itwillsync 1.3.1 → 1.3.3

package/dist/index.js

@@ -4172,7 +4172,7 @@ async function runSetupWizard() {
 
 // src/hub-client.ts
 import { spawn as spawn2 } from "child_process";
-import { readFileSync as readFileSync2, existsSync as existsSync2 } from "fs";
+import { readFileSync as readFileSync2, existsSync as existsSync2, unlinkSync } from "fs";
 import { homedir as homedir2 } from "os";
 import { join as join4, dirname as dirname2 } from "path";
 import { fileURLToPath as fileURLToPath2 } from "url";
@@ -4219,13 +4219,70 @@ async function discoverHub() {
     req.end();
   });
 }
+async function getHubPidFromHealth() {
+  return new Promise((resolve) => {
+    const req = request(
+      {
+        hostname: "127.0.0.1",
+        port: HUB_INTERNAL_PORT,
+        path: "/api/health",
+        method: "GET",
+        timeout: 2e3
+      },
+      (res) => {
+        let data = "";
+        res.on("data", (chunk) => {
+          data += chunk;
+        });
+        res.on("end", () => {
+          try {
+            const json = JSON.parse(data);
+            resolve(json.pid && typeof json.pid === "number" ? json.pid : null);
+          } catch {
+            resolve(null);
+          }
+        });
+      }
+    );
+    req.on("error", () => resolve(null));
+    req.on("timeout", () => {
+      req.destroy();
+      resolve(null);
+    });
+    req.end();
+  });
+}
+async function killStaleHub() {
+  const pid = await getHubPidFromHealth();
+  if (!pid) return false;
+  try {
+    process.kill(pid, "SIGTERM");
+  } catch {
+    return false;
+  }
+  for (let i = 0; i < 20; i++) {
+    await new Promise((r) => setTimeout(r, 200));
+    const stillRunning = await discoverHub();
+    if (!stillRunning) break;
+  }
+  const hubDir = getHubDir();
+  try {
+    unlinkSync(join4(hubDir, "hub.json"));
+  } catch {
+  }
+  try {
+    unlinkSync(join4(hubDir, "hub.pid"));
+  } catch {
+  }
+  return true;
+}
 async function spawnHub() {
   const __dirname = dirname2(fileURLToPath2(import.meta.url));
   const hubPath = join4(__dirname, "hub", "daemon.js");
   return new Promise((resolve, reject) => {
     const child = spawn2("node", [hubPath], {
       detached: true,
-      stdio: ["ignore", "pipe", "ignore"],
+      stdio: ["ignore", "pipe", "pipe"],
       env: {
         ...process.env,
         // Pass config dir to hub
@@ -4234,6 +4291,7 @@ async function spawnHub() {
     });
     child.unref();
     let output = "";
+    let stderrOutput = "";
     const timeout = setTimeout(() => {
       reject(new Error("Hub daemon startup timed out"));
     }, 1e4);
@@ -4242,9 +4300,13 @@ async function spawnHub() {
       if (output.includes("hub:ready:")) {
         clearTimeout(timeout);
         child.stdout?.destroy();
+        child.stderr?.destroy();
         resolve();
       }
     });
+    child.stderr?.on("data", (data) => {
+      stderrOutput += data.toString();
+    });
     child.on("error", (err) => {
       clearTimeout(timeout);
       reject(new Error(`Failed to spawn hub daemon: ${err.message}`));
@@ -4252,7 +4314,11 @@ async function spawnHub() {
     child.on("exit", (code) => {
       clearTimeout(timeout);
       if (code !== null && code !== 0) {
-        reject(new Error(`Hub daemon exited with code ${code}`));
+        const detail = stderrOutput.trim();
+        reject(new Error(
+          `Hub daemon exited with code ${code}${detail ? `:
+${detail}` : ""}`
+        ));
       }
     });
   });
@@ -4364,11 +4430,19 @@ async function listSessions() {
     req.end();
   });
 }
-function stopHub() {
+async function stopHub() {
   const config = getHubConfig();
-  if (!config) return false;
+  if (config) {
+    try {
+      process.kill(config.pid, "SIGTERM");
+      return true;
+    } catch {
+    }
+  }
+  const pid = await getHubPidFromHealth();
+  if (!pid) return false;
   try {
-    process.kill(config.pid, "SIGTERM");
+    process.kill(pid, "SIGTERM");
     return true;
   } catch {
     return false;
@@ -4537,11 +4611,15 @@ function preventSleep() {
 async function ensureHub() {
   const hubRunning = await discoverHub();
   if (hubRunning) {
-    return false;
+    const config = getHubConfig();
+    if (config) {
+      return false;
+    }
+    console.warn("  Detected stale hub daemon (no config). Restarting...");
+    await killStaleHub();
   }
   try {
     await spawnHub();
-    await new Promise((resolve) => setTimeout(resolve, 500));
     return true;
   } catch (err) {
     console.warn(`
@@ -4554,11 +4632,11 @@ async function handleHubCommand(options) {
   const hubConfig = getHubConfig();
   const hubRunning = await discoverHub();
   if (options.hubStop) {
-    if (!hubRunning || !hubConfig) {
+    if (!hubRunning) {
       console.log("\n  No hub daemon is running.\n");
       return;
     }
-    const stopped = stopHub();
+    const stopped = await stopHub();
     if (stopped) {
       console.log("\n  Hub daemon stopped.\n");
     } else {
@@ -4585,11 +4663,16 @@ async function handleHubCommand(options) {
     return;
   }
   if (options.hubInfo) {
-    if (!hubRunning || !hubConfig) {
+    if (!hubRunning) {
       console.log("\n  No hub daemon is running.");
       console.log("  Start a session with: itwillsync -- <agent>\n");
       return;
     }
+    if (!hubConfig) {
+      console.log("\n  Hub daemon is running but its config is missing (stale state).");
+      console.log("  Run: itwillsync hub stop\n");
+      return;
+    }
     let networkingMode = "local";
     if (options.tailscale) {
       networkingMode = "tailscale";
@@ -4685,12 +4768,12 @@ async function main() {
     }
   }
   const dashboardUrl = hubConfig ? `http://${ip}:${HUB_EXTERNAL_PORT}?token=${hubConfig.masterToken}` : null;
-  if (isFirstSession && dashboardUrl && !options.noQr) {
+  if (dashboardUrl && !options.noQr) {
+    if (!isFirstSession) {
+      console.log(`
+  Session "${cmd}" registered with hub.`);
+    }
     displayQR(dashboardUrl);
-    console.log(`  Dashboard: ${dashboardUrl}`);
-  } else if (isFirstSession && !options.noQr) {
-    const directUrl = `http://${ip}:${port}?token=${token}`;
-    displayQR(directUrl);
   } else if (dashboardUrl) {
     console.log(`
   Session "${cmd}" registered with hub.`);
@@ -4726,6 +4809,10 @@ async function main() {
   process.stdout.on("resize", handleResize);
   handleResize();
   async function cleanup() {
+    process.stdout.write(
+      "\x1B[>0u\x1B[?2004l\x1B[?1000l\x1B[?1002l\x1B[?1003l\x1B[?1006l\x1B[?25h\x1B[?1049l"
+      // Exit alternate screen buffer (if active)
+    );
     if (process.stdin.isTTY) {
       process.stdin.setRawMode(false);
     }