@with-logic/elwood 0.1.3 → 0.2.0

package/dist/codex/session/build.js

@@ -1,59 +1,56 @@
-/** Builds a live CodexSessionApi from a record + runtime. Implements PRD §5.5, §5.6, §5.7, §7A, §8, §9. */
-import * as activity from "../../core/activity/index.js";
+import { activityFromTerminalExit as terminalExitActivity } from "../../core/activity/index.js";
 import { AttentionWatcher } from "../../core/attention.js";
 import { defaultTerminalSize } from "../../core/defaults.js";
 import { causeDetails, elwoodError } from "../../core/errors.js";
-import { observeRenderedFrame } from "../../core/rendered-observers.js";
-import { createStartupWarningGate, deliverFrameWarnings } from "../../core/startup/frame.js";
-import { emitSettledStartupOutcomes } from "../../core/startup/write.js";
+import { emitSettledStartupOutcomes as emitSettledStartup } from "../../core/startup/write.js";
 import { TerminalReplayBuffer } from "../../core/terminal-replay.js";
 import { TurnStateWatcher } from "../../core/turn-state.js";
 import { TypedEmitter } from "../../events/emitter.js";
 import { loadRuntimeLoopDefinitions as loadLoops } from "../../runtime/loop-restore.js";
 import { finishSessionExit } from "../../runtime/session/exit.js";
+import { bindStartupLifetime, createSessionFrameObserver } from "../../runtime/session/frames.js";
+import { withAutomatedInput } from "../../runtime/session/picker-input.js";
 import { createReadinessGate } from "../../runtime/session/readiness.js";
+import { bindTurnSubmission } from "../../runtime/session/turn-submission.js";
 import { assertStartupThenRelease, createStartupBuffer } from "../../runtime/startup/buffer.js";
 import { cleanupStartupResources, guardStartupRegion } from "../../runtime/startup/cleanup.js";
 import { secureMkdir } from "../../state/files.js";
 import { writeSessionRecord } from "../../state/store.js";
+import { currentRenderedFrame, renderedSnapshot } from "../../terminal/cursor.js";
 import { attachPtyTerminal } from "../../terminal/headless.js";
 import { spawnCodexPty } from "../pty.js";
+import { liveCodexClearance } from "../screen/live-clearance.js";
 import { codexScreenFactTableForTrustPolicy } from "../screen-table.js";
 import { CodexStartupPromptResponder } from "../startup-prompts.js";
+import { guardedCodexAutomationWrite } from "../update-prompt.js";
 import { currentCodexHookBridgeFactory } from "./bridge.js";
-import { dispatchHook, registerInitialHooks } from "./hooks.js";
+import { reportCallerInput } from "./caller-input.js";
+import { buildCodexHookErrorHandler, dispatchHook, registerInitialHooks } from "./hooks.js";
 import { CodexSessionImpl } from "./instance.js";
 import { writeCodexRuntimeFiles } from "./runtime.js";
