thinkpool-pair 0.7.50 → 0.7.52

package/bridge.mjs

@@ -136,8 +136,11 @@ if (argv[0] === 'install-service' || argv[0] === 'uninstall-service') {
   const svcRoom = account ? null : arg1.toUpperCase().trim()
   const sd = argv.indexOf('--')
   const svcCmd = sd >= 0 ? argv.slice(sd + 1) : []
+  // PINNED to the installed version by default (a bad publish can't auto-roll to the
+  // always-on service); --auto-update opts into @latest tracking. (2026-06-22)
+  const autoUpdate = argv.includes('--auto-update')
   const svc = await import('./service.mjs')
-  if (argv[0] === 'install-service') svc.installService(svcRoom, svcCmd)
+  if (argv[0] === 'install-service') svc.installService(svcRoom, svcCmd, { autoUpdate })
   else svc.uninstallService(svcRoom)
   process.exit(0)
 }
@@ -653,6 +656,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
@@ -666,6 +685,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/package.json

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

package/service.mjs

@@ -28,6 +28,12 @@ const label = (room) => room ? `io.thinkpool.pair.${room.toLowerCase()}` : 'io.t
 const slug = (room) => room || 'account'
 const xml = (s) => String(s).replace(/&/g, '&amp;').replace(/</g, '&lt;').replace(/>/g, '&gt;')
 
+// The version installing the service. By DEFAULT the service is pinned to this exact
+// version (not @latest) so a future bad npm publish can't auto-roll to every machine's
+// always-on bridge — that's what spread the broken 0.7.49 on 2026-06-22. Updates become
+// deliberate (re-run install-service). `--auto-update` opts back into @latest tracking.
+const VERSION = (() => { try { return JSON.parse(fs.readFileSync(new URL('./package.json', import.meta.url), 'utf8')).version } catch { return 'latest' } })()
+
 // Resolve the real npx next to the current node, so the service stays seamless:
 // it runs `npx -y thinkpool-pair@latest …`, always picking up the newest publish
 // with no re-install. Absolute path + injected PATH so it works under launchd /
