@slock-ai/daemon 0.2.1 → 0.2.3

package/package.json

@@ -1,12 +1,12 @@
 {
   "name": "@slock-ai/daemon",
-  "version": "0.2.1",
+  "version": "0.2.3",
   "type": "module",
   "bin": {
-    "slock-daemon": "src/index.ts"
+    "slock-daemon": "dist/index.js"
   },
   "files": [
-    "src"
+    "dist"
   ],
   "repository": {
     "type": "git",
@@ -18,23 +18,23 @@
   },
   "dependencies": {
     "@modelcontextprotocol/sdk": "^1.12.1",
-    "tsx": "^4.19.2",
     "ws": "^8.18.0",
     "zod": "^4.3.6"
   },
   "devDependencies": {
     "@types/node": "^22.12.0",
     "@types/ws": "^8.5.13",
+    "tsup": "^8.5.1",
     "typescript": "^5.7.3",
     "@slock-ai/shared": "0.1.0"
   },
   "scripts": {
     "dev": "tsx watch src/index.ts",
     "start": "tsx src/index.ts",
-    "build": "tsc",
+    "build": "tsup",
     "typecheck": "tsc --noEmit",
-    "release:patch": "npm version patch --no-git-tag-version && cd ../.. && git add packages/daemon/package.json && 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 ../.. && git add packages/daemon/package.json && 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:major": "npm version major --no-git-tag-version && cd ../.. && git add packages/daemon/package.json && 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: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",
+    "release:major": "npm version major --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"
   }
 }

package/src/connection.ts

@@ -1,100 +0,0 @@
-import WebSocket from "ws";
-import type { ServerToMachineMessage, MachineToServerMessage } from "@slock-ai/shared";
-
-export interface ConnectionOptions {
-  serverUrl: string;
-  apiKey: string;
-  onMessage: (msg: ServerToMachineMessage) => void;
-  onConnect: () => void;
-  onDisconnect: () => void;
-}
-
-export class DaemonConnection {
-  private ws: WebSocket | null = null;
-  private options: ConnectionOptions;
-  private reconnectTimer: ReturnType<typeof setTimeout> | null = null;
-  private reconnectDelay = 1000;
-  private maxReconnectDelay = 30000;
-  private shouldConnect = true;
-
-  constructor(options: ConnectionOptions) {
-    this.options = options;
-  }
-
-  connect() {
-    this.shouldConnect = true;
-    this.doConnect();
-  }
-
-  disconnect() {
-    this.shouldConnect = false;
-    if (this.reconnectTimer) {
-      clearTimeout(this.reconnectTimer);
-      this.reconnectTimer = null;
-    }
-    if (this.ws) {
-      this.ws.close();
-      this.ws = null;
-    }
-  }
-
-  send(msg: MachineToServerMessage) {
-    if (this.ws?.readyState === WebSocket.OPEN) {
-      this.ws.send(JSON.stringify(msg));
-    }
-  }
-
-  get connected(): boolean {
-    return this.ws?.readyState === WebSocket.OPEN;
-  }
-
-  private doConnect() {
-    if (!this.shouldConnect) 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", () => {
-      console.log("[Daemon] Connected to server");
-      this.reconnectDelay = 1000; // Reset backoff
-      this.options.onConnect();
-    });
-
-    this.ws.on("message", (data: Buffer) => {
-      try {
-        const msg: ServerToMachineMessage = JSON.parse(data.toString());
-        this.options.onMessage(msg);
-      } catch (err) {
-        console.error("[Daemon] Invalid message from server:", err);
-      }
-    });
-
-    this.ws.on("close", () => {
-      console.log("[Daemon] Disconnected from server");
-      this.options.onDisconnect();
-      this.scheduleReconnect();
-    });
-
-    this.ws.on("error", (err) => {
-      console.error("[Daemon] WebSocket error:", err.message);
-      // 'close' will fire after this
-    });
-  }
-
-  private scheduleReconnect() {
-    if (!this.shouldConnect) return;
-    if (this.reconnectTimer) return;
-
-    console.log(`[Daemon] Reconnecting in ${this.reconnectDelay}ms...`);
-    this.reconnectTimer = setTimeout(() => {
-      this.reconnectTimer = null;
-      this.doConnect();
-    }, this.reconnectDelay);
-
-    // Exponential backoff
-    this.reconnectDelay = Math.min(this.reconnectDelay * 2, this.maxReconnectDelay);
-  }
-}

package/src/index.ts

