fix(whatsapp): ignore outbound echoes for inbound activity (#79057)

ai-hpc · mcaxtr · web-flow · commit 36f847a60e39 · 2026-05-08T01:02:19.000-03:00
Merged via squash. Prepared head SHA: 3b1f38a Co-authored-by: ai-hpc <183861985+ai-hpc@users.noreply.github.com> Co-authored-by: mcaxtr <7562095+mcaxtr@users.noreply.github.com> Reviewed-by: @mcaxtr
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -598,6 +598,7 @@ Docs: https://docs.openclaw.ai
 - Hooks/cron: log returned `/hooks/agent` isolated-run errors and failed cron jobs with cron diagnostic summaries, so rejected `payload.model` values are visible instead of looking like accepted-but-missing runs. Fixes #78597. (#78655) Thanks @kevinslin.
 - Managed proxy/security: classify raw socket callsites and proxy runtime mutations in boundary checks so new direct egress or unmanaged proxy-state changes cannot land without explicit review. (#77126) Thanks @jesse-merhi.
 - Channels/iMessage: surface the silent group-allowlist drop at default log level by emitting a one-time `warn` per account at monitor startup when `channels.imessage.groupPolicy: "allowlist"` is set without a `channels.imessage.groups` block, plus a one-time `warn` per `chat_id` when the runtime gate drops a specific group, naming the exact `channels.imessage.groups[...]` key to add to allow it. Fixes #78749. (#79190) Thanks @omarshahine.
+- WhatsApp: stop Gateway-originated outbound echoes from advancing inbound activity in `openclaw channels status`, so outbound self-sends no longer look like handled inbound messages. Fixes #79056. (#79057) Thanks @ai-hpc and @bittoby.
 
 ## 2026.5.3-1
 
diff --git a/extensions/whatsapp/src/inbound/monitor.ts b/extensions/whatsapp/src/inbound/monitor.ts
@@ -113,6 +113,14 @@ function isGroupJid(jid: string): boolean {
   return (typeof isJidGroup === "function" ? isJidGroup(jid) : jid.endsWith("@g.us")) === true;
 }
 
+function recordAcceptedInboundActivity(accountId: string): void {
+  recordChannelActivity({
+    channel: "whatsapp",
+    accountId,
+    direction: "inbound",
+  });
+}
+
 function isRetryableSendDisconnectError(err: unknown): boolean {
   return /closed|reset|timed\s*out|disconnect|no active socket/i.test(formatError(err));
 }
@@ -799,11 +807,6 @@ export async function attachWebInboxToSocket(
       return;
     }
     for (const msg of upsert.messages ?? []) {
-      recordChannelActivity({
-        channel: "whatsapp",
-        accountId: options.accountId,
-        direction: "inbound",
-      });
       const inbound = await normalizeInboundMessage(msg);
       if (!inbound) {
         continue;
@@ -832,6 +835,7 @@ export async function attachWebInboxToSocket(
         continue;
       }
 
+      recordAcceptedInboundActivity(options.accountId);
       await enqueueInboundMessage(msg, inbound, enriched);
     }
   };
diff --git a/extensions/whatsapp/src/monitor-inbox.allows-messages-from-senders-allowfrom-list.test-support.ts b/extensions/whatsapp/src/monitor-inbox.allows-messages-from-senders-allowfrom-list.test-support.ts
@@ -3,6 +3,7 @@ import { describe, expect, it, vi } from "vitest";
 import {
   buildNotifyMessageUpsert,
   expectPairingPromptSent,
+  getRecordChannelActivityMock,
   installWebMonitorInboxUnitTestHooks,
   mockLoadConfig,
   settleInboundWork,
@@ -33,6 +34,20 @@ async function openInboxMonitor(onMessage = vi.fn()) {
   return { onMessage, listener, sock };
 }
 
+function expectOnlyOutboundChannelActivity(accountId = "default") {
+  const recordChannelActivityMock = getRecordChannelActivityMock();
+  expect(recordChannelActivityMock).toHaveBeenCalledWith({
+    channel: "whatsapp",
+    accountId,
+    direction: "outbound",
+  });
+  expect(recordChannelActivityMock).not.toHaveBeenCalledWith({
+    channel: "whatsapp",
+    accountId,
+    direction: "inbound",
+  });
+}
+
 async function expectOutboundDmSkipsPairing(params: {
   selfChatMode: boolean;
   messageId: string;
@@ -294,6 +309,7 @@ describe("web monitor inbox", () => {
     await settleInboundWork();
 
     expect(onMessage).not.toHaveBeenCalled();
+    expectOnlyOutboundChannelActivity();
 
     await listener.close();
   });
@@ -333,6 +349,7 @@ describe("web monitor inbox", () => {
     await settleInboundWork();
 
     expect(onMessage).not.toHaveBeenCalled();
+    expectOnlyOutboundChannelActivity();
 
     await listener.close();
   });
diff --git a/extensions/whatsapp/src/monitor-inbox.test-harness.ts b/extensions/whatsapp/src/monitor-inbox.test-harness.ts
@@ -55,6 +55,25 @@ const sessionState = vi.hoisted(() => ({
   sock: undefined as MockSock | undefined,
 }));
 
+const channelActivityMocks = vi.hoisted(() => ({
+  recordChannelActivity: vi.fn(),
+}));
+
+export function getRecordChannelActivityMock(): AnyMockFn {
+  return channelActivityMocks.recordChannelActivity;
+}
+
+vi.mock("openclaw/plugin-sdk/channel-activity-runtime", async () => {
+  const actual = await vi.importActual<
+    typeof import("openclaw/plugin-sdk/channel-activity-runtime")
+  >("openclaw/plugin-sdk/channel-activity-runtime");
+  return {
+    ...actual,
+    recordChannelActivity: (...args: unknown[]) =>
+      channelActivityMocks.recordChannelActivity(...args),
+  };
+});
+
 const inboundRuntimeMocks = vi.hoisted(() => {
   const wrapperKeys = [
     "ephemeralMessage",
@@ -277,6 +296,7 @@ export function installWebMonitorInboxUnitTestHooks(opts?: { authDir?: boolean }
   beforeEach(async () => {
     vi.useRealTimers();
     vi.clearAllMocks();
+    channelActivityMocks.recordChannelActivity.mockClear();
     sessionState.sock = createMockSock();
     resetPairingSecurityMocks(DEFAULT_WEB_INBOX_CONFIG);
     if (!monitorWebInbox || !resetWebInboundDedupe) {
