@with-logic/elwood 0.1.3 → 0.2.0

package/dist/codex/session/transcript.js

@@ -20,21 +20,64 @@ export function createCodexTranscriptWatcher(elwoodSessionId, emitter, getSink)
     // The shared router buffers diagnostics observed BEFORE the sink exists (the watcher
     // is built first) and delivers each exactly once with clear-before-delivery + throw
     // containment (see core/transcript/warning-router).
-    const { route, flushPendingWarnings } = createTranscriptWarningRouter(getSink);
-    const watcher = new CodexTranscriptWatcher(elwoodSessionId, (event) => {
-        emitter.emit("codex:transcript", event);
-        emitter.emit("activity", activity.activityFromCodexTranscript(event));
-    }, {
+    const warnings = createTranscriptWarningRouter(getSink);
+    let deliveryDepth = 0;
+    function duringDelivery(work) {
+        deliveryDepth += 1;
+        try {
+            work();
+        }
+        finally {
+            deliveryDepth -= 1;
+        }
+    }
+    const route = (warning) => duringDelivery(() => warnings.route(warning));
+    const flushPendingWarnings = () => duringDelivery(warnings.flushPendingWarnings);
+    const reported = new Set();
+    // TypedEmitter fans out to all listeners before rethrowing. Contain each channel
+    // separately so one consumer cannot suppress the projection or stop later polls.
+    function deliver(channel, event) {
+        try {
+            emitter.emit(channel, event);
+        }
+        catch {
+            if (reported.has(channel))
+                return;
+            reported.add(channel);
+            // Run warning callbacks after the current scan/flush. A callback may stop
+            // the session synchronously, so it must not interrupt paired record delivery.
+            queueMicrotask(() => route({
+                elwoodSessionId,
+                agent: "codex",
+                source: "terminal",
+                code: "transcript_listener_error",
+                severity: "warning",
+                message: "Codex transcript listener failed; remaining transcript delivery continues.",
+                channel,
+                raw: `transcript_listener_error channel=${channel}`,
+            }));
+        }
+    }
+    const watcher = new CodexTranscriptWatcher(elwoodSessionId, (event) => duringDelivery(() => {
+        deliver("codex:transcript", event);
+        deliver("activity", activity.activityFromCodexTranscript(event));
+    }), {
         onDrop: (notice) => route(codexDropWarning(notice)),
         onReadError: (notice) => route(codexReadErrorWarning(notice)),
         onPollError: (error) => route(codexPollStoppedWarning(elwoodSessionId, error)),
     });
     // C-LIFE-10: drive the FINAL flush behind an error boundary, then run `afterFlush`
-    // (terminal:exit emission, status, reap) in a `finally` so a throwing final-flush
-    // listener can NEVER skip terminal:exit. A flush failure is contained and surfaced as
+    // (terminal:exit emission, status, reap) in a `finally` so an internal drain
+    // error cannot skip terminal:exit. A flush failure is contained and surfaced as
     // a bounded `transcript_poll_stopped` diagnostic phase-labelled `final_flush` (so lost
     // trailing shutdown activity is distinguishable from a live poll failure). Mirrors Claude.
     const finishSafely = (afterFlush = () => undefined) => {
+        if (deliveryDepth > 0) {
+            // A listener can synchronously stop the PTY. Let the bounded scan deliver
+            // every record it already read before finalizing the watcher and session.
+            queueMicrotask(() => finishSafely(afterFlush));
+            return;
+        }
         try {
             watcher.finish();
         }
@@ -48,6 +91,6 @@ export function createCodexTranscriptWatcher(elwoodSessionId, emitter, getSink)
             afterFlush();
         }
     };
-    return { watcher, flushPendingWarnings, finishSafely };
+    return { watcher, duringDelivery, flushPendingWarnings, finishSafely };
 }
 //# sourceMappingURL=transcript.js.map

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

