yingclaw 2.5.25 → 2.5.27

package/README.md

@@ -2,7 +2,7 @@
 
 Claude Code × 国产大模型，一键接入。
 
-支持 DeepSeek、Kimi、火山方舟 Coding Plan、阿里云百炼（Qwen）、MiniMax、智谱 GLM、小米 MiMo，也支持自定义 Anthropic 兼容接口和自定义 OpenAI 兼容接口，无需梯子即可使用 Claude Code。
+支持 DeepSeek、Kimi、火山方舟 Coding Plan、阿里云百炼（Qwen）、MiniMax、智谱 GLM、小米 MiMo、B.AI、OpenCode Zen/Go，也支持自定义 Anthropic 兼容接口和自定义 OpenAI 兼容接口，无需梯子即可使用 Claude Code。
 
 ![yingclaw 交互菜单](https://raw.githubusercontent.com/DengShiyingA/yingclaw/main/screenshot.png)
 
@@ -69,6 +69,10 @@ claw desktop
 | MiniMax | MiniMax-M2.7 | MiniMax-M2.7-Turbo |
 | 智谱 GLM | GLM-4.7 | GLM-5-Turbo |
 | 小米 MiMo | mimo-v2.5-pro | mimo-v2.5 |
+| B.AI | claude-sonnet-4.6 | claude-haiku-4.5 |
+| OpenCode Zen（按量） | claude-sonnet-4-6 | deepseek-v4-flash-free |
+| OpenCode Go（订阅制） | glm-5.1 | deepseek-v4-flash |
+| OpenRouter | deepseek/deepseek-r1-0528 | deepseek/deepseek-chat-v3-0324 |
 | 自定义 Anthropic 兼容接口 | 自动获取或手动输入 | 手动选择 |
 | 自定义 OpenAI 兼容接口 | 自动获取或手动输入 | 手动选择 |
 

package/bin/cli.js

@@ -1,7 +1,7 @@
 #!/usr/bin/env node
 
 const { Command } = require('commander');
-const { select, input, confirm } = require('@inquirer/prompts');
+const { select, input, confirm, search, checkbox } = require('@inquirer/prompts');
 const {
   loadConfig,
   saveConfig,
@@ -54,16 +54,19 @@ const { normalizeOpenAiBaseUrl } = require('../lib/openai');
 
 const program = new Command();
 
+let _bannerCache;
 async function getBanner() {
+  if (_bannerCache) return _bannerCache;
   const chalk = (await import('chalk')).default;
   const figlet = require('figlet');
   const boxen = (await import('boxen')).default;
   const title = figlet.textSync('yingclaw', { font: 'Small', horizontalLayout: 'fitted' });
   const subtitle = chalk.dim('Claude Code × 国产大模型 一键接入') + '   ' + chalk.cyan(`v${pkg.version}`);
-  return boxen(
+  _bannerCache = boxen(
     chalk.cyan.bold(title) + '\n' + subtitle,
     { padding: { top: 0, bottom: 0, left: 2, right: 2 }, borderStyle: 'round', borderColor: 'cyan', margin: { top: 1, bottom: 0 } }
   );
+  return _bannerCache;
 }
 
 function getConfigValidationMessage(config) {
@@ -164,15 +167,36 @@ async function offerDesktopSync(chalk, ora, config) {
   }
 }
 
+const SEARCH_THRESHOLD = 15;
+
 async function promptModelFromChoices({ chalk, choices, message, backLabel = '↩  返回上一步', allowManual = true }) {
-  const selected = await select({ loop: false,
-    message: chalk.cyan(message),
-    choices: [
-      ...choices,
-      ...(allowManual ? [{ name: '手动输入模型名', value: '__MANUAL__' }] : []),
-      { name: chalk.dim(backLabel), value: '__BACK__' },
-    ],
-  });
+  const extraChoices = [
+    ...(allowManual ? [{ name: '手动输入模型名', value: '__MANUAL__' }] : []),
+    { name: chalk.dim(backLabel), value: '__BACK__' },
+  ];
+
+  let selected;
+  if (choices.length > SEARCH_THRESHOLD) {
+    selected = await search({
+      message: chalk.cyan(message),
+      source: (term) => {
+        const filtered = term
+          ? choices.filter((c) =>
+              String(c.name || '').toLowerCase().includes(term.toLowerCase()) ||
+              String(c.value || '').toLowerCase().includes(term.toLowerCase())
+            )
+          : choices;
+        return term ? [...filtered, ...extraChoices] : [...extraChoices, ...filtered];
+      },
+      pageSize: 15,
+    });
+  } else {
+    selected = await select({ loop: false,
+      message: chalk.cyan(message),
+      choices: [...choices, ...extraChoices],
+    });
+  }
+
   if (selected === '__BACK__') return '__BACK__';
   if (selected !== '__MANUAL__') return selected;
 
@@ -182,10 +206,115 @@ async function promptModelFromChoices({ chalk, choices, message, backLabel = '
   }).then(v => v.trim());
 }
 
+const DESKTOP_MODEL_SELECT_THRESHOLD = 10;
+const DESKTOP_MODEL_MAX = 10;
+
+async function promptDesktopModels(chalk, config, chatModels) {
+  const savedModels = Array.isArray(config.desktopModels)
+    ? config.desktopModels.filter((m) => chatModels.includes(m))
+    : [];
+
+  // If there is a saved selection, ask whether to keep it or reselect
+  if (savedModels.length > 0) {
+    console.log(chalk.dim(`上次选择（${savedModels.length} 个）：${savedModels.join('、')}`));
+    let keep;
+    try {
+      keep = await confirm({ message: chalk.cyan('保留上次选择？'), default: true });
+    } catch (e) {
+      if (e?.name === 'ExitPromptError') return null;
+      throw e;
+    }
+    if (keep) return savedModels;
+  }
+
+  const selected = savedModels.length > 0
+    ? [...savedModels]
+    : [config.model].filter((m) => m && chatModels.includes(m));
+
+  const choices = chatModels.map((m) => ({ name: m, value: m }));
+
+  const DONE = '__DONE__';
+  const BACK = '__BACK__';
+
+  while (true) {
+    if (selected.length > 0) {
+      console.log(chalk.green(`已选 ${selected.length} 个：${selected.join('、')}`));
+    }
+    const remaining = choices.filter((c) => !selected.includes(c.value));
+
+    let picked;
+    try {
+      picked = await search({
+        message: chalk.cyan(selected.length > 0 ? `继续添加桌面模型` : `选择桌面模型`) + chalk.dim(`  共 ${chatModels.length} 个可用`),
+        source: (term) => {
+          const filtered = term
+            ? remaining.filter((c) => c.value.toLowerCase().includes(term.toLowerCase()))
+            : remaining;
+          return [
+            ...(selected.length > 0 ? [{ name: chalk.green('✔  完成'), value: DONE, short: '完成' }] : []),
+            { name: chalk.dim('↩  返回主菜单'), value: BACK, short: '返回主菜单' },
+            ...filtered,
+          ];
+        },
+        pageSize: 15,
+      });
+    } catch (e) {
+      if (e?.name === 'ExitPromptError') return null;
+      throw e;
+    }
+
+    if (picked === BACK) return null;
+    if (picked === DONE) return selected;
+
+    selected.push(picked);
+    if (selected.length >= DESKTOP_MODEL_MAX) return selected;
+  }
+}
+
 function getChatModelChoices(models) {
   return models.filter(isDesktopChatModel).map(id => ({ name: id, value: id }));
 }
 
+const OPENCODE_GROUP_VALUE = '__opencode__';
+
+async function promptProviderKey(chalk, message = '选择 AI 厂商') {
+  const buildMainChoices = () => {
+    const entries = Object.entries(PROVIDERS)
+      .filter(([key]) => key !== 'opencode_zen' && key !== 'opencode_go')
+      .map(([value, p]) => ({ name: p.name, value }));
+    const openrouterIdx = entries.findIndex((c) => c.value === 'openrouter');
+    entries.splice(openrouterIdx, 0, { name: 'OpenCode', value: OPENCODE_GROUP_VALUE });
+    return [...entries, { name: chalk.dim('↩  返回主菜单'), value: '__BACK__' }];
+  };
+
+  while (true) {
+    let mainKey;
+    try {
+      mainKey = await select({ loop: false, message: chalk.cyan(message), choices: buildMainChoices() });
+    } catch (e) {
+      if (e?.name === 'ExitPromptError') return null;
+      throw e;
+    }
+    if (mainKey !== OPENCODE_GROUP_VALUE) return mainKey;
+
+    let sub;
+    try {
+      sub = await select({ loop: false,
+        message: chalk.cyan('选择 OpenCode 服务'),
+        choices: [
+          { name: 'Zen（按量计费）', value: 'opencode_zen' },
+          { name: 'Go（订阅制 $10/月）', value: 'opencode_go' },
+          { name: chalk.dim('↩  返回上一级'), value: '__BACK__' },
+        ],
+      });
+    } catch (e) {
+      if (e?.name === 'ExitPromptError') return null;
+      throw e;
+    }
+    if (sub !== '__BACK__') return sub;
+  }
+}
+
 function sortModelChoicesByRelatedFamily(choices, mainModel) {
   const order = sortRelatedModelIds(choices.map((choice) => choice.value), mainModel);
   const rank = new Map(order.map((value, index) => [value, index]));
@@ -384,14 +513,8 @@ async function runConfigFlow({ writeCodeEnv = false } = {}) {
 
   while (true) {
     if (step === 'provider') {
-      providerKey = await select({ loop: false,
-        message: chalk.cyan('选择 AI 厂商'),
-        choices: [
-          ...Object.entries(PROVIDERS).map(([value, p]) => ({ name: p.name, value })),
-          { name: chalk.dim('↩  返回主菜单'), value: '__BACK__' },
-        ],
-      });
-      if (providerKey === '__BACK__') return;
+      providerKey = await promptProviderKey(chalk);
+      if (!providerKey || providerKey === '__BACK__') return;
       provider = PROVIDERS[providerKey];
       if (provider.custom) {
         customConfig = await configureCustomProvider({ chalk, ora, providerKey });
@@ -429,12 +552,12 @@ async function runConfigFlow({ writeCodeEnv = false } = {}) {
         availableModels = provider.models.map(m => m.value);
       }
 
-      const m = await select({ loop: false,
-        message: chalk.cyan('选择模型'),
-        choices: [
-          ...modelChoices,
-          { name: chalk.dim('↩  返回上一步（重新输入 Key）'), value: '__BACK__' },
-        ],
+      const m = await promptModelFromChoices({
+        chalk,
+        choices: modelChoices,
+        message: '选择模型',
+        backLabel: '↩  返回上一步（重新输入 Key）',
+        allowManual: false,
       });
       if (m === '__BACK__') { step = 'apikey'; continue; }
       model = m;
@@ -474,7 +597,6 @@ async function runConfigFlow({ writeCodeEnv = false } = {}) {
     { padding: { top: 0, bottom: 0, left: 2, right: 2 }, borderStyle: 'round', borderColor: 'green', margin: { top: 1, bottom: 1 } }
   ));
 
-  await offerDesktopSync(chalk, ora, cfg);
 }
 
 program
@@ -613,12 +735,17 @@ program
     }
 
     console.log(chalk.dim(getStorageHint(file)));
-    const displayedConfig = ensureGatewayForOpenAiConfig(config);
+    const displayedConfig = effectiveConfig;
+    const needsGatewayHint = process.platform !== 'darwin' && process.platform !== 'win32'
+      && isOpenAiCompatibleConfig(effectiveConfig);
     console.log(boxen(
       chalk.bold('Claude Code 终端已接入\n\n') +
       chalk.dim('Base URL  ') + chalk.cyan(buildClaudeEnv(displayedConfig).ANTHROPIC_BASE_URL) + '\n' +
       chalk.dim('模型      ') + chalk.yellow(displayedConfig.model) + '\n\n' +
-      chalk.white('需要启动时，在主菜单选择“启动 Claude Code”，或直接输入 ') + chalk.cyan.bold('claude') + '\n' +
+      (needsGatewayHint
+        ? chalk.yellow('注：OpenAI 兼容接口需要本机 Gateway，请在新终端运行 ') + chalk.cyan.bold('claw gateway') + chalk.yellow(' 并保持运行。\n\n')
+        : '') +
+      chalk.white('需要启动时，在主菜单选择”启动 Claude Code”，或直接输入 ') + chalk.cyan.bold('claude') + '\n' +
       chalk.dim(getActivationHint(file)),
       { padding: { top: 0, bottom: 0, left: 2, right: 2 }, borderStyle: 'round', borderColor: 'green', margin: { top: 1, bottom: 1 } }
     ));
@@ -692,10 +819,11 @@ program
     if (effectiveConfig !== config) saveConfig(effectiveConfig);
 
     const vscodeModelChoices = getChatModelChoices(buildVsCodeModelSelectionIds(effectiveConfig));
+    const vscodeModelCount = vscodeModelChoices.length;
     const vscodeModel = await promptModelFromChoices({
       chalk,
       choices: vscodeModelChoices,
-      message: '选择 VS Code Claude Code 主模型',
+      message: `选择 VS Code Claude Code 主模型  共 ${vscodeModelCount} 个可用`,
       allowManual: true,
     });
     if (vscodeModel === '__BACK__') return;
@@ -703,7 +831,7 @@ program
     const vscodeFastModel = await promptModelFromChoices({
       chalk,
       choices: sortModelChoicesByRelatedFamily(vscodeModelChoices, vscodeModel),
-      message: '选择 VS Code Claude Code 快速模型 / 备用模型',
+      message: `选择 VS Code Claude Code 快速模型 / 备用模型  共 ${vscodeModelCount} 个可用`,
       allowManual: true,
     });
     if (vscodeFastModel === '__BACK__') return;
@@ -725,12 +853,17 @@ program
       return;
     }
 
+    const vscodeNeedsGatewayHint = process.platform !== 'darwin' && process.platform !== 'win32'
+      && isOpenAiCompatibleConfig(effectiveConfig);
     console.log(boxen(
       chalk.bold('VS Code Claude Code 扩展已配置\n\n') +
       chalk.dim('共享设置  ') + chalk.cyan(result.claudeSettings.file) + '\n' +
       chalk.dim('VS Code   ') + chalk.cyan(result.vscodeSettings.file) + '\n' +
       chalk.dim('主模型    ') + chalk.yellow(vscodeModel) + '\n' +
       chalk.dim('快速模型  ') + chalk.yellow(vscodeFastModel) + '\n\n' +
+      (vscodeNeedsGatewayHint
+        ? chalk.yellow('注：OpenAI 兼容接口需要本机 Gateway，请在新终端运行 ') + chalk.cyan.bold('claw gateway') + chalk.yellow(' 并保持运行。\n\n')
+        : '') +
       chalk.white('已写入 Claude Code settings.json 的 env，并关闭 VS Code 扩展登录提示。\n') +
       chalk.dim('如果 VS Code 已打开，请执行 Developer: Reload Window 或完全重启 VS Code。'),
       { padding: { top: 0, bottom: 0, left: 2, right: 2 }, borderStyle: 'round', borderColor: 'green', margin: { top: 1, bottom: 1 } }
@@ -799,14 +932,8 @@ program
       return;
     }
 
-    const providerKey = await select({ loop: false,
-      message: chalk.cyan('选择 AI 厂商'),
-      choices: [
-        ...Object.entries(PROVIDERS).map(([value, p]) => ({ name: p.name, value })),
-        { name: chalk.dim('↩  返回主菜单'), value: '__BACK__' },
-      ],
-    });
-    if (providerKey === '__BACK__') return;
+    const providerKey = await promptProviderKey(chalk);
+    if (!providerKey || providerKey === '__BACK__') return;
 
     const provider = PROVIDERS[providerKey];
     if (provider.custom) {
@@ -818,7 +945,6 @@ program
       saveConfig(savedConfig);
       spinner.succeed(chalk.green(`API 连接已切换至 ${savedConfig.providerName} · ${savedConfig.model}`));
       console.log(chalk.dim('如需让外部 claude 命令使用新模型，请运行 claw code。'));
-      await offerDesktopSync(chalk, ora, savedConfig);
       return;
     }
 
@@ -859,12 +985,12 @@ program
       availableModels = provider.models.map(m => m.value);
     }
 
-    const model = await select({ loop: false,
-      message: chalk.cyan('选择模型'),
-      choices: [
-        ...modelChoices,
-        { name: chalk.dim('↩  返回主菜单'), value: '__BACK__' },
-      ],
+    const model = await promptModelFromChoices({
+      chalk,
+      choices: modelChoices,
+      message: '选择模型',
+      backLabel: '↩  返回主菜单',
+      allowManual: false,
     });
     if (model === '__BACK__') return;
 
@@ -874,7 +1000,6 @@ program
     saveConfig(newConfig);
     spinner.succeed(chalk.green(`API 连接已切换至 ${provider.name} · ${model}`));
     console.log(chalk.dim('如需让外部 claude 命令使用新模型，请运行 claw code。'));
-    await offerDesktopSync(chalk, ora, newConfig);
   });
 
 program
@@ -963,6 +1088,16 @@ program
       if (desktopConfig.desktopGatewayKey !== config.desktopGatewayKey || desktopConfig.desktopGatewayPort !== config.desktopGatewayPort) {
         saveConfig(desktopConfig);
       }
+
+      const chatModels = Array.isArray(desktopConfig.availableModels)
+        ? desktopConfig.availableModels.filter(isDesktopChatModel)
+        : [];
+      if (chatModels.length > DESKTOP_MODEL_SELECT_THRESHOLD) {
+        const selectedModels = await promptDesktopModels(chalk, desktopConfig, chatModels);
+        if (!selectedModels) return;
+        saveConfig({ ...desktopConfig, desktopModels: selectedModels });
+        desktopConfig = { ...desktopConfig, availableModels: selectedModels };
+      }
     }
 
     const spinner = ora('写入 Claude 桌面应用配置...').start();
@@ -1273,14 +1408,16 @@ program
       ));
       process.exit(0);
     } else {
-      console.log(chalk.red('\n升级失败，请手动运行：'));
-      console.log(chalk.cyan('npm install -g yingclaw@latest'));
+      const hints = getInstallFailureHints(result, chalk);
+      console.log(chalk.red('\n升级失败'));
+      if (hints.length > 0) console.log(...hints);
+      console.log(chalk.dim('\n手动运行：') + chalk.cyan('npm install -g yingclaw@latest'));
     }
   });
 
