@cluesmith/codev 3.3.1 → 3.3.3

package/dist/agent-farm/servers/message-write.js.map

@@ -1 +1 @@
-{"version":3,"file":"message-write.js","sourceRoot":"","sources":["../../../src/agent-farm/servers/message-write.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"message-write.js","sourceRoot":"","sources":["../../../src/agent-farm/servers/message-write.ts"],"names":[],"mappings":"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"}

package/dist/agent-farm/servers/render-gate.d.ts

@@ -35,7 +35,10 @@
  * the same capped seed), not a round-2 regression; tracked as #1361.
  *
  * Classifier (fail-toward-not-clean): CLEAN requires
- *   (a) a recognized composer marker on the screen, AND
+ *   (a) a recognized composer marker on the screen — a text match, plus whatever further
+ *       positive evidence the profile demands that the row is the LIVE composer and not
+ *       just a row the app prefixes alike (agy anchors on the cursor row and the marker's
+ *       own palette color; see `markerRequiresCursorRow` / `markerFgPalette`), AND
  *   (b) a positively-bounded composer region (a rule/status line BELOW the
  *       marker — never a scan to the screen bottom), AND
  *   (c) zero normal-intensity (non-dim), non-whitespace, non-chrome cells in that
@@ -86,6 +89,26 @@ export interface GateProfile {
      * below the composer is never counted as user text.
      */
     regionEndPatterns: RegExp[];
+    /**
+     * Optional per-app marker anchor: when true, the marker row must ALSO be the row
+     * holding the buffer cursor. `markerPattern` alone is a text test, and a text test
+     * cannot tell a composer from any other row an app happens to prefix the same way —
+     * agy's `> ` matches its slash-menu selection cursor and its per-turn transcript echo
+     * as readily as its composer (measured, #1474). The cursor is the one signal only the
+     * live input row carries, so this converts "a row that looks like a prompt" into "the
+     * row the user would actually type into". Fail-safe: an app whose cursor is parked
+     * elsewhere yields NO marker ⇒ `no-composer-marker` ⇒ hold. Left unset, the marker is
+     * the text match alone (claude/codex behavior is unchanged).
+     */
+    markerRequiresCursorRow?: boolean;
+    /**
+     * Optional per-app marker anchor: the 16-color palette index the marker GLYPH cell must
+     * render in. The color-attribute analogue of {@link markerRequiresCursorRow}, and the
+     * signal that separates agy's composer marker (palette 12, bright blue) from its
+     * transcript echo of a submitted turn (palette 4 — measured, #1474). Left unset, the
+     * marker cell's color is not examined.
+     */
+    markerFgPalette?: number;
     /**
      * Optional per-app placeholder signal: a 16-color palette index whose cells are
      * treated as placeholder/hint chrome (ignored), NOT user text. This is the
@@ -112,6 +135,19 @@ export interface GateVerdict {
      */
     detail: 'no-composer-marker' | 'no-region-end' | 'user-text' | 'empty';
 }
+/**
+ * Every line the mirror still holds — scrollback AND viewport — right-trimmed (Issue #1573).
+ *
+ * The gate itself deliberately reads only the viewport ({@link screenLines}): a composer lives
+ * at the bottom of the screen, and history is noise for classifying it. Echo verification wants
+ * the opposite reach. A long message pushes its own header off the top while it is still being
+ * typed, so the only place the header survives is scrollback — measured with a 300-line send,
+ * where the header sat at buffer line 6 under a viewport starting at 209.
+ *
+ * Bounded by the mirror's own `SCREEN_SCROLLBACK` (1000 lines), and read once per delivery
+ * rather than per gate check, so the O(history) scan is not on any hot path.
+ */
+export declare function bufferLines(term: HeadlessTerminal): string[];
 /**
  * The classifier CORE (Spec 1313 render-gate round 2): classify an already-rendered
  * headless buffer against a profile. Synchronous — it only READS the live buffer, it never

package/dist/agent-farm/servers/render-gate.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"render-gate.d.ts","sourceRoot":"","sources":["../../../src/agent-farm/servers/render-gate.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;GAuDG;AAWH,OAAO,KAAK,EAAE,QAAQ,IAAI,gBAAgB,EAAE,MAAM,iBAAiB,CAAC;AAWpE;;;;;;;;GAQG;AACH,MAAM,WAAW,YAAY;IAC3B,MAAM,EAAE,MAAM,CAAC;IACf,IAAI,EAAE,MAAM,CAAC;IACb,IAAI,EAAE,MAAM,CAAC;CACd;AAED;;;;;GAKG;AACH,MAAM,WAAW,WAAW;IAC1B,qEAAqE;IACrE,GAAG,EAAE,MAAM,CAAC;IACZ,wEAAwE;IACxE,aAAa,EAAE,MAAM,CAAC;IACtB;;;;OAIG;IACH,iBAAiB,EAAE,MAAM,EAAE,CAAC;IAC5B;;;;;;;;OAQG;IACH,oBAAoB,CAAC,EAAE,MAAM,CAAC;CAC/B;AAED,kFAAkF;AAClF,MAAM,WAAW,WAAW;IAC1B,KAAK,EAAE,OAAO,CAAC;IACf,+DAA+D;IAC/D,MAAM,CAAC,EAAE,MAAM,CAAC;IAChB;;;;;;;OAOG;IACH,MAAM,EAAE,oBAAoB,GAAG,eAAe,GAAG,WAAW,GAAG,OAAO,CAAC;CACxE;AA0GD;;;;;;;;;;;;;;;GAeG;AACH,wBAAgB,cAAc,CAC5B,IAAI,EAAE,gBAAgB,EACtB,IAAI,EAAE,MAAM,EACZ,IAAI,EAAE,MAAM,EACZ,OAAO,EAAE,WAAW,GACnB,WAAW,CAsDb;AAED;;;;;;;GAOG;AACH,wBAAsB,cAAc,CAAC,QAAQ,EAAE,YAAY,EAAE,OAAO,EAAE,WAAW,GAAG,OAAO,CAAC,WAAW,CAAC,CAYvG"}
+{"version":3,"file":"render-gate.d.ts","sourceRoot":"","sources":["../../../src/agent-farm/servers/render-gate.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;GA0DG;AAWH,OAAO,KAAK,EAAE,QAAQ,IAAI,gBAAgB,EAAE,MAAM,iBAAiB,CAAC;AAWpE;;;;;;;;GAQG;AACH,MAAM,WAAW,YAAY;IAC3B,MAAM,EAAE,MAAM,CAAC;IACf,IAAI,EAAE,MAAM,CAAC;IACb,IAAI,EAAE,MAAM,CAAC;CACd;AAED;;;;;GAKG;AACH,MAAM,WAAW,WAAW;IAC1B,qEAAqE;IACrE,GAAG,EAAE,MAAM,CAAC;IACZ,wEAAwE;IACxE,aAAa,EAAE,MAAM,CAAC;IACtB;;;;OAIG;IACH,iBAAiB,EAAE,MAAM,EAAE,CAAC;IAC5B;;;;;;;;;;OAUG;IACH,uBAAuB,CAAC,EAAE,OAAO,CAAC;IAClC;;;;;;OAMG;IACH,eAAe,CAAC,EAAE,MAAM,CAAC;IACzB;;;;;;;;OAQG;IACH,oBAAoB,CAAC,EAAE,MAAM,CAAC;CAC/B;AAED,kFAAkF;AAClF,MAAM,WAAW,WAAW;IAC1B,KAAK,EAAE,OAAO,CAAC;IACf,+DAA+D;IAC/D,MAAM,CAAC,EAAE,MAAM,CAAC;IAChB;;;;;;;OAOG;IACH,MAAM,EAAE,oBAAoB,GAAG,eAAe,GAAG,WAAW,GAAG,OAAO,CAAC;CACxE;AAwBD;;;;;;;;;;;GAWG;AACH,wBAAgB,WAAW,CAAC,IAAI,EAAE,gBAAgB,GAAG,MAAM,EAAE,CAQ5D;AAsHD;;;;;;;;;;;;;;;GAeG;AACH,wBAAgB,cAAc,CAC5B,IAAI,EAAE,gBAAgB,EACtB,IAAI,EAAE,MAAM,EACZ,IAAI,EAAE,MAAM,EACZ,OAAO,EAAE,WAAW,GACnB,WAAW,CA2Db;AAED;;;;;;;GAOG;AACH,wBAAsB,cAAc,CAAC,QAAQ,EAAE,YAAY,EAAE,OAAO,EAAE,WAAW,GAAG,OAAO,CAAC,WAAW,CAAC,CAYvG"}

package/dist/agent-farm/servers/render-gate.js

@@ -35,7 +35,10 @@
  * the same capped seed), not a round-2 regression; tracked as #1361.
  *
  * Classifier (fail-toward-not-clean): CLEAN requires
- *   (a) a recognized composer marker on the screen, AND
+ *   (a) a recognized composer marker on the screen — a text match, plus whatever further
+ *       positive evidence the profile demands that the row is the LIVE composer and not
+ *       just a row the app prefixes alike (agy anchors on the cursor row and the marker's
+ *       own palette color; see `markerRequiresCursorRow` / `markerFgPalette`), AND
  *   (b) a positively-bounded composer region (a rule/status line BELOW the
  *       marker — never a scan to the screen bottom), AND
  *   (c) zero normal-intensity (non-dim), non-whitespace, non-chrome cells in that
@@ -81,12 +84,63 @@ function screenLines(term, rows) {
     }
     return lines;
 }
-/** Last row index whose text starts with the profile's composer marker, or -1. */
-function findMarkerRow(lines, markerPattern) {
+/**
+ * Every line the mirror still holds — scrollback AND viewport — right-trimmed (Issue #1573).
+ *
+ * The gate itself deliberately reads only the viewport ({@link screenLines}): a composer lives
+ * at the bottom of the screen, and history is noise for classifying it. Echo verification wants
+ * the opposite reach. A long message pushes its own header off the top while it is still being
+ * typed, so the only place the header survives is scrollback — measured with a 300-line send,
+ * where the header sat at buffer line 6 under a viewport starting at 209.
+ *
+ * Bounded by the mirror's own `SCREEN_SCROLLBACK` (1000 lines), and read once per delivery
+ * rather than per gate check, so the O(history) scan is not on any hot path.
+ */
+export function bufferLines(term) {
+    const buf = term.buffer.active;
+    const lines = [];
+    for (let i = 0; i < buf.length; i++) {
+        const line = buf.getLine(i);
+        lines.push(line ? line.translateToString(true).trimEnd() : '');
+    }
+    return lines;
+}
+/**
+ * Last row index that is the profile's composer marker, or -1 when no row qualifies.
+ *
+ * The text match (`markerPattern`) is the necessary condition; a profile may demand
+ * further POSITIVE evidence that the row is the live composer and not merely a row the
+ * app prefixes the same way (`markerRequiresCursorRow`, `markerFgPalette` — both measured
+ * per app, see their docs on {@link GateProfile}). Last-match-wins is retained: with the
+ * anchors applied, the qualifying rows are the composer, and the lowest one is it.
+ *
+ * Why the anchors exist (#1474): agy's marker is `> `, which its slash-menu selection
+ * cursor and its per-turn transcript echo also render — and the menu's item rows sit BELOW
+ * the composer, so text-only last-match-wins bounded the wrong region on real screens.
+ * Requiring the cursor row (and the marker's own color) makes the composer the only row
+ * that can qualify. A row that fails the anchors is simply not a marker, so an app that
+ * drifts fails toward `no-composer-marker` ⇒ hold, never toward a false clean.
+ *
+ * `cursorRow` is viewport-relative, matching `lines`' indexing from `viewportY` (the same
+ * convention {@link isGhostCursorCell} uses) — the caller converts it from xterm's
+ * baseY-relative `cursorY`.
+ */
+function findMarkerRow(lines, profile, buf, top, cursorRow, cell) {
     let markerRow = -1;
     for (let i = 0; i < lines.length; i++) {
-        if (markerPattern.test(lines[i]))
-            markerRow = i;
+        if (!profile.markerPattern.test(lines[i]))
+            continue;
+        if (profile.markerRequiresCursorRow && i !== cursorRow)
+            continue;
+        if (profile.markerFgPalette !== undefined) {
+            const line = buf.getLine(top + i);
+            if (!line)
+                continue;
+            line.getCell(0, cell);
+            if (!cell.isFgPalette() || cell.getFgColor() !== profile.markerFgPalette)
+                continue;
+        }
+        markerRow = i;
     }
     return markerRow;
 }
@@ -176,7 +230,18 @@ function isGhostCursorCell(line, row, col, cols, cursorRow, cursorCol, cell, pro
 export function classifyBuffer(term, cols, rows, profile) {
     const buf = term.buffer.active;
     const lines = screenLines(term, rows);
-    const markerRow = findMarkerRow(lines, profile.markerPattern);
+    const top = buf.viewportY;
+    const cell = buf.getNullCell();
+    const probe = buf.getNullCell(); // scratch cell for the ghost-tail look-ahead (never clobbers `cell`)
+    // Cursor position, made viewport-relative to match `lines`/`row`, which index from
+    // `viewportY`. `cursorY` is baseY-relative, NOT viewport-relative — the two coincide only
+    // while the viewport sits at the bottom of the scrollback, which is the usual case but not
+    // xterm's contract. Converting through baseY costs nothing and removes the assumption; the
+    // marker anchor below compares row indices, so a stale scroll position would otherwise
+    // move the cursor off the composer row and hold forever.
+    const cursorRow = buf.baseY + buf.cursorY - top;
+    const cursorCol = buf.cursorX;
+    const markerRow = findMarkerRow(lines, profile, buf, top, cursorRow, cell);
     if (markerRow === -1) {
         // No composer marker: a wrapper/boot screen, a full-screen picker with no marker, a
         // mirror that has not yet repainted a coherent frame, or an unrenderable snapshot.
@@ -191,12 +256,6 @@ export function classifyBuffer(term, cols, rows, profile) {
         // empty/dim, return a false CLEAN).
         return { clean: false, reason: 'busy', detail: 'no-region-end' };
     }
-    const top = buf.viewportY;
-    const cell = buf.getNullCell();
-    const probe = buf.getNullCell(); // scratch cell for the ghost-tail look-ahead (never clobbers `cell`)
-    // Cursor position is viewport-relative (matching `row`, which indexes from `viewportY`).
-    const cursorRow = buf.cursorY;
-    const cursorCol = buf.cursorX;
     let userCells = 0;
     for (let row = markerRow; row < endRow; row++) {
         const line = buf.getLine(top + row);

package/dist/agent-farm/servers/render-gate.js.map

@@ -1 +1 @@
-{"version":3,"file":"render-gate.js","sourceRoot":"","sources":["../../../src/agent-farm/servers/render-gate.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"render-gate.js","sourceRoot":"","sources":["../../../src/agent-farm/servers/render-gate.ts"],"names":[],"mappings":"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"}

package/dist/agent-farm/servers/session-submit.d.ts

@@ -41,36 +41,200 @@
  *
  * ## Exactly what it covers — this is NOT blanket per-session atomicity
  *
- * A lock only serialises writers that take it. Currently that is the `escape`
- * and `interrupt` paths of `/api/send`. Every other PTY writer still writes
- * directly, and it is worth being precise about why:
- *
- *   - The mailbox delivery path (`deliverAgentMailSerialized`, Spec 1313) — every
- *     normal `/api/send` AND every cron notification (Phase 6 rerouted cron here; the
- *     old blind `writeMessageToSession` is gone). NOT covered by this lock, and does not
- *     need it: it runs its OWN per-agent write serializer that completion-chains each
- *     delivery on the prior one's paced write (text + Enter), so two mailbox deliveries
- *     to one agent cannot interleave. That is a disjoint lock from this per-session one,
- *     so a mailbox delivery is not serialised against a concurrent `escape`/`interrupt`
- *     here — but a normal mailbox delivery only ever writes onto a render-gate-verified
- *     empty prompt, and `interrupt` is the explicit gate-bypassing human action (see
- *     tower-routes.ts), so that residual cross-path race is an accepted, documented
- *     boundary, not a regression this lock must close.
- *   - `POST /api/terminals/:id/write` — NOT covered. It is a raw passthrough
- *     with no Enter semantics of its own.
- *   - `tower-websocket.ts` keystrokes and the shellper frame relay — DELIBERATELY
- *     not covered. That is a human typing into their own terminal; serialising
- *     it behind an agent's message would make the UI feel stuck, and the human
- *     is the composer's owner.
- *
- * So the guarantee is: **two lock-taking `/api/send` submissions (escape/interrupt)
- * to one session cannot interleave**, which is the failure that reached production.
- * Anything stronger requires the remaining writers to take the lock too.
+ * A lock only serialises writers that take it. As of Issue #1365 that is every writer
+ * that puts a *message* on a terminal:
+ *
+ *   - `escape` and `interrupt` on `/api/send`, and the delayed `--interrupt` `^C`
+ *     (`tower-routes.ts`) — the explicit human gate-bypasses.
+ *   - The mailbox delivery path (`deliverAgentMailSerialized`, Spec 1313) — every normal
+ *     `/api/send`, every cron notification, every backstop drain. It takes this lock as a
+ *     LEAF inside its own per-agent serializer, via `submitMessagePaced`.
+ *
+ * These stay deliberately uncovered:
+ *
+ *   - `POST /api/terminals/:id/write` — a raw passthrough with no Enter semantics of its own.
+ *   - `tower-websocket.ts` keystrokes and the shellper frame relay — a human typing into
+ *     their own terminal. Serialising that behind an agent's message would make the UI feel
+ *     stuck, and the human is the composer's owner.
+ *
+ * ### Why the mailbox path was converged (Issue #1365)
+ *
+ * Until #1365 the delivery path held only its per-AGENT serializer — a disjoint lock — and
+ * the resulting cross-path race was accepted on the grounds that a gated delivery only ever
+ * writes onto a render-verified empty prompt and `interrupt` is an explicit human action.
+ * That reasoning covered one ordering (a delivery landing inside the interrupt's `^C`→settle
+ * →text window) and missed two:
+ *
+ *   - a `^C` landing inside the DELIVERY's own text→Enter window (50–130 ms+) cleared the
+ *     composer, so the delivery's Enter submitted nothing — yet every byte had reached the
+ *     PTY, so the write reported success and the row was marked `delivered`. Silent loss with
+ *     a false audit record, which is the one outcome Spec 1313 exists to exclude;
+ *   - `--escape` (ESC, then Enter 50 ms later) produced the truncated variant, and is the
+ *     MORE likely trigger for a multi-line body, because the delivery's exposed window is
+ *     longest exactly when the body is long.
+ *
+ * The "a human is standing at this terminal" premise also does not hold for the DELAYED
+ * `^C`, which fires unattended on a timer.
+ *
+ * ### Lock order, and why there is no cycle
+ *
+ * Always per-agent → per-terminal. The delivery path takes this lock as a leaf inside
+ * `KeyedSerializer`; the operator paths take only this one and never enter the per-agent
+ * serializer. Re-entrancy is impossible in the other direction too: `PtySession.write()`
+ * emits no `'submit'` signal (only `handleUserInput` does, for human keystrokes), so no
+ * write from inside a lock can schedule a delivery synchronously.
+ *
+ * The lock is a leaf around the WRITE only, never the gate classify. `--interrupt` is the
+ * human's escape hatch for a wedged agent; making it queue behind a screen classification
+ * would be a real regression for the one action that must always get through.
+ *
+ * ### Asymmetric acquisition: deliveries decline, operators wait
+ *
+ * A delivery uses {@link trySubmitToSession} and abandons its turn on contention, because
+ * `MailboxDrainer.tick` walks agents SEQUENTIALLY — one delivery parked on a terminal lock
+ * would stall every other agent's mail, plus that tick's escalation and prune passes. It
+ * costs nothing: a contended terminal means the delivery's in-lock precheck would have
+ * aborted it anyway, and the row simply re-delivers on the next clean pass.
+ *
+ * Operators block — bounded by {@link OPERATOR_SUBMIT_WAIT_CEILING_MS}, because a paced
+ * write runs `(lines−1)×10+80` ms and a body is capped only by `parseJsonBody`'s 1 MiB.
+ *
+ * The ceiling may only ever bypass a DELIVERY write, never another operator (codex review of
+ * PR #1492). Operator-vs-operator was ALWAYS fully serialized before #1365 — `submitToSession`
+ * had no ceiling — so a ceiling that could skip a queued or in-flight operator would make that
+ * one pair strictly WORSE than the old behaviour, which is the opposite of the point. The
+ * {@link SubmissionKind} tag plus the pending-operator count is what keeps the guarantee true
+ * per pair:
+ *
+ *   - operator vs operator — fully serialized, unbounded wait, exactly as before #1365;
+ *   - operator vs delivery — serialized under the ceiling, and above it degraded to the
+ *     pre-#1365 behaviour (two disjoint locks, i.e. no serialization at all), so never worse;
+ *   - delivery vs delivery — the per-agent serializer, unchanged, plus a declined contention.
+ *
+ * ### What is guaranteed, and what is not
+ *
+ * **Serialization is the structural guarantee**: no lock-taking writer can put bytes on a
+ * terminal while another lock-taking writer's submission is in flight. That is a property of
+ * the lock, not of any check.
+ *
+ * The delivery path ALSO re-validates its preconditions inside the lock (`writable`, the
+ * gate's `ringToken`, and the row's own status). That re-check narrows a window; it does not
+ * close one, and it should not be described as if it did:
+ *
+ *   - `ringToken` counts OUTPUT bytes, so input written by an uncovered path (the raw
+ *     passthrough, or a human's keystrokes) can sit un-echoed on the line and read as
+ *     unchanged. That echo-lag residual survives this change by design — it is #1473's
+ *     territory.
+ *   - Its real structural value is that it makes the ACQUISITION POLICY a free choice: were
+ *     the delivery ever switched from declining to waiting (e.g. to order an interrupt ahead
+ *     of its own body, per #1481), the precheck is what would keep that safe.
+ *
+ * The one hole this lock opens is its own degraded path: an operator whose ceiling expires
+ * writes unserialized. Rather than leave that as a second silent-loss route, degraded writes
+ * are COUNTED per session ({@link unserializedWriteCount}); `submitMessagePaced` holds a
+ * {@link watchBypasses} watch across its write and reports `preempted`, so the delivery holds
+ * its row for redelivery instead of reporting a delivery that may have been clobbered.
+ * Deliberately no screen re-classification — the question is only "did anyone bypass the lock
+ * while I held it?", and a counter answers exactly that. The count is BYTES, not intent: a
+ * degraded write whose callback declines to write anything (the delayed `^C` re-checks
+ * liveness inside the lock) bumps nothing, because there is nothing for a delivery to have
+ * been raced by.
  */
 /** Injectable for tests; real timers otherwise. */
 export interface SubmitClock {
     sleep(ms: number): Promise<void>;
 }
+/**
+ * What kind of writer a submission is (Issue #1365, codex review).
+ *
+ * Load-bearing for the wait ceiling: the ceiling may only ever let a writer bypass a
+ * DELIVERY write, never another operator. See {@link SubmitOptions.waitCeilingMs}.
+ */
+export type SubmissionKind = 'operator' | 'delivery-write';
+/** Options for an operator submission that must not wait unboundedly (Issue #1365). */
+export interface SubmitOptions {
+    /**
+     * What this submission is. Defaults to `operator` — every pre-#1365 caller of this
+     * function is one, and defaulting to the kind that is never bypassable is the safe way
+     * round.
+     */
+    kind?: SubmissionKind;
+    /**
+     * Max ms to wait for an in-flight submission before proceeding UNSERIALIZED.
+     * Omitted (the default) means wait as long as it takes.
+     *
+     * **Only armed when nothing ahead of us is an operator submission.** Two operator
+     * submissions to one terminal were ALWAYS fully serialized before #1365, and a ceiling
+     * that could bypass an operator would make this pair strictly worse than that — the one
+     * corner where "never worse than the old status quo" would otherwise be false. The
+     * ceiling exists to keep the escape hatch responsive against a long DELIVERY, which is
+     * the only thing it may skip.
+     */
+    waitCeilingMs?: number;
+    /** Called instead of the write's serialization when {@link waitCeilingMs} expires. */
+    onCeilingExpired?: (waitedMs: number) => void;
+    /**
+     * Consulted immediately after the write callback returns, on the DEGRADED path only:
+     * did the write actually put bytes on the terminal? Defaults to yes.
+     *
+     * The delayed `^C` re-checks `isStillLive()` and `writable` INSIDE the lock and can
+     * legitimately write nothing. Counting that as a bypass would make a concurrent delivery
+     * report `preempted` and re-deliver — a duplicate charged for a race that never happened.
+     * {@link unserializedWriteCount} answers "did bytes bypass the lock while I held it?", so
+     * only bytes may bump it.
+     */
+    wroteBytes?: () => boolean;
+}
+/**
+ * How long an OPERATOR submission (`--interrupt`, `--escape`, the delayed `^C`) waits for an
+ * in-flight submission before proceeding unserialized (Issue #1365).
+ *
+ * Needed because a paced write's duration is `(lines−1)×10+80` ms and a request body is capped
+ * only by `parseJsonBody`'s 1 MiB, so a 48 KB `--file` of short lines is ~8 minutes on the wire.
+ * Blocking `--interrupt` — the human's escape hatch for a wedged agent — behind that would be a
+ * worse regression than the interleaving this lock closes. Two seconds comfortably covers every
+ * realistic message while keeping the escape hatch responsive.
+ *
+ * It applies ONLY against a delivery write; behind another operator the wait stays unbounded
+ * (see {@link SubmitOptions.waitCeilingMs}). And when it does expire, the caller must SAY so —
+ * `/api/send` reports `degraded: true` — because a degraded operator write may interleave with
+ * the write it skipped, and the interrupt path has already claimed its row `delivered`.
+ */
+export declare const OPERATOR_SUBMIT_WAIT_CEILING_MS = 2000;
+/** A live comparison window over a session's degraded-write count. See {@link watchBypasses}. */
+export interface BypassWatch {
+    /** Did a degraded write put bytes on this terminal since the watch opened? */
+    raced(): boolean;
+    /** Close the watch. Idempotent; call it from a `finally` so no path leaks a watcher. */
+    release(): void;
+}
+/**
+ * Watch a session for degraded (ceiling-bypassing) writes across your own write.
+ *
+ * Open before the first byte, {@link BypassWatch.raced} after the last, and
+ * {@link BypassWatch.release} in a `finally`. Holding the watch is what pins the underlying
+ * count in place: without it the entry may be evicted the moment the session goes idle, and
+ * a reset between the two reads would look like "no race".
+ */
+export declare function watchBypasses(sessionId: string): BypassWatch;
+/**
+ * How many unserialized (ceiling-expired) writes this session has seen.
+ *
+ * The point of comparison for a writer that wants to know whether its own submission was
+ * raced: sample before the first byte, compare after the last. Cheaper and far more
+ * direct than re-classifying the screen — it asks "did anyone bypass the lock while I
+ * held it?", which is exactly the question, and needs no terminal rendering at all.
+ */
+export declare function unserializedWriteCount(sessionId: string): number;
+/**
+ * Whether a submission is queued or in flight for this session RIGHT NOW.
+ *
+ * Read by {@link trySubmitToSession} and exposed for telemetry. Safe to act on
+ * without a lock of its own: the runtime is single-threaded and every mutation of
+ * `chains` happens with no await in between, so a caller that observes `false`
+ * cannot be beaten to the install by another caller in the same tick.
+ */
+export declare function isSubmissionInFlight(sessionId: string): boolean;
 /**
  * Run a write against a session so that it completes before any other
  * submission to the same session begins.
@@ -80,11 +244,40 @@ export interface SubmitClock {
  *                   keystroke (the Enter) has been written. This is exactly what
  *                   `writeMessageToSession` / `writeEscapeToSession` already
  *                   return, so callers pass them through unchanged.
+ * @param clock      injectable sleeper; real timers by default
+ * @param options    {@link SubmitOptions} — the operator paths pass a wait ceiling
  * @returns resolves once the submission is complete
  */
-export declare function submitToSession(sessionId: string, write: () => number, clock?: SubmitClock): Promise<void>;
+export declare function submitToSession(sessionId: string, write: () => number, clock?: SubmitClock, options?: SubmitOptions): Promise<void>;
+/**
+ * {@link submitToSession} for a writer that would rather skip its turn than wait
+ * for one — the gated mailbox delivery path (Issue #1365).
+ *
+ * Resolves `false` **without writing anything** when another submission already
+ * holds the session. That is the right trade for a gated delivery and the wrong one
+ * for an operator action, which is why the two differ:
+ *
+ *   - A contended terminal means some other writer is mid-submission, so the
+ *     delivery's in-lock precheck would have aborted it anyway (the screen has
+ *     moved, or is about to). Nothing is lost by declining now: the row stays held
+ *     and the backstop re-delivers within one tick.
+ *   - Blocking instead would be a genuine liveness regression, because
+ *     `MailboxDrainer.tick` walks agents SEQUENTIALLY — one agent parked on a
+ *     terminal lock would stall every other agent's delivery, plus that tick's
+ *     escalation, owner-notice and prune passes.
+ *
+ * @returns `true` when the write ran (and completed), `false` when the session was
+ *          contended and nothing was written.
+ */
+export declare function trySubmitToSession(sessionId: string, write: () => number, clock?: SubmitClock): Promise<boolean>;
 /** Number of sessions with a submission in flight. Test/observability only. */
 export declare function pendingSubmissionSessions(): number;
-/** Drop all chains. Test-only; a live Tower should let them drain. */
+/** Drop all chains and degraded-write counters. Test-only; a live Tower should let them drain. */
 export declare function resetSubmissionChains(): void;
+/**
+ * How many sessions still carry a degraded-write count. Test/observability only — the
+ * assertion that {@link unserializedWrites} self-evicts rather than growing for the life of
+ * a Tower.
+ */
+export declare function bypassCountedSessions(): number;
 //# sourceMappingURL=session-submit.d.ts.map

package/dist/agent-farm/servers/session-submit.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"session-submit.d.ts","sourceRoot":"","sources":["../../../src/agent-farm/servers/session-submit.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;GAoEG;AAUH,mDAAmD;AACnD,MAAM,WAAW,WAAW;IAC1B,KAAK,CAAC,EAAE,EAAE,MAAM,GAAG,OAAO,CAAC,IAAI,CAAC,CAAC;CAClC;AAMD;;;;;;;;;;GAUG;AACH,wBAAgB,eAAe,CAC7B,SAAS,EAAE,MAAM,EACjB,KAAK,EAAE,MAAM,MAAM,EACnB,KAAK,GAAE,WAAuB,GAC7B,OAAO,CAAC,IAAI,CAAC,CAgCf;AAED,+EAA+E;AAC/E,wBAAgB,yBAAyB,IAAI,MAAM,CAElD;AAED,sEAAsE;AACtE,wBAAgB,qBAAqB,IAAI,IAAI,CAE5C"}
+{"version":3,"file":"session-submit.d.ts","sourceRoot":"","sources":["../../../src/agent-farm/servers/session-submit.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;GA6IG;AAWH,mDAAmD;AACnD,MAAM,WAAW,WAAW;IAC1B,KAAK,CAAC,EAAE,EAAE,MAAM,GAAG,OAAO,CAAC,IAAI,CAAC,CAAC;CAClC;AAMD;;;;;GAKG;AACH,MAAM,MAAM,cAAc,GAAG,UAAU,GAAG,gBAAgB,CAAC;AAE3D,uFAAuF;AACvF,MAAM,WAAW,aAAa;IAC5B;;;;OAIG;IACH,IAAI,CAAC,EAAE,cAAc,CAAC;IACtB;;;;;;;;;;OAUG;IACH,aAAa,CAAC,EAAE,MAAM,CAAC;IACvB,sFAAsF;IACtF,gBAAgB,CAAC,EAAE,CAAC,QAAQ,EAAE,MAAM,KAAK,IAAI,CAAC;IAC9C;;;;;;;;;OASG;IACH,UAAU,CAAC,EAAE,MAAM,OAAO,CAAC;CAC5B;AAKD;;;;;;;;;;;;;;GAcG;AACH,eAAO,MAAM,+BAA+B,OAAO,CAAC;AA8BpD,iGAAiG;AACjG,MAAM,WAAW,WAAW;IAC1B,8EAA8E;IAC9E,KAAK,IAAI,OAAO,CAAC;IACjB,wFAAwF;IACxF,OAAO,IAAI,IAAI,CAAC;CACjB;AAED;;;;;;;GAOG;AACH,wBAAgB,aAAa,CAAC,SAAS,EAAE,MAAM,GAAG,WAAW,CAkB5D;AA0BD;;;;;;;GAOG;AACH,wBAAgB,sBAAsB,CAAC,SAAS,EAAE,MAAM,GAAG,MAAM,CAEhE;AAED;;;;;;;GAOG;AACH,wBAAgB,oBAAoB,CAAC,SAAS,EAAE,MAAM,GAAG,OAAO,CAE/D;AAED;;;;;;;;;;;;GAYG;AACH,wBAAgB,eAAe,CAC7B,SAAS,EAAE,MAAM,EACjB,KAAK,EAAE,MAAM,MAAM,EACnB,KAAK,GAAE,WAAuB,EAC9B,OAAO,GAAE,aAAkB,GAC1B,OAAO,CAAC,IAAI,CAAC,CAiGf;AAED;;;;;;;;;;;;;;;;;;;GAmBG;AACH,wBAAsB,kBAAkB,CACtC,SAAS,EAAE,MAAM,EACjB,KAAK,EAAE,MAAM,MAAM,EACnB,KAAK,GAAE,WAAuB,GAC7B,OAAO,CAAC,OAAO,CAAC,CAIlB;AAED,+EAA+E;AAC/E,wBAAgB,yBAAyB,IAAI,MAAM,CAElD;AAED,kGAAkG;AAClG,wBAAgB,qBAAqB,IAAI,IAAI,CAK5C;AAED;;;;GAIG;AACH,wBAAgB,qBAAqB,IAAI,MAAM,CAE9C"}