@@ -40,7 +46,7 @@ function npxPath(platform) {
 
 // Pure artifact builder — returned shape is testable without side effects.
 // room falsy → ACCOUNT service (bare `thinkpool-pair`, auto-serves all sessions).
-export function buildArtifact(platform, { room = null, cmdArgs = [] } = {}) {
+export function buildArtifact(platform, { room = null, cmdArgs = [], autoUpdate = false } = {}) {
   const npx = npxPath(platform)
   const cwd = process.cwd()
   const id = slug(room)
@@ -48,10 +54,15 @@ export function buildArtifact(platform, { room = null, cmdArgs = [] } = {}) {
   const log = path.join(logDir, `${id}.log`)
   const tail = cmdArgs.length ? ['--', ...cmdArgs] : []
   const desc = room ? `bridge (${room})` : 'account bridge'
-  // OS-supervised tiers (launchd KeepAlive / systemd Restart) don't need
-  // --supervise; the latest published bridge is fetched by npx each (re)start.
-  // Account mode passes NO room arg — that's what selects the account supervisor.
-  const pkgArgs = room ? ['-y', 'thinkpool-pair@latest', room] : ['-y', 'thinkpool-pair@latest']
+  // OS-supervised tiers (launchd KeepAlive / systemd Restart) don't need --supervise.
+  // PINNED by default to `@${VERSION}` so a KeepAlive restart re-runs the SAME known-good
+  // version — a bad publish can't auto-roll here. `autoUpdate` opts into `@latest` tracking
+  // (and the in-process self-updater via THINKPOOL_PAIR_AUTOUPDATE below).
+  const verSpec = autoUpdate ? 'thinkpool-pair@latest' : `thinkpool-pair@${VERSION}`
+  const pkgArgs = room ? ['-y', verSpec, room] : ['-y', verSpec]
+  // In-process self-update (account.mjs / bridge.mjs) is gated on this env — only on when
+  // the user explicitly opted into auto-update.
+  const autoUpdateEnv = autoUpdate ? { THINKPOOL_PAIR_AUTOUPDATE: '1' } : {}
 
   if (platform === 'darwin') {
     const args = [npx, ...pkgArgs, ...tail]   // launchd KeepAlive supervises
@@ -66,7 +77,7 @@ export function buildArtifact(platform, { room = null, cmdArgs = [] } = {}) {
   <key>WorkingDirectory</key><string>${xml(cwd)}</string>
   <key>StandardOutPath</key><string>${xml(log)}</string>
   <key>StandardErrorPath</key><string>${xml(log)}</string>
-  <key>EnvironmentVariables</key><dict><key>PATH</key><string>${xml(process.env.PATH || '')}</string><key>THINKPOOL_PAIR_AUTOUPDATE</key><string>1</string></dict>
+  <key>EnvironmentVariables</key><dict><key>PATH</key><string>${xml(process.env.PATH || '')}</string>${autoUpdate ? '<key>THINKPOOL_PAIR_AUTOUPDATE</key><string>1</string>' : ''}</dict>
 </dict></plist>\n`
     return { file, content, logDir, post: [`launchctl unload "${file}" 2>/dev/null; launchctl load "${file}"`], note: 'Loaded as a LaunchAgent — starts at login, restarts on crash.' }
   }
@@ -84,8 +95,7 @@ Restart=always
 RestartSec=2
 WorkingDirectory=${cwd}
 Environment=PATH=${process.env.PATH || ''}
-Environment=THINKPOOL_PAIR_AUTOUPDATE=1
-StandardOutput=append:${log}
+${autoUpdate ? 'Environment=THINKPOOL_PAIR_AUTOUPDATE=1\n' : ''}StandardOutput=append:${log}
 StandardError=append:${log}
 
 [Install]
@@ -102,8 +112,8 @@ WantedBy=default.target
     const startup = path.join(process.env.APPDATA || path.join(os.homedir(), 'AppData', 'Roaming'), 'Microsoft', 'Windows', 'Start Menu', 'Programs', 'Startup')
     const file = path.join(startup, `thinkpool-pair-${id}.cmd`)
     const inner = room
-      ? ['npx', '-y', 'thinkpool-pair@latest', room, '--supervise', ...tail].join(' ')
-      : ['npx', '-y', 'thinkpool-pair@latest'].join(' ')
+      ? ['npx', '-y', verSpec, room, '--supervise', ...tail].join(' ')
+      : ['npx', '-y', verSpec].join(' ')
     const content = `@echo off\r\ntitle thinkpool-pair ${id}\r\n${inner}\r\n`
     return { file, content, logDir, post: [], note: 'Installed to the Startup folder — runs at login' + (room ? ' with --supervise (auto-restart on crash).' : ' (account mode).') + ' Start it now without rebooting by double-clicking the .cmd, or run it from a terminal.' }
   }
@@ -111,8 +121,8 @@ WantedBy=default.target
   throw new Error(`unsupported platform: ${platform}`)
 }
 
-export function installService(room, cmdArgs = []) {
-  const a = buildArtifact(process.platform, { room, cmdArgs })
+export function installService(room, cmdArgs = [], { autoUpdate = false } = {}) {
+  const a = buildArtifact(process.platform, { room, cmdArgs, autoUpdate })
   fs.mkdirSync(a.logDir, { recursive: true })
   fs.mkdirSync(path.dirname(a.file), { recursive: true })
   fs.writeFileSync(a.file, a.content)
@@ -124,12 +134,14 @@ export function installService(room, cmdArgs = []) {
   // roughly every 30 min (THINKPOOL_PAIR_UPDATE_INTERVAL) and only restarts once
   // every served session is idle, so a just-published version can take a while.
   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 (re-run install-service, or 'launchctl kickstart -k gui/$(id -u)/io.thinkpool.pair.${slug(room)}' on macOS).`
+  const updateNote = autoUpdate
+    ? (process.platform === 'win32'
+        ? 'auto-update ON: a new thinkpool-pair@latest applies on the next login/restart (Windows has no in-process self-update).'
+        : `auto-update ON: checks npm ~every 30 min and restarts to apply a new @latest once sessions are idle (≥${idleSecs}s quiet; they resume in place).`)
+    : `PINNED to ${VERSION} (safe default — a bad publish can't auto-roll to this always-on bridge). To update: re-run install-service from a newer thinkpool-pair. Pass --auto-update to track @latest instead.`
   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`)
+  process.stderr.write(`  ◆ ${what}\n  ◆ ${a.note}\n  ◆ ${updateNote}\n  ◆ logs: ${path.join(a.logDir, `${slug(room)}.log`)}\n  ◆ remove with: thinkpool-pair uninstall-service${removeArg}\n\n`)
 }
 
 // Is a boot-persistent service already installed? (artifact file present.)