thinkpool-pair 0.7.49 → 0.7.51

package/bridge.mjs

@@ -142,16 +142,6 @@ if (argv[0] === 'install-service' || argv[0] === 'uninstall-service') {
   process.exit(0)
 }
 
-// Restart an installed boot-persistent service (re-fetches @latest, sessions resume):
-// `thinkpool-pair restart-service [<ROOM>]` — no room → the account service.
-if (argv[0] === 'restart-service') {
-  const arg1 = argv[1] || ''
-  const svcRoom = (!arg1 || arg1.startsWith('-')) ? null : arg1.toUpperCase().trim()
-  const svc = await import('./service.mjs')
-  svc.restartService(svcRoom)
-  process.exit(0)
-}
-
 // Account mode (Phase 1, docs/specs/2026-06-16-account-bridge.md): one bridge per
 // ACCOUNT, not per room. `login` links this device; `bind <ROOM> <dir>` maps a
 // session to a working dir on this machine; a bare invocation discovers + serves
@@ -195,12 +185,8 @@ if ((!argv[0] || argv[0] === 'setup') && process.stdin.isTTY) {
       child.on('exit', (code) => process.exit(code == null ? 0 : code))
     }),
     serveAccountForeground: async () => { const { runAccount } = await import('./account.mjs'); await runAccount(SUPABASE_URL, SUPABASE_ANON) },
-    // install / uninstall / restart are NOT terminal anymore — they do their work,
-    // print their notes, and RETURN so the launcher loop drops you back at the menu
-    // (the service runs in its own launchd/systemd process; this launcher isn't a bridge).
-    installService: ({ room = null, agentCmd } = {}) => { svc.installService(room, agentCmd ? [agentCmd] : []) },
-    uninstallService: ({ room = null } = {}) => { svc.uninstallService(room) },
-    restartService: ({ room = null } = {}) => { svc.restartService(room) },
+    installService: ({ room = null, agentCmd } = {}) => { svc.installService(room, agentCmd ? [agentCmd] : []); process.exit(0) },
+    uninstallService: ({ room = null } = {}) => { svc.uninstallService(room); process.exit(0) },
     login: async () => { const { runLogin } = await import('./account.mjs'); await runLogin(SUPABASE_URL, SUPABASE_ANON, WEB_BASE) },
     // Provider config is NOT terminal — it writes provider.json and returns to the
     // menu so you can pick a model, switch back, or do something else. (It used to
@@ -667,6 +653,22 @@ function pushLog(entry, evt) {
   return evt
 }
 
+// Resume-idle guard (2026-06-22 cooked-terminal bug): a turn force-killed mid-flight
+// leaves the restored log ending on in-flight events (assistant/you/tool_result) with
+// NO terminal `result`, so the web reads it as "thinking" forever AND Stop is a no-op
+// (the freshly-resumed SDK session has no live turn to interrupt — q.interrupt() on an
+// idle query does nothing). Mirror of the client working-scan in
+// src/pages/code/structured.jsx: walking back from the end, a result/error/propose/pool
+// closes the turn; an assistant/you/tool_result reached first means it's still open.
+function restoredTurnOpen(log) {
+  for (let i = log.length - 1; i >= 0; i--) {
+    const k = log[i]?.kind
+    if (k === 'result' || k === 'error' || k === 'propose' || k === 'pool') return false
+    if (k === 'assistant' || k === 'you' || k === 'tool_result') return true
+  }
+  return false
+}
+
 // The Phase-2 path: instead of a PTY, run Claude Code through the Agent SDK and
 // relay STRUCTURED events. onEvent → broadcast `code-event` + print locally +
 // persist to the host file; tool calls round-trip through the perm card; the
