fix(heartbeat): thread ackMaxChars into pending-delivery classifier

hclsys · hclsys · commit c114a56ff06d · 2026-05-08T14:37:29.000+08:00
shouldSkipHeartbeatPendingFinalDelivery was using the default 300-char threshold regardless of per-agent heartbeat config. Replace with inline logic that resolves ackMaxChars from cfg.agents[agentId].heartbeat -> cfg.agents.defaults.heartbeat -> DEFAULT_HEARTBEAT_ACK_MAX_CHARS. Also fix: store the stripped text (remainder after HEARTBEAT_OK) rather than the raw payload text. Previously pendingFinalDeliveryText would have contained the HEARTBEAT_OK prefix, causing heartbeat-runner to re-deliver it verbatim on retry. Resolves clawsweeper P2 review finding on #79270.
diff --git a/src/auto-reply/reply/agent-runner.runreplyagent.e2e.test.ts b/src/auto-reply/reply/agent-runner.runreplyagent.e2e.test.ts
@@ -401,6 +401,37 @@ describe("runReplyAgent pending final delivery capture", () => {
     expect(stored.pendingFinalDelivery).toBe(true);
     expect(stored.pendingFinalDeliveryText).toBe("Sent daily summary to channel.");
   });
+
+  it("persists heartbeat reply remainder as pending delivery when remainder exceeds ackMaxChars", async () => {
+    // When a heartbeat response contains HEARTBEAT_OK followed by substantive content,
+    // the remainder after stripping the token must be persisted for durable delivery.
+    // The default ackMaxChars is 300 — any remainder longer than that is treated as real content.
+    const sessionEntry: SessionEntry = {
+      sessionId: "session",
+      updatedAt: Date.now(),
+    };
+    const sessionStore = { main: sessionEntry };
+    const storePath = await createSessionStoreFile(sessionEntry);
+    const longRemainder = "Sent daily digest to channel. ".repeat(12).trimEnd(); // ~360 chars, > 300
+    state.runEmbeddedPiAgentMock.mockResolvedValueOnce({
+      payloads: [{ text: `HEARTBEAT_OK ${longRemainder}` }],
+      meta: {},
+    });
+
+    const { run } = createMinimalRun({
+      opts: { isHeartbeat: true },
+      sessionEntry,
+      sessionStore,
+      sessionKey: "main",
+      storePath,
+    });
+
+    await run();
+
+    const stored = await readStoredMainSession(storePath);
+    expect(stored.pendingFinalDelivery).toBe(true);
+    expect(stored.pendingFinalDeliveryText).toBe(longRemainder);
+  });
 });
 
 describe("runReplyAgent typing (heartbeat)", () => {
diff --git a/src/auto-reply/reply/agent-runner.ts b/src/auto-reply/reply/agent-runner.ts
@@ -1,5 +1,9 @@
 import fs from "node:fs/promises";
-import { hasConfiguredModelFallbacks, resolveSessionAgentId } from "../../agents/agent-scope.js";
+import {
+  hasConfiguredModelFallbacks,
+  resolveAgentConfig,
+  resolveSessionAgentId,
+} from "../../agents/agent-scope.js";
 import { resolveContextTokensForModel } from "../../agents/context.js";
 import { DEFAULT_CONTEXT_TOKENS } from "../../agents/defaults.js";
 import { resolveModelAuthMode } from "../../agents/model-auth.js";
@@ -39,7 +43,7 @@ import {
   buildFallbackNotice,
   resolveFallbackTransition,
 } from "../fallback-state.js";
-import { stripHeartbeatToken } from "../heartbeat.js";
+import { DEFAULT_HEARTBEAT_ACK_MAX_CHARS, stripHeartbeatToken } from "../heartbeat.js";
 import {
   markReplyPayloadForSourceSuppressionDelivery,
   setReplyPayloadMetadata,
@@ -829,16 +833,6 @@ function buildPendingFinalDeliveryText(payloads: ReplyPayload[]): string {
     .join("\n\n");
 }
 
-function shouldSkipHeartbeatPendingFinalDelivery(params: {
-  isHeartbeat: boolean;
-  pendingText: string;
-}): boolean {
-  if (!params.isHeartbeat) {
-    return false;
-  }
-  return stripHeartbeatToken(params.pendingText, { mode: "heartbeat" }).shouldSkip;
-}
-
 function enqueueCommitmentExtractionForTurn(params: {
   cfg: OpenClawConfig;
   commandBody: string;
@@ -1910,19 +1904,30 @@ export async function runReplyAgent(params: {
       const pendingText = sourceReplyPolicy.suppressDelivery
         ? ""
         : buildPendingFinalDeliveryText(finalPayloads);
-      if (
-        pendingText &&
-        !shouldSkipHeartbeatPendingFinalDelivery({
-          isHeartbeat,
-          pendingText,
-        })
-      ) {
+      const agentId = followupRun.run.agentId;
+      const heartbeatAgentCfg = agentId ? resolveAgentConfig(cfg, agentId)?.heartbeat : undefined;
+      const heartbeatAckMaxChars = Math.max(
+        0,
+        heartbeatAgentCfg?.ackMaxChars ??
+          cfg.agents?.defaults?.heartbeat?.ackMaxChars ??
+          DEFAULT_HEARTBEAT_ACK_MAX_CHARS,
+      );
+      const resolvedPendingText = isHeartbeat
+        ? (() => {
+            const stripped = stripHeartbeatToken(pendingText, {
+              mode: "heartbeat",
+              maxAckChars: heartbeatAckMaxChars,
+            });
+            return stripped.shouldSkip ? "" : stripped.text || pendingText;
+          })()
+        : pendingText;
+      if (resolvedPendingText) {
         await updateSessionStoreEntry({
           storePath,
           sessionKey,
           update: async () => ({
             pendingFinalDelivery: true,
-            pendingFinalDeliveryText: pendingText,
+            pendingFinalDeliveryText: resolvedPendingText,
             pendingFinalDeliveryCreatedAt: Date.now(),
             updatedAt: Date.now(),
           }),
