@parall/codex-agent 1.45.0 → 1.46.0

package/dist/dispatch.d.ts

@@ -1,5 +1,6 @@
 import type { CleanupForkOpts, DispatchAdapter, DispatchOpts, ForkOpts, ForkSessionHandle, GatewayLogger, RuntimeEvent } from '@parall/agent-core';
 import type { CodexAgentConfig } from './config.js';
+import { type NotificationTap } from './instructions-refresh.js';
 import type { CodexSessionManager } from './session-manager.js';
 type CodexAppServerAdapterOptions = Pick<CodexAgentConfig, 'approvalPolicy' | 'codexBin' | 'codexHome' | 'model' | 'reasoningEffort' | 'sandbox' | 'workspaceDir'> & {
     sessionManager: CodexSessionManager;
@@ -22,19 +23,22 @@ type CodexAppServerAdapterOptions = Pick<CodexAgentConfig, 'approvalPolicy' | 'c
      * which coupled the prompt to codex's interactive workspace-trust concept
      * and made the bridge write into the operator's own config on shared homes.
      *
-     * Where it lands, live-probed on 0.144.1 — the CLI accepts the param on all
-     * three entrypoints but only `thread/start` APPLIES it (instructions are
-     * baked into the thread there). `thread/resume` keeps the thread's own copy;
-     * `thread/fork` inherits the parent's. The bridge sends it on all three
-     * anyway: a failed resume falls back to thread/start on the same params, and
-     * a future CLI that honors it then needs no bridge change.
+     * Where it lands on 0.144.1: `thread/start` bakes it in (canonical AND
+     * model-visible at once); a fresh-process `thread/resume` updates only the
+     * thread's CANONICAL configuration (a resume of a still-running thread
+     * ignores every override); `thread/fork` inherits the parent's; compaction
+     * rebuilds the model-visible context from the canonical configuration.
      *
-     * Consequence: updateConfig() changes what the NEXT thread/start sends; it
-     * cannot re-instruct an already-persisted thread. Inherited from the retired
-     * channel, not introduced —
-     * docs/tech-debt/codex-persisted-thread-prompt-refresh.md.
+     * Consequence: updateConfig() changes what the NEXT thread open sends; for
+     * the persisted main thread, the lazy restart's fresh-process resume plus
+     * one explicit compaction converge both planes before the next turn — the
+     * full two-plane semantics and evidence live in instructions-refresh.ts.
      */
     developerInstructions?: string;
+    /** Override the compaction wait budget for the instructions refresh (tests). */
+    instructionsCompactTimeoutMs?: number;
+    /** Override the post-interrupt grace for the instructions refresh (tests). */
+    instructionsInterruptGraceMs?: number;
 };
 /**
  * Bridge driver backed by `codex app-server --listen stdio://`.
@@ -60,7 +64,22 @@ export declare class CodexAppServerAdapter implements DispatchAdapter {
     private readonly activeTurnIds;
     private readonly pendingInjections;
     private readonly resumedThreadIds;
+    /** Threads whose reconcile compaction is in flight — tap-only traffic. */
+    private readonly reconcilingThreadIds;
+    /**
+     * Set when a stalled compaction left (possibly) a zombie turn on the main
+     * thread. Until the subprocess ACTUALLY restarts, main-lane redrives must
+     * not open/compact/turn-start the thread: re-entering the zombie process
+     * lets a second compaction's watcher misattribute the zombie's close as a
+     * plain failure, dropping the stalled marker and re-arming the
+     * fresh-thread rotation this state exists to prevent. Cleared where the
+     * zombie dies: subprocess teardown.
+     */
+    private mainLaneQuarantined;
+    private readonly notificationTaps;
+    private readonly instructionsRefresher;
     private stopping;
+    private lastUnroutedNotificationWarnAt;
     /**
      * Store an active turn sink keyed by threadId. If a sink already exists for
      * the same threadId, log a warning and fail the existing sink — this
@@ -71,6 +90,15 @@ export declare class CodexAppServerAdapter implements DispatchAdapter {
      */
     private setActiveTurn;
     constructor(opts: CodexAppServerAdapterOptions);