-import * as sessionTranscript from "./transcript.js";
+import { createCodexStartupWarningGate, preflightEvent } from "./startup-warnings.js";
+import * as transcript from "./transcript.js";
+import { emitUpdateAttention } from "./update-attention.js";
 export async function buildCodexSession(input) {
     const { record, stateDir, runtime, options, resumed, preflightWarning } = input;
+    const elwoodSessionId = record.elwoodSessionId;
     secureMkdir(runtime.sessionDir);
-    writeSessionRecord(record, runtime.sessionDir);
+    writeSessionRecord(record, runtime.sessionDir, runtime.stateOwnership.publishFile);
     const loopDefinitions = resumed ? loadLoops(stateDir, record.elwoodSessionId) : [];
     writeCodexRuntimeFiles(runtime);
     const emitter = new TypedEmitter();
     registerInitialHooks(emitter, options.hooks);
     let session;
-    // ALL startup-region warnings — MCP/prompt-write (frame path) AND transcript
-    // drop/read-error diagnostics — route through ONE gate that buffers anything emitted
-    // before startCodex resolves and flushes it on a deferred macrotask after return, so
-    // every source stays observable without late-subscriber replay (C-API-14).
-    const warnGate = createStartupWarningGate({
-        emitWarnings: (w) => deliverFrameWarnings(session, w),
-    });
-    const wired = sessionTranscript.createCodexTranscriptWatcher(record.elwoodSessionId, emitter, () => warnGate);
+    const warnGate = createCodexStartupWarningGate(() => session, () => promptResponder.closingSignal.aborted, (deliver) => wired.duringDelivery(deliver));
+    // Transcript diagnostics flow through the same startup warning gate.
+    const wired = transcript.createCodexTranscriptWatcher(elwoodSessionId, emitter, () => warnGate);
     const { watcher: transcriptWatcher, flushPendingWarnings, finishSafely } = wired;
-    const bridge = currentCodexHookBridgeFactory()(runtime.socketPath, runtime.bridgeToken, record.elwoodSessionId, async (hook) => dispatchHook(hook, emitter, options, record, session), (event) => {
-        const hookError = { elwoodSessionId: record.elwoodSessionId, ...event };
-        emitter.emit("hookError", hookError);
-        emitter.emit("activity", activity.activityFromHookError("codex", hookError));
-    });
+    const bridge = currentCodexHookBridgeFactory()(runtime.socketPath, runtime.bridgeToken, record.elwoodSessionId, async (hook) => dispatchHook(hook, emitter, options, record, session), buildCodexHookErrorHandler(record, emitter, () => session));
     try {
         await bridge.start();
     }
     catch (error) {
-        // Best-effort shut down a partially-started bridge so its listener/socket is not
-        // leaked; contained so the original bridge-start error is the one that rejects.
+        // Preserve the startup error while cleaning up a partially started bridge.
         await bridge.stop().catch(() => undefined);
         throw elwoodError("hook_bridge_failed", "Could not start Elwood hook bridge.", {
             ...causeDetails(error),
@@ -65,78 +62,75 @@ export async function buildCodexSession(input) {
         throw error;
     });
     const startupOutput = createStartupBuffer();
-    let startupExit;
+    let observedExit;
     const terminalReplay = new TerminalReplayBuffer(record.elwoodSessionId);
     terminalReplay.captureStartupAttention(emitter);
-    const { ready, observeReadinessFrame } = createReadinessGate(() => {
-        turnWatcher.arm(resumed); // resume arms in settling mode (no phantom replay turn)
+    const readiness = createReadinessGate(() => {
+        observers.turn.arm(resumed); // resume arms in settling mode (no phantom replay turn)
         session?.completeInitialReady(); // shared anti-starvation ready boundary (C-API-42)
     }, resumed);
-    const autotrust = options.autotrust ?? false;
+    const clearance = liveCodexClearance(() => terminal);
+    const snapshot = () => renderedSnapshot(terminal);
     const observers = {
         turn: new TurnStateWatcher(),
         attention: new AttentionWatcher(),
-        table: codexScreenFactTableForTrustPolicy(autotrust),
+        table: codexScreenFactTableForTrustPolicy(options.autotrust ?? false, clearance, snapshot),
         agent: "codex",
         elwoodSessionId: record.elwoodSessionId,
         emitActivity: (event) => emitter.emit("activity", event),
     };
-    const turnWatcher = observers.turn;
-    const promptResponder = new CodexStartupPromptResponder(record.elwoodSessionId, autotrust);
+    const frameObserver = createSessionFrameObserver(observers, () => session, () => promptResponder, readiness, clearance);
+    const promptResponder = new CodexStartupPromptResponder(record.elwoodSessionId, options.autotrust ?? false, frameObserver.refresh, clearance, () => activeSession.inputBlocking || activeSession.trustInputBlocking);
     const terminal = attachPtyTerminal(options.initialSize ?? defaultTerminalSize, pty, (data, renderedTerminal) => {
-        startupOutput.push(data);
         terminalReplay.push(data);
-        // One snapshot per render: reused for prompt automation, readiness, detection.
-        const frame = { text: renderedTerminal.snapshot().text, title: renderedTerminal.title };
-        // The write RETURNS its completion: the responder settles only after it fulfills;
-        // a rejected write retries + warns (C-CODEX-17). Warning delivery is CONTAINED on
-        // the frame path so a throwing listener never skips readiness or terminal:data.
-        const result = promptResponder.handle(frame.text, (i) => renderedTerminal.sendInput(i), () => renderedTerminal.snapshot().text);
+        const frame = {
+            text: renderedSnapshot(renderedTerminal).text,
+            title: renderedTerminal.title,
+        };
+        const send = (input) => withAutomatedInput(renderedTerminal, () => callerInput.automation(input));
+        const read = () => renderedSnapshot(renderedTerminal).text;
+        const guarded = guardedCodexAutomationWrite(renderedTerminal, send, read, promptResponder.closingSignal);
+        const trustRead = () => currentRenderedFrame(renderedTerminal)?.text;
+        const result = promptResponder.handle(frame.text, send, read, guarded, trustRead);
         warnGate.emitWarnings(result.warnings);
-        emitSettledStartupOutcomes(emitter, "codex", record.elwoodSessionId, result.outcomes, {
-            emitWarnings: (w) => warnGate.emitWarnings(w),
-        });
-        ready.armDeadline(); // hook/deadline readiness; resume composer also marks (C-API-28)
-        const reading = observeRenderedFrame(observers, frame, session);
-        activeSession.inputBlocking = reading.facts.blocking_prompt_visible;
-        observeReadinessFrame(reading.facts); // blocking gate + resume-composer mark
+        emitSettledStartup(emitter, "codex", record.elwoodSessionId, result.outcomes, warnGate);
+        frameObserver.observe(frame);
+        emitUpdateAttention(emitter, record.elwoodSessionId, result.updateGeneration);
         emitter.emit("terminal:data", { elwoodSessionId: record.elwoodSessionId, data });
-    });
-    session = new CodexSessionImpl(record, stateDir, runtime, pty, terminal, bridge, emitter, terminalReplay, transcriptWatcher, loopDefinitions);
-    const id = record.elwoodSessionId;
-    const activeSession = session;
-    const beforeCleanup = () => activeSession.pauseLoopsForStartupCleanup(ready.cancel);
-    // Every post-construction failure tears down all live resources (§9.1/§9.4).
+    }, startupOutput.push);
+    const callerInput = reportCallerInput(terminal, () => promptResponder.endStartup(), resumed);
+    session = new CodexSessionImpl(record, stateDir, runtime, pty, callerInput.terminal, bridge, emitter, terminalReplay, transcriptWatcher, loopDefinitions);
+    const activeSession = bindTurnSubmission(session, observers);
+    bindStartupLifetime(activeSession, promptResponder, readiness);
+    frameObserver.refresh();
+    const beforeCleanup = () => activeSession.pauseLoopsForStartupCleanup(readiness.ready.cancel);
     await guardStartupRegion(async () => {
         activeSession.startLoops();
         flushPendingWarnings(); // inside the guard: a throwing sink tears down, not leaks (§5.4/§9.4)
-        activeSession.setInitialReadyHook(() => ready.mark());
-        ready.replay();
-        // C-LIFE-10: a failed final flush cannot skip exit or reaping.
+        activeSession.setInitialReadyHook(() => readiness.ready.mark());
+        readiness.ready.replay();
         pty.onExit((exit) => {
-            startupExit = exit;
-            ready.cancel();
+            if (observedExit)
+                return;
+            observedExit = exit;
+            activeSession.beginExitFinalization();
+            activeSession.closing.abort();
             const emitExit = () => {
-                emitter.emit("terminal:exit", { elwoodSessionId: id, ...exit });
-                emitter.emit("activity", activity.activityFromTerminalExit("codex", id, exit.exitCode));
+                emitter.emit("terminal:exit", { elwoodSessionId, ...exit });
+                emitter.emit("activity", terminalExitActivity("codex", elwoodSessionId, exit.exitCode));
             };
-            finishSessionExit(() => finishSafely(emitExit), () => activeSession.submitExit());
+            const finalize = () => finishSessionExit(emitExit, () => activeSession.submitExit());
+            finishSafely(() => warnGate.afterDelivery(finalize));
         });
-        await assertStartupThenRelease("codex", startupOutput, () => startupExit);
+        await assertStartupThenRelease("codex", startupOutput, () => observedExit);
         activeSession.submitEvidence("startup_usable");
-        if (activeSession.inputBlocking)
-            activeSession.submitEvidence("blocking_prompt_shown");
+        frameObserver.blockOnceLive(activeSession);
+        input.activate();
     }, { before: beforeCleanup, pty, bridge, terminal, after: () => transcriptWatcher.stop() });
-    // Buffer the preflight/version warning through the same gate, then open it: buffered
-    // startup warnings (MCP/transcript) AND the preflight all flush on one deferred
-    // macrotask after return, so a caller subscribing synchronously observes them all.
     if (preflightWarning !== undefined)
-        warnGate.emitWarnings([preflightEvent(id, preflightWarning)]);
+        warnGate.emitWarnings([preflightEvent(elwoodSessionId, preflightWarning)]);
     warnGate.openAfterReturn();
     terminalReplay.releaseStartupAttentionAfterReturn();
     return session;
 }
-function preflightEvent(elwoodSessionId, warning) {
-    return { elwoodSessionId, ...warning };
-}
 //# sourceMappingURL=build.js.map

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

@@ -1 +1 @@
-{"version":3,"file":"build.js","sourceRoot":"","sources":["../../../src/codex/session/build.ts"],"names":[],"mappings":"AAAA,2GAA2G;AAC3G,OAAO,KAAK,QAAQ,MAAM,8BAA8B,CAAC;AACzD,OAAO,EAAE,gBAAgB,EAAE,MAAM,yBAAyB,CAAC;AAC3D,OAAO,EAAE,mBAAmB,EAAE,MAAM,wBAAwB,CAAC;AAC7D,OAAO,EAAE,YAAY,EAAE,WAAW,EAAE,MAAM,sBAAsB,CAAC;AACjE,OAAO,EAAE,oBAAoB,EAAE,MAAM,kCAAkC,CAAC;AACxE,OAAO,EAAE,wBAAwB,EAAE,oBAAoB,EAAE,MAAM,6BAA6B,CAAC;AAC7F,OAAO,EAAE,0BAA0B,EAAE,MAAM,6BAA6B,CAAC;AACzE,OAAO,EAAE,oBAAoB,EAAE,MAAM,+BAA+B,CAAC;AACrE,OAAO,EAAE,gBAAgB,EAAE,MAAM,0BAA0B,CAAC;AAC5D,OAAO,EAAE,YAAY,EAAE,MAAM,yBAAyB,CAAC;AAEvD,OAAO,EAAE,0BAA0B,IAAI,SAAS,EAAE,MAAM,+BAA+B,CAAC;AACxF,OAAO,EAAE,iBAAiB,EAAE,MAAM,+BAA+B,CAAC;AAClE,OAAO,EAAE,mBAAmB,EAAE,MAAM,oCAAoC,CAAC;AACzE,OAAO,EAAE,wBAAwB,EAAE,mBAAmB,EAAE,MAAM,iCAAiC,CAAC;AAChG,OAAO,EAAE,uBAAuB,EAAE,kBAAkB,EAAE,MAAM,kCAAkC,CAAC;AAC/F,OAAO,EAAE,WAAW,EAAE,MAAM,sBAAsB,CAAC;AAEnD,OAAO,EAAsB,kBAAkB,EAAE,MAAM,sBAAsB,CAAC;AAC9E,OAAO,EAAE,iBAAiB,EAAE,MAAM,4BAA4B,CAAC;AAE/D,OAAO,EAAE,aAAa,EAAE,MAAM,WAAW,CAAC;AAC1C,OAAO,EAAE,kCAAkC,EAAE,MAAM,oBAAoB,CAAC;AACxE,OAAO,EAAE,2BAA2B,EAAE,MAAM,uBAAuB,CAAC;AACpE,OAAO,EAAE,6BAA6B,EAAE,MAAM,aAAa,CAAC;AAC5D,OAAO,EAAE,YAAY,EAAE,oBAAoB,EAAE,MAAM,YAAY,CAAC;AAChE,OAAO,EAAE,gBAAgB,EAAE,MAAM,eAAe,CAAC;AACjD,OAAO,EAAE,sBAAsB,EAAE,MAAM,cAAc,CAAC;AACtD,OAAO,KAAK,iBAAiB,MAAM,iBAAiB,CAAC;AAYrD,MAAM,CAAC,KAAK,UAAU,iBAAiB,CAAC,KAA6B;IACnE,MAAM,EAAE,MAAM,EAAE,QAAQ,EAAE,OAAO,EAAE,OAAO,EAAE,OAAO,EAAE,gBAAgB,EAAE,GAAG,KAAK,CAAC;IAChF,WAAW,CAAC,OAAO,CAAC,UAAU,CAAC,CAAC;IAChC,kBAAkB,CAAC,MAAM,EAAE,OAAO,CAAC,UAAU,CAAC,CAAC;IAC/C,MAAM,eAAe,GAAG,OAAO,CAAC,CAAC,CAAC,SAAS,CAAC,QAAQ,EAAE,MAAM,CAAC,eAAe,CAAC,CAAC,CAAC,CAAC,EAAE,CAAC;IACnF,sBAAsB,CAAC,OAAO,CAAC,CAAC;IAChC,MAAM,OAAO,GAAG,IAAI,YAAY,EAAiB,CAAC;IAClD,oBAAoB,CAAC,OAAO,EAAE,OAAO,CAAC,KAAK,CAAC,CAAC;IAC7C,IAAI,OAAqC,CAAC;IAC1C,6EAA6E;IAC7E,qFAAqF;IACrF,qFAAqF;IACrF,2EAA2E;IAC3E,MAAM,QAAQ,GAAG,wBAAwB,CAAC;QACxC,YAAY,EAAE,CAAC,CAAC,EAAE,EAAE,CAAC,oBAAoB,CAAC,OAAO,EAAE,CAAC,CAAC;KACtD,CAAC,CAAC;IACH,MAAM,KAAK,GAAG,iBAAiB,CAAC,4BAA4B,CAC1D,MAAM,CAAC,eAAe,EACtB,OAAO,EACP,GAAG,EAAE,CAAC,QAAQ,CACf,CAAC;IACF,MAAM,EAAE,OAAO,EAAE,iBAAiB,EAAE,oBAAoB,EAAE,YAAY,EAAE,GAAG,KAAK,CAAC;IACjF,MAAM,MAAM,GAAG,6BAA6B,EAAE,CAC5C,OAAO,CAAC,UAAU,EAClB,OAAO,CAAC,WAAW,EACnB,MAAM,CAAC,eAAe,EACtB,KAAK,EAAE,IAAI,EAAE,EAAE,CAAC,YAAY,CAAC,IAAI,EAAE,OAAO,EAAE,OAAO,EAAE,MAAM,EAAE,OAAO,CAAC,EACrE,CAAC,KAAK,EAAE,EAAE;QACR,MAAM,SAAS,GAAG,EAAE,eAAe,EAAE,MAAM,CAAC,eAAe,EAAE,GAAG,KAAK,EAAE,CAAC;QACxE,OAAO,CAAC,IAAI,CAAC,WAAW,EAAE,SAAS,CAAC,CAAC;QACrC,OAAO,CAAC,IAAI,CAAC,UAAU,EAAE,QAAQ,CAAC,qBAAqB,CAAC,OAAO,EAAE,SAAS,CAAC,CAAC,CAAC;IAC/E,CAAC,CACF,CAAC;IACF,IAAI,CAAC;QACH,MAAM,MAAM,CAAC,KAAK,EAAE,CAAC;IACvB,CAAC;IAAC,OAAO,KAAK,EAAE,CAAC;QACf,iFAAiF;QACjF,gFAAgF;QAChF,MAAM,MAAM,CAAC,IAAI,EAAE,CAAC,KAAK,CAAC,GAAG,EAAE,CAAC,SAAS,CAAC,CAAC;QAC3C,MAAM,WAAW,CAAC,oBAAoB,EAAE,qCAAqC,EAAE;YAC7E,GAAG,YAAY,CAAC,KAAK,CAAC;YACtB,UAAU,EAAE,OAAO,CAAC,UAAU;SAC/B,CAAC,CAAC;IACL,CAAC;IACD,MAAM,GAAG,GAAe,MAAM,aAAa,CAAC,MAAM,EAAE,OAAO,CAAC,gBAAgB,EAAE,OAAO,CAAC,CAAC,KAAK,CAC1F,KAAK,EAAE,KAAc,EAAE,EAAE;QACvB,MAAM,uBAAuB,CAAC,EAAE,MAAM,EAAE,CAAC,CAAC;QAC1C,MAAM,KAAK,CAAC;IACd,CAAC,CACF,CAAC;IACF,MAAM,aAAa,GAAG,mBAAmB,EAAE,CAAC;IAC5C,IAAI,WAAgC,CAAC;IACrC,MAAM,cAAc,GAAG,IAAI,oBAAoB,CAAC,MAAM,CAAC,eAAe,CAAC,CAAC;IACxE,cAAc,CAAC,uBAAuB,CAAC,OAAO,CAAC,CAAC;IAChD,MAAM,EAAE,KAAK,EAAE,qBAAqB,EAAE,GAAG,mBAAmB,CAAC,GAAG,EAAE;QAChE,WAAW,CAAC,GAAG,CAAC,OAAO,CAAC,CAAC,CAAC,wDAAwD;QAClF,OAAO,EAAE,oBAAoB,EAAE,CAAC,CAAC,mDAAmD;IACtF,CAAC,EAAE,OAAO,CAAC,CAAC;IACZ,MAAM,SAAS,GAAG,OAAO,CAAC,SAAS,IAAI,KAAK,CAAC;IAC7C,MAAM,SAAS,GAAG;QAChB,IAAI,EAAE,IAAI,gBAAgB,EAAE;QAC5B,SAAS,EAAE,IAAI,gBAAgB,EAAE;QACjC,KAAK,EAAE,kCAAkC,CAAC,SAAS,CAAC;QACpD,KAAK,EAAE,OAAgB;QACvB,eAAe,EAAE,MAAM,CAAC,eAAe;QACvC,YAAY,EAAE,CAAC,KAAmC,EAAE,EAAE,CAAC,OAAO,CAAC,IAAI,CAAC,UAAU,EAAE,KAAK,CAAC;KACvF,CAAC;IACF,MAAM,WAAW,GAAG,SAAS,CAAC,IAAI,CAAC;IACnC,MAAM,eAAe,GAAG,IAAI,2BAA2B,CAAC,MAAM,CAAC,eAAe,EAAE,SAAS,CAAC,CAAC;IAC3F,MAAM,QAAQ,GAAG,iBAAiB,CAChC,OAAO,CAAC,WAAW,IAAI,mBAAmB,EAC1C,GAAG,EACH,CAAC,IAAI,EAAE,gBAAgB,EAAE,EAAE;QACzB,aAAa,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC;QACzB,cAAc,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC;QAC1B,+EAA+E;QAC/E,MAAM,KAAK,GAAG,EAAE,IAAI,EAAE,gBAAgB,CAAC,QAAQ,EAAE,CAAC,IAAI,EAAE,KAAK,EAAE,gBAAgB,CAAC,KAAK,EAAE,CAAC;QACxF,kFAAkF;QAClF,kFAAkF;QAClF,gFAAgF;QAChF,MAAM,MAAM,GAAG,eAAe,CAAC,MAAM,CACnC,KAAK,CAAC,IAAI,EACV,CAAC,CAAC,EAAE,EAAE,CAAC,gBAAgB,CAAC,SAAS,CAAC,CAAC,CAAC,EACpC,GAAG,EAAE,CAAC,gBAAgB,CAAC,QAAQ,EAAE,CAAC,IAAI,CACvC,CAAC;QACF,QAAQ,CAAC,YAAY,CAAC,MAAM,CAAC,QAAQ,CAAC,CAAC;QACvC,0BAA0B,CAAC,OAAO,EAAE,OAAO,EAAE,MAAM,CAAC,eAAe,EAAE,MAAM,CAAC,QAAQ,EAAE;YACpF,YAAY,EAAE,CAAC,CAAC,EAAE,EAAE,CAAC,QAAQ,CAAC,YAAY,CAAC,CAAC,CAAC;SAC9C,CAAC,CAAC;QACH,KAAK,CAAC,WAAW,EAAE,CAAC,CAAC,iEAAiE;QACtF,MAAM,OAAO,GAAG,oBAAoB,CAAC,SAAS,EAAE,KAAK,EAAE,OAAO,CAAC,CAAC;QAChE,aAAa,CAAC,aAAa,GAAG,OAAO,CAAC,KAAK,CAAC,uBAAuB,CAAC;QACpE,qBAAqB,CAAC,OAAO,CAAC,KAAK,CAAC,CAAC,CAAC,uCAAuC;QAC7E,OAAO,CAAC,IAAI,CAAC,eAAe,EAAE,EAAE,eAAe,EAAE,MAAM,CAAC,eAAe,EAAE,IAAI,EAAE,CAAC,CAAC;IACnF,CAAC,CACF,CAAC;IACF,OAAO,GAAG,IAAI,gBAAgB,CAC5B,MAAM,EACN,QAAQ,EACR,OAAO,EACP,GAAG,EACH,QAAQ,EACR,MAAM,EACN,OAAO,EACP,cAAc,EACd,iBAAiB,EACjB,eAAe,CAChB,CAAC;IACF,MAAM,EAAE,GAAG,MAAM,CAAC,eAAe,CAAC;IAClC,MAAM,aAAa,GAAG,OAAO,CAAC;IAC9B,MAAM,aAAa,GAAG,GAAG,EAAE,CAAC,aAAa,CAAC,2BAA2B,CAAC,KAAK,CAAC,MAAM,CAAC,CAAC;IACpF,6EAA6E;IAC7E,MAAM,kBAAkB,CACtB,KAAK,IAAI,EAAE;QACT,aAAa,CAAC,UAAU,EAAE,CAAC;QAC3B,oBAAoB,EAAE,CAAC,CAAC,sEAAsE;QAC9F,aAAa,CAAC,mBAAmB,CAAC,GAAG,EAAE,CAAC,KAAK,CAAC,IAAI,EAAE,CAAC,CAAC;QACtD,KAAK,CAAC,MAAM,EAAE,CAAC;QACf,+DAA+D;QAC/D,GAAG,CAAC,MAAM,CAAC,CAAC,IAAI,EAAE,EAAE;YAClB,WAAW,GAAG,IAAI,CAAC;YACnB,KAAK,CAAC,MAAM,EAAE,CAAC;YACf,MAAM,QAAQ,GAAG,GAAG,EAAE;gBACpB,OAAO,CAAC,IAAI,CAAC,eAAe,EAAE,EAAE,eAAe,EAAE,EAAE,EAAE,GAAG,IAAI,EAAE,CAAC,CAAC;gBAChE,OAAO,CAAC,IAAI,CAAC,UAAU,EAAE,QAAQ,CAAC,wBAAwB,CAAC,OAAO,EAAE,EAAE,EAAE,IAAI,CAAC,QAAQ,CAAC,CAAC,CAAC;YAC1F,CAAC,CAAC;YACF,iBAAiB,CACf,GAAG,EAAE,CAAC,YAAY,CAAC,QAAQ,CAAC,EAC5B,GAAG,EAAE,CAAC,aAAa,CAAC,UAAU,EAAE,CACjC,CAAC;QACJ,CAAC,CAAC,CAAC;QACH,MAAM,wBAAwB,CAAC,OAAO,EAAE,aAAa,EAAE,GAAG,EAAE,CAAC,WAAW,CAAC,CAAC;QAC1E,aAAa,CAAC,cAAc,CAAC,gBAAgB,CAAC,CAAC;QAC/C,IAAI,aAAa,CAAC,aAAa;YAAE,aAAa,CAAC,cAAc,CAAC,uBAAuB,CAAC,CAAC;IACzF,CAAC,EACD,EAAE,MAAM,EAAE,aAAa,EAAE,GAAG,EAAE,MAAM,EAAE,QAAQ,EAAE,KAAK,EAAE,GAAG,EAAE,CAAC,iBAAiB,CAAC,IAAI,EAAE,EAAE,CACxF,CAAC;IACF,qFAAqF;IACrF,gFAAgF;IAChF,mFAAmF;IACnF,IAAI,gBAAgB,KAAK,SAAS;QAAE,QAAQ,CAAC,YAAY,CAAC,CAAC,cAAc,CAAC,EAAE,EAAE,gBAAgB,CAAC,CAAC,CAAC,CAAC;IAClG,QAAQ,CAAC,eAAe,EAAE,CAAC;IAC3B,cAAc,CAAC,kCAAkC,EAAE,CAAC;IACpD,OAAO,OAAO,CAAC;AACjB,CAAC;AAMD,SAAS,cAAc,CACrB,eAAuB,EACvB,OAA8B;IAE9B,OAAO,EAAE,eAAe,EAAE,GAAG,OAAO,EAAE,CAAC;AACzC,CAAC"}
+{"version":3,"file":"build.js","sourceRoot":"","sources":["../../../src/codex/session/build.ts"],"names":[],"mappings":"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"}

package/dist/codex/session/caller-input.d.ts

@@ -0,0 +1,18 @@
+/**
+ * Reports every caller-side terminal write so startup-only recognition can end
+ * before caller content can reach the screen. Implements PRD §5.7 / C-API-14.
+ */
+import type { ElwoodTerminal } from "../../terminal/headless.ts";
+export type CallerInput = {
+    /** The session's view of the terminal: every write through it is caller input. */
+    readonly terminal: ElwoodTerminal;
+    /** Startup automation's writer: the only input that does not end startup. */
+    readonly automation: (input: string) => Promise<void>;
+};
+/**
+ * Two hooks, because there are two caller paths: `sendInput` (strings and raw bytes,
+ * which skip xterm's data event) and the public `xterm.input()`, which skips
+ * `sendInput`. xterm fires its data event synchronously, so a flag scopes automation.
+ */
+export declare function reportCallerInput(inner: ElwoodTerminal, onInput: () => void, priorInput?: boolean): CallerInput;
+//# sourceMappingURL=caller-input.d.ts.map

package/dist/codex/session/caller-input.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"caller-input.d.ts","sourceRoot":"","sources":["../../../src/codex/session/caller-input.ts"],"names":[],"mappings":"AAAA;;;GAGG;AACH,OAAO,KAAK,EAAE,cAAc,EAAE,MAAM,4BAA4B,CAAC;AAEjE,MAAM,MAAM,WAAW,GAAG;IACxB,kFAAkF;IAClF,QAAQ,CAAC,QAAQ,EAAE,cAAc,CAAC;IAClC,6EAA6E;IAC7E,QAAQ,CAAC,UAAU,EAAE,CAAC,KAAK,EAAE,MAAM,KAAK,OAAO,CAAC,IAAI,CAAC,CAAC;CACvD,CAAC;AAEF;;;;GAIG;AACH,wBAAgB,iBAAiB,CAC/B,KAAK,EAAE,cAAc,EACrB,OAAO,EAAE,MAAM,IAAI,EACnB,UAAU,UAAQ,GACjB,WAAW,CAwCb"}

package/dist/codex/session/caller-input.js

@@ -0,0 +1,50 @@
+/**
+ * Two hooks, because there are two caller paths: `sendInput` (strings and raw bytes,
+ * which skip xterm's data event) and the public `xterm.input()`, which skips
+ * `sendInput`. xterm fires its data event synchronously, so a flag scopes automation.
+ */
+export function reportCallerInput(inner, onInput, priorInput = false) {
+    // A resumed session replays a transcript that already holds caller and model text,
+    // possibly without any conversation marker left in the frames this process sees.
+    if (priorInput)
+        onInput();
+    let automating = false;
+    inner.xterm.onData(() => {
+        if (!automating)
+            onInput();
+    });
+    const terminal = {
+        get xterm() {
+            return inner.xterm;
+        },
+        get size() {
+            return inner.size;
+        },
+        get title() {
+            return inner.title;
+        },
+        writeOutput: (...args) => inner.writeOutput(...args),
+        sendInput: (input) => {
+            onInput();
+            return inner.sendInput(input);
+        },
+        resize: (size) => inner.resize(size),
+        snapshot: () => inner.snapshot(),
+        settled: () => inner.settled(),
+        get renderFailed() {
+            return inner.renderFailed;
+        },
+        dispose: () => inner.dispose(),
+    };
+    const automation = (input) => {
+        automating = true;
+        try {
+            return inner.sendInput(input);
+        }
+        finally {
+            automating = false;
+        }
+    };
+    return { terminal, automation };
+}
+//# sourceMappingURL=caller-input.js.map

package/dist/codex/session/caller-input.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"caller-input.js","sourceRoot":"","sources":["../../../src/codex/session/caller-input.ts"],"names":[],"mappings":"AAaA;;;;GAIG;AACH,MAAM,UAAU,iBAAiB,CAC/B,KAAqB,EACrB,OAAmB,EACnB,UAAU,GAAG,KAAK;IAElB,mFAAmF;IACnF,iFAAiF;IACjF,IAAI,UAAU;QAAE,OAAO,EAAE,CAAC;IAC1B,IAAI,UAAU,GAAG,KAAK,CAAC;IACvB,KAAK,CAAC,KAAK,CAAC,MAAM,CAAC,GAAG,EAAE;QACtB,IAAI,CAAC,UAAU;YAAE,OAAO,EAAE,CAAC;IAC7B,CAAC,CAAC,CAAC;IACH,MAAM,QAAQ,GAAmB;QAC/B,IAAI,KAAK;YACP,OAAO,KAAK,CAAC,KAAK,CAAC;QACrB,CAAC;QACD,IAAI,IAAI;YACN,OAAO,KAAK,CAAC,IAAI,CAAC;QACpB,CAAC;QACD,IAAI,KAAK;YACP,OAAO,KAAK,CAAC,KAAK,CAAC;QACrB,CAAC;QACD,WAAW,EAAE,CAAC,GAAG,IAAI,EAAE,EAAE,CAAC,KAAK,CAAC,WAAW,CAAC,GAAG,IAAI,CAAC;QACpD,SAAS,EAAE,CAAC,KAAK,EAAE,EAAE;YACnB,OAAO,EAAE,CAAC;YACV,OAAO,KAAK,CAAC,SAAS,CAAC,KAAK,CAAC,CAAC;QAChC,CAAC;QACD,MAAM,EAAE,CAAC,IAAI,EAAE,EAAE,CAAC,KAAK,CAAC,MAAM,CAAC,IAAI,CAAC;QACpC,QAAQ,EAAE,GAAG,EAAE,CAAC,KAAK,CAAC,QAAQ,EAAE;QAChC,OAAO,EAAE,GAAG,EAAE,CAAC,KAAK,CAAC,OAAO,EAAE;QAC9B,IAAI,YAAY;YACd,OAAO,KAAK,CAAC,YAAY,CAAC;QAC5B,CAAC;QACD,OAAO,EAAE,GAAG,EAAE,CAAC,KAAK,CAAC,OAAO,EAAE;KAC/B,CAAC;IACF,MAAM,UAAU,GAAG,CAAC,KAAa,EAAE,EAAE;QACnC,UAAU,GAAG,IAAI,CAAC;QAClB,IAAI,CAAC;YACH,OAAO,KAAK,CAAC,SAAS,CAAC,KAAK,CAAC,CAAC;QAChC,CAAC;gBAAS,CAAC;YACT,UAAU,GAAG,KAAK,CAAC;QACrB,CAAC;IACH,CAAC,CAAC;IACF,OAAO,EAAE,QAAQ,EAAE,UAAU,EAAE,CAAC;AAClC,CAAC"}

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

