@parall/codex-agent 1.29.0 → 1.29.1

package/dist/dispatch.d.ts

@@ -14,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;
     /**
@@ -30,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":"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;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;YAeI,aAAa;YAyBb,OAAO;IAyErB,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

@@ -41,6 +41,8 @@ export class CodexAppServerAdapter {
     initialized = false;
     startPromise = null;
     activeTurns = new Map();
+    activeTurnIds = new Map();
+    pendingInjections = new Map();
     resumedThreadIds = new Set();
     stopping = false;
     /**
@@ -69,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
@@ -224,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,
@@ -264,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();
             }
         }
@@ -284,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");
@@ -314,6 +369,8 @@ 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) {
@@ -329,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;
@@ -437,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;
@@ -502,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 });
         }
     }
@@ -592,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/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@parall/codex-agent",
-  "version": "1.29.0",
+  "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.29.0",
-    "@parall/cli": "1.29.0",
-    "@parall/sdk": "1.29.0"
+    "@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

@@ -77,6 +77,8 @@ export class CodexAppServerAdapter implements DispatchAdapter {
   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;
 
@@ -107,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
@@ -260,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,
@@ -300,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();
       }
     }
@@ -320,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");
@@ -352,6 +408,8 @@ 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) {
       if (!IS_WIN32 || !proc.pid || !killWin32Tree(proc.pid)) {
@@ -367,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;
@@ -485,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;
@@ -557,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 });
     }
   }
@@ -653,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>;