thinkpool-pair 0.7.58 → 0.7.59

package/bridge.mjs

@@ -149,7 +149,14 @@ if (argv[0] === 'install-service' || argv[0] === 'uninstall-service') {
   const autoUpdate = argv.includes('--auto-update')
   const svc = await import('./service.mjs')
   if (argv[0] === 'install-service') svc.installService(svcRoom, svcCmd, { autoUpdate })
-  else svc.uninstallService(svcRoom)
+  else {
+    // Account scope (room=null) may be the cmux-hosted tier (cmux-service.json) —
+    // that's torn down via cmux, not launchctl/systemctl. Room scope is always OS.
+    const cmux = await import('./cmux.mjs')
+    if (svcRoom === null && cmux.isCmuxServiceInstalled()) {
+      cmux.uninstallCmuxService(); process.stderr.write('  ◆ removed the cmux-hosted account service.\n')
+    } else svc.uninstallService(svcRoom)
+  }
   process.exit(0)
 }
 
@@ -158,8 +165,10 @@ if (argv[0] === 'install-service' || argv[0] === 'uninstall-service') {
 if (argv[0] === 'restart-service') {
   const arg1 = argv[1] || ''
   const svcRoom = (!arg1 || arg1.startsWith('-')) ? null : arg1.toUpperCase().trim()
-  const svc = await import('./service.mjs')
-  svc.restartService(svcRoom)
+  const cmux = await import('./cmux.mjs')
+  if (svcRoom === null && cmux.isCmuxServiceInstalled()) {
+    cmux.restartCmuxService(); process.stderr.write('  ◆ restarted the cmux-hosted account service — sessions resume in place.\n')
+  } else { const svc = await import('./service.mjs'); svc.restartService(svcRoom) }
   process.exit(0)
 }
 
@@ -180,6 +189,62 @@ if (argv[0] === 'login') { const { runLogin } = await import('./account.mjs'); a
 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) }
 
