thinkpool-pair 0.7.264 → 0.7.265

package/bridge.mjs

@@ -60,6 +60,7 @@ import { canonicalRoomFilePath, waitForNativeImages } from './codex-images.mjs'
 import { createManagedLaneWorktree, removeManagedLaneWorktree } from './lane-worktree.mjs'
 import { commandOnPath } from './agent-detect.mjs'
 import { requiresSdkAdmission, sdkSmokePassed } from './sdk-admission.mjs'
+import { hermesUserInputResponse } from './question-response.mjs'
 
 const STRUCTURED_MODES = new Set(['default', 'acceptEdits', 'plan', 'review', 'bypassPermissions'])
 import { FLOW_CONDUCTOR_PROMPT, FLOW_LANE_PROMPT, FLOW_CODEX_CONDUCTOR_PROMPT, FLOW_CODEX_LANE_PROMPT, buildConductorEnv, assembleCrossWaveContext, buildLanePrompt } from './flow-conductor.mjs'
@@ -2189,10 +2190,7 @@ function openStructured({ id, runtime = 'claude', model, models, effort, resume,
             answerFormat: 'hermes',
             autoResolutionMs: args.autoResolutionMs,
           })
-          const decision = result && typeof result === 'object' ? result.decision : result
-          const answers = result && typeof result === 'object' && result.answers && typeof result.answers === 'object' ? result.answers : {}
-          const status = String(decision || '').startsWith('answer:') ? 'answered' : decision === 'timeout' ? 'timed_out' : 'dismissed'
-          return { content: [{ type: 'text', text: JSON.stringify({ status, answers }) }] }
+          return { content: [{ type: 'text', text: JSON.stringify(hermesUserInputResponse(result, questions)) }] }
         },
       )] : []),
       ...createViewportTools({ tool, z, manager: entry.viewport }),

package/codex-session.mjs

@@ -31,6 +31,7 @@ import { buildCodexAppServerArgs, codexAppServerGate, createCodexAppServer } fro
 import { CodexEventMapper } from './codex-event-mapper.mjs'
 import { startCodexMcpHttp } from './codex-mcp-http.mjs'
 import { CODEX_THINKPOOL_FIRST_TURN_PREAMBLE, buildThinkPoolTurnGuidance, createRoomContextSelector, usesFullThinkPoolReminder } from './thinkpool-room-prompt.mjs'
+import { questionAnswerResponse } from './question-response.mjs'
 
 const DEFAULT_SANDBOX = 'workspace-write'
 const SAFE_SANDBOXES = new Set(['read-only', 'workspace-write', 'danger-full-access'])
@@ -316,46 +317,8 @@ export function codexApprovalResponse(decision) {
   return { decision: decision === 'always' ? 'acceptForSession' : decision === 'allow' ? 'accept' : 'decline' }
 }
 
