@with-logic/elwood 0.2.1 → 0.2.2

package/dist/codex/session/instance.js

@@ -2,43 +2,57 @@
  * In-memory Codex session object exposed to callers.
  * Implements PRD §5.7, §7A, §8, and §9.
  */
-import { isPickerIntervention } from "../../core/models/intervention.js";
 import { sessionWaitForActivity, sessionWaitForStatus } from "../../core/session-wait.js";
 import { registerNativeTurnReader } from "../../core/simple/submission-context.js";
 import { emitSessionWarnings } from "../../core/warnings/session.js";
+import { PtyExitLatch } from "../../pty/exit-latch.js";
 import { AgentSessionBase } from "../../runtime/session/base.js";
 import { updateSessionResumeId } from "../../state/store.js";
 import { codexTurnIdentity } from "../accepted-turn.js";
-import { restoreCodexConfig, snapshotCodexConfig } from "../config/restore.js";
-import { runCodexModelSwitch } from "../config/transaction.js";
+import { withCodexDefault } from "../config/default-model.js";
 import { attachCodexImages } from "../images/attach.js";
 import { codexModelPicker } from "../model-picker.js";
 import { codexSessionQuestions } from "../questions/session.js";
 import { liveCodexClearance } from "../screen/live-clearance.js";
 import { createCodexRecoveryComposer } from "../screen/staged-input.js";
+import { confirmCodexRejection } from "../transcript/rejection.js";
 import { stopCodexRuntime } from "./cleanup.js";
-import { CliExitBarrier } from "./cli-exit.js";
+import { switchCodexModel } from "./config-switch.js";
 import { observeCodexInitialReady } from "./initial-ready.js";
