@with-logic/elwood 0.1.3 → 0.2.0

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

@@ -1,4 +1,5 @@
 /** CodexSessionApi entry points: preflight, record creation, and socket-home-guarded start. Implements PRD §5.5, §5.6, §5.7, §7A, §8, §9. */
+import type { LaunchReservation } from "../../state/launch-ownership.ts";
 import { type SessionRecord } from "../../state/store.ts";
 import * as preflight from "../preflight.ts";
 import type { CodexSessionApi, StartCodexOptions } from "./types.ts";
@@ -12,5 +13,5 @@ export { resetCodexSessionSeamsForTests, setCodexHookBridgeFactoryForTests, } fr
 export declare function startCodex(rawOptions: StartCodexOptions): Promise<CodexSessionApi>;
 /** Internal deterministic-identity start used by owners that must clean failed launch state. */
 export declare function startCodexWithId(rawOptions: StartCodexOptions, elwoodSessionId: string): Promise<CodexSessionApi>;
-export declare function startCodexFromRecord(record: SessionRecord, stateDir: string, options: StartCodexOptions, resumed: boolean, preflightWarning: preflight.CodexPreflightWarning | undefined): Promise<import("./instance.ts").CodexSessionImpl>;
+export declare function startCodexFromRecord(record: SessionRecord, stateDir: string, options: StartCodexOptions, resumed: boolean, preflightWarning: preflight.CodexPreflightWarning | undefined, ownership?: LaunchReservation): Promise<import("./instance.ts").CodexSessionImpl>;
 //# sourceMappingURL=index.d.ts.map

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

