botmux 2.12.0 → 2.12.2

package/dist/services/bridge-rotation-policy.d.ts

@@ -0,0 +1,139 @@
+/**
+ * Pure rotation-policy gate for the Claude bridge watcher.
+ *
+ * Lives outside `worker.ts` so tests can import without dragging worker-level
+ * fs / IPC side-effects.
+ */
+export type PidFollowResult = 'unavailable' | 'same' | 'switched';
+/**
+ * Decide whether `bridgeIngest` should fall through to the directory-mtime
+ * `maybeFollowQuietRotation` heuristic this tick.
+ *
+ * Inputs:
+ *   - `pidFollow`: result of the authoritative pid-state probe
+ *     (`maybeFollowSessionRotationViaPid`). `'switched'` means it already
+ *     moved us; `'same'` means the pid file's `sessionId` matches our
+ *     current path; `'unavailable'` means the pid file was unreadable
+ *     (non-Linux, no `~/.claude/sessions/<pid>.json`, validation failure).
+ *   - `switched`: whether ANY earlier rotation step (pid resolver OR
+ *     fingerprint fallback) already moved the watcher this tick.
+ *
+ * Returns true only when there was no earlier switch AND the pid resolver
+ * gave no opinion.
+ *
+ * Trade-off: pid resolver `'same'` is NOT proof that no rotation happened
+ * — Claude Code 2.1.123 writes `sessionId` ONCE at process start and the
+ * in-pane `/clear` path does not refresh it. We still skip the mtime
+ * heuristic on `'same'` because the alternative is sibling-pane hijack:
+ * any other Claude pane in the same cwd gets a busier jsonl and the
+ * heuristic picks it. The cost is that a pure-local `/clear` with no
+ * pending Lark turn won't auto-follow until the user sends a Lark
+ * message (which arms fingerprint fallback). The Lark-message path is
+ * the dominant /clear recovery flow in practice; sibling-pane
+ * corruption would silently break every multi-pane adopt setup.
+ *
+ * `--resume` is a fresh spawn and rewrites the pid file's sessionId, so
+ * it surfaces here as `'switched'`, not `'same'` — it's not affected by
+ * this gate.
+ */
+export declare function shouldRunQuietRotation(pidFollow: PidFollowResult, switched: boolean): boolean;
+export interface PidResolverPullbackInput {
+    /** sessionId reported by the pid file this tick. */
+    resolvedCliSessionId: string;
+    /** The pid file's full jsonl path (derived from sessionId + cwd). */
+    resolvedPath: string;
+    /** Current bridge jsonl path. */
+    currentBridgeJsonlPath: string | undefined;
+    /** Sid recorded as "stale" by the fingerprint fallback the last time it
+     *  accepted a candidate the pid file disagreed about. Undefined when no
+     *  fingerprint accept has overridden the pid file. */
+    stalePidStateSessionId: string | undefined;
+}
+export interface PidResolverPullbackDecision {
+    /** True ⇒ pid resolver should report 'same' rather than rotate the
+     *  watcher back to `resolvedPath`. */
+    suppress: boolean;
+    /** True ⇒ caller should clear `stalePidStateSessionId`: a fresh sid
+     *  (different from the stale one) appeared in the pid file, meaning a
+     *  real rotation has happened (`--resume` / fresh spawn) and the prior
+     *  fingerprint accept is no longer relevant. */
+    clearStale: boolean;
+}
+/**
+ * Decide whether the pid resolver should pull the watcher back to a path
+ * that disagrees with the current bridgeJsonlPath, given the worker's
+ * staleness bookkeeping.
+ *
+ * Rules:
+ * - No `stalePidStateSessionId` recorded ⇒ honour pid resolver as before.
+ * - Recorded sid matches pid file's current sid ⇒ suppress: this is the
+ *   spawn-time sid that fingerprint fallback already overrode for an
+ *   in-pane /clear that pid file can't see.
+ * - Recorded sid differs from pid file's current sid ⇒ a NEW rotation has
+ *   happened (`--resume` / fresh spawn / Claude restart with new pid file
+ *   contents). Clear the stale flag and let pid resolver switch normally.
+ */
+export declare function evaluatePidResolverPullback(input: PidResolverPullbackInput): PidResolverPullbackDecision;
+/** UUID-shaped Claude jsonl filename (sessionId.jsonl). Duplicated from
+ *  `src/adapters/cli/claude-code.ts:SESSION_UUID_RE` to keep this module
+ *  free of adapter imports. Keep the two patterns in sync; both gate
+ *  trust-set membership and fingerprint-fallback candidate eligibility. */
+export declare const SESSION_ID_FILENAME_RE: RegExp;
+/** Extract the sessionId portion of a `<sid>.jsonl` path (basename minus
+ *  the `.jsonl` extension). Returns the empty string when the path lacks
+ *  the expected suffix; callers should treat that as "untrusted". */
+export declare function sessionIdFromJsonlPath(path: string): string;
+export interface FingerprintSwitchInput {
+    /** Substring fingerprint to feed Phase 1's scanner. Required. */
+    contentFingerprint: string;
+    /** Full normalised content of the Lark turn. Phase 2 (unknown-sid
+     *  exact-content recovery) is skipped when this is missing or empty —
+     *  short content can't anchor a recovery without ambiguity. */
+    contentNormalized?: string;
+    /** Trust set populated from initial attach, pid resolver hits, fd probes. */
+    knownSessionIds: ReadonlySet<string>;
+    /** Phase 1 scanner: substring fingerprint search. Caller wires it to
+     *  `findJsonlContainingFingerprint`; this helper only sees the result. */
+    findSubstring: (acceptCandidate: (path: string) => boolean) => string | null;
+    /** Phase 2 scanner: exact-content search returning ALL matches in
+     *  mtime-descending order. Caller wires it to
+     *  `findJsonlsContainingExactContent`. */
+    findExact: (acceptCandidate: (path: string) => boolean) => string[];
+}
+export type FingerprintSwitchDecision = {
+    action: 'switch';
+    path: string;
+    reason: 'known-sid-substring' | 'unknown-sid-exact';
+} | {
+    action: 'abstain';
+    reason: 'multiple-unknown-exact';
+    candidates: string[];
+} | {
+    action: 'no-match';
+};
+/**
+ * Two-phase candidate selection for the bridge fingerprint fallback.
+ *
+ * Phase 1 (known-sid substring): the cheap path. Run the substring
+ * fingerprint scanner with an acceptCandidate predicate that requires
+ * `(UUID-shaped sid) AND (sid in knownSessionIds)`. Sibling panes are
+ * UUID-shaped but not in our trust set — their fingerprint hits are
+ * rejected. UUID gate also blocks accidental non-Claude jsonls.
+ *
+ * Phase 2 (unknown-sid exact-content recovery): only runs when
+ * `contentNormalized` is non-empty. Fires when Phase 1 found no match,
+ * which is the worst-case in-pane `/clear` scenario where the new sid
+ * never reaches our trust set (pid file lags, fd probe missed the open
+ * window). Run the exact-content scanner with predicate
+ * `(UUID-shaped sid) AND (sid NOT in knownSessionIds)`. Decision:
+ *   - 0 matches → no-match
+ *   - 1 match  → switch (the post-/clear file we couldn't otherwise see)
+ *   - ≥2 matches → abstain; multiple untrusted files normalise to the
+ *     same Lark content, so we cannot pick one without further evidence.
+ *     Caller is expected to log and surface a diagnostic.
+ *
+ * Pure: never touches fs / IPC / module state. Tests inject fakes for
+ * `findSubstring` and `findExact` to exercise every branch.
+ */
+export declare function decideFingerprintSwitch(input: FingerprintSwitchInput): FingerprintSwitchDecision;
+//# sourceMappingURL=bridge-rotation-policy.d.ts.map

