fix: /login provider change

src/components/OpenAILoginFlow.tsx

@@ -115,7 +115,11 @@ export function OpenAILoginFlow({
     }
   }
 
-  async function handleSubmit(value: string): Promise<void> {
+  async function handleSubmit(value?: string): Promise<void> {
+    if (!value) {
+      return
+    }
+    
     const trimmed = value.trim()
     if (!trimmed) {
       return
@@ -180,6 +184,7 @@ export function OpenAILoginFlow({
             onChangeCursorOffset={setCursorOffset}
             columns={72}
             mask="*"
+            focus={true}
           />
         </Box>
         {status ? <Text color="error">{status}</Text> : null}

src/components/OpenRouterLoginFlow.tsx

@@ -19,7 +19,11 @@ export function OpenRouterLoginFlow({
   const [inputValue, setInputValue] = useState('')
   const [cursorOffset, setCursorOffset] = useState(0)
 
-  async function handleSubmit(value: string): Promise<void> {
+  async function handleSubmit(value?: string): Promise<void> {
+    if (!value) {
+      return
+    }
+    
     const trimmed = value.trim()
     if (!trimmed) {
       return
@@ -76,6 +80,7 @@ export function OpenRouterLoginFlow({
           onChangeCursorOffset={setCursorOffset}
           columns={72}
           mask="*"
+          focus={true}
         />
       </Box>
       {status ? <Text color="error">{status}</Text> : null}

src/services/api/errors.ts

@@ -905,9 +905,10 @@ export function getAssistantMessageFromError(
   if (error instanceof APIError && error.status === 404) {
     const switchCmd = getIsNonInteractiveSession() ? '--model' : '/model'
     const fallbackSuggestion = get3PModelFallbackSuggestion(model)
+    const provider = getAPIProvider()
     return createAssistantAPIErrorMessage({
       content: fallbackSuggestion
-        ? `The model ${model} is not available on your ${getAPIProvider()} deployment. Try ${switchCmd} to switch to ${fallbackSuggestion}, or ask your admin to enable this model.`
+        ? `The model ${model} is not available on your ${provider ?? 'configured'} deployment. Try ${switchCmd} to switch to ${fallbackSuggestion}, or ask your admin to enable this model.`
         : `There's an issue with the selected model (${model}). It may not exist or you may not have access to it. Run ${switchCmd} to pick a different model.`,
       error: 'invalid_request',
     })

src/utils/auth.ts

@@ -388,11 +388,18 @@ export async function saveOpenAIApiKey(apiKey: string): Promise<void> {
 }
 
 export async function saveOpenRouterApiKey(apiKey: string): Promise<void> {
+  if (!apiKey || typeof apiKey !== 'string') {
+    throw new Error(
+      'Invalid API key: API key must be a non-empty string.',
+    )
+  }
+  
   if (!isValidApiKey(apiKey)) {
     throw new Error(
       'Invalid API key format. API key must contain only alphanumeric characters, dashes, and underscores.',
     )
   }
+  
   saveGlobalConfig(current => ({
     ...current,
     authProvider: 'openrouter',
@@ -402,12 +409,16 @@ export async function saveOpenRouterApiKey(apiKey: string): Promise<void> {
   const { clearStoredProviderCache } = await import('./model/providers.js')
   clearStoredProviderCache()
   // Clear OpenRouter models cache so it will be refetched with new API key
-  const { clearOpenRouterModelsCache } = await import('./model/openRouterModels.js')
-  clearOpenRouterModelsCache()
+  try {
+    const { clearOpenRouterModelsCache } = await import('./model/openRouterModels.js')
+    clearOpenRouterModelsCache()
+  } catch (error) {
+    // Ignore errors from clearing cache
+    console.error('Error clearing OpenRouter models cache:', error)
+  }
 }
 
 export async function saveLocalModelConfig(baseUrl: string, modelName: string): Promise<void> {
-  console.log('[saveLocalModelConfig] Saving local model config:', baseUrl, modelName)
   if (!baseUrl.trim()) {
     throw new Error('Base URL cannot be empty')
   }
@@ -426,14 +437,20 @@ export async function saveLocalModelConfig(baseUrl: string, modelName: string):
       localBaseUrl: baseUrl,
       localModelName: modelName,
     }
-    console.log('[saveLocalModelConfig] New config to save:', newConfig)
     return newConfig
   })
   
   // Clear provider cache so it will be re-read on next access
   const { clearStoredProviderCache } = await import('./model/providers.js')
   clearStoredProviderCache()
-  console.log('[saveLocalModelConfig] Config saved successfully')
+  
+  // Clear OpenRouter models cache so it will be refetched with new API key
+  try {
+    const { clearOpenRouterModelsCache } = await import('./model/openRouterModels.js')
+    clearOpenRouterModelsCache()
+  } catch (error) {
+    // Ignore errors from clearing cache
+  }
 }
 
 export function getLocalModelName(): string | null {

src/utils/model/model.ts

@@ -179,7 +179,29 @@ export function getRuntimeMainLoopModel(params: {
  */
 export function getDefaultMainLoopModelSetting(): ModelName | ModelAlias {
   // Check if using Local provider
-  if (getAPIProvider() === 'local') {
+  // Need to check both getAPIProvider() and direct file read because
+  // getAPIProvider() might return null if cache was cleared
+  const apiProvider = getAPIProvider()
+  let isLocalProvider = apiProvider === 'local'
+  
+  // If getAPIProvider() returns null, check the config file directly
+  if (!isLocalProvider && apiProvider === null) {
+    try {
+      // eslint-disable-next-line @typescript-eslint/no-require-imports
+      const { readFileSync } = require('fs') as typeof import('fs')
+      const { getGlobalClaudeFile } = require('./env.js') as typeof import('./env.js')
+      const raw = readFileSync(getGlobalClaudeFile(), 'utf8')
+      const config = JSON.parse(raw) as {
+        authProvider?: string
+        localBaseUrl?: string
+      }
+      isLocalProvider = config.authProvider === 'local' && !!config.localBaseUrl
+    } catch {
+      // Ignore errors, fall through to default behavior
+    }
+  }
+  
+  if (isLocalProvider) {
     const localModelName = getLocalModelName()
     if (localModelName) {
       return localModelName

src/utils/model/modelOptions.ts

@@ -67,7 +67,40 @@ export function getDefaultOptionForUser(fastMode = false): ModelOption {
   // PAYG
   const provider = getAPIProvider()
   const isOpenAI = provider === 'openai'
+  const isLocal = provider === 'local'
   const is3P = provider !== 'firstParty'
+  
+  // Check if we should use local model
+  let localModelName: string | null = null
+  if (isLocal || provider === null) {
+    // Try to get local model name from file
+    try {
+      // eslint-disable-next-line @typescript-eslint/no-require-imports
+      const { readFileSync } = require('fs') as typeof import('fs')
+      const { getGlobalClaudeFile } = require('../env.js') as typeof import('../env.js')
+      const raw = readFileSync(getGlobalClaudeFile(), 'utf8')
+      const config = JSON.parse(raw) as {
+        authProvider?: string
+        localBaseUrl?: string
+        localModelName?: string
+      }
+      if (config.authProvider === 'local' && config.localBaseUrl && config.localModelName) {
+        localModelName = config.localModelName
+      }
+    } catch {
+      // Ignore errors
+    }
+  }
+  
+  if (localModelName) {
+    return {
+      value: null,
+      label: 'Default (recommended)',
+      description: `Use the default local model (currently ${localModelName})`,
+      descriptionForModel: `Default local model (currently ${localModelName})`,
+    }
+  }
+  
   return {
     value: null,
     label: 'Default (recommended)',
@@ -333,6 +366,13 @@ function getOpusPlanOption(): ModelOption {
 // @[MODEL LAUNCH]: Update the model picker lists below to include/reorder options for the new model.
 // Each user tier (ant, Max/Team Premium, Pro/Team Standard/Enterprise, PAYG 1P, PAYG 3P) has its own list.
 function getModelOptionsBase(fastMode = false): ModelOption[] {
+  const provider = getAPIProvider()
+  
+  // If no provider is configured, only return Default option
+  if (!provider) {
+    return [getDefaultOptionForUser(fastMode)]
+  }
+
   if (process.env.USER_TYPE === 'ant') {
     // Build options from antModels config
     const antModelOptions: ModelOption[] = getAntModels().map(m => ({

src/utils/model/providers.ts

@@ -164,7 +164,7 @@ export function getOpenAIBaseUrl(): string {
   return process.env.OPENAI_BASE_URL ?? 'https://api.openai.com/v1'
 }
 
-export function getAPIProvider(): APIProvider {
+export function getAPIProvider(): APIProvider | null {
   const explicitProvider = getExplicitProviderOverride()
   if (explicitProvider) {
     return explicitProvider
@@ -180,7 +180,7 @@ export function getAPIProvider(): APIProvider {
           ? 'openai'
           : isOpenRouterConfigured()
             ? 'openrouter'
-            : getStoredProviderPreference() ?? 'firstParty'
+            : getStoredProviderPreference()
 }
 
 export function getAPIProviderForStatsig(): AnalyticsMetadata_I_VERIFIED_THIS_IS_NOT_CODE_OR_FILEPATHS {

src/utils/swarm/teammateModel.ts

@@ -6,5 +6,7 @@ import { getAPIProvider } from '../model/providers.js'
 // use Opus 4.6. Must be provider-aware so Bedrock/Vertex/Foundry customers get
 // the correct model ID.
 export function getHardcodedTeammateModelFallback(): string {
-  return CLAUDE_OPUS_4_6_CONFIG[getAPIProvider()]
+  const provider = getAPIProvider()
+  // Default to firstParty if no provider is configured
+  return CLAUDE_OPUS_4_6_CONFIG[provider ?? 'firstParty']
 }