thinkpool-pair 0.7.24 → 0.7.25

package/bridge.mjs

@@ -143,8 +143,16 @@ if (argv[0] === 'install-service' || argv[0] === 'uninstall-service') {
 // ACCOUNT, not per room. `login` links this device; `bind <ROOM> <dir>` maps a
 // session to a working dir on this machine; a bare invocation discovers + serves
 // every session you're in (a headless child bridge per room, run in its dir).
+// Apply the per-machine LLM provider choice (GLM via Z.ai, or default Anthropic)
+// BEFORE any child is spawned. The launchd service doesn't source ~/.zshrc, so a
+// 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')
+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]) }
+if (argv[0] === 'provider') { const { runProvider } = await import('./provider.mjs'); await runProvider(argv.slice(1)); process.exit(0) }
 if (!argv[0] || argv[0].startsWith('-')) { const { runAccount } = await import('./account.mjs'); await runAccount(SUPABASE_URL, SUPABASE_ANON) }
 
 const room = (argv[0] || '').toUpperCase().trim()

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "thinkpool-pair",
-  "version": "0.7.24",
+  "version": "0.7.25",
   "description": "Share a local coding-agent CLI (Claude Code, Codex, Gemini, Aider, …) into a ThinkPool Code room, live.",
   "type": "module",
   "bin": {
@@ -13,6 +13,7 @@
     "service.mjs",
     "account.mjs",
     "auth-store.mjs",
+    "provider.mjs",
     "README.md"
   ],
   "scripts": {

package/provider.mjs

@@ -0,0 +1,120 @@
+/* ─────────────────────────────────────────────────────────────
+   provider.mjs — per-machine LLM provider choice for the ThinkPool
+   bridge. Lets a Code room run on GLM (Z.ai's Anthropic-compatible
+   endpoint) instead of plain Anthropic, INDEPENDENT of the launching
+   shell. Why this exists: the launchd service does NOT source ~/.zshrc,
+   so a shell `export ANTHROPIC_*` can never reach a serviced bridge —
+   its spawned Claude children fall back to the host's claude.ai login
+   and hit the Anthropic spend wall. provider.json is the bridge's OWN
+   source of truth.
+
+   applyProviderEnv() runs once at the top of bridge.mjs (the universal
+   entry point), BEFORE any child is spawned. It sets ANTHROPIC_BASE_URL
+   / ANTHROPIC_AUTH_TOKEN / ANTHROPIC_MODEL on process.env. Because the
+   account-supervisor spawn (account.mjs) and the Agent-SDK env
+   (claude-session.mjs) both spread `...process.env`, the choice reaches
+   every code session with no other change. Default (no file, or
+   provider:"anthropic") = the host's regular Claude login, untouched.
+
+   CLI (dispatched from bridge.mjs):
+     npx thinkpool-pair provider                         # show current
+     npx thinkpool-pair provider glm --token <zai_…>     # use GLM (Z.ai)
+     npx thinkpool-pair provider custom --base <url> --token <key>
+     npx thinkpool-pair provider anthropic               # reset to Claude
+   ───────────────────────────────────────────────────────────── */
+import os from 'node:os'
+import fs from 'node:fs'
+import path from 'node:path'
+
+const DIR = path.join(os.homedir(), '.thinkpool-pair')
+const FILE = path.join(DIR, 'provider.json')
+
+// The pre-baked GLM/Z.ai preset. --token is always required (never bake a key
+// into source); --base / --model override these if the endpoint ever moves.
+const GLM = { baseUrl: 'https://api.z.ai/api/anthropic', model: 'glm-5.2' }
+
+function ensureDir() { try { fs.mkdirSync(DIR, { recursive: true }) } catch { /* noop */ } }
+function opt(args, flag) { const i = args.indexOf(flag); return i >= 0 ? args[i + 1] : undefined }
+
+export function loadProvider() {
+  try { return JSON.parse(fs.readFileSync(FILE, 'utf8')) } catch { return null }
+}
+
+export function saveProvider(p) {
+  ensureDir()
+  fs.writeFileSync(FILE, JSON.stringify(p, null, 2), { mode: 0o600 })
+}
+
+/**
+ * Merge the persisted provider choice (or TP_PROVIDER* env overrides) into
+ * process.env. Call once at startup, before spawning any child. Idempotent.
+ * A no-op for the default Anthropic provider — we only ever SET the GLM/custom
+ * vars, never clobber a host's real Claude login env. Env vars win over the
+ * file so a one-off launch can flip providers without writing anything.
+ * @returns {{provider:string,baseUrl?:string,model?:string,source:string}}
+ */
+export function applyProviderEnv() {
+  const cfg = loadProvider() || {}
+  const provider = (process.env.TP_PROVIDER || cfg.provider || 'anthropic').toLowerCase()
+  if (provider === 'anthropic' || !provider) return { provider: 'anthropic', source: 'default' }
+
+  const baseUrl = process.env.TP_ANTHROPIC_BASE_URL || cfg.baseUrl
+  const authToken = process.env.TP_ANTHROPIC_AUTH_TOKEN || cfg.authToken
+  const model = process.env.TP_ANTHROPIC_MODEL || cfg.model
+  if (!baseUrl || !authToken) {
+    process.stderr.write(`\n  ◇ provider "${provider}" is set but is missing baseUrl/authToken.\n    Finish setup:  npx thinkpool-pair provider ${provider} --token <key>\n    Falling back to regular Claude for now.\n`)
+    return { provider: 'anthropic', source: 'incomplete' }
+  }
+  process.env.ANTHROPIC_BASE_URL = baseUrl
+  process.env.ANTHROPIC_AUTH_TOKEN = authToken
+  if (model) process.env.ANTHROPIC_MODEL = model
+  return { provider, baseUrl, model, source: cfg.provider ? 'file' : 'env' }
+}
+
+/** CLI handler for `thinkpool-pair provider [...]`. */
+export async function runProvider(args) {
+  const sub = (args[0] || '').toLowerCase()
+
+  // ── show ──
+  if (!sub || sub === 'show' || sub === 'status') {
+    const cfg = loadProvider()
+    if (!cfg || cfg.provider === 'anthropic' || !cfg.provider) {
+      console.error('\n  ◆ provider: anthropic (regular Claude login) — the default.\n')
+    } else {
+      console.error(`\n  ◆ provider: ${cfg.provider}\n    base url: ${cfg.baseUrl || '(unset)'}\n    model:    ${cfg.model || '(unset)'}\n    token:    ${cfg.authToken ? cfg.authToken.slice(0, 8) + '…' : '(unset)'}\n`)
+    }
+    return
+  }
+
+  // ── reset to Anthropic ──
+  if (sub === 'anthropic' || sub === 'clear' || sub === 'reset') {
+    try { fs.unlinkSync(FILE) } catch { /* noop */ }
+    console.error('\n  ✓ provider reset to anthropic (regular Claude login).\n')
+    return
+  }
+
+  // ── GLM (Z.ai) preset ──
+  if (sub === 'glm') {
+    const token = opt(args, '--token') || opt(args, '--key')
+    const baseUrl = opt(args, '--base') || opt(args, '--base-url') || GLM.baseUrl
+    const model = opt(args, '--model') || GLM.model
+    if (!token) { console.error('\n  ✗ glm needs --token <zai_…>. Get one at https://z.ai/\n'); process.exit(1) }
+    saveProvider({ provider: 'glm', baseUrl, authToken: token, model, savedAt: Date.now() })
+    console.error(`\n  ✓ provider set to glm (Z.ai).\n    base url: ${baseUrl}\n    model:    ${model}\n    token:    ${token.slice(0, 8)}…\n    Restart the bridge (or its launchd service) to apply.\n`)
+    return
+  }
+
+  // ── arbitrary Anthropic-compatible endpoint ──
+  if (sub === 'custom') {
+    const token = opt(args, '--token') || opt(args, '--key')
+    const baseUrl = opt(args, '--base') || opt(args, '--base-url')
+    const model = opt(args, '--model')
+    if (!token || !baseUrl) { console.error('\n  ✗ custom needs --base <url> and --token <key>.\n'); process.exit(1) }
+    saveProvider({ provider: 'custom', baseUrl, authToken: token, model: model || undefined, savedAt: Date.now() })
+    console.error(`\n  ✓ provider set to custom (${baseUrl}).\n    Restart the bridge to apply.\n`)
+    return
+  }
+
+  console.error('\n  usage:\n    npx thinkpool-pair provider                              # show current\n    npx thinkpool-pair provider glm --token <zai_…> [--model glm-5.2]\n    npx thinkpool-pair provider custom --base <url> --token <key> [--model <m>]\n    npx thinkpool-pair provider anthropic                      # reset to Claude\n')
+  process.exit(1)
+}