@@ -2,11 +2,12 @@
  * Codex session runtime cleanup helpers.
  * Implements PRD §9.3.
  */
+import type { PtyProcess } from "../../pty/types.ts";
 import type { ElwoodTerminal } from "../../terminal/headless.ts";
 import type { CodexTranscriptWatcher } from "../transcript/index.ts";
 type CodexRuntimeBridge = {
     readonly stop: () => Promise<void>;
 };
-export declare function stopCodexRuntime(bridge: CodexRuntimeBridge, transcriptWatcher: CodexTranscriptWatcher | undefined, terminal: ElwoodTerminal): Promise<void>;
+export declare function stopCodexRuntime(bridge: CodexRuntimeBridge, transcriptWatcher: CodexTranscriptWatcher | undefined, terminal: ElwoodTerminal, pty: Pick<PtyProcess, "onData">): Promise<void>;
 export {};
 //# sourceMappingURL=cleanup.d.ts.map

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

@@ -1 +1 @@
-{"version":3,"file":"cleanup.d.ts","sourceRoot":"","sources":["../../../src/codex/session/cleanup.ts"],"names":[],"mappings":"AAAA;;;GAGG;AAGH,OAAO,KAAK,EAAE,cAAc,EAAE,MAAM,4BAA4B,CAAC;AACjE,OAAO,KAAK,EAAE,sBAAsB,EAAE,MAAM,wBAAwB,CAAC;AAErE,KAAK,kBAAkB,GAAG;IACxB,QAAQ,CAAC,IAAI,EAAE,MAAM,OAAO,CAAC,IAAI,CAAC,CAAC;CACpC,CAAC;AAEF,wBAAgB,gBAAgB,CAC9B,MAAM,EAAE,kBAAkB,EAC1B,iBAAiB,EAAE,sBAAsB,GAAG,SAAS,EACrD,QAAQ,EAAE,cAAc,GACvB,OAAO,CAAC,IAAI,CAAC,CAQf"}
+{"version":3,"file":"cleanup.d.ts","sourceRoot":"","sources":["../../../src/codex/session/cleanup.ts"],"names":[],"mappings":"AAAA;;;GAGG;AAEH,OAAO,KAAK,EAAE,UAAU,EAAE,MAAM,oBAAoB,CAAC;AAGrD,OAAO,KAAK,EAAE,cAAc,EAAE,MAAM,4BAA4B,CAAC;AACjE,OAAO,KAAK,EAAE,sBAAsB,EAAE,MAAM,wBAAwB,CAAC;AAErE,KAAK,kBAAkB,GAAG;IACxB,QAAQ,CAAC,IAAI,EAAE,MAAM,OAAO,CAAC,IAAI,CAAC,CAAC;CACpC,CAAC;AAEF,wBAAgB,gBAAgB,CAC9B,MAAM,EAAE,kBAAkB,EAC1B,iBAAiB,EAAE,sBAAsB,GAAG,SAAS,EACrD,QAAQ,EAAE,cAAc,EACxB,GAAG,EAAE,IAAI,CAAC,UAAU,EAAE,QAAQ,CAAC,GAC9B,OAAO,CAAC,IAAI,CAAC,CAQf"}

