iteration-cli 0.4.2 → 0.4.3

package/dist/launch-agent.d.ts

@@ -1,4 +1,11 @@
+export type LaunchAgentRestart = {
+    isLoaded(timeoutMs: number): Promise<boolean>;
+    bootstrap(timeoutMs: number): Promise<void>;
+    wait(delayMs: number): Promise<void>;
+    now(): number;
+};
 export declare function launchAgentPlist(cliPath?: string, nodePath?: string, logDirectory?: string, dataDirectory?: string): string;
+export declare function bootstrapAfterBootout(wasLoaded: boolean, control: LaunchAgentRestart): Promise<void>;
 export declare function installLaunchAgent(dataDirectory?: string): Promise<string>;
 export declare function uninstallLaunchAgent(): Promise<void>;
 export declare function launchAgentStatus(): Promise<boolean>;

package/dist/launch-agent.js

@@ -3,9 +3,13 @@ import { execFile as execFileCallback } from "node:child_process";
 import { promises as fs } from "node:fs";
 import os from "node:os";
 import path from "node:path";
+import { setTimeout as sleep } from "node:timers/promises";
 import { fileURLToPath } from "node:url";
 const execFile = promisify(execFileCallback);
 const LABEL = "com.iteration.codex-collector";
+const LAUNCHCTL_TIMEOUT_MS = 5_000;
+const RESTART_TIMEOUT_MS = 10_000;
+const RESTART_POLL_MS = 200;
 function xml(value) {
     return value
         .replaceAll("&", "&")
@@ -52,18 +56,73 @@ function launchctlTarget() {
         throw new Error("Could not determine the current macOS user id.");
     return `gui/${userId}`;
 }
-async function bootoutIfLoaded(target) {
+function serviceMissing(error) {
+    const details = error;
+    return (String(details.code) === "113" ||
+        details.stderr?.includes("Could not find service") === true);
+}
+async function serviceLoaded(target, timeoutMs = LAUNCHCTL_TIMEOUT_MS) {
     try {
-        await execFile("launchctl", ["print", `${target}/${LABEL}`]);
+        await execFile("launchctl", ["print", `${target}/${LABEL}`], {
+            timeout: timeoutMs,
+        });
+        return true;
     }
     catch (error) {
-        const details = error;
-        if (String(details.code) === "113" ||
-            details.stderr?.includes("Could not find service"))
-            return;
+        if (serviceMissing(error))
+            return false;
         throw error;
     }
-    await execFile("launchctl", ["bootout", `${target}/${LABEL}`]);
+}
+async function bootoutIfLoaded(target) {
+    if (!(await serviceLoaded(target)))
+        return false;
+    await execFile("launchctl", ["bootout", `${target}/${LABEL}`], {
+        timeout: LAUNCHCTL_TIMEOUT_MS,
+    });
+    return true;
+}
+function transientBootstrapFailure(error) {
+    const details = error;
+    return (String(details.code) === "5" ||
+        /^Bootstrap failed:\s*5\b/m.test(details.stderr ?? ""));
+}
+function restartTimeoutError(lastBootstrapFailure) {
+    return new Error(lastBootstrapFailure === undefined
+        ? "The previous Codex collector did not stop within 10 seconds."
+        : "launchctl bootstrap still failed with error 5 after 10 seconds.", { cause: lastBootstrapFailure });
+}
+export async function bootstrapAfterBootout(wasLoaded, control) {
+    if (!wasLoaded) {
+        await control.bootstrap(LAUNCHCTL_TIMEOUT_MS);
+        return;
+    }
+    const deadline = control.now() + RESTART_TIMEOUT_MS;
+    let lastBootstrapFailure;
+    while (true) {
+        let remaining = deadline - control.now();
+        if (remaining <= 0) {
+            throw restartTimeoutError(lastBootstrapFailure);
+        }
+        if (!(await control.isLoaded(Math.min(remaining, LAUNCHCTL_TIMEOUT_MS)))) {
+            remaining = deadline - control.now();
+            if (remaining <= 0)
+                continue;
+            try {
+                await control.bootstrap(Math.min(remaining, LAUNCHCTL_TIMEOUT_MS));
+                return;
+            }
+            catch (error) {
+                if (!transientBootstrapFailure(error))
+                    throw error;
+                lastBootstrapFailure = error;
+            }
+        }
+        remaining = deadline - control.now();
+        if (remaining > 0) {
+            await control.wait(Math.min(remaining, RESTART_POLL_MS));
+        }
+    }
 }
 export async function installLaunchAgent(dataDirectory) {
     if (process.platform !== "darwin") {
@@ -77,9 +136,20 @@ export async function installLaunchAgent(dataDirectory) {
     await fs.writeFile(file, launchAgentPlist(undefined, undefined, undefined, dataDirectory ??
         path.join(os.homedir(), ".config", "iteration", "codex-collector")), { encoding: "utf8", mode: 0o644 });
     const target = launchctlTarget();
-    await bootoutIfLoaded(target);
-    await execFile("launchctl", ["bootstrap", target, file]);
-    await execFile("launchctl", ["kickstart", "-p", `${target}/${LABEL}`]);
+    const wasLoaded = await bootoutIfLoaded(target);
+    await bootstrapAfterBootout(wasLoaded, {
+        isLoaded: (timeoutMs) => serviceLoaded(target, timeoutMs),
+        bootstrap: async (timeoutMs) => {
+            await execFile("launchctl", ["bootstrap", target, file], {
+                timeout: timeoutMs,
+            });
+        },
+        wait: sleep,
+        now: Date.now,
+    });
+    await execFile("launchctl", ["kickstart", "-p", `${target}/${LABEL}`], {
+        timeout: LAUNCHCTL_TIMEOUT_MS,
+    });
     return file;
 }
 export async function uninstallLaunchAgent() {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "iteration-cli",
-  "version": "0.4.2",
+  "version": "0.4.3",
   "type": "module",
   "repository": {
     "type": "git",