@slock-ai/daemon 0.24.0 → 0.25.0

package/dist/chat-bridge.js

@@ -256,62 +256,6 @@ server.tool(
     }
   }
 );
-server.tool(
-  "wait_for_message",
-  "Block and wait for new messages. ONLY call this when you have NO work left to do \u2014 all tasks complete, all replies sent, nothing pending. This blocks for up to ~4 minutes waiting for a message to arrive. If you still have work in progress, do NOT call this \u2014 finish your work first.",
-  {},
-  async () => {
-    try {
-      const POLL_INTERVAL_MS = 25e3;
-      const MAX_WAIT_MS = 27e4;
-      const startTime = Date.now();
-      while (true) {
-        const elapsed = Date.now() - startTime;
-        const remaining = MAX_WAIT_MS - elapsed;
-        if (remaining <= 0) {
-          const params2 = new URLSearchParams();
-          params2.set("block", "true");
-          params2.set("timeout", "1000");
-          const res2 = await fetch(
-            `${serverUrl}/internal/agent/${agentId}/receive?${params2}`,
-            { method: "GET", headers: commonHeaders }
-          );
-          if (!res2.ok) {
-            const errData = await res2.json().catch(() => ({}));
-            return { content: [{ type: "text", text: `Error: ${errData.error || res2.statusText}` }] };
-          }
-          const data2 = await res2.json();
-          if (data2.messages?.length > 0) {
-            return { content: [{ type: "text", text: formatMessages(data2.messages) }] };
-          }
-          return {
-            content: [{ type: "text", text: "No new messages. Take a rest \u2014 new messages will be delivered to you directly. Do not take any further action until notified." }]
-          };
-        }
-        const thisPoll = Math.min(POLL_INTERVAL_MS, remaining);
-        const params = new URLSearchParams();
-        params.set("block", "true");
-        params.set("timeout", String(thisPoll));
-        const res = await fetch(
-          `${serverUrl}/internal/agent/${agentId}/receive?${params}`,
-          { method: "GET", headers: commonHeaders }
-        );
-        if (!res.ok) {
-          const errData = await res.json().catch(() => ({}));
-          return { content: [{ type: "text", text: `Error: ${errData.error || res.statusText}` }] };
-        }
-        const data = await res.json();
-        if (data.messages?.length > 0) {
-          return { content: [{ type: "text", text: formatMessages(data.messages) }] };
-        }
-      }
-    } catch (err) {
-      return {
-        content: [{ type: "text", text: `Error: ${err.message}` }]
-      };
-    }
-  }
-);
 function formatMessages(messages) {
   return messages.map((m) => {
     const target = formatTarget(m);

package/dist/index.js

@@ -106,9 +106,9 @@ function buildBaseSystemPrompt(config, opts) {
   const startupSteps = [
     `1. **Read MEMORY.md** (in your cwd). This is your memory index \u2014 it tells you what you know and where to find it.`,
     `2. Follow the instructions in MEMORY.md to read any other memory files you need (e.g. channel summaries, role definitions, user preferences).`,
-    `3. Call ${t("wait_for_message")}() to start listening.`,
+    `3. Stop and wait. New messages will be delivered to you automatically via stdin.`,
     `4. When you receive a message, process it and reply with ${t("send_message")}.`,
-    `5. **Only when you have NO more work to do**, call ${t("wait_for_message")}() to wait for new messages. NEVER call wait_for_message while you still have work in progress \u2014 finish all steps first, report your results, then go back to listening.`
+    `5. **Complete ALL your work before stopping.** If a task requires multi-step work (research, code changes, testing), finish everything, report results, then stop. New messages arrive automatically \u2014 you do not need to poll or wait for them.`
   ];
   let prompt = `You are "${config.displayName || config.name}", an AI agent in Slock \u2014 a collaborative platform for human-AI collaboration.
 
@@ -120,18 +120,17 @@ You are a **long-running, persistent agent**. You are NOT a one-shot assistant \
 
 You have MCP tools from the "chat" server. Use ONLY these for communication:
 
-1. **${t("wait_for_message")}** \u2014 Block and wait for new messages. ONLY use when you have NO work left to do. This is your idle loop.
-2. **${t("check_messages")}** \u2014 Non-blocking check for new messages. Use freely during work \u2014 at natural breakpoints or after notifications.
-3. **${t("send_message")}** \u2014 Send a message to a channel or DM.
-4. **${t("list_server")}** \u2014 List all channels in this server, which ones you have joined, plus all agents and humans.
-5. **${t("read_history")}** \u2014 Read past messages from a channel or DM.
-6. **${t("list_tasks")}** \u2014 View a channel's task board.
-7. **${t("create_tasks")}** \u2014 Create tasks on a channel's task board (supports batch).
-8. **${t("claim_tasks")}** \u2014 Claim tasks by number (supports batch, handles conflicts).
-9. **${t("unclaim_task")}** \u2014 Release your claim on a task.
-10. **${t("update_task_status")}** \u2014 Change a task's status (e.g. to in_review or done).
-11. **${t("upload_file")}** \u2014 Upload an image file to attach to a message. Returns an attachment ID to pass to send_message.
-12. **${t("view_file")}** \u2014 Download an attached image by its attachment ID so you can view it. Use when messages contain image attachments.
+1. **${t("check_messages")}** \u2014 Non-blocking check for new messages. Use freely during work \u2014 at natural breakpoints or after notifications.
+2. **${t("send_message")}** \u2014 Send a message to a channel or DM.
+3. **${t("list_server")}** \u2014 List all channels in this server, which ones you have joined, plus all agents and humans.
+4. **${t("read_history")}** \u2014 Read past messages from a channel or DM.
+5. **${t("list_tasks")}** \u2014 View a channel's task board.
+6. **${t("create_tasks")}** \u2014 Create tasks on a channel's task board (supports batch).
+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.
+11. **${t("view_file")}** \u2014 Download an attached image by its attachment ID so you can view it. Use when messages contain image attachments.
 
 CRITICAL RULES:
 ${criticalRules.join("\n")}
@@ -340,7 +339,7 @@ While you are busy (executing tools, thinking, etc.), new messages may arrive. W
 How to handle these:
 - Call \`${t("check_messages")}()\` to check for new messages. You are encouraged to do this frequently \u2014 at natural breakpoints in your work, or whenever you see a notification.
 - If the new message is higher priority, you may pivot to it. If not, continue your current work.
-- **IMPORTANT: \`${t("check_messages")}\` and \`${t("wait_for_message")}\` are very different tools.** \`check_messages\` returns instantly with any pending messages (or "no new messages"). \`wait_for_message\` blocks for up to ~4 minutes \u2014 ONLY use it when you have absolutely NO work left to do.`;
+- \`check_messages\` returns instantly with any pending messages (or "no new messages"). It is always safe to call.`;
   }
   if (config.description) {
     prompt += `
@@ -718,11 +717,10 @@ var CodexDriver = class {
     return buildBaseSystemPrompt(config, {
       toolPrefix: "",
       extraCriticalRules: [
-        "- Do NOT use shell commands to send or receive messages. The MCP tools handle everything.",
-        "- ALWAYS call wait_for_message after completing any task \u2014 this keeps you listening for new messages."
+        "- Do NOT use shell commands to send or receive messages. The MCP tools handle everything."
       ],
       postStartupNotes: [
-        "**IMPORTANT**: Your process exits after each turn completes. You will be automatically restarted when new messages arrive. Always call wait_for_message as your last action \u2014 if no messages are pending, you'll sleep and be woken when one arrives."
+        "**IMPORTANT**: Your process exits after each turn completes. You will be automatically restarted when new messages arrive. Complete all your work, then stop \u2014 new messages will wake you up."
       ],
       includeStdinNotificationSection: false
     });
@@ -872,9 +870,9 @@ Use read_history to catch up, or respond to the message above first.`;
         }
         prompt += `
 
-Respond as appropriate \u2014 reply using send_message, or take action as needed. Then call wait_for_message to keep listening.
+Respond as appropriate \u2014 reply using send_message, or take action as needed. Complete ALL your work before stopping.
 
-IMPORTANT: If the message requires multi-step work (e.g. research, code changes, testing), complete ALL steps before calling wait_for_message. Sending a progress update does NOT mean your task is done \u2014 only call wait_for_message when you have NO more work to do.`;
+IMPORTANT: If the message requires multi-step work (e.g. research, code changes, testing), complete ALL steps before stopping. Sending a progress update does NOT mean your task is done \u2014 only stop when you have NO more work to do. New messages will be delivered to you automatically via stdin.`;
         if (driver.supportsStdinNotification) {
           prompt += `
 
@@ -888,14 +886,14 @@ Note: While you are busy, you may receive [System notification: ...] messages. F
         }
         prompt += `
 
-Use read_history to catch up on important channels, then call wait_for_message to listen for new messages.`;
+Use read_history to catch up on important channels, then stop. New messages will be delivered to you automatically.`;
         if (driver.supportsStdinNotification) {
           prompt += `
 
 Note: While you are busy, you may receive [System notification: ...] messages. Finish your current step, then call check_messages to check for messages.`;
         }
       } else if (isResume) {
-        prompt = `No new messages while you were away. Call ${driver.mcpToolPrefix}wait_for_message to listen for new messages.`;
+        prompt = `No new messages while you were away. Nothing to do \u2014 just stop. New messages will be delivered to you automatically via stdin.`;
         if (driver.supportsStdinNotification) {
           prompt += `
 
@@ -916,10 +914,9 @@ Note: While you are busy, you may receive [System notification: ...] messages ab
         process: proc,
         driver,
         inbox: [],
-        pendingReceive: null,
         config,
         sessionId: config.sessionId || null,
-        isInReceiveMessage: false,
+        isIdle: false,
         notificationTimer: null,
         pendingNotificationCount: 0,
         activityHeartbeat: null,
@@ -952,10 +949,6 @@ Note: While you are busy, you may receive [System notification: ...] messages ab
         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);
           }
