thinkpool-pair 0.7.263 → 0.7.264

package/bridge.mjs

@@ -3104,23 +3104,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 +4062,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 +4605,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/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.264",
   "description": "Share a local coding-agent CLI (Claude Code, Codex, Gemini, Aider, …) into a ThinkPool Code room, live.",
   "type": "module",
   "bin": {