thinkpool-pair 0.7.72 → 0.7.74

package/launcher.mjs

@@ -13,6 +13,7 @@
 import os from 'node:os'
 import fs from 'node:fs'
 import path from 'node:path'
+import { execSync } from 'node:child_process'
 
 const HOME = os.homedir()
 const CFG_DIR = path.join(HOME, '.thinkpool-pair')
@@ -48,6 +49,18 @@ function serviceFile(room) {
   return path.join(startup, `thinkpool-pair-${room || 'account'}.cmd`)
 }
 
+// Ground truth for the header: is the service actually LOADED, not just a plist on disk?
+// `launchctl load` can silently no-op, leaving a plist that never loads — file-existence
+// would report "installed" while the bridge is off (the 2026-06-26 bug). Query the manager.
+function serviceLoaded(room) {
+  const label = room ? `io.thinkpool.pair.${room.toLowerCase()}` : 'io.thinkpool.pair.account'
+  try {
+    if (process.platform === 'darwin') { execSync(`launchctl print gui/$(id -u)/${label}`, { stdio: 'ignore' }); return true }
+    if (process.platform === 'linux')  { execSync(`systemctl --user is-active --quiet ${label}.service`); return true }
+    return fs.existsSync(serviceFile(room)) // Windows: no daemon, file presence is the only proxy
+  } catch { return false }
+}
+
 export function detectState() {
   const auth = readJson(path.join(CFG_DIR, 'auth.json'))
   const provider = readJson(path.join(CFG_DIR, 'provider.json'))
@@ -60,7 +73,7 @@ export function detectState() {
     provider: isCustom ? `Custom (${provider.baseUrl || 'endpoint'})` : 'Anthropic (default)',
     providerModel: isCustom ? (provider.model || null) : null,
     agents: KNOWN_AGENTS.filter(a => onPath(a.cmd)),
-    accountSvc: fs.existsSync(serviceFile(null)),
+    accountSvc: serviceLoaded(null),
     cwd: process.cwd(),
   }
 }

package/package.json

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

package/service.mjs

@@ -79,7 +79,24 @@ export function buildArtifact(platform, { room = null, cmdArgs = [], autoUpdate
   <key>StandardErrorPath</key><string>${xml(log)}</string>
   <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.' }
+    // Modern bootstrap/enable, NOT the deprecated `launchctl load`. On current macOS
+    // (Darwin 24/25) `load` silently no-ops for a GUI LaunchAgent — the plist lands on
+    // disk but never loads, so the bridge is "installed" yet off (the 2026-06-26 bug).
+    // Sequence: bootout any existing instance (idempotent reinstall) → WAIT for it to
+    // actually leave the domain (bootout is async; bootstrapping while teardown is in
+    // flight throws "Bootstrap failed: 5: Input/output error") → enable (clears a stale
+    // `disabled` override from a prior bootout / the account-storm cleanup) → bootstrap,
+    // retried on the EIO race → a final `print` so the command's exit code reports the
+    // real loaded state (installService warns if it ends not-loaded).
+    const lbl = label(room), dom = 'gui/$(id -u)'
+    const post = [
+      `launchctl bootout ${dom}/${lbl} 2>/dev/null`,
+      `for i in $(seq 1 20); do launchctl print ${dom}/${lbl} >/dev/null 2>&1 || break; sleep 0.2; done`,
+      `launchctl enable ${dom}/${lbl}`,
+      `for i in $(seq 1 20); do launchctl bootstrap ${dom} "${file}" 2>/dev/null && break; sleep 0.3; done`,
+      `launchctl print ${dom}/${lbl} >/dev/null 2>&1`,
+    ].join('; ')
+    return { file, content, logDir, post: [post], note: 'Loaded as a LaunchAgent — starts at login, restarts on crash.' }
   }
 
   if (platform === 'linux') {
@@ -173,18 +190,34 @@ export function restartService(room) {
   }
 }
 
-// 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.
+// Ground truth: is the OS service manager ACTUALLY running our service right now?
+// A leftover plist/unit on disk does NOT mean it's loaded — `launchctl load` can
+// silently no-op (the 2026-06-26 "says installed but it's off" bug), and a unit can
+// be left disabled. Ask the manager, don't trust file presence. room falsy → account.
+export function serviceActive(room) {
+  const plat = process.platform
+  const id = label(room)
+  try {
+    if (plat === 'darwin') { execSync(`launchctl print gui/$(id -u)/${id}`, { stdio: 'ignore' }); return true }
+    if (plat === 'linux')  { execSync(`systemctl --user is-active --quiet ${id}.service`); return true }
+    // Windows has no managed daemon — the Startup-folder script's presence is the only proxy.
+    return fs.existsSync(buildArtifact(plat, { room }).file)
+  } catch { return false }
+}
+
+// Is a boot-persistent service installed AND loaded? room falsy → the ACCOUNT service.
+// Lets the main run skip the offer + avoid starting a second bridge that races the
+// service. Reflects launchd/systemd reality, not just file existence (so a plist that
+// failed to load reads as not-installed → the menu re-offers install, which self-heals).
 export function isServiceInstalled(room) {
-  try { return fs.existsSync(buildArtifact(process.platform, { room }).file) } catch { return false }
+  return serviceActive(room)
 }
 
 export function uninstallService(room) {
   const plat = process.platform
   let a
   try { a = buildArtifact(plat, { room }) } catch (e) { process.stderr.write(`  ⚠ ${e.message}\n`); return }
-  if (plat === 'darwin') { try { execSync(`launchctl unload "${a.file}" 2>/dev/null`) } catch { /* noop */ } }
+  if (plat === 'darwin') { try { execSync(`launchctl bootout gui/$(id -u)/${label(room)} 2>/dev/null`) } catch { /* noop */ } }
   if (plat === 'linux') { try { execSync(`systemctl --user disable --now ${label(room)}.service 2>/dev/null`) } catch { /* noop */ } }
   try { fs.rmSync(a.file, { force: true }); process.stderr.write(`  ◆ removed ${a.file}\n`) } catch (e) { process.stderr.write(`  ⚠ ${e.message}\n`) }
 }