thinkpool-pair 0.7.169 → 0.7.170

package/claude-session.mjs

@@ -660,15 +660,11 @@ export function startClaudeSession({ cwd, model, resume, env, mode: initialMode
   // documented override. opts.env REPLACES the child env, so spread the inherited one.
   opts.env = { ...(env || process.env), CLAUDE_CODE_ENABLE_PROMPT_SUGGESTION: '1' }
 
-  // Before the SDK replays this transcript, heal any cross-provider tool blocks
-  // it left behind (e.g. a room that ran on Z.ai GLM, now back on anthropic).
-  // Anthropic 400s on a `server_tool_use` block carrying a foreign id/name, which
-  // wedges the room on every send. Reclassifying those to plain `tool_use` clears
-  // it; idempotent + no-op on clean transcripts. See transcript-sanitize.mjs.
-  if (resume) {
-    const healed = sanitizeSession(cwd || process.cwd(), resume)
-    if (healed.blocks) process.stderr.write(`\n  ◆ healed ${healed.blocks} malformed tool block(s) in the transcript before resume.\n`)
-  }
+  // Transcript healing lives at the TRUE resume point — see runQuery, right before
+  // query() is (re)built. The old factory-time heal was gated on the closure constant
+  // `resume`, so it ran only on the first open; a `/model` switch or a restart re-points
+  // the live `sessionId` and re-enters runQuery, resuming a transcript that was never
+  // re-healed (finding FBL-1). Healing inside runQuery covers EVERY resume path.
 
   // One-shot Haiku fallback suggestion. Runs on the SAME subscription auth as the room
   // (opts.env carries the OAuth — no API key needed), but as a BARE model call: no
@@ -719,6 +715,18 @@ export function startClaudeSession({ cwd, model, resume, env, mode: initialMode
     const onParentAbort = () => { try { myAc.abort() } catch { /* noop */ } }
     ac.signal.addEventListener('abort', onParentAbort, { once: true })
     try {
+      // Heal the transcript we're about to REPLAY — at the true resume point, keyed on the
+      // LIVE `sessionId` (not the factory-time `resume` constant). `sessionId` mutates:
+      // recreateForSwitch re-points it to persistedSessionId and the restart / bad-resume
+      // forks re-point it too, each re-entering runQuery. A `/model` switch (or restart) that
+      // resumed a corrupted transcript — a dangling tool_use / tool_result-in-assistant left
+      // by an aborted mid-tool turn — used to hit an Anthropic 400 (H42 class) and wedge the
+      // lane on every send (finding FBL-1). sanitizeSession is idempotent + a no-op on clean
+      // transcripts, so healing before EVERY resume is free. See transcript-sanitize.mjs.
+      if (sessionId) {
+        const healed = sanitizeSession(cwd || process.cwd(), sessionId)
+        if (healed.blocks) process.stderr.write(`\n  ◆ healed ${healed.blocks} malformed tool block(s) in the transcript before resume.\n`)
+      }
       q = query({ prompt: input.stream, options: { ...opts, abortController: myAc, ...(sessionId ? { resume: sessionId } : {}) } })
       for await (const m of q) {
         if (closed) break
@@ -756,7 +764,7 @@ export function startClaudeSession({ cwd, model, resume, env, mode: initialMode
             // Cold-start timing — the init system message is when the terminal is
             // usable, so spawn→here IS the latency the user waits on. One line per
             // open. Compare a normal open vs one with TP_MCP_STRICT=1 to read off how
-            // many ms the host MCP servers cost. (resume opens also pay sanitizeSession.)
+            // many ms the host MCP servers cost. (each resume also pays a sanitizeSession heal — see runQuery.)
             if (!readyLogged) {
               readyLogged = true
               process.stderr.write(`\n  ◆ session ready in ${Date.now() - spawnT0}ms — MCP ${process.env.TP_MCP_STRICT === '1' ? 'OFF' : 'on'}${resume ? ', resume' : ', fresh'}.\n`)

package/package.json

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