@parall/codex-agent 1.28.1 → 1.29.1

package/dist/dispatch.d.ts

@@ -7,20 +7,6 @@ type CodexAppServerAdapterOptions = Pick<CodexAgentConfig, "approvalPolicy" | "c
     contextFilePath?: string;
     useParallProvider?: boolean;
 };
-/**
- * Bridge driver backed by `codex app-server --listen stdio://`.
- *
- * Lifecycle:
- *   - bridge startup: spawn one `codex app-server` subprocess, do the
- *     `initialize` / `initialized` handshake once, keep the pipe open
- *   - per Parall dispatch: `thread/start` (first time) or `thread/resume`,
- *     then `turn/start`; forward server notifications until `turn/completed`
- *   - fork-on-busy: `thread/fork` creates a disposable sibling thread
- *
- * Concurrency: agent-core routes one dispatch per sessionKey at a time, so
- * main + fork can interleave turns on the same stdio pipe. We route
- * notifications by threadId the server stamps on every item/turn event.
- */
 export declare class CodexAppServerAdapter implements DispatchAdapter {
     private readonly opts;
     private client;
@@ -28,6 +14,8 @@ export declare class CodexAppServerAdapter implements DispatchAdapter {
     private initialized;
     private startPromise;
     private readonly activeTurns;
+    private readonly activeTurnIds;
+    private readonly pendingInjections;
     private readonly resumedThreadIds;
     private stopping;
     /**
@@ -44,6 +32,8 @@ export declare class CodexAppServerAdapter implements DispatchAdapter {
         model?: string | null;
         reasoningEffort?: string | null;
     }): void;
+    enqueueDuringDispatch(sessionKey: string, body: string): Promise<boolean>;
+    hasPendingInjections(sessionKey: string): boolean;
     dispatch({ event, bodyForAgent, sessionKey, context }: DispatchOpts): AsyncIterable<RuntimeEvent>;
     getBranchPoint(_sessionKey: string): string | undefined;
     forkSession({ sessionKey: parentSessionKey }: ForkOpts): Promise<ForkSessionHandle | null>;

package/dist/dispatch.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"dispatch.d.ts","sourceRoot":"","sources":["../src/dispatch.ts"],"names":[],"mappings":"AAUA,OAAO,KAAK,EACV,eAAe,EACf,eAAe,EACf,YAAY,EACZ,QAAQ,EACR,iBAAiB,EACjB,aAAa,EACb,YAAY,EACb,MAAM,oBAAoB,CAAC;AAC5B,OAAO,KAAK,EAAE,gBAAgB,EAAE,MAAM,aAAa,CAAC;AAIpD,OAAO,KAAK,EAAE,mBAAmB,EAAE,MAAM,sBAAsB,CAAC;AAEhE,KAAK,4BAA4B,GAAG,IAAI,CACtC,gBAAgB,EACd,gBAAgB,GAChB,UAAU,GACV,WAAW,GACX,OAAO,GACP,iBAAiB,GACjB,SAAS,GACT,cAAc,CACjB,GAAG;IACF,cAAc,EAAE,mBAAmB,CAAC;IACpC,GAAG,CAAC,EAAE,aAAa,CAAC;IACpB,eAAe,CAAC,EAAE,MAAM,CAAC;IACzB,iBAAiB,CAAC,EAAE,OAAO,CAAC;CAC7B,CAAC;AAOF;;;;;;;;;;;;;GAaG;AACH,qBAAa,qBAAsB,YAAW,eAAe;IA6B/C,OAAO,CAAC,QAAQ,CAAC,IAAI;IA5BjC,OAAO,CAAC,MAAM,CAAmC;IACjD,OAAO,CAAC,IAAI,CAA+C;IAC3D,OAAO,CAAC,WAAW,CAAS;IAC5B,OAAO,CAAC,YAAY,CAA8B;IAClD,OAAO,CAAC,QAAQ,CAAC,WAAW,CAA+B;IAC3D,OAAO,CAAC,QAAQ,CAAC,gBAAgB,CAAqB;IACtD,OAAO,CAAC,QAAQ,CAAS;IAEzB;;;;;;;OAOG;IACH,OAAO,CAAC,aAAa;gBAYQ,IAAI,EAAE,4BAA4B;IAE/D,YAAY,CAAC,MAAM,EAAE;QAAE,KAAK,CAAC,EAAE,MAAM,GAAG,IAAI,CAAC;QAAC,eAAe,CAAC,EAAE,MAAM,GAAG,IAAI,CAAA;KAAE,GAAG,IAAI;IAK/E,QAAQ,CAAC,EAAE,KAAK,EAAE,YAAY,EAAE,UAAU,EAAE,OAAO,EAAE,EAAE,YAAY,GAAG,aAAa,CAAC,YAAY,CAAC;IAwMxG,cAAc,CAAC,WAAW,EAAE,MAAM,GAAG,MAAM,GAAG,SAAS;IAMjD,WAAW,CAAC,EAAE,UAAU,EAAE,gBAAgB,EAAE,EAAE,QAAQ,GAAG,OAAO,CAAC,iBAAiB,GAAG,IAAI,CAAC;IAuBhG,WAAW,CAAC,EAAE,IAAI,EAAE,EAAE,eAAe;IAIrC,OAAO,CAAC,cAAc;IAKhB,IAAI;YAaI,aAAa;YAyBb,OAAO;IA8DrB,OAAO,CAAC,qBAAqB;YAiCf,UAAU;IA2CxB,OAAO,CAAC,iBAAiB;CA2B1B"}
+{"version":3,"file":"dispatch.d.ts","sourceRoot":"","sources":["../src/dispatch.ts"],"names":[],"mappings":"AASA,OAAO,KAAK,EACV,eAAe,EACf,eAAe,EACf,YAAY,EACZ,QAAQ,EACR,iBAAiB,EACjB,aAAa,EACb,YAAY,EACb,MAAM,oBAAoB,CAAC;AAC5B,OAAO,KAAK,EAAE,gBAAgB,EAAE,MAAM,aAAa,CAAC;AAIpD,OAAO,KAAK,EAAE,mBAAmB,EAAE,MAAM,sBAAsB,CAAC;AAEhE,KAAK,4BAA4B,GAAG,IAAI,CACtC,gBAAgB,EACd,gBAAgB,GAChB,UAAU,GACV,WAAW,GACX,OAAO,GACP,iBAAiB,GACjB,SAAS,GACT,cAAc,CACjB,GAAG;IACF,cAAc,EAAE,mBAAmB,CAAC;IACpC,GAAG,CAAC,EAAE,aAAa,CAAC;IACpB,eAAe,CAAC,EAAE,MAAM,CAAC;IACzB,iBAAiB,CAAC,EAAE,OAAO,CAAC;CAC7B,CAAC;AAmCF,qBAAa,qBAAsB,YAAW,eAAe;IA+B/C,OAAO,CAAC,QAAQ,CAAC,IAAI;IA9BjC,OAAO,CAAC,MAAM,CAAmC;IACjD,OAAO,CAAC,IAAI,CAA+C;IAC3D,OAAO,CAAC,WAAW,CAAS;IAC5B,OAAO,CAAC,YAAY,CAA8B;IAClD,OAAO,CAAC,QAAQ,CAAC,WAAW,CAA+B;IAC3D,OAAO,CAAC,QAAQ,CAAC,aAAa,CAA6B;IAC3D,OAAO,CAAC,QAAQ,CAAC,iBAAiB,CAA6B;IAC/D,OAAO,CAAC,QAAQ,CAAC,gBAAgB,CAAqB;IACtD,OAAO,CAAC,QAAQ,CAAS;IAEzB;;;;;;;OAOG;IACH,OAAO,CAAC,aAAa;gBAYQ,IAAI,EAAE,4BAA4B;IAE/D,YAAY,CAAC,MAAM,EAAE;QAAE,KAAK,CAAC,EAAE,MAAM,GAAG,IAAI,CAAC;QAAC,eAAe,CAAC,EAAE,MAAM,GAAG,IAAI,CAAA;KAAE,GAAG,IAAI;IAKhF,qBAAqB,CAAC,UAAU,EAAE,MAAM,EAAE,IAAI,EAAE,MAAM,GAAG,OAAO,CAAC,OAAO,CAAC;IAqB/E,oBAAoB,CAAC,UAAU,EAAE,MAAM,GAAG,OAAO;IAI1C,QAAQ,CAAC,EAAE,KAAK,EAAE,YAAY,EAAE,UAAU,EAAE,OAAO,EAAE,EAAE,YAAY,GAAG,aAAa,CAAC,YAAY,CAAC;IA6NxG,cAAc,CAAC,WAAW,EAAE,MAAM,GAAG,MAAM,GAAG,SAAS;IAMjD,WAAW,CAAC,EAAE,UAAU,EAAE,gBAAgB,EAAE,EAAE,QAAQ,GAAG,OAAO,CAAC,iBAAiB,GAAG,IAAI,CAAC;IA+BhG,WAAW,CAAC,EAAE,IAAI,EAAE,EAAE,eAAe;IAIrC,OAAO,CAAC,cAAc;IAKhB,IAAI;YAiBI,aAAa;YA2Bb,OAAO;IAyErB,OAAO,CAAC,qBAAqB;YAmCf,UAAU;IA2CxB,OAAO,CAAC,iBAAiB;CA4B1B"}

package/dist/dispatch.js

@@ -1,5 +1,4 @@
-import { spawn } from "node:child_process";
-import { execSync } from "node:child_process";
+import { execSync, spawn } from "node:child_process";
 import { randomUUID } from "node:crypto";
 import * as fs from "node:fs";
 import { appendPreparedLocalAttachmentRefs, ensureLocalAttachmentGitExclude, pinLocalAttachmentPaths, } from "@parall/agent-core/internal/attachment-input";
@@ -20,6 +19,21 @@ import { JsonRpcStdioClient } from "./jsonrpc-client.js";
  * main + fork can interleave turns on the same stdio pipe. We route
  * notifications by threadId the server stamps on every item/turn event.
  */
+const IS_WIN32 = process.platform === "win32";
+function quoteWin32Arg(arg) {
+    if (!/[\s"&|^<>()]/.test(arg))
+        return arg;
+    return `"${arg.replace(/"/g, '""')}"`;
+}
+function killWin32Tree(pid) {
+    try {
+        execSync(`taskkill /T /F /PID ${pid}`, { windowsHide: true, stdio: "ignore" });
+        return true;
+    }
+    catch {
+        return false;
+    }
+}
 export class CodexAppServerAdapter {
     opts;
     client = null;
@@ -27,6 +41,8 @@ export class CodexAppServerAdapter {
     initialized = false;
     startPromise = null;
     activeTurns = new Map();
+    activeTurnIds = new Map();
+    pendingInjections = new Map();
     resumedThreadIds = new Set();
     stopping = false;
     /**
@@ -55,7 +71,49 @@ export class CodexAppServerAdapter {
         if (config.reasoningEffort !== undefined)
             this.opts.reasoningEffort = config.reasoningEffort ?? undefined;
     }
+    async enqueueDuringDispatch(sessionKey, body) {
+        const client = this.client;
+        if (!client || client.isDisposed())
+            return false;
+        const threadId = this.opts.sessionManager.getThreadId(sessionKey);
+        if (!threadId)
+            return false;
+        const turnId = this.activeTurnIds.get(threadId);
+        if (!turnId)
+            return false;
+        try {
+            await client.sendRequest("turn/steer", {
+                threadId,
+                expectedTurnId: turnId,
+                input: buildTurnInput(body, []),
+            });
+            this.pendingInjections.set(sessionKey, (this.pendingInjections.get(sessionKey) ?? 0) + 1);
+            return true;
+        }
+        catch (err) {
+            this.opts.log?.warn?.(`codex-agent: turn/steer failed: ${errToString(err)}`);
+            return false;
+        }
+    }
+    hasPendingInjections(sessionKey) {
+        return (this.pendingInjections.get(sessionKey) ?? 0) > 0;
+    }
     async *dispatch({ event, bodyForAgent, sessionKey, context }) {
+        const pending = this.pendingInjections.get(sessionKey) ?? 0;
+        if (pending > 0) {
+            this.pendingInjections.delete(sessionKey);
+            const threadId = this.opts.sessionManager.getThreadId(sessionKey);
+            if (threadId && this.client && !this.client.isDisposed()) {
+                (this.opts.log ?? context.log)?.info?.(`codex-agent[${context.accountId}]: ${pending} steer injection(s) already sent; skipping turn/start`);
+                yield {
+                    type: "runtime_session",
+                    runtimeSessionId: threadId,
+                    runtimeLaneKey: sessionKey,
+                };
+                return;
+            }
+            (this.opts.log ?? context.log)?.warn?.(`codex-agent[${context.accountId}]: pending steer invalidated (subprocess died); falling through to normal dispatch`);
+        }
         await this.ensureStarted(context.log);
         // After ensureStarted resolves the subprocess could still die before we
         // capture the client (handleSubprocessClose nulls this.client). Yield a
@@ -210,7 +268,9 @@ export class CodexAppServerAdapter {
                 this.resumedThreadIds.add(freshThreadId);
                 threadId = freshThreadId;
             }
-            void turnStartResult; // turnId comes back here but isn't needed — we key by threadId
+            const turnId = extractTurnId(turnStartResult);
+            if (turnId)
+                this.activeTurnIds.set(threadId, turnId);
             yield {
                 type: "runtime_session",
                 runtimeSessionId: threadId,
@@ -250,8 +310,8 @@ export class CodexAppServerAdapter {
         finally {
             releasePreparedAttachments();
             this.activeTurns.delete(threadId);
+            this.activeTurnIds.delete(threadId);
             if (!sawTurnEnd) {
-                // Defensive: if we bailed early, make sure we leave no dangling sink.
                 sink.close();
             }
         }
@@ -270,10 +330,19 @@ export class CodexAppServerAdapter {
             return null;
         const handle = this.opts.sessionManager.createForkSessionKey();
         try {
-            const result = await client.sendRequest("thread/fork", {
+            const forkParams = {
                 threadId: parentThreadId,
                 ephemeral: true,
-            });
+            };
+            if (this.opts.useParallProvider) {
+                forkParams.modelProvider = "parall";
+            }
+            if (this.opts.model)
+                forkParams.model = this.opts.model;
+            if (this.opts.reasoningEffort) {
+                forkParams.config = { modelReasoningEffort: this.opts.reasoningEffort };
+            }
+            const result = await client.sendRequest("thread/fork", forkParams);
             const forkedThreadId = extractThreadId(result);
             if (!forkedThreadId) {
                 this.opts.log?.warn?.("codex-agent: thread/fork returned no thread id");
@@ -300,10 +369,14 @@ export class CodexAppServerAdapter {
         this.proc = null;
         this.client = null;
         this.initialized = false;
+        this.activeTurnIds.clear();
+        this.pendingInjections.clear();
         if (client)
             client.dispose(new Error("adapter stopped"));
         if (proc && proc.exitCode === null && proc.signalCode === null) {
-            proc.kill("SIGTERM");
+            if (!IS_WIN32 || !proc.pid || !killWin32Tree(proc.pid)) {
+                proc.kill("SIGTERM");
+            }
         }
     }
     async ensureStarted(log) {
@@ -313,6 +386,8 @@ export class CodexAppServerAdapter {
                 activeSink.close();
             }
             this.activeTurns.clear();
+            this.activeTurnIds.clear();
+            this.pendingInjections.clear();
             this.client = null;
             this.proc = null;
             this.initialized = false;
@@ -355,10 +430,11 @@ export class CodexAppServerAdapter {
         }
         const args = ["app-server", "--listen", "stdio://"];
         (log ?? this.opts.log)?.info?.(`codex-agent: spawning ${this.opts.codexBin} ${args.join(" ")}`);
-        const proc = spawn(this.opts.codexBin, args, {
+        const proc = spawn(IS_WIN32 ? quoteWin32Arg(this.opts.codexBin) : this.opts.codexBin, IS_WIN32 ? args.map(quoteWin32Arg) : args, {
             cwd: this.opts.workspaceDir,
             env,
             stdio: ["pipe", "pipe", "pipe"],
+            shell: IS_WIN32,
         });
         proc.stderr.setEncoding("utf8");
         proc.stderr.on("data", (chunk) => {
@@ -369,7 +445,11 @@ export class CodexAppServerAdapter {
         // start), we kill the half-spawned subprocess and clear local refs here
         // — leaving them on `this` would leak the orphan process and cause the
         // next ensureStarted() to spawn a second app-server on top of it.
-        const client = new JsonRpcStdioClient(proc);
+        const client = new JsonRpcStdioClient(proc, undefined, (p) => {
+            if (!IS_WIN32 || !p.pid || !killWin32Tree(p.pid)) {
+                p.kill("SIGTERM");
+            }
+        });
         client.setNotificationHandler((method, params) => this.routeNotification(method, params));
         proc.once("close", (code, signal) => this.handleSubprocessClose(proc, code, signal, log));
         proc.once("error", (err) => this.handleSubprocessClose(proc, null, null, log, err));
@@ -382,8 +462,11 @@ export class CodexAppServerAdapter {
         }
         catch (err) {
             client.dispose(err instanceof Error ? err : new Error(String(err)));
-            if (proc.exitCode === null && proc.signalCode === null)
-                proc.kill("SIGTERM");
+            if (proc.exitCode === null && proc.signalCode === null) {
+                if (!IS_WIN32 || !proc.pid || !killWin32Tree(proc.pid)) {
+                    proc.kill("SIGTERM");
+                }
+            }
             throw err;
         }
         this.proc = proc;
@@ -413,6 +496,8 @@ export class CodexAppServerAdapter {
             activeSink.close();
         }
         this.activeTurns.clear();
+        this.activeTurnIds.clear();
+        this.pendingInjections.clear();
         this.resumedThreadIds.clear();
         this.client = null;
         this.proc = null;
@@ -478,6 +563,7 @@ export class CodexAppServerAdapter {
             sink.push({ kind: "runtime", event });
         }
         if (method === "turn/completed") {
+            this.activeTurnIds.delete(threadId);
             sink.push({ kind: "turn_end", threadId });
         }
     }
@@ -568,6 +654,17 @@ function extractThreadId(result) {
         return thread.id;
     return undefined;
 }
+function extractTurnId(result) {
+    if (!result || typeof result !== "object")
+        return undefined;
+    const r = result;
+    if (typeof r.turnId === "string")
+        return r.turnId;
+    const turn = r.turn;
+    if (turn && typeof turn.id === "string")
+        return turn.id;
+    return undefined;
+}
 function extractThreadIdFromNotification(params) {
     if (!params || typeof params !== "object")
         return undefined;

package/dist/index.js

@@ -1,18 +1,12 @@
 #!/usr/bin/env node
 import * as os from "node:os";
-import { ParallAgentGateway, createPlatformConfigManager, isPlatformManagedProfile, parseShutdownDeadlineMs } from "@parall/agent-core";
+import { ParallAgentGateway, createPlatformConfigManager, createLogger, isPlatformManagedProfile, parseShutdownDeadlineMs } from "@parall/agent-core";
 import { ApiError, ParallClient, ParallWs } from "@parall/sdk";
 import { buildCodexRuntimeKey, contextFilePathForSession, resolveCodexAgentConfig, resolveWsUrl, sessionStateFilePathForRuntime, stepIdFilePathForSession, } from "./config.js";
 import { CodexAppServerAdapter } from "./dispatch.js";
 import { CodexSessionManager } from "./session-manager.js";
 import { ensureCodexWorkspace, ensureParallProvider, ensureWorkspaceTrusted, isParallProxyMode } from "./workspace.js";
-function createLogger(prefix) {
-    return {
-        info: (msg) => console.log(`[${prefix}] ${msg}`),
-        warn: (msg) => console.warn(`[${prefix}] ${msg}`),
-        error: (msg) => console.error(`[${prefix}] ${msg}`),
-    };
-}
+const log = createLogger("codex-agent");
 async function getAgentMeWithLegacyFallback(client, orgId) {
     try {
         return await client.getAgentMe(orgId);
@@ -27,7 +21,6 @@ async function getAgentMeWithLegacyFallback(client, orgId) {
 }
 async function main() {
     const config = resolveCodexAgentConfig(process.env);
-    const log = createLogger("codex-agent");
     const client = new ParallClient({
         baseUrl: config.apiUrl,
         token: config.apiKey,
@@ -136,6 +129,6 @@ async function main() {
     }
 }
 main().catch((err) => {
-    console.error(`[codex-agent] fatal: ${String(err)}`);
+    log.error(`fatal: ${String(err)}`);
     process.exitCode = 1;
 });

package/dist/jsonrpc-client.d.ts

@@ -33,12 +33,13 @@ export type NotificationHandler = (method: string, params: unknown) => void;
 export declare class JsonRpcStdioClient {
     private readonly proc;
     private readonly requestTimeoutMs;
+    private readonly killProcess?;
     private nextId;
     private readonly pending;
     private buffer;
     private onNotification;
     private disposed;
-    constructor(proc: ChildProcessWithoutNullStreams, requestTimeoutMs?: number);
+    constructor(proc: ChildProcessWithoutNullStreams, requestTimeoutMs?: number, killProcess?: ((proc: ChildProcessWithoutNullStreams) => void) | undefined);
     setNotificationHandler(handler: NotificationHandler): void;
     sendRequest(method: string, params?: unknown): Promise<unknown>;
     sendNotification(method: string, params?: unknown): void;

package/dist/jsonrpc-client.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"jsonrpc-client.d.ts","sourceRoot":"","sources":["../src/jsonrpc-client.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,8BAA8B,EAAE,MAAM,oBAAoB,CAAC;AAEzE,KAAK,SAAS,GAAG,MAAM,GAAG,MAAM,CAAC;AAEjC,MAAM,MAAM,cAAc,GAAG;IAC3B,OAAO,EAAE,KAAK,CAAC;IACf,EAAE,EAAE,SAAS,CAAC;IACd,MAAM,EAAE,MAAM,CAAC;IACf,MAAM,CAAC,EAAE,OAAO,CAAC;CAClB,CAAC;AAEF,MAAM,MAAM,mBAAmB,GAAG;IAChC,OAAO,EAAE,KAAK,CAAC;IACf,MAAM,EAAE,MAAM,CAAC;IACf,MAAM,CAAC,EAAE,OAAO,CAAC;CAClB,CAAC;AAEF,MAAM,MAAM,eAAe,GAAG;IAC5B,OAAO,EAAE,KAAK,CAAC;IACf,EAAE,EAAE,SAAS,CAAC;IACd,MAAM,CAAC,EAAE,OAAO,CAAC;IACjB,KAAK,CAAC,EAAE;QAAE,IAAI,EAAE,MAAM,CAAC;QAAC,OAAO,EAAE,MAAM,CAAC;QAAC,IAAI,CAAC,EAAE,OAAO,CAAA;KAAE,CAAC;CAC3D,CAAC;AAEF,MAAM,MAAM,mBAAmB,GAAG,CAAC,MAAM,EAAE,MAAM,EAAE,MAAM,EAAE,OAAO,KAAK,IAAI,CAAC;AAW5E;;;;;;;GAOG;AACH,qBAAa,kBAAkB;IAQ3B,OAAO,CAAC,QAAQ,CAAC,IAAI;IACrB,OAAO,CAAC,QAAQ,CAAC,gBAAgB;IARnC,OAAO,CAAC,MAAM,CAAK;IACnB,OAAO,CAAC,QAAQ,CAAC,OAAO,CAAiC;IACzD,OAAO,CAAC,MAAM,CAAM;IACpB,OAAO,CAAC,cAAc,CAAoC;IAC1D,OAAO,CAAC,QAAQ,CAAS;gBAGN,IAAI,EAAE,8BAA8B,EACpC,gBAAgB,GAAE,MAAmC;IASxE,sBAAsB,CAAC,OAAO,EAAE,mBAAmB;IAInD,WAAW,CAAC,MAAM,EAAE,MAAM,EAAE,MAAM,CAAC,EAAE,OAAO,GAAG,OAAO,CAAC,OAAO,CAAC;IAoB/D,gBAAgB,CAAC,MAAM,EAAE,MAAM,EAAE,MAAM,CAAC,EAAE,OAAO;IAMjD,UAAU,IAAI,OAAO;IAIrB,OAAO,CAAC,GAAG,EAAE,KAAK;IAUlB,OAAO,CAAC,UAAU;IAQlB,OAAO,CAAC,aAAa;IAOrB,OAAO,CAAC,MAAM;IAWd,OAAO,CAAC,UAAU;CAyBnB"}
+{"version":3,"file":"jsonrpc-client.d.ts","sourceRoot":"","sources":["../src/jsonrpc-client.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,8BAA8B,EAAE,MAAM,oBAAoB,CAAC;AAEzE,KAAK,SAAS,GAAG,MAAM,GAAG,MAAM,CAAC;AAEjC,MAAM,MAAM,cAAc,GAAG;IAC3B,OAAO,EAAE,KAAK,CAAC;IACf,EAAE,EAAE,SAAS,CAAC;IACd,MAAM,EAAE,MAAM,CAAC;IACf,MAAM,CAAC,EAAE,OAAO,CAAC;CAClB,CAAC;AAEF,MAAM,MAAM,mBAAmB,GAAG;IAChC,OAAO,EAAE,KAAK,CAAC;IACf,MAAM,EAAE,MAAM,CAAC;IACf,MAAM,CAAC,EAAE,OAAO,CAAC;CAClB,CAAC;AAEF,MAAM,MAAM,eAAe,GAAG;IAC5B,OAAO,EAAE,KAAK,CAAC;IACf,EAAE,EAAE,SAAS,CAAC;IACd,MAAM,CAAC,EAAE,OAAO,CAAC;IACjB,KAAK,CAAC,EAAE;QAAE,IAAI,EAAE,MAAM,CAAC;QAAC,OAAO,EAAE,MAAM,CAAC;QAAC,IAAI,CAAC,EAAE,OAAO,CAAA;KAAE,CAAC;CAC3D,CAAC;AAEF,MAAM,MAAM,mBAAmB,GAAG,CAAC,MAAM,EAAE,MAAM,EAAE,MAAM,EAAE,OAAO,KAAK,IAAI,CAAC;AAW5E;;;;;;;GAOG;AACH,qBAAa,kBAAkB;IAQ3B,OAAO,CAAC,QAAQ,CAAC,IAAI;IACrB,OAAO,CAAC,QAAQ,CAAC,gBAAgB;IACjC,OAAO,CAAC,QAAQ,CAAC,WAAW,CAAC;IAT/B,OAAO,CAAC,MAAM,CAAK;IACnB,OAAO,CAAC,QAAQ,CAAC,OAAO,CAAiC;IACzD,OAAO,CAAC,MAAM,CAAM;IACpB,OAAO,CAAC,cAAc,CAAoC;IAC1D,OAAO,CAAC,QAAQ,CAAS;gBAGN,IAAI,EAAE,8BAA8B,EACpC,gBAAgB,GAAE,MAAmC,EACrD,WAAW,CAAC,GAAE,CAAC,IAAI,EAAE,8BAA8B,KAAK,IAAI,aAAA;IAS/E,sBAAsB,CAAC,OAAO,EAAE,mBAAmB;IAInD,WAAW,CAAC,MAAM,EAAE,MAAM,EAAE,MAAM,CAAC,EAAE,OAAO,GAAG,OAAO,CAAC,OAAO,CAAC;IAoB/D,gBAAgB,CAAC,MAAM,EAAE,MAAM,EAAE,MAAM,CAAC,EAAE,OAAO;IAMjD,UAAU,IAAI,OAAO;IAIrB,OAAO,CAAC,GAAG,EAAE,KAAK;IAUlB,OAAO,CAAC,UAAU;IAQlB,OAAO,CAAC,aAAa;IAWrB,OAAO,CAAC,MAAM;IAWd,OAAO,CAAC,UAAU;CAyBnB"}

package/dist/jsonrpc-client.js

@@ -11,14 +11,16 @@ const DEFAULT_REQUEST_TIMEOUT_MS = 120_000;
 export class JsonRpcStdioClient {
     proc;
     requestTimeoutMs;
+    killProcess;
     nextId = 1;
     pending = new Map();
     buffer = "";
     onNotification = null;
     disposed = false;
-    constructor(proc, requestTimeoutMs = DEFAULT_REQUEST_TIMEOUT_MS) {
+    constructor(proc, requestTimeoutMs = DEFAULT_REQUEST_TIMEOUT_MS, killProcess) {
         this.proc = proc;
         this.requestTimeoutMs = requestTimeoutMs;
+        this.killProcess = killProcess;
         proc.stdout.setEncoding("utf8");
         proc.stdout.on("data", (chunk) => this.ingest(chunk));
         proc.once("close", () => this.dispose(new Error("app-server subprocess closed")));
@@ -78,7 +80,12 @@ export class JsonRpcStdioClient {
     killUnhealthy(err) {
         this.dispose(err);
         if (this.proc.exitCode === null && this.proc.signalCode === null) {
-            this.proc.kill("SIGTERM");
+            if (this.killProcess) {
+                this.killProcess(this.proc);
+            }
+            else {
+                this.proc.kill("SIGTERM");
+            }
         }
     }
     ingest(chunk) {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@parall/codex-agent",
-  "version": "1.28.1",
+  "version": "1.29.1",
   "description": "Codex CLI bridge runtime for self-hosted Parall agents",
   "license": "MIT",
   "repository": {
@@ -26,9 +26,9 @@
   ],
   "dependencies": {
     "smol-toml": "^1.6.1",
-    "@parall/agent-core": "1.28.1",
-    "@parall/cli": "1.28.1",
-    "@parall/sdk": "1.28.1"
+    "@parall/agent-core": "1.29.1",
+    "@parall/cli": "1.29.1",
+    "@parall/sdk": "1.29.1"
   },
   "devDependencies": {
     "@types/node": "^22.0.0",

package/src/dispatch.ts

@@ -1,5 +1,4 @@
-import { spawn, type ChildProcessWithoutNullStreams } from "node:child_process";
-import { execSync } from "node:child_process";
+import { execSync, spawn, type ChildProcessWithoutNullStreams } from "node:child_process";
 import { randomUUID } from "node:crypto";
 import * as fs from "node:fs";
 import {
@@ -58,12 +57,28 @@ type TurnEventEnvelope =
  * main + fork can interleave turns on the same stdio pipe. We route
  * notifications by threadId the server stamps on every item/turn event.
  */
+const IS_WIN32 = process.platform === "win32";
+
+function quoteWin32Arg(arg: string): string {
+  if (!/[\s"&|^<>()]/.test(arg)) return arg;
+  return `"${arg.replace(/"/g, '""')}"`;
+}
+
+function killWin32Tree(pid: number): boolean {
+  try {
+    execSync(`taskkill /T /F /PID ${pid}`, { windowsHide: true, stdio: "ignore" });
+    return true;
+  } catch { return false; }
+}
+
 export class CodexAppServerAdapter implements DispatchAdapter {
   private client: JsonRpcStdioClient | null = null;
   private proc: ChildProcessWithoutNullStreams | null = null;
   private initialized = false;
   private startPromise: Promise<void> | null = null;
   private readonly activeTurns = new Map<string, TurnSink>();
+  private readonly activeTurnIds = new Map<string, string>();
+  private readonly pendingInjections = new Map<string, number>();
   private readonly resumedThreadIds = new Set<string>();
   private stopping = false;
 
@@ -94,7 +109,52 @@ export class CodexAppServerAdapter implements DispatchAdapter {
     if (config.reasoningEffort !== undefined) this.opts.reasoningEffort = config.reasoningEffort ?? undefined;
   }
 
+  async enqueueDuringDispatch(sessionKey: string, body: string): Promise<boolean> {
+    const client = this.client;
+    if (!client || client.isDisposed()) return false;
+    const threadId = this.opts.sessionManager.getThreadId(sessionKey);
+    if (!threadId) return false;
+    const turnId = this.activeTurnIds.get(threadId);
+    if (!turnId) return false;
+    try {
+      await client.sendRequest("turn/steer", {
+        threadId,
+        expectedTurnId: turnId,
+        input: buildTurnInput(body, []),
+      });
+      this.pendingInjections.set(sessionKey, (this.pendingInjections.get(sessionKey) ?? 0) + 1);
+      return true;
+    } catch (err) {
+      this.opts.log?.warn?.(`codex-agent: turn/steer failed: ${errToString(err)}`);
+      return false;
+    }
+  }
+
+  hasPendingInjections(sessionKey: string): boolean {
+    return (this.pendingInjections.get(sessionKey) ?? 0) > 0;
+  }
+
   async *dispatch({ event, bodyForAgent, sessionKey, context }: DispatchOpts): AsyncIterable<RuntimeEvent> {
+    const pending = this.pendingInjections.get(sessionKey) ?? 0;
+    if (pending > 0) {
+      this.pendingInjections.delete(sessionKey);
+      const threadId = this.opts.sessionManager.getThreadId(sessionKey);
+      if (threadId && this.client && !this.client.isDisposed()) {
+        (this.opts.log ?? context.log)?.info?.(
+          `codex-agent[${context.accountId}]: ${pending} steer injection(s) already sent; skipping turn/start`,
+        );
+        yield {
+          type: "runtime_session",
+          runtimeSessionId: threadId,
+          runtimeLaneKey: sessionKey,
+        };
+        return;
+      }
+      (this.opts.log ?? context.log)?.warn?.(
+        `codex-agent[${context.accountId}]: pending steer invalidated (subprocess died); falling through to normal dispatch`,
+      );
+    }
+
     await this.ensureStarted(context.log);
     // After ensureStarted resolves the subprocess could still die before we
     // capture the client (handleSubprocessClose nulls this.client). Yield a
@@ -247,7 +307,8 @@ export class CodexAppServerAdapter implements DispatchAdapter {
         threadId = freshThreadId;
       }
 
-      void turnStartResult; // turnId comes back here but isn't needed — we key by threadId
+      const turnId = extractTurnId(turnStartResult);
+      if (turnId) this.activeTurnIds.set(threadId, turnId);
       yield {
         type: "runtime_session",
         runtimeSessionId: threadId,
@@ -287,8 +348,8 @@ export class CodexAppServerAdapter implements DispatchAdapter {
     } finally {
       releasePreparedAttachments();
       this.activeTurns.delete(threadId!);
+      this.activeTurnIds.delete(threadId!);
       if (!sawTurnEnd) {
-        // Defensive: if we bailed early, make sure we leave no dangling sink.
         sink.close();
       }
     }
@@ -307,10 +368,18 @@ export class CodexAppServerAdapter implements DispatchAdapter {
     if (!parentThreadId) return null;
     const handle = this.opts.sessionManager.createForkSessionKey();
     try {
-      const result = await client.sendRequest("thread/fork", {
+      const forkParams: Record<string, unknown> = {
         threadId: parentThreadId,
         ephemeral: true,
-      });
+      };
+      if (this.opts.useParallProvider) {
+        forkParams.modelProvider = "parall";
+      }
+      if (this.opts.model) forkParams.model = this.opts.model;
+      if (this.opts.reasoningEffort) {
+        forkParams.config = { modelReasoningEffort: this.opts.reasoningEffort };
+      }
+      const result = await client.sendRequest("thread/fork", forkParams);
       const forkedThreadId = extractThreadId(result);
       if (!forkedThreadId) {
         this.opts.log?.warn?.("codex-agent: thread/fork returned no thread id");
@@ -339,9 +408,13 @@ export class CodexAppServerAdapter implements DispatchAdapter {
     this.proc = null;
     this.client = null;
     this.initialized = false;
+    this.activeTurnIds.clear();
+    this.pendingInjections.clear();
     if (client) client.dispose(new Error("adapter stopped"));
     if (proc && proc.exitCode === null && proc.signalCode === null) {
-      proc.kill("SIGTERM");
+      if (!IS_WIN32 || !proc.pid || !killWin32Tree(proc.pid)) {
+        proc.kill("SIGTERM");
+      }
     }
   }
 
@@ -352,6 +425,8 @@ export class CodexAppServerAdapter implements DispatchAdapter {
         activeSink.close();
       }
       this.activeTurns.clear();
+      this.activeTurnIds.clear();
+      this.pendingInjections.clear();
       this.client = null;
       this.proc = null;
       this.initialized = false;
@@ -393,10 +468,13 @@ export class CodexAppServerAdapter implements DispatchAdapter {
     }
     const args = ["app-server", "--listen", "stdio://"];
     (log ?? this.opts.log)?.info?.(`codex-agent: spawning ${this.opts.codexBin} ${args.join(" ")}`);
-    const proc = spawn(this.opts.codexBin, args, {
+    const proc = spawn(
+      IS_WIN32 ? quoteWin32Arg(this.opts.codexBin) : this.opts.codexBin,
+      IS_WIN32 ? args.map(quoteWin32Arg) : args, {
       cwd: this.opts.workspaceDir,
       env,
       stdio: ["pipe", "pipe", "pipe"],
+      shell: IS_WIN32,
     }) as ChildProcessWithoutNullStreams;
 
     proc.stderr.setEncoding("utf8");
@@ -409,7 +487,11 @@ export class CodexAppServerAdapter implements DispatchAdapter {
     // start), we kill the half-spawned subprocess and clear local refs here
     // — leaving them on `this` would leak the orphan process and cause the
     // next ensureStarted() to spawn a second app-server on top of it.
-    const client = new JsonRpcStdioClient(proc);
+    const client = new JsonRpcStdioClient(proc, undefined, (p) => {
+      if (!IS_WIN32 || !p.pid || !killWin32Tree(p.pid)) {
+        p.kill("SIGTERM");
+      }
+    });
     client.setNotificationHandler((method, params) => this.routeNotification(method, params));
 
     proc.once("close", (code, signal) => this.handleSubprocessClose(proc, code, signal, log));
@@ -423,7 +505,11 @@ export class CodexAppServerAdapter implements DispatchAdapter {
       client.sendNotification("initialized", {});
     } catch (err) {
       client.dispose(err instanceof Error ? err : new Error(String(err)));
-      if (proc.exitCode === null && proc.signalCode === null) proc.kill("SIGTERM");
+      if (proc.exitCode === null && proc.signalCode === null) {
+        if (!IS_WIN32 || !proc.pid || !killWin32Tree(proc.pid)) {
+          proc.kill("SIGTERM");
+        }
+      }
       throw err;
     }
 
@@ -459,6 +545,8 @@ export class CodexAppServerAdapter implements DispatchAdapter {
       activeSink.close();
     }
     this.activeTurns.clear();
+    this.activeTurnIds.clear();
+    this.pendingInjections.clear();
     this.resumedThreadIds.clear();
     this.client = null;
     this.proc = null;
@@ -531,6 +619,7 @@ export class CodexAppServerAdapter implements DispatchAdapter {
       sink.push({ kind: "runtime", event });
     }
     if (method === "turn/completed") {
+      this.activeTurnIds.delete(threadId);
       sink.push({ kind: "turn_end", threadId });
     }
   }
@@ -627,6 +716,15 @@ function extractThreadId(result: unknown): string | undefined {
   return undefined;
 }
 
+function extractTurnId(result: unknown): string | undefined {
+  if (!result || typeof result !== "object") return undefined;
+  const r = result as Record<string, unknown>;
+  if (typeof r.turnId === "string") return r.turnId;
+  const turn = r.turn as Record<string, unknown> | undefined;
+  if (turn && typeof turn.id === "string") return turn.id;
+  return undefined;
+}
+
 function extractThreadIdFromNotification(params: unknown): string | undefined {
   if (!params || typeof params !== "object") return undefined;
   const p = params as Record<string, unknown>;

package/src/index.ts

@@ -1,7 +1,7 @@
 #!/usr/bin/env node
 
 import * as os from "node:os";
-import { ParallAgentGateway, createPlatformConfigManager, isPlatformManagedProfile, parseShutdownDeadlineMs } from "@parall/agent-core";
+import { ParallAgentGateway, createPlatformConfigManager, createLogger, isPlatformManagedProfile, parseShutdownDeadlineMs } from "@parall/agent-core";
 import { ApiError, ParallClient, ParallWs } from "@parall/sdk";
 import {
   buildCodexRuntimeKey,
@@ -15,13 +15,7 @@ import { CodexAppServerAdapter } from "./dispatch.js";
 import { CodexSessionManager } from "./session-manager.js";
 import { ensureCodexWorkspace, ensureParallProvider, ensureWorkspaceTrusted, isParallProxyMode } from "./workspace.js";
 
-function createLogger(prefix: string) {
-  return {
-    info: (msg: string) => console.log(`[${prefix}] ${msg}`),
-    warn: (msg: string) => console.warn(`[${prefix}] ${msg}`),
-    error: (msg: string) => console.error(`[${prefix}] ${msg}`),
-  };
-}
+const log = createLogger("codex-agent");
 
 async function getAgentMeWithLegacyFallback(client: ParallClient, orgId: string) {
   try {
@@ -37,7 +31,6 @@ async function getAgentMeWithLegacyFallback(client: ParallClient, orgId: string)
 
 async function main() {
   const config = resolveCodexAgentConfig(process.env);
-  const log = createLogger("codex-agent");
 
   const client = new ParallClient({
     baseUrl: config.apiUrl,
@@ -156,6 +149,6 @@ async function main() {
 }
 
 main().catch((err) => {
-  console.error(`[codex-agent] fatal: ${String(err)}`);
+  log.error(`fatal: ${String(err)}`);
   process.exitCode = 1;
 });

package/src/jsonrpc-client.ts

@@ -51,6 +51,7 @@ export class JsonRpcStdioClient {
   constructor(
     private readonly proc: ChildProcessWithoutNullStreams,
     private readonly requestTimeoutMs: number = DEFAULT_REQUEST_TIMEOUT_MS,
+    private readonly killProcess?: (proc: ChildProcessWithoutNullStreams) => void,
   ) {
     proc.stdout.setEncoding("utf8");
     proc.stdout.on("data", (chunk: string) => this.ingest(chunk));
@@ -114,7 +115,11 @@ export class JsonRpcStdioClient {
   private killUnhealthy(err: Error) {
     this.dispose(err);
     if (this.proc.exitCode === null && this.proc.signalCode === null) {
-      this.proc.kill("SIGTERM");
+      if (this.killProcess) {
+        this.killProcess(this.proc);
+      } else {
+        this.proc.kill("SIGTERM");
+      }
     }
   }