yingclaw 2.5.20 → 2.5.26

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,
@@ -13,7 +13,9 @@ const {
   validateConfig,
   validateKey,
   normalizeAnthropicBaseUrl,
+  getProviderProtocol,
   resolveFastModel,
+  sortRelatedModelIds,
   buildClaudeEnv,
   PROVIDERS,
   CLAUDE_ENV_KEYS,
@@ -23,6 +25,12 @@ 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 {
+  buildVsCodeOpenCommand,
+  buildVsCodeModelSelectionIds,
+  clearVsCodeIntegration,
+  writeVsCodeIntegration,
+} = require('../lib/vscode');
 const {
   buildClaudeInstallCommand,
   buildYingclawUpgradeCommand,
@@ -42,19 +50,23 @@ 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();
 
+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) {
@@ -155,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;
 
@@ -173,10 +206,121 @@ 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]));
+  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/桌面聊天`);
@@ -190,14 +334,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 = '';
@@ -213,7 +378,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);
@@ -231,7 +396,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, '输入主模型名');
@@ -239,8 +408,9 @@ async function configureCustomProvider({ chalk, ora, existingConfig }) {
   }
 
   return {
-    provider: 'custom',
-    providerName: '自定义接口',
+    provider: providerKey,
+    providerName: provider.name,
+    protocol,
     baseUrl,
     modelsUrl: modelsUrl || undefined,
     apiKey,
@@ -343,17 +513,11 @@ 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 });
+        customConfig = await configureCustomProvider({ chalk, ora, providerKey });
         if (!customConfig) { step = 'provider'; continue; }
         break;
       }
@@ -388,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;
@@ -407,9 +571,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) {
@@ -432,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
@@ -546,7 +710,7 @@ program
 
     console.log(await getBanner());
 
-    const config = loadConfig();
+    let config = loadConfig();
     if (!config) {
       console.log(chalk.red('\n未配置 API 连接，请先运行: claw config\n'));
       return;
@@ -561,7 +725,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}`));
@@ -569,10 +735,11 @@ program
     }
 
     console.log(chalk.dim(getStorageHint(file)));
+    const displayedConfig = effectiveConfig;
     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 } }
@@ -620,6 +787,120 @@ 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 vscodeModelCount = vscodeModelChoices.length;
+    const vscodeModel = await promptModelFromChoices({
+      chalk,
+      choices: vscodeModelChoices,
+      message: `选择 VS Code Claude Code 主模型  共 ${vscodeModelCount} 个可用`,
+      allowManual: true,
+    });
+    if (vscodeModel === '__BACK__') return;
+
+    const vscodeFastModel = await promptModelFromChoices({
+      chalk,
+      choices: sortModelChoicesByRelatedFamily(vscodeModelChoices, vscodeModel),
+      message: `选择 VS Code Claude Code 快速模型 / 备用模型  共 ${vscodeModelCount} 个可用`,
+      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 连接）')
@@ -641,25 +922,19 @@ 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) {
-      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);
       return;
     }
 
@@ -700,12 +975,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;
 
@@ -715,7 +990,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
@@ -793,6 +1067,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) {
@@ -800,6 +1078,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();
@@ -942,7 +1230,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;
@@ -965,6 +1253,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);
@@ -1105,15 +1397,18 @@ program
         { padding: { top: 0, bottom: 0, left: 2, right: 2 }, borderStyle: 'round', borderColor: 'green', margin: { top: 1, bottom: 1 } }
       ));
       process.exit(0);
+    } else if (result.status === null) {
+      console.log(chalk.red('\nnpm 命令未找到，请确认 Node.js 和 npm 已正确安装后手动运行：'));
+      console.log(chalk.cyan('npm install -g yingclaw@latest'));
     } else {
       console.log(chalk.red('\n升级失败，请手动运行：'));
       console.log(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('●');
@@ -1131,11 +1426,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 {
@@ -1198,6 +1494,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' },
@@ -1239,7 +1536,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();
 
@@ -1253,6 +1550,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' },
@@ -1276,8 +1574,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',
@@ -1297,7 +1600,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',
@@ -1315,7 +1620,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;
     }