@slock-ai/daemon 0.13.0 → 0.16.0

package/dist/chat-bridge.js

@@ -51,14 +51,15 @@ server.tool(
     target: z.string().describe(
       "Where to send. Reuse the identifier from received messages. Format: '#channel' for channels, 'dm:@name' for DMs, '#channel:id' for channel threads, 'dm:@name:id' for DM threads. Examples: '#general', 'dm:@richard', '#general:abcd1234', 'dm:@richard:abcd1234'."
     ),
-    content: z.string().describe("The message content")
+    content: z.string().describe("The message content"),
+    attachment_ids: z.array(z.string()).optional().describe("Optional attachment IDs from upload_file to include with the message")
   },
-  async ({ target, content }) => {
+  async ({ target, content, attachment_ids }) => {
     try {
       const res = await fetch(`${serverUrl}/internal/agent/${agentId}/send`, {
         method: "POST",
         headers: commonHeaders,
-        body: JSON.stringify({ target, content })
+        body: JSON.stringify({ target, content, attachmentIds: attachment_ids })
       });
       const data = await res.json();
       if (!res.ok) {
@@ -68,11 +69,13 @@ server.tool(
           ]
         };
       }
+      const shortId = data.messageId ? data.messageId.slice(0, 8) : null;
+      const replyHint = shortId ? ` (to reply in this message's thread, use target "${target.includes(":") ? target : target + ":" + shortId}")` : "";
       return {
         content: [
           {
             type: "text",
-            text: `Message sent to ${target}`
+            text: `Message sent to ${target}. Message ID: ${data.messageId}${replyHint}`
           }
         ]
       };
@@ -83,6 +86,148 @@ server.tool(
     }
   }
 );
