thinkpool-pair 0.7.186 → 0.7.187

package/bridge.mjs

@@ -94,7 +94,7 @@ const flowRedispatch = new Map()
 const flowBudgets = new Map()
 import { formatPeek, PEEK, siblingsOf, resolveSibling, crossPostDecision, CROSSPOST, spawnDecision, SPAWN, CROSSROOM, formatPairRoster, crossRoomPostDecision, formatRoomNow } from './cross-terminal.mjs'
 import { turnInFlight } from './update-gate.mjs'
-import { saveSession, flushSession, deleteSession, loadAll, canResume, loadPtyId, savePtyId, loadNames, saveNames, appendDurableEvents, seedDurableEvents, readDurablePage, readDurableOldestSeq } from './session-store.mjs'
+import { saveSession, flushSession, deleteSession, loadAll, canResume, loadPtyId, savePtyId, loadNames, saveNames, appendDurableEvents, seedDurableEvents, readDurablePage, readDurableOldestSeq, hasDurableArchive, servesHistoryPage } from './session-store.mjs'
 import { stampEvent, makeSeqCounter, maxSeq, seqable, capReplayEvents, chunkReplayEvents, boundEventForBroadcast, inlineImageBlocks, usageReportLine, buildRecapFromLog, RECAP_CAP, trimmedBeforeSeq, firstSeq } from './event-id.mjs'
 import { planMeterLine } from './plan-meters.mjs'
 import { makeThrottledTrack } from './presence.mjs'
