yingclaw 2.2.0 → 2.2.3

package/bin/cli.js

@@ -787,7 +787,7 @@ program
         { padding: { top: 0, bottom: 0, left: 2, right: 2 }, borderStyle: 'round', borderColor: 'green', margin: { top: 1, bottom: 1 } }
       ));
 
-      if (process.platform === 'darwin') {
+      if (process.platform === 'darwin' || process.platform === 'win32') {
         const shouldReopen = await confirm({ message: '是否现在重启 Claude 桌面应用使默认配置生效？', default: true });
         if (shouldReopen) {
           const openSpinner = ora('正在重启 Claude 桌面应用...').start();
@@ -795,8 +795,15 @@ program
             await openClaudeDesktop();
             openSpinner.succeed(chalk.green('Claude 桌面应用已重启（已恢复 1P 模式）'));
           } catch (e) {
-            openSpinner.fail(chalk.red(`打开失败: ${e.message}`));
-            console.log(chalk.dim('请手动完全退出 Claude 后重新打开。'));
+            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('请手动完全退出 Claude 后重新打开。'));
+            }
           }
         }
       } else {

package/lib/desktop.js

@@ -231,7 +231,7 @@ function isDesktopConfigured(options = {}) {
   return meta.entries.some((entry) => entry && entry.name === YINGCLAW_ENTRY_NAME);
 }
 
-function buildClaudeDesktopOpenCommands(platform = process.platform) {
+function buildClaudeDesktopOpenCommands(platform = process.platform, options = {}) {
   // 必须先完全退出 Claude，新配置只在启动时读取一次
   if (platform === 'darwin') {
     return [
@@ -244,10 +244,15 @@ function buildClaudeDesktopOpenCommands(platform = process.platform) {
   }
 
   if (platform === 'win32') {
-    // taskkill /T 也连带杀掉子进程；start "" 找已注册的 Claude.exe
+    // 在 Node 里展开 LOCALAPPDATA，避免 cmd /c 解析带空格的中文路径出错
+    const localAppData = options.localAppData
+      || process.env.LOCALAPPDATA
+      || `${options.homeDir || os.homedir()}\\AppData\\Local`;
+    const claudeDir = `${localAppData}\\AnthropicClaude`;
+    // taskkill /T 连带杀子进程；start "" /D 切到 Claude 目录后启动 Claude.exe（Squirrel 标准安装位置）
     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 },
+      { command: 'taskkill', args: ['/IM', 'Claude.exe', '/F', '/T'], optional: true, waitAfter: 1500 },
+      { command: 'cmd', args: ['/c', 'start', '', '/D', claudeDir, 'Claude.exe'], optional: true, waitAfter: 800 },
     ];
   }
 
@@ -260,7 +265,7 @@ async function sleep(ms) {
 
 async function openClaudeDesktop(options = {}) {
   const platform = options.platform || process.platform;
-  const commands = buildClaudeDesktopOpenCommands(platform);
+  const commands = buildClaudeDesktopOpenCommands(platform, options);
   if (!commands) return { result: 'unsupported' };
 
   const runner = options.runner || spawnSync;

package/package.json

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