thinkpool-pair 0.7.140 → 0.7.142

package/claude-session.mjs

@@ -191,6 +191,7 @@ export function startClaudeSession({ cwd, model, resume, env, mode: initialMode
   // that isn't persisted until a turn completes, so re-creating on it fails with
   // "No conversation found" (Max 2026-07-02). This is always a resumable id.
   let persistedSessionId = resume || null
+  let lastTurnText = null   // the most recent turn text, so a bad-resume recovery can re-deliver it
   let closed = false
   // Lazy boot (2026-07-02): a RESTORED-IDLE terminal returns a full session object but
   // defers the expensive query() cold-start (MCP + settingSources, ~50s each) until its
@@ -762,8 +763,14 @@ export function startClaudeSession({ cwd, model, resume, env, mode: initialMode
             // m.slash_commands (init message) — the commands this session really
             // supports: built-ins + the host's custom .claude/commands. Surfaced
             // so the room composer's autocomplete lists what ACTUALLY exists.
-            curModel = m.model || model || curModel
-            emit({ kind: 'system', sessionId, model: m.model || model || null, commands: Array.isArray(m.slash_commands) ? m.slash_commands : undefined })
+            // Prefer the INTENDED model (opts.model — set at open and on every /model switch)
+            // over the message's own `m.model`. A RESUMED session REPLAYS the transcript's old
+            // init messages, all carrying the PRE-switch model, and each one used to reset the
+            // displayed model back (Max 2026-07-02: switch to Fable, then 24 replayed
+            // "init model=claude-opus-4-8" dragged the chip back to Opus with no result yet to
+            // correct it). opts.model reflects what the session will actually run, so trust it.
+            curModel = opts.model || m.model || model || curModel
+            emit({ kind: 'system', sessionId, model: opts.model || m.model || model || null, commands: Array.isArray(m.slash_commands) ? m.slash_commands : undefined })
             // Dynamic model list — ask the SDK for its OWN supported models and surface
             // them to the room so the /model picker renders live options (incl. new
             // models like Fable) instead of a hardcoded three-item list. Fire-and-forget:
@@ -819,6 +826,30 @@ export function startClaudeSession({ cwd, model, resume, env, mode: initialMode
           }
           case 'result':
             if (m.session_id) sessionId = m.session_id
+            // Bad resume target: the CLI can't find the session we tried to resume — a forked
+            // id that was never persisted, or a pruned transcript. It surfaces as an is_error
+            // RESULT (subtype error_during_execution), NOT a thrown error, so it bypasses the
+            // catch below and used to loop forever on the dead id (Max 2026-07-02, sid 6db6c1e3
+            // stuck across restarts + model switches). Drop the resume for good, re-run FRESH
+            // on the current model, and re-deliver the in-flight turn so nothing is lost.
+            if (m.is_error && Array.isArray(m.errors) && m.errors.some((x) => /no conversation found/i.test(String(x))) && (sessionId || persistedSessionId) && restartCount < RESTART_MAX) {
+              restartCount++
+              const wasActive = turnActive
+              turnActive = false
+              sessionId = null; persistedSessionId = null   // never resume the dead id again
+              emit({ kind: 'note', text: 'previous session not found — continuing on a fresh one' })
+              const oldInput = input
+              input = makeInputStream()
+              try { oldInput.end() } catch { /* noop */ }
+              const replay = wasActive ? lastTurnText : null
+              restartTimer = setTimeout(() => {
+                restartTimer = null
+                if (closed) return
+                runQuery()
+                if (replay != null) { turnActive = true; lastEvtTs = Date.now(); stalledSent = false; input.push([{ type: 'text', text: replay }, { type: 'text', text: `<system-reminder>\n${TP_ROOM_REMINDER}\n</system-reminder>` }]) }
+              }, 300)
+              break
+            }
             // Swallow the interrupt's redundant teardown results (see `interrupting` above):
             // abort() already emitted the one canonical aborted boundary. `success` (and any
             // non-teardown subtype) always emits; only the aborted/error_during_execution pair
@@ -956,7 +987,7 @@ export function startClaudeSession({ cwd, model, resume, env, mode: initialMode
   return {
     // A lazy (restored-idle) session cold-boots the query on its first turn. input.push
     // is queue-backed, so the pushed turn buffers and runs once the query is ready.
-    sendTurn(text) { if (!closed) { if (!started) runQuery(); turnActive = true; sawSuggestion = false; if (sugTimer) { clearTimeout(sugTimer); sugTimer = null } lastEvtTs = Date.now(); stalledSent = false; input.push([{ type: 'text', text: String(text) }, { type: 'text', text: `<system-reminder>\n${TP_ROOM_REMINDER}\n</system-reminder>` }]) } },
+    sendTurn(text) { if (!closed) { if (!started) runQuery(); turnActive = true; sawSuggestion = false; lastTurnText = String(text); if (sugTimer) { clearTimeout(sugTimer); sugTimer = null } lastEvtTs = Date.now(); stalledSent = false; input.push([{ type: 'text', text: String(text) }, { type: 'text', text: `<system-reminder>\n${TP_ROOM_REMINDER}\n</system-reminder>` }]) } },
     // Cold-boot the query WITHOUT sending a turn — the background warmer calls this on
     // lazily-restored idle terminals so they're ready before the user clicks them.
     warm() { if (!started && !closed) runQuery() },

package/package.json

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