@slock-ai/daemon 0.19.0 → 0.21.0

package/dist/chat-bridge.js

@@ -230,37 +230,57 @@ Use your Read tool to view this image.` }]
 );
 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.",
+  "Receive new messages. Blocks and waits for new messages (polls internally). 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)")
+    block: z.boolean().default(true).describe("Whether to block (wait) for new messages")
   },
-  async ({ block, timeout_ms }) => {
+  async ({ block }) => {
     try {
-      const params = new URLSearchParams();
-      if (block) params.set("block", "true");
-      params.set("timeout", String(timeout_ms));
-      const res = await fetch(
-        `${serverUrl}/internal/agent/${agentId}/receive?${params}`,
-        { method: "GET", headers: commonHeaders }
-      );
-      const data = await res.json();
-      if (!data.messages || data.messages.length === 0) {
-        return {
-          content: [{ type: "text", text: "No new messages." }]
-        };
+      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 (!block || remaining <= 0) {
+          const params2 = new URLSearchParams();
+          if (block) {
+            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 call receive_message or 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) }] };
+        }
       }
-      const formatted = data.messages.map((m) => {
-        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" : "";
-        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 }]
-      };
     } catch (err) {
       return {
         content: [{ type: "text", text: `Error: ${err.message}` }]
@@ -268,6 +288,16 @@ server.tool(
     }
   }
 );
+function formatMessages(messages) {
+  return messages.map((m) => {
+    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" : "";
+    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");
+}
 server.tool(
   "list_server",
   "List all channels in this server, including which ones you have joined, plus all agents and humans. Use this to discover who and where you can message.",

package/dist/index.js

@@ -372,8 +372,14 @@ var ClaudeDriver = class {
         }
       }
     });
-    const mcpConfigPath = path.join(ctx.workingDirectory, ".slock-claude-mcp.json");
-    writeFileSync(mcpConfigPath, mcpConfig, "utf8");
+    let mcpConfigArg;
+    if (process.platform === "win32") {
+      const mcpConfigPath = path.join(ctx.workingDirectory, ".slock-claude-mcp.json");
+      writeFileSync(mcpConfigPath, mcpConfig, "utf8");
+      mcpConfigArg = mcpConfigPath;
+    } else {
+      mcpConfigArg = mcpConfig;
+    }
     const args2 = [
       "--allow-dangerously-skip-permissions",
       "--dangerously-skip-permissions",
@@ -383,7 +389,7 @@ var ClaudeDriver = class {
       "--input-format",
       "stream-json",
       "--mcp-config",
-      mcpConfigPath,
+      mcpConfigArg,
       "--model",
       ctx.config.model || "sonnet",
       "--disallowed-tools",
@@ -564,7 +570,7 @@ var CodexDriver = class {
       "-c",
       "mcp_servers.chat.startup_timeout_sec=30",
       "-c",
-      "mcp_servers.chat.tool_timeout_sec=120",
+      "mcp_servers.chat.tool_timeout_sec=300",
       "-c",
       "mcp_servers.chat.enabled=true",
       "-c",
@@ -578,11 +584,36 @@ var CodexDriver = class {
     }
     args2.push(ctx.prompt);
     const spawnEnv = { ...process.env, FORCE_COLOR: "0", NO_COLOR: "1", ...ctx.config.envVars || {} };
-    const proc = spawn2("codex", args2, {
+    let spawnCmd = "codex";
+    let spawnArgs = args2;
+    if (process.platform === "win32") {
+      let codexEntry = null;
+      try {
+        const globalRoot = execSync("npm root -g", { encoding: "utf8", stdio: ["pipe", "pipe", "pipe"] }).trim();
+        const candidate = path2.join(globalRoot, "@openai", "codex", "bin", "codex.js");
+        if (existsSync(candidate)) codexEntry = candidate;
+      } catch {
+      }
+      if (!codexEntry) {
+        try {
+          const cmdPath = execSync("where codex", { encoding: "utf8", stdio: ["pipe", "pipe", "pipe"] }).trim().split(/\r?\n/)[0];
+          const candidate = path2.join(path2.dirname(cmdPath), "node_modules", "@openai", "codex", "bin", "codex.js");
+          if (existsSync(candidate)) codexEntry = candidate;
+        } catch {
+        }
+      }
+      if (!codexEntry) {
+        throw new Error(
+          "Cannot resolve Codex CLI entry point on Windows. Ensure @openai/codex is installed globally via npm (npm i -g @openai/codex)."
+        );
+      }
+      spawnCmd = process.execPath;
+      spawnArgs = [codexEntry, ...args2];
+    }
+    const proc = spawn2(spawnCmd, spawnArgs, {
       cwd: ctx.workingDirectory,
       stdio: ["pipe", "pipe", "pipe"],
-      env: spawnEnv,
-      shell: process.platform === "win32"
+      env: spawnEnv
     });
     return { process: proc };
   }
@@ -772,6 +803,8 @@ var AgentProcessManager = class {
   agents = /* @__PURE__ */ new Map();
   agentsStarting = /* @__PURE__ */ new Set();
   // Prevent concurrent starts of same agent
+  /** Cached configs for agents whose process exited normally — enables auto-restart on next message */
+  idleAgentConfigs = /* @__PURE__ */ new Map();
   chatBridgePath;
   sendToServer;
   daemonApiKey;
@@ -917,9 +950,13 @@ Note: While you are busy, you may receive [System notification: ...] messages ab
           }
           this.agents.delete(agentId);
           if (code === 0) {
-            this.sendToServer({ type: "agent:status", agentId, status: "sleeping" });
-            this.sendToServer({ type: "agent:activity", agentId, activity: "sleeping", detail: "" });
+            this.idleAgentConfigs.set(agentId, {
+              config: { ...ap.config, sessionId: ap.sessionId },
+              sessionId: ap.sessionId
+            });
+            this.sendToServer({ type: "agent:activity", agentId, activity: "online", detail: "" });
           } else {
+            this.idleAgentConfigs.delete(agentId);
             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" });
@@ -934,7 +971,8 @@ Note: While you are busy, you may receive [System notification: ...] messages ab
       throw err;
     }
   }
-  async stopAgent(agentId) {
+  async stopAgent(agentId, { wait = false, silent = false } = {}) {
+    this.idleAgentConfigs.delete(agentId);
     const ap = this.agents.get(agentId);
     if (!ap) return;
     if (ap.pendingReceive) {
@@ -946,27 +984,43 @@ Note: While you are busy, you may receive [System notification: ...] messages ab
     }
     this.agents.delete(agentId);
     ap.process.kill("SIGTERM");
-    this.sendToServer({ type: "agent:status", agentId, status: "inactive" });
-    this.sendToServer({ type: "agent:activity", agentId, activity: "offline", detail: "" });
-  }
-  /** Hibernate: kill process but keep status as "sleeping" (auto-wakes on next message via --resume) */
-  sleepAgent(agentId) {
-    const ap = this.agents.get(agentId);
-    if (!ap) return;
-    console.log(`[Agent ${agentId}] Hibernating (sleeping)`);
-    if (ap.pendingReceive) {
-      clearTimeout(ap.pendingReceive.timer);
-      ap.pendingReceive.resolve([]);
+    if (!silent) {
+      this.sendToServer({ type: "agent:status", agentId, status: "inactive" });
+      this.sendToServer({ type: "agent:activity", agentId, activity: "offline", detail: "" });
     }
-    if (ap.notificationTimer) {
-      clearTimeout(ap.notificationTimer);
+    if (wait) {
+      await new Promise((resolve) => {
+        const forceKillTimer = setTimeout(() => {
+          try {
+            ap.process.kill("SIGKILL");
+          } catch {
+          }
+          resolve();
+        }, 5e3);
+        ap.process.on("exit", () => {
+          clearTimeout(forceKillTimer);
+          resolve();
+        });
+        if (ap.process.exitCode !== null || ap.process.signalCode !== null) {
+          clearTimeout(forceKillTimer);
+          resolve();
+        }
+      });
     }
-    this.agents.delete(agentId);
-    ap.process.kill("SIGTERM");
   }
   deliverMessage(agentId, message) {
     const ap = this.agents.get(agentId);
-    if (!ap) return;
+    if (!ap) {
+      const cached = this.idleAgentConfigs.get(agentId);
+      if (cached) {
+        console.log(`[Agent ${agentId}] Auto-restarting idle process for incoming message`);
+        this.idleAgentConfigs.delete(agentId);
+        this.startAgent(agentId, cached.config, message).catch((err) => {
+          console.error(`[Agent ${agentId}] Failed to auto-restart:`, err);
+        });
+      }
+      return;
+    }
     if (ap.pendingReceive) {
       clearTimeout(ap.pendingReceive.timer);
       ap.pendingReceive.resolve([message]);
@@ -994,8 +1048,9 @@ Note: While you are busy, you may receive [System notification: ...] messages ab
     }
   }
   async stopAll() {
+    this.idleAgentConfigs.clear();
     const ids = [...this.agents.keys()];
-    await Promise.all(ids.map((id) => this.stopAgent(id)));
+    await Promise.all(ids.map((id) => this.stopAgent(id, { wait: true, silent: true })));
   }
   getRunningAgentIds() {
     return [...this.agents.keys()];
@@ -1126,39 +1181,51 @@ Note: While you are busy, you may receive [System notification: ...] messages ab
       case "thinking": {
         const text = event.text.length > MAX_TRAJECTORY_TEXT ? event.text.slice(0, MAX_TRAJECTORY_TEXT) + "\u2026" : event.text;
         trajectory.push({ kind: "thinking", text });
-        activity = "thinking";
-        if (ap) ap.isInReceiveMessage = false;
+        if (ap?.isInReceiveMessage) {
+          ap.isInReceiveMessage = false;
+        } else {
+          activity = "thinking";
+        }
         break;
       }
       case "text": {
         const text = event.text.length > MAX_TRAJECTORY_TEXT ? event.text.slice(0, MAX_TRAJECTORY_TEXT) + "\u2026" : event.text;
         trajectory.push({ kind: "text", text });
-        activity = "thinking";
-        if (ap) ap.isInReceiveMessage = false;
+        if (ap?.isInReceiveMessage) {
+          ap.isInReceiveMessage = false;
+        } else {
+          activity = "thinking";
+        }
         break;
       }
       case "tool_call": {
         const toolName = event.name;
         const inputSummary = driver.summarizeToolInput(toolName, event.input);
-        trajectory.push({ kind: "tool_start", toolName, toolInput: inputSummary });
         if (toolName === `${driver.mcpToolPrefix}receive_message`) {
-          const isBlocking = event.input?.block !== false;
+          const isBlocking = event.input?.block === true || event.input?.block === "true";
           if (isBlocking) {
             activity = "online";
-          }
-          if (ap) {
-            ap.isInReceiveMessage = true;
-            ap.pendingNotificationCount = 0;
-            if (ap.notificationTimer) {
-              clearTimeout(ap.notificationTimer);
-              ap.notificationTimer = null;
+            if (ap) {
+              ap.isInReceiveMessage = true;
+              ap.pendingNotificationCount = 0;
+              if (ap.notificationTimer) {
+                clearTimeout(ap.notificationTimer);
+                ap.notificationTimer = null;
+              }
             }
+          } else {
+            trajectory.push({ kind: "tool_start", toolName, toolInput: inputSummary });
+            activity = "working";
+            detail = "Checking messages\u2026";
+            if (ap) ap.isInReceiveMessage = false;
           }
         } else if (toolName === `${driver.mcpToolPrefix}send_message`) {
+          trajectory.push({ kind: "tool_start", toolName, toolInput: inputSummary });
           activity = "working";
           detail = "Sending message\u2026";
           if (ap) ap.isInReceiveMessage = false;
         } else {
+          trajectory.push({ kind: "tool_start", toolName, toolInput: inputSummary });
           activity = "working";
           detail = driver.toolDisplayName(toolName);
           if (ap) ap.isInReceiveMessage = false;
@@ -1181,7 +1248,10 @@ Note: While you are busy, you may receive [System notification: ...] messages ab
     }
     if (activity) {
       this.sendToServer({ type: "agent:activity", agentId, activity, detail });
-      trajectory.push({ kind: "status", activity, detail });
+      const hasToolStart = trajectory.some((e) => e.kind === "tool_start");
+      if (!hasToolStart) {
+        trajectory.push({ kind: "status", activity, detail });
+      }
     }
     if (trajectory.length > 0) {
       this.sendToServer({ type: "agent:trajectory", agentId, entries: trajectory });
@@ -1346,10 +1416,6 @@ connection = new DaemonConnection({
         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);

package/package.json

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