@@ -1 +1 @@
-{"version":3,"file":"transcript.js","sourceRoot":"","sources":["../../../src/codex/session/transcript.ts"],"names":[],"mappings":"AAAA;;;;;;;;GAQG;AAEH,OAAO,KAAK,QAAQ,MAAM,8BAA8B,CAAC;AACzD,OAAO,EACL,6BAA6B,GAE9B,MAAM,yCAAyC,CAAC;AAEjD,OAAO,EACL,sBAAsB,EACtB,gBAAgB,EAChB,uBAAuB,EACvB,qBAAqB,GACtB,MAAM,wBAAwB,CAAC;AAYhC;;;;;GAKG;AACH,MAAM,UAAU,4BAA4B,CAC1C,eAAuB,EACvB,OAAoC,EACpC,OAAgD;IAEhD,qFAAqF;IACrF,oFAAoF;IACpF,oDAAoD;IACpD,MAAM,EAAE,KAAK,EAAE,oBAAoB,EAAE,GAAG,6BAA6B,CAAC,OAAO,CAAC,CAAC;IAC/E,MAAM,OAAO,GAAG,IAAI,sBAAsB,CACxC,eAAe,EACf,CAAC,KAAK,EAAE,EAAE;QACR,OAAO,CAAC,IAAI,CAAC,kBAAkB,EAAE,KAAK,CAAC,CAAC;QACxC,OAAO,CAAC,IAAI,CAAC,UAAU,EAAE,QAAQ,CAAC,2BAA2B,CAAC,KAAK,CAAC,CAAC,CAAC;IACxE,CAAC,EACD;QACE,MAAM,EAAE,CAAC,MAAM,EAAE,EAAE,CAAC,KAAK,CAAC,gBAAgB,CAAC,MAAM,CAAC,CAAC;QACnD,WAAW,EAAE,CAAC,MAAM,EAAE,EAAE,CAAC,KAAK,CAAC,qBAAqB,CAAC,MAAM,CAAC,CAAC;QAC7D,WAAW,EAAE,CAAC,KAAK,EAAE,EAAE,CAAC,KAAK,CAAC,uBAAuB,CAAC,eAAe,EAAE,KAAK,CAAC,CAAC;KAC/E,CACF,CAAC;IACF,mFAAmF;IACnF,kFAAkF;IAClF,sFAAsF;IACtF,uFAAuF;IACvF,2FAA2F;IAC3F,MAAM,YAAY,GAAG,CAAC,aAAyB,GAAG,EAAE,CAAC,SAAS,EAAE,EAAE;QAChE,IAAI,CAAC;YACH,OAAO,CAAC,MAAM,EAAE,CAAC;QACnB,CAAC;QAAC,OAAO,KAAK,EAAE,CAAC;YACf,IAAI,CAAC;gBACH,KAAK,CAAC,uBAAuB,CAAC,eAAe,EAAE,KAAK,EAAE,aAAa,CAAC,CAAC,CAAC;YACxE,CAAC;YAAC,MAAM,CAAC,CAAA,CAAC,CAAC,gEAAgE;QAC7E,CAAC;gBAAS,CAAC;YACT,UAAU,EAAE,CAAC;QACf,CAAC;IACH,CAAC,CAAC;IACF,OAAO,EAAE,OAAO,EAAE,oBAAoB,EAAE,YAAY,EAAE,CAAC;AACzD,CAAC"}
+{"version":3,"file":"transcript.js","sourceRoot":"","sources":["../../../src/codex/session/transcript.ts"],"names":[],"mappings":"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"}

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

@@ -6,10 +6,11 @@ import type { ElwoodActivityEvent } from "../../core/activity/index.ts";
 import type { SendOptions } from "../../core/images/types.ts";
 import type { LoopControls } from "../../core/loops/loop-controls.ts";
 import type { AgentModelOption } from "../../core/models/rows.ts";
+import type { QuestionControls } from "../../core/questions/types.ts";
 import type { CodexReasoningEffort } from "../../core/reasoning-effort.ts";
 import type { ActivityMatch, ElwoodCommonEventMap, ElwoodSessionStatus, ElwoodStatusDecision, StatusMatch, TerminalSize, Unsubscribe } from "../../core/types.ts";
 import type { ElwoodTerminal } from "../../terminal/headless.ts";
-import type { CodexHookEvent, CodexHookEventFor, CodexHookEventName, CodexHookHandlers, CodexHookResultFor } from "../hooks/index.ts";
+import type { CodexHookCommonResultFor, CodexHookEvent, CodexHookEventFor, CodexHookEventName, CodexHookHandlers } from "../hooks/index.ts";
 import type { CodexTranscriptEvent } from "../transcript/index.ts";
 export type CodexSandboxMode = "read-only" | "workspace-write" | "danger-full-access";
 export type CodexApprovalPolicy = "untrusted" | "on-request" | "never";
@@ -54,8 +55,8 @@ export type CodexEventMap = ElwoodCommonEventMap & {
     readonly [K in `hook:${CodexHookEventName}`]: K extends `hook:${infer N}` ? N extends CodexHookEventName ? CodexHookEventFor<N> : never : never;
 };
 export type CodexEventName = keyof CodexEventMap;