package/dist/services/bridge-rotation-policy.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"bridge-rotation-policy.d.ts","sourceRoot":"","sources":["../../src/services/bridge-rotation-policy.ts"],"names":[],"mappings":"AAAA;;;;;GAKG;AAEH,MAAM,MAAM,eAAe,GAAG,aAAa,GAAG,MAAM,GAAG,UAAU,CAAC;AAElE;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;GA8BG;AACH,wBAAgB,sBAAsB,CACpC,SAAS,EAAE,eAAe,EAC1B,QAAQ,EAAE,OAAO,GAChB,OAAO,CAGT;AAID,MAAM,WAAW,wBAAwB;IACvC,oDAAoD;IACpD,oBAAoB,EAAE,MAAM,CAAC;IAC7B,qEAAqE;IACrE,YAAY,EAAE,MAAM,CAAC;IACrB,iCAAiC;IACjC,sBAAsB,EAAE,MAAM,GAAG,SAAS,CAAC;IAC3C;;0DAEsD;IACtD,sBAAsB,EAAE,MAAM,GAAG,SAAS,CAAC;CAC5C;AAED,MAAM,WAAW,2BAA2B;IAC1C;0CACsC;IACtC,QAAQ,EAAE,OAAO,CAAC;IAClB;;;oDAGgD;IAChD,UAAU,EAAE,OAAO,CAAC;CACrB;AAED;;;;;;;;;;;;;GAaG;AACH,wBAAgB,2BAA2B,CACzC,KAAK,EAAE,wBAAwB,GAC9B,2BAA2B,CAQ7B;AAID;;;2EAG2E;AAC3E,eAAO,MAAM,sBAAsB,QAAoE,CAAC;AAExG;;qEAEqE;AACrE,wBAAgB,sBAAsB,CAAC,IAAI,EAAE,MAAM,GAAG,MAAM,CAG3D;AAED,MAAM,WAAW,sBAAsB;IACrC,iEAAiE;IACjE,kBAAkB,EAAE,MAAM,CAAC;IAC3B;;mEAE+D;IAC/D,iBAAiB,CAAC,EAAE,MAAM,CAAC;IAC3B,6EAA6E;IAC7E,eAAe,EAAE,WAAW,CAAC,MAAM,CAAC,CAAC;IACrC;8EAC0E;IAC1E,aAAa,EAAE,CAAC,eAAe,EAAE,CAAC,IAAI,EAAE,MAAM,KAAK,OAAO,KAAK,MAAM,GAAG,IAAI,CAAC;IAC7E;;8CAE0C;IAC1C,SAAS,EAAE,CAAC,eAAe,EAAE,CAAC,IAAI,EAAE,MAAM,KAAK,OAAO,KAAK,MAAM,EAAE,CAAC;CACrE;AAED,MAAM,MAAM,yBAAyB,GACjC;IAAE,MAAM,EAAE,QAAQ,CAAC;IAAC,IAAI,EAAE,MAAM,CAAC;IAAC,MAAM,EAAE,qBAAqB,GAAG,mBAAmB,CAAA;CAAE,GACvF;IAAE,MAAM,EAAE,SAAS,CAAC;IAAC,MAAM,EAAE,wBAAwB,CAAC;IAAC,UAAU,EAAE,MAAM,EAAE,CAAA;CAAE,GAC7E;IAAE,MAAM,EAAE,UAAU,CAAA;CAAE,CAAC;AAE3B;;;;;;;;;;;;;;;;;;;;;;;GAuBG;AACH,wBAAgB,uBAAuB,CACrC,KAAK,EAAE,sBAAsB,GAC5B,yBAAyB,CAoB3B"}

