@slock-ai/daemon 0.29.0 → 0.30.0

package/dist/index.js

@@ -10,26 +10,39 @@ import { fileURLToPath } from "url";
 
 // src/connection.ts
 import WebSocket from "ws";
+var systemClock = {
+  now: () => Date.now(),
+  setTimeout: (fn, ms) => setTimeout(fn, ms),
+  clearTimeout: (timer) => clearTimeout(timer)
+};
+var INBOUND_WATCHDOG_MS = 7e4;
 var DaemonConnection = class {
   ws = null;
   options;
+  clock;
   reconnectTimer = null;
-  reconnectDelay = 1e3;
+  watchdogTimer = null;
+  reconnectDelay;
   maxReconnectDelay = 3e4;
   shouldConnect = true;
   reconnectAttempt = 0;
   lastDroppedSendLogAt = 0;
   constructor(options) {
     this.options = options;
+    this.clock = options.clock ?? systemClock;
+    this.reconnectDelay = options.minReconnectDelayMs ?? 1e3;
   }
   connect() {
     this.shouldConnect = true;
+    if (this.reconnectTimer) return;
+    if (this.ws && this.ws.readyState !== WebSocket.CLOSED) return;
     this.doConnect();
   }
   disconnect() {
     this.shouldConnect = false;
+    this.clearWatchdog();
     if (this.reconnectTimer) {
-      clearTimeout(this.reconnectTimer);
+      this.clock.clearTimeout(this.reconnectTimer);
       this.reconnectTimer = null;
     }
     if (this.ws) {
@@ -43,7 +56,7 @@ var DaemonConnection = class {
       this.ws.send(JSON.stringify(msg));
       return;
     }
-    const now = Date.now();
+    const now = this.clock.now();
     if (now - this.lastDroppedSendLogAt > 5e3) {
       this.lastDroppedSendLogAt = now;
       console.warn(`[Daemon] Dropping outbound message while disconnected: ${msg.type}`);
@@ -54,16 +67,23 @@ var DaemonConnection = class {
   }
   doConnect() {
     if (!this.shouldConnect) return;
+    if (this.ws && this.ws.readyState !== WebSocket.CLOSED) return;
     const wsUrl = this.options.serverUrl.replace(/^http/, "ws") + `/daemon/connect?key=${this.options.apiKey}`;
     console.log(`[Daemon] Connecting to ${this.options.serverUrl}...`);
-    this.ws = new WebSocket(wsUrl);
-    this.ws.on("open", () => {
+    const ws = this.options.wsFactory ? this.options.wsFactory(wsUrl) : new WebSocket(wsUrl);
+    this.ws = ws;
+    ws.on("open", () => {
+      if (this.ws !== ws) return;
+      if (!this.shouldConnect) return;
       console.log("[Daemon] Connected to server");
       this.reconnectAttempt = 0;
-      this.reconnectDelay = 1e3;
+      this.reconnectDelay = this.options.minReconnectDelayMs ?? 1e3;
+      this.resetWatchdog();
       this.options.onConnect();
     });
-    this.ws.on("message", (data) => {
+    ws.on("message", (data) => {
+      if (this.ws !== ws) return;
+      this.resetWatchdog();
       try {
         const msg = JSON.parse(data.toString());
         this.options.onMessage(msg);
@@ -71,7 +91,10 @@ var DaemonConnection = class {
         console.error("[Daemon] Invalid message from server:", err);
       }
     });
-    this.ws.on("close", (code, reasonBuffer) => {
+    ws.on("close", (code, reasonBuffer) => {
+      if (this.ws !== ws) return;
+      this.ws = null;
+      this.clearWatchdog();
       const reason = reasonBuffer.toString("utf8");
       console.log(
         `[Daemon] Disconnected from server (code=${code}, reason=${JSON.stringify(reason)}, reconnecting=${this.shouldConnect})`
@@ -79,7 +102,8 @@ var DaemonConnection = class {
       this.options.onDisconnect();
       this.scheduleReconnect();
     });
-    this.ws.on("error", (err) => {
+    ws.on("error", (err) => {
+      if (this.ws !== ws) return;
       console.error("[Daemon] WebSocket error:", err.message);
     });
   }
@@ -88,12 +112,29 @@ var DaemonConnection = class {
     if (this.reconnectTimer) return;
     this.reconnectAttempt += 1;
     console.log(`[Daemon] Reconnecting to server in ${this.reconnectDelay}ms (attempt ${this.reconnectAttempt})`);
-    this.reconnectTimer = setTimeout(() => {
+    this.reconnectTimer = this.clock.setTimeout(() => {
       this.reconnectTimer = null;
       this.doConnect();
     }, this.reconnectDelay);
     this.reconnectDelay = Math.min(this.reconnectDelay * 2, this.maxReconnectDelay);
   }
+  resetWatchdog() {
+    this.clearWatchdog();
+    const ms = this.options.inboundWatchdogMs ?? INBOUND_WATCHDOG_MS;
+    this.watchdogTimer = this.clock.setTimeout(() => {
+      console.warn(`[Daemon] No inbound traffic for ${ms / 1e3}s \u2014 forcing reconnect`);
+      try {
+        this.ws?.terminate();
+      } catch {
+      }
+    }, ms);
+  }
+  clearWatchdog() {
+    if (this.watchdogTimer) {
+      this.clock.clearTimeout(this.watchdogTimer);
+      this.watchdogTimer = null;
+    }
+  }
 };
 
 // src/agentProcessManager.ts
@@ -1288,6 +1329,16 @@ Note: While you are busy, you may receive [System notification: ...] messages ab
   getRunningAgentIds() {
     return [...this.agents.keys()];
   }
+  getAgentSessionId(agentId) {
+    return this.agents.get(agentId)?.sessionId ?? null;
+  }
+  getIdleAgentSessionIds() {
+    const result = [];
+    for (const [agentId, { sessionId }] of this.idleAgentConfigs) {
+      if (sessionId) result.push({ agentId, sessionId });
+    }
+    return result;
+  }
   // Machine-level workspace scanning
   async scanAllWorkspaces() {
     const results = [];
@@ -1851,6 +1902,15 @@ connection = new DaemonConnection({
       os: `${os2.platform()} ${os2.arch()}`,
       daemonVersion: DAEMON_VERSION
     });
+    for (const agentId of agentManager.getRunningAgentIds()) {
+      const sessionId = agentManager.getAgentSessionId(agentId);
+      if (sessionId) {
+        connection.send({ type: "agent:session", agentId, sessionId });
+      }
+    }
+    for (const { agentId, sessionId } of agentManager.getIdleAgentSessionIds()) {
+      connection.send({ type: "agent:session", agentId, sessionId });
+    }
   },
   onDisconnect: () => {
     console.log("[Daemon] Lost connection \u2014 agents continue running locally");

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@slock-ai/daemon",
-  "version": "0.29.0",
+  "version": "0.30.0",
   "type": "module",
   "bin": {
     "slock-daemon": "dist/index.js"
@@ -32,7 +32,7 @@
     "dev": "tsx watch src/index.ts",
     "start": "tsx src/index.ts",
     "build": "tsup",
-    "test": "node --import tsx --test src/**/*.test.ts",
+    "test": "node --import tsx --test --test-force-exit 'src/**/*.test.ts'",
     "typecheck": "tsc --noEmit",
     "release:patch": "npm version patch --no-git-tag-version && cd ../.. && pnpm install --lockfile-only && git add packages/daemon/package.json pnpm-lock.yaml && git commit -m \"chore: bump @slock-ai/daemon to v$(node -p \"require('./packages/daemon/package.json').version\")\" && git tag daemon-v$(node -p \"require('./packages/daemon/package.json').version\") && git push && git push --tags",
     "release:minor": "npm version minor --no-git-tag-version && cd ../.. && pnpm install --lockfile-only && git add packages/daemon/package.json pnpm-lock.yaml && git commit -m \"chore: bump @slock-ai/daemon to v$(node -p \"require('./packages/daemon/package.json').version\")\" && git tag daemon-v$(node -p \"require('./packages/daemon/package.json').version\") && git push && git push --tags",