thinkpool-pair 0.7.168 → 0.7.170

package/bridge.mjs

@@ -1510,7 +1510,16 @@ function openStructured({ id, model, resume, log, commands, mode, spawnedBy, rol
   // spawnedBy: set when this lane was Dispatched (spawn_terminal). Restored from the
   // session store so the Ensemble flag survives a bridge restart (else a respin
   // stripped it and the lane reverted to a plain tab — the t6 "no chip" bug).
-  const entry = { cmd: 'claude', kind: 'structured', log: Array.isArray(log) ? log.slice(-STRUCTURED_LOG_MAX) : [], pending: new Map(), session: null, recovered: false, commands: Array.isArray(commands) ? commands : undefined, mode, model: model || null, provider: provider || null, spawnedBy: spawnedBy || undefined, flowSessionId: flowSessionId || null, flowTaskKey: flowTaskKey || null, cwd: cwd || null,
+  const entry = { cmd: 'claude', kind: 'structured', log: Array.isArray(log) ? log.slice(-STRUCTURED_LOG_MAX) : [], pending: new Map(), session: null, recovered: false, commands: Array.isArray(commands) ? commands : undefined, mode,
+    // model: truthful active-model label. When this lane runs on a custom (non-anthropic)
+    // registered provider the SDK id is impersonated (see the onEvent guard below), so seed
+    // from THAT provider's CONFIGURED model — glm-5.2, not a Claude label — before any turn.
+    // No configured model → the provider's name, never a false Claude id. Built-in Anthropic
+    // keeps the passed model. Keyed on the lane's own provider id, not the bridge default.
+    model: (!provider || provider === 'anthropic')
+      ? (model || null)
+      : (resolveProviderEnv(provider)?.ANTHROPIC_MODEL || providerNameMap()[provider] || model || provider),
+    provider: provider || null, spawnedBy: spawnedBy || undefined, flowSessionId: flowSessionId || null, flowTaskKey: flowTaskKey || null, cwd: cwd || null,
     // Stable creation order — persisted so a bridge restart restores tabs in the SAME
     // 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.
@@ -2108,7 +2117,18 @@ function openStructured({ id, model, resume, log, commands, mode, spawnedBy, rol
       // LIST (from the `models` event) so the announce carries them to EVERY device.
       // Re-announce on change so a switch / late device sees it without a turn (the
       // old localStorage cache was per-device; branch showed on every other device).
-      { const m = evt.model || evt.ctx?.model
+      // When THIS lane runs on a NON-anthropic provider (a registered GLM/Z.ai,
+      // OpenRouter, any Anthropic-compatible proxy — entry.provider is a custom
+      // registry id) the SDK reads the endpoint's response metadata, which IMPERSONATES
+      // a Claude model id (z.ai reports "claude-sonnet-…" while actually serving glm-5.2).
+      // Trusting evt.model made the chip lie "Sonnet 5" on a GLM lane. The truthful label
+      // is the configured provider model (seeded at openStructured) or an explicit /model
+      // pick, both of which live on entry.model already — so DON'T let the impersonated
+      // SDK id overwrite it. Only trust the SDK's model on the built-in Anthropic path.
+      // Keyed on the LANE's provider (entry.provider), not the bridge default — lanes can
+      // run on different registered providers. (bridge-truth slice.)
+      { 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() } }
       // FL-B2 — fold this flow lane's completed-turn output tokens into its budget so the

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,7 +1,7 @@
 {
   "name": "thinkpool-pair",
-  "version": "0.7.168",
-  "description": "Share a local coding-agent CLI (Claude Code, Codex, Gemini, Aider, \u2026) into a ThinkPool Code room, live.",
+  "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": {
     "thinkpool-pair": "bridge.mjs"