package/dist/services/bridge-rotation-policy.js

@@ -0,0 +1,125 @@
+/**
+ * Pure rotation-policy gate for the Claude bridge watcher.
+ *
+ * Lives outside `worker.ts` so tests can import without dragging worker-level
+ * fs / IPC side-effects.
+ */
+/**
+ * Decide whether `bridgeIngest` should fall through to the directory-mtime
+ * `maybeFollowQuietRotation` heuristic this tick.
+ *
+ * Inputs:
+ *   - `pidFollow`: result of the authoritative pid-state probe
+ *     (`maybeFollowSessionRotationViaPid`). `'switched'` means it already
+ *     moved us; `'same'` means the pid file's `sessionId` matches our
+ *     current path; `'unavailable'` means the pid file was unreadable
+ *     (non-Linux, no `~/.claude/sessions/<pid>.json`, validation failure).
+ *   - `switched`: whether ANY earlier rotation step (pid resolver OR
+ *     fingerprint fallback) already moved the watcher this tick.
+ *
+ * Returns true only when there was no earlier switch AND the pid resolver
+ * gave no opinion.
+ *
+ * Trade-off: pid resolver `'same'` is NOT proof that no rotation happened
+ * — Claude Code 2.1.123 writes `sessionId` ONCE at process start and the
+ * in-pane `/clear` path does not refresh it. We still skip the mtime
+ * heuristic on `'same'` because the alternative is sibling-pane hijack:
+ * any other Claude pane in the same cwd gets a busier jsonl and the
+ * heuristic picks it. The cost is that a pure-local `/clear` with no
+ * pending Lark turn won't auto-follow until the user sends a Lark
+ * message (which arms fingerprint fallback). The Lark-message path is
+ * the dominant /clear recovery flow in practice; sibling-pane
+ * corruption would silently break every multi-pane adopt setup.
+ *
+ * `--resume` is a fresh spawn and rewrites the pid file's sessionId, so
+ * it surfaces here as `'switched'`, not `'same'` — it's not affected by
+ * this gate.
+ */
+export function shouldRunQuietRotation(pidFollow, switched) {
+    if (switched)
+        return false;
+    return pidFollow === 'unavailable';
+}
+/**
+ * Decide whether the pid resolver should pull the watcher back to a path
+ * that disagrees with the current bridgeJsonlPath, given the worker's
+ * staleness bookkeeping.
+ *
+ * Rules:
+ * - No `stalePidStateSessionId` recorded ⇒ honour pid resolver as before.
+ * - Recorded sid matches pid file's current sid ⇒ suppress: this is the
+ *   spawn-time sid that fingerprint fallback already overrode for an
+ *   in-pane /clear that pid file can't see.
+ * - Recorded sid differs from pid file's current sid ⇒ a NEW rotation has
+ *   happened (`--resume` / fresh spawn / Claude restart with new pid file
+ *   contents). Clear the stale flag and let pid resolver switch normally.
+ */
+export function evaluatePidResolverPullback(input) {
+    if (input.stalePidStateSessionId === undefined) {
+        return { suppress: false, clearStale: false };
+    }
+    if (input.resolvedCliSessionId === input.stalePidStateSessionId) {
+        return { suppress: true, clearStale: false };
+    }
+    return { suppress: false, clearStale: true };
+}
+// ─── Two-phase fingerprint-fallback decision ───────────────────────────────
+/** UUID-shaped Claude jsonl filename (sessionId.jsonl). Duplicated from
+ *  `src/adapters/cli/claude-code.ts:SESSION_UUID_RE` to keep this module
+ *  free of adapter imports. Keep the two patterns in sync; both gate
+ *  trust-set membership and fingerprint-fallback candidate eligibility. */
+export const SESSION_ID_FILENAME_RE = /^[0-9a-f]{8}-[0-9a-f]{4}-[0-9a-f]{4}-[0-9a-f]{4}-[0-9a-f]{12}$/i;
+/** Extract the sessionId portion of a `<sid>.jsonl` path (basename minus
+ *  the `.jsonl` extension). Returns the empty string when the path lacks
+ *  the expected suffix; callers should treat that as "untrusted". */
+export function sessionIdFromJsonlPath(path) {
+    const base = path.split('/').pop() ?? '';
+    return base.endsWith('.jsonl') ? base.slice(0, -'.jsonl'.length) : '';
+}
+/**
+ * Two-phase candidate selection for the bridge fingerprint fallback.
+ *
+ * Phase 1 (known-sid substring): the cheap path. Run the substring
+ * fingerprint scanner with an acceptCandidate predicate that requires
+ * `(UUID-shaped sid) AND (sid in knownSessionIds)`. Sibling panes are
+ * UUID-shaped but not in our trust set — their fingerprint hits are
+ * rejected. UUID gate also blocks accidental non-Claude jsonls.
+ *
+ * Phase 2 (unknown-sid exact-content recovery): only runs when
+ * `contentNormalized` is non-empty. Fires when Phase 1 found no match,
+ * which is the worst-case in-pane `/clear` scenario where the new sid
+ * never reaches our trust set (pid file lags, fd probe missed the open
+ * window). Run the exact-content scanner with predicate
+ * `(UUID-shaped sid) AND (sid NOT in knownSessionIds)`. Decision:
+ *   - 0 matches → no-match
+ *   - 1 match  → switch (the post-/clear file we couldn't otherwise see)
+ *   - ≥2 matches → abstain; multiple untrusted files normalise to the
+ *     same Lark content, so we cannot pick one without further evidence.
+ *     Caller is expected to log and surface a diagnostic.
+ *
+ * Pure: never touches fs / IPC / module state. Tests inject fakes for
+ * `findSubstring` and `findExact` to exercise every branch.
+ */
+export function decideFingerprintSwitch(input) {
+    const matchedKnown = input.findSubstring((path) => {
+        const sid = sessionIdFromJsonlPath(path);
+        return SESSION_ID_FILENAME_RE.test(sid) && input.knownSessionIds.has(sid);
+    });
+    if (matchedKnown) {
+        return { action: 'switch', path: matchedKnown, reason: 'known-sid-substring' };
+    }
+    if (!input.contentNormalized || input.contentNormalized.length === 0) {
+        return { action: 'no-match' };
+    }
+    const exact = input.findExact((path) => {
+        const sid = sessionIdFromJsonlPath(path);
+        return SESSION_ID_FILENAME_RE.test(sid) && !input.knownSessionIds.has(sid);
+    });
+    if (exact.length === 0)
+        return { action: 'no-match' };
+    if (exact.length > 1) {
+        return { action: 'abstain', reason: 'multiple-unknown-exact', candidates: exact };
+    }
+    return { action: 'switch', path: exact[0], reason: 'unknown-sid-exact' };
+}
+//# sourceMappingURL=bridge-rotation-policy.js.map

