thinkpool-pair 0.7.263 → 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 }),
@@ -3104,23 +3102,20 @@ function cancelPendingDurablePermissions(s, permissionIds = null, reason = 'perm
   })
 }
 
-const restoredPermissionCleanupPending = new Set()
+let restoredPermissionCleanupPending = false
 
-async function cancelRestoredDurablePermissions(terminalIds = []) {
-  for (const terminalId of terminalIds) if (terminalId) restoredPermissionCleanupPending.add(terminalId)
-  const terminals = [...restoredPermissionCleanupPending]
-  const outcomes = await Promise.all(terminals.map(async (terminalId) => {
-    const result = await cancelDurablePermissions({
-      supabaseUrl: SUPABASE_URL, anonKey: SUPABASE_ANON, token: codeAuthToken, roomCode: room,
-      // New bridge process, old durable bridge authority: filter by the
-      // restored terminal and let the cleanup read each historical binding.
-      terminalId, reason: 'bridge_restarted',
-    })
-    if (!result.ok && process.env.TP_DEBUG) process.stderr.write(`\n  ◇ restored permission cleanup incomplete (${result.code})\n`)
-    return { terminalId, ok: result.ok }
-  }))
-  for (const outcome of outcomes) if (outcome.ok) restoredPermissionCleanupPending.delete(outcome.terminalId)
-  return { ok: restoredPermissionCleanupPending.size === 0, pending: [...restoredPermissionCleanupPending] }
+async function cancelRestoredDurablePermissions() {
+  restoredPermissionCleanupPending = true
+  const result = await cancelDurablePermissions({
+    supabaseUrl: SUPABASE_URL, anonKey: SUPABASE_ANON, token: codeAuthToken, roomCode: room,
+    // A new process gets a fresh bridge id. Every approval bound to any older
+    // id has lost its process-local resolver, including archived terminals that
+    // no longer have a session file and therefore never enter loadAll().
+    currentBridgeId: BRIDGE_ID, reason: 'bridge_restarted',
+  })
+  if (result.ok) restoredPermissionCleanupPending = false
+  else if (process.env.TP_DEBUG) process.stderr.write(`\n  ◇ restored permission cleanup incomplete (${result.code})\n`)
+  return result
 }
 
 function drainPending(s) {
@@ -4065,7 +4060,7 @@ channel
           // Cancel their durable dispatch rows BEFORE opening a restored SDK
           // session, so a new permission raised during resume can never be
           // mistaken for a pre-restart card from the same terminal.
-          await cancelRestoredDurablePermissions(all.map((rec) => rec.id))
+          await cancelRestoredDurablePermissions()
           if (all.length) for (const rec of all) {
             const wasInterrupted = restoredTurnOpen(rec.log || [])
             // Codex can persist a thread id before its rollout receives the
@@ -4608,9 +4603,9 @@ if (process.env.THINKPOOL_PAIR_AUTOUPDATE === '1' && VERSION) {
       })
       refreshOwnerPlan()
       // A restart sweep may have raced an expiring owner JWT. Keep failed
-      // terminal ids until the supervisor hands us its next fresh token, then
-      // retry the exact cleanup instead of leaving dead question cards forever.
-      if (restoredPermissionCleanupPending.size) void cancelRestoredDurablePermissions()
+      // room sweep queued until the supervisor hands us its next fresh token,
+      // then retry without leaving archived-terminal questions behind.
+      if (restoredPermissionCleanupPending) void cancelRestoredDurablePermissions()
     }
   })
   setInterval(() => { try { process.send({ t: 'idle', idle: idleNow(), between: betweenTurns(), webPeer: webPeerPresent() }) } catch { /* parent gone */ } }, 5000).unref()

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/dispatch-permission-cleanup.mjs

