fix(whatsapp): deliver final error payloads so incomplete-turn errors reach users

NianJiuZst · NianJiuZst · commit c0c2be91d1dd · 2026-05-20T20:53:46.000+08:00
diff --git a/extensions/whatsapp/src/auto-reply/monitor/inbound-dispatch.test.ts b/extensions/whatsapp/src/auto-reply/monitor/inbound-dispatch.test.ts
@@ -816,7 +816,7 @@ describe("whatsapp inbound dispatch", () => {
     expect(rememberSentText).not.toHaveBeenCalled();
   });
 
-  it("suppresses error payload text", async () => {
+  it("delivers final error payload text so incomplete-turn errors reach users (#84569)", async () => {
     const deliverReply = vi.fn(async () => acceptedDeliveryResult());
     const rememberSentText = vi.fn();
 
@@ -825,7 +825,22 @@ describe("whatsapp inbound dispatch", () => {
     const deliver = getCapturedDeliver();
     expect(deliver).toBeTypeOf("function");
 
-    await deliver?.({ text: "provider exploded", isError: true }, { kind: "final" });
+    await deliver?.({ text: "incomplete turn error", isError: true }, { kind: "final" });
+
+    expect(deliverReply).toHaveBeenCalled();
+    expect(rememberSentText).toHaveBeenCalled();
+  });
+
+  it("still suppresses non-final error payloads", async () => {
+    const deliverReply = vi.fn(async () => acceptedDeliveryResult());
+    const rememberSentText = vi.fn();
+
+    await dispatchBufferedReply({ deliverReply, rememberSentText });
+
+    const deliver = getCapturedDeliver();
+    expect(deliver).toBeTypeOf("function");
+
+    await deliver?.({ text: "tool error", isError: true }, { kind: "tool" });
 
     expect(deliverReply).not.toHaveBeenCalled();
     expect(rememberSentText).not.toHaveBeenCalled();
diff --git a/extensions/whatsapp/src/auto-reply/monitor/inbound-dispatch.ts b/extensions/whatsapp/src/auto-reply/monitor/inbound-dispatch.ts
@@ -116,7 +116,9 @@ function resolveWhatsAppDeliverablePayload(
   if (payload.isReasoning === true || payload.isCompactionNotice === true) {
     return null;
   }
-  if (payload.isError === true) {
+  // Allow isError payloads with user-facing text through for final delivery.
+  // Incomplete-turn error messages (payloads=0) must reach the user (#84569).
+  if (payload.isError === true && info.kind !== "final") {
     return null;
   }
   if (info.kind === "tool") {
diff --git a/extensions/whatsapp/src/outbound-adapter.sendpayload.test.ts b/extensions/whatsapp/src/outbound-adapter.sendpayload.test.ts
@@ -163,19 +163,22 @@ describe("whatsappOutbound sendPayload", () => {
     expect(sendWhatsApp).not.toHaveBeenCalled();
   });
 
-  it("suppresses routed error payloads", async () => {
-    const sendWhatsApp = vi.fn();
+  it("delivers routed error payloads so incomplete-turn errors reach users (#84569)", async () => {
+    const sendWhatsApp = vi.fn().mockResolvedValue({
+      channel: "whatsapp",
+      messageId: "msg-error-001",
+    });
 
     const result = await whatsappOutbound.sendPayload!({
       cfg: {},
       to: "5511999999999@c.us",
       text: "",
-      payload: { text: "provider exploded", isError: true },
+      payload: { text: "incomplete turn error", isError: true },
       deps: { sendWhatsApp },
     });
 
-    expect(result).toEqual({ channel: "whatsapp", messageId: "" });
-    expect(sendWhatsApp).not.toHaveBeenCalled();
+    expect(sendWhatsApp).toHaveBeenCalled();
+    expect(result).toEqual({ channel: "whatsapp", messageId: "msg-error-001" });
   });
 
   it("sanitizes HTML-only text to whitespace-only payload", () => {
diff --git a/extensions/whatsapp/src/outbound-base.ts b/extensions/whatsapp/src/outbound-base.ts
@@ -231,9 +231,6 @@ export function createWhatsAppOutboundBase({
   return {
     ...outbound,
     sendPayload: async (ctx) => {
-      if (ctx.payload.isError === true) {
-        return { channel: "whatsapp", messageId: "" };
-      }
       const payload = normalizeWhatsAppOutboundPayload(ctx.payload, { normalizeText });
       if (!payload.text && !(payload.mediaUrl || payload.mediaUrls?.length)) {
         if (ctx.payload.interactive || ctx.payload.presentation || ctx.payload.channelData) {

Original file line number	Diff line number	Diff line change
`@@ -116,7 +116,9 @@ function resolveWhatsAppDeliverablePayload(`
`116`	`116`	`if (payload.isReasoning === true \|\| payload.isCompactionNotice === true) {`
`117`	`117`	`return null;`
`118`	`118`	`}`
`119`		`- if (payload.isError === true) {`
	`119`	`+ // Allow isError payloads with user-facing text through for final delivery.`
	`120`	`+ // Incomplete-turn error messages (payloads=0) must reach the user (#84569).`
	`121`	`+ if (payload.isError === true && info.kind !== "final") {`
`120`	`122`	`return null;`
`121`	`123`	`}`
`122`	`124`	`if (info.kind === "tool") {`