🐛 Bug Fixes Release v0.1.1 (#898)

packages/cli/src/ui/auth/AuthDialog.tsx

@@ -8,12 +8,7 @@ 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 { validateAuthMethod } from '../../config/auth.js';
 import { type LoadedSettings, SettingScope } from '../../config/settings.js';
 import { Colors } from '../colors.js';
 import { useKeypress } from '../hooks/useKeypress.js';
@@ -21,7 +16,15 @@ import { OpenAIKeyPrompt } from '../components/OpenAIKeyPrompt.js';
 import { RadioButtonSelect } from '../components/shared/RadioButtonSelect.js';
 
 interface AuthDialogProps {
-  onSelect: (authMethod: AuthType | undefined, scope: SettingScope) => void;
+  onSelect: (
+    authMethod: AuthType | undefined,
+    scope: SettingScope,
+    credentials?: {
+      apiKey?: string;
+      baseUrl?: string;
+      model?: string;
+    },
+  ) => void;
   settings: LoadedSettings;
   initialErrorMessage?: string | null;
 }
@@ -70,11 +73,7 @@ export function AuthDialog({
         return item.value === defaultAuthType;
       }
 
-      if (process.env['GEMINI_API_KEY']) {
-        return item.value === AuthType.USE_GEMINI;
-      }
-
-      return item.value === AuthType.LOGIN_WITH_GOOGLE;
+      return item.value === AuthType.QWEN_OAUTH;
     }),
   );
 
@@ -101,11 +100,12 @@ export function AuthDialog({
     baseUrl: string,
     model: string,
   ) => {
-    setOpenAIApiKey(apiKey);
-    setOpenAIBaseUrl(baseUrl);
-    setOpenAIModel(model);
     setShowOpenAIKeyPrompt(false);
-    onSelect(AuthType.USE_OPENAI, SettingScope.User);
+    onSelect(AuthType.USE_OPENAI, SettingScope.User, {
+      apiKey,
+      baseUrl,
+      model,
+    });
   };
 
   const handleOpenAIKeyCancel = () => {

packages/cli/src/ui/auth/useAuth.ts

@@ -6,12 +6,11 @@
 
 import { useState, useCallback, useEffect } from 'react';
 import type { LoadedSettings, SettingScope } from '../../config/settings.js';
-import { AuthType, type Config } from '@qwen-code/qwen-code-core';
+import type { AuthType, Config } from '@qwen-code/qwen-code-core';
 import {
   clearCachedCredentialFile,
   getErrorMessage,
 } from '@qwen-code/qwen-code-core';
-import { runExitCleanup } from '../../utils/cleanup.js';
 import { AuthState } from '../types.js';
 import { validateAuthMethod } from '../../config/auth.js';
 
@@ -47,6 +46,7 @@ export const useAuthCommand = (settings: LoadedSettings, config: Config) => {
       setAuthError(error);
       if (error) {
         setAuthState(AuthState.Updating);
+        setIsAuthDialogOpen(true);
       }
     },
     [setAuthError, setAuthState],
@@ -87,24 +87,49 @@ export const useAuthCommand = (settings: LoadedSettings, config: Config) => {
 
   // Handle auth selection from dialog
   const handleAuthSelect = useCallback(
-    async (authType: AuthType | undefined, scope: SettingScope) => {
+    async (
+      authType: AuthType | undefined,
+      scope: SettingScope,
+      credentials?: {
+        apiKey?: string;
+        baseUrl?: string;
+        model?: string;
+      },
+    ) => {
       if (authType) {
         await clearCachedCredentialFile();
 
-        settings.setValue(scope, 'security.auth.selectedType', authType);
+        // Save OpenAI credentials if provided
+        if (credentials) {
+          // Update Config's internal generationConfig before calling refreshAuth
+          // This ensures refreshAuth has access to the new credentials
+          config.updateCredentials({
+            apiKey: credentials.apiKey,
+            baseUrl: credentials.baseUrl,
+            model: credentials.model,
+          });
 
-        if (
-          authType === AuthType.LOGIN_WITH_GOOGLE &&
-          config.isBrowserLaunchSuppressed()
-        ) {
-          await runExitCleanup();
-          console.log(`
-----------------------------------------------------------------
-Logging in with Google... Please restart Gemini CLI to continue.
-----------------------------------------------------------------
-          `);
-          process.exit(0);
+          // Also set environment variables for compatibility with other parts of the code
+          if (credentials.apiKey) {
+            settings.setValue(
+              scope,
+              'security.auth.apiKey',
+              credentials.apiKey,
+            );
+          }
+          if (credentials.baseUrl) {
+            settings.setValue(
+              scope,
+              'security.auth.baseUrl',
+              credentials.baseUrl,
+            );
+          }
+          if (credentials.model) {
+            settings.setValue(scope, 'model.name', credentials.model);
+          }
         }
+
+        settings.setValue(scope, 'security.auth.selectedType', authType);
       }
 
       setIsAuthDialogOpen(false);