-export type CodexEventHandler<E extends CodexEventName> = (event: CodexEventMap[E]) => E extends `hook:${infer K}` ? K extends CodexHookEventName ? CodexHookResultFor<K> | Promise<CodexHookResultFor<K>> : undefined : void;
-export interface CodexSessionApi extends LoopControls {
+export type CodexEventHandler<E extends CodexEventName> = (event: CodexEventMap[E]) => E extends `hook:${infer K}` ? K extends CodexHookEventName ? CodexHookCommonResultFor<K> | Promise<CodexHookCommonResultFor<K>> : undefined : void;
+export interface CodexSessionApi extends LoopControls, QuestionControls {
     readonly elwoodSessionId: string;
     readonly cwd: string;
     readonly status: ElwoodSessionStatus;

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

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

package/dist/codex/session/update-attention.d.ts

@@ -0,0 +1,4 @@
+/** Fresh update evidence renews CLI grace without claiming success (PRD §5.4/§5.5). */
+import type { StartupActivityEmitter } from "../../core/startup/automation.ts";
+export declare function emitUpdateAttention(emitter: StartupActivityEmitter, elwoodSessionId: string, promptGeneration: number | undefined): void;
+//# sourceMappingURL=update-attention.d.ts.map

package/dist/codex/session/update-attention.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"update-attention.d.ts","sourceRoot":"","sources":["../../../src/codex/session/update-attention.ts"],"names":[],"mappings":"AAAA,uFAAuF;AACvF,OAAO,KAAK,EAAE,sBAAsB,EAAE,MAAM,kCAAkC,CAAC;AAE/E,wBAAgB,mBAAmB,CACjC,OAAO,EAAE,sBAAsB,EAC/B,eAAe,EAAE,MAAM,EACvB,gBAAgB,EAAE,MAAM,GAAG,SAAS,GACnC,IAAI,CAcN"}

package/dist/codex/session/update-attention.js

@@ -0,0 +1,18 @@
+export function emitUpdateAttention(emitter, elwoodSessionId, promptGeneration) {
+    if (promptGeneration === undefined)
+        return;
+    try {
+        emitter.emit("activity", {
+            elwoodSessionId,
+            agent: "codex",
+            source: "terminal",
+            kind: "attention",
+            label: "codex-update-prompt",
+            promptGeneration,
+        });
+    }
+    catch {
+        // A throwing observer cannot interrupt the frame or its new bounded attempt.
+    }
+}
+//# sourceMappingURL=update-attention.js.map

package/dist/codex/session/update-attention.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"update-attention.js","sourceRoot":"","sources":["../../../src/codex/session/update-attention.ts"],"names":[],"mappings":"AAGA,MAAM,UAAU,mBAAmB,CACjC,OAA+B,EAC/B,eAAuB,EACvB,gBAAoC;IAEpC,IAAI,gBAAgB,KAAK,SAAS;QAAE,OAAO;IAC3C,IAAI,CAAC;QACH,OAAO,CAAC,IAAI,CAAC,UAAU,EAAE;YACvB,eAAe;YACf,KAAK,EAAE,OAAO;YACd,MAAM,EAAE,UAAU;YAClB,IAAI,EAAE,WAAW;YACjB,KAAK,EAAE,qBAAqB;YAC5B,gBAAgB;SACjB,CAAC,CAAC;IACL,CAAC;IAAC,MAAM,CAAC;QACP,6EAA6E;IAC/E,CAAC;AACH,CAAC"}

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

@@ -10,10 +10,11 @@ type RestoreWarning = Extract<ElwoodWarningEvent, {
     readonly code: "codex_default_model_persisted";
 }>;
 declare const restoreSkippedMessages: {
+    readonly 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.";
     readonly skipped: "Codex persisted the picker selection as the user's default model, and Elwood skipped the restore because config.toml changed in other ways during the switch.";
     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.";
 };
