thinkpool-pair 0.7.273 → 0.7.275

package/account.mjs

@@ -501,12 +501,11 @@ export async function runAccount(SUPABASE_URL, SUPABASE_ANON) {
   acct.on('broadcast', { event: 'restart' }, () => {
     restarting = true
     // The dashboard "Restart bridge" button ALSO updates to the newest published version
-    // (Max, 2026-07-03). If an OS service manages this bridge, spawn a DETACHED updater
-    // that re-pins the service to @latest and reloads it (install-service resolves the
-    // newest version → rewrites the plist/unit → bootout+bootstrap). Detached → its own
-    // session, so it SURVIVES this process being booted out (the reload kills us); it
-    // inherits our env, whose PATH carries nvm's bin, so npx/node resolve — a bare launchd
-    // PATH would NOT (the 2026-07-03 gotcha that made a manual updater silently no-op).
+    // (Max, 2026-07-03). Use service.mjs's authoritative registry → immutable runtime →
+    // one-shot reload transaction directly. Spawning `npx install-service` here used a
+    // disposable cache that legacy services could delete underneath the updater. The
+    // service primitive arms an independent launchd handoff before this process is booted
+    // out, so the reload survives us without a second package execution tree.
     // The reload IS the bounce; sessions resume from disk on the new version. Best-effort:
     // if there's no service or npm is unreachable, we fall through to the plain bounce, so
     // the button is never dead — and even a failed update degrades to today's behaviour.
@@ -525,8 +524,7 @@ export async function runAccount(SUPABASE_URL, SUPABASE_ANON) {
       try {
         const svc = await import('./service.mjs')
         if (svc.serviceActive(null)) {
-          spawn('npx', ['-y', 'thinkpool-pair@latest', 'install-service'], { detached: true, stdio: 'ignore', env: process.env }).unref()
-          updating = true
+          updating = svc.updateService(null) !== false
         }
       } catch { /* no service / spawn failed → plain bounce below */ }
       process.stderr.write(updating

package/codex-app-server.mjs

@@ -99,6 +99,8 @@ export class CodexAppServerClient {
     this.pending = new Map()
     this.turnWaiters = new Map()
     this.completedTurns = new Map()
+    this.mcpStartup = new Map()
+    this.mcpWaiters = new Map()
     this.closedError = null
     this.stderrTail = ''
   }
@@ -196,6 +198,25 @@ export class CodexAppServerClient {
         }
       }
     }
+    if (message.method === 'mcpServer/startupStatus/updated') {
+      const params = message.params || {}
+      const threadId = String(params.threadId || '')
+      const name = String(params.name || '')
+      if (threadId && name) {
+        const key = `${threadId}\0${name}`
+        this.mcpStartup.set(key, params)
+        const waiter = this.mcpWaiters.get(key)
+        if (waiter && params.status === 'ready') {
+          this.mcpWaiters.delete(key)
+          if (waiter.timer) clearTimeout(waiter.timer)
+          waiter.resolve(params)
+        } else if (waiter && (params.status === 'failed' || params.error || params.failureReason)) {
+          this.mcpWaiters.delete(key)
+          if (waiter.timer) clearTimeout(waiter.timer)
+          waiter.reject(new Error(`Codex MCP server ${name} failed to start: ${params.error || params.failureReason || params.status}`))
+        }
+      }
+    }
     try { this.onNotification?.(message.method, message.params || {}) } catch { /* consumer isolation */ }
   }
 
@@ -208,6 +229,12 @@ export class CodexAppServerClient {
     for (const { reject } of this.turnWaiters.values()) reject(this.closedError)
     this.turnWaiters.clear()
     this.completedTurns.clear()
+    for (const { reject, timer } of this.mcpWaiters.values()) {
+      if (timer) clearTimeout(timer)
+      reject(this.closedError)
+    }
+    this.mcpWaiters.clear()
+    this.mcpStartup.clear()
     try { this.onClose?.(this.closedError) } catch { /* consumer isolation */ }
   }
 
@@ -221,6 +248,32 @@ export class CodexAppServerClient {
     return id
   }
 
+  waitForMcpServer({ threadId, name, timeoutMs = this.threadTimeoutMs } = {}) {
+    const safeThreadId = String(threadId || '')
+    const safeName = String(name || '')
+    if (!safeThreadId || !safeName) return Promise.reject(new Error('Codex MCP readiness needs a thread id and server name'))
+    const key = `${safeThreadId}\0${safeName}`
+    const current = this.mcpStartup.get(key)
+    if (current?.status === 'ready') return Promise.resolve(current)
+    if (current && (current.status === 'failed' || current.error || current.failureReason)) {
+      return Promise.reject(new Error(`Codex MCP server ${safeName} failed to start: ${current.error || current.failureReason || current.status}`))
+    }
+    if (this.mcpWaiters.has(key)) return this.mcpWaiters.get(key).promise
+    let timer = null
+    let resolveWaiter
+    let rejectWaiter
+    const promise = new Promise((resolve, reject) => {
+      resolveWaiter = resolve
+      rejectWaiter = reject
+      if (timeoutMs > 0) timer = setTimeout(() => {
+        this.mcpWaiters.delete(key)
+        reject(new Error(`Codex MCP server ${safeName} did not become ready within ${timeoutMs}ms`))
+      }, timeoutMs)
+    })
+    this.mcpWaiters.set(key, { promise, resolve: resolveWaiter, reject: rejectWaiter, timer })
+    return promise
+  }
+
   async startTurn({ threadId, input, images, model, effort, approvalPolicy, collaborationMode } = {}) {
     const result = await this.request('turn/start', {
       threadId,

package/codex-session.mjs

@@ -352,7 +352,7 @@ function appServerItemForMapper(item) {
  * @param {string} [o.providerConfig] optional -c overrides / provider block (M2: from the provider registry)
  * @returns {{ sendTurn(text, options?), abort(), end(), readonly sessionId }}
  */
-export function startCodexSession({ cwd, model, effort: initialEffort = 'high', resume, env, sandbox, mode = 'default', onEvent, providerConfig, terminalRolePrompt, rolePrompt, roomContext, mcpServers, prepareCwd = null, requestPermission, appServerGate = codexAppServerGate, appServerFactory = createCodexAppServer, spawnImpl = spawn }) {
+export function startCodexSession({ cwd, model, effort: initialEffort = 'high', resume, env, sandbox, mode = 'default', onEvent, providerConfig, terminalRolePrompt, rolePrompt, roomContext, mcpServers, prepareCwd = null, requestPermission, appServerGate = codexAppServerGate, appServerFactory = createCodexAppServer, mcpHttpFactory = startCodexMcpHttp, spawnImpl = spawn }) {
   let activeMode = CODEX_MODE_CONFIG[mode] ? mode : 'default'
   let modeConfig = codexConfigForMode(activeMode)
   sandbox = normalizeCodexSandbox(sandbox || modeConfig.sandbox)
@@ -424,7 +424,7 @@ export function startCodexSession({ cwd, model, effort: initialEffort = 'high',
   async function ensureMcpHttp() {
     const thinkpool = mcpServers?.thinkpool
     if (!thinkpool) return null
-    if (!mcpHttpPromise) mcpHttpPromise = startCodexMcpHttp({ sdkServer: thinkpool })
+    if (!mcpHttpPromise) mcpHttpPromise = mcpHttpFactory({ sdkServer: thinkpool })
     return mcpHttpPromise
   }
 
@@ -526,6 +526,12 @@ export function startCodexSession({ cwd, model, effort: initialEffort = 'high',
         // independent ThinkPool sandbox / approval posture above.
         config: { 'features.default_mode_request_user_input': true },
       })
+      // App Server reports thread/start before its per-thread MCP clients finish
+      // initializing. Starting the first turn in that gap snapshots a toolset
+      // without ThinkPool even though the server becomes ready milliseconds later.
+      // Hold the turn boundary until the room MCP is actually ready; a timeout or
+      // startup failure drops into the required-MCP codex exec fallback below.
+      if (peer?.url) await appServer.waitForMcpServer({ threadId: sessionId, name: 'thinkpool' })
       appServerThreadReady = true
       pushMappedEvent({ type: 'thread.started', thread_id: sessionId })
       return true

package/package.json

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

package/service.mjs

@@ -46,16 +46,12 @@ export function darwinServiceRunning(output) {
   const text = String(output || '')
   return /(^|\n)[ \t]*state = running[ \t]*($|\n)/.test(text) && /(^|\n)[ \t]*pid = \d+[ \t]*($|\n)/.test(text)
 }
-// Legacy auto-update services still use npx. Wipe its disposable execution project
-// before resolving the package so an @latest restart cannot re-serve a stale cache.
-// `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).
-// 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`
+// Legacy auto-update services still use npx. They MUST use a bridge-owned cache:
+// deleting ~/.npm/_npx corrupts unrelated interactive `npx thinkpool-pair` processes
+// (0.7.274 removed account.mjs underneath a live launcher). The service cache is
+// disposable and isolated, so clearing it cannot mutate a person's npm execution tree.
+const serviceNpmCache = () => path.join(os.homedir(), '.thinkpool-pair', 'npm-cache')
+const cacheWipe = (cacheRoot) => `rm -rf ${shq(path.join(cacheRoot, '_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
@@ -130,6 +126,7 @@ export function buildArtifact(platform, { room = null, cmdArgs = [], autoUpdate
   const logDir = path.join(os.homedir(), '.thinkpool-pair')
   const log = path.join(logDir, `${id}.log`)
   const servicePath = sanitizeServicePath(process.env.PATH || '', platform)
+  const npmCache = serviceNpmCache()
   const tail = cmdArgs.length ? ['--', ...cmdArgs] : []
   const desc = room ? `bridge (${room})` : 'account bridge'
   // OS-supervised tiers (launchd KeepAlive / systemd Restart) don't need --supervise.
@@ -156,7 +153,7 @@ export function buildArtifact(platform, { room = null, cmdArgs = [], autoUpdate
     const args = runtimeEntry
       ? [process.execPath, runtimeEntry, ...(room ? [room] : []), ...tail]
       : staleProof
-      ? ['/bin/bash', '-lc', `${cacheWipe('"$HOME"')}; exec ${[npx, ...pkgArgs, ...tail].map(shq).join(' ')}`]
+      ? ['/bin/bash', '-lc', `${cacheWipe(npmCache)}; export NPM_CONFIG_CACHE=${shq(npmCache)}; exec ${[npx, ...pkgArgs, ...tail].map(shq).join(' ')}`]
       : [npx, ...pkgArgs, ...tail]
     const file = path.join(os.homedir(), 'Library', 'LaunchAgents', `${label(room)}.plist`)
     const content = `<?xml version="1.0" encoding="UTF-8"?>
@@ -175,7 +172,7 @@ export function buildArtifact(platform, { room = null, cmdArgs = [], autoUpdate
   <key>WorkingDirectory</key><string>${xml(cwd)}</string>
   <key>StandardOutPath</key><string>${xml(log)}</string>
   <key>StandardErrorPath</key><string>${xml(log)}</string>
-  <key>EnvironmentVariables</key><dict><key>PATH</key><string>${xml(servicePath)}</string>${autoUpdate ? '<key>THINKPOOL_PAIR_AUTOUPDATE</key><string>1</string>' : ''}</dict>
+  <key>EnvironmentVariables</key><dict><key>PATH</key><string>${xml(servicePath)}</string>${runtimeEntry ? '' : `<key>NPM_CONFIG_CACHE</key><string>${xml(npmCache)}</string>`}${autoUpdate ? '<key>THINKPOOL_PAIR_AUTOUPDATE</key><string>1</string>' : ''}</dict>
 </dict></plist>\n`
     // The destructive reload is intentionally NOT represented as an inline `post`
     // command. installService stages this plist and hands the transaction to an
@@ -193,7 +190,7 @@ export function buildArtifact(platform, { room = null, cmdArgs = [], autoUpdate
     const execStart = runtimeEntry
       ? args.map((a) => `'${a.replace(/'/g, "'\\''")}'`).join(' ')
       : staleProof
-      ? `/bin/bash -lc "${cacheWipe('$$HOME')}; exec ${[npx, ...pkgArgs, ...tail].join(' ')}"`
+      ? `/bin/bash -lc "${cacheWipe(npmCache)}; export NPM_CONFIG_CACHE=${shq(npmCache)}; exec ${[npx, ...pkgArgs, ...tail].join(' ')}"`
       : args.map((a) => `'${a.replace(/'/g, "'\\''")}'`).join(' ')
     const content = `[Unit]
 Description=ThinkPool Code ${desc}
@@ -211,7 +208,7 @@ RestartSec=2
 RestartPreventExitStatus=0
 WorkingDirectory=${cwd}
 Environment=PATH=${servicePath}
-${autoUpdate ? 'Environment=THINKPOOL_PAIR_AUTOUPDATE=1\n' : ''}StandardOutput=append:${log}
+${runtimeEntry ? '' : `Environment=NPM_CONFIG_CACHE=${npmCache}\n`}${autoUpdate ? 'Environment=THINKPOOL_PAIR_AUTOUPDATE=1\n' : ''}StandardOutput=append:${log}
 StandardError=append:${log}
 
 [Install]
@@ -232,7 +229,7 @@ WantedBy=default.target
       : room
       ? ['npx', '-y', ...onlineFlag, verSpec, room, '--supervise', ...tail].join(' ')
       : ['npx', '-y', ...onlineFlag, verSpec].join(' ')
-    const content = `@echo off\r\ntitle thinkpool-pair ${id}\r\n${inner}\r\n`
+    const content = `@echo off\r\ntitle thinkpool-pair ${id}\r\n${runtimeEntry ? '' : `set "NPM_CONFIG_CACHE=${npmCache}"\r\n`}${inner}\r\n`
     return { file, content, logDir, post: [], note: 'Installed to the Startup folder — runs at login' + (room ? ' with --supervise (auto-restart on crash).' : ' (account mode).') + ' Start it now without rebooting by double-clicking the .cmd, or run it from a terminal.' }
   }
 

package/thinkpool-capabilities.json

@@ -1,10 +1,10 @@
 {
   "schemaVersion": 1,
-  "bundleVersion": 4,
+  "bundleVersion": 5,
   "contracts": [
     {
       "id": "room-coordination",
-      "version": 1,
+      "version": 2,
       "routes": [
         {
           "id": "room-awareness",
@@ -27,12 +27,16 @@
       ],
       "impact": [
         {"path": "bridge/cross-terminal.mjs"},
-        {"path": "bridge/bridge.mjs", "diffPattern": "read_terminal|list_sessions|read_session|post_to_terminal|post_to_session"}
+        {"path": "bridge/bridge.mjs", "diffPattern": "read_terminal|list_sessions|read_session|post_to_terminal|post_to_session"},
+        {"path": "bridge/codex-session.mjs", "diffPattern": "MCP|Mcp|mcp|read_terminal|list_sessions|read_session|post_to_terminal|post_to_session"},
+        {"path": "bridge/codex-app-server.mjs", "diffPattern": "MCP|Mcp|mcp"}
       ],
       "evidence": [
         {"path": "bridge/cross-terminal.mjs", "pattern": "read_terminal"},
         {"path": "bridge/cross-terminal.mjs", "pattern": "post_to_session"},
-        {"path": "bridge/bridge.mjs", "pattern": "'list_sessions'"}
+        {"path": "bridge/bridge.mjs", "pattern": "'list_sessions'"},
+        {"path": "bridge/codex-session.mjs", "pattern": "waitForMcpServer"},
+        {"path": "bridge/codex-app-server.mjs", "pattern": "mcpServer/startupStatus/updated"}
       ]
     },
     {