fix(agents): cover stop-labeled pre-tool commentary

849261680 · 849261680 · commit 94edd68267a8 · 2026-07-08T20:52:16.000+08:00
diff --git a/src/agents/embedded-agent-runner/replay-history.test.ts b/src/agents/embedded-agent-runner/replay-history.test.ts
@@ -318,18 +318,19 @@ describe("normalizeAssistantReplayContent", () => {
 
   it("marks commentary text before tool calls as undelivered in provider replay", () => {
     const toolCall = { type: "toolCall", id: "call_1", name: "read", arguments: {} };
+    const signature = JSON.stringify({
+      v: 1,
+      id: "commentary-0",
+      phase: "commentary",
+    });
     const messages = [
       userMessage("hi"),
       bedrockAssistant(
         [
           {
             type: "text",
             text: "Please confirm the payment details before I continue.",
-            textSignature: JSON.stringify({
-              v: 1,
-              id: "commentary-0",
-              phase: "commentary",
-            }),
+            textSignature: signature,
           },
           toolCall,
         ],
@@ -361,6 +362,43 @@ describe("normalizeAssistantReplayContent", () => {
     expect(out[2]).toBe(messages[2]);
   });
 
+  it("marks commentary text as undelivered when tool-call turns replay with stop", () => {
+    const toolCall = { type: "toolCall", id: "call_1", name: "read", arguments: {} };
+    const messages = [
+      userMessage("hi"),
+      bedrockAssistant(
+        [
+          {
+            type: "text",
+            text: "I will check that now.",
+            textSignature: JSON.stringify({
+              v: 1,
+              id: "commentary-0",
+              phase: "commentary",
+            }),
+          },
+          toolCall,
+        ],
+        "stop",
+      ),
+      {
+        role: "toolResult",
+        toolCallId: "call_1",
+        toolName: "read",
+        content: [{ type: "text", text: "ok" }],
+        timestamp: 1,
+      } as unknown as AgentMessage,
+    ];
+
+    const out = normalizeAssistantReplayContent(messages);
+
+    const normalized = out[1] as AgentMessage & { content: unknown[] };
+    const replayText = (normalized.content[0] as { text?: string }).text ?? "";
+    expect(replayText).toContain("was not delivered to the user/channel");
+    expect(replayText).toContain("I will check that now.");
+    expect(normalized.content[1]).toBe(toolCall);
+  });
+
   it("filters openclaw delivery-mirror and gateway-injected assistant messages from replay", () => {
     // Gateway mirror entries are transcript artifacts, not model-authored
     // assistant turns, so they must not be sent back to providers.
diff --git a/src/agents/embedded-agent-runner/replay-history.ts b/src/agents/embedded-agent-runner/replay-history.ts
@@ -277,9 +277,7 @@ function formatUndeliveredCommentaryReplayContext(text: string): string {
 function normalizeAssistantReplayBlockContent(message: AgentMessage, replayContent: unknown[]) {
   let touched = false;
   const sanitizedContent: unknown[] = [];
-  const markUndeliveredCommentary =
-    (message as { stopReason?: unknown }).stopReason === "toolUse" &&
-    hasReplayToolCallBlock(replayContent);
+  const markUndeliveredCommentary = hasReplayToolCallBlock(replayContent);
   for (const block of replayContent) {
     if (!block || typeof block !== "object") {
       sanitizedContent.push(block);
