thinkpool-pair 0.7.283 → 0.7.285

package/bridge.mjs

@@ -929,6 +929,37 @@ const terms = new Map()
 // PTY `terms` map so none of the byte-relay code paths (flush, resize,
 // pty-in, scrollback) ever touch them. id → { session, cmd, log, pending }.
 const sessions = new Map()
+
+// One monotonically increasing authority per bridge process. Realtime preserves
+// messages best-effort, not total order across a reconnect; clients use this to
+// reject a late snapshot from an older channel while bridge_id distinguishes a
+// real process restart (where the counter intentionally begins again).
+let announceRev = 0
+
+function syncStructuredTurn(entry, now = Date.now()) {
+  const busy = entry?.session?.turnActive ?? false
+  const changed = busy !== entry?._busyAnn
+  if (!changed) return false
+  if (busy) {
+    entry._turnRev = (Number(entry._turnRev) || 0) + 1
+    entry._turnStart = now
+  }
+  entry._busyAnn = busy
+  return true
+}
+
+function beginStructuredTurn(entry, now = Date.now()) {
+  if (entry?._busyAnn === true) return false
+  entry._turnRev = (Number(entry._turnRev) || 0) + 1
+  entry._turnStart = now
+  entry._busyAnn = true
+  return true
+}
+
+function stampStructuredTurn(entry, event) {
+  if (event && event.turnRev == null && Number(entry?._turnRev) > 0) event.turnRev = entry._turnRev
+  return event
+}
 let attachedId = null
 let shuttingDown = false
 
