doer-agent 0.8.4 → 0.8.5

package/dist/codex-app-server-client.js

@@ -18,6 +18,7 @@ export class CodexAppServerClient {
     stdoutLines = null;
     nextRequestId = 1;
     startPromise = null;
+    stopPromise = null;
     pending = new Map();
     constructor(options) {
         this.options = options;
@@ -37,10 +38,19 @@ export class CodexAppServerClient {
     }
     async stop() {
         const child = this.child;
-        if (!child || child.killed) {
+        if (!child) {
             return;
         }
-        child.kill("SIGTERM");
+        if (this.stopPromise) {
+            return await this.stopPromise;
+        }
+        this.stopPromise = this.stopChild(child);
+        try {
+            await this.stopPromise;
+        }
+        finally {
+            this.stopPromise = null;
+        }
     }
     async start() {
         if (this.child && !this.child.killed) {
@@ -60,9 +70,12 @@ export class CodexAppServerClient {
     async startInner() {
         this.child = spawn(process.execPath, [resolveCodexCliBinPath(), ...this.options.args], {
             cwd: this.options.cwd,
+            detached: process.platform !== "win32",
             env: this.options.env,
             stdio: ["pipe", "pipe", "pipe"],
         });
+        const childPid = this.child.pid;
+        const removeExitHooks = this.registerProcessExitHooks(childPid);
         this.child.stdout.setEncoding("utf8");
         this.child.stderr.setEncoding("utf8");
         this.stdoutLines = createInterface({ input: this.child.stdout });
@@ -75,6 +88,8 @@ export class CodexAppServerClient {
         });
         this.child.once("exit", (code, signal) => {
             this.options.onLog?.(`[codex-app-server] exited code=${code ?? "null"} signal=${signal ?? "null"}`);
+            removeExitHooks();
+            this.signalProcessGroup(childPid, "SIGTERM");
             this.rejectPending(new Error("Codex app-server exited"));
             this.stdoutLines?.close();
             this.stdoutLines = null;
@@ -157,4 +172,95 @@ export class CodexAppServerClient {
             pending.reject(error);
         }
     }
+    async stopChild(child) {
+        const pid = child.pid;
+        if (!pid) {
+            child.kill("SIGTERM");
+            return;
+        }
+        this.signalProcessGroup(pid, "SIGTERM") || child.kill("SIGTERM");
+        const exited = await this.waitForExit(child, 5_000);
+        if (!exited) {
+            this.options.onLog?.("[codex-app-server] forcing process group shutdown after timeout");
+            this.signalProcessGroup(pid, "SIGKILL") || child.kill("SIGKILL");
+            await this.waitForExit(child, 1_000);
+        }
+        else {
+            this.signalProcessGroup(pid, "SIGTERM");
+        }
+    }
+    registerProcessExitHooks(pid) {
+        if (!pid || process.platform === "win32") {
+            return () => { };
+        }
+        let removed = false;
+        const cleanup = () => {
+            this.signalProcessGroup(pid, "SIGTERM");
+        };
+        const signalHandlers = new Map();
+        const remove = () => {
+            if (removed) {
+                return;
+            }
+            removed = true;
+            process.off("exit", cleanup);
+            for (const [signal, handler] of signalHandlers) {
+                process.off(signal, handler);
+            }
+        };
+        process.once("exit", cleanup);
+        for (const signal of ["SIGINT", "SIGTERM", "SIGHUP"]) {
+            const handler = () => {
+                cleanup();
+                remove();
+                try {
+                    process.kill(process.pid, signal);
+                }
+                catch {
+                    process.exitCode = 1;
+                }
+            };
+            signalHandlers.set(signal, handler);
+            process.once(signal, handler);
+        }
+        return remove;
+    }
+    signalProcessGroup(pid, signal) {
+        if (!pid || process.platform === "win32") {
+            return false;
+        }
+        try {
+            process.kill(-pid, signal);
+            return true;
+        }
+        catch (error) {
+            const code = typeof error === "object" && error !== null && "code" in error
+                ? String(error.code)
+                : "";
+            if (code && code !== "ESRCH") {
+                this.options.onLog?.(`[codex-app-server] failed to signal process group pid=${pid} signal=${signal} code=${code}`);
+            }
+            return false;
+        }
+    }
+    async waitForExit(child, timeoutMs) {
+        if (child.exitCode !== null || child.signalCode !== null) {
+            return true;
+        }
+        return await new Promise((resolve) => {
+            const timer = setTimeout(() => {
+                cleanup();
+                resolve(false);
+            }, timeoutMs);
+            const onExit = () => {
+                cleanup();
+                resolve(true);
+            };
+            const cleanup = () => {
+                clearTimeout(timer);
+                child.off("exit", onExit);
+            };
+            child.once("exit", onExit);
+        });
+    }
 }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "doer-agent",
-  "version": "0.8.4",
+  "version": "0.8.5",
   "description": "Reverse-polling agent runtime for doer",
   "type": "module",
   "main": "dist/agent.js",