@slock-ai/daemon 0.12.0 → 0.14.0

package/dist/chat-bridge.js

@@ -27,28 +27,38 @@ var commonHeaders = { "Content-Type": "application/json" };
 if (authToken) {
   commonHeaders["Authorization"] = `Bearer ${authToken}`;
 }
+function formatTarget(m) {
+  if (m.channel_type === "thread" && m.parent_channel_name) {
+    const shortId = m.channel_name.startsWith("thread-") ? m.channel_name.slice(7) : m.channel_name;
+    if (m.parent_channel_type === "dm") {
+      return `dm:@${m.parent_channel_name}:${shortId}`;
+    }
+    return `#${m.parent_channel_name}:${shortId}`;
+  }
+  if (m.channel_type === "dm") {
+    return `dm:@${m.channel_name}`;
+  }
+  return `#${m.channel_name}`;
+}
 var server = new McpServer({
   name: "chat",
   version: "1.0.0"
 });
 server.tool(
   "send_message",
-  "Send a message to a channel or DM. To reply, reuse the channel value from the received message (e.g. channel='#all' or channel='DM:@richard'). To start a NEW DM, use dm_to with the person's name.",
+  "Send a message to a channel, DM, or thread. Use the target value from received messages to reply. Format: '#channel' for channels, 'dm:@peer' for DMs, '#channel:shortid' for threads in channels, 'dm:@peer:shortid' for threads in DMs. To start a NEW DM, use 'dm:@person-name'.",
   {
-    channel: z.string().optional().describe(
-      "Where to send. Reuse the identifier from received messages: '#channel-name' for channels, 'DM:@peer-name' for DMs. Examples: '#all', '#general', 'DM:@richard'."
-    ),
-    dm_to: z.string().optional().describe(
-      "Person's name to start a NEW DM with (e.g. 'richard'). Only for starting a new DM \u2014 to reply in an existing DM, use channel instead."
+    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")
   },
-  async ({ channel, dm_to, content }) => {
+  async ({ target, content }) => {
     try {
       const res = await fetch(`${serverUrl}/internal/agent/${agentId}/send`, {
         method: "POST",
         headers: commonHeaders,
-        body: JSON.stringify({ channel, dm_to, content })
+        body: JSON.stringify({ target, content })
       });
       const data = await res.json();
       if (!res.ok) {
@@ -58,11 +68,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 ${channel || `new DM with ${dm_to}`}`
+            text: `Message sent to ${target}. Message ID: ${data.messageId}${replyHint}`
           }
         ]
       };
@@ -75,7 +87,7 @@ server.tool(
 );
 server.tool(
   "receive_message",
-  "Receive new messages. Use block=true to wait for new messages. Returns messages formatted as [#channel-name] or [DM:@peer-name] followed by the sender and content.",
+  "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.",
   {
     block: z.boolean().default(true).describe("Whether to block (wait) for new messages"),
     timeout_ms: z.number().default(59e3).describe("How long to wait in ms when blocking (default 59s, just under MCP tool call timeout)")
@@ -96,10 +108,11 @@ 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) " : "";
-        const time = m.timestamp ? ` (${toLocalTime(m.timestamp)})` : "";
-        return `[${channel}]${time} ${senderPrefix}@${m.sender_name}: ${m.content}`;
+        const target = formatTarget(m);
+        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" : "";
+        return `[target=${target} msg=${msgId} time=${time}${senderType}] @${m.sender_name}: ${m.content}`;
       }).join("\n");
       return {
         content: [{ type: "text", text: formatted }]
@@ -146,7 +159,7 @@ server.tool(
         text += "  (none)\n";
       }
       text += "\n### Humans\n";
-      text += 'To start a new DM: send_message(dm_to="<name>"). To reply in an existing DM: reuse channel from the received message.\n';
+      text += 'To start a new DM: send_message(target="dm:@name"). To reply in an existing DM: reuse the target from received messages.\n';
       if (data.humans?.length > 0) {
         for (const u of data.humans) {
           text += `  - @${u.name}
@@ -167,9 +180,9 @@ server.tool(
 );
 server.tool(
   "read_history",
-  "Read message history for a channel or DM. Use #channel-name for channels or DM:@name for DMs. Supports pagination: use 'before' to load older messages, 'after' to load messages after a seq number (e.g. to catch up on unread).",
+  "Read message history for a channel, DM, or thread. Use the same target format: '#channel', 'dm:@name', '#channel:id' for threads, 'dm:@name:id' for DM threads. Supports pagination: use 'before' to load older messages, 'after' to load messages after a seq number (e.g. to catch up on unread).",
   {
-    channel: z.string().describe("The channel to read history from \u2014 e.g. '#all', '#general', 'DM:@richard'"),
+    channel: z.string().describe("The target to read history from \u2014 e.g. '#general', 'dm:@richard', '#general:abcd1234', 'dm:@richard:abcd1234'"),
     limit: z.number().default(50).describe("Max number of messages to return (default 50, max 100)"),
     before: z.number().optional().describe("Return messages before this seq number (for backward pagination). Omit for latest messages."),
     after: z.number().optional().describe("Return messages after this seq number (for catching up on unread). Returns oldest-first.")
@@ -201,9 +214,10 @@ 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) : "-";
+        return `[seq=${m.seq} msg=${msgId} time=${time}${senderType}] @${m.senderName}: ${m.content}`;
       }).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) {
@@ -143,20 +145,41 @@ ${opts.postStartupNotes.join("\n")}`;
 
 ## Messaging
 
-Messages you receive look like:
-- **Channel message from a human**: \`[#all] @richard: hello everyone\`
-- **Channel message from an agent**: \`[#all] (agent) @Alice: hi there\`
-- **DM from a human**: \`[DM:@richard] @richard: hey, can you help?\`
+Messages you receive have a single RFC 5424-style structured data header followed by the sender and content:
 
-The \`[...]\` prefix identifies where the message came from. Reuse it as the \`channel\` parameter when replying.
+\`\`\`
+[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
+\`\`\`
+
+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
 
-- **Reply to a channel**: \`send_message(channel="#channel-name", content="...")\`
-- **Reply to a DM**: \`send_message(channel="DM:@peer-name", content="...")\`  \u2014 reuse the channel value from the received message
-- **Start a NEW DM**: \`send_message(dm_to="peer-name", content="...")\`  \u2014 use the human's name from list_server (no @ prefix)
+- **Reply to a channel**: \`send_message(target="#channel-name", content="...")\`
+- **Reply to a DM**: \`send_message(target="dm:@peer-name", content="...")\`
+- **Reply in a thread**: \`send_message(target="#channel:shortid", content="...")\` or \`send_message(target="dm:@peer:shortid", content="...")\`
+- **Start a NEW DM**: \`send_message(target="dm:@person-name", content="...")\`
+
+**IMPORTANT**: To reply to any message, always reuse the exact \`target\` from the received message. This ensures your reply goes to the right place \u2014 whether it's a channel, DM, or thread.
 
-**IMPORTANT**: To reply to any message (channel or DM), always use \`channel\` with the exact identifier from the received message. Only use \`dm_to\` when you want to start a brand new DM that doesn't exist yet.
+### Threads
+
+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: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.
+- **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
 
@@ -165,13 +188,13 @@ Call \`list_server\` to see all channels in this server, which ones you have joi
 ### Channel awareness
 
 Each channel has a **name** and optionally a **description** that define its purpose (visible via \`list_server\`). Respect them:
-- **Reply in context** \u2014 always respond in the channel the message came from.
+- **Reply in context** \u2014 always respond in the channel/thread the message came from.
 - **Stay on topic** \u2014 when proactively sharing results or updates, post in the channel most relevant to the work. Don't scatter messages across unrelated channels.
 - If unsure where something belongs, call \`list_server\` to review channel descriptions.
 
 ### Reading history
 
-\`read_history(channel="#channel-name")\` or \`read_history(channel="DM:@peer-name")\`
+\`read_history(channel="#channel-name")\` or \`read_history(channel="dm:@peer-name")\` or \`read_history(channel="#channel:shortid")\`
 
 ### Task boards
 
@@ -348,6 +371,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",
@@ -357,7 +382,7 @@ var ClaudeDriver = class {
       "--input-format",
       "stream-json",
       "--mcp-config",
-      mcpConfig,
+      mcpConfigPath,
       "--model",
       ctx.config.model || "sonnet"
     ];
@@ -472,9 +497,9 @@ var ClaudeDriver = class {
       if (name === "WebFetch" || name === "web_fetch") return input.url || "";
       if (name === "WebSearch" || name === "web_search") return input.query || "";
       if (name === "mcp__chat__send_message") {
-        return input.channel || (input.dm_to ? `DM:@${input.dm_to}` : "");
+        return input.target || input.channel || (input.dm_to ? `DM:@${input.dm_to}` : "");
       }
-      if (name === "mcp__chat__read_history") return input.channel || "";
+      if (name === "mcp__chat__read_history") return input.target || input.channel || "";
       if (name === "mcp__chat__list_tasks") return input.channel || "";
       if (name === "mcp__chat__create_tasks") return input.channel || "";
       if (name === "mcp__chat__claim_tasks") {
@@ -494,13 +519,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'", {
@@ -683,9 +708,9 @@ var CodexDriver = class {
       if (name === "file_write") return input.path || input.file_path || "";
       if (name === "web_search") return input.query || "";
       if (name === `${this.mcpToolPrefix}send_message`) {
-        return input.channel || (input.dm_to ? `DM:@${input.dm_to}` : "");
+        return input.target || input.channel || (input.dm_to ? `DM:@${input.dm_to}` : "");
       }
-      if (name === `${this.mcpToolPrefix}read_history`) return input.channel || "";
+      if (name === `${this.mcpToolPrefix}read_history`) return input.target || input.channel || "";
       if (name === `${this.mcpToolPrefix}list_tasks`) return input.channel || "";
       if (name === `${this.mcpToolPrefix}create_tasks`) return input.channel || "";
       if (name === `${this.mcpToolPrefix}claim_tasks`) {
@@ -716,7 +741,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;
@@ -741,9 +766,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 {
@@ -761,7 +786,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) {
@@ -941,7 +966,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}`);
@@ -967,14 +992,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()) {
@@ -1004,7 +1029,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}`);
@@ -1016,7 +1041,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 {
@@ -1024,8 +1049,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;
@@ -1033,9 +1058,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);
@@ -1059,7 +1084,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 };
     }
@@ -1098,7 +1123,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;
@@ -1173,8 +1201,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);
@@ -1191,6 +1219,50 @@ Note: While you are busy, you may receive [System notification: ...] messages ab
   }
 };
 
+// ../shared/src/serverPermissions.ts
+var EMPTY_SERVER_CAPABILITIES = Object.freeze({
+  manageServer: false,
+  manageChannels: false,
+  manageAgents: false,
+  manageMachines: false,
+  manageMembers: false,
+  changeMemberRoles: false,
+  manageBilling: false,
+  joinPublicChannels: false
+});
+var SERVER_CAPABILITY_MATRIX = {
+  owner: Object.freeze({
+    manageServer: true,
+    manageChannels: true,
+    manageAgents: true,
+    manageMachines: true,
+    manageMembers: true,
+    changeMemberRoles: true,
+    manageBilling: true,
+    joinPublicChannels: true
+  }),
+  admin: Object.freeze({
+    manageServer: true,
+    manageChannels: true,
+    manageAgents: true,
+    manageMachines: true,
+    manageMembers: true,
+    changeMemberRoles: false,
+    manageBilling: false,
+    joinPublicChannels: true
+  }),
+  member: Object.freeze({
+    manageServer: false,
+    manageChannels: false,
+    manageAgents: false,
+    manageMachines: false,
+    manageMembers: false,
+    changeMemberRoles: false,
+    manageBilling: false,
+    joinPublicChannels: true
+  })
+};
+
 // ../shared/src/index.ts
 var RUNTIMES = [
   { id: "claude", displayName: "Claude Code", binary: "claude", supported: true },
@@ -1225,12 +1297,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.12.0",
+  "version": "0.14.0",
   "type": "module",
   "bin": {
     "slock-daemon": "dist/index.js"