thinkpool-pair 0.7.37 → 0.7.40

package/bridge.mjs

@@ -151,9 +151,7 @@ if (argv[0] === 'install-service' || argv[0] === 'uninstall-service') {
 // shell export can't reach a serviced bridge — provider.json is its own source
 // of truth. Idempotent; a no-op for the default Anthropic provider. See provider.mjs.
 const { applyProviderEnv } = await import('./provider.mjs')
-// Captured so the room announce can report the active LLM provider (anthropic,
-// or a custom Anthropic-compatible endpoint) to the web welcome banner.
-const PROVIDER_INFO = applyProviderEnv()
+applyProviderEnv()
 
 if (argv[0] === 'login') { const { runLogin } = await import('./account.mjs'); await runLogin(SUPABASE_URL, SUPABASE_ANON, WEB_BASE) }
 if (argv[0] === 'bind')  { const { runBind }  = await import('./account.mjs'); runBind(argv[1], argv[2]) }
@@ -166,7 +164,7 @@ if (argv[0] === 'provider') { const { runProvider } = await import('./provider.m
 // so launchd / systemd / CI / pipes are byte-for-byte unchanged.
 // Spec: docs/specs/2026-06-19-bridge-unified-launcher.md (Part 1).
 if ((!argv[0] || argv[0] === 'setup') && process.stdin.isTTY) {
-  const { runLauncher, detectState } = await import('./launcher.mjs')
+  const { runLauncher } = await import('./launcher.mjs')
   const svc = await import('./service.mjs')
   const BRIDGE = fileURLToPath(import.meta.url)
   const io = {
@@ -188,18 +186,9 @@ if ((!argv[0] || argv[0] === 'setup') && process.stdin.isTTY) {
     installService: ({ room = null, agentCmd } = {}) => { svc.installService(room, agentCmd ? [agentCmd] : []); process.exit(0) },
     uninstallService: ({ room = null } = {}) => { svc.uninstallService(room); process.exit(0) },
     login: async () => { const { runLogin } = await import('./account.mjs'); await runLogin(SUPABASE_URL, SUPABASE_ANON, WEB_BASE) },
-    // Provider config is NOT terminal — it writes provider.json and returns to the
-    // menu so you can pick a model, switch back, or do something else. (It used to
-    // process.exit(0), which dumped you to the shell mid-setup.)
-    setProvider: async ({ kind, base, token, model }) => {
-      const { runProvider } = await import('./provider.mjs')
-      const args = kind === 'custom'
-        ? ['custom', '--base', base, '--token', token, ...(model ? ['--model', model] : [])]
-        : ['anthropic']
-      await runProvider(args)
-    },
+    setProvider: async ({ kind, base, token }) => { const { runProvider } = await import('./provider.mjs'); await runProvider(kind === 'custom' ? ['custom', '--base', base, '--token', token] : ['anthropic']); process.exit(0) },
   }
-  await runLauncher({ actions, io, refresh: detectState })
+  await runLauncher({ actions, io })
   process.exit(0)
 }
 
@@ -417,14 +406,6 @@ const announce = () =>
     // cwd + version: the host's working dir + thinkpool-pair version, shown in
     // the room's welcome banner. Re-sent per announce so late joiners get them.
     cwd, version: VERSION,
-    // provider: the LLM endpoint this bridge drives Claude Code through —
-    // 'anthropic' (the default, the host's regular Claude login) or 'custom'
-    // (any Anthropic-compatible base url: GLM/Z.ai, OpenRouter, a proxy). Shown
-    // in the room banner so both drivers see whose model they're on.
-    // providerBaseUrl rides along only for custom so the banner can show the
-    // host (e.g. openrouter.ai). Older web clients ignore unknown fields.
-    provider: PROVIDER_INFO.provider,
-    providerBaseUrl: PROVIDER_INFO.baseUrl || undefined,
     // pendingUpdate: a newer thinkpool-pair is out — drives the room's "update ready"
     // chip; re-sent per announce so reloads/late-joiners see it (Slice 3).
     pendingUpdate,

package/launcher.mjs

@@ -51,14 +51,10 @@ function serviceFile(room) {
 export function detectState() {
   const auth = readJson(path.join(CFG_DIR, 'auth.json'))
   const provider = readJson(path.join(CFG_DIR, 'provider.json'))
-  // provider.json is written with { provider, baseUrl, model } (see provider.mjs).
-  // Anything whose `provider` field is set and not "anthropic" is a custom endpoint.
-  const isCustom = !!provider?.provider && provider.provider !== 'anthropic'
   return {
     loggedIn: !!auth?.refresh_token,
     email: auth?.email || auth?.user?.email || null,
-    provider: isCustom ? `Custom (${provider.baseUrl || 'endpoint'})` : 'Anthropic (default)',
-    providerModel: isCustom ? (provider.model || null) : null,
+    provider: provider?.kind === 'custom' ? `Custom (${provider.base || 'endpoint'})` : 'Anthropic (default)',
     agents: KNOWN_AGENTS.filter(a => onPath(a.cmd)),
     accountSvc: fs.existsSync(serviceFile(null)),
     cwd: process.cwd(),
@@ -72,11 +68,7 @@ const C = {
 }
 
 // io: { ask(prompt)->Promise<string>, print(s) }. actions: real | dry-run | mock.
-// refresh: optional () => state — re-read disk after a mutating action so the header
-// reflects the change (real bridge passes detectState; tests omit it to keep the
-// injected state stable).
-export async function runLauncher({ actions, io, state = detectState(), refresh = null }) {
-  const resync = () => { if (refresh) state = refresh() }
+export async function runLauncher({ actions, io, state = detectState() }) {
   const askChoice = async (prompt, options, def = 1) => {
     options.forEach((o, i) => io.print(`    ${C.cyan(String(i + 1))})  ${o.label}${o.hint ? '  ' + C.dim(o.hint) : ''}`))
     const a = await io.ask(`\n  ${prompt} ${C.dim(`[${def}]`)} ${C.cyan('▸')} `)
@@ -145,41 +137,25 @@ export async function runLauncher({ actions, io, state = detectState(), refresh
     await actions.installService({ room, agentCmd: agent.cmd })
   }
 
-  const providerMenu = async () => {
-    const cur = state.provider + (state.providerModel ? `, model ${state.providerModel}` : '')
-    const p = await askChoice('\n  provider', [
-      { label: 'Anthropic (default)', hint: 'regular Claude login' },
-      { label: 'Custom endpoint', hint: 'Z.ai GLM, OpenRouter, your own proxy' },
-      { label: '← Back', hint: `current: ${cur}` },
-    ], 3)  // Enter = Back
-    if (p === 2) return
-    if (p === 0) { await actions.setProvider({ kind: 'anthropic' }); resync(); io.print('\n  ' + C.green('✓ back on regular Claude.')); return }
-    // custom — every step can be aborted with a blank line, which backs out cleanly.
-    const base = (await io.ask(`\n  Base url ${C.dim('(blank to cancel · SDK appends /v1/messages)')} ${C.cyan('▸')} `)).trim()
-    if (!base) { io.print('  ' + C.yellow('cancelled — provider unchanged')); return }
-    const token = (await io.ask(`  API token ${C.dim('(blank to cancel)')} ${C.cyan('▸')} `)).trim()
-    if (!token) { io.print('  ' + C.yellow('cancelled — provider unchanged')); return }
-    const model = (await io.ask(`  Model ${C.dim('(blank = endpoint default · e.g. glm-4.6)')} ${C.cyan('▸')} `)).trim()
-    await actions.setProvider({ kind: 'custom', base, token, model: model || undefined })
-    resync()
-    io.print(`\n  ${C.green('✓ provider set to custom.')}\n    base url: ${state.provider}\n    model:    ${state.providerModel || '(endpoint default)'}`)
-  }
-
   const settingsMenu = async () => {
-    for (;;) {
-      const pick = await askChoice('\n  change', [
-        { label: 'LLM provider', hint: `current: ${state.provider}` },
-        { label: 'Account', hint: state.loggedIn ? `linked: ${state.email || 'yes'}` : 'not linked' },
-        { label: 'Remove the background service', hint: state.accountSvc ? '' : 'none installed' },
-        { label: '← Back to main menu', hint: '' },
-      ], 4)  // Enter = Back
-      if (pick === 3) return
-      if (pick === 0) await providerMenu()
-      else if (pick === 1) { await actions.login(); resync(); return }
+    const pick = await askChoice('\n  change', [
+      { label: 'LLM provider', hint: `current: ${state.provider}` },
+      { label: 'Account', hint: state.loggedIn ? `linked: ${state.email || 'yes'}` : 'not linked' },
+      { label: 'Remove the background service', hint: state.accountSvc ? '' : 'none installed' },
+    ])
+    if (pick === 0) {
+      const p = await askChoice('\n  provider', [{ label: 'Anthropic (default)' }, { label: 'Custom endpoint', hint: 'Z.ai GLM, OpenRouter, your own proxy' }])
+      if (p === 0) await actions.setProvider({ kind: 'anthropic' })
       else {
-        if (state.accountSvc) await actions.uninstallService({ room: null })
-        else io.print('  ' + C.yellow('no background service installed'))
+        const base = (await io.ask(`\n  Base url ${C.dim('(SDK appends /v1/messages)')} ${C.cyan('▸')} `)).trim()
+        const token = (await io.ask(`  API token ${C.cyan('▸')} `)).trim()
+        await actions.setProvider({ kind: 'custom', base, token })
       }
+    } else if (pick === 1) {
+      await actions.login()
+    } else {
+      if (state.accountSvc) await actions.uninstallService({ room: null })
+      else io.print('  ' + C.yellow('no background service installed'))
     }
   }
 

package/package.json

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