doer-agent 0.8.4 → 0.8.6

package/dist/agent-codex-cli.js

@@ -1,6 +1,8 @@
 import { spawn, spawnSync } from "node:child_process";
 import { existsSync } from "node:fs";
+import { createRequire } from "node:module";
 import path from "node:path";
+const require = createRequire(import.meta.url);
 const ANSI_RE = /\u001b\[[0-9;]*m/g;
 function shellSingleQuote(value) {
     return `'${value.replace(/'/g, `'"'"'`)}'`;
@@ -32,6 +34,20 @@ function hasDirectCodexBinary() {
     });
     return result.status === 0;
 }
+function resolveBundledCodexCliBinPath() {
+    try {
+        const packageJsonPath = require.resolve("@openai/codex/package.json");
+        const packageJson = require(packageJsonPath);
+        const codexBin = packageJson.bin?.codex;
+        if (!codexBin) {
+            return null;
+        }
+        return path.resolve(path.dirname(packageJsonPath), codexBin);
+    }
+    catch {
+        return null;
+    }
+}
 export function stripAnsi(value) {
     return value.replace(ANSI_RE, "");
 }
@@ -144,6 +160,10 @@ function buildWorkspaceMcpConfigArgs(args) {
 }
 export function buildLocalCodexCliCommand(args) {
     const quotedArgs = args.map(shellSingleQuote).join(" ");
+    const bundledCodex = resolveBundledCodexCliBinPath();
+    if (bundledCodex) {
+        return `exec ${shellSingleQuote(process.execPath)} ${shellSingleQuote(bundledCodex)} ${quotedArgs}`;
+    }
     const direct = `exec codex ${quotedArgs}`;
     const fallback = `exec npm exec --yes --package doer-agent -- codex ${quotedArgs}`;
     const script = [
@@ -159,19 +179,27 @@ export function spawnManagedCodexCommand(args) {
         ...args.env,
         DOER_AGENT_TOKEN: args.agentToken,
     };
-    const child = hasDirectCodexBinary()
-        ? spawn("codex", args.codexArgs, {
+    const bundledCodex = resolveBundledCodexCliBinPath();
+    const child = bundledCodex
+        ? spawn(process.execPath, [bundledCodex, ...args.codexArgs], {
             cwd: args.taskWorkspace,
             detached: process.platform !== "win32",
             env,
             stdio: ["ignore", "pipe", "pipe"],
         })
-        : spawn("npm", ["exec", "--yes", "--package", "doer-agent", "--", "codex", ...args.codexArgs], {
-            cwd: args.taskWorkspace,
-            detached: process.platform !== "win32",
-            env,
-            stdio: ["ignore", "pipe", "pipe"],
-        });
+        : hasDirectCodexBinary()
+            ? spawn("codex", args.codexArgs, {
+                cwd: args.taskWorkspace,
+                detached: process.platform !== "win32",
+                env,
+                stdio: ["ignore", "pipe", "pipe"],
+            })
+            : spawn("npm", ["exec", "--yes", "--package", "doer-agent", "--", "codex", ...args.codexArgs], {
+                cwd: args.taskWorkspace,
+                detached: process.platform !== "win32",
+                env,
+                stdio: ["ignore", "pipe", "pipe"],
+            });
     child.stdout?.setEncoding("utf8");
     child.stderr?.setEncoding("utf8");
     return child;

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/dist/codex-cli.js

@@ -1,7 +1,9 @@
 #!/usr/bin/env node
 import { existsSync, realpathSync } from "node:fs";
-import { delimiter, join } from "node:path";
+import { createRequire } from "node:module";
+import { delimiter, dirname, join } from "node:path";
 import { spawn } from "node:child_process";
+const require = createRequire(import.meta.url);
 function isWindows() {
     return process.platform === "win32";
 }
@@ -23,6 +25,10 @@ function resolveSelf() {
     }
 }
 function findCodexBinary() {
+    const localCodex = resolveBundledCodexBinary();
+    if (localCodex) {
+        return localCodex;
+    }
     const pathValue = process.env.PATH ?? "";
     const dirs = pathValue.split(delimiter).filter(Boolean);
     const self = resolveSelf();
@@ -43,6 +49,20 @@ function findCodexBinary() {
     }
     return null;
 }
+function resolveBundledCodexBinary() {
+    try {
+        const packageJsonPath = require.resolve("@openai/codex/package.json");
+        const packageJson = require(packageJsonPath);
+        const codexBin = packageJson.bin?.codex;
+        if (!codexBin) {
+            return null;
+        }
+        return join(dirname(packageJsonPath), codexBin);
+    }
+    catch {
+        return null;
+    }
+}
 const binary = findCodexBinary();
 if (!binary) {
     console.error("Unable to find a real 'codex' binary in PATH.");

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "doer-agent",
-  "version": "0.8.4",
+  "version": "0.8.6",
   "description": "Reverse-polling agent runtime for doer",
   "type": "module",
   "main": "dist/agent.js",
@@ -25,15 +25,16 @@
   },
   "dependencies": {
     "@modelcontextprotocol/sdk": "^1.29.0",
-    "@openai/codex": "^0.133.0",
-    "@openai/codex-sdk": "^0.133.0",
+    "@openai/codex": "^0.141.0",
+    "@openai/codex-sdk": "^0.141.0",
     "diff": "^9.0.0",
     "nats": "^2.29.3",
     "tar": "^7.5.15"
   },
   "devDependencies": {
     "@types/node": "^20.19.40",
-    "tsx": "^4.21.0",
+    "esbuild": "^0.28.1",
+    "tsx": "^4.22.4",
     "typescript": "^5"
   }
 }