yingclaw 2.5.19 → 2.5.25

package/README.md

@@ -2,7 +2,7 @@
 
 Claude Code × 国产大模型，一键接入。
 
-支持 DeepSeek、Kimi、阿里云百炼（Qwen）、MiniMax、智谱 GLM、小米 MiMo，也支持自定义 Anthropic 兼容接口，无需梯子即可使用 Claude Code。
+支持 DeepSeek、Kimi、火山方舟 Coding Plan、阿里云百炼（Qwen）、MiniMax、智谱 GLM、小米 MiMo，也支持自定义 Anthropic 兼容接口和自定义 OpenAI 兼容接口，无需梯子即可使用 Claude Code。
 
 ![yingclaw 交互菜单](https://raw.githubusercontent.com/DengShiyingA/yingclaw/main/screenshot.png)
 
@@ -44,35 +44,46 @@ claw code
 ```
 写入 Claude Code 所需的环境变量，之后运行 `claude` 即可。
 
+接入 VS Code Claude Code 扩展：
+```bash
+claw vscode
+```
+写入 Claude Code 共享设置 `~/.claude/settings.json`，并在 VS Code 用户设置中关闭 Claude Code 扩展登录提示。VS Code 已打开时需要执行 `Developer: Reload Window` 或完全重启。
+
 接入 Claude 桌面应用：
 ```bash
 claw desktop
-claw gateway
 ```
 `claw desktop` 会把 Claude Desktop 指向 yingclaw 本机 Gateway，并只暴露 `claude-sonnet-4-6`、`claude-opus-4-7`、`claude-haiku-4-5` 这类 Claude Desktop 可接受的模型名。真实第三方模型仍按 `claw config` 保存的主模型和快速模型转发。
 
-使用 Claude Desktop 时需要保持 `claw gateway` 运行。
+`claw desktop` 会设置 Gateway 登录自动运行；如果自动启动失败，可以手动运行 `claw gateway`。
 
 ## 支持的厂商
 
 | 厂商 | 主模型 | 快速模型 |
 |------|--------|---------|
 | DeepSeek | deepseek-v4-pro[1m] | deepseek-v4-flash[1m] |
-| Kimi / Moonshot | kimi-k2.5 | kimi-k2.5 |
+| Kimi / Moonshot（OpenAI 兼容） | kimi-k2.5 | kimi-k2.5 |
+| 火山方舟 Coding Plan | ark-code-latest | ark-code-latest |
 | 阿里云百炼 | qwen3-max | qwen3.5-plus |
 | MiniMax | MiniMax-M2.7 | MiniMax-M2.7-Turbo |
 | 智谱 GLM | GLM-4.7 | GLM-5-Turbo |
 | 小米 MiMo | mimo-v2.5-pro | mimo-v2.5 |
-| 自定义接口 | 自动获取或手动输入 | — |
+| 自定义 Anthropic 兼容接口 | 自动获取或手动输入 | 手动选择 |
+| 自定义 OpenAI 兼容接口 | 自动获取或手动输入 | 手动选择 |
 
 DeepSeek 的 `[1m]` 后缀是真实 API 模型 ID，表示 100 万 token 上下文窗口（[官方说明](https://api-docs.deepseek.com/zh-cn/quick_start/agent_integrations/claude_code)）。
 
+火山方舟 Coding Plan 使用官方指定的 Anthropic 兼容 Base URL `https://ark.cn-beijing.volces.com/api/coding`，不要替换成普通推理 API Base URL。
+
 ## 命令列表
 
 ```bash
 claw                 # 交互菜单（无参数时自动进入）
 claw config          # 配置 API 连接
 claw code            # 接入 Claude Code 终端
+claw vscode          # 接入 VS Code Claude Code 扩展
+claw vscode-reset    # 恢复 VS Code Claude Code 扩展默认配置
 claw desktop         # 接入 Claude 桌面应用
 claw gateway         # 启动 Claude 桌面应用本机 Gateway
 claw desktop --direct # 高级：直连写入厂商 Gateway URL
@@ -95,7 +106,7 @@ claw setup           # 兼容旧命令：config + code
 |------|---------|---------|
 | macOS | ✅ 写入 `~/.zshrc` | ✅ 自动启动本机 Gateway 并重启 Claude Desktop |
 | Linux / WSL | ✅ 写入 `~/.zshrc` / `~/.bashrc` | — |
-| Windows | ✅ 写入用户级环境变量（需重开终端） | ✅ 写入 `%APPDATA%\Claude-3p\`，并写入登录启动脚本 |
+| Windows | ✅ 写入用户级环境变量（需重开终端） | ✅ 同步写入 `%APPDATA%\Claude-3p\` 和 `%LOCALAPPDATA%\Claude-3p\`，并写入登录启动脚本 |
 
 ## 原理
 
@@ -116,13 +127,23 @@ CLAUDE_CODE_EFFORT_LEVEL
 
 - macOS / Windows：写入 `Claude-3p/configLibrary/` 中的 yingclaw entry
 - Claude Desktop 访问 `http://127.0.0.1:18080/yingclaw`
-- Gateway 再转发到当前保存的 Anthropic 兼容接口
+- Gateway 再转发到当前保存的 Anthropic 兼容接口；如当前为 Kimi 或 OpenAI 兼容接口，则自动转换为 `/v1/chat/completions`
 - macOS 使用 LaunchAgent 登录启动 Gateway，Windows 使用 Startup 目录脚本登录启动 Gateway
-- 终端接入仍直接使用 `ANTHROPIC_*` 环境变量，不受桌面 Gateway 影响
+- Windows 会同时写入 Roaming / Local 两个 Claude-3p 位置，以兼容不同 Claude Desktop 安装方式
+- Anthropic 兼容接口的终端接入仍直接使用 `ANTHROPIC_*` 环境变量；Kimi 和 OpenAI 兼容接口的终端/VS Code/桌面会通过本机 Gateway 转换协议
 
 使用 `inferenceProvider=gateway`、`inferenceGatewayAuthScheme=bearer`，将 Gateway Base URL 指向 yingclaw 本机 Gateway。高级用户可用 `claw desktop --direct` 保留旧式直连写入，但新版 Claude Desktop 可能拒绝非 Claude 模型名。
 
-**自定义接口**需支持 Anthropic `/v1/messages` 格式；工具会根据 Base URL 自动尝试获取模型列表，失败则手动输入。
+**自定义 Anthropic 兼容接口**需支持 Anthropic `/v1/messages` 格式。**自定义 OpenAI 兼容接口**需支持 OpenAI `/v1/models` 和 `/v1/chat/completions` 格式，工具会通过本机 Gateway 转换为 Claude 可用的 Messages 格式。工具会根据 Base URL 自动尝试获取模型列表，失败则手动输入。
+
+**VS Code 接入**（`claw vscode`）写入 Claude Code 官方共享设置：
+
+- 接入时会让你单独选择 VS Code Claude Code 的主模型和快速模型，不影响终端或桌面配置
+- `~/.claude/settings.json` 写入所选主模型，并把已获取的可用聊天模型写入 `availableModels`
+- `env` 中启用 Gateway model discovery，并把所选快速模型写入 `ANTHROPIC_CUSTOM_MODEL_OPTION`
+- VS Code 用户 `settings.json` 写入 `claudeCode.disableLoginPrompt=true`
+- 扩展与 CLI 共享 Claude Code 设置；如果 VS Code 已打开，需重载窗口或重启后生效
+- 如需恢复默认，运行 `claw vscode-reset`，只移除 yingclaw 写入的 Claude Code env 和 VS Code Claude Code 扩展项，保留其它用户设置
 
 ## 卸载
  

package/bin/cli.js

@@ -13,7 +13,9 @@ const {
   validateConfig,
   validateKey,
   normalizeAnthropicBaseUrl,
+  getProviderProtocol,
   resolveFastModel,
+  sortRelatedModelIds,
   buildClaudeEnv,
   PROVIDERS,
   CLAUDE_ENV_KEYS,
@@ -23,7 +25,20 @@ const { execSync, spawn, spawnSync } = require('child_process');
 const pkg = require('../package.json');
 const { getGatewayAutostartStatus, installGatewayAutostart, removeGatewayAutostart } = require('../lib/autostart');
 const { buildMenuStatusLines, buildStatusView } = require('../lib/panel');
-const { buildClaudeInstallCommand, checkNodeEnv, getNodeInstallGuide, getInstallFailureHints } = require('../lib/install');
+const {
+  buildVsCodeOpenCommand,
+  buildVsCodeModelSelectionIds,
+  clearVsCodeIntegration,
+  writeVsCodeIntegration,
+} = require('../lib/vscode');
+const {
+  buildClaudeInstallCommand,
+  buildYingclawUpgradeCommand,
+  buildWindowsYingclawUpgradeScript,
+  checkNodeEnv,
+  getNodeInstallGuide,
+  getInstallFailureHints,
+} = require('../lib/install');
 const { clearClaudeDesktopConfig, isDesktopConfigured, openClaudeDesktop, writeClaudeDesktopConfig } = require('../lib/desktop');
 const {
   DEFAULT_DESKTOP_GATEWAY_PORT,
@@ -35,6 +50,7 @@ const {
   isDesktopChatModel,
 } = require('../lib/gateway');
 const { runDoctorChecks, summarize, STATUS_OK, STATUS_FAIL, STATUS_WARN, STATUS_INFO } = require('../lib/doctor');
+const { normalizeOpenAiBaseUrl } = require('../lib/openai');
 
 const program = new Command();
 
@@ -170,6 +186,12 @@ function getChatModelChoices(models) {
   return models.filter(isDesktopChatModel).map(id => ({ name: id, value: id }));
 }
 
+function sortModelChoicesByRelatedFamily(choices, mainModel) {
+  const order = sortRelatedModelIds(choices.map((choice) => choice.value), mainModel);
+  const rank = new Map(order.map((value, index) => [value, index]));
+  return [...choices].sort((a, b) => (rank.get(a.value) ?? 9999) - (rank.get(b.value) ?? 9999));
+}
+
 function formatFetchedModelCount(chalk, total, chatCount) {
   if (total === chatCount) return chalk.green(`已获取 ${chatCount} 个可用聊天模型`);
   return chalk.green(`已获取 ${total} 个模型，其中 ${chatCount} 个可用于 Claude/桌面聊天`);
@@ -183,14 +205,35 @@ async function promptManualModel(chalk, message, defaultValue) {
   }).then(v => v.trim());
 }
 
-async function configureCustomProvider({ chalk, ora, existingConfig }) {
+function isOpenAiCompatibleConfig(config) {
+  return getProviderProtocol(config) === 'openai';
+}
+
+function ensureGatewayForOpenAiConfig(config) {
+  return isOpenAiCompatibleConfig(config) ? ensureDesktopGatewayConfig(config) : config;
+}
+
+function writeClaudeCodeEnv(config) {
+  const effectiveConfig = buildClaudeEnv(config);
+  return writeEnvToZshrc(
+    effectiveConfig.ANTHROPIC_BASE_URL,
+    effectiveConfig.ANTHROPIC_AUTH_TOKEN,
+    effectiveConfig.ANTHROPIC_MODEL,
+    effectiveConfig.CLAUDE_CODE_SUBAGENT_MODEL,
+  );
+}
+
+async function configureCustomProvider({ chalk, ora, existingConfig, providerKey = 'custom' }) {
+  const provider = PROVIDERS[providerKey];
+  const protocol = provider.protocol || 'anthropic';
+  const sameProvider = existingConfig?.provider === providerKey;
   const baseUrl = await input({
-    message: chalk.cyan('Anthropic Base URL'),
-    default: existingConfig?.provider === 'custom' ? existingConfig.baseUrl : undefined,
+    message: chalk.cyan(protocol === 'openai' ? 'OpenAI Base URL' : 'Anthropic Base URL'),
+    default: sameProvider ? existingConfig.baseUrl : undefined,
     validate: (v) => v.trim().length > 0 && isValidUrl(v.trim()) ? true : '请输入有效 URL',
-  }).then(v => normalizeAnthropicBaseUrl(v.trim()));
+  }).then(v => protocol === 'openai' ? normalizeOpenAiBaseUrl(v.trim()) : normalizeAnthropicBaseUrl(v.trim()));
 
-  let apiKey = existingConfig?.provider === 'custom' ? existingConfig.apiKey : '';
+  let apiKey = sameProvider ? existingConfig.apiKey : '';
   if (apiKey) {
     const keepKey = await confirm({ message: '沿用当前 API Key？', default: true });
     if (!keepKey) apiKey = '';
@@ -206,7 +249,7 @@ async function configureCustomProvider({ chalk, ora, existingConfig }) {
   let modelChoices = [];
   let modelsUrl;
   const fetchSpinner = ora('正在自动获取可用模型...').start();
-  const onlineResult = await fetchModelsFromBaseUrl('custom', apiKey, baseUrl);
+  const onlineResult = await fetchModelsFromBaseUrl(providerKey, apiKey, baseUrl);
   if (onlineResult) {
     modelsUrl = onlineResult.modelsUrl;
     modelChoices = getChatModelChoices(onlineResult.models);
@@ -224,7 +267,11 @@ async function configureCustomProvider({ chalk, ora, existingConfig }) {
   if (modelChoices.length > 0) {
     model = await promptModelFromChoices({ chalk, choices: modelChoices, message: '选择主模型' });
     if (model === '__BACK__') return null;
-    fastModel = await promptModelFromChoices({ chalk, choices: modelChoices, message: '选择快速模型 / Subagent 模型' });
+    fastModel = await promptModelFromChoices({
+      chalk,
+      choices: sortModelChoicesByRelatedFamily(modelChoices, model),
+      message: '选择快速模型 / Subagent 模型',
+    });
     if (fastModel === '__BACK__') return null;
   } else {
     model = await promptManualModel(chalk, '输入主模型名');
@@ -232,8 +279,9 @@ async function configureCustomProvider({ chalk, ora, existingConfig }) {
   }
 
   return {
-    provider: 'custom',
-    providerName: '自定义接口',
+    provider: providerKey,
+    providerName: provider.name,
+    protocol,
     baseUrl,
     modelsUrl: modelsUrl || undefined,
     apiKey,
@@ -346,7 +394,7 @@ async function runConfigFlow({ writeCodeEnv = false } = {}) {
       if (providerKey === '__BACK__') return;
       provider = PROVIDERS[providerKey];
       if (provider.custom) {
-        customConfig = await configureCustomProvider({ chalk, ora });
+        customConfig = await configureCustomProvider({ chalk, ora, providerKey });
         if (!customConfig) { step = 'provider'; continue; }
         break;
       }
@@ -400,9 +448,10 @@ async function runConfigFlow({ writeCodeEnv = false } = {}) {
   try {
     const fastModel = customConfig?.fastModel || resolveFastModel(provider, model);
     cfg = customConfig || { provider: providerKey, model, fastModel, apiKey, baseUrl: provider.baseUrl, availableModels };
+    cfg = ensureGatewayForOpenAiConfig(cfg);
     saveConfig(cfg);
     if (writeCodeEnv) {
-      ({ file } = writeEnvToZshrc(cfg.baseUrl, cfg.apiKey, cfg.model, cfg.fastModel));
+      ({ file } = writeClaudeCodeEnv(cfg));
     }
     spinner.succeed(chalk.green(writeCodeEnv ? 'API 连接已保存，Claude Code 终端已接入' : 'API 连接已保存'));
   } catch (e) {
@@ -539,7 +588,7 @@ program
 
     console.log(await getBanner());
 
-    const config = loadConfig();
+    let config = loadConfig();
     if (!config) {
       console.log(chalk.red('\n未配置 API 连接，请先运行: claw config\n'));
       return;
@@ -554,7 +603,9 @@ program
     const spinner = ora('写入 Claude Code 终端环境变量...').start();
     let file;
     try {
-      ({ file } = writeEnvToZshrc(config.baseUrl, config.apiKey, config.model, config.fastModel));
+      const effectiveConfig = ensureGatewayForOpenAiConfig(config);
+      if (effectiveConfig !== config) saveConfig(effectiveConfig);
+      ({ file } = writeClaudeCodeEnv(effectiveConfig));
       spinner.succeed(chalk.green(`Claude Code 终端已接入 → ${file}`));
     } catch (e) {
       spinner.fail(chalk.red(`写入失败: ${e.message}`));
@@ -562,10 +613,11 @@ program
     }
 
     console.log(chalk.dim(getStorageHint(file)));
+    const displayedConfig = ensureGatewayForOpenAiConfig(config);
     console.log(boxen(
       chalk.bold('Claude Code 终端已接入\n\n') +
-      chalk.dim('Base URL  ') + chalk.cyan(config.baseUrl) + '\n' +
-      chalk.dim('模型      ') + chalk.yellow(config.model) + '\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' +
       chalk.dim(getActivationHint(file)),
       { padding: { top: 0, bottom: 0, left: 2, right: 2 }, borderStyle: 'round', borderColor: 'green', margin: { top: 1, bottom: 1 } }
@@ -613,6 +665,119 @@ program
     }
   });
 
+program
+  .command('vscode')
+  .description('接入 VS Code Claude Code 扩展')
+  .option('--terminal', '让 Claude Code 扩展默认使用终端模式')
+  .action(async (options) => {
+    const chalk = (await import('chalk')).default;
+    const ora = (await import('ora')).default;
+    const boxen = (await import('boxen')).default;
+
+    console.log(await getBanner());
+
+    const config = loadConfig();
+    if (!config) {
+      console.log(chalk.red('\n未配置 API 连接，请先运行: claw config\n'));
+      return;
+    }
+    const configProblem = getConfigValidationMessage(config);
+    if (configProblem) {
+      console.log(chalk.red(`\n配置无效：${configProblem}`));
+      console.log(chalk.dim('请运行 claw config 重新配置。\n'));
+      return;
+    }
+
+    let effectiveConfig = ensureGatewayForOpenAiConfig(config);
+    if (effectiveConfig !== config) saveConfig(effectiveConfig);
+
+    const vscodeModelChoices = getChatModelChoices(buildVsCodeModelSelectionIds(effectiveConfig));
+    const vscodeModel = await promptModelFromChoices({
+      chalk,
+      choices: vscodeModelChoices,
+      message: '选择 VS Code Claude Code 主模型',
+      allowManual: true,
+    });
+    if (vscodeModel === '__BACK__') return;
+
+    const vscodeFastModel = await promptModelFromChoices({
+      chalk,
+      choices: sortModelChoicesByRelatedFamily(vscodeModelChoices, vscodeModel),
+      message: '选择 VS Code Claude Code 快速模型 / 备用模型',
+      allowManual: true,
+    });
+    if (vscodeFastModel === '__BACK__') return;
+
+    const vscodeConfig = {
+      ...config,
+      ...effectiveConfig,
+      vscodeModel,
+      vscodeFastModel,
+    };
+
+    const spinner = ora('写入 VS Code Claude Code 配置...').start();
+    let result;
+    try {
+      result = writeVsCodeIntegration(vscodeConfig, options.terminal ? { useTerminal: true } : {});
+      spinner.succeed(chalk.green('VS Code Claude Code 已接入'));
+    } catch (e) {
+      spinner.fail(chalk.red(`写入失败: ${e.message}`));
+      return;
+    }
+
+    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' +
+      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 } }
+    ));
+
+    const shouldOpen = await confirm({ message: '是否现在打开 Claude Code 的 VS Code 面板？', default: false });
+    if (shouldOpen) {
+      const openCommand = buildVsCodeOpenCommand(process.platform);
+      spawnSync(openCommand.command, openCommand.args, { stdio: 'ignore', windowsHide: true });
+    }
+  });
+
+program
+  .command('vscode-reset')
+  .description('恢复 VS Code Claude Code 扩展默认配置')
+  .action(async () => {
+    const chalk = (await import('chalk')).default;
+    const ora = (await import('ora')).default;
+    const boxen = (await import('boxen')).default;
+
+    console.log(await getBanner());
+
+    const yes = await confirm({
+      message: chalk.red('确定要恢复 VS Code Claude Code 扩展默认配置吗？API 连接、终端和桌面配置不会被清除'),
+      default: false,
+    });
+    if (!yes) {
+      console.log(chalk.dim('已取消'));
+      return;
+    }
+
+    const spinner = ora('正在恢复 VS Code Claude Code 默认配置...').start();
+    const result = clearVsCodeIntegration();
+
+    if (result.result === 'updated') {
+      spinner.succeed(chalk.green('VS Code Claude Code 已恢复默认'));
+      console.log(boxen(
+        chalk.bold('已清除以下 VS Code / Claude Code 扩展配置：\n\n') +
+        result.files.map(f => chalk.cyan('  • ' + f)).join('\n') +
+        '\n\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 } }
+      ));
+    } else {
+      spinner.warn(chalk.yellow('没有找到 VS Code Claude Code 的 yingclaw 配置，无需恢复'));
+    }
+  });
+
 program
   .command('switch')
   .description('快速切换模型（只更新 API 连接）')
@@ -645,14 +810,15 @@ program
 
     const provider = PROVIDERS[providerKey];
     if (provider.custom) {
-      const customConfig = await configureCustomProvider({ chalk, ora, existingConfig: config });
+      const customConfig = await configureCustomProvider({ chalk, ora, existingConfig: config, providerKey });
       if (!customConfig) return;
 
       const spinner = ora('切换中...').start();
-      saveConfig(customConfig);
-      spinner.succeed(chalk.green(`API 连接已切换至 ${customConfig.providerName} · ${customConfig.model}`));
+      const savedConfig = ensureGatewayForOpenAiConfig(customConfig);
+      saveConfig(savedConfig);
+      spinner.succeed(chalk.green(`API 连接已切换至 ${savedConfig.providerName} · ${savedConfig.model}`));
       console.log(chalk.dim('如需让外部 claude 命令使用新模型，请运行 claw code。'));
-      await offerDesktopSync(chalk, ora, customConfig);
+      await offerDesktopSync(chalk, ora, savedConfig);
       return;
     }
 
@@ -786,6 +952,10 @@ program
       console.log(chalk.yellow('\nClaude 桌面应用 3P 配置目前仅支持 macOS / Windows。\n'));
       return;
     }
+    if (options.direct && isOpenAiCompatibleConfig(config)) {
+      console.log(chalk.yellow('\nOpenAI 兼容接口必须通过本机 Gateway 转换协议，不能使用直连模式。\n'));
+      return;
+    }
 
     let desktopConfig = config;
     if (!options.direct) {
@@ -935,7 +1105,7 @@ program
 
 program
   .command('reset')
-  .description('清除 API 连接、终端环境变量和桌面配置')
+  .description('清除 API 连接、终端环境变量、VS Code 和桌面配置')
   .action(async () => {
     const chalk = (await import('chalk')).default;
     const ora = (await import('ora')).default;
@@ -958,6 +1128,10 @@ program
     if (desktopCleared.result === 'updated') {
       cleared.push(...desktopConfigClearedPaths(desktopCleared));
     }
+    const vscodeCleared = clearVsCodeIntegration();
+    if (vscodeCleared.result === 'updated') {
+      cleared.push(...vscodeCleared.files);
+    }
     const autostartCleared = removeGatewayAutostart();
     if (autostartCleared.result === 'removed' && autostartCleared.file) {
       cleared.push(autostartCleared.file);
@@ -1065,12 +1239,31 @@ program
       ],
     });
 
-    const upgradeArgs = ['install', '-g', 'yingclaw@latest'];
-    if (network === 'cn') upgradeArgs.push('--registry=https://registry.npmmirror.com');
-    const upgradeCmd = { command: 'npm', args: upgradeArgs };
+    const upgradeCmd = buildYingclawUpgradeCommand(network);
+
+    if (process.platform === 'win32') {
+      const fs = require('fs');
+      const os = require('os');
+      const path = require('path');
+      const scriptFile = path.join(os.tmpdir(), `yingclaw-upgrade-${Date.now()}.cmd`);
+      fs.writeFileSync(scriptFile, buildWindowsYingclawUpgradeScript(network), 'utf8');
+      const child = spawn('cmd', ['/c', 'start', '', scriptFile], {
+        detached: true,
+        stdio: 'ignore',
+        windowsHide: false,
+      });
+      if (child && typeof child.unref === 'function') child.unref();
+      console.log(boxen(
+        chalk.bold(`已打开独立更新窗口，准备升级到 v${latest}\n\n`) +
+        chalk.dim('Windows 会锁定当前正在运行的包目录，所以更新会在当前 claw 退出后执行。\n') +
+        chalk.dim('更新完成后重新运行 ') + chalk.cyan('claw'),
+        { padding: { top: 0, bottom: 0, left: 2, right: 2 }, borderStyle: 'round', borderColor: 'green', margin: { top: 1, bottom: 1 } }
+      ));
+      process.exit(0);
+    }
 
     console.log(chalk.dim('\n升级中...\n'));
-    const result = spawnSync(upgradeCmd.command, upgradeCmd.args, { stdio: 'inherit', shell: process.platform === 'win32' });
+    const result = spawnSync(upgradeCmd.command, upgradeCmd.args, { stdio: 'inherit' });
 
     if (result.status === 0) {
       console.log(boxen(
@@ -1105,11 +1298,12 @@ async function renderStatusBar(apiStatus) {
     const statusLines = buildMenuStatusLines(view, { apiStatus, claudeInstalled, platform: process.platform });
     cfgPart = statusLines.map((line, index) => {
       if (index === 0) return line.replace('API 正常', chalk.green('API 正常')).replace('API Key 无效', chalk.red('API Key 无效')).replace('网络/服务异常', chalk.yellow('网络/服务异常'));
-      if (line.startsWith('环境变量未生效')) return chalk.yellow(line);
+      if (line.startsWith('终端未生效')) return chalk.yellow(line);
       if (line.startsWith('旧模型名')) return chalk.yellow(line);
+      if (line.startsWith('快速模型跨系列')) return chalk.yellow(line);
       if (line.startsWith('Desktop Gateway 未运行')) return chalk.yellow(line);
       if (line.startsWith('Desktop Gateway 已运行')) return chalk.green(line);
-      if (line.startsWith('主模型')) return line.replace(view.mainModel, chalk.yellow(view.mainModel)).replace(view.fastModel, chalk.yellow(view.fastModel));
+      if (line.startsWith('模型')) return line.replace(view.mainModel, chalk.yellow(view.mainModel)).replace(view.fastModel, chalk.yellow(view.fastModel));
       return line;
     }).join('\n  ');
   } else {
@@ -1172,6 +1366,7 @@ async function runAdvancedMenu(chalk, hasConfig) {
       { name: '🩺 诊断（一键自检并给出修复建议）', value: 'doctor' },
       { name: '🔁 重新检测 API', value: 'recheck', disabled: !hasConfig && ADVANCED_DISABLED_HINT },
       { name: '↩️  恢复 Claude Code 终端默认', value: 'code-reset' },
+      { name: '↩️  恢复 VS Code Claude Code 默认', value: 'vscode-reset' },
       { name: '↩️  恢复 Claude 桌面默认', value: 'desktop-reset' },
       { name: '🗑  清除所有 yingclaw 配置', value: 'reset' },
       { name: '⬆️  检查更新', value: 'update' },
@@ -1227,6 +1422,7 @@ async function runMenu() {
         { name: config ? '🔑 重新配置 API 连接' : '🔑 配置 API 连接', value: 'config' },
         { name: '🔄 切换厂商或模型', value: 'switch', disabled: disabledHint },
         { name: '💻 接入 Claude Code 终端', value: 'code', disabled: disabledHint },
+        { name: '🧩 接入 VS Code Claude Code 扩展', value: 'vscode', disabled: disabledHint },
         { name: '🖥  接入 Claude 桌面应用', value: 'desktop', disabled: disabledHint },
         { name: '📊 查看当前配置', value: 'status', disabled: !config && '需先配置 API 连接' },
         { name: '🛠  高级 ›', value: 'advanced' },
@@ -1250,8 +1446,13 @@ async function runMenu() {
     }
 
     if (resolvedAction === 'launch') {
-      const cfg = loadConfig();
+      let cfg = loadConfig();
       if (!cfg || getConfigValidationMessage(cfg)) continue;
+      const effectiveConfig = ensureGatewayForOpenAiConfig(cfg);
+      if (effectiveConfig !== cfg) {
+        saveConfig(effectiveConfig);
+        cfg = effectiveConfig;
+      }
       await new Promise((resolve) => {
         const child = spawn('claude', [], {
           stdio: 'inherit',
@@ -1271,7 +1472,9 @@ async function runMenu() {
       install: 'install-claude',
       config: 'config',
       code: 'code',
+      vscode: 'vscode',
       'code-reset': 'code-reset',
+      'vscode-reset': 'vscode-reset',
       switch: 'switch',
       desktop: 'desktop',
       'desktop-reset': 'desktop-reset',
@@ -1289,7 +1492,7 @@ async function runMenu() {
     });
 
     // 改 config 的命令需要刷新缓存
-    if (['config', 'switch', 'reset', 'code-reset', 'desktop-reset'].includes(resolvedAction)) {
+    if (['config', 'switch', 'reset', 'code-reset', 'vscode-reset', 'desktop-reset', 'vscode'].includes(resolvedAction)) {
       lastCheckResult = undefined;
       lastCheckedHash = null;
     }

package/index.js

@@ -1,7 +1,10 @@
 module.exports = {
   ...require('./lib/config'),
+  ...require('./lib/autostart'),
   ...require('./lib/desktop'),
   ...require('./lib/gateway'),
   ...require('./lib/install'),
+  ...require('./lib/openai'),
   ...require('./lib/panel'),
+  ...require('./lib/vscode'),
 };