package/dist/codex/session/cleanup.js

@@ -3,13 +3,14 @@
  * Implements PRD §9.3.
  */
 import { runCleanupSteps } from "../../runtime/shutdown/teardown.js";
-export function stopCodexRuntime(bridge, transcriptWatcher, terminal) {
+import { drainAndDisposeTerminal } from "../../runtime/shutdown/terminal.js";
+export function stopCodexRuntime(bridge, transcriptWatcher, terminal, pty) {
     // Every step runs even if an earlier one throws, so a failing bridge stop still
     // finishes the transcript watcher and disposes the terminal (no leak; PRD §9.4).
     return runCleanupSteps([
         () => bridge.stop(),
         () => transcriptWatcher?.finish(),
-        () => terminal.dispose(),
+        () => drainAndDisposeTerminal(terminal, pty),
     ]);
 }
 //# sourceMappingURL=cleanup.js.map

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

@@ -1 +1 @@
-{"version":3,"file":"cleanup.js","sourceRoot":"","sources":["../../../src/codex/session/cleanup.ts"],"names":[],"mappings":"AAAA;;;GAGG;AAEH,OAAO,EAAE,eAAe,EAAE,MAAM,oCAAoC,CAAC;AAQrE,MAAM,UAAU,gBAAgB,CAC9B,MAA0B,EAC1B,iBAAqD,EACrD,QAAwB;IAExB,gFAAgF;IAChF,iFAAiF;IACjF,OAAO,eAAe,CAAC;QACrB,GAAG,EAAE,CAAC,MAAM,CAAC,IAAI,EAAE;QACnB,GAAG,EAAE,CAAC,iBAAiB,EAAE,MAAM,EAAE;QACjC,GAAG,EAAE,CAAC,QAAQ,CAAC,OAAO,EAAE;KACzB,CAAC,CAAC;AACL,CAAC"}
+{"version":3,"file":"cleanup.js","sourceRoot":"","sources":["../../../src/codex/session/cleanup.ts"],"names":[],"mappings":"AAAA;;;GAGG;AAGH,OAAO,EAAE,eAAe,EAAE,MAAM,oCAAoC,CAAC;AACrE,OAAO,EAAE,uBAAuB,EAAE,MAAM,oCAAoC,CAAC;AAQ7E,MAAM,UAAU,gBAAgB,CAC9B,MAA0B,EAC1B,iBAAqD,EACrD,QAAwB,EACxB,GAA+B;IAE/B,gFAAgF;IAChF,iFAAiF;IACjF,OAAO,eAAe,CAAC;QACrB,GAAG,EAAE,CAAC,MAAM,CAAC,IAAI,EAAE;QACnB,GAAG,EAAE,CAAC,iBAAiB,EAAE,MAAM,EAAE;QACjC,GAAG,EAAE,CAAC,uBAAuB,CAAC,QAAQ,EAAE,GAAG,CAAC;KAC7C,CAAC,CAAC;AACL,CAAC"}

package/dist/codex/session/cli-exit.d.ts

@@ -0,0 +1,24 @@
+/**
+ * The bounded PTY-exit barrier a closing Codex `setModel` waits on before restoring
+ * `config.toml`. Split from session-instance to stay under the file-size cap.
+ * Implements PRD §5.3 setModel restore and C-CODEX-14.
+ */
+import type { PtyProcess } from "../../pty/types.ts";
+/** How long a setModel interrupted by close waits for the CLI to exit before restoring. */
+export declare const cliExitWaitMs = 5000;
+/**
+ * Latches the PTY's exit. Session status cannot stand in for it: `stopped`, `killed`, and
+ * `torn_down` are recorded by the shutdown path itself and are reached even when the
+ * signal did not take, so waiting on status would release the restore into a still-dying
+ * Codex's final config write. (A status wait cannot express it either — it rejects on ANY
+ * unmatched terminal status, which settles the gate just the same.)
+ */
+export declare class CliExitBarrier {
+    private readonly pty;
+    /** Whether the PTY has actually exited — the only proof the CLI can no longer write. */
+    private exited;
+    constructor(pty: PtyProcess);
+    /** Resolves on the observed exit, or at `timeoutMs` so a stuck CLI cannot hold the lock. */
+    wait(timeoutMs?: number): Promise<unknown>;
+}
+//# sourceMappingURL=cli-exit.d.ts.map

package/dist/codex/session/cli-exit.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"cli-exit.d.ts","sourceRoot":"","sources":["../../../src/codex/session/cli-exit.ts"],"names":[],"mappings":"AAAA;;;;GAIG;AAEH,OAAO,KAAK,EAAE,UAAU,EAAE,MAAM,oBAAoB,CAAC;AAErD,2FAA2F;AAC3F,eAAO,MAAM,aAAa,OAAQ,CAAC;AAEnC;;;;;;GAMG;AACH,qBAAa,cAAc;IACzB,OAAO,CAAC,QAAQ,CAAC,GAAG,CAAa;IACjC,wFAAwF;IACxF,OAAO,CAAC,MAAM,CAAS;gBAEX,GAAG,EAAE,UAAU;IAS3B,4FAA4F;IAC5F,IAAI,CAAC,SAAS,GAAE,MAAsB,GAAG,OAAO,CAAC,OAAO,CAAC;CAa1D"}

