orchestrating 0.1.35 → 0.1.37

package/bin/orch

@@ -448,10 +448,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 +480,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 +540,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 +553,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 +665,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 +682,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);
@@ -722,6 +742,11 @@ while (i < args.length) {
     console.error("  -y, --yolo          Skip all permission prompts (auto-approve everything)");
     console.error("");
     console.error("Daemon options:");
+    console.error("  -b, --background    Run daemon in background");
+    console.error("  --enable            Start on boot (systemd/launchd)");
+    console.error("  --disable           Remove boot startup");
+    console.error("  --stop              Stop background daemon");
+    console.error("  --status            Check if daemon is running");
     console.error("  --projects <path>   Directory to scan for projects (default: ~/projects)");
     console.error("  -d <path>           Short alias for --projects");
     console.error("");
@@ -731,7 +756,8 @@ while (i < args.length) {
     console.error('  orch -l "deploy fix" codex');
     console.error("  orch bash");
     console.error("  orch daemon");
-    console.error("  orch daemon --projects ~/work");
+    console.error("  orch daemon -b");
+    console.error("  orch daemon --enable");
     console.error("");
     console.error("Environment:");
     console.error("  ORC_URL      WebSocket server URL (default: wss://api.orchestrat.ing/ws)");
@@ -1082,10 +1108,13 @@ if (adapter) {
           } catch {}
         }
         if (historyEvents.length > 0) {
-          process.stderr.write(`${DIM}[orch] Forwarding ${historyEvents.length} history events to dashboard${RESET}\n`);
+          // Only keep the most recent events from history
+          const trimmedHistory = historyEvents.length > MAX_EVENT_HISTORY
+            ? historyEvents.slice(-MAX_EVENT_HISTORY)
+            : historyEvents;
+          process.stderr.write(`${DIM}[orch] Forwarding ${trimmedHistory.length} history events to dashboard (${historyEvents.length} total)${RESET}\n`);
           // Prepend to eventHistory so they get replayed on reconnect too
-          eventHistory.unshift(...historyEvents);
-          while (eventHistory.length > MAX_EVENT_HISTORY) eventHistory.pop();
+          eventHistory.unshift(...trimmedHistory);
         }
       }
     } catch (err) {

package/package.json

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