@with-logic/elwood 0.1.3 → 0.2.0

package/dist/core/simple/turn-types.d.ts.map

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

package/dist/core/simple/turn-types.js

@@ -1,9 +1,4 @@
-/**
- * Types and conformance probes for one ergonomic turn (PRD §5.8, C-API-48/53). Separated from
- * the `runTurn` runner (turn.ts) so both stay under the file-size cap. Defines the loose
- * boundary-hook shape the oracle reads, the compile-time drift guard adapters assert against,
- * the narrow turn-capable session surface, and the turn's options and result shapes.
- */
+export { boundaryFailure, boundaryText } from "./boundary-signal.js";
 /**
  * The default reader: a `Stop` hook is the turn boundary and its `last_assistant_message` the
  * completeness signal (`""` when null/absent → no oracle); any other hook is not a boundary.

package/dist/core/simple/turn-types.js.map

@@ -1 +1 @@
-{"version":3,"file":"turn-types.js","sourceRoot":"","sources":["../../../src/core/simple/turn-types.ts"],"names":[],"mappings":"AAAA;;;;;GAKG;AA6CH;;;GAGG;AACH,MAAM,CAAC,MAAM,qBAAqB,GAAyB,CAAC,KAAK,EAAE,EAAE,CACnE,KAAK,CAAC,eAAe,KAAK,MAAM,CAAC,CAAC,CAAC,CAAC,KAAK,CAAC,sBAAsB,IAAI,EAAE,CAAC,CAAC,CAAC,CAAC,SAAS,CAAC;AAEtF,qFAAqF;AACrF,MAAM,CAAC,MAAM,uBAAuB,GAA2B,CAAC,KAAK,EAAE,MAAM,EAAE,EAAE,CAC/E,KAAK,CAAC,eAAe,KAAK,MAAM;IAChC,CAAC,KAAK,CAAC,eAAe,KAAK,kBAAkB,IAAI,KAAK,CAAC,MAAM,KAAK,MAAM,CAAC,CAAC"}
+{"version":3,"file":"turn-types.js","sourceRoot":"","sources":["../../../src/core/simple/turn-types.ts"],"names":[],"mappings":"AAiDA,OAAO,EAAE,eAAe,EAAE,YAAY,EAAE,MAAM,sBAAsB,CAAC;AAOrE;;;GAGG;AACH,MAAM,CAAC,MAAM,qBAAqB,GAAyB,CAAC,KAAK,EAAE,EAAE,CACnE,KAAK,CAAC,eAAe,KAAK,MAAM,CAAC,CAAC,CAAC,CAAC,KAAK,CAAC,sBAAsB,IAAI,EAAE,CAAC,CAAC,CAAC,CAAC,SAAS,CAAC;AAEtF,qFAAqF;AACrF,MAAM,CAAC,MAAM,uBAAuB,GAA2B,CAAC,KAAK,EAAE,MAAM,EAAE,EAAE,CAC/E,KAAK,CAAC,eAAe,KAAK,MAAM;IAChC,CAAC,KAAK,CAAC,eAAe,KAAK,kBAAkB,IAAI,KAAK,CAAC,MAAM,KAAK,MAAM,CAAC,CAAC"}

package/dist/core/simple/turn.d.ts

@@ -1,37 +1,14 @@
 /**
- * One ergonomic turn: submit a prompt and drive the agent turn to its REAL boundary,
- * feeding a gate the consumer reads (PRD §5.8, C-API-48/49/50).
- *
- * The turn boundary is a COMPLETENESS ORACLE, not a timer. A turn's assistant text is
- * transcript-sourced (C-CLAUDE-15) and the transcript is written ASYNCHRONOUSLY, arriving
- * shortly AFTER the `ready` status. The turn-boundary `Stop` hook carries
- * `last_assistant_message` — the final assistant text of the just-completed turn — used
- * ONLY as a completeness signal (never displayed — it can be ghost text): the turn ends
- * once the transcript-collected assistant text CONTAINS it. With no such signal (a
- * pure-tool turn, or an empty/`null` `last_assistant_message`) the turn ends after a
- * bounded quiet window with no new content.
- *
- * The runner is decoupled from its consumer. `completion` always resolves when the consumer
- * settles; its error travels through `events`. The serializer instead holds `boundary`, which
- * resolves on a successful oracle/quiet settle or terminal status. After consumer failure it
- * waits for real `ready`/terminal evidence plus transcript drain, so abandoned streams cannot
- * release their slot while the agent is still producing.
- *
- * Timeouts: a turn may run for HOURS (a test suite, a PR poll), so there is NO whole-turn
- * timeout by default; callers may pass an opt-in `timeoutMs`, armed only AFTER submission (a
- * turn begins on submission — the timer must never reject a caller for a prompt still queued
- * behind readiness that then submits anyway). The tight cap is `catchUpMs` (default 10s),
- * armed only ONCE `ready` fires — the flush should be near-instant, so a longer stall rejects
- * with `wait_timeout`. A terminal status ends the turn at once.
+ * Collect one ergonomic turn through native completion and transcript drain (PRD §5.8).
+ * Consumer failure settles events but retains the serializer boundary until actual completion
+ * or terminal status. Codex acceptance and Stop identity come from private adapter evidence;
+ * public running/ready alone cannot bind or finish its turn. Untagged adapters retain the
+ * serialized passive oracle. The Stop oracle checks completeness; it never supplies output.
+ * Whole-turn deadlines start after physical submission; catch-up deadlines start after idle.
  */
 import { type RunningTurn, type StreamTurnOptions, type TurnSession } from "./turn-types.ts";
 export type { AcceptanceSignalReader, AssertStopBoundary, BoundarySignalReader, RunningTurn, StreamTurnOptions, TurnBoundaryContract, TurnBoundaryHook, TurnSession, } from "./turn-types.ts";
 export { defaultAcceptanceSignal, defaultBoundarySignal } from "./turn-types.ts";
-/**
- * Start a turn: attach listeners, submit the prompt, and drive the gate to the turn's real
- * boundary. Returns the consumer `events` generator, an always-resolving `completion` signal,
- * and the `boundary` promise the serializer holds its slot on (so the next turn never starts
- * before the AGENT settles — see `RunningTurn` and the file docstring).
- */
+/** Attach before owned submission; retain the native boundary after consumer failure. */
 export declare function runTurn(session: TurnSession, prompt: string, options?: StreamTurnOptions): RunningTurn;
 //# sourceMappingURL=turn.d.ts.map

package/dist/core/simple/turn.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"turn.d.ts","sourceRoot":"","sources":["../../../src/core/simple/turn.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;;;;;;;;;;;;GAyBG;AAQH,OAAO,EAGL,KAAK,WAAW,EAChB,KAAK,iBAAiB,EACtB,KAAK,WAAW,EACjB,MAAM,iBAAiB,CAAC;AAEzB,YAAY,EACV,sBAAsB,EACtB,kBAAkB,EAClB,oBAAoB,EACpB,WAAW,EACX,iBAAiB,EACjB,oBAAoB,EACpB,gBAAgB,EAChB,WAAW,GACZ,MAAM,iBAAiB,CAAC;AACzB,OAAO,EAAE,uBAAuB,EAAE,qBAAqB,EAAE,MAAM,iBAAiB,CAAC;AAOjF;;;;;GAKG;AACH,wBAAgB,OAAO,CACrB,OAAO,EAAE,WAAW,EACpB,MAAM,EAAE,MAAM,EACd,OAAO,GAAE,iBAAsB,GAC9B,WAAW,CAmIb"}
+{"version":3,"file":"turn.d.ts","sourceRoot":"","sources":["../../../src/core/simple/turn.ts"],"names":[],"mappings":"AAAA;;;;;;;GAOG;AAYH,OAAO,EAGL,KAAK,WAAW,EAChB,KAAK,iBAAiB,EACtB,KAAK,WAAW,EACjB,MAAM,iBAAiB,CAAC;AAEzB,YAAY,EACV,sBAAsB,EACtB,kBAAkB,EAClB,oBAAoB,EACpB,WAAW,EACX,iBAAiB,EACjB,oBAAoB,EACpB,gBAAgB,EAChB,WAAW,GACZ,MAAM,iBAAiB,CAAC;AACzB,OAAO,EAAE,uBAAuB,EAAE,qBAAqB,EAAE,MAAM,iBAAiB,CAAC;AAEjF,yFAAyF;AACzF,wBAAgB,OAAO,CACrB,OAAO,EAAE,WAAW,EACpB,MAAM,EAAE,MAAM,EACd,OAAO,GAAE,iBAAsB,GAC9B,WAAW,CA4Ib"}

