thinkpool-pair 0.7.10 → 0.7.12

package/bridge.mjs

@@ -36,7 +36,7 @@ import { spawn } from 'node:child_process'
 import { randomUUID } from 'node:crypto'
 import { createClient } from '@supabase/supabase-js'
 import { startClaudeSession } from './claude-session.mjs'
-import { saveSession, flushSession, loadLatest, canResume } from './session-store.mjs'
+import { saveSession, flushSession, loadLatest, canResume, loadPtyId, savePtyId } from './session-store.mjs'
 
 // Public client creds (the same anon values the web app ships — safe to embed).
 // Override with TP_SUPABASE_URL / TP_SUPABASE_ANON if you ever need to.
@@ -205,6 +205,15 @@ const askYesNo = (q, defaultYes = true) => new Promise((resolve) => {
 let attachedCmd = null, attachedArgs = [], continuing = false
 if (dashIdx >= 0) {
   ;[attachedCmd, ...attachedArgs] = argv.slice(dashIdx + 1)
+  // A token after `--` that's itself a flag (e.g. `-- --headless`) is a
+  // mis-placed own-flag, not a command to share — own-flags are already parsed
+  // from the full argv above, regardless of `--` position. Refuse to treat it
+  // as a command, else the subscribe handler auto-opens a junk PTY literally
+  // running `--headless` that immediately goes dormant (Maxbridge Main, 2026-06-17).
+  if (attachedCmd && attachedCmd.startsWith('-')) {
+    process.stderr.write(`\n  ◇ ignoring "${attachedCmd}" after \`--\` — that's a flag, not a command to share.\n`)
+    attachedCmd = null; attachedArgs = []
+  }
 } else if (!headless) {
   if (installedAgents.length === 0) {
     console.error(`\n  No known coding-agent CLI found on your PATH.\n  Install one (claude / codex / gemini / aider / cursor-agent / opencode …)\n  or share a specific command:  npx thinkpool-pair ${room} -- <your-command>\n`)
@@ -774,7 +783,14 @@ channel
           if (prev && (prev.log?.length || prev.sessionId)) openStructured({ id: prev.id, resume: canResume(prev) ? prev.sessionId : undefined, log: prev.log, commands: prev.commands, mode: prev.mode })
           else openStructured({ id: randomUUID() })
         }
-        else openTerm({ id: randomUUID(), cmd: startCmd, args: attachedArgs, attached: !autoAgent })
+        else {
+          // Reuse the prior auto-opened PTY id across restarts so a reconnecting
+          // bridge re-attaches to the SAME terminal tab instead of breeding a
+          // fresh dormant "Terminal N" on every reconnect.
+          const ptyId = loadPtyId(room) || randomUUID()
+          savePtyId(room, ptyId)
+          openTerm({ id: ptyId, cmd: startCmd, args: attachedArgs, attached: !autoAgent })
+        }
       }
       announce()
       process.stderr.write(headless

package/claude-session.mjs

@@ -162,6 +162,19 @@ export function startClaudeSession({ cwd, model, resume, mode: initialMode = 'de
     // (deny → stay planning). On approval we flip the SDK permission mode so
     // subsequent tools actually execute.
     if (toolName === 'ExitPlanMode') {
+      // GUARANTEE: a plan card only ever appears when the room is ACTUALLY in Plan
+      // mode (the user pressed ⇧⇥ → Plan). If the agent reaches ExitPlanMode while
+      // the room is in any other mode (default / acceptEdits / bypassPermissions),
+      // it entered plan mode on its own — the user never asked. Don't surface an
+      // unsolicited "PLAN READY" card that blocks them; re-assert the room's real
+      // mode and let the work proceed. This is the backstop for plan-mode leaking
+      // in regardless of source (sticky localStorage, SDK default, a host-global
+      // brainstorm nudge): in a ThinkPool room, plan is opt-in, never imposed.
+      if (mode !== 'plan') {
+        scheduleSdkMode(mode)        // snap the SDK back out of plan, into the real mode
+        emit({ kind: 'mode', mode }) // keep the room chip honest
+        return { continue: true, hookSpecificOutput: { hookEventName: 'PreToolUse', permissionDecision: 'allow', permissionDecisionReason: `The ThinkPool room is in ${mode} mode, not Plan — the user did not ask for a plan. Do NOT call ExitPlanMode; proceed and make the changes directly. Only present a plan if the user switches the room to Plan mode or explicitly asks.` } }
+      }
       let choice = 'keep'
       try { choice = await requestPermission?.({ id: randomUUID(), toolName, input: toolInput, risk: 'plan', plan: toolInput?.plan || '' }) ?? 'keep' }
       catch { choice = 'keep' }

package/package.json

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

package/session-store.mjs

@@ -55,3 +55,15 @@ export function loadLatest(room) {
 export function canResume(rec) {
   return !!(rec && rec.sessionId && rec.savedAt && (Date.now() - rec.savedAt) < RESUME_MAX_AGE_MS)
 }
+
+// Last PTY terminal id auto-opened for an attached command. A reconnecting
+// bridge reuses it so it re-attaches to the SAME terminal tab instead of
+// minting a fresh UUID and breeding a new dormant "Terminal N" each restart.
+// Stored as a dotfile (NOT *.json) so it never lands in listRecs/loadLatest.
+const ptyFile = (room) => path.join(dir(room), '.pty-id')
+export function loadPtyId(room) {
+  try { return fs.readFileSync(ptyFile(room), 'utf8').trim() || null } catch { return null }
+}
+export function savePtyId(room, id) {
+  try { ensureDir(room); fs.writeFileSync(ptyFile(room), String(id)) } catch { /* noop */ }
+}