+// Explicit account-serve entrypoint — used by the cmux-hosted service tier (cmux.mjs).
+// A cmux surface HAS a TTY, so a bare invocation would open the interactive launcher
+// instead of serving; `serve` runs account mode directly, regardless of TTY. With
+// `--supervise` it first wraps itself in a crash-restart loop (re-execing `serve`
+// without the flag): cmux, unlike launchd KeepAlive, will not relaunch a surface
+// whose command exits, so the account supervisor must restart itself.
+if (argv[0] === 'serve') {
+  if (argv.includes('--supervise') || argv.includes('--keep-alive')) {
+    const childArgs = process.argv.slice(1).filter((a) => a !== '--supervise' && a !== '--keep-alive')
+    let backoff = 1000, stopping = false, child = null
+    const spawnChild = () => {
+      const t0 = Date.now()
+      child = spawn(process.execPath, childArgs, { stdio: 'inherit' })
+      child.on('exit', (code, signal) => {
+        if (stopping || code === 0) process.exit(code || 0)
+        const ranLong = Date.now() - t0 > 60000
+        const wait = ranLong ? 1000 : backoff
+        backoff = ranLong ? 1000 : Math.min(backoff * 2, 30000)
+        process.stderr.write(`\n  ⚠ account supervisor exited (${signal || `code ${code}`}); restarting in ${Math.round(wait / 1000)}s…\n`)
+        setTimeout(spawnChild, wait)
+      })
+      child.on('error', () => { /* spawn failure → exit handler retries */ })
+    }
+    for (const sig of ['SIGINT', 'SIGTERM']) process.on(sig, () => { stopping = true; try { child?.kill(sig) } catch { /* noop */ } setTimeout(() => process.exit(0), 400) })
+    process.stderr.write('\n  ◆ supervisor up — keeping the account bridge alive (auto-restart on crash).\n')
+    spawnChild()
+    await new Promise(() => {})   // block forever; the child IS the account supervisor
+  }
+  const { runAccount } = await import('./account.mjs')
+  await runAccount(SUPABASE_URL, SUPABASE_ANON)
+  process.exit(0)
+}
+
+// `npx thinkpool-pair cmux-doctor` — explain why the cmux service tier did/didn't engage.
+// Detection is env-based (CMUX_WORKSPACE_ID/SURFACE_ID); the socket is only needed for the
+// actual surface spawn. This prints both so a "it didn't detect cmux" report is one command.
+if (argv[0] === 'cmux-doctor') {
+  const cmux = await import('./cmux.mjs')
+  const env = process.env
+  const w = (s) => process.stderr.write(s + '\n')
+  const reachable = cmux.cmuxReachable()
+  w('\n  thinkpool-pair · cmux doctor')
+  w(`    CMUX_WORKSPACE_ID : ${env.CMUX_WORKSPACE_ID || '(unset)'}`)
+  w(`    CMUX_SURFACE_ID   : ${env.CMUX_SURFACE_ID || '(unset)'}`)
+  w(`    CMUX_SOCKET_PATH  : ${env.CMUX_SOCKET_PATH || '(unset)'}`)
+  w(`    cmux on PATH      : ${onPath('cmux')}`)
+  w(`    inCmux()          : ${cmux.inCmux()}`)
+  w(`    cmux ping         : ${reachable ? 'ok' : 'FAILED (socket unreachable)'}`)
+  w(`    detectCmux()      : ${cmux.detectCmux()}   ${cmux.detectCmux() ? '→ cmux-surface offered' : '→ falls back to OS service'}`)
+  w(`    cmux service set  : ${cmux.isCmuxServiceInstalled()}`)
+  if (!cmux.inCmux()) w('\n  ⚠ not launched from cmux (no CMUX_WORKSPACE_ID/SURFACE_ID). Run this INSIDE a cmux\n    terminal surface — a plain Terminal/iTerm window will not be detected.')
+  else if (!reachable) w('\n  ⚠ in cmux, but the automation socket is unreachable. detectCmux() is env-based so\n    the surface is still offered, but the actual spawn needs the socket — if install\n    falls back to the OS service, enable cmux automation/socket access in cmux settings.')
+  else w('\n  ✓ cmux detected and drivable — the cmux-surface service tier is available.')
+  process.exit(0)
+}
+
 // One-command launcher: a bare invocation on a TTY (or the `setup` alias) opens the
 // interactive menu instead of going straight to account mode. The menu only ASSEMBLES
 // existing commands — it re-execs `<ROOM>`, or calls installService / runLogin /
