thinkpool-pair 0.7.40 → 0.7.41

package/account.mjs

@@ -260,13 +260,20 @@ export async function runAccount(SUPABASE_URL, SUPABASE_ANON) {
   const tick = async () => {
     let rooms = []
     try {
-      const { data } = await sb.from('code_sessions').select('code,name,last_active_at').order('last_active_at', { ascending: false }).limit(20)
+      // Owner-only discovery (Contract C-CODE-2): a host bridges ONLY the sessions
+      // it CREATED. RLS on code_sessions returns owned OR participant rooms, so
+      // without this owner filter the supervisor auto-serves rooms you merely JOINED
+      // as a guest — spawning your machine into another owner's session that already
+      // runs its own bridge. The web watches tpacct:<session-owner>, so a
+      // participant's bridge is duplication the UI never even looks at.
+      const { data } = await sb.from('code_sessions').select('code,name,last_active_at,owner_id').eq('owner_id', session.user.id).order('last_active_at', { ascending: false }).limit(20)
       rooms = data || []
     } catch { /* transient — keep existing children, retry next tick */ }
     const dirs = loadDirs()
     for (const r of rooms) {
       const room = r.code
       if (!room || children.has(room)) continue
+      if (r.owner_id && r.owner_id !== session.user.id) continue   // never serve a room we don't own (defense-in-depth behind the .eq above)
       const dir = dirs[room] || DEFAULT_DIR   // auto-serve unbound sessions in the launch dir
       if (!fs.existsSync(dir)) {
         if (!warned.has(room)) { warned.add(room); process.stderr.write(`\n  ◇ ${room}: bound directory is gone (${dir}) — re-bind it.\n`) }

package/bridge.mjs

@@ -164,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 } = await import('./launcher.mjs')
+  const { runLauncher, detectState } = await import('./launcher.mjs')
   const svc = await import('./service.mjs')
   const BRIDGE = fileURLToPath(import.meta.url)
   const io = {
@@ -186,9 +186,18 @@ 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) },
-    setProvider: async ({ kind, base, token }) => { const { runProvider } = await import('./provider.mjs'); await runProvider(kind === 'custom' ? ['custom', '--base', base, '--token', token] : ['anthropic']); process.exit(0) },
+    // 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)
+    },
   }
-  await runLauncher({ actions, io })
+  await runLauncher({ actions, io, refresh: detectState })
   process.exit(0)
 }
 

package/launcher.mjs

@@ -51,10 +51,14 @@ 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: provider?.kind === 'custom' ? `Custom (${provider.base || 'endpoint'})` : 'Anthropic (default)',
+    provider: isCustom ? `Custom (${provider.baseUrl || 'endpoint'})` : 'Anthropic (default)',
+    providerModel: isCustom ? (provider.model || null) : null,
     agents: KNOWN_AGENTS.filter(a => onPath(a.cmd)),
     accountSvc: fs.existsSync(serviceFile(null)),
     cwd: process.cwd(),
@@ -68,7 +72,11 @@ const C = {
 }
 
 // io: { ask(prompt)->Promise<string>, print(s) }. actions: real | dry-run | mock.
-export async function runLauncher({ actions, io, state = detectState() }) {
+// 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() }
   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('▸')} `)
@@ -137,25 +145,41 @@ export async function runLauncher({ actions, io, state = detectState() }) {
     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 () => {
-    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' })
+    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 }
       else {
-        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 })
+        if (state.accountSvc) await actions.uninstallService({ room: null })
+        else io.print('  ' + C.yellow('no background service installed'))
       }
-    } 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.40",
+  "version": "0.7.41",
   "description": "Share a local coding-agent CLI (Claude Code, Codex, Gemini, Aider, …) into a ThinkPool Code room, live.",
   "type": "module",
   "bin": {