@@ -1 +1 @@
-{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../src/codex/session/index.ts"],"names":[],"mappings":"AAAA,6IAA6I;AAW7I,OAAO,EAIL,KAAK,aAAa,EACnB,MAAM,sBAAsB,CAAC;AAC9B,OAAO,KAAK,SAAS,MAAM,iBAAiB,CAAC;AAE7C,OAAO,KAAK,EAAE,eAAe,EAAE,iBAAiB,EAAE,MAAM,YAAY,CAAC;AAErE,OAAO,EACL,8BAA8B,EAC9B,iCAAiC,GAClC,MAAM,aAAa,CAAC;AAErB;;;;;GAKG;AACH,wBAAgB,UAAU,CAAC,UAAU,EAAE,iBAAiB,GAAG,OAAO,CAAC,eAAe,CAAC,CAElF;AAED,gGAAgG;AAChG,wBAAsB,gBAAgB,CACpC,UAAU,EAAE,iBAAiB,EAC7B,eAAe,EAAE,MAAM,GACtB,OAAO,CAAC,eAAe,CAAC,CAuB1B;AAED,wBAAgB,oBAAoB,CAClC,MAAM,EAAE,aAAa,EACrB,QAAQ,EAAE,MAAM,EAChB,OAAO,EAAE,iBAAiB,EAC1B,OAAO,EAAE,OAAO,EAChB,gBAAgB,EAAE,SAAS,CAAC,qBAAqB,GAAG,SAAS,qDAyB9D"}
+{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../src/codex/session/index.ts"],"names":[],"mappings":"AAAA,6IAA6I;AAW7I,OAAO,KAAK,EAAE,iBAAiB,EAAE,MAAM,iCAAiC,CAAC;AAKzE,OAAO,EAIL,KAAK,aAAa,EACnB,MAAM,sBAAsB,CAAC;AAC9B,OAAO,KAAK,SAAS,MAAM,iBAAiB,CAAC;AAE7C,OAAO,KAAK,EAAE,eAAe,EAAE,iBAAiB,EAAE,MAAM,YAAY,CAAC;AAErE,OAAO,EACL,8BAA8B,EAC9B,iCAAiC,GAClC,MAAM,aAAa,CAAC;AAErB;;;;;GAKG;AACH,wBAAgB,UAAU,CAAC,UAAU,EAAE,iBAAiB,GAAG,OAAO,CAAC,eAAe,CAAC,CAElF;AAED,gGAAgG;AAChG,wBAAsB,gBAAgB,CACpC,UAAU,EAAE,iBAAiB,EAC7B,eAAe,EAAE,MAAM,GACtB,OAAO,CAAC,eAAe,CAAC,CAwB1B;AAED,wBAAgB,oBAAoB,CAClC,MAAM,EAAE,aAAa,EACrB,QAAQ,EAAE,MAAM,EAChB,OAAO,EAAE,iBAAiB,EAC1B,OAAO,EAAE,OAAO,EAChB,gBAAgB,EAAE,SAAS,CAAC,qBAAqB,GAAG,SAAS,EAC7D,SAAS,CAAC,EAAE,iBAAiB,qDA2C9B"}

package/dist/codex/session/index.js

@@ -1,13 +1,17 @@
 /** CodexSessionApi entry points: preflight, record creation, and socket-home-guarded start. Implements PRD §5.5, §5.6, §5.7, §7A, §8, §9. */
 import { randomUUID } from "node:crypto";
 import { resolve } from "node:path";
+import { checkedInputBytes } from "../../core/control-queue/budget.js";
 import { applyCodexHighTrust } from "../../core/high-trust.js";
 import { queuePersonaMessage } from "../../core/persona.js";
 import { codexReasoningEfforts, validateReasoningEffort } from "../../core/reasoning-effort.js";
 import { withSocketHomeCleanup } from "../../runtime/startup/cleanup.js";
+import { canonicalStatePath } from "../../state/canonical-path.js";
+import { safeSessionDir } from "../../state/files.js";
 import { codexLaunchPosture, withCodexLaunch } from "../../state/launch-posture.js";
 import { sessionRuntime } from "../../state/runtime-paths.js";
 import { removeOwnSocketFile } from "../../state/socket-home.js";
+import { withLaunchOwnership } from "../../state/startup-ownership.js";
 import { createSessionRecord, defaultStateDir, prepareStateDir, } from "../../state/store.js";
 import * as preflight from "../preflight.js";
 import { buildCodexSession } from "./build.js";
@@ -31,7 +35,8 @@ export async function startCodexWithId(rawOptions, elwoodSessionId) {
     // conflicting explicit one) HERE, before preflight, so the persisted record and the
     // launch command both carry the expanded posture (C-API-54).
     const options = applyCodexHighTrust({ ...rawOptions, cwd: resolve(rawOptions.cwd) });
-    const stateDir = resolve(options.stateDir ?? defaultStateDir(options.cwd));
+    checkedInputBytes(options.persona ?? "");
+    const stateDir = canonicalStatePath(options.stateDir ?? defaultStateDir(options.cwd));
     const warning = await preflight.preflightCodex(options.strictVersionCheck ?? false, options.autoupdate ?? false);
     prepareStateDir(stateDir, { gitignore: options.stateDir === undefined });
     const createdRecord = createSessionRecord({
@@ -41,9 +46,9 @@ export async function startCodexWithId(rawOptions, elwoodSessionId) {
     });
     const record = withCodexLaunch(createdRecord, codexLaunchPosture(options));
     const session = await startCodexFromRecord(record, stateDir, options, false, warning);
-    return queuePersonaMessage(session, options.persona);
+    return queuePersonaMessage(session, options.persona, session.closing.signal);
 }
-export function startCodexFromRecord(record, stateDir, options, resumed, preflightWarning) {
+export function startCodexFromRecord(record, stateDir, options, resumed, preflightWarning, ownership) {
     // Validate the effort enum before any spawn (C-CODEX-21): both start and resume funnel
     // through here. Codex validates server-side (a bad value fails at the first turn), so
     // this turns a deferred provider error into a fast, clear start-time rejection.
@@ -54,11 +59,21 @@ export function startCodexFromRecord(record, stateDir, options, resumed, preflig
     // before the session takes ownership removes THIS launch's own socket file — never the
     // shared home, which a concurrent launch may own (§9.1). On success ownership transfers
     // to the returned session, whose teardown removes the whole home via removeSessionFiles.
-    const runtime = sessionRuntime({
-        stateDir,
-        elwoodSessionId: record.elwoodSessionId,
-        adapter: "codex",
+    return withLaunchOwnership(safeSessionDir(stateDir, record.elwoodSessionId), ownership, (owner, activate) => {
+        const runtime = sessionRuntime({
+            stateDir,
+            elwoodSessionId: record.elwoodSessionId,
+            adapter: "codex",
+        }, owner);
+        return withSocketHomeCleanup(() => removeOwnSocketFile(runtime.socketPath), () => buildCodexSession({
+            record,
+            stateDir,
+            runtime,
+            options,
+            resumed,
+            preflightWarning,
+            activate,
+        }));
     });
-    return withSocketHomeCleanup(() => removeOwnSocketFile(runtime.socketPath), () => buildCodexSession({ record, stateDir, runtime, options, resumed, preflightWarning }));
 }
 //# sourceMappingURL=index.js.map

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

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

package/dist/codex/session/initial-ready.d.ts

@@ -0,0 +1,6 @@
+/** Contains Codex initial-ready Promise observers without hiding synchronous fallback (C-API-42). */
+import { type HookObservation } from "../../core/hook-observation.ts";
+import type { TypedEmitter } from "../../events/emitter.ts";
+import type { CodexEventMap } from "./types.ts";
+export declare function observeCodexInitialReady(emitter: TypedEmitter<CodexEventMap>, elwoodSessionId: string, advance: () => void, hookObservation?: HookObservation): void;
+//# sourceMappingURL=initial-ready.d.ts.map

package/dist/codex/session/initial-ready.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"initial-ready.d.ts","sourceRoot":"","sources":["../../../src/codex/session/initial-ready.ts"],"names":[],"mappings":"AAAA,qGAAqG;AACrG,OAAO,EACL,KAAK,eAAe,EAErB,MAAM,gCAAgC,CAAC;AACxC,OAAO,KAAK,EAAE,YAAY,EAAE,MAAM,yBAAyB,CAAC;AAC5D,OAAO,KAAK,EAAE,aAAa,EAAE,MAAM,YAAY,CAAC;AAEhD,wBAAgB,wBAAwB,CACtC,OAAO,EAAE,YAAY,CAAC,aAAa,CAAC,EACpC,eAAe,EAAE,MAAM,EACvB,OAAO,EAAE,MAAM,IAAI,EACnB,eAAe,CAAC,EAAE,eAAe,GAChC,IAAI,CAIN"}

package/dist/codex/session/initial-ready.js

@@ -0,0 +1,9 @@
+/** Contains Codex initial-ready Promise observers without hiding synchronous fallback (C-API-42). */
+import { initialReadyObservationBoundary, } from "../../core/hook-observation.js";
+export function observeCodexInitialReady(emitter, elwoodSessionId, advance, hookObservation) {
+    const observation = hookObservation ?? initialReadyObservationBoundary(emitter, elwoodSessionId);
+    observation.runRejections("lifecycle", advance);
+    if (!hookObservation)
+        observation.report();
+}
+//# sourceMappingURL=initial-ready.js.map

package/dist/codex/session/initial-ready.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"initial-ready.js","sourceRoot":"","sources":["../../../src/codex/session/initial-ready.ts"],"names":[],"mappings":"AAAA,qGAAqG;AACrG,OAAO,EAEL,+BAA+B,GAChC,MAAM,gCAAgC,CAAC;AAIxC,MAAM,UAAU,wBAAwB,CACtC,OAAoC,EACpC,eAAuB,EACvB,OAAmB,EACnB,eAAiC;IAEjC,MAAM,WAAW,GAAG,eAAe,IAAI,+BAA+B,CAAC,OAAO,EAAE,eAAe,CAAC,CAAC;IACjG,WAAW,CAAC,aAAa,CAAC,WAAW,EAAE,OAAO,CAAC,CAAC;IAChD,IAAI,CAAC,eAAe;QAAE,WAAW,CAAC,MAAM,EAAE,CAAC;AAC7C,CAAC"}

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

@@ -3,6 +3,7 @@
  * Implements PRD §5.7, §7A, §8, and §9.
  */
 import type { ElwoodActivityEvent } from "../../core/activity/index.ts";
+import type { HookObservation } from "../../core/hook-observation.ts";
 import type { TerminalReplayBuffer } from "../../core/terminal-replay.ts";
 import type { ElwoodSessionStatus, ElwoodWarningEvent } from "../../core/types.ts";
 import type { TypedEmitter } from "../../events/emitter.ts";
@@ -16,22 +17,36 @@ import type { CodexTranscriptWatcher } from "../transcript/index.ts";
 import type { CodexHookBridge } from "./bridge.ts";
 import type { CodexEventHandler, CodexEventMap, CodexEventName, CodexSessionApi } from "./types.ts";
 export declare class CodexSessionImpl extends AgentSessionBase implements CodexSessionApi {
-    protected readonly picker: import("../../core/models/picker.ts").ModelPickerSpec;
+    protected readonly picker: {
+        isClear: import("../../core/trust/clearance.ts").TrustClearance;
+        agent: string;
+        isCandidate: (text: string) => boolean;
+        isOpen: (text: string) => boolean;
+        activeDialog: (text: string, authority: import("../../core/models/rows.ts").ModelDialogAuthority) => import("../../core/models/rows.ts").ModelDialogStage | undefined;
+        parse: (text: string) => import("../../core/models/rows.ts").ParsedModelPicker;
+        apply: (io: import("../../core/models/picker.ts").ModelPickerIo, timeoutMs: number) => Promise<void>;
+    };
     private readonly bridge;
     private readonly emitter;
     private readonly transcriptWatcher;
     private onInitialReady;
+    private hookReadyObservation;
+    private readonly cliExit;
     constructor(record: SessionRecord, stateDir: string, runtime: SessionRuntime, pty: PtyProcess, terminal: ElwoodTerminal, bridge: CodexHookBridge, emitter: TypedEmitter<CodexEventMap>, terminalReplay: TerminalReplayBuffer, transcriptWatcher: CodexTranscriptWatcher | undefined, loopDefinitions: readonly PersistedLoopDefinition[]);
     on<E extends CodexEventName>(event: E, handler: CodexEventHandler<E>): import("../../index.ts").Unsubscribe;
     setModel(id: string, options?: {
         readonly timeoutMs?: number;
     }): Promise<void>;
+    private waitForCliExit;
     private restoreCodexDefault;
     off<E extends CodexEventName>(event: E, handler: CodexEventHandler<E>): void;
     completeInitialReady(): void;
-    waitForStatus(match: (status: ElwoodSessionStatus) => boolean, timeoutMs?: number): Promise<"starting" | "running" | "ready" | "blocked" | "exited" | "stopped" | "killed" | "torn_down">;
+    waitForStatus(match: (status: ElwoodSessionStatus) => boolean, timeoutMs?: number): Promise<"running" | "ready" | "blocked" | "exited" | "stopped" | "killed" | "torn_down" | "starting">;
     waitForActivity(match: (event: ElwoodActivityEvent) => boolean, timeoutMs?: number): Promise<ElwoodActivityEvent>;
-    protected stagedPaste(screen: string, prompt: string): boolean;
+    protected readonly recoveryComposer: {
+        prepareStaged: (payload: string) => () => boolean;
+        emptyFrame: () => import("../../index.ts").TerminalSnapshot | undefined;
+    };
     protected attachImages: (paths: readonly string[], signal: AbortSignal) => Promise<void>;
     rememberCodexSessionId(sessionId: string): void;
     /** Registers the readiness trigger fired by the `SessionStart` hook — Codex's
@@ -40,7 +55,7 @@ export declare class CodexSessionImpl extends AgentSessionBase implements CodexS
     /** Fires initial readiness from the `SessionStart` hook so the first queued
      * message is released only once Codex is actually accepting input, not on the
      * boot-time composer placeholder that would swallow it (C-API-28). */
-    markInitialReadyFromHook(): void;
+    markInitialReadyFromHook(observation: HookObservation): void;
     observeTranscript(path?: string | null): void;
     /** One bounded per-pass scan of the committed transcript (an unblocked `Stop`, §7A.3). */
     scanTranscript(): void;

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

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

package/dist/codex/session/instance.js

@@ -2,27 +2,43 @@
  * 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 { 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 { 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 { stopCodexRuntime } from "./cleanup.js";
+import { CliExitBarrier } from "./cli-exit.js";
+import { observeCodexInitialReady } from "./initial-ready.js";
 import { clipboardRestoreFailedWarning, codexRestoreFailedWarning, codexRestoreSkippedWarning, } from "./warnings.js";
 export class CodexSessionImpl extends AgentSessionBase {
-    picker = codexModelPicker;
+    picker = {
+        ...codexModelPicker,
+        isClear: liveCodexClearance(() => this.terminal),
+    };
     bridge;
     emitter;
     transcriptWatcher;
     onInitialReady;
+    hookReadyObservation;
+    cliExit;
     constructor(record, stateDir, runtime, pty, terminal, bridge, emitter, terminalReplay, transcriptWatcher, loopDefinitions) {
         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);
     }
     on(event, handler) {
         // REGISTER before replaying buffered `terminal:data` (mirrors Claude): a throwing replay
@@ -31,26 +47,38 @@ export class CodexSessionImpl extends AgentSessionBase {
         this.replayFor(event, handler);
         return unsubscribe;
     }
-    // The Codex CLI persists picker selections into user config.toml; restore
-    // the user's prior default after the switch (C-CODEX-14). The live session
-    // keeps the switched model because Codex reads its config at launch.
-    //
-    // The whole transaction runs under a PROCESS-WIDE config lock (see
-    // config/transaction.ts) so two sessions switching at once cannot interleave
-    // snapshot/restore on the shared file and persist the wrong model, and the
-    // restore still fires when the picker automation rejects AFTER Codex wrote
-    // config.toml — otherwise a late `waitForScreen` timeout would leave the
-    // user's global default changed (C-CODEX-14).
+    // 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) {
-        return runCodexModelSwitch({
+        // 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: () => super.setModel(id, options),
-            restore: (snapshot) => this.restoreCodexDefault(snapshot),
+            apply: flow,
+            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)]),
-        });
-    }
-    restoreCodexDefault(snapshot) {
-        const outcome = restoreCodexConfig(snapshot);
+        }));
+    }
+    // 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.
+    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)]);
@@ -58,11 +86,9 @@ export class CodexSessionImpl extends AgentSessionBase {
     off(event, handler) {
         this.emitter.off(event, handler);
     }
-    // One-shot initial-ready transition via the shared anti-starvation boundary: a
-    // failed persist/listener releases the queue directly and warns (C-API-42). Codex
-    // has no narrow-bootstrap resize to restore, so this is just the base advance.
+    // C-API-42 releases the queue and warns if initial-ready recording throws.
     completeInitialReady() {
-        this.advanceInitialReady();
+        observeCodexInitialReady(this.emitter, this.elwoodSessionId, () => this.advanceInitialReady(), this.hookReadyObservation);
     }
     waitForStatus(match, timeoutMs) {
         return sessionWaitForStatus(this, match, timeoutMs);
@@ -71,13 +97,10 @@ export class CodexSessionImpl extends AgentSessionBase {
         return sessionWaitForActivity(this, match, timeoutMs);
     }
     // Codex has no staged chip; the composer still shows the paste's last line.
-    stagedPaste(screen, prompt) {
-        const lastLine = prompt.trim().split("\n").at(-1)?.trim();
-        return lastLine !== undefined && lastLine.length > 0 && screen.includes(lastLine);
-    }
+    recoveryComposer = createCodexRecoveryComposer(this.terminal);
     // Codex ingests an interactive image only from the OS clipboard; the Ctrl+V is
     // held while a dialog is on screen so it never confirms one (C-API-46/37).
-    attachImages = (paths, signal) => attachCodexImages(this.terminal, paths, signal, () => this.status === "blocked", () => this.emitWarnings([clipboardRestoreFailedWarning(this.elwoodSessionId)]));
+    attachImages = (paths, signal) => attachCodexImages(this.automatedTerminal, paths, signal, () => this.queuedInputBlocked(), () => this.emitWarnings([clipboardRestoreFailedWarning(this.elwoodSessionId)]));
     rememberCodexSessionId(sessionId) {
         if (this.record.codex.resumeId)
             return;
@@ -91,8 +114,15 @@ export class CodexSessionImpl extends AgentSessionBase {
     /** Fires initial readiness from the `SessionStart` hook so the first queued
      * message is released only once Codex is actually accepting input, not on the
      * boot-time composer placeholder that would swallow it (C-API-28). */
-    markInitialReadyFromHook() {
-        this.onInitialReady?.();
+    markInitialReadyFromHook(observation) {
+        const previous = this.hookReadyObservation;
+        this.hookReadyObservation = observation;
+        try {
+            this.onInitialReady?.();
+        }
+        finally {
+            this.hookReadyObservation = previous;
+        }
     }
     observeTranscript(path) {
         if (path)
@@ -111,7 +141,7 @@ export class CodexSessionImpl extends AgentSessionBase {
         });
     }
     async stopRuntime() {
-        await stopCodexRuntime(this.bridge, this.transcriptWatcher, this.terminal);
+        await stopCodexRuntime(this.bridge, this.transcriptWatcher, this.terminal, this.pty);
     }
 }
 //# sourceMappingURL=instance.js.map

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

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

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;AAaH,OAAO,KAAK,EAAE,eAAe,EAAE,kBAAkB,EAAE,MAAM,YAAY,CAAC;AAEtE,wBAAsB,WAAW,CAAC,UAAU,EAAE,kBAAkB,GAAG,OAAO,CAAC,eAAe,CAAC,CA2C1F"}
+{"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"}

package/dist/codex/session/resume.js

@@ -2,11 +2,12 @@
  * Codex session resume entry point built on the shared start path.
  * Implements PRD §5.6, §9.3, and C-API-16.
  */
-import { resolve } from "node:path";
 import { elwoodError } from "../../core/errors.js";
 import { applyCodexHighTrust } from "../../core/high-trust.js";
+import { canonicalStatePath } from "../../state/canonical-path.js";
+import { reserveLaunchOwnership } from "../../state/launch-ownership.js";
 import { codexLaunchPosture, effectivePosture, withCodexLaunch, } from "../../state/launch-posture.js";
-import { defaultStateDir, readSessionRecord } from "../../state/store.js";
+import { defaultStateDir, readSessionRecord, sessionDir } from "../../state/store.js";
 import * as preflight from "../preflight.js";
 import { startCodexFromRecord } from "./index.js";
 export async function resumeCodex(rawOptions) {
@@ -15,34 +16,42 @@ export async function resumeCodex(rawOptions) {
     const options = applyCodexHighTrust(rawOptions);
     // Resolve stateDir to ABSOLUTE ONCE, before any read/await, so a `process.chdir()`
     // between the record read and the runtime-file writes can't split them (§8.1).
-    const stateDir = resolve(options.stateDir ?? defaultStateDir(options.cwd ?? process.cwd()));
+    const stateDir = canonicalStatePath(options.stateDir ?? defaultStateDir(options.cwd ?? process.cwd()));
     const record = readSessionRecord(stateDir, options.elwoodSessionId);
     if (record.adapter !== "codex")
         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.");
-    const warning = await preflight.preflightCodex(options.strictVersionCheck ?? false, options.autoupdate ?? false);
-    // 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);
-    return await startCodexFromRecord(resumedRecord, stateDir, {
-        cwd: options.cwd ?? record.cwd,
-        stateDir,
-        ...(options.hooks === undefined ? {} : { hooks: options.hooks }),
-        ...(options.initialSize === undefined ? {} : { initialSize: options.initialSize }),
-        ...(options.hookTimeoutMs === undefined ? {} : { hookTimeoutMs: options.hookTimeoutMs }),
-        ...(options.autotrust === undefined ? {} : { autotrust: options.autotrust }),
-        // Reasoning effort is NOT persisted posture — re-supply it per resume (C-CODEX-21).
-        ...(options.reasoningEffort === undefined
-            ? {}
-            : { reasoningEffort: options.reasoningEffort }),
-        ...launch,
-        ...(options.strictVersionCheck === undefined
-            ? {}
-            : { strictVersionCheck: options.strictVersionCheck }),
-    }, true, // resumed: mark ready on the first composer marker, not the 10s deadline
-    warning);
+    const ownership = reserveLaunchOwnership(sessionDir(stateDir, record.elwoodSessionId));
+    try {
+        const warning = await preflight.preflightCodex(options.strictVersionCheck ?? false, options.autoupdate ?? false);
+        // 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,
+            stateDir,
+            ...(options.hooks === undefined ? {} : { hooks: options.hooks }),
+            ...(options.initialSize === undefined ? {} : { initialSize: options.initialSize }),
+            ...(options.hookTimeoutMs === undefined ? {} : { hookTimeoutMs: options.hookTimeoutMs }),
+            ...(options.autotrust === undefined ? {} : { autotrust: options.autotrust }),
+            // Reasoning effort is NOT persisted posture — re-supply it per resume (C-CODEX-21).
+            ...(options.reasoningEffort === undefined
+                ? {}
+                : { reasoningEffort: options.reasoningEffort }),
+            ...launch,
+            ...(options.strictVersionCheck === undefined
+                ? {}
+                : { strictVersionCheck: options.strictVersionCheck }),
+        }, true, // resumed: mark ready on the first composer marker, not the 10s deadline
+        warning, ownership);
+        return session;
+    }
+    catch (error) {
+        ownership.rollback();
+        throw error;
+    }
 }
 //# sourceMappingURL=resume.js.map

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/runtime.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"runtime.d.ts","sourceRoot":"","sources":["../../../src/codex/session/runtime.ts"],"names":[],"mappings":"AAAA;;;GAGG;AAIH,OAAO,KAAK,EAAE,cAAc,EAAE,MAAM,8BAA8B,CAAC;AAEnE,wBAAgB,sBAAsB,CAAC,OAAO,EAAE,cAAc,GAAG,IAAI,CAKpE"}
+{"version":3,"file":"runtime.d.ts","sourceRoot":"","sources":["../../../src/codex/session/runtime.ts"],"names":[],"mappings":"AAAA;;;GAGG;AAGH,OAAO,KAAK,EAAE,cAAc,EAAE,MAAM,8BAA8B,CAAC;AAEnE,wBAAgB,sBAAsB,CAAC,OAAO,EAAE,cAAc,GAAG,IAAI,CAKpE"}

package/dist/codex/session/runtime.js

@@ -3,8 +3,7 @@
  * Implements PRD §7A and §8.2.
  */
 import { bridgeScriptSource } from "../../bridge/script.js";
-import { writePrivateFileAtomic } from "../../state/files.js";
 export function writeCodexRuntimeFiles(runtime) {
-    writePrivateFileAtomic(runtime.bridgeScriptPath, bridgeScriptSource(runtime.socketPath, runtime.bridgeToken));
+    runtime.stateOwnership.publishFile(runtime.bridgeScriptPath, bridgeScriptSource(runtime.socketPath, runtime.bridgeToken));
 }
 //# sourceMappingURL=runtime.js.map

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

@@ -1 +1 @@
-{"version":3,"file":"runtime.js","sourceRoot":"","sources":["../../../src/codex/session/runtime.ts"],"names":[],"mappings":"AAAA;;;GAGG;AAEH,OAAO,EAAE,kBAAkB,EAAE,MAAM,wBAAwB,CAAC;AAC5D,OAAO,EAAE,sBAAsB,EAAE,MAAM,sBAAsB,CAAC;AAG9D,MAAM,UAAU,sBAAsB,CAAC,OAAuB;IAC5D,sBAAsB,CACpB,OAAO,CAAC,gBAAgB,EACxB,kBAAkB,CAAC,OAAO,CAAC,UAAU,EAAE,OAAO,CAAC,WAAW,CAAC,CAC5D,CAAC;AACJ,CAAC"}
+{"version":3,"file":"runtime.js","sourceRoot":"","sources":["../../../src/codex/session/runtime.ts"],"names":[],"mappings":"AAAA;;;GAGG;AAEH,OAAO,EAAE,kBAAkB,EAAE,MAAM,wBAAwB,CAAC;AAG5D,MAAM,UAAU,sBAAsB,CAAC,OAAuB;IAC5D,OAAO,CAAC,cAAc,CAAC,WAAW,CAChC,OAAO,CAAC,gBAAgB,EACxB,kBAAkB,CAAC,OAAO,CAAC,UAAU,EAAE,OAAO,CAAC,WAAW,CAAC,CAC5D,CAAC;AACJ,CAAC"}

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

@@ -0,0 +1,11 @@
+/** Deliver startup diagnostics with update retry lifetime checks (PRD §5.7, C-CODEX-12). */
+import type { FrameWarningSink } from "../../core/startup/frame.ts";
+import { createSessionStartupWarningGate } from "../../core/startup/warnings.ts";
+import type { CodexPreflightWarning } from "../preflight.ts";
+export declare function createCodexStartupWarningGate(session: () => FrameWarningSink | undefined, closing: () => boolean, duringDelivery: (deliver: () => void) => void): ReturnType<typeof createSessionStartupWarningGate>;
+type WithSessionId<W> = W extends unknown ? W & {
+    readonly elwoodSessionId: string;
+} : never;
+export declare function preflightEvent(elwoodSessionId: string, warning: CodexPreflightWarning): WithSessionId<CodexPreflightWarning>;
+export {};
+//# sourceMappingURL=startup-warnings.d.ts.map

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

@@ -0,0 +1 @@
+{"version":3,"file":"startup-warnings.d.ts","sourceRoot":"","sources":["../../../src/codex/session/startup-warnings.ts"],"names":[],"mappings":"AAAA,4FAA4F;AAE5F,OAAO,KAAK,EAAE,gBAAgB,EAAE,MAAM,6BAA6B,CAAC;AACpE,OAAO,EAAE,+BAA+B,EAAE,MAAM,gCAAgC,CAAC;AACjF,OAAO,KAAK,EAAE,qBAAqB,EAAE,MAAM,iBAAiB,CAAC;AAE7D,wBAAgB,6BAA6B,CAC3C,OAAO,EAAE,MAAM,gBAAgB,GAAG,SAAS,EAC3C,OAAO,EAAE,MAAM,OAAO,EACtB,cAAc,EAAE,CAAC,OAAO,EAAE,MAAM,IAAI,KAAK,IAAI,GAC5C,UAAU,CAAC,OAAO,+BAA+B,CAAC,CAOpD;AAGD,KAAK,aAAa,CAAC,CAAC,IAAI,CAAC,SAAS,OAAO,GAAG,CAAC,GAAG;IAAE,QAAQ,CAAC,eAAe,EAAE,MAAM,CAAA;CAAE,GAAG,KAAK,CAAC;AAE7F,wBAAgB,cAAc,CAC5B,eAAe,EAAE,MAAM,EACvB,OAAO,EAAE,qBAAqB,GAC7B,aAAa,CAAC,qBAAqB,CAAC,CAEtC"}

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

@@ -0,0 +1,9 @@
+/** Deliver startup diagnostics with update retry lifetime checks (PRD §5.7, C-CODEX-12). */
+import { createSessionStartupWarningGate } from "../../core/startup/warnings.js";
+export function createCodexStartupWarningGate(session, closing, duringDelivery) {
+    return createSessionStartupWarningGate(session, (warning) => warning.code === "startup_prompt_write_failed" && warning.label === "update" && closing(), duringDelivery);
+}
+export function preflightEvent(elwoodSessionId, warning) {
+    return { elwoodSessionId, ...warning };
+}
+//# sourceMappingURL=startup-warnings.js.map

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

@@ -0,0 +1 @@
+{"version":3,"file":"startup-warnings.js","sourceRoot":"","sources":["../../../src/codex/session/startup-warnings.ts"],"names":[],"mappings":"AAAA,4FAA4F;AAG5F,OAAO,EAAE,+BAA+B,EAAE,MAAM,gCAAgC,CAAC;AAGjF,MAAM,UAAU,6BAA6B,CAC3C,OAA2C,EAC3C,OAAsB,EACtB,cAA6C;IAE7C,OAAO,+BAA+B,CACpC,OAAO,EACP,CAAC,OAAO,EAAE,EAAE,CACV,OAAO,CAAC,IAAI,KAAK,6BAA6B,IAAI,OAAO,CAAC,KAAK,KAAK,QAAQ,IAAI,OAAO,EAAE,EAC3F,cAAc,CACf,CAAC;AACJ,CAAC;AAKD,MAAM,UAAU,cAAc,CAC5B,eAAuB,EACvB,OAA8B;IAE9B,OAAO,EAAE,eAAe,EAAE,GAAG,OAAO,EAAE,CAAC;AACzC,CAAC"}

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

@@ -14,9 +14,11 @@ import type { CodexEventMap } from "./types.ts";
 /** A watcher plus the hook to flush any diagnostics buffered before the sink existed. */
 type WiredCodexTranscriptWatcher = {
     readonly watcher: CodexTranscriptWatcher;
+    /** Include deferred startup-warning fan-out in the exit-order barrier. */
+    readonly duringDelivery: (work: () => void) => void;
     readonly flushPendingWarnings: () => void;
     /** Drive `watcher.finish()` behind an error boundary, then run `afterFlush` in a
-     * `finally` so a throwing final-flush listener never skips terminal:exit (C-LIFE-10). */
+     * `finally` so an internal final-flush error never skips terminal:exit (C-LIFE-10). */
     readonly finishSafely: (afterFlush?: () => void) => void;
 };
 /**

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,QAAQ,CAAC,oBAAoB,EAAE,MAAM,IAAI,CAAC;IAC1C;6FACyF;IACzF,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,CAkC7B"}
+{"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"}