fix(whatsapp): make inbound diagnostics policy-aware

neeravmakwana · neeravmakwana · commit d012a009e74a · 2026-05-18T22:06:03.000-04:00
diff --git a/extensions/whatsapp/src/auto-reply/monitor.ts b/extensions/whatsapp/src/auto-reply/monitor.ts
@@ -22,6 +22,7 @@ import {
   WHATSAPP_WATCHDOG_TIMEOUT_ERROR,
   type ManagedWhatsAppListener,
 } from "../connection-controller.js";
+import { resolveWhatsAppInboundPolicy } from "../inbound-policy.js";
 import { attachWebInboxToSocket, type WhatsAppGroupMetadataCache } from "../inbound/monitor.js";
 import {
   newConnectionId,
@@ -542,7 +543,18 @@ export async function monitorWebChannel(
         );
       });
 
-      whatsappLog.info(formatWhatsAppInboundListeningLog(account));
+      const inboundPolicy = resolveWhatsAppInboundPolicy({
+        cfg,
+        accountId: account.accountId,
+        selfE164: selfE164 ?? null,
+      });
+      whatsappLog.info(
+        formatWhatsAppInboundListeningLog({
+          groups: inboundPolicy.account.groups,
+          groupPolicy: inboundPolicy.groupPolicy,
+          hasGroupAllowFrom: inboundPolicy.groupAllowFrom.length > 0,
+        }),
+      );
       if (process.stdout.isTTY || process.stderr.isTTY) {
         whatsappLog.raw("Ctrl+C to stop.");
       }
diff --git a/extensions/whatsapp/src/auto-reply/monitor/listener-log.ts b/extensions/whatsapp/src/auto-reply/monitor/listener-log.ts
@@ -1,9 +1,22 @@
 export function formatWhatsAppInboundListeningLog(account: {
   groups?: Record<string, unknown>;
+  groupPolicy: "open" | "allowlist" | "disabled";
+  hasGroupAllowFrom: boolean;
 }): string {
+  if (account.groupPolicy === "disabled") {
+    return "Listening for WhatsApp inbound messages (DM + groups disabled by groupPolicy).";
+  }
+  if (account.groupPolicy === "allowlist" && !account.hasGroupAllowFrom) {
+    return "Listening for WhatsApp inbound messages (DM + group inbound blocked by empty groupPolicy allowlist).";
+  }
+
   const groups = account.groups ?? {};
   if (Object.keys(groups).length === 0) {
-    return "Listening for WhatsApp inbound messages (DM + all groups; no group allowlist configured).";
+    const suffix =
+      account.groupPolicy === "allowlist"
+        ? "sender allowlist configured"
+        : "no group allowlist configured";
+    return `Listening for WhatsApp inbound messages (DM + all groups; ${suffix}).`;
   }
   if (Object.hasOwn(groups, "*")) {
     return "Listening for WhatsApp inbound messages (DM + all groups; wildcard configured).";
diff --git a/extensions/whatsapp/src/auto-reply/web-auto-reply-monitor.test.ts b/extensions/whatsapp/src/auto-reply/web-auto-reply-monitor.test.ts
@@ -120,15 +120,50 @@ function makeInboundCfg(messagePrefix = "") {
 
 describe("WhatsApp listener diagnostics", () => {
   it("describes WhatsApp inbound listener scope without implying DM-only routing", () => {
-    expect(formatWhatsAppInboundListeningLog({})).toBe(
+    expect(
+      formatWhatsAppInboundListeningLog({
+        groupPolicy: "open",
+        hasGroupAllowFrom: false,
+      }),
+    ).toBe(
       "Listening for WhatsApp inbound messages (DM + all groups; no group allowlist configured).",
     );
-    expect(formatWhatsAppInboundListeningLog({ groups: { "123@g.us": {}, "*": {} } })).toBe(
-      "Listening for WhatsApp inbound messages (DM + all groups; wildcard configured).",
+    expect(
+      formatWhatsAppInboundListeningLog({
+        groupPolicy: "disabled",
+        hasGroupAllowFrom: true,
+      }),
+    ).toBe("Listening for WhatsApp inbound messages (DM + groups disabled by groupPolicy).");
+    expect(
+      formatWhatsAppInboundListeningLog({
+        groupPolicy: "allowlist",
+        hasGroupAllowFrom: false,
+      }),
+    ).toBe(
+      "Listening for WhatsApp inbound messages (DM + group inbound blocked by empty groupPolicy allowlist).",
     );
-    expect(formatWhatsAppInboundListeningLog({ groups: { "123@g.us": {}, "456@g.us": {} } })).toBe(
-      "Listening for WhatsApp inbound messages (DM + 2 configured groups).",
+    expect(
+      formatWhatsAppInboundListeningLog({
+        groupPolicy: "allowlist",
+        hasGroupAllowFrom: true,
+      }),
+    ).toBe(
+      "Listening for WhatsApp inbound messages (DM + all groups; sender allowlist configured).",
     );
+    expect(
+      formatWhatsAppInboundListeningLog({
+        groups: { "123@g.us": {}, "*": {} },
+        groupPolicy: "allowlist",
+        hasGroupAllowFrom: true,
+      }),
+    ).toBe("Listening for WhatsApp inbound messages (DM + all groups; wildcard configured).");
+    expect(
+      formatWhatsAppInboundListeningLog({
+        groups: { "123@g.us": {}, "456@g.us": {} },
+        groupPolicy: "allowlist",
+        hasGroupAllowFrom: true,
+      }),
+    ).toBe("Listening for WhatsApp inbound messages (DM + 2 configured groups).");
   });
 });
 
