@with-logic/elwood 0.1.2 → 0.2.0

package/dist/claude/session/build.js

@@ -1,58 +1,50 @@
 /** Builds a live ClaudeSessionApi from a record + runtime. Implements PRD §5, §6, §8, §9. */
 import { defaultTerminalSize } from "../../core/defaults.js";
 import { causeDetails, elwoodError } from "../../core/errors.js";
-import { observeRenderedFrame } from "../../core/rendered-observers.js";
-import { createStartupWarningGate, deliverFrameWarnings } from "../../core/startup/frame.js";
 import { emitSettledStartupOutcomes } from "../../core/startup/write.js";
 import { TerminalReplayBuffer } from "../../core/terminal-replay.js";
 import { TypedEmitter } from "../../events/emitter.js";
 import { loadRuntimeLoopDefinitions as loadLoops } from "../../runtime/loop-restore.js";
+import { bindStartupLifetime, createSessionFrameObserver } from "../../runtime/session/frames.js";
+import { withAutomatedInput } from "../../runtime/session/picker-input.js";
 import { createReadinessGate } from "../../runtime/session/readiness.js";
+import { bindTurnSubmission } from "../../runtime/session/turn-submission.js";
 import { assertStartupThenRelease, createStartupBuffer } from "../../runtime/startup/buffer.js";
 import { cleanupStartupResources, guardStartupRegion } from "../../runtime/startup/cleanup.js";
 import { secureMkdir } from "../../state/files.js";
 import { writeSessionRecord } from "../../state/store.js";
+import { currentRenderedFrame, renderedSnapshot } from "../../terminal/cursor.js";
 import { attachPtyTerminal } from "../../terminal/headless.js";
+import { LoginExpiringWatcher } from "../login/renewal.js";
 import { preflightEvent } from "../preflight.js";
-import { ClaudeStartupPromptResponder } from "../startup-prompts.js";
+import { liveClaudeClearance } from "../screen-table.js";
+import { ClaudeStartupPromptResponder, guardedClaudeAutomationWrite } from "../startup-prompts.js";
 import { CLAUDE_STARTUP_MIN_COLS } from "../startup-size.js";
 import { currentClaudeHookBridgeFactory } from "./bridge.js";
 import { buildClaudeHookErrorHandler, buildClaudeHookHandler } from "./hook-handler.js";
 import { ClaudeSessionImpl } from "./instance.js";
 import { buildClaudeObservers, handleClaudeExit, registerInitialHooks, spawnClaudePty, writeRuntimeFiles, } from "./runtime.js";