+server.tool(
+  "upload_file",
+  "Upload an image file to attach to a message. Returns an attachment ID that you can pass to send_message's attachment_ids parameter. Supported formats: JPEG, PNG, GIF, WebP. Max size: 5MB.",
+  {
+    file_path: z.string().describe("Absolute path to the image file on your local filesystem"),
+    channel: z.string().describe("The channel target where this file will be used (e.g. '#general', 'dm:@richard')")
+  },
+  async ({ file_path, channel }) => {
+    try {
+      const fs = await import("fs");
+      const path = await import("path");
+      if (!fs.existsSync(file_path)) {
+        return {
+          content: [{ type: "text", text: `Error: File not found: ${file_path}` }]
+        };
+      }
+      const stat = fs.statSync(file_path);
+      if (stat.size > 5 * 1024 * 1024) {
+        return {
+          content: [{ type: "text", text: `Error: File too large (${(stat.size / 1024 / 1024).toFixed(1)}MB). Max 5MB.` }]
+        };
+      }
+      const listRes = await fetch(`${serverUrl}/internal/agent/${agentId}/resolve-channel`, {
+        method: "POST",
+        headers: commonHeaders,
+        body: JSON.stringify({ target: channel })
+      });
+      let channelId;
+      if (listRes.ok) {
+        const listData = await listRes.json();
+        channelId = listData.channelId;
+      } else {
+        return {
+          content: [{ type: "text", text: `Error: Could not resolve channel: ${channel}` }]
+        };
+      }
+      const fileBuffer = fs.readFileSync(file_path);
+      const filename = path.basename(file_path);
+      const ext = path.extname(file_path).toLowerCase();
+      const mimeMap = {
+        ".jpg": "image/jpeg",
+        ".jpeg": "image/jpeg",
+        ".png": "image/png",
+        ".gif": "image/gif",
+        ".webp": "image/webp"
+      };
+      const mimeType = mimeMap[ext] || "application/octet-stream";
+      const blob = new Blob([fileBuffer], { type: mimeType });
+      const formData = new FormData();
+      formData.append("file", blob, filename);
+      formData.append("channelId", channelId);
+      const uploadHeaders = {};
+      if (authToken) {
+        uploadHeaders["Authorization"] = `Bearer ${authToken}`;
+      }
+      const res = await fetch(`${serverUrl}/internal/agent/${agentId}/upload`, {
+        method: "POST",
+        headers: uploadHeaders,
+        body: formData
+      });
+      const data = await res.json();
+      if (!res.ok) {
+        return {
+          content: [{ type: "text", text: `Error: ${data.error}` }]
+        };
+      }
+      return {
+        content: [
+          {
+            type: "text",
+            text: `File uploaded: ${data.filename} (${(data.sizeBytes / 1024).toFixed(1)}KB)
+Attachment ID: ${data.id}
+
+Use this ID in send_message's attachment_ids parameter to include it in a message.`
+          }
+        ]
+      };
+    } catch (err) {
+      return {
+        content: [{ type: "text", text: `Error: ${err.message}` }]
+      };
+    }
+  }
+);
+server.tool(
+  "view_file",
+  "Download an attached image by its attachment ID and save it locally so you can view it. Returns the local file path. Use this when you see '[use view_file to see]' in a message with images.",
+  {
+    attachment_id: z.string().describe("The attachment UUID (from the 'id:...' shown in the message)")
+  },
+  async ({ attachment_id }) => {
+    try {
+      const fs = await import("fs");
+      const path = await import("path");
+      const os = await import("os");
+      const cacheDir = path.join(os.homedir(), ".slock", "attachments");
+      fs.mkdirSync(cacheDir, { recursive: true });
+      const existing = fs.readdirSync(cacheDir).find((f) => f.startsWith(attachment_id));
+      if (existing) {
+        const cachedPath = path.join(cacheDir, existing);
+        return {
+          content: [{ type: "text", text: `File already cached at: ${cachedPath}
+
+Use your Read tool to view this image.` }]
+        };
+      }
+      const downloadHeaders = {};
+      if (authToken) {
+        downloadHeaders["Authorization"] = `Bearer ${authToken}`;
+      }
+      const res = await fetch(`${serverUrl}/api/attachments/${attachment_id}`, {
+        headers: downloadHeaders,
+        redirect: "follow"
+      });
+      if (!res.ok) {
+        return {
+          content: [{ type: "text", text: `Error: Failed to download attachment (${res.status})` }]
+        };
+      }
+      const contentType = res.headers.get("content-type") || "application/octet-stream";
+      const extMap = {
+        "image/jpeg": ".jpg",
+        "image/png": ".png",
+        "image/gif": ".gif",
+        "image/webp": ".webp"
+      };
+      const ext = extMap[contentType] || ".bin";
+      const filePath = path.join(cacheDir, `${attachment_id}${ext}`);
+      const buffer = Buffer.from(await res.arrayBuffer());
+      fs.writeFileSync(filePath, buffer);
+      return {
+        content: [{ type: "text", text: `Downloaded to: ${filePath}
+
+Use your Read tool to view this image.` }]
+      };
+    } catch (err) {
+      return {
+        content: [{ type: "text", text: `Error: ${err.message}` }]
+      };
+    }
+  }
+);
 server.tool(
   "receive_message",
   "Receive new messages. Use block=true to wait for new messages. Returns messages formatted as [#channel], [dm:@peer], or [thread:#channel:id] followed by the sender and content.",
@@ -107,9 +252,11 @@ server.tool(
       }
       const formatted = data.messages.map((m) => {
         const target = formatTarget(m);
-        const senderPrefix = m.sender_type === "agent" ? "(agent) " : "";
-        const time = m.timestamp ? ` (${toLocalTime(m.timestamp)})` : "";
-        return `[${target}]${time} ${senderPrefix}@${m.sender_name}: ${m.content}`;
+        const msgId = m.message_id ? m.message_id.slice(0, 8) : "-";
+        const time = m.timestamp ? toLocalTime(m.timestamp) : "-";
+        const senderType = m.sender_type === "agent" ? " type=agent" : "";
+        const attachSuffix = m.attachments?.length ? ` [${m.attachments.length} image${m.attachments.length > 1 ? "s" : ""}: ${m.attachments.map((a) => `${a.filename} (id:${a.id})`).join(", ")} \u2014 use view_file to see]` : "";
+        return `[target=${target} msg=${msgId} time=${time}${senderType}] @${m.sender_name}: ${m.content}${attachSuffix}`;
       }).join("\n");
       return {
         content: [{ type: "text", text: formatted }]
@@ -211,9 +358,11 @@ server.tool(
         };
       }
       const formatted = data.messages.map((m) => {
-        const senderPrefix = m.senderType === "agent" ? "(agent) " : "";
-        const time = m.createdAt ? ` (${toLocalTime(m.createdAt)})` : "";
-        return `[seq:${m.seq}]${time} ${senderPrefix}@${m.senderName}: ${m.content}`;
+        const senderType = m.senderType === "agent" ? " type=agent" : "";
+        const time = m.createdAt ? toLocalTime(m.createdAt) : "-";
+        const msgId = m.id ? m.id.slice(0, 8) : "-";
+        const attachSuffix = m.attachments?.length ? ` [${m.attachments.length} image${m.attachments.length > 1 ? "s" : ""}: ${m.attachments.map((a) => `${a.filename} (id:${a.id})`).join(", ")} \u2014 use view_file to see]` : "";
+        return `[seq=${m.seq} msg=${msgId} time=${time}${senderType}] @${m.senderName}: ${m.content}${attachSuffix}`;
       }).join("\n");
       let footer = "";
       if (data.historyLimited) {

package/dist/index.js

@@ -1,7 +1,7 @@
 #!/usr/bin/env node
 
 // src/index.ts
-import path3 from "path";
+import path4 from "path";
 import os2 from "os";
 import { createRequire } from "module";
 import { execSync as execSync2 } from "child_process";
@@ -84,11 +84,13 @@ var DaemonConnection = class {
 
 // src/agentProcessManager.ts
 import { mkdir, writeFile, access, readdir, stat, readFile, rm } from "fs/promises";
-import path2 from "path";
+import path3 from "path";
 import os from "os";
 
 // src/drivers/claude.ts
 import { spawn } from "child_process";
+import { writeFileSync } from "fs";
+import path from "path";
 
 // src/drivers/systemPrompt.ts
 function toolRef(prefix, name) {
@@ -127,6 +129,7 @@ You have MCP tools from the "chat" server. Use ONLY these for communication:
 7. **${t("claim_tasks")}** \u2014 Claim tasks by number (supports batch, handles conflicts).
 8. **${t("unclaim_task")}** \u2014 Release your claim on a task.
 9. **${t("update_task_status")}** \u2014 Change a task's status (e.g. to in_review or done).
+10. **${t("upload_file")}** \u2014 Upload an image file to attach to a message. Returns an attachment ID to pass to send_message.
 
 CRITICAL RULES:
 ${criticalRules.join("\n")}
@@ -143,14 +146,21 @@ ${opts.postStartupNotes.join("\n")}`;
 
 ## Messaging
 
-Messages you receive look like:
-- **Channel message**: \`[#general] @richard: hello everyone\`
-- **Channel message from an agent**: \`[#general] (agent) @Alice: hi there\`
-- **DM**: \`[dm:@richard] @richard: hey, can you help?\`
-- **Thread in a channel**: \`[#general:a1b2c3] @richard: replying in thread\`
-- **Thread in a DM**: \`[dm:@richard:x9y8z7] @richard: thread reply\`
+Messages you receive have a single RFC 5424-style structured data header followed by the sender and content:
+
+\`\`\`
+[target=#general msg=a1b2c3d4 time=2026-03-15T01:00:00] @richard: hello everyone
+[target=#general msg=e5f6a7b8 time=2026-03-15T01:00:01 type=agent] @Alice: hi there
+[target=dm:@richard msg=c9d0e1f2 time=2026-03-15T01:00:02] @richard: hey, can you help?
+[target=#general:a1b2c3d4 msg=f3a4b5c6 time=2026-03-15T01:00:03] @richard: thread reply
+[target=dm:@richard:x9y8z7a0 msg=d7e8f9a0 time=2026-03-15T01:00:04] @richard: DM thread reply
+\`\`\`
 
-The \`[...]\` prefix is the **target** \u2014 it identifies where the message came from. Reuse it exactly as the \`target\` parameter when replying.
+Header fields:
+- \`target=\` \u2014 where the message came from. Reuse as the \`target\` parameter when replying.
+- \`msg=\` \u2014 message short ID (first 8 chars of UUID). Use as thread suffix to start/reply in a thread.
+- \`time=\` \u2014 timestamp.
+- \`type=agent\` \u2014 present only if the sender is an agent.
 
 ### Sending messages
 
@@ -165,9 +175,11 @@ The \`[...]\` prefix is the **target** \u2014 it identifies where the message ca
 
 Threads are sub-conversations attached to a specific message. They let you discuss a topic without cluttering the main channel.
 
-- **Thread targets** have a colon and short ID suffix: \`#general:a1b2c3\` (thread in #general) or \`dm:@richard:x9y8z7\` (thread in a DM).
+- **Thread targets** have a colon and short ID suffix: \`#general:a1b2c3d4\` (thread in #general) or \`dm:@richard:x9y8z7a0\` (thread in a DM).
 - When you receive a message from a thread (the target has a \`:shortid\` suffix), **always reply using that same target** to keep the conversation in the thread.
-- You can read thread history: \`read_history(channel="#general:a1b2c3")\`
+- **Start a new thread**: Use the \`msg=\` field from the header as the thread suffix. For example, if you see \`[target=#general msg=a1b2c3d4 ...]\`, reply with \`send_message(target="#general:a1b2c3d4", content="...")\`. The thread will be auto-created if it doesn't exist yet.
+- When you send a message, the response includes the message ID. You can use it to start a thread on your own message.
+- You can read thread history: \`read_history(channel="#general:a1b2c3d4")\`
 - Threads cannot be nested \u2014 you cannot start a thread inside a thread.
 
 ### Discovering people and channels
@@ -360,6 +372,8 @@ var ClaudeDriver = class {
         }
       }
     });
+    const mcpConfigPath = path.join(ctx.workingDirectory, ".slock-claude-mcp.json");
+    writeFileSync(mcpConfigPath, mcpConfig, "utf8");
     const args2 = [
       "--allow-dangerously-skip-permissions",
       "--dangerously-skip-permissions",
@@ -369,7 +383,7 @@ var ClaudeDriver = class {
       "--input-format",
       "stream-json",
       "--mcp-config",
-      mcpConfig,
+      mcpConfigPath,
       "--model",
       ctx.config.model || "sonnet"
     ];
@@ -496,6 +510,7 @@ var ClaudeDriver = class {
       if (name === "mcp__chat__unclaim_task" || name === "mcp__chat__complete_task") {
         return input.channel ? `${input.channel} #t${input.task_number}` : "";
       }
+      if (name === "mcp__chat__upload_file") return input.file_path || "";
       return "";
     } catch {
       return "";
@@ -506,13 +521,13 @@ var ClaudeDriver = class {
 // src/drivers/codex.ts
 import { spawn as spawn2, execSync } from "child_process";
 import { existsSync } from "fs";
-import path from "path";
+import path2 from "path";
 var CodexDriver = class {
   id = "codex";
   supportsStdinNotification = false;
   mcpToolPrefix = "mcp_chat_";
   spawn(ctx) {
-    const gitDir = path.join(ctx.workingDirectory, ".git");
+    const gitDir = path2.join(ctx.workingDirectory, ".git");
     if (!existsSync(gitDir)) {
       execSync("git init", { cwd: ctx.workingDirectory, stdio: "pipe" });
       execSync("git add -A && git commit --allow-empty -m 'init'", {
@@ -707,6 +722,7 @@ var CodexDriver = class {
       if (name === `${this.mcpToolPrefix}unclaim_task` || name === `${this.mcpToolPrefix}complete_task`) {
         return input.channel ? `${input.channel} #t${input.task_number}` : "";
       }
+      if (name === `${this.mcpToolPrefix}upload_file`) return input.file_path || "";
       return "";
     } catch {
       return "";
@@ -728,7 +744,7 @@ function getDriver(runtimeId) {
 }
 
 // src/agentProcessManager.ts
-var DATA_DIR = path2.join(os.homedir(), ".slock", "agents");
+var DATA_DIR = path3.join(os.homedir(), ".slock", "agents");
 function toLocalTime(iso) {
   const d = new Date(iso);
   if (isNaN(d.getTime())) return iso;
@@ -753,9 +769,9 @@ var AgentProcessManager = class {
     this.agentsStarting.add(agentId);
     try {
       const driver = getDriver(config.runtime || "claude");
-      const agentDataDir = path2.join(DATA_DIR, agentId);
+      const agentDataDir = path3.join(DATA_DIR, agentId);
       await mkdir(agentDataDir, { recursive: true });
-      const memoryMdPath = path2.join(agentDataDir, "MEMORY.md");
+      const memoryMdPath = path3.join(agentDataDir, "MEMORY.md");
       try {
         await access(memoryMdPath);
       } catch {
@@ -773,7 +789,7 @@ ${config.description || "No role defined yet."}
 `;
         await writeFile(memoryMdPath, initialMemoryMd);
       }
-      await mkdir(path2.join(agentDataDir, "notes"), { recursive: true });
+      await mkdir(path3.join(agentDataDir, "notes"), { recursive: true });
       const isResume = !!config.sessionId;
       let prompt;
       if (isResume && wakeMessage) {
@@ -953,7 +969,7 @@ Note: While you are busy, you may receive [System notification: ...] messages ab
     }
   }
   async resetWorkspace(agentId) {
-    const agentDataDir = path2.join(DATA_DIR, agentId);
+    const agentDataDir = path3.join(DATA_DIR, agentId);
     try {
       await rm(agentDataDir, { recursive: true, force: true });
       console.log(`[Agent ${agentId}] Workspace deleted: ${agentDataDir}`);
@@ -979,14 +995,14 @@ Note: While you are busy, you may receive [System notification: ...] messages ab
     }
     for (const entry of entries) {
       if (!entry.isDirectory()) continue;
-      const dirPath = path2.join(DATA_DIR, entry.name);
+      const dirPath = path3.join(DATA_DIR, entry.name);
       try {
         const dirContents = await readdir(dirPath, { withFileTypes: true });
         let totalSize = 0;
         let latestMtime = /* @__PURE__ */ new Date(0);
         let fileCount = 0;
         for (const item of dirContents) {
-          const itemPath = path2.join(dirPath, item.name);
+          const itemPath = path3.join(dirPath, item.name);
           try {
             const info = await stat(itemPath);
             if (item.isFile()) {
@@ -1016,7 +1032,7 @@ Note: While you are busy, you may receive [System notification: ...] messages ab
     if (directoryName.includes("/") || directoryName.includes("..") || directoryName.includes("\\")) {
       return false;
     }
-    const targetDir = path2.join(DATA_DIR, directoryName);
+    const targetDir = path3.join(DATA_DIR, directoryName);
     try {
       await rm(targetDir, { recursive: true, force: true });
       console.log(`[Workspace] Deleted directory: ${targetDir}`);
@@ -1028,7 +1044,7 @@ Note: While you are busy, you may receive [System notification: ...] messages ab
   }
   // Workspace file browsing
   async getFileTree(agentId, dirPath) {
-    const agentDir = path2.join(DATA_DIR, agentId);
+    const agentDir = path3.join(DATA_DIR, agentId);
     try {
       await stat(agentDir);
     } catch {
@@ -1036,8 +1052,8 @@ Note: While you are busy, you may receive [System notification: ...] messages ab
     }
     let targetDir = agentDir;
     if (dirPath) {
-      const resolved = path2.resolve(agentDir, dirPath);
-      if (!resolved.startsWith(agentDir + path2.sep) && resolved !== agentDir) {
+      const resolved = path3.resolve(agentDir, dirPath);
+      if (!resolved.startsWith(agentDir + path3.sep) && resolved !== agentDir) {
         return [];
       }
       targetDir = resolved;
@@ -1045,9 +1061,9 @@ Note: While you are busy, you may receive [System notification: ...] messages ab
     return this.listDirectoryChildren(targetDir, agentDir);
   }
   async readFile(agentId, filePath) {
-    const agentDir = path2.join(DATA_DIR, agentId);
-    const resolved = path2.resolve(agentDir, filePath);
-    if (!resolved.startsWith(agentDir + path2.sep) && resolved !== agentDir) {
+    const agentDir = path3.join(DATA_DIR, agentId);
+    const resolved = path3.resolve(agentDir, filePath);
+    if (!resolved.startsWith(agentDir + path3.sep) && resolved !== agentDir) {
       throw new Error("Access denied");
     }
     const info = await stat(resolved);
@@ -1071,7 +1087,7 @@ Note: While you are busy, you may receive [System notification: ...] messages ab
       ".sh",
       ".py"
     ]);
-    const ext = path2.extname(resolved).toLowerCase();
+    const ext = path3.extname(resolved).toLowerCase();
     if (!TEXT_EXTENSIONS.has(ext) && ext !== "") {
       return { content: null, binary: true };
     }
@@ -1110,7 +1126,10 @@ Note: While you are busy, you may receive [System notification: ...] messages ab
         const inputSummary = driver.summarizeToolInput(toolName, event.input);
         trajectory.push({ kind: "tool_start", toolName, toolInput: inputSummary });
         if (toolName === `${driver.mcpToolPrefix}receive_message`) {
-          activity = "online";
+          const isBlocking = event.input?.block !== false;
+          if (isBlocking) {
+            activity = "online";
+          }
           if (ap) {
             ap.isInReceiveMessage = true;
             ap.pendingNotificationCount = 0;
@@ -1185,8 +1204,8 @@ Note: While you are busy, you may receive [System notification: ...] messages ab
     const nodes = [];
     for (const entry of entries) {
       if (entry.name.startsWith(".") || entry.name === "node_modules") continue;
-      const fullPath = path2.join(dir, entry.name);
-      const relativePath = path2.relative(rootDir, fullPath);
+      const fullPath = path3.join(dir, entry.name);
+      const relativePath = path3.relative(rootDir, fullPath);
       let info;
       try {
         info = await stat(fullPath);
@@ -1281,12 +1300,12 @@ if (!serverUrl || !apiKey) {
   console.error("Usage: slock-daemon --server-url <url> --api-key <key>");
   process.exit(1);
 }
-var __dirname = path3.dirname(fileURLToPath(import.meta.url));
-var chatBridgePath = path3.resolve(__dirname, "chat-bridge.js");
+var __dirname = path4.dirname(fileURLToPath(import.meta.url));
+var chatBridgePath = path4.resolve(__dirname, "chat-bridge.js");
 try {
   accessSync(chatBridgePath);
 } catch {
-  chatBridgePath = path3.resolve(__dirname, "chat-bridge.ts");
+  chatBridgePath = path4.resolve(__dirname, "chat-bridge.ts");
 }
 var connection;
 var agentManager = new AgentProcessManager(chatBridgePath, (msg) => {

package/package.json

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