-import { clipboardRestoreFailedWarning, codexRestoreFailedWarning, codexRestoreSkippedWarning, } from "./warnings.js";
+import { CodexTurnCommit } from "./turn-commit.js";
+import { clipboardRestoreFailedWarning } from "./warnings.js";
+/** How long a setModel interrupted by close waits for the CLI to exit before restoring. */
+const cliExitWaitMs = 5_000;
 export class CodexSessionImpl extends AgentSessionBase {
+    // The default and the setModel restore use the config of THIS session's Codex (C-CODEX-24).
     picker = {
         ...codexModelPicker,
         isClear: liveCodexClearance(() => this.terminal),
+        withDefaults: (options, signal) => withCodexDefault(options, signal, this.resolveConfigPath),
     };
     bridge;
     emitter;
     transcriptWatcher;
     onInitialReady;
     hookReadyObservation;
-    cliExit;
-    constructor(record, stateDir, runtime, pty, terminal, bridge, emitter, terminalReplay, transcriptWatcher, loopDefinitions) {
+    // The PTY's own exit. Session status cannot stand in for it: shutdown records stopped,
+    // killed, and torn_down even when its signal did not take.
+    cliExit = new PtyExitLatch(this.pty);
+    resolveConfigPath;
+    /** Holds `stop`/`teardown` for the turn a `Stop` hook ends to be recorded (C-LIFE-13). */
+    turnCommit;
+    constructor(record, stateDir, runtime, pty, terminal, bridge, emitter, terminalReplay, transcriptWatcher, loopDefinitions, resolveConfigPath) {
         super("codex", record, stateDir, runtime, pty, terminal, emitter, terminalReplay, loopDefinitions);
         registerNativeTurnReader(this, codexTurnIdentity);
         this.configureQuestions((registry) => codexSessionQuestions(registry, this.elwoodSessionId, emitter));
         this.bridge = bridge;
         this.emitter = emitter;
         this.transcriptWatcher = transcriptWatcher;
-        this.cliExit = new CliExitBarrier(pty);
+        this.turnCommit = new CodexTurnCommit(() => transcriptWatcher?.poll(), this.cliExit, this);
+        this.resolveConfigPath = resolveConfigPath;
+        // Codex fires no `Stop` for a turn it rejects; its failed `task_complete` ends it (C-API-60).
+        emitter.on("codex:transcript", ({ item }) => confirmCodexRejection(this, item));
+        emitter.on("codex:transcript", (event) => this.turnCommit.observe(event.item));
     }
     on(event, handler) {
         // REGISTER before replaying buffered `terminal:data` (mirrors Claude): a throwing replay
@@ -47,41 +61,24 @@ export class CodexSessionImpl extends AgentSessionBase {
         this.replayFor(event, handler);
         return unsubscribe;
     }
-    // Restore the user's config default after picker changes; the live CLI retains
-    // its selection. The process-wide transaction lock prevents interleaved snapshots
-    // and restores even when automation rejects after Codex writes (C-CODEX-14).
     setModel(id, options) {
         // The queue slot is claimed FIRST (by `super.setModel`), and the config transaction
         // runs inside it via `around`. Reversing that let a following `sendMessage` dispatch
         // while this call was still waiting for another session's lock, sending under the old
         // model — a FIFO violation the slot exists to prevent.
-        return super.setModel(id, options, (flow, signal) => runCodexModelSwitch({
-            snapshot: snapshotCodexConfig,
-            apply: flow,
+        const session = {
+            elwoodSessionId: this.elwoodSessionId,
+            resolveConfigPath: this.resolveConfigPath,
             waitForCliExit: () => this.waitForCliExit(),
-            // The picker deadline includes this lock wait. Once acquired, the transaction
-            // owns config.toml until its abort handling and restore finish.
-            cancel: { signal, error: () => signal.reason },
-            restore: (snapshot) => this.restoreCodexDefault(snapshot, signal.reason),
-            onRestoreError: (error) => this.emitWarnings([codexRestoreFailedWarning(this.elwoodSessionId, error)]),
-        }));
-    }
-    // A closing session rejects the picker at once, while the dying CLI can still persist
-    // the selection it had confirmed, so the restore waits on the PTY's own exit.
+            emitWarnings: (warnings) => this.emitWarnings(warnings),
+        };
+        return super.setModel(id, options, (flow, signal) => switchCodexModel(session, flow, signal));
+    }
+    // A closing session's dying CLI can still persist a confirmed selection: await its exit.
     waitForCliExit() {
         if (!this.closing.signal.aborted)
             return undefined;
-        return this.cliExit.wait();
-    }
-    restoreCodexDefault(snapshot, reason) {
-        const outcome = isPickerIntervention(reason)
-            ? snapshotCodexConfig() === snapshot
-                ? "unchanged"
-                : "interrupted"
-            : restoreCodexConfig(snapshot);
-        if (outcome === "restored" || outcome === "unchanged")
-            return;
-        this.emitWarnings([codexRestoreSkippedWarning(this.elwoodSessionId, outcome)]);
+        return this.cliExit.within(cliExitWaitMs, { unref: true }); // never holds the host open
     }
     off(event, handler) {
         this.emitter.off(event, handler);
@@ -128,10 +125,18 @@ export class CodexSessionImpl extends AgentSessionBase {
         if (path)
             this.transcriptWatcher?.observe(path);
     }
-    /** One bounded per-pass scan of the committed transcript (an unblocked `Stop`, §7A.3). */
-    scanTranscript() {
-        this.transcriptWatcher?.scan();
+    stop() {
+        this.closing.abort();
+        this.loops.pause();
+        return this.turnCommit.beforeShutdown(() => super.stop());
     }
+    teardown() {
+        this.closing.abort();
+        this.loops.prepareClear();
+        return this.turnCommit.beforeShutdown(() => super.teardown());
+    }
+    /** One bounded per-pass scan of the committed transcript (an unblocked `Stop`, §7A.3). */
+    scanTranscript = () => this.transcriptWatcher?.scan();
     emitWarnings(warnings) {
         // No cast: each callback is the emitter's own `emit` bound to a correlated
         // event name, so a map/payload drift is a compile error here.

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

@@ -1 +1 @@
-{"version":3,"file":"instance.js","sourceRoot":"","sources":["../../../src/codex/session/instance.ts"],"names":[],"mappings":"AAAA;;;GAGG;AAIH,OAAO,EAAE,oBAAoB,EAAE,MAAM,mCAAmC,CAAC;AACzE,OAAO,EAAE,sBAAsB,EAAE,oBAAoB,EAAE,MAAM,4BAA4B,CAAC;AAC1F,OAAO,EAAE,wBAAwB,EAAE,MAAM,yCAAyC,CAAC;AAGnF,OAAO,EAAE,mBAAmB,EAAE,MAAM,gCAAgC,CAAC;AAGrE,OAAO,EAAE,gBAAgB,EAAE,MAAM,+BAA+B,CAAC;AAGjE,OAAO,EAAsB,qBAAqB,EAAE,MAAM,sBAAsB,CAAC;AAEjF,OAAO,EAAE,iBAAiB,EAAE,MAAM,qBAAqB,CAAC;AACxD,OAAO,EAAE,kBAAkB,EAAE,mBAAmB,EAAE,MAAM,sBAAsB,CAAC;AAC/E,OAAO,EAAE,mBAAmB,EAAE,MAAM,0BAA0B,CAAC;AAC/D,OAAO,EAAE,iBAAiB,EAAE,MAAM,qBAAqB,CAAC;AACxD,OAAO,EAAE,gBAAgB,EAAE,MAAM,oBAAoB,CAAC;AACtD,OAAO,EAAE,qBAAqB,EAAE,MAAM,yBAAyB,CAAC;AAChE,OAAO,EAAE,kBAAkB,EAAE,MAAM,6BAA6B,CAAC;AACjE,OAAO,EAAE,2BAA2B,EAAE,MAAM,2BAA2B,CAAC;AAGxE,OAAO,EAAE,gBAAgB,EAAE,MAAM,cAAc,CAAC;AAChD,OAAO,EAAE,cAAc,EAAE,MAAM,eAAe,CAAC;AAC/C,OAAO,EAAE,wBAAwB,EAAE,MAAM,oBAAoB,CAAC;AAE9D,OAAO,EACL,6BAA6B,EAC7B,yBAAyB,EACzB,0BAA0B,GAC3B,MAAM,eAAe,CAAC;AACvB,MAAM,OAAO,gBAAiB,SAAQ,gBAAgB;IACjC,MAAM,GAAG;QAC1B,GAAG,gBAAgB;QACnB,OAAO,EAAE,kBAAkB,CAAC,GAAG,EAAE,CAAC,IAAI,CAAC,QAAQ,CAAC;KACjD,CAAC;IACe,MAAM,CAAkB;IACxB,OAAO,CAA8B;IACrC,iBAAiB,CAAqC;IAC/D,cAAc,CAA2B;IACzC,oBAAoB,CAA8B;IACzC,OAAO,CAAiB;IACzC,YACE,MAAqB,EACrB,QAAgB,EAChB,OAAuB,EACvB,GAAe,EACf,QAAwB,EACxB,MAAuB,EACvB,OAAoC,EACpC,cAAoC,EACpC,iBAAqD,EACrD,eAAmD;QAEnD,KAAK,CACH,OAAO,EACP,MAAM,EACN,QAAQ,EACR,OAAO,EACP,GAAG,EACH,QAAQ,EACR,OAAO,EACP,cAAc,EACd,eAAe,CAChB,CAAC;QACF,wBAAwB,CAAC,IAAI,EAAE,iBAAiB,CAAC,CAAC;QAClD,IAAI,CAAC,kBAAkB,CAAC,CAAC,QAAQ,EAAE,EAAE,CACnC,qBAAqB,CAAC,QAAQ,EAAE,IAAI,CAAC,eAAe,EAAE,OAAO,CAAC,CAC/D,CAAC;QACF,IAAI,CAAC,MAAM,GAAG,MAAM,CAAC;QACrB,IAAI,CAAC,OAAO,GAAG,OAAO,CAAC;QACvB,IAAI,CAAC,iBAAiB,GAAG,iBAAiB,CAAC;QAC3C,IAAI,CAAC,OAAO,GAAG,IAAI,cAAc,CAAC,GAAG,CAAC,CAAC;IACzC,CAAC;IAED,EAAE,CAA2B,KAAQ,EAAE,OAA6B;QAClE,yFAAyF;QACzF,mGAAmG;QACnG,MAAM,WAAW,GAAG,IAAI,CAAC,OAAO,CAAC,EAAE,CAAC,KAAK,EAAE,OAAO,CAAC,CAAC;QACpD,IAAI,CAAC,SAAS,CAAC,KAAe,EAAE,OAAO,CAAC,CAAC;QACzC,OAAO,WAAW,CAAC;IACrB,CAAC;IACD,+EAA+E;IAC/E,kFAAkF;IAClF,6EAA6E;IACpE,QAAQ,CAAC,EAAU,EAAE,OAAyC;QACrE,oFAAoF;QACpF,qFAAqF;QACrF,sFAAsF;QACtF,uDAAuD;QACvD,OAAO,KAAK,CAAC,QAAQ,CAAC,EAAE,EAAE,OAAO,EAAE,CAAC,IAAI,EAAE,MAAM,EAAE,EAAE,CAClD,mBAAmB,CAAC;YAClB,QAAQ,EAAE,mBAAmB;YAC7B,KAAK,EAAE,IAAI;YACX,cAAc,EAAE,GAAG,EAAE,CAAC,IAAI,CAAC,cAAc,EAAE;YAC3C,8EAA8E;YAC9E,gEAAgE;YAChE,MAAM,EAAE,EAAE,MAAM,EAAE,KAAK,EAAE,GAAG,EAAE,CAAC,MAAM,CAAC,MAAM,EAAE;YAC9C,OAAO,EAAE,CAAC,QAAQ,EAAE,EAAE,CAAC,IAAI,CAAC,mBAAmB,CAAC,QAAQ,EAAE,MAAM,CAAC,MAAM,CAAC;YACxE,cAAc,EAAE,CAAC,KAAK,EAAE,EAAE,CACxB,IAAI,CAAC,YAAY,CAAC,CAAC,yBAAyB,CAAC,IAAI,CAAC,eAAe,EAAE,KAAK,CAAC,CAAC,CAAC;SAC9E,CAAC,CACH,CAAC;IACJ,CAAC;IACD,sFAAsF;IACtF,8EAA8E;IACtE,cAAc;QACpB,IAAI,CAAC,IAAI,CAAC,OAAO,CAAC,MAAM,CAAC,OAAO;YAAE,OAAO,SAAS,CAAC;QACnD,OAAO,IAAI,CAAC,OAAO,CAAC,IAAI,EAAE,CAAC;IAC7B,CAAC;IACO,mBAAmB,CAAC,QAA4B,EAAE,MAAe;QACvE,MAAM,OAAO,GAAG,oBAAoB,CAAC,MAAM,CAAC;YAC1C,CAAC,CAAC,mBAAmB,EAAE,KAAK,QAAQ;gBAClC,CAAC,CAAC,WAAW;gBACb,CAAC,CAAC,aAAa;YACjB,CAAC,CAAC,kBAAkB,CAAC,QAAQ,CAAC,CAAC;QACjC,IAAI,OAAO,KAAK,UAAU,IAAI,OAAO,KAAK,WAAW;YAAE,OAAO;QAC9D,IAAI,CAAC,YAAY,CAAC,CAAC,0BAA0B,CAAC,IAAI,CAAC,eAAe,EAAE,OAAO,CAAC,CAAC,CAAC,CAAC;IACjF,CAAC;IACD,GAAG,CAA2B,KAAQ,EAAE,OAA6B;QACnE,IAAI,CAAC,OAAO,CAAC,GAAG,CAAC,KAAK,EAAE,OAAO,CAAC,CAAC;IACnC,CAAC;IACD,2EAA2E;IAC3E,oBAAoB;QAClB,wBAAwB,CACtB,IAAI,CAAC,OAAO,EACZ,IAAI,CAAC,eAAe,EACpB,GAAG,EAAE,CAAC,IAAI,CAAC,mBAAmB,EAAE,EAChC,IAAI,CAAC,oBAAoB,CAC1B,CAAC;IACJ,CAAC;IACD,aAAa,CAAC,KAA+C,EAAE,SAAkB;QAC/E,OAAO,oBAAoB,CAAC,IAAI,EAAE,KAAK,EAAE,SAAS,CAAC,CAAC;IACtD,CAAC;IACD,eAAe,CAAC,KAA8C,EAAE,SAAkB;QAChF,OAAO,sBAAsB,CAAC,IAAI,EAAE,KAAK,EAAE,SAAS,CAAC,CAAC;IACxD,CAAC;IACD,4EAA4E;IACzD,gBAAgB,GAAG,2BAA2B,CAAC,IAAI,CAAC,QAAQ,CAAC,CAAC;IAEjF,+EAA+E;IAC/E,2EAA2E;IACjE,YAAY,GAAG,CAAC,KAAwB,EAAE,MAAmB,EAAiB,EAAE,CACxF,iBAAiB,CACf,IAAI,CAAC,iBAAiB,EACtB,KAAK,EACL,MAAM,EACN,GAAG,EAAE,CAAC,IAAI,CAAC,kBAAkB,EAAE,EAC/B,GAAG,EAAE,CAAC,IAAI,CAAC,YAAY,CAAC,CAAC,6BAA6B,CAAC,IAAI,CAAC,eAAe,CAAC,CAAC,CAAC,CAC/E,CAAC;IACJ,sBAAsB,CAAC,SAAiB;QACtC,IAAI,IAAI,CAAC,MAAM,CAAC,KAAK,CAAC,QAAQ;YAAE,OAAO;QACvC,IAAI,CAAC,OAAO,CAAC,qBAAqB,CAAC,IAAI,CAAC,MAAM,EAAE,OAAO,EAAE,SAAS,CAAC,CAAC,CAAC;IACvE,CAAC;IACD;4EACwE;IACxE,mBAAmB,CAAC,IAAgB;QAClC,IAAI,CAAC,cAAc,GAAG,IAAI,CAAC;IAC7B,CAAC;IACD;;0EAEsE;IACtE,wBAAwB,CAAC,WAA4B;QACnD,MAAM,QAAQ,GAAG,IAAI,CAAC,oBAAoB,CAAC;QAC3C,IAAI,CAAC,oBAAoB,GAAG,WAAW,CAAC;QACxC,IAAI,CAAC;YACH,IAAI,CAAC,cAAc,EAAE,EAAE,CAAC;QAC1B,CAAC;gBAAS,CAAC;YACT,IAAI,CAAC,oBAAoB,GAAG,QAAQ,CAAC;QACvC,CAAC;IACH,CAAC;IACD,iBAAiB,CAAC,IAAoB;QACpC,IAAI,IAAI;YAAE,IAAI,CAAC,iBAAiB,EAAE,OAAO,CAAC,IAAI,CAAC,CAAC;IAClD,CAAC;IACD,0FAA0F;IAC1F,cAAc;QACZ,IAAI,CAAC,iBAAiB,EAAE,IAAI,EAAE,CAAC;IACjC,CAAC;IACQ,YAAY,CAAC,QAAuC;QAC3D,2EAA2E;QAC3E,8DAA8D;QAC9D,mBAAmB,CAAC,QAAQ,EAAE;YAC5B,OAAO,EAAE,CAAC,KAAK,EAAE,EAAE,CAAC,IAAI,CAAC,OAAO,CAAC,IAAI,CAAC,SAAS,EAAE,KAAK,CAAC;YACvD,QAAQ,EAAE,CAAC,KAAK,EAAE,EAAE,CAAC,IAAI,CAAC,OAAO,CAAC,IAAI,CAAC,UAAU,EAAE,KAAK,CAAC;SAC1D,CAAC,CAAC;IACL,CAAC;IACS,KAAK,CAAC,WAAW;QACzB,MAAM,gBAAgB,CAAC,IAAI,CAAC,MAAM,EAAE,IAAI,CAAC,iBAAiB,EAAE,IAAI,CAAC,QAAQ,EAAE,IAAI,CAAC,GAAG,CAAC,CAAC;IACvF,CAAC;CACF"}
+{"version":3,"file":"instance.js","sourceRoot":"","sources":["../../../src/codex/session/instance.ts"],"names":[],"mappings":"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"}

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

@@ -0,0 +1,11 @@
+/**
+ * Codex's initial-readiness gate: its deadline needs the configured composer (the model
+ * footer), and a release by the backstop without one is reported as a content-free
+ * `initial_ready_backstop` warning (PRD §5.3, §5.7, C-API-28).
+ */
+import type { InitialReadyBackstopWarning } from "../../core/warnings/lifecycle.ts";
+import { type ReadinessGate } from "../../runtime/session/readiness.ts";
+export declare function createCodexReadinessGate(onReady: () => void, resumed: boolean, elwoodSessionId: string, warnings: {
+    emitWarnings(warnings: readonly InitialReadyBackstopWarning[]): void;
+}): ReadinessGate;
+//# sourceMappingURL=readiness.d.ts.map

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

@@ -0,0 +1 @@
+{"version":3,"file":"readiness.d.ts","sourceRoot":"","sources":["../../../src/codex/session/readiness.ts"],"names":[],"mappings":"AAAA;;;;GAIG;AACH,OAAO,KAAK,EAAE,2BAA2B,EAAE,MAAM,kCAAkC,CAAC;AAEpF,OAAO,EAAuB,KAAK,aAAa,EAAE,MAAM,oCAAoC,CAAC;AAG7F,wBAAgB,wBAAwB,CACtC,OAAO,EAAE,MAAM,IAAI,EACnB,OAAO,EAAE,OAAO,EAChB,eAAe,EAAE,MAAM,EACvB,QAAQ,EAAE;IAAE,YAAY,CAAC,QAAQ,EAAE,SAAS,2BAA2B,EAAE,GAAG,IAAI,CAAA;CAAE,GACjF,aAAa,CAKf"}

package/dist/codex/session/readiness.js

@@ -0,0 +1,22 @@
+import { initialBackstopMs } from "../../runtime/readiness/initial-ready.js";
+import { createReadinessGate } from "../../runtime/session/readiness.js";
+import { codexComposerConfigured } from "../screen/clearance.js";
+export function createCodexReadinessGate(onReady, resumed, elwoodSessionId, warnings) {
+    return createReadinessGate(onReady, resumed, {
+        configured: codexComposerConfigured,
+        onBackstopRelease: () => warnings.emitWarnings([backstopWarning(elwoodSessionId)]),
+    });
+}
+/** Live-only and content-free: it names the missing evidence, never the screen. */
+function backstopWarning(elwoodSessionId) {
+    return {
+        elwoodSessionId,
+        agent: "codex",
+        source: "lifecycle",
+        code: "initial_ready_backstop",
+        severity: "warning",
+        message: `No configured Codex composer was recognized within ${initialBackstopMs / 1_000} seconds of the first frame; readiness was released without it.`,
+        raw: "initial_ready_backstop",
+    };
+}
+//# sourceMappingURL=readiness.js.map

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

@@ -0,0 +1 @@
+{"version":3,"file":"readiness.js","sourceRoot":"","sources":["../../../src/codex/session/readiness.ts"],"names":[],"mappings":"AAMA,OAAO,EAAE,iBAAiB,EAAE,MAAM,0CAA0C,CAAC;AAC7E,OAAO,EAAE,mBAAmB,EAAsB,MAAM,oCAAoC,CAAC;AAC7F,OAAO,EAAE,uBAAuB,EAAE,MAAM,wBAAwB,CAAC;AAEjE,MAAM,UAAU,wBAAwB,CACtC,OAAmB,EACnB,OAAgB,EAChB,eAAuB,EACvB,QAAkF;IAElF,OAAO,mBAAmB,CAAC,OAAO,EAAE,OAAO,EAAE;QAC3C,UAAU,EAAE,uBAAuB;QACnC,iBAAiB,EAAE,GAAG,EAAE,CAAC,QAAQ,CAAC,YAAY,CAAC,CAAC,eAAe,CAAC,eAAe,CAAC,CAAC,CAAC;KACnF,CAAC,CAAC;AACL,CAAC;AAED,mFAAmF;AACnF,SAAS,eAAe,CAAC,eAAuB;IAC9C,OAAO;QACL,eAAe;QACf,KAAK,EAAE,OAAO;QACd,MAAM,EAAE,WAAW;QACnB,IAAI,EAAE,wBAAwB;QAC9B,QAAQ,EAAE,SAAS;QACnB,OAAO,EAAE,sDAAsD,iBAAiB,GAAG,KAAK,iEAAiE;QACzJ,GAAG,EAAE,wBAAwB;KAC9B,CAAC;AACJ,CAAC"}

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

@@ -1 +1 @@
-{"version":3,"file":"resume.d.ts","sourceRoot":"","sources":["../../../src/codex/session/resume.ts"],"names":[],"mappings":"AAAA;;;GAGG;AAcH,OAAO,KAAK,EAAE,eAAe,EAAE,kBAAkB,EAAE,MAAM,YAAY,CAAC;AAEtE,wBAAsB,WAAW,CAAC,UAAU,EAAE,kBAAkB,GAAG,OAAO,CAAC,eAAe,CAAC,CAqD1F"}
+{"version":3,"file":"resume.d.ts","sourceRoot":"","sources":["../../../src/codex/session/resume.ts"],"names":[],"mappings":"AAAA;;;GAGG;AAkBH,OAAO,KAAK,EAAE,eAAe,EAAE,kBAAkB,EAAE,MAAM,YAAY,CAAC;AAEtE,wBAAsB,WAAW,CAAC,UAAU,EAAE,kBAAkB,GAAG,OAAO,CAAC,eAAe,CAAC,CA8D1F"}

package/dist/codex/session/resume.js

@@ -4,6 +4,7 @@
  */
 import { elwoodError } from "../../core/errors.js";
 import { applyCodexHighTrust } from "../../core/high-trust.js";
+import { assertLaunchDirectory, recheckLaunchDirectoryOnFailure, } from "../../runtime/session/launch-directory.js";
 import { canonicalStatePath } from "../../state/canonical-path.js";
 import { reserveLaunchOwnership } from "../../state/launch-ownership.js";
 import { codexLaunchPosture, effectivePosture, withCodexLaunch, } from "../../state/launch-posture.js";
@@ -22,16 +23,20 @@ export async function resumeCodex(rawOptions) {
         throw elwoodError("adapter_mismatch", "Cannot resume a non-Codex session as Codex.");
     if (!record.codex.resumeId)
         throw elwoodError("resume_unavailable", "Cannot resume Codex without a Codex session id.");
+    // Reserved before the first `await`: a teardown already running must see this successor
+    // before it decides which shared state to remove (C-API-20).
     const ownership = reserveLaunchOwnership(sessionDir(stateDir, record.elwoodSessionId));
     try {
-        const warning = await preflight.preflightCodex(options.strictVersionCheck ?? false, options.autoupdate ?? false);
+        // Codex relaunches where the session started (`--cd`); `cwd` only locates the state.
+        await assertLaunchDirectory("codex", record.cwd);
+        const warning = await recheckLaunchDirectoryOnFailure("codex", record.cwd, () => preflight.preflightCodex(options.strictVersionCheck ?? false, options.autoupdate ?? false, record.cwd));
         // Resume defaults to the posture this session launched with; explicit options
         // override field by field, and the effective posture is re-persisted (C-API-32,
         // C-STATE-13). Terminal size is not persisted: it falls back to options.initialSize.
         const launch = effectivePosture(record.codex.launch, codexLaunchPosture(options));
         const resumedRecord = withCodexLaunch(record, launch);
-        const session = await startCodexFromRecord(resumedRecord, stateDir, {
-            cwd: options.cwd ?? record.cwd,
+        const session = await recheckLaunchDirectoryOnFailure("codex", record.cwd, () => startCodexFromRecord(resumedRecord, stateDir, {
+            cwd: record.cwd, // where Codex relaunches; `options.cwd` only located the state
             stateDir,
             ...(options.hooks === undefined ? {} : { hooks: options.hooks }),
             ...(options.initialSize === undefined ? {} : { initialSize: options.initialSize }),
@@ -46,7 +51,7 @@ export async function resumeCodex(rawOptions) {
                 ? {}
                 : { strictVersionCheck: options.strictVersionCheck }),
         }, true, // resumed: mark ready on the first composer marker, not the 10s deadline
-        warning, ownership);
+        warning, ownership));
         return session;
     }
     catch (error) {

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

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

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

@@ -1 +1 @@
-{"version":3,"file":"transcript.d.ts","sourceRoot":"","sources":["../../../src/codex/session/transcript.ts"],"names":[],"mappings":"AAAA;;;;;;;;GAQG;AAGH,OAAO,EAEL,KAAK,qBAAqB,EAC3B,MAAM,yCAAyC,CAAC;AACjD,OAAO,KAAK,EAAE,YAAY,EAAE,MAAM,yBAAyB,CAAC;AAC5D,OAAO,EACL,sBAAsB,EAIvB,MAAM,wBAAwB,CAAC;AAChC,OAAO,KAAK,EAAE,aAAa,EAAE,MAAM,YAAY,CAAC;AAEhD,yFAAyF;AACzF,KAAK,2BAA2B,GAAG;IACjC,QAAQ,CAAC,OAAO,EAAE,sBAAsB,CAAC;IACzC,0EAA0E;IAC1E,QAAQ,CAAC,cAAc,EAAE,CAAC,IAAI,EAAE,MAAM,IAAI,KAAK,IAAI,CAAC;IACpD,QAAQ,CAAC,oBAAoB,EAAE,MAAM,IAAI,CAAC;IAC1C;2FACuF;IACvF,QAAQ,CAAC,YAAY,EAAE,CAAC,UAAU,CAAC,EAAE,MAAM,IAAI,KAAK,IAAI,CAAC;CAC1D,CAAC;AAEF;;;;;GAKG;AACH,wBAAgB,4BAA4B,CAC1C,eAAe,EAAE,MAAM,EACvB,OAAO,EAAE,YAAY,CAAC,aAAa,CAAC,EACpC,OAAO,EAAE,MAAM,qBAAqB,GAAG,SAAS,GAC/C,2BAA2B,CA8E7B"}
+{"version":3,"file":"transcript.d.ts","sourceRoot":"","sources":["../../../src/codex/session/transcript.ts"],"names":[],"mappings":"AAAA;;;;;;;;GAQG;AAGH,OAAO,EAEL,KAAK,qBAAqB,EAC3B,MAAM,yCAAyC,CAAC;AACjD,OAAO,KAAK,EAAE,YAAY,EAAE,MAAM,yBAAyB,CAAC;AAE5D,OAAO,EACL,sBAAsB,EAIvB,MAAM,wBAAwB,CAAC;AAChC,OAAO,KAAK,EAAE,aAAa,EAAE,MAAM,YAAY,CAAC;AAGhD,yFAAyF;AACzF,KAAK,2BAA2B,GAAG;IACjC,QAAQ,CAAC,OAAO,EAAE,sBAAsB,CAAC;IACzC,0EAA0E;IAC1E,QAAQ,CAAC,cAAc,EAAE,CAAC,IAAI,EAAE,MAAM,IAAI,KAAK,IAAI,CAAC;IACpD,QAAQ,CAAC,oBAAoB,EAAE,MAAM,IAAI,CAAC;IAC1C;2FACuF;IACvF,QAAQ,CAAC,YAAY,EAAE,CAAC,UAAU,CAAC,EAAE,MAAM,IAAI,KAAK,IAAI,CAAC;CAC1D,CAAC;AAEF;;;;;GAKG;AACH,wBAAgB,4BAA4B,CAC1C,eAAe,EAAE,MAAM,EACvB,OAAO,EAAE,YAAY,CAAC,aAAa,CAAC,EACpC,OAAO,EAAE,MAAM,qBAAqB,GAAG,SAAS,GAC/C,2BAA2B,CAsF7B"}

package/dist/codex/session/transcript.js

@@ -9,7 +9,9 @@
  */
 import * as activity from "../../core/activity/index.js";
 import { createTranscriptWarningRouter, } from "../../core/transcript/warning-router.js";
+import { CodexClipboardCopies } from "../images/clipboard-copies.js";
 import { CodexTranscriptWatcher, codexDropWarning, codexPollStoppedWarning, codexReadErrorWarning, } from "../transcript/index.js";
+import { imageCopyRemovalFailedWarning } from "./warnings.js";
 /**
  * Builds the transcript watcher, routing content-free drop/read-error notices to
  * the session's warning sink. Notices seen before `getSink()` resolves are held in
@@ -58,7 +60,9 @@ export function createCodexTranscriptWatcher(elwoodSessionId, emitter, getSink)
             }));
         }
     }
+    const clipboardCopies = new CodexClipboardCopies();
     const watcher = new CodexTranscriptWatcher(elwoodSessionId, (event) => duringDelivery(() => {
+        clipboardCopies.observe(event.item);
         deliver("codex:transcript", event);
         deliver("activity", activity.activityFromCodexTranscript(event));
     }), {
@@ -88,7 +92,14 @@ export function createCodexTranscriptWatcher(elwoodSessionId, emitter, getSink)
             catch { } // a diagnostic-listener bug must not block lifecycle completion
         }
         finally {
-            afterFlush();
+            // The CLI has exited and the flush has read its last records: remove the image
+            // copies they named, and report one that stays, before finishing the exit (C-API-46).
+            clipboardCopies.removeAll((failure) => {
+                // `route` contains a throwing listener, so the exit always finishes.
+                if (failure !== undefined)
+                    route(imageCopyRemovalFailedWarning(elwoodSessionId, failure));
+                afterFlush();
+            });
         }
     };
     return { watcher, duringDelivery, flushPendingWarnings, finishSafely };

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

@@ -1 +1 @@
-{"version":3,"file":"transcript.js","sourceRoot":"","sources":["../../../src/codex/session/transcript.ts"],"names":[],"mappings":"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"}
+{"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,EAAE,oBAAoB,EAAE,MAAM,+BAA+B,CAAC;AACrE,OAAO,EACL,sBAAsB,EACtB,gBAAgB,EAChB,uBAAuB,EACvB,qBAAqB,GACtB,MAAM,wBAAwB,CAAC;AAEhC,OAAO,EAAE,6BAA6B,EAAE,MAAM,eAAe,CAAC;AAa9D;;;;;GAKG;AACH,MAAM,UAAU,4BAA4B,CAC1C,eAAuB,EACvB,OAAoC,EACpC,OAAgD;IAEhD,qFAAqF;IACrF,oFAAoF;IACpF,oDAAoD;IACpD,MAAM,QAAQ,GAAG,6BAA6B,CAAC,OAAO,CAAC,CAAC;IACxD,IAAI,aAAa,GAAG,CAAC,CAAC;IACtB,SAAS,cAAc,CAAC,IAAgB;QACtC,aAAa,IAAI,CAAC,CAAC;QACnB,IAAI,CAAC;YACH,IAAI,EAAE,CAAC;QACT,CAAC;gBAAS,CAAC;YACT,aAAa,IAAI,CAAC,CAAC;QACrB,CAAC;IACH,CAAC;IACD,MAAM,KAAK,GAAG,CAAC,OAA6C,EAAE,EAAE,CAC9D,cAAc,CAAC,GAAG,EAAE,CAAC,QAAQ,CAAC,KAAK,CAAC,OAAO,CAAC,CAAC,CAAC;IAChD,MAAM,oBAAoB,GAAG,GAAG,EAAE,CAAC,cAAc,CAAC,QAAQ,CAAC,oBAAoB,CAAC,CAAC;IACjF,MAAM,QAAQ,GAAG,IAAI,GAAG,EAAmC,CAAC;IAC5D,iFAAiF;IACjF,iFAAiF;IACjF,SAAS,OAAO,CAA4C,OAAU,EAAE,KAAuB;QAC7F,IAAI,CAAC;YACH,OAAO,CAAC,IAAI,CAAC,OAAO,EAAE,KAAK,CAAC,CAAC;QAC/B,CAAC;QAAC,MAAM,CAAC;YACP,IAAI,QAAQ,CAAC,GAAG,CAAC,OAAO,CAAC;gBAAE,OAAO;YAClC,QAAQ,CAAC,GAAG,CAAC,OAAO,CAAC,CAAC;YACtB,0EAA0E;YAC1E,8EAA8E;YAC9E,cAAc,CAAC,GAAG,EAAE,CAClB,KAAK,CAAC;gBACJ,eAAe;gBACf,KAAK,EAAE,OAAO;gBACd,MAAM,EAAE,UAAU;gBAClB,IAAI,EAAE,2BAA2B;gBACjC,QAAQ,EAAE,SAAS;gBACnB,OAAO,EAAE,4EAA4E;gBACrF,OAAO;gBACP,GAAG,EAAE,qCAAqC,OAAO,EAAE;aACpD,CAAC,CACH,CAAC;QACJ,CAAC;IACH,CAAC;IACD,MAAM,eAAe,GAAG,IAAI,oBAAoB,EAAE,CAAC;IACnD,MAAM,OAAO,GAAG,IAAI,sBAAsB,CACxC,eAAe,EACf,CAAC,KAAK,EAAE,EAAE,CACR,cAAc,CAAC,GAAG,EAAE;QAClB,eAAe,CAAC,OAAO,CAAC,KAAK,CAAC,IAAI,CAAC,CAAC;QACpC,OAAO,CAAC,kBAAkB,EAAE,KAAK,CAAC,CAAC;QACnC,OAAO,CAAC,UAAU,EAAE,QAAQ,CAAC,2BAA2B,CAAC,KAAK,CAAC,CAAC,CAAC;IACnE,CAAC,CAAC,EACJ;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,6EAA6E;IAC7E,gFAAgF;IAChF,uFAAuF;IACvF,2FAA2F;IAC3F,MAAM,YAAY,GAAG,CAAC,aAAyB,GAAG,EAAE,CAAC,SAAS,EAAE,EAAE;QAChE,IAAI,aAAa,GAAG,CAAC,EAAE,CAAC;YACtB,0EAA0E;YAC1E,0EAA0E;YAC1E,cAAc,CAAC,GAAG,EAAE,CAAC,YAAY,CAAC,UAAU,CAAC,CAAC,CAAC;YAC/C,OAAO;QACT,CAAC;QACD,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,+EAA+E;YAC/E,sFAAsF;YACtF,eAAe,CAAC,SAAS,CAAC,CAAC,OAAO,EAAE,EAAE;gBACpC,qEAAqE;gBACrE,IAAI,OAAO,KAAK,SAAS;oBAAE,KAAK,CAAC,6BAA6B,CAAC,eAAe,EAAE,OAAO,CAAC,CAAC,CAAC;gBAC1F,UAAU,EAAE,CAAC;YACf,CAAC,CAAC,CAAC;QACL,CAAC;IACH,CAAC,CAAC;IACF,OAAO,EAAE,OAAO,EAAE,cAAc,EAAE,oBAAoB,EAAE,YAAY,EAAE,CAAC;AACzE,CAAC"}

package/dist/codex/session/turn-commit.d.ts

@@ -0,0 +1,58 @@
+/**
+ * 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 type { ElwoodWarningEvent } from "../../core/types.ts";
+import type { PtyExitLatch } from "../../pty/exit-latch.ts";
+/** The longest `stop`/`teardown` wait for the record before signaling anyway. */
+export declare const turnCommitWaitMs = 2000;
+/** The session a wait the bound ended is reported to, as `turn_commit_wait_expired`. */
+type ExpiryReport = {
+    readonly elwoodSessionId: string;
+    emitWarnings(warnings: readonly ElwoodWarningEvent[]): void;
+};
+export declare class CodexTurnCommit {
+    private pending;
+    private readonly poll;
+    private readonly cliExit;
+    private readonly 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: () => void, cliExit: Pick<PtyExitLatch, "within">, session: ExpiryReport);
+    /**
+     * 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: string): void;
+    /** Ends the wait for `turnId`: its end was recorded, or its `Stop` was blocked. */
+    release(turnId: string): void;
+    /**
+     * 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: unknown): void;
+    /**
+     * 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: () => Promise<void>): Promise<void>;
+    private waitFor;
+    /** A throwing listener of the warning must not keep Codex running. */
+    private reportExpired;
+}
+export {};
+//# sourceMappingURL=turn-commit.d.ts.map

package/dist/codex/session/turn-commit.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"turn-commit.d.ts","sourceRoot":"","sources":["../../../src/codex/session/turn-commit.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;GAUG;AAGH,OAAO,KAAK,EAAE,kBAAkB,EAAE,MAAM,qBAAqB,CAAC;AAC9D,OAAO,KAAK,EAAE,YAAY,EAAE,MAAM,yBAAyB,CAAC;AAK5D,iFAAiF;AACjF,eAAO,MAAM,gBAAgB,OAAQ,CAAC;AAatC,wFAAwF;AACxF,KAAK,YAAY,GAAG;IAClB,QAAQ,CAAC,eAAe,EAAE,MAAM,CAAC;IACjC,YAAY,CAAC,QAAQ,EAAE,SAAS,kBAAkB,EAAE,GAAG,IAAI,CAAC;CAC7D,CAAC;AAEF,qBAAa,eAAe;IAC1B,OAAO,CAAC,OAAO,CAA4B;IAC3C,OAAO,CAAC,QAAQ,CAAC,IAAI,CAAa;IAClC,OAAO,CAAC,QAAQ,CAAC,OAAO,CAA+B;IACvD,OAAO,CAAC,QAAQ,CAAC,OAAO,CAAe;IAEvC;;;;OAIG;gBACS,IAAI,EAAE,MAAM,IAAI,EAAE,OAAO,EAAE,IAAI,CAAC,YAAY,EAAE,QAAQ,CAAC,EAAE,OAAO,EAAE,YAAY;IAM1F;;;OAGG;IACH,MAAM,CAAC,MAAM,EAAE,MAAM,GAAG,IAAI;IAK5B,mFAAmF;IACnF,OAAO,CAAC,MAAM,EAAE,MAAM,GAAG,IAAI;IAO7B;;;;OAIG;IACH,OAAO,CAAC,IAAI,EAAE,OAAO,GAAG,IAAI;IAM5B;;;;;;OAMG;IACH,cAAc,CAAC,QAAQ,EAAE,MAAM,OAAO,CAAC,IAAI,CAAC,GAAG,OAAO,CAAC,IAAI,CAAC;IAO5D,OAAO,CAAC,OAAO;IAWf,sEAAsE;IACtE,OAAO,CAAC,aAAa;CAMtB"}

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"}