thinkpool-pair 0.7.273 → 0.7.274

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.274",
   "description": "Share a local coding-agent CLI (Claude Code, Codex, Gemini, Aider, …) into a ThinkPool Code room, live.",
   "type": "module",
   "bin": {

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"}
       ]
     },
     {