itwillsync 1.3.0 → 1.3.2

package/dist/index.js

@@ -3683,6 +3683,14 @@ function ensureSpawnHelperPermissions() {
 }
 var PtyManager = class {
   ptyProcess;
+  _cols = 80;
+  _rows = 24;
+  get cols() {
+    return this._cols;
+  }
+  get rows() {
+    return this._rows;
+  }
   /** The process ID of the spawned PTY process. */
   pid;
   constructor(command, args) {
@@ -3725,6 +3733,8 @@ var PtyManager = class {
   resize(cols, rows) {
     try {
       this.ptyProcess.resize(cols, rows);
+      this._cols = cols;
+      this._rows = rows;
     } catch {
     }
   }
@@ -3929,7 +3939,7 @@ async function serveStaticFile(webClientPath, filePath, req, res) {
 var PING_INTERVAL_MS = 3e4;
 var SCROLLBACK_BUFFER_SIZE = 5e4;
 function createSyncServer(options) {
-  const { ptyManager, token, webClientPath, host, port } = options;
+  const { ptyManager, token, webClientPath, host, port, localTerminalOwnsResize = false } = options;
   const clients = /* @__PURE__ */ new Set();
   const aliveMap = /* @__PURE__ */ new WeakMap();
   let scrollbackBuffer = "";
@@ -3972,6 +3982,7 @@ function createSyncServer(options) {
     if (scrollbackBuffer.length > 0) {
       ws.send(JSON.stringify({ type: "data", data: scrollbackBuffer, seq }));
     }
+    ws.send(JSON.stringify({ type: "resize", cols: ptyManager.cols, rows: ptyManager.rows }));
     ws.on("pong", () => {
       aliveMap.set(ws, true);
     });
@@ -3981,7 +3992,9 @@ function createSyncServer(options) {
         if (message.type === "input" && typeof message.data === "string") {
           ptyManager.write(message.data);
         } else if (message.type === "resize" && typeof message.cols === "number" && typeof message.rows === "number") {
-          ptyManager.resize(message.cols, message.rows);
+          if (!localTerminalOwnsResize) {
+            ptyManager.resize(message.cols, message.rows);
+          }
         } else if (message.type === "resume" && typeof message.lastSeq === "number") {
           const missed = seq - message.lastSeq;
           if (missed > 0 && scrollbackBuffer.length > 0) {
@@ -4024,6 +4037,14 @@ function createSyncServer(options) {
       clients.clear();
       wssServer.close();
       httpServer.close();
+    },
+    broadcastResize(cols, rows) {
+      const msg = JSON.stringify({ type: "resize", cols, rows });
+      for (const client of clients) {
+        if (client.readyState === client.OPEN) {
+          client.send(msg);
+        }
+      }
     }
   };
 }
@@ -4151,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";
@@ -4198,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
@@ -4213,6 +4291,7 @@ async function spawnHub() {
     });
     child.unref();
     let output = "";
+    let stderrOutput = "";
     const timeout = setTimeout(() => {
       reject(new Error("Hub daemon startup timed out"));
     }, 1e4);
@@ -4221,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}`));
@@ -4231,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}` : ""}`
+        ));
       }
     });
   });
@@ -4343,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;
@@ -4516,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(`
@@ -4533,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 {
@@ -4564,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";
@@ -4639,7 +4743,8 @@ async function main() {
     token,
     webClientPath,
     host,
-    port
+    port,
+    localTerminalOwnsResize: true
   });
   let registeredSession = null;
   let heartbeatInterval = null;
@@ -4698,6 +4803,7 @@ async function main() {
   function handleResize() {
     if (process.stdout.columns && process.stdout.rows) {
       ptyManager.resize(process.stdout.columns, process.stdout.rows);
+      server.broadcastResize(process.stdout.columns, process.stdout.rows);
     }
   }
   process.stdout.on("resize", handleResize);