botmux 2.60.0 → 2.61.0

package/dist/services/codex-bridge-queue.js

@@ -39,11 +39,14 @@
  *     has finalText.
  */
 import { makeFingerprint, normaliseForFingerprint } from './bridge-turn-queue.js';
+const UNMATCHED_REPLAY_WINDOW_MS = 5_000;
+const MAX_BUFFERED_UNMATCHED_EVENTS = 20;
 export class CodexBridgeQueue {
     seen = new Set();
     queue = [];
     collecting = null;
     localTurnsEnabled = false;
+    bufferedUnmatched = [];
     /** Lower bound (ms) for synthesising local turns — protects against a
      *  fresh-empty attach replaying historical iTerm conversation as
      *  "live" local input. Typically set to the moment adopt was wired up. */
@@ -61,6 +64,8 @@ export class CodexBridgeQueue {
     setLocalTurns(enabled, lowerBoundMs = Date.now()) {
         this.localTurnsEnabled = enabled;
         this.localLowerBoundMs = lowerBoundMs;
+        if (enabled)
+            this.bufferedUnmatched = [];
     }
     /** Push a pending Lark turn anchored to the message text. The fingerprint
      *  derived from `message` is what the upcoming `user` event must contain
@@ -74,6 +79,7 @@ export class CodexBridgeQueue {
             contentFingerprint: makeFingerprint(message),
             markTimeMs,
         });
+        this.replayBufferedUnmatched(markTimeMs);
     }
     /** Drop all pending turns. Used when the worker decides it can't reliably
      *  attribute future events (e.g. a teardown). */
@@ -81,6 +87,7 @@ export class CodexBridgeQueue {
         const dropped = this.queue.splice(0);
         if (this.collecting && dropped.includes(this.collecting))
             this.collecting = null;
+        this.bufferedUnmatched = [];
         return dropped;
     }
     /** Process newly-appended events. Idempotent on uuid: events with seen
@@ -90,91 +97,117 @@ export class CodexBridgeQueue {
             if (!ev.uuid || this.seen.has(ev.uuid))
                 continue;
             this.seen.add(ev.uuid);
-            if (ev.kind === 'user') {
-                // First decide whether this user event is a REAL turn-start: either it
-                // matches the head pending Lark turn's fingerprint (and isn't tooOld),
-                // or — in adopt mode — it synthesises a local turn. Both the HOL-drop
-                // and the actual start key off this decision.
-                const next = this.queue.find(t => !t.started);
-                const tooOld = !!next && next.markTimeMs !== undefined && ev.timestampMs < next.markTimeMs - 5_000;
-                let fingerprintOk = true;
-                if (next?.contentFingerprint) {
-                    fingerprintOk = normaliseForFingerprint(ev.text).includes(next.contentFingerprint);
-                }
-                const willStartNext = !!next && !tooOld && fingerprintOk;
-                const willSynthLocal = !willStartNext && this.localTurnsEnabled && ev.timestampMs >= this.localLowerBoundMs - 5_000;
-                // HOL-block drop (codex 0.134.0 active-turn steer): when a real new
-                // turn-start arrives while a turn is still collecting with no finalText,
-                // codex steered/merged this input into the active turn — it processes
-                // both as ONE turn and emits a single combined assistant_final, so the
-                // collecting turn will NEVER get its own final. Drop it now, otherwise
-                // it sits at the queue head forever and `drainEmittable()` wedges
-                // (started, no finalText → breaks the FIFO scan). Gating on "is a real
-                // turn-start" reuses the tooOld/fingerprint freshness already proven for
-                // turn-start, so the same 5s-skew invariant applies to both: a replayed
-                // historical user event is tooOld → won't start a turn → won't evict a
-                // live collecting turn; and a non-matching stray user event (non-adopt)
-                // is ignored rather than treated as a turn boundary. Mirrors Claude's
-                // BridgeTurnQueue.handleTurnStart HOL drop (which keys off "no assistant
-                // text yet" — the streaming-transcript equivalent of "no finalText").
-                if ((willStartNext || willSynthLocal) && this.collecting && this.collecting.finalText === undefined) {
-                    const idx = this.queue.indexOf(this.collecting);
-                    if (idx >= 0)
-                        this.queue.splice(idx, 1);
-                    this.collecting = null;
-                }
-                if (willStartNext) {
-                    next.started = true;
-                    next.sourceSessionId = ev.sourceSessionId;
-                    // Anchor the bridge-fallback suppression window to when the turn
-                    // ACTUALLY started processing (the transcript user event's
-                    // timestamp), not when the worker marked it. With type-ahead the
-                    // worker marks turn N+1 immediately after turn N (both at flush
-                    // time), but CoCo only writes turn N+1's user event when it
-                    // dequeues it — i.e. after turn N's assistant_final. Without this
-                    // override the [markTimeMs, nextTurn.markTimeMs) windows are all
-                    // bunched at flush time, so turn N's own `botmux send` (which
-                    // lands seconds later, after the model replies) falls OUTSIDE its
-                    // own window and the fallback isn't suppressed → duplicate emit.
-                    // `max` (not bare assignment) keeps the lower bound from ever
-                    // moving backwards: a dequeue event can only be at or after the
-                    // mark, and the -5s tooOld tolerance must not be able to widen the
-                    // window into a previous turn's sends. Mirrors what Claude's
-                    // BridgeTurnQueue.handleTurnStart does with eventTimeMs.
-                    if (next.markTimeMs === undefined)
-                        next.markTimeMs = ev.timestampMs;
-                    else
-                        next.markTimeMs = Math.max(next.markTimeMs, ev.timestampMs);
-                    this.collecting = next;
-                }
-                else if (willSynthLocal) {
-                    // Adopt mode local input: user typed in iTerm, no Lark
-                    // fingerprint match. Synthesise a local turn so the assistant
-                    // reply still reaches Lark. Insert AHEAD of any unstarted Lark
-                    // turn so emit order matches when the event hit the transcript.
-                    const localTurn = {
-                        turnId: `codex-local-${ev.uuid}`,
-                        started: true,
-                        isLocal: true,
-                        userText: ev.text,
-                        markTimeMs: ev.timestampMs,
-                        sourceSessionId: ev.sourceSessionId,
-                    };
-                    const insertAt = this.queue.findIndex(t => !t.started);
-                    if (insertAt === -1)
-                        this.queue.push(localTurn);
-                    else
-                        this.queue.splice(insertAt, 0, localTurn);
-                    this.collecting = localTurn;
-                }
+            this.ingestOne(ev, true);
+        }
+    }
+    replayBufferedUnmatched(markTimeMs) {
+        if (this.bufferedUnmatched.length === 0)
+            return;
+        const replay = this.bufferedUnmatched.filter(ev => ev.timestampMs >= markTimeMs - UNMATCHED_REPLAY_WINDOW_MS);
+        this.bufferedUnmatched = [];
+        for (const ev of replay)
+            this.ingestOne(ev, false);
+    }
+    rememberUnmatched(ev) {
+        this.bufferedUnmatched.push(ev);
+        if (this.bufferedUnmatched.length > MAX_BUFFERED_UNMATCHED_EVENTS) {
+            this.bufferedUnmatched.splice(0, this.bufferedUnmatched.length - MAX_BUFFERED_UNMATCHED_EVENTS);
+        }
+    }
+    ingestOne(ev, bufferUnmatched) {
+        if (ev.kind === 'user') {
+            // First decide whether this user event is a REAL turn-start: either it
+            // matches the head pending Lark turn's fingerprint (and isn't tooOld),
+            // or — in adopt mode — it synthesises a local turn. Both the HOL-drop
+            // and the actual start key off this decision.
+            const next = this.queue.find(t => !t.started);
+            const tooOld = !!next && next.markTimeMs !== undefined && ev.timestampMs < next.markTimeMs - UNMATCHED_REPLAY_WINDOW_MS;
+            let fingerprintOk = true;
+            if (next?.contentFingerprint) {
+                fingerprintOk = normaliseForFingerprint(ev.text).includes(next.contentFingerprint);
+            }
+            const willStartNext = !!next && !tooOld && fingerprintOk;
+            const willSynthLocal = !willStartNext && this.localTurnsEnabled && ev.timestampMs >= this.localLowerBoundMs - UNMATCHED_REPLAY_WINDOW_MS;
+            // HOL-block drop (codex 0.134.0 active-turn steer): when a real new
+            // turn-start arrives while a turn is still collecting with no finalText,
+            // codex steered/merged this input into the active turn — it processes
+            // both as ONE turn and emits a single combined assistant_final, so the
+            // collecting turn will NEVER get its own final. Drop it now, otherwise
+            // it sits at the queue head forever and `drainEmittable()` wedges
+            // (started, no finalText → breaks the FIFO scan). Gating on "is a real
+            // turn-start" reuses the tooOld/fingerprint freshness already proven for
+            // turn-start, so the same 5s-skew invariant applies to both: a replayed
+            // historical user event is tooOld → won't start a turn → won't evict a
+            // live collecting turn; and a non-matching stray user event (non-adopt)
+            // is ignored rather than treated as a turn boundary. Mirrors Claude's
+            // BridgeTurnQueue.handleTurnStart HOL drop (which keys off "no assistant
+            // text yet" — the streaming-transcript equivalent of "no finalText").
+            if ((willStartNext || willSynthLocal) && this.collecting && this.collecting.finalText === undefined) {
+                const idx = this.queue.indexOf(this.collecting);
+                if (idx >= 0)
+                    this.queue.splice(idx, 1);
+                this.collecting = null;
+            }
+            if (willStartNext) {
+                next.started = true;
+                next.sourceSessionId = ev.sourceSessionId;
+                // Anchor the bridge-fallback suppression window to when the turn
+                // ACTUALLY started processing (the transcript user event's
+                // timestamp), not when the worker marked it. With type-ahead the
+                // worker marks turn N+1 immediately after turn N (both at flush
+                // time), but CoCo only writes turn N+1's user event when it
+                // dequeues it — i.e. after turn N's assistant_final. Without this
+                // override the [markTimeMs, nextTurn.markTimeMs) windows are all
+                // bunched at flush time, so turn N's own `botmux send` (which
+                // lands seconds later, after the model replies) falls OUTSIDE its
+                // own window and the fallback isn't suppressed → duplicate emit.
+                // `max` (not bare assignment) keeps the lower bound from ever
+                // moving backwards: a dequeue event can only be at or after the
+                // mark, and the -5s tooOld tolerance must not be able to widen the
+                // window into a previous turn's sends. Mirrors what Claude's
+                // BridgeTurnQueue.handleTurnStart does with eventTimeMs.
+                if (next.markTimeMs === undefined)
+                    next.markTimeMs = ev.timestampMs;
+                else
+                    next.markTimeMs = Math.max(next.markTimeMs, ev.timestampMs);
+                this.collecting = next;
+            }
+            else if (willSynthLocal) {
+                // Adopt mode local input: user typed in iTerm, no Lark
+                // fingerprint match. Synthesise a local turn so the assistant
+                // reply still reaches Lark. Insert AHEAD of any unstarted Lark
+                // turn so emit order matches when the event hit the transcript.
+                const localTurn = {
+                    turnId: `codex-local-${ev.uuid}`,
+                    started: true,
+                    isLocal: true,
+                    userText: ev.text,
+                    markTimeMs: ev.timestampMs,
+                    sourceSessionId: ev.sourceSessionId,
+                };
+                const insertAt = this.queue.findIndex(t => !t.started);
+                if (insertAt === -1)
+                    this.queue.push(localTurn);
+                else
+                    this.queue.splice(insertAt, 0, localTurn);
+                this.collecting = localTurn;
+            }
+            else if (bufferUnmatched && !this.localTurnsEnabled) {
+                // Cursor can write the Lark/user line to JSONL before the daemon IPC
+                // that marks the turn reaches this worker. Keep a tiny recent buffer
+                // so mark() can replay it instead of losing the line to `seen`.
+                this.rememberUnmatched(ev);
+            }
+        }
+        else if (ev.kind === 'assistant_final') {
+            if (this.collecting) {
+                if (this.collecting.sourceSessionId && ev.sourceSessionId && this.collecting.sourceSessionId !== ev.sourceSessionId)
+                    return;
+                this.collecting.finalText = ev.text;
+                this.collecting = null;
             }
-            else if (ev.kind === 'assistant_final') {
-                if (this.collecting) {
-                    if (this.collecting.sourceSessionId && ev.sourceSessionId && this.collecting.sourceSessionId !== ev.sourceSessionId)
-                        continue;
-                    this.collecting.finalText = ev.text;
-                    this.collecting = null;
-                }
+            else if (bufferUnmatched && !this.localTurnsEnabled) {
+                this.rememberUnmatched(ev);
             }
         }
     }

package/dist/services/codex-bridge-queue.js.map

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

package/dist/services/cursor-transcript.d.ts

@@ -0,0 +1,47 @@
+import type { CodexBridgeEvent } from './codex-transcript.js';
+/** Default `~/.cursor/projects` root. Overridable by callers (tests) so the
+ *  scan doesn't depend on a real home directory. */
+export declare function cursorProjectsRoot(): string;
+/** Extract the chatId encoded in a Cursor store.db path of the shape
+ *  `.../.cursor/chats/<projectHash>/<chatId>/store.db` (also matches the
+ *  `-wal` / `-shm` sidecar files SQLite keeps open). The chatId is the same
+ *  UUID used to name the agent-transcript JSONL, so it's the bridge between
+ *  the open fd and the transcript file. Returns undefined for non-matching
+ *  paths. */
+export declare function cursorChatIdFromStoreDbPath(path: string): string | undefined;
+/** Find the chatId of an externally-running cursor-agent process by reading
+ *  the store.db file it keeps open. cursor-agent holds an fd on its current
+ *  chat's SQLite store for the whole session lifetime, which makes this the
+ *  authoritative pid→chatId binding — far more reliable than scanning chat
+ *  dirs by mtime (which would race with sibling cursor-agent panes).
+ *
+ *  Linux: `/proc/<pid>/fd/*` fast path. macOS / BSD: `lsof -p <pid> -Fn`
+ *  fallback (same shape as codex-transcript.findCodexRolloutByPid). */
+export declare function findCursorChatIdByPid(pid: number): string | undefined;
+/** Locate the agent-transcript JSONL for a given chatId. The chatId is a
+ *  globally-unique UUID, so a one-shot scan of the (small) projects root for
+ *  `<slug>/agent-transcripts/<chatId>/<chatId>.jsonl` is unambiguous and
+ *  avoids having to reproduce Cursor's opaque cwd→slug hashing. */
+export declare function findCursorTranscriptByChatId(chatId: string, projectsRoot?: string): string | undefined;
+/** Resolve the transcript path for an externally-running cursor-agent pid:
+ *  pid → open store.db → chatId → agent-transcript JSONL. Returns both the
+ *  path and the chatId so the caller can remember the chatId for a later
+ *  retry if the JSONL isn't on disk yet. */
+export declare function findCursorTranscriptByPid(pid: number, projectsRoot?: string): {
+    path: string;
+    chatId: string;
+} | undefined;
+export interface CursorDrainResult {
+    events: CodexBridgeEvent[];
+    /** Byte offset of the last fully-parsed line + its trailing \n. The next
+     *  drain should pass this back as fromOffset. */
+    newOffset: number;
+    /** A line written without its terminating \n yet — informational; only
+     *  complete lines produce events. */
+    pendingTail: string;
+}
+/** Increment-read the transcript from `fromOffset`. Mirrors the byte-offset
+ *  contract of codex-transcript.drainCodexRollout so the worker can reuse the
+ *  same fs.watch / poll wakeup machinery and the shared CodexBridgeQueue. */
+export declare function drainCursorTranscript(path: string, fromOffset: number): CursorDrainResult;
+//# sourceMappingURL=cursor-transcript.d.ts.map

package/dist/services/cursor-transcript.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"cursor-transcript.d.ts","sourceRoot":"","sources":["../../src/services/cursor-transcript.ts"],"names":[],"mappings":"AAwDA,OAAO,KAAK,EAAE,gBAAgB,EAAE,MAAM,uBAAuB,CAAC;AAM9D;oDACoD;AACpD,wBAAgB,kBAAkB,IAAI,MAAM,CAE3C;AAED;;;;;aAKa;AACb,wBAAgB,2BAA2B,CAAC,IAAI,EAAE,MAAM,GAAG,MAAM,GAAG,SAAS,CAI5E;AAED;;;;;;;uEAOuE;AACvE,wBAAgB,qBAAqB,CAAC,GAAG,EAAE,MAAM,GAAG,MAAM,GAAG,SAAS,CAgCrE;AAED;;;mEAGmE;AACnE,wBAAgB,4BAA4B,CAC1C,MAAM,EAAE,MAAM,EACd,YAAY,GAAE,MAA6B,GAC1C,MAAM,GAAG,SAAS,CASpB;AAED;;;4CAG4C;AAC5C,wBAAgB,yBAAyB,CACvC,GAAG,EAAE,MAAM,EACX,YAAY,GAAE,MAA6B,GAC1C;IAAE,IAAI,EAAE,MAAM,CAAC;IAAC,MAAM,EAAE,MAAM,CAAA;CAAE,GAAG,SAAS,CAK9C;AAED,MAAM,WAAW,iBAAiB;IAChC,MAAM,EAAE,gBAAgB,EAAE,CAAC;IAC3B;qDACiD;IACjD,SAAS,EAAE,MAAM,CAAC;IAClB;yCACqC;IACrC,WAAW,EAAE,MAAM,CAAC;CACrB;AA8ED;;6EAE6E;AAC7E,wBAAgB,qBAAqB,CAAC,IAAI,EAAE,MAAM,EAAE,UAAU,EAAE,MAAM,GAAG,iBAAiB,CA4DzF"}