yingclaw 1.8.1 → 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}`));

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,9 +126,10 @@ function clearClaudeDesktopConfig(options = {}) {
 
 function buildClaudeDesktopOpenCommands(platform = process.platform) {
   if (platform !== 'darwin') return null;
-  // 先 quit 再 open：避免已运行的实例缓存了旧配置
+  // 先 graceful quit，再 force kill 兜底，最后 open
   return [
-    { command: 'osascript', args: ['-e', 'tell application "Claude" to quit'], optional: true },
+    { 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'] },
   ];
 }
@@ -138,18 +144,15 @@ async function openClaudeDesktop(options = {}) {
   if (!commands) return { result: 'unsupported' };
 
   const runner = options.runner || spawnSync;
-  const waitMs = options.waitMs ?? 700;
+  const isMocked = options.runner !== undefined;
 
-  for (let i = 0; i < commands.length; i++) {
-    const { command, args, optional } = commands[i];
+  for (const { command, args, optional, waitAfter } of commands) {
     const result = runner(command, args, { stdio: 'ignore', windowsHide: true });
-    // optional 命令失败（比如 Claude 没在运行）不报错
     if (result.status !== 0 && !optional) {
       throw new Error('Claude 桌面应用打开失败');
     }
-    // quit 后等一下再 open，给系统清理资源的时间
-    if (i === 0 && commands.length > 1 && options.runner === undefined) {
-      await sleep(waitMs);
+    if (waitAfter && !isMocked) {
+      await sleep(waitAfter);
     }
   }
 

package/package.json

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