@@ -1,154 +0,0 @@
-#!/usr/bin/env npx tsx
-import path from "node:path";
-import os from "node:os";
-import { execSync } from "node:child_process";
-import { fileURLToPath } from "node:url";
-import { DaemonConnection } from "./connection.js";
-import { AgentProcessManager } from "./agentProcessManager.js";
-import { RUNTIMES, type ServerToMachineMessage } from "@slock-ai/shared";
-
-/** Detect which CLI runtimes are installed on this machine */
-function detectRuntimes(): string[] {
-  const detected: string[] = [];
-  for (const rt of RUNTIMES) {
-    try {
-      execSync(`which ${rt.binary}`, { stdio: "pipe" });
-      detected.push(rt.id);
-    } catch { /* not installed */ }
-  }
-  return detected;
-}
-
-// Parse CLI args
-const args = process.argv.slice(2);
-let serverUrl = "";
-let apiKey = "";
-
-for (let i = 0; i < args.length; i++) {
-  if (args[i] === "--server-url" && args[i + 1]) serverUrl = args[++i];
-  if (args[i] === "--api-key" && args[i + 1]) apiKey = args[++i];
-}
-
-if (!serverUrl || !apiKey) {
-  console.error("Usage: slock-daemon --server-url <url> --api-key <key>");
-  process.exit(1);
-}
-
-// Resolve chat-bridge path (bundled within daemon package)
-const __dirname = path.dirname(fileURLToPath(import.meta.url));
-const chatBridgePath = path.resolve(__dirname, "chat-bridge.ts");
-
-// Create connection and agent manager
-let connection: DaemonConnection;
-
-const agentManager = new AgentProcessManager(chatBridgePath, (msg) => {
-  connection.send(msg);
-}, apiKey);
-
-connection = new DaemonConnection({
-  serverUrl,
-  apiKey,
-  onMessage: (msg: ServerToMachineMessage) => {
-    console.log(`[Daemon] Received: ${msg.type}`, msg.type === "ping" ? "" : JSON.stringify(msg).slice(0, 200));
-    switch (msg.type) {
-      case "agent:start":
-        console.log(`[Daemon] Starting agent ${msg.agentId} (model: ${msg.config.model}, session: ${msg.config.sessionId || "new"}${msg.wakeMessage ? ", with wake message" : ""})`);
-        agentManager.startAgent(msg.agentId, msg.config, msg.wakeMessage, msg.unreadSummary);
-        break;
-
-      case "agent:stop":
-        console.log(`[Daemon] Stopping agent ${msg.agentId}`);
-        agentManager.stopAgent(msg.agentId);
-        break;
-
-      case "agent:sleep":
-        console.log(`[Daemon] Sleeping agent ${msg.agentId}`);
-        agentManager.sleepAgent(msg.agentId);
-        break;
-
-      case "agent:reset-workspace":
-        console.log(`[Daemon] Resetting workspace for agent ${msg.agentId}`);
-        agentManager.resetWorkspace(msg.agentId);
-        break;
-
-      case "agent:deliver":
-        console.log(`[Daemon] Delivering message to ${msg.agentId}: ${msg.message.content.slice(0, 80)}`);
-        agentManager.deliverMessage(msg.agentId, msg.message);
-        connection.send({ type: "agent:deliver:ack", agentId: msg.agentId, seq: msg.seq });
-        break;
-
-      case "agent:workspace:list":
-        agentManager.getFileTree(msg.agentId).then((files) => {
-          connection.send({ type: "agent:workspace:file_tree", agentId: msg.agentId, files });
-        });
-        break;
-
-      case "agent:workspace:read":
-        agentManager.readFile(msg.agentId, msg.path).then(({ content, binary }) => {
-          connection.send({
-            type: "agent:workspace:file_content",
-            agentId: msg.agentId,
-            requestId: msg.requestId,
-            content,
-            binary,
-          });
-        }).catch(() => {
-          connection.send({
-            type: "agent:workspace:file_content",
-            agentId: msg.agentId,
-            requestId: msg.requestId,
-            content: null,
-            binary: false,
-          });
-        });
-        break;
-
-      case "machine:workspace:scan":
-        console.log("[Daemon] Scanning all workspace directories");
-        agentManager.scanAllWorkspaces().then((directories) => {
-          connection.send({ type: "machine:workspace:scan_result", directories });
-        });
-        break;
-
-      case "machine:workspace:delete":
-        console.log(`[Daemon] Deleting workspace directory: ${msg.directoryName}`);
-        agentManager.deleteWorkspaceDirectory(msg.directoryName).then((success) => {
-          connection.send({ type: "machine:workspace:delete_result", directoryName: msg.directoryName, success });
-        });
-        break;
-
-      case "ping":
-        connection.send({ type: "pong" });
-        break;
-    }
-  },
-  onConnect: () => {
-    const runtimes = detectRuntimes();
-    console.log(`[Daemon] Detected runtimes: ${runtimes.join(", ") || "none"}`);
-    connection.send({
-      type: "ready",
-      capabilities: ["agent:start", "agent:stop", "agent:deliver", "workspace:files"],
-      runtimes,
-      runningAgents: agentManager.getRunningAgentIds(),
-      hostname: os.hostname(),
-      os: `${os.platform()} ${os.arch()}`,
-    });
-  },
-  onDisconnect: () => {
-    console.log("[Daemon] Lost connection — agents continue running locally");
-  },
-});
-
-console.log("[Slock Daemon] Starting...");
-connection.connect();
-
-// Graceful shutdown
-const shutdown = async () => {
-  console.log("[Slock Daemon] Shutting down...");
-  await agentManager.stopAll();
-  connection.disconnect();
-  process.exit(0);
-};
-
-process.on("SIGTERM", shutdown);
-process.on("SIGINT", shutdown);