@@ -9,14 +9,17 @@ const SETTLED = new Set(['denied', 'idempotent_replay', 'already_resolved', 'sta
 
 const safeString = (value) => typeof value === 'string' && value.length > 0
 
-export function pendingDurablePermissionItems (items, { bridgeId = null, terminalId, permissionIds = null, actionKinds = ['approval', 'dispatch'] } = {}) {
-  if ((bridgeId != null && !safeString(bridgeId)) || !safeString(terminalId)) return []
+export function pendingDurablePermissionItems (items, { bridgeId = null, currentBridgeId = null, terminalId = null, permissionIds = null, actionKinds = ['approval', 'dispatch'] } = {}) {
+  if ((bridgeId != null && !safeString(bridgeId)) || (currentBridgeId != null && !safeString(currentBridgeId)) ||
+      (terminalId != null && !safeString(terminalId)) || (terminalId == null && currentBridgeId == null)) return []
   const requested = permissionIds == null ? null : new Set(permissionIds.filter(safeString))
   const actions = new Set(actionKinds)
   return (Array.isArray(items) ? items : []).filter((item) => {
     const permissionId = item?.request_context?.permission_id
     return PENDING.has(item?.status) && item?.item_kind === 'approval' && actions.has(item?.action_kind) &&
-      (!bridgeId || item?.bridge_authority_id === bridgeId) && item?.local_authority_id === terminalId &&
+      (!bridgeId || item?.bridge_authority_id === bridgeId) &&
+      (!currentBridgeId || item?.bridge_authority_id !== currentBridgeId) &&
+      (!terminalId || item?.local_authority_id === terminalId) &&
       safeString(permissionId) && (!requested || requested.has(permissionId))
   })
 }
@@ -37,10 +40,13 @@ const rpc = async ({ fetchImpl, supabaseUrl, headers, name, body }) => {
 // room-member identity.  Never accept an id supplied by a public broadcast.
 export async function cancelDurablePermissions ({
   fetchImpl = globalThis.fetch, supabaseUrl, anonKey, token, roomCode, bridgeId,
-  terminalId, permissionIds = null, reason = 'permission_aborted', actionKinds = ['approval', 'dispatch'],
+  currentBridgeId = null, terminalId = null, permissionIds = null,
+  reason = 'permission_aborted', actionKinds = ['approval', 'dispatch'],
 } = {}) {
   if (typeof fetchImpl !== 'function' || !safeString(supabaseUrl) || !safeString(anonKey) ||
-      !safeString(token) || !safeString(roomCode) || (bridgeId != null && !safeString(bridgeId)) || !safeString(terminalId)) {
+      !safeString(token) || !safeString(roomCode) || (bridgeId != null && !safeString(bridgeId)) ||
+      (currentBridgeId != null && !safeString(currentBridgeId)) ||
+      (terminalId != null && !safeString(terminalId)) || (terminalId == null && currentBridgeId == null)) {
     return Object.freeze({ ok: false, code: 'cleanup_unavailable', canceled: 0 })
   }
   if (permissionIds != null && (!Array.isArray(permissionIds) || !permissionIds.length)) {
@@ -51,7 +57,7 @@ export async function cancelDurablePermissions ({
     const listed = await rpc({ fetchImpl, supabaseUrl, headers, name: 'list_code_pair_controls', body: {
       p_session_code: String(roomCode).toUpperCase(), p_status: null, p_limit: 100,
     } })
-    const candidates = pendingDurablePermissionItems(listed, { bridgeId, terminalId, permissionIds, actionKinds })
+    const candidates = pendingDurablePermissionItems(listed, { bridgeId, currentBridgeId, terminalId, permissionIds, actionKinds })
     const outcomes = await Promise.all(candidates.map(async (item) => {
       const result = await rpc({ fetchImpl, supabaseUrl, headers, name: 'resolve_code_pair_control', body: {
         p_item_id: item.id,
@@ -63,7 +69,7 @@ export async function cancelDurablePermissions ({
         // by its immutable authority binding, so resolve it with that exact
         // value after the owner-authenticated RLS list—not a guessed current ID.
         p_bridge_authority_id: item.bridge_authority_id,
-        p_local_authority_id: terminalId,
+        p_local_authority_id: item.local_authority_id,
         p_idempotency_key: `cancel-permission:${item.id}:${reason}`.slice(0, 160),
       } })
       return { id: item.id, code: result?.code || 'invalid_response', ok: Boolean(result?.ok) && SETTLED.has(result.code) }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "thinkpool-pair",
-  "version": "0.7.263",
+  "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),
+  }
+}