@slock-ai/daemon 0.4.1 → 0.6.0

package/dist/chat-bridge.js

@@ -4,6 +4,12 @@
 import { McpServer } from "@modelcontextprotocol/sdk/server/mcp.js";
 import { StdioServerTransport } from "@modelcontextprotocol/sdk/server/stdio.js";
 import { z } from "zod";
+function toLocalTime(iso) {
+  const d = new Date(iso);
+  if (isNaN(d.getTime())) return iso;
+  const pad = (n) => String(n).padStart(2, "0");
+  return `${d.getFullYear()}-${pad(d.getMonth() + 1)}-${pad(d.getDate())} ${pad(d.getHours())}:${pad(d.getMinutes())}:${pad(d.getSeconds())}`;
+}
 var args = process.argv.slice(2);
 var agentId = "";
 var serverUrl = "http://localhost:3001";
@@ -92,7 +98,8 @@ server.tool(
       const formatted = data.messages.map((m) => {
         const channel = m.channel_type === "dm" ? `DM:@${m.channel_name}` : `#${m.channel_name}`;
         const senderPrefix = m.sender_type === "agent" ? "(agent) " : "";
-        return `[${channel}] ${senderPrefix}@${m.sender_name}: ${m.content}`;
+        const time = m.timestamp ? ` (${toLocalTime(m.timestamp)})` : "";
+        return `[${channel}]${time} ${senderPrefix}@${m.sender_name}: ${m.content}`;
       }).join("\n");
       return {
         content: [{ type: "text", text: formatted }]
@@ -193,7 +200,8 @@ server.tool(
       }
       const formatted = data.messages.map((m) => {
         const senderPrefix = m.senderType === "agent" ? "(agent) " : "";
-        return `[seq:${m.seq}] ${senderPrefix}@${m.senderName}: ${m.content}`;
+        const time = m.createdAt ? ` (${toLocalTime(m.createdAt)})` : "";
+        return `[seq:${m.seq}]${time} ${senderPrefix}@${m.senderName}: ${m.content}`;
       }).join("\n");
       let footer = "";
       if (data.historyLimited) {

package/dist/index.js

@@ -622,9 +622,17 @@ function getDriver(runtimeId) {
 
 // src/agentProcessManager.ts
 var DATA_DIR = path2.join(os.homedir(), ".slock", "agents");
+function toLocalTime(iso) {
+  const d = new Date(iso);
+  if (isNaN(d.getTime())) return iso;
+  const pad = (n) => String(n).padStart(2, "0");
+  return `${d.getFullYear()}-${pad(d.getMonth() + 1)}-${pad(d.getDate())} ${pad(d.getHours())}:${pad(d.getMinutes())}:${pad(d.getSeconds())}`;
+}
 var MAX_TRAJECTORY_TEXT = 2e3;
 var AgentProcessManager = class {
   agents = /* @__PURE__ */ new Map();
+  agentsStarting = /* @__PURE__ */ new Set();
+  // Prevent concurrent starts of same agent
   chatBridgePath;
   sendToServer;
   daemonApiKey;
@@ -634,16 +642,18 @@ var AgentProcessManager = class {
     this.daemonApiKey = daemonApiKey;
   }
   async startAgent(agentId, config, wakeMessage, unreadSummary) {
-    if (this.agents.has(agentId)) return;
-    const driver = getDriver(config.runtime || "claude");
-    const agentDataDir = path2.join(DATA_DIR, agentId);
-    await mkdir(agentDataDir, { recursive: true });
-    const memoryMdPath = path2.join(agentDataDir, "MEMORY.md");
+    if (this.agents.has(agentId) || this.agentsStarting.has(agentId)) return;
+    this.agentsStarting.add(agentId);
     try {
-      await access(memoryMdPath);
-    } catch {
-      const agentName = config.displayName || config.name;
-      const initialMemoryMd = `# ${agentName}
+      const driver = getDriver(config.runtime || "claude");
+      const agentDataDir = path2.join(DATA_DIR, agentId);
+      await mkdir(agentDataDir, { recursive: true });
+      const memoryMdPath = path2.join(agentDataDir, "MEMORY.md");
+      try {
+        await access(memoryMdPath);
+      } catch {
+        const agentName = config.displayName || config.name;
+        const initialMemoryMd = `# ${agentName}
 
 ## Role
 ${config.description || "No role defined yet."}
@@ -654,122 +664,136 @@ ${config.description || "No role defined yet."}
 ## Active Context
 - First startup.
 `;
-      await writeFile(memoryMdPath, initialMemoryMd);
-    }
-    await mkdir(path2.join(agentDataDir, "notes"), { recursive: true });
-    const isResume = !!config.sessionId;
-    let prompt;
-    if (isResume && wakeMessage) {
-      const channelLabel = wakeMessage.channel_type === "dm" ? `DM:@${wakeMessage.channel_name}` : `#${wakeMessage.channel_name}`;
-      const senderPrefix = wakeMessage.sender_type === "agent" ? "(agent) " : "";
-      const formatted = `[${channelLabel}] ${senderPrefix}@${wakeMessage.sender_name}: ${wakeMessage.content}`;
-      prompt = `New message received:
+        await writeFile(memoryMdPath, initialMemoryMd);
+      }
+      await mkdir(path2.join(agentDataDir, "notes"), { recursive: true });
+      const isResume = !!config.sessionId;
+      let prompt;
+      if (isResume && wakeMessage) {
+        const channelLabel = wakeMessage.channel_type === "dm" ? `DM:@${wakeMessage.channel_name}` : `#${wakeMessage.channel_name}`;
+        const senderPrefix = wakeMessage.sender_type === "agent" ? "(agent) " : "";
+        const time = wakeMessage.timestamp ? ` (${toLocalTime(wakeMessage.timestamp)})` : "";
+        const formatted = `[${channelLabel}]${time} ${senderPrefix}@${wakeMessage.sender_name}: ${wakeMessage.content}`;
+        prompt = `New message received:
 
 ${formatted}`;
-      if (unreadSummary && Object.keys(unreadSummary).length > 0) {
-        const otherUnread = Object.entries(unreadSummary).filter(([key]) => key !== channelLabel);
-        if (otherUnread.length > 0) {
-          prompt += `
+        if (unreadSummary && Object.keys(unreadSummary).length > 0) {
+          const otherUnread = Object.entries(unreadSummary).filter(([key]) => key !== channelLabel);
+          if (otherUnread.length > 0) {
+            prompt += `
 
 You also have unread messages in other channels:`;
-          for (const [ch, count] of otherUnread) {
-            prompt += `
+            for (const [ch, count] of otherUnread) {
+              prompt += `
 - ${ch}: ${count} unread`;
-          }
-          prompt += `
+            }
+            prompt += `
 
 Use read_history to catch up, or respond to the message above first.`;
+          }
         }
-      }
-      prompt += `
+        prompt += `
 
 Respond as appropriate \u2014 reply using send_message, or take action as needed. Then call receive_message(block=true) to keep listening.`;
-      if (driver.supportsStdinNotification) {
-        prompt += `
+        if (driver.supportsStdinNotification) {
+          prompt += `
 
 Note: While you are busy, you may receive [System notification: ...] messages. Finish your current step, then call receive_message to check.`;
-      }
-    } else if (isResume && unreadSummary && Object.keys(unreadSummary).length > 0) {
-      prompt = `You have unread messages from while you were offline:`;
-      for (const [ch, count] of Object.entries(unreadSummary)) {
-        prompt += `
+        }
+      } else if (isResume && unreadSummary && Object.keys(unreadSummary).length > 0) {
+        prompt = `You have unread messages from while you were offline:`;
+        for (const [ch, count] of Object.entries(unreadSummary)) {
+          prompt += `
 - ${ch}: ${count} unread`;
-      }
-      prompt += `
+        }
+        prompt += `
 
 Use read_history to catch up on important channels, then call receive_message(block=true) to listen for new messages.`;
-      if (driver.supportsStdinNotification) {
-        prompt += `
+        if (driver.supportsStdinNotification) {
+          prompt += `
 
 Note: While you are busy, you may receive [System notification: ...] messages. Finish your current step, then call receive_message to check.`;
-      }
-    } else if (isResume) {
-      prompt = `No new messages while you were away. Call ${driver.mcpToolPrefix}receive_message(block=true) to listen for new messages.`;
-      if (driver.supportsStdinNotification) {
-        prompt += `
+        }
+      } else if (isResume) {
+        prompt = `No new messages while you were away. Call ${driver.mcpToolPrefix}receive_message(block=true) to listen for new messages.`;
+        if (driver.supportsStdinNotification) {
+          prompt += `
 
 Note: While you are busy, you may receive [System notification: ...] messages about new messages. Finish your current step, then call receive_message to check.`;
-      }
-    } else {
-      prompt = driver.buildSystemPrompt(config, agentId);
-    }
-    const { process: proc } = driver.spawn({
-      agentId,
-      config,
-      prompt,
-      workingDirectory: agentDataDir,
-      chatBridgePath: this.chatBridgePath,
-      daemonApiKey: this.daemonApiKey
-    });
-    const agentProcess = {
-      process: proc,
-      driver,
-      inbox: [],
-      pendingReceive: null,
-      config,
-      sessionId: config.sessionId || null,
-      isInReceiveMessage: false,
-      notificationTimer: null,
-      pendingNotificationCount: 0
-    };
-    this.agents.set(agentId, agentProcess);
-    let buffer = "";
-    proc.stdout?.on("data", (chunk) => {
-      buffer += chunk.toString();
-      const lines = buffer.split("\n");
-      buffer = lines.pop() || "";
-      for (const line of lines) {
-        if (!line.trim()) continue;
-        const events = driver.parseLine(line);
-        for (const event of events) {
-          this.handleParsedEvent(agentId, event, driver);
         }
+      } else {
+        prompt = driver.buildSystemPrompt(config, agentId);
       }
-    });
-    proc.stderr?.on("data", (chunk) => {
-      const text = chunk.toString().trim();
-      if (!text) return;
-      if (/Reconnecting\.\.\.|Falling back from WebSockets/i.test(text)) return;
-      console.error(`[Agent ${agentId} stderr]: ${text}`);
-    });
-    proc.on("exit", (code) => {
-      console.log(`[Agent ${agentId}] Process exited with code ${code}`);
-      if (this.agents.has(agentId)) {
-        const ap = this.agents.get(agentId);
-        if (ap.pendingReceive) {
-          clearTimeout(ap.pendingReceive.timer);
-          ap.pendingReceive.resolve([]);
+      const { process: proc } = driver.spawn({
+        agentId,
+        config,
+        prompt,
+        workingDirectory: agentDataDir,
+        chatBridgePath: this.chatBridgePath,
+        daemonApiKey: this.daemonApiKey
+      });
+      const agentProcess = {
+        process: proc,
+        driver,
+        inbox: [],
+        pendingReceive: null,
+        config,
+        sessionId: config.sessionId || null,
+        isInReceiveMessage: false,
+        notificationTimer: null,
+        pendingNotificationCount: 0
+      };
+      this.agents.set(agentId, agentProcess);
+      this.agentsStarting.delete(agentId);
+      let buffer = "";
+      proc.stdout?.on("data", (chunk) => {
+        buffer += chunk.toString();
+        const lines = buffer.split("\n");
+        buffer = lines.pop() || "";
+        for (const line of lines) {
+          if (!line.trim()) continue;
+          const events = driver.parseLine(line);
+          for (const event of events) {
+            this.handleParsedEvent(agentId, event, driver);
+          }
         }
-        if (ap.notificationTimer) {
-          clearTimeout(ap.notificationTimer);
+      });
+      proc.stderr?.on("data", (chunk) => {
+        const text = chunk.toString().trim();
+        if (!text) return;
+        if (/Reconnecting\.\.\.|Falling back from WebSockets/i.test(text)) return;
+        console.error(`[Agent ${agentId} stderr]: ${text}`);
+      });
+      proc.on("exit", (code) => {
+        console.log(`[Agent ${agentId}] Process exited with code ${code}`);
+        if (this.agents.has(agentId)) {
+          const ap = this.agents.get(agentId);
+          if (ap.process !== proc) return;
+          if (ap.pendingReceive) {
+            clearTimeout(ap.pendingReceive.timer);
+            ap.pendingReceive.resolve([]);
+          }
+          if (ap.notificationTimer) {
+            clearTimeout(ap.notificationTimer);
+          }
+          this.agents.delete(agentId);
+          if (code === 0) {
+            this.sendToServer({ type: "agent:status", agentId, status: "sleeping" });
+            this.sendToServer({ type: "agent:activity", agentId, activity: "sleeping", detail: "" });
+          } else {
+            const reason = code === null ? "killed by signal" : `exit code ${code}`;
+            console.error(`[Agent ${agentId}] Process crashed (${reason}) \u2014 marking inactive`);
+            this.sendToServer({ type: "agent:status", agentId, status: "inactive" });
+            this.sendToServer({ type: "agent:activity", agentId, activity: "offline", detail: `Crashed (${reason})` });
+          }
         }
-        this.agents.delete(agentId);
-        this.sendToServer({ type: "agent:status", agentId, status: "sleeping" });
-        this.sendToServer({ type: "agent:activity", agentId, activity: "sleeping", detail: "" });
-      }
-    });
-    this.sendToServer({ type: "agent:status", agentId, status: "active" });
-    this.sendToServer({ type: "agent:activity", agentId, activity: "working", detail: "Starting\u2026" });
+      });
+      this.sendToServer({ type: "agent:status", agentId, status: "active" });
+      this.sendToServer({ type: "agent:activity", agentId, activity: "working", detail: "Starting\u2026" });
+    } catch (err) {
+      this.agentsStarting.delete(agentId);
+      throw err;
+    }
   }
   async stopAgent(agentId) {
     const ap = this.agents.get(agentId);
@@ -896,15 +920,22 @@ Note: While you are busy, you may receive [System notification: ...] messages ab
     }
   }
   // Workspace file browsing
-  async getFileTree(agentId) {
+  async getFileTree(agentId, dirPath) {
     const agentDir = path2.join(DATA_DIR, agentId);
     try {
       await stat(agentDir);
     } catch {
       return [];
     }
-    const count = { n: 0 };
-    return this.buildFileTree(agentDir, agentDir, count);
+    let targetDir = agentDir;
+    if (dirPath) {
+      const resolved = path2.resolve(agentDir, dirPath);
+      if (!resolved.startsWith(agentDir + path2.sep) && resolved !== agentDir) {
+        return [];
+      }
+      targetDir = resolved;
+    }
+    return this.listDirectoryChildren(targetDir, agentDir);
   }
   async readFile(agentId, filePath) {
     const agentDir = path2.join(DATA_DIR, agentId);
@@ -1031,7 +1062,8 @@ Note: While you are busy, you may receive [System notification: ...] messages ab
       ap.process.stdin?.write(encoded + "\n");
     }
   }
-  async buildFileTree(dir, rootDir, count) {
+  /** List ONE level of a directory — directories returned without children (lazy-loaded on demand) */
+  async listDirectoryChildren(dir, rootDir) {
     let entries;
     try {
       entries = await readdir(dir, { withFileTypes: true });
@@ -1045,7 +1077,6 @@ Note: While you are busy, you may receive [System notification: ...] messages ab
     });
     const nodes = [];
     for (const entry of entries) {
-      if (count.n >= 500) break;
       if (entry.name.startsWith(".") || entry.name === "node_modules") continue;
       const fullPath = path2.join(dir, entry.name);
       const relativePath = path2.relative(rootDir, fullPath);
@@ -1055,10 +1086,8 @@ Note: While you are busy, you may receive [System notification: ...] messages ab
       } catch {
         continue;
       }
-      count.n++;
       if (entry.isDirectory()) {
-        const children = await this.buildFileTree(fullPath, rootDir, count);
-        nodes.push({ name: entry.name, path: relativePath, isDirectory: true, size: 0, modifiedAt: info.mtime.toISOString(), children });
+        nodes.push({ name: entry.name, path: relativePath, isDirectory: true, size: 0, modifiedAt: info.mtime.toISOString() });
       } else {
         nodes.push({ name: entry.name, path: relativePath, isDirectory: false, size: info.size, modifiedAt: info.mtime.toISOString() });
       }
@@ -1117,7 +1146,12 @@ connection = new DaemonConnection({
     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);
+        agentManager.startAgent(msg.agentId, msg.config, msg.wakeMessage, msg.unreadSummary).catch((err) => {
+          const reason = err instanceof Error ? err.message : String(err);
+          console.error(`[Daemon] Failed to start agent ${msg.agentId}:`, reason);
+          connection.send({ type: "agent:status", agentId: msg.agentId, status: "inactive" });
+          connection.send({ type: "agent:activity", agentId: msg.agentId, activity: "offline", detail: `Start failed: ${reason}` });
+        });
         break;
       case "agent:stop":
         console.log(`[Daemon] Stopping agent ${msg.agentId}`);
@@ -1137,8 +1171,8 @@ connection = new DaemonConnection({
         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 });
+        agentManager.getFileTree(msg.agentId, msg.dirPath).then((files) => {
+          connection.send({ type: "agent:workspace:file_tree", agentId: msg.agentId, files, dirPath: msg.dirPath });
         });
         break;
       case "agent:workspace:read":

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@slock-ai/daemon",
-  "version": "0.4.1",
+  "version": "0.6.0",
   "type": "module",
   "bin": {
     "slock-daemon": "dist/index.js"