Sync upstream Gemini-CLI v0.8.2 (#838)

2025-12-19 09:33:53 +00:00 · 2025-10-23 09:27:04 +08:00
parent 096fabb5d6
commit eb95c131be
644 changed files with 70389 additions and 23709 deletions
--- a/packages/cli/src/ui/auth/AuthDialog.tsx
+++ b/packages/cli/src/ui/auth/AuthDialog.tsx
@@ -0,0 +1,187 @@
+/**
+ * @license
+ * Copyright 2025 Google LLC
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+import type React from 'react';
+import { useState } from 'react';
+import { AuthType } from '@qwen-code/qwen-code-core';
+import { Box, Text } from 'ink';
+import {
+  setOpenAIApiKey,
+  setOpenAIBaseUrl,
+  setOpenAIModel,
+  validateAuthMethod,
+} from '../../config/auth.js';
+import { type LoadedSettings, SettingScope } from '../../config/settings.js';
+import { Colors } from '../colors.js';
+import { useKeypress } from '../hooks/useKeypress.js';
+import { OpenAIKeyPrompt } from '../components/OpenAIKeyPrompt.js';
+import { RadioButtonSelect } from '../components/shared/RadioButtonSelect.js';
+
+interface AuthDialogProps {
+  onSelect: (authMethod: AuthType | undefined, scope: SettingScope) => void;
+  settings: LoadedSettings;
+  initialErrorMessage?: string | null;
+}
+
+function parseDefaultAuthType(
+  defaultAuthType: string | undefined,
+): AuthType | null {
+  if (
+    defaultAuthType &&
+    Object.values(AuthType).includes(defaultAuthType as AuthType)
+  ) {
+    return defaultAuthType as AuthType;
+  }
+  return null;
+}
+
+export function AuthDialog({
+  onSelect,
+  settings,
+  initialErrorMessage,
+}: AuthDialogProps): React.JSX.Element {
+  const [errorMessage, setErrorMessage] = useState<string | null>(
+    initialErrorMessage || null,
+  );
+  const [showOpenAIKeyPrompt, setShowOpenAIKeyPrompt] = useState(false);
+  const items = [
+    {
+      key: AuthType.QWEN_OAUTH,
+      label: 'Qwen OAuth',
+      value: AuthType.QWEN_OAUTH,
+    },
+    { key: AuthType.USE_OPENAI, label: 'OpenAI', value: AuthType.USE_OPENAI },
+  ];
+
+  const initialAuthIndex = Math.max(
+    0,
+    items.findIndex((item) => {
+      if (settings.merged.security?.auth?.selectedType) {
+        return item.value === settings.merged.security?.auth?.selectedType;
+      }
+
+      const defaultAuthType = parseDefaultAuthType(
+        process.env['QWEN_DEFAULT_AUTH_TYPE'],
+      );
+      if (defaultAuthType) {
+        return item.value === defaultAuthType;
+      }
+
+      if (process.env['GEMINI_API_KEY']) {
+        return item.value === AuthType.USE_GEMINI;
+      }
+
+      return item.value === AuthType.LOGIN_WITH_GOOGLE;
+    }),
+  );
+
+  const handleAuthSelect = (authMethod: AuthType) => {
+    const error = validateAuthMethod(authMethod);
+    if (error) {
+      if (
+        authMethod === AuthType.USE_OPENAI &&
+        !process.env['OPENAI_API_KEY']
+      ) {
+        setShowOpenAIKeyPrompt(true);
+        setErrorMessage(null);
+      } else {
+        setErrorMessage(error);
+      }
+    } else {
+      setErrorMessage(null);
+      onSelect(authMethod, SettingScope.User);
+    }
+  };
+
+  const handleOpenAIKeySubmit = (
+    apiKey: string,
+    baseUrl: string,
+    model: string,
+  ) => {
+    setOpenAIApiKey(apiKey);
+    setOpenAIBaseUrl(baseUrl);
+    setOpenAIModel(model);
+    setShowOpenAIKeyPrompt(false);
+    onSelect(AuthType.USE_OPENAI, SettingScope.User);
+  };
+
+  const handleOpenAIKeyCancel = () => {
+    setShowOpenAIKeyPrompt(false);
+    setErrorMessage('OpenAI API key is required to use OpenAI authentication.');
+  };
+
+  useKeypress(
+    (key) => {
+      if (showOpenAIKeyPrompt) {
+        return;
+      }
+
+      if (key.name === 'escape') {
+        // Prevent exit if there is an error message.
+        // This means they user is not authenticated yet.
+        if (errorMessage) {
+          return;
+        }
+        if (settings.merged.security?.auth?.selectedType === undefined) {
+          // Prevent exiting if no auth method is set
+          setErrorMessage(
+            'You must select an auth method to proceed. Press Ctrl+C again to exit.',
+          );
+          return;
+        }
+        onSelect(undefined, SettingScope.User);
+      }
+    },
+    { isActive: true },
+  );
+
+  if (showOpenAIKeyPrompt) {
+    return (
+      <OpenAIKeyPrompt
+        onSubmit={handleOpenAIKeySubmit}
+        onCancel={handleOpenAIKeyCancel}
+      />
+    );
+  }
+
+  return (
+    <Box
+      borderStyle="round"
+      borderColor={Colors.Gray}
+      flexDirection="column"
+      padding={1}
+      width="100%"
+    >
+      <Text bold>Get started</Text>
+      <Box marginTop={1}>
+        <Text>How would you like to authenticate for this project?</Text>
+      </Box>
+      <Box marginTop={1}>
+        <RadioButtonSelect
+          items={items}
+          initialIndex={initialAuthIndex}
+          onSelect={handleAuthSelect}
+        />
+      </Box>
+      {errorMessage && (
+        <Box marginTop={1}>
+          <Text color={Colors.AccentRed}>{errorMessage}</Text>
+        </Box>
+      )}
+      <Box marginTop={1}>
+        <Text color={Colors.AccentPurple}>(Use Enter to Set Auth)</Text>
+      </Box>
+      <Box marginTop={1}>
+        <Text>Terms of Services and Privacy Notice for Qwen Code</Text>
+      </Box>
+      <Box marginTop={1}>
+        <Text color={Colors.AccentBlue}>
+          {'https://github.com/QwenLM/Qwen3-Coder/blob/main/README.md'}
+        </Text>
+      </Box>
+    </Box>
+  );
+}