yingclaw 2.5.12 → 2.5.13

package/lib/autostart.js

@@ -1,7 +1,7 @@
 const fs = require('fs');
 const os = require('os');
 const path = require('path');
-const { spawnSync } = require('child_process');
+const { spawn, spawnSync } = require('child_process');
 
 const GATEWAY_LAUNCH_AGENT_LABEL = 'com.yingclaw.gateway';
 const WINDOWS_GATEWAY_STARTUP_SCRIPT = 'yingclaw-gateway.cmd';
@@ -74,6 +74,21 @@ function buildWindowsGatewayStartupScript(options = {}) {
   ].join('\r\n');
 }
 
+function startWindowsGateway(options = {}) {
+  const starter = options.starter || spawn;
+  const nodePath = options.nodePath || process.execPath;
+  const cliPath = options.cliPath || path.join(__dirname, '..', 'bin', 'cli.js');
+  const workingDirectory = options.workingDirectory || path.join(__dirname, '..');
+  const child = starter(nodePath, [cliPath, 'gateway'], {
+    cwd: workingDirectory,
+    detached: true,
+    stdio: 'ignore',
+    windowsHide: true,
+  });
+  if (child && typeof child.unref === 'function') child.unref();
+  return true;
+}
+
 function runLaunchctl(runner, args, options = {}) {
   const result = runner('launchctl', args, { encoding: 'utf8', stdio: 'pipe' });
   if (result.status !== 0 && !options.optional) {
@@ -125,9 +140,15 @@ function installGatewayAutostart(options = {}) {
   const platform = options.platform || process.platform;
   if (platform === 'win32') {
     const file = options.file || getWindowsStartupScriptPath(options);
+    const runner = options.runner || spawnSync;
+    const port = options.port || 18080;
+    const wasRunning = isWindowsPortListening(runner, port);
     fs.mkdirSync(path.dirname(file), { recursive: true });
     fs.writeFileSync(file, buildWindowsGatewayStartupScript(options), 'utf8');
-    return { result: 'installed', file };
+    const started = !wasRunning && options.startNow !== false
+      ? startWindowsGateway(options)
+      : false;
+    return { result: 'installed', file, started };
   }
 
   if (platform !== 'darwin') {
@@ -211,6 +232,7 @@ module.exports = {
   GATEWAY_LAUNCH_AGENT_LABEL,
   buildMacLaunchAgentPlist,
   buildWindowsGatewayStartupScript,
+  startWindowsGateway,
   getGatewayAutostartStatus,
   getMacLaunchAgentPath,
   getWindowsStartupScriptPath,

package/lib/desktop.js

@@ -363,11 +363,27 @@ function buildClaudeDesktopOpenCommands(platform = process.platform, options = {
     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 标准安装位置）
+    const fileExists = options.fileExists || fs.existsSync;
+    const exeCandidates = [
+      `${localAppData}\\Programs\\Claude\\Claude.exe`,
+      `${localAppData}\\AnthropicClaude\\Claude.exe`,
+    ];
+    const updateCandidates = [
+      `${localAppData}\\AnthropicClaude\\Update.exe`,
+      `${localAppData}\\Programs\\Claude\\Update.exe`,
+    ];
+    const foundExe = exeCandidates.find((file) => fileExists(file));
+    const foundUpdate = foundExe ? null : updateCandidates.find((file) => fileExists(file));
+    const fallbackDir = `${localAppData}\\AnthropicClaude`;
+    const launchCommand = foundExe
+      ? { command: 'cmd', args: ['/c', 'start', '', '/D', path.win32.dirname(foundExe), 'Claude.exe'], optional: true, waitAfter: 800 }
+      : foundUpdate
+        ? { command: foundUpdate, args: ['--processStart', 'Claude.exe'], optional: true, waitAfter: 800 }
+        : { command: 'cmd', args: ['/c', 'start', '', '/D', fallbackDir, 'Claude.exe'], optional: true, waitAfter: 800 };
+    // taskkill /T 连带杀子进程；启动路径按实际安装位置选择，找不到时保留旧的 Squirrel 目录兜底
     return [
       { 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 },
+      launchCommand,
     ];
   }
 

package/package.json

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