fix(cron): de-duplicate main-session systemEvent in heartbeat model input

Zeng-wen · Zeng-wen · commit c061740ecb95 · 2026-06-08T09:00:52.000+08:00
A sessionTarget:"main" cron systemEvent was surfaced to the model twice: the reply pipeline rendered it as a raw System: line and the heartbeat also wrapped it via buildCronEventPrompt. selectGenericSystemEvents excluded exec-completion events (which own a dedicated heartbeat prompt) but not cron events, which own buildCronEventPrompt. Exclude cron:<jobId>-tagged events so the heartbeat path is their single owner, symmetric with exec-completions. Closes #44922
diff --git a/src/auto-reply/reply/session-system-events.ts b/src/auto-reply/reply/session-system-events.ts
@@ -18,8 +18,21 @@ import {
   type SystemEvent,
 } from "../../infra/system-events.js";
 
+function isCronContextSystemEvent(event: SystemEvent): boolean {
+  return event.contextKey?.startsWith("cron:") ?? false;
+}
+
 function selectGenericSystemEvents(events: readonly SystemEvent[]): SystemEvent[] {
-  return events.filter((event) => !isExecCompletionEvent(event.text));
+  // Exec completions and tagged cron events each own a dedicated heartbeat prompt
+  // (buildExecEventPrompt / buildCronEventPrompt) that surfaces them to the model
+  // once. Rendering them here as raw `System:` lines too double-surfaces the same
+  // text: a `sessionTarget: "main"` cron systemEvent (tagged `cron:<jobId>`) would
+  // appear both as a `System:` line and inside the heartbeat reminder wrapper
+  // (#44922). Leave them queued so the heartbeat path stays the single owner that
+  // consumes and renders them.
+  return events.filter(
+    (event) => !isExecCompletionEvent(event.text) && !isCronContextSystemEvent(event),
+  );
 }
 
 function compactSystemEvent(line: string): string | null {
diff --git a/src/auto-reply/reply/session.test.ts b/src/auto-reply/reply/session.test.ts
@@ -3225,6 +3225,34 @@ describe("drainFormattedSystemEvents", () => {
       expect(line).toMatch(/^System:/);
     }
   });
+
+  it("leaves tagged cron events queued for the heartbeat wrapper instead of re-rendering them (#44922)", async () => {
+    try {
+      // A `sessionTarget: "main"` cron systemEvent is enqueued tagged `cron:<jobId>`
+      // and is surfaced by the heartbeat's dedicated reminder prompt. The generic
+      // render must not also emit it as a raw `System:` line, or the model sees the
+      // same text twice.
+      enqueueSystemEvent("Reminder: rotate API keys", {
+        sessionKey: "agent:main:main",
+        contextKey: "cron:rotate-keys",
+      });
+      enqueueSystemEvent("Model switched.", { sessionKey: "agent:main:main" });
+
+      const result = await drainFormattedSystemEvents({
+        cfg: {} as OpenClawConfig,
+        sessionKey: "agent:main:main",
+        isMainSession: true,
+        isNewSession: false,
+      });
+
+      expect(result).toContain("Model switched.");
+      expect(result).not.toContain("rotate API keys");
+      // The cron event stays queued so the heartbeat path remains its single owner.
+      expect(peekSystemEvents("agent:main:main")).toEqual(["Reminder: rotate API keys"]);
+    } finally {
+      resetSystemEventsForTest();
+    }
+  });
 });
 
 describe("persistSessionUsageUpdate", () => {
