@with-logic/elwood 0.2.0 → 0.2.2

package/dist/codex/session/turn-commit.js

@@ -0,0 +1,97 @@
+/**
+ * Gives Codex a bounded time to record the turn its `Stop` hook ended before a graceful
+ * shutdown signals it. Implements PRD §5.7 (shutting down after a Codex turn) and C-LIFE-13.
+ *
+ * Codex runs the `Stop` hook before it records the turn's completion in its transcript,
+ * and Elwood reports `ready` from that hook. Codex 0.164.0 signaled after the hook returns
+ * but before that record is written exits without it, and the resumed conversation then
+ * ends in "Conversation interrupted" (docs/cli-behavior.md, "Resume lifecycle"). The wait
+ * also ends when the CLI exits or after `turnCommitWaitMs`; shutdown then proceeds, and a
+ * turn Codex has still not recorded can be lost, which the session is warned of.
+ */
+import { outsideStopInput } from "../../core/stop-input.js";
+import { payloadOf } from "../transcript/payload.js";
+import { isTurnEndPayload } from "../transcript/turn-end.js";
+import { turnCommitWaitExpiredWarning } from "./warnings.js";
+/** The longest `stop`/`teardown` wait for the record before signaling anyway. */
+export const turnCommitWaitMs = 2_000;
+/** Transcript re-read cadence while waiting; the watcher's own poll is 250 ms. */
+const turnCommitPollMs = 20;
+export class CodexTurnCommit {
+    pending;
+    poll;
+    cliExit;
+    session;
+    /**
+     * `poll` reads newly committed transcript items into `observe` and contains its own
+     * failures. `cliExit` is the session's shared latch on the CLI's exit; `session` is
+     * warned when the bound ends the wait.
+     */
+    constructor(poll, cliExit, session) {
+        this.poll = poll;
+        this.cliExit = cliExit;
+        this.session = session;
+    }
+    /**
+     * A `Stop` hook for `turnId` arrived. Registered before any observer of that hook runs,
+     * since an observer may shut the session down at once.
+     */
+    expect(turnId) {
+        const { promise, resolve } = Promise.withResolvers();
+        this.pending = { turnId, waitFinished: promise, release: resolve };
+    }
+    /** Ends the wait for `turnId`: its end was recorded, or its `Stop` was blocked. */
+    release(turnId) {
+        const pending = this.pending;
+        if (pending?.turnId !== turnId)
+            return;
+        this.pending = undefined;
+        pending.release();
+    }
+    /**
+     * Reads one committed transcript item. Only a turn-end record carrying the pending
+     * turn's id releases the wait: every captured end record carries one, and a record
+     * without it could be an older turn's backlog.
+     */
+    observe(item) {
+        const payload = payloadOf(item);
+        const turnId = payload?.["turn_id"];
+        if (payload && isTurnEndPayload(payload) && typeof turnId === "string")
+            this.release(turnId);
+    }
+    /**
+     * Runs `shutdown` once the pending turn is recorded, its `Stop` is blocked, the CLI
+     * exits, or `turnCommitWaitMs` passes, re-reading the transcript meanwhile. With no
+     * turn pending, `shutdown` starts in the same tick. A turn not recorded within the
+     * bound is reported to the session once and not waited for again. Callers close
+     * queued input and loops first: only the signal waits for the record.
+     */
+    beforeShutdown(shutdown) {
+        const pending = this.pending;
+        if (!pending)
+            return shutdown();
+        pending.wait ??= this.waitFor(pending);
+        return pending.wait.then(shutdown);
+    }
+    waitFor(pending) {
+        // Internal work outlives a Stop callback that called `stop()` (C-HOOK-22).
+        const poll = outsideStopInput(() => setInterval(this.poll, turnCommitPollMs));
+        const released = pending.waitFinished.then(() => true);
+        return Promise.race([released, this.cliExit.within(turnCommitWaitMs)]).then((ended) => {
+            clearInterval(poll);
+            if (this.pending === pending)
+                this.pending = undefined;
+            if (!ended)
+                this.reportExpired();
+        });
+    }
+    /** A throwing listener of the warning must not keep Codex running. */
+    reportExpired() {
+        const warning = turnCommitWaitExpiredWarning(this.session.elwoodSessionId, turnCommitWaitMs);
+        try {
+            this.session.emitWarnings([warning]);
+        }
+        catch { } // the warning's listeners failed; the shutdown still proceeds
+    }
+}
+//# sourceMappingURL=turn-commit.js.map

package/dist/codex/session/turn-commit.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"turn-commit.js","sourceRoot":"","sources":["../../../src/codex/session/turn-commit.ts"],"names":[],"mappings":"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"}

package/dist/codex/session/warnings.d.ts

@@ -1,11 +1,14 @@
 /**
  * Builders for the Codex session's lifecycle warnings: the config.toml restore
- * outcomes after a model switch (PRD §5.3, C-CODEX-14) and the clipboard-restore
- * failure after an image attach (§5.3, C-API-46). Every warning is live-only
- * (§5.7) and content-free: `raw` carries a path or a bounded errno code, never
- * config contents, clipboard data, or a raw error message.
+ * outcomes after a model switch (PRD §5.3, C-CODEX-14), the clipboard-restore
+ * failure after an image attach and a pasted image's copy left after exit (§5.3, C-API-46),
+ * and a shutdown that signaled Codex
+ * before it recorded the ended turn (§5.7, C-LIFE-13). Every warning is live-only
+ * (§5.7) and content-free: `raw` carries a path, a fixed token, or a bounded errno
+ * code, never config contents, clipboard data, or a raw error message.
  */
 import type { ElwoodWarningEvent } from "../../core/types.ts";
+import type { ImageCopyErrorCode, ImageCopyRemovalFailedWarning } from "../../core/warnings/images.ts";
 type RestoreWarning = Extract<ElwoodWarningEvent, {
     readonly code: "codex_default_model_persisted";
 }>;
@@ -15,14 +18,18 @@ declare const restoreSkippedMessages: {
     readonly no_snapshot: "Codex persisted the picker selection as the user's default model in a config.toml that did not exist before the switch; Elwood left the new file in place because there was no prior config to restore.";
 };
 /** No restore: concurrent edits, raw takeover, or no prior snapshot left the default in place. */
-export declare function codexRestoreSkippedWarning(elwoodSessionId: string, outcome: keyof typeof restoreSkippedMessages): RestoreWarning;
+export declare function codexRestoreSkippedWarning(elwoodSessionId: string, outcome: keyof typeof restoreSkippedMessages, configPath: string): RestoreWarning;
 /**
  * Both the picker automation and the config restore failed: the primary error is
  * preserved to the caller, so the swallowed restore failure is surfaced as a bounded
  * diagnostic — otherwise the user gets no signal that config.toml may stay mutated.
  */
-export declare function codexRestoreFailedWarning(elwoodSessionId: string, error: unknown): RestoreWarning;
+export declare function codexRestoreFailedWarning(elwoodSessionId: string, error: unknown, configPath: string): RestoreWarning;
 /** The clipboard text could not be restored after an image attach (content-free). */
 export declare function clipboardRestoreFailedWarning(elwoodSessionId: string): ElwoodWarningEvent;
+/** A copy Codex saved of a pasted image could not be removed (C-API-46). */
+export declare function imageCopyRemovalFailedWarning(elwoodSessionId: string, errorCode: ImageCopyErrorCode): ImageCopyRemovalFailedWarning;
+/** `stop`/`teardown` stopped waiting `waitMs` for the ended turn's record; shutdown proceeds. */
+export declare function turnCommitWaitExpiredWarning(elwoodSessionId: string, waitMs: number): ElwoodWarningEvent;
 export {};
 //# sourceMappingURL=warnings.d.ts.map

package/dist/codex/session/warnings.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"warnings.d.ts","sourceRoot":"","sources":["../../../src/codex/session/warnings.ts"],"names":[],"mappings":"AAAA;;;;;;GAMG;AAEH,OAAO,KAAK,EAAE,kBAAkB,EAAE,MAAM,qBAAqB,CAAC;AAI9D,KAAK,cAAc,GAAG,OAAO,CAC3B,kBAAkB,EAClB;IAAE,QAAQ,CAAC,IAAI,EAAE,+BAA+B,CAAA;CAAE,CACnD,CAAC;AAEF,QAAA,MAAM,sBAAsB;;;;CAOlB,CAAC;AAEX,kGAAkG;AAClG,wBAAgB,0BAA0B,CACxC,eAAe,EAAE,MAAM,EACvB,OAAO,EAAE,MAAM,OAAO,sBAAsB,GAC3C,cAAc,CAUhB;AAED;;;;GAIG;AACH,wBAAgB,yBAAyB,CAAC,eAAe,EAAE,MAAM,EAAE,KAAK,EAAE,OAAO,GAAG,cAAc,CAWjG;AAED,qFAAqF;AACrF,wBAAgB,6BAA6B,CAAC,eAAe,EAAE,MAAM,GAAG,kBAAkB,CAUzF"}
+{"version":3,"file":"warnings.d.ts","sourceRoot":"","sources":["../../../src/codex/session/warnings.ts"],"names":[],"mappings":"AAAA;;;;;;;;GAQG;AAEH,OAAO,KAAK,EAAE,kBAAkB,EAAE,MAAM,qBAAqB,CAAC;AAC9D,OAAO,KAAK,EACV,kBAAkB,EAClB,6BAA6B,EAC9B,MAAM,+BAA+B,CAAC;AAIvC,KAAK,cAAc,GAAG,OAAO,CAC3B,kBAAkB,EAClB;IAAE,QAAQ,CAAC,IAAI,EAAE,+BAA+B,CAAA;CAAE,CACnD,CAAC;AAEF,QAAA,MAAM,sBAAsB;;;;CAOlB,CAAC;AAEX,kGAAkG;AAClG,wBAAgB,0BAA0B,CACxC,eAAe,EAAE,MAAM,EACvB,OAAO,EAAE,MAAM,OAAO,sBAAsB,EAC5C,UAAU,EAAE,MAAM,GACjB,cAAc,CAUhB;AAED;;;;GAIG;AACH,wBAAgB,yBAAyB,CACvC,eAAe,EAAE,MAAM,EACvB,KAAK,EAAE,OAAO,EACd,UAAU,EAAE,MAAM,GACjB,cAAc,CAWhB;AAED,qFAAqF;AACrF,wBAAgB,6BAA6B,CAAC,eAAe,EAAE,MAAM,GAAG,kBAAkB,CAUzF;AAED,4EAA4E;AAC5E,wBAAgB,6BAA6B,CAC3C,eAAe,EAAE,MAAM,EACvB,SAAS,EAAE,kBAAkB,GAC5B,6BAA6B,CAW/B;AAED,iGAAiG;AACjG,wBAAgB,4BAA4B,CAC1C,eAAe,EAAE,MAAM,EACvB,MAAM,EAAE,MAAM,GACb,kBAAkB,CAUpB"}

