thinkpool-pair 0.7.272 → 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.272",
+  "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": 3,
+  "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"}
       ]
     },
     {
@@ -161,9 +165,9 @@
     },
     {
       "id": "design-workspace",
-      "version": 2,
-      "interactionPrompt": "DESIGN EDITING MODEL: a trusted source-backed mockup card offers Edit in Design. That explicit action—not ordinary Preview or unrelated artifact delivery—arms a persistent room-level Design workspace, opens the artifact directly in editable mode, and adds Design · Page name as a virtual Ensemble lane for both partners; it creates no terminal, agent runtime, or worker slot. Once armed, the Design lane reopens the active artifact at its latest verified revision without another agent turn, history search, HTML/path request, or re-selection. Design is the default canvas there and Preview is only a temporary interaction mode. Direct text, supported movement, and selected-image changes auto-stage as optimistic drafts in the bounded changes queue. Apply changes sends the ordered batch once to the producing lane, that lane edits the canonical authored HTML, and a successful desktop+mobile render advances the verified revision for the room. Never call a staged draft saved or live. A preview_capture card is visual evidence, not an editable Design artifact.",
-      "turnReminder": "DESIGN ROUTE: authored HTML must produce a source-backed Thinkpool Design card with verified desktop and mobile renders. Edit in Design explicitly arms the persistent Design workspace and adds its virtual Design · Page Ensemble lane; Preview alone does not arm it. Do not duplicate the card renders as inline PNGs. Use inline PNG evidence only when no interactive Design artifact is available.",
+      "version": 3,
+      "interactionPrompt": "DESIGN EDITING MODEL: a trusted source-backed mockup card offers Edit in Design. That explicit action—not ordinary Preview or unrelated artifact delivery—arms a persistent room-level Design workspace, opens the artifact directly in editable mode, and adds Design · Page name beneath the producing terminal in its Ensemble row for both partners; it creates no terminal, agent runtime, or worker slot. The virtual lane can be closed from that Ensemble row without deleting the artifact. Once armed, the Design lane reopens the active artifact at its latest verified revision without another agent turn, history search, HTML/path request, or re-selection. Design is the default canvas there and Preview is only a temporary interaction mode. Direct text, supported movement, and selected-image changes auto-stage as optimistic drafts in the bounded changes queue; queued edits can be reopened, revised, or removed before Apply. Apply changes sends the ordered batch once to the producing lane, that lane edits the canonical authored HTML, and a successful desktop+mobile render advances the verified revision for the room. Never call a staged draft saved or live. A preview_capture card is visual evidence, not an editable Design artifact. For direction rounds, deliver every option as its own source-backed Design card; a multi-option gallery may accompany them for comparison but must never be the only editable artifact.",
+      "turnReminder": "DESIGN ROUTE: authored HTML must produce a source-backed Thinkpool Design card with verified desktop and mobile renders. Edit in Design explicitly arms the persistent Design workspace and adds its virtual Design · Page beneath the producing terminal in the Ensemble row; Preview alone does not arm it. For direction rounds, deliver every option as a separate source-backed Design card; gallery navigation is not a substitute for separately editable artifacts. Do not duplicate the card renders as inline PNGs. Use inline PNG evidence only when no interactive Design artifact is available.",
       "impact": [
         {"path": "src/pages/code/design/"},
         {"path": "src/pages/code/structured.jsx", "diffPattern": "Edit in Design|openMockup|tp-mockup-view|sourceKnown"},