thinkpool-pair 0.7.247 → 0.7.248

package/bridge.mjs

@@ -110,6 +110,7 @@ const flowRedispatch = new Map()
 const flowBudgets = new Map()
 import { formatPeek, PEEK, siblingsOf, resolveSibling, crossPostDecision, CROSSPOST, spawnDecision, SPAWN, CROSSROOM, formatPairRoster, crossRoomPostDecision, formatRoomNow, formatClosableHint, closeLaneDecision, laneStatusOf, nativeClaudeFallbackHint, buildDispatchPreview, authorizeDispatchApproval, verifyDurableDispatchAuthority } from './cross-terminal.mjs'
 import { dispatchPendingRecap, recoverInterruptedTurn, recoverMissingResumeOnce, sendInterruptedContinue, shouldAttemptNativeResume, supersedeInterruptedResume } from './interrupted-resume.mjs'
+import { beginDispatchLease, finishDispatchLease, isDispatchLeaseCurrent, supersedeDispatchLease } from './dispatch-lease.mjs'
 import { turnInFlight } from './update-gate.mjs'
 import { saveSession, flushSession, deleteSession, loadAll, canResume, loadPtyId, savePtyId, loadNames, saveNames, appendDurableEvents, seedDurableEvents, readDurablePage, readDurableOldestSeq, hasDurableArchive, servesHistoryPage } from './session-store.mjs'
 import { stampEvent, makeSeqCounter, maxSeq, seqable, capReplayEvents, chunkReplayEvents, boundEventForBroadcast, inlineImageBlocks, ImageEventQueue, imageQueueConfig, uploadCodeImage as uploadCodeImageRequest, usageReportLine, codexUsageReportLine, buildRecapFromLog, RECAP_CAP, trimmedBeforeSeq, firstSeq } from './event-id.mjs'
@@ -2401,9 +2402,16 @@ function openStructured({ id, runtime = 'claude', model, models, effort, resume,
             })
           } catch { return okText('Dispatch preview could not be built safely. No lane was created.') }
           const permissionId = randomUUID()
+          const dispatchAdmission = beginDispatchLease(entry, permissionId)
+          if (!dispatchAdmission.ok) {
+            return okText('A dispatch choice is already awaiting approval in the room. Do not retry or switch runtimes; wait for that choice to be approved or canceled, or for a new human turn to supersede it.')
+          }
+          const dispatchLease = dispatchAdmission.lease
+          try {
           let approval = { decision: 'deny' }
           try { approval = await requestDispatchApproval({ id: permissionId, input: effectiveArgs, dispatchPreview: preview }) } catch { /* fail closed */ }
           if (approval?.decision !== 'allow') return okText('Dispatch canceled. No lane or worktree was created.')
+          if (!isDispatchLeaseCurrent(entry, dispatchLease)) return okText('That dispatch choice was superseded by a newer turn. No lane or worktree was created.')
           const currentNow = Date.now()
           const current = dispatchContext(currentNow)
           const durable = await readDurableDispatchAuthority({
@@ -2416,6 +2424,7 @@ function openStructured({ id, runtime = 'claude', model, models, effort, resume,
             },
           })
           if (!durable.ok) return okText('Dispatch approval could not be verified from the durable room authority. No lane was created.')
+          if (!isDispatchLeaseCurrent(entry, dispatchLease)) return okText('That dispatch choice was superseded by a newer turn. No lane or worktree was created.')
           const authorization = authorizeDispatchApproval({
             preview,
             approvedFingerprint: durable.fingerprint,
@@ -2477,6 +2486,9 @@ function openStructured({ id, runtime = 'claude', model, models, effort, resume,
             return okText(`Opened agent lane ${newRef}${args?.name ? ` ("${args.name}")` : ''} and handed it the task. It runs in its own lane — check back with read_terminal, then close_terminal when done.`)
           }
           return okText(`Opened idle agent lane ${newRef}${args?.name ? ` ("${args.name}")` : ''}. Hand it work with post_to_terminal, or a person can type into it.`)
+          } finally {
+            finishDispatchLease(entry, dispatchLease)
+          }
         },
       )] : []),
       // Research lane — run a REAL multi-source search + adversarial verification and
