fix: retry transient launchd bootstrap failures

Author: javazys

package.json

@@ -1,6 +1,6 @@
 {
     "name": "opencode-supertask",
-    "version": "0.1.32-rc.1",
+    "version": "0.1.32-rc.2",
     "description": "AI Agent 任务调度系统 — OpenCode 插件 + CLI + Gateway 常驻进程",
     "type": "module",
     "main": "dist/plugin/supertask.js",

src/daemon/pm2.ts

@@ -417,6 +417,29 @@ export function isMacLaunchAgentConfigured(
     }
 }
 
+function bootstrapMacLaunchAgent(domain: string, path: string) {
+    const retryDeadline = Date.now() + 2_000;
+    const sleeper = new Int32Array(new SharedArrayBuffer(4));
+    let result = spawnSync(launchctlBin(), ["bootstrap", domain, path], {
+        encoding: "utf8",
+        timeout: pm2CommandTimeoutMs(),
+        killSignal: "SIGKILL",
+    });
+
+    while (result.status !== 0 && Date.now() < retryDeadline) {
+        const output = `${result.stdout ?? ""}${result.stderr ?? ""}`;
+        if (result.status !== 5 && !output.includes("Bootstrap failed: 5:")) break;
+        Atomics.wait(sleeper, 0, 0, 100);
+        result = spawnSync(launchctlBin(), ["bootstrap", domain, path], {
+            encoding: "utf8",
+            timeout: pm2CommandTimeoutMs(),
+            killSignal: "SIGKILL",
+        });
+    }
+
+    return result;
+}
+
 export function installMacLaunchAgent(expectedRuntime = currentGatewayRuntime()): string {
     if (typeof process.getuid !== "function") {
         throw new Error("[supertask] 当前运行时无法获取 macOS 用户 ID");
@@ -488,11 +511,7 @@ export function installMacLaunchAgent(expectedRuntime = currentGatewayRuntime())
         timeout: pm2CommandTimeoutMs(),
         killSignal: "SIGKILL",
     });
-    const loaded = spawnSync(launchctlBin(), ["bootstrap", domain, path], {
-        encoding: "utf8",
-        timeout: pm2CommandTimeoutMs(),
-        killSignal: "SIGKILL",
-    });
+    const loaded = bootstrapMacLaunchAgent(domain, path);
     const configuredVerifyTimeout = Number(process.env.SUPERTASK_LAUNCH_AGENT_VERIFY_TIMEOUT_MS ?? 2_000);
     const verifyTimeoutMs = Number.isFinite(configuredVerifyTimeout) && configuredVerifyTimeout > 0
         ? configuredVerifyTimeout
@@ -523,11 +542,7 @@ export function installMacLaunchAgent(expectedRuntime = currentGatewayRuntime())
 
         let rollbackFailure = "";
         if (wasLoaded && previousPlist != null) {
-            const restored = spawnSync(launchctlBin(), ["bootstrap", domain, path], {
-                encoding: "utf8",
-                timeout: pm2CommandTimeoutMs(),
-                killSignal: "SIGKILL",
-            });
+            const restored = bootstrapMacLaunchAgent(domain, path);
             if (restored.status !== 0) {
                 rollbackFailure = `；旧 LaunchAgent 恢复失败: ${`${restored.stdout ?? ""}${restored.stderr ?? ""}`.trim() || `退出码 ${restored.status}`}`;
             }

tests/pm2.test.ts

@@ -112,7 +112,7 @@ if (args[0] === 'install') writeFileSync(${JSON.stringify(moduleState)}, 'instal
         ]);
     });
 
-    test('macOS 用户级 LaunchAgent 长期监督 PM2 且无需 sudo', () => {
+    test('macOS 用户级 LaunchAgent 在 bootout 竞态后重试并长期监督 PM2', () => {
         const dir = mkdtempSync(join(tmpdir(), 'supertask-launch-agent-'));
         dirs.push(dir);
         const fakePm2 = join(dir, 'pm2 & tool');
@@ -132,9 +132,17 @@ if (args[0] === 'install') writeFileSync(${JSON.stringify(moduleState)}, 'instal
             pm2_env: { args: [gateway], pm_exec_path: process.execPath, pm_cwd: process.cwd(), env: expectedEnv },
         }]));
         writeFileSync(fakeLaunchctl, `#!/usr/bin/env bun
-import { appendFileSync } from 'fs';
+import { appendFileSync, readFileSync } from 'fs';
 const args = Bun.argv.slice(2);
 appendFileSync(${JSON.stringify(launchctlLog)}, JSON.stringify(args) + '\\n');
+if (args[0] === 'bootstrap') {
+    const calls = readFileSync(${JSON.stringify(launchctlLog)}, 'utf8').trim().split('\\n')
+        .map((line) => JSON.parse(line));
+    if (calls.filter((call) => call[0] === 'bootstrap').length === 1) {
+        console.error('Bootstrap failed: 5: Input/output error');
+        process.exit(5);
+    }
+}
 if (args[0] === 'print') {
     console.log('path = ${plist}');
     console.log('program = ${process.execPath}');
@@ -164,6 +172,7 @@ if (args[0] === 'print') {
         expect(calls).toEqual([
             ['bootout', `gui/${process.getuid()}/com.supertask.pm2-resurrect`],
             ['bootstrap', `gui/${process.getuid()}`, plist],
+            ['bootstrap', `gui/${process.getuid()}`, plist],
             ['print', `gui/${process.getuid()}/com.supertask.pm2-resurrect`],
         ]);
     });