package/dist/core/simple/turn.js

@@ -1,65 +1,48 @@
 /**
- * One ergonomic turn: submit a prompt and drive the agent turn to its REAL boundary,
- * feeding a gate the consumer reads (PRD §5.8, C-API-48/49/50).
- *
- * The turn boundary is a COMPLETENESS ORACLE, not a timer. A turn's assistant text is
- * transcript-sourced (C-CLAUDE-15) and the transcript is written ASYNCHRONOUSLY, arriving
- * shortly AFTER the `ready` status. The turn-boundary `Stop` hook carries
- * `last_assistant_message` — the final assistant text of the just-completed turn — used
- * ONLY as a completeness signal (never displayed — it can be ghost text): the turn ends
- * once the transcript-collected assistant text CONTAINS it. With no such signal (a
- * pure-tool turn, or an empty/`null` `last_assistant_message`) the turn ends after a
- * bounded quiet window with no new content.
- *
- * The runner is decoupled from its consumer. `completion` always resolves when the consumer
- * settles; its error travels through `events`. The serializer instead holds `boundary`, which
- * resolves on a successful oracle/quiet settle or terminal status. After consumer failure it
- * waits for real `ready`/terminal evidence plus transcript drain, so abandoned streams cannot
- * release their slot while the agent is still producing.
- *
- * Timeouts: a turn may run for HOURS (a test suite, a PR poll), so there is NO whole-turn
- * timeout by default; callers may pass an opt-in `timeoutMs`, armed only AFTER submission (a
- * turn begins on submission — the timer must never reject a caller for a prompt still queued
- * behind readiness that then submits anyway). The tight cap is `catchUpMs` (default 10s),
- * armed only ONCE `ready` fires — the flush should be near-instant, so a longer stall rejects
- * with `wait_timeout`. A terminal status ends the turn at once.
+ * Collect one ergonomic turn through native completion and transcript drain (PRD §5.8).
+ * Consumer failure settles events but retains the serializer boundary until actual completion
+ * or terminal status. Codex acceptance and Stop identity come from private adapter evidence;
+ * public running/ready alone cannot bind or finish its turn. Untagged adapters retain the
+ * serialized passive oracle. The Stop oracle checks completeness; it never supplies output.
+ * Whole-turn deadlines start after physical submission; catch-up deadlines start after idle.
  */
-import { elwoodError, toError } from "../errors.js";
+import { toError } from "../errors.js";
+import { cancellableSubmission } from "../input/submission-cancel.js";
 import { terminalStatuses } from "../status-categories.js";
+import { boundaryExpectation } from "./boundary-signal.js";
 import { toTurnEvent } from "./events.js";
+import { withSubmissionAttempt } from "./submission-context.js";
+import { armTurnTimeout, FALLBACK_QUIET_MS, gateForTurn } from "./turn/defaults.js";
 import { TurnAcceptance } from "./turn-acceptance.js";
 import { TurnBoundary } from "./turn-boundary.js";
-import { TurnGate } from "./turn-gate.js";
+import { TurnIdentity } from "./turn-identity.js";
 import { defaultAcceptanceSignal, defaultBoundarySignal, } from "./turn-types.js";
 export { defaultAcceptanceSignal, defaultBoundarySignal } from "./turn-types.js";
