provider (api) 指令查询/切换模型api类型 分离OpenAl和Anthropic模型的环境变量 分离 Gemini和Anthropic环境变量 通过github action更新contributors

CLAUDE.md

@@ -180,7 +180,7 @@ Feature flag `VOICE_MODE`，dev/build 默认启用。Push-to-Talk 语音输入
 - **`src/services/api/openai/`** — client、消息/工具转换、流适配、模型映射
 - **`src/utils/model/providers.ts`** — 添加 `'openai'` provider 类型（最高优先级）
 
-关键环境变量：`CLAUDE_CODE_USE_OPENAI`、`OPENAI_API_KEY`、`OPENAI_BASE_URL`、`OPENAI_MODEL`、`OPENAI_MODEL_MAP`。详见 `docs/plans/openai-compatibility.md`。
+关键环境变量：`CLAUDE_CODE_USE_OPENAI`、`OPENAI_API_KEY`、`OPENAI_BASE_URL`、`OPENAI_MODEL`、`OPENAI_DEFAULT_OPUS_MODEL`、`OPENAI_DEFAULT_SONNET_MODEL`、`OPENAI_DEFAULT_HAIKU_MODEL`。详见 `docs/plans/openai-compatibility.md`。
 
 ### Key Type Files
 

docs/plans/openai-compatibility.md

@@ -14,7 +14,9 @@ claude-code 支持通过 OpenAI Chat Completions API（`/v1/chat/completions`）
 | `OPENAI_API_KEY` | 是 | API key（Ollama 等可设为任意值） |
 | `OPENAI_BASE_URL` | 推荐 | 端点 URL（如 `http://localhost:11434/v1`） |
 | `OPENAI_MODEL` | 可选 | 覆盖所有请求的模型名（跳过映射） |
-| `OPENAI_MODEL_MAP` | 可选 | JSON 映射，如 `{"claude-sonnet-4-6":"gpt-4o"}` |
+| `OPENAI_DEFAULT_OPUS_MODEL` | 可选 | 覆盖 opus 家族对应的模型（如 `o3`, `o3-mini`, `o1-pro`） |
+| `OPENAI_DEFAULT_SONNET_MODEL` | 可选 | 覆盖 sonnet 家族对应的模型（如 `gpt-4o`, `gpt-4.1`） |
+| `OPENAI_DEFAULT_HAIKU_MODEL` | 可选 | 覆盖 haiku 家族对应的模型（如 `gpt-4o-mini`, `gpt-4.0-mini`） |
 | `OPENAI_ORG_ID` | 可选 | Organization ID |
 | `OPENAI_PROJECT_ID` | 可选 | Project ID |
 
@@ -49,11 +51,12 @@ OPENAI_BASE_URL=https://your-one-api.example.com/v1 \
 OPENAI_MODEL=gpt-4o \
 bun run dev
 
-# 自定义模型映射
+# 自定义模型映射（使用家族变量）
 CLAUDE_CODE_USE_OPENAI=1 \
 OPENAI_API_KEY=sk-xxx \
 OPENAI_BASE_URL=https://my-gateway.example.com/v1 \
