yingclaw 1.8.2 → 1.9.0

package/lib/desktop.js

@@ -21,12 +21,12 @@ function getClaudeDesktopConfigPath(options = {}) {
   const homeDir = options.homeDir || os.homedir();
 
   if (platform === 'darwin') {
-    return path.join(homeDir, 'Library', 'Application Support', 'Claude-3p', 'claude_desktop_config.json');
+    return path.join(homeDir, 'Library', 'Application Support', 'Claude', 'claude_desktop_config.json');
   }
 
   if (platform === 'win32') {
     const appData = options.appData || process.env.APPDATA || path.join(homeDir, 'AppData', 'Roaming');
-    return path.join(appData, 'Claude-3p', 'claude_desktop_config.json');
+    return path.join(appData, 'Claude', 'claude_desktop_config.json');
   }
 
   return null;
@@ -126,11 +126,13 @@ function clearClaudeDesktopConfig(options = {}) {
 
 function buildClaudeDesktopOpenCommands(platform = process.platform) {
   if (platform !== 'darwin') return null;
-  // 先 graceful quit，再 force kill 兜底，最后 open
+  // 先 graceful quit，SIGTERM 兜底，SIGKILL 强制清理，再 open，最后 activate
   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'] },
+    { 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 },
   ];
 }
 
@@ -146,17 +148,23 @@ async function openClaudeDesktop(options = {}) {
   const runner = options.runner || spawnSync;
   const isMocked = options.runner !== undefined;
 
+  const trace = [];
   for (const { command, args, optional, waitAfter } of commands) {
-    const result = runner(command, args, { stdio: 'ignore', windowsHide: true });
+    const result = runner(command, args, { stdio: 'pipe', encoding: 'utf8', windowsHide: true });
+    const stderr = (result.stderr || '').toString().trim();
+    trace.push({ command, args, status: result.status, stderr });
+
     if (result.status !== 0 && !optional) {
-      throw new Error('Claude 桌面应用打开失败');
+      const detail = stderr ? `: ${stderr}` : '';
+      const trail = trace.map(t => `${t.command} ${t.args.join(' ')} → ${t.status}${t.stderr ? ' (' + t.stderr + ')' : ''}`).join('\n  ');
+      throw new Error(`Claude 桌面应用打开失败${detail}\n  ${trail}`);
     }
     if (waitAfter && !isMocked) {
       await sleep(waitAfter);
     }
   }
 
-  return { result: 'reopened' };
+  return { result: 'reopened', trace };
 }
 
 module.exports = {

package/package.json

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