-/** The restore was not applied: the file changed in other ways, or there was nothing 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;
 /**
  * Both the picker automation and the config restore failed: the primary error is

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;;;CAKlB,CAAC;AAEX,oGAAoG;AACpG,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;;;;;;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"}

package/dist/codex/session/warnings.js

@@ -8,10 +8,11 @@
 import { codexConfigPath, 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.",
     skipped: "Codex persisted the picker selection as the user's default model, and Elwood skipped the restore because config.toml changed in other ways during the switch.",
     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.",
 };
-/** The restore was not applied: the file changed in other ways, or there was nothing to restore. */
+/** No restore: concurrent edits, raw takeover, or no prior snapshot left the default in place. */
 export function codexRestoreSkippedWarning(elwoodSessionId, outcome) {
     return {
         elwoodSessionId,

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,OAAO,EACL,+JAA+J;IACjK,WAAW,EACT,yMAAyM;CACnM,CAAC;AAEX,oGAAoG;AACpG,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;;;;;;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"}

package/dist/codex/simple.d.ts

@@ -18,6 +18,7 @@ export declare class CodexSession extends SessionBase<CodexSessionApi> {
     protected launch(): Promise<CodexSessionApi>;
     /** Codex's `Stop` hook carries `last_assistant_message` — the standard completeness signal. */
     protected readBoundarySignal: import("../core/simple/turn-types.ts").BoundarySignalReader;
+    protected readonly readNativeTurn: import("../core/simple/turn-identity.ts").NativeTurnReader;
     /** Typed event subscription over the Codex event map (buffered before start). */
     on<E extends CodexEventName>(event: E, handler: CodexEventHandler<E>): Unsubscribe;
     off<E extends CodexEventName>(event: E, handler: CodexEventHandler<E>): void;

package/dist/codex/simple.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"simple.d.ts","sourceRoot":"","sources":["../../src/codex/simple.ts"],"names":[],"mappings":"AAAA;;;;;;GAMG;AAIH,OAAO,EAAE,WAAW,EAAE,MAAM,2BAA2B,CAAC;AAExD,OAAO,KAAK,EAAE,WAAW,EAAE,MAAM,kBAAkB,CAAC;AAGpD,OAAO,KAAK,EACV,iBAAiB,EACjB,cAAc,EACd,eAAe,EACf,iBAAiB,EAClB,MAAM,oBAAoB,CAAC;AAW5B,6FAA6F;AAC7F,MAAM,MAAM,mBAAmB,GAAG,IAAI,CAAC,iBAAiB,EAAE,KAAK,CAAC,GAAG;IAAE,QAAQ,CAAC,GAAG,CAAC,EAAE,MAAM,CAAA;CAAE,CAAC;AAE7F,qBAAa,YAAa,SAAQ,WAAW,CAAC,eAAe,CAAC;IAC5D,OAAO,CAAC,QAAQ,CAAC,OAAO,CAAoB;gBAEhC,OAAO,GAAE,mBAAwB;IAU7C,SAAS,CAAC,MAAM,IAAI,OAAO,CAAC,eAAe,CAAC;IAI5C,+FAA+F;IAC/F,SAAS,CAAC,kBAAkB,8DAAyB;IAErD,iFAAiF;IACjF,EAAE,CAAC,CAAC,SAAS,cAAc,EAAE,KAAK,EAAE,CAAC,EAAE,OAAO,EAAE,iBAAiB,CAAC,CAAC,CAAC,GAAG,WAAW;IAKlF,GAAG,CAAC,CAAC,SAAS,cAAc,EAAE,KAAK,EAAE,CAAC,EAAE,OAAO,EAAE,iBAAiB,CAAC,CAAC,CAAC,GAAG,IAAI;CAG7E"}
+{"version":3,"file":"simple.d.ts","sourceRoot":"","sources":["../../src/codex/simple.ts"],"names":[],"mappings":"AAAA;;;;;;GAMG;AAIH,OAAO,EAAE,WAAW,EAAE,MAAM,2BAA2B,CAAC;AAExD,OAAO,KAAK,EAAE,WAAW,EAAE,MAAM,kBAAkB,CAAC;AAIpD,OAAO,KAAK,EACV,iBAAiB,EACjB,cAAc,EACd,eAAe,EACf,iBAAiB,EAClB,MAAM,oBAAoB,CAAC;AAW5B,6FAA6F;AAC7F,MAAM,MAAM,mBAAmB,GAAG,IAAI,CAAC,iBAAiB,EAAE,KAAK,CAAC,GAAG;IAAE,QAAQ,CAAC,GAAG,CAAC,EAAE,MAAM,CAAA;CAAE,CAAC;AAE7F,qBAAa,YAAa,SAAQ,WAAW,CAAC,eAAe,CAAC;IAC5D,OAAO,CAAC,QAAQ,CAAC,OAAO,CAAoB;gBAEhC,OAAO,GAAE,mBAAwB;IAU7C,SAAS,CAAC,MAAM,IAAI,OAAO,CAAC,eAAe,CAAC;IAI5C,+FAA+F;IAC/F,SAAS,CAAC,kBAAkB,8DAAyB;IACrD,mBAA4B,cAAc,6DAAqB;IAE/D,iFAAiF;IACjF,EAAE,CAAC,CAAC,SAAS,cAAc,EAAE,KAAK,EAAE,CAAC,EAAE,OAAO,EAAE,iBAAiB,CAAC,CAAC,CAAC,GAAG,WAAW;IAKlF,GAAG,CAAC,CAAC,SAAS,cAAc,EAAE,KAAK,EAAE,CAAC,EAAE,OAAO,EAAE,iBAAiB,CAAC,CAAC,CAAC,GAAG,IAAI;CAG7E"}

package/dist/codex/simple.js

@@ -9,6 +9,7 @@ import { assertCodexHighTrust } from "../core/high-trust.js";
 import { resolveSessionPaths } from "../core/simple/resolve-paths.js";
 import { SessionBase } from "../core/simple/session.js";
 import { defaultBoundarySignal } from "../core/simple/turn.js";
+import { codexTurnIdentity } from "./accepted-turn.js";
 import { startCodex } from "./session/index.js";
 const _stopBoundaryCheck = true;
 void _stopBoundaryCheck;
@@ -28,6 +29,7 @@ export class CodexSession extends SessionBase {
     }
     /** Codex's `Stop` hook carries `last_assistant_message` — the standard completeness signal. */
     readBoundarySignal = defaultBoundarySignal;
+    readNativeTurn = codexTurnIdentity;
     /** Typed event subscription over the Codex event map (buffered before start). */
     on(event, handler) {
         // Keyed by (event, handler) so the disposer works before AND after start and `off` scopes

package/dist/codex/simple.js.map

@@ -1 +1 @@
-{"version":3,"file":"simple.js","sourceRoot":"","sources":["../../src/codex/simple.ts"],"names":[],"mappings":"AAAA;;;;;;GAMG;AAEH,OAAO,EAAE,oBAAoB,EAAE,MAAM,uBAAuB,CAAC;AAC7D,OAAO,EAAE,mBAAmB,EAAE,MAAM,iCAAiC,CAAC;AACtE,OAAO,EAAE,WAAW,EAAE,MAAM,2BAA2B,CAAC;AACxD,OAAO,EAA2B,qBAAqB,EAAE,MAAM,wBAAwB,CAAC;AAGxF,OAAO,EAAE,UAAU,EAAE,MAAM,oBAAoB,CAAC;AAchD,MAAM,kBAAkB,GAA2B,IAAI,CAAC;AACxD,KAAK,kBAAkB,CAAC;AAKxB,MAAM,OAAO,YAAa,SAAQ,WAA4B;IAC3C,OAAO,CAAoB;IAE5C,YAAY,UAA+B,EAAE;QAC3C,KAAK,EAAE,CAAC;QACR,8FAA8F;QAC9F,+FAA+F;QAC/F,IAAI,CAAC,OAAO,GAAG,mBAAmB,CAAC,OAAO,CAAC,CAAC;QAC5C,yFAAyF;QACzF,qFAAqF;QACrF,oBAAoB,CAAC,IAAI,CAAC,OAAO,CAAC,CAAC;IACrC,CAAC;IAES,MAAM;QACd,OAAO,UAAU,CAAC,IAAI,CAAC,OAAO,CAAC,CAAC;IAClC,CAAC;IAED,+FAA+F;IACrF,kBAAkB,GAAG,qBAAqB,CAAC;IAErD,iFAAiF;IACjF,EAAE,CAA2B,KAAQ,EAAE,OAA6B;QAClE,0FAA0F;QAC1F,uFAAuF;QACvF,OAAO,IAAI,CAAC,SAAS,CAAC,KAAK,EAAE,OAAO,EAAE,CAAC,OAAO,EAAE,EAAE,CAAC,OAAO,CAAC,EAAE,CAAC,KAAK,EAAE,OAAO,CAAC,CAAC,CAAC;IACjF,CAAC;IACD,GAAG,CAA2B,KAAQ,EAAE,OAA6B;QACnE,IAAI,CAAC,WAAW,CAAC,KAAK,EAAE,OAAO,CAAC,CAAC;IACnC,CAAC;CACF"}
+{"version":3,"file":"simple.js","sourceRoot":"","sources":["../../src/codex/simple.ts"],"names":[],"mappings":"AAAA;;;;;;GAMG;AAEH,OAAO,EAAE,oBAAoB,EAAE,MAAM,uBAAuB,CAAC;AAC7D,OAAO,EAAE,mBAAmB,EAAE,MAAM,iCAAiC,CAAC;AACtE,OAAO,EAAE,WAAW,EAAE,MAAM,2BAA2B,CAAC;AACxD,OAAO,EAA2B,qBAAqB,EAAE,MAAM,wBAAwB,CAAC;AAExF,OAAO,EAAE,iBAAiB,EAAE,MAAM,oBAAoB,CAAC;AAEvD,OAAO,EAAE,UAAU,EAAE,MAAM,oBAAoB,CAAC;AAchD,MAAM,kBAAkB,GAA2B,IAAI,CAAC;AACxD,KAAK,kBAAkB,CAAC;AAKxB,MAAM,OAAO,YAAa,SAAQ,WAA4B;IAC3C,OAAO,CAAoB;IAE5C,YAAY,UAA+B,EAAE;QAC3C,KAAK,EAAE,CAAC;QACR,8FAA8F;QAC9F,+FAA+F;QAC/F,IAAI,CAAC,OAAO,GAAG,mBAAmB,CAAC,OAAO,CAAC,CAAC;QAC5C,yFAAyF;QACzF,qFAAqF;QACrF,oBAAoB,CAAC,IAAI,CAAC,OAAO,CAAC,CAAC;IACrC,CAAC;IAES,MAAM;QACd,OAAO,UAAU,CAAC,IAAI,CAAC,OAAO,CAAC,CAAC;IAClC,CAAC;IAED,+FAA+F;IACrF,kBAAkB,GAAG,qBAAqB,CAAC;IACzB,cAAc,GAAG,iBAAiB,CAAC;IAE/D,iFAAiF;IACjF,EAAE,CAA2B,KAAQ,EAAE,OAA6B;QAClE,0FAA0F;QAC1F,uFAAuF;QACvF,OAAO,IAAI,CAAC,SAAS,CAAC,KAAK,EAAE,OAAO,EAAE,CAAC,OAAO,EAAE,EAAE,CAAC,OAAO,CAAC,EAAE,CAAC,KAAK,EAAE,OAAO,CAAC,CAAC,CAAC;IACjF,CAAC;IACD,GAAG,CAA2B,KAAQ,EAAE,OAA6B;QACnE,IAAI,CAAC,WAAW,CAAC,KAAK,EAAE,OAAO,CAAC,CAAC;IACnC,CAAC;CACF"}

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

@@ -1,32 +1,47 @@
-/**
- * Handles known Codex startup prompts that block interactive sessions.
- * Implements PRD §4.4, §5.5, and §5.7.
- */
+/** Handles known Codex startup prompts that block interactive sessions.
+ * Implements PRD §4.4, §5.5, and §5.7. */
+import type { AutomationWriteResult } from "../core/startup/barrier.ts";
 import type { SettledStartupOutcome } from "../core/startup/write.ts";
+import type { TrustClearance } from "../core/trust/clearance.ts";
 import { type TrustWriteResult } from "../core/trust/responder.ts";
 import type { ElwoodWarningEvent } from "../core/types.ts";
+export { codexWarningsFromText } from "./startup-warnings.ts";
 /** A Codex startup outcome paired with its PTY-write completion (§5.4, §5.7). */
 export type SettledCodexStartupOutcome = SettledStartupOutcome<"codex">;
 type CodexStartupPromptResult = {
     readonly warnings: readonly ElwoodWarningEvent[];
     readonly outcomes: readonly SettledCodexStartupOutcome[];
+    readonly updateGeneration?: number;
 };
 export declare class CodexStartupPromptResponder {
-    private buffer;
     private readonly elwoodSessionId;
     private readonly trust;
+    private readonly clearance;
+    private readonly sessionInputHeld;
     private readonly updatePrompt;
-    private skippedUpdate;
+    private readonly lifetime;
+    private skipGeneration;
+    private updateAttempt;
     private warnedBanners;
-    constructor(elwoodSessionId?: string, autotrust?: boolean);
-    handle(screenText: string, write: (input: string) => TrustWriteResult, readFrame?: () => string): CodexStartupPromptResult;
+    private conversationStarted;
+    constructor(elwoodSessionId?: string, autotrust?: boolean, onStateChange?: () => void, clearance?: TrustClearance, sessionInputHeld?: () => boolean);
+    observeClearance(frame: string): void;
+    get closingSignal(): AbortSignal;
+    get blockedPrompt(): "workspace_trust" | "hook_trust" | undefined;
+    dispose(): void;
+    get inputBlocking(): boolean;
+    /**
+     * `write` answers trust; `writeAutomation` (default `write`) handles other prompts,
+     * where a trust gate must withhold unrelated automated keys.
+     * Live adapters must supply `readTrustFrame` from `currentRenderedFrame`, returning
+     * undefined for pending rendering, synchronized output, or render failure.
+     * The fallback to `readFrame` preserves static/direct callers; a snapshot-only
+     * reader must not replace the settlement-aware reader in a live session.
+     */
+    handle(screenText: string, write: (input: string) => TrustWriteResult, readFrame?: () => string, writeAutomation?: (input: string) => TrustWriteResult | Promise<AutomationWriteResult>, readTrustFrame?: () => string | undefined): CodexStartupPromptResult;
+    /** The session is about to write caller input; nothing after this is a startup banner. */
+    endStartup(): void;
     private newWarnings;
 }
-/** The two banner warnings the startup responder parses (an exhaustive pair). */
-type CodexBannerWarning = Extract<ElwoodWarningEvent, {
-    readonly code: "mcp_server_not_logged_in" | "mcp_startup_incomplete";
-}>;
 export declare function findNumberedOption(text: string, pattern: RegExp): string | null;
-export declare function codexWarningsFromText(text: string, elwoodSessionId: string): readonly CodexBannerWarning[];
-export {};
 //# sourceMappingURL=startup-prompts.d.ts.map

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;;;GAGG;AAEH,OAAO,KAAK,EAAE,qBAAqB,EAAE,MAAM,0BAA0B,CAAC;AAEtE,OAAO,EAAwB,KAAK,gBAAgB,EAAE,MAAM,4BAA4B,CAAC;AACzF,OAAO,KAAK,EAAE,kBAAkB,EAAE,MAAM,kBAAkB,CAAC;AAO3D,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;CAC1D,CAAC;AAIF,qBAAa,2BAA2B;IACtC,OAAO,CAAC,MAAM,CAAS;IACvB,OAAO,CAAC,QAAQ,CAAC,eAAe,CAAS;IACzC,OAAO,CAAC,QAAQ,CAAC,KAAK,CAAgC;IACtD,OAAO,CAAC,QAAQ,CAAC,YAAY,CAAkC;IAC/D,OAAO,CAAC,aAAa,CAAU;IAM/B,OAAO,CAAC,aAAa,CAAqB;gBAE9B,eAAe,SAAK,EAAE,SAAS,UAAQ;IASnD,MAAM,CACJ,UAAU,EAAE,MAAM,EAClB,KAAK,EAAE,CAAC,KAAK,EAAE,MAAM,KAAK,gBAAgB,EAC1C,SAAS,CAAC,EAAE,MAAM,MAAM,GACvB,wBAAwB;IAuD3B,OAAO,CAAC,WAAW;CAMpB;AAED,iFAAiF;AACjF,KAAK,kBAAkB,GAAG,OAAO,CAC/B,kBAAkB,EAClB;IAAE,QAAQ,CAAC,IAAI,EAAE,0BAA0B,GAAG,wBAAwB,CAAA;CAAE,CACzE,CAAC;AASF,wBAAgB,kBAAkB,CAAC,IAAI,EAAE,MAAM,EAAE,OAAO,EAAE,MAAM,GAAG,MAAM,GAAG,IAAI,CAE/E;AAED,wBAAgB,qBAAqB,CACnC,IAAI,EAAE,MAAM,EACZ,eAAe,EAAE,MAAM,GACtB,SAAS,kBAAkB,EAAE,CAU/B"}
+{"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"}

package/dist/codex/startup-prompts.js

@@ -1,74 +1,122 @@
-/**
- * Handles known Codex startup prompts that block interactive sessions.
- * Implements PRD §4.4, §5.5, and §5.7.
- */
+/** Handles known Codex startup prompts that block interactive sessions.
+ * Implements PRD §4.4, §5.5, and §5.7. */
 import { numberedOptions } from "../core/terminal-options.js";
+import { trustGateVisible } from "../core/trust/blocking.js";
 import { TrustPromptResponder } from "../core/trust/responder.js";
-import { CodexUpdatePromptTracker, codexUpdateOptionPattern, writeCodexUpdateSkip, } from "./update-prompt.js";
-const maxBufferLength = 6_000;
+import { codexTrustClearance } from "./screen-table.js";
+import { codexWarningsFromText } from "./startup-warnings.js";
+import { safeUpdateOption } from "./update/selection.js";
+import { startCodexUpdateSkip } from "./update/skip-attempt.js";
+import { CodexUpdatePromptTracker } from "./update/tracker.js";
+export { codexWarningsFromText } from "./startup-warnings.js";
 export class CodexStartupPromptResponder {
-    buffer;
     elwoodSessionId;
     trust;
-    updatePrompt = new CodexUpdatePromptTracker();
-    skippedUpdate;
-    // The banner identities that fired a warning on the PREVIOUS frame. A warning fires
-    // only on the EDGE a banner first appears; a banner still present next frame is NOT
-    // re-emitted (that would replay the same live incident indefinitely, C-API-14). A
-    // banner that clears (drops out of this set) and reappears fires again — a genuinely
-    // new occurrence, matching "once when observed" rather than "replay while on screen".
+    clearance;
+    sessionInputHeld;
+    updatePrompt;
+    lifetime = new AbortController();
+    // The update-screen generation that owns the skip latch (0 = none). Only that
+    // generation's own completion may release it; a stale completion is a no-op.
+    skipGeneration = 0;
+    updateAttempt;
+    // Emit only newly appearing warning banners; clearing re-arms a later occurrence.
     warnedBanners = new Set();
-    constructor(elwoodSessionId = "", autotrust = false) {
+    conversationStarted = false;
+    constructor(elwoodSessionId = "", autotrust = false, onStateChange, clearance = codexTrustClearance, sessionInputHeld) {
         this.elwoodSessionId = elwoodSessionId;
-        this.buffer = "";
-        // Owns the whole allowlisted trust family (directory + hook trust), not just
-        // one prompt; extended by adding entries to trustPromptAllowlist.
-        this.trust = new TrustPromptResponder("codex", autotrust);
-        this.skippedUpdate = false;
+        this.clearance = clearance;
+        this.sessionInputHeld = sessionInputHeld ?? (() => false);
+        this.updatePrompt = new CodexUpdatePromptTracker(clearance, sessionInputHeld !== undefined);
+        this.trust = new TrustPromptResponder("codex", clearance, autotrust, onStateChange);
     }
-    handle(screenText, write, readFrame) {
+    observeClearance(frame) {
+        if (this.updatePrompt.needsClearance) {
+            this.updatePrompt.observeClearance(!this.sessionInputHeld() && this.clearance(frame));
+        }
+        this.updateAttempt?.observeClearance(frame);
+    }
+    get closingSignal() {
+        return this.lifetime.signal;
+    }
+    get blockedPrompt() {
+        return this.trust.blockedPrompt;
+    }
+    dispose() {
+        this.lifetime.abort();
+        this.trust.dispose();
+    }
+    get inputBlocking() {
+        return this.trust.inputBlocking;
+    }
+    /**
+     * `write` answers trust; `writeAutomation` (default `write`) handles other prompts,
+     * where a trust gate must withhold unrelated automated keys.
+     * Live adapters must supply `readTrustFrame` from `currentRenderedFrame`, returning
+     * undefined for pending rendering, synchronized output, or render failure.
+     * The fallback to `readFrame` preserves static/direct callers; a snapshot-only
+     * reader must not replace the settlement-aware reader in a live session.
+     */
+    handle(screenText, write, readFrame, writeAutomation = write, readTrustFrame) {
         const outcomes = [];
-        this.buffer = `${this.buffer}\n${screenText}`.slice(-maxBufferLength);
+        if (this.lifetime.signal.aborted)
+            return { warnings: [], outcomes };
         // Trust prompts are matched against the CURRENT frame only: a stale phrase in
-        // the accumulated buffer must never pair with a different dialog's answer.
-        const trust = this.trust.handle(screenText, write, readFrame);
-        if (trust?.kind === "answered") {
-            outcomes.push({ outcome: { kind: "answered", ...trust.automation }, settled: trust.settled });
+        // an earlier frame must never pair with a different dialog's answer.
+        const trust = this.trust.handle(screenText, write, readTrustFrame ?? readFrame);
+        if (trust?.kind === "attempted") {
+            outcomes.push({
+                outcome: { kind: "attempted", ...trust.automation },
+                settled: trust.settled,
+            });
         }
         else if (trust?.kind === "option_pending") {
             outcomes.push({ outcome: { kind: "option_pending", prompt: trust.prompt } });
         }
-        // Skipping an available update is not a trust decision, so it stays here.
-        // The skip is EDGE-triggered and scoped to the CURRENT frame's update screen:
-        // `skippedUpdate` latches after a successful skip so a persistent update screen is
-        // not re-answered every frame, but it RE-ARMS the moment the update screen leaves
-        // the frame. That breaks the observed restart loop — Codex restarts itself, the
-        // update does not take, and the SAME update screen reappears; a cleared frame
-        // between the two appearances (Codex's restart draws a normal composer) re-arms us
-        // to skip the reappearance. Gating the attempt on the CURRENT frame (not just the
-        // accumulated buffer) also means a re-armed benign frame that merely mentions
-        // "update" never re-fires a skip against a stale buffered option — only a frame
-        // actually showing the update screen does. The buffer is still consulted to LOCATE
-        // the option, since Codex can split the banner and its numbered options across two
-        // consecutive frames.
+        // One bounded skip belongs to one appearance. Unknown replacements disable
+        // 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.
+        const renewUpdateAttention = this.updatePrompt.renewsAttention(screenText);
         const onUpdateScreen = this.updatePrompt.observe(screenText);
-        if (!onUpdateScreen)
-            this.skippedUpdate = false;
-        if (onUpdateScreen && !this.skippedUpdate) {
-            const option = findNumberedOption(this.buffer, codexUpdateOptionPattern);
-            if (option) {
-                // Settle OPTIMISTICALLY but keep the skip retryable if the write is
-                // rejected, so a later frame re-attempts it rather than falsely reporting
-                // the update as skipped (C-CODEX-17).
-                this.skippedUpdate = true;
-                const settled = writeCodexUpdateSkip(option, write, readFrame, this.updatePrompt.currentFramePredicate()).catch((error) => {
-                    this.skippedUpdate = false;
-                    throw error;
+        const generation = this.updatePrompt.currentGeneration;
+        // A trust gate (held allowlisted candidate or off-allowlist) is never ELIGIBLE for
+        // update-skip automation, even when its rows resemble the update options. Note this
+        // 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 parsed = this.updatePrompt.classify(screenText);
+            const option = safeUpdateOption(screenText, parsed.options ?? [])?.number ?? null;
+            if (option && this.updatePrompt.currentFramePredicate()(screenText)) {
+                // Latch this appearance before writing; rejection can release the latch
+                // for a later frame, while success requires observed clearance (C-CODEX-17).
+                this.skipGeneration = generation;
+                this.updateAttempt = startCodexUpdateSkip({
+                    option,
+                    generation,
+                    screenText,
+                    tracker: this.updatePrompt,
+                    writeAutomation,
+                    readFrame,
+                    signal: this.lifetime.signal,
+                    clearance: this.clearance,
+                    inputHeld: this.sessionInputHeld,
+                    releaseLatch: () => {
+                        this.skipGeneration = 0;
+                    },
+                });
+                outcomes.push({
+                    outcome: { kind: "attempted", prompt: "update", input: option },
+                    settled: this.updateAttempt.settled,
                 });
-                outcomes.push({ outcome: { kind: "answered", prompt: "update", input: option }, settled });
             }
         }
-        return { warnings: this.newWarnings(screenText), outcomes };
+        return {
+            warnings: this.newWarnings(screenText),
+            outcomes,
+            ...(renewUpdateAttention ? { updateGeneration: generation } : {}),
+        };
     }
     // Emit warnings only for banners NEWLY appearing on THIS frame, matched against the
     // CURRENT frame (not the accumulated buffer) so a scrolled-off banner does not replay
@@ -77,7 +125,19 @@ export class CodexStartupPromptResponder {
     // the same banner with different padding/wrapping across frames, which raw-line keying
     // would treat as new. `warnedBanners` is reset to this frame's identities, so a banner
     // that clears (leaves the frame) then reappears fires again as a genuinely new occurrence.
+    /** The session is about to write caller input; nothing after this is a startup banner. */
+    endStartup() {
+        this.conversationStarted = true;
+    }
     newWarnings(screenText) {
+        // Startup banners can only come from startup: once caller content or a resumed
+        // transcript can be on screen, a copied welcome box whose own conversation marker
+        // has scrolled out of the frame is content, not provenance. EVERY assistant-marker
+        // row ends it — no spinner exemption, since a message can quote spinner text and
+        // native Codex 0.154.0 startup renders no `•` row at all (docs/cli-behavior.md).
+        this.conversationStarted ||= /^\s*[●•]/m.test(screenText);
+        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));
@@ -93,44 +153,4 @@ function bannerKey(warning) {
 export function findNumberedOption(text, pattern) {
     return numberedOptions(text).find((option) => pattern.test(option.label))?.number ?? null;
 }
-export function codexWarningsFromText(text, elwoodSessionId) {
-    const warnings = [];
-    for (const raw of text.split(/\r?\n/)) {
-        const line = raw.trim();
-        const login = /The ([\w.-]+) MCP server is not logged in\. Run `([^`]+)`\./.exec(line);
-        if (login)
-            warnings.push(mcpLoginWarning(elwoodSessionId, line, login[1], login[2]));
-        const failed = /MCP startup incomplete \(failed:\s*([^)]+)\)/.exec(line);
-        if (failed)
-            warnings.push(mcpStartupWarning(elwoodSessionId, line, failed[1]));
-    }
-    return warnings;
-}
-function mcpLoginWarning(elwoodSessionId, raw, mcpServerName, recoveryCommand) {
-    return {
-        elwoodSessionId,
-        agent: "codex",
-        source: "terminal",
-        code: "mcp_server_not_logged_in",
-        severity: "warning",
-        message: `The ${mcpServerName} MCP server is not logged in.`,
-        mcpServerName,
-        recoveryCommand,
-        raw,
-    };
-}
-function mcpStartupWarning(elwoodSessionId, raw, failed) {
-    const failedServers = failed.split(",").map((server) => server.trim());
-    return {
-        elwoodSessionId,
-        agent: "codex",
-        source: "terminal",
-        code: "mcp_startup_incomplete",
-        severity: "warning",
-        message: `MCP startup incomplete: ${failedServers.join(", ")}.`,
-        failedServers,
-        recoveryCommands: failedServers.map((server) => `codex mcp login ${server}`),
-        raw,
-    };
-}
 //# sourceMappingURL=startup-prompts.js.map