thinkpool-pair 0.7.193 → 0.7.194

package/package.json

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

package/service.mjs

@@ -66,9 +66,30 @@ function npxPath(platform) {
   try { fs.accessSync(cand); return cand } catch { return platform === 'win32' ? 'npx.cmd' : 'npx' }
 }
 
+function npmPath(platform = process.platform) {
+  const bin = path.dirname(process.execPath)
+  const cand = path.join(bin, platform === 'win32' ? 'npm.cmd' : 'npm')
+  try { fs.accessSync(cand); return cand } catch { return platform === 'win32' ? 'npm.cmd' : 'npm' }
+}
+
+// Persistent services never execute through npx. Provision an immutable, versioned
+// runtime from the tarball URL (which bypasses stale npm packument metadata), then point
+// launchd/systemd directly at its bridge.mjs with the current Node binary.
+export function provisionRuntime(version, { exec = execSync } = {}) {
+  if (!/^\d+\.\d+\.\d+(?:[-+][0-9A-Za-z.-]+)?$/.test(String(version))) throw new Error(`invalid runtime version: ${version}`)
+  const dir = path.join(os.homedir(), '.thinkpool-pair', 'runtimes', String(version))
+  const entry = path.join(dir, 'node_modules', 'thinkpool-pair', 'bridge.mjs')
+  if (fs.existsSync(entry)) return entry
+  fs.mkdirSync(dir, { recursive: true })
+  const tarball = `https://registry.npmjs.org/thinkpool-pair/-/thinkpool-pair-${version}.tgz`
+  exec(`${shq(npmPath())} install --prefix ${shq(dir)} ${shq(tarball)} --prefer-online --no-audit --no-fund`, { stdio: 'inherit', shell: '/bin/bash' })
+  if (!fs.existsSync(entry)) throw new Error(`runtime install completed without ${entry}`)
+  return entry
+}
+
 // 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 = [], autoUpdate = false, version = VERSION, staleProof = false } = {}) {
+export function buildArtifact(platform, { room = null, cmdArgs = [], autoUpdate = false, version = VERSION, staleProof = false, runtimeEntry = null } = {}) {
   const npx = npxPath(platform)
   const cwd = process.cwd()
   const id = slug(room)
@@ -97,7 +118,9 @@ export function buildArtifact(platform, { room = null, cmdArgs = [], autoUpdate
   if (platform === 'darwin') {
     // launchd KeepAlive supervises. staleProof → wrap in a cache-wiping /bin/bash launch so
     // every (re)start re-fetches the pinned version fresh (deliberate-update path).
-    const args = staleProof
+    const args = runtimeEntry
+      ? [process.execPath, runtimeEntry, ...(room ? [room] : []), ...tail]
+      : staleProof
       ? ['/bin/bash', '-lc', `${cacheWipe('"$HOME"')}; exec ${[npx, ...pkgArgs, ...tail].map(shq).join(' ')}`]
       : [npx, ...pkgArgs, ...tail]
     const file = path.join(os.homedir(), 'Library', 'LaunchAgents', `${label(room)}.plist`)
@@ -153,11 +176,15 @@ export function buildArtifact(platform, { room = null, cmdArgs = [], autoUpdate
   }
 
   if (platform === 'linux') {
-    const args = [npx, ...pkgArgs, ...tail]   // systemd Restart=always supervises
+    const args = runtimeEntry
+      ? [process.execPath, runtimeEntry, ...(room ? [room] : []), ...tail]
+      : [npx, ...pkgArgs, ...tail]   // systemd Restart=always supervises
     const file = path.join(os.homedir(), '.config', 'systemd', 'user', `${label(room)}.service`)
     // staleProof → cache-wiping /bin/bash launch (same intent as darwin). `$$HOME` so systemd
     // emits a literal $HOME to bash rather than expanding it itself (empty + warning).
-    const execStart = staleProof
+    const execStart = runtimeEntry
+      ? args.map((a) => `'${a.replace(/'/g, "'\\''")}'`).join(' ')
+      : staleProof
       ? `/bin/bash -lc "${cacheWipe('$$HOME')}; exec ${[npx, ...pkgArgs, ...tail].join(' ')}"`
       : args.map((a) => `'${a.replace(/'/g, "'\\''")}'`).join(' ')
     const content = `[Unit]
@@ -192,7 +219,9 @@ WantedBy=default.target
     // so it gets login-persistence only — no in-process crash-restart on Windows.
     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
+    const inner = runtimeEntry
+      ? [process.execPath, runtimeEntry, ...(room ? [room, '--supervise'] : []), ...tail].map((s) => `"${s}"`).join(' ')
+      : room
       ? ['npx', '-y', ...onlineFlag, verSpec, room, '--supervise', ...tail].join(' ')
       : ['npx', '-y', ...onlineFlag, verSpec].join(' ')
     const content = `@echo off\r\ntitle thinkpool-pair ${id}\r\n${inner}\r\n`
@@ -299,7 +328,14 @@ export function sweepExistingServices(keepLabel, platform = process.platform) {
 // pinned version is fetched fresh on every (re)start. buildArtifact keeps staleProof=false
 // so its unit tests assert the pure pinned shape.
 export function installService(room, cmdArgs = [], { autoUpdate = false, version = VERSION, staleProof = true } = {}) {
-  const a = buildArtifact(process.platform, { room, cmdArgs, autoUpdate, version, staleProof })
+  // Pinned services get a stable local runtime. The legacy @latest opt-in keeps its
+  // existing npx behavior until it resolves a concrete version through updateService.
+  let runtimeEntry = null
+  if (!autoUpdate) {
+    try { runtimeEntry = provisionRuntime(version) }
+    catch (e) { process.stderr.write(`  ⚠ runtime install failed; service left unchanged: ${e.message}\n`); return false }
+  }
+  const a = buildArtifact(process.platform, { room, cmdArgs, autoUpdate, version, staleProof, runtimeEntry })
   // F4: clear every OTHER pre-existing pair service first, so only the one we install remains
   // (the "two account services live" storm trigger). Our own label is bootout+bootstrapped
   // by a.post below, so keep it.
@@ -323,10 +359,11 @@ export function installService(room, cmdArgs = [], { autoUpdate = false, version
     ? (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}${staleProof ? ' (stale-proof: every restart re-fetches it fresh, never a stale npx cache)' : ''} (safe default — a bad publish can't auto-roll to this always-on bridge). To update: use "Restart & update the bridge" (or re-run install-service from a newer thinkpool-pair). Pass --auto-update to track @latest instead.`
+    : `PINNED to ${version} (stable local runtime; restarts do not depend on npx or the network). To update: use "Restart & update the bridge" (or 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  ◆ ${updateNote}\n  ◆ logs: ${path.join(a.logDir, `${slug(room)}.log`)}\n  ◆ remove with: thinkpool-pair uninstall-service${removeArg}\n\n`)
+  return true
 }
 
 // Restart an already-installed boot-persistent service. launchd/systemd relaunch
@@ -376,8 +413,7 @@ export function updateService(room, { exec = execSync, install = installService,
     return false
   }
   process.stderr.write(`\n  ◆ updating the background service to v${target} and restarting…\n`)
-  install(room, [], { version: target, staleProof: true })
-  return true
+  return install(room, [], { version: target, staleProof: true }) !== false
 }
 
 // Ground truth: is the OS service manager ACTUALLY running our service right now?