@@ -2761,6 +2761,13 @@ channel
   .on('broadcast', { event: 'history-page-request' }, ({ payload }) => {
     const id = payload?.term
     if (!id) return
+    // Multi-bridge rooms (Max's two Macs; the account-supervisor path): only the bridge
+    // that HOLDS this terminal may answer. A foreign bridge used to reply with an empty
+    // page — the client reads the first empty page as "no older history", clears the gap
+    // and kills the load-earlier pill, so recoverable history reads as gone. Targeting
+    // (payload.host) is honoured too, matching term-open / file-put / code-open / flow-*,
+    // but no client stamps it yet — ownership is what actually closes the race.
+    if (!servesHistoryPage({ payloadHost: payload?.host, bridgeName: name, hasSession: sessions.has(id), hasArchive: hasDurableArchive(room, id) })) return
     const { events, hasMore } = readDurablePage(room, id, Number(payload?.beforeSeq) || null, 200)
     const to = payload?.to ?? null
     if (!events.length) { bcast('history-page', { to, term: id, events: [], hasMore: false }); return }
@@ -2856,7 +2863,15 @@ channel
     if (/^\/clear\s*$/.test(text)) {
       s.pendingRecap = null   // /clear means forget context — drop any un-fired carry recap
       s.session.sendTurn(text)
-      s.log = []; s.seq = makeSeqCounter(0); bcast('code-event', { term: payload.term, evt: { kind: 'clear' } })
+      // The seq reset is load-bearing on BOTH ends: the client's clear handler sets
+      // seqHi = 0 (room.jsx), so the counter must restart with it. The durable archive
+      // is append-only and keeps the pre-clear era under colliding seqs — session-store's
+      // epochStart() confines every read to the newest era, so the archive never splices
+      // two conversations. Drop the cached floor with it: the next pushLog re-seeds
+      // archiveOldestSeq from the FIRST post-clear event (the new epoch's floor), instead
+      // of leaving a stale pre-clear floor to mis-aim trimmedBeforeSeq's phantom-pill guard.
+      s.log = []; s.seq = makeSeqCounter(0); s.archiveOldestSeq = null
+      bcast('code-event', { term: payload.term, evt: { kind: 'clear' } })
       flushSession(room, payload.term, { sessionId: s.session?.sessionId || null, log: [] })
       ctlLine('context cleared. You can continue with these answers in mind.')
       return

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "thinkpool-pair",
-  "version": "0.7.186",
+  "version": "0.7.187",
   "description": "Share a local coding-agent CLI (Claude Code, Codex, Gemini, Aider, …) into a ThinkPool Code room, live.",
   "type": "module",
   "bin": {

package/session-store.mjs

@@ -115,17 +115,75 @@ export function seedDurableEvents(room, id, events) {
   } catch { /* noop */ }
 }
 
-// The archive FLOOR: the lowest transcript seq durably stored for this terminal.
-// The client compares its oldest loaded seq against this — only OFFER "load earlier"
-// when there genuinely are older events in the archive (vs a fresh lane whose first
-// turn happens to land at seq > 1, or an evicted-but-unarchived gap). null = no archive.
+// Does this bridge hold a durable archive for `id`? The capability half of the
+// history-page-request guard (a foreign bridge in a multi-bridge room has no file).
+export function hasDurableArchive(room, id) {
+  try { return !!room && !!id && fs.existsSync(eventsLog(room, id)) } catch { return false }
+}
+
+// Should THIS bridge answer a history-page-request? (pure — tested in test-history-ab.mjs)
+//
+// Two independent gates, both required:
+//  · `payloadHost` — the same targeting guard every other broadcast handler carries
+//    (term-open, file-put, code-open, flow-*): a targeted request is for ONE machine.
+//  · ownership — no client build to date STAMPS a host on this event, so targeting
+//    alone leaves an untargeted request answerable by every bridge in the room. The
+//    bridge that doesn't serve the terminal has no archive, replies
+//    `{ events: [], hasMore: false }`, and the client reads that first empty page as
+//    "no older history" — the load-earlier pill dies and recoverable history looks
+//    gone. Only the bridge that actually HOLDS the terminal may speak: a live session,
+//    or (a closed lane whose transcript is still on screen) its durable archive.
+export function servesHistoryPage({ payloadHost, bridgeName, hasSession, hasArchive }) {
+  if (payloadHost && payloadHost !== bridgeName) return false
+  return !!(hasSession || hasArchive)
+}
+
+// ── Epochs: /clear resets the per-session seq counter (bridge.mjs) but the durable
+// archive is append-only and keeps every era. So one file can hold seq 1..500 (pre-clear)
+// followed by seq 1..30 (post-clear) — colliding keys. `findIndex(e.seq >= beforeSeq)`
+// then anchors in the WRONG era and a page splices two conversations together.
+//
+// A seq that does not strictly increase over its predecessor is, by construction, a
+// counter reset: within one bridge run the counter only climbs, and a restart reseeds it
+// from maxSeq(restored log). So the last regression marks the start of the CURRENT epoch,
+// and only that epoch is pageable. Everything older is a conversation the user explicitly
+// cleared — surfacing it under colliding seqs would be wrong twice over.
+//
+// This is read-side only: it needs no migration and fixes archives already on disk
+// (every user's, right now) as well as ones written from here on.
+function epochStart(all) {
+  let start = 0, last = -Infinity
+  for (let i = 0; i < all.length; i++) {
+    const s = all[i]?.seq
+    if (typeof s !== 'number') continue
+    if (s <= last) { start = i; last = s; continue }   // counter went backwards → new era
+    last = s
+  }
+  return start
+}
+
+function readArchive(room, id) {
+  const f = eventsLog(room, id)
+  if (!fs.existsSync(f)) return null
+  const all = []
+  for (const line of fs.readFileSync(f, 'utf8').split('\n')) {
+    if (!line) continue
+    try { all.push(JSON.parse(line)) } catch { /* skip a torn line */ }
+  }
+  return all
+}
+
+// The archive FLOOR: the lowest transcript seq durably stored for this terminal *in the
+// current epoch*. The client compares its oldest loaded seq against this — only OFFER
+// "load earlier" when there genuinely are older events in the archive (vs a fresh lane
+// whose first turn happens to land at seq > 1, or an evicted-but-unarchived gap).
+// null = no archive.
 export function readDurableOldestSeq(room, id) {
   try {
-    const f = eventsLog(room, id)
-    if (!fs.existsSync(f)) return null
-    for (const line of fs.readFileSync(f, 'utf8').split('\n')) {
-      if (!line) continue
-      try { const e = JSON.parse(line); if (e && e.seq != null) return e.seq } catch { /* skip torn line */ }
+    const all = readArchive(room, id)
+    if (!all) return null
+    for (let i = epochStart(all); i < all.length; i++) {
+      if (all[i] && all[i].seq != null) return all[i].seq
     }
     return null
   } catch { return null }
@@ -134,22 +192,19 @@ export function readDurableOldestSeq(room, id) {
 // Read a backward page: events with transcript seq < beforeSeq (newest `limit` of
 // them, no-seq chrome interleaved by file order preserved). Returns { events, hasMore }.
 // beforeSeq null → the newest `limit` events (the tail). hasMore = there is older still.
+// Never reads below the current epoch — see epochStart.
 export function readDurablePage(room, id, beforeSeq, limit = 200) {
   try {
-    const f = eventsLog(room, id)
-    if (!fs.existsSync(f)) return { events: [], hasMore: false }
-    const all = []
-    for (const line of fs.readFileSync(f, 'utf8').split('\n')) {
-      if (!line) continue
-      try { all.push(JSON.parse(line)) } catch { /* skip a torn line */ }
-    }
+    const all = readArchive(room, id)
+    if (!all) return { events: [], hasMore: false }
+    const from = epochStart(all)
     let bound = all.length
     if (beforeSeq != null) {
-      const i = all.findIndex((e) => e && e.seq != null && e.seq >= beforeSeq)
+      const i = all.findIndex((e, idx) => idx >= from && e && e.seq != null && e.seq >= beforeSeq)
       if (i >= 0) bound = i
     }
-    const start = Math.max(0, bound - limit)
-    return { events: all.slice(start, bound), hasMore: start > 0 }
+    const start = Math.max(from, bound - limit)
+    return { events: all.slice(start, Math.max(start, bound)), hasMore: start > from }
   } catch { return { events: [], hasMore: false } }
 }