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

.github/workflows/update-contributors.yml

@@ -0,0 +1,31 @@
+name: Update Contributors
+
+on:
+  push:
+    branches:
+      - main
+  schedule:
+    - cron: '0 0 * * *'  # 每天更新一次
+
+permissions:
+  contents: write
+
+jobs:
+  update:
+    runs-on: ubuntu-latest
+    steps:
+      - uses: actions/checkout@v4
+        with:
+          token: ${{ secrets.GITHUB_TOKEN }}
+
+      - uses: jaywcjlove/github-action-contributors@main
+        with:
+          token: ${{ secrets.GITHUB_TOKEN }}
+          output: "contributors.svg"
+          repository: ${{ github.repository }}
+
+      - uses: stefanzweifel/git-auto-commit-action@v5
+        with:
+          commit_message: "docs: update contributors"
+          file_pattern: "contributors.svg"
+          branch: main

CLAUDE.md

@@ -180,7 +180,38 @@ 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`。
+
+### Gemini 兼容层
+
+通过 `CLAUDE_CODE_USE_GEMINI=1` 环境变量或 `modelType: "gemini"` 设置启用，支持 Google Gemini API。独立的环境变量体系，不与 OpenAI 或 Anthropic 配置混杂。
+
+- **`src/services/api/gemini/`** — client、模型映射、类型定义
+- **`src/utils/model/providers.ts`** — 添加 `'gemini'` provider 类型
+- **`src/utils/managedEnvConstants.ts`** — Gemini 专用的 managed env vars
+
+关键环境变量：
+- `CLAUDE_CODE_USE_GEMINI` - 启用 Gemini provider
+- `GEMINI_API_KEY` - API 密钥（必填）
+- `GEMINI_BASE_URL` - API 端点（可选，默认 `https://generativelanguage.googleapis.com/v1beta`）
+- `GEMINI_MODEL` - 直接指定模型（最高优先级）
+- `GEMINI_DEFAULT_HAIKU_MODEL` / `GEMINI_DEFAULT_SONNET_MODEL` / `GEMINI_DEFAULT_OPUS_MODEL` - 按能力级别映射
+- `GEMINI_DEFAULT_HAIKU_MODEL_NAME` / `DESCRIPTION` / `SUPPORTED_CAPABILITIES` - 显示名称和描述
+- `GEMINI_SMALL_FAST_MODEL` - 快速任务使用的模型（可选）
+
+模型映射优先级（`src/services/api/gemini/modelMapping.ts`）：
+1. `GEMINI_MODEL` - 直接覆盖
+2. `GEMINI_DEFAULT_*_MODEL` - 独立配置（推荐）
+3. `ANTHROPIC_DEFAULT_*_MODEL` - 向后兼容 fallback（已废弃）
+4. 原样返回 Anthropic 模型名
+
+使用示例：
+```bash
+export CLAUDE_CODE_USE_GEMINI=1
+export GEMINI_API_KEY="your-api-key"
+export GEMINI_DEFAULT_SONNET_MODEL="gemini-2.5-flash"
+export GEMINI_DEFAULT_OPUS_MODEL="gemini-2.5-pro"
+```
 
 ### Key Type Files
 

README.md

@@ -127,7 +127,7 @@ TUI (REPL) 模式需要真实终端，无法直接通过 VS Code launch 启动
 ## Contributors
 
 <a href="https://github.com/claude-code-best/claude-code/graphs/contributors">
-  <img src="https://contrib.rocks/image?repo=claude-code-best/claude-code" />
+  <img src="contributors.svg" alt="Contributors" />
 </a>
 
 ## Star History

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,146 @@
+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'
+    case 'gemini':
+      return 'CLAUDE_CODE_USE_GEMINI'
+    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
+    delete process.env.CLAUDE_CODE_USE_GEMINI
+    return {
+      type: 'text',
+      value: 'API provider cleared (will use environment variables).',
+    }
+  }
+
+  // Validate provider
+  const validProviders = [
+    'anthropic',
+    'openai',
+    'gemini',
+    '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.`,
+      }
+    }
+  }
+
+  // Check env vars when switching to gemini (including settings.env)
+  if (arg === 'gemini') {
+    const mergedEnv = getMergedEnv()
+    const hasKey = !!mergedEnv.GEMINI_API_KEY
+    // GEMINI_BASE_URL is optional (has default)
+    if (!hasKey) {
+      updateSettingsForSource('userSettings', { modelType: 'gemini' })
+      return {
+        type: 'text',
+        value: `Switched to Gemini provider.\nWarning: Missing env var: GEMINI_API_KEY\nConfigure it via /login or set manually.`,
+      }
+    }
+  }
+
+  // Handle different provider types
+  // - 'anthropic', 'openai', 'gemini' are stored in settings.json (persistent)
+  // - 'bedrock', 'vertex', 'foundry' are env-only (do NOT touch settings.json)
+  if (arg === 'anthropic' || arg === 'openai' || arg === 'gemini') {
+    // 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
+    delete process.env.CLAUDE_CODE_USE_OPENAI
+    delete process.env.CLAUDE_CODE_USE_GEMINI
+    // 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.json
+    delete process.env.CLAUDE_CODE_USE_OPENAI
+    delete process.env.OPENAI_API_KEY
+    delete process.env.OPENAI_BASE_URL
+    delete process.env.CLAUDE_CODE_USE_GEMINI
+    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/gemini/bedrock/vertex/foundry)',
+  aliases: ['api'],
+  argumentHint: '[anthropic|openai|gemini|bedrock|vertex|foundry|unset]',
+  supportsNonInteractive: true,
+  load: () => Promise.resolve({ call }),
+} satisfies Command
+
+export default provider