yingclaw 1.7.12 → 1.8.2

package/bin/cli.js

@@ -196,6 +196,7 @@ async function configureCustomProvider({ chalk, ora, existingConfig }) {
     apiKey,
     model,
     fastModel,
+    availableModels: onlineResult?.models || (model ? [model, fastModel].filter(Boolean) : []),
   };
 }
 
@@ -283,7 +284,7 @@ async function runConfigFlow({ writeCodeEnv = false } = {}) {
     if (!overwrite) return;
   }
 
-  let providerKey, provider, apiKey, model, customConfig;
+  let providerKey, provider, apiKey, model, customConfig, availableModels;
   let step = 'provider';
 
   while (true) {
@@ -319,9 +320,11 @@ async function runConfigFlow({ writeCodeEnv = false } = {}) {
       if (onlineModels && onlineModels.length > 0) {
         fetchSpinner.succeed(chalk.green(`已获取 ${onlineModels.length} 个可用模型`));
         modelChoices = onlineModels.map(id => ({ name: id, value: id }));
+        availableModels = onlineModels;
       } else {
         fetchSpinner.warn(chalk.yellow('无法获取在线列表，使用内置默认列表'));
         modelChoices = provider.models;
+        availableModels = provider.models.map(m => m.value);
       }
 
       const m = await select({ loop: false,
@@ -342,7 +345,7 @@ async function runConfigFlow({ writeCodeEnv = false } = {}) {
   let cfg;
   try {
     const fastModel = customConfig?.fastModel || resolveFastModel(provider, model);
-    cfg = customConfig || { provider: providerKey, model, fastModel, apiKey, baseUrl: provider.baseUrl };
+    cfg = customConfig || { provider: providerKey, model, fastModel, apiKey, baseUrl: provider.baseUrl, availableModels };
     saveConfig(cfg);
     if (writeCodeEnv) {
       ({ file } = writeEnvToZshrc(cfg.baseUrl, cfg.apiKey, cfg.model, cfg.fastModel));
@@ -589,12 +592,15 @@ program
     const fetchSpinner = ora('正在获取可用模型...').start();
     const onlineModels = await fetchModels(providerKey, apiKey);
     let modelChoices;
+    let availableModels;
     if (onlineModels && onlineModels.length > 0) {
       fetchSpinner.succeed(chalk.green(`已获取 ${onlineModels.length} 个可用模型`));
       modelChoices = onlineModels.map(id => ({ name: id, value: id }));
+      availableModels = onlineModels;
     } else {
       fetchSpinner.warn(chalk.yellow('无法获取在线列表，使用内置默认列表'));
       modelChoices = provider.models;
+      availableModels = provider.models.map(m => m.value);
     }
 
     const model = await select({ loop: false,
@@ -608,7 +614,7 @@ program
 
     const spinner = ora('切换中...').start();
     const fastModel = resolveFastModel(provider, model);
-    const newConfig = { ...config, provider: providerKey, model, fastModel, baseUrl: provider.baseUrl, apiKey };
+    const newConfig = { ...config, provider: providerKey, model, fastModel, baseUrl: provider.baseUrl, apiKey, availableModels };
     saveConfig(newConfig);
     await new Promise(r => setTimeout(r, 300));
     spinner.succeed(chalk.green(`API 连接已切换至 ${provider.name} · ${model}`));
@@ -676,8 +682,8 @@ program
       if (shouldOpen) {
         const openSpinner = ora('正在打开 Claude 桌面应用...').start();
         try {
-          openClaudeDesktop();
-          openSpinner.succeed(chalk.green('Claude 桌面应用已打开'));
+          await openClaudeDesktop();
+          openSpinner.succeed(chalk.green('Claude 桌面应用已重新打开（旧实例已退出，新配置生效）'));
         } catch (e) {
           openSpinner.fail(chalk.red(`打开失败: ${e.message}`));
           console.log(chalk.dim(getDesktopOpenHint()));
@@ -802,62 +808,113 @@ async function renderStatusBar(apiStatus) {
   return config ? `  ${cfgPart}` : `  ${claudeIcon} ${claudeText}    ${cfgPart}`;
 }
 
+// 缓存上次校验的 config 哈希和结果，避免每次回菜单都重检
+let lastCheckedHash = null;
+let lastCheckResult; // undefined / true / false / null
+
+function configHash(cfg) {
+  if (!cfg) return null;
+  return JSON.stringify({ p: cfg.provider, b: cfg.baseUrl, k: cfg.apiKey, m: cfg.model });
+}
+
+async function maybeCheckApi(config, forceRecheck) {
+  const hash = configHash(config);
+  if (!forceRecheck && hash === lastCheckedHash && lastCheckResult !== undefined) {
+    return lastCheckResult;
+  }
+  const result = await validateKey(config);
+  lastCheckedHash = hash;
+  lastCheckResult = result;
+  return result;
+}
+
+const ADVANCED_DISABLED_HINT = '需先配置 API 连接';
+
+async function runAdvancedMenu(chalk, hasConfig) {
+  const action = await select({ loop: false,
+    message: chalk.cyan('高级选项'),
+    choices: [
+      { name: '🔁 重新检测 API', value: 'recheck', disabled: !hasConfig && ADVANCED_DISABLED_HINT },
+      { name: '↩️  恢复 Claude Code 终端默认', value: 'code-reset' },
+      { name: '↩️  恢复 Claude 桌面默认', value: 'desktop-reset' },
+      { name: '🗑  清除所有 yingclaw 配置', value: 'reset' },
+      { name: chalk.dim('↩  返回主菜单'), value: '__BACK__' },
+    ],
+  });
+  return action;
+}
+
 async function runMenu() {
   const chalk = (await import('chalk')).default;
   const ora = (await import('ora')).default;
 
+  let forceRecheck = false;
+
   while (true) {
     console.clear();
     console.log(await getBanner());
 
     const config = loadConfig();
-    let apiStatus; // undefined = skipped, true/false/null = checked
     const configProblem = config ? getConfigValidationMessage(config) : null;
+    let apiStatus;
+
     if (config && !configProblem) {
-      const spinner = ora('正在检测 API 是否通畅...').start();
-      apiStatus = await validateKey(config);
-      if (apiStatus === true) spinner.succeed('API 连接正常');
-      else if (apiStatus === false) spinner.fail('API Key 无效或已过期');
-      else spinner.warn('网络异常，无法连接 API');
+      const hash = configHash(config);
+      if (forceRecheck || hash !== lastCheckedHash || lastCheckResult === undefined) {
+        const spinner = ora('正在检测 API...').start();
+        apiStatus = await maybeCheckApi(config, true);
+        if (apiStatus === true) spinner.succeed('API 连接正常');
+        else if (apiStatus === false) spinner.fail('API Key 无效或已过期');
+        else spinner.warn('网络异常，无法连接 API');
+      } else {
+        apiStatus = lastCheckResult;
+      }
+      forceRecheck = false;
     }
 
     if (configProblem) {
       console.log(chalk.red(`  ● 配置无效：${configProblem}`));
-      console.log(chalk.dim('  请先选择“配置 API 连接”重新配置'));
+      console.log(chalk.dim('  请先选择"配置 API 连接"重新配置'));
     } else {
       console.log(await renderStatusBar(apiStatus));
     }
     console.log();
 
+    const disabledHint = (!config || configProblem) && '需先配置 API 连接';
+
     const action = await select({ loop: false,
       message: chalk.cyan('选择操作'),
       choices: [
-        { name: '🤖 启动 Claude Code', value: 'launch', disabled: (!config || configProblem) && '需先配置 API 连接' },
+        { name: '🤖 启动 Claude Code', value: 'launch', disabled: disabledHint },
         { name: '📦 安装 Claude Code', value: 'install' },
         { name: config ? '🔑 重新配置 API 连接' : '🔑 配置 API 连接', value: 'config' },
-        { name: '💻 接入 Claude Code 终端', value: 'code', disabled: (!config || configProblem) && '需先配置 API 连接' },
-        { name: '🔄 切换厂商或模型', value: 'switch', disabled: (!config || configProblem) && '需先配置 API 连接' },
-        { name: '🖥  接入 Claude 桌面应用', value: 'desktop', disabled: (!config || configProblem) && '需先配置 API 连接' },
-        { name: '↩️  恢复 Claude Code 终端默认', value: 'code-reset' },
-        { name: '↩️  恢复 Claude 桌面默认', value: 'desktop-reset' },
+        { name: '🔄 切换厂商或模型', value: 'switch', disabled: disabledHint },
+        { name: '💻 接入 Claude Code 终端', value: 'code', disabled: disabledHint },
+        { name: '🖥  接入 Claude 桌面应用', value: 'desktop', disabled: disabledHint },
         { name: '📊 查看当前配置', value: 'status', disabled: !config && '需先配置 API 连接' },
-        { name: '🔁 重新检测 API', value: 'recheck', disabled: (!config || configProblem) && '需先配置 API 连接' },
-        { name: '🗑  清除所有 yingclaw 配置', value: 'reset' },
+        { name: '🛠  高级 ›', value: 'advanced' },
         { name: '退出', value: 'exit' },
       ],
     });
 
     if (action === 'exit') return;
 
-    if (action === 'recheck') {
-      // 仅刷新菜单，下次循环会重新检测
+    let resolvedAction = action;
+    if (action === 'advanced') {
+      const adv = await runAdvancedMenu(chalk, !!config && !configProblem);
+      if (adv === '__BACK__') continue;
+      resolvedAction = adv;
+    }
+
+    if (resolvedAction === 'recheck') {
+      lastCheckResult = undefined;
+      forceRecheck = true;
       continue;
     }
 
-    if (action === 'launch') {
+    if (resolvedAction === 'launch') {
       const cfg = loadConfig();
       if (!cfg || getConfigValidationMessage(cfg)) continue;
-      // 启动 claude 后等它退出，然后回菜单
       await new Promise((resolve) => {
         const child = spawn('claude', [], {
           stdio: 'inherit',
@@ -875,7 +932,6 @@ async function runMenu() {
     const cmdMap = {
       install: 'install-claude',
       config: 'config',
-      setup: 'setup',
       code: 'code',
       'code-reset': 'code-reset',
       switch: 'switch',
@@ -885,14 +941,19 @@ async function runMenu() {
       reset: 'reset',
     };
 
-    // 执行子命令
+    // 执行子命令（用 spawn 隔离，避免 commander 对 program 的副作用）
     await new Promise((resolve) => {
-      const child = spawn(process.execPath, [__filename, cmdMap[action]], { stdio: 'inherit' });
+      const child = spawn(process.execPath, [__filename, cmdMap[resolvedAction]], { stdio: 'inherit' });
       child.on('exit', resolve);
       child.on('error', resolve);
     });
 
-    // 操作结束，提示返回菜单
+    // 改 config 的命令需要刷新缓存
+    if (['config', 'switch', 'reset', 'code-reset'].includes(resolvedAction)) {
+      lastCheckResult = undefined;
+      lastCheckedHash = null;
+    }
+
     console.log();
     const next = await select({ loop: false,
       message: chalk.cyan('下一步'),

package/lib/desktop.js

@@ -40,12 +40,17 @@ function readJsonFile(file) {
   }
 }
 
-function uniqueModels(model, fastModel) {
-  return [...new Set([model, fastModel].filter(Boolean))];
+function collectModels(config) {
+  // 优先用 config 中保存的全量模型列表（setup/switch 时联网拉取的）
+  // 退化：主模型 + 快速模型
+  const list = Array.isArray(config.availableModels) && config.availableModels.length > 0
+    ? [config.model, config.fastModel, ...config.availableModels]
+    : [config.model, config.fastModel];
+  return [...new Set(list.filter(Boolean))];
 }
 
 function buildClaudeDesktopEnterpriseConfig(config, options = {}) {
-  const models = uniqueModels(config.model, config.fastModel);
+  const models = collectModels(config);
   const baseUrl = normalizeAnthropicBaseUrl(config.baseUrl);
   if (!baseUrl.startsWith('https://')) {
     throw new Error('Claude 桌面应用要求 Gateway Base URL 使用 HTTPS');
@@ -121,24 +126,37 @@ function clearClaudeDesktopConfig(options = {}) {
 
 function buildClaudeDesktopOpenCommands(platform = process.platform) {
   if (platform !== 'darwin') return null;
+  // 先 graceful quit，再 force kill 兜底，最后 open
   return [
+    { command: 'osascript', args: ['-e', 'tell application "Claude" to quit'], optional: true, waitAfter: 600 },
+    { command: 'pkill', args: ['-x', 'Claude'], optional: true, waitAfter: 400 },
     { command: 'open', args: ['-a', 'Claude'] },
   ];
 }
 
-function openClaudeDesktop(options = {}) {
+async function sleep(ms) {
+  return new Promise((r) => setTimeout(r, ms));
+}
+
+async function openClaudeDesktop(options = {}) {
   const platform = options.platform || process.platform;
   const commands = buildClaudeDesktopOpenCommands(platform);
   if (!commands) return { result: 'unsupported' };
 
   const runner = options.runner || spawnSync;
-  const [openCommand] = commands;
-  const result = runner(openCommand.command, openCommand.args, { stdio: 'ignore', windowsHide: true });
-  if (result.status !== 0) {
-    throw new Error('Claude 桌面应用打开失败');
+  const isMocked = options.runner !== undefined;
+
+  for (const { command, args, optional, waitAfter } of commands) {
+    const result = runner(command, args, { stdio: 'ignore', windowsHide: true });
+    if (result.status !== 0 && !optional) {
+      throw new Error('Claude 桌面应用打开失败');
+    }
+    if (waitAfter && !isMocked) {
+      await sleep(waitAfter);
+    }
   }
 
-  return { result: 'opened' };
+  return { result: 'reopened' };
 }
 
 module.exports = {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "yingclaw",
-  "version": "1.7.12",
+  "version": "1.8.2",
   "description": "Claude Code × 国产大模型一键接入：DeepSeek、Kimi、Qwen、MiniMax、GLM、MiMo",
   "main": "index.js",
   "bin": {