@clastres/groundcontrol 0.1.3 → 0.1.5

package/daemon.mjs

@@ -54,7 +54,7 @@ if (process.argv.includes('--help') || process.argv.includes('-h')) {
   process.exit(0);
 }
 if (process.argv.includes('--version')) {
-  console.log('0.1.3');
+  console.log('0.1.5');
   process.exit(0);
 }
 
@@ -88,6 +88,37 @@ function packageDirOf(dep) {
   return dir;
 }
 
+/// A node path that survives upgrades. process.execPath resolves symlinks, so
+/// on Homebrew it points into a versioned Cellar directory that the next
+/// `brew upgrade node` deletes. Prefer a stable symlink that leads to the
+/// same binary; fall back to the resolved path only when none does.
+function stableNodePath() {
+  const real = fs.realpathSync(process.execPath);
+  for (const c of ['/opt/homebrew/opt/node/bin/node', '/opt/homebrew/bin/node', '/usr/local/bin/node']) {
+    try { if (fs.realpathSync(c) === real) return c; } catch {}
+  }
+  return real;
+}
+
+/// Explain why a loaded service is not running, with the fix.
+function explainStoppedService(printOut) {
+  const uid = process.getuid();
+  const state = printOut.match(/state = (\S+)/)?.[1] || 'unknown';
+  const runs = printOut.match(/runs = (\d+)/)?.[1] || '0';
+  console.log(`  Service state: ${state}, runs: ${runs}`);
+  const disabled = new RegExp(`"${LABEL}" => (disabled|true)`).test(launchctl(`print-disabled gui/${uid}`));
+  if (disabled) {
+    console.log('  The service is switched off in launchd, usually from System');
+    console.log('  Settings, General, Login Items. Turn node back on there, or run:');
+    console.log(`  launchctl enable gui/${uid}/${LABEL} && launchctl kickstart -k gui/${uid}/${LABEL}`);
+  } else if (runs === '0') {
+    console.log(`  It never started. Try: launchctl kickstart -k gui/${uid}/${LABEL}`);
+    console.log(`  and check ${LOG_FILE}`);
+  } else {
+    console.log(`  It ran and stopped. Check ${LOG_FILE} and ${path.join(os.homedir(), '.groundcontrol', 'daemon.err.log')}`);
+  }
+}
+
 /// Stage a self contained copy of the daemon and register it with launchd.
 /// Returns true when launchd reports the job running.
 function installService() {
@@ -105,7 +136,7 @@ function installService() {
   }
 
   const esc = (s) => s.replace(/&/g, '&amp;').replace(/</g, '&lt;').replace(/>/g, '&gt;');
-  const nodeBin = fs.realpathSync(process.execPath);
+  const nodeBin = stableNodePath();
   const plist = `<?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
 <plist version="1.0">
@@ -134,14 +165,23 @@ function installService() {
 `;
   fs.mkdirSync(path.dirname(PLIST_PATH), { recursive: true });
   fs.writeFileSync(PLIST_PATH, plist);
+  // A persisted disabled state (for example the Login Items toggle) makes
+  // bootstrap load the job without ever running it, so enable explicitly and
+  // force the first start instead of trusting RunAtLoad.
+  launchctl(`enable gui/${uid}/${LABEL}`);
   launchctl(`bootstrap gui/${uid} ${PLIST_PATH}`);
+  launchctl(`kickstart -k gui/${uid}/${LABEL}`);
   // launchd reports the job async; give it a moment to reach running state.
   let out = '';
   for (let i = 0; i < 5 && !out.includes('state = running'); i++) {
     execSync('sleep 1');
     out = launchctl(`print gui/${uid}/${LABEL}`);
   }
-  return out.includes('state = running');
+  if (!out.includes('state = running')) {
+    explainStoppedService(out);
+    return false;
+  }
+  return true;
 }
 
 if (subcommand === 'service') {
@@ -180,7 +220,9 @@ if (subcommand === 'service') {
     if (out.includes('state = running')) {
       console.log('\n  Running in the background.');
     } else if (fs.existsSync(PLIST_PATH)) {
-      console.log('\n  Installed but not running. Reinstall with: groundcontrol service install');
+      console.log('\n  Installed but not running.');
+      explainStoppedService(out);
+      console.log('  Or reinstall with: groundcontrol service install');
     } else {
       console.log('\n  Not installed. Set it up with: groundcontrol service install');
     }
@@ -251,6 +293,7 @@ if (subcommand !== 'run' && !runsFromServiceDir && process.platform === 'darwin'
   }
   console.log('\n  Could not set up the background service, running here instead.');
   console.log('  Keep this window open to stay connected.\n');
+  try { fs.appendFileSync(LOG_FILE, '[daemon] background service failed to start at install, fell back to a foreground run\n'); } catch {}
 } else if (subcommand === 'run' || process.platform !== 'darwin') {
   console.log('  Keep this window open to stay connected.');
   if (process.platform === 'darwin') {
@@ -342,7 +385,14 @@ function terminalApps() {
       if (tty && id) tmuxPanes.set(tty, id);
     }
   } catch {}
+  const prev = termCache;
   termCache = { at: Date.now(), terminal: running('Terminal'), iterm: running('iTerm2'), tmuxPanes };
+  // The service usually starts at login, before any terminal app is open, so
+  // the startup Automation poke finds nothing. Poke again the first time a
+  // terminal app shows up, while the user is right there to click Allow.
+  if ((termCache.terminal && !prev.terminal) || (termCache.iterm && !prev.iterm)) {
+    requestAutomationGrant();
+  }
   return termCache;
 }
 
@@ -367,7 +417,10 @@ async function osascript(script) {
 /// Poke each running terminal app once at startup so the Automation dialog
 /// appears while the user is still at the Mac (the grant is keyed to this
 /// node binary and covers every later injection).
+let lastGrantPokeAt = 0;
 async function requestAutomationGrant() {
+  if (Date.now() - lastGrantPokeAt < 10_000) return;
+  lastGrantPokeAt = Date.now();
   const apps = terminalApps();
   for (const [name, present] of [['Terminal', apps.terminal], ['iTerm2', apps.iterm]]) {
     if (!present) continue;
@@ -657,7 +710,10 @@ async function handleCommand(cmd) {
 let lastPongAt = Date.now();
 
 function connect() {
-  ws = new WebSocket(`${RELAY}/ch/${CHANNEL}?role=host`);
+  // handshakeTimeout: a dial that never completes would otherwise sit in
+  // CONNECTING forever without firing close, freezing the retry loop.
+  ws = new WebSocket(`${RELAY}/ch/${CHANNEL}?role=host`, { handshakeTimeout: 15_000 });
+  lastPongAt = Date.now();
   ws.on('open', () => { lastPongAt = Date.now(); console.log('[daemon] connected to relay'); sendSnapshot(true); });
   ws.on('pong', () => { lastPongAt = Date.now(); });
   ws.on('message', (data) => {
@@ -690,6 +746,11 @@ setInterval(() => {
       console.log('[daemon] stale relay link, forcing reconnect');
       ws.terminate();
     }
+  } else if (ws && ws.readyState === 0 && Date.now() - lastPongAt > 65_000) {
+    // Backstop for a handshake stuck past its timeout; terminate fires the
+    // close handler, which schedules the next retry.
+    console.log('[daemon] connect attempt hung, forcing reconnect');
+    ws.terminate();
   }
 }, 20_000);
 try { fs.watch(SESSIONS_DIR, () => sendSnapshot()); } catch {}

package/package.json

@@ -1,9 +1,9 @@
 {
   "name": "@clastres/groundcontrol",
-  "version": "0.1.3",
+  "version": "0.1.5",
   "description": "See and command your Claude Code sessions from your iPhone. Pairs the Ground Control app with the agents running on this Mac, end to end encrypted.",
   "bin": {
-    "groundcontrol": "./bin/groundcontrol.mjs"
+    "groundcontrol": "bin/groundcontrol.mjs"
   },
   "type": "module",
   "engines": {
@@ -26,4 +26,4 @@
   "homepage": "https://groundcontrol.chat",
   "author": "Carlos Lastres",
   "license": "MIT"
-}
+}