yingclaw 2.0.7 → 2.0.9

package/bin/cli.js

@@ -16,12 +16,13 @@ const {
   buildClaudeEnv,
   classifyValidationStatus,
   PROVIDERS,
+  CLAUDE_ENV_KEYS,
 } = require('../lib/config');
 const { execSync, spawn, spawnSync } = require('child_process');
 const pkg = require('../package.json');
 const { buildMenuStatusLines, buildStatusView } = require('../lib/panel');
 const { buildClaudeInstallCommand } = require('../lib/install');
-const { clearClaudeDesktopConfig, openClaudeDesktop, writeClaudeDesktopConfig } = require('../lib/desktop');
+const { clearClaudeDesktopConfig, isDesktopConfigured, openClaudeDesktop, writeClaudeDesktopConfig } = require('../lib/desktop');
 
 const program = new Command();
 
@@ -118,6 +119,32 @@ function getSavedConfigHint() {
   return '⚠ API Key 以明文存储在 ~/.clawai.json';
 }
 
+async function offerDesktopSync(chalk, ora, config) {
+  if (!isDesktopConfigured()) return;
+  const syncDesktop = await confirm({ message: 'Claude 桌面应用已配置，是否同步新模型？', default: true });
+  if (!syncDesktop) return;
+  const spinner = ora('同步 Claude 桌面应用配置...').start();
+  try {
+    writeClaudeDesktopConfig(config);
+    spinner.succeed(chalk.green('Claude 桌面应用配置已同步'));
+  } catch (e) {
+    spinner.fail(chalk.red(`桌面配置同步失败: ${e.message}`));
+    return;
+  }
+  if (process.platform === 'darwin') {
+    const shouldOpen = await confirm({ message: '是否重启 Claude 桌面应用使新配置生效？', default: true });
+    if (shouldOpen) {
+      const openSpinner = ora('正在重启 Claude 桌面应用...').start();
+      try {
+        await openClaudeDesktop();
+        openSpinner.succeed(chalk.green('Claude 桌面应用已重启'));
+      } catch (e) {
+        openSpinner.fail(chalk.red(`打开失败: ${e.message}`));
+      }
+    }
+  }
+}
+
 async function promptModelFromChoices({ chalk, choices, message, backLabel = '↩  返回上一步', allowManual = true }) {
   const selected = await select({ loop: false,
     message: chalk.cyan(message),
@@ -513,19 +540,21 @@ program
 
     const spinner = ora('正在恢复 Claude Code 终端默认配置...').start();
     const cleared = clearClaudeCodeEnv();
-    await new Promise(r => setTimeout(r, 300));
 
     if (cleared.length === 0) {
       spinner.warn(chalk.yellow('没有找到 Claude Code 终端环境变量，无需恢复'));
     } else {
       spinner.succeed(chalk.green('Claude Code 终端已恢复默认'));
-      const resetNote = cleared.includes('Windows 用户环境变量')
+      const isWin = cleared.includes('Windows 用户环境变量');
+      const resetNote = isWin
         ? '注：当前终端的环境变量还在内存中，重新打开 PowerShell / CMD 后才彻底清除'
-        : '注：当前终端的环境变量还在内存中，重开终端或 unset 才彻底清除';
+        : '注：当前终端的环境变量还在内存中，重开终端后生效，或在当前终端执行：';
+      const unsetCmd = isWin ? null : `unset ${CLAUDE_ENV_KEYS.join(' ')}`;
       console.log(boxen(
         chalk.bold('已清除以下位置中的 Claude Code 终端环境变量：\n\n') +
         cleared.map(f => chalk.cyan('  • ' + f)).join('\n') +
-        '\n\n' + chalk.dim(resetNote),
+        '\n\n' + chalk.dim(resetNote) +
+        (unsetCmd ? '\n' + chalk.cyan(unsetCmd) : ''),
         { padding: { top: 0, bottom: 0, left: 2, right: 2 }, borderStyle: 'round', borderColor: 'green', margin: { top: 1, bottom: 1 } }
       ));
     }
@@ -568,9 +597,9 @@ program
 
       const spinner = ora('切换中...').start();
       saveConfig(customConfig);
-      await new Promise(r => setTimeout(r, 300));
       spinner.succeed(chalk.green(`API 连接已切换至 ${customConfig.providerName} · ${customConfig.model}`));
       console.log(chalk.dim('如需让外部 claude 命令使用新模型，请运行 claw code。'));
+      await offerDesktopSync(chalk, ora, customConfig);
       return;
     }
 
@@ -616,9 +645,9 @@ program
     const fastModel = resolveFastModel(provider, model);
     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}`));
     console.log(chalk.dim('如需让外部 claude 命令使用新模型，请运行 claw code。'));
+    await offerDesktopSync(chalk, ora, newConfig);
   });
 
 program
@@ -720,16 +749,34 @@ program
 
     const spinner = ora('正在恢复 Claude 桌面应用默认配置...').start();
     const result = clearClaudeDesktopConfig();
-    await new Promise(r => setTimeout(r, 300));
 
     if (result.result === 'updated') {
       spinner.succeed(chalk.green('Claude 桌面应用已恢复默认'));
+      const cleared = [
+        result.dataDir ? require('path').join(result.dataDir, 'configLibrary/') : null,
+        result.file,
+      ].filter(Boolean);
       console.log(boxen(
         chalk.bold('已清除 Claude 桌面应用第三方推理配置：\n\n') +
-        chalk.cyan('  • ' + result.file) +
-        '\n\n' + chalk.dim('如 Claude Desktop 已打开，请完全退出后重新打开。'),
+        cleared.map(f => chalk.cyan('  • ' + f)).join('\n'),
         { padding: { top: 0, bottom: 0, left: 2, right: 2 }, borderStyle: 'round', borderColor: 'green', margin: { top: 1, bottom: 1 } }
       ));
+
+      if (process.platform === 'darwin') {
+        const shouldReopen = await confirm({ message: '是否现在重启 Claude 桌面应用使默认配置生效？', default: true });
+        if (shouldReopen) {
+          const openSpinner = ora('正在重启 Claude 桌面应用...').start();
+          try {
+            await openClaudeDesktop();
+            openSpinner.succeed(chalk.green('Claude 桌面应用已重启（已恢复 1P 模式）'));
+          } catch (e) {
+            openSpinner.fail(chalk.red(`打开失败: ${e.message}`));
+            console.log(chalk.dim('请手动完全退出 Claude 后重新打开。'));
+          }
+        }
+      } else {
+        console.log(chalk.dim('请手动完全退出 Claude 后重新打开。'));
+      }
     } else {
       spinner.warn(chalk.yellow('没有找到 Claude 桌面应用第三方推理配置，无需恢复'));
     }
@@ -758,9 +805,9 @@ program
     const cleared = resetConfig();
     const desktopCleared = clearClaudeDesktopConfig();
     if (desktopCleared.result === 'updated') {
-      cleared.push(desktopCleared.file);
+      if (desktopCleared.dataDir) cleared.push(require('path').join(desktopCleared.dataDir, 'configLibrary/'));
+      if (desktopCleared.file) cleared.push(desktopCleared.file);
     }
-    await new Promise(r => setTimeout(r, 300));
 
     if (cleared.length === 0) {
       spinner.warn(chalk.yellow('没有找到任何配置，无需清除'));

package/lib/config.js

@@ -22,10 +22,10 @@ const PROVIDERS = {
     name: 'DeepSeek',
     baseUrl: 'https://api.deepseek.com/anthropic',
     modelsUrl: 'https://api.deepseek.com/v1/models',
-    fastModel: 'deepseek-v4-flash',
+    fastModel: 'deepseek-v4-flash[1m]',
     models: [
       { name: 'DeepSeek V4 Pro（强力）',   value: 'deepseek-v4-pro[1m]' },
-      { name: 'DeepSeek V4 Flash（快速）', value: 'deepseek-v4-flash' },
+      { name: 'DeepSeek V4 Flash（快速）', value: 'deepseek-v4-flash[1m]' },
     ],
   },
   kimi: {
@@ -41,6 +41,7 @@ const PROVIDERS = {
     name: '阿里云百炼 (Qwen)',
     baseUrl: 'https://dashscope.aliyuncs.com/apps/anthropic',
     modelsUrl: 'https://dashscope.aliyuncs.com/compatible-mode/v1/models',
+    fastModel: 'qwen3.5-plus',
     models: [
       { name: 'Qwen3 Max（强力）',   value: 'qwen3-max' },
       { name: 'Qwen3 Plus（均衡）',  value: 'qwen3-plus' },
@@ -86,8 +87,12 @@ const PROVIDERS = {
 function normalizeModelIds(providerKey, ids) {
   if (providerKey !== 'deepseek') return ids;
 
-  const mapped = ids.map((id) => id === 'deepseek-v4-pro' ? 'deepseek-v4-pro[1m]' : id);
-  const preferred = ['deepseek-v4-pro[1m]', 'deepseek-v4-flash'];
+  const mapped = ids.map((id) => {
+    if (id === 'deepseek-v4-pro') return 'deepseek-v4-pro[1m]';
+    if (id === 'deepseek-v4-flash') return 'deepseek-v4-flash[1m]';
+    return id;
+  });
+  const preferred = ['deepseek-v4-pro[1m]', 'deepseek-v4-flash[1m]'];
   return [
     ...preferred.filter((id) => mapped.includes(id)),
     ...mapped.filter((id) => !preferred.includes(id)),

package/lib/desktop.js

@@ -51,10 +51,6 @@ function readJsonFile(file) {
   }
 }
 
-function normalizeLegacyDesktopModelId(model) {
-  return model.replace(/\[\w+\]$/, '');
-}
-
 function toDesktopModelId(model) {
   return model.startsWith('claude-') ? model : `claude-${model}`;
 }
@@ -63,7 +59,7 @@ function collectModels(config) {
   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).map(normalizeLegacyDesktopModelId).map(toDesktopModelId))];
+  return [...new Set(list.filter(Boolean).map(toDesktopModelId))];
 }
 
 // 按官方 schema：所有值必须是字符串（包括布尔、数组都序列化）
@@ -170,35 +166,46 @@ function writeClaudeDesktopConfig(config, options = {}) {
 }
 
 function clearClaudeDesktopConfig(options = {}) {
-  const file = options.configFile || getClaudeDesktopConfigPath(options);
+  // Derive dataDir only when configFile is not explicitly overridden (to avoid touching real system dirs in tests)
+  const dataDir = options.dataDir || (options.configFile ? null : getClaudeDesktopDataDir(options));
+  const file = options.configFile || (dataDir ? path.join(dataDir, 'claude_desktop_config.json') : null);
+
+  // Clear configLibrary regardless of whether the main config file exists
+  const libResult = clearClaudeDesktopConfigLibrary({ ...options, dataDir });
+
   if (!file || !fs.existsSync(file)) {
-    return { result: 'missing', file };
+    return { result: libResult.result === 'updated' ? 'updated' : 'missing', file, dataDir };
   }
 
   const current = readJsonFile(file);
-  if (!current.enterpriseConfig || typeof current.enterpriseConfig !== 'object') {
-    return { result: 'missing', file };
-  }
+  const next = { ...current };
 
-  const enterpriseConfig = { ...current.enterpriseConfig };
-  for (const key of DESKTOP_GATEWAY_KEYS) {
-    delete enterpriseConfig[key];
+  // Remove legacy enterpriseConfig gateway keys
+  if (next.enterpriseConfig && typeof next.enterpriseConfig === 'object') {
+    const enterpriseConfig = { ...next.enterpriseConfig };
+    for (const key of DESKTOP_GATEWAY_KEYS) {
+      delete enterpriseConfig[key];
+    }
+    if (Object.keys(enterpriseConfig).length > 0) {
+      next.enterpriseConfig = enterpriseConfig;
+    } else {
+      delete next.enterpriseConfig;
+    }
   }
 
-  const next = { ...current };
-  if (Object.keys(enterpriseConfig).length > 0) {
-    next.enterpriseConfig = enterpriseConfig;
-  } else {
-    delete next.enterpriseConfig;
-  }
-  if (Object.keys(next).length === 1 && next.deploymentMode === '3p') {
-    delete next.deploymentMode;
-  }
+  // Always remove deploymentMode when clearing 3P config
+  delete next.deploymentMode;
 
   fs.writeFileSync(file, JSON.stringify(next, null, 2) + '\n');
-  clearClaudeDesktopConfigLibrary({ ...options, dataDir: path.dirname(file) });
 
-  return { result: 'updated', file };
+  return { result: 'updated', file, dataDir };
+}
+
+function isDesktopConfigured(options = {}) {
+  const dir = options.dataDir || getClaudeDesktopDataDir(options);
+  if (!dir) return false;
+  const meta = readJsonFile(path.join(dir, 'configLibrary', '_meta.json'));
+  return typeof meta.appliedId === 'string' && meta.appliedId.length > 0;
 }
 
 function buildClaudeDesktopOpenCommands(platform = process.platform) {
@@ -251,6 +258,7 @@ module.exports = {
   clearClaudeDesktopConfig,
   getClaudeDesktopConfigPath,
   getClaudeDesktopDataDir,
+  isDesktopConfigured,
   openClaudeDesktop,
   writeClaudeDesktopConfig,
   CLAUDE_DESKTOP_LABEL,

package/package.json

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