-function legacyQuestionAnswers(decision, questions) {
-  if (typeof decision !== 'string' || !decision.startsWith('answer:')) return {}
-  const text = decision.slice(7).trim()
-  if (!text || !questions.length) return {}
-  if (questions.length === 1) {
-    const question = questions[0]
-    const prefix = `${question.header || 'Q1'}: `
-    const value = text.startsWith(prefix) ? text.slice(prefix.length) : text
-    return { [String(question.id || 0)]: { answers: [value] } }
-  }
-  const answers = {}
-  questions.forEach((question, index) => {
-    const id = String(question.id || index)
-    const marker = `${index ? '; ' : ''}${question.header || `Q${index + 1}`}: `
-    const start = text.indexOf(marker)
-    if (start < 0) return
-    const valueStart = start + marker.length
-    const nextQuestion = questions[index + 1]
-    const nextMarker = nextQuestion ? `; ${nextQuestion.header || `Q${index + 2}`}: ` : null
-    const end = nextMarker ? text.indexOf(nextMarker, valueStart) : -1
-    const value = text.slice(valueStart, end < 0 ? undefined : end).trim()
-    if (value) answers[id] = { answers: [value] }
-  })
-  return answers
-}
-
 export function codexUserInputResponse(result, questions = []) {
-  const supplied = result && typeof result === 'object' ? result.answers : null
-  const answers = {}
-  if (supplied && typeof supplied === 'object') {
-    const allowed = new Set(questions.map((question, index) => String(question?.id || index)))
-    for (const [id, value] of Object.entries(supplied)) {
-      if (!allowed.has(String(id)) || !Array.isArray(value?.answers)) continue
-      const values = value.answers.map((answer) => String(answer)).filter(Boolean)
-      if (values.length) answers[String(id)] = { answers: values }
-    }
-  }
-  if (Object.keys(answers).length) return { answers }
-  const decision = result && typeof result === 'object' ? result.decision : result
-  return { answers: legacyQuestionAnswers(decision, questions) }
+  return questionAnswerResponse(result, questions)
 }
 
 function appServerItemForMapper(item) {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "thinkpool-pair",
-  "version": "0.7.264",
+  "version": "0.7.265",
   "description": "Share a local coding-agent CLI (Claude Code, Codex, Gemini, Aider, …) into a ThinkPool Code room, live.",
   "type": "module",
   "bin": {
@@ -16,6 +16,7 @@
     "context-windows.mjs",
     "claude-session.mjs",
     "codex-session.mjs",
+    "question-response.mjs",
     "thinkpool-room-prompt.mjs",
     "thinkpool-prompt-contracts.mjs",
     "thinkpool-capabilities.json",

package/question-response.mjs

@@ -0,0 +1,52 @@
+function legacyQuestionAnswers (decision, questions) {
+  if (typeof decision !== 'string' || !decision.startsWith('answer:')) return {}
+  const text = decision.slice(7).trim()
+  if (!text || !questions.length) return {}
+  if (questions.length === 1) {
+    const question = questions[0]
+    const prefix = `${question.header || 'Q1'}: `
+    const value = text.startsWith(prefix) ? text.slice(prefix.length) : text
+    return { [String(question.id || 0)]: { answers: [value] } }
+  }
+  const answers = {}
+  questions.forEach((question, index) => {
+    const id = String(question.id || index)
+    const marker = `${index ? '; ' : ''}${question.header || `Q${index + 1}`}: `
+    const start = text.indexOf(marker)
+    if (start < 0) return
+    const valueStart = start + marker.length
+    const nextQuestion = questions[index + 1]
+    const nextMarker = nextQuestion ? `; ${nextQuestion.header || `Q${index + 2}`}: ` : null
+    const end = nextMarker ? text.indexOf(nextMarker, valueStart) : -1
+    const value = text.slice(valueStart, end < 0 ? undefined : end).trim()
+    if (value) answers[id] = { answers: [value] }
+  })
+  return answers
+}
+
+// Codex and Hermes use different native tool protocols, but the room answer is
+// one contract. Keep filtering, multi-select preservation, and legacy fallback
+// in one pure adapter so the two runtimes cannot drift independently.
+export function questionAnswerResponse (result, questions = []) {
+  const supplied = result && typeof result === 'object' ? result.answers : null
+  const answers = {}
+  if (supplied && typeof supplied === 'object') {
+    const allowed = new Set(questions.map((question, index) => String(question?.id || index)))
+    for (const [id, value] of Object.entries(supplied)) {
+      if (!allowed.has(String(id)) || !Array.isArray(value?.answers)) continue
+      const values = value.answers.map((answer) => String(answer)).filter(Boolean)
+      if (values.length) answers[String(id)] = { answers: values }
+    }
+  }
+  if (Object.keys(answers).length) return { answers }
+  const decision = result && typeof result === 'object' ? result.decision : result
+  return { answers: legacyQuestionAnswers(decision, questions) }
+}
+
+export function hermesUserInputResponse (result, questions = []) {
+  const decision = result && typeof result === 'object' ? result.decision : result
+  return {
+    status: String(decision || '').startsWith('answer:') ? 'answered' : decision === 'timeout' ? 'timed_out' : 'dismissed',
+    ...questionAnswerResponse(result, questions),
+  }
+}