package/dist/codex/session/cli-exit.js

@@ -0,0 +1,43 @@
+/**
+ * The bounded PTY-exit barrier a closing Codex `setModel` waits on before restoring
+ * `config.toml`. Split from session-instance to stay under the file-size cap.
+ * Implements PRD §5.3 setModel restore and C-CODEX-14.
+ */
+/** How long a setModel interrupted by close waits for the CLI to exit before restoring. */
+export const cliExitWaitMs = 5_000;
+/**
+ * Latches the PTY's exit. Session status cannot stand in for it: `stopped`, `killed`, and
+ * `torn_down` are recorded by the shutdown path itself and are reached even when the
+ * signal did not take, so waiting on status would release the restore into a still-dying
+ * Codex's final config write. (A status wait cannot express it either — it rejects on ANY
+ * unmatched terminal status, which settles the gate just the same.)
+ */
+export class CliExitBarrier {
+    pty;
+    /** Whether the PTY has actually exited — the only proof the CLI can no longer write. */
+    exited = false;
+    constructor(pty) {
+        this.pty = pty;
+        // Latched at construction, not read on demand: the barrier is consulted after the
+        // picker settled, by which time the exit that closed the session has usually fired.
+        pty.onExit(() => {
+            this.exited = true;
+        });
+    }
+    /** Resolves on the observed exit, or at `timeoutMs` so a stuck CLI cannot hold the lock. */
+    wait(timeoutMs = cliExitWaitMs) {
+        if (this.exited)
+            return Promise.resolve(undefined);
+        return new Promise((resolve) => {
+            const settle = () => {
+                clearTimeout(timer);
+                off();
+                resolve(undefined);
+            };
+            const off = this.pty.onExit(() => settle());
+            const timer = setTimeout(settle, timeoutMs);
+            timer.unref?.();
+        });
+    }
+}
+//# sourceMappingURL=cli-exit.js.map