package/dist/codex/session/warnings.js

@@ -1,11 +1,13 @@
 /**
  * Builders for the Codex session's lifecycle warnings: the config.toml restore
- * outcomes after a model switch (PRD §5.3, C-CODEX-14) and the clipboard-restore
- * failure after an image attach (§5.3, C-API-46). Every warning is live-only
- * (§5.7) and content-free: `raw` carries a path or a bounded errno code, never
- * config contents, clipboard data, or a raw error message.
+ * outcomes after a model switch (PRD §5.3, C-CODEX-14), the clipboard-restore
+ * failure after an image attach and a pasted image's copy left after exit (§5.3, C-API-46),
+ * and a shutdown that signaled Codex
+ * before it recorded the ended turn (§5.7, C-LIFE-13). Every warning is live-only
+ * (§5.7) and content-free: `raw` carries a path, a fixed token, or a bounded errno
+ * code, never config contents, clipboard data, or a raw error message.
  */
-import { codexConfigPath, restoreFailureRaw } from "../config/restore.js";
+import { restoreFailureRaw } from "../config/restore.js";
 import { CLIPBOARD_RESTORE_FAILED_MESSAGE } from "../images/clipboard.js";
 const restoreSkippedMessages = {
     interrupted: "Raw input took over the model picker; Elwood left changed model defaults in place because it could no longer attribute the change to its own operation.",
@@ -13,7 +15,7 @@ const restoreSkippedMessages = {
     no_snapshot: "Codex persisted the picker selection as the user's default model in a config.toml that did not exist before the switch; Elwood left the new file in place because there was no prior config to restore.",
 };
 /** No restore: concurrent edits, raw takeover, or no prior snapshot left the default in place. */
-export function codexRestoreSkippedWarning(elwoodSessionId, outcome) {
+export function codexRestoreSkippedWarning(elwoodSessionId, outcome, configPath) {
     return {
         elwoodSessionId,
         agent: "codex",
@@ -21,7 +23,7 @@ export function codexRestoreSkippedWarning(elwoodSessionId, outcome) {
         code: "codex_default_model_persisted",
         severity: "warning",
         message: restoreSkippedMessages[outcome],
-        raw: codexConfigPath(),
+        raw: configPath,
     };
 }
 /**
@@ -29,7 +31,7 @@ export function codexRestoreSkippedWarning(elwoodSessionId, outcome) {
  * preserved to the caller, so the swallowed restore failure is surfaced as a bounded
  * diagnostic — otherwise the user gets no signal that config.toml may stay mutated.
  */
-export function codexRestoreFailedWarning(elwoodSessionId, error) {
+export function codexRestoreFailedWarning(elwoodSessionId, error, configPath) {
     return {
         elwoodSessionId,
         agent: "codex",
@@ -37,7 +39,7 @@ export function codexRestoreFailedWarning(elwoodSessionId, error) {
         code: "codex_default_model_persisted",
         severity: "warning",
         message: "Codex may have persisted the picker selection as the user's default model: the model switch failed and restoring config.toml also failed.",
-        raw: restoreFailureRaw(codexConfigPath(), error),
+        raw: restoreFailureRaw(configPath, error),
     };
 }
 /** The clipboard text could not be restored after an image attach (content-free). */
@@ -52,4 +54,29 @@ export function clipboardRestoreFailedWarning(elwoodSessionId) {
         raw: "clipboard_restore_failed",
     };
 }
+/** A copy Codex saved of a pasted image could not be removed (C-API-46). */
+export function imageCopyRemovalFailedWarning(elwoodSessionId, errorCode) {
+    return {
+        elwoodSessionId,
+        agent: "codex",
+        source: "lifecycle",
+        code: "image_copy_removal_failed",
+        severity: "warning",
+        message: `Could not remove a temp copy Codex saved of a pasted image (${errorCode}); it is left for the OS to reap.`,
+        errorCode,
+        raw: `image_copy_removal_failed code=${errorCode}`,
+    };
+}
+/** `stop`/`teardown` stopped waiting `waitMs` for the ended turn's record; shutdown proceeds. */
+export function turnCommitWaitExpiredWarning(elwoodSessionId, waitMs) {
+    return {
+        elwoodSessionId,
+        agent: "codex",
+        source: "lifecycle",
+        code: "turn_commit_wait_expired",
+        severity: "warning",
+        message: `Elwood did not see Codex record the turn its Stop hook ended within ${waitMs / 1000} seconds of the shutdown request, and is shutting Codex down anyway. A resumed conversation may show that turn as interrupted.`,
+        raw: "turn_commit_wait_expired",
+    };
+}
 //# sourceMappingURL=warnings.js.map

package/dist/codex/session/warnings.js.map

@@ -1 +1 @@
-{"version":3,"file":"warnings.js","sourceRoot":"","sources":["../../../src/codex/session/warnings.ts"],"names":[],"mappings":"AAAA;;;;;;GAMG;AAGH,OAAO,EAAE,eAAe,EAAE,iBAAiB,EAAE,MAAM,sBAAsB,CAAC;AAC1E,OAAO,EAAE,gCAAgC,EAAE,MAAM,wBAAwB,CAAC;AAO1E,MAAM,sBAAsB,GAAG;IAC7B,WAAW,EACT,yJAAyJ;IAC3J,OAAO,EACL,+JAA+J;IACjK,WAAW,EACT,yMAAyM;CACnM,CAAC;AAEX,kGAAkG;AAClG,MAAM,UAAU,0BAA0B,CACxC,eAAuB,EACvB,OAA4C;IAE5C,OAAO;QACL,eAAe;QACf,KAAK,EAAE,OAAO;QACd,MAAM,EAAE,WAAW;QACnB,IAAI,EAAE,+BAA+B;QACrC,QAAQ,EAAE,SAAS;QACnB,OAAO,EAAE,sBAAsB,CAAC,OAAO,CAAC;QACxC,GAAG,EAAE,eAAe,EAAE;KACvB,CAAC;AACJ,CAAC;AAED;;;;GAIG;AACH,MAAM,UAAU,yBAAyB,CAAC,eAAuB,EAAE,KAAc;IAC/E,OAAO;QACL,eAAe;QACf,KAAK,EAAE,OAAO;QACd,MAAM,EAAE,WAAW;QACnB,IAAI,EAAE,+BAA+B;QACrC,QAAQ,EAAE,SAAS;QACnB,OAAO,EACL,2IAA2I;QAC7I,GAAG,EAAE,iBAAiB,CAAC,eAAe,EAAE,EAAE,KAAK,CAAC;KACjD,CAAC;AACJ,CAAC;AAED,qFAAqF;AACrF,MAAM,UAAU,6BAA6B,CAAC,eAAuB;IACnE,OAAO;QACL,eAAe;QACf,KAAK,EAAE,OAAO;QACd,MAAM,EAAE,WAAW;QACnB,IAAI,EAAE,0BAA0B;QAChC,QAAQ,EAAE,SAAS;QACnB,OAAO,EAAE,gCAAgC;QACzC,GAAG,EAAE,0BAA0B;KAChC,CAAC;AACJ,CAAC"}
+{"version":3,"file":"warnings.js","sourceRoot":"","sources":["../../../src/codex/session/warnings.ts"],"names":[],"mappings":"AAAA;;;;;;;;GAQG;AAOH,OAAO,EAAE,iBAAiB,EAAE,MAAM,sBAAsB,CAAC;AACzD,OAAO,EAAE,gCAAgC,EAAE,MAAM,wBAAwB,CAAC;AAO1E,MAAM,sBAAsB,GAAG;IAC7B,WAAW,EACT,yJAAyJ;IAC3J,OAAO,EACL,+JAA+J;IACjK,WAAW,EACT,yMAAyM;CACnM,CAAC;AAEX,kGAAkG;AAClG,MAAM,UAAU,0BAA0B,CACxC,eAAuB,EACvB,OAA4C,EAC5C,UAAkB;IAElB,OAAO;QACL,eAAe;QACf,KAAK,EAAE,OAAO;QACd,MAAM,EAAE,WAAW;QACnB,IAAI,EAAE,+BAA+B;QACrC,QAAQ,EAAE,SAAS;QACnB,OAAO,EAAE,sBAAsB,CAAC,OAAO,CAAC;QACxC,GAAG,EAAE,UAAU;KAChB,CAAC;AACJ,CAAC;AAED;;;;GAIG;AACH,MAAM,UAAU,yBAAyB,CACvC,eAAuB,EACvB,KAAc,EACd,UAAkB;IAElB,OAAO;QACL,eAAe;QACf,KAAK,EAAE,OAAO;QACd,MAAM,EAAE,WAAW;QACnB,IAAI,EAAE,+BAA+B;QACrC,QAAQ,EAAE,SAAS;QACnB,OAAO,EACL,2IAA2I;QAC7I,GAAG,EAAE,iBAAiB,CAAC,UAAU,EAAE,KAAK,CAAC;KAC1C,CAAC;AACJ,CAAC;AAED,qFAAqF;AACrF,MAAM,UAAU,6BAA6B,CAAC,eAAuB;IACnE,OAAO;QACL,eAAe;QACf,KAAK,EAAE,OAAO;QACd,MAAM,EAAE,WAAW;QACnB,IAAI,EAAE,0BAA0B;QAChC,QAAQ,EAAE,SAAS;QACnB,OAAO,EAAE,gCAAgC;QACzC,GAAG,EAAE,0BAA0B;KAChC,CAAC;AACJ,CAAC;AAED,4EAA4E;AAC5E,MAAM,UAAU,6BAA6B,CAC3C,eAAuB,EACvB,SAA6B;IAE7B,OAAO;QACL,eAAe;QACf,KAAK,EAAE,OAAO;QACd,MAAM,EAAE,WAAW;QACnB,IAAI,EAAE,2BAA2B;QACjC,QAAQ,EAAE,SAAS;QACnB,OAAO,EAAE,+DAA+D,SAAS,mCAAmC;QACpH,SAAS;QACT,GAAG,EAAE,kCAAkC,SAAS,EAAE;KACnD,CAAC;AACJ,CAAC;AAED,iGAAiG;AACjG,MAAM,UAAU,4BAA4B,CAC1C,eAAuB,EACvB,MAAc;IAEd,OAAO;QACL,eAAe;QACf,KAAK,EAAE,OAAO;QACd,MAAM,EAAE,WAAW;QACnB,IAAI,EAAE,0BAA0B;QAChC,QAAQ,EAAE,SAAS;QACnB,OAAO,EAAE,uEAAuE,MAAM,GAAG,IAAI,gIAAgI;QAC7N,GAAG,EAAE,0BAA0B;KAChC,CAAC;AACJ,CAAC"}

package/dist/codex/startup-prompts.d.ts

@@ -22,6 +22,7 @@ export declare class CodexStartupPromptResponder {
     private readonly lifetime;
     private skipGeneration;
     private updateAttempt;
+    private updateCallerOwned;
     private warnedBanners;
     private conversationStarted;
     constructor(elwoodSessionId?: string, autotrust?: boolean, onStateChange?: () => void, clearance?: TrustClearance, sessionInputHeld?: () => boolean);
@@ -29,6 +30,8 @@ export declare class CodexStartupPromptResponder {
     get closingSignal(): AbortSignal;
     get blockedPrompt(): "workspace_trust" | "hook_trust" | undefined;
     dispose(): void;
+    /** Raw caller input owns the startup prompt on screen (C-TRUST-01, C-CODEX-12). */
+    callerInput(): void;
     get inputBlocking(): boolean;
     /**
      * `write` answers trust; `writeAutomation` (default `write`) handles other prompts,

package/dist/codex/startup-prompts.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"startup-prompts.d.ts","sourceRoot":"","sources":["../../src/codex/startup-prompts.ts"],"names":[],"mappings":"AAAA;0CAC0C;AAE1C,OAAO,KAAK,EAAE,qBAAqB,EAAE,MAAM,4BAA4B,CAAC;AACxE,OAAO,KAAK,EAAE,qBAAqB,EAAE,MAAM,0BAA0B,CAAC;AAGtE,OAAO,KAAK,EAAE,cAAc,EAAE,MAAM,4BAA4B,CAAC;AACjE,OAAO,EAAwB,KAAK,gBAAgB,EAAE,MAAM,4BAA4B,CAAC;AACzF,OAAO,KAAK,EAAE,kBAAkB,EAAE,MAAM,kBAAkB,CAAC;AAO3D,OAAO,EAAE,qBAAqB,EAAE,MAAM,uBAAuB,CAAC;AAE9D,iFAAiF;AACjF,MAAM,MAAM,0BAA0B,GAAG,qBAAqB,CAAC,OAAO,CAAC,CAAC;AAExE,KAAK,wBAAwB,GAAG;IAC9B,QAAQ,CAAC,QAAQ,EAAE,SAAS,kBAAkB,EAAE,CAAC;IACjD,QAAQ,CAAC,QAAQ,EAAE,SAAS,0BAA0B,EAAE,CAAC;IACzD,QAAQ,CAAC,gBAAgB,CAAC,EAAE,MAAM,CAAC;CACpC,CAAC;AAEF,qBAAa,2BAA2B;IACtC,OAAO,CAAC,QAAQ,CAAC,eAAe,CAAS;IACzC,OAAO,CAAC,QAAQ,CAAC,KAAK,CAAgC;IACtD,OAAO,CAAC,QAAQ,CAAC,SAAS,CAAiB;IAC3C,OAAO,CAAC,QAAQ,CAAC,gBAAgB,CAAgB;IACjD,OAAO,CAAC,QAAQ,CAAC,YAAY,CAA2B;IACxD,OAAO,CAAC,QAAQ,CAAC,QAAQ,CAAyB;IAGlD,OAAO,CAAC,cAAc,CAAK;IAC3B,OAAO,CAAC,aAAa,CAAsD;IAE3E,OAAO,CAAC,aAAa,CAAqB;IAC1C,OAAO,CAAC,mBAAmB,CAAS;gBAGlC,eAAe,SAAK,EACpB,SAAS,UAAQ,EACjB,aAAa,CAAC,EAAE,MAAM,IAAI,EAC1B,SAAS,GAAE,cAAoC,EAC/C,gBAAgB,CAAC,EAAE,MAAM,OAAO;IASlC,gBAAgB,CAAC,KAAK,EAAE,MAAM,GAAG,IAAI;IAOrC,IAAI,aAAa,IAAI,WAAW,CAE/B;IAED,IAAI,aAAa,iDAEhB;IAED,OAAO,IAAI,IAAI;IAKf,IAAI,aAAa,IAAI,OAAO,CAE3B;IAED;;;;;;;OAOG;IACH,MAAM,CACJ,UAAU,EAAE,MAAM,EAClB,KAAK,EAAE,CAAC,KAAK,EAAE,MAAM,KAAK,gBAAgB,EAC1C,SAAS,CAAC,EAAE,MAAM,MAAM,EACxB,eAAe,GAAE,CAAC,KAAK,EAAE,MAAM,KAAK,gBAAgB,GAAG,OAAO,CAAC,qBAAqB,CAAS,EAC7F,cAAc,CAAC,EAAE,MAAM,MAAM,GAAG,SAAS,GACxC,wBAAwB;IAmE3B,0FAA0F;IAC1F,UAAU,IAAI,IAAI;IAIlB,OAAO,CAAC,WAAW;CAapB;AASD,wBAAgB,kBAAkB,CAAC,IAAI,EAAE,MAAM,EAAE,OAAO,EAAE,MAAM,GAAG,MAAM,GAAG,IAAI,CAE/E"}
+{"version":3,"file":"startup-prompts.d.ts","sourceRoot":"","sources":["../../src/codex/startup-prompts.ts"],"names":[],"mappings":"AAAA;0CAC0C;AAE1C,OAAO,KAAK,EAAE,qBAAqB,EAAE,MAAM,4BAA4B,CAAC;AACxE,OAAO,KAAK,EAAE,qBAAqB,EAAE,MAAM,0BAA0B,CAAC;AAGtE,OAAO,KAAK,EAAE,cAAc,EAAE,MAAM,4BAA4B,CAAC;AACjE,OAAO,EAAwB,KAAK,gBAAgB,EAAE,MAAM,4BAA4B,CAAC;AACzF,OAAO,KAAK,EAAE,kBAAkB,EAAE,MAAM,kBAAkB,CAAC;AAQ3D,OAAO,EAAE,qBAAqB,EAAE,MAAM,uBAAuB,CAAC;AAE9D,iFAAiF;AACjF,MAAM,MAAM,0BAA0B,GAAG,qBAAqB,CAAC,OAAO,CAAC,CAAC;AAExE,KAAK,wBAAwB,GAAG;IAC9B,QAAQ,CAAC,QAAQ,EAAE,SAAS,kBAAkB,EAAE,CAAC;IACjD,QAAQ,CAAC,QAAQ,EAAE,SAAS,0BAA0B,EAAE,CAAC;IACzD,QAAQ,CAAC,gBAAgB,CAAC,EAAE,MAAM,CAAC;CACpC,CAAC;AAEF,qBAAa,2BAA2B;IACtC,OAAO,CAAC,QAAQ,CAAC,eAAe,CAAS;IACzC,OAAO,CAAC,QAAQ,CAAC,KAAK,CAAgC;IACtD,OAAO,CAAC,QAAQ,CAAC,SAAS,CAAiB;IAC3C,OAAO,CAAC,QAAQ,CAAC,gBAAgB,CAAgB;IACjD,OAAO,CAAC,QAAQ,CAAC,YAAY,CAA2B;IACxD,OAAO,CAAC,QAAQ,CAAC,QAAQ,CAAyB;IAGlD,OAAO,CAAC,cAAc,CAAK;IAC3B,OAAO,CAAC,aAAa,CAAsD;IAE3E,OAAO,CAAC,iBAAiB,CAAS;IAElC,OAAO,CAAC,aAAa,CAAqB;IAC1C,OAAO,CAAC,mBAAmB,CAAS;gBAGlC,eAAe,SAAK,EACpB,SAAS,UAAQ,EACjB,aAAa,CAAC,EAAE,MAAM,IAAI,EAC1B,SAAS,GAAE,cAAoC,EAC/C,gBAAgB,CAAC,EAAE,MAAM,OAAO;IAYlC,gBAAgB,CAAC,KAAK,EAAE,MAAM,GAAG,IAAI;IAMrC,IAAI,aAAa,IAAI,WAAW,CAE/B;IAED,IAAI,aAAa,iDAEhB;IAED,OAAO,IAAI,IAAI;IAKf,mFAAmF;IACnF,WAAW,IAAI,IAAI;IAMnB,IAAI,aAAa,IAAI,OAAO,CAE3B;IAED;;;;;;;OAOG;IACH,MAAM,CACJ,UAAU,EAAE,MAAM,EAClB,KAAK,EAAE,CAAC,KAAK,EAAE,MAAM,KAAK,gBAAgB,EAC1C,SAAS,CAAC,EAAE,MAAM,MAAM,EACxB,eAAe,GAAE,CAAC,KAAK,EAAE,MAAM,KAAK,gBAAgB,GAAG,OAAO,CAAC,qBAAqB,CAAS,EAC7F,cAAc,CAAC,EAAE,MAAM,MAAM,GAAG,SAAS,GACxC,wBAAwB;IAqE3B,0FAA0F;IAC1F,UAAU,IAAI,IAAI;IAIlB,OAAO,CAAC,WAAW;CAapB;AAED,wBAAgB,kBAAkB,CAAC,IAAI,EAAE,MAAM,EAAE,OAAO,EAAE,MAAM,GAAG,MAAM,GAAG,IAAI,CAE/E"}

package/dist/codex/startup-prompts.js

@@ -4,7 +4,8 @@ import { numberedOptions } from "../core/terminal-options.js";
 import { trustGateVisible } from "../core/trust/blocking.js";
 import { TrustPromptResponder } from "../core/trust/responder.js";
 import { codexTrustClearance } from "./screen-table.js";
-import { codexWarningsFromText } from "./startup-warnings.js";
+import { codexBannerKey, codexWarningsFromText } from "./startup-warnings.js";
+import { codexNumberedRetry } from "./trust-retry.js";
 import { safeUpdateOption } from "./update/selection.js";
 import { startCodexUpdateSkip } from "./update/skip-attempt.js";
 import { CodexUpdatePromptTracker } from "./update/tracker.js";
@@ -20,6 +21,8 @@ export class CodexStartupPromptResponder {
     // generation's own completion may release it; a stale completion is a no-op.
     skipGeneration = 0;
     updateAttempt;
+    // Raw caller input owns an unresolved update until a native composer clears it.
+    updateCallerOwned = false;
     // Emit only newly appearing warning banners; clearing re-arms a later occurrence.
     warnedBanners = new Set();
     conversationStarted = false;
@@ -28,12 +31,14 @@ export class CodexStartupPromptResponder {
         this.clearance = clearance;
         this.sessionInputHeld = sessionInputHeld ?? (() => false);
         this.updatePrompt = new CodexUpdatePromptTracker(clearance, sessionInputHeld !== undefined);
-        this.trust = new TrustPromptResponder("codex", clearance, autotrust, onStateChange);
+        this.trust = new TrustPromptResponder("codex", clearance, autotrust, {
+            onStateChange,
+            numberedRetry: codexNumberedRetry,
+        });
     }
     observeClearance(frame) {
-        if (this.updatePrompt.needsClearance) {
+        if (this.updatePrompt.needsClearance)
             this.updatePrompt.observeClearance(!this.sessionInputHeld() && this.clearance(frame));
-        }
         this.updateAttempt?.observeClearance(frame);
     }
     get closingSignal() {
@@ -46,6 +51,12 @@ export class CodexStartupPromptResponder {
         this.lifetime.abort();
         this.trust.dispose();
     }
+    /** Raw caller input owns the startup prompt on screen (C-TRUST-01, C-CODEX-12). */
+    callerInput() {
+        this.trust.callerInput();
+        this.updateAttempt?.cancel();
+        this.updateCallerOwned ||= this.updatePrompt.unresolved;
+    }
     get inputBlocking() {
         return this.trust.inputBlocking;
     }
@@ -77,6 +88,7 @@ export class CodexStartupPromptResponder {
         // reauthorization immediately; a fresh banner with a valid current safe-option
         // block or authoritative native clearance can rearm it. The live observer confirms
         // clearance after this frame's retained hold is classified, before queued input can repaint it.
+        this.updateCallerOwned &&= this.updatePrompt.unresolved; // a later appearance is new
         const renewUpdateAttention = this.updatePrompt.renewsAttention(screenText);
         const onUpdateScreen = this.updatePrompt.observe(screenText);
         const generation = this.updatePrompt.currentGeneration;
@@ -85,7 +97,8 @@ export class CodexStartupPromptResponder {
         // gates the WRITE only: `updatePrompt.observe` above still tracks such a frame as an
         // update appearance, so generation latching and re-arming are unaffected.
         const noTrustGate = (frame) => !trustGateVisible(frame, "codex");
-        if (onUpdateScreen && this.skipGeneration !== generation && noTrustGate(screenText)) {
+        const automatable = onUpdateScreen && !this.updateCallerOwned;
+        if (automatable && this.skipGeneration !== generation && noTrustGate(screenText)) {
             const parsed = this.updatePrompt.classify(screenText);
             const option = safeUpdateOption(screenText, parsed.options ?? [])?.number ?? null;
             if (option && this.updatePrompt.currentFramePredicate()(screenText)) {
@@ -139,17 +152,11 @@ export class CodexStartupPromptResponder {
         if (this.conversationStarted)
             return [];
         const matched = codexWarningsFromText(screenText, this.elwoodSessionId);
-        const fresh = matched.filter((warning) => !this.warnedBanners.has(bannerKey(warning)));
-        this.warnedBanners = new Set(matched.map(bannerKey));
+        const fresh = matched.filter((warning) => !this.warnedBanners.has(codexBannerKey(warning)));
+        this.warnedBanners = new Set(matched.map(codexBannerKey));
         return fresh;
     }
 }
-/** A stable identity for a startup banner: its code plus the server(s) it names. */
-function bannerKey(warning) {
-    return warning.code === "mcp_server_not_logged_in"
-        ? `login:${warning.mcpServerName}`
-        : `startup:${warning.failedServers.join(",")}`;
-}
 export function findNumberedOption(text, pattern) {
     return numberedOptions(text).find((option) => pattern.test(option.label))?.number ?? null;
 }

package/dist/codex/startup-prompts.js.map

@@ -1 +1 @@
-{"version":3,"file":"startup-prompts.js","sourceRoot":"","sources":["../../src/codex/startup-prompts.ts"],"names":[],"mappings":"AAAA;0CAC0C;AAI1C,OAAO,EAAE,eAAe,EAAE,MAAM,6BAA6B,CAAC;AAC9D,OAAO,EAAE,gBAAgB,EAAE,MAAM,2BAA2B,CAAC;AAE7D,OAAO,EAAE,oBAAoB,EAAyB,MAAM,4BAA4B,CAAC;AAEzF,OAAO,EAAE,mBAAmB,EAAE,MAAM,mBAAmB,CAAC;AACxD,OAAO,EAA2B,qBAAqB,EAAE,MAAM,uBAAuB,CAAC;AACvF,OAAO,EAAE,gBAAgB,EAAE,MAAM,uBAAuB,CAAC;AACzD,OAAO,EAAE,oBAAoB,EAAE,MAAM,0BAA0B,CAAC;AAChE,OAAO,EAAE,wBAAwB,EAAE,MAAM,qBAAqB,CAAC;AAE/D,OAAO,EAAE,qBAAqB,EAAE,MAAM,uBAAuB,CAAC;AAW9D,MAAM,OAAO,2BAA2B;IACrB,eAAe,CAAS;IACxB,KAAK,CAAgC;IACrC,SAAS,CAAiB;IAC1B,gBAAgB,CAAgB;IAChC,YAAY,CAA2B;IACvC,QAAQ,GAAG,IAAI,eAAe,EAAE,CAAC;IAClD,8EAA8E;IAC9E,6EAA6E;IACrE,cAAc,GAAG,CAAC,CAAC;IACnB,aAAa,CAAsD;IAC3E,kFAAkF;IAC1E,aAAa,GAAG,IAAI,GAAG,EAAU,CAAC;IAClC,mBAAmB,GAAG,KAAK,CAAC;IAEpC,YACE,eAAe,GAAG,EAAE,EACpB,SAAS,GAAG,KAAK,EACjB,aAA0B,EAC1B,YAA4B,mBAAmB,EAC/C,gBAAgC;QAEhC,IAAI,CAAC,eAAe,GAAG,eAAe,CAAC;QACvC,IAAI,CAAC,SAAS,GAAG,SAAS,CAAC;QAC3B,IAAI,CAAC,gBAAgB,GAAG,gBAAgB,IAAI,CAAC,GAAG,EAAE,CAAC,KAAK,CAAC,CAAC;QAC1D,IAAI,CAAC,YAAY,GAAG,IAAI,wBAAwB,CAAC,SAAS,EAAE,gBAAgB,KAAK,SAAS,CAAC,CAAC;QAC5F,IAAI,CAAC,KAAK,GAAG,IAAI,oBAAoB,CAAC,OAAO,EAAE,SAAS,EAAE,SAAS,EAAE,aAAa,CAAC,CAAC;IACtF,CAAC;IAED,gBAAgB,CAAC,KAAa;QAC5B,IAAI,IAAI,CAAC,YAAY,CAAC,cAAc,EAAE,CAAC;YACrC,IAAI,CAAC,YAAY,CAAC,gBAAgB,CAAC,CAAC,IAAI,CAAC,gBAAgB,EAAE,IAAI,IAAI,CAAC,SAAS,CAAC,KAAK,CAAC,CAAC,CAAC;QACxF,CAAC;QACD,IAAI,CAAC,aAAa,EAAE,gBAAgB,CAAC,KAAK,CAAC,CAAC;IAC9C,CAAC;IAED,IAAI,aAAa;QACf,OAAO,IAAI,CAAC,QAAQ,CAAC,MAAM,CAAC;IAC9B,CAAC;IAED,IAAI,aAAa;QACf,OAAO,IAAI,CAAC,KAAK,CAAC,aAAa,CAAC;IAClC,CAAC;IAED,OAAO;QACL,IAAI,CAAC,QAAQ,CAAC,KAAK,EAAE,CAAC;QACtB,IAAI,CAAC,KAAK,CAAC,OAAO,EAAE,CAAC;IACvB,CAAC;IAED,IAAI,aAAa;QACf,OAAO,IAAI,CAAC,KAAK,CAAC,aAAa,CAAC;IAClC,CAAC;IAED;;;;;;;OAOG;IACH,MAAM,CACJ,UAAkB,EAClB,KAA0C,EAC1C,SAAwB,EACxB,kBAAwF,KAAK,EAC7F,cAAyC;QAEzC,MAAM,QAAQ,GAAiC,EAAE,CAAC;QAClD,IAAI,IAAI,CAAC,QAAQ,CAAC,MAAM,CAAC,OAAO;YAAE,OAAO,EAAE,QAAQ,EAAE,EAAE,EAAE,QAAQ,EAAE,CAAC;QACpE,8EAA8E;QAC9E,qEAAqE;QACrE,MAAM,KAAK,GAAG,IAAI,CAAC,KAAK,CAAC,MAAM,CAAC,UAAU,EAAE,KAAK,EAAE,cAAc,IAAI,SAAS,CAAC,CAAC;QAChF,IAAI,KAAK,EAAE,IAAI,KAAK,WAAW,EAAE,CAAC;YAChC,QAAQ,CAAC,IAAI,CAAC;gBACZ,OAAO,EAAE,EAAE,IAAI,EAAE,WAAW,EAAE,GAAG,KAAK,CAAC,UAAU,EAAE;gBACnD,OAAO,EAAE,KAAK,CAAC,OAAO;aACvB,CAAC,CAAC;QACL,CAAC;aAAM,IAAI,KAAK,EAAE,IAAI,KAAK,gBAAgB,EAAE,CAAC;YAC5C,QAAQ,CAAC,IAAI,CAAC,EAAE,OAAO,EAAE,EAAE,IAAI,EAAE,gBAAgB,EAAE,MAAM,EAAE,KAAK,CAAC,MAAM,EAAE,EAAE,CAAC,CAAC;QAC/E,CAAC;QACD,2EAA2E;QAC3E,+EAA+E;QAC/E,mFAAmF;QACnF,gGAAgG;QAChG,MAAM,oBAAoB,GAAG,IAAI,CAAC,YAAY,CAAC,eAAe,CAAC,UAAU,CAAC,CAAC;QAC3E,MAAM,cAAc,GAAG,IAAI,CAAC,YAAY,CAAC,OAAO,CAAC,UAAU,CAAC,CAAC;QAC7D,MAAM,UAAU,GAAG,IAAI,CAAC,YAAY,CAAC,iBAAiB,CAAC;QACvD,mFAAmF;QACnF,oFAAoF;QACpF,qFAAqF;QACrF,0EAA0E;QAC1E,MAAM,WAAW,GAAG,CAAC,KAAa,EAAE,EAAE,CAAC,CAAC,gBAAgB,CAAC,KAAK,EAAE,OAAO,CAAC,CAAC;QACzE,IAAI,cAAc,IAAI,IAAI,CAAC,cAAc,KAAK,UAAU,IAAI,WAAW,CAAC,UAAU,CAAC,EAAE,CAAC;YACpF,MAAM,MAAM,GAAG,IAAI,CAAC,YAAY,CAAC,QAAQ,CAAC,UAAU,CAAC,CAAC;YACtD,MAAM,MAAM,GAAG,gBAAgB,CAAC,UAAU,EAAE,MAAM,CAAC,OAAO,IAAI,EAAE,CAAC,EAAE,MAAM,IAAI,IAAI,CAAC;YAClF,IAAI,MAAM,IAAI,IAAI,CAAC,YAAY,CAAC,qBAAqB,EAAE,CAAC,UAAU,CAAC,EAAE,CAAC;gBACpE,wEAAwE;gBACxE,6EAA6E;gBAC7E,IAAI,CAAC,cAAc,GAAG,UAAU,CAAC;gBACjC,IAAI,CAAC,aAAa,GAAG,oBAAoB,CAAC;oBACxC,MAAM;oBACN,UAAU;oBACV,UAAU;oBACV,OAAO,EAAE,IAAI,CAAC,YAAY;oBAC1B,eAAe;oBACf,SAAS;oBACT,MAAM,EAAE,IAAI,CAAC,QAAQ,CAAC,MAAM;oBAC5B,SAAS,EAAE,IAAI,CAAC,SAAS;oBACzB,SAAS,EAAE,IAAI,CAAC,gBAAgB;oBAChC,YAAY,EAAE,GAAG,EAAE;wBACjB,IAAI,CAAC,cAAc,GAAG,CAAC,CAAC;oBAC1B,CAAC;iBACF,CAAC,CAAC;gBACH,QAAQ,CAAC,IAAI,CAAC;oBACZ,OAAO,EAAE,EAAE,IAAI,EAAE,WAAW,EAAE,MAAM,EAAE,QAAQ,EAAE,KAAK,EAAE,MAAM,EAAE;oBAC/D,OAAO,EAAE,IAAI,CAAC,aAAa,CAAC,OAAO;iBACpC,CAAC,CAAC;YACL,CAAC;QACH,CAAC;QACD,OAAO;YACL,QAAQ,EAAE,IAAI,CAAC,WAAW,CAAC,UAAU,CAAC;YACtC,QAAQ;YACR,GAAG,CAAC,oBAAoB,CAAC,CAAC,CAAC,EAAE,gBAAgB,EAAE,UAAU,EAAE,CAAC,CAAC,CAAC,EAAE,CAAC;SAClE,CAAC;IACJ,CAAC;IAED,oFAAoF;IACpF,sFAAsF;IACtF,sFAAsF;IACtF,uFAAuF;IACvF,uFAAuF;IACvF,uFAAuF;IACvF,2FAA2F;IAC3F,0FAA0F;IAC1F,UAAU;QACR,IAAI,CAAC,mBAAmB,GAAG,IAAI,CAAC;IAClC,CAAC;IAEO,WAAW,CAAC,UAAkB;QACpC,+EAA+E;QAC/E,kFAAkF;QAClF,mFAAmF;QACnF,iFAAiF;QACjF,iFAAiF;QACjF,IAAI,CAAC,mBAAmB,KAAK,WAAW,CAAC,IAAI,CAAC,UAAU,CAAC,CAAC;QAC1D,IAAI,IAAI,CAAC,mBAAmB;YAAE,OAAO,EAAE,CAAC;QACxC,MAAM,OAAO,GAAG,qBAAqB,CAAC,UAAU,EAAE,IAAI,CAAC,eAAe,CAAC,CAAC;QACxE,MAAM,KAAK,GAAG,OAAO,CAAC,MAAM,CAAC,CAAC,OAAO,EAAE,EAAE,CAAC,CAAC,IAAI,CAAC,aAAa,CAAC,GAAG,CAAC,SAAS,CAAC,OAAO,CAAC,CAAC,CAAC,CAAC;QACvF,IAAI,CAAC,aAAa,GAAG,IAAI,GAAG,CAAC,OAAO,CAAC,GAAG,CAAC,SAAS,CAAC,CAAC,CAAC;QACrD,OAAO,KAAK,CAAC;IACf,CAAC;CACF;AAED,oFAAoF;AACpF,SAAS,SAAS,CAAC,OAA2B;IAC5C,OAAO,OAAO,CAAC,IAAI,KAAK,0BAA0B;QAChD,CAAC,CAAC,SAAS,OAAO,CAAC,aAAa,EAAE;QAClC,CAAC,CAAC,WAAW,OAAO,CAAC,aAAa,CAAC,IAAI,CAAC,GAAG,CAAC,EAAE,CAAC;AACnD,CAAC;AAED,MAAM,UAAU,kBAAkB,CAAC,IAAY,EAAE,OAAe;IAC9D,OAAO,eAAe,CAAC,IAAI,CAAC,CAAC,IAAI,CAAC,CAAC,MAAM,EAAE,EAAE,CAAC,OAAO,CAAC,IAAI,CAAC,MAAM,CAAC,KAAK,CAAC,CAAC,EAAE,MAAM,IAAI,IAAI,CAAC;AAC5F,CAAC"}
+{"version":3,"file":"startup-prompts.js","sourceRoot":"","sources":["../../src/codex/startup-prompts.ts"],"names":[],"mappings":"AAAA;0CAC0C;AAI1C,OAAO,EAAE,eAAe,EAAE,MAAM,6BAA6B,CAAC;AAC9D,OAAO,EAAE,gBAAgB,EAAE,MAAM,2BAA2B,CAAC;AAE7D,OAAO,EAAE,oBAAoB,EAAyB,MAAM,4BAA4B,CAAC;AAEzF,OAAO,EAAE,mBAAmB,EAAE,MAAM,mBAAmB,CAAC;AACxD,OAAO,EAAE,cAAc,EAAE,qBAAqB,EAAE,MAAM,uBAAuB,CAAC;AAC9E,OAAO,EAAE,kBAAkB,EAAE,MAAM,kBAAkB,CAAC;AACtD,OAAO,EAAE,gBAAgB,EAAE,MAAM,uBAAuB,CAAC;AACzD,OAAO,EAAE,oBAAoB,EAAE,MAAM,0BAA0B,CAAC;AAChE,OAAO,EAAE,wBAAwB,EAAE,MAAM,qBAAqB,CAAC;AAE/D,OAAO,EAAE,qBAAqB,EAAE,MAAM,uBAAuB,CAAC;AAW9D,MAAM,OAAO,2BAA2B;IACrB,eAAe,CAAS;IACxB,KAAK,CAAgC;IACrC,SAAS,CAAiB;IAC1B,gBAAgB,CAAgB;IAChC,YAAY,CAA2B;IACvC,QAAQ,GAAG,IAAI,eAAe,EAAE,CAAC;IAClD,8EAA8E;IAC9E,6EAA6E;IACrE,cAAc,GAAG,CAAC,CAAC;IACnB,aAAa,CAAsD;IAC3E,gFAAgF;IACxE,iBAAiB,GAAG,KAAK,CAAC;IAClC,kFAAkF;IAC1E,aAAa,GAAG,IAAI,GAAG,EAAU,CAAC;IAClC,mBAAmB,GAAG,KAAK,CAAC;IAEpC,YACE,eAAe,GAAG,EAAE,EACpB,SAAS,GAAG,KAAK,EACjB,aAA0B,EAC1B,YAA4B,mBAAmB,EAC/C,gBAAgC;QAEhC,IAAI,CAAC,eAAe,GAAG,eAAe,CAAC;QACvC,IAAI,CAAC,SAAS,GAAG,SAAS,CAAC;QAC3B,IAAI,CAAC,gBAAgB,GAAG,gBAAgB,IAAI,CAAC,GAAG,EAAE,CAAC,KAAK,CAAC,CAAC;QAC1D,IAAI,CAAC,YAAY,GAAG,IAAI,wBAAwB,CAAC,SAAS,EAAE,gBAAgB,KAAK,SAAS,CAAC,CAAC;QAC5F,IAAI,CAAC,KAAK,GAAG,IAAI,oBAAoB,CAAC,OAAO,EAAE,SAAS,EAAE,SAAS,EAAE;YACnE,aAAa;YACb,aAAa,EAAE,kBAAkB;SAClC,CAAC,CAAC;IACL,CAAC;IAED,gBAAgB,CAAC,KAAa;QAC5B,IAAI,IAAI,CAAC,YAAY,CAAC,cAAc;YAClC,IAAI,CAAC,YAAY,CAAC,gBAAgB,CAAC,CAAC,IAAI,CAAC,gBAAgB,EAAE,IAAI,IAAI,CAAC,SAAS,CAAC,KAAK,CAAC,CAAC,CAAC;QACxF,IAAI,CAAC,aAAa,EAAE,gBAAgB,CAAC,KAAK,CAAC,CAAC;IAC9C,CAAC;IAED,IAAI,aAAa;QACf,OAAO,IAAI,CAAC,QAAQ,CAAC,MAAM,CAAC;IAC9B,CAAC;IAED,IAAI,aAAa;QACf,OAAO,IAAI,CAAC,KAAK,CAAC,aAAa,CAAC;IAClC,CAAC;IAED,OAAO;QACL,IAAI,CAAC,QAAQ,CAAC,KAAK,EAAE,CAAC;QACtB,IAAI,CAAC,KAAK,CAAC,OAAO,EAAE,CAAC;IACvB,CAAC;IAED,mFAAmF;IACnF,WAAW;QACT,IAAI,CAAC,KAAK,CAAC,WAAW,EAAE,CAAC;QACzB,IAAI,CAAC,aAAa,EAAE,MAAM,EAAE,CAAC;QAC7B,IAAI,CAAC,iBAAiB,KAAK,IAAI,CAAC,YAAY,CAAC,UAAU,CAAC;IAC1D,CAAC;IAED,IAAI,aAAa;QACf,OAAO,IAAI,CAAC,KAAK,CAAC,aAAa,CAAC;IAClC,CAAC;IAED;;;;;;;OAOG;IACH,MAAM,CACJ,UAAkB,EAClB,KAA0C,EAC1C,SAAwB,EACxB,kBAAwF,KAAK,EAC7F,cAAyC;QAEzC,MAAM,QAAQ,GAAiC,EAAE,CAAC;QAClD,IAAI,IAAI,CAAC,QAAQ,CAAC,MAAM,CAAC,OAAO;YAAE,OAAO,EAAE,QAAQ,EAAE,EAAE,EAAE,QAAQ,EAAE,CAAC;QACpE,8EAA8E;QAC9E,qEAAqE;QACrE,MAAM,KAAK,GAAG,IAAI,CAAC,KAAK,CAAC,MAAM,CAAC,UAAU,EAAE,KAAK,EAAE,cAAc,IAAI,SAAS,CAAC,CAAC;QAChF,IAAI,KAAK,EAAE,IAAI,KAAK,WAAW,EAAE,CAAC;YAChC,QAAQ,CAAC,IAAI,CAAC;gBACZ,OAAO,EAAE,EAAE,IAAI,EAAE,WAAW,EAAE,GAAG,KAAK,CAAC,UAAU,EAAE;gBACnD,OAAO,EAAE,KAAK,CAAC,OAAO;aACvB,CAAC,CAAC;QACL,CAAC;aAAM,IAAI,KAAK,EAAE,IAAI,KAAK,gBAAgB,EAAE,CAAC;YAC5C,QAAQ,CAAC,IAAI,CAAC,EAAE,OAAO,EAAE,EAAE,IAAI,EAAE,gBAAgB,EAAE,MAAM,EAAE,KAAK,CAAC,MAAM,EAAE,EAAE,CAAC,CAAC;QAC/E,CAAC;QACD,2EAA2E;QAC3E,+EAA+E;QAC/E,mFAAmF;QACnF,gGAAgG;QAChG,IAAI,CAAC,iBAAiB,KAAK,IAAI,CAAC,YAAY,CAAC,UAAU,CAAC,CAAC,4BAA4B;QACrF,MAAM,oBAAoB,GAAG,IAAI,CAAC,YAAY,CAAC,eAAe,CAAC,UAAU,CAAC,CAAC;QAC3E,MAAM,cAAc,GAAG,IAAI,CAAC,YAAY,CAAC,OAAO,CAAC,UAAU,CAAC,CAAC;QAC7D,MAAM,UAAU,GAAG,IAAI,CAAC,YAAY,CAAC,iBAAiB,CAAC;QACvD,mFAAmF;QACnF,oFAAoF;QACpF,qFAAqF;QACrF,0EAA0E;QAC1E,MAAM,WAAW,GAAG,CAAC,KAAa,EAAE,EAAE,CAAC,CAAC,gBAAgB,CAAC,KAAK,EAAE,OAAO,CAAC,CAAC;QACzE,MAAM,WAAW,GAAG,cAAc,IAAI,CAAC,IAAI,CAAC,iBAAiB,CAAC;QAC9D,IAAI,WAAW,IAAI,IAAI,CAAC,cAAc,KAAK,UAAU,IAAI,WAAW,CAAC,UAAU,CAAC,EAAE,CAAC;YACjF,MAAM,MAAM,GAAG,IAAI,CAAC,YAAY,CAAC,QAAQ,CAAC,UAAU,CAAC,CAAC;YACtD,MAAM,MAAM,GAAG,gBAAgB,CAAC,UAAU,EAAE,MAAM,CAAC,OAAO,IAAI,EAAE,CAAC,EAAE,MAAM,IAAI,IAAI,CAAC;YAClF,IAAI,MAAM,IAAI,IAAI,CAAC,YAAY,CAAC,qBAAqB,EAAE,CAAC,UAAU,CAAC,EAAE,CAAC;gBACpE,wEAAwE;gBACxE,6EAA6E;gBAC7E,IAAI,CAAC,cAAc,GAAG,UAAU,CAAC;gBACjC,IAAI,CAAC,aAAa,GAAG,oBAAoB,CAAC;oBACxC,MAAM;oBACN,UAAU;oBACV,UAAU;oBACV,OAAO,EAAE,IAAI,CAAC,YAAY;oBAC1B,eAAe;oBACf,SAAS;oBACT,MAAM,EAAE,IAAI,CAAC,QAAQ,CAAC,MAAM;oBAC5B,SAAS,EAAE,IAAI,CAAC,SAAS;oBACzB,SAAS,EAAE,IAAI,CAAC,gBAAgB;oBAChC,YAAY,EAAE,GAAG,EAAE;wBACjB,IAAI,CAAC,cAAc,GAAG,CAAC,CAAC;oBAC1B,CAAC;iBACF,CAAC,CAAC;gBACH,QAAQ,CAAC,IAAI,CAAC;oBACZ,OAAO,EAAE,EAAE,IAAI,EAAE,WAAW,EAAE,MAAM,EAAE,QAAQ,EAAE,KAAK,EAAE,MAAM,EAAE;oBAC/D,OAAO,EAAE,IAAI,CAAC,aAAa,CAAC,OAAO;iBACpC,CAAC,CAAC;YACL,CAAC;QACH,CAAC;QACD,OAAO;YACL,QAAQ,EAAE,IAAI,CAAC,WAAW,CAAC,UAAU,CAAC;YACtC,QAAQ;YACR,GAAG,CAAC,oBAAoB,CAAC,CAAC,CAAC,EAAE,gBAAgB,EAAE,UAAU,EAAE,CAAC,CAAC,CAAC,EAAE,CAAC;SAClE,CAAC;IACJ,CAAC;IAED,oFAAoF;IACpF,sFAAsF;IACtF,sFAAsF;IACtF,uFAAuF;IACvF,uFAAuF;IACvF,uFAAuF;IACvF,2FAA2F;IAC3F,0FAA0F;IAC1F,UAAU;QACR,IAAI,CAAC,mBAAmB,GAAG,IAAI,CAAC;IAClC,CAAC;IAEO,WAAW,CAAC,UAAkB;QACpC,+EAA+E;QAC/E,kFAAkF;QAClF,mFAAmF;QACnF,iFAAiF;QACjF,iFAAiF;QACjF,IAAI,CAAC,mBAAmB,KAAK,WAAW,CAAC,IAAI,CAAC,UAAU,CAAC,CAAC;QAC1D,IAAI,IAAI,CAAC,mBAAmB;YAAE,OAAO,EAAE,CAAC;QACxC,MAAM,OAAO,GAAG,qBAAqB,CAAC,UAAU,EAAE,IAAI,CAAC,eAAe,CAAC,CAAC;QACxE,MAAM,KAAK,GAAG,OAAO,CAAC,MAAM,CAAC,CAAC,OAAO,EAAE,EAAE,CAAC,CAAC,IAAI,CAAC,aAAa,CAAC,GAAG,CAAC,cAAc,CAAC,OAAO,CAAC,CAAC,CAAC,CAAC;QAC5F,IAAI,CAAC,aAAa,GAAG,IAAI,GAAG,CAAC,OAAO,CAAC,GAAG,CAAC,cAAc,CAAC,CAAC,CAAC;QAC1D,OAAO,KAAK,CAAC;IACf,CAAC;CACF;AAED,MAAM,UAAU,kBAAkB,CAAC,IAAY,EAAE,OAAe;IAC9D,OAAO,eAAe,CAAC,IAAI,CAAC,CAAC,IAAI,CAAC,CAAC,MAAM,EAAE,EAAE,CAAC,OAAO,CAAC,IAAI,CAAC,MAAM,CAAC,KAAK,CAAC,CAAC,EAAE,MAAM,IAAI,IAAI,CAAC;AAC5F,CAAC"}

package/dist/codex/startup-warnings.d.ts

@@ -7,4 +7,6 @@ export type CodexBannerWarning = Extract<ElwoodWarningEvent, {
     readonly code: "mcp_server_not_logged_in" | "mcp_startup_incomplete";
 }>;
 export declare function codexWarningsFromText(text: string, elwoodSessionId: string): readonly CodexBannerWarning[];
+/** A stable identity for a startup banner: its code plus the server(s) it names. */
+export declare function codexBannerKey(warning: CodexBannerWarning): string;
 //# sourceMappingURL=startup-warnings.d.ts.map

package/dist/codex/startup-warnings.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"startup-warnings.d.ts","sourceRoot":"","sources":["../../src/codex/startup-warnings.ts"],"names":[],"mappings":"AAAA;;;GAGG;AACH,OAAO,KAAK,EAAE,kBAAkB,EAAE,MAAM,kBAAkB,CAAC;AAE3D,MAAM,MAAM,kBAAkB,GAAG,OAAO,CACtC,kBAAkB,EAClB;IAAE,QAAQ,CAAC,IAAI,EAAE,0BAA0B,GAAG,wBAAwB,CAAA;CAAE,CACzE,CAAC;AAEF,wBAAgB,qBAAqB,CACnC,IAAI,EAAE,MAAM,EACZ,eAAe,EAAE,MAAM,GACtB,SAAS,kBAAkB,EAAE,CAc/B"}
+{"version":3,"file":"startup-warnings.d.ts","sourceRoot":"","sources":["../../src/codex/startup-warnings.ts"],"names":[],"mappings":"AAAA;;;GAGG;AACH,OAAO,KAAK,EAAE,kBAAkB,EAAE,MAAM,kBAAkB,CAAC;AAE3D,MAAM,MAAM,kBAAkB,GAAG,OAAO,CACtC,kBAAkB,EAClB;IAAE,QAAQ,CAAC,IAAI,EAAE,0BAA0B,GAAG,wBAAwB,CAAA;CAAE,CACzE,CAAC;AAEF,wBAAgB,qBAAqB,CACnC,IAAI,EAAE,MAAM,EACZ,eAAe,EAAE,MAAM,GACtB,SAAS,kBAAkB,EAAE,CAc/B;AAqDD,oFAAoF;AACpF,wBAAgB,cAAc,CAAC,OAAO,EAAE,kBAAkB,GAAG,MAAM,CAIlE"}

package/dist/codex/startup-warnings.js

@@ -62,4 +62,10 @@ function mcpStartupWarning(elwoodSessionId, failed) {
         raw: `MCP startup incomplete (failed: ${failedServers.join(", ")})`,
     };
 }
+/** A stable identity for a startup banner: its code plus the server(s) it names. */
+export function codexBannerKey(warning) {
+    return warning.code === "mcp_server_not_logged_in"
+        ? `login:${warning.mcpServerName}`
+        : `startup:${warning.failedServers.join(",")}`;
+}
 //# sourceMappingURL=startup-warnings.js.map

package/dist/codex/startup-warnings.js.map

@@ -1 +1 @@
-{"version":3,"file":"startup-warnings.js","sourceRoot":"","sources":["../../src/codex/startup-warnings.ts"],"names":[],"mappings":"AAWA,MAAM,UAAU,qBAAqB,CACnC,IAAY,EACZ,eAAuB;IAEvB,MAAM,QAAQ,GAAyB,EAAE,CAAC;IAC1C,KAAK,MAAM,GAAG,IAAI,iBAAiB,CAAC,IAAI,CAAC,EAAE,CAAC;QAC1C,MAAM,MAAM,GAAG,0BAA0B,CAAC,IAAI,CAAC,GAAG,CAAC,CAAC;QACpD,IAAI,MAAM,KAAK,IAAI;YAAE,SAAS;QAC9B,MAAM,IAAI,GAAG,MAAM,CAAC,CAAC,CAAE,CAAC;QACxB,MAAM,KAAK,GAAG,4EAA4E,CAAC,IAAI,CAC7F,IAAI,CACL,CAAC;QACF,IAAI,KAAK;YAAE,QAAQ,CAAC,IAAI,CAAC,eAAe,CAAC,eAAe,EAAE,KAAK,CAAC,CAAC,CAAE,EAAE,KAAK,CAAC,CAAC,CAAE,CAAC,CAAC,CAAC;QACjF,MAAM,MAAM,GAAG,kEAAkE,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC;QAC7F,IAAI,MAAM;YAAE,QAAQ,CAAC,IAAI,CAAC,iBAAiB,CAAC,eAAe,EAAE,MAAM,CAAC,CAAC,CAAE,CAAC,CAAC,CAAC;IAC5E,CAAC;IACD,OAAO,QAAQ,CAAC;AAClB,CAAC;AAED,wFAAwF;AACxF,QAAQ,CAAC,CAAC,iBAAiB,CAAC,IAAY;IACtC,IAAI,MAAM,GAAG,KAAK,CAAC;IACnB,IAAI,IAAI,GAAG,KAAK,CAAC;IACjB,KAAK,MAAM,GAAG,IAAI,IAAI,CAAC,KAAK,CAAC,OAAO,CAAC,EAAE,CAAC;QACtC,8EAA8E;QAC9E,2EAA2E;QAC3E,IAAI,aAAa,CAAC,IAAI,CAAC,GAAG,CAAC;YAAE,MAAM;QACnC,IAAI,qCAAqC,CAAC,IAAI,CAAC,GAAG,CAAC;YAAE,MAAM,GAAG,IAAI,CAAC;QACnE,IAAI,CAAC,IAAI,EAAE,CAAC;YACV,IAAI,MAAM,IAAI,cAAc,CAAC,IAAI,CAAC,GAAG,CAAC;gBAAE,IAAI,GAAG,IAAI,CAAC;iBAC/C,IAAI,MAAM,IAAI,CAAC,OAAO,CAAC,IAAI,CAAC,GAAG,CAAC;gBAAE,MAAM;YAC7C,SAAS;QACX,CAAC;QACD,MAAM,GAAG,CAAC;IACZ,CAAC;AACH,CAAC;AAED,SAAS,eAAe,CACtB,eAAuB,EACvB,aAAqB,EACrB,eAAuB;IAEvB,OAAO;QACL,eAAe;QACf,KAAK,EAAE,OAAO;QACd,MAAM,EAAE,UAAU;QAClB,IAAI,EAAE,0BAA0B;QAChC,QAAQ,EAAE,SAAS;QACnB,OAAO,EAAE,OAAO,aAAa,+BAA+B;QAC5D,aAAa;QACb,eAAe;QACf,GAAG,EAAE,OAAO,aAAa,uCAAuC,eAAe,KAAK;KACrF,CAAC;AACJ,CAAC;AAED,SAAS,iBAAiB,CAAC,eAAuB,EAAE,MAAc;IAChE,MAAM,aAAa,GAAG,MAAM,CAAC,KAAK,CAAC,GAAG,CAAC,CAAC,GAAG,CAAC,CAAC,MAAM,EAAE,EAAE,CAAC,MAAM,CAAC,IAAI,EAAE,CAAC,CAAC;IACvE,OAAO;QACL,eAAe;QACf,KAAK,EAAE,OAAO;QACd,MAAM,EAAE,UAAU;QAClB,IAAI,EAAE,wBAAwB;QAC9B,QAAQ,EAAE,SAAS;QACnB,OAAO,EAAE,2BAA2B,aAAa,CAAC,IAAI,CAAC,IAAI,CAAC,GAAG;QAC/D,aAAa;QACb,gBAAgB,EAAE,aAAa,CAAC,GAAG,CAAC,CAAC,MAAM,EAAE,EAAE,CAAC,mBAAmB,MAAM,EAAE,CAAC;QAC5E,GAAG,EAAE,mCAAmC,aAAa,CAAC,IAAI,CAAC,IAAI,CAAC,GAAG;KACpE,CAAC;AACJ,CAAC"}
+{"version":3,"file":"startup-warnings.js","sourceRoot":"","sources":["../../src/codex/startup-warnings.ts"],"names":[],"mappings":"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"}

package/dist/codex/transcript/payload.d.ts

@@ -0,0 +1,8 @@
+/**
+ * Reads the `payload` envelope that every committed Codex transcript item carries, for
+ * each reader of those items: the native question lifecycle (PRD §5.10) and the shutdown
+ * wait on a turn's record (§5.7, C-LIFE-13). Implements PRD §7A.3.
+ */
+/** The item's `payload` object, or `undefined` when the item has none. */
+export declare function payloadOf(item: unknown): Record<string, unknown> | undefined;
+//# sourceMappingURL=payload.d.ts.map

package/dist/codex/transcript/payload.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"payload.d.ts","sourceRoot":"","sources":["../../../src/codex/transcript/payload.ts"],"names":[],"mappings":"AAAA;;;;GAIG;AAIH,0EAA0E;AAC1E,wBAAgB,SAAS,CAAC,IAAI,EAAE,OAAO,GAAG,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,GAAG,SAAS,CAE5E"}

package/dist/codex/transcript/payload.js

@@ -0,0 +1,11 @@
+/**
+ * Reads the `payload` envelope that every committed Codex transcript item carries, for
+ * each reader of those items: the native question lifecycle (PRD §5.10) and the shutdown
+ * wait on a turn's record (§5.7, C-LIFE-13). Implements PRD §7A.3.
+ */
+import { isRecord } from "../../core/predicates.js";
+/** The item's `payload` object, or `undefined` when the item has none. */
+export function payloadOf(item) {
+    return isRecord(item) && isRecord(item["payload"]) ? item["payload"] : undefined;
+}
+//# sourceMappingURL=payload.js.map

package/dist/codex/transcript/payload.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"payload.js","sourceRoot":"","sources":["../../../src/codex/transcript/payload.ts"],"names":[],"mappings":"AAAA;;;;GAIG;AAEH,OAAO,EAAE,QAAQ,EAAE,MAAM,0BAA0B,CAAC;AAEpD,0EAA0E;AAC1E,MAAM,UAAU,SAAS,CAAC,IAAa;IACrC,OAAO,QAAQ,CAAC,IAAI,CAAC,IAAI,QAAQ,CAAC,IAAI,CAAC,SAAS,CAAC,CAAC,CAAC,CAAC,CAAC,IAAI,CAAC,SAAS,CAAC,CAAC,CAAC,CAAC,SAAS,CAAC;AACnF,CAAC"}

package/dist/codex/transcript/rejection.d.ts

@@ -0,0 +1,15 @@
+/**
+ * Codex's turn-rejection evidence, read from its committed transcript (PRD §5.8, C-API-60).
+ * Codex fires no `Stop` hook for a turn it rejects (an unknown model, an API error). Its only
+ * evidence is the `task_complete` event that carries an `error`, tagged with the turn id the
+ * turn's own `UserPromptSubmit` reported. That event ends the turn as a native boundary.
+ */
+import { type TurnFailure } from "../../core/simple/boundary-signal.ts";
+/** A rejected turn's id and failure, or `undefined` for every other transcript item. */
+export declare function codexTurnRejection(item: unknown): {
+    readonly turnId: string;
+    readonly failure: TurnFailure;
+} | undefined;
+/** Ends the rejected turn whose id the item names; any other item is ignored. */
+export declare function confirmCodexRejection(session: object, item: unknown): void;
+//# sourceMappingURL=rejection.d.ts.map

package/dist/codex/transcript/rejection.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"rejection.d.ts","sourceRoot":"","sources":["../../../src/codex/transcript/rejection.ts"],"names":[],"mappings":"AAAA;;;;;GAKG;AAGH,OAAO,EAAqB,KAAK,WAAW,EAAE,MAAM,sCAAsC,CAAC;AAG3F,wFAAwF;AACxF,wBAAgB,kBAAkB,CAChC,IAAI,EAAE,OAAO,GACZ;IAAE,QAAQ,CAAC,MAAM,EAAE,MAAM,CAAC;IAAC,QAAQ,CAAC,OAAO,EAAE,WAAW,CAAA;CAAE,GAAG,SAAS,CAcxE;AAED,iFAAiF;AACjF,wBAAgB,qBAAqB,CAAC,OAAO,EAAE,MAAM,EAAE,IAAI,EAAE,OAAO,GAAG,IAAI,CAK1E"}

package/dist/codex/transcript/rejection.js

@@ -0,0 +1,44 @@
+/**
+ * Codex's turn-rejection evidence, read from its committed transcript (PRD §5.8, C-API-60).
+ * Codex fires no `Stop` hook for a turn it rejects (an unknown model, an API error). Its only
+ * evidence is the `task_complete` event that carries an `error`, tagged with the turn id the
+ * turn's own `UserPromptSubmit` reported. That event ends the turn as a native boundary.
+ */
+import { isRecord } from "../../core/predicates.js";
+import { boundedDiagnostic } from "../../core/simple/boundary-signal.js";
+import { confirmNativeBoundary } from "../../core/simple/native-boundary.js";
+/** A rejected turn's id and failure, or `undefined` for every other transcript item. */
+export function codexTurnRejection(item) {
+    if (!isRecord(item) || item["type"] !== "event_msg")
+        return undefined;
+    const payload = item["payload"];
+    if (!isRecord(payload) || payload["type"] !== "task_complete")
+        return undefined;
+    const error = payload["error"];
+    const turnId = payload["turn_id"];
+    if (!isRecord(error) || typeof turnId !== "string" || turnId.trim() === "")
+        return undefined;
+    const agentError = errorInfoName(error["codex_error_info"]);
+    const message = boundedDiagnostic(error["message"]) ??
+        (agentError === undefined
+            ? "Codex rejected the turn."
+            : `Codex rejected the turn: ${agentError}`);
+    return { turnId, failure: { message, agentError } };
+}
+/** Ends the rejected turn whose id the item names; any other item is ignored. */
+export function confirmCodexRejection(session, item) {
+    const rejection = codexTurnRejection(item);
+    if (rejection === undefined)
+        return;
+    const signal = { text: "", failure: rejection.failure };
+    confirmNativeBoundary(session, { kind: "stop", turnId: rejection.turnId, signal });
+}
+// Codex's `CodexErrorInfo` is a bare variant name (`"other"`, `"usage_limit_exceeded"`) or a
+// one-key object for a variant with fields (`{"http_connection_failed":{...}}`).
+function errorInfoName(info) {
+    if (!isRecord(info))
+        return boundedDiagnostic(info);
+    const names = Object.keys(info);
+    return names.length === 1 ? boundedDiagnostic(names[0]) : undefined;
+}
+//# sourceMappingURL=rejection.js.map

package/dist/codex/transcript/rejection.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"rejection.js","sourceRoot":"","sources":["../../../src/codex/transcript/rejection.ts"],"names":[],"mappings":"AAAA;;;;;GAKG;AAEH,OAAO,EAAE,QAAQ,EAAE,MAAM,0BAA0B,CAAC;AACpD,OAAO,EAAE,iBAAiB,EAAoB,MAAM,sCAAsC,CAAC;AAC3F,OAAO,EAAE,qBAAqB,EAAE,MAAM,sCAAsC,CAAC;AAE7E,wFAAwF;AACxF,MAAM,UAAU,kBAAkB,CAChC,IAAa;IAEb,IAAI,CAAC,QAAQ,CAAC,IAAI,CAAC,IAAI,IAAI,CAAC,MAAM,CAAC,KAAK,WAAW;QAAE,OAAO,SAAS,CAAC;IACtE,MAAM,OAAO,GAAG,IAAI,CAAC,SAAS,CAAC,CAAC;IAChC,IAAI,CAAC,QAAQ,CAAC,OAAO,CAAC,IAAI,OAAO,CAAC,MAAM,CAAC,KAAK,eAAe;QAAE,OAAO,SAAS,CAAC;IAChF,MAAM,KAAK,GAAG,OAAO,CAAC,OAAO,CAAC,CAAC;IAC/B,MAAM,MAAM,GAAG,OAAO,CAAC,SAAS,CAAC,CAAC;IAClC,IAAI,CAAC,QAAQ,CAAC,KAAK,CAAC,IAAI,OAAO,MAAM,KAAK,QAAQ,IAAI,MAAM,CAAC,IAAI,EAAE,KAAK,EAAE;QAAE,OAAO,SAAS,CAAC;IAC7F,MAAM,UAAU,GAAG,aAAa,CAAC,KAAK,CAAC,kBAAkB,CAAC,CAAC,CAAC;IAC5D,MAAM,OAAO,GACX,iBAAiB,CAAC,KAAK,CAAC,SAAS,CAAC,CAAC;QACnC,CAAC,UAAU,KAAK,SAAS;YACvB,CAAC,CAAC,0BAA0B;YAC5B,CAAC,CAAC,4BAA4B,UAAU,EAAE,CAAC,CAAC;IAChD,OAAO,EAAE,MAAM,EAAE,OAAO,EAAE,EAAE,OAAO,EAAE,UAAU,EAAE,EAAE,CAAC;AACtD,CAAC;AAED,iFAAiF;AACjF,MAAM,UAAU,qBAAqB,CAAC,OAAe,EAAE,IAAa;IAClE,MAAM,SAAS,GAAG,kBAAkB,CAAC,IAAI,CAAC,CAAC;IAC3C,IAAI,SAAS,KAAK,SAAS;QAAE,OAAO;IACpC,MAAM,MAAM,GAAG,EAAE,IAAI,EAAE,EAAE,EAAE,OAAO,EAAE,SAAS,CAAC,OAAO,EAAE,CAAC;IACxD,qBAAqB,CAAC,OAAO,EAAE,EAAE,IAAI,EAAE,MAAM,EAAE,MAAM,EAAE,SAAS,CAAC,MAAM,EAAE,MAAM,EAAE,CAAC,CAAC;AACrF,CAAC;AAED,6FAA6F;AAC7F,iFAAiF;AACjF,SAAS,aAAa,CAAC,IAAa;IAClC,IAAI,CAAC,QAAQ,CAAC,IAAI,CAAC;QAAE,OAAO,iBAAiB,CAAC,IAAI,CAAC,CAAC;IACpD,MAAM,KAAK,GAAG,MAAM,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC;IAChC,OAAO,KAAK,CAAC,MAAM,KAAK,CAAC,CAAC,CAAC,CAAC,iBAAiB,CAAC,KAAK,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,SAAS,CAAC;AACtE,CAAC"}

package/dist/codex/transcript/turn-end.d.ts

@@ -0,0 +1,8 @@
+/**
+ * Recognizes the committed Codex transcript records that end a turn.
+ * Implements PRD §7A.3 for the native question lifecycle (§5.10) and for the shutdown
+ * wait on a turn's commit (§5.7, C-LIFE-13), so both read one list.
+ */
+/** Whether a rollout item's `payload` records that a turn ended. */
+export declare function isTurnEndPayload(payload: Readonly<Record<string, unknown>>): boolean;
+//# sourceMappingURL=turn-end.d.ts.map

package/dist/codex/transcript/turn-end.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"turn-end.d.ts","sourceRoot":"","sources":["../../../src/codex/transcript/turn-end.ts"],"names":[],"mappings":"AAAA;;;;GAIG;AASH,oEAAoE;AACpE,wBAAgB,gBAAgB,CAAC,OAAO,EAAE,QAAQ,CAAC,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,CAAC,GAAG,OAAO,CAGpF"}

package/dist/codex/transcript/turn-end.js

@@ -0,0 +1,17 @@
+/**
+ * Recognizes the committed Codex transcript records that end a turn.
+ * Implements PRD §7A.3 for the native question lifecycle (§5.10) and for the shutdown
+ * wait on a turn's commit (§5.7, C-LIFE-13), so both read one list.
+ */
+const turnEndPayloadTypes = new Set([
+    "task_complete",
+    "turn_complete",
+    "turn_aborted",
+    "turn_failed",
+]);
+/** Whether a rollout item's `payload` records that a turn ended. */
+export function isTurnEndPayload(payload) {
+    const type = payload["type"];
+    return typeof type === "string" && turnEndPayloadTypes.has(type);
+}
+//# sourceMappingURL=turn-end.js.map

package/dist/codex/transcript/turn-end.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"turn-end.js","sourceRoot":"","sources":["../../../src/codex/transcript/turn-end.ts"],"names":[],"mappings":"AAAA;;;;GAIG;AAEH,MAAM,mBAAmB,GAAwB,IAAI,GAAG,CAAC;IACvD,eAAe;IACf,eAAe;IACf,cAAc;IACd,aAAa;CACd,CAAC,CAAC;AAEH,oEAAoE;AACpE,MAAM,UAAU,gBAAgB,CAAC,OAA0C;IACzE,MAAM,IAAI,GAAG,OAAO,CAAC,MAAM,CAAC,CAAC;IAC7B,OAAO,OAAO,IAAI,KAAK,QAAQ,IAAI,mBAAmB,CAAC,GAAG,CAAC,IAAI,CAAC,CAAC;AACnE,CAAC"}

package/dist/codex/transcript/watcher.d.ts

@@ -4,7 +4,8 @@
  * are sourced from the JSONL transcript Codex writes; reads are bounded (fixed-size
  * chunks, a max-pending ceiling, a per-scan chunk budget) so a hundreds-of-MiB file
  * never OOMs or blocks the event loop, and lost committed data is surfaced through
- * bounded, content-free drop notices.
+ * bounded, content-free drop notices. A transcript not created yet is waited on silently;
+ * one removed after it existed is a read race that warns (§5.7, C-CODEX-23).
  */
 import type { CodexTranscriptEvent } from "./types.ts";
 import type { CodexTranscriptNotices } from "./watcher-config.ts";
@@ -23,7 +24,9 @@ export declare class CodexTranscriptWatcher {
     private readonly now;
     constructor(elwoodSessionId: string, emit: (event: CodexTranscriptEvent) => void, notices?: CodexTranscriptNotices);
     observe(path: string): void;
-    private runScan;
+    /** One `scan()` that never throws, as the poll timer runs it: a failure finishes the
+     * watcher and reports `onPollError`. For callers that scan from their own timers. */
+    poll(): void;
     scan(): void;
     flush(): void;
     finish(): void;

package/dist/codex/transcript/watcher.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"watcher.d.ts","sourceRoot":"","sources":["../../../src/codex/transcript/watcher.ts"],"names":[],"mappings":"AAAA;;;;;;;GAOG;AASH,OAAO,KAAK,EAAE,oBAAoB,EAAE,MAAM,YAAY,CAAC;AACvD,OAAO,KAAK,EAAE,sBAAsB,EAAE,MAAM,qBAAqB,CAAC;AAElE,YAAY,EACV,oBAAoB,IAAI,eAAe,EACvC,yBAAyB,IAAI,oBAAoB,GAClD,MAAM,gCAAgC,CAAC;AACxC,YAAY,EAAE,sBAAsB,EAAE,MAAM,qBAAqB,CAAC;AAMlE,qBAAa,sBAAsB;IACjC,OAAO,CAAC,MAAM,CAAsC;IACpD,OAAO,CAAC,QAAQ,CAA6C;IAE7D,OAAO,CAAC,QAAQ,CAAS;IACzB,OAAO,CAAC,QAAQ,CAAC,KAAK,CAAyB;IAC/C,OAAO,CAAC,QAAQ,CAAC,KAAK,CAAe;IACrC,OAAO,CAAC,QAAQ,CAAC,KAAK,CAAmB;IACzC,OAAO,CAAC,QAAQ,CAAC,WAAW,CAAyC;IAErE,OAAO,CAAC,QAAQ,CAAC,cAAc,CAAoC;IACnE,OAAO,CAAC,QAAQ,CAAC,cAAc,CAAqB;IAEpD,OAAO,CAAC,QAAQ,CAAC,GAAG,CAA6B;gBAG/C,eAAe,EAAE,MAAM,EACvB,IAAI,EAAE,CAAC,KAAK,EAAE,oBAAoB,KAAK,IAAI,EAC3C,OAAO,GAAE,sBAA2B;IActC,OAAO,CAAC,IAAI,EAAE,MAAM,GAAG,IAAI;IAc3B,OAAO,CAAC,OAAO;IAUf,IAAI,IAAI,IAAI;IAkBZ,KAAK,IAAI,IAAI;IAQb,MAAM,IAAI,IAAI;IAUd,IAAI,IAAI,IAAI;IASZ,OAAO,CAAC,oBAAoB;IAS5B,OAAO,CAAC,YAAY;CAQrB"}
+{"version":3,"file":"watcher.d.ts","sourceRoot":"","sources":["../../../src/codex/transcript/watcher.ts"],"names":[],"mappings":"AAAA;;;;;;;;GAQG;AAaH,OAAO,KAAK,EAAE,oBAAoB,EAAE,MAAM,YAAY,CAAC;AACvD,OAAO,KAAK,EAAE,sBAAsB,EAAE,MAAM,qBAAqB,CAAC;AAElE,YAAY,EACV,oBAAoB,IAAI,eAAe,EACvC,yBAAyB,IAAI,oBAAoB,GAClD,MAAM,gCAAgC,CAAC;AACxC,YAAY,EAAE,sBAAsB,EAAE,MAAM,qBAAqB,CAAC;AAMlE,qBAAa,sBAAsB;IACjC,OAAO,CAAC,MAAM,CAAsC;IACpD,OAAO,CAAC,QAAQ,CAA6C;IAE7D,OAAO,CAAC,QAAQ,CAAS;IACzB,OAAO,CAAC,QAAQ,CAAC,KAAK,CAAyB;IAC/C,OAAO,CAAC,QAAQ,CAAC,KAAK,CAAe;IACrC,OAAO,CAAC,QAAQ,CAAC,KAAK,CAAmB;IACzC,OAAO,CAAC,QAAQ,CAAC,WAAW,CAAyC;IAErE,OAAO,CAAC,QAAQ,CAAC,cAAc,CAAoC;IACnE,OAAO,CAAC,QAAQ,CAAC,cAAc,CAAqB;IAEpD,OAAO,CAAC,QAAQ,CAAC,GAAG,CAA6B;gBAG/C,eAAe,EAAE,MAAM,EACvB,IAAI,EAAE,CAAC,KAAK,EAAE,oBAAoB,KAAK,IAAI,EAC3C,OAAO,GAAE,sBAA2B;IActC,OAAO,CAAC,IAAI,EAAE,MAAM,GAAG,IAAI;IAc3B;yFACqF;IACrF,IAAI,IAAI,IAAI;IAUZ,IAAI,IAAI,IAAI;IAoBZ,KAAK,IAAI,IAAI;IAQb,MAAM,IAAI,IAAI;IAUd,IAAI,IAAI,IAAI;IASZ,OAAO,CAAC,oBAAoB;IAS5B,OAAO,CAAC,YAAY;CAQrB"}