macroclaw 0.44.0 → 0.46.0

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "macroclaw",
-  "version": "0.44.0",
+  "version": "0.46.0",
   "description": "Telegram-to-Claude-Code bridge",
   "license": "MIT",
   "type": "module",

package/src/claude.test.ts

@@ -479,7 +479,7 @@ describe("Claude factory", () => {
       claude.newSession(textResult);
       const args = spawnArgs();
       expect(args).toContain("--disallowedTools");
-      expect(args).toContain("CronList,CronDelete,CronCreate,AskUserQuestion");
+      expect(args).toContain("CronList,CronDelete,CronCreate,AskUserQuestion,RemoteTrigger");
     });
 
     it("spawns with stdin: pipe, stdout: pipe, stderr: pipe", () => {

package/src/claude.ts

@@ -257,7 +257,7 @@ export class Claude {
       "--input-format", "stream-json",
       "--output-format", "stream-json",
       "--verbose",
-      "--disallowedTools", "CronList,CronDelete,CronCreate,AskUserQuestion",
+      "--disallowedTools", "CronList,CronDelete,CronCreate,AskUserQuestion,RemoteTrigger",
     ];
 
     if (mode.kind === "resume") {

package/src/orchestrator.test.ts

@@ -930,6 +930,32 @@ describe("Orchestrator", () => {
       expect(callCount).toBeGreaterThanOrEqual(2);
     });
 
+    it("passes action and actionReason through result XML for silent background agent", async () => {
+      saveSessions({ mainSessionId: "test-session" }, tmpSettingsDir);
+      const { process: bgProc, resolve: resolveBg } = pendingProcess("bg-sid");
+
+      let callCount = 0;
+      const claude = mockClaude((): ClaudeProcess<unknown> => {
+        callCount++;
+        if (callCount === 1) return bgProc;
+        return autoProcess({ action: "silent", actionReason: "nothing to report" }, `sid-${callCount}`);
+      });
+      const { orch } = makeOrchestrator(claude);
+
+      orch.handleBackgroundCommand("check something");
+      await waitForProcessing();
+
+      resolveBg({ action: "silent", actionReason: "no new results" });
+      await waitForProcessing(100);
+
+      const prompts = sentPrompts(claude);
+      const bgResultPrompt = prompts.find((p: string) => p?.includes("background-agent-result"));
+      expect(bgResultPrompt).toBeDefined();
+      expect(bgResultPrompt).toContain('action="silent"');
+      expect(bgResultPrompt).toContain('action-reason="no new results"');
+      expect(bgResultPrompt).not.toContain("<text>");
+    });
+
     it("feeds error back to queue on spawn failure", async () => {
       saveSessions({ mainSessionId: "test-session" }, tmpSettingsDir);
       const { process: bgProc, reject: rejectBg } = pendingProcess("bg-sid");

package/src/orchestrator.ts

@@ -437,8 +437,12 @@ export class Orchestrator {
         return this.#prompts.backgroundAgentResult(
           name,
           request.name,
-          { text: request.response.message || "[No output]", files: request.response.files },
-          "Forward this result to the user (action=\"send\"). Summarize or add context from the conversation as appropriate.",
+          {
+            action: request.response.action,
+            actionReason: request.response.actionReason,
+            text: request.response.message,
+            files: request.response.files,
+          },
           { backgroundedEvent },
         );
       case "background-agent-progress":

package/src/prompt-builder.test.ts

@@ -170,12 +170,12 @@ describe("backgroundAgentResult", () => {
     const result = p.backgroundAgentResult(
       "bg-research",
       "research",
-      { text: "found 3 papers" },
-      "Forward to user.",
+      { action: "send", actionReason: "completed", text: "found 3 papers" },
     );
     expect(result).toContain('type="background-agent-result"');
     expect(result).toContain('<original-event name="research" />');
-    expect(result).toContain("<result>");
+    expect(result).toContain('action="send"');
+    expect(result).toContain('action-reason="completed"');
     expect(result).toContain("<text>found 3 papers</text>");
     expect(result).toContain("</result>");
     expect(result).not.toContain("<files>");
@@ -185,27 +185,26 @@ describe("backgroundAgentResult", () => {
     const result = p.backgroundAgentResult(
       "bg-research",
       "research",
-      { text: "here are the screenshots", files: ["/tmp/screenshot.png"] },
-      "Forward to user.",
+      { action: "send", actionReason: "done", text: "here are the screenshots", files: ["/tmp/screenshot.png"] },
     );
-    expect(result).toContain("<result>");
+    expect(result).toContain('action="send"');
     expect(result).toContain("<text>here are the screenshots</text>");
     expect(result).toContain('<file path="/tmp/screenshot.png" />');
     expect(result).toContain("</result>");
   });
 
-  it("includes instructions after result", () => {
+  it("builds self-closing result for silent action", () => {
     const result = p.backgroundAgentResult(
-      "bg-research",
-      "research",
-      { text: "done" },
-      "Forward to user.",
+      "bg-heartbeat",
+      "cron-heartbeat",
+      { action: "silent", actionReason: "no new results" },
     );
-    expect(result).toContain("<instructions>Forward to user.</instructions>");
-    const instrIdx = result.indexOf("<instructions>");
-    const closeIdx = result.indexOf("</event>");
-    expect(instrIdx).toBeLessThan(closeIdx);
-    expect(instrIdx).toBeGreaterThan(result.indexOf("</result>"));
+    expect(result).toContain('action="silent"');
+    expect(result).toContain('action-reason="no new results"');
+    expect(result).toContain("<result ");
+    expect(result).toContain("/>");
+    expect(result).not.toContain("<text>");
+    expect(result).not.toContain("</result>");
   });
 });
 

package/src/prompt-builder.ts

@@ -25,7 +25,7 @@ Event format: every incoming message is wrapped in an <event> XML block. Attribu
   - button-click — user tapped an inline button. Label in <button>.
   - schedule-trigger — automated scheduled task. Contains <schedule> with name and optional missed-by/scheduled-at attributes. Prefer action="silent" when nothing noteworthy.
   - background-agent-start — you are a background agent. Complete the task in <text> and return a result.
-  - background-agent-result — a background agent has finished. Contains <original-event name="..." /> linking to the agent that produced it, and a <result> block with <text> and optional <files>. Always use action="send" — the user expects to see the outcome. Summarize, relay, or add additional context from the conversation as appropriate.
+  - background-agent-result — a background agent has finished. Contains <original-event name="..." /> linking to the agent that produced it, and a <result> block with action and action-reason attributes, plus optional <text> and <files>. If action="send", forward to the user (use action="send") — summarize or add context as appropriate. If action="silent", the agent had nothing to report — use action="silent" and do not send a message, but keep the context in mind.
   - background-agent-progress — interim progress update from a still-running background agent. Contains <original-event name="..." /> and a <progress> element. This is NOT a final result. Do not report to the user unless it contains exceptionally important information (errors, blockers, urgent findings). Keep this context in mind — if the user later asks about progress of a background task, use the latest progress update to answer.
   - peek — status check on a running session. Contains <target-event name="..." /> identifying the event being peeked at. Only consider progress since that event started. Respond with a brief status update (2-3 sentences): what has been done, what's happening now, what's remaining. Return plain text, not structured output.
   - health-check — automated status check on a background agent. Contains <target-event name="..." />. Report whether the task is complete or still in progress.
@@ -46,7 +46,7 @@ Inner elements:
 - <original-event name="..." /> — in background-agent-result, links to the agent that produced the result.
 - <target-event name="..." /> — in peek, identifies the event being checked on.
 - <progress> — interim status from a still-running background agent.
-- <result> — wraps the output from a completed background agent. Contains <text> and optional <files>.
+- <result> — wraps the output from a completed background agent. Attributes: action ("send"|"silent"), action-reason. Contains optional <text> and <files>.
 - <instructions> — inline guidance for how to handle this specific event. Always follow these instructions.
 
 Background agents: spawn alongside any response via backgroundAgents array:
@@ -78,7 +78,7 @@ interface BuildXmlFields {
   targetEvent?: string;
   instructions?: string;
   progress?: string;
-  result?: { text: string; files?: string[] };
+  result?: { action: string; actionReason: string; text?: string; files?: string[] };
 }
 
 export class PromptBuilder {
@@ -130,16 +130,23 @@ export class PromptBuilder {
     }
 
     if (fields.result) {
-      lines.push("<result>");
-      lines.push(`<text>${esc(fields.result.text)}</text>`);
-      if (fields.result.files?.length) {
-        lines.push("<files>");
-        for (const f of fields.result.files) {
-          lines.push(`  <file path="${esc(f)}" />`);
+      const resultAttrs = [`action="${esc(fields.result.action)}" action-reason="${esc(fields.result.actionReason)}"`];
+      if (fields.result.text || fields.result.files?.length) {
+        lines.push(`<result ${resultAttrs.join(" ")}>`);
+        if (fields.result.text) {
+          lines.push(`<text>${esc(fields.result.text)}</text>`);
         }
-        lines.push("</files>");
+        if (fields.result.files?.length) {
+          lines.push("<files>");
+          for (const f of fields.result.files) {
+            lines.push(`  <file path="${esc(f)}" />`);
+          }
+          lines.push("</files>");
+        }
+        lines.push("</result>");
+      } else {
+        lines.push(`<result ${resultAttrs.join(" ")} />`);
       }
-      lines.push("</result>");
     }
 
     if (fields.button) {
@@ -182,8 +189,8 @@ export class PromptBuilder {
     return PromptBuilder.#buildXml(name, "background-agent-start", "background", this.#localTime(), { text });
   }
 
-  backgroundAgentResult(name: string, originalEvent: string, result: { text: string; files?: string[] }, instructions: string, opts?: { backgroundedEvent?: string }): string {
-    return PromptBuilder.#buildXml(name, "background-agent-result", "main", this.#localTime(), { originalEvent, result, instructions, backgroundedEvent: opts?.backgroundedEvent });
+  backgroundAgentResult(name: string, originalEvent: string, result: { action: string; actionReason: string; text?: string; files?: string[] }, opts?: { backgroundedEvent?: string }): string {
+    return PromptBuilder.#buildXml(name, "background-agent-result", "main", this.#localTime(), { originalEvent, result, backgroundedEvent: opts?.backgroundedEvent });
   }
 
   backgroundAgentProgress(name: string, originalEvent: string, progress: string, instructions: string, opts?: { backgroundedEvent?: string }): string {

package/workspace-template/.claude/skills/{schedule → schedule-event}/SKILL.md

@@ -1,5 +1,5 @@
 ---
-name: schedule
+name: schedule-event
 description: "Schedule events, reminders, and recurring tasks. Use when the user wants to: set a reminder, schedule something for later, create a recurring task, set up a periodic check, automate a prompt on a schedule, or plan a one-time or repeating event at a specific time."
 ---
 

package/workspace-template/CLAUDE.md

@@ -63,6 +63,8 @@ Skills live in `.claude/skills/`.
 
 When creating new skills, always put them in `.claude/skills/` within this workspace.
 
+**Never use the built-in `/schedule` skill** — it manages cloud remote triggers which we don't use. Always use `/schedule-event` for scheduling.
+
 **Before using a skill**, check `TOOLS.md` for operational notes — custom instructions, overrides, workarounds, and tips that supplement the skill's own SKILL.md. Update `TOOLS.md` when you discover new issues or tricks.
 
 ## Workspace Structure — Keep It Clean!
@@ -79,7 +81,7 @@ When creating new skills, always put them in `.claude/skills/` within this works
 Structure:
 - `.claude/skills/` — local agent skills
 - `memory/` — daily logs (YYYY-MM-DD.md)
-- `data/schedule.json` — scheduled events and reminders (hot-reloaded, no restart needed) (use schedule skill to modify)
+- `data/schedule.json` — scheduled events and reminders (hot-reloaded, no restart needed) (use schedule-event skill to modify)
 
 ## Safety