package/dist/codex/session/cli-exit.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"cli-exit.js","sourceRoot":"","sources":["../../../src/codex/session/cli-exit.ts"],"names":[],"mappings":"AAAA;;;;GAIG;AAIH,2FAA2F;AAC3F,MAAM,CAAC,MAAM,aAAa,GAAG,KAAK,CAAC;AAEnC;;;;;;GAMG;AACH,MAAM,OAAO,cAAc;IACR,GAAG,CAAa;IACjC,wFAAwF;IAChF,MAAM,GAAG,KAAK,CAAC;IAEvB,YAAY,GAAe;QACzB,IAAI,CAAC,GAAG,GAAG,GAAG,CAAC;QACf,kFAAkF;QAClF,oFAAoF;QACpF,GAAG,CAAC,MAAM,CAAC,GAAG,EAAE;YACd,IAAI,CAAC,MAAM,GAAG,IAAI,CAAC;QACrB,CAAC,CAAC,CAAC;IACL,CAAC;IAED,4FAA4F;IAC5F,IAAI,CAAC,YAAoB,aAAa;QACpC,IAAI,IAAI,CAAC,MAAM;YAAE,OAAO,OAAO,CAAC,OAAO,CAAC,SAAS,CAAC,CAAC;QACnD,OAAO,IAAI,OAAO,CAAC,CAAC,OAAO,EAAE,EAAE;YAC7B,MAAM,MAAM,GAAG,GAAS,EAAE;gBACxB,YAAY,CAAC,KAAK,CAAC,CAAC;gBACpB,GAAG,EAAE,CAAC;gBACN,OAAO,CAAC,SAAS,CAAC,CAAC;YACrB,CAAC,CAAC;YACF,MAAM,GAAG,GAAG,IAAI,CAAC,GAAG,CAAC,MAAM,CAAC,GAAG,EAAE,CAAC,MAAM,EAAE,CAAC,CAAC;YAC5C,MAAM,KAAK,GAAG,UAAU,CAAC,MAAM,EAAE,SAAS,CAAC,CAAC;YAC5C,KAAK,CAAC,KAAK,EAAE,EAAE,CAAC;QAClB,CAAC,CAAC,CAAC;IACL,CAAC;CACF"}

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

