bloby-bot 0.22.16 → 0.22.18

package/bin/cli.js

@@ -715,19 +715,26 @@ function writeVersionFile(version) {
 }
 
 /**
- * Poll health endpoint and config.json until the daemon is ready.
+ * Poll daemon log for __READY__ and config.json for tunnel URL until the daemon
+ * is fully ready (tunnel registered with relay). logOffset should be captured
+ * BETWEEN stopping and starting the daemon so only new-session output is checked.
+ *
  * Advances the stepper through tunnel + verification steps.
  */
-async function waitForDaemonHealth(stepper, config, hasTunnel) {
+async function waitForDaemonHealth(stepper, config, hasTunnel, logOffset) {
   const port = config.port || 7400;
   const relayUrl = config.relay?.url || null;
   let tunnelUrl = null;
   let tunnelShown = false;
-  let healthOk = false;
+  let ready = false;
 
-  // Clear any stale tunnelUrl from config so we detect the fresh one
   const oldTunnelUrl = config.tunnelUrl || null;
 
+  // Daemon log file — the supervisor writes __READY__ to stdout which goes here
+  const logFile = PLATFORM === 'darwin'
+    ? path.join(LAUNCHD_LOG_DIR, 'bloby.log')
+    : null;
+
   for (let i = 0; i < 120; i++) {
     await new Promise(r => setTimeout(r, 1000));
 
@@ -749,14 +756,32 @@ async function waitForDaemonHealth(stepper, config, hasTunnel) {
       } catch {}
     }
 
-    // Check health
-    try {
-      const res = await fetch(`http://127.0.0.1:${port}/api/health`);
-      if (res.ok) {
-        healthOk = true;
-        break;
+    // Check for __READY__ in daemon log (emitted after relay registration)
+    if (!ready) {
+      if (logFile && fs.existsSync(logFile)) {
+        try {
+          const currentSize = fs.statSync(logFile).size;
+          if (currentSize > logOffset) {
+            const fd = fs.openSync(logFile, 'r');
+            const buf = Buffer.alloc(currentSize - logOffset);
+            fs.readSync(fd, buf, 0, buf.length, logOffset);
+            fs.closeSync(fd);
+            const newContent = buf.toString('utf-8');
+            if (newContent.includes('__READY__')) {
+              ready = true;
+            }
+          }
+        } catch {}
+      } else {
+        // Linux / no log file fallback: check local health
+        try {
+          const res = await fetch(`http://127.0.0.1:${port}/api/health`);
+          if (res.ok) ready = true;
+        } catch {}
       }
-    } catch {}
+    }
+
+    if (ready && (!hasTunnel || tunnelShown)) break;
   }
 
   // If tunnel never came up, advance past tunnel step anyway
@@ -777,7 +802,7 @@ async function waitForDaemonHealth(stepper, config, hasTunnel) {
     if (cfg.tunnelUrl) tunnelUrl = cfg.tunnelUrl;
   } catch {}
 
-  return { tunnelUrl, relayUrl, healthOk };
+  return { tunnelUrl, relayUrl, healthOk: ready };
 }
 
 // ── Steps ──
@@ -1484,6 +1509,13 @@ async function update() {
   // Restart daemon if it was running (skipped during self-update)
   let updateResult = null;
   if (daemonWasRunning) {
+    // Capture log offset before starting so we only detect new-session __READY__
+    const updateLogFile = path.join(LAUNCHD_LOG_DIR, 'bloby.log');
+    let updateLogOffset = 0;
+    if (PLATFORM === 'darwin' && fs.existsSync(updateLogFile)) {
+      try { updateLogOffset = fs.statSync(updateLogFile).size; } catch {}
+    }
+
     try {
       if (PLATFORM === 'darwin') {
         execSync(`launchctl load "${LAUNCHD_PLIST_PATH}"`, { stdio: 'ignore' });
@@ -1495,7 +1527,7 @@ async function update() {
     stepper.advance(); // Restarting daemon done
 
     // Wait for daemon to become healthy and tunnel to connect
-    updateResult = await waitForDaemonHealth(stepper, updateConfig, updateHasTunnel);
+    updateResult = await waitForDaemonHealth(stepper, updateConfig, updateHasTunnel, updateLogOffset);
   }
 
   stepper.finish();
@@ -1645,10 +1677,17 @@ async function daemon(sub) {
         try { execSync(`launchctl unload "${LAUNCHD_PLIST_PATH}" 2>/dev/null`, { stdio: 'ignore' }); } catch {}
         restartStepper.advance(); // Stopping daemon done
 
+        // Capture log offset between stop and start so we only see new session output
+        const restartLogFile = path.join(LAUNCHD_LOG_DIR, 'bloby.log');
+        let restartLogOffset = 0;
+        if (fs.existsSync(restartLogFile)) {
+          try { restartLogOffset = fs.statSync(restartLogFile).size; } catch {}
+        }
+
         execSync(`launchctl load "${LAUNCHD_PLIST_PATH}"`, { stdio: 'ignore' });
         restartStepper.advance(); // Starting daemon done
 
-        const restartResult = await waitForDaemonHealth(restartStepper, restartConfig, restartHasTunnel);
+        const restartResult = await waitForDaemonHealth(restartStepper, restartConfig, restartHasTunnel, restartLogOffset);
         restartStepper.finish();
 
         console.log(`\n  ${c.blue}✔${c.reset}  Bloby daemon restarted.\n`);
@@ -1787,7 +1826,8 @@ async function daemon(sub) {
       execSync(`systemctl start ${SERVICE_NAME}`, { stdio: 'ignore' });
       sysRestartStepper.advance(); // Starting daemon done
 
-      const sysRestartResult = await waitForDaemonHealth(sysRestartStepper, sysRestartConfig, sysRestartHasTunnel);
+      // Linux: no log file offset, falls back to local health check
+      const sysRestartResult = await waitForDaemonHealth(sysRestartStepper, sysRestartConfig, sysRestartHasTunnel, 0);
       sysRestartStepper.finish();
 
       console.log(`\n  ${c.blue}✔${c.reset}  Bloby daemon restarted.\n`);

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "bloby-bot",
-  "version": "0.22.16",
+  "version": "0.22.18",
   "releaseNotes": [
     "1. new stuff",
     "2. ",