-/** Quiet window (ms) after `ready` for a no-oracle turn to settle once content stops. */
-const FALLBACK_QUIET_MS = 2_000;
-/** Cap (ms) on the POST-`ready` transcript catch-up: a stalled flush bails, not hangs. */
-const CATCH_UP_MS = 10_000;
-/**
- * Start a turn: attach listeners, submit the prompt, and drive the gate to the turn's real
- * boundary. Returns the consumer `events` generator, an always-resolving `completion` signal,
- * and the `boundary` promise the serializer holds its slot on (so the next turn never starts
- * before the AGENT settles — see `RunningTurn` and the file docstring).
- */
+/** Attach before owned submission; retain the native boundary after consumer failure. */
 export function runTurn(session, prompt, options = {}) {
-    const catchUpMs = options.catchUpMs ?? CATCH_UP_MS;
-    const gate = new TurnGate(options.fallbackQuietMs ?? FALLBACK_QUIET_MS, catchUpMs, options.maxPendingEvents, options.maxPendingBytes);
+    const gate = gateForTurn(options);
     const sendOptions = options.images === undefined ? undefined : { images: options.images };
-    const send = () => session.sendMessage(prompt, sendOptions);
+    const identity = options.readNativeTurn && new TurnIdentity(session, options.readNativeTurn);
+    let submitted = false;
+    let timer;
+    const onSubmitted = () => {
+        if (submitted)
+            return;
+        submitted = true;
+        timer = armTurnTimeout(options.timeoutMs, (error) => gate.fail(error));
+    };
     const acceptance = new TurnAcceptance(options.fallbackQuietMs ?? FALLBACK_QUIET_MS, {
-        replay: send,
-        acceptReady: () => gate.observeReady(),
+        write: (signal) => {
+            const send = () => session.sendMessage(prompt, cancellableSubmission(sendOptions, signal, onSubmitted));
+            return identity ? withSubmissionAttempt(session, identity, send) : send();
+        },
+        acceptReady: () => {
+            if (!identity)
+                gate.observeReady();
+        },
         fail: (error) => gate.fail(toError(error)),
     });
-    // Bound to the first content event that CARRIES a `turnId` (Codex tags; Claude never does);
-    // untagged events always belong to this turn, a differently tagged one is a prior turn's.
     let turnId;
-    // The turn only ENDS on a settle once it has demonstrably STARTED — a `running` status or
-    // the first content event — so the idle `ready` the session sits at when the prompt is
-    // submitted does not end the turn before any work runs. This (with the serializer holding
-    // the prior turn to its real boundary before this one starts) is why no explicit
-    // "is this my submission" gate is needed: there are no prior-turn events left to mis-collect.
     let started = false;
     let sawReady = false; // a `ready` after the turn started was observed (agent turn is idle/done)
     let consumerSettled = false;
@@ -73,14 +56,17 @@ export function runTurn(session, prompt, options = {}) {
         offActivity();
         offHook();
         offStatus();
+        offNativeBoundary();
     };
-    const boundary = new TurnBoundary(maybeCleanup, options.drainMs);
+    const boundary = new TurnBoundary(maybeCleanup, options.drainMs, () => acceptance.quiesce());
     // The gate's SUCCESSFUL settle means the transcript drained — the real boundary. Its rejection
     // (a consumer failure) does NOT reach it here; a post-failure `ready`/terminal does.
-    gate.done().then(() => boundary.reach(), () => undefined);
+    acceptance.disarmOnSettle(gate.done(), () => boundary.reach());
     const offActivity = session.on("activity", (event) => {
         const simple = toTurnEvent(event);
-        if (simple || (event.kind === "user_message" && event.text === prompt))
+        if (identity && !identity.acceptsContent(event.turnId))
+            return;
+        if (simple || (!identity && event.kind === "user_message" && event.text === prompt))
             acceptance.accept();
         if (simple) {
             started = true;
@@ -97,20 +83,37 @@ export function runTurn(session, prompt, options = {}) {
         if (boundary.draining)
             boundary.armDrain(); // trailing post-failure flush re-arms the drain
     });
+    const nativeIdle = () => {
+        if (!identity?.ready())
+            return;
+        sawReady = true;
+        gate.observeReady();
+        boundary.armDrain();
+    };
+    const offNativeBoundary = identity?.observeBoundary((signal) => {
+        gate.expectText(boundaryExpectation(signal));
+        nativeIdle();
+    }, nativeIdle) ?? (() => undefined);
     const readBoundarySignal = options.readBoundarySignal ?? defaultBoundarySignal;
     const offHook = session.on("hook", (event) => {
-        // The adapter NORMALIZES its raw hook into the completeness signal (the expected final
-        // assistant text of a turn-BOUNDARY hook; `undefined` for any other hook, which the gate
-        // ignores so a late `Notification` cannot wipe an installed oracle). The core reads only
-        // that — never raw hook fields. Used as a completeness ORACLE only (never displayed —
-        // respects C-CLAUDE-15).
+        // The adapter NORMALIZES its raw hook into the completeness signal (`undefined` for any
+        // non-boundary hook, which the gate ignores so a late `Notification` cannot wipe an
+        // installed oracle). The core reads only that — never raw hook fields — and uses it as a
+        // completeness ORACLE only, never displayed (C-CLAUDE-15).
+        if (identity) {
+            if (identity.observe(event))
+                acceptance.accept();
+            return; // Public Stop precedes its callback outcome; only private confirmation owns the oracle.
+        }
         if (defaultAcceptanceSignal(event, prompt))
             acceptance.accept();
-        gate.expectText(readBoundarySignal(event));
+        gate.expectText(boundaryExpectation(readBoundarySignal(event)));
     });
     const offStatus = session.on("status", ({ status }) => {
         if (status === "running") {
             started = true;
+            sawReady = false;
+            boundary.cancelDrain();
             acceptance.running();
         }
         if (terminalStatuses.has(status)) {
@@ -119,8 +122,11 @@ export function runTurn(session, prompt, options = {}) {
             return boundary.reach(); // agent is gone — the real boundary, regardless of consumer state
         }
         if (status === "ready" && started) {
+            const accepted = acceptance.ready();
+            if (identity && !identity.ready())
+                return;
             sawReady = true;
-            if (acceptance.ready())
+            if (accepted)
                 gate.observeReady();
             boundary.armDrain(); // failure path: agent reached ready → drain then release the slot
         }
@@ -128,26 +134,21 @@ export function runTurn(session, prompt, options = {}) {
     // Drive the consumer lifecycle EAGERLY and independently of iteration: submit, then wait for
     // the gate to settle. Always resolves — the turn error reaches the consumer via `events`.
     const completion = (async () => {
-        let timer;
         try {
-            // A turn BEGINS on submission (PRD §5.8), so the opt-in ceiling is armed only AFTER
-            // `sendMessage` resolves — never rejecting a prompt still queued behind readiness.
-            await send(); // listeners attached — no early event lost
+            // Native submission arms its ceiling at physical Enter; this await also retains
+            // ownership through fresh-empty confirmation or cancellation cleanup.
+            await acceptance.submit(); // listeners attached — no early event lost
+            onSubmitted(); // fallback for custom TurnSession implementations without private metadata
         }
         catch (error) {
-            // The SUBMISSION failed → no agent turn is in flight and no status transition is coming:
-            // fail the consumer with the typed error AND reach the boundary at once (else the
-            // serializer waits forever). A terminal-status race is a benign idempotent no-op; otherwise
-            // a submit-on-a-dead-session `session_not_running` propagates to the consumer (C-API-25).
             gate.fail(toError(error));
-            boundary.reach();
-            consumerSettled = true;
-            maybeCleanup();
-            return;
-        }
-        if (options.timeoutMs !== undefined) {
-            timer = setTimeout(() => gate.fail(elwoodError("wait_timeout", "turn timed out")), options.timeoutMs);
-            timer.unref?.(); // a pending ceiling must not keep the host alive by itself
+            if (!(submitted || identity?.attempted)) {
+                // No physical Enter: no native turn or future status needs draining.
+                boundary.reach();
+                consumerSettled = true;
+                maybeCleanup();
+                return;
+            }
         }
         try {
             await gate.done(); // resolves on genuine settle (→ boundary); rejects on consumer failure
@@ -163,7 +164,6 @@ export function runTurn(session, prompt, options = {}) {
         finally {
             if (timer)
                 clearTimeout(timer);
-            acceptance.dispose();
             consumerSettled = true;
             maybeCleanup();
         }

package/dist/core/simple/turn.js.map

@@ -1 +1 @@
-{"version":3,"file":"turn.js","sourceRoot":"","sources":["../../../src/core/simple/turn.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"turn.js","sourceRoot":"","sources":["../../../src/core/simple/turn.ts"],"names":[],"mappings":"AAAA;;;;;;;GAOG;AAEH,OAAO,EAAE,OAAO,EAAE,MAAM,cAAc,CAAC;AACvC,OAAO,EAAE,qBAAqB,EAAE,MAAM,+BAA+B,CAAC;AACtE,OAAO,EAAE,gBAAgB,EAAE,MAAM,yBAAyB,CAAC;AAC3D,OAAO,EAAE,mBAAmB,EAAE,MAAM,sBAAsB,CAAC;AAC3D,OAAO,EAAE,WAAW,EAAE,MAAM,aAAa,CAAC;AAC1C,OAAO,EAAE,qBAAqB,EAAE,MAAM,yBAAyB,CAAC;AAChE,OAAO,EAAE,cAAc,EAAE,iBAAiB,EAAE,WAAW,EAAE,MAAM,oBAAoB,CAAC;AACpF,OAAO,EAAE,cAAc,EAAE,MAAM,sBAAsB,CAAC;AACtD,OAAO,EAAE,YAAY,EAAE,MAAM,oBAAoB,CAAC;AAClD,OAAO,EAAE,YAAY,EAAE,MAAM,oBAAoB,CAAC;AAClD,OAAO,EACL,uBAAuB,EACvB,qBAAqB,GAItB,MAAM,iBAAiB,CAAC;AAYzB,OAAO,EAAE,uBAAuB,EAAE,qBAAqB,EAAE,MAAM,iBAAiB,CAAC;AAEjF,yFAAyF;AACzF,MAAM,UAAU,OAAO,CACrB,OAAoB,EACpB,MAAc,EACd,UAA6B,EAAE;IAE/B,MAAM,IAAI,GAAG,WAAW,CAAC,OAAO,CAAC,CAAC;IAClC,MAAM,WAAW,GAAG,OAAO,CAAC,MAAM,KAAK,SAAS,CAAC,CAAC,CAAC,SAAS,CAAC,CAAC,CAAC,EAAE,MAAM,EAAE,OAAO,CAAC,MAAM,EAAE,CAAC;IAC1F,MAAM,QAAQ,GAAG,OAAO,CAAC,cAAc,IAAI,IAAI,YAAY,CAAC,OAAO,EAAE,OAAO,CAAC,cAAc,CAAC,CAAC;IAC7F,IAAI,SAAS,GAAG,KAAK,CAAC;IACtB,IAAI,KAAgD,CAAC;IACrD,MAAM,WAAW,GAAG,GAAG,EAAE;QACvB,IAAI,SAAS;YAAE,OAAO;QACtB,SAAS,GAAG,IAAI,CAAC;QACjB,KAAK,GAAG,cAAc,CAAC,OAAO,CAAC,SAAS,EAAE,CAAC,KAAK,EAAE,EAAE,CAAC,IAAI,CAAC,IAAI,CAAC,KAAK,CAAC,CAAC,CAAC;IACzE,CAAC,CAAC;IACF,MAAM,UAAU,GAAG,IAAI,cAAc,CAAC,OAAO,CAAC,eAAe,IAAI,iBAAiB,EAAE;QAClF,KAAK,EAAE,CAAC,MAAM,EAAE,EAAE;YAChB,MAAM,IAAI,GAAG,GAAG,EAAE,CAChB,OAAO,CAAC,WAAW,CAAC,MAAM,EAAE,qBAAqB,CAAC,WAAW,EAAE,MAAM,EAAE,WAAW,CAAC,CAAC,CAAC;YACvF,OAAO,QAAQ,CAAC,CAAC,CAAC,qBAAqB,CAAC,OAAO,EAAE,QAAQ,EAAE,IAAI,CAAC,CAAC,CAAC,CAAC,IAAI,EAAE,CAAC;QAC5E,CAAC;QACD,WAAW,EAAE,GAAG,EAAE;YAChB,IAAI,CAAC,QAAQ;gBAAE,IAAI,CAAC,YAAY,EAAE,CAAC;QACrC,CAAC;QACD,IAAI,EAAE,CAAC,KAAK,EAAE,EAAE,CAAC,IAAI,CAAC,IAAI,CAAC,OAAO,CAAC,KAAK,CAAC,CAAC;KAC3C,CAAC,CAAC;IACH,IAAI,MAA0B,CAAC;IAC/B,IAAI,OAAO,GAAG,KAAK,CAAC;IACpB,IAAI,QAAQ,GAAG,KAAK,CAAC,CAAC,0EAA0E;IAChG,IAAI,eAAe,GAAG,KAAK,CAAC;IAE5B,yFAAyF;IACzF,+FAA+F;IAC/F,4FAA4F;IAC5F,MAAM,YAAY,GAAG,GAAG,EAAE;QACxB,IAAI,CAAC,CAAC,eAAe,IAAI,QAAQ,CAAC,SAAS,CAAC;YAAE,OAAO;QACrD,IAAI,CAAC,OAAO,EAAE,CAAC;QACf,WAAW,EAAE,CAAC;QACd,OAAO,EAAE,CAAC;QACV,SAAS,EAAE,CAAC;QACZ,iBAAiB,EAAE,CAAC;IACtB,CAAC,CAAC;IACF,MAAM,QAAQ,GAAG,IAAI,YAAY,CAAC,YAAY,EAAE,OAAO,CAAC,OAAO,EAAE,GAAG,EAAE,CAAC,UAAU,CAAC,OAAO,EAAE,CAAC,CAAC;IAC7F,+FAA+F;IAC/F,qFAAqF;IACrF,UAAU,CAAC,cAAc,CAAC,IAAI,CAAC,IAAI,EAAE,EAAE,GAAG,EAAE,CAAC,QAAQ,CAAC,KAAK,EAAE,CAAC,CAAC;IAE/D,MAAM,WAAW,GAAG,OAAO,CAAC,EAAE,CAAC,UAAU,EAAE,CAAC,KAAK,EAAE,EAAE;QACnD,MAAM,MAAM,GAAG,WAAW,CAAC,KAAK,CAAC,CAAC;QAClC,IAAI,QAAQ,IAAI,CAAC,QAAQ,CAAC,cAAc,CAAC,KAAK,CAAC,MAAM,CAAC;YAAE,OAAO;QAC/D,IAAI,MAAM,IAAI,CAAC,CAAC,QAAQ,IAAI,KAAK,CAAC,IAAI,KAAK,cAAc,IAAI,KAAK,CAAC,IAAI,KAAK,MAAM,CAAC;YACjF,UAAU,CAAC,MAAM,EAAE,CAAC;QACtB,IAAI,MAAM,EAAE,CAAC;YACX,OAAO,GAAG,IAAI,CAAC;YACf,MAAM,KAAK,KAAK,CAAC,MAAM,CAAC,CAAC,6DAA6D;QACxF,CAAC;QACD,IAAI,MAAM,IAAI,CAAC,KAAK,CAAC,MAAM,KAAK,SAAS,IAAI,KAAK,CAAC,MAAM,KAAK,MAAM,CAAC,EAAE,CAAC;YACtE,mFAAmF;YACnF,mFAAmF;YACnF,oCAAoC;YACpC,IAAI,CAAC,IAAI,CAAC,MAAM,CAAC,CAAC;YAClB,IAAI,MAAM,CAAC,IAAI,KAAK,MAAM;gBAAE,IAAI,CAAC,WAAW,CAAC,MAAM,CAAC,IAAI,CAAC,CAAC;QAC5D,CAAC;QACD,IAAI,QAAQ,CAAC,QAAQ;YAAE,QAAQ,CAAC,QAAQ,EAAE,CAAC,CAAC,gDAAgD;IAC9F,CAAC,CAAC,CAAC;IACH,MAAM,UAAU,GAAG,GAAG,EAAE;QACtB,IAAI,CAAC,QAAQ,EAAE,KAAK,EAAE;YAAE,OAAO;QAC/B,QAAQ,GAAG,IAAI,CAAC;QAChB,IAAI,CAAC,YAAY,EAAE,CAAC;QACpB,QAAQ,CAAC,QAAQ,EAAE,CAAC;IACtB,CAAC,CAAC;IACF,MAAM,iBAAiB,GACrB,QAAQ,EAAE,eAAe,CAAC,CAAC,MAAM,EAAE,EAAE;QACnC,IAAI,CAAC,UAAU,CAAC,mBAAmB,CAAC,MAAM,CAAC,CAAC,CAAC;QAC7C,UAAU,EAAE,CAAC;IACf,CAAC,EAAE,UAAU,CAAC,IAAI,CAAC,GAAG,EAAE,CAAC,SAAS,CAAC,CAAC;IACtC,MAAM,kBAAkB,GAAG,OAAO,CAAC,kBAAkB,IAAI,qBAAqB,CAAC;IAC/E,MAAM,OAAO,GAAG,OAAO,CAAC,EAAE,CAAC,MAAM,EAAE,CAAC,KAAK,EAAE,EAAE;QAC3C,wFAAwF;QACxF,oFAAoF;QACpF,yFAAyF;QACzF,2DAA2D;QAC3D,IAAI,QAAQ,EAAE,CAAC;YACb,IAAI,QAAQ,CAAC,OAAO,CAAC,KAAK,CAAC;gBAAE,UAAU,CAAC,MAAM,EAAE,CAAC;YACjD,OAAO,CAAC,wFAAwF;QAClG,CAAC;QACD,IAAI,uBAAuB,CAAC,KAAK,EAAE,MAAM,CAAC;YAAE,UAAU,CAAC,MAAM,EAAE,CAAC;QAChE,IAAI,CAAC,UAAU,CAAC,mBAAmB,CAAC,kBAAkB,CAAC,KAAK,CAAC,CAAC,CAAC,CAAC;IAClE,CAAC,CAAC,CAAC;IACH,MAAM,SAAS,GAAG,OAAO,CAAC,EAAE,CAAC,QAAQ,EAAE,CAAC,EAAE,MAAM,EAAE,EAAE,EAAE;QACpD,IAAI,MAAM,KAAK,SAAS,EAAE,CAAC;YACzB,OAAO,GAAG,IAAI,CAAC;YACf,QAAQ,GAAG,KAAK,CAAC;YACjB,QAAQ,CAAC,WAAW,EAAE,CAAC;YACvB,UAAU,CAAC,OAAO,EAAE,CAAC;QACvB,CAAC;QACD,IAAI,gBAAgB,CAAC,GAAG,CAAC,MAAM,CAAC,EAAE,CAAC;YACjC,UAAU,CAAC,OAAO,EAAE,CAAC;YACrB,IAAI,CAAC,GAAG,EAAE,CAAC;YACX,OAAO,QAAQ,CAAC,KAAK,EAAE,CAAC,CAAC,kEAAkE;QAC7F,CAAC;QACD,IAAI,MAAM,KAAK,OAAO,IAAI,OAAO,EAAE,CAAC;YAClC,MAAM,QAAQ,GAAG,UAAU,CAAC,KAAK,EAAE,CAAC;YACpC,IAAI,QAAQ,IAAI,CAAC,QAAQ,CAAC,KAAK,EAAE;gBAAE,OAAO;YAC1C,QAAQ,GAAG,IAAI,CAAC;YAChB,IAAI,QAAQ;gBAAE,IAAI,CAAC,YAAY,EAAE,CAAC;YAClC,QAAQ,CAAC,QAAQ,EAAE,CAAC,CAAC,kEAAkE;QACzF,CAAC;IACH,CAAC,CAAC,CAAC;IAEH,6FAA6F;IAC7F,0FAA0F;IAC1F,MAAM,UAAU,GAAG,CAAC,KAAK,IAAI,EAAE;QAC7B,IAAI,CAAC;YACH,gFAAgF;YAChF,sEAAsE;YACtE,MAAM,UAAU,CAAC,MAAM,EAAE,CAAC,CAAC,2CAA2C;YACtE,WAAW,EAAE,CAAC,CAAC,2EAA2E;QAC5F,CAAC;QAAC,OAAO,KAAK,EAAE,CAAC;YACf,IAAI,CAAC,IAAI,CAAC,OAAO,CAAC,KAAK,CAAC,CAAC,CAAC;YAC1B,IAAI,CAAC,CAAC,SAAS,IAAI,QAAQ,EAAE,SAAS,CAAC,EAAE,CAAC;gBACxC,qEAAqE;gBACrE,QAAQ,CAAC,KAAK,EAAE,CAAC;gBACjB,eAAe,GAAG,IAAI,CAAC;gBACvB,YAAY,EAAE,CAAC;gBACf,OAAO;YACT,CAAC;QACH,CAAC;QACD,IAAI,CAAC;YACH,MAAM,IAAI,CAAC,IAAI,EAAE,CAAC,CAAC,uEAAuE;QAC5F,CAAC;QAAC,MAAM,CAAC;YACP,6FAA6F;YAC7F,yFAAyF;YACzF,8FAA8F;YAC9F,QAAQ,CAAC,kBAAkB,EAAE,CAAC;YAC9B,IAAI,QAAQ;gBAAE,QAAQ,CAAC,QAAQ,EAAE,CAAC;QACpC,CAAC;gBAAS,CAAC;YACT,IAAI,KAAK;gBAAE,YAAY,CAAC,KAAK,CAAC,CAAC;YAC/B,eAAe,GAAG,IAAI,CAAC;YACvB,YAAY,EAAE,CAAC;QACjB,CAAC;IACH,CAAC,CAAC,EAAE,CAAC;IAEL,OAAO,EAAE,MAAM,EAAE,IAAI,CAAC,KAAK,EAAE,EAAE,UAAU,EAAE,QAAQ,EAAE,QAAQ,CAAC,OAAO,EAAE,CAAC;AAC1E,CAAC"}

package/dist/core/startup/barrier.d.ts

@@ -0,0 +1,37 @@
+/**
+ * A render-settlement barrier for NON-TRUST automated startup writes.
+ * Implements PRD §5.1/§5.4 and C-API-56: rendering is asynchronous (§4.1), so a trust
+ * gate can be RECEIVED while the last observed frame is still the previous screen.
+ * The veto is `trustGateVisible`, which covers allowlisted candidates AND off-allowlist
+ * gates in the native grammar — a reworded gate classifies as `unknown` to `trustView`,
+ * so vetoing on candidates alone would let an automated key reach a human-owned gate.
+ * Startup automation decides from that observed frame, so without a barrier the Codex
+ * update skip or the Claude browser-tools decline can write into a gate that has
+ * arrived but not been classified. Each write therefore observes everything received,
+ * fails closed when it cannot, and only then re-checks the settled frame.
+ *
+ * Scope is deliberate: this guards the NON-TRUST writer, never the trust writer.
+ * Answering a trust gate is `TrustPromptResponder`'s own job, so vetoing it here would
+ * block the one writer that is supposed to act on such a frame.
+ *
+ * Withholding is REPORTED, not silent. The settled frame is the first trustworthy view
+ * of the screen, so a caller that decided from the pre-settle frame must be able to
+ * learn its key never went out — otherwise it latches the prompt as handled and emits
+ * success telemetry for a key nobody sent.
+ */
+import type { ElwoodAgentKind } from "../activity/index.ts";
+import { type InputTerminal } from "../input/abort.ts";
+/** What a non-trust automation write returns; void writers settle immediately. */
+export type NonTrustAutomationWriter = (input: string) => void | Promise<void>;
+/** `withheld`: nothing reached the PTY. A live prompt may be retried on a later
+ * frame; lifecycle cancellation is permanent and callers must not retry it. */
+export type AutomationWriteResult = "written" | "withheld";
+/**
+ * Wrap the NON-TRUST automation writer: observe all received output, then withhold the
+ * key if the settled frame shows a trust gate or the caller's own `stillValid` check no
+ * longer holds. `stillValid` runs AFTER settlement, so a caller whose key encodes screen
+ * state (an option number, a latched prompt) can revalidate it against the frame that is
+ * actually on screen rather than the one it decided from.
+ */
+export declare function guardedNonTrustAutomationWrite(terminal: InputTerminal, write: NonTrustAutomationWriter, readFrame: () => string, agent: ElwoodAgentKind, stillValid?: (frameText: string, input: string) => boolean, cancelled?: () => boolean, signal?: AbortSignal): (input: string, perWrite?: (frameText: string) => boolean) => Promise<AutomationWriteResult>;
+//# sourceMappingURL=barrier.d.ts.map

package/dist/core/startup/barrier.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"barrier.d.ts","sourceRoot":"","sources":["../../../src/core/startup/barrier.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;;;;;;;GAoBG;AAEH,OAAO,KAAK,EAAE,eAAe,EAAE,MAAM,sBAAsB,CAAC;AAC5D,OAAO,EAAE,KAAK,aAAa,EAAe,MAAM,mBAAmB,CAAC;AAGpE,kFAAkF;AAClF,MAAM,MAAM,wBAAwB,GAAG,CAAC,KAAK,EAAE,MAAM,KAAK,IAAI,GAAG,OAAO,CAAC,IAAI,CAAC,CAAC;AAE/E;+EAC+E;AAC/E,MAAM,MAAM,qBAAqB,GAAG,SAAS,GAAG,UAAU,CAAC;AAE3D;;;;;;GAMG;AACH,wBAAgB,8BAA8B,CAC5C,QAAQ,EAAE,aAAa,EACvB,KAAK,EAAE,wBAAwB,EAC/B,SAAS,EAAE,MAAM,MAAM,EACvB,KAAK,EAAE,eAAe,EACtB,UAAU,GAAE,CAAC,SAAS,EAAE,MAAM,EAAE,KAAK,EAAE,MAAM,KAAK,OAAoB,EACtE,SAAS,GAAE,MAAM,OAAqB,EACtC,MAAM,CAAC,EAAE,WAAW,GACnB,CAAC,KAAK,EAAE,MAAM,EAAE,QAAQ,CAAC,EAAE,CAAC,SAAS,EAAE,MAAM,KAAK,OAAO,KAAK,OAAO,CAAC,qBAAqB,CAAC,CAqB9F"}

package/dist/core/startup/barrier.js

@@ -0,0 +1,59 @@
+/**
+ * A render-settlement barrier for NON-TRUST automated startup writes.
+ * Implements PRD §5.1/§5.4 and C-API-56: rendering is asynchronous (§4.1), so a trust
+ * gate can be RECEIVED while the last observed frame is still the previous screen.
+ * The veto is `trustGateVisible`, which covers allowlisted candidates AND off-allowlist
+ * gates in the native grammar — a reworded gate classifies as `unknown` to `trustView`,
+ * so vetoing on candidates alone would let an automated key reach a human-owned gate.
+ * Startup automation decides from that observed frame, so without a barrier the Codex
+ * update skip or the Claude browser-tools decline can write into a gate that has
+ * arrived but not been classified. Each write therefore observes everything received,
+ * fails closed when it cannot, and only then re-checks the settled frame.
+ *
+ * Scope is deliberate: this guards the NON-TRUST writer, never the trust writer.
+ * Answering a trust gate is `TrustPromptResponder`'s own job, so vetoing it here would
+ * block the one writer that is supposed to act on such a frame.
+ *
+ * Withholding is REPORTED, not silent. The settled frame is the first trustworthy view
+ * of the screen, so a caller that decided from the pre-settle frame must be able to
+ * learn its key never went out — otherwise it latches the prompt as handled and emits
+ * success telemetry for a key nobody sent.
+ */
+import { writeUnsafe } from "../input/abort.js";
+import { trustGateVisible } from "../trust/blocking.js";
+/**
+ * Wrap the NON-TRUST automation writer: observe all received output, then withhold the
+ * key if the settled frame shows a trust gate or the caller's own `stillValid` check no
+ * longer holds. `stillValid` runs AFTER settlement, so a caller whose key encodes screen
+ * state (an option number, a latched prompt) can revalidate it against the frame that is
+ * actually on screen rather than the one it decided from.
+ */
+export function guardedNonTrustAutomationWrite(terminal, write, readFrame, agent, stillValid = () => true, cancelled = () => false, signal) {
+    return async (input, perWrite) => {
+        // The settle await below SUSPENDS this write, so the session can close while it is
+        // parked. Check before and after: the physical `sendInput` must never run for a
+        // session that is already closing, or an Escape lands on a dead/reused PTY
+        // (C-CLAUDE-22).
+        if (cancelled())
+            return "withheld";
+        // `writeUnsafe` awaits `terminal.settled()`, so the frame read next reflects every
+        // byte received before this write was requested. It fails closed when observation
+        // exceeds its budget or a render has failed (C-API-56).
+        if (await writeUnsafe(terminal, undefined, signal))
+            return "withheld";
+        if (cancelled())
+            return "withheld";
+        const frame = readFrame();
+        if (trustGateVisible(frame, agent))
+            return "withheld";
+        if (!stillValid(frame, input))
+            return "withheld";
+        // A caller may also pass a predicate CAPTURED for this single write, so a later
+        // attempt mutating shared state cannot validate an older key (#42 round 3).
+        if (perWrite !== undefined && !perWrite(frame))
+            return "withheld";
+        await write(input);
+        return "written";
+    };
+}
+//# sourceMappingURL=barrier.js.map

package/dist/core/startup/barrier.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"barrier.js","sourceRoot":"","sources":["../../../src/core/startup/barrier.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;;;;;;;GAoBG;AAGH,OAAO,EAAsB,WAAW,EAAE,MAAM,mBAAmB,CAAC;AACpE,OAAO,EAAE,gBAAgB,EAAE,MAAM,sBAAsB,CAAC;AASxD;;;;;;GAMG;AACH,MAAM,UAAU,8BAA8B,CAC5C,QAAuB,EACvB,KAA+B,EAC/B,SAAuB,EACvB,KAAsB,EACtB,aAA4D,GAAG,EAAE,CAAC,IAAI,EACtE,YAA2B,GAAG,EAAE,CAAC,KAAK,EACtC,MAAoB;IAEpB,OAAO,KAAK,EAAE,KAAK,EAAE,QAAQ,EAAE,EAAE;QAC/B,mFAAmF;QACnF,gFAAgF;QAChF,2EAA2E;QAC3E,iBAAiB;QACjB,IAAI,SAAS,EAAE;YAAE,OAAO,UAAU,CAAC;QACnC,mFAAmF;QACnF,kFAAkF;QAClF,wDAAwD;QACxD,IAAI,MAAM,WAAW,CAAC,QAAQ,EAAE,SAAS,EAAE,MAAM,CAAC;YAAE,OAAO,UAAU,CAAC;QACtE,IAAI,SAAS,EAAE;YAAE,OAAO,UAAU,CAAC;QACnC,MAAM,KAAK,GAAG,SAAS,EAAE,CAAC;QAC1B,IAAI,gBAAgB,CAAC,KAAK,EAAE,KAAK,CAAC;YAAE,OAAO,UAAU,CAAC;QACtD,IAAI,CAAC,UAAU,CAAC,KAAK,EAAE,KAAK,CAAC;YAAE,OAAO,UAAU,CAAC;QACjD,gFAAgF;QAChF,4EAA4E;QAC5E,IAAI,QAAQ,KAAK,SAAS,IAAI,CAAC,QAAQ,CAAC,KAAK,CAAC;YAAE,OAAO,UAAU,CAAC;QAClE,MAAM,KAAK,CAAC,KAAK,CAAC,CAAC;QACnB,OAAO,SAAS,CAAC;IACnB,CAAC,CAAC;AACJ,CAAC"}

package/dist/core/startup/frame.d.ts

@@ -35,5 +35,7 @@ export declare function deliverFrameWarnings(sink: FrameWarningSink | undefined,
 export declare function createStartupWarningGate(sink: FrameWarningSink): {
     readonly emitWarnings: (warnings: readonly ElwoodWarningEvent[]) => void;
     readonly openAfterReturn: () => void;
+    /** Join a scheduled startup flush before contained terminal finalization. */
+    readonly afterDelivery: (finalize: () => void) => void;
 };
 //# sourceMappingURL=frame.d.ts.map

package/dist/core/startup/frame.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"frame.d.ts","sourceRoot":"","sources":["../../../src/core/startup/frame.ts"],"names":[],"mappings":"AAAA;;;;;;;;;GASG;AAEH,OAAO,KAAK,EAAE,kBAAkB,EAAE,MAAM,aAAa,CAAC;AAEtD,+EAA+E;AAC/E,MAAM,MAAM,gBAAgB,GAAG;IAC7B,QAAQ,CAAC,YAAY,EAAE,CAAC,QAAQ,EAAE,SAAS,kBAAkB,EAAE,KAAK,IAAI,CAAC;CAC1E,CAAC;AAEF;;;;GAIG;AACH,wBAAgB,oBAAoB,CAClC,IAAI,EAAE,gBAAgB,GAAG,SAAS,EAClC,QAAQ,EAAE,SAAS,kBAAkB,EAAE,GACtC,IAAI,CAQN;AAED;;;;;;;;;;;;GAYG;AACH,wBAAgB,wBAAwB,CAAC,IAAI,EAAE,gBAAgB,GAAG;IAChE,QAAQ,CAAC,YAAY,EAAE,CAAC,QAAQ,EAAE,SAAS,kBAAkB,EAAE,KAAK,IAAI,CAAC;IACzE,QAAQ,CAAC,eAAe,EAAE,MAAM,IAAI,CAAC;CACtC,CAiBA"}
+{"version":3,"file":"frame.d.ts","sourceRoot":"","sources":["../../../src/core/startup/frame.ts"],"names":[],"mappings":"AAAA;;;;;;;;;GASG;AAEH,OAAO,KAAK,EAAE,kBAAkB,EAAE,MAAM,aAAa,CAAC;AAEtD,+EAA+E;AAC/E,MAAM,MAAM,gBAAgB,GAAG;IAC7B,QAAQ,CAAC,YAAY,EAAE,CAAC,QAAQ,EAAE,SAAS,kBAAkB,EAAE,KAAK,IAAI,CAAC;CAC1E,CAAC;AAEF;;;;GAIG;AACH,wBAAgB,oBAAoB,CAClC,IAAI,EAAE,gBAAgB,GAAG,SAAS,EAClC,QAAQ,EAAE,SAAS,kBAAkB,EAAE,GACtC,IAAI,CAQN;AAED;;;;;;;;;;;;GAYG;AACH,wBAAgB,wBAAwB,CAAC,IAAI,EAAE,gBAAgB,GAAG;IAChE,QAAQ,CAAC,YAAY,EAAE,CAAC,QAAQ,EAAE,SAAS,kBAAkB,EAAE,KAAK,IAAI,CAAC;IACzE,QAAQ,CAAC,eAAe,EAAE,MAAM,IAAI,CAAC;IACrC,6EAA6E;IAC7E,QAAQ,CAAC,aAAa,EAAE,CAAC,QAAQ,EAAE,MAAM,IAAI,KAAK,IAAI,CAAC;CACxD,CA4BA"}

package/dist/core/startup/frame.js

@@ -39,6 +39,7 @@ export function deliverFrameWarnings(sink, warnings) {
  */
 export function createStartupWarningGate(sink) {
     let open = false;
+    let opening;
     const buffered = [];
     return {
         emitWarnings: (warnings) => {
@@ -46,13 +47,24 @@ export function createStartupWarningGate(sink) {
                 return deliverFrameWarnings(sink, warnings);
             buffered.push(...warnings);
         },
+        afterDelivery: (finalize) => {
+            if (!opening || buffered.length === 0)
+                return finalize();
+            // Exit now owns this wait: keep its scheduled flush alive until finalization.
+            opening.timer.ref();
+            void opening.done.then(finalize);
+        },
         openAfterReturn: () => {
+            const done = Promise.withResolvers();
             const timer = setTimeout(() => {
                 open = true; // subsequent startup-frame warnings deliver live from here on
                 const batch = buffered.splice(0);
                 if (batch.length > 0)
                     deliverFrameWarnings(sink, batch);
+                opening = undefined;
+                done.resolve();
             }, 0);
+            opening = { timer, done: done.promise };
             timer.unref?.();
         },
     };

package/dist/core/startup/frame.js.map

@@ -1 +1 @@
-{"version":3,"file":"frame.js","sourceRoot":"","sources":["../../../src/core/startup/frame.ts"],"names":[],"mappings":"AAAA;;;;;;;;;GASG;AASH;;;;GAIG;AACH,MAAM,UAAU,oBAAoB,CAClC,IAAkC,EAClC,QAAuC;IAEvC,IAAI,CAAC,IAAI,IAAI,QAAQ,CAAC,MAAM,KAAK,CAAC;QAAE,OAAO;IAC3C,IAAI,CAAC;QACH,IAAI,CAAC,YAAY,CAAC,QAAQ,CAAC,CAAC;IAC9B,CAAC;IAAC,MAAM,CAAC;QACP,+EAA+E;QAC/E,8EAA8E;IAChF,CAAC;AACH,CAAC;AAED;;;;;;;;;;;;GAYG;AACH,MAAM,UAAU,wBAAwB,CAAC,IAAsB;IAI7D,IAAI,IAAI,GAAG,KAAK,CAAC;IACjB,MAAM,QAAQ,GAAyB,EAAE,CAAC;IAC1C,OAAO;QACL,YAAY,EAAE,CAAC,QAAQ,EAAE,EAAE;YACzB,IAAI,IAAI;gBAAE,OAAO,oBAAoB,CAAC,IAAI,EAAE,QAAQ,CAAC,CAAC;YACtD,QAAQ,CAAC,IAAI,CAAC,GAAG,QAAQ,CAAC,CAAC;QAC7B,CAAC;QACD,eAAe,EAAE,GAAG,EAAE;YACpB,MAAM,KAAK,GAAG,UAAU,CAAC,GAAG,EAAE;gBAC5B,IAAI,GAAG,IAAI,CAAC,CAAC,8DAA8D;gBAC3E,MAAM,KAAK,GAAG,QAAQ,CAAC,MAAM,CAAC,CAAC,CAAC,CAAC;gBACjC,IAAI,KAAK,CAAC,MAAM,GAAG,CAAC;oBAAE,oBAAoB,CAAC,IAAI,EAAE,KAAK,CAAC,CAAC;YAC1D,CAAC,EAAE,CAAC,CAAC,CAAC;YACN,KAAK,CAAC,KAAK,EAAE,EAAE,CAAC;QAClB,CAAC;KACF,CAAC;AACJ,CAAC"}
+{"version":3,"file":"frame.js","sourceRoot":"","sources":["../../../src/core/startup/frame.ts"],"names":[],"mappings":"AAAA;;;;;;;;;GASG;AASH;;;;GAIG;AACH,MAAM,UAAU,oBAAoB,CAClC,IAAkC,EAClC,QAAuC;IAEvC,IAAI,CAAC,IAAI,IAAI,QAAQ,CAAC,MAAM,KAAK,CAAC;QAAE,OAAO;IAC3C,IAAI,CAAC;QACH,IAAI,CAAC,YAAY,CAAC,QAAQ,CAAC,CAAC;IAC9B,CAAC;IAAC,MAAM,CAAC;QACP,+EAA+E;QAC/E,8EAA8E;IAChF,CAAC;AACH,CAAC;AAED;;;;;;;;;;;;GAYG;AACH,MAAM,UAAU,wBAAwB,CAAC,IAAsB;IAM7D,IAAI,IAAI,GAAG,KAAK,CAAC;IACjB,IAAI,OAAqF,CAAC;IAC1F,MAAM,QAAQ,GAAyB,EAAE,CAAC;IAC1C,OAAO;QACL,YAAY,EAAE,CAAC,QAAQ,EAAE,EAAE;YACzB,IAAI,IAAI;gBAAE,OAAO,oBAAoB,CAAC,IAAI,EAAE,QAAQ,CAAC,CAAC;YACtD,QAAQ,CAAC,IAAI,CAAC,GAAG,QAAQ,CAAC,CAAC;QAC7B,CAAC;QACD,aAAa,EAAE,CAAC,QAAQ,EAAE,EAAE;YAC1B,IAAI,CAAC,OAAO,IAAI,QAAQ,CAAC,MAAM,KAAK,CAAC;gBAAE,OAAO,QAAQ,EAAE,CAAC;YACzD,8EAA8E;YAC9E,OAAO,CAAC,KAAK,CAAC,GAAG,EAAE,CAAC;YACpB,KAAK,OAAO,CAAC,IAAI,CAAC,IAAI,CAAC,QAAQ,CAAC,CAAC;QACnC,CAAC;QACD,eAAe,EAAE,GAAG,EAAE;YACpB,MAAM,IAAI,GAAG,OAAO,CAAC,aAAa,EAAQ,CAAC;YAC3C,MAAM,KAAK,GAAG,UAAU,CAAC,GAAG,EAAE;gBAC5B,IAAI,GAAG,IAAI,CAAC,CAAC,8DAA8D;gBAC3E,MAAM,KAAK,GAAG,QAAQ,CAAC,MAAM,CAAC,CAAC,CAAC,CAAC;gBACjC,IAAI,KAAK,CAAC,MAAM,GAAG,CAAC;oBAAE,oBAAoB,CAAC,IAAI,EAAE,KAAK,CAAC,CAAC;gBACxD,OAAO,GAAG,SAAS,CAAC;gBACpB,IAAI,CAAC,OAAO,EAAE,CAAC;YACjB,CAAC,EAAE,CAAC,CAAC,CAAC;YACN,OAAO,GAAG,EAAE,KAAK,EAAE,IAAI,EAAE,IAAI,CAAC,OAAO,EAAE,CAAC;YACxC,KAAK,CAAC,KAAK,EAAE,EAAE,CAAC;QAClB,CAAC;KACF,CAAC;AACJ,CAAC"}

package/dist/core/startup/warnings.d.ts

@@ -0,0 +1,5 @@
+/** Shared reentrant startup-warning delivery and filtering (PRD §5.7, C-API-14). */
+import type { ElwoodWarningEvent } from "../types.ts";
+import { createStartupWarningGate, type FrameWarningSink } from "./frame.ts";
+export declare function createSessionStartupWarningGate(session: () => FrameWarningSink | undefined, suppress: (warning: ElwoodWarningEvent) => boolean, duringDelivery: (deliver: () => void) => void): ReturnType<typeof createStartupWarningGate>;
+//# sourceMappingURL=warnings.d.ts.map

package/dist/core/startup/warnings.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"warnings.d.ts","sourceRoot":"","sources":["../../../src/core/startup/warnings.ts"],"names":[],"mappings":"AAAA,oFAAoF;AACpF,OAAO,KAAK,EAAE,kBAAkB,EAAE,MAAM,aAAa,CAAC;AACtD,OAAO,EAAE,wBAAwB,EAAwB,KAAK,gBAAgB,EAAE,MAAM,YAAY,CAAC;AAEnG,wBAAgB,+BAA+B,CAC7C,OAAO,EAAE,MAAM,gBAAgB,GAAG,SAAS,EAC3C,QAAQ,EAAE,CAAC,OAAO,EAAE,kBAAkB,KAAK,OAAO,EAClD,cAAc,EAAE,CAAC,OAAO,EAAE,MAAM,IAAI,KAAK,IAAI,GAC5C,UAAU,CAAC,OAAO,wBAAwB,CAAC,CAW7C"}

package/dist/core/startup/warnings.js

@@ -0,0 +1,14 @@
+import { createStartupWarningGate, deliverFrameWarnings } from "./frame.js";
+export function createSessionStartupWarningGate(session, suppress, duringDelivery) {
+    return createStartupWarningGate({
+        emitWarnings: (warnings) => duringDelivery(() => {
+            for (const warning of warnings) {
+                // A preceding listener can stop the session. Recheck each warning while
+                // preserving every admitted warning's paired activity.
+                if (!suppress(warning))
+                    deliverFrameWarnings(session(), [warning]);
+            }
+        }),
+    });
+}
+//# sourceMappingURL=warnings.js.map

package/dist/core/startup/warnings.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"warnings.js","sourceRoot":"","sources":["../../../src/core/startup/warnings.ts"],"names":[],"mappings":"AAEA,OAAO,EAAE,wBAAwB,EAAE,oBAAoB,EAAyB,MAAM,YAAY,CAAC;AAEnG,MAAM,UAAU,+BAA+B,CAC7C,OAA2C,EAC3C,QAAkD,EAClD,cAA6C;IAE7C,OAAO,wBAAwB,CAAC;QAC9B,YAAY,EAAE,CAAC,QAAQ,EAAE,EAAE,CACzB,cAAc,CAAC,GAAG,EAAE;YAClB,KAAK,MAAM,OAAO,IAAI,QAAQ,EAAE,CAAC;gBAC/B,wEAAwE;gBACxE,uDAAuD;gBACvD,IAAI,CAAC,QAAQ,CAAC,OAAO,CAAC;oBAAE,oBAAoB,CAAC,OAAO,EAAE,EAAE,CAAC,OAAO,CAAC,CAAC,CAAC;YACrE,CAAC;QACH,CAAC,CAAC;KACL,CAAC,CAAC;AACL,CAAC"}

package/dist/core/startup/write.d.ts

@@ -4,28 +4,30 @@
  * `startup_prompt` activity emitted) ONLY after its `sendInput` write actually
  * fulfills. A rejected write leaves the prompt retryable and surfaces a bounded,
  * content-free `startup_prompt_write_failed` warning instead of false telemetry
- * (C-CLAUDE-16, C-CODEX-17).
+ * (C-CLAUDE-16, C-CODEX-17). Logical cancellation during trust navigation or Codex update retries
+ * emits neither success activity nor a write-failure warning (C-TRUST-01, C-CODEX-12).
  */
 import type { ElwoodAgentKind } from "../activity/index.ts";
 import type { ElwoodWarningEvent } from "../warnings/index.ts";
 import type { TrustPromptIdFor } from "./automation.ts";
 import { type StartupActivityEmitter, type StartupPromptLabelFor } from "./automation.ts";
+/** Lost, changed, or expired trust/update attempts cancel without claiming a PTY failure. */
+export type StartupWriteCompletion = "answered" | "cancelled";
 /**
  * A settled startup-prompt automation, discriminated by `outcome.kind` so the
- * invalid pairings are unrepresentable: an `answered` outcome ALWAYS carries the
- * write-completion `settled` promise (resolves on write success, rejects — after
- * the responder un-settles the prompt — on a rejected write), and an
- * `option_pending` outcome (no write happened) NEVER carries one. This makes a
- * false success ("answered" with no write to await) and a silently lost warning
- * (write present on a non-answered outcome) impossible to construct (§5.4, §5.7).
+ * invalid pairings are unrepresentable: an `attempted` outcome ALWAYS carries the
+ * write-completion `settled` promise (resolves on success or safe cancellation,
+ * rejects on a failed write), and an `option_pending` outcome (no write happened)
+ * NEVER carries one. An attempt without completion and a silently lost warning
+ * (write present on a pending outcome) are impossible to construct (§5.4, §5.7).
  */
 export type SettledStartupOutcome<A extends ElwoodAgentKind> = {
     readonly outcome: {
-        readonly kind: "answered";
+        readonly kind: "attempted";
         readonly prompt: StartupPromptLabelFor<A>;
         readonly input: string;
     };
-    readonly settled: Promise<void>;
+    readonly settled: Promise<void | StartupWriteCompletion>;
 } | {
     readonly outcome: {
         readonly kind: "option_pending";
@@ -39,9 +41,9 @@ export type StartupWarningSink = {
 };
 /**
  * Emit each settled automation's activity at the RIGHT time: an `option_pending`
- * or write-less outcome emits immediately; a write-backed `answered` outcome emits
+ * or write-less outcome emits immediately; an `attempted` outcome emits
  * its `startup_prompt` activity only once the write resolves, and on rejection
- * emits a bounded warning instead — never a false "answered" activity.
+ * emits a bounded warning instead. A safely cancelled attempt emits neither.
  */
 export declare function emitSettledStartupOutcomes<A extends ElwoodAgentKind>(emitter: StartupActivityEmitter, agent: A, elwoodSessionId: string, settledOutcomes: readonly SettledStartupOutcome<NoInfer<A>>[], warnings: StartupWarningSink | undefined): void;
 //# sourceMappingURL=write.d.ts.map

package/dist/core/startup/write.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"write.d.ts","sourceRoot":"","sources":["../../../src/core/startup/write.ts"],"names":[],"mappings":"AAAA;;;;;;;GAOG;AAEH,OAAO,KAAK,EAAE,eAAe,EAAE,MAAM,sBAAsB,CAAC;AAC5D,OAAO,KAAK,EAAE,kBAAkB,EAA4B,MAAM,sBAAsB,CAAC;AACzF,OAAO,KAAK,EAAE,gBAAgB,EAAE,MAAM,iBAAiB,CAAC;AACxD,OAAO,EAEL,KAAK,sBAAsB,EAC3B,KAAK,qBAAqB,EAE3B,MAAM,iBAAiB,CAAC;AAEzB;;;;;;;;GAQG;AACH,MAAM,MAAM,qBAAqB,CAAC,CAAC,SAAS,eAAe,IACvD;IACE,QAAQ,CAAC,OAAO,EAAE;QAChB,QAAQ,CAAC,IAAI,EAAE,UAAU,CAAC;QAC1B,QAAQ,CAAC,MAAM,EAAE,qBAAqB,CAAC,CAAC,CAAC,CAAC;QAC1C,QAAQ,CAAC,KAAK,EAAE,MAAM,CAAC;KACxB,CAAC;IACF,QAAQ,CAAC,OAAO,EAAE,OAAO,CAAC,IAAI,CAAC,CAAC;CACjC,GACD;IACE,QAAQ,CAAC,OAAO,EAAE;QAAE,QAAQ,CAAC,IAAI,EAAE,gBAAgB,CAAC;QAAC,QAAQ,CAAC,MAAM,EAAE,gBAAgB,CAAC,CAAC,CAAC,CAAA;KAAE,CAAC;IAC5F,QAAQ,CAAC,OAAO,CAAC,EAAE,SAAS,CAAC;CAC9B,CAAC;AAEN,yDAAyD;AACzD,MAAM,MAAM,kBAAkB,GAAG;IAC/B,YAAY,CAAC,QAAQ,EAAE,SAAS,kBAAkB,EAAE,GAAG,IAAI,CAAC;CAC7D,CAAC;AAEF;;;;;GAKG;AACH,wBAAgB,0BAA0B,CAAC,CAAC,SAAS,eAAe,EAClE,OAAO,EAAE,sBAAsB,EAC/B,KAAK,EAAE,CAAC,EACR,eAAe,EAAE,MAAM,EAIvB,eAAe,EAAE,SAAS,qBAAqB,CAAC,OAAO,CAAC,CAAC,CAAC,CAAC,EAAE,EAC7D,QAAQ,EAAE,kBAAkB,GAAG,SAAS,GACvC,IAAI,CAgCN"}
+{"version":3,"file":"write.d.ts","sourceRoot":"","sources":["../../../src/core/startup/write.ts"],"names":[],"mappings":"AAAA;;;;;;;;GAQG;AAEH,OAAO,KAAK,EAAE,eAAe,EAAE,MAAM,sBAAsB,CAAC;AAC5D,OAAO,KAAK,EAAE,kBAAkB,EAA4B,MAAM,sBAAsB,CAAC;AACzF,OAAO,KAAK,EAAE,gBAAgB,EAAE,MAAM,iBAAiB,CAAC;AACxD,OAAO,EAEL,KAAK,sBAAsB,EAC3B,KAAK,qBAAqB,EAC3B,MAAM,iBAAiB,CAAC;AAEzB,6FAA6F;AAC7F,MAAM,MAAM,sBAAsB,GAAG,UAAU,GAAG,WAAW,CAAC;AAE9D;;;;;;;GAOG;AACH,MAAM,MAAM,qBAAqB,CAAC,CAAC,SAAS,eAAe,IACvD;IACE,QAAQ,CAAC,OAAO,EAAE;QAChB,QAAQ,CAAC,IAAI,EAAE,WAAW,CAAC;QAC3B,QAAQ,CAAC,MAAM,EAAE,qBAAqB,CAAC,CAAC,CAAC,CAAC;QAC1C,QAAQ,CAAC,KAAK,EAAE,MAAM,CAAC;KACxB,CAAC;IAEF,QAAQ,CAAC,OAAO,EAAE,OAAO,CAAC,IAAI,GAAG,sBAAsB,CAAC,CAAC;CAC1D,GACD;IACE,QAAQ,CAAC,OAAO,EAAE;QAAE,QAAQ,CAAC,IAAI,EAAE,gBAAgB,CAAC;QAAC,QAAQ,CAAC,MAAM,EAAE,gBAAgB,CAAC,CAAC,CAAC,CAAA;KAAE,CAAC;IAC5F,QAAQ,CAAC,OAAO,CAAC,EAAE,SAAS,CAAC;CAC9B,CAAC;AAEN,yDAAyD;AACzD,MAAM,MAAM,kBAAkB,GAAG;IAC/B,YAAY,CAAC,QAAQ,EAAE,SAAS,kBAAkB,EAAE,GAAG,IAAI,CAAC;CAC7D,CAAC;AAEF;;;;;GAKG;AACH,wBAAgB,0BAA0B,CAAC,CAAC,SAAS,eAAe,EAClE,OAAO,EAAE,sBAAsB,EAC/B,KAAK,EAAE,CAAC,EACR,eAAe,EAAE,MAAM,EAIvB,eAAe,EAAE,SAAS,qBAAqB,CAAC,OAAO,CAAC,CAAC,CAAC,CAAC,EAAE,EAC7D,QAAQ,EAAE,kBAAkB,GAAG,SAAS,GACvC,IAAI,CAsCN"}