-async function renderStatusBar(apiStatus) {
+async function renderStatusBar(apiStatus, config) {
   const chalk = (await import('chalk')).default;
-  const config = loadConfig();
+  if (config === undefined) config = loadConfig();
   const claudeInstalled = isClaudeInstalled();
 
   const claudeIcon = claudeInstalled ? chalk.green('●') : chalk.red('●');
@@ -1408,7 +1545,7 @@ async function runMenu() {
       console.log(chalk.red(`  ● 配置无效：${configProblem}`));
       console.log(chalk.dim('  请先选择"配置 API 连接"重新配置'));
     } else {
-      console.log(await renderStatusBar(apiStatus));
+      console.log(await renderStatusBar(apiStatus, config));
     }
     console.log();
 

package/lib/config.js

@@ -109,6 +109,66 @@ const PROVIDERS = {
       { name: 'MiMo V2 Flash（快速）', value: 'mimo-v2-flash' },
     ],
   },
+  bai: {
+    name: 'B.AI',
+    baseUrl: 'https://api.b.ai',
+    modelsUrl: 'https://api.b.ai/v1/models',
+    fastModel: 'claude-haiku-4.5',
+    models: [
+      { name: 'Claude Sonnet 4.6（推荐）', value: 'claude-sonnet-4.6' },
+      { name: 'Claude Opus 4.7（强力）',   value: 'claude-opus-4.7' },
+      { name: 'Claude Haiku 4.5（快速）',  value: 'claude-haiku-4.5' },
+      { name: 'DeepSeek V4 Pro',           value: 'deepseek-v4-pro' },
+      { name: 'GLM-5.1',                   value: 'glm-5.1' },
+      { name: 'MiniMax M2.7',              value: 'minimax-m2.7' },
+    ],
+  },
+  opencode_zen: {
+    name: 'OpenCode Zen（按量）',
+    protocol: 'openai',
+    baseUrl: 'https://opencode.ai/zen',
+    modelsUrl: 'https://opencode.ai/zen/v1/models',
+    fastModel: 'deepseek-v4-flash-free',
+    models: [
+      { name: 'Claude Sonnet 4.6（推荐）',   value: 'claude-sonnet-4-6' },
+      { name: 'Claude Opus 4.7（强力）',     value: 'claude-opus-4-7' },
+      { name: 'Claude Haiku 4.5（快速）',    value: 'claude-haiku-4-5' },
+      { name: 'GLM 5.1',                     value: 'glm-5.1' },
+      { name: 'MiniMax M2.7',                value: 'minimax-m2.7' },
+      { name: 'Kimi K2.5',                   value: 'kimi-k2.5' },
+      { name: 'DeepSeek V4 Flash（免费）',   value: 'deepseek-v4-flash-free' },
+    ],
+  },
+  opencode_go: {
+    name: 'OpenCode Go（订阅制）',
+    protocol: 'openai',
+    baseUrl: 'https://opencode.ai/zen/go',
+    modelsUrl: 'https://opencode.ai/zen/go/v1/models',
+    fastModel: 'deepseek-v4-flash',
+    models: [
+      { name: 'GLM-5.1',                     value: 'glm-5.1' },
+      { name: 'Kimi K2.5',                   value: 'kimi-k2.5' },
+      { name: 'DeepSeek V4 Pro（强力）',     value: 'deepseek-v4-pro' },
+      { name: 'DeepSeek V4 Flash（快速）',   value: 'deepseek-v4-flash' },
+      { name: 'MiniMax M2.7',                value: 'minimax-m2.7' },
+      { name: 'MiniMax M2.5',                value: 'minimax-m2.5' },
+      { name: 'MiMo V2.5 Pro',               value: 'mimo-v2.5-pro' },
+      { name: 'Qwen3.6 Plus',                value: 'qwen3.6-plus' },
+    ],
+  },
+  openrouter: {
+    name: 'OpenRouter',
+    protocol: 'openai',
+    baseUrl: 'https://openrouter.ai/api/v1',
+    modelsUrl: 'https://openrouter.ai/api/v1/models',
+    fastModel: 'deepseek/deepseek-chat-v3-0324',
+    models: [
+      { name: 'DeepSeek R1 0528（推理）',    value: 'deepseek/deepseek-r1-0528' },
+      { name: 'DeepSeek Chat V3（快速）',    value: 'deepseek/deepseek-chat-v3-0324' },
+      { name: 'Gemini 2.5 Pro（Google）',   value: 'google/gemini-2.5-pro' },
+      { name: 'Claude Sonnet 4.5（Anthropic）', value: 'anthropic/claude-sonnet-4-5' },
+    ],
+  },
   custom: {
     name: '自定义 Anthropic 兼容接口',
     custom: true,
@@ -128,6 +188,8 @@ const PREFERRED_MODEL_IDS = {
   minimax: ['MiniMax-M2.7', 'MiniMax-M2.7-Turbo', 'MiniMax-M2.5'],
   glm: ['GLM-4.7', 'GLM-5.1', 'GLM-5-Turbo', 'GLM-4.5-Air'],
   mimo: ['mimo-v2.5-pro', 'mimo-v2.5', 'mimo-v2-flash'],
+  opencode_zen: ['claude-sonnet-4-6', 'claude-opus-4-7', 'claude-haiku-4-5', 'deepseek-v4-flash-free'],
+  opencode_go: ['glm-5.1', 'deepseek-v4-pro', 'deepseek-v4-flash'],
 };
 
 function sortPreferredModelIds(providerKey, ids) {
@@ -143,7 +205,7 @@ function isChatModelId(model) {
   const value = String(model || '');
   return !/(^|[-_])(tts|voice|voiceclone|voicedesign|speech|audio|image|video|embedding|embed|rerank|moderation)([-_]|$)/i.test(value)
     && !/(^|[-_])(i2v|t2v|t2i|i2i|v2v|video-generation|image-generation)([-_]|$)/i.test(value)
-    && !/(cogview|cogvideo|wanx|^wan\d|seedance|seedream|seededit|vision|hyper3d|hitem3d|seed3d|flux|sdxl|stable-diffusion)/i.test(value);
+    && !/(cogview|cogvideo|wanx|^wan\d|seedance|seedream|seededit|vision|hyper3d|hitem3d|seed3d|flux|sdxl|stable-diffusion|dall-e|whisper)/i.test(value);
 }
 
 function normalizeModelIds(providerKey, ids) {
@@ -185,6 +247,9 @@ function parseModelIdsResponse(providerKey, data) {
   if (providerKey === 'volcengine') {
     return normalizeModelIds(providerKey, ids.filter(isChatModelId));
   }
+  if (providerKey === 'bai') {
+    return normalizeModelIds(providerKey, ids.filter(id => !id.includes('/')));
+  }
   return normalizeModelIds(providerKey, ids);
 }
 
@@ -403,15 +468,17 @@ function runWindowsEnvCommands(commands, runner = spawnSync, { ignoreErrors = fa
 
 function classifyValidationStatus(statusCode) {
   if (statusCode >= 200 && statusCode < 300) return true;
+  if (statusCode === 429) return true; // 限流 = Key 有效
   if (statusCode === 401 || statusCode === 403) return false;
   return null;
 }
 
 // 发一次最小的 /v1/messages 请求验证 Key（true=有效, false=无效, null=网络/服务异常）
 async function validateKey(config, options = {}) {
+  const protocol = getProviderProtocol(config);
   let url;
   try {
-    url = getProviderProtocol(config) === 'openai'
+    url = protocol === 'openai'
       ? openAiChatCompletionsUrl(config.baseUrl)
       : `${normalizeAnthropicBaseUrl(config.baseUrl)}/v1/messages`;
     new URL(url);
@@ -428,20 +495,13 @@ async function validateKey(config, options = {}) {
       headers: {
         'content-type': 'application/json',
         ...buildProviderAuthHeaders(config.provider, config.apiKey),
-        ...(getProviderProtocol(config) === 'anthropic' ? { 'x-api-key': config.apiKey } : {}),
-        ...(getProviderProtocol(config) === 'anthropic' ? { 'anthropic-version': '2023-06-01' } : {}),
+        ...(protocol === 'anthropic' ? { 'x-api-key': config.apiKey, 'anthropic-version': '2023-06-01' } : {}),
       },
-      body: JSON.stringify(getProviderProtocol(config) === 'openai'
-        ? {
-            model: config.model,
-            max_tokens: 1,
-            messages: [{ role: 'user', content: 'hi' }],
-          }
-        : {
-            model: config.model,
-            max_tokens: 1,
-            messages: [{ role: 'user', content: 'hi' }],
-          }),
+      body: JSON.stringify({
+        model: config.model,
+        max_tokens: 16,
+        messages: [{ role: 'user', content: 'hi' }],
+      }),
     });
     return classifyValidationStatus(res.status);
   } catch {

package/lib/doctor.js

@@ -110,7 +110,7 @@ async function runDoctorChecks(options = {}) {
   checks.push({
     name: 'VS Code Claude Code',
     status: vscodeSettings.configured ? STATUS_OK : STATUS_WARN,
-    message: vscodeSettings.configured ? '共享 settings.json 已写入' : `${vscodeSettings.missing.length} 个变量未写入共享设置`,
+    message: vscodeSettings.configured ? 'VS Code 扩展设置已配置' : `${vscodeSettings.missing.length} 项配置未写入 VS Code 扩展设置`,
     fix: vscodeSettings.configured ? null : '运行 claw vscode，并重启 VS Code',
   });
 

package/lib/gateway.js

@@ -74,6 +74,25 @@ function isDesktopChatModel(model) {
   return isChatModelId(model);
 }
 
+function isNativeClaudeModel(modelId) {
+  return /^claude-/i.test(String(modelId || ''));
+}
+
+function stripThinkingFromBody(body) {
+  const cleaned = { ...body };
+  delete cleaned.thinking;
+  if (Array.isArray(cleaned.messages)) {
+    cleaned.messages = cleaned.messages.map((msg) => {
+      if (!Array.isArray(msg.content)) return msg;
+      const content = msg.content.filter(
+        (block) => block.type !== 'thinking' && block.type !== 'redacted_thinking',
+      );
+      return { ...msg, content: content.length > 0 ? content : [{ type: 'text', text: '' }] };
+    });
+  }
+  return cleaned;
+}
+
 function buildDesktopGatewayRoutes(config) {
   const fastModel = config.fastModel || config.model;
   const configuredModels = [config.model, fastModel];
@@ -224,6 +243,10 @@ async function proxyMessages(req, res, config) {
     return;
   }
 
+  if (!isNativeClaudeModel(body.model)) {
+    body = stripThinkingFromBody(body);
+  }
+
   if (getProviderProtocol(config) === 'openai') {
     await proxyOpenAiMessages(res, config, body);
     return;
@@ -306,10 +329,8 @@ async function proxyOpenAiMessages(res, config, body) {
   const state = { model: body.model, started: false, finished: false };
   let buffer = '';
   const decoder = new TextDecoder();
-  for await (const chunk of upstream.body) {
-    buffer += decoder.decode(chunk, { stream: true });
-    const frames = buffer.split(/\n\n/);
-    buffer = frames.pop() || '';
+
+  function processFrames(frames) {
     for (const frame of frames) {
       const dataLine = frame.split(/\n/).find((line) => line.startsWith('data:'));
       if (!dataLine) continue;
@@ -324,6 +345,17 @@ async function proxyOpenAiMessages(res, config, body) {
       res.write(openAiStreamChunkToAnthropicEvents(parsed, state));
     }
   }
+
+  for await (const chunk of upstream.body) {
+    buffer += decoder.decode(chunk, { stream: true });
+    const frames = buffer.split(/\n\n/);
+    buffer = frames.pop() || '';
+    processFrames(frames);
+  }
+  // flush any remaining buffer content not terminated by \n\n
+  if (buffer.trim()) {
+    processFrames([buffer]);
+  }
   if (!state.finished) {
     res.write(openAiStreamChunkToAnthropicEvents({ model: body.model, choices: [{ delta: {}, finish_reason: 'stop' }] }, state));
   }

package/lib/install.js

@@ -1,3 +1,4 @@
+const path = require('path');
 const { execSync } = require('child_process');
 
 function buildClaudeInstallCommand(network) {
@@ -20,9 +21,12 @@ function quoteWindowsBatchArg(value) {
   return `"${String(value).replace(/"/g, '""')}"`;
 }
 
-function buildWindowsYingclawUpgradeScript(network) {
-  const { command, args } = buildYingclawUpgradeCommand(network);
-  const commandLine = [command, ...args].map(quoteWindowsBatchArg).join(' ');
+function buildWindowsYingclawUpgradeScript(network, options = {}) {
+  const nodePath = options.nodePath || process.execPath;
+  // 用绝对路径避免 PATH 里的残留 npm 被优先找到（System32 等位置）
+  const npmCmd = options.npmCmd || path.win32.join(path.win32.dirname(nodePath), 'npm.cmd');
+  const { args } = buildYingclawUpgradeCommand(network);
+  const commandLine = `call ${quoteWindowsBatchArg(npmCmd)} ${args.map(quoteWindowsBatchArg).join(' ')}`;
   return [
     '@echo off',
     'chcp 65001 >nul',

package/lib/openai.js

@@ -44,13 +44,74 @@ function normalizeSystemMessages(system) {
   return [];
 }
 
+function anthropicToolUseToOpenAi(block) {
+  return {
+    id: block.id,
+    type: 'function',
+    function: {
+      name: block.name,
+      arguments: typeof block.input === 'string' ? block.input : JSON.stringify(block.input || {}),
+    },
+  };
+}
+
+function anthropicToolResultContentToText(content) {
+  if (typeof content === 'string') return content;
+  if (Array.isArray(content)) {
+    return content.filter(p => p?.type === 'text').map(p => p.text || '').join('\n');
+  }
+  return '';
+}
+
+function anthropicMessageToOpenAi(message) {
+  const content = message.content;
+  if (message.role === 'assistant') {
+    const textParts = Array.isArray(content)
+      ? content.filter(p => p?.type === 'text').map(p => p.text || '').join('')
+      : typeof content === 'string' ? content : '';
+    const toolUses = Array.isArray(content) ? content.filter(p => p?.type === 'tool_use') : [];
+    const msg = { role: 'assistant', content: textParts || null };
+    if (toolUses.length > 0) {
+      msg.tool_calls = toolUses.map(anthropicToolUseToOpenAi);
+    }
+    if (msg.content === null && !msg.tool_calls) msg.content = '';
+    return [msg];
+  }
+
+  // user role: split tool_result blocks into separate 'tool' messages
+  if (!Array.isArray(content)) {
+    return [{ role: 'user', content: anthropicTextFromContent(content) }];
+  }
+  const toolResults = content.filter(p => p?.type === 'tool_result');
+  const other = content.filter(p => p?.type !== 'tool_result');
+  const messages = toolResults.map(tr => ({
+    role: 'tool',
+    tool_call_id: tr.tool_use_id,
+    content: anthropicToolResultContentToText(tr.content),
+  }));
+  const text = anthropicTextFromContent(other);
+  if (text) messages.push({ role: 'user', content: text });
+  if (messages.length === 0) messages.push({ role: 'user', content: '' });
+  return messages;
+}
+
+function anthropicToolsToOpenAi(tools) {
+  if (!Array.isArray(tools)) return undefined;
+  const converted = tools.map(tool => ({
+    type: 'function',
+    function: {
+      name: tool.name,
+      description: tool.description || '',
+      parameters: tool.input_schema || { type: 'object', properties: {} },
+    },
+  }));
+  return converted.length > 0 ? converted : undefined;
+}
+
 function anthropicToOpenAiChatRequest(body) {
   const messages = [
     ...normalizeSystemMessages(body.system),
-    ...(Array.isArray(body.messages) ? body.messages : []).map((message) => ({
-      role: message.role === 'assistant' ? 'assistant' : 'user',
-      content: anthropicTextFromContent(message.content),
-    })),
+    ...(Array.isArray(body.messages) ? body.messages : []).flatMap(anthropicMessageToOpenAi),
   ];
 
   const request = {
@@ -63,6 +124,8 @@ function anthropicToOpenAiChatRequest(body) {
   if (body.temperature !== undefined) request.temperature = body.temperature;
   if (body.top_p !== undefined) request.top_p = body.top_p;
   if (body.stop_sequences !== undefined) request.stop = body.stop_sequences;
+  const tools = anthropicToolsToOpenAi(body.tools);
+  if (tools) request.tools = tools;
   return request;
 }
 
@@ -73,18 +136,38 @@ function openAiFinishReasonToAnthropic(reason) {
   return reason || 'end_turn';
 }
 
+function openAiToolCallToAnthropic(toolCall) {
+  let input = {};
+  try { input = JSON.parse(toolCall.function?.arguments || '{}'); } catch {}
+  return {
+    type: 'tool_use',
+    id: toolCall.id || `tool_${Date.now()}`,
+    name: toolCall.function?.name || '',
+    input,
+  };
+}
+
 function openAiToAnthropicMessage(body, fallbackModel) {
   const choice = body?.choices?.[0] || {};
-  const content = choice.message?.content ?? choice.text ?? '';
-  const text = Array.isArray(content)
-    ? content.map((part) => part?.text || '').join('')
-    : String(content || '');
+  const message = choice.message || {};
+  const rawContent = message.content ?? choice.text ?? '';
+  const text = Array.isArray(rawContent)
+    ? rawContent.map((part) => part?.text || '').join('')
+    : String(rawContent || '');
+
+  const contentBlocks = [];
+  if (text) contentBlocks.push({ type: 'text', text });
+  if (Array.isArray(message.tool_calls)) {
+    for (const tc of message.tool_calls) contentBlocks.push(openAiToolCallToAnthropic(tc));
+  }
+  if (contentBlocks.length === 0) contentBlocks.push({ type: 'text', text: '' });
+
   return {
     id: body?.id || `msg_${Date.now()}`,
     type: 'message',
     role: 'assistant',
     model: body?.model || fallbackModel,
-    content: [{ type: 'text', text }],
+    content: contentBlocks,
     stop_reason: openAiFinishReasonToAnthropic(choice.finish_reason),
     stop_sequence: null,
     usage: {
@@ -102,8 +185,14 @@ function openAiStreamChunkToAnthropicEvents(chunk, state) {
   const choice = chunk?.choices?.[0] || {};
   const delta = choice.delta || {};
   const events = [];
+
   if (!state.started) {
     state.started = true;
+    // index 0 is always the text block
+    state.textBlockOpen = false;
+    // map tool_call index → anthropic content block index
+    state.toolIndexMap = {};
+    state.nextBlockIndex = 0;
     events.push(anthropicSse('message_start', {
       type: 'message_start',
       message: {
@@ -114,32 +203,85 @@ function openAiStreamChunkToAnthropicEvents(chunk, state) {
         content: [],
         stop_reason: null,
         stop_sequence: null,
-        usage: { input_tokens: 0, output_tokens: 0 },
+        usage: { input_tokens: chunk?.usage?.prompt_tokens ?? 0, output_tokens: 0 },
       },
     }));
-    events.push(anthropicSse('content_block_start', {
-      type: 'content_block_start',
-      index: 0,
-      content_block: { type: 'text', text: '' },
-    }));
   }
+
   if (delta.content) {
+    if (!state.textBlockOpen) {
+      state.textBlockOpen = true;
+      state.textBlockIndex = state.nextBlockIndex++;
+      events.push(anthropicSse('content_block_start', {
+        type: 'content_block_start',
+        index: state.textBlockIndex,
+        content_block: { type: 'text', text: '' },
+      }));
+    }
     events.push(anthropicSse('content_block_delta', {
       type: 'content_block_delta',
-      index: 0,
+      index: state.textBlockIndex,
       delta: { type: 'text_delta', text: delta.content },
     }));
   }
+
+  if (Array.isArray(delta.tool_calls)) {
+    for (const tc of delta.tool_calls) {
+      const tcIdx = tc.index ?? 0;
+      if (!(tcIdx in state.toolIndexMap)) {
+        // close text block first if open
+        if (state.textBlockOpen && !state.textBlockClosed) {
+          state.textBlockClosed = true;
+          events.push(anthropicSse('content_block_stop', { type: 'content_block_stop', index: state.textBlockIndex }));
+        }
+        const blockIndex = state.nextBlockIndex++;
+        state.toolIndexMap[tcIdx] = blockIndex;
+        let input = {};
+        try { if (tc.function?.arguments) input = JSON.parse(tc.function.arguments); } catch {}
+        events.push(anthropicSse('content_block_start', {
+          type: 'content_block_start',
+          index: blockIndex,
+          content_block: {
+            type: 'tool_use',
+            id: tc.id || `tool_${Date.now()}_${tcIdx}`,
+            name: tc.function?.name || '',
+            input,
+          },
+        }));
+      }
+      if (tc.function?.arguments) {
+        events.push(anthropicSse('content_block_delta', {
+          type: 'content_block_delta',
+          index: state.toolIndexMap[tcIdx],
+          delta: { type: 'input_json_delta', partial_json: tc.function.arguments },
+        }));
+      }
+    }
+  }
+
   if (choice.finish_reason) {
     state.finished = true;
-    events.push(anthropicSse('content_block_stop', { type: 'content_block_stop', index: 0 }));
+    // close any open blocks
+    if (state.textBlockOpen && !state.textBlockClosed) {
+      events.push(anthropicSse('content_block_stop', { type: 'content_block_stop', index: state.textBlockIndex }));
+    }
+    for (const blockIndex of Object.values(state.toolIndexMap)) {
+      events.push(anthropicSse('content_block_stop', { type: 'content_block_stop', index: blockIndex }));
+    }
+    // if nothing was opened at all, emit an empty text block
+    if (!state.textBlockOpen && Object.keys(state.toolIndexMap).length === 0) {
+      events.push(anthropicSse('content_block_start', { type: 'content_block_start', index: 0, content_block: { type: 'text', text: '' } }));
+      events.push(anthropicSse('content_block_stop', { type: 'content_block_stop', index: 0 }));
+    }
+    const outputTokens = chunk?.usage?.completion_tokens ?? chunk?.usage?.output_tokens ?? 0;
     events.push(anthropicSse('message_delta', {
       type: 'message_delta',
       delta: { stop_reason: openAiFinishReasonToAnthropic(choice.finish_reason), stop_sequence: null },
-      usage: { output_tokens: 0 },
+      usage: { output_tokens: outputTokens },
     }));
     events.push(anthropicSse('message_stop', { type: 'message_stop' }));
   }
+
   return events.join('');
 }
 

package/lib/panel.js

@@ -94,7 +94,9 @@ function buildMenuStatusLines(view, options = {}) {
   } else if (options.platform === 'win32') {
     lines.push('终端未生效：重新打开 PowerShell / CMD');
   } else {
-    lines.push('终端未生效：source ~/.zshrc 或重开终端');
+    const shell = options.shell || process.env.SHELL || '';
+    const rcFile = shell.includes('bash') ? '~/.bashrc' : '~/.zshrc';
+    lines.push(`终端未生效：source ${rcFile} 或重开终端`);
   }
 
   const modelCountText = view.availableModelCount ? ` · 可用 ${view.availableModelCount}` : '';

package/lib/vscode.js

@@ -2,7 +2,7 @@ const fs = require('fs');
 const os = require('os');
 const path = require('path');
 const { buildClaudeEnv, resolveFastModel, PROVIDERS, CLEAR_CLAUDE_ENV_KEYS } = require('./config');
-const { isDesktopChatModel } = require('./gateway');
+const { isDesktopChatModel, buildDesktopGatewayRoutes, buildDesktopGatewayUrl } = require('./gateway');
 
 const CLAUDE_CODE_SETTINGS_SCHEMA = 'https://json.schemastore.org/claude-code-settings.json';
 const VSCODE_CLAUDE_OPEN_URI = 'vscode://anthropic.claude-code/open';
@@ -43,14 +43,10 @@ function getVsCodeUserSettingsPath(options = {}) {
 }
 
 function buildClaudeCodeSettingsPatch(config) {
-  const env = buildVsCodeClaudeEnv(config);
   const availableModels = buildVsCodeAvailableModels(config);
-  const model = config.vscodeModel || config.model;
   return {
     $schema: CLAUDE_CODE_SETTINGS_SCHEMA,
-    model: availableModels.includes(model) ? model : availableModels[0],
     availableModels,
-    env,
   };
 }
 
@@ -62,7 +58,7 @@ function buildVsCodeClaudeEnv(config) {
   const env = {
     ANTHROPIC_BASE_URL: claudeEnv.ANTHROPIC_BASE_URL,
     ANTHROPIC_AUTH_TOKEN: claudeEnv.ANTHROPIC_AUTH_TOKEN,
-    CLAUDE_CODE_ENABLE_GATEWAY_MODEL_DISCOVERY: '1',
+    ANTHROPIC_MODEL: claudeEnv.ANTHROPIC_MODEL,
     CLAUDE_CODE_SUBAGENT_MODEL: resolvedFastModel,
     CLAUDE_CODE_EFFORT_LEVEL: 'max',
   };
@@ -91,32 +87,47 @@ function writeClaudeCodeSettings(config, options = {}) {
   const file = getClaudeCodeSettingsPath(options);
   const current = readJsonFile(file);
   const patch = buildClaudeCodeSettingsPatch(config);
+
+  // Clean up any yingclaw env vars previously written to settings.json
   const nextEnv = { ...(current.env && typeof current.env === 'object' ? current.env : {}) };
   for (const key of CLEAR_CLAUDE_ENV_KEYS) {
     delete nextEnv[key];
   }
-  Object.assign(nextEnv, patch.env);
 
   const next = {
     ...current,
     $schema: current.$schema || patch.$schema,
-    model: patch.model,
     availableModels: patch.availableModels,
-    env: nextEnv,
   };
+
+  // Remove model from settings.json — it would also affect the terminal
+  delete next.model;
+
+  if (Object.keys(nextEnv).length > 0) {
+    next.env = nextEnv;
+  } else {
+    delete next.env;
+  }
+
   writeJsonFile(file, next);
   try {
     fs.chmodSync(file, 0o600);
   } catch {}
-  return { result: 'updated', file, env: patch.env };
+  return { result: 'updated', file };
 }
 
-function writeVsCodeExtensionSettings(options = {}) {
+function buildVsCodeExtensionEnvVars(config) {
+  const env = buildVsCodeClaudeEnv(config);
+  return Object.entries(env).map(([name, value]) => ({ name, value: String(value) }));
+}
+
+function writeVsCodeExtensionSettings(config, options = {}) {
   const file = getVsCodeUserSettingsPath(options);
   const current = readJsonFile(file);
   const next = {
     ...current,
     'claudeCode.disableLoginPrompt': true,
+    'claudeCode.environmentVariables': buildVsCodeExtensionEnvVars(config),
   };
   if (options.useTerminal === true || options.useTerminal === false) {
     next['claudeCode.useTerminal'] = options.useTerminal;
@@ -127,7 +138,7 @@ function writeVsCodeExtensionSettings(options = {}) {
 
 function writeVsCodeIntegration(config, options = {}) {
   const claudeSettings = writeClaudeCodeSettings(config, options);
-  const vscodeSettings = writeVsCodeExtensionSettings(options);
+  const vscodeSettings = writeVsCodeExtensionSettings(config, options);
   return {
     result: 'updated',
     files: [claudeSettings.file, vscodeSettings.file],
@@ -178,7 +189,7 @@ function clearVsCodeExtensionSettings(options = {}) {
   const current = readJsonFile(file);
   const next = { ...current };
   let changed = false;
-  for (const key of ['claudeCode.disableLoginPrompt', 'claudeCode.useTerminal']) {
+  for (const key of ['claudeCode.disableLoginPrompt', 'claudeCode.useTerminal', 'claudeCode.environmentVariables']) {
     if (Object.prototype.hasOwnProperty.call(next, key)) {
       delete next[key];
       changed = true;
@@ -206,21 +217,33 @@ function clearVsCodeIntegration(options = {}) {
 }
 
 function checkClaudeCodeSettingsEnv(config, options = {}) {
-  const file = getClaudeCodeSettingsPath(options);
-  const current = readJsonFile(file);
-  const env = current.env && typeof current.env === 'object' ? current.env : {};
-  const expected = buildVsCodeClaudeEnv(config);
-  const missing = Object.entries(expected)
-    .filter(([key, value]) => env[key] !== value)
-    .map(([key]) => key);
+  const settingsFile = getClaudeCodeSettingsPath(options);
+  const vsCodeFile = getVsCodeUserSettingsPath(options);
+  const settings = readJsonFile(settingsFile);
+  const vsCodeSettings = readJsonFile(vsCodeFile);
+  const missing = [];
+
+  // Check availableModels in settings.json
   const expectedModels = buildVsCodeAvailableModels(config);
-  const expectedModel = expectedModels.includes(config.model) ? config.model : expectedModels[0];
-  if (current.model !== expectedModel) missing.push('model');
-  if (!Array.isArray(current.availableModels) || current.availableModels.join(',') !== expectedModels.join(',')) {
+  if (!Array.isArray(settings.availableModels) || settings.availableModels.join(',') !== expectedModels.join(',')) {
     missing.push('availableModels');
   }
+
+  // Check claudeCode.environmentVariables in VS Code extension settings
+  const expectedEnv = buildVsCodeClaudeEnv(config);
+  const actualEnvArray = vsCodeSettings['claudeCode.environmentVariables'];
+  if (!Array.isArray(actualEnvArray)) {
+    missing.push('claudeCode.environmentVariables');
+  } else {
+    const actualEnvMap = {};
+    for (const { name, value } of actualEnvArray) actualEnvMap[name] = value;
+    for (const [key, value] of Object.entries(expectedEnv)) {
+      if (actualEnvMap[key] !== String(value)) missing.push(key);
+    }
+  }
+
   return {
-    file,
+    file: settingsFile,
     configured: missing.length === 0,
     missing,
   };
@@ -242,6 +265,7 @@ module.exports = {
   buildClaudeCodeSettingsPatch,
   buildVsCodeAvailableModels,
   buildVsCodeClaudeEnv,
+  buildVsCodeExtensionEnvVars,
   buildVsCodeModelSelectionIds,
   buildVsCodeOpenCommand,
   checkClaudeCodeSettingsEnv,

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "yingclaw",
-  "version": "2.5.25",
+  "version": "2.5.27",
   "description": "Claude Code × 国产大模型一键接入：DeepSeek、Kimi、火山方舟、Qwen、MiniMax、GLM、MiMo、自定义接口",
   "main": "index.js",
   "bin": {