yingclaw 2.1.7 → 2.2.0

package/bin/cli.js

@@ -79,13 +79,20 @@ function getConfigValidationMessage(config) {
   return validation.valid ? null : validation.message;
 }
 
+let _claudeInstalledCache;
 function isClaudeInstalled() {
+  if (_claudeInstalledCache !== undefined) return _claudeInstalledCache;
   try {
     execSync('claude --version', { stdio: 'pipe' });
-    return true;
+    _claudeInstalledCache = true;
   } catch {
-    return false;
+    _claudeInstalledCache = false;
   }
+  return _claudeInstalledCache;
+}
+
+function invalidateClaudeInstalledCache() {
+  _claudeInstalledCache = undefined;
 }
 
 function isValidUrl(value) {
@@ -131,7 +138,7 @@ async function offerDesktopSync(chalk, ora, config) {
     spinner.fail(chalk.red(`桌面配置同步失败: ${e.message}`));
     return;
   }
-  if (process.platform === 'darwin') {
+  if (process.platform === 'darwin' || process.platform === 'win32') {
     const shouldOpen = await confirm({ message: '是否重启 Claude 桌面应用使新配置生效？', default: true });
     if (shouldOpen) {
       const openSpinner = ora('正在重启 Claude 桌面应用...').start();
@@ -139,7 +146,13 @@ async function offerDesktopSync(chalk, ora, config) {
         await openClaudeDesktop();
         openSpinner.succeed(chalk.green('Claude 桌面应用已重启'));
       } catch (e) {
-        openSpinner.fail(chalk.red(`打开失败: ${e.message}`));
+        openSpinner.fail(chalk.red(`自动重启失败: ${e.message}`));
+        if (process.platform === 'win32') {
+          console.log(chalk.yellow('\n请手动操作（仅关闭窗口不够，进程还在系统托盘）：'));
+          console.log(chalk.dim('  1. 任务栏右下角找 Claude 图标 → 右键 → 退出'));
+          console.log(chalk.dim('  2. 或在任务管理器中结束所有 Claude.exe 进程'));
+          console.log(chalk.dim('  3. 然后重新打开 Claude'));
+        }
       }
     }
   }
@@ -334,6 +347,7 @@ async function runConfigFlow({ writeCodeEnv = false } = {}) {
     } else if (step === 'apikey') {
       const k = await input({
         message: chalk.cyan(`${provider.name} API Key（输入 b 返回上一步）`),
+        default: apiKey || undefined,
         transformer: (v) => v && v !== 'b' ? chalk.dim('•'.repeat(v.length)) : v,
         validate: (v) => v.trim().length > 0 ? true : 'API Key 不能为空',
       });
@@ -397,6 +411,8 @@ async function runConfigFlow({ writeCodeEnv = false } = {}) {
     nextStep,
     { padding: { top: 0, bottom: 0, left: 2, right: 2 }, borderStyle: 'round', borderColor: 'green', margin: { top: 1, bottom: 1 } }
   ));
+
+  await offerDesktopSync(chalk, ora, cfg);
 }
 
 program
@@ -415,7 +431,7 @@ program
     console.log(await getBanner());
 
     try {
-      const ver = execSync('claude --version 2>/dev/null', { encoding: 'utf8' }).trim();
+      const ver = execSync('claude --version', { encoding: 'utf8', stdio: ['ignore', 'pipe', 'ignore'] }).trim();
       console.log(chalk.green(`\n✔ Claude Code 已安装：${ver}\n`));
       const yes = await confirm({ message: '是否重新安装/更新？', default: false });
       if (!yes) return;
@@ -435,8 +451,8 @@ program
 
     console.log(chalk.dim('\n安装中，实时输出：\n'));
 
-    // 实时输出安装日志
-    const result = spawnSync(installCommand.command, installCommand.args, { stdio: 'inherit' });
+    // 实时输出安装日志（Windows 下 npm 是 npm.cmd，需要 shell: true 才能找到）
+    const result = spawnSync(installCommand.command, installCommand.args, { stdio: 'inherit', shell: process.platform === 'win32' });
 
     if (result.status === 0) {
       console.log(chalk.green('\n✔ Claude Code 安装成功！'));
@@ -614,6 +630,8 @@ program
           validate: (v) => v.trim().length > 0 ? true : 'API Key 不能为空',
         });
         apiKey = apiKey.trim();
+      } else {
+        console.log(chalk.yellow('⚠ 沿用旧 Key 通常无法访问新厂商，模型列表可能拉取失败'));
       }
     }
 
@@ -706,16 +724,23 @@ program
       { padding: { top: 0, bottom: 0, left: 2, right: 2 }, borderStyle: 'round', borderColor: 'cyan', margin: { top: 1, bottom: 1 } }
     ));
 
