thinkpool-pair 0.7.270 → 0.7.272

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.272",
   "description": "Share a local coding-agent CLI (Claude Code, Codex, Gemini, Aider, …) into a ThinkPool Code room, live.",
   "type": "module",
   "bin": {

package/thinkpool-capabilities.json

@@ -1,6 +1,6 @@
 {
   "schemaVersion": 1,
-  "bundleVersion": 2,
+  "bundleVersion": 3,
   "contracts": [
     {
       "id": "room-coordination",
@@ -161,17 +161,17 @@
     },
     {
       "id": "design-workspace",
-      "version": 1,
-      "interactionPrompt": "DESIGN EDITING MODEL: a trusted source-backed mockup card offers Work on design. That explicit action—not ordinary Preview or unrelated artifact delivery—arms a persistent room-level Design workspace, opens the artifact directly in editable mode, and adds Design · Page name as a virtual Ensemble lane for both partners; it creates no terminal, agent runtime, or worker slot. Once armed, the Design lane reopens the active artifact at its latest verified revision without another agent turn, history search, HTML/path request, or re-selection. Design is the default canvas there and Preview is only a temporary interaction mode. Direct text, supported movement, and selected-image changes auto-stage as optimistic drafts in the bounded changes queue. Apply changes sends the ordered batch once to the producing lane, that lane edits the canonical authored HTML, and a successful desktop+mobile render advances the verified revision for the room. Never call a staged draft saved or live. A preview_capture card is visual evidence, not an editable Design artifact.",
-      "turnReminder": "DESIGN ROUTE: authored HTML must produce a source-backed Thinkpool Design card with verified desktop and mobile renders. Work on design explicitly arms the persistent Design workspace and adds its virtual Design · Page Ensemble lane; Preview alone does not arm it. Do not duplicate the card renders as inline PNGs. Use inline PNG evidence only when no interactive Design artifact is available.",
+      "version": 2,
+      "interactionPrompt": "DESIGN EDITING MODEL: a trusted source-backed mockup card offers Edit in Design. That explicit action—not ordinary Preview or unrelated artifact delivery—arms a persistent room-level Design workspace, opens the artifact directly in editable mode, and adds Design · Page name as a virtual Ensemble lane for both partners; it creates no terminal, agent runtime, or worker slot. Once armed, the Design lane reopens the active artifact at its latest verified revision without another agent turn, history search, HTML/path request, or re-selection. Design is the default canvas there and Preview is only a temporary interaction mode. Direct text, supported movement, and selected-image changes auto-stage as optimistic drafts in the bounded changes queue. Apply changes sends the ordered batch once to the producing lane, that lane edits the canonical authored HTML, and a successful desktop+mobile render advances the verified revision for the room. Never call a staged draft saved or live. A preview_capture card is visual evidence, not an editable Design artifact.",
+      "turnReminder": "DESIGN ROUTE: authored HTML must produce a source-backed Thinkpool Design card with verified desktop and mobile renders. Edit in Design explicitly arms the persistent Design workspace and adds its virtual Design · Page Ensemble lane; Preview alone does not arm it. Do not duplicate the card renders as inline PNGs. Use inline PNG evidence only when no interactive Design artifact is available.",
       "impact": [
         {"path": "src/pages/code/design/"},
-        {"path": "src/pages/code/structured.jsx", "diffPattern": "Work on design|openMockup|tp-mockup-view|sourceKnown"},
+        {"path": "src/pages/code/structured.jsx", "diffPattern": "Edit in Design|openMockup|tp-mockup-view|sourceKnown"},
         {"path": "src/pages/code/room.jsx", "diffPattern": "designWorkspace|designLane|activeDesign|DesignViewer"},
         {"path": "bridge/design-edit.mjs"}
       ],
       "evidence": [
-        {"path": "src/pages/code/structured.jsx", "pattern": "Work on design"},
+        {"path": "src/pages/code/structured.jsx", "pattern": "Edit in Design"},
         {"path": "src/pages/code/design/workspace.js", "pattern": "armed: true"},
         {"path": "src/pages/code/room.jsx", "pattern": "designLaneSelected"},
         {"path": "src/pages/code/design/DesignViewer.jsx", "pattern": "createPortal\\(surface, laneHost\\)"},