fix(agents): recognize nested message delivery receipts (#111012)

steipete · web-flow · commit 4362e1a4fe39 · 2026-07-19T00:33:33.000+01:00
diff --git a/src/agents/embedded-agent-message-tool-source-reply.test.ts b/src/agents/embedded-agent-message-tool-source-reply.test.ts
@@ -319,6 +319,24 @@ describe("isDeliveredMessagingToolResult", () => {
       }),
     ).toBe(true);
   });
+
+  it("accepts a nested provider message id as delivery evidence", () => {
+    expect(
+      isDeliveredMessagingToolResult({
+        toolName: "message",
+        args: {
+          action: "send",
+          channel: "qa-channel",
+          target: "qa-a2a-requester",
+          message: "reply",
+        },
+        result: {
+          content: [{ type: "text", text: '{"message":{"id":"qa-message-242"}}' }],
+          details: { message: { id: "qa-message-242" } },
+        },
+      }),
+    ).toBe(true);
+  });
 });
 
 describe("isDeliveredMessageToolOnlySourceReplyResult", () => {
diff --git a/src/agents/embedded-agent-message-tool-source-reply.ts b/src/agents/embedded-agent-message-tool-source-reply.ts
@@ -84,7 +84,12 @@ function recordHasDeliveredMessageId(record: Record<string, unknown>): boolean {
     const normalized = normalizeStatus(value);
     return Boolean(normalized && !NON_DELIVERY_MESSAGE_IDS.has(normalized));
   };
-  if (hasDeliveredId(record.messageId) || hasDeliveredId(record.pollId)) {
+  const message = asRecord(record.message);
+  if (
+    hasDeliveredId(record.messageId) ||
+    hasDeliveredId(record.pollId) ||
+    hasDeliveredId(message.id)
+  ) {
     return true;
   }
   const receipt = record.receipt;
diff --git a/src/agents/embedded-agent-runner/run/message-tool-terminal.test.ts b/src/agents/embedded-agent-runner/run/message-tool-terminal.test.ts
@@ -54,6 +54,18 @@ describe("message-tool-only source replies", () => {
       }),
       expected: true,
     },
+    {
+      label: "gateway plugin send result",
+      context: createAfterToolCallContext({
+        toolName: "message",
+        args: { action: "send", message: "visible reply" },
+        result: {
+          content: [{ type: "text", text: '{"message":{"id":"qa-message-1"}}' }],
+          details: { message: { id: "qa-message-1" } },
+        },
+      }),
+      expected: true,
+    },
     {
       label: "hook result delivery evidence",
       context: createAfterToolCallContext({