+import { createClaudeStartupWarningGate } from "./startup-warnings.js";
 import { createTranscriptWatcher, observeTranscript } from "./transcript.js";
 export async function buildClaudeSession(input) {
     const { record, stateDir, runtime, options, resumed, preflightWarning } = input;
     secureMkdir(runtime.sessionDir);
-    writeSessionRecord(record, runtime.sessionDir);
+    writeSessionRecord(record, runtime.sessionDir, runtime.stateOwnership.publishFile);
     const loopDefinitions = resumed ? loadLoops(stateDir, record.elwoodSessionId) : [];
     writeRuntimeFiles(runtime, options);
     const emitter = new TypedEmitter();
     registerInitialHooks(emitter, options.hooks);
     let session;
-    // ALL startup-region warnings — startup-prompt (frame path) AND transcript
-    // drop/read-error diagnostics — route through ONE gate that buffers anything emitted
-    // before startClaude resolves and flushes it on a deferred macrotask after return,
-    // so every source stays observable without late-subscriber replay (C-API-14).
-    const warnGate = createStartupWarningGate({
-        emitWarnings: (w) => deliverFrameWarnings(session, w),
-    });
+    const warnGate = createClaudeStartupWarningGate(() => session, () => promptResponder.closing, (deliver) => wired.duringDelivery(deliver));
     const wired = createTranscriptWatcher(record.elwoodSessionId, emitter, () => warnGate);
     const { watcher: transcriptWatcher, flushPendingWarnings, finishSafely } = wired;
-    // Initial readiness is hook-backed (`InstructionsLoaded` fires `mark`); the first
-    // frame arms a starvation deadline so a missing/failed hook cannot starve the queue,
-    // and on resume the first composer frame also marks ready (PRD §5.3, C-API-28).
     const autotrust = options.autotrust ?? false;
-    // Observers are built BEFORE the readiness gate so its callback never closes
-    // over a binding declared later in this function.
     const observers = buildClaudeObservers(record.elwoodSessionId, autotrust, emitter);
-    const turnWatcher = observers.turn;
-    const { ready, observeReadinessFrame } = createReadinessGate(() => {
-        turnWatcher.arm(resumed); // resume arms in settling mode (no phantom replay turn)
-        // completeInitialReady advances readiness in a finally, isolating restore/warning
-        // failures internally, so its promise never rejects (not awaited).
+    const readiness = createReadinessGate(() => {
+        observers.turn.arm(resumed); // resume arms in settling mode (no phantom replay turn)
         void session?.completeInitialReady();
     }, resumed);
+    const { ready } = readiness;
     const bridge = currentClaudeHookBridgeFactory()(runtime.socketPath, runtime.bridgeToken, record.elwoodSessionId, buildClaudeHookHandler({
         record,
         options,
@@ -60,15 +52,14 @@ export async function buildClaudeSession(input) {
         transcriptWatcher,
         ready,
         getSession: () => session,
-        getTurnWatcher: () => turnWatcher,
+        getTurnWatcher: () => observers.turn,
         observeHookTranscript: (event) => observeTranscript(transcriptWatcher, event),
-    }), buildClaudeHookErrorHandler(record, emitter));
+        onHookOutcome: (event, result) => session?.resolveQuestionHook(event, result),
+    }), buildClaudeHookErrorHandler(record, emitter, () => session));
     try {
         await bridge.start();
     }
     catch (error) {
-        // Best-effort shut down a partially-started bridge so its listener/socket is not
-        // leaked; contained so the original bridge-start error is the one that rejects.
         await bridge.stop().catch(() => undefined);
         throw elwoodError("hook_bridge_failed", "Could not start Elwood hook bridge.", {
             ...causeDetails(error),
@@ -89,57 +80,53 @@ export async function buildClaudeSession(input) {
         throw error;
     }
     const startupOutput = createStartupBuffer();
-    let startupExit;
+    let observedExit;
     const terminalReplay = new TerminalReplayBuffer(record.elwoodSessionId);
     terminalReplay.captureStartupAttention(emitter);
-    const promptResponder = new ClaudeStartupPromptResponder(autotrust);
+    const frameObserver = createSessionFrameObserver(observers, () => session, () => promptResponder, readiness, liveClaudeClearance(() => terminal));
+    const promptResponder = new ClaudeStartupPromptResponder(autotrust, frameObserver.refresh, liveClaudeClearance(() => terminal));
     let latestRenderedText = "";
+    const loginExpiring = new LoginExpiringWatcher();
     const terminal = attachPtyTerminal(startupSize, pty, (data, renderedTerminal) => {
-        startupOutput.push(data);
         terminalReplay.push(data);
-        latestRenderedText = renderedTerminal.snapshot().text;
+        const snapshot = renderedSnapshot(renderedTerminal);
+        latestRenderedText = snapshot.text;
         const frame = { text: latestRenderedText, title: renderedTerminal.title };
-        // The write RETURNS its `sendInput` completion (no longer swallowed): the
-        // responder settles the prompt and its `startup_prompt` activity only after
-        // the write fulfills, and a rejected write stays retryable + warns (C-CLAUDE-16).
-        const autos = promptResponder.handle(frame.text, (input) => renderedTerminal.sendInput(input), () => latestRenderedText);
-        // Warning delivery is CONTAINED on the frame path: a throwing `warning`/`activity`
-        // listener must never skip readiness, login detection, or terminal:data (§5.7).
+        const send = (input) => withAutomatedInput(renderedTerminal, () => renderedTerminal.sendInput(input));
+        const read = () => latestRenderedText;
+        const guarded = guardedClaudeAutomationWrite(renderedTerminal, send, read, () => promptResponder.closing, promptResponder.closingSignal);
+        const trustRead = () => currentRenderedFrame(renderedTerminal)?.text;
+        const autos = promptResponder.handle(frame.text, send, read, guarded, trustRead);
         emitSettledStartupOutcomes(emitter, "claude", record.elwoodSessionId, autos, {
             emitWarnings: (warnings) => warnGate.emitWarnings(warnings),
         });
-        // Hook-backed readiness + deadline fallback; on resume the first composer also marks ready (C-API-28).
-        ready.armDeadline();
-        const reading = observeRenderedFrame(observers, frame, session);
-        active.inputBlocking = reading.facts.blocking_prompt_visible;
-        observeReadinessFrame(reading.facts); // blocking gate + resume-composer mark
-        // Surface a mid-session login-expiry banner once (C-CLAUDE-18); no-op pre-readiness.
+        frameObserver.observe(frame);
+        warnGate.emitWarnings(loginExpiring.observeFrame(snapshot, record.elwoodSessionId, renderedTerminal));
         session?.noteLoginExpiry(frame.text);
         emitter.emit("terminal:data", { elwoodSessionId: record.elwoodSessionId, data });
-    });
+    }, startupOutput.push);
     session = new ClaudeSessionImpl(record, stateDir, runtime, pty, terminal, bridge, emitter, terminalReplay, requestedSize, loopDefinitions);
-    const active = session;
+    const active = bindTurnSubmission(session, observers);
+    bindStartupLifetime(active, promptResponder, readiness);
+    frameObserver.refresh();
     const beforeCleanup = () => active.pauseLoopsForStartupCleanup(ready.cancel);
-    // Guard every live-resource step after session creation: a failure in any of them
-    // tears down the now-live PTY, bridge, terminal, and watcher first (PRD §9.1, §9.4).
     await guardStartupRegion(async () => {
         active.startLoops();
         flushPendingWarnings(); // sink now exists: flush any early-buffered diagnostic (§5.7)
-        // A hook or deadline that fired before the session existed submitted nothing
-        // (evidence is `session?.`-guarded); replay it now the session can consume it.
         ready.replay();
         pty.onExit((exit) => {
-            startupExit = exit;
-            ready.cancel(); // No queued message can release after exit; drop the pending deadline.
-            handleClaudeExit(emitter, record.elwoodSessionId, exit, finishSafely, () => active.submitExit());
+            if (observedExit)
+                return;
+            observedExit = exit;
+            active.beginExitFinalization();
+            active.closing.abort();
+            handleClaudeExit(emitter, record.elwoodSessionId, exit, (afterFlush) => finishSafely(() => warnGate.afterDelivery(afterFlush)), () => active.submitExit());
         });
-        // Release the startup buffer once the check settles (§9.4).
-        await assertStartupThenRelease("claude", startupOutput, () => startupExit);
+        await assertStartupThenRelease("claude", startupOutput, () => observedExit);
         active.submitEvidence("startup_usable");
-        if (active.inputBlocking)
-            active.submitEvidence("blocking_prompt_shown");
+        frameObserver.blockOnceLive(active);
+        input.activate();
     }, { before: beforeCleanup, pty, bridge, terminal, after: () => transcriptWatcher.stop() });
-    // Open buffered startup warnings after return so synchronous subscribers see them (C-API-14).
     if (preflightWarning !== undefined) {
         warnGate.emitWarnings([preflightEvent(record.elwoodSessionId, preflightWarning)]);
     }

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

@@ -1 +1 @@
-{"version":3,"file":"build.js","sourceRoot":"","sources":["../../../src/claude/session/build.ts"],"names":[],"mappings":"AAAA,6FAA6F;AAC7F,OAAO,EAAE,mBAAmB,EAAE,MAAM,wBAAwB,CAAC;AAC7D,OAAO,EAAE,YAAY,EAAE,WAAW,EAAE,MAAM,sBAAsB,CAAC;AACjE,OAAO,EAAE,oBAAoB,EAAE,MAAM,kCAAkC,CAAC;AACxE,OAAO,EAAE,wBAAwB,EAAE,oBAAoB,EAAE,MAAM,6BAA6B,CAAC;AAC7F,OAAO,EAAE,0BAA0B,EAAE,MAAM,6BAA6B,CAAC;AACzE,OAAO,EAAE,oBAAoB,EAAE,MAAM,+BAA+B,CAAC;AAErE,OAAO,EAAE,YAAY,EAAE,MAAM,yBAAyB,CAAC;AAEvD,OAAO,EAAE,0BAA0B,IAAI,SAAS,EAAE,MAAM,+BAA+B,CAAC;AACxF,OAAO,EAAE,mBAAmB,EAAE,MAAM,oCAAoC,CAAC;AACzE,OAAO,EAAE,wBAAwB,EAAE,mBAAmB,EAAE,MAAM,iCAAiC,CAAC;AAChG,OAAO,EAAE,uBAAuB,EAAE,kBAAkB,EAAE,MAAM,kCAAkC,CAAC;AAC/F,OAAO,EAAE,WAAW,EAAE,MAAM,sBAAsB,CAAC;AAEnD,OAAO,EAAsB,kBAAkB,EAAE,MAAM,sBAAsB,CAAC;AAC9E,OAAO,EAAE,iBAAiB,EAAE,MAAM,4BAA4B,CAAC;AAC/D,OAAO,EAA+B,cAAc,EAAE,MAAM,iBAAiB,CAAC;AAC9E,OAAO,EAAE,4BAA4B,EAAE,MAAM,uBAAuB,CAAC;AACrE,OAAO,EAAE,uBAAuB,EAAE,MAAM,oBAAoB,CAAC;AAC7D,OAAO,EAAE,8BAA8B,EAAE,MAAM,aAAa,CAAC;AAC7D,OAAO,EAAE,2BAA2B,EAAE,sBAAsB,EAAE,MAAM,mBAAmB,CAAC;AACxF,OAAO,EAAE,iBAAiB,EAAE,MAAM,eAAe,CAAC;AAClD,OAAO,EACL,oBAAoB,EACpB,gBAAgB,EAChB,oBAAoB,EACpB,cAAc,EACd,iBAAiB,GAClB,MAAM,cAAc,CAAC;AACtB,OAAO,EAAE,uBAAuB,EAAE,iBAAiB,EAAE,MAAM,iBAAiB,CAAC;AAW7E,MAAM,CAAC,KAAK,UAAU,kBAAkB,CACtC,KAA8B;IAE9B,MAAM,EAAE,MAAM,EAAE,QAAQ,EAAE,OAAO,EAAE,OAAO,EAAE,OAAO,EAAE,gBAAgB,EAAE,GAAG,KAAK,CAAC;IAChF,WAAW,CAAC,OAAO,CAAC,UAAU,CAAC,CAAC;IAChC,kBAAkB,CAAC,MAAM,EAAE,OAAO,CAAC,UAAU,CAAC,CAAC;IAC/C,MAAM,eAAe,GAAG,OAAO,CAAC,CAAC,CAAC,SAAS,CAAC,QAAQ,EAAE,MAAM,CAAC,eAAe,CAAC,CAAC,CAAC,CAAC,EAAE,CAAC;IACnF,iBAAiB,CAAC,OAAO,EAAE,OAAO,CAAC,CAAC;IACpC,MAAM,OAAO,GAAG,IAAI,YAAY,EAAkB,CAAC;IACnD,oBAAoB,CAAC,OAAO,EAAE,OAAO,CAAC,KAAK,CAAC,CAAC;IAC7C,IAAI,OAAsC,CAAC;IAC3C,2EAA2E;IAC3E,qFAAqF;IACrF,mFAAmF;IACnF,8EAA8E;IAC9E,MAAM,QAAQ,GAAG,wBAAwB,CAAC;QACxC,YAAY,EAAE,CAAC,CAAC,EAAE,EAAE,CAAC,oBAAoB,CAAC,OAAO,EAAE,CAAC,CAAC;KACtD,CAAC,CAAC;IACH,MAAM,KAAK,GAAG,uBAAuB,CAAC,MAAM,CAAC,eAAe,EAAE,OAAO,EAAE,GAAG,EAAE,CAAC,QAAQ,CAAC,CAAC;IACvF,MAAM,EAAE,OAAO,EAAE,iBAAiB,EAAE,oBAAoB,EAAE,YAAY,EAAE,GAAG,KAAK,CAAC;IACjF,kFAAkF;IAClF,qFAAqF;IACrF,gFAAgF;IAChF,MAAM,SAAS,GAAG,OAAO,CAAC,SAAS,IAAI,KAAK,CAAC;IAC7C,6EAA6E;IAC7E,kDAAkD;IAClD,MAAM,SAAS,GAAG,oBAAoB,CAAC,MAAM,CAAC,eAAe,EAAE,SAAS,EAAE,OAAO,CAAC,CAAC;IACnF,MAAM,WAAW,GAAG,SAAS,CAAC,IAAI,CAAC;IACnC,MAAM,EAAE,KAAK,EAAE,qBAAqB,EAAE,GAAG,mBAAmB,CAAC,GAAG,EAAE;QAChE,WAAW,CAAC,GAAG,CAAC,OAAO,CAAC,CAAC,CAAC,wDAAwD;QAClF,kFAAkF;QAClF,mEAAmE;QACnE,KAAK,OAAO,EAAE,oBAAoB,EAAE,CAAC;IACvC,CAAC,EAAE,OAAO,CAAC,CAAC;IACZ,MAAM,MAAM,GAAG,8BAA8B,EAAE,CAC7C,OAAO,CAAC,UAAU,EAClB,OAAO,CAAC,WAAW,EACnB,MAAM,CAAC,eAAe,EACtB,sBAAsB,CAAC;QACrB,MAAM;QACN,OAAO;QACP,OAAO;QACP,iBAAiB;QACjB,KAAK;QACL,UAAU,EAAE,GAAG,EAAE,CAAC,OAAO;QACzB,cAAc,EAAE,GAAG,EAAE,CAAC,WAAW;QACjC,qBAAqB,EAAE,CAAC,KAAK,EAAE,EAAE,CAAC,iBAAiB,CAAC,iBAAiB,EAAE,KAAK,CAAC;KAC9E,CAAC,EACF,2BAA2B,CAAC,MAAM,EAAE,OAAO,CAAC,CAC7C,CAAC;IACF,IAAI,CAAC;QACH,MAAM,MAAM,CAAC,KAAK,EAAE,CAAC;IACvB,CAAC;IAAC,OAAO,KAAK,EAAE,CAAC;QACf,iFAAiF;QACjF,gFAAgF;QAChF,MAAM,MAAM,CAAC,IAAI,EAAE,CAAC,KAAK,CAAC,GAAG,EAAE,CAAC,SAAS,CAAC,CAAC;QAC3C,MAAM,WAAW,CAAC,oBAAoB,EAAE,qCAAqC,EAAE;YAC7E,GAAG,YAAY,CAAC,KAAK,CAAC;YACtB,UAAU,EAAE,OAAO,CAAC,UAAU;SAC/B,CAAC,CAAC;IACL,CAAC;IACD,MAAM,aAAa,GAAG,OAAO,CAAC,WAAW,IAAI,mBAAmB,CAAC;IACjE,MAAM,WAAW,GAAG;QAClB,GAAG,aAAa;QAChB,IAAI,EAAE,IAAI,CAAC,GAAG,CAAC,aAAa,CAAC,IAAI,EAAE,uBAAuB,CAAC;KAC5D,CAAC;IACF,IAAI,GAAsC,CAAC;IAC3C,IAAI,CAAC;QACH,GAAG,GAAG,cAAc,CAAC,MAAM,EAAE,OAAO,CAAC,YAAY,EAAE,EAAE,GAAG,OAAO,EAAE,WAAW,EAAE,WAAW,EAAE,CAAC,CAAC;IAC/F,CAAC;IAAC,OAAO,KAAK,EAAE,CAAC;QACf,MAAM,uBAAuB,CAAC,EAAE,MAAM,EAAE,CAAC,CAAC;QAC1C,MAAM,KAAK,CAAC;IACd,CAAC;IACD,MAAM,aAAa,GAAG,mBAAmB,EAAE,CAAC;IAC5C,IAAI,WAAgC,CAAC;IACrC,MAAM,cAAc,GAAG,IAAI,oBAAoB,CAAC,MAAM,CAAC,eAAe,CAAC,CAAC;IACxE,cAAc,CAAC,uBAAuB,CAAC,OAAO,CAAC,CAAC;IAChD,MAAM,eAAe,GAAG,IAAI,4BAA4B,CAAC,SAAS,CAAC,CAAC;IACpE,IAAI,kBAAkB,GAAG,EAAE,CAAC;IAC5B,MAAM,QAAQ,GAAG,iBAAiB,CAAC,WAAW,EAAE,GAAG,EAAE,CAAC,IAAI,EAAE,gBAAgB,EAAE,EAAE;QAC9E,aAAa,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC;QACzB,cAAc,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC;QAC1B,kBAAkB,GAAG,gBAAgB,CAAC,QAAQ,EAAE,CAAC,IAAI,CAAC;QACtD,MAAM,KAAK,GAAG,EAAE,IAAI,EAAE,kBAAkB,EAAE,KAAK,EAAE,gBAAgB,CAAC,KAAK,EAAE,CAAC;QAC1E,0EAA0E;QAC1E,4EAA4E;QAC5E,kFAAkF;QAClF,MAAM,KAAK,GAAG,eAAe,CAAC,MAAM,CAClC,KAAK,CAAC,IAAI,EACV,CAAC,KAAK,EAAE,EAAE,CAAC,gBAAgB,CAAC,SAAS,CAAC,KAAK,CAAC,EAC5C,GAAG,EAAE,CAAC,kBAAkB,CACzB,CAAC;QACF,mFAAmF;QACnF,gFAAgF;QAChF,0BAA0B,CAAC,OAAO,EAAE,QAAQ,EAAE,MAAM,CAAC,eAAe,EAAE,KAAK,EAAE;YAC3E,YAAY,EAAE,CAAC,QAAQ,EAAE,EAAE,CAAC,QAAQ,CAAC,YAAY,CAAC,QAAQ,CAAC;SAC5D,CAAC,CAAC;QACH,uGAAuG;QACvG,KAAK,CAAC,WAAW,EAAE,CAAC;QACpB,MAAM,OAAO,GAAG,oBAAoB,CAAC,SAAS,EAAE,KAAK,EAAE,OAAO,CAAC,CAAC;QAChE,MAAM,CAAC,aAAa,GAAG,OAAO,CAAC,KAAK,CAAC,uBAAuB,CAAC;QAC7D,qBAAqB,CAAC,OAAO,CAAC,KAAK,CAAC,CAAC,CAAC,uCAAuC;QAC7E,qFAAqF;QACrF,OAAO,EAAE,eAAe,CAAC,KAAK,CAAC,IAAI,CAAC,CAAC;QACrC,OAAO,CAAC,IAAI,CAAC,eAAe,EAAE,EAAE,eAAe,EAAE,MAAM,CAAC,eAAe,EAAE,IAAI,EAAE,CAAC,CAAC;IACnF,CAAC,CAAC,CAAC;IACH,OAAO,GAAG,IAAI,iBAAiB,CAC7B,MAAM,EACN,QAAQ,EACR,OAAO,EACP,GAAG,EACH,QAAQ,EACR,MAAM,EACN,OAAO,EACP,cAAc,EACd,aAAa,EACb,eAAe,CAChB,CAAC;IACF,MAAM,MAAM,GAAG,OAAO,CAAC;IACvB,MAAM,aAAa,GAAG,GAAG,EAAE,CAAC,MAAM,CAAC,2BAA2B,CAAC,KAAK,CAAC,MAAM,CAAC,CAAC;IAC7E,kFAAkF;IAClF,qFAAqF;IACrF,MAAM,kBAAkB,CACtB,KAAK,IAAI,EAAE;QACT,MAAM,CAAC,UAAU,EAAE,CAAC;QACpB,oBAAoB,EAAE,CAAC,CAAC,8DAA8D;QACtF,6EAA6E;QAC7E,+EAA+E;QAC/E,KAAK,CAAC,MAAM,EAAE,CAAC;QACf,GAAG,CAAC,MAAM,CAAC,CAAC,IAAI,EAAE,EAAE;YAClB,WAAW,GAAG,IAAI,CAAC;YACnB,KAAK,CAAC,MAAM,EAAE,CAAC,CAAC,uEAAuE;YACvF,gBAAgB,CAAC,OAAO,EAAE,MAAM,CAAC,eAAe,EAAE,IAAI,EAAE,YAAY,EAAE,GAAG,EAAE,CACzE,MAAM,CAAC,UAAU,EAAE,CACpB,CAAC;QACJ,CAAC,CAAC,CAAC;QACH,4DAA4D;QAC5D,MAAM,wBAAwB,CAAC,QAAQ,EAAE,aAAa,EAAE,GAAG,EAAE,CAAC,WAAW,CAAC,CAAC;QAC3E,MAAM,CAAC,cAAc,CAAC,gBAAgB,CAAC,CAAC;QACxC,IAAI,MAAM,CAAC,aAAa;YAAE,MAAM,CAAC,cAAc,CAAC,uBAAuB,CAAC,CAAC;IAC3E,CAAC,EACD,EAAE,MAAM,EAAE,aAAa,EAAE,GAAG,EAAE,MAAM,EAAE,QAAQ,EAAE,KAAK,EAAE,GAAG,EAAE,CAAC,iBAAiB,CAAC,IAAI,EAAE,EAAE,CACxF,CAAC;IACF,8FAA8F;IAC9F,IAAI,gBAAgB,KAAK,SAAS,EAAE,CAAC;QACnC,QAAQ,CAAC,YAAY,CAAC,CAAC,cAAc,CAAC,MAAM,CAAC,eAAe,EAAE,gBAAgB,CAAC,CAAC,CAAC,CAAC;IACpF,CAAC;IACD,QAAQ,CAAC,eAAe,EAAE,CAAC;IAC3B,cAAc,CAAC,kCAAkC,EAAE,CAAC;IACpD,OAAO,OAAO,CAAC;AACjB,CAAC"}
+{"version":3,"file":"build.js","sourceRoot":"","sources":["../../../src/claude/session/build.ts"],"names":[],"mappings":"AAAA,6FAA6F;AAC7F,OAAO,EAAE,mBAAmB,EAAE,MAAM,wBAAwB,CAAC;AAC7D,OAAO,EAAE,YAAY,EAAE,WAAW,EAAE,MAAM,sBAAsB,CAAC;AACjE,OAAO,EAAE,0BAA0B,EAAE,MAAM,6BAA6B,CAAC;AACzE,OAAO,EAAE,oBAAoB,EAAE,MAAM,+BAA+B,CAAC;AAErE,OAAO,EAAE,YAAY,EAAE,MAAM,yBAAyB,CAAC;AAEvD,OAAO,EAAE,0BAA0B,IAAI,SAAS,EAAE,MAAM,+BAA+B,CAAC;AACxF,OAAO,EAAE,mBAAmB,EAAE,0BAA0B,EAAE,MAAM,iCAAiC,CAAC;AAClG,OAAO,EAAE,kBAAkB,EAAE,MAAM,uCAAuC,CAAC;AAC3E,OAAO,EAAE,mBAAmB,EAAE,MAAM,oCAAoC,CAAC;AACzE,OAAO,EAAE,kBAAkB,EAAE,MAAM,0CAA0C,CAAC;AAC9E,OAAO,EAAE,wBAAwB,EAAE,mBAAmB,EAAE,MAAM,iCAAiC,CAAC;AAChG,OAAO,EAAE,uBAAuB,EAAE,kBAAkB,EAAE,MAAM,kCAAkC,CAAC;AAC/F,OAAO,EAAE,WAAW,EAAE,MAAM,sBAAsB,CAAC;AACnD,OAAO,EAAE,kBAAkB,EAAE,MAAM,sBAAsB,CAAC;AAC1D,OAAO,EAAE,oBAAoB,EAAE,gBAAgB,EAAE,MAAM,0BAA0B,CAAC;AAClF,OAAO,EAAE,iBAAiB,EAAE,MAAM,4BAA4B,CAAC;AAC/D,OAAO,EAAE,oBAAoB,EAAE,MAAM,qBAAqB,CAAC;AAC3D,OAAO,EAAE,cAAc,EAAE,MAAM,iBAAiB,CAAC;AACjD,OAAO,EAAE,mBAAmB,EAAE,MAAM,oBAAoB,CAAC;AACzD,OAAO,EAAE,4BAA4B,EAAE,4BAA4B,EAAE,MAAM,uBAAuB,CAAC;AACnG,OAAO,EAAE,uBAAuB,EAAE,MAAM,oBAAoB,CAAC;AAC7D,OAAO,EAAE,8BAA8B,EAAE,MAAM,aAAa,CAAC;AAC7D,OAAO,EAAE,2BAA2B,EAAE,sBAAsB,EAAE,MAAM,mBAAmB,CAAC;AACxF,OAAO,EAAE,iBAAiB,EAAE,MAAM,eAAe,CAAC;AAClD,OAAO,EAEL,oBAAoB,EACpB,gBAAgB,EAChB,oBAAoB,EACpB,cAAc,EACd,iBAAiB,GAClB,MAAM,cAAc,CAAC;AACtB,OAAO,EAAE,8BAA8B,EAAE,MAAM,uBAAuB,CAAC;AACvE,OAAO,EAAE,uBAAuB,EAAE,iBAAiB,EAAE,MAAM,iBAAiB,CAAC;AAC7E,MAAM,CAAC,KAAK,UAAU,kBAAkB,CACtC,KAA8B;IAE9B,MAAM,EAAE,MAAM,EAAE,QAAQ,EAAE,OAAO,EAAE,OAAO,EAAE,OAAO,EAAE,gBAAgB,EAAE,GAAG,KAAK,CAAC;IAChF,WAAW,CAAC,OAAO,CAAC,UAAU,CAAC,CAAC;IAChC,kBAAkB,CAAC,MAAM,EAAE,OAAO,CAAC,UAAU,EAAE,OAAO,CAAC,cAAc,CAAC,WAAW,CAAC,CAAC;IACnF,MAAM,eAAe,GAAG,OAAO,CAAC,CAAC,CAAC,SAAS,CAAC,QAAQ,EAAE,MAAM,CAAC,eAAe,CAAC,CAAC,CAAC,CAAC,EAAE,CAAC;IACnF,iBAAiB,CAAC,OAAO,EAAE,OAAO,CAAC,CAAC;IACpC,MAAM,OAAO,GAAG,IAAI,YAAY,EAAkB,CAAC;IACnD,oBAAoB,CAAC,OAAO,EAAE,OAAO,CAAC,KAAK,CAAC,CAAC;IAC7C,IAAI,OAAsC,CAAC;IAC3C,MAAM,QAAQ,GAAG,8BAA8B,CAC7C,GAAG,EAAE,CAAC,OAAO,EACb,GAAG,EAAE,CAAC,eAAe,CAAC,OAAO,EAC7B,CAAC,OAAO,EAAE,EAAE,CAAC,KAAK,CAAC,cAAc,CAAC,OAAO,CAAC,CAC3C,CAAC;IACF,MAAM,KAAK,GAAG,uBAAuB,CAAC,MAAM,CAAC,eAAe,EAAE,OAAO,EAAE,GAAG,EAAE,CAAC,QAAQ,CAAC,CAAC;IACvF,MAAM,EAAE,OAAO,EAAE,iBAAiB,EAAE,oBAAoB,EAAE,YAAY,EAAE,GAAG,KAAK,CAAC;IACjF,MAAM,SAAS,GAAG,OAAO,CAAC,SAAS,IAAI,KAAK,CAAC;IAC7C,MAAM,SAAS,GAAG,oBAAoB,CAAC,MAAM,CAAC,eAAe,EAAE,SAAS,EAAE,OAAO,CAAC,CAAC;IACnF,MAAM,SAAS,GAAG,mBAAmB,CAAC,GAAG,EAAE;QACzC,SAAS,CAAC,IAAI,CAAC,GAAG,CAAC,OAAO,CAAC,CAAC,CAAC,wDAAwD;QACrF,KAAK,OAAO,EAAE,oBAAoB,EAAE,CAAC;IACvC,CAAC,EAAE,OAAO,CAAC,CAAC;IACZ,MAAM,EAAE,KAAK,EAAE,GAAG,SAAS,CAAC;IAC5B,MAAM,MAAM,GAAG,8BAA8B,EAAE,CAC7C,OAAO,CAAC,UAAU,EAClB,OAAO,CAAC,WAAW,EACnB,MAAM,CAAC,eAAe,EACtB,sBAAsB,CAAC;QACrB,MAAM;QACN,OAAO;QACP,OAAO;QACP,iBAAiB;QACjB,KAAK;QACL,UAAU,EAAE,GAAG,EAAE,CAAC,OAAO;QACzB,cAAc,EAAE,GAAG,EAAE,CAAC,SAAS,CAAC,IAAI;QACpC,qBAAqB,EAAE,CAAC,KAAK,EAAE,EAAE,CAAC,iBAAiB,CAAC,iBAAiB,EAAE,KAAK,CAAC;QAC7E,aAAa,EAAE,CAAC,KAAK,EAAE,MAAM,EAAE,EAAE,CAAC,OAAO,EAAE,mBAAmB,CAAC,KAAK,EAAE,MAAM,CAAC;KAC9E,CAAC,EACF,2BAA2B,CAAC,MAAM,EAAE,OAAO,EAAE,GAAG,EAAE,CAAC,OAAO,CAAC,CAC5D,CAAC;IACF,IAAI,CAAC;QACH,MAAM,MAAM,CAAC,KAAK,EAAE,CAAC;IACvB,CAAC;IAAC,OAAO,KAAK,EAAE,CAAC;QACf,MAAM,MAAM,CAAC,IAAI,EAAE,CAAC,KAAK,CAAC,GAAG,EAAE,CAAC,SAAS,CAAC,CAAC;QAC3C,MAAM,WAAW,CAAC,oBAAoB,EAAE,qCAAqC,EAAE;YAC7E,GAAG,YAAY,CAAC,KAAK,CAAC;YACtB,UAAU,EAAE,OAAO,CAAC,UAAU;SAC/B,CAAC,CAAC;IACL,CAAC;IACD,MAAM,aAAa,GAAG,OAAO,CAAC,WAAW,IAAI,mBAAmB,CAAC;IACjE,MAAM,WAAW,GAAG;QAClB,GAAG,aAAa;QAChB,IAAI,EAAE,IAAI,CAAC,GAAG,CAAC,aAAa,CAAC,IAAI,EAAE,uBAAuB,CAAC;KAC5D,CAAC;IACF,IAAI,GAAsC,CAAC;IAC3C,IAAI,CAAC;QACH,GAAG,GAAG,cAAc,CAAC,MAAM,EAAE,OAAO,CAAC,YAAY,EAAE,EAAE,GAAG,OAAO,EAAE,WAAW,EAAE,WAAW,EAAE,CAAC,CAAC;IAC/F,CAAC;IAAC,OAAO,KAAK,EAAE,CAAC;QACf,MAAM,uBAAuB,CAAC,EAAE,MAAM,EAAE,CAAC,CAAC;QAC1C,MAAM,KAAK,CAAC;IACd,CAAC;IACD,MAAM,aAAa,GAAG,mBAAmB,EAAE,CAAC;IAC5C,IAAI,YAAiC,CAAC;IACtC,MAAM,cAAc,GAAG,IAAI,oBAAoB,CAAC,MAAM,CAAC,eAAe,CAAC,CAAC;IACxE,cAAc,CAAC,uBAAuB,CAAC,OAAO,CAAC,CAAC;IAChD,MAAM,aAAa,GAAG,0BAA0B,CAC9C,SAAS,EACT,GAAG,EAAE,CAAC,OAAO,EACb,GAAG,EAAE,CAAC,eAAe,EACrB,SAAS,EACT,mBAAmB,CAAC,GAAG,EAAE,CAAC,QAAQ,CAAC,CACpC,CAAC;IACF,MAAM,eAAe,GAAG,IAAI,4BAA4B,CACtD,SAAS,EACT,aAAa,CAAC,OAAO,EACrB,mBAAmB,CAAC,GAAG,EAAE,CAAC,QAAQ,CAAC,CACpC,CAAC;IACF,IAAI,kBAAkB,GAAG,EAAE,CAAC;IAC5B,MAAM,aAAa,GAAG,IAAI,oBAAoB,EAAE,CAAC;IACjD,MAAM,QAAQ,GAAG,iBAAiB,CAChC,WAAW,EACX,GAAG,EACH,CAAC,IAAI,EAAE,gBAAgB,EAAE,EAAE;QACzB,cAAc,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC;QAC1B,MAAM,QAAQ,GAAG,gBAAgB,CAAC,gBAAgB,CAAC,CAAC;QACpD,kBAAkB,GAAG,QAAQ,CAAC,IAAI,CAAC;QACnC,MAAM,KAAK,GAAG,EAAE,IAAI,EAAE,kBAAkB,EAAE,KAAK,EAAE,gBAAgB,CAAC,KAAK,EAAE,CAAC;QAC1E,MAAM,IAAI,GAAG,CAAC,KAAa,EAAE,EAAE,CAC7B,kBAAkB,CAAC,gBAAgB,EAAE,GAAG,EAAE,CAAC,gBAAgB,CAAC,SAAS,CAAC,KAAK,CAAC,CAAC,CAAC;QAChF,MAAM,IAAI,GAAG,GAAG,EAAE,CAAC,kBAAkB,CAAC;QACtC,MAAM,OAAO,GAAG,4BAA4B,CAC1C,gBAAgB,EAChB,IAAI,EACJ,IAAI,EACJ,GAAG,EAAE,CAAC,eAAe,CAAC,OAAO,EAC7B,eAAe,CAAC,aAAa,CAC9B,CAAC;QACF,MAAM,SAAS,GAAG,GAAG,EAAE,CAAC,oBAAoB,CAAC,gBAAgB,CAAC,EAAE,IAAI,CAAC;QACrE,MAAM,KAAK,GAAG,eAAe,CAAC,MAAM,CAAC,KAAK,CAAC,IAAI,EAAE,IAAI,EAAE,IAAI,EAAE,OAAO,EAAE,SAAS,CAAC,CAAC;QACjF,0BAA0B,CAAC,OAAO,EAAE,QAAQ,EAAE,MAAM,CAAC,eAAe,EAAE,KAAK,EAAE;YAC3E,YAAY,EAAE,CAAC,QAAQ,EAAE,EAAE,CAAC,QAAQ,CAAC,YAAY,CAAC,QAAQ,CAAC;SAC5D,CAAC,CAAC;QACH,aAAa,CAAC,OAAO,CAAC,KAAK,CAAC,CAAC;QAC7B,QAAQ,CAAC,YAAY,CACnB,aAAa,CAAC,YAAY,CAAC,QAAQ,EAAE,MAAM,CAAC,eAAe,EAAE,gBAAgB,CAAC,CAC/E,CAAC;QACF,OAAO,EAAE,eAAe,CAAC,KAAK,CAAC,IAAI,CAAC,CAAC;QACrC,OAAO,CAAC,IAAI,CAAC,eAAe,EAAE,EAAE,eAAe,EAAE,MAAM,CAAC,eAAe,EAAE,IAAI,EAAE,CAAC,CAAC;IACnF,CAAC,EACD,aAAa,CAAC,IAAI,CACnB,CAAC;IACF,OAAO,GAAG,IAAI,iBAAiB,CAC7B,MAAM,EACN,QAAQ,EACR,OAAO,EACP,GAAG,EACH,QAAQ,EACR,MAAM,EACN,OAAO,EACP,cAAc,EACd,aAAa,EACb,eAAe,CAChB,CAAC;IACF,MAAM,MAAM,GAAG,kBAAkB,CAAC,OAAO,EAAE,SAAS,CAAC,CAAC;IACtD,mBAAmB,CAAC,MAAM,EAAE,eAAe,EAAE,SAAS,CAAC,CAAC;IACxD,aAAa,CAAC,OAAO,EAAE,CAAC;IACxB,MAAM,aAAa,GAAG,GAAG,EAAE,CAAC,MAAM,CAAC,2BAA2B,CAAC,KAAK,CAAC,MAAM,CAAC,CAAC;IAC7E,MAAM,kBAAkB,CACtB,KAAK,IAAI,EAAE;QACT,MAAM,CAAC,UAAU,EAAE,CAAC;QACpB,oBAAoB,EAAE,CAAC,CAAC,8DAA8D;QACtF,KAAK,CAAC,MAAM,EAAE,CAAC;QACf,GAAG,CAAC,MAAM,CAAC,CAAC,IAAI,EAAE,EAAE;YAClB,IAAI,YAAY;gBAAE,OAAO;YACzB,YAAY,GAAG,IAAI,CAAC;YACpB,MAAM,CAAC,qBAAqB,EAAE,CAAC;YAC/B,MAAM,CAAC,OAAO,CAAC,KAAK,EAAE,CAAC;YACvB,gBAAgB,CACd,OAAO,EACP,MAAM,CAAC,eAAe,EACtB,IAAI,EACJ,CAAC,UAAU,EAAE,EAAE,CAAC,YAAY,CAAC,GAAG,EAAE,CAAC,QAAQ,CAAC,aAAa,CAAC,UAAU,CAAC,CAAC,EACtE,GAAG,EAAE,CAAC,MAAM,CAAC,UAAU,EAAE,CAC1B,CAAC;QACJ,CAAC,CAAC,CAAC;QACH,MAAM,wBAAwB,CAAC,QAAQ,EAAE,aAAa,EAAE,GAAG,EAAE,CAAC,YAAY,CAAC,CAAC;QAC5E,MAAM,CAAC,cAAc,CAAC,gBAAgB,CAAC,CAAC;QACxC,aAAa,CAAC,aAAa,CAAC,MAAM,CAAC,CAAC;QACpC,KAAK,CAAC,QAAQ,EAAE,CAAC;IACnB,CAAC,EACD,EAAE,MAAM,EAAE,aAAa,EAAE,GAAG,EAAE,MAAM,EAAE,QAAQ,EAAE,KAAK,EAAE,GAAG,EAAE,CAAC,iBAAiB,CAAC,IAAI,EAAE,EAAE,CACxF,CAAC;IACF,IAAI,gBAAgB,KAAK,SAAS,EAAE,CAAC;QACnC,QAAQ,CAAC,YAAY,CAAC,CAAC,cAAc,CAAC,MAAM,CAAC,eAAe,EAAE,gBAAgB,CAAC,CAAC,CAAC,CAAC;IACpF,CAAC;IACD,QAAQ,CAAC,eAAe,EAAE,CAAC;IAC3B,cAAc,CAAC,kCAAkC,EAAE,CAAC;IACpD,OAAO,OAAO,CAAC;AACjB,CAAC"}

package/dist/claude/session/hook-handler.d.ts

@@ -11,7 +11,7 @@ import type { ClaudeEventMap, HookErrorEvent, StartClaudeOptions } from "../../c
 import type { TypedEmitter } from "../../events/emitter.ts";
 import type { InitialReady } from "../../runtime/readiness/initial-ready.ts";
 import type { SessionRecord } from "../../state/store.ts";
-import type { ClaudeHookEvent } from "../hooks/index.ts";
+import type { ClaudeHookEvent, ClaudeHookResult } from "../hooks/index.ts";
 import type { ClaudeSessionImpl } from "./instance.ts";
 /** The live pieces the Claude hook handler drives; `session`/`turnWatcher` are read
  * lazily because both are assigned after the bridge is constructed. */
@@ -26,9 +26,10 @@ export type ClaudeHookHandlerDeps = {
     readonly getSession: () => ClaudeSessionImpl | undefined;
     readonly getTurnWatcher: () => TurnStateWatcher;
     readonly observeHookTranscript: (event: ClaudeHookEvent) => void;
+    readonly onHookOutcome?: (event: ClaudeHookEvent, result: ClaudeHookResult) => void;
 };
 /** Builds the async hook-message handler passed to the Claude hook bridge factory. */
 export declare function buildClaudeHookHandler(deps: ClaudeHookHandlerDeps): (input: unknown) => Promise<BridgeProcessResult>;
 /** Builds the hook-error handler passed to the Claude hook bridge factory. */
-export declare function buildClaudeHookErrorHandler(record: SessionRecord, emitter: TypedEmitter<ClaudeEventMap>): (event: Omit<HookErrorEvent, "elwoodSessionId">) => void;
+export declare function buildClaudeHookErrorHandler(record: SessionRecord, emitter: TypedEmitter<ClaudeEventMap>, getSession?: () => ClaudeSessionImpl | undefined): (event: Omit<HookErrorEvent, "elwoodSessionId">) => void;
 //# sourceMappingURL=hook-handler.d.ts.map

package/dist/claude/session/hook-handler.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"hook-handler.d.ts","sourceRoot":"","sources":["../../../src/claude/session/hook-handler.ts"],"names":[],"mappings":"AAAA;;;;;;GAMG;AAEH,OAAO,KAAK,EAAE,mBAAmB,EAAE,MAAM,uBAAuB,CAAC;AAEjE,OAAO,KAAK,EAAE,gBAAgB,EAAE,MAAM,0BAA0B,CAAC;AACjE,OAAO,KAAK,EAAE,cAAc,EAAE,cAAc,EAAE,kBAAkB,EAAE,MAAM,qBAAqB,CAAC;AAC9F,OAAO,KAAK,EAAE,YAAY,EAAE,MAAM,yBAAyB,CAAC;AAC5D,OAAO,KAAK,EAAE,YAAY,EAAE,MAAM,0CAA0C,CAAC;AAC7E,OAAO,KAAK,EAAE,aAAa,EAAE,MAAM,sBAAsB,CAAC;AAE1D,OAAO,KAAK,EAAE,eAAe,EAAE,MAAM,mBAAmB,CAAC;AAGzD,OAAO,KAAK,EAAE,iBAAiB,EAAE,MAAM,eAAe,CAAC;AAEvD;uEACuE;AACvE,MAAM,MAAM,qBAAqB,GAAG;IAClC,QAAQ,CAAC,MAAM,EAAE,aAAa,CAAC;IAC/B,QAAQ,CAAC,OAAO,EAAE,kBAAkB,CAAC;IACrC,QAAQ,CAAC,OAAO,EAAE,YAAY,CAAC,cAAc,CAAC,CAAC;IAC/C,QAAQ,CAAC,iBAAiB,EAAE;QAAE,QAAQ,CAAC,IAAI,EAAE,MAAM,IAAI,CAAA;KAAE,CAAC;IAC1D,QAAQ,CAAC,KAAK,EAAE,YAAY,CAAC;IAC7B,QAAQ,CAAC,UAAU,EAAE,MAAM,iBAAiB,GAAG,SAAS,CAAC;IACzD,QAAQ,CAAC,cAAc,EAAE,MAAM,gBAAgB,CAAC;IAChD,QAAQ,CAAC,qBAAqB,EAAE,CAAC,KAAK,EAAE,eAAe,KAAK,IAAI,CAAC;CAClE,CAAC;AAEF,sFAAsF;AACtF,wBAAgB,sBAAsB,CACpC,IAAI,EAAE,qBAAqB,GAC1B,CAAC,KAAK,EAAE,OAAO,KAAK,OAAO,CAAC,mBAAmB,CAAC,CAiClD;AAED,8EAA8E;AAC9E,wBAAgB,2BAA2B,CACzC,MAAM,EAAE,aAAa,EACrB,OAAO,EAAE,YAAY,CAAC,cAAc,CAAC,GACpC,CAAC,KAAK,EAAE,IAAI,CAAC,cAAc,EAAE,iBAAiB,CAAC,KAAK,IAAI,CAM1D"}
+{"version":3,"file":"hook-handler.d.ts","sourceRoot":"","sources":["../../../src/claude/session/hook-handler.ts"],"names":[],"mappings":"AAAA;;;;;;GAMG;AAEH,OAAO,KAAK,EAAE,mBAAmB,EAAE,MAAM,uBAAuB,CAAC;AAKjE,OAAO,KAAK,EAAE,gBAAgB,EAAE,MAAM,0BAA0B,CAAC;AACjE,OAAO,KAAK,EAAE,cAAc,EAAE,cAAc,EAAE,kBAAkB,EAAE,MAAM,qBAAqB,CAAC;AAC9F,OAAO,KAAK,EAAE,YAAY,EAAE,MAAM,yBAAyB,CAAC;AAC5D,OAAO,KAAK,EAAE,YAAY,EAAE,MAAM,0CAA0C,CAAC;AAC7E,OAAO,KAAK,EAAE,aAAa,EAAE,MAAM,sBAAsB,CAAC;AAE1D,OAAO,KAAK,EAAE,eAAe,EAAE,gBAAgB,EAAE,MAAM,mBAAmB,CAAC;AAG3E,OAAO,KAAK,EAAE,iBAAiB,EAAE,MAAM,eAAe,CAAC;AAEvD;uEACuE;AACvE,MAAM,MAAM,qBAAqB,GAAG;IAClC,QAAQ,CAAC,MAAM,EAAE,aAAa,CAAC;IAC/B,QAAQ,CAAC,OAAO,EAAE,kBAAkB,CAAC;IACrC,QAAQ,CAAC,OAAO,EAAE,YAAY,CAAC,cAAc,CAAC,CAAC;IAC/C,QAAQ,CAAC,iBAAiB,EAAE;QAAE,QAAQ,CAAC,IAAI,EAAE,MAAM,IAAI,CAAA;KAAE,CAAC;IAC1D,QAAQ,CAAC,KAAK,EAAE,YAAY,CAAC;IAC7B,QAAQ,CAAC,UAAU,EAAE,MAAM,iBAAiB,GAAG,SAAS,CAAC;IACzD,QAAQ,CAAC,cAAc,EAAE,MAAM,gBAAgB,CAAC;IAChD,QAAQ,CAAC,qBAAqB,EAAE,CAAC,KAAK,EAAE,eAAe,KAAK,IAAI,CAAC;IACjE,QAAQ,CAAC,aAAa,CAAC,EAAE,CAAC,KAAK,EAAE,eAAe,EAAE,MAAM,EAAE,gBAAgB,KAAK,IAAI,CAAC;CACrF,CAAC;AAEF,sFAAsF;AACtF,wBAAgB,sBAAsB,CACpC,IAAI,EAAE,qBAAqB,GAC1B,CAAC,KAAK,EAAE,OAAO,KAAK,OAAO,CAAC,mBAAmB,CAAC,CAkElD;AAED,8EAA8E;AAC9E,wBAAgB,2BAA2B,CACzC,MAAM,EAAE,aAAa,EACrB,OAAO,EAAE,YAAY,CAAC,cAAc,CAAC,EACrC,UAAU,CAAC,EAAE,MAAM,iBAAiB,GAAG,SAAS,GAC/C,CAAC,KAAK,EAAE,IAAI,CAAC,cAAc,EAAE,iBAAiB,CAAC,KAAK,IAAI,CAc1D"}

package/dist/claude/session/hook-handler.js

@@ -6,6 +6,9 @@
  * `InstructionsLoaded` (C-API-28), turn-end on an unblocked `Stop` (C-CLAUDE-15).
  */
 import * as activity from "../../core/activity/index.js";
+import { freezeHookEvent } from "../../core/freeze-hook-event.js";
+import { hookObservationBoundary } from "../../core/hook-observation.js";
+import { withStopInput, withStopInputNotification } from "../../core/stop-input.js";
 import { isBlock, requestHook } from "../hooks/dispatch.js";
 import { normalizeClaudeHookEvent } from "../normalize.js";
 import { serializeHookResult } from "../serialize.js";
@@ -13,30 +16,53 @@ import { serializeHookResult } from "../serialize.js";
 export function buildClaudeHookHandler(deps) {
     const { record, options, emitter, transcriptWatcher, ready } = deps;
     return async (input) => {
-        const event = normalizeClaudeHookEvent(input);
+        const event = freezeHookEvent(normalizeClaudeHookEvent(input));
+        return await withStopInput({ hookName: event.hook_event_name, session: deps.getSession() ?? record }, () => observeAndRequest(event));
+    };
+    async function observeAndRequest(event) {
+        const submissionGenerationUnchanged = event.hook_event_name === "Stop"
+            ? deps.getSession()?.stopCompletion.captureSubmissionGeneration()
+            : undefined;
+        const observation = hookObservationBoundary(emitter, record.elwoodSessionId, "claude");
         if (event.hook_event_name === "SessionStart")
             deps.getSession()?.rememberClaudeSessionId(event.session_id);
-        deps.observeHookTranscript(event);
-        emitter.emit("hook", event);
-        emitter.emit("activity", activity.activityFromClaudeHook(record.elwoodSessionId, event));
-        const outcome = await requestHook(emitter, event, options.hookTimeoutMs ?? 25_000, record.elwoodSessionId);
-        emitter.emit("activity", activity.activityFromHookResult("claude", record.elwoodSessionId, event.hook_event_name, outcome.result, outcome.failedOpen));
+        observation.run("transcript", () => deps.observeHookTranscript(event));
+        observation.run("hook", () => emitter.emit("hook", event));
+        observation.run("activity", () => emitter.emit("activity", activity.activityFromClaudeHook(record.elwoodSessionId, event)));
+        const outcome = await requestHook({
+            hasListeners: (name) => emitter.hasListeners(name),
+            requestWithProvenance: (name, payload) => emitter.requestWithProvenance(name, payload),
+            emit: (name, payload) => observation.run(name === "hookError" ? "hook_error" : "activity", () => emitter.emit(name, payload)),
+        }, event, options.hookTimeoutMs ?? 25_000, record.elwoodSessionId);
+        const serialized = serializeHookResult(event.hook_event_name, outcome.result);
+        const blocked = isBlock(outcome.result);
+        observation.run("activity", () => emitter.emit("activity", activity.activityFromHookResult("claude", record.elwoodSessionId, event.hook_event_name, outcome.result, outcome.failedOpen)));
+        observation.run("activity", () => deps.onHookOutcome?.(event, outcome.result));
         if (event.hook_event_name === "InstructionsLoaded")
-            ready.mark();
-        if (event.hook_event_name === "Stop" && !isBlock(outcome.result)) {
-            transcriptWatcher.scan(); // Committed turn is on disk; read it now (C-CLAUDE-15).
-            deps.getTurnWatcher().arm();
-            deps.getSession()?.submitEvidence("hook_turn_ended");
+            observation.run("lifecycle", () => ready.mark());
+        if (event.hook_event_name === "Stop" && !blocked) {
+            observation.run("transcript", () => transcriptWatcher.scan());
+            // Diagnostic callbacks may submit input; report before comparing physical generations.
+            observation.report();
+            // Guidance may steer the current turn; every physical submission supersedes this Stop.
+            const sameSubmissionGeneration = submissionGenerationUnchanged?.() ?? true;
+            if (sameSubmissionGeneration) {
+                deps.getTurnWatcher().arm();
+                observation.run("lifecycle", () => deps.getSession()?.submitEvidence("hook_turn_ended"));
+            }
         }
-        return serializeHookResult(event.hook_event_name, outcome.result);
-    };
+        observation.report();
+        return serialized;
+    }
 }
 /** Builds the hook-error handler passed to the Claude hook bridge factory. */
-export function buildClaudeHookErrorHandler(record, emitter) {
-    return (event) => {
+export function buildClaudeHookErrorHandler(record, emitter, getSession) {
+    return (event) => withStopInputNotification({ hookName: event.hookEventName, session: getSession?.() ?? record }, () => {
         const hookError = { elwoodSessionId: record.elwoodSessionId, ...event };
-        emitter.emit("hookError", hookError);
-        emitter.emit("activity", activity.activityFromHookError("claude", hookError));
-    };
+        const observation = hookObservationBoundary(emitter, record.elwoodSessionId, "claude");
+        observation.run("hook_error", () => emitter.emit("hookError", hookError));
+        observation.run("activity", () => emitter.emit("activity", activity.activityFromHookError("claude", hookError)));
+        observation.report();
+    });
 }
 //# sourceMappingURL=hook-handler.js.map

package/dist/claude/session/hook-handler.js.map

@@ -1 +1 @@
-{"version":3,"file":"hook-handler.js","sourceRoot":"","sources":["../../../src/claude/session/hook-handler.ts"],"names":[],"mappings":"AAAA;;;;;;GAMG;AAGH,OAAO,KAAK,QAAQ,MAAM,8BAA8B,CAAC;AAMzD,OAAO,EAAE,OAAO,EAAE,WAAW,EAAE,MAAM,sBAAsB,CAAC;AAE5D,OAAO,EAAE,wBAAwB,EAAE,MAAM,iBAAiB,CAAC;AAC3D,OAAO,EAAE,mBAAmB,EAAE,MAAM,iBAAiB,CAAC;AAgBtD,sFAAsF;AACtF,MAAM,UAAU,sBAAsB,CACpC,IAA2B;IAE3B,MAAM,EAAE,MAAM,EAAE,OAAO,EAAE,OAAO,EAAE,iBAAiB,EAAE,KAAK,EAAE,GAAG,IAAI,CAAC;IACpE,OAAO,KAAK,EAAE,KAAc,EAAgC,EAAE;QAC5D,MAAM,KAAK,GAAG,wBAAwB,CAAC,KAAK,CAAC,CAAC;QAC9C,IAAI,KAAK,CAAC,eAAe,KAAK,cAAc;YAC1C,IAAI,CAAC,UAAU,EAAE,EAAE,uBAAuB,CAAC,KAAK,CAAC,UAAU,CAAC,CAAC;QAC/D,IAAI,CAAC,qBAAqB,CAAC,KAAK,CAAC,CAAC;QAClC,OAAO,CAAC,IAAI,CAAC,MAAM,EAAE,KAAK,CAAC,CAAC;QAC5B,OAAO,CAAC,IAAI,CAAC,UAAU,EAAE,QAAQ,CAAC,sBAAsB,CAAC,MAAM,CAAC,eAAe,EAAE,KAAK,CAAC,CAAC,CAAC;QACzF,MAAM,OAAO,GAAG,MAAM,WAAW,CAC/B,OAAO,EACP,KAAK,EACL,OAAO,CAAC,aAAa,IAAI,MAAM,EAC/B,MAAM,CAAC,eAAe,CACvB,CAAC;QACF,OAAO,CAAC,IAAI,CACV,UAAU,EACV,QAAQ,CAAC,sBAAsB,CAC7B,QAAQ,EACR,MAAM,CAAC,eAAe,EACtB,KAAK,CAAC,eAAe,EACrB,OAAO,CAAC,MAAM,EACd,OAAO,CAAC,UAAU,CACnB,CACF,CAAC;QACF,IAAI,KAAK,CAAC,eAAe,KAAK,oBAAoB;YAAE,KAAK,CAAC,IAAI,EAAE,CAAC;QACjE,IAAI,KAAK,CAAC,eAAe,KAAK,MAAM,IAAI,CAAC,OAAO,CAAC,OAAO,CAAC,MAAM,CAAC,EAAE,CAAC;YACjE,iBAAiB,CAAC,IAAI,EAAE,CAAC,CAAC,wDAAwD;YAClF,IAAI,CAAC,cAAc,EAAE,CAAC,GAAG,EAAE,CAAC;YAC5B,IAAI,CAAC,UAAU,EAAE,EAAE,cAAc,CAAC,iBAAiB,CAAC,CAAC;QACvD,CAAC;QACD,OAAO,mBAAmB,CAAC,KAAK,CAAC,eAAe,EAAE,OAAO,CAAC,MAAM,CAAC,CAAC;IACpE,CAAC,CAAC;AACJ,CAAC;AAED,8EAA8E;AAC9E,MAAM,UAAU,2BAA2B,CACzC,MAAqB,EACrB,OAAqC;IAErC,OAAO,CAAC,KAAK,EAAE,EAAE;QACf,MAAM,SAAS,GAAG,EAAE,eAAe,EAAE,MAAM,CAAC,eAAe,EAAE,GAAG,KAAK,EAAE,CAAC;QACxE,OAAO,CAAC,IAAI,CAAC,WAAW,EAAE,SAAS,CAAC,CAAC;QACrC,OAAO,CAAC,IAAI,CAAC,UAAU,EAAE,QAAQ,CAAC,qBAAqB,CAAC,QAAQ,EAAE,SAAS,CAAC,CAAC,CAAC;IAChF,CAAC,CAAC;AACJ,CAAC"}
+{"version":3,"file":"hook-handler.js","sourceRoot":"","sources":["../../../src/claude/session/hook-handler.ts"],"names":[],"mappings":"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"}

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

@@ -1,5 +1,6 @@
 /** ClaudeSessionApi entry points: preflight, record creation, and socket-home-guarded start. Implements PRD §5, §6, §8, §9. */
 import type { StartClaudeOptions } from "../../core/types.ts";
+import type { LaunchReservation } from "../../state/launch-ownership.ts";
 import type { SessionRecord } from "../../state/store.ts";
 import type { ClaudePreflightWarning } from "../preflight.ts";
 import { resetClaudeHookBridgeFactoryForTests, setHookBridgeFactoryForTests } from "./bridge.ts";
@@ -14,5 +15,5 @@ export { resetClaudeHookBridgeFactoryForTests as resetClaudeSessionSeamsForTests
 export declare function startClaude(rawOptions: StartClaudeOptions): Promise<ClaudeSessionApi>;
 /** Internal deterministic-identity start used by owners that must clean failed launch state. */
 export declare function startClaudeWithId(rawOptions: StartClaudeOptions, elwoodSessionId: string): Promise<ClaudeSessionApi>;
-export declare function startClaudeFromRecord(record: SessionRecord, stateDir: string, options: StartClaudeOptions, resumed: boolean, preflightWarning: ClaudePreflightWarning | undefined): Promise<import("./instance.ts").ClaudeSessionImpl>;
+export declare function startClaudeFromRecord(record: SessionRecord, stateDir: string, options: StartClaudeOptions, resumed: boolean, preflightWarning: ClaudePreflightWarning | undefined, ownership?: LaunchReservation): Promise<import("./instance.ts").ClaudeSessionImpl>;
 //# sourceMappingURL=index.d.ts.map

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

@@ -1 +1 @@
-{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../src/claude/session/index.ts"],"names":[],"mappings":"AAAA,+HAA+H;AAO/H,OAAO,KAAK,EAAE,kBAAkB,EAAE,MAAM,qBAAqB,CAAC;AAK9D,OAAO,KAAK,EAAE,aAAa,EAAE,MAAM,sBAAsB,CAAC;AAE1D,OAAO,KAAK,EAAE,sBAAsB,EAAE,MAAM,iBAAiB,CAAC;AAE9D,OAAO,EAAE,oCAAoC,EAAE,4BAA4B,EAAE,MAAM,aAAa,CAAC;AAEjG,OAAO,KAAK,EAAE,gBAAgB,EAAE,MAAM,gBAAgB,CAAC;AAEvD,OAAO,EACL,oCAAoC,IAAI,+BAA+B,EACvE,4BAA4B,GAC7B,CAAC;AAEF;;;;;GAKG;AACH,wBAAgB,WAAW,CAAC,UAAU,EAAE,kBAAkB,GAAG,OAAO,CAAC,gBAAgB,CAAC,CAErF;AAED,gGAAgG;AAChG,wBAAsB,iBAAiB,CACrC,UAAU,EAAE,kBAAkB,EAC9B,eAAe,EAAE,MAAM,GACtB,OAAO,CAAC,gBAAgB,CAAC,CAiB3B;AAED,wBAAgB,qBAAqB,CACnC,MAAM,EAAE,aAAa,EACrB,QAAQ,EAAE,MAAM,EAChB,OAAO,EAAE,kBAAkB,EAC3B,OAAO,EAAE,OAAO,EAChB,gBAAgB,EAAE,sBAAsB,GAAG,SAAS,sDAwBrD"}
+{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../src/claude/session/index.ts"],"names":[],"mappings":"AAAA,+HAA+H;AAQ/H,OAAO,KAAK,EAAE,kBAAkB,EAAE,MAAM,qBAAqB,CAAC;AAI9D,OAAO,KAAK,EAAE,iBAAiB,EAAE,MAAM,iCAAiC,CAAC;AAKzE,OAAO,KAAK,EAAE,aAAa,EAAE,MAAM,sBAAsB,CAAC;AAE1D,OAAO,KAAK,EAAE,sBAAsB,EAAE,MAAM,iBAAiB,CAAC;AAE9D,OAAO,EAAE,oCAAoC,EAAE,4BAA4B,EAAE,MAAM,aAAa,CAAC;AAEjG,OAAO,KAAK,EAAE,gBAAgB,EAAE,MAAM,gBAAgB,CAAC;AAEvD,OAAO,EACL,oCAAoC,IAAI,+BAA+B,EACvE,4BAA4B,GAC7B,CAAC;AAEF;;;;;GAKG;AACH,wBAAgB,WAAW,CAAC,UAAU,EAAE,kBAAkB,GAAG,OAAO,CAAC,gBAAgB,CAAC,CAErF;AAED,gGAAgG;AAChG,wBAAsB,iBAAiB,CACrC,UAAU,EAAE,kBAAkB,EAC9B,eAAe,EAAE,MAAM,GACtB,OAAO,CAAC,gBAAgB,CAAC,CAkB3B;AAED,wBAAgB,qBAAqB,CACnC,MAAM,EAAE,aAAa,EACrB,QAAQ,EAAE,MAAM,EAChB,OAAO,EAAE,kBAAkB,EAC3B,OAAO,EAAE,OAAO,EAChB,gBAAgB,EAAE,sBAAsB,GAAG,SAAS,EACpD,SAAS,CAAC,EAAE,iBAAiB,sDA0C9B"}

package/dist/claude/session/index.js

@@ -1,13 +1,17 @@
 /** ClaudeSessionApi entry points: preflight, record creation, and socket-home-guarded start. Implements PRD §5, §6, §8, §9. */
 import { randomUUID } from "node:crypto";
 import { resolve } from "node:path";
+import { checkedInputBytes } from "../../core/control-queue/budget.js";
 import { applyClaudeHighTrust } from "../../core/high-trust.js";
 import { queuePersonaMessage } from "../../core/persona.js";
 import { claudeReasoningEfforts, 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 { claudeLaunchPosture, withClaudeLaunch } 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 { preflightClaude } from "../preflight.js";
 import { resetClaudeHookBridgeFactoryForTests, setHookBridgeFactoryForTests } from "./bridge.js";
@@ -32,16 +36,17 @@ export async function startClaudeWithId(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 = applyClaudeHighTrust({ ...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 strict = options.strictVersionCheck ?? false;
     const warning = await preflightClaude(strict, options.autoupdate ?? false);
     prepareStateDir(stateDir, { gitignore: options.stateDir === undefined });
     const createdRecord = createSessionRecord({ cwd: options.cwd, id: elwoodSessionId });
     const record = withClaudeLaunch(createdRecord, claudeLaunchPosture(options));
     const session = await startClaudeFromRecord(record, stateDir, options, false, warning);
-    return queuePersonaMessage(session, options.persona);
+    return queuePersonaMessage(session, options.persona, session.closing.signal);
 }
-export function startClaudeFromRecord(record, stateDir, options, resumed, preflightWarning) {
+export function startClaudeFromRecord(record, stateDir, options, resumed, preflightWarning, ownership) {
     // Validate the effort enum before any spawn (C-CLAUDE-20): both start and resume
     // funnel through here, so a bad value fails fast at the single chokepoint.
     validateReasoningEffort(options.reasoningEffort, claudeReasoningEfforts, "claude_invalid_reasoning_effort");
@@ -51,11 +56,21 @@ export function startClaudeFromRecord(record, stateDir, options, resumed, prefli
     // 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: "claude",
+    return withLaunchOwnership(safeSessionDir(stateDir, record.elwoodSessionId), ownership, (owner, activate) => {
+        const runtime = sessionRuntime({
+            stateDir,
+            elwoodSessionId: record.elwoodSessionId,
+            adapter: "claude",
+        }, owner);
+        return withSocketHomeCleanup(() => removeOwnSocketFile(runtime.socketPath), () => buildClaudeSession({
+            record,
+            stateDir,
+            runtime,
+            options,
+            resumed,
+            preflightWarning,
+            activate,
+        }));
     });
-    return withSocketHomeCleanup(() => removeOwnSocketFile(runtime.socketPath), () => buildClaudeSession({ record, stateDir, runtime, options, resumed, preflightWarning }));
 }
 //# sourceMappingURL=index.js.map

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

@@ -1 +1 @@
-{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../src/claude/session/index.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../src/claude/session/index.ts"],"names":[],"mappings":"AAAA,+HAA+H;AAE/H,OAAO,EAAE,UAAU,EAAE,MAAM,aAAa,CAAC;AACzC,OAAO,EAAE,OAAO,EAAE,MAAM,WAAW,CAAC;AACpC,OAAO,EAAE,iBAAiB,EAAE,MAAM,oCAAoC,CAAC;AACvE,OAAO,EAAE,oBAAoB,EAAE,MAAM,0BAA0B,CAAC;AAChE,OAAO,EAAE,mBAAmB,EAAE,MAAM,uBAAuB,CAAC;AAC5D,OAAO,EAAE,sBAAsB,EAAE,uBAAuB,EAAE,MAAM,gCAAgC,CAAC;AAEjG,OAAO,EAAE,qBAAqB,EAAE,MAAM,kCAAkC,CAAC;AACzE,OAAO,EAAE,kBAAkB,EAAE,MAAM,+BAA+B,CAAC;AACnE,OAAO,EAAE,cAAc,EAAE,MAAM,sBAAsB,CAAC;AAEtD,OAAO,EAAE,mBAAmB,EAAE,gBAAgB,EAAE,MAAM,+BAA+B,CAAC;AACtF,OAAO,EAAE,cAAc,EAAE,MAAM,8BAA8B,CAAC;AAC9D,OAAO,EAAE,mBAAmB,EAAE,MAAM,4BAA4B,CAAC;AACjE,OAAO,EAAE,mBAAmB,EAAE,MAAM,kCAAkC,CAAC;AAEvE,OAAO,EAAE,mBAAmB,EAAE,eAAe,EAAE,eAAe,EAAE,MAAM,sBAAsB,CAAC;AAE7F,OAAO,EAAE,eAAe,EAAE,MAAM,iBAAiB,CAAC;AAClD,OAAO,EAAE,oCAAoC,EAAE,4BAA4B,EAAE,MAAM,aAAa,CAAC;AACjG,OAAO,EAAE,kBAAkB,EAAE,MAAM,YAAY,CAAC;AAGhD,OAAO,EACL,oCAAoC,IAAI,+BAA+B,EACvE,4BAA4B,GAC7B,CAAC;AAEF;;;;;GAKG;AACH,MAAM,UAAU,WAAW,CAAC,UAA8B;IACxD,OAAO,iBAAiB,CAAC,UAAU,EAAE,UAAU,EAAE,CAAC,CAAC;AACrD,CAAC;AAED,gGAAgG;AAChG,MAAM,CAAC,KAAK,UAAU,iBAAiB,CACrC,UAA8B,EAC9B,eAAuB;IAEvB,qFAAqF;IACrF,uFAAuF;IACvF,uFAAuF;IACvF,uFAAuF;IACvF,iFAAiF;IACjF,oFAAoF;IACpF,6DAA6D;IAC7D,MAAM,OAAO,GAAG,oBAAoB,CAAC,EAAE,GAAG,UAAU,EAAE,GAAG,EAAE,OAAO,CAAC,UAAU,CAAC,GAAG,CAAC,EAAE,CAAC,CAAC;IACtF,iBAAiB,CAAC,OAAO,CAAC,OAAO,IAAI,EAAE,CAAC,CAAC;IACzC,MAAM,QAAQ,GAAG,kBAAkB,CAAC,OAAO,CAAC,QAAQ,IAAI,eAAe,CAAC,OAAO,CAAC,GAAG,CAAC,CAAC,CAAC;IACtF,MAAM,MAAM,GAAG,OAAO,CAAC,kBAAkB,IAAI,KAAK,CAAC;IACnD,MAAM,OAAO,GAAG,MAAM,eAAe,CAAC,MAAM,EAAE,OAAO,CAAC,UAAU,IAAI,KAAK,CAAC,CAAC;IAC3E,eAAe,CAAC,QAAQ,EAAE,EAAE,SAAS,EAAE,OAAO,CAAC,QAAQ,KAAK,SAAS,EAAE,CAAC,CAAC;IACzE,MAAM,aAAa,GAAG,mBAAmB,CAAC,EAAE,GAAG,EAAE,OAAO,CAAC,GAAG,EAAE,EAAE,EAAE,eAAe,EAAE,CAAC,CAAC;IACrF,MAAM,MAAM,GAAG,gBAAgB,CAAC,aAAa,EAAE,mBAAmB,CAAC,OAAO,CAAC,CAAC,CAAC;IAC7E,MAAM,OAAO,GAAG,MAAM,qBAAqB,CAAC,MAAM,EAAE,QAAQ,EAAE,OAAO,EAAE,KAAK,EAAE,OAAO,CAAC,CAAC;IACvF,OAAO,mBAAmB,CAAC,OAAO,EAAE,OAAO,CAAC,OAAO,EAAE,OAAO,CAAC,OAAO,CAAC,MAAM,CAAC,CAAC;AAC/E,CAAC;AAED,MAAM,UAAU,qBAAqB,CACnC,MAAqB,EACrB,QAAgB,EAChB,OAA2B,EAC3B,OAAgB,EAChB,gBAAoD,EACpD,SAA6B;IAE7B,iFAAiF;IACjF,2EAA2E;IAC3E,uBAAuB,CACrB,OAAO,CAAC,eAAe,EACvB,sBAAsB,EACtB,iCAAiC,CAClC,CAAC;IACF,sFAAsF;IACtF,mFAAmF;IACnF,mFAAmF;IACnF,uFAAuF;IACvF,wFAAwF;IACxF,yFAAyF;IACzF,OAAO,mBAAmB,CACxB,cAAc,CAAC,QAAQ,EAAE,MAAM,CAAC,eAAe,CAAC,EAChD,SAAS,EACT,CAAC,KAAK,EAAE,QAAQ,EAAE,EAAE;QAClB,MAAM,OAAO,GAAG,cAAc,CAC5B;YACE,QAAQ;YACR,eAAe,EAAE,MAAM,CAAC,eAAe;YACvC,OAAO,EAAE,QAAQ;SAClB,EACD,KAAK,CACN,CAAC;QACF,OAAO,qBAAqB,CAC1B,GAAG,EAAE,CAAC,mBAAmB,CAAC,OAAO,CAAC,UAAU,CAAC,EAC7C,GAAG,EAAE,CACH,kBAAkB,CAAC;YACjB,MAAM;YACN,QAAQ;YACR,OAAO;YACP,OAAO;YACP,OAAO;YACP,gBAAgB;YAChB,QAAQ;SACT,CAAC,CACL,CAAC;IACJ,CAAC,CACF,CAAC;AACJ,CAAC"}

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

@@ -4,19 +4,28 @@ import type { TerminalReplayBuffer } from "../../core/terminal-replay.ts";
 import type { ClaudeEventMap, ElwoodEventHandler, ElwoodEventName, ElwoodSessionStatus, ElwoodWarningEvent, TerminalSize } from "../../core/types.ts";
 import type { TypedEmitter } from "../../events/emitter.ts";
 import type { PtyProcess } from "../../pty/types.ts";
-import { AgentSessionBase } from "../../runtime/session/base.ts";
 import type { PersistedLoopDefinition } from "../../state/loop-store.ts";
 import type { SessionRuntime } from "../../state/runtime-paths.ts";
 import { type SessionRecord } from "../../state/store.ts";
 import type { ElwoodTerminal } from "../../terminal/headless.ts";
 import type { ClaudeLoginOptions } from "../login/types.ts";
 import type { ClaudeSessionApi } from "./interface.ts";
+import { ClaudeQuestionsSession } from "./questions.ts";
 export type HookBridge = {
     readonly start: () => Promise<void>;
     readonly stop: () => Promise<void>;
 };
-export declare class ClaudeSessionImpl extends AgentSessionBase implements ClaudeSessionApi {
-    protected readonly picker: import("../../core/models/picker.ts").ModelPickerSpec;
+export declare class ClaudeSessionImpl extends ClaudeQuestionsSession implements ClaudeSessionApi {
+    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 composerIsEmpty(text: string): boolean;
     private readonly bridge;
     private readonly emitter;
     private requestedSize;
@@ -26,9 +35,12 @@ export declare class ClaudeSessionImpl extends AgentSessionBase implements Claud
     constructor(record: SessionRecord, stateDir: string, runtime: SessionRuntime, pty: PtyProcess, terminal: ElwoodTerminal, bridge: HookBridge, emitter: TypedEmitter<ClaudeEventMap>, terminalReplay: TerminalReplayBuffer, requestedSize: TerminalSize, loopDefinitions: readonly PersistedLoopDefinition[]);
     on<E extends ElwoodEventName>(event: E, handler: ElwoodEventHandler<E>): import("../../index.ts").Unsubscribe;
     off<E extends ElwoodEventName>(event: E, handler: ElwoodEventHandler<E>): 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): boolean;
+    protected readonly recoveryComposer: {
+        prepareStaged: () => () => boolean;
+        emptyFrame: () => import("../../index.ts").TerminalSnapshot | undefined;
+    };
     protected attachImages: (paths: readonly string[], signal: AbortSignal) => Promise<void>;
     resize(size: TerminalSize): Promise<void>;
     completeInitialReady(): Promise<void>;

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

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

package/dist/claude/session/instance.js

@@ -1,29 +1,39 @@
 import { sessionWaitForActivity, sessionWaitForStatus } from "../../core/session-wait.js";
 import { terminalStatuses } from "../../core/status-categories.js";
 import { emitSessionWarnings } from "../../core/warnings/session.js";
-import { AgentSessionBase } from "../../runtime/session/base.js";
 import { runCleanupSteps } from "../../runtime/shutdown/teardown.js";
+import { drainAndDisposeTerminal } from "../../runtime/shutdown/terminal.js";
 import { updateSessionResumeId } from "../../state/store.js";
 import { attachClaudeImages } from "../attach-images.js";
+import { createClaudeRecoveryComposer } from "../composer/staged-input.js";
 import { runSessionLogin } from "../login/session-login.js";
 import { LoginExpiredWatcher, loginExpiredWarning } from "../login-expired.js";
+import { claudeModelComposerClearance } from "../model-composer.js";
 import { claudeModelPicker } from "../model-picker.js";
 import { resizeRestoreFailedWarning } from "../resize-restore.js";
+import { liveClaudeClearance } from "../screen-table.js";
 import { CLAUDE_STARTUP_MIN_COLS } from "../startup-size.js";
-export class ClaudeSessionImpl extends AgentSessionBase {
-    picker = claudeModelPicker;
+import { ClaudeQuestionsSession } from "./questions.js";
+export class ClaudeSessionImpl extends ClaudeQuestionsSession {
+    picker = {
+        ...claudeModelPicker,
+        isClear: liveClaudeClearance(() => this.terminal, claudeModelComposerClearance),
+    };
+    composerIsEmpty(text) {
+        return liveClaudeClearance(() => this.terminal)(text) || super.composerIsEmpty(text);
+    }
     bridge;
     emitter;
     requestedSize;
     // Only a session requested BELOW the 100-column startup floor bootstraps wide and
     // defers its restore to readiness (C-API-36); a 100+ session resizes immediately.
     awaitingInitialReady;
-    // Whether the one-shot initial-ready transition has already run (idempotent).
     initialReadyDone = false;
     // Edge-detects a mid-session login-expiry banner so it warns once per occurrence.
     loginExpiredWatcher = new LoginExpiredWatcher();
     constructor(record, stateDir, runtime, pty, terminal, bridge, emitter, terminalReplay, requestedSize, loopDefinitions) {
         super("claude", record, stateDir, runtime, pty, terminal, emitter, terminalReplay, loopDefinitions);
+        this.configureClaudeQuestions();
         this.bridge = bridge;
         this.emitter = emitter;
         this.requestedSize = requestedSize;
@@ -46,12 +56,9 @@ export class ClaudeSessionImpl extends AgentSessionBase {
     waitForActivity(match, timeoutMs) {
         return sessionWaitForActivity(this, match, timeoutMs);
     }
-    // Captured staged chip: "❯ [Pasted text #1 +15 lines]" (claude 2.1.201).
-    stagedPaste(screen) {
-        return /\[Pasted text/.test(screen);
-    }
+    recoveryComposer = createClaudeRecoveryComposer(this.terminal);
     // Claude reads a pasted absolute path; the paste is held while a dialog shows (C-API-45/37).
-    attachImages = (paths, signal) => attachClaudeImages(this.terminal, paths, signal, () => this.status === "blocked");
+    attachImages = (paths, signal) => attachClaudeImages(this.automatedTerminal, paths, signal, () => this.queuedInputBlocked());
     // A narrow session holds the PHYSICAL resize until readiness; it just records the
     // requested geometry now and restores it at the initial-ready transition. A wide
     // session (100+ cols) never deferred; it resizes now.
@@ -134,13 +141,19 @@ export class ClaudeSessionImpl extends AgentSessionBase {
     // Drive `/login` re-auth as an exclusive, abort-aware queue transaction (C-API-43).
     login(options) {
         const onReady = (handler) => this.emitter.on("status", (e) => e.status === "ready" && handler());
-        const blocked = () => this.status === "blocked";
-        const deps = { controlQueue: this.controlQueue, terminal: this.terminal, blocked, onReady };
+        // Login writes `/login` and an Enter outside any picker transaction, so it must also
+        // stand off a model dialog a human opened: Enter there applies the highlighted row.
+        const blocked = () => this.isInputBlocked() || this.foreignDialogBlocksWrite();
+        const terminal = this.automatedTerminal;
+        const deps = { controlQueue: this.controlQueue, terminal, blocked, onReady };
         return this.inSession(() => runSessionLogin(deps, options));
     }
     stopRuntime() {
         // Dispose the terminal even if the bridge stop rejects — no first-failure leak (§9.4).
-        return runCleanupSteps([() => this.bridge.stop(), () => this.terminal.dispose()]);
+        return runCleanupSteps([
+            () => this.bridge.stop(),
+            () => drainAndDisposeTerminal(this.terminal, this.pty),
+        ]);
     }
 }
 //# sourceMappingURL=instance.js.map