thinkpool-pair 0.7.178 → 0.7.179

package/bridge.mjs

@@ -45,8 +45,8 @@ import { createPermNotifier, shouldNotifyTurnDone, permissionSummary, clipSummar
 // resolveProviderEnv(id) → {ANTHROPIC_BASE_URL,ANTHROPIC_AUTH_TOKEN,ANTHROPIC_MODEL} for a
 // registered custom provider, or null for the built-in/unknown (leave the default env intact).
 // Multi-provider BYOK slice 1: a lane spawned with a `provider` id runs on that endpoint.
-import { resolveProviderEnv, providerNameMap, publicKeyB64, announceProviders, listProviders, addProvider, removeProvider, unseal, effectiveLaneModel } from './providers.mjs'
-import { validateProviderSwitch, BUILTIN_PROVIDER } from './switch-provider.mjs'
+import { resolveProviderEnv, providerNameMap, publicKeyB64, announceProviders, listProviders, addProvider, removeProvider, unseal, effectiveLaneModel, sameProviderEnv, providerModel } from './providers.mjs'
+import { validateProviderSwitch, providerSwitchPlan, BUILTIN_PROVIDER } from './switch-provider.mjs'
 import { createSdkMcpServer, tool } from '@anthropic-ai/claude-agent-sdk'
 import { z } from 'zod'
 import { startClaudeSession } from './claude-session.mjs'
@@ -2473,7 +2473,16 @@ function respawnStructured(id, provider) {
   const s = sessions.get(id)
   if (!s) return false
   // Capture the lane's identity for re-open (NOT resume — fresh SDK session).
-  const { model, log, commands, mode, spawnedBy, flowSessionId, flowTaskKey, cwd, rolePrompt, reviewSliceRoots, openedAt } = s
+  // NOTE the deliberate absence of `model`: a respawn crosses a provider boundary,
+  // and the old lane's model id means nothing on the new backend. Carrying it sent
+  // `glm-4.6` to Anthropic on a GLM→Claude switch, and — once effectiveLaneModel
+  // started honouring explicit non-Claude ids — pinned a GLM→GLM-5.2 switch back to
+  // glm-4.6, so the lane truthfully labelled the model it was wrongly still running
+  // (Max, 2026-07-09: "selecting 5.2 still shows 4.6"). Omitting it lets
+  // openStructured seed from the TARGET provider's configured model, which is the
+  // only model this lane was ever asked for. A same-env model change never reaches
+  // here — that path is an in-place setModel (see provider-switch).
+  const { log, commands, mode, spawnedBy, flowSessionId, flowTaskKey, cwd, rolePrompt, reviewSliceRoots, openedAt } = s
   // Context-carry (2026-07-08): a provider switch is not an SDK resume — the new backend
   // starts blank mid-conversation. Synthesize a plain-text recap from the VISIBLE log NOW
   // (before teardown) and hand it to the fresh session as its first turn so the agent
@@ -2491,7 +2500,33 @@ function respawnStructured(id, provider) {
   // sessionData() (provider included) synchronously on open, so a bridge restart
   // restores the lane on its CURRENT provider, not the original — and its next
   // announce carries the new provider badge (additive {id,name} projection).
-  openStructured({ id, model, provider, log, commands, mode, spawnedBy, flowSessionId, flowTaskKey, cwd, rolePrompt, reviewSliceRoots, openedAt, carryRecap })
+  openStructured({ id, provider, log, commands, mode, spawnedBy, flowSessionId, flowTaskKey, cwd, rolePrompt, reviewSliceRoots, openedAt, carryRecap })
+  return true
+}
+
+/**
+ * Switch a lane between two providers that share an endpoint AND a key — i.e. two
+ * registry rows for the same z.ai/OpenRouter/proxy account, differing only in model.
+ *
+ * Nothing about the child's env changes except ANTHROPIC_MODEL, and the SDK's `model`
+ * option overrides that anyway, so there is no reason to tear the agent down. setModel()
+ * re-creates the query with `resume`, which keeps the SDK context (and defers a mid-turn
+ * switch to turn-end). The lane keeps its memory; only the model moves.
+ *
+ * Returns false when the lane is gone or the target has no configured model — the caller
+ * falls back to a full respawn rather than leaving the lane on a stale model.
+ */
+function switchModelInPlace(id, provider) {
+  const s = sessions.get(id)
+  if (!s?.session) return false
+  const nextModel = providerModel(provider)
+  if (!nextModel) return false            // no model to switch TO → let respawn seed the env
+  s.provider = provider || null
+  s.model = nextModel                     // truthful label; announce reads this
+  try { s.session.setModel(nextModel) } catch { return false }
+  // Persist through the entry's own closure (sessionData is private to openStructured),
+  // so a bridge restart restores the lane on the row it was switched TO, not the origin.
+  try { s.flush?.() } catch { /* disk full / racing close — the debounced save still runs */ }
   return true
 }
 
@@ -2953,7 +2988,9 @@ channel
   // projection the client already renders from #219). Spec: docs/specs/2026-07-05-provider-switch.md.
   .on('broadcast', { event: 'provider-switch' }, async ({ payload }) => {
     const nonce = payload?.nonce
-    const reply = (ok, error) => channel.send({ type: 'broadcast', event: 'provider-switch-res', payload: { nonce, ok, ...(error ? { error } : {}) } })
+    // `restarted` (0.7.179+): did the agent lose its context? false for a same-key model
+    // change, true for a real provider change. Older clients ignore the extra field.
+    const reply = (ok, error, restarted) => channel.send({ type: 'broadcast', event: 'provider-switch-res', payload: { nonce, ok, ...(error ? { error } : {}), ...(restarted === undefined ? {} : { restarted }) } })
     // AUTH first — anon / non-participant / bad jwt → ok:false 'unauthorized'. No lane
     // state is touched for a rejected sender (fail closed before any lookup).
     if (!(await isRoomParticipant(payload?.jwt))) return reply(false, 'unauthorized')
@@ -2968,12 +3005,32 @@ channel
       registeredIds: listProviders().map((p) => p.id),
     })
     if (!v.ok) return reply(false, v.error)
-    if (v.noop) return reply(true)   // nothing to do; idempotent ok (UI guarantees a change)
     const target = payload?.provider === BUILTIN_PROVIDER ? null : payload?.provider
+
+    // The three-way choice is pure + unit-tested (switch-provider.mjs). Two registry rows
+    // on ONE endpoint + key (Max's glm-4.6 and glm-5.2 on the same z.ai account) are the
+    // same provider asked for a different model: the child's env is identical, so tearing
+    // the agent down and recapping it is pure loss. Only a different endpoint/key earns a
+    // respawn. An in-place attempt that fails (lane raced closed, setModel threw) falls
+    // back to the respawn rather than leaving the lane on a stale model.
+    const plan = providerSwitchPlan({
+      provider: payload?.provider,
+      currentProvider: s.provider,
+      sameEnv: sameProviderEnv(s.provider, target),
+      targetModel: providerModel(target),
+    })
+    if (plan.action === 'noop') return reply(true, undefined, false)   // idempotent (UI guarantees a change)
+
+    if (plan.action === 'in-place' && switchModelInPlace(term, target)) {
+      process.stderr.write(`\n  ◆ lane ${String(term).slice(0, 8)} switched model → ${providerModel(target)} (same key, context kept).\n`)
+      announce()
+      return reply(true, undefined, false)
+    }
+
     const done = respawnStructured(term, target)
     if (!done) return reply(false, 'no such live lane')   // raced closed between the lookup + respawn
     process.stderr.write(`\n  ◆ lane ${String(term).slice(0, 8)} switched provider → ${target || 'anthropic'} (memory reset, transcript kept).\n`)
-    reply(true)
+    reply(true, undefined, true)
   })
   .subscribe(status => {
     if (status === 'SUBSCRIBED') {

package/package.json

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

package/providers.mjs

@@ -247,6 +247,55 @@ export function removeProvider(id) {
   return { ok: true }
 }
 
+/* ── the provider GROUP token (Max, 2026-07-09) ──────────────────────────
+   Two registry rows are the SAME PROVIDER when they point at the same endpoint
+   with the same key — they differ only in which model they ask it for. That is
+   the identity that matters: it decides whether the switch menu unites them, and
+   whether switching between them needs a fresh agent (it doesn't — same env).
+
+   Before this, the clients grouped on `brandKey(name)`: the first whitespace token
+   of the user's DISPLAY NAME, lowercased. "GLM" → `glm`, "GLM-5.2" → `glm5.2`, so
+   Max's two models on one z.ai key rendered as two unrelated providers, each
+   threatening to restart his agent. Identity was being derived from a label.
+
+   `group` is a one-way digest of baseUrl + key, NOT either value. It is safe on
+   the announce (which deliberately carries neither): a 12-hex prefix reveals only
+   *sameness*, and preimaging it means preimaging the key. The built-in Anthropic
+   has no stored key, so it gets the literal 'anthropic' — it groups with nothing.
+
+   NUL-separated so ("https://a.io/x", "key") and ("https://a.io/xkey", "") can't
+   collide into one group. */
+export function providerGroup(p) {
+  if (!p || p.id === BUILTIN_ID) return BUILTIN_ID
+  return crypto.createHash('sha256')
+    .update(`${p.baseUrl || ''}\0${p.key || ''}`)
+    .digest('hex')
+    .slice(0, 12)
+}
+
+/**
+ * Do these two registered providers share an endpoint AND a key? Then a switch
+ * between them changes only ANTHROPIC_MODEL — the child's env is otherwise
+ * identical, so the live session can just setModel() and keep its context
+ * instead of being torn down and recapped. Built-in ↔ custom is never same-env.
+ */
+export function sameProviderEnv(idA, idB) {
+  const a = effectiveId(idA), b = effectiveId(idB)
+  if (a === BUILTIN_ID || b === BUILTIN_ID) return a === b   // both built-in, or one of them
+  const arr = loadProviders()
+  const pa = arr.find((x) => x.id === a), pb = arr.find((x) => x.id === b)
+  if (!pa || !pb) return false                                // unknown id → never same
+  return providerGroup(pa) === providerGroup(pb)
+}
+
+const effectiveId = (p) => (!p || p === BUILTIN_ID) ? BUILTIN_ID : String(p)
+
+/** The model a registered provider is configured to ask for (null for built-in/unknown). */
+export function providerModel(id) {
+  if (!id || id === BUILTIN_ID) return null
+  return loadProviders().find((x) => x.id === id)?.model || null
+}
+
 // ── read-only projections (never expose the raw key) ────────────────────
 /** Masked list for the dashboard: keyHint = last 4 chars only. Built-in first. */
 export function listProviders() {
@@ -254,15 +303,16 @@ export function listProviders() {
     id: p.id,
     name: p.name,
     model: p.model || null,
+    group: providerGroup(p),
     keyHint: keyHint(p.key),
   }))
-  return [{ id: BUILTIN_ID, name: 'Anthropic (Claude)', model: null, keyHint: null }, ...custom]
+  return [{ id: BUILTIN_ID, name: 'Anthropic (Claude)', model: null, group: BUILTIN_ID, keyHint: null }, ...custom]
 }
 
 /** Name-only projection for the announce/presence payload — NO key, NO baseUrl. */
 export function announceProviders() {
-  const custom = loadProviders().map((p) => ({ id: p.id, name: p.name, model: p.model || null }))
-  return [{ id: BUILTIN_ID, name: 'Anthropic (Claude)', model: null }, ...custom]
+  const custom = loadProviders().map((p) => ({ id: p.id, name: p.name, model: p.model || null, group: providerGroup(p) }))
+  return [{ id: BUILTIN_ID, name: 'Anthropic (Claude)', model: null, group: BUILTIN_ID }, ...custom]
 }
 
 /**

package/switch-provider.mjs

@@ -55,3 +55,30 @@ export function validateProviderSwitch({ provider, currentProvider, registeredId
   const noop = effectiveProvider(id) === effectiveProvider(currentProvider)
   return { ok: true, noop }
 }
+
+/**
+ * WHAT KIND of switch is this? The pure half of the provider-switch handler, so the
+ * three-way choice is testable without booting a bridge (Max, 2026-07-09).
+ *
+ *   'noop'     — same provider; nothing to do.
+ *   'in-place' — a different registry row on the SAME endpoint + key (two models on
+ *                one z.ai account). Only ANTHROPIC_MODEL differs, so the live session
+ *                just setModel()s and KEEPS ITS CONTEXT. Requires a model to switch to.
+ *   'respawn'  — a genuinely different endpoint or key. Fresh agent, transcript kept,
+ *                recap carried. This is the only case that costs the user their context.
+ *
+ * `sameEnv` is supplied by the caller (providers.mjs `sameProviderEnv`) rather than
+ * imported, so this module stays free of registry/disk state — the whole point of it.
+ * A same-env target with NO configured model falls back to 'respawn': openStructured
+ * would then seed the model from the target's env, which an in-place setModel cannot do.
+ *
+ * @param {{provider:string, currentProvider?:string|null, sameEnv:boolean, targetModel?:string|null}} input
+ * @returns {{action:'noop'|'in-place'|'respawn', restarted:boolean}}
+ */
+export function providerSwitchPlan({ provider, currentProvider, sameEnv, targetModel }) {
+  if (effectiveProvider(provider) === effectiveProvider(currentProvider)) {
+    return { action: 'noop', restarted: false }
+  }
+  if (sameEnv && targetModel) return { action: 'in-place', restarted: false }
+  return { action: 'respawn', restarted: true }
+}