thinkpool-pair 0.7.242 → 0.7.243

package/bridge.mjs

@@ -105,7 +105,7 @@ const flowRedispatch = new Map()
 // wave BEFORE overrun. Lives bridge-side because waves dispatch across separate
 // broadcasts; without persistent state the cap can never bite.
 const flowBudgets = new Map()
-import { formatPeek, PEEK, siblingsOf, resolveSibling, crossPostDecision, CROSSPOST, spawnDecision, SPAWN, CROSSROOM, formatPairRoster, crossRoomPostDecision, formatRoomNow, formatClosableHint, laneStatusOf, nativeClaudeFallbackHint } from './cross-terminal.mjs'
+import { formatPeek, PEEK, siblingsOf, resolveSibling, crossPostDecision, CROSSPOST, spawnDecision, SPAWN, CROSSROOM, formatPairRoster, crossRoomPostDecision, formatRoomNow, formatClosableHint, closeLaneDecision, laneStatusOf, nativeClaudeFallbackHint } from './cross-terminal.mjs'
 import { dispatchPendingRecap, recoverInterruptedTurn, recoverMissingResumeOnce, sendInterruptedContinue, shouldAttemptNativeResume, supersedeInterruptedResume } from './interrupted-resume.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'
@@ -2296,7 +2296,7 @@ function openStructured({ id, runtime = 'claude', model, models, effort, resume,
             ref: String(sid).slice(0, 8),
             name: termNames[sid] || undefined,
             spawnedBy: s.spawnedBy,
-            busy: s.session?.turnActive ?? false,
+            busy: (s.session?.turnActive ?? false) || (s.pending?.size ?? 0) > 0,
           }))))
           // Record this spawn, pruning timestamps that have already left the window
           // (identical predicate to recentSpawnCount) so the array can't grow unbounded.
@@ -2376,7 +2376,7 @@ function openStructured({ id, runtime = 'claude', model, models, effort, resume,
       // the web's code-close), which no-ops if the id isn't a live session.
       ...(!entry.flowRole ? [tool(
         'close_terminal',
-        'Close an agent lane that YOU opened with spawn_terminal (identified by ref/id/name). You can only close lanes you spawned yourself — never a sibling someone else is working in, and never the main terminal. Use it to clean up after a fan-out once you have collected the results with read_terminal.',
+        'Close an IDLE agent lane that YOU opened with spawn_terminal (identified by ref/id/name). Active turns and permission waits are protected: collect the completed result with read_terminal before closing. You can only close lanes you spawned yourself — never a sibling someone else is working in, and never the main terminal.',
         {
           terminal: z.string().describe('ref, id, or name of the lane you spawned (from read_terminal)'),
         },
@@ -2387,7 +2387,15 @@ function openStructured({ id, runtime = 'claude', model, models, effort, resume,
           if (!target) return okText(`No terminal matches "${args?.terminal}". Call read_terminal with no argument to list the open terminals.`)
           const te = sessions.get(target.id)
           if (!te) return okText(`Terminal ${target.ref} is not an agent lane (or already closed) — only spawned agent lanes can be closed this way.`)
-          if (te.spawnedBy !== id) return okText(`Terminal ${target.ref} was not opened by you — you can only close lanes you spawned yourself. Leave it to the person running it.`)
+          const close = closeLaneDecision({
+            callerId: id,
+            spawnedBy: te.spawnedBy,
+            busy: (te.session?.turnActive ?? false) || (te.pending?.size ?? 0) > 0,
+          })
+          if (!close.ok && close.reason === 'not-owner') return okText(`Terminal ${target.ref} was not opened by you — you can only close lanes you spawned yourself. Leave it to the person running it.`)
+          if (!close.ok && close.reason === 'busy') {
+            return okText(`Terminal ${target.ref} is still working or waiting for a permission decision. close_terminal will not kill an active turn. Wait until read_terminal reports it idle/completed, collect its result, then close it. If it is genuinely stuck, ask a person to press Stop.`)
+          }
           endStructured(target.id)
           return okText(`Closed agent lane ${target.ref}${target.name ? ` ("${target.name}")` : ''}.`)
         },

package/cross-terminal.mjs

@@ -220,7 +220,7 @@ export const formatPeek = ({ selfId, sessions, terms, names = {}, terminal, line
   } else {
     body = cleanPtyTail(hit.buf, n).join('\n') || '(no output yet)'
   }
-  return `Terminal ${label(hit)} (${hit.kind} · ${hit.cmd}) — last ${n} lines:\n${body}`
+  return `Terminal ${label(hit)} (${hit.kind} · ${hit.cmd}) · ${laneStatusText(hit)} — last ${n} lines:\n${body}`
 }
 
 // A native Claude Code account failure is provider-wide, not model-specific. Retrying
@@ -417,8 +417,18 @@ export const spawnDecision = ({ hop = 0, spawnTimes = [], now = 0, spawnedLive =
 // Only lanes this caller spawned are suggested: close_terminal refuses the others, and
 // suggesting a sibling's lane is how you get an agent killing someone else's work.
 export const CLOSABLE_HINT_MAX = 6
+export const closeLaneDecision = ({ callerId, spawnedBy, busy } = {}) => {
+  if (!callerId || spawnedBy !== callerId) return { ok: false, reason: 'not-owner' }
+  if (busy) return { ok: false, reason: 'busy' }
+  return { ok: true }
+}
+
 export const closableLanes = (callerId, lanes = []) =>
-  (Array.isArray(lanes) ? lanes : []).filter((l) => l && l.spawnedBy === callerId && !l.busy)
+  (Array.isArray(lanes) ? lanes : []).filter((l) => l && closeLaneDecision({
+    callerId,
+    spawnedBy: l.spawnedBy,
+    busy: l.busy,
+  }).ok)
 
 export const formatClosableHint = (callerId, lanes = [], max = CLOSABLE_HINT_MAX) => {
   const idle = closableLanes(callerId, lanes)

package/package.json

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