orchestrating 0.1.36 → 0.1.38

package/bin/orch

@@ -328,6 +328,8 @@ if (firstArg === "daemon") {
   </dict>
 </dict>
 </plist>`;
+      // Unload old plist first if it exists (avoids "Load failed" error on re-enable)
+      try { execSync(`launchctl unload "${plistPath}" 2>/dev/null`); } catch {}
       writeFileSync(plistPath, plist);
       execSync(`launchctl load -w "${plistPath}"`);
       console.log("Daemon enabled — will start on login and auto-restart.");
@@ -353,6 +355,8 @@ WantedBy=default.target
 `;
       writeFileSync(servicePath, service);
       execSync("systemctl --user daemon-reload");
+      // Stop old instance if running, then enable + start
+      try { execSync("systemctl --user stop orch-daemon.service 2>/dev/null"); } catch {}
       execSync("systemctl --user enable --now orch-daemon.service");
       // Enable lingering so user services run without active login session
       try { execSync(`loginctl enable-linger ${os.userInfo().username}`); } catch {}
@@ -448,10 +452,12 @@ async function handleDaemon(projectsDir) {
 
   const PING_INTERVAL_MS = 30_000;
   const PONG_TIMEOUT_MS = 10_000;
+  const HEARTBEAT_TIMEOUT_MS = 65_000; // expect server heartbeat every 30s, allow 2 missed + margin
   let ws = null;
   let pingTimer = null;
   let pongTimer = null;
   let reconnectTimer = null;
+  let heartbeatTimer = null;
 
   // Scan project directories
   const homeDir = os.homedir();
@@ -478,6 +484,14 @@ async function handleDaemon(projectsDir) {
   const recentRequests = new Set();
   const recentSpawns = new Map(); // "command:cwd" -> timestamp
 
+  function resetHeartbeatTimer(sock) {
+    if (heartbeatTimer) clearTimeout(heartbeatTimer);
+    heartbeatTimer = setTimeout(() => {
+      process.stderr.write(`${RED}${PREFIX} No server heartbeat — reconnecting${RESET}\n`);
+      if (sock && sock.readyState !== WebSocket.CLOSED) sock.terminate();
+    }, HEARTBEAT_TIMEOUT_MS);
+  }
+
   function scheduleReconnect(delaySec) {
     if (reconnecting) return;
     reconnecting = true;
@@ -530,6 +544,9 @@ async function handleDaemon(projectsDir) {
           }, PONG_TIMEOUT_MS);
         }
       }, PING_INTERVAL_MS);
+
+      // Start expecting server heartbeats (more reliable than WS pings through proxies)
+      resetHeartbeatTimer(sock);
     });
 
     sock.on("pong", () => {
@@ -540,6 +557,11 @@ async function handleDaemon(projectsDir) {
       let msg;
       try { msg = JSON.parse(raw.toString()); } catch { return; }
 
+      if (msg.type === "heartbeat") {
+        resetHeartbeatTimer(sock);
+        return;
+      }
+
       if (msg.type === "error") {
         process.stderr.write(`${RED}${PREFIX} Server: ${msg.error}${RESET}\n`);
         if (/unauthorized|auth|token/i.test(msg.error || "")) {
@@ -647,6 +669,7 @@ async function handleDaemon(projectsDir) {
       if (ws === sock) ws = null;
       if (pingTimer) { clearInterval(pingTimer); pingTimer = null; }
       if (pongTimer) { clearTimeout(pongTimer); pongTimer = null; }
+      if (heartbeatTimer) { clearTimeout(heartbeatTimer); heartbeatTimer = null; }
       process.stderr.write(`${DIM}${PREFIX} Disconnected — reconnecting in 2s${RESET}\n`);
       scheduleReconnect(2);
     });
@@ -663,6 +686,7 @@ async function handleDaemon(projectsDir) {
     process.stderr.write(`\n${DIM}${PREFIX} Shutting down${RESET}\n`);
     if (pingTimer) clearInterval(pingTimer);
     if (pongTimer) clearTimeout(pongTimer);
+    if (heartbeatTimer) clearTimeout(heartbeatTimer);
     if (reconnectTimer) clearTimeout(reconnectTimer);
     if (ws) ws.close();
     process.exit(0);

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "orchestrating",
-  "version": "0.1.36",
+  "version": "0.1.38",
   "description": "Stream terminal sessions to the orchestrat.ing dashboard",
   "type": "module",
   "bin": {