yingclaw 2.5.4 → 2.5.5

package/lib/autostart.js

@@ -63,6 +63,35 @@ function runLaunchctl(runner, args, options = {}) {
   return result;
 }
 
+function sleepSync(ms) {
+  Atomics.wait(new Int32Array(new SharedArrayBuffer(4)), 0, 0, ms);
+}
+
+function getLaunchAgentRuntimeStatus(runner, service) {
+  const result = runner('launchctl', ['print', service], { encoding: 'utf8', stdio: 'pipe' });
+  const output = `${result.stdout || ''}\n${result.stderr || ''}`;
+  return {
+    loaded: result.status === 0,
+    running: result.status === 0 && /state\s*=\s*running/i.test(output),
+  };
+}
+
+function waitForLaunchAgentUnload(runner, service, options = {}) {
+  const timeoutMs = options.timeoutMs == null ? 1500 : options.timeoutMs;
+  const intervalMs = options.intervalMs == null ? 100 : options.intervalMs;
+  const deadline = Date.now() + timeoutMs;
+
+  do {
+    if (!getLaunchAgentRuntimeStatus(runner, service).loaded) {
+      return true;
+    }
+    if (Date.now() >= deadline) {
+      return false;
+    }
+    sleepSync(intervalMs);
+  } while (true);
+}
+
 function installGatewayAutostart(options = {}) {
   const platform = options.platform || process.platform;
   if (platform !== 'darwin') {
@@ -84,8 +113,18 @@ function installGatewayAutostart(options = {}) {
   const domain = `gui/${uid}`;
   const service = `${domain}/${GATEWAY_LAUNCH_AGENT_LABEL}`;
 
-  runLaunchctl(runner, ['bootout', domain, GATEWAY_LAUNCH_AGENT_LABEL], { optional: true });
-  runLaunchctl(runner, ['bootstrap', domain, file]);
+  const bootout = runLaunchctl(runner, ['bootout', service], { optional: true });
+  if (bootout.status === 0) {
+    waitForLaunchAgentUnload(runner, service, {
+      timeoutMs: options.unloadTimeoutMs,
+      intervalMs: options.unloadPollIntervalMs,
+    });
+  }
+  const bootstrap = runLaunchctl(runner, ['bootstrap', domain, file], { optional: true });
+  if (bootstrap.status !== 0 && !getLaunchAgentRuntimeStatus(runner, service).loaded) {
+    const stderr = String(bootstrap.stderr || '').trim();
+    throw new Error(`launchctl bootstrap ${domain} ${file} 失败${stderr ? `: ${stderr}` : ''}`);
+  }
   runLaunchctl(runner, ['enable', service]);
   runLaunchctl(runner, ['kickstart', '-k', service]);
 
@@ -111,12 +150,11 @@ function getGatewayAutostartStatus(options = {}) {
   }
 
   const runner = options.runner || spawnSync;
-  const result = runner('launchctl', ['print', `gui/${uid}/${GATEWAY_LAUNCH_AGENT_LABEL}`], { encoding: 'utf8', stdio: 'pipe' });
-  const output = `${result.stdout || ''}\n${result.stderr || ''}`;
+  const runtimeStatus = getLaunchAgentRuntimeStatus(runner, `gui/${uid}/${GATEWAY_LAUNCH_AGENT_LABEL}`);
   return {
     supported: true,
     installed: true,
-    running: result.status === 0 && /state\s*=\s*running/i.test(output),
+    running: runtimeStatus.running,
     file,
   };
 }

package/package.json

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