fix(whatsapp): preserve shipped admission callbacks

mcaxtr · mcaxtr · commit cbca97602b0a · 2026-07-19T12:39:51.000-03:00
diff --git a/extensions/whatsapp/src/auto-reply/monitor/on-message.audio-preflight.test.ts b/extensions/whatsapp/src/auto-reply/monitor/on-message.audio-preflight.test.ts
@@ -99,13 +99,33 @@ import {
   createTestLegacyFlatWebInboundMessage,
   createTestWebAudioInboundMessage,
 } from "../../inbound/test-message.test-helper.js";
-import type { WebInboundMessage } from "../../inbound/types.js";
+import type { WebInboundCallbackMessage, WebInboundMessage } from "../../inbound/types.js";
 import { createWebOnMessageHandler } from "./on-message.js";
 
 function makeAudioMsg(): WebInboundMessage {
   return createTestWebAudioInboundMessage();
 }
 
+function makeShippedNestedAudioMsg(params: {
+  admission: "dispatch" | "observe" | "skip" | "drop";
+  reasonCode: "activation_allowed" | "activation_skipped" | "route_blocked";
+}): WebInboundCallbackMessage {
+  const msg = createTestWebAudioInboundMessage();
+  const { turnAdmission: _turnAdmission, ...admission } = msg.admission!;
+  return {
+    ...msg,
+    admission: {
+      ...admission,
+      ingress: {
+        ...admission.ingress,
+        admission: params.admission,
+        decision: params.admission === "drop" ? "block" : "allow",
+        reasonCode: params.reasonCode,
+      },
+    },
+  };
+}
+
 function makeLegacyAudioMsg() {
   return createTestLegacyFlatWebInboundMessage({
     body: "<media:audio>",
@@ -242,6 +262,29 @@ describe("createWebOnMessageHandler audio preflight", () => {
     expect(processParams.ackReaction).toBe(ackReactionHandle);
   });
 
+  it.each([
+    ["dispatch", "activation_allowed", { kind: "dispatch", reason: "activation_allowed" }, true],
+    ["observe", "activation_allowed", { kind: "observeOnly", reason: "activation_allowed" }, true],
+    ["skip", "activation_skipped", { kind: "handled", reason: "activation_skipped" }, false],
+    [
+      "drop",
+      "route_blocked",
+      { kind: "drop", reason: "route_blocked", recordHistory: false },
+      false,
+    ],
+  ] as const)(
+    "normalizes shipped nested %s admission before gating the turn",
+    async (admission, reasonCode, expectedTurnAdmission, shouldProcess) => {
+      const msg = makeShippedNestedAudioMsg({ admission, reasonCode });
+      const handler = makeHandler();
+
+      await handler(msg);
+
+      expect(msg.admission).toMatchObject({ turnAdmission: expectedTurnAdmission });
+      expect(processMessageMock).toHaveBeenCalledTimes(shouldProcess ? 1 : 0);
+    },
+  );
+
   it("sends queued status reaction before audio preflight when status reactions are enabled", async () => {
     const handler = makeHandler({
       cfg: {
diff --git a/extensions/whatsapp/src/inbound/admission.ts b/extensions/whatsapp/src/inbound/admission.ts
@@ -29,10 +29,12 @@ type WhatsAppInboundActivationAccess = Pick<
   "ran" | "allowed" | "shouldSkip" | "reasonCode"
 >;
 
-type WhatsAppInboundAdmissionAccess = Pick<
-  ResolvedChannelMessageIngress,
-  "ingress" | "senderAccess" | "commandAccess" | "activationAccess"
->;
+type WhatsAppInboundAdmissionAccess = {
+  ingress: WhatsAppInboundIngressDecision;
+  senderAccess: WhatsAppInboundSenderAccess;
+  commandAccess: WhatsAppInboundCommandAccess;
+  activationAccess: WhatsAppInboundActivationAccess;
+};
 
 type WhatsAppInboundAdmissionPolicy = {
   account: {
@@ -105,6 +107,24 @@ export type WhatsAppInboundAdmission = {
   turnAdmission: WhatsAppInboundTurnAdmission;
 };
 
+export type WhatsAppInboundAdmissionInput =
+  | WhatsAppInboundAdmission
+  | Omit<WhatsAppInboundAdmission, "turnAdmission">;
+
+export function normalizeWhatsAppInboundAdmission(
+  admission: WhatsAppInboundAdmissionInput,
+): WhatsAppInboundAdmission {
+  if ("turnAdmission" in admission) {
+    return admission;
+  }
+  // Shipped nested callbacks predate turnAdmission. Normalize once at the
+  // callback boundary so all runtime consumers receive the canonical shape.
+  return {
+    ...admission,
+    turnAdmission: mapChannelIngressDecisionToTurnAdmission(admission.ingress),
+  };
+}
+
 function copyAccount(
   account: WhatsAppInboundAdmissionPolicy["account"],
 ): WhatsAppInboundAdmission["account"] {
@@ -197,53 +217,49 @@ export function buildDeprecatedFlatWhatsAppInboundAdmission(
       ? "group_policy_allowed"
       : "dm_policy_allowlisted"
     : "no_policy_match";
-  const ingress: WhatsAppInboundIngressDecision = {
-    admission: admitted ? "dispatch" : "drop",
-    decision: admitted ? "allow" : "block",
-    decisiveGateId: "legacy-flat-compat",
-    reasonCode,
-  };
-
-  // Compatibility only: flat listenerFactory inputs predate SDK ingress, so
-  // construct their legacy admission directly instead of inventing an access graph.
-  return {
-    accountId,
-    isSelfChat: false,
-    account: {
-      accountId,
-      enabled: true,
-      sendReadReceipts: true,
+  // Compatibility only: deprecated listenerFactory flat inputs predate the
+  // admission envelope, so convert them through the canonical admission builder.
+  // Canonical nested inputs without admission remain malformed for runtime use.
+  return buildWhatsAppInboundAdmission({
+    policy: {
+      account: {
+        accountId,
+        enabled: true,
+        sendReadReceipts: true,
+      },
+      isSelfChat: false,
+      isSamePhone: () => false,
     },
-    conversation: {
-      kind: msg.chatType === "group" ? "group" : "direct",
-      id: conversationId,
-      groupSessionId: resolveWhatsAppGroupConversationId(conversationId),
+    access: {
+      ingress: {
+        admission: admitted ? "dispatch" : "drop",
+        decision: admitted ? "allow" : "block",
+        decisiveGateId: "legacy-flat-compat",
+        reasonCode,
+      },
+      senderAccess: {
+        allowed: admitted,
+        decision: admitted ? "allow" : "block",
+        reasonCode,
+        providerMissingFallbackApplied: false,
+      },
+      commandAccess: {
+        requested: false,
+        authorized: false,
+        shouldBlockControlCommand: false,
+        reasonCode: "command_authorized",
+      },
+      activationAccess: {
+        ran: false,
+        allowed: admitted,
+        shouldSkip: !admitted,
+        reasonCode: admitted ? "activation_allowed" : "activation_skipped",
+      },
     },
-    sender: {
-      id: senderId,
-      isSamePhone: false,
-    },
-    ingress,
-    senderAccess: {
-      allowed: admitted,
-      decision: admitted ? "allow" : "block",
-      reasonCode,
-      providerMissingFallbackApplied: false,
-    },
-    commandAccess: {
-      requested: false,
-      authorized: false,
-      shouldBlockControlCommand: false,
-      reasonCode: "command_authorized",
-    },
-    activationAccess: {
-      ran: false,
-      allowed: admitted,
-      shouldSkip: !admitted,
-      reasonCode: admitted ? "activation_allowed" : "activation_skipped",
-    },
-    turnAdmission: mapChannelIngressDecisionToTurnAdmission(ingress),
-  };
+    isGroup: msg.chatType === "group",
+    conversationId,
+    senderId,
+  });
 }
 
 export function requireWhatsAppInboundAdmission(
diff --git a/extensions/whatsapp/src/inbound/message-aliases.ts b/extensions/whatsapp/src/inbound/message-aliases.ts
@@ -1,4 +1,7 @@
-import { buildDeprecatedFlatWhatsAppInboundAdmission } from "./admission.js";
+import {
+  buildDeprecatedFlatWhatsAppInboundAdmission,
+  normalizeWhatsAppInboundAdmission,
+} from "./admission.js";
 import { resolveWhatsAppGroupConversationId } from "./group-conversation.js";
 import type {
   DeprecatedWebInboundAdmissionTopLevelFields,
@@ -202,6 +205,9 @@ function defineDeprecatedAdmissionTopLevelAccessors<T extends WebInboundCallback
 export function withDeprecatedWebInboundMessageFlatAliases<T extends WebInboundCallbackMessage>(
   msg: T,
 ): T & WebInboundMessage {
+  if (msg.admission) {
+    msg.admission = normalizeWhatsAppInboundAdmission(msg.admission);
+  }
   // Keep the shipped callback shape alive while nested/admission contexts remain canonical.
   const withAdmissionAliases = defineDeprecatedAdmissionTopLevelAccessors(msg);
   return defineDeprecatedAliasAccessors(withAdmissionAliases, {
diff --git a/extensions/whatsapp/src/inbound/types.ts b/extensions/whatsapp/src/inbound/types.ts
@@ -4,7 +4,7 @@ import type { NormalizedLocation } from "openclaw/plugin-sdk/channel-inbound";
 import type { PollInput } from "openclaw/plugin-sdk/poll-runtime";
 import type { WhatsAppIdentity, WhatsAppReplyContext, WhatsAppSelfIdentity } from "../identity.js";
 import type { DeprecatedWebInboundAdmissionTopLevelFields } from "./admission-types.js";
-import type { WhatsAppInboundAdmission } from "./admission.js";
+import type { WhatsAppInboundAdmission, WhatsAppInboundAdmissionInput } from "./admission.js";
 import type { WhatsAppSendResult } from "./send-result.js";
 
 export type { DeprecatedWebInboundAdmissionTopLevelFields } from "./admission-types.js";
@@ -216,8 +216,10 @@ type WebInboundCallbackMessageCommon = {
 };
 
 type WebInboundCallbackAdmissionFields =
-  | ({ admission: WhatsAppInboundAdmission } & Partial<DeprecatedWebInboundAdmissionTopLevelFields>)
-  | ({ admission?: WhatsAppInboundAdmission } & DeprecatedWebInboundAdmissionTopLevelFields);
+  | ({
+      admission: WhatsAppInboundAdmissionInput;
+    } & Partial<DeprecatedWebInboundAdmissionTopLevelFields>)
+  | ({ admission?: WhatsAppInboundAdmissionInput } & DeprecatedWebInboundAdmissionTopLevelFields);
 
 export type WebInboundCallbackMessage = WebInboundCallbackMessageCommon &
   WebInboundCallbackAdmissionFields & {
@@ -226,8 +228,9 @@ export type WebInboundCallbackMessage = WebInboundCallbackMessageCommon &
     platform: WhatsAppInboundPlatform;
   };
 
-export type WebInboundMessage = WebInboundCallbackMessage &
-  DeprecatedWebInboundAdmissionTopLevelFields &
+export type WebInboundMessage = Omit<WebInboundCallbackMessage, "admission"> & {
+  admission?: WhatsAppInboundAdmission;
+} & DeprecatedWebInboundAdmissionTopLevelFields &
   DeprecatedWebInboundMessageFlatAliases;
 
 export type AdmittedWebInboundMessage = Omit<
@@ -239,7 +242,7 @@ export type AdmittedWebInboundMessage = Omit<
 
 export type LegacyFlatWebInboundMessage = DeprecatedWebInboundAdmissionTopLevelFields &
   Pick<WebInboundCallbackMessageCommon, "wasMentioned"> & {
-    admission?: WhatsAppInboundAdmission;
+    admission?: WhatsAppInboundAdmissionInput;
   } & DeprecatedWebInboundMessageFlatAliases & {
     event?: never;
     payload?: never;
