thinkpool-pair 0.7.191 → 0.7.193

package/bridge.mjs

@@ -32,7 +32,7 @@ import os from 'node:os'
 import fs from 'node:fs'
 import path from 'node:path'
 import readline from 'node:readline'
-import { spawn, execSync, execFileSync } from 'node:child_process'
+import { spawn, execFileSync } from 'node:child_process'
 import { fileURLToPath } from 'node:url'
 import { createRequire } from 'node:module'
 import { randomUUID } from 'node:crypto'
@@ -50,7 +50,7 @@ import { validateProviderSwitch, providerSwitchPlan, BUILTIN_PROVIDER } from './
 import { createSdkMcpServer, tool } from '@anthropic-ai/claude-agent-sdk'
 import { z } from 'zod'
 import { startClaudeSession } from './claude-session.mjs'
-import { startCodexSession, readCodexDefaultModel } from './codex-session.mjs'
+import { startCodexSession, readCodexDefaultModel, readCodexModels } from './codex-session.mjs'
 import { FLOW_CONDUCTOR_PROMPT, FLOW_LANE_PROMPT, buildConductorEnv, assembleCrossWaveContext, buildLanePrompt } from './flow-conductor.mjs'
 import { normalizePlanOutput, laneModelFor } from './flow-task-graph.mjs'   // FL-B1 — validate the conductor's submit_flow_plan task-graph; laneModelFor — per-slice model tier (2026-07-03-flow-lane-model-tiers)
 // S1 (context-offload) — durable digest store. mark_flow_done digests a closed slice in;
@@ -232,8 +232,9 @@ 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)
-  process.exit(0)
+  const svc = await import('./service.mjs')
+  const ok = argv.includes('--current') ? svc.restartService(svcRoom) : svc.updateService(svcRoom)
+  process.exit(ok ? 0 : 1)
 }
 
 // Account mode (Phase 1, docs/specs/2026-06-16-account-bridge.md): one bridge per