package/dist/services/bridge-rotation-policy.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"bridge-rotation-policy.js","sourceRoot":"","sources":["../../src/services/bridge-rotation-policy.ts"],"names":[],"mappings":"AAAA;;;;;GAKG;AAIH;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;GA8BG;AACH,MAAM,UAAU,sBAAsB,CACpC,SAA0B,EAC1B,QAAiB;IAEjB,IAAI,QAAQ;QAAE,OAAO,KAAK,CAAC;IAC3B,OAAO,SAAS,KAAK,aAAa,CAAC;AACrC,CAAC;AA4BD;;;;;;;;;;;;;GAaG;AACH,MAAM,UAAU,2BAA2B,CACzC,KAA+B;IAE/B,IAAI,KAAK,CAAC,sBAAsB,KAAK,SAAS,EAAE,CAAC;QAC/C,OAAO,EAAE,QAAQ,EAAE,KAAK,EAAE,UAAU,EAAE,KAAK,EAAE,CAAC;IAChD,CAAC;IACD,IAAI,KAAK,CAAC,oBAAoB,KAAK,KAAK,CAAC,sBAAsB,EAAE,CAAC;QAChE,OAAO,EAAE,QAAQ,EAAE,IAAI,EAAE,UAAU,EAAE,KAAK,EAAE,CAAC;IAC/C,CAAC;IACD,OAAO,EAAE,QAAQ,EAAE,KAAK,EAAE,UAAU,EAAE,IAAI,EAAE,CAAC;AAC/C,CAAC;AAED,8EAA8E;AAE9E;;;2EAG2E;AAC3E,MAAM,CAAC,MAAM,sBAAsB,GAAG,iEAAiE,CAAC;AAExG;;qEAEqE;AACrE,MAAM,UAAU,sBAAsB,CAAC,IAAY;IACjD,MAAM,IAAI,GAAG,IAAI,CAAC,KAAK,CAAC,GAAG,CAAC,CAAC,GAAG,EAAE,IAAI,EAAE,CAAC;IACzC,OAAO,IAAI,CAAC,QAAQ,CAAC,QAAQ,CAAC,CAAC,CAAC,CAAC,IAAI,CAAC,KAAK,CAAC,CAAC,EAAE,CAAC,QAAQ,CAAC,MAAM,CAAC,CAAC,CAAC,CAAC,EAAE,CAAC;AACxE,CAAC;AAyBD;;;;;;;;;;;;;;;;;;;;;;;GAuBG;AACH,MAAM,UAAU,uBAAuB,CACrC,KAA6B;IAE7B,MAAM,YAAY,GAAG,KAAK,CAAC,aAAa,CAAC,CAAC,IAAI,EAAE,EAAE;QAChD,MAAM,GAAG,GAAG,sBAAsB,CAAC,IAAI,CAAC,CAAC;QACzC,OAAO,sBAAsB,CAAC,IAAI,CAAC,GAAG,CAAC,IAAI,KAAK,CAAC,eAAe,CAAC,GAAG,CAAC,GAAG,CAAC,CAAC;IAC5E,CAAC,CAAC,CAAC;IACH,IAAI,YAAY,EAAE,CAAC;QACjB,OAAO,EAAE,MAAM,EAAE,QAAQ,EAAE,IAAI,EAAE,YAAY,EAAE,MAAM,EAAE,qBAAqB,EAAE,CAAC;IACjF,CAAC;IACD,IAAI,CAAC,KAAK,CAAC,iBAAiB,IAAI,KAAK,CAAC,iBAAiB,CAAC,MAAM,KAAK,CAAC,EAAE,CAAC;QACrE,OAAO,EAAE,MAAM,EAAE,UAAU,EAAE,CAAC;IAChC,CAAC;IACD,MAAM,KAAK,GAAG,KAAK,CAAC,SAAS,CAAC,CAAC,IAAI,EAAE,EAAE;QACrC,MAAM,GAAG,GAAG,sBAAsB,CAAC,IAAI,CAAC,CAAC;QACzC,OAAO,sBAAsB,CAAC,IAAI,CAAC,GAAG,CAAC,IAAI,CAAC,KAAK,CAAC,eAAe,CAAC,GAAG,CAAC,GAAG,CAAC,CAAC;IAC7E,CAAC,CAAC,CAAC;IACH,IAAI,KAAK,CAAC,MAAM,KAAK,CAAC;QAAE,OAAO,EAAE,MAAM,EAAE,UAAU,EAAE,CAAC;IACtD,IAAI,KAAK,CAAC,MAAM,GAAG,CAAC,EAAE,CAAC;QACrB,OAAO,EAAE,MAAM,EAAE,SAAS,EAAE,MAAM,EAAE,wBAAwB,EAAE,UAAU,EAAE,KAAK,EAAE,CAAC;IACpF,CAAC;IACD,OAAO,EAAE,MAAM,EAAE,QAAQ,EAAE,IAAI,EAAE,KAAK,CAAC,CAAC,CAAC,EAAE,MAAM,EAAE,mBAAmB,EAAE,CAAC;AAC3E,CAAC"}

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

