thinkpool-pair 0.7.240 → 0.7.241

package/bridge.mjs

@@ -2513,6 +2513,13 @@ function openStructured({ id, runtime = 'claude', model, models, effort, resume,
     // FL-B4 — a review lane records its verdict via FLOW_REVIEW.json (revert-on-fail).
     onReviewVerdict: entry.flowRole === 'reviewer' ? onReviewVerdict : null,
     mcpServers: { thinkpool: peekServer },
+    // Hermes' ACP MCP registration is intentionally non-fatal upstream. Make
+    // ThinkPool's room-tool contract stricter: a lane must prove its actual
+    // role-scoped tools through local /tools before a user turn. Claude/Codex
+    // already fail startup when their required MCP handshake fails.
+    requiredMcpTools: runtime === 'hermes'
+      ? ['read_terminal', ...(canSpawnWorkers ? ['spawn_terminal', 'close_terminal'] : [])]
+      : undefined,
     // Tier C precheck — the PreToolUse gate calls this BEFORE raising a card, so a
     // disabled/looping/over-cap post never bothers a person. Closes over `entry`.
     crossPostGate: () => crossPostDecision({ hop: entry.hop || 0, postCount: entry.postCount || 0, disabled: process.env.TP_CROSSPOST_OFF === '1' }),

package/hermes-session.mjs

@@ -42,7 +42,7 @@ const permissionOutcome = (decision, options = []) => {
 
 export function startHermesSession({
   cwd, model, resume, env = process.env, mode = 'default', onEvent, requestPermission,
-  roomContext, terminalRolePrompt, rolePrompt, mcpServers, prepareCwd = null,
+  roomContext, terminalRolePrompt, rolePrompt, mcpServers, requiredMcpTools = [], prepareCwd = null,
   command = HERMES_COMMAND, args = ['acp'], clientFactory = createAcpClient,
   mcpHttpFactory = startCodexMcpHttp, lazy = false,
 } = {}) {
@@ -66,6 +66,7 @@ export function startHermesSession({
   const abortedTurns = new Set()
   let retireClient = () => {}
   let resuming = false
+  let inventoryProbe = null
   let modelSwitchPending = false
 
   const emit = (event) => { try { onEvent?.(event) } catch { /* consumer isolation */ } }
@@ -87,10 +88,33 @@ export function startHermesSession({
   function onNotification(method, params) {
     if (method !== 'session/update') return
     const update = params?.update || params
+    if (inventoryProbe) {
+      if (update?.sessionUpdate === 'agent_message_chunk' && update?.content?.type === 'text') {
+        inventoryProbe.push(String(update.content.text || ''))
+      }
+      return
+    }
     if (resuming && HERMES_REPLAY_UPDATES.has(update?.sessionUpdate)) return
     mapper?.push(params)
   }
 
+  async function probeMcpTools() {
+    const required = [...new Set((Array.isArray(requiredMcpTools) ? requiredMcpTools : [])
+      .map((name) => String(name || '').trim()).filter(Boolean))]
+    if (!required.length) return []
+    const chunks = []
+    inventoryProbe = chunks
+    try {
+      await client.request('session/prompt', {
+        sessionId,
+        prompt: [{ type: 'text', text: '/tools' }],
+        messageId: randomUUID(),
+      }, 30_000)
+    } finally { inventoryProbe = null }
+    const inventory = chunks.join('')
+    return required.filter((name) => !inventory.includes(`mcp__thinkpool__${name}`))
+  }
+
   async function boot() {
     if (ended) throw new Error('Hermes session is closed')
     if (crashed) throw new Error('Hermes ACP process crashed; this lane must be restarted before sending another turn')
@@ -151,6 +175,22 @@ export function startHermesSession({
       } else state = await client.request('session/new', params, 30_000)
       if (!sessionId) sessionId = state?.sessionId || null
       if (!sessionId) throw new Error('Hermes ACP did not return a session id')
+      let missingMcpTools = await probeMcpTools()
+      // Hermes treats ACP-provided MCP registration as non-fatal. A transient
+      // first connection can therefore leave an otherwise healthy session with
+      // only built-in tools. Re-running the released resume lifecycle retries
+      // registration without inventing a new native identity. Bound this to one
+      // retry, then fail closed before any user prompt reaches a tool-less lane.
+      if (missingMcpTools.length && initialized?.agentCapabilities?.sessionCapabilities?.resume) {
+        try {
+          resuming = true
+          state = await client.request('session/resume', { ...params, sessionId }, 30_000)
+        } finally { resuming = false }
+        missingMcpTools = await probeMcpTools()
+      }
+      if (missingMcpTools.length) {
+        throw new Error(`Hermes ThinkPool MCP readiness failed; missing ${missingMcpTools.join(', ')}`)
+      }
       const serverModel = state?.models?.currentModelId || null
       activeModel = requestedModel || serverModel || activeModel
       mapper.startSession({ sessionId, models: state?.models, modes: state?.modes, commands: [] })

package/package.json

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