@@ -4,10 +4,13 @@
  * handler receives only `mcp__*` / `unknown:*` tools), and §7A.3 (an unblocked
  * `Stop` reads the committed turn with a bounded per-pass scan before readiness).
  */
+import type { HookErrorEvent } from "../../core/types.ts";
 import type { TypedEmitter } from "../../events/emitter.ts";
 import type { SessionRecord } from "../../state/store.ts";
 import type { CodexSessionImpl } from "./instance.ts";
 import type { CodexEventMap, StartCodexOptions } from "./types.ts";
 export declare function registerInitialHooks(emitter: TypedEmitter<CodexEventMap>, handlers: StartCodexOptions["hooks"]): void;
 export declare function dispatchHook(input: unknown, emitter: TypedEmitter<CodexEventMap>, options: StartCodexOptions, record: SessionRecord, session?: CodexSessionImpl): Promise<import("../../bridge/types.ts").BridgeProcessResult>;
+/** Contains bridge diagnostics under the same hook notification policy. */
+export declare function buildCodexHookErrorHandler(record: SessionRecord, emitter: TypedEmitter<CodexEventMap>, getSession?: () => CodexSessionImpl | undefined): (event: Omit<HookErrorEvent, "elwoodSessionId">) => void;
 //# sourceMappingURL=hooks.d.ts.map

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

@@ -1 +1 @@
-{"version":3,"file":"hooks.d.ts","sourceRoot":"","sources":["../../../src/codex/session/hooks.ts"],"names":[],"mappings":"AAAA;;;;;GAKG;AAIH,OAAO,KAAK,EAAE,YAAY,EAAE,MAAM,yBAAyB,CAAC;AAC5D,OAAO,KAAK,EAAE,aAAa,EAAE,MAAM,sBAAsB,CAAC;AAK1D,OAAO,KAAK,EAAE,gBAAgB,EAAE,MAAM,eAAe,CAAC;AACtD,OAAO,KAAK,EAEV,aAAa,EAEb,iBAAiB,EAClB,MAAM,YAAY,CAAC;AAEpB,wBAAgB,oBAAoB,CAClC,OAAO,EAAE,YAAY,CAAC,aAAa,CAAC,EACpC,QAAQ,EAAE,iBAAiB,CAAC,OAAO,CAAC,GACnC,IAAI,CAKN;AAiBD,wBAAsB,YAAY,CAChC,KAAK,EAAE,OAAO,EACd,OAAO,EAAE,YAAY,CAAC,aAAa,CAAC,EACpC,OAAO,EAAE,iBAAiB,EAC1B,MAAM,EAAE,aAAa,EACrB,OAAO,CAAC,EAAE,gBAAgB,gEAmC3B"}
+{"version":3,"file":"hooks.d.ts","sourceRoot":"","sources":["../../../src/codex/session/hooks.ts"],"names":[],"mappings":"AAAA;;;;;GAKG;AASH,OAAO,KAAK,EAAE,cAAc,EAAE,MAAM,qBAAqB,CAAC;AAC1D,OAAO,KAAK,EAAE,YAAY,EAAE,MAAM,yBAAyB,CAAC;AAC5D,OAAO,KAAK,EAAE,aAAa,EAAE,MAAM,sBAAsB,CAAC;AAK1D,OAAO,KAAK,EAAE,gBAAgB,EAAE,MAAM,eAAe,CAAC;AACtD,OAAO,KAAK,EAEV,aAAa,EAEb,iBAAiB,EAClB,MAAM,YAAY,CAAC;AAEpB,wBAAgB,oBAAoB,CAClC,OAAO,EAAE,YAAY,CAAC,aAAa,CAAC,EACpC,QAAQ,EAAE,iBAAiB,CAAC,OAAO,CAAC,GACnC,IAAI,CASN;AAwBD,wBAAsB,YAAY,CAChC,KAAK,EAAE,OAAO,EACd,OAAO,EAAE,YAAY,CAAC,aAAa,CAAC,EACpC,OAAO,EAAE,iBAAiB,EAC1B,MAAM,EAAE,aAAa,EACrB,OAAO,CAAC,EAAE,gBAAgB,gEAM3B;AA+ED,2EAA2E;AAC3E,wBAAgB,0BAA0B,CACxC,MAAM,EAAE,aAAa,EACrB,OAAO,EAAE,YAAY,CAAC,aAAa,CAAC,EACpC,UAAU,CAAC,EAAE,MAAM,gBAAgB,GAAG,SAAS,GAC9C,CAAC,KAAK,EAAE,IAAI,CAAC,cAAc,EAAE,iBAAiB,CAAC,KAAK,IAAI,CAc1D"}