@@ -189,6 +254,8 @@ if (argv[0] === 'provider') { const { runProvider } = await import('./provider.m
 if ((!argv[0] || argv[0] === 'setup') && process.stdin.isTTY) {
   const { runLauncher, detectState } = await import('./launcher.mjs')
   const svc = await import('./service.mjs')
+  const cmux = await import('./cmux.mjs')
+  const PKG_VERSION = (() => { try { return JSON.parse(fs.readFileSync(new URL('./package.json', import.meta.url), 'utf8')).version } catch { return 'latest' } })()
   const BRIDGE = fileURLToPath(import.meta.url)
   const io = {
     print: (s) => process.stderr.write(s + '\n'),
@@ -210,8 +277,40 @@ if ((!argv[0] || argv[0] === 'setup') && process.stdin.isTTY) {
     // notes, and RETURN so the launcher loop drops you back at the menu (the service
     // runs in its own launchd/systemd process; this launcher isn't itself a bridge).
     installService: ({ room = null, agentCmd } = {}) => { svc.installService(room, agentCmd ? [agentCmd] : []) },
-    uninstallService: ({ room = null } = {}) => { svc.uninstallService(room) },
-    restartService: ({ room = null } = {}) => { svc.restartService(room) },
+    uninstallService: ({ room = null } = {}) => {
+      if (room === null && cmux.isCmuxServiceInstalled()) { cmux.uninstallCmuxService(); process.stderr.write('\n  ◆ removed the cmux-hosted account service.\n') }
+      else svc.uninstallService(room)
+    },
+    restartService: ({ room = null } = {}) => {
+      if (room === null && cmux.isCmuxServiceInstalled()) { cmux.restartCmuxService(); process.stderr.write('\n  ◆ restarted the cmux-hosted account service — sessions resume in place.\n') }
+      else svc.restartService(room)
+    },
+    // "Restart & update the bridge" — re-pin the service to THIS launcher's version
+    // (you launched via @latest, so it's the newest publish) and restart. The cmux
+    // surface re-pins + respawns; the OS service is reinstalled (rewrites the plist/unit
+    // to the new version and reloads). Pinned throughout — no auto-roll.
+    restartUpdateService: ({ room = null } = {}) => {
+      if (room === null && cmux.isCmuxServiceInstalled()) {
+        cmux.restartCmuxService({ version: PKG_VERSION })
+        process.stderr.write(`\n  ◆ updated the cmux account service to v${PKG_VERSION} and restarted it — sessions resume in place.\n`)
+      } else {
+        process.stderr.write(`\n  ◆ updating the background service to v${PKG_VERSION} and restarting…\n`)
+        svc.installService(room, [])   // rewrites the plist/unit at this version + reloads = update + restart
+      }
+    },
+    // Account service hosted as a cmux surface — offered only inside cmux, with its
+    // weaker-persistence caveat shown first (launcher.mjs serveAccount). Falls back to
+    // the OS service if the cmux socket can't actually be driven (detection is env-based).
+    detectCmux: () => cmux.detectCmux(),
+    installAccountCmux: () => {
+      try {
+        const rec = cmux.installCmuxService({ version: PKG_VERSION })
+        process.stderr.write(`\n  ◆ account service now runs as a cmux surface ("${cmux.WS_NAME}") — visible and killable.\n  ◆ it restarts itself on crash; stop it with:  npx thinkpool-pair uninstall-service\n  ◆ pinned to v${rec.version}.\n\n`)
+      } catch (e) {
+        process.stderr.write(`\n  ⚠ couldn't spawn a cmux surface (${e.message || e}). The cmux automation socket may be\n    disabled — run 'npx thinkpool-pair cmux-doctor' to check. Falling back to the system service.\n`)
+        svc.installService(null, [])
+      }
+    },
     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

package/cmux.mjs

@@ -0,0 +1,148 @@
+/* ─────────────────────────────────────────────────────────────
+   cmux.mjs — host the ACCOUNT service as a cmux surface instead of
+   a detached launchd/systemd daemon, when the bridge was launched
+   from inside cmux.
+
+   Why a separate tier: the OS service (service.mjs) is invisible —
+   it logs to a file and is supervised by launchd KeepAlive. Inside
+   cmux, the user would rather see the service running in a normal
+   surface they can watch and kill, alongside everything else. cmux,
+   unlike launchd, does NOT relaunch a surface whose command exits,
+   so the surface runs `serve --supervise` (bridge.mjs) which restarts
+   the account supervisor itself on crash.
+
+   Detection is deliberately strict: being on $PATH is NOT proof cmux
+   spawned us (claude-session.mjs makes the same distinction). Only the
+   CMUX_WORKSPACE_ID / CMUX_SURFACE_ID env vars — which cmux injects
+   into every surface it creates — prove it, and we additionally confirm
+   the socket actually answers before committing to this tier. If either
+   check fails the caller falls back to the OS service.
+
+   Persistence trade-off (flagged to the user in launcher.mjs before
+   install): up while cmux runs · crash-restart via --supervise ·
+   best-effort return on cmux session-restore · does NOT survive
+   logout/reboot unless cmux launches at login.
+
+   Spec: docs/specs/2026-06-23-cmux-hosted-account-service.md
+   ───────────────────────────────────────────────────────────── */
+
+import os from 'node:os'
+import fs from 'node:fs'
+import path from 'node:path'
+import { execFileSync } from 'node:child_process'
+
+const HOME = os.homedir()
+const CFG_DIR = path.join(HOME, '.thinkpool-pair')
+// One stable record per machine → exactly one cmux-hosted account service.
+export const RECORD = path.join(CFG_DIR, 'cmux-service.json')
+export const WS_NAME = 'thinkpool-pair service'
+
+// Run a cmux CLI command; return trimmed stdout, or throw. Isolated so the rest
+// of the module (and its tests) can run without the socket by injecting `run`.
+function cmux(args, { timeout = 6000 } = {}) {
+  return execFileSync('cmux', args, { encoding: 'utf8', timeout, stdio: ['ignore', 'pipe', 'ignore'] }).trim()
+}
+
+// cmux injects these into every surface it spawns. PATH containing a cmux shim is
+// NOT enough — only the env proves cmux launched this shell.
+export function inCmux(env = process.env) {
+  return !!(env.CMUX_WORKSPACE_ID || env.CMUX_SURFACE_ID)
+}
+
+// Can we actually drive cmux right now? (socket answers a ping.) Returns false on
+// any failure — a broken/absent socket means we cannot host a surface, so fall back.
+export function cmuxReachable(run = cmux) {
+  try { run(['ping'], { timeout: 4000 }); return true } catch { return false }
+}
+
+// Detection keys ONLY on the env cmux injects into every surface it spawns — NOT on
+// whether the socket answers. The socket ping proved flaky (it needs CMUX_SOCKET_PASSWORD
+// and can broken-pipe even from a real surface), and gating detection on it silently
+// killed the cmux offer in 0.7.57. If the env says cmux we offer the cmux tier; if the
+// actual new-workspace spawn then can't reach the socket, installCmuxService throws and
+// the caller falls back to the OS service. (cmuxReachable stays exported for cmux-doctor.)
+export function detectCmux(env = process.env) {
+  return inCmux(env)
+}
+
+export function readRecord(recordFile = RECORD) {
+  try { return JSON.parse(fs.readFileSync(recordFile, 'utf8')) } catch { return null }
+}
+
+export function isCmuxServiceInstalled(recordFile = RECORD) {
+  return !!readRecord(recordFile)
+}
+
+// The command the cmux surface runs. PINNED to the installing version (same safety
+// default as service.mjs — a bad publish can't auto-roll to the always-on bridge).
+// `serve` runs account mode regardless of TTY (a cmux surface has a TTY, so a bare
+// invocation would open the interactive launcher instead). `--supervise` restarts
+// the account supervisor on crash, since cmux won't re-run a dead surface.
+export function serviceCommand(version) {
+  return `npx -y thinkpool-pair@${version || 'latest'} serve --supervise`
+}
+
+// Pull a stable handle out of cmux output. Prefer a UUID (stable across reorders);
+// fall back to a positional `workspace:N` ref; null if neither is present.
+export function parseWorkspaceRef(out) {
+  const uuid = (String(out).match(/[0-9a-f]{8}-[0-9a-f]{4}-[0-9a-f]{4}-[0-9a-f]{4}-[0-9a-f]{12}/i) || [])[0]
+  if (uuid) return uuid
+  const ref = (String(out).match(/workspace:\d+/) || [])[0]
+  return ref || null
+}
+
+// Best-effort: find the service workspace by its name when we have no stored ref
+// (e.g. the record predates ref capture, or parsing failed at install time).
+function resolveByName(run, name = WS_NAME) {
+  try {
+    const out = run(['--id-format', 'uuids', 'list-workspaces'])
+    const line = String(out).split('\n').find((l) => l.includes(name))
+    return line ? parseWorkspaceRef(line) : null
+  } catch { return null }
+}
+
+function spawnSurface(run, command, cwd = HOME) {
+  // --focus false: never steal focus from the user's current surface.
+  const out = run(['--id-format', 'uuids', 'new-workspace', '--name', WS_NAME, '--cwd', cwd, '--command', command, '--focus', 'false'])
+  return parseWorkspaceRef(out)
+}
+
+function closeSurface(run, rec) {
+  const ref = rec.workspace || resolveByName(run)
+  if (!ref) return
+  try { run(['close-workspace', '--workspace', ref]) } catch { /* may already be gone */ }
+}
+
+export function installCmuxService({ version, cwd = HOME, run = cmux, recordFile = RECORD } = {}) {
+  const command = serviceCommand(version)
+  const workspace = spawnSurface(run, command, cwd)
+  const rec = { kind: 'cmux', version: version || 'latest', name: WS_NAME, command, workspace, installedAt: new Date().toISOString() }
+  fs.mkdirSync(path.dirname(recordFile), { recursive: true })
+  fs.writeFileSync(recordFile, JSON.stringify(rec, null, 2))
+  return rec
+}
+
+// Restart = close the surface + spawn a fresh one. The account supervisor restores
+// every active session from disk (session-store crash-resume), so sessions resume
+// in place — same contract as an OS-service restart. Passing `version` re-pins the
+// surface command to that version first (the "Restart & update the bridge" path):
+// the command stays PINNED (never @latest — no auto-roll), just bumped to the version
+// the user explicitly launched.
+export function restartCmuxService({ run = cmux, recordFile = RECORD, version } = {}) {
+  const rec = readRecord(recordFile)
+  if (!rec) return false
+  closeSurface(run, rec)
+  if (version) { rec.version = version; rec.command = serviceCommand(version) }
+  rec.workspace = spawnSurface(run, rec.command)
+  rec.installedAt = new Date().toISOString()
+  fs.writeFileSync(recordFile, JSON.stringify(rec, null, 2))
+  return true
+}
+
+export function uninstallCmuxService({ run = cmux, recordFile = RECORD } = {}) {
+  const rec = readRecord(recordFile)
+  if (!rec) return false
+  closeSurface(run, rec)
+  try { fs.rmSync(recordFile, { force: true }) } catch { /* noop */ }
+  return true
+}

package/launcher.mjs

@@ -13,6 +13,7 @@
 import os from 'node:os'
 import fs from 'node:fs'
 import path from 'node:path'
+import { isCmuxServiceInstalled } from './cmux.mjs'
 
 const HOME = os.homedir()
 const CFG_DIR = path.join(HOME, '.thinkpool-pair')
@@ -60,7 +61,11 @@ export function detectState() {
     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)),
+    accountSvc: fs.existsSync(serviceFile(null)) || isCmuxServiceInstalled(),
+    // Which tier hosts the account service, so the menu can label it honestly.
+    // Cheap, read-only (file existence) — no cmux socket call here; the live
+    // cmux detection (which pings) happens in serveAccount at install time.
+    accountSvcKind: isCmuxServiceInstalled() ? 'cmux' : (fs.existsSync(serviceFile(null)) ? 'os' : null),
     cwd: process.cwd(),
   }
 }
@@ -95,7 +100,7 @@ export async function runLauncher({ actions, io, state = detectState(), refresh
     io.print(`  ${C.dim('│ provider ')} ${state.provider}`)
     io.print(`  ${C.dim('│ agents   ')} ${state.agents.length ? state.agents.map(a => a.label).join(', ') : C.yellow('none on PATH')}`)
     io.print(`  ${C.dim('│ directory')} ${C.dim(state.cwd)}`)
-    io.print(`  ${C.dim('│ service  ')} ${state.accountSvc ? C.green('account service installed') : 'none'}`)
+    io.print(`  ${C.dim('│ service  ')} ${state.accountSvc ? C.green('account service installed' + (state.accountSvcKind === 'cmux' ? ' (cmux surface)' : state.accountSvcKind === 'os' ? ' (system service)' : '')) : 'none'}`)
     io.print('  ' + C.dim('└' + '─'.repeat(54)) + '\n')
   }
 
@@ -128,8 +133,21 @@ export async function runLauncher({ actions, io, state = detectState(), refresh
       { label: '← Back to main menu', hint: '' },
     ])
     if (how === 2) return
-    if (how === 0) { await actions.installService({ room: null }); resync() }
-    else await actions.serveAccountForeground()
+    if (how === 1) { await actions.serveAccountForeground(); return }
+    // how === 0 — always-on. Environment-aware: inside cmux, offer the cmux-hosted
+    // surface (visible + killable) — but flag its weaker persistence FIRST and let
+    // the user opt back into the durable OS service.
+    if (actions.detectCmux && actions.detectCmux()) {
+      io.print('\n  ' + C.cyan('Detected cmux') + ' — I can run the service as a cmux surface you can see and kill,')
+      io.print('  alongside your other terminals. Heads up — this is ' + C.yellow('less durable') + ' than the system service:')
+      io.print('    ' + C.dim('•') + ' stays up while cmux is running')
+      io.print('    ' + C.dim('•') + ' restarts itself on crash (--supervise)')
+      io.print('    ' + C.dim('•') + ' best-effort return via cmux session-restore')
+      io.print('    ' + C.dim('•') + ' ' + C.yellow('does NOT survive logout/reboot') + ' unless cmux launches at login')
+      const useCmux = await askYesNo('\n  Run it as a cmux surface? (n = always-on system service)', true)
+      if (useCmux) { await actions.installAccountCmux(); resync(); return }
+    }
+    await actions.installService({ room: null }); resync()
   }
 
   const serviceMenu = async () => {
@@ -174,7 +192,7 @@ export async function runLauncher({ actions, io, state = detectState(), refresh
       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: 'Restart the background service', hint: state.accountSvc ? 'bounce it now — sessions resume' : 'none installed' },
+        { label: 'Restart & update the bridge', hint: state.accountSvc ? 'pull the newest published version, then restart — sessions resume' : 'none installed' },
         { label: 'Remove the background service', hint: state.accountSvc ? '' : 'none installed' },
         { label: '← Back to main menu', hint: '' },
       ], 5)  // Enter = Back
@@ -182,7 +200,7 @@ export async function runLauncher({ actions, io, state = detectState(), refresh
       if (pick === 0) await providerMenu()
       else if (pick === 1) { await actions.login(); resync(); return }
       else if (pick === 2) {
-        if (state.accountSvc) { await actions.restartService({ room: null }); resync() }
+        if (state.accountSvc) { await actions.restartUpdateService({ room: null }); resync() }
         else io.print('  ' + C.yellow('no background service installed'))
       }
       else {
@@ -207,7 +225,7 @@ export async function runLauncher({ actions, io, state = detectState(), refresh
       { key: 'serve',   label: 'Serve all my sessions', hint: 'account mode — needs login' },
       { key: 'service', label: 'Always-on background service', hint: 'survives reboot, restarts on crash' },
     ]
-    if (state.accountSvc) items.push({ key: 'restart', label: 'Restart the background service', hint: 'bounce it now — sessions resume' })
+    if (state.accountSvc) items.push({ key: 'restart', label: 'Restart & update the bridge', hint: 'pull the newest version + restart — sessions resume' })
     items.push({ key: 'settings', label: 'Settings', hint: 'provider · account · restart · remove service' })
     items.push({ key: 'quit', label: 'Quit', hint: '' })
     const pick = items[await askChoice('choose', items)]
@@ -215,7 +233,7 @@ export async function runLauncher({ actions, io, state = detectState(), refresh
     if (pick.key === 'pair') await pairRoom()
     else if (pick.key === 'serve') await serveAccount()
     else if (pick.key === 'service') await serviceMenu()
-    else if (pick.key === 'restart') { await actions.restartService({ room: null }); resync() }
+    else if (pick.key === 'restart') { await actions.restartUpdateService({ room: null }); resync() }
     else if (pick.key === 'settings') await settingsMenu()
     await io.ask('\n  ' + C.dim('press Enter to return to the menu…'))
   }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "thinkpool-pair",
-  "version": "0.7.58",
+  "version": "0.7.59",
   "description": "Share a local coding-agent CLI (Claude Code, Codex, Gemini, Aider, …) into a ThinkPool Code room, live.",
   "type": "module",
   "bin": {
@@ -15,6 +15,7 @@
     "transcript-sanitize.mjs",
     "session-store.mjs",
     "service.mjs",
+    "cmux.mjs",
     "account.mjs",
     "auth-store.mjs",
     "provider.mjs",