thinkpool-pair 0.7.201 → 0.7.203

package/bridge.mjs

@@ -98,6 +98,7 @@ const flowRedispatch = new Map()
 // broadcasts; without persistent state the cap can never bite.
 const flowBudgets = new Map()
 import { formatPeek, PEEK, siblingsOf, resolveSibling, crossPostDecision, CROSSPOST, spawnDecision, SPAWN, CROSSROOM, formatPairRoster, crossRoomPostDecision, formatRoomNow, formatClosableHint } from './cross-terminal.mjs'
+import { armInterruptedResume, sendInterruptedContinue, supersedeInterruptedResume } from './interrupted-resume.mjs'
 import { turnInFlight } from './update-gate.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'
@@ -2238,7 +2239,10 @@ function openStructured({ id, runtime = 'claude', model, effort, resume, log, co
       { const onBuiltin = !entry.provider || entry.provider === 'anthropic'
         const m = onBuiltin ? (evt.model || evt.ctx?.model) : null
         if (m && m !== entry.model) { entry.model = m; announce() }
-        if (evt.kind === 'models' && Array.isArray(evt.models) && evt.models.length) { roomModels = evt.models; announce() } }
+        // A custom Anthropic-compatible endpoint may expose its own catalog through the
+        // same SDK method. Never publish that as the ROOM's Claude catalog: its models
+        // already render in the provider group and otherwise leak under ANTHROPIC.
+        if (onBuiltin && evt.kind === 'models' && Array.isArray(evt.models) && evt.models.length) { roomModels = evt.models; announce() } }
       // Cache the last usage/ctx meter on the entry (persisted + replayed — see
       // openStructured). Chrome events bypass pushLog/persist in emitTail below, so
       // usage needs an explicit persist() here to survive a bridge restart.
@@ -2271,9 +2275,7 @@ function openStructured({ id, runtime = 'claude', model, effort, resume, log, co
       // resume gets its single "continue" HERE — not on a blind timer that raced the ~40s
       // resume and dropped the turn into a dead input stream. Fires exactly once.
       if (evt.kind === 'system' && entry.pendingAutoResume) {
-        entry.pendingAutoResume = false
-        try { entry.session?.sendTurn('continue') } catch { /* not resumable — stays idle, user can continue manually */ }
-        process.stderr.write(`\n  ◆ auto-resumed interrupted turn (${id.slice(0, 8)}) — sent continue.\n`)
+        if (sendInterruptedContinue(entry)) process.stderr.write(`\n  ◆ auto-resumed interrupted turn (${id.slice(0, 8)}) — sent continue.\n`)
       }
       // Context-carry (2026-07-08): a lane re-opened WITHOUT an SDK resume (provider switch,
       // non-resumable restart) starts blank. Fire the text-layer recap as its first turn the
@@ -2851,6 +2853,11 @@ channel
     s.hop = 0
     s.roomHop = 0   // a human turn is room-hop 0 — clears any injected cross-room hop depth
     const text = String(payload.text)
+    // A human turn supersedes a restart's still-pending auto-continue. Without this,
+    // their message starts the cold runtime; its init event then queues a second stale
+    // `continue` behind the request. Codex normally resumes immediately at restore, while
+    // Claude holds this flag only until its input stream is live.
+    supersedeInterruptedResume(s)
     // Echo the turn so BOTH readers (and late joiners, via the log) show who
     // said what — UNLESS silent (an @pool fire, which renders its own line).
     const echoYou = () => {
@@ -3203,7 +3210,8 @@ channel
             // instant it's live. openStructured already closed the interrupted turn idle, so a
             // continue that can't be delivered just leaves it idle (recoverable) — never a hang.
             if (re && !rec.flowSessionId && canResume(rec) && restoredTurnOpen(rec.log || [])) {
-              re.pendingAutoResume = true
+              const recovery = armInterruptedResume(re)
+              if (recovery === 'sent') process.stderr.write(`\n  ◆ auto-resumed interrupted Codex turn (${rec.id.slice(0, 8)}) — sent continue.\n`)
             }
             // Context-carry (2026-07-08): the SAME mid-turn case but the SDK context CANNOT
             // resume (canResume false — a stale/expired session). A bare "continue" would land

package/interrupted-resume.mjs

@@ -0,0 +1,29 @@
+// Runtime-specific bridge-restart recovery.
+//
+// Claude owns a long-lived input stream: its continue must wait for the init system
+// event proving that stream is consumed. Codex is one process per turn and has no idle
+// init event: sending the prompt IS what launches the resumed process.
+
+export function sendInterruptedContinue(entry) {
+  if (!entry) return false
+  entry.pendingAutoResume = false
+  try { return entry.session?.sendTurn?.('continue') !== false }
+  catch { return false }
+}
+
+export function armInterruptedResume(entry) {
+  if (!entry?.session) return 'unavailable'
+  if (entry.runtime === 'codex') return sendInterruptedContinue(entry) ? 'sent' : 'unavailable'
+  entry.pendingAutoResume = true
+  return 'armed'
+}
+
+// A real person speaking always wins the race. Otherwise a human turn that starts a
+// cold Claude/Codex runtime can trigger its init event and enqueue a stale second
+// `continue` behind the person's actual request.
+export function supersedeInterruptedResume(entry) {
+  if (!entry?.pendingAutoResume) return false
+  entry.pendingAutoResume = false
+  return true
+}
+

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "thinkpool-pair",
-  "version": "0.7.201",
+  "version": "0.7.203",
   "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 @@
     "transcript-sanitize.mjs",
     "session-store.mjs",
     "cross-terminal.mjs",
+    "interrupted-resume.mjs",
     "flow-conductor.mjs",
     "flow-worktree.mjs",
     "flow-task-graph.mjs",