@@ -989,10 +982,6 @@ Note: While you are busy, you may receive [System notification: ...] messages ab
     this.idleAgentConfigs.delete(agentId);
     const ap = this.agents.get(agentId);
     if (!ap) return;
-    if (ap.pendingReceive) {
-      clearTimeout(ap.pendingReceive.timer);
-      ap.pendingReceive.resolve([]);
-    }
     if (ap.notificationTimer) {
       clearTimeout(ap.notificationTimer);
     }
@@ -1038,19 +1027,14 @@ Note: While you are busy, you may receive [System notification: ...] messages ab
       }
       return;
     }
-    if (ap.isInReceiveMessage) {
-      ap.isInReceiveMessage = false;
+    if (ap.isIdle && ap.driver.supportsStdinNotification && ap.sessionId) {
+      ap.isIdle = false;
       this.broadcastActivity(agentId, "working", "Message received");
+      this.deliverMessageViaStdin(agentId, ap, message);
+      return;
     }
-    if (ap.pendingReceive) {
-      clearTimeout(ap.pendingReceive.timer);
-      ap.pendingReceive.resolve([message]);
-      ap.pendingReceive = null;
-    } else {
-      ap.inbox.push(message);
-    }
+    ap.inbox.push(message);
     if (!ap.driver.supportsStdinNotification) return;
-    if (ap.isInReceiveMessage) return;
     if (!ap.sessionId) return;
     ap.pendingNotificationCount++;
     if (!ap.notificationTimer) {
@@ -1229,40 +1213,34 @@ Note: While you are busy, you may receive [System notification: ...] messages ab
         const text = event.text.length > MAX_TRAJECTORY_TEXT ? event.text.slice(0, MAX_TRAJECTORY_TEXT) + "\u2026" : event.text;
         const extra = text ? [{ kind: "thinking", text }] : [];
         this.broadcastActivity(agentId, "thinking", "", extra);
-        if (ap) ap.isInReceiveMessage = false;
+        if (ap) ap.isIdle = false;
         break;
       }
       case "text": {
         const text = event.text.length > MAX_TRAJECTORY_TEXT ? event.text.slice(0, MAX_TRAJECTORY_TEXT) + "\u2026" : event.text;
         this.broadcastActivity(agentId, "thinking", "", [{ kind: "text", text }]);
-        if (ap) ap.isInReceiveMessage = false;
+        if (ap) ap.isIdle = false;
         break;
       }
       case "tool_call": {
         const toolName = event.name;
         const inputSummary = driver.summarizeToolInput(toolName, event.input);
-        if (toolName === `${driver.mcpToolPrefix}wait_for_message`) {
-          this.broadcastActivity(agentId, "online", "Idle");
-          if (ap) {
-            ap.isInReceiveMessage = true;
-            ap.pendingNotificationCount = 0;
-            if (ap.notificationTimer) {
-              clearTimeout(ap.notificationTimer);
-              ap.notificationTimer = null;
-            }
-          }
-        } else {
-          const detail = toolName === `${driver.mcpToolPrefix}check_messages` ? "Checking messages\u2026" : toolName === `${driver.mcpToolPrefix}send_message` ? "Sending message\u2026" : driver.toolDisplayName(toolName);
-          this.broadcastActivity(agentId, "working", detail, [{ kind: "tool_start", toolName, toolInput: inputSummary }]);
-          if (ap) ap.isInReceiveMessage = false;
-        }
+        const detail = toolName === `${driver.mcpToolPrefix}check_messages` ? "Checking messages\u2026" : toolName === `${driver.mcpToolPrefix}send_message` ? "Sending message\u2026" : driver.toolDisplayName(toolName);
+        this.broadcastActivity(agentId, "working", detail, [{ kind: "tool_start", toolName, toolInput: inputSummary }]);
+        if (ap) ap.isIdle = false;
         break;
       }
       case "turn_end":
-        this.broadcastActivity(agentId, "online", "Turn complete");
         if (ap) {
-          ap.isInReceiveMessage = false;
           if (event.sessionId) ap.sessionId = event.sessionId;
+          if (ap.inbox.length > 0 && ap.driver.supportsStdinNotification && ap.sessionId) {
+            const nextMessage = ap.inbox.shift();
+            this.broadcastActivity(agentId, "working", "Message received");
+            this.deliverMessageViaStdin(agentId, ap, nextMessage);
+          } else {
+            ap.isIdle = true;
+            this.broadcastActivity(agentId, "online", "Idle");
+          }
         }
         if (event.sessionId) {
           this.sendToServer({ type: "agent:session", agentId, sessionId: event.sessionId });
@@ -1284,7 +1262,7 @@ Note: While you are busy, you may receive [System notification: ...] messages ab
     ap.pendingNotificationCount = 0;
     ap.notificationTimer = null;
     if (count === 0) return;
-    if (ap.isInReceiveMessage) return;
+    if (ap.isIdle) return;
     if (!ap.sessionId) return;
     const notification = `[System notification: You have ${count} new message${count > 1 ? "s" : ""} waiting. Call check_messages to read ${count > 1 ? "them" : "it"} when you're ready.]`;
     console.log(`[Agent ${agentId}] Sending stdin notification: ${count} message(s)`);
@@ -1293,6 +1271,23 @@ Note: While you are busy, you may receive [System notification: ...] messages ab
       ap.process.stdin?.write(encoded + "\n");
     }
   }
+  /** Deliver a message to an agent via stdin, formatting it the same way as the MCP bridge */
+  deliverMessageViaStdin(agentId, ap, message) {
+    const channelLabel = message.channel_type === "dm" ? `DM:@${message.channel_name}` : `#${message.channel_name}`;
+    const senderPrefix = message.sender_type === "agent" ? "(agent) " : "";
+    const time = message.timestamp ? ` (${toLocalTime(message.timestamp)})` : "";
+    const formatted = `[${channelLabel}]${time} ${senderPrefix}@${message.sender_name}: ${message.content}`;
+    const prompt = `New message received:
+
+${formatted}
+
+Respond as appropriate. Complete all your work before stopping.`;
+    const encoded = ap.driver.encodeStdinMessage(prompt, ap.sessionId);
+    if (encoded) {
+      console.log(`[Agent ${agentId}] Delivering message via stdin from @${message.sender_name}`);
+      ap.process.stdin?.write(encoded + "\n");
+    }
+  }
   /** List ONE level of a directory — directories returned without children (lazy-loaded on demand) */
   async listDirectoryChildren(dir, rootDir) {
     let entries;

package/package.json

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