@@ -680,6 +682,15 @@ function openStructured({ id, model, resume, log, commands, mode }) {
   // event-id.mjs + src/pages/code/seqDedup.js). pushLog() is the single stamp point.
   entry.seq = makeSeqCounter(maxSeq(entry.log))
   sessions.set(id, entry)
+  // Close an interrupted turn so a restored terminal comes back IDLE-with-history
+  // instead of stuck "thinking" (see restoredTurnOpen). Idempotent: the closer is
+  // persisted, so a later resume sees a closed turn and no-ops.
+  if (entry.log.length && restoredTurnOpen(entry.log)) {
+    const closer = { kind: 'result', subtype: 'aborted', recovered: true }
+    stampEvent(closer)
+    pushLog(entry, closer)
+    process.stderr.write(`\n  ◆ closed an interrupted turn on resume (${id.slice(0, 8)}) — restored idle.\n`)
+  }
   // This session's private mockup outbox — render.sh writes manifests here (via
   // TP_MOCKUP_OUTBOX below) and the watcher attributes every card to THIS id, so
   // they land on this session even after other terminals open/close.

package/claude-session.mjs

@@ -361,8 +361,7 @@ export function startClaudeSession({ cwd, model, resume, env, mode: initialMode
   // alone defers to the server-side `tengu_prompt_suggestion` feature gate, which
   // Anthropic flips on/off during rollout — so the ghost-text chip silently died
   // mid-day with NO change on our side. CLAUDE_CODE_ENABLE_PROMPT_SUGGESTION is the
-  // documented override (the SDK docs name `=false` as the kill switch; `=1` forces
-  // on past the gate). opts.env REPLACES the child env, so spread the inherited one.
+  // documented override. opts.env REPLACES the child env, so spread the inherited one.
   opts.env = { ...(env || process.env), CLAUDE_CODE_ENABLE_PROMPT_SUGGESTION: '1' }
 
   // Before the SDK replays this transcript, heal any cross-provider tool blocks
@@ -473,15 +472,9 @@ export function startClaudeSession({ cwd, model, resume, env, mode: initialMode
             // Claude Code's own predicted next prompt (promptSuggestions opt-in).
             // Arrives once per turn AFTER `result`; surfaced verbatim as ephemeral
             // chrome (a ghost-text chip in the room composer), never persisted.
-            process.stderr.write(`\n  ◆ [suggestion] received: ${JSON.stringify(m.suggestion ?? null)}\n`)
             if (m.suggestion) emit({ kind: 'suggestion', text: m.suggestion })
             break
           default:
-            // Debug: log any unhandled message type so we can see if prompt_suggestion
-            // is arriving under a different name. Remove once confirmed working.
-            if (m.type && !['stream_event', 'user', 'agent_metadata'].includes(m.type)) {
-              process.stderr.write(`  [debug] unhandled sdk msg type=${m.type}${m.suggestion ? ` (HAS .suggestion=${JSON.stringify(m.suggestion)})` : ''}\n`)
-            }
             break
         }
       }
@@ -541,12 +534,11 @@ export function startClaudeSession({ cwd, model, resume, env, mode: initialMode
     async abort() {
       try { await q?.interrupt?.() } catch { /* noop */ }
       // interrupt() stops the turn but emits NO terminal message. Without one the
-      // struct event stream ends on a non-terminal event, so a page refresh replays
-      // it as still "thinking" (the client's optimistic stop is in-memory only and is
-      // lost on reload). Emit a terminal result so busy clears AND persists across
-      // refresh — the client persists on `result` and structWorkingFor() treats it as
-      // done. Guarded on turnActive so we don't double-emit if the SDK already
-      // surfaced a result for the interrupt. (2026-06-22)
+      // struct stream ends on a non-terminal event, so on resume the SDK treats the
+      // turn as INCOMPLETE and auto-continues it — the 2026-06-22 "zombie turn that
+      // resumes itself" storm. Emit a terminal result so the turn is marked DONE +
+      // persists across refresh. Guarded on turnActive to avoid a double-emit if the
+      // SDK already surfaced one for the interrupt. (restored from 0.7.49)
       if (turnActive) { turnActive = false; emit({ kind: 'result', subtype: 'aborted', sessionId }) }
     },
     end() { closed = true; clearInterval(stallTimer); input.end(); try { ac.abort() } catch { /* noop */ } },

package/launcher.mjs

@@ -125,10 +125,8 @@ export async function runLauncher({ actions, io, state = detectState(), refresh
     const how = await askChoice('run it', [
       { label: 'As an always-on background service', hint: 'recommended — survives reboot, auto-updates' },
       { label: 'Here in this terminal (foreground)', hint: 'stops when you close it' },
-      { label: '← Back to main menu', hint: '' },
     ])
-    if (how === 2) return
-    if (how === 0) { await actions.installService({ room: null }); resync() }
+    if (how === 0) await actions.installService({ room: null })
     else await actions.serveAccountForeground()
   }
 
@@ -136,17 +134,15 @@ export async function runLauncher({ actions, io, state = detectState(), refresh
     const what = await askChoice('install for', [
       { label: 'All my sessions (account)', hint: state.loggedIn ? '' : 'needs login first' },
       { label: 'One specific room', hint: 'no login needed' },
-      { label: '← Back to main menu', hint: '' },
     ])
-    if (what === 2) return
     if (what === 0) {
       if (!state.loggedIn) { io.print('\n  ' + C.yellow('Account service needs a login first (pick “Serve all my sessions”).')); return }
-      await actions.installService({ room: null }); resync(); return
+      await actions.installService({ room: null }); return
     }
-    const room = (await io.ask(`\n  Room code ${C.dim('(blank to go back)')} ${C.cyan('▸')} `)).toUpperCase().trim()
+    const room = (await io.ask(`\n  Room code ${C.cyan('▸')} `)).toUpperCase().trim()
     if (!room) { io.print('  ' + C.yellow('no room — back to menu')); return }
     const agent = state.agents[0] || { cmd: 'claude' }
-    await actions.installService({ room, agentCmd: agent.cmd }); resync()
+    await actions.installService({ room, agentCmd: agent.cmd })
   }
 
   const providerMenu = async () => {
@@ -174,49 +170,39 @@ export async function runLauncher({ actions, io, state = detectState(), refresh
       const pick = await askChoice('\n  change', [
         { label: 'LLM provider', hint: `current: ${state.provider}` },
         { label: 'Account', hint: state.loggedIn ? `linked: ${state.email || 'yes'}` : 'not linked' },
-        { label: 'Restart the background service', hint: state.accountSvc ? 'apply the latest update now' : 'none installed' },
         { label: 'Remove the background service', hint: state.accountSvc ? '' : 'none installed' },
         { label: '← Back to main menu', hint: '' },
-      ], 5)  // Enter = Back
-      if (pick === 4) return
+      ], 4)  // Enter = Back
+      if (pick === 3) return
       if (pick === 0) await providerMenu()
       else if (pick === 1) { await actions.login(); resync(); return }
-      else if (pick === 2) {
-        if (state.accountSvc) { await actions.restartService({ room: null }); resync() }
-        else io.print('  ' + C.yellow('no background service installed'))
-      }
       else {
-        if (state.accountSvc) { await actions.uninstallService({ room: null }); resync() }
+        if (state.accountSvc) await actions.uninstallService({ room: null })
         else io.print('  ' + C.yellow('no background service installed'))
       }
     }
   }
 
   // ── menu loop ──
-  // pairRoom re-execs + waits, and account-foreground runs forever, so those choices
-  // never return here. Everything else (install / restart / uninstall / settings /
-  // provider) just does its work, prints its notes, and RETURNS — so the loop always
-  // drops you back at the menu. Submenus carry a "← Back" so you can bail at any point.
-  // The trailing "press Enter" lands on every returning path.
+  // Real actions either replace the process (pairRoom re-execs + waits; serve/install
+  // call process.exit) or run forever (account foreground), so a real "do something"
+  // choice never returns here. Dry-run/mock actions just print + return → the loop
+  // re-renders. The "press Enter" only lands on a no-op / back-out path.
   for (;;) {
     header()
     io.print('  ' + C.bold('What do you want to do?') + '\n')
-    // Built per-render so the contextual "Restart" only appears once a service exists.
-    const items = [
-      { key: 'pair',    label: 'Pair one room now', hint: 'run here, Ctrl-C stops it' },
-      { key: 'serve',   label: 'Serve all my sessions', hint: 'account mode — needs login' },
-      { key: 'service', label: 'Always-on background service', hint: 'survives reboot, auto-updates' },
-    ]
-    if (state.accountSvc) items.push({ key: 'restart', label: 'Restart the background service', hint: 'apply the latest update now' })
-    items.push({ key: 'settings', label: 'Settings', hint: 'provider · account · restart · remove service' })
-    items.push({ key: 'quit', label: 'Quit', hint: '' })
-    const pick = items[await askChoice('choose', items)]
-    if (pick.key === 'quit') return
-    if (pick.key === 'pair') await pairRoom()
-    else if (pick.key === 'serve') await serveAccount()
-    else if (pick.key === 'service') await serviceMenu()
-    else if (pick.key === 'restart') { await actions.restartService({ room: null }); resync() }
-    else if (pick.key === 'settings') await settingsMenu()
+    const choice = await askChoice('choose', [
+      { label: 'Pair one room now', hint: 'run here, Ctrl-C stops it' },
+      { label: 'Serve all my sessions', hint: 'account mode — needs login' },
+      { label: 'Always-on background service', hint: 'survives reboot, auto-updates' },
+      { label: 'Settings', hint: 'provider · account · remove service' },
+      { label: 'Quit', hint: '' },
+    ])
+    if (choice === 4) return  // Quit
+    if (choice === 0) await pairRoom()
+    else if (choice === 1) await serveAccount()
+    else if (choice === 2) await serviceMenu()
+    else if (choice === 3) await settingsMenu()
     await io.ask('\n  ' + C.dim('press Enter to return to the menu…'))
   }
 }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "thinkpool-pair",
-  "version": "0.7.49",
+  "version": "0.7.51",
   "description": "Share a local coding-agent CLI (Claude Code, Codex, Gemini, Aider, …) into a ThinkPool Code room, live.",
   "type": "module",
   "bin": {
@@ -27,7 +27,7 @@
     "node": ">=18"
   },
   "dependencies": {
-    "@anthropic-ai/claude-agent-sdk": "^0.3.185",
+    "@anthropic-ai/claude-agent-sdk": "0.3.185",
     "@supabase/supabase-js": "^2.45.0"
   },
   "optionalDependencies": {

package/service.mjs

@@ -126,40 +126,12 @@ export function installService(room, cmdArgs = []) {
   const idleSecs = Math.max(10, parseInt(process.env.THINKPOOL_PAIR_UPDATE_IDLE, 10) || 90)
   const autoUpdate = process.platform === 'win32'
     ? 'auto-update: a new thinkpool-pair@latest applies on the next login/restart (Windows has no in-process self-update).'
-    : `auto-update: checks npm ~every 30 min and restarts to apply a new version once sessions are idle (≥${idleSecs}s quiet; they resume in place). Not instant — to update now, restart it (pick “Restart the background service” in the menu, run 'thinkpool-pair restart-service${slug(room) === 'account' ? '' : ' ' + room}', or 'launchctl kickstart -k gui/$(id -u)/io.thinkpool.pair.${slug(room)}' on macOS).`
+    : `auto-update: checks npm ~every 30 min and restarts to apply a new version once sessions are idle (≥${idleSecs}s quiet; they resume in place). Not instant — to update now, restart it (re-run install-service, or 'launchctl kickstart -k gui/$(id -u)/io.thinkpool.pair.${slug(room)}' on macOS).`
   const removeArg = room ? ` ${room}` : ''
   const what = room ? `room ${room}` : 'your account (auto-serves every session)'
   process.stderr.write(`  ◆ ${what}\n  ◆ ${a.note}\n  ◆ ${autoUpdate}\n  ◆ logs: ${path.join(a.logDir, `${slug(room)}.log`)}\n  ◆ remove with: thinkpool-pair uninstall-service${removeArg}\n\n`)
 }
 
-// Restart an already-installed boot-persistent service so it re-resolves
-// thinkpool-pair@latest right now — the supported "apply the update now" path.
-// launchd/systemd relaunch `npx … @latest`, so a just-published version is picked
-// up; any active session resumes in place (the bridge restores from disk).
-// room falsy → the ACCOUNT service. Returns true on success.
-export function restartService(room) {
-  const plat = process.platform
-  if (!isServiceInstalled(room)) {
-    process.stderr.write('  ⚠ no background service installed to restart — install one first.\n')
-    return false
-  }
-  const id = label(room)
-  try {
-    if (plat === 'darwin') execSync(`launchctl kickstart -k gui/$(id -u)/${id}`, { stdio: 'inherit' })
-    else if (plat === 'linux') execSync(`systemctl --user restart ${id}.service`, { stdio: 'inherit' })
-    else {
-      // Windows Startup .cmd has no managed daemon to kick — guide the manual path.
-      process.stderr.write('  ⚠ Windows has no managed daemon — close the running thinkpool-pair window and re-launch the Startup .cmd (or reboot) to restart.\n')
-      return false
-    }
-    process.stderr.write(`  ◆ restarted ${id} — it re-fetches thinkpool-pair@latest; any active session resumes in place.\n`)
-    return true
-  } catch (e) {
-    process.stderr.write(`  ⚠ restart failed: ${e.message}\n`)
-    return false
-  }
-}
-
 // Is a boot-persistent service already installed? (artifact file present.)
 // room falsy → checks the ACCOUNT service. Lets the main run skip the offer +
 // avoid starting a second bridge that would race the service.