@@ -270,7 +271,6 @@ 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 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'),
@@ -294,28 +294,8 @@ if ((!argv[0] || argv[0] === 'setup') && process.stdin.isTTY) {
     installService: ({ room = null, agentCmd } = {}) => { svc.installService(room, agentCmd ? [agentCmd] : []) },
     uninstallService: ({ room = null } = {}) => { svc.uninstallService(room) },
     restartService: ({ room = null } = {}) => { svc.restartService(room) },
-    // "Restart & update the bridge" — resolve the NEWEST PUBLISHED version from npm and
-    // re-pin the OS service to it (stale-proof: the rewritten launch wipes the npx cache
-    // each start so it can't re-serve an old build). We must NOT trust PKG_VERSION here:
-    // npx can run a STALE cached launcher, so this very menu may be an old version — that's
-    // the bug that left the bridge stuck on 0.7.75. `npm view` hits the registry live, so it
-    // updates correctly even from a stale launcher. Pinned to the resolved number — no auto-roll.
-    restartUpdateService: ({ room = null } = {}) => {
-      let target = null
-      try { target = execSync('npm view thinkpool-pair version', { encoding: 'utf8', stdio: ['ignore', 'pipe', 'ignore'] }).trim() } catch { /* offline / no npm */ }
-      if (!/^\d+\.\d+\.\d+/.test(target || '')) {
-        // Can't reach npm to learn the newest version — DON'T silently re-pin this
-        // launcher's PKG_VERSION (npx may have run a stale cached launcher, so it could
-        // be OLDER than what's installed). Just RESTART the current pinned service (no
-        // version change) and say so honestly — never call a same-version restart an
-        // "update".
-        process.stderr.write(`\n  ⚠ couldn't reach npm to check for a newer version — restarting the current version, NO update applied. Try again when online.\n`)
-        svc.restartService(room)
-        return
-      }
-      process.stderr.write(`\n  ◆ updating the background service to v${target} (newest published) and restarting…\n`)
-      svc.installService(room, [], { version: target, staleProof: true })   // rewrites plist/unit at resolved version + reloads = update + restart
-    },
+    // Menu and CLI share the same registry-resolve → repin → reload implementation.
+    restartUpdateService: ({ room = null } = {}) => { svc.updateService(room) },
     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
@@ -1070,7 +1050,7 @@ const announce = () => {
       // turnActive). Authoritative — the bridge owns the turn — so the /code
       // dashboard reads "N agents working" off the roster instead of sniffing
       // the live code-event stream (which a passive dashboard channel misses).
-      ...[...sessions.entries()].map(([id, s]) => ({ id, cmd: s.cmd, kind: 'structured', runtime: s.runtime || 'claude', alive: true, busy: s.session?.turnActive ?? false, commands: s.commands, mode: s.mode || undefined, name: termNames[id] || undefined, model: s.model || undefined, ...(s.archiveOldestSeq != null ? { oldestSeq: s.archiveOldestSeq } : {}), ...(s.spawnedBy ? { spawned: true, spawnedBy: s.spawnedBy } : {}), ...(s.flowSessionId ? { flowId: s.flowSessionId, flowRole: s.flowTaskKey ? 'lane' : 'conductor' } : {}),
+      ...[...sessions.entries()].map(([id, s]) => ({ id, cmd: s.cmd, kind: 'structured', runtime: s.runtime || 'claude', alive: true, busy: s.session?.turnActive ?? false, commands: s.commands, mode: s.mode || undefined, name: termNames[id] || undefined, model: s.model || undefined, ...(s.runtime === 'codex' ? { approvalPolicy: 'never', models: s.models || [] } : {}), ...(s.archiveOldestSeq != null ? { oldestSeq: s.archiveOldestSeq } : {}), ...(s.spawnedBy ? { spawned: true, spawnedBy: s.spawnedBy } : {}), ...(s.flowSessionId ? { flowId: s.flowSessionId, flowRole: s.flowTaskKey ? 'lane' : 'conductor' } : {}),
         // provider: the registered LLM-provider this lane runs on, NAME-ONLY {id,name}
         // (NEVER the key or baseUrl). Additive; older clients ignore it. Omitted for the
         // built-in/default Claude path (no badge). Makes the lane's provider badge +
@@ -1580,7 +1560,7 @@ function openStructured({ id, runtime = 'claude', model, resume, log, commands,
   // spawnedBy: set when this lane was Dispatched (spawn_terminal). Restored from the
   // session store so the Ensemble flag survives a bridge restart (else a respin
   // stripped it and the lane reverted to a plain tab — the t6 "no chip" bug).
-  const entry = { cmd: runtime, runtime, kind: 'structured', log: Array.isArray(log) ? log.slice(-STRUCTURED_LOG_MAX) : [], pending: new Map(), session: null, recovered: false, commands: Array.isArray(commands) ? commands : undefined, mode,
+  const entry = { cmd: runtime, runtime, kind: 'structured', log: Array.isArray(log) ? log.slice(-STRUCTURED_LOG_MAX) : [], pending: new Map(), session: null, recovered: false, commands: Array.isArray(commands) ? commands : undefined, mode, models: runtime === 'codex' ? readCodexModels() : undefined,
     // model: truthful active-model label — now the SAME `laneModel` the SDK is given, so the
     // chip cannot disagree with the wire. When this lane runs on a custom (non-anthropic)
     // registered provider the SDK id is impersonated (see the onEvent guard below), so

package/codex-session.mjs

@@ -43,6 +43,16 @@ export function readCodexDefaultModel({ home = process.env.CODEX_HOME || path.jo
   } catch { return null }
 }
 
+export function readCodexModels({ home = process.env.CODEX_HOME || path.join(os.homedir(), '.codex'), fsImpl = fs } = {}) {
+  try {
+    const data = JSON.parse(fsImpl.readFileSync(path.join(home, 'models_cache.json'), 'utf8'))
+    return (Array.isArray(data?.models) ? data.models : [])
+      .filter((m) => m?.slug && m.visibility !== 'hide')
+      .sort((a, b) => (Number(a.priority) || 999) - (Number(b.priority) || 999))
+      .map((m) => ({ value: m.slug, displayName: m.display_name || m.slug, description: m.description || '' }))
+  } catch { return [] }
+}
+
 export function normalizeCodexSandbox(value) {
   return SAFE_SANDBOXES.has(value) ? value : DEFAULT_SANDBOX
 }
@@ -97,8 +107,6 @@ export function startCodexSession({ cwd, model, resume, env, sandbox = DEFAULT_S
 
   const mapper = new CodexEventMapper({ onEvent, model: model || null })
 
-  const note = (text) => { try { onEvent?.({ kind: 'note', text }) } catch { /* noop */ } }
-
   function runExec(prompt) {
     // First turn: fresh exec. Later turns: resume THIS lane's captured thread.
     // `--last` is process-global and can cross-wire two concurrently-active Codex
@@ -123,19 +131,12 @@ export function startCodexSession({ cwd, model, resume, env, sandbox = DEFAULT_S
       child = spawn('codex', args, opts)
       if (stdinFd != null) { try { fs.closeSync(stdinFd) } catch { /* child owns its duplicated fd */ } }
 
-      // G1 mitigation: while codex composes (before the first item event), show life.
-      let sawFirst = false
-      const composingTimer = setTimeout(() => {
-        if (!sawFirst) note('codex composing…')
-      }, 1200)
-
       const rl = readline.createInterface({ input: child.stdout, crlfDelay: Infinity })
       rl.on('line', (line) => {
         if (!line.trim()) return
         let ev
         try { ev = JSON.parse(line) } catch { return /* non-JSON progress line */
         }
-        if (!sawFirst && ev.type && ev.type.startsWith('item')) sawFirst = true
         if (ev.type === 'thread.started' && ev.thread_id) sessionId = sessionId || ev.thread_id
         if (ev.type === 'turn.completed' || ev.type === 'turn.failed') sawTerminalResult = true
         mapper.push(ev)
@@ -149,7 +150,6 @@ export function startCodexSession({ cwd, model, resume, env, sandbox = DEFAULT_S
       const finish = (code) => {
         if (settled) return
         settled = true
-        clearTimeout(composingTimer)
         child = null
         turnActive = false
         if (aborted && !sawTerminalResult) {
@@ -162,7 +162,6 @@ export function startCodexSession({ cwd, model, resume, env, sandbox = DEFAULT_S
       child.on('error', (e) => {
         if (settled) return
         settled = true
-        clearTimeout(composingTimer)
         try { onEvent?.({ kind: 'error', message: `codex failed to start: ${e.message}`, recoverable: true }) } catch { /* noop */ }
         child = null
         turnActive = false

package/package.json

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

package/service.mjs

@@ -43,7 +43,12 @@ const shq = (s) => `'${String(s).replace(/'/g, `'\\''`)}'`
 // which is what left Max's account bridge stuck on 0.7.75 while @latest was 0.7.78.
 // `home` is the platform-correct, runtime-expanded home token ("$HOME" on darwin under
 // /bin/bash; "$$HOME" inside a systemd unit so systemd emits a literal $HOME to bash).
-const cacheWipe = (home) => `rm -rf ${home}/.npm/_npx/*/node_modules/thinkpool-pair 2>/dev/null`
+// npx caches the temporary execution project as a unit. Removing only the package can
+// leave its generated .bin/package-lock metadata behind, producing the contradictory
+// state where `npm view` sees a version but `npx` reports ETARGET or no executable.
+// The whole _npx directory is disposable; clear its children so the next launch is a
+// genuinely clean install.
+const cacheWipe = (home) => `rm -rf ${home}/.npm/_npx/* 2>/dev/null`
 
 // The version installing the service. By DEFAULT the service is pinned to this exact
 // version (not @latest) so a future bad npm publish can't auto-roll to every machine's
@@ -83,7 +88,7 @@ export function buildArtifact(platform, { room = null, cmdArgs = [], autoUpdate
   // 0.7.87). `--prefer-online` forces npx to REVALIDATE the packument against the
   // registry every resolve, so `@latest` always means the true latest. Only needed for
   // the @latest (autoUpdate) tier — a pinned exact version is immutable, no staleness.
-  const onlineFlag = autoUpdate ? ['--prefer-online'] : []
+  const onlineFlag = (autoUpdate || staleProof) ? ['--prefer-online'] : []
   const pkgArgs = room ? ['-y', ...onlineFlag, verSpec, room] : ['-y', ...onlineFlag, verSpec]
   // In-process self-update (account.mjs / bridge.mjs) is gated on this env — only on when
   // the user explicitly opted into auto-update.
@@ -353,6 +358,28 @@ export function restartService(room) {
   }
 }
 
+// One authoritative update path for both the interactive menu and `restart-service`.
+// Resolve the registry version first, then rewrite + reload the service pinned to that
+// exact build. If npm is unavailable, fail without pretending an old-version restart
+// was an update.
+export function updateService(room, { exec = execSync, install = installService, active = isServiceInstalled } = {}) {
+  if (!active(room)) {
+    process.stderr.write('  ⚠ no background service installed to update — install one first.\n')
+    return false
+  }
+  let target = ''
+  try {
+    target = String(exec('npm view thinkpool-pair version', { encoding: 'utf8', stdio: ['ignore', 'pipe', 'ignore'] })).trim()
+  } catch { /* reported below */ }
+  if (!/^\d+\.\d+\.\d+(?:[-+][0-9A-Za-z.-]+)?$/.test(target)) {
+    process.stderr.write("  ⚠ couldn't reach npm or resolve the published version — bridge left unchanged; NO update or restart was applied.\n")
+    return false
+  }
+  process.stderr.write(`\n  ◆ updating the background service to v${target} and restarting…\n`)
+  install(room, [], { version: target, staleProof: true })
+  return true
+}
+
 // Ground truth: is the OS service manager ACTUALLY running our service right now?
 // A leftover plist/unit on disk does NOT mean it's loaded — `launchctl load` can
 // silently no-op (the 2026-06-26 "says installed but it's off" bug), and a unit can