botmux 3.11.0 → 3.12.0

package/dist/services/bridge-fallback-gate.js

@@ -10,17 +10,21 @@
  * Rules:
  *   - Non-adopt + sentinel terminator: the model ended its final with a
  *     standalone `BOTMUX_NOTHING_TO_SEND` (or the legacy `BOTMUX_NO_REPLY`)
- *     line. Two sub-cases, split by what remains after the sentinel line is
- *     stripped (stripTrailingBridgeSentinelLine):
- *       · NOTHING remains → genuine silence (#554): the model was triggered but
- *         deliberately produced no answer (ambient group chatter, or a message
- *         addressed to another bot). Suppress the whole turn. isBridgeNothingToSendFinal.
- *       · PROSE remains → the model DID produce an answer and merely appended
- *         the sentinel. This is the "did work, forgot to `botmux send`, ended
- *         with the sentinel" ghosting shape. Do NOT drop it: callers strip the
- *         sentinel line and forward the prose through the normal send-marker
- *         gate (so a turn that already sent is still suppressed, but an un-sent
- *         answer is delivered instead of lost).
+ *     line. Sub-cases:
+ *       · NOTHING remains after stripping the sentinel → genuine silence (#554):
+ *         the model was triggered but deliberately produced no answer (ambient
+ *         group chatter, or a message addressed to another bot). Suppress the
+ *         whole turn. isBridgeNothingToSendFinal.
+ *       · PROSE remains AND the model ALREADY sent ≥1 message in-window → the
+ *         trailing prose is narration / thinking the model kept out of chat and
+ *         then ended with the sentinel. SUPPRESS (do not re-post it as a new
+ *         answer — the length heuristic would otherwise mistake longer narration
+ *         for a substantive final). This is the "already sent, then narrated,
+ *         ended with sentinel" leak the send-marker branch guards.
+ *       · PROSE remains AND the model sent NOTHING in-window → the prose is a
+ *         real answer produced but never sent (ghosting). Do NOT drop it: callers
+ *         strip the sentinel line and forward the prose (empty marker set → not
+ *         suppressed).
  *     A token that only appears inline (mid-sentence, or with prose after it) is
  *     a normal answer and is left untouched.
  *   - Adopt mode never suppresses: in /adopt the model in the adopted
@@ -228,6 +232,25 @@ export function shouldSuppressBridgeEmit(turn, nextBoundaryMs, markers, adoptMod
     const lower = turn.markTimeMs;
     const upper = nextBoundaryMs ?? Number.POSITIVE_INFINITY;
     const markersInWindow = markers.filter(m => m.sentAtMs >= lower && m.sentAtMs < upper);
+    // A trailing sentinel line is the model's explicit "I have nothing more to
+    // send" signal. Split the two prose+sentinel cases by whether the model
+    // ALREADY sent this turn:
+    //   · sent ≥1 in-window + trailing sentinel → the trailing prose is narration
+    //     / thinking the model deliberately kept out of chat (it explicitly ended
+    //     with the sentinel after sending). SUPPRESS — do NOT let the length
+    //     heuristic below mistake longer narration for a new substantive answer
+    //     and re-post it. This is the "already sent, then narrated, ended with
+    //     sentinel" leak.
+    //   · zero sends in-window + trailing sentinel → the prose is a real answer
+    //     the model produced but never sent (ghosting). Fall through: the
+    //     stripped prose is forwarded by the length check below (markers empty →
+    //     markerSetCoversFinal=false → not suppressed → caller posts it).
+    // A final WITHOUT a trailing sentinel keeps the pure length-based behavior.
+    if (turn.finalText !== undefined
+        && hasTrailingBridgeSentinelLine(turn.finalText)
+        && markersInWindow.length > 0) {
+        return true;
+    }
     // Compare the SENTINEL-STRIPPED final against send markers: a prose+sentinel
     // final is delivered as the stripped prose (callers strip before send), so the
     // length used for the material-longer check must match what actually posts —

package/dist/services/bridge-fallback-gate.js.map

@@ -1 +1 @@
-{"version":3,"file":"bridge-fallback-gate.js","sourceRoot":"","sources":["../../src/services/bridge-fallback-gate.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"bridge-fallback-gate.js","sourceRoot":"","sources":["../../src/services/bridge-fallback-gate.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;GAkDG;AACH,OAAO,EAAE,uBAAuB,EAAE,MAAM,wBAAwB,CAAC;AAEjE,MAAM,2BAA2B,GAAG,CAAC,CAAC;AACtC,MAAM,8BAA8B,GAAG,GAAG,CAAC;AAE3C,MAAM,CAAC,MAAM,+BAA+B,GAAG,wBAAwB,CAAC;AACxE;;;;;iDAKiD;AACjD,MAAM,CAAC,MAAM,+BAA+B,GAAG,iBAAiB,CAAC;AAEjE,MAAM,sBAAsB,GAAsB;IAChD,+BAA+B;IAC/B,+BAA+B;CAChC,CAAC;AAEF,MAAM,UAAU,0BAA0B,CAAC,SAA6B;IACtE,IAAI,SAAS,KAAK,SAAS;QAAE,OAAO,KAAK,CAAC;IAC1C,2EAA2E;IAC3E,8EAA8E;IAC9E,6EAA6E;IAC7E,8EAA8E;IAC9E,8DAA8D;IAC9D,EAAE;IACF,0EAA0E;IAC1E,8EAA8E;IAC9E,6EAA6E;IAC7E,6EAA6E;IAC7E,6EAA6E;IAC7E,+EAA+E;IAC/E,8EAA8E;IAC9E,8EAA8E;IAC9E,mCAAmC;IACnC,OAAO,+BAA+B,CAAC,SAAS,CAAC,CAAC,IAAI,EAAE,CAAC,MAAM,KAAK,CAAC;WAChE,6BAA6B,CAAC,SAAS,CAAC,CAAC;AAChD,CAAC;AAED;;;6BAG6B;AAC7B,SAAS,6BAA6B,CAAC,SAAiB;IACtD,MAAM,KAAK,GAAG,SAAS,CAAC,KAAK,CAAC,IAAI,CAAC,CAAC;IACpC,KAAK,IAAI,CAAC,GAAG,KAAK,CAAC,MAAM,GAAG,CAAC,EAAE,CAAC,IAAI,CAAC,EAAE,CAAC,EAAE,EAAE,CAAC;QAC3C,MAAM,IAAI,GAAG,KAAK,CAAC,CAAC,CAAC,CAAC,IAAI,EAAE,CAAC;QAC7B,IAAI,IAAI,CAAC,MAAM,KAAK,CAAC;YAAE,SAAS;QAChC,OAAO,sBAAsB,CAAC,QAAQ,CAAC,IAAI,CAAC,CAAC;IAC/C,CAAC;IACD,OAAO,KAAK,CAAC;AACf,CAAC;AAED;;;;;;;;;;;;;;;;;;;qFAmBqF;AACrF,MAAM,UAAU,+BAA+B,CAAC,SAAiB;IAC/D,MAAM,KAAK,GAAG,SAAS,CAAC,KAAK,CAAC,IAAI,CAAC,CAAC;IACpC,8EAA8E;IAC9E,kEAAkE;IAClE,IAAI,GAAG,GAAG,KAAK,CAAC,MAAM,GAAG,CAAC,CAAC;IAC3B,IAAI,iBAAiB,GAAG,KAAK,CAAC;IAC9B,OAAO,GAAG,IAAI,CAAC,EAAE,CAAC;QAChB,MAAM,OAAO,GAAG,KAAK,CAAC,GAAG,CAAC,CAAC,IAAI,EAAE,CAAC;QAClC,IAAI,OAAO,CAAC,MAAM,KAAK,CAAC,EAAE,CAAC;YAAC,GAAG,EAAE,CAAC;YAAC,SAAS;QAAC,CAAC,CAAU,eAAe;QACvE,IAAI,sBAAsB,CAAC,QAAQ,CAAC,OAAO,CAAC,EAAE,CAAC,CAAU,0BAA0B;YACjF,iBAAiB,GAAG,IAAI,CAAC;YACzB,GAAG,EAAE,CAAC;YACN,SAAS;QACX,CAAC;QACD,MAAM,CAAmD,oBAAoB;IAC/E,CAAC;IACD,6EAA6E;IAC7E,mEAAmE;IACnE,IAAI,CAAC,iBAAiB;QAAE,OAAO,SAAS,CAAC;IACzC,2EAA2E;IAC3E,OAAO,GAAG,IAAI,CAAC,IAAI,KAAK,CAAC,GAAG,CAAC,CAAC,IAAI,EAAE,CAAC,MAAM,KAAK,CAAC;QAAE,GAAG,EAAE,CAAC;IACzD,OAAO,KAAK,CAAC,KAAK,CAAC,CAAC,EAAE,GAAG,GAAG,CAAC,CAAC,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC;AAC5C,CAAC;AAED;;;;;;;;;;;;;;;qDAeqD;AACrD,MAAM,UAAU,cAAc,CAAC,SAAiB,EAAE,SAAkB;IAClE,OAAO,SAAS,CAAC,CAAC,CAAC,SAAS,CAAC,CAAC,CAAC,+BAA+B,CAAC,SAAS,CAAC,CAAC;AAC5E,CAAC;AA2BD,MAAM,6BAA6B,GAAG,KAAK,CAAC;AAE5C;;;;;;oFAMoF;AACpF,MAAM,UAAU,0BAA0B,CAAC,OAAe;IACxD,MAAM,IAAI,GAAG,MAAM,CAAC,OAAO,IAAI,EAAE,CAAC;SAC/B,OAAO,CAAC,QAAQ,EAAE,IAAI,CAAC;SACvB,OAAO,CAAC,aAAa,EAAE,IAAI,CAAC;SAC5B,OAAO,CAAC,SAAS,EAAE,MAAM,CAAC;SAC1B,OAAO,CAAC,MAAM,EAAE,EAAE,CAAC;SACnB,OAAO,CAAC,MAAM,EAAE,EAAE,CAAC,CAAC;IACvB,IAAI,CAAC,IAAI;QAAE,OAAO,SAAS,CAAC;IAC5B,OAAO,IAAI,CAAC,MAAM,GAAG,6BAA6B;QAChD,CAAC,CAAC,GAAG,IAAI,CAAC,KAAK,CAAC,CAAC,EAAE,6BAA6B,GAAG,CAAC,CAAC,GAAG;QACxD,CAAC,CAAC,IAAI,CAAC;AACX,CAAC;AAED,MAAM,UAAU,4BAA4B,CAC1C,OAAe;IAEf,MAAM,UAAU,GAAG,uBAAuB,CAAC,OAAO,CAAC,CAAC;IACpD,IAAI,CAAC,UAAU;QAAE,OAAO,SAAS,CAAC;IAClC,OAAO;QACL,6EAA6E;QAC7E,2EAA2E;QAC3E,aAAa,EAAE,UAAU,CAAC,MAAM;QAChC,0EAA0E;QAC1E,WAAW,EAAE,0BAA0B,CAAC,OAAO,CAAC;KACjD,CAAC;AACJ,CAAC;AAMD,SAAS,0BAA0B,CAAC,MAAwB;IAC1D,OAAO,OAAO,MAAM,CAAC,aAAa,KAAK,QAAQ,CAAC;AAClD,CAAC;AAED,SAAS,gCAAgC,CAAC,WAAmB,EAAE,OAA8C;IAC3G,MAAM,aAAa,GAAG,OAAO,CAAC,MAAM,CAAC,CAAC,GAAG,EAAE,MAAM,EAAE,EAAE,CAAC,IAAI,CAAC,GAAG,CAAC,GAAG,EAAE,MAAM,CAAC,aAAa,CAAC,EAAE,CAAC,CAAC,CAAC;IAC9F,OAAO,WAAW,IAAI,aAAa,GAAG,2BAA2B;WAC5D,WAAW,GAAG,aAAa,IAAI,8BAA8B,CAAC;AACrE,CAAC;AAED,SAAS,oBAAoB,CAAC,OAAoC,EAAE,SAA6B;IAC/F,IAAI,OAAO,CAAC,MAAM,KAAK,CAAC;QAAE,OAAO,KAAK,CAAC;IAEvC,2EAA2E;IAC3E,yEAAyE;IACzE,IAAI,OAAO,CAAC,IAAI,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,0BAA0B,CAAC,CAAC,CAAC,CAAC;QAAE,OAAO,IAAI,CAAC;IAEnE,MAAM,eAAe,GAAG,uBAAuB,CAAC,SAAS,IAAI,EAAE,CAAC,CAAC;IACjE,IAAI,CAAC,eAAe;QAAE,OAAO,IAAI,CAAC;IAElC,MAAM,iBAAiB,GAAG,OAAO,CAAC,MAAM,CAAC,0BAA0B,CAAC,CAAC;IACrE,OAAO,CAAC,gCAAgC,CAAC,eAAe,CAAC,MAAM,EAAE,iBAAiB,CAAC,CAAC;AACtF,CAAC;AAED,MAAM,UAAU,wBAAwB,CACtC,IAAqB,EACrB,cAAkC,EAClC,OAAoC,EACpC,SAAkB;IAElB,IAAI,SAAS;QAAE,OAAO,KAAK,CAAC;IAC5B,IAAI,0BAA0B,CAAC,IAAI,CAAC,SAAS,CAAC;QAAE,OAAO,IAAI,CAAC;IAC5D,IAAI,IAAI,CAAC,OAAO;QAAE,OAAO,IAAI,CAAC;IAC9B,IAAI,IAAI,CAAC,UAAU,KAAK,SAAS;QAAE,OAAO,KAAK,CAAC;IAChD,MAAM,KAAK,GAAG,IAAI,CAAC,UAAU,CAAC;IAC9B,MAAM,KAAK,GAAG,cAAc,IAAI,MAAM,CAAC,iBAAiB,CAAC;IACzD,MAAM,eAAe,GAAG,OAAO,CAAC,MAAM,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,QAAQ,IAAI,KAAK,IAAI,CAAC,CAAC,QAAQ,GAAG,KAAK,CAAC,CAAC;IACvF,2EAA2E;IAC3E,wEAAwE;IACxE,0BAA0B;IAC1B,8EAA8E;IAC9E,8EAA8E;IAC9E,yEAAyE;IACzE,4EAA4E;IAC5E,2EAA2E;IAC3E,sBAAsB;IACtB,4EAA4E;IAC5E,sEAAsE;IACtE,6EAA6E;IAC7E,sEAAsE;IACtE,4EAA4E;IAC5E,IAAI,IAAI,CAAC,SAAS,KAAK,SAAS;WACzB,6BAA6B,CAAC,IAAI,CAAC,SAAS,CAAC;WAC7C,eAAe,CAAC,MAAM,GAAG,CAAC,EAAE,CAAC;QAClC,OAAO,IAAI,CAAC;IACd,CAAC;IACD,6EAA6E;IAC7E,+EAA+E;IAC/E,6EAA6E;IAC7E,8EAA8E;IAC9E,mCAAmC;IACnC,MAAM,UAAU,GAAG,IAAI,CAAC,SAAS,KAAK,SAAS;QAC7C,CAAC,CAAC,SAAS;QACX,CAAC,CAAC,+BAA+B,CAAC,IAAI,CAAC,SAAS,CAAC,CAAC;IACpD,OAAO,oBAAoB,CAAC,eAAe,EAAE,UAAU,CAAC,CAAC;AAC3D,CAAC;AAED;;;;;;;;;;;;;;;;;;;;;;;;;;;2DA2B2D;AAC3D,MAAM,UAAU,sCAAsC,CACpD,IAAqB,EACrB,cAAkC,EAClC,OAAoC,EACpC,SAAkB;IAElB,IAAI,SAAS;QAAE,OAAO,KAAK,CAAC;IAC5B,IAAI,IAAI,CAAC,OAAO;QAAE,OAAO,KAAK,CAAC;IAC/B,IAAI,IAAI,CAAC,cAAc,KAAK,SAAS,IAAI,IAAI,CAAC,cAAc,KAAK,WAAW;QAAE,OAAO,KAAK,CAAC;IAC3F,IAAI,CAAC,IAAI,CAAC,SAAS,IAAI,EAAE,CAAC,CAAC,IAAI,EAAE,CAAC,MAAM,GAAG,CAAC;QAAE,OAAO,KAAK,CAAC;IAC3D,OAAO,CAAC,wBAAwB,CAAC,IAAI,EAAE,cAAc,EAAE,OAAO,EAAE,SAAS,CAAC,CAAC;AAC7E,CAAC;AAED,kCAAkC;AAClC,MAAM,UAAU,8BAA8B,CAC5C,IAAqB,EACrB,cAAkC,EAClC,OAAoC,EACpC,SAAkB;IAElB,IAAI,SAAS;QAAE,OAAO,KAAK,CAAC;IAC5B,IAAI,IAAI,CAAC,OAAO;QAAE,OAAO,KAAK,CAAC;IAC/B,IAAI,IAAI,CAAC,cAAc,KAAK,QAAQ;QAAE,OAAO,KAAK,CAAC;IACnD,OAAO,CAAC,wBAAwB,CAAC,IAAI,EAAE,cAAc,EAAE,OAAO,EAAE,SAAS,CAAC,CAAC;AAC7E,CAAC"}

package/dist/services/codex-bridge-queue.d.ts

@@ -1,4 +1,19 @@
 import type { CodexBridgeEvent } from './codex-transcript.js';
+/** A verified submit may be parked in a type-ahead queue before its transcript
+ *  user event is written. Keep that hand-off busy for a bounded interval: long
+ *  enough for the active turn to finish and dequeue it, but never forever if
+ *  the CLI accepted the keypress without producing a structured event. */
+export declare const STRUCTURED_SUBMIT_START_GRACE_MS = 20000;
+/** Maximum time an unconfirmed worker mark may remain at the attribution
+ *  head after the adapter write/verification path stops. This lease never
+ *  contributes to lifecycle busy: it exists only so a late transcript user
+ *  event can still claim the mark without allowing a silent write to wedge
+ *  every later turn forever. */
+export declare const STRUCTURED_UNCONFIRMED_ATTRIBUTION_GRACE_MS = 20000;
+/** Maximum time a worker may wait for an adapter/history verification call.
+ *  This covers Codex/CoCo's in-band polling plus the 20s deferred recheck,
+ *  while remaining bounded if an adapter promise or recheck is stranded. */
+export declare const STRUCTURED_SUBMIT_VERIFICATION_GRACE_MS = 30000;
 export interface CodexPendingTurn {
     turnId: string;
     dispatchAttempt?: number;
@@ -8,6 +23,17 @@ export interface CodexPendingTurn {
      *  the lower bound of the "did `botmux send` happen for this turn?"
      *  window. Optional only for legacy / test-injected turns. */
     markTimeMs?: number;
+    /** Wall-clock millis when an authoritative adapter/history check confirmed
+     *  the submit. Unverified writes deliberately leave this unset. */
+    submitConfirmedAtMs?: number;
+    /** Wall-clock millis anchoring the bounded attribution-only lease for an
+     *  unconfirmed mark. Unlike verification/confirmation leases, this never
+     *  gates screen-ready or reports the CLI busy. */
+    unconfirmedAttributionStartedAtMs?: number;
+    /** Wall-clock millis when worker-side authoritative submit verification
+     *  began. This closes the race where screen-ready arrives while writeInput
+     *  is still polling history, before it can return `submitted: true`. */
+    submitVerificationStartedAtMs?: number;
     /** Set once an assistant_final event closes this turn. */
     finalText?: string;
     /** Explicit transcript terminal semantics. Undefined keeps the historical
@@ -24,8 +50,17 @@ export interface CodexPendingTurn {
      *  assistant reply so the Lark thread sees both sides of the exchange. */
     userText?: string;
     sourceSessionId?: string;
+    /** True when the turn was delivered via Codex RPC (turn/start) and the
+     *  app-server has acknowledged it. RPC turns have no local transcript to
+     *  ingest, so they can never reach the started state; this flag keeps the
+     *  lifecycle gate asserted for the full server-side execution instead of
+     *  letting the bounded 20s confirmation lease expire mid-turn (which would
+     *  falsely release idle and prune a still-running turn). Cleared by the
+     *  terminal edge or an explicit stop. */
+    rpcActive?: boolean;
 }
 export declare class CodexBridgeQueue {
+    private readonly now;
     private seen;
     private queue;
     private collecting;
@@ -36,6 +71,7 @@ export declare class CodexBridgeQueue {
      *  fresh-empty attach replaying historical iTerm conversation as
      *  "live" local input. Typically set to the moment adopt was wired up. */
     private localLowerBoundMs;
+    constructor(now?: () => number);
     /** Register events as historical without producing pending-turn side
      *  effects. Used at attach time when resume mode wants to swallow prior
      *  conversation as already-processed. */
@@ -53,22 +89,82 @@ export declare class CodexBridgeQueue {
     /** Drop all pending turns. Used when the worker decides it can't reliably
      *  attribute future events (e.g. a teardown). */
     clearPending(): CodexPendingTurn[];
-    /** Remove one exact worker delivery attempt after a failed/ambiguous
-     *  terminal. A replay may reuse turnId with a higher dispatchAttempt; if
-     *  the retired mark stayed queued, its fingerprint would claim the replay's
-     *  transcript events and permanently head-of-line block the live attempt. */
-    dropPendingTurn(turnId: string, dispatchAttempt?: number): CodexPendingTurn | null;
+    /** Remove one exact worker delivery attempt. Submit-confirmation cleanup is
+     *  pre-start-only by default: once the transcript has started a turn, only a
+     *  structured terminal may retire it. An authoritative failed/ambiguous
+     *  terminal may opt into removing a started attempt via `allowStarted`.
+     *  Matching dispatchAttempt keeps a replay of the same turnId isolated from
+     *  the retired delivery attempt. */
+    dropPendingTurn(turnId: string, dispatchAttempt?: number, allowStarted?: boolean): CodexPendingTurn | null;
+    /** Remove expired pre-start queue heads that never reached transcript
+     *  start, whether positively confirmed or only retained for attribution.
+     *  Only the first unresolved fingerprint(s) are eligible, and never
+     *  while an earlier started turn is still running: that predecessor's final
+     *  is the dequeue boundary that refreshes the next legitimate type-ahead
+     *  lease. Dropping a stale head replays buffered events immediately, so a
+     *  later real turn can become started instead of remaining hidden behind a
+     *  dead fingerprint. */
+    pruneExpiredPreStartHeads(nowMs?: number): CodexPendingTurn[];
+    /** Record positive submit evidence from an adapter/history check. The turn
+     *  can still be waiting in the CLI's type-ahead queue, so this starts a
+     *  bounded hand-off lease until its transcript user event appears. */
+    confirmPendingTurn(turnId: string, confirmedAtMs?: number, dispatchAttempt?: number): boolean;
+    /** Mark a turn as actively running server-side via Codex RPC. The app-server
+     *  ack for turn/start is authoritative confirmation that execution has begun,
+     *  but no local transcript event will follow to flip started. This flag keeps
+     *  the lifecycle gate asserted and protects the turn from lease expiry pruning
+     *  until the terminal edge (or an explicit stop) clears it. */
+    markRpcActive(turnId: string, dispatchAttempt?: number): boolean;
+    /** Clear the server-side active flag when an RPC turn reaches a terminal edge
+     *  or is otherwise retired. Without this, a completed RPC turn would keep the
+     *  lifecycle gate asserted forever (permanent false-busy). */
+    stopRpcActive(turnId: string, dispatchAttempt?: number): boolean;
+    /** Start bounded adapter/history verification before awaiting writeInput. */
+    beginSubmitVerification(turnId: string, startedAtMs?: number, dispatchAttempt?: number): boolean;
+    /** Finish verification without positive submit evidence. A bare mark remains
+     *  available for transcript attribution but no longer gates screen-ready. */
+    finishSubmitVerification(turnId: string, finishedAtMs?: number, dispatchAttempt?: number): boolean;
+    /** Exact-attempt existence check for deferred callbacks. A replay reuses
+     *  turnId with a higher dispatchAttempt, so an old timer must treat that as
+     *  a missing target rather than mutating the new delivery generation. */
+    hasPendingTurn(turnId: string, dispatchAttempt?: number): boolean;
+    /** True when buffered transcript replay has already closed this exact turn
+     *  before its RPC turn/start continuation installs rpcActive. */
+    hasTerminalTurn(turnId: string, dispatchAttempt?: number): boolean;
+    /** True while the transcript proves a turn is running, or while a verified
+     *  submit is in the bounded pre-start hand-off window. A bare worker mark is
+     *  never authoritative, preventing a dropped Enter from causing permanent
+     *  false-busy. */
+    hasBlockingTurn(nowMs?: number): boolean;
+    /** Remaining bounded pre-start verification/confirmation lease. The worker
+     *  uses this to re-drive a previously rejected ready signal once every active
+     *  lease expires. Started turns return undefined because their eventual
+     *  assistant_final is the authoritative re-drive. */
+    preStartLeaseRemainingMs(nowMs?: number): number | undefined;
     /** Process newly-appended events. Idempotent on uuid: events with seen
      *  uuids are skipped, so callers can replay safely. */
     ingest(events: CodexBridgeEvent[]): void;
     private replayBufferedUnmatched;
     private rememberUnmatched;
+    /** Refresh the next queued submit from the locally-observed terminal edge.
+     *  External transcript clocks may be skewed, so lease boundedness must use
+     *  this process's clock for both successful and aborted predecessors. */
+    private refreshNextPreStartLease;
     private ingestOne;
-    /** Pop FIFO any leading turn that is started AND observed assistant_final.
-     *  Empty final text still closes a durable turn. */
+    /** Pop FIFO any leading turn that is started AND observed a terminal edge.
+     *  Empty final text closes a durable turn without producing final_output. */
     drainEmittable(): CodexPendingTurn[];
     size(): number;
     /** Test helper — peek the queue without mutating. */
     peek(): readonly CodexPendingTurn[];
 }
+/** Explicit mutation boundary for lease expiry. Pruning can replay a buffered
+ *  successor user+final pair, so callers must drain/emit in the same call
+ *  stack; keeping that invariant here prevents a status/query path from
+ *  silently creating an unconsumed completion. */
+export declare function pruneExpiredPreStartHeadsAndEmit(queue: CodexBridgeQueue, emitReady: () => void, nowMs?: number, 
+/** Settle exact durable attempts before a replayed successor is emitted.
+ *  The queue removal can expose buffered successor user/final events, so
+ *  running this after emitReady would publish N+1 ahead of N's terminal. */
+onDropped?: (dropped: readonly CodexPendingTurn[]) => void): CodexPendingTurn[];
 //# sourceMappingURL=codex-bridge-queue.d.ts.map

package/dist/services/codex-bridge-queue.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"codex-bridge-queue.d.ts","sourceRoot":"","sources":["../../src/services/codex-bridge-queue.ts"],"names":[],"mappings":"AAyCA,OAAO,KAAK,EAAE,gBAAgB,EAAE,MAAM,uBAAuB,CAAC;AAK9D,MAAM,WAAW,gBAAgB;IAC/B,MAAM,EAAE,MAAM,CAAC;IACf,eAAe,CAAC,EAAE,MAAM,CAAC;IACzB,OAAO,EAAE,OAAO,CAAC;IACjB,kBAAkB,CAAC,EAAE,MAAM,CAAC;IAC5B;;kEAE8D;IAC9D,UAAU,CAAC,EAAE,MAAM,CAAC;IACpB,0DAA0D;IAC1D,SAAS,CAAC,EAAE,MAAM,CAAC;IACnB;kDAC8C;IAC9C,cAAc,CAAC,EAAE,WAAW,GAAG,QAAQ,GAAG,WAAW,CAAC;IACtD,iBAAiB,CAAC,EAAE,MAAM,CAAC;IAC3B,oBAAoB,CAAC,EAAE,MAAM,CAAC;IAC9B;;;2EAGuE;IACvE,OAAO,CAAC,EAAE,OAAO,CAAC;IAClB;8EAC0E;IAC1E,QAAQ,CAAC,EAAE,MAAM,CAAC;IAClB,eAAe,CAAC,EAAE,MAAM,CAAC;CAC1B;AAED,qBAAa,gBAAgB;IAC3B,OAAO,CAAC,IAAI,CAAqB;IACjC,OAAO,CAAC,KAAK,CAA0B;IACvC,OAAO,CAAC,UAAU,CAAiC;IACnD,OAAO,CAAC,iBAAiB,CAAS;IAClC,OAAO,CAAC,iBAAiB,CAA0B;IACnD,OAAO,CAAC,8BAA8B,CAAqB;IAC3D;;8EAE0E;IAC1E,OAAO,CAAC,iBAAiB,CAAK;IAE9B;;6CAEyC;IACzC,MAAM,CAAC,MAAM,EAAE,gBAAgB,EAAE,GAAG,IAAI;IAIxC;;uEAEmE;IACnE,aAAa,CAAC,OAAO,EAAE,OAAO,EAAE,YAAY,GAAE,MAAmB,GAAG,IAAI;IAMxE;;;;+DAI2D;IAC3D,IAAI,CAAC,MAAM,EAAE,MAAM,EAAE,OAAO,EAAE,MAAM,EAAE,UAAU,GAAE,MAAmB,EAAE,eAAe,CAAC,EAAE,MAAM,GAAG,IAAI;IAWtG;qDACiD;IACjD,YAAY,IAAI,gBAAgB,EAAE;IAQlC;;;iFAG6E;IAC7E,eAAe,CAAC,MAAM,EAAE,MAAM,EAAE,eAAe,CAAC,EAAE,MAAM,GAAG,gBAAgB,GAAG,IAAI;IAUlF;2DACuD;IACvD,MAAM,CAAC,MAAM,EAAE,gBAAgB,EAAE,GAAG,IAAI;IAQxC,OAAO,CAAC,uBAAuB;IAO/B,OAAO,CAAC,iBAAiB;IAOzB,OAAO,CAAC,SAAS;IA+GjB;wDACoD;IACpD,cAAc,IAAI,gBAAgB,EAAE;IAYpC,IAAI,IAAI,MAAM;IAId,qDAAqD;IACrD,IAAI,IAAI,SAAS,gBAAgB,EAAE;CAGpC"}
+{"version":3,"file":"codex-bridge-queue.d.ts","sourceRoot":"","sources":["../../src/services/codex-bridge-queue.ts"],"names":[],"mappings":"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"}