@with-logic/elwood 0.2.1 → 0.2.2

package/dist/codex/screen-table.js

@@ -11,7 +11,7 @@ import { codexWorkingScreen, codexWorkingTitle } from "./screen/working.js";
 import { codexUpdatePromptVisible } from "./update/recognition.js";
 import { CodexUpdatePromptTracker } from "./update/tracker.js";
 export { codexComposerClearance as codexTrustClearance } from "./screen/clearance.js";
-const verifiedAgainst = "codex-cli 0.142.5; work pulses and question panels: 0.163.0";
+const verifiedAgainst = "codex-cli 0.142.5; work pulses and question panels: 0.163.0; resume loading: 0.164.0";
 /**
  * Original rules verified against codex-cli 0.142.5; 0.163.0 captures additionally
  * verify pulsing work and native question panels. The working spinner renders
@@ -26,11 +26,15 @@ const verifiedAgainst = "codex-cli 0.142.5; work pulses and question panels: 0.1
  * directory name when idle. The update-prompt rule takes its matcher as a
  * parameter: production injects per-session update generation tracking and a
  * retained input hold until positive native composer clearance. Both belong to
- * this table; startup automation only needs update generation tracking.
+ * this table; startup automation only needs update generation tracking. A resumed
+ * 0.164.0 session first paints "Resuming session…" above its composer, before it
+ * loads the conversation under a working title (docs/cli-behavior.md, "Resume
+ * lifecycle"); C-TURN-03 resume settling reads that placeholder.
  */
 function codexScreenFactRules(updatePromptVisible) {
     return [
         { id: "codex-composer-marker", fact: "composer_visible", all: [/^\s*›/m] },
+        { id: "codex-resume-loading", fact: "resume_loading_visible", all: [/^\s*Resuming session…/m] },
         { id: "codex-working-spinner", fact: "working_visible", all: [codexWorkingScreen] },
         {
             id: "codex-working-title",

package/dist/codex/screen-table.js.map

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

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

@@ -8,6 +8,7 @@ export type CodexHookBridge = {
     readonly stop: () => Promise<void>;
 };
 export type CodexHookBridgeFactory = (socketPath: string, token: string, elwoodSessionId: string, dispatch: ConstructorParameters<typeof HookBridgeServer>[2], onError: ConstructorParameters<typeof HookBridgeServer>[3]) => CodexHookBridge;
+/** The configured factory; each bridge it builds releases its socket when it stops. */
 export declare function currentCodexHookBridgeFactory(): CodexHookBridgeFactory;
 export declare function setCodexHookBridgeFactoryForTests(next: CodexHookBridgeFactory): void;
 export declare function resetCodexSessionSeamsForTests(): void;

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

@@ -1 +1 @@
-{"version":3,"file":"bridge.d.ts","sourceRoot":"","sources":["../../../src/codex/session/bridge.ts"],"names":[],"mappings":"AAAA;;;GAGG;AAEH,OAAO,EAAE,gBAAgB,EAAE,MAAM,wBAAwB,CAAC;AAI1D,MAAM,MAAM,eAAe,GAAG;IAC5B,QAAQ,CAAC,KAAK,EAAE,MAAM,OAAO,CAAC,IAAI,CAAC,CAAC;IACpC,QAAQ,CAAC,IAAI,EAAE,MAAM,OAAO,CAAC,IAAI,CAAC,CAAC;CACpC,CAAC;AAEF,MAAM,MAAM,sBAAsB,GAAG,CACnC,UAAU,EAAE,MAAM,EAClB,KAAK,EAAE,MAAM,EACb,eAAe,EAAE,MAAM,EACvB,QAAQ,EAAE,qBAAqB,CAAC,OAAO,gBAAgB,CAAC,CAAC,CAAC,CAAC,EAC3D,OAAO,EAAE,qBAAqB,CAAC,OAAO,gBAAgB,CAAC,CAAC,CAAC,CAAC,KACvD,eAAe,CAAC;AAOrB,wBAAgB,6BAA6B,IAAI,sBAAsB,CAEtE;AAED,wBAAgB,iCAAiC,CAAC,IAAI,EAAE,sBAAsB,GAAG,IAAI,CAEpF;AAED,wBAAgB,8BAA8B,IAAI,IAAI,CAGrD"}
+{"version":3,"file":"bridge.d.ts","sourceRoot":"","sources":["../../../src/codex/session/bridge.ts"],"names":[],"mappings":"AAAA;;;GAGG;AAEH,OAAO,EAAE,gBAAgB,EAAE,MAAM,wBAAwB,CAAC;AAK1D,MAAM,MAAM,eAAe,GAAG;IAC5B,QAAQ,CAAC,KAAK,EAAE,MAAM,OAAO,CAAC,IAAI,CAAC,CAAC;IACpC,QAAQ,CAAC,IAAI,EAAE,MAAM,OAAO,CAAC,IAAI,CAAC,CAAC;CACpC,CAAC;AAEF,MAAM,MAAM,sBAAsB,GAAG,CACnC,UAAU,EAAE,MAAM,EAClB,KAAK,EAAE,MAAM,EACb,eAAe,EAAE,MAAM,EACvB,QAAQ,EAAE,qBAAqB,CAAC,OAAO,gBAAgB,CAAC,CAAC,CAAC,CAAC,EAC3D,OAAO,EAAE,qBAAqB,CAAC,OAAO,gBAAgB,CAAC,CAAC,CAAC,CAAC,KACvD,eAAe,CAAC;AAOrB,uFAAuF;AACvF,wBAAgB,6BAA6B,IAAI,sBAAsB,CAEtE;AAED,wBAAgB,iCAAiC,CAAC,IAAI,EAAE,sBAAsB,GAAG,IAAI,CAEpF;AAED,wBAAgB,8BAA8B,IAAI,IAAI,CAGrD"}

package/dist/codex/session/bridge.js

@@ -3,12 +3,14 @@
  * Implements PRD §7A and §13.
  */
 import { HookBridgeServer } from "../../bridge/server.js";
+import { releasingSocketOnStop } from "../../bridge/socket-release.js";
 import { isCodexHookEvent } from "../hooks/validate.js";
 import { resetCodexPreflightCacheForTests } from "../preflight.js";
 const realFactory = (socketPath, token, id, dispatch, onError) => new HookBridgeServer(socketPath, token, dispatch, onError, isCodexHookEvent, id);
 let factory = realFactory;
+/** The configured factory; each bridge it builds releases its socket when it stops. */
 export function currentCodexHookBridgeFactory() {
-    return factory;
+    return releasingSocketOnStop(factory);
 }
 export function setCodexHookBridgeFactoryForTests(next) {
     factory = next;

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

@@ -1 +1 @@
-{"version":3,"file":"bridge.js","sourceRoot":"","sources":["../../../src/codex/session/bridge.ts"],"names":[],"mappings":"AAAA;;;GAGG;AAEH,OAAO,EAAE,gBAAgB,EAAE,MAAM,wBAAwB,CAAC;AAC1D,OAAO,EAAE,gBAAgB,EAAE,MAAM,sBAAsB,CAAC;AACxD,OAAO,EAAE,gCAAgC,EAAE,MAAM,iBAAiB,CAAC;AAenE,MAAM,WAAW,GAA2B,CAAC,UAAU,EAAE,KAAK,EAAE,EAAE,EAAE,QAAQ,EAAE,OAAO,EAAE,EAAE,CACvF,IAAI,gBAAgB,CAAC,UAAU,EAAE,KAAK,EAAE,QAAQ,EAAE,OAAO,EAAE,gBAAgB,EAAE,EAAE,CAAC,CAAC;AAEnF,IAAI,OAAO,GAAG,WAAW,CAAC;AAE1B,MAAM,UAAU,6BAA6B;IAC3C,OAAO,OAAO,CAAC;AACjB,CAAC;AAED,MAAM,UAAU,iCAAiC,CAAC,IAA4B;IAC5E,OAAO,GAAG,IAAI,CAAC;AACjB,CAAC;AAED,MAAM,UAAU,8BAA8B;IAC5C,OAAO,GAAG,WAAW,CAAC;IACtB,gCAAgC,EAAE,CAAC;AACrC,CAAC"}
+{"version":3,"file":"bridge.js","sourceRoot":"","sources":["../../../src/codex/session/bridge.ts"],"names":[],"mappings":"AAAA;;;GAGG;AAEH,OAAO,EAAE,gBAAgB,EAAE,MAAM,wBAAwB,CAAC;AAC1D,OAAO,EAAE,qBAAqB,EAAE,MAAM,gCAAgC,CAAC;AACvE,OAAO,EAAE,gBAAgB,EAAE,MAAM,sBAAsB,CAAC;AACxD,OAAO,EAAE,gCAAgC,EAAE,MAAM,iBAAiB,CAAC;AAenE,MAAM,WAAW,GAA2B,CAAC,UAAU,EAAE,KAAK,EAAE,EAAE,EAAE,QAAQ,EAAE,OAAO,EAAE,EAAE,CACvF,IAAI,gBAAgB,CAAC,UAAU,EAAE,KAAK,EAAE,QAAQ,EAAE,OAAO,EAAE,gBAAgB,EAAE,EAAE,CAAC,CAAC;AAEnF,IAAI,OAAO,GAAG,WAAW,CAAC;AAE1B,uFAAuF;AACvF,MAAM,UAAU,6BAA6B;IAC3C,OAAO,qBAAqB,CAAC,OAAO,CAAC,CAAC;AACxC,CAAC;AAED,MAAM,UAAU,iCAAiC,CAAC,IAA4B;IAC5E,OAAO,GAAG,IAAI,CAAC;AACjB,CAAC;AAED,MAAM,UAAU,8BAA8B;IAC5C,OAAO,GAAG,WAAW,CAAC;IACtB,gCAAgC,EAAE,CAAC;AACrC,CAAC"}

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

@@ -1 +1 @@
-{"version":3,"file":"build.d.ts","sourceRoot":"","sources":["../../../src/codex/session/build.ts"],"names":[],"mappings":"AAoBA,OAAO,KAAK,EAAE,cAAc,EAAE,MAAM,8BAA8B,CAAC;AACnE,OAAO,EAAE,KAAK,aAAa,EAAsB,MAAM,sBAAsB,CAAC;AAG9E,OAAO,KAAK,EAAE,qBAAqB,EAAE,MAAM,iBAAiB,CAAC;AAS7D,OAAO,EAAE,gBAAgB,EAAE,MAAM,eAAe,CAAC;AAIjD,OAAO,KAAK,EAAiB,iBAAiB,EAAE,MAAM,YAAY,CAAC;AAEnE,MAAM,MAAM,sBAAsB,GAAG;IACnC,QAAQ,CAAC,MAAM,EAAE,aAAa,CAAC;IAC/B,QAAQ,CAAC,QAAQ,EAAE,MAAM,CAAC;IAC1B,QAAQ,CAAC,OAAO,EAAE,cAAc,CAAC;IACjC,QAAQ,CAAC,OAAO,EAAE,iBAAiB,CAAC;IACpC,QAAQ,CAAC,OAAO,EAAE,OAAO,CAAC;IAC1B,QAAQ,CAAC,QAAQ,EAAE,MAAM,IAAI,CAAC;IAC9B,QAAQ,CAAC,gBAAgB,EAAE,qBAAqB,GAAG,SAAS,CAAC;CAC9D,CAAC;AACF,wBAAsB,iBAAiB,CAAC,KAAK,EAAE,sBAAsB,GAAG,OAAO,CAAC,gBAAgB,CAAC,CAoJhG"}
+{"version":3,"file":"build.d.ts","sourceRoot":"","sources":["../../../src/codex/session/build.ts"],"names":[],"mappings":"AAmBA,OAAO,KAAK,EAAE,cAAc,EAAE,MAAM,8BAA8B,CAAC;AACnE,OAAO,EAAE,KAAK,aAAa,EAAsB,MAAM,sBAAsB,CAAC;AAG9E,OAAO,KAAK,EAAE,qBAAqB,EAAE,MAAM,iBAAiB,CAAC;AAS7D,OAAO,EAAE,gBAAgB,EAAE,MAAM,eAAe,CAAC;AAKjD,OAAO,KAAK,EAAiB,iBAAiB,EAAE,MAAM,YAAY,CAAC;AAEnE,MAAM,MAAM,sBAAsB,GAAG;IACnC,QAAQ,CAAC,MAAM,EAAE,aAAa,CAAC;IAC/B,QAAQ,CAAC,QAAQ,EAAE,MAAM,CAAC;IAC1B,QAAQ,CAAC,OAAO,EAAE,cAAc,CAAC;IACjC,QAAQ,CAAC,OAAO,EAAE,iBAAiB,CAAC;IACpC,QAAQ,CAAC,OAAO,EAAE,OAAO,CAAC;IAC1B,QAAQ,CAAC,QAAQ,EAAE,MAAM,IAAI,CAAC;IAC9B,QAAQ,CAAC,gBAAgB,EAAE,qBAAqB,GAAG,SAAS,CAAC;CAC9D,CAAC;AACF,wBAAsB,iBAAiB,CAAC,KAAK,EAAE,sBAAsB,GAAG,OAAO,CAAC,gBAAgB,CAAC,CAsJhG"}

package/dist/codex/session/build.js

@@ -9,8 +9,7 @@ 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 { withAutomatedInput } from "../../runtime/session/session-input.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";
@@ -27,6 +26,7 @@ import { currentCodexHookBridgeFactory } from "./bridge.js";
 import { reportCallerInput } from "./caller-input.js";
 import { buildCodexHookErrorHandler, dispatchHook, registerInitialHooks } from "./hooks.js";
 import { CodexSessionImpl } from "./instance.js";
+import { createCodexReadinessGate } from "./readiness.js";
 import { writeCodexRuntimeFiles } from "./runtime.js";
 import { createCodexStartupWarningGate, preflightEvent } from "./startup-warnings.js";
 import * as transcript from "./transcript.js";
@@ -35,8 +35,9 @@ export async function buildCodexSession(input) {
     const { record, stateDir, runtime, options, resumed, preflightWarning } = input;
     const elwoodSessionId = record.elwoodSessionId;
     secureMkdir(runtime.sessionDir);
-    writeSessionRecord(record, runtime.sessionDir, runtime.stateOwnership.publishFile);
-    const loopDefinitions = resumed ? loadLoops(stateDir, record.elwoodSessionId) : [];
+    const publish = runtime.stateOwnership.publishFile;
+    writeSessionRecord(record, runtime.sessionDir, publish);
+    const loopDefinitions = resumed ? loadLoops(stateDir, record.elwoodSessionId, publish) : [];
     writeCodexRuntimeFiles(runtime);
     const emitter = new TypedEmitter();
     registerInitialHooks(emitter, options.hooks);
@@ -57,18 +58,19 @@ export async function buildCodexSession(input) {
             socketPath: runtime.socketPath,
         });
     }
-    const pty = await spawnCodexPty(record, runtime.bridgeScriptPath, options).catch(async (error) => {
+    const { pty, resolveConfigPath } = await spawnCodexPty(record, runtime, options).catch(async (error) => {
         await cleanupStartupResources({ bridge });
         throw error;
     });
-    const startupOutput = createStartupBuffer();
+    const startupOutput = createStartupBuffer({ source: pty });
     let observedExit;
     const terminalReplay = new TerminalReplayBuffer(record.elwoodSessionId);
     terminalReplay.captureStartupAttention(emitter);
-    const readiness = createReadinessGate(() => {
+    const onReady = () => {
         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 readiness = createCodexReadinessGate(onReady, resumed, elwoodSessionId, warnGate);
     const clearance = liveCodexClearance(() => terminal);
     const snapshot = () => renderedSnapshot(terminal);
     const observers = {
@@ -97,13 +99,13 @@ export async function buildCodexSession(input) {
         frameObserver.observe(frame);
         emitUpdateAttention(emitter, record.elwoodSessionId, result.updateGeneration);
         emitter.emit("terminal:data", { elwoodSessionId: record.elwoodSessionId, data });
-    }, startupOutput.push);
+    });
     const callerInput = reportCallerInput(terminal, () => promptResponder.endStartup(), resumed);
-    session = new CodexSessionImpl(record, stateDir, runtime, pty, callerInput.terminal, bridge, emitter, terminalReplay, transcriptWatcher, loopDefinitions);
+    session = new CodexSessionImpl(record, stateDir, runtime, pty, callerInput.terminal, bridge, emitter, terminalReplay, transcriptWatcher, loopDefinitions, resolveConfigPath);
     const activeSession = bindTurnSubmission(session, observers);
     bindStartupLifetime(activeSession, promptResponder, readiness);
     frameObserver.refresh();
-    const beforeCleanup = () => activeSession.pauseLoopsForStartupCleanup(readiness.ready.cancel);
+    const sessionCleanup = activeSession.startupCleanupResources(readiness.ready.cancel);
     await guardStartupRegion(async () => {
         activeSession.startLoops();
         flushPendingWarnings(); // inside the guard: a throwing sink tears down, not leaks (§5.4/§9.4)
@@ -126,7 +128,7 @@ export async function buildCodexSession(input) {
         activeSession.submitEvidence("startup_usable");
         frameObserver.blockOnceLive(activeSession);
         input.activate();
-    }, { before: beforeCleanup, pty, bridge, terminal, after: () => transcriptWatcher.stop() });
+    }, { ...sessionCleanup, bridge, terminal, after: () => transcriptWatcher.stop() });
     if (preflightWarning !== undefined)
         warnGate.emitWarnings([preflightEvent(elwoodSessionId, preflightWarning)]);
     warnGate.openAfterReturn();

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

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

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

@@ -1,6 +1,6 @@
 /**
- * Codex session runtime cleanup helpers.
- * Implements PRD §9.3.
+ * Codex session runtime cleanup (PRD §9.4, C-LIFE-12): the shared runtime cleanup over
+ * Codex's hook bridge and transcript watcher.
  */
 import type { PtyProcess } from "../../pty/types.ts";
 import type { ElwoodTerminal } from "../../terminal/headless.ts";

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;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"}
+{"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;AAErD,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,CAMf"}

package/dist/codex/session/cleanup.js

@@ -1,16 +1,13 @@
 /**
- * Codex session runtime cleanup helpers.
- * Implements PRD §9.3.
+ * Codex session runtime cleanup (PRD §9.4, C-LIFE-12): the shared runtime cleanup over
+ * Codex's hook bridge and transcript watcher.
  */
-import { runCleanupSteps } from "../../runtime/shutdown/teardown.js";
-import { drainAndDisposeTerminal } from "../../runtime/shutdown/terminal.js";
+import { stopSessionRuntime } from "../../runtime/session/runtime-cleanup.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(),
-        () => drainAndDisposeTerminal(terminal, pty),
-    ]);
+    const parts = {
+        stopBridge: () => bridge.stop(),
+        finishTranscriptWatcher: () => transcriptWatcher?.finish(),
+    };
+    return stopSessionRuntime(parts, 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;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"}
+{"version":3,"file":"cleanup.js","sourceRoot":"","sources":["../../../src/codex/session/cleanup.ts"],"names":[],"mappings":"AAAA;;;GAGG;AAGH,OAAO,EAAE,kBAAkB,EAAE,MAAM,0CAA0C,CAAC;AAQ9E,MAAM,UAAU,gBAAgB,CAC9B,MAA0B,EAC1B,iBAAqD,EACrD,QAAwB,EACxB,GAA+B;IAE/B,MAAM,KAAK,GAAG;QACZ,UAAU,EAAE,GAAG,EAAE,CAAC,MAAM,CAAC,IAAI,EAAE;QAC/B,uBAAuB,EAAE,GAAG,EAAE,CAAC,iBAAiB,EAAE,MAAM,EAAE;KAC3D,CAAC;IACF,OAAO,kBAAkB,CAAC,KAAK,EAAE,QAAQ,EAAE,GAAG,CAAC,CAAC;AAClD,CAAC"}

package/dist/codex/session/config-switch.d.ts

@@ -0,0 +1,20 @@
+/**
+ * One Codex session's `setModel` config transaction: the snapshot, the picker flow, and the
+ * compare-and-swap restore of THAT session's config.toml, with the restore warnings.
+ * Implements PRD §5.3 setModel restore, C-CODEX-14, C-CODEX-24, and C-CODEX-25.
+ */
+import type { ElwoodWarningEvent } from "../../core/types.ts";
+export type CodexConfigSwitchSession = {
+    readonly elwoodSessionId: string;
+    /** The config.toml of the `CODEX_HOME` this session's Codex runs with (C-CODEX-24). */
+    readonly resolveConfigPath: (signal: AbortSignal) => Promise<string>;
+    readonly waitForCliExit: () => Promise<unknown> | undefined;
+    readonly emitWarnings: (warnings: readonly ElwoodWarningEvent[]) => void;
+};
+/**
+ * Restores the user's config default after picker changes; the live CLI retains its
+ * selection. The config file's transaction lock prevents interleaved snapshots and restores
+ * even when automation rejects after Codex writes (C-CODEX-14).
+ */
+export declare function switchCodexModel(session: CodexConfigSwitchSession, flow: () => Promise<void>, signal: AbortSignal): Promise<void>;
+//# sourceMappingURL=config-switch.d.ts.map

package/dist/codex/session/config-switch.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"config-switch.d.ts","sourceRoot":"","sources":["../../../src/codex/session/config-switch.ts"],"names":[],"mappings":"AAAA;;;;GAIG;AAGH,OAAO,KAAK,EAAE,kBAAkB,EAAE,MAAM,qBAAqB,CAAC;AAK9D,MAAM,MAAM,wBAAwB,GAAG;IACrC,QAAQ,CAAC,eAAe,EAAE,MAAM,CAAC;IACjC,uFAAuF;IACvF,QAAQ,CAAC,iBAAiB,EAAE,CAAC,MAAM,EAAE,WAAW,KAAK,OAAO,CAAC,MAAM,CAAC,CAAC;IACrE,QAAQ,CAAC,cAAc,EAAE,MAAM,OAAO,CAAC,OAAO,CAAC,GAAG,SAAS,CAAC;IAC5D,QAAQ,CAAC,YAAY,EAAE,CAAC,QAAQ,EAAE,SAAS,kBAAkB,EAAE,KAAK,IAAI,CAAC;CAC1E,CAAC;AAEF;;;;GAIG;AACH,wBAAsB,gBAAgB,CACpC,OAAO,EAAE,wBAAwB,EACjC,IAAI,EAAE,MAAM,OAAO,CAAC,IAAI,CAAC,EACzB,MAAM,EAAE,WAAW,GAClB,OAAO,CAAC,IAAI,CAAC,CA0Bf"}

package/dist/codex/session/config-switch.js

@@ -0,0 +1,42 @@
+/**
+ * One Codex session's `setModel` config transaction: the snapshot, the picker flow, and the
+ * compare-and-swap restore of THAT session's config.toml, with the restore warnings.
+ * Implements PRD §5.3 setModel restore, C-CODEX-14, C-CODEX-24, and C-CODEX-25.
+ */
+import { isCallerInputIntervention } from "../../core/models/intervention.js";
+import { currentCodexConfig, restoreCodexConfig, snapshotCodexConfig } from "../config/restore.js";
+import { runCodexModelSwitch } from "../config/transaction.js";
+import { codexRestoreFailedWarning, codexRestoreSkippedWarning } from "./warnings.js";
+/**
+ * Restores the user's config default after picker changes; the live CLI retains its
+ * selection. The config file's transaction lock prevents interleaved snapshots and restores
+ * even when automation rejects after Codex writes (C-CODEX-14).
+ */
+export async function switchCodexModel(session, flow, signal) {
+    // Known before the picker runs: a switch whose config cannot be named is never made. A
+    // switch that starts before the launch shell has written its report waits for it.
+    const path = await session.resolveConfigPath(signal);
+    const { elwoodSessionId } = session;
+    await runCodexModelSwitch({
+        path,
+        snapshot: () => snapshotCodexConfig(path),
+        apply: flow,
+        waitForCliExit: session.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) => {
+            // Raw input that took over the picker revokes restore authority.
+            const outcome = isCallerInputIntervention(signal.reason)
+                ? currentCodexConfig(path) === snapshot
+                    ? "unchanged"
+                    : "interrupted"
+                : restoreCodexConfig({ path, snapshot });
+            if (outcome === "restored" || outcome === "unchanged")
+                return;
+            session.emitWarnings([codexRestoreSkippedWarning(elwoodSessionId, outcome, path)]);
+        },
+        onRestoreError: (error) => session.emitWarnings([codexRestoreFailedWarning(elwoodSessionId, error, path)]),
+    });
+}
+//# sourceMappingURL=config-switch.js.map

package/dist/codex/session/config-switch.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"config-switch.js","sourceRoot":"","sources":["../../../src/codex/session/config-switch.ts"],"names":[],"mappings":"AAAA;;;;GAIG;AAEH,OAAO,EAAE,yBAAyB,EAAE,MAAM,mCAAmC,CAAC;AAE9E,OAAO,EAAE,kBAAkB,EAAE,kBAAkB,EAAE,mBAAmB,EAAE,MAAM,sBAAsB,CAAC;AACnG,OAAO,EAAE,mBAAmB,EAAE,MAAM,0BAA0B,CAAC;AAC/D,OAAO,EAAE,yBAAyB,EAAE,0BAA0B,EAAE,MAAM,eAAe,CAAC;AAUtF;;;;GAIG;AACH,MAAM,CAAC,KAAK,UAAU,gBAAgB,CACpC,OAAiC,EACjC,IAAyB,EACzB,MAAmB;IAEnB,uFAAuF;IACvF,kFAAkF;IAClF,MAAM,IAAI,GAAG,MAAM,OAAO,CAAC,iBAAiB,CAAC,MAAM,CAAC,CAAC;IACrD,MAAM,EAAE,eAAe,EAAE,GAAG,OAAO,CAAC;IACpC,MAAM,mBAAmB,CAAC;QACxB,IAAI;QACJ,QAAQ,EAAE,GAAG,EAAE,CAAC,mBAAmB,CAAC,IAAI,CAAC;QACzC,KAAK,EAAE,IAAI;QACX,cAAc,EAAE,OAAO,CAAC,cAAc;QACtC,8EAA8E;QAC9E,gEAAgE;QAChE,MAAM,EAAE,EAAE,MAAM,EAAE,KAAK,EAAE,GAAG,EAAE,CAAC,MAAM,CAAC,MAAM,EAAE;QAC9C,OAAO,EAAE,CAAC,QAAQ,EAAE,EAAE;YACpB,iEAAiE;YACjE,MAAM,OAAO,GAAG,yBAAyB,CAAC,MAAM,CAAC,MAAM,CAAC;gBACtD,CAAC,CAAC,kBAAkB,CAAC,IAAI,CAAC,KAAK,QAAQ;oBACrC,CAAC,CAAC,WAAW;oBACb,CAAC,CAAC,aAAa;gBACjB,CAAC,CAAC,kBAAkB,CAAC,EAAE,IAAI,EAAE,QAAQ,EAAE,CAAC,CAAC;YAC3C,IAAI,OAAO,KAAK,UAAU,IAAI,OAAO,KAAK,WAAW;gBAAE,OAAO;YAC9D,OAAO,CAAC,YAAY,CAAC,CAAC,0BAA0B,CAAC,eAAe,EAAE,OAAO,EAAE,IAAI,CAAC,CAAC,CAAC,CAAC;QACrF,CAAC;QACD,cAAc,EAAE,CAAC,KAAK,EAAE,EAAE,CACxB,OAAO,CAAC,YAAY,CAAC,CAAC,yBAAyB,CAAC,eAAe,EAAE,KAAK,EAAE,IAAI,CAAC,CAAC,CAAC;KAClF,CAAC,CAAC;AACL,CAAC"}

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;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"}
+{"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;AAqFD,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

@@ -50,6 +50,10 @@ async function observeAndRequest(event, emitter, options, record, session) {
     const submissionGenerationUnchanged = event.hook_event_name === "Stop"
         ? session?.stopCompletion.captureSubmissionGeneration()
         : undefined;
+    // Before any observer runs: one may stop the session at once, and Codex records the
+    // turn's end only after this hook returns (C-LIFE-13).
+    if (event.hook_event_name === "Stop" && event.transcript_path)
+        session?.turnCommit.expect(event.turn_id);
     const observation = hookObservationBoundary(emitter, record.elwoodSessionId, "codex");
     observation.run("transcript", () => session?.observeTranscript(event.transcript_path));
     if (event.hook_event_name === "SessionStart") {
@@ -71,6 +75,9 @@ async function observeAndRequest(event, emitter, options, record, session) {
     }, event, options.hookTimeoutMs ?? 25_000, record.elwoodSessionId);
     const serialized = serializeCodexHookResult(event.hook_event_name, outcome.result);
     const blocked = isCodexBlock(outcome.result);
+    // A blocked Stop continues the turn, so no end record is coming.
+    if (event.hook_event_name === "Stop" && blocked)
+        session?.turnCommit.release(event.turn_id);
     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

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

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,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"}
+{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../src/codex/session/index.ts"],"names":[],"mappings":"AAAA,6IAA6I;AAiB7I,OAAO,KAAK,EAAE,iBAAiB,EAAE,MAAM,iCAAiC,CAAC;AAKzE,OAAO,EAAwC,KAAK,aAAa,EAAE,MAAM,sBAAsB,CAAC;AAChG,OAAO,KAAK,SAAS,MAAM,iBAAiB,CAAC;AAG7C,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,CAuC1B;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,qDA8C9B"}

package/dist/codex/session/index.js

@@ -5,15 +5,18 @@ 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 { assertLaunchDirectory, recheckLaunchDirectoryOnFailure, resolveLaunchDirectory, } from "../../runtime/session/launch-directory.js";
+import { prepareLaunchState } from "../../runtime/session/prepare-state.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 { releaseLaunchSocket } from "../../state/socket-home.js";
 import { withLaunchOwnership } from "../../state/startup-ownership.js";
-import { createSessionRecord, defaultStateDir, prepareStateDir, } from "../../state/store.js";
+import { createSessionRecord, defaultStateDir } from "../../state/store.js";
 import * as preflight from "../preflight.js";
+import { codexHomeReportPath, explainCodexStartFailure } from "../pty.js";
 import { buildCodexSession } from "./build.js";
 export { resetCodexSessionSeamsForTests, setCodexHookBridgeFactoryForTests, } from "./bridge.js";
 /**
@@ -34,18 +37,30 @@ export async function startCodexWithId(rawOptions, elwoodSessionId) {
     // PTY spawn all agree. `highTrust` expands to its concrete posture (or rejects a
     // 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 options = applyCodexHighTrust({
+        ...rawOptions,
+        cwd: resolveLaunchDirectory("codex", rawOptions.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({
-        cwd: options.cwd,
-        id: elwoodSessionId,
-        adapter: "codex",
+    const stateDirPath = resolve(options.stateDir ?? defaultStateDir(options.cwd));
+    // Before the default state path, which is under `cwd`, is inspected: a bad `cwd` is the error.
+    await assertLaunchDirectory("codex", options.cwd);
+    const stateDir = canonicalStatePath(stateDirPath);
+    const warning = await recheckLaunchDirectoryOnFailure("codex", options.cwd, () => preflight.preflightCodex(options.strictVersionCheck ?? false, options.autoupdate ?? false, options.cwd));
+    const session = await recheckLaunchDirectoryOnFailure("codex", options.cwd, () => {
+        prepareLaunchState("codex", stateDir, {
+            cwd: options.cwd,
+            isImplicitDefaultStateDir: options.stateDir === undefined,
+            elwoodSessionId,
+        });
+        const createdRecord = createSessionRecord({
+            cwd: options.cwd,
+            id: elwoodSessionId,
+            adapter: "codex",
+        });
+        const record = withCodexLaunch(createdRecord, codexLaunchPosture(options));
+        return startCodexFromRecord(record, stateDir, options, false, warning);
     });
-    const record = withCodexLaunch(createdRecord, codexLaunchPosture(options));
-    const session = await startCodexFromRecord(record, stateDir, options, false, warning);
     return queuePersonaMessage(session, options.persona, session.closing.signal);
 }
 export function startCodexFromRecord(record, stateDir, options, resumed, preflightWarning, ownership) {
@@ -56,16 +71,17 @@ export function startCodexFromRecord(record, stateDir, options, resumed, preflig
     // `sessionRuntime` ensures the session's STABLE out-of-tree home and reserves a FRESH
     // per-launch socket PATH inside it; the socket is bound later, by `bridge.start()`
     // (after the state/runtime files are written). Wrap the WHOLE build so ANY failure
-    // 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.
+    // before the session takes ownership releases THIS launch's own socket file, and the
+    // shared home only if no concurrent launch's socket is in it (§8.1, §9.1). On success
+    // ownership transfers to the returned session; teardown removes the whole home.
     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({
+        const report = codexHomeReportPath(runtime);
+        return withSocketHomeCleanup(() => releaseLaunchSocket(runtime.socketPath), () => buildCodexSession({
             record,
             stateDir,
             runtime,
@@ -73,6 +89,8 @@ export function startCodexFromRecord(record, stateDir, options, resumed, preflig
             resumed,
             preflightWarning,
             activate,
+        }).catch((error) => {
+            throw explainCodexStartFailure(error, report);
         }));
     });
 }

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

@@ -4,6 +4,7 @@
  */
 import type { ElwoodActivityEvent } from "../../core/activity/index.ts";
 import type { HookObservation } from "../../core/hook-observation.ts";
+import type { ModelPickerSpec } from "../../core/models/picker.ts";
 import type { TerminalReplayBuffer } from "../../core/terminal-replay.ts";
 import type { ElwoodSessionStatus, ElwoodWarningEvent } from "../../core/types.ts";
 import type { TypedEmitter } from "../../events/emitter.ts";
@@ -15,30 +16,25 @@ import { type SessionRecord } from "../../state/store.ts";
 import type { ElwoodTerminal } from "../../terminal/headless.ts";
 import type { CodexTranscriptWatcher } from "../transcript/index.ts";
 import type { CodexHookBridge } from "./bridge.ts";
+import { CodexTurnCommit } from "./turn-commit.ts";
 import type { CodexEventHandler, CodexEventMap, CodexEventName, CodexSessionApi } from "./types.ts";
 export declare class CodexSessionImpl extends AgentSessionBase implements CodexSessionApi {
-    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>;
-    };
+    protected readonly picker: ModelPickerSpec;
     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[]);
+    private readonly resolveConfigPath;
+    /** Holds `stop`/`teardown` for the turn a `Stop` hook ends to be recorded (C-LIFE-13). */
+    readonly turnCommit: CodexTurnCommit;
+    constructor(record: SessionRecord, stateDir: string, runtime: SessionRuntime, pty: PtyProcess, terminal: ElwoodTerminal, bridge: CodexHookBridge, emitter: TypedEmitter<CodexEventMap>, terminalReplay: TerminalReplayBuffer, transcriptWatcher: CodexTranscriptWatcher | undefined, loopDefinitions: readonly PersistedLoopDefinition[], resolveConfigPath: (signal: AbortSignal) => Promise<string>);
     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<"running" | "ready" | "blocked" | "exited" | "stopped" | "killed" | "torn_down" | "starting">;
@@ -57,8 +53,10 @@ export declare class CodexSessionImpl extends AgentSessionBase implements CodexS
      * boot-time composer placeholder that would swallow it (C-API-28). */
     markInitialReadyFromHook(observation: HookObservation): void;
     observeTranscript(path?: string | null): void;
+    stop(): Promise<void>;
+    teardown(): Promise<void>;
     /** One bounded per-pass scan of the committed transcript (an unblocked `Stop`, §7A.3). */
-    scanTranscript(): void;
+    readonly scanTranscript: () => void;
     emitWarnings(warnings: readonly ElwoodWarningEvent[]): void;
     protected stopRuntime(): Promise<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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"}