@@ -3110,6 +3122,10 @@ function pendingResolution(pending, payload = {}) {
 
 function drainPending(s) {
   if (!s?.pending) return
+  // Invalidate the execution fence before settling promises. A dispatch that
+  // was already approved but is still re-reading durable authority must also
+  // fail closed when this terminal stops or its turn settles.
+  supersedeDispatchLease(s)
   for (const [, p] of s.pending) {
     if (p?.timer) clearTimeout(p.timer)
     try { p.resolve(pendingResolution(p, { decision: 'deny' })) } catch { /* noop */ }
@@ -3119,6 +3135,17 @@ function drainPending(s) {
   s.permNotifier?.clearAll()
 }
 
+function supersedePendingDispatch(s) {
+  const lease = supersedeDispatchLease(s)
+  if (!lease) return null
+  const pending = s.pending?.get(lease.permissionId)
+  if (pending?.timer) clearTimeout(pending.timer)
+  s.pending?.delete(lease.permissionId)
+  s.permNotifier?.resolve(lease.permissionId)
+  try { pending?.resolve(pendingResolution(pending, { decision: 'deny' })) } catch { /* noop */ }
+  return lease.permissionId
+}
+
 // Switching a terminal to bypassPermissions must RETROACTIVELY clear the cards the
 // current turn already raised — setPermissionMode is a streaming control request that
 // only applies going forward, so without this a user who flips to bypass mid-turn keeps
@@ -3617,6 +3644,15 @@ channel
     s.hop = 0
     s.roomHop = 0   // a human turn is room-hop 0 — clears any injected cross-room hop depth
     const text = String(payload.text)
+    // A fresh person-authored turn is a newer dispatch intent boundary. Retract
+    // any older runtime choice and invalidate its lease before it can resume from
+    // a late durable approval. Ordinary tool cards remain untouched: steering a
+    // running turn must not silently answer unrelated permissions.
+    const supersededDispatchId = supersedePendingDispatch(s)
+    if (supersededDispatchId) {
+      bcast('code-perm', { term: payload.term, id: supersededDispatchId, decision: 'deny', name: 'agent' })
+      announce()
+    }
     // A human turn supersedes a restart's still-pending auto-continue. Without this,
     // their message starts the cold runtime; its init event then queues a second stale
     // `continue` behind the request. Codex normally resumes immediately at restore, while

package/dispatch-lease.mjs

@@ -0,0 +1,37 @@
+// One live dispatch intent per structured terminal.
+//
+// Durable permission rows can outlive the agent turn that requested them. The
+// lease is the bridge-local execution fence: arguments still need the durable
+// fingerprint/authority checks, and the matching intent must also remain current
+// until the lane is created. A newer human turn or abort supersedes the lease, so
+// a late (otherwise valid) approval cannot resurrect an old runtime choice.
+
+const nextGeneration = (entry) =>
+  (Number.isSafeInteger(entry?.dispatchGeneration) ? entry.dispatchGeneration : 0) + 1
+
+export function beginDispatchLease (entry, permissionId) {
+  if (!entry || !permissionId) return Object.freeze({ ok: false, code: 'invalid_dispatch' })
+  if (entry.dispatchLease) return Object.freeze({ ok: false, code: 'dispatch_pending', active: entry.dispatchLease })
+  const lease = Object.freeze({ permissionId, generation: nextGeneration(entry) })
+  entry.dispatchGeneration = lease.generation
+  entry.dispatchLease = lease
+  return Object.freeze({ ok: true, lease })
+}
+
+export function isDispatchLeaseCurrent (entry, lease) {
+  return Boolean(entry && lease && entry.dispatchLease === lease && entry.dispatchGeneration === lease.generation)
+}
+
+export function finishDispatchLease (entry, lease) {
+  if (!isDispatchLeaseCurrent(entry, lease)) return false
+  entry.dispatchLease = null
+  return true
+}
+
+export function supersedeDispatchLease (entry) {
+  const lease = entry?.dispatchLease || null
+  if (!entry || !lease) return null
+  entry.dispatchGeneration = nextGeneration(entry)
+  entry.dispatchLease = null
+  return lease
+}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "thinkpool-pair",
-  "version": "0.7.247",
+  "version": "0.7.248",
   "description": "Share a local coding-agent CLI (Claude Code, Codex, Gemini, Aider, …) into a ThinkPool Code room, live.",
   "type": "module",
   "bin": {
@@ -49,6 +49,7 @@
     "cross-terminal.mjs",
     "lane-lifecycle.mjs",
     "interrupted-resume.mjs",
+    "dispatch-lease.mjs",
     "flow-conductor.mjs",
     "flow-worktree.mjs",
     "flow-task-graph.mjs",