@@ -51,6 +51,14 @@ export interface BridgePendingTurn {
      *  start the turn. Local-terminal input (whose content won't contain
      *  the Lark fingerprint) leaves the turn unstarted. */
     contentFingerprint?: string;
+    /** Full normalised content of the Lark message. Used by the rotation
+     *  fallback's recovery path to gate a switch into an UNKNOWN sessionId
+     *  on exact equality with a user/queue event in that file — much
+     *  stronger than the substring fingerprint check, which can't tell
+     *  "test" from "run tests" across sibling panes. Stored in addition to
+     *  `contentFingerprint` (not instead of) because in-pane known-sid
+     *  candidates still benefit from the cheaper substring path. */
+    contentNormalized?: string;
     /** JSONL file the turn's user event was first seen in. Stamped by ingest()
      *  when the turn transitions to started. Lets the emit step re-read text
      *  from the original transcript even after a sessionId rotation has
@@ -84,7 +92,7 @@ export declare class BridgeTurnQueue {
      *  `markTimeMs` is captured here so the rotation fallback can bound its
      *  fingerprint scan to events written after this point — protects short
      *  fingerprints from matching old history in unrelated sibling jsonls. */
-    mark(turnId: string, contentFingerprint?: string, markTimeMs?: number): void;
+    mark(turnId: string, contentFingerprint?: string, markTimeMs?: number, contentNormalized?: string): void;
     /** Drop all pending turns. Used when the worker discovers it can't
      *  reliably attribute future events (e.g. baseline raced with a turn
      *  already in flight) and wants to clear the slate. */

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

@@ -1 +1 @@
-{"version":3,"file":"bridge-turn-queue.d.ts","sourceRoot":"","sources":["../../src/services/bridge-turn-queue.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;;;;;;;;;;;;;;;;GA6BG;AACH,OAAO,EAAwB,uBAAuB,EAAyB,KAAK,eAAe,EAAE,MAAM,wBAAwB,CAAC;AAIpI,OAAO,EAAE,uBAAuB,EAAE,CAAC;AAEnC,MAAM,WAAW,iBAAiB;IAChC,MAAM,EAAE,MAAM,CAAC;IACf,OAAO,EAAE,OAAO,CAAC;IACjB,cAAc,EAAE,MAAM,EAAE,CAAC;IACzB;;;;+EAI2E;IAC3E,OAAO,CAAC,EAAE,OAAO,CAAC;IAClB;;;gEAG4D;IAC5D,QAAQ,CAAC,EAAE,MAAM,CAAC;IAClB;;;;2DAIuD;IACvD,kBAAkB,CAAC,EAAE,MAAM,CAAC;IAC5B;;;;;mBAKe;IACf,eAAe,CAAC,EAAE,MAAM,CAAC;IACzB;;;wEAGoE;IACpE,UAAU,CAAC,EAAE,MAAM,CAAC;CACrB;AAQD;;;6CAG6C;AAC7C,wBAAgB,eAAe,CAAC,OAAO,EAAE,MAAM,EAAE,GAAG,SAAK,GAAG,MAAM,GAAG,SAAS,CAK7E;AAED,qBAAa,eAAe;IAC1B,OAAO,CAAC,IAAI,CAAqB;IACjC,OAAO,CAAC,KAAK,CAA2B;IACxC,OAAO,CAAC,UAAU,CAAkC;IAEpD;uEACmE;IACnE,MAAM,CAAC,MAAM,EAAE,eAAe,EAAE,GAAG,IAAI;IAMvC;;;;;;;8EAO0E;IAC1E,IAAI,CAAC,MAAM,EAAE,MAAM,EAAE,kBAAkB,CAAC,EAAE,MAAM,EAAE,UAAU,GAAE,MAAmB,GAAG,IAAI;IAIxF;;2DAEuD;IACvD,YAAY,IAAI,iBAAiB,EAAE;IAMnC;;;;;;;;yEAQqE;IACrE,MAAM,CAAC,MAAM,EAAE,eAAe,EAAE,EAAE,eAAe,CAAC,EAAE,MAAM,GAAG,IAAI;IAoFjE;;gEAE4D;IAC5D,cAAc,IAAI,iBAAiB,EAAE;IAYrC,qDAAqD;IACrD,IAAI,IAAI,MAAM;IAId,qDAAqD;IACrD,IAAI,IAAI,SAAS,iBAAiB,EAAE;CAGrC"}
+{"version":3,"file":"bridge-turn-queue.d.ts","sourceRoot":"","sources":["../../src/services/bridge-turn-queue.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;;;;;;;;;;;;;;;;GA6BG;AACH,OAAO,EAAwB,uBAAuB,EAAyB,KAAK,eAAe,EAAE,MAAM,wBAAwB,CAAC;AAIpI,OAAO,EAAE,uBAAuB,EAAE,CAAC;AAEnC,MAAM,WAAW,iBAAiB;IAChC,MAAM,EAAE,MAAM,CAAC;IACf,OAAO,EAAE,OAAO,CAAC;IACjB,cAAc,EAAE,MAAM,EAAE,CAAC;IACzB;;;;+EAI2E;IAC3E,OAAO,CAAC,EAAE,OAAO,CAAC;IAClB;;;gEAG4D;IAC5D,QAAQ,CAAC,EAAE,MAAM,CAAC;IAClB;;;;2DAIuD;IACvD,kBAAkB,CAAC,EAAE,MAAM,CAAC;IAC5B;;;;;;oEAMgE;IAChE,iBAAiB,CAAC,EAAE,MAAM,CAAC;IAC3B;;;;;mBAKe;IACf,eAAe,CAAC,EAAE,MAAM,CAAC;IACzB;;;wEAGoE;IACpE,UAAU,CAAC,EAAE,MAAM,CAAC;CACrB;AAQD;;;6CAG6C;AAC7C,wBAAgB,eAAe,CAAC,OAAO,EAAE,MAAM,EAAE,GAAG,SAAK,GAAG,MAAM,GAAG,SAAS,CAK7E;AAED,qBAAa,eAAe;IAC1B,OAAO,CAAC,IAAI,CAAqB;IACjC,OAAO,CAAC,KAAK,CAA2B;IACxC,OAAO,CAAC,UAAU,CAAkC;IAEpD;uEACmE;IACnE,MAAM,CAAC,MAAM,EAAE,eAAe,EAAE,GAAG,IAAI;IAMvC;;;;;;;8EAO0E;IAC1E,IAAI,CAAC,MAAM,EAAE,MAAM,EAAE,kBAAkB,CAAC,EAAE,MAAM,EAAE,UAAU,GAAE,MAAmB,EAAE,iBAAiB,CAAC,EAAE,MAAM,GAAG,IAAI;IAWpH;;2DAEuD;IACvD,YAAY,IAAI,iBAAiB,EAAE;IAMnC;;;;;;;;yEAQqE;IACrE,MAAM,CAAC,MAAM,EAAE,eAAe,EAAE,EAAE,eAAe,CAAC,EAAE,MAAM,GAAG,IAAI;IAoFjE;;gEAE4D;IAC5D,cAAc,IAAI,iBAAiB,EAAE;IAYrC,qDAAqD;IACrD,IAAI,IAAI,MAAM;IAId,qDAAqD;IACrD,IAAI,IAAI,SAAS,iBAAiB,EAAE;CAGrC"}

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

@@ -71,8 +71,15 @@ export class BridgeTurnQueue {
      *  `markTimeMs` is captured here so the rotation fallback can bound its
      *  fingerprint scan to events written after this point — protects short
      *  fingerprints from matching old history in unrelated sibling jsonls. */
-    mark(turnId, contentFingerprint, markTimeMs = Date.now()) {
-        this.queue.push({ turnId, started: false, assistantUuids: [], contentFingerprint, markTimeMs });
+    mark(turnId, contentFingerprint, markTimeMs = Date.now(), contentNormalized) {
+        this.queue.push({
+            turnId,
+            started: false,
+            assistantUuids: [],
+            contentFingerprint,
+            contentNormalized,
+            markTimeMs,
+        });
     }
     /** Drop all pending turns. Used when the worker discovers it can't
      *  reliably attribute future events (e.g. baseline raced with a turn

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

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

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

@@ -153,6 +153,14 @@ export interface JsonlFingerprintSearchOptions {
     minEventTimestampMs?: number;
     /** Also match Claude Code type-ahead enqueue events, whose content is not role:user. */
     includeQueueOperations?: boolean;
+    /** Called on each candidate that already passed the fingerprint match.
+     *  Returning `false` skips the candidate and continues searching older
+     *  files in the directory (mtime-descending walk). Used by the bridge
+     *  watcher to reject sibling-pane jsonls whose sessionId we don't trust,
+     *  without losing the chance to find a legitimate /clear rotation buried
+     *  under a busier sibling. Default (no callback): accept the first
+     *  fingerprint match like the original behaviour. */
+    acceptCandidate?: (path: string) => boolean;
 }
 /** Scan a single jsonl file's tail for a Lark message fingerprint. Same
  *  parsing rules as `findJsonlContainingFingerprint` (decode role:user content,
@@ -165,4 +173,63 @@ export declare function jsonlContainsFingerprint(path: string, fingerprint: stri
     minEventTimestampMs?: number;
 }): boolean;
 export declare function findJsonlContainingFingerprint(dir: string, fingerprint: string, excludePathOrOptions?: string | JsonlFingerprintSearchOptions): string | null;
+/**
+ * Stronger sibling-pane recovery anchor than the substring fingerprint
+ * search. Walks every `.jsonl` in `dir` and returns the paths whose
+ * trailing 1MB contains a user/queue event whose normalised text is
+ * EXACTLY equal to `normalisedContent` (not a substring), respecting
+ * `excludePath`, `minMtimeMs`, `minEventTimestampMs`,
+ * `includeQueueOperations`, and `acceptCandidate` the same way as
+ * `findJsonlContainingFingerprint`.
+ *
+ * Returns *all* matches in mtime-descending order — callers must
+ * abstain when the result has length > 1, since multiple files containing
+ * the same exact normalised content cannot be disambiguated without
+ * stronger evidence (and forcing a switch would risk picking the wrong
+ * pane). The caller's typical pattern is:
+ *
+ *   - 1 match → switch to it (legitimate post-/clear recovery)
+ *   - 0 matches → no recovery this tick; wait for stronger signal
+ *   - >1 match → log and abstain; surface a diagnostic to the user
+ *
+ * Used by the bridge fingerprint fallback's recovery path for in-pane
+ * `/clear`: substring matches risk hijacking on short fingerprints (the
+ * literal text "test" matches "run tests" / "test bridge"), but full
+ * equality on a Lark message we just wrote is a much stronger anchor.
+ */
+export declare function findJsonlsContainingExactContent(dir: string, normalisedContent: string, options?: JsonlFingerprintSearchOptions): string[];
+/**
+ * Partition transcript events into history (timestamp ≤ cutoff) and live
+ * (timestamp > cutoff, or no parseable timestamp). Used by the bridge
+ * watcher when it switches to a new jsonl that may contain pre-existing
+ * conversation: anything older than the cutoff (e.g. iTerm-typed turns
+ * the user produced before the Lark mark fired) belongs in the seen-set
+ * via `BridgeTurnQueue.absorb` so the worker doesn't replay them as
+ * "🖥️ 终端本地对话" cards. Anything newer is fed through `ingest()` so
+ * the freshly-written Lark user event can match its pending fingerprint.
+ *
+ * Events with malformed / missing timestamps fall into `live`: better
+ * to forward an unattributable event once than to silently drop a real
+ * reply because Claude omitted a timestamp.
+ */
+export declare function splitTranscriptEventsByCutoff(events: TranscriptEvent[], cutoffMs: number): {
+    history: TranscriptEvent[];
+    live: TranscriptEvent[];
+};
+/**
+ * Read the first event timestamp out of a jsonl. Reads only the leading
+ * 4 KB — Claude's `file-history-snapshot` and `SessionStart` events both
+ * land in the first few hundred bytes. Returns the parsed millis, or
+ * undefined when no parseable timestamp is found in the leading chunk
+ * (corrupted file, partial first line, format change).
+ *
+ * NOTE: not currently wired into the bridge rotation flow. The bridge
+ * fingerprint fallback (`decideFingerprintSwitch` in
+ * `bridge-rotation-policy.ts`) deliberately rejects candidates outside
+ * the pid-derived trust set rather than relying on freshness heuristics
+ * — file-creation timestamps cannot prove ownership across panes in
+ * the same project dir. Kept here as a reusable primitive for
+ * diagnostics and future /clear-recovery work.
+ */
+export declare function readFirstEventTimestamp(path: string): number | undefined;
 //# sourceMappingURL=claude-transcript.d.ts.map

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

@@ -1 +1 @@
-{"version":3,"file":"claude-transcript.d.ts","sourceRoot":"","sources":["../../src/services/claude-transcript.ts"],"names":[],"mappings":"AAgBA,+DAA+D;AAC/D,MAAM,WAAW,eAAe;IAC9B,IAAI,CAAC,EAAE,MAAM,CAAC;IACd,IAAI,CAAC,EAAE,MAAM,CAAC;IACd,SAAS,CAAC,EAAE,MAAM,CAAC;IACnB,SAAS,CAAC,EAAE,MAAM,CAAC;IACnB,OAAO,CAAC,EAAE;QACR,IAAI,CAAC,EAAE,MAAM,CAAC;QACd,OAAO,CAAC,EAAE,OAAO,CAAC;KACnB,CAAC;CACH;AAED,MAAM,WAAW,WAAW;IAC1B,MAAM,EAAE,eAAe,EAAE,CAAC;IAC1B,kDAAkD;IAClD,SAAS,EAAE,MAAM,CAAC;IAClB;;wCAEoC;IACpC,WAAW,EAAE,MAAM,CAAC;CACrB;AAED;;;;;;;;;;;GAWG;AACH,wBAAgB,eAAe,CAC7B,IAAI,EAAE,MAAM,EACZ,UAAU,EAAE,MAAM,GACjB,WAAW,CA8Db;AAED;;;;;;;;GAQG;AACH,wBAAgB,uBAAuB,CAAC,MAAM,EAAE,eAAe,EAAE,GAAG,eAAe,EAAE,CAapF;AAED;;;;GAIG;AACH,wBAAgB,oBAAoB,CAAC,KAAK,EAAE,eAAe,GAAG,MAAM,CAYnE;AAED,sFAAsF;AACtF,wBAAgB,iBAAiB,CAAC,MAAM,EAAE,eAAe,EAAE,GAAG,MAAM,CAKnE;AAeD;;;;;mCAKmC;AACnC,wBAAgB,qBAAqB,CAAC,EAAE,EAAE,eAAe,GAAG,IAAI,GAAG,SAAS,GAAG,OAAO,CAcrF;AAED,MAAM,WAAW,aAAa;IAC5B;2EACuE;IACvE,QAAQ,EAAE,MAAM,CAAC;IACjB;;6DAEyD;IACzD,aAAa,EAAE,MAAM,CAAC;CACvB;AAED;;;;;;;;;;+DAU+D;AAC/D,wBAAgB,wBAAwB,CAAC,MAAM,EAAE,eAAe,EAAE,GAAG,aAAa,GAAG,IAAI,CAyBxF;AAED;;;;;;;;;;;;;;GAcG;AACH,wBAAgB,yBAAyB,CAAC,OAAO,EAAE,OAAO,GAAG,OAAO,CAGnE;AAED;;;;;;;;GAQG;AACH,wBAAgB,oBAAoB,CAAC,OAAO,EAAE,OAAO,GAAG,MAAM,CAS7D;AAED;;;;;GAKG;AACH,wBAAgB,uBAAuB,CAAC,CAAC,EAAE,MAAM,GAAG,MAAM,CAEzD;AAED;;;;;;;;GAQG;AACH,wBAAgB,eAAe,CAAC,GAAG,EAAE,MAAM,GAAG,MAAM,GAAG,IAAI,CAyB1D;AAED;;;;;;;;;;;;;;;;;;;;GAoBG;AACH,MAAM,WAAW,6BAA6B;IAC5C,6DAA6D;IAC7D,WAAW,CAAC,EAAE,MAAM,CAAC;IACrB,+EAA+E;IAC/E,UAAU,CAAC,EAAE,MAAM,CAAC;IACpB;;;wEAGoE;IACpE,mBAAmB,CAAC,EAAE,MAAM,CAAC;IAC7B,wFAAwF;IACxF,sBAAsB,CAAC,EAAE,OAAO,CAAC;CAClC;AAED;;;;;6CAK6C;AAC7C,wBAAgB,wBAAwB,CACtC,IAAI,EAAE,MAAM,EACZ,WAAW,EAAE,MAAM,EACnB,IAAI,CAAC,EAAE;IAAE,sBAAsB,CAAC,EAAE,OAAO,CAAC;IAAC,mBAAmB,CAAC,EAAE,MAAM,CAAA;CAAE,GACxE,OAAO,CA6DT;AAED,wBAAgB,8BAA8B,CAC5C,GAAG,EAAE,MAAM,EACX,WAAW,EAAE,MAAM,EACnB,oBAAoB,CAAC,EAAE,MAAM,GAAG,6BAA6B,GAC5D,MAAM,GAAG,IAAI,CA2Ff"}
+{"version":3,"file":"claude-transcript.d.ts","sourceRoot":"","sources":["../../src/services/claude-transcript.ts"],"names":[],"mappings":"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"}