fix(agents): preserve rich internal source replies

vincentkoc · pashpashpash · commit 3ce4a87e19d4 · 2026-05-13T19:47:45.000-07:00
diff --git a/src/agents/pi-embedded-runner/run/payloads.test.ts b/src/agents/pi-embedded-runner/run/payloads.test.ts
@@ -1,6 +1,7 @@
 import type { AssistantMessage } from "@earendil-works/pi-ai";
 import { describe, expect, it } from "vitest";
 import { getReplyPayloadMetadata } from "../../../auto-reply/reply-payload.js";
+import type { InteractiveReply, MessagePresentation } from "../../../interactive/payload.js";
 import {
   buildPayloads,
   expectSinglePayloadText,
@@ -172,6 +173,64 @@ describe("buildEmbeddedRunPayloads tool-error warnings", () => {
     });
   });
 
+  it("preserves rich-only internal message-tool source replies", () => {
+    const presentation = {
+      blocks: [
+        {
+          type: "buttons",
+          buttons: [{ label: "Approve", value: "approve" }],
+        },
+      ],
+    } satisfies MessagePresentation;
+    const interactive = {
+      blocks: [
+        {
+          type: "buttons",
+          buttons: [{ label: "Open", value: "open" }],
+        },
+      ],
+    } satisfies InteractiveReply;
+
+    const payloads = buildPayloads({
+      assistantTexts: ["ordinary final should stay private"],
+      didSendViaMessagingTool: true,
+      messagingToolSourceReplyPayloads: [
+        {
+          presentation,
+        },
+        {
+          interactive,
+        },
+      ],
+      sourceReplyDeliveryMode: "message_tool_only",
+      sessionKey: "agent:main",
+      agentId: "main",
+      runId: "run-1",
+    });
+
+    expect(payloads).toHaveLength(2);
+    expect(payloads[0]).toMatchObject({ presentation });
+    expect(payloads[0]?.text).toBeUndefined();
+    expect(payloads[1]).toMatchObject({ interactive });
+    expect(payloads[1]?.text).toBeUndefined();
+    expect(getReplyPayloadMetadata(payloads[0] as object)).toMatchObject({
+      deliverDespiteSourceReplySuppression: true,
+      sourceReplyTranscriptMirror: {
+        sessionKey: "agent:main",
+        agentId: "main",
+        idempotencyKey: "run-1:internal-source-reply:0",
+      },
+    });
+    expect(getReplyPayloadMetadata(payloads[1] as object)).toMatchObject({
+      deliverDespiteSourceReplySuppression: true,
+      sourceReplyTranscriptMirror: {
+        sessionKey: "agent:main",
+        agentId: "main",
+        idempotencyKey: "run-1:internal-source-reply:1",
+      },
+    });
+  });
+
   it("ignores accumulated internal/status text after the final answer", () => {
     const payloads = buildPayloads({
       assistantTexts: [
diff --git a/src/agents/pi-embedded-runner/run/payloads.ts b/src/agents/pi-embedded-runner/run/payloads.ts
@@ -1,5 +1,4 @@
 import type { AssistantMessage } from "@earendil-works/pi-ai";
-import { hasOutboundReplyContent } from "openclaw/plugin-sdk/reply-payload";
 import type { SourceReplyDeliveryMode } from "../../../auto-reply/get-reply-options.types.js";
 import {
   createHeartbeatToolResponsePayload,
@@ -16,6 +15,7 @@ import type { ReasoningLevel, ThinkLevel, VerboseLevel } from "../../../auto-rep
 import { isSilentReplyPayloadText, SILENT_REPLY_TOKEN } from "../../../auto-reply/tokens.js";
 import { formatToolAggregate } from "../../../auto-reply/tool-meta.js";
 import type { OpenClawConfig } from "../../../config/types.openclaw.js";
+import { hasReplyPayloadContent } from "../../../interactive/payload.js";
 import { isCronSessionKey } from "../../../routing/session-key.js";
 import { extractAssistantTextForPhase } from "../../../shared/chat-message-content.js";
 import {
@@ -568,15 +568,15 @@ export function buildEmbeddedRunPayloads(params: {
       if (payload.text && isSilentReplyPayloadText(payload.text, SILENT_REPLY_TOKEN)) {
         const silentText = payload.text;
         payload.text = undefined;
-        if (hasOutboundReplyContent(payload)) {
+        if (hasReplyPayloadContent(payload)) {
           return payload;
         }
         payload.text = silentText;
       }
       return payload;
     })
     .filter((p) => {
-      if (!hasOutboundReplyContent(p)) {
+      if (!hasReplyPayloadContent(p)) {
         return false;
       }
       if (p.text && isSilentReplyPayloadText(p.text, SILENT_REPLY_TOKEN)) {