-    if (process.platform === 'darwin') {
-      const shouldOpen = await confirm({ message: '是否现在打开 Claude 桌面应用？', default: true });
+    if (process.platform === 'darwin' || process.platform === 'win32') {
+      const shouldOpen = await confirm({ message: '是否现在重启 Claude 桌面应用？', default: true });
       if (shouldOpen) {
-        const openSpinner = ora('正在打开 Claude 桌面应用...').start();
+        const openSpinner = ora('正在重启 Claude 桌面应用...').start();
         try {
           await openClaudeDesktop();
           openSpinner.succeed(chalk.green('Claude 桌面应用已重新打开（旧实例已退出，新配置生效）'));
         } catch (e) {
-          openSpinner.fail(chalk.red(`打开失败: ${e.message}`));
-          console.log(chalk.dim(getDesktopOpenHint()));
+          openSpinner.fail(chalk.red(`自动重启失败: ${e.message}`));
+          if (process.platform === 'win32') {
+            console.log(chalk.yellow('\n请手动操作（仅关闭窗口不够，进程还在系统托盘）：'));
+            console.log(chalk.dim('  1. 任务栏右下角找 Claude 图标 → 右键 → 退出'));
+            console.log(chalk.dim('  2. 或在任务管理器中结束所有 Claude.exe 进程'));
+            console.log(chalk.dim('  3. 然后重新打开 Claude'));
+          } else {
+            console.log(chalk.dim(getDesktopOpenHint()));
+          }
         }
       }
     } else {
@@ -870,7 +895,7 @@ program
     const upgradeCmd = { command: 'npm', args: upgradeArgs };
 
     console.log(chalk.dim('\n升级中...\n'));
-    const result = spawnSync(upgradeCmd.command, upgradeCmd.args, { stdio: 'inherit' });
+    const result = spawnSync(upgradeCmd.command, upgradeCmd.args, { stdio: 'inherit', shell: process.platform === 'win32' });
 
     if (result.status === 0) {
       console.log(boxen(
@@ -1051,6 +1076,7 @@ async function runMenu() {
         const child = spawn('claude', [], {
           stdio: 'inherit',
           env: { ...process.env, ...buildClaudeEnv(cfg) },
+          shell: process.platform === 'win32',
         });
         child.on('error', () => {
           console.log(chalk.yellow('\nClaude Code 未找到，请先选择"安装 Claude Code"'));
@@ -1086,6 +1112,10 @@ async function runMenu() {
       lastCheckResult = undefined;
       lastCheckedHash = null;
     }
+    // 安装 Claude 后刷新检测缓存
+    if (resolvedAction === 'install') {
+      invalidateClaudeInstalledCache();
+    }
 
     console.log();
     const next = await select({ loop: false,

package/lib/desktop.js

@@ -232,15 +232,26 @@ function isDesktopConfigured(options = {}) {
 }
 
 function buildClaudeDesktopOpenCommands(platform = process.platform) {
-  if (platform !== 'darwin') return null;
   // 必须先完全退出 Claude，新配置只在启动时读取一次
-  return [
-    { command: 'osascript', args: ['-e', 'tell application "Claude" to quit'], optional: true, waitAfter: 800 },
-    { command: 'pkill', args: ['-TERM', '-x', 'Claude'], optional: true, waitAfter: 500 },
-    { command: 'pkill', args: ['-KILL', '-x', 'Claude'], optional: true, waitAfter: 800 },
-    { command: 'open', args: ['-a', 'Claude'], waitAfter: 600 },
-    { command: 'osascript', args: ['-e', 'tell application "Claude" to activate'], optional: true },
-  ];
+  if (platform === 'darwin') {
+    return [
+      { command: 'osascript', args: ['-e', 'tell application "Claude" to quit'], optional: true, waitAfter: 800 },
+      { command: 'pkill', args: ['-TERM', '-x', 'Claude'], optional: true, waitAfter: 500 },
+      { command: 'pkill', args: ['-KILL', '-x', 'Claude'], optional: true, waitAfter: 800 },
+      { command: 'open', args: ['-a', 'Claude'], waitAfter: 600 },
+      { command: 'osascript', args: ['-e', 'tell application "Claude" to activate'], optional: true },
+    ];
+  }
+
+  if (platform === 'win32') {
+    // taskkill /T 也连带杀掉子进程；start "" 找已注册的 Claude.exe
+    return [
+      { command: 'taskkill', args: ['/IM', 'Claude.exe', '/F', '/T'], optional: true, waitAfter: 1200, shell: true },
+      { command: 'cmd', args: ['/c', 'start', '""', '/B', 'claude:'], optional: true, waitAfter: 600, shell: true },
+    ];
+  }
+
+  return null;
 }
 
 async function sleep(ms) {
@@ -257,8 +268,8 @@ async function openClaudeDesktop(options = {}) {
   const timeoutMs = options.timeoutMs || 5000;
 
   const trace = [];
-  for (const { command, args, optional, waitAfter } of commands) {
-    const result = runner(command, args, { stdio: 'pipe', encoding: 'utf8', windowsHide: true, timeout: timeoutMs });
+  for (const { command, args, optional, waitAfter, shell } of commands) {
+    const result = runner(command, args, { stdio: 'pipe', encoding: 'utf8', windowsHide: true, timeout: timeoutMs, shell });
     const stderr = (result.stderr || '').toString().trim();
     trace.push({ command, args, status: result.status, stderr });
 

package/lib/panel.js

@@ -23,8 +23,12 @@ function buildStatusView(config, options = {}) {
   const envActive = isEnvActive(config, env);
   const warnings = [];
 
-  if (config.provider === 'deepseek' && config.model === 'deepseek-v4-pro') {
-    warnings.push('检测到旧 DeepSeek 模型名，建议运行 claw switch 更新到 deepseek-v4-pro[1m]');
+  if (config.provider === 'deepseek' && (
+    config.model === 'deepseek-v4-pro' ||
+    config.model === 'deepseek-v4-flash' ||
+    config.fastModel === 'deepseek-v4-flash'
+  )) {
+    warnings.push('检测到旧 DeepSeek 模型名，建议运行 claw switch 更新到 [1m] 长上下文版本');
   }
 
   return {
@@ -63,7 +67,7 @@ function buildMenuStatusLines(view, options = {}) {
   lines.push(`主模型 ${view.mainModel} · 快速模型 ${view.fastModel}`);
 
   if (view.warnings.some((warning) => warning.includes('旧 DeepSeek 模型名'))) {
-    lines.push('旧模型名：选择下方“切换厂商或模型”更新');
+    lines.push('旧模型名：选择下方"切换厂商或模型"更新到 [1m]');
   }
 
   return lines;

package/package.json

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