+    /** Register a listener for every server notification; returns unregister. */
+    addNotificationTap(tap: NotificationTap): () => void;
+    /**
+     * Tell tap waiters the subprocess is gone so they abort immediately —
+     * no further notifications will ever arrive, and a waiter left to its
+     * own timeout would stall its dispatch for the full compaction budget.
+     * Mirrors the global-error broadcast routeNotification does for sinks.
+     */
+    private notifyTapsDisposed;
     updateConfig(config: {
         model?: string | null;
         reasoningEffort?: string | null;
@@ -80,6 +108,14 @@ export declare class CodexAppServerAdapter implements DispatchAdapter {
     abortDispatch(sessionKey: string): void;
     hasPendingInjections(sessionKey: string): boolean;
     dispatch({ event, bodyForAgent, sessionKey, context, }: DispatchOpts): AsyncIterable<RuntimeEvent>;
+    /**
+     * Bring the app-server up and open (start or resume) the thread for this
+     * dispatch, then reconcile the main thread's EFFECTIVE instructions plane.
+     * Extracted from dispatch() so the convergence re-check there can loop back
+     * through the restart path without duplicating the open logic. Errors are
+     * returned, not thrown — the generator yields them as runtime events.
+     */
+    private openDispatchTarget;
     getBranchPoint(_sessionKey: string): string | undefined;
     forkSession({ sessionKey: parentSessionKey }: ForkOpts): Promise<ForkSessionHandle | null>;
     cleanupFork({ fork }: CleanupForkOpts): void;
@@ -90,12 +126,21 @@ export declare class CodexAppServerAdapter implements DispatchAdapter {
      * to the next dispatch with no active turns — never kills an in-flight turn;
      * thread state survives via thread/resume.
      *
-     * A restart does NOT re-instruct an already-persisted thread — see the
-     * `developerInstructions` option doc. The capability shim dir on PATH is what
-     * makes a grant/revocation effective immediately.
+     * For the persisted main thread this restart is also the CANONICAL half of
+     * the instructions refresh: only a fresh-process thread/resume applies the
+     * updated developerInstructions to the thread's configuration (a resume of
+     * a still-running thread ignores it). The EFFECTIVE half is the explicit
+     * compaction in instructions-refresh.ts. The capability shim dir on PATH is
+     * what makes a grant/revocation's TOOLS effective immediately.
      */
     requestProcessRestart(): void;
     private restartRequested;
+    /**
+     * Dispatches currently inside their open/reconcile phase — real work on
+     * the subprocess (thread open, possibly a compaction turn) that predates
+     * any TurnSink registration, so activeTurns alone cannot gate the restart.
+     */
+    private openingDispatches;
     private applyPendingRestart;
     stop(): Promise<void>;
     private ensureStarted;

package/dist/dispatch.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"dispatch.d.ts","sourceRoot":"","sources":["../src/dispatch.ts"],"names":[],"mappings":"AAQA,OAAO,KAAK,EACV,eAAe,EACf,eAAe,EACf,YAAY,EACZ,QAAQ,EACR,iBAAiB,EACjB,aAAa,EACb,YAAY,EACb,MAAM,oBAAoB,CAAC;AAQ5B,OAAO,KAAK,EAAE,gBAAgB,EAAE,MAAM,aAAa,CAAC;AAGpD,OAAO,KAAK,EAAE,mBAAmB,EAAE,MAAM,sBAAsB,CAAC;AAGhE,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,cAAc,CAAC,EAAE,MAAM,CAAC;IACxB,iBAAiB,CAAC,EAAE,OAAO,CAAC;IAC5B;;;;;;OAMG;IACH,gBAAgB,CAAC,EAAE,MAAM,CAAC;IAC1B;;;;;;;;;;;;;;;;;;OAkBG;IACH,qBAAqB,CAAC,EAAE,MAAM,CAAC;CAChC,CAAC;AAEF;;;;;;;;;;;;;GAaG;AACH,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;QACnB,KAAK,CAAC,EAAE,MAAM,GAAG,IAAI,CAAC;QACtB,eAAe,CAAC,EAAE,MAAM,GAAG,IAAI,CAAC;QAChC,qBAAqB,CAAC,EAAE,MAAM,GAAG,IAAI,CAAC;KACvC,GAAG,IAAI;IAQF,qBAAqB,CAAC,UAAU,EAAE,MAAM,EAAE,IAAI,EAAE,MAAM,GAAG,OAAO,CAAC,OAAO,CAAC;IAqB/E,aAAa,CAAC,UAAU,EAAE,MAAM,GAAG,IAAI;IAUvC,oBAAoB,CAAC,UAAU,EAAE,MAAM,GAAG,OAAO;IAI1C,QAAQ,CAAC,EACd,KAAK,EACL,YAAY,EACZ,UAAU,EACV,OAAO,GACR,EAAE,YAAY,GAAG,aAAa,CAAC,YAAY,CAAC;IA8P7C,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;IAqChG,WAAW,CAAC,EAAE,IAAI,EAAE,EAAE,eAAe;IAIrC,OAAO,CAAC,cAAc;IAKtB;;;;;;;;;OASG;IACH,qBAAqB,IAAI,IAAI;IAI7B,OAAO,CAAC,gBAAgB,CAAS;YAEnB,mBAAmB;IAS3B,IAAI;YAuBI,aAAa;YA2Bb,OAAO;IAuGrB,OAAO,CAAC,qBAAqB;YAmCf,UAAU;IAoDxB,OAAO,CAAC,iBAAiB;CA2B1B"}
+{"version":3,"file":"dispatch.d.ts","sourceRoot":"","sources":["../src/dispatch.ts"],"names":[],"mappings":"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"}