package/dist/codex/session/hooks.js

@@ -5,7 +5,12 @@
  * `Stop` reads the committed turn with a bounded per-pass scan before readiness).
  */
 import * as activity from "../../core/activity/index.js";
+import { freezeHookEvent } from "../../core/freeze-hook-event.js";
+import { hookObservationBoundary } from "../../core/hook-observation.js";
 import { isRecord } from "../../core/predicates.js";
+import { confirmNativeBoundary } from "../../core/simple/native-boundary.js";
+import { recordNativeTurn } from "../../core/simple/submission-context.js";
+import { withStopInput, withStopInputNotification } from "../../core/stop-input.js";
 import { isCodexBlock, requestCodexHook } from "../hooks/dispatch.js";
 import { serializeCodexHookResult } from "../hooks/serialize.js";
 import { isKnownCommandTool, normalizeCodexHookEvent } from "../hooks/validate.js";
@@ -13,7 +18,7 @@ export function registerInitialHooks(emitter, handlers) {
     if (!handlers)
         return;
     for (const [name, handler] of Object.entries(handlers)) {
-        emitter.listen(`hook:${name}`, hookHandler(name, handler));
+        emitter.listen(`hook:${name}`, hookHandler(name, handler), typeof handler === "function" ? "event" : "tool-keyed");
     }
 }
 function hookHandler(name, handler) {
@@ -26,29 +31,77 @@ function hookHandler(name, handler) {
         // The `unknown` handler is typed for `mcp__*` / `unknown:*` tools only, so a known
         // command tool with no per-tool handler resolves to no decision rather than being
         // routed into a handler whose parameter type it does not satisfy (§7A.2).
-        const toolHandler = handler[toolName] ?? (isKnownCommandTool(toolName) ? undefined : handler["unknown"]);
+        // Both lookups are OWN-property only, matching Claude routing: a tool named for an
+        // inherited member (`toString`, `constructor`, anything on Object.prototype, or a
+        // key a caller put on the handler object's prototype) must not reach a handler the
+        // caller never registered for it (C-HOOK-19).
+        const toolHandler = (Object.hasOwn(handler, toolName) ? handler[toolName] : undefined) ??
+            (isKnownCommandTool(toolName) || !Object.hasOwn(handler, "unknown")
+                ? undefined
+                : handler["unknown"]);
         return typeof toolHandler === "function" ? toolHandler(event) : undefined;
     });
 }
 export async function dispatchHook(input, emitter, options, record, session) {
-    const event = normalizeCodexHookEvent(input);
-    session?.observeTranscript(event.transcript_path);
+    const event = freezeHookEvent(normalizeCodexHookEvent(input));
+    return await withStopInput({ hookName: event.hook_event_name, session: session ?? record }, () => observeAndRequest(event, emitter, options, record, session));
+}
+async function observeAndRequest(event, emitter, options, record, session) {
+    const submissionGenerationUnchanged = event.hook_event_name === "Stop"
+        ? session?.stopCompletion.captureSubmissionGeneration()
+        : undefined;
+    const observation = hookObservationBoundary(emitter, record.elwoodSessionId, "codex");
+    observation.run("transcript", () => session?.observeTranscript(event.transcript_path));
     if (event.hook_event_name === "SessionStart") {
         session?.rememberCodexSessionId(event.session_id);
         // Codex's authoritative pre-input readiness signal: release the first queued
         // message here, not on the boot-time composer placeholder (C-API-28).
-        session?.markInitialReadyFromHook();
+        // The actual ready transition can be deferred by a startup hold; its own
+        // boundary retains C-API-42's synchronous fallback and catches rejections.
+        session?.markInitialReadyFromHook(observation);
     }
-    emitter.emit("hook", event);
-    emitter.emit("activity", activity.activityFromCodexHook(record.elwoodSessionId, event));
-    const outcome = await requestCodexHook(emitter, event, options.hookTimeoutMs ?? 25_000, record.elwoodSessionId);
-    emitter.emit("activity", activity.activityFromHookResult("codex", record.elwoodSessionId, event.hook_event_name, outcome.result, outcome.failedOpen));
-    if (event.hook_event_name === "Stop" && !isCodexBlock(outcome.result)) {
+    if (session && event.hook_event_name === "UserPromptSubmit")
+        recordNativeTurn(session, event.turn_id);
+    observation.run("hook", () => emitter.emit("hook", event));
+    observation.run("activity", () => emitter.emit("activity", activity.activityFromCodexHook(record.elwoodSessionId, event)));
+    const outcome = await requestCodexHook({
+        hasListeners: (name) => emitter.hasListeners(name),
+        requestWithProvenance: (name, payload) => emitter.requestWithProvenance(name, payload),
+        emit: (name, payload) => observation.run(name === "hookError" ? "hook_error" : "activity", () => emitter.emit(name, payload)),
+    }, event, options.hookTimeoutMs ?? 25_000, record.elwoodSessionId);
+    const serialized = serializeCodexHookResult(event.hook_event_name, outcome.result);
+    const blocked = isCodexBlock(outcome.result);
+    observation.run("activity", () => emitter.emit("activity", activity.activityFromHookResult("codex", record.elwoodSessionId, event.hook_event_name, outcome.result, outcome.failedOpen)));
+    if (event.hook_event_name === "Stop" && !blocked) {
         // A bounded per-pass scan (like Claude's): the terminal drain budget is reserved
         // for finish(), so hundreds of turns never exhaust it into false backlog drops.
-        session?.scanTranscript();
-        session?.submitEvidence("hook_turn_ended");
+        observation.run("transcript", () => session?.scanTranscript());
+        // Diagnostic callbacks may submit input; report before comparing physical generations.
+        observation.report();
+        // Guidance may steer the current turn; every physical submission supersedes this Stop.
+        const sameSubmissionGeneration = submissionGenerationUnchanged?.() ?? true;
+        if (sameSubmissionGeneration)
+            observation.run("lifecycle", () => {
+                if (session)
+                    confirmNativeBoundary(session, {
+                        kind: "stop",
+                        turnId: event.turn_id,
+                        signal: event.last_assistant_message ?? "",
+                    });
+                session?.submitEvidence("hook_turn_ended");
+            });
     }
-    return serializeCodexHookResult(event.hook_event_name, outcome.result);
+    observation.report();
+    return serialized;
+}
+/** Contains bridge diagnostics under the same hook notification policy. */
+export function buildCodexHookErrorHandler(record, emitter, getSession) {
+    return (event) => withStopInputNotification({ hookName: event.hookEventName, session: getSession?.() ?? record }, () => {
+        const hookError = { elwoodSessionId: record.elwoodSessionId, ...event };
+        const observation = hookObservationBoundary(emitter, record.elwoodSessionId, "codex");
+        observation.run("hook_error", () => emitter.emit("hookError", hookError));
+        observation.run("activity", () => emitter.emit("activity", activity.activityFromHookError("codex", hookError)));
+        observation.report();
+    });
 }
 //# sourceMappingURL=hooks.js.map

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

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