@@ -1058,8 +1089,9 @@ const announce = () => {
   // (name-only, NEVER key/baseUrl) so a cross-device viewer can badge a lane opened
   // on a custom provider without the owner's account-channel registry.
   const provNames = providerNameMap()
+  const rev = ++announceRev
   return bcast('bridge', {
-    v: 2, name, bridge_id: BRIDGE_ID, repo: repoLabel, branch: readBranch(),
+    v: 2, name, bridge_id: BRIDGE_ID, rev, repo: repoLabel, branch: readBranch(),
     // sdkWarn: the auto-pulled agent SDK failed its boot compatibility smoke test —
     // surfaced so the room can show a banner (turns may misbehave; pin a good SDK).
     ...(sdkStatus.ok === false ? { sdkWarn: `${sdkStatus.version}: ${sdkStatus.reason}` } : {}),
@@ -1130,7 +1162,7 @@ const announce = () => {
       // laneStatusOf: authoritative busy/idle + last-action timestamp/age +
       // STUCK/BLOCKED alert. The bridge owns the turn and permission state, so
       // every roster consumer reads one status instead of reconstructing it.
-      ...[...sessions.entries()].map(([id, s]) => ({ id, cmd: s.cmd, kind: 'structured', runtime: s.runtime || 'claude', alive: true, ...laneStatusOf(s), hasTranscript: s.log.length > 0, commands: s.commands, mode: s.mode || undefined, effort: s.effort || undefined, name: termNames[id] || undefined, model: s.model || undefined, capabilities: { ...structuredRuntimeMetadata(s.runtime || 'claude'), modes: structuredModesForLane(s.runtime || 'claude', s) }, ...(s.runtime === 'codex' ? { approvalPolicy: codexConfigForMode(s.mode).approvalPolicy, models: s.models || [], canSteer: s.session?.canSteer ?? false } : s.runtime === 'hermes' ? { models: s.models || [], canSteer: s.session?.canSteer ?? false } : {}), ...(s.archiveOldestSeq != null ? { oldestSeq: s.archiveOldestSeq } : {}), ...(s.spawnedBy ? { spawned: true, spawnedBy: s.spawnedBy } : {}), ...(s.sideParent ? { sideParent: s.sideParent, sideTask: s.sideTask || undefined, sideHandback: !!s.sideHandback } : {}), ...(s.flowSessionId ? { flowId: s.flowSessionId, flowRole: s.flowTaskKey ? 'lane' : 'conductor' } : {}),
+      ...[...sessions.entries()].map(([id, s]) => ({ id, cmd: s.cmd, kind: 'structured', runtime: s.runtime || 'claude', alive: true, ...laneStatusOf(s), turnRev: Number(s._turnRev) || 0, ...(s.session?.turnActive && s._turnStart ? { turnStartedAt: s._turnStart } : {}), hasTranscript: s.log.length > 0, commands: s.commands, mode: s.mode || undefined, effort: s.effort || undefined, name: termNames[id] || undefined, model: s.model || undefined, capabilities: { ...structuredRuntimeMetadata(s.runtime || 'claude'), modes: structuredModesForLane(s.runtime || 'claude', s) }, ...(s.runtime === 'codex' ? { approvalPolicy: codexConfigForMode(s.mode).approvalPolicy, models: s.models || [], canSteer: s.session?.canSteer ?? false } : s.runtime === 'hermes' ? { models: s.models || [], canSteer: s.session?.canSteer ?? false } : {}), ...(s.archiveOldestSeq != null ? { oldestSeq: s.archiveOldestSeq } : {}), ...(s.spawnedBy ? { spawned: true, spawnedBy: s.spawnedBy } : {}), ...(s.sideParent ? { sideParent: s.sideParent, sideTask: s.sideTask || undefined, sideHandback: !!s.sideHandback } : {}), ...(s.flowSessionId ? { flowId: s.flowSessionId, flowRole: s.flowTaskKey ? 'lane' : 'conductor' } : {}),
         // provider: the registered LLM-provider this lane runs on, NAME-ONLY {id,name}
         // (NEVER the key or baseUrl). Additive; older clients ignore it. Omitted for the
         // built-in/default Claude path (no badge). Makes the lane's provider badge +
@@ -1684,6 +1716,7 @@ function pushLog(entry, evt) {
   // every old user message stacks at the TOP of the timeline (room XE3IQ, 2026-06-25).
   // A real ts makes ordering wall-clock — immune to eviction AND /clear seq resets.
   // stampEvent is idempotent, so the callers that already stamp are unaffected.
+  stampStructuredTurn(entry, evt)
   stampEvent(evt)
   entry.lastActionAt = evt.ts
   entry.lastEvent = evt
@@ -1818,6 +1851,7 @@ function openStructured({ id, runtime = 'claude', model, models, effort, resume,
     // order (not readdir/filesystem order). Legacy recs (no openedAt) derive it from the
     // first transcript event ts, so even the first post-fix restart is ordered right.
     openedAt: openedAt || (Array.isArray(log) ? (log.find((e) => e?.ts)?.ts || 0) : 0) || Date.now() }
+  entry._turnRev = entry.log.reduce((max, event) => Math.max(max, Number(event?.turnRev) || 0), 0)
   entry.interruptedRecap = restoredTurnOpen(entry.log) ? buildRecapFromLog(entry.log, RECAP_CAP) : null
   // Slice 3 — a permission card left unanswered past the grace window pushes
   // "<lane> — needs you: <what>"; answering it anywhere retracts the banner
@@ -2841,6 +2875,8 @@ function openStructured({ id, runtime = 'claude', model, models, effort, resume,
       // replay-union dedupes ONLY by cid, and SDK events carry none — without an
       // id, an event that arrives both live AND in a reconnect replay renders
       // twice (the 2026-06-19 duplicate-message bug). See event-id.mjs.
+      const busyChanged = syncStructuredTurn(entry)
+      stampStructuredTurn(entry, evt)
       stampEvent(evt)
       const stalledChanged = evt.kind === 'stalled' ? !entry.stalled : !!entry.stalled
       entry.stalled = evt.kind === 'stalled'
@@ -2856,10 +2892,7 @@ function openStructured({ id, runtime = 'claude', model, models, effort, resume,
       // The RISING edge is also where a turn's wall clock starts — the only place the
       // bridge sees "this lane just began working". `result`/`error` reads it to decide
       // whether the turn was long enough that nobody was watching (Slice 3).
-      { const busyNow = entry.session?.turnActive ?? false
-        const busyChanged = busyNow !== entry._busyAnn
-        if (busyChanged) { if (busyNow) entry._turnStart = Date.now(); entry._busyAnn = busyNow }
-        if (busyChanged || stalledChanged) announce() }
+      if (busyChanged || stalledChanged) announce()
       // App Server steering is opt-in and can fall back to exec at runtime. Keep
       // the roster capability authoritative so the browser never immediate-sends
       // into an exec-only turn and loses its shared queue.
@@ -2910,7 +2943,7 @@ function openStructured({ id, runtime = 'claude', model, models, effort, resume,
       // usage needs an explicit persist() here to survive a bridge restart.
       if (evt.kind === 'usage') { entry.lastUsage = evt; persist() }
       if (evt.kind === 'effort') {
-        entry.effort = evt.effort ?? null
+        entry.effort = evt.level ?? evt.effort ?? null
         persist()
         announce()
       }
@@ -3909,7 +3942,12 @@ channel
     const nativeImages = s.runtime === 'codex' || s.runtime === 'hermes'
       ? await waitForNativeImages(payload.files, { updir: UPDIR })
       : []
+    // Sample the runtime before dispatch so a missed prior falling edge cannot
+    // make this genuinely new turn inherit the previous turn's revision.
+    syncStructuredTurn(s)
     const accepted = s.session.sendTurn(sendText, nativeImages.length ? { images: nativeImages } : undefined)
+    if (accepted === false) syncStructuredTurn(s)
+    else beginStructuredTurn(s)
     echoYou()
     if (accepted === false) {
       // A runtime that did not accept a turn must still close the optimistic

package/codex-session.mjs

@@ -33,6 +33,7 @@ import { startCodexMcpHttp } from './codex-mcp-http.mjs'
 import { CODEX_THINKPOOL_FIRST_TURN_PREAMBLE, buildThinkPoolTurnGuidance, createRoomContextSelector, usesFullThinkPoolReminder } from './thinkpool-room-prompt.mjs'
 import { questionAnswerResponse } from './question-response.mjs'
 import { codexReviewTarget, isCodexCompactCommand } from './codex-commands.mjs'
+import { createCumulativeEventRelay } from './cumulative-event-relay.mjs'
 
 const DEFAULT_SANDBOX = 'workspace-write'
 const SAFE_SANDBOXES = new Set(['read-only', 'workspace-write', 'danger-full-access'])
@@ -402,8 +403,9 @@ export function startCodexSession({ cwd, model, effort: initialEffort = 'high',
   let chain = Promise.resolve()
   const queue = []
 
+  const relayEvent = createCumulativeEventRelay((event) => { try { onEvent?.(event) } catch { /* consumer isolation */ } })
   const mapper = new CodexEventMapper({
-    onEvent,
+    onEvent: relayEvent,
     model: model || null,
     usageSnapshotForSession: (id) => {
       const snapshot = readCodexThreadUsage(id)
@@ -425,10 +427,10 @@ export function startCodexSession({ cwd, model, effort: initialEffort = 'high',
   }
   const emitTurnBoundary = (event) => {
     turnActive = false
-    try { onEvent?.(event) } catch { /* noop */ }
+    relayEvent(event)
   }
 
-  const note = (text) => { try { onEvent?.({ kind: 'note', text }) } catch { /* noop */ } }
+  const note = (text) => relayEvent({ kind: 'note', text })
 
   const closeAppServerTurn = (turnId = activeTurnId) => {
     const id = String(turnId || '')
@@ -472,7 +474,7 @@ export function startCodexSession({ cwd, model, effort: initialEffort = 'high',
         activeForm: step || '',
         status: status === 'inProgress' ? 'in_progress' : status === 'completed' ? 'completed' : 'pending',
       })).filter((todo) => todo.content)
-      try { onEvent?.({ kind: 'assistant', blocks: [{ type: 'tool_use', id: `codex-plan:${params.turnId || 'active'}`, name: 'TodoWrite', input: { todos } }], parentToolUseId: null }) } catch { /* noop */ }
+      relayEvent({ kind: 'assistant', blocks: [{ type: 'tool_use', id: `codex-plan:${params.turnId || 'active'}`, name: 'TodoWrite', input: { todos } }], parentToolUseId: null })
       return
     }
     if (method === 'item/agentMessage/delta') {
@@ -484,7 +486,7 @@ export function startCodexSession({ cwd, model, effort: initialEffort = 'high',
       // Cumulative transient snapshot. The bridge broadcasts this chrome event
       // without assigning transcript seq/archive rows; room.jsx replaces the
       // stable cid in place. item/completed emits one durable assistant row.
-      try { onEvent?.({ kind: 'assistant_stream', cid: state.cid, text: state.text, itemId, streaming: true }) } catch { /* noop */ }
+      relayEvent({ kind: 'assistant_stream', cid: state.cid, text: state.text, itemId, streaming: true })
       return
     }
     if (method === 'item/started' || method === 'item/completed') {
@@ -496,7 +498,7 @@ export function startCodexSession({ cwd, model, effort: initialEffort = 'high',
         if (raw.type === 'agentMessage' && streamedAgentItems.has(raw.id)) {
           const state = streamedAgentItems.get(raw.id)
           streamedAgentItems.delete(raw.id)
-          try { onEvent?.({ kind: 'assistant', blocks: [{ type: 'text', text: raw.text || state.text }], parentToolUseId: null, replacesCid: state.cid }) } catch { /* noop */ }
+          relayEvent({ kind: 'assistant', blocks: [{ type: 'text', text: raw.text || state.text }], parentToolUseId: null, replacesCid: state.cid })
           return
         }
       }
@@ -639,7 +641,7 @@ export function startCodexSession({ cwd, model, effort: initialEffort = 'high',
       // than leaving a replay-less streaming shell behind.
       for (const state of streamedAgentItems.values()) {
         if (!state.text) continue
-        try { onEvent?.({ kind: 'assistant', blocks: [{ type: 'text', text: state.text }], parentToolUseId: null, replacesCid: state.cid }) } catch { /* noop */ }
+        relayEvent({ kind: 'assistant', blocks: [{ type: 'text', text: state.text }], parentToolUseId: null, replacesCid: state.cid })
       }
       activeTurnId = null
       turnActive = false
@@ -683,7 +685,7 @@ export function startCodexSession({ cwd, model, effort: initialEffort = 'high',
     } finally {
       for (const state of streamedAgentItems.values()) {
         if (!state.text) continue
-        try { onEvent?.({ kind: 'assistant', blocks: [{ type: 'text', text: state.text }], parentToolUseId: null, replacesCid: state.cid }) } catch { /* noop */ }
+        relayEvent({ kind: 'assistant', blocks: [{ type: 'text', text: state.text }], parentToolUseId: null, replacesCid: state.cid })
       }
       activeTurnId = null
       turnActive = false
@@ -817,7 +819,7 @@ export function startCodexSession({ cwd, model, effort: initialEffort = 'high',
       if (!turnActive && queue.length === 0 && !appServerThreadReady && !child) {
         const gate = typeof admitStart === 'function' ? admitStart() : { ok: true }
         if (gate?.ok === false) {
-          try { onEvent?.({ kind: 'error', message: gate.reason || 'Host memory is critically low. This Codex runtime was not started.', recoverable: true }) } catch { /* noop */ }
+          relayEvent({ kind: 'error', message: gate.reason || 'Host memory is critically low. This Codex runtime was not started.', recoverable: true })
           return false
         }
       }
@@ -848,7 +850,7 @@ export function startCodexSession({ cwd, model, effort: initialEffort = 'high',
               queue.push({ text, options, promptIndex, forceFullReminder: thisTurnForceFull })
               if (!turnActive && queue.length === 1) pump()
             } else {
-              try { onEvent?.({ kind: 'error', message: 'Codex steering delivery is uncertain; the message was not replayed automatically.', recoverable: true }) } catch { /* noop */ }
+              relayEvent({ kind: 'error', message: 'Codex steering delivery is uncertain; the message was not replayed automatically.', recoverable: true })
             }
           })
         return true
@@ -884,6 +886,7 @@ export function startCodexSession({ cwd, model, effort: initialEffort = 'high',
     end() {
       ended = true
       turnActive = false
+      relayEvent.cancel()
       queue.length = 0
       closeAppServerTurn(activeTurnId)
       if (child) { try { child.kill() } catch { /* noop */ } }
@@ -912,7 +915,7 @@ export function startCodexSession({ cwd, model, effort: initialEffort = 'high',
     setEffort(nextEffort) {
       if (turnActive || !EFFORT_LEVELS.has(nextEffort)) return false
       activeEffort = nextEffort
-      try { onEvent?.({ kind: 'effort', level: activeEffort }) } catch { /* noop */ }
+      relayEvent({ kind: 'effort', level: activeEffort })
       return true
     },
     clearContext() {

package/cumulative-event-relay.mjs

@@ -0,0 +1,48 @@
+// Cumulative provider snapshots are replace-in-place UI state, not transcript
+// facts. Deliver the first immediately and coalesce a burst to its latest frame;
+// any durable event flushes the pending snapshot first to preserve wire order.
+export function createCumulativeEventRelay(emit, waitMs = 150) {
+  let lastSentAt = 0
+  let pending = null
+  let timer = null
+
+  const send = (event) => {
+    lastSentAt = Date.now()
+    emit(event)
+  }
+  const flush = () => {
+    if (timer) clearTimeout(timer)
+    timer = null
+    if (!pending) return
+    const event = pending
+    pending = null
+    send(event)
+  }
+  const relay = (event) => {
+    if (event?.kind !== 'assistant_stream') {
+      flush()
+      emit(event)
+      return
+    }
+    const remaining = waitMs - (Date.now() - lastSentAt)
+    if (!lastSentAt || remaining <= 0) {
+      pending = null
+      if (timer) clearTimeout(timer)
+      timer = null
+      send(event)
+      return
+    }
+    pending = event
+    if (!timer) {
+      timer = setTimeout(flush, remaining)
+      timer.unref?.()
+    }
+  }
+  relay.flush = flush
+  relay.cancel = () => {
+    if (timer) clearTimeout(timer)
+    timer = null
+    pending = null
+  }
+  return relay
+}

package/hermes-session.mjs

@@ -11,6 +11,7 @@ import { startCodexMcpHttp } from './codex-mcp-http.mjs'
 import { autoAllow, classifyRisk } from './claude-session.mjs'
 import { crossPostNeedsCard } from './cross-terminal.mjs'
 import { buildThinkPoolTurnGuidance, createRoomContextSelector, usesFullThinkPoolReminder } from './thinkpool-room-prompt.mjs'
+import { createCumulativeEventRelay } from './cumulative-event-relay.mjs'
 
 export const HERMES_COMMAND = 'thinkpool'
 export const HERMES_ACP_PROTOCOL_VERSION = 1
@@ -112,7 +113,7 @@ export function startHermesSession({
       ? 'dont_ask'
       : 'default'
 
-  const emit = (event) => { try { onEvent?.(event) } catch { /* consumer isolation */ } }
+  const emit = createCumulativeEventRelay((event) => { try { onEvent?.(event) } catch { /* consumer isolation */ } })
 
   const thinkpoolPeerTool = (name) => {
     const lower = String(name || '').toLowerCase()
@@ -479,7 +480,7 @@ export function startHermesSession({
           : new RegExp(`Session reasoning set to ${requested}`, 'i').test(mapper.text)
         if (confirmed) {
           activeEffort = requested === 'reset' ? null : requested
-          emit({ kind: 'effort', effort: activeEffort })
+          emit({ kind: 'effort', level: activeEffort })
         }
       }
       // Reserve the idle-looking result boundary for the existing FIFO before
@@ -598,6 +599,7 @@ export function startHermesSession({
     end() {
       ended = true
       turnActive = false
+      emit.cancel()
       queuedTurns.length = 0
       queueDrainPending = false
       if (sessionId && client?.alive) void client.request('session/close', { sessionId }, 1500).catch(() => {}).finally(() => client?.end())
@@ -660,7 +662,7 @@ export function startHermesSession({
       const requested = String(nextEffort)
       void boot().then(() => client.request('session/set_config_option', { sessionId, configId: HERMES_EFFORT_CONFIG_ID, value: requested })).then(() => {
         activeEffort = requested
-        emit({ kind: 'effort', effort: activeEffort })
+        emit({ kind: 'effort', level: activeEffort })
       }).catch((error) => emit({ kind: 'error', message: `Hermes reasoning change failed: ${error?.message || error}`, recoverable: true }))
       return true
     },

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "thinkpool-pair",
-  "version": "0.7.283",
+  "version": "0.7.285",
   "description": "Share a local coding-agent CLI (Claude Code, Codex, Gemini, Aider, …) into a ThinkPool Code room, live.",
   "type": "module",
   "bin": {
@@ -27,6 +27,7 @@
     "codex-mcp-http.mjs",
     "lane-worktree.mjs",
     "codex-event-mapper.mjs",
+    "cumulative-event-relay.mjs",
     "codex-commands.mjs",
     "acp-client.mjs",
     "hermes-session.mjs",