fix(whatsapp): restore config-driven block streaming for WhatsApp delivery

Ignasi Cambra Diaz · Ignasi Cambra Diaz · commit 2003dbde7202 · 2026-03-15T15:04:50.000+01:00
diff --git a/extensions/whatsapp/src/auto-reply/monitor/process-message.inbound-contract.test.ts b/extensions/whatsapp/src/auto-reply/monitor/process-message.inbound-contract.test.ts
@@ -280,7 +280,7 @@ describe("web processMessage inbound contract", () => {
     expect(groupHistories.get("whatsapp:default:group:123@g.us") ?? []).toHaveLength(0);
   });
 
-  it("suppresses non-final WhatsApp payload delivery", async () => {
+  it("suppresses tool payload delivery but allows block and final", async () => {
     const rememberSentText = vi.fn();
     await processMessage(createWhatsAppDirectStreamingArgs({ rememberSentText }));
 
@@ -291,21 +291,46 @@ describe("web processMessage inbound contract", () => {
     expect(deliver).toBeTypeOf("function");
 
     await deliver?.({ text: "tool payload" }, { kind: "tool" });
-    await deliver?.({ text: "block payload" }, { kind: "block" });
     expect(deliverWebReplyMock).not.toHaveBeenCalled();
-    expect(rememberSentText).not.toHaveBeenCalled();
 
-    await deliver?.({ text: "final payload" }, { kind: "final" });
+    await deliver?.({ text: "block payload" }, { kind: "block" });
     expect(deliverWebReplyMock).toHaveBeenCalledTimes(1);
-    expect(rememberSentText).toHaveBeenCalledTimes(1);
+
+    await deliver?.({ text: "final payload" }, { kind: "final" });
+    expect(deliverWebReplyMock).toHaveBeenCalledTimes(2);
+    expect(rememberSentText).toHaveBeenCalledTimes(2);
   });
 
-  it("forces disableBlockStreaming for WhatsApp dispatch", async () => {
+  it("respects per-account blockStreaming config for disableBlockStreaming", async () => {
     await processMessage(createWhatsAppDirectStreamingArgs());
 
     // oxlint-disable-next-line typescript/no-explicit-any
     const replyOptions = (capturedDispatchParams as any)?.replyOptions;
-    expect(replyOptions?.disableBlockStreaming).toBe(true);
+    // blockStreaming: true in config → disableBlockStreaming: false
+    expect(replyOptions?.disableBlockStreaming).toBe(false);
+  });
+
+  it("leaves disableBlockStreaming undefined when blockStreaming not configured", async () => {
+    const args = makeProcessMessageArgs({
+      routeSessionKey: "agent:main:whatsapp:direct:+1555",
+      groupHistoryKey: "+1555",
+      cfg: {
+        messages: {},
+        session: { store: sessionStorePath },
+      } as unknown as ReturnType<typeof import("../../../../../src/config/config.js").loadConfig>,
+      msg: {
+        id: "msg1",
+        from: "+1555",
+        to: "+2000",
+        chatType: "direct",
+        body: "hi",
+      },
+    });
+    await processMessage(args);
+
+    // oxlint-disable-next-line typescript/no-explicit-any
+    const replyOptions = (capturedDispatchParams as any)?.replyOptions;
+    expect(replyOptions?.disableBlockStreaming).toBeUndefined();
   });
 
   it("passes sendComposing through as the reply typing callback", async () => {
diff --git a/extensions/whatsapp/src/auto-reply/monitor/process-message.ts b/extensions/whatsapp/src/auto-reply/monitor/process-message.ts
@@ -255,6 +255,7 @@ export async function processMessage(params: {
         })()
       : undefined;
 
+  const account = resolveWhatsAppAccount({ cfg: params.cfg, accountId: params.route.accountId });
   const textLimit = params.maxMediaTextChunkLimit ?? resolveTextChunkLimit(params.cfg, "whatsapp");
   const chunkMode = resolveChunkMode(params.cfg, "whatsapp", params.route.accountId);
   const tableMode = resolveMarkdownTableMode({
@@ -402,12 +403,12 @@ export async function processMessage(params: {
         }
       },
       deliver: async (payload: ReplyPayload, info) => {
-        if (info.kind !== "final") {
-          // Only deliver final replies to external messaging channels (WhatsApp).
-          // Block (reasoning/thinking) and tool updates are meant for the internal
-          // web UI only; sending them here leaks chain-of-thought to end users.
+        if (info.kind === "tool") {
+          // Tool updates are internal-only; don't deliver to WhatsApp.
           return;
         }
+        // Reasoning blocks are already filtered upstream by shouldSuppressReasoningPayload
+        // in dispatch-from-config.ts. Only user-facing text/media blocks reach here.
         await deliverWebReply({
           replyResult: payload,
           msg: params.msg,
@@ -450,9 +451,8 @@ export async function processMessage(params: {
       onReplyStart: params.msg.sendComposing,
     },
     replyOptions: {
-      // WhatsApp delivery intentionally suppresses non-final payloads.
-      // Keep block streaming disabled so final replies are still produced.
-      disableBlockStreaming: true,
+      disableBlockStreaming:
+        typeof account.blockStreaming === "boolean" ? !account.blockStreaming : undefined,
       onModelSelected,
     },
   });
