thinkpool-pair 0.7.270 → 0.7.271

package/codex-session.mjs

@@ -543,8 +543,11 @@ export function startCodexSession({ cwd, model, effort: initialEffort = 'high',
 
   async function runAppServer(prompt, options = {}) {
     if (!await ensureAppServer()) return false
+    // Stop can land while the cold App Server / MCP bootstrap is still awaiting.
+    // The accepted turn was already closed at the room boundary; never start it
+    // after bootstrap finally resolves.
+    if (ended || aborted) return true
     mapper.setUsageBaseline(sessionId ? readCodexThreadUsage(sessionId) : null)
-    aborted = false
     turnActive = true
     try {
       activeTurnId = await appServer.startTurn({
@@ -556,6 +559,13 @@ export function startCodexSession({ cwd, model, effort: initialEffort = 'high',
         approvalPolicy: modeConfig.approvalPolicy,
         collaborationMode: codexDefaultCollaborationMode(activeModel, activeEffort),
       })
+      // Stop may land after the RPC was written but before startTurn returns its
+      // id. abort() already closed the room boundary; interrupt the now-known
+      // native turn before waiting, and never let it continue invisibly.
+      if (aborted || ended) {
+        try { await appServer.interrupt({ threadId: sessionId, turnId: activeTurnId }) } catch { /* boundary is already closed */ }
+        return true
+      }
       const completed = await appServer.waitForTurn(activeTurnId)
       const status = completed?.turn?.status
       if (aborted || status === 'interrupted') {
@@ -592,13 +602,17 @@ export function startCodexSession({ cwd, model, effort: initialEffort = 'high',
 
   async function runAppServerReview(commandText) {
     if (!await ensureAppServer()) return false
+    if (ended || aborted) return true
     mapper.setUsageBaseline(sessionId ? readCodexThreadUsage(sessionId) : null)
-    aborted = false
     turnActive = true
     try {
       const started = await appServer.startReview({ threadId: sessionId, target: codexReviewTarget(commandText) })
       activeTurnId = started?.turn?.id || started?.turnId
       if (!activeTurnId) throw new Error('Codex review/start returned no turn id')
+      if (aborted || ended) {
+        try { await appServer.interrupt({ threadId: sessionId, turnId: activeTurnId }) } catch { /* boundary is already closed */ }
+        return true
+      }
       const completed = await appServer.waitForTurn(activeTurnId)
       const status = completed?.turn?.status
       if (aborted || status === 'interrupted') {
@@ -628,6 +642,7 @@ export function startCodexSession({ cwd, model, effort: initialEffort = 'high',
   }
 
   async function runExec(prompt, options = {}) {
+    if (ended || aborted) return
     // First turn: fresh exec. Later turns: resume THIS lane's captured thread.
     // `--last` is process-global and can cross-wire two concurrently-active Codex
     // lanes, so it is never safe in a multi-lane bridge.
@@ -658,7 +673,6 @@ export function startCodexSession({ cwd, model, effort: initialEffort = 'high',
       const opts = { cwd, env: childEnv, stdio: ['ignore', 'pipe', 'pipe'] }
       if (stdinFd != null) opts.stdio = [stdinFd, 'pipe', 'pipe']
 
-      aborted = false
       turnActive = true
       child = spawnImpl('codex', args, opts)
       if (stdinFd != null) { try { fs.closeSync(stdinFd) } catch { /* child owns its duplicated fd */ } }
@@ -777,18 +791,35 @@ export function startCodexSession({ cwd, model, effort: initialEffort = 'high',
         return true
       }
       queue.push({ text, options, promptIndex, forceFullReminder: thisTurnForceFull })
+      // Match Claude and Hermes: accepting an idle turn claims the lane before
+      // any cold App Server, MCP, or exec bootstrap. bridge.mjs announces
+      // synchronously after sendTurn(), so this is the edge that makes Thinking,
+      // Stop, and the tab spinner appear at dispatch time rather than at the
+      // first provider event many seconds later.
+      if (!turnActive) {
+        aborted = false
+        turnActive = true
+      }
       // start the pump if idle
       if (queue.length === 1) pump()
       return true
     },
     abort() {
+      const bootstrapOnly = turnActive && !activeTurnId && !child
       aborted = true
       queue.length = 0
       if (appServer && activeTurnId) { void appServer.interrupt({ threadId: sessionId, turnId: activeTurnId }).catch(() => {}) ; return }
       if (child) { try { child.kill('SIGTERM') } catch { /* noop */ } ; setTimeout(() => { try { child?.kill('SIGKILL') } catch { /* noop */ } }, 1500) }
+      else if (bootstrapOnly) {
+        // No native turn exists to produce a boundary. Close the optimistic
+        // accepted turn exactly once and let runAppServer's post-bootstrap
+        // aborted check discard the delayed startup.
+        emitTurnBoundary({ kind: 'result', subtype: 'aborted', sessionId, model: activeModel, costUsd: null, usage: null, numTurns: 0, durationMs: undefined, denials: 0, resultText: null })
+      }
     },
     end() {
       ended = true
+      turnActive = false
       queue.length = 0
       if (child) { try { child.kill() } catch { /* noop */ } }
       try { appServer?.end() } catch { /* noop */ }

package/package.json

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