-OPENAI_MODEL_MAP='{"claude-sonnet-4-6":"gpt-4o-2024-11-20","claude-haiku-4-5":"gpt-4o-mini"}' \
+OPENAI_DEFAULT_SONNET_MODEL="gpt-4o-2024-11-20" \
+OPENAI_DEFAULT_HAIKU_MODEL="gpt-4o-mini" \
 bun run dev
 ```
 
@@ -85,9 +88,10 @@ queryModel() [claude.ts]
 `resolveOpenAIModel()` 的解析顺序：
 
 1. `OPENAI_MODEL` 环境变量 → 直接使用，覆盖所有
-2. `OPENAI_MODEL_MAP` JSON 查表 → 自定义映射
-3. 内置默认映射（见下表）
-4. 以上都不匹配 → 原名透传
+2. `OPENAI_DEFAULT_{FAMILY}_MODEL` 变量（如 `OPENAI_DEFAULT_SONNET_MODEL`）→ 按模型家族覆盖
+3. `ANTHROPIC_DEFAULT_{FAMILY}_MODEL` 变量（向后兼容）
+4. 内置默认映射（见下表）
+5. 以上都不匹配 → 原名透传
 
 ### 内置模型映射
 

src/commands.ts

@@ -150,6 +150,7 @@ import sandboxToggle from './commands/sandbox-toggle/index.js'
 import chrome from './commands/chrome/index.js'
 import stickers from './commands/stickers/index.js'
 import advisor from './commands/advisor.js'
+import provider from './commands/provider.js'
 import { logError } from './utils/log.js'
 import { toError } from './utils/errors.js'
 import { logForDebugging } from './utils/debug.js'
@@ -258,6 +259,7 @@ export const INTERNAL_ONLY_COMMANDS = [
 const COMMANDS = memoize((): Command[] => [
   addDir,
   advisor,
+  provider,
   agents,
   branch,
   btw,

src/commands/provider.ts

@@ -0,0 +1,109 @@
+import type { Command } from '../commands.js'
+import type { LocalCommandCall } from '../types/command.js'
+import { getAPIProvider } from '../utils/model/providers.js'
+import { updateSettingsForSource } from '../utils/settings/settings.js'
+import { getSettings_DEPRECATED } from '../utils/settings/settings.js'
+import { applyConfigEnvironmentVariables } from '../utils/managedEnv.js'
+
+function getEnvVarForProvider(provider: string): string {
+  switch (provider) {
+    case 'bedrock':
+      return 'CLAUDE_CODE_USE_BEDROCK'
+    case 'vertex':
+      return 'CLAUDE_CODE_USE_VERTEX'
+    case 'foundry':
+      return 'CLAUDE_CODE_USE_FOUNDRY'
+    default:
+      throw new Error(`Unknown provider: ${provider}`)
+  }
+}
+
+// Get merged env: process.env + settings.env (from userSettings)
+function getMergedEnv(): Record<string, string> {
+  const settings = getSettings_DEPRECATED()
+  const merged = { ...process.env }
+  if (settings?.env) {
+    Object.assign(merged, settings.env)
+  }
+  return merged
+}
+
+const call: LocalCommandCall = async (args, context) => {
+  const arg = args.trim().toLowerCase()
+
+  // No argument: show current provider
+  if (!arg) {
+    const current = getAPIProvider()
+    return { type: 'text', value: `Current API provider: ${current}` }
+  }
+
+  // unset - clear settings, fallback to env vars
+  if (arg === 'unset') {
+    updateSettingsForSource('userSettings', { modelType: undefined })
+    // Also clear all provider-specific env vars to prevent conflicts
+    delete process.env.CLAUDE_CODE_USE_BEDROCK
+    delete process.env.CLAUDE_CODE_USE_VERTEX
+    delete process.env.CLAUDE_CODE_USE_FOUNDRY
+    delete process.env.CLAUDE_CODE_USE_OPENAI
+    return { type: 'text', value: 'API provider cleared (will use environment variables).' }
+  }
+
+  // Validate provider
+  const validProviders = ['anthropic', 'openai', 'bedrock', 'vertex', 'foundry']
+  if (!validProviders.includes(arg)) {
+    return { type: 'text', value: `Invalid provider: ${arg}\nValid: ${validProviders.join(', ')}` }
+  }
+
+  // Check env vars when switching to openai (including settings.env)
+  if (arg === 'openai') {
+    const mergedEnv = getMergedEnv()
+    const hasKey = !!mergedEnv.OPENAI_API_KEY
+    const hasUrl = !!mergedEnv.OPENAI_BASE_URL
+    if (!hasKey || !hasUrl) {
+      updateSettingsForSource('userSettings', { modelType: 'openai' })
+      const missing = []
+      if (!hasKey) missing.push('OPENAI_API_KEY')
+      if (!hasUrl) missing.push('OPENAI_BASE_URL')
+      return {
+        type: 'text',
+        value: `Switched to OpenAI provider.\nWarning: Missing env vars: ${missing.join(', ')}\nConfigure them via /login or set manually.`,
+      }
+    }
+  }
+
+  // Handle different provider types
+  // - 'anthropic' and 'openai' are stored in settings.json (persistent)
+  // - 'bedrock', 'vertex', 'foundry' are env-only (do NOT touch settings.json)
+  if (arg === 'anthropic' || arg === 'openai') {
+    // Clear any cloud provider env vars to avoid conflicts
+    delete process.env.CLAUDE_CODE_USE_BEDROCK
+    delete process.env.CLAUDE_CODE_USE_VERTEX
+    delete process.env.CLAUDE_CODE_USE_FOUNDRY
+    // Update settings.json
+    updateSettingsForSource('userSettings', { modelType: arg })
+    // Ensure settings.env gets applied to process.env
+    applyConfigEnvironmentVariables()
+    return { type: 'text', value: `API provider set to ${arg}.` }
+  } else {
+    // Cloud providers: set env vars only, do NOT touch settings.modelType
+    delete process.env.CLAUDE_CODE_USE_OPENAI
+    delete process.env.OPENAI_API_KEY
+    delete process.env.OPENAI_BASE_URL
+    process.env[getEnvVarForProvider(arg)] = '1'
+    // Do not modify settings.json - cloud providers controlled solely by env vars
+    applyConfigEnvironmentVariables()
+    return { type: 'text', value: `API provider set to ${arg} (via environment variable).` }
+  }
+}
+
+const provider = {
+  type: 'local',
+  name: 'provider',
+  description: 'Switch API provider (anthropic/openai/bedrock/vertex/foundry)',
+  aliases: ['api'],
+  argumentHint: '[anthropic|openai|bedrock|vertex|foundry|unset]',
+  supportsNonInteractive: true,
+  load: () => Promise.resolve({ call }),
+} satisfies Command
+
+export default provider

src/components/ConsoleOAuthFlow.tsx

@@ -303,17 +303,10 @@ export function ConsoleOAuthFlow({
       !pendingOAuthStartRef.current
     ) {
       pendingOAuthStartRef.current = true
-      process.nextTick(
-        (
-          startOAuth: () => Promise<void>,
-          pendingOAuthStartRef: React.MutableRefObject<boolean>,
-        ) => {
-          void startOAuth()
-          pendingOAuthStartRef.current = false
-        },
-        startOAuth,
-        pendingOAuthStartRef,
-      )
+      // Start OAuth flow and reset the pending flag when complete
+      void startOAuth().finally(() => {
+        pendingOAuthStartRef.current = false
+      })
     }
   }, [oauthStatus.state, startOAuth])
 
@@ -538,9 +531,9 @@ function OAuthStatusMessage({
                     state: 'openai_chat_api',
                     baseUrl: process.env.OPENAI_BASE_URL ?? '',
                     apiKey: process.env.OPENAI_API_KEY ?? '',
-                    haikuModel: process.env.ANTHROPIC_DEFAULT_HAIKU_MODEL ?? '',
-                    sonnetModel: process.env.ANTHROPIC_DEFAULT_SONNET_MODEL ?? '',
-                    opusModel: process.env.ANTHROPIC_DEFAULT_OPUS_MODEL ?? '',
+                    haikuModel: process.env.OPENAI_DEFAULT_HAIKU_MODEL ?? '',
+                    sonnetModel: process.env.OPENAI_DEFAULT_SONNET_MODEL ?? '',
+                    opusModel: process.env.OPENAI_DEFAULT_OPUS_MODEL ?? '',
                     activeField: 'base_url',
                   })
                 } else if (value === 'platform') {
@@ -640,7 +633,7 @@ function OAuthStatusMessage({
           if (error) {
             setOAuthStatus({
               state: 'error',
-              message: `Failed to save: ${error.message}`,
+              message: 'Failed to save settings. Please try again.',
               toRetry: {
                 state: 'custom_platform',
                 baseUrl: '',
@@ -654,6 +647,7 @@ function OAuthStatusMessage({
           } else {
             for (const [k, v] of Object.entries(env)) process.env[k] = v
             setOAuthStatus({ state: 'success' })
+            // Schedule onDone after state update to avoid potential state update on unmounted component
             void onDone()
           }
         }, [activeField, inputValue, displayValues, setOAuthStatus, onDone])
@@ -826,17 +820,17 @@ function OAuthStatusMessage({
           const env: Record<string, string> = {}
           if (finalVals.base_url) env.OPENAI_BASE_URL = finalVals.base_url
           if (finalVals.api_key) env.OPENAI_API_KEY = finalVals.api_key
-          if (finalVals.haiku_model) env.ANTHROPIC_DEFAULT_HAIKU_MODEL = finalVals.haiku_model
-          if (finalVals.sonnet_model) env.ANTHROPIC_DEFAULT_SONNET_MODEL = finalVals.sonnet_model
-          if (finalVals.opus_model) env.ANTHROPIC_DEFAULT_OPUS_MODEL = finalVals.opus_model
+          if (finalVals.haiku_model) env.OPENAI_DEFAULT_HAIKU_MODEL = finalVals.haiku_model
+          if (finalVals.sonnet_model) env.OPENAI_DEFAULT_SONNET_MODEL = finalVals.sonnet_model
+          if (finalVals.opus_model) env.OPENAI_DEFAULT_OPUS_MODEL = finalVals.opus_model
           const { error } = updateSettingsForSource('userSettings', {
             modelType: 'openai' as any,
             env,
           } as any)
           if (error) {
             setOAuthStatus({
               state: 'error',
-              message: `Failed to save: ${error.message}`,
+              message: 'Failed to save settings. Please try again.',
               toRetry: {
                 state: 'openai_chat_api',
                 baseUrl: '',
@@ -850,6 +844,7 @@ function OAuthStatusMessage({
           } else {
             for (const [k, v] of Object.entries(env)) process.env[k] = v
             setOAuthStatus({ state: 'success' })
+            // Schedule onDone after state update to avoid potential state update on unmounted component
             void onDone()
           }
         }, [activeField, openaiInputValue, openaiDisplayValues, setOAuthStatus, onDone])

src/services/api/openai/__tests__/modelMapping.test.ts

@@ -4,13 +4,19 @@ import { resolveOpenAIModel } from '../modelMapping.js'
 describe('resolveOpenAIModel', () => {
   const originalEnv = {
     OPENAI_MODEL: process.env.OPENAI_MODEL,
+    OPENAI_DEFAULT_HAIKU_MODEL: process.env.OPENAI_DEFAULT_HAIKU_MODEL,
+    OPENAI_DEFAULT_SONNET_MODEL: process.env.OPENAI_DEFAULT_SONNET_MODEL,
+    OPENAI_DEFAULT_OPUS_MODEL: process.env.OPENAI_DEFAULT_OPUS_MODEL,
     ANTHROPIC_DEFAULT_HAIKU_MODEL: process.env.ANTHROPIC_DEFAULT_HAIKU_MODEL,
     ANTHROPIC_DEFAULT_SONNET_MODEL: process.env.ANTHROPIC_DEFAULT_SONNET_MODEL,
     ANTHROPIC_DEFAULT_OPUS_MODEL: process.env.ANTHROPIC_DEFAULT_OPUS_MODEL,
   }
 
   beforeEach(() => {
     delete process.env.OPENAI_MODEL
+    delete process.env.OPENAI_DEFAULT_HAIKU_MODEL
+    delete process.env.OPENAI_DEFAULT_SONNET_MODEL
+    delete process.env.OPENAI_DEFAULT_OPUS_MODEL
     delete process.env.ANTHROPIC_DEFAULT_HAIKU_MODEL
     delete process.env.ANTHROPIC_DEFAULT_SONNET_MODEL
     delete process.env.ANTHROPIC_DEFAULT_OPUS_MODEL

src/services/api/openai/modelMapping.ts

@@ -31,9 +31,10 @@ function getModelFamily(model: string): 'haiku' | 'sonnet' | 'opus' | null {
  *
  * Priority:
  * 1. OPENAI_MODEL env var (override all)
- * 2. ANTHROPIC_DEFAULT_{FAMILY}_MODEL env var (e.g. ANTHROPIC_DEFAULT_SONNET_MODEL)
- * 3. DEFAULT_MODEL_MAP lookup
- * 4. Pass through original model name
+ * 2. OPENAI_DEFAULT_{FAMILY}_MODEL env var (e.g. OPENAI_DEFAULT_SONNET_MODEL)
+ * 3. ANTHROPIC_DEFAULT_{FAMILY}_MODEL env var (backward compatibility)
+ * 4. DEFAULT_MODEL_MAP lookup
+ * 5. Pass through original model name
  */
 export function resolveOpenAIModel(anthropicModel: string): string {
   // Highest priority: explicit override
@@ -44,12 +45,18 @@ export function resolveOpenAIModel(anthropicModel: string): string {
   // Strip [1m] suffix if present (Claude-specific modifier)
   const cleanModel = anthropicModel.replace(/\[1m\]$/, '')
 
-  // Check ANTHROPIC_DEFAULT_*_MODEL env vars based on model family
+  // Check family-specific overrides
   const family = getModelFamily(cleanModel)
   if (family) {
-    const envVar = `ANTHROPIC_DEFAULT_${family.toUpperCase()}_MODEL`
-    const override = process.env[envVar]
-    if (override) return override
+    // OpenAI-specific family override (preferred for openai provider)
+    const openaiEnvVar = `OPENAI_DEFAULT_${family.toUpperCase()}_MODEL`
+    const openaiOverride = process.env[openaiEnvVar]
+    if (openaiOverride) return openaiOverride
+
+    // Anthropic env var (backward compatibility)
+    const anthropicEnvVar = `ANTHROPIC_DEFAULT_${family.toUpperCase()}_MODEL`
+    const anthropicOverride = process.env[anthropicEnvVar]
+    if (anthropicOverride) return anthropicOverride
   }
 
   return DEFAULT_MODEL_MAP[cleanModel] ?? cleanModel

src/utils/managedEnvConstants.ts

@@ -10,6 +10,10 @@
  * @[MODEL LAUNCH]: New models usually don't need changes here —
  * VERTEX_REGION_CLAUDE_* is prefix-matched. New providers or new routing
  * config vars (endpoint, project, region, auth) do.
+ *
+ * Note: OpenAI provider uses OPENAI_* env vars (OPENAI_API_KEY, OPENAI_BASE_URL,
+ * OPENAI_MODEL, OPENAI_DEFAULT_*_MODEL, OPENAI_SMALL_FAST_MODEL) which are all
+ * provider-managed to keep routing config isolated from Anthropic settings.
  */
 const PROVIDER_MANAGED_ENV_VARS = new Set([
   // The flag itself — settings can't unset it once the host set it
@@ -50,6 +54,23 @@ const PROVIDER_MANAGED_ENV_VARS = new Set([
   'ANTHROPIC_DEFAULT_SONNET_MODEL_DESCRIPTION',
   'ANTHROPIC_DEFAULT_SONNET_MODEL_NAME',
   'ANTHROPIC_DEFAULT_SONNET_MODEL_SUPPORTED_CAPABILITIES',
+  // OpenAI provider specific
+  'OPENAI_API_KEY',
+  'OPENAI_BASE_URL',
+  'OPENAI_MODEL',
+  'OPENAI_DEFAULT_HAIKU_MODEL',
+  'OPENAI_DEFAULT_HAIKU_MODEL_DESCRIPTION',
+  'OPENAI_DEFAULT_HAIKU_MODEL_NAME',
+  'OPENAI_DEFAULT_HAIKU_MODEL_SUPPORTED_CAPABILITIES',
+  'OPENAI_DEFAULT_OPUS_MODEL',
+  'OPENAI_DEFAULT_OPUS_MODEL_DESCRIPTION',
+  'OPENAI_DEFAULT_OPUS_MODEL_NAME',
+  'OPENAI_DEFAULT_OPUS_MODEL_SUPPORTED_CAPABILITIES',
+  'OPENAI_DEFAULT_SONNET_MODEL',
+  'OPENAI_DEFAULT_SONNET_MODEL_DESCRIPTION',
+  'OPENAI_DEFAULT_SONNET_MODEL_NAME',
+  'OPENAI_DEFAULT_SONNET_MODEL_SUPPORTED_CAPABILITIES',
+  'OPENAI_SMALL_FAST_MODEL',
   'ANTHROPIC_SMALL_FAST_MODEL',
   'ANTHROPIC_SMALL_FAST_MODEL_AWS_REGION',
   'CLAUDE_CODE_SUBAGENT_MODEL',
@@ -122,6 +143,19 @@ export const SAFE_ENV_VARS = new Set([
   'ANTHROPIC_DEFAULT_SONNET_MODEL_DESCRIPTION',
   'ANTHROPIC_DEFAULT_SONNET_MODEL_NAME',
   'ANTHROPIC_DEFAULT_SONNET_MODEL_SUPPORTED_CAPABILITIES',
+  // OpenAI provider specific
+  'OPENAI_DEFAULT_HAIKU_MODEL',
+  'OPENAI_DEFAULT_HAIKU_MODEL_DESCRIPTION',
+  'OPENAI_DEFAULT_HAIKU_MODEL_NAME',
+  'OPENAI_DEFAULT_HAIKU_MODEL_SUPPORTED_CAPABILITIES',
+  'OPENAI_DEFAULT_OPUS_MODEL',
+  'OPENAI_DEFAULT_OPUS_MODEL_DESCRIPTION',
+  'OPENAI_DEFAULT_OPUS_MODEL_NAME',
+  'OPENAI_DEFAULT_OPUS_MODEL_SUPPORTED_CAPABILITIES',
+  'OPENAI_DEFAULT_SONNET_MODEL',
+  'OPENAI_DEFAULT_SONNET_MODEL_DESCRIPTION',
+  'OPENAI_DEFAULT_SONNET_MODEL_NAME',
+  'OPENAI_DEFAULT_SONNET_MODEL_SUPPORTED_CAPABILITIES',
   'ANTHROPIC_FOUNDRY_API_KEY',
   'ANTHROPIC_MODEL',
   'ANTHROPIC_SMALL_FAST_MODEL_AWS_REGION',