@whanext/core 0.19.13 → 0.19.15

package/CHANGELOG.md

@@ -1,5 +1,25 @@
 # Changelog
 
+## 0.19.15
+
+### Added
+- Added provider-safe payload classification through `message.protocolKinds` and `message.payloadKinds`, also available on quoted messages.
+- Added `payment` to `MessageContentKind` for WhatsApp payment payloads and native-flow payment cards.
+- Added Zapo 1.7.1 payment coverage for `sendPaymentMessage`, `requestPaymentMessage`, `paymentInviteMessage`, `cancelPaymentRequestMessage`, `declinePaymentRequestMessage`, `invoiceMessage`, `paymentReminderMessage`, `splitPaymentMessage`, and `splitPaymentUpdateMessage`.
+- Added group-status wrapper coverage for `groupStatusMessage`, `groupStatusMessageV2`, `groupStatusMentionMessage`, and `groupMentionedMessage` while preserving the nested content classification.
+- Added `catalog_message` classification for Zapo `productMessage` and `orderMessage` payloads.
+- Added native-flow payment detection for the documented `payment_info` and `review_and_pay` flows.
+- Added defensive `malformed_payload` and `native_flow_crash` signals for invalid or structurally unsafe native-flow JSON without exposing raw provider payloads to consumers.
+
+### Compatibility
+- Existing `contentKind` consumers remain compatible; the new protocol/payload arrays are optional.
+- `groupStatus*` and `groupMentionedMessage` are unwrapped as Zapo `FutureProofMessage` containers so text/media inside them continues through the regular normalizer.
+
+## 0.19.14
+
+- Removed the temporary end-to-end AntiEdit diagnostic instrumentation after confirming the group-author identity fix in production.
+- Normal edit handling remains quiet apart from the existing standard error and recovery logs.
+
 ## 0.19.13
 
 - Group edits now preserve the original message author's participant identities instead of replacing them with identities carried by the edit-addon envelope.

package/README.md

@@ -356,7 +356,26 @@ app.on('message', async (message) => {
 });
 ```
 
-Os valores disponíveis são `text`, `image`, `video`, `audio`, `document`, `sticker`, `location`, `contact`, `poll`, `catalog` e `unknown`. Para mídia baixável, continue usando `message.media.kind`.
+Os valores disponíveis são `text`, `image`, `video`, `audio`, `document`, `sticker`, `location`, `contact`, `poll`, `catalog`, `payment` e `unknown`. Para mídia baixável, continue usando `message.media.kind`.
+
+Para moderação de payloads especiais, o provider Zapo também expõe duas classificações opcionais:
+
+- `message.protocolKinds`: nomes reais do protocolo reconhecidos no `Proto.IMessage`, sem expor o objeto protobuf bruto.
+- `message.payloadKinds`: categorias estáveis do WhaNext: `catalog_message`, `payment_payload`, `group_status_payload`, `payment_info_embedded`, `native_flow_crash` e `malformed_payload`.
+
+Um filtro de pagamentos pode cobrir tanto mensagens de pagamento do protocolo quanto os cards PIX/cobrança em native-flow:
+
+```ts
+app.on('message', async (message) => {
+  if (message.contentKind === 'payment' && message.isGroup) {
+    await app.message.delete(message);
+  }
+});
+```
+
+Os wrappers `groupStatusMessage`, `groupStatusMessageV2`, `groupStatusMentionMessage` e `groupMentionedMessage` são desembrulhados antes da classificação normal. Por exemplo, uma imagem dentro de `groupStatusMessageV2` continua com `contentKind === 'image'`, enquanto `payloadKinds` inclui `group_status_payload` e `protocolKinds` preserva o wrapper detectado.
+
+`catalog_message` normaliza `productMessage` e `orderMessage`. `payment_info_embedded` cobre os flows `payment_info` e `review_and_pay`. `native_flow_crash` e `malformed_payload` são sinais defensivos do WhaNext, não nomes de campos do protocolo Zapo.
 
 ```ts
 app.on('message', async (message) => {

package/dist/index.d.ts

@@ -72,7 +72,9 @@ type MediaKind = 'image' | 'video' | 'audio' | 'document' | 'sticker';
  * `contentKind` additionally exposes non-media payloads such as locations,
  * contacts, polls and catalog/product messages without leaking provider-specific protocol types.
  */
-type MessageContentKind = 'text' | 'image' | 'video' | 'audio' | 'document' | 'sticker' | 'location' | 'contact' | 'poll' | 'catalog' | 'unknown';
+type MessageContentKind = 'text' | 'image' | 'video' | 'audio' | 'document' | 'sticker' | 'location' | 'contact' | 'poll' | 'catalog' | 'payment' | 'unknown';
+type MessageProtocolKind = 'groupStatusMessage' | 'groupStatusMessageV2' | 'groupStatusMentionMessage' | 'groupMentionedMessage' | 'productMessage' | 'orderMessage' | 'sendPaymentMessage' | 'requestPaymentMessage' | 'paymentInviteMessage' | 'cancelPaymentRequestMessage' | 'declinePaymentRequestMessage' | 'invoiceMessage' | 'paymentReminderMessage' | 'splitPaymentMessage' | 'splitPaymentUpdateMessage';
+type MessagePayloadKind = 'catalog_message' | 'payment_payload' | 'group_status_payload' | 'payment_info_embedded' | 'native_flow_crash' | 'malformed_payload';
 interface MessageMedia {
     kind: MediaKind;
     mimetype?: string;
@@ -88,6 +90,8 @@ interface QuotedMessage {
     hasMedia: boolean;
     isViewOnce?: boolean;
     contentKind?: MessageContentKind;
+    protocolKinds?: MessageProtocolKind[];
+    payloadKinds?: MessagePayloadKind[];
     media?: MessageMedia;
 }
 type InteractiveResponseKind = 'button' | 'list';
@@ -132,6 +136,8 @@ interface Message {
     isViewOnce: boolean;
     hasMedia: boolean;
     contentKind?: MessageContentKind;
+    protocolKinds?: MessageProtocolKind[];
+    payloadKinds?: MessagePayloadKind[];
     media?: MessageMedia;
     quoted?: QuotedMessage;
     interactive?: InteractiveResponse;
@@ -640,8 +646,8 @@ declare const guards: {
     custom(guard: CommandGuard): CommandGuard;
 };
 
-type CommandScope = 'global' | 'user' | 'chat' | 'user-chat' | 'user-group';
-type ConcurrencyStrategy = 'parallel' | 'reject' | 'queue' | 'replace';
+type CommandScope = "global" | "user" | "chat" | "user-chat" | "user-group";
+type ConcurrencyStrategy = "parallel" | "reject" | "queue" | "replace";
 interface CommandCooldown {
     durationMs: number;
     scope?: CommandScope;
@@ -966,4 +972,4 @@ declare class SqliteMuteStore implements MuteStore {
     close(): void;
 }
 
-export { AccountService, type AddMuteOptions, type AddMuteResult, type AppEvents, type AppHealth, type AppHealthStatus, ArgsParser, type AudioContent, type BooleanOption, Browser, type ButtonsContent, type CacheOptions, type CacheStore, type CallEvent, type CallStatus, type ChangeResult, type CommandAccountContext, type CommandCatalogOptions, type CommandCatalogView, type CommandChatContext, type CommandConcurrency, type CommandContext, type CommandCooldown, type CommandDefinition, type CommandErrorHandler, type CommandGroupContext, type CommandGroupDefinition, type CommandGuard, type CommandHelpOptions, type CommandHooks, type CommandLocalization, type CommandMetadata, type CommandMiddleware, type CommandOptionDefinition, type CommandOptionSchema, type CommandOptionValue, type CommandOptionValues, type CommandRegistrar, CommandRouter, type CommandRuntimeServices, type CommandScope, type ConcurrencyStrategy, type ConnectionState, type ConnectionUpdate, type CopyCodeButton, type CreateMultiOptions, type CreateOptions, DeferredReply, type DownloadedMedia, type DurationOption, type EnumOption, type ExecutableCommandDefinition, type GroupAccess, type GroupAddressingMode, type GroupParticipant, type GroupParticipantAction, type GroupParticipantsChanged, type GroupRole, type GroupSnapshot, type GuardResult, type ImageContent, type InteractiveResponse, type InteractiveResponseKind, type InviteResult, type LinkButton, type ListContent, type ListRow, type ListSection, type LoadCommandsOptions, type LoadCommandsResult, type LoadedCommand, type LogContext, type LogEntry, type LogFormat, type LogLevel, type LogWriter, Logger, type LoggerConfig, type LoggerOptions, type LoginOptions, type MediaKind, type MediaSource, type MemberActionState, MemoryCache, type MemoryCacheStats, type MentionTarget, type Message, type MessageButton, type MessageContent, type MessageContentKind, type MessageDeleted, type MessageEdited, type MessageKey, type MessageMedia, type MultiAccountOptions, type MultiAppEvent, type MultiAppHealth, MultiCommandRouter, type MultiLoadCommandsResult, type MultiLoginOptions, type MuteChangeResult, type MuteEnforcement, type MuteOptions, type MuteRecord, MuteService, type MuteStore, type NumberOption, ParsedCommandOptions, type ParticipantUpdateResult, type PollContent, type PresenceState, type QuickReplyButton, type QuotedMessage, type ReconnectOptions, type RegisteredCommand, type RemoveMuteResult, type ReplyOptions, type RepostMessageOptions, type RouterOptions, type SentMessage, SqliteMuteStore, type StickerContent, type StoredMute, type StringOption, type TextContent, User, type UserData, type UserOption, type VideoContent, WhaNextApp, WhaNextError, type WhaNextErrorCode, WhaNextMultiApp, type WhatsAppProvider, create, createMulti, defineCommand, defineCommandGroup, defineCommands, defineSubcommand, guards, isCommandGroup, loadCommands, option, toWhaNextError };
+export { AccountService, type AddMuteOptions, type AddMuteResult, type AppEvents, type AppHealth, type AppHealthStatus, ArgsParser, type AudioContent, type BooleanOption, Browser, type ButtonsContent, type CacheOptions, type CacheStore, type CallEvent, type CallStatus, type ChangeResult, type CommandAccountContext, type CommandCatalogOptions, type CommandCatalogView, type CommandChatContext, type CommandConcurrency, type CommandContext, type CommandCooldown, type CommandDefinition, type CommandErrorHandler, type CommandGroupContext, type CommandGroupDefinition, type CommandGuard, type CommandHelpOptions, type CommandHooks, type CommandLocalization, type CommandMetadata, type CommandMiddleware, type CommandOptionDefinition, type CommandOptionSchema, type CommandOptionValue, type CommandOptionValues, type CommandRegistrar, CommandRouter, type CommandRuntimeServices, type CommandScope, type ConcurrencyStrategy, type ConnectionState, type ConnectionUpdate, type CopyCodeButton, type CreateMultiOptions, type CreateOptions, DeferredReply, type DownloadedMedia, type DurationOption, type EnumOption, type ExecutableCommandDefinition, type GroupAccess, type GroupAddressingMode, type GroupParticipant, type GroupParticipantAction, type GroupParticipantsChanged, type GroupRole, type GroupSnapshot, type GuardResult, type ImageContent, type InteractiveResponse, type InteractiveResponseKind, type InviteResult, type LinkButton, type ListContent, type ListRow, type ListSection, type LoadCommandsOptions, type LoadCommandsResult, type LoadedCommand, type LogContext, type LogEntry, type LogFormat, type LogLevel, type LogWriter, Logger, type LoggerConfig, type LoggerOptions, type LoginOptions, type MediaKind, type MediaSource, type MemberActionState, MemoryCache, type MemoryCacheStats, type MentionTarget, type Message, type MessageButton, type MessageContent, type MessageContentKind, type MessageDeleted, type MessageEdited, type MessageKey, type MessageMedia, type MessagePayloadKind, type MessageProtocolKind, type MultiAccountOptions, type MultiAppEvent, type MultiAppHealth, MultiCommandRouter, type MultiLoadCommandsResult, type MultiLoginOptions, type MuteChangeResult, type MuteEnforcement, type MuteOptions, type MuteRecord, MuteService, type MuteStore, type NumberOption, ParsedCommandOptions, type ParticipantUpdateResult, type PollContent, type PresenceState, type QuickReplyButton, type QuotedMessage, type ReconnectOptions, type RegisteredCommand, type RemoveMuteResult, type ReplyOptions, type RepostMessageOptions, type RouterOptions, type SentMessage, SqliteMuteStore, type StickerContent, type StoredMute, type StringOption, type TextContent, User, type UserData, type UserOption, type VideoContent, WhaNextApp, WhaNextError, type WhaNextErrorCode, WhaNextMultiApp, type WhatsAppProvider, create, createMulti, defineCommand, defineCommandGroup, defineCommands, defineSubcommand, guards, isCommandGroup, loadCommands, option, toWhaNextError };

package/dist/index.js

@@ -2416,9 +2416,37 @@ import {
 } from "zapo-js";
 
 // src/provider/zapo/normalize-message.ts
+var GROUP_STATUS_PROTOCOL_KINDS = [
+  "groupStatusMessage",
+  "groupStatusMessageV2",
+  "groupStatusMentionMessage",
+  "groupMentionedMessage"
+];
+var PAYMENT_PROTOCOL_KINDS = [
+  "sendPaymentMessage",
+  "requestPaymentMessage",
+  "paymentInviteMessage",
+  "cancelPaymentRequestMessage",
+  "declinePaymentRequestMessage",
+  "invoiceMessage",
+  "paymentReminderMessage",
+  "splitPaymentMessage",
+  "splitPaymentUpdateMessage"
+];
+var CATALOG_PROTOCOL_KINDS = [
+  "productMessage",
+  "orderMessage"
+];
+var NATIVE_FLOW_PAYMENT_NAMES = /* @__PURE__ */ new Set([
+  "payment_info",
+  "review_and_pay"
+]);
+var MAX_NATIVE_FLOW_JSON_BYTES = 128 * 1024;
+var MAX_NATIVE_FLOW_DEPTH = 32;
+var MAX_NATIVE_FLOW_NODES = 4096;
 function unwrapZapoMessageContent(input) {
   if (!input) return void 0;
-  const nested = input.ephemeralMessage?.message ?? input.viewOnceMessage?.message ?? input.viewOnceMessageV2?.message ?? viewOnceV2ExtensionMessage(input) ?? input.deviceSentMessage?.message ?? input.documentWithCaptionMessage?.message ?? editedWrapperMessage(input);
+  const nested = input.ephemeralMessage?.message ?? input.viewOnceMessage?.message ?? input.viewOnceMessageV2?.message ?? viewOnceV2ExtensionMessage(input) ?? input.deviceSentMessage?.message ?? input.documentWithCaptionMessage?.message ?? editedWrapperMessage(input) ?? futureProofMessage(input, "groupStatusMessage") ?? futureProofMessage(input, "groupStatusMessageV2") ?? futureProofMessage(input, "groupStatusMentionMessage") ?? futureProofMessage(input, "groupMentionedMessage");
   return nested ? unwrapZapoMessageContent(nested) : input;
 }
 function editedWrapperMessage(input) {
@@ -2429,12 +2457,16 @@ function viewOnceV2ExtensionMessage(input) {
   const extension = input.viewOnceMessageV2Extension;
   return extension?.message ?? void 0;
 }
+function futureProofMessage(input, key) {
+  const wrapper = input[key];
+  return wrapper?.message ?? void 0;
+}
 function isZapoViewOnceContent(input) {
   if (!input) return false;
   if (input.viewOnceMessage?.message || input.viewOnceMessageV2?.message || viewOnceV2ExtensionMessage(input)) {
     return true;
   }
-  const nested = input.ephemeralMessage?.message ?? input.deviceSentMessage?.message ?? input.documentWithCaptionMessage?.message ?? editedWrapperMessage(input);
+  const nested = input.ephemeralMessage?.message ?? input.deviceSentMessage?.message ?? input.documentWithCaptionMessage?.message ?? editedWrapperMessage(input) ?? futureProofMessage(input, "groupStatusMessage") ?? futureProofMessage(input, "groupStatusMessageV2") ?? futureProofMessage(input, "groupStatusMentionMessage") ?? futureProofMessage(input, "groupMentionedMessage");
   return nested ? isZapoViewOnceContent(nested) : false;
 }
 function extractQuotedZapoMessage(input) {
@@ -2462,6 +2494,7 @@ function normalizeZapoMessage(input) {
   if (!chatId || !id || !event.message) {
     return void 0;
   }
+  const payloadInspection = inspectZapoPayload(event.message);
   const content = unwrapZapoMessageContent(event.message);
   if (!content) {
     return void 0;
@@ -2488,7 +2521,7 @@ function normalizeZapoMessage(input) {
   const mentionedUsers = mentionedIds.map((identity) => User.fromIdentities([identity]));
   const viewOnce = isZapoViewOnceContent(event.message);
   const media = getMedia(type, node, viewOnce);
-  const contentKind = getContentKind(type);
+  const contentKind = payloadInspection.payloadKinds.includes("payment_payload") || payloadInspection.payloadKinds.includes("payment_info_embedded") ? "payment" : getContentKind(type);
   const text = getText(content);
   const caption = getCaption(content);
   const quoted = getQuoted(context, chatId);
@@ -2510,6 +2543,12 @@ function normalizeZapoMessage(input) {
     hasMedia: media !== void 0,
     contentKind
   };
+  if (payloadInspection.protocolKinds.length > 0) {
+    message.protocolKinds = payloadInspection.protocolKinds;
+  }
+  if (payloadInspection.payloadKinds.length > 0) {
+    message.payloadKinds = payloadInspection.payloadKinds;
+  }
   if (senderJid !== void 0) message.senderJid = senderJid;
   if (senderLid !== void 0) {
     message.lid = senderLid;
@@ -2534,6 +2573,131 @@ function normalizeZapoKey(key) {
   }
   return normalized;
 }
+function inspectZapoPayload(input) {
+  const protocolKinds = /* @__PURE__ */ new Set();
+  const payloadKinds = /* @__PURE__ */ new Set();
+  inspectMessageLayer(input, protocolKinds, payloadKinds, 0);
+  return {
+    protocolKinds: [...protocolKinds],
+    payloadKinds: [...payloadKinds]
+  };
+}
+function inspectMessageLayer(input, protocolKinds, payloadKinds, depth) {
+  if (!input) return;
+  if (depth > 16) {
+    payloadKinds.add("malformed_payload");
+    return;
+  }
+  for (const kind of GROUP_STATUS_PROTOCOL_KINDS) {
+    if (input[kind] !== null && input[kind] !== void 0) {
+      protocolKinds.add(kind);
+      payloadKinds.add("group_status_payload");
+      if (!futureProofMessage(input, kind)) payloadKinds.add("malformed_payload");
+    }
+  }
+  for (const kind of PAYMENT_PROTOCOL_KINDS) {
+    if (input[kind] !== null && input[kind] !== void 0) {
+      protocolKinds.add(kind);
+      payloadKinds.add("payment_payload");
+    }
+  }
+  for (const kind of CATALOG_PROTOCOL_KINDS) {
+    if (input[kind] !== null && input[kind] !== void 0) {
+      protocolKinds.add(kind);
+      payloadKinds.add("catalog_message");
+    }
+  }
+  inspectNativeFlow(input, payloadKinds);
+  for (const nested of wrappedMessages(input)) {
+    inspectMessageLayer(nested, protocolKinds, payloadKinds, depth + 1);
+  }
+}
+function wrappedMessages(input) {
+  const messages = [
+    input.ephemeralMessage?.message,
+    input.viewOnceMessage?.message,
+    input.viewOnceMessageV2?.message,
+    viewOnceV2ExtensionMessage(input),
+    input.deviceSentMessage?.message,
+    input.documentWithCaptionMessage?.message,
+    editedWrapperMessage(input),
+    futureProofMessage(input, "groupStatusMessage"),
+    futureProofMessage(input, "groupStatusMessageV2"),
+    futureProofMessage(input, "groupStatusMentionMessage"),
+    futureProofMessage(input, "groupMentionedMessage")
+  ];
+  return messages.filter((message) => message !== null && message !== void 0);
+}
+function inspectNativeFlow(input, payloadKinds) {
+  const interactive = input.interactiveMessage;
+  const nativeFlow = interactive?.nativeFlowMessage;
+  if (nativeFlow) {
+    inspectNativeFlowJson(nativeFlow.messageParamsJson, payloadKinds);
+    for (const button of nativeFlow.buttons ?? []) {
+      if (button.name && NATIVE_FLOW_PAYMENT_NAMES.has(button.name)) {
+        payloadKinds.add("payment_info_embedded");
+      }
+      inspectNativeFlowJson(button.buttonParamsJson, payloadKinds);
+    }
+  }
+  const response = input.interactiveResponseMessage;
+  const nativeResponse = response?.nativeFlowResponseMessage;
+  if (nativeResponse?.name && NATIVE_FLOW_PAYMENT_NAMES.has(nativeResponse.name)) {
+    payloadKinds.add("payment_info_embedded");
+  }
+  inspectNativeFlowJson(nativeResponse?.paramsJson, payloadKinds);
+  const buttonsMessage = input.buttonsMessage;
+  for (const button of buttonsMessage?.buttons ?? []) {
+    const flow = button.nativeFlowInfo;
+    if (flow?.name && NATIVE_FLOW_PAYMENT_NAMES.has(flow.name)) {
+      payloadKinds.add("payment_info_embedded");
+    }
+    inspectNativeFlowJson(flow?.paramsJson, payloadKinds);
+  }
+}
+function inspectNativeFlowJson(json, payloadKinds) {
+  if (!json) return;
+  if (Buffer.byteLength(json, "utf8") > MAX_NATIVE_FLOW_JSON_BYTES) {
+    payloadKinds.add("native_flow_crash");
+    payloadKinds.add("malformed_payload");
+    return;
+  }
+  let parsed;
+  try {
+    parsed = JSON.parse(json);
+  } catch {
+    payloadKinds.add("malformed_payload");
+    return;
+  }
+  if (!isSafeNativeFlowJson(parsed)) {
+    payloadKinds.add("native_flow_crash");
+    payloadKinds.add("malformed_payload");
+  }
+}
+function isSafeNativeFlowJson(root) {
+  const queue = [{ value: root, depth: 0 }];
+  let nodes = 0;
+  while (queue.length > 0) {
+    const current = queue.shift();
+    if (!current) break;
+    nodes += 1;
+    if (nodes > MAX_NATIVE_FLOW_NODES || current.depth > MAX_NATIVE_FLOW_DEPTH) {
+      return false;
+    }
+    if (Array.isArray(current.value)) {
+      for (const value of current.value) {
+        queue.push({ value, depth: current.depth + 1 });
+      }
+      continue;
+    }
+    if (typeof current.value === "object" && current.value !== null) {
+      for (const value of Object.values(current.value)) {
+        queue.push({ value, depth: current.depth + 1 });
+      }
+    }
+  }
+  return true;
+}
 function contentNode(content) {
   const order = [
     "conversation",
@@ -2556,6 +2720,7 @@ function contentNode(content) {
     "pollCreationMessageV5",
     "productMessage",
     "orderMessage",
+    "interactiveMessage",
     "interactiveResponseMessage"
   ];
   const type = order.find((key) => content[key] !== null && content[key] !== void 0);
@@ -2568,6 +2733,7 @@ function getContentKind(type) {
     case "buttonsResponseMessage":
     case "listResponseMessage":
     case "templateButtonReplyMessage":
+    case "interactiveMessage":
     case "interactiveResponseMessage":
       return "text";
     case "imageMessage":
@@ -2599,7 +2765,11 @@ function getContentKind(type) {
   }
 }
 function getText(content) {
-  return content.conversation ?? content.extendedTextMessage?.text ?? content.buttonsResponseMessage?.selectedDisplayText ?? content.listResponseMessage?.title ?? content.templateButtonReplyMessage?.selectedDisplayText ?? content.pollCreationMessage?.name ?? content.pollCreationMessageV2?.name ?? content.pollCreationMessageV3?.name ?? content.pollCreationMessageV5?.name ?? getNativeFlowDisplayText(content) ?? void 0;
+  return content.conversation ?? content.extendedTextMessage?.text ?? content.buttonsResponseMessage?.selectedDisplayText ?? content.listResponseMessage?.title ?? content.templateButtonReplyMessage?.selectedDisplayText ?? content.pollCreationMessage?.name ?? content.pollCreationMessageV2?.name ?? content.pollCreationMessageV3?.name ?? content.pollCreationMessageV5?.name ?? interactiveMessageBodyText(content) ?? getNativeFlowDisplayText(content) ?? void 0;
+}
+function interactiveMessageBodyText(content) {
+  const interactive = content.interactiveMessage;
+  return interactive?.body?.text ?? void 0;
 }
 function getInteractiveResponse(content) {
   const buttons = content.buttonsResponseMessage;
@@ -2700,6 +2870,7 @@ function getMedia(type, node, wrapperViewOnce) {
 }
 function getQuoted(context, chatId) {
   if (!context?.stanzaId || !context.quotedMessage) return void 0;
+  const payloadInspection = inspectZapoPayload(context.quotedMessage);
   const content = unwrapZapoMessageContent(context.quotedMessage);
   if (!content) return void 0;
   const { type, node } = contentNode(content);
@@ -2714,8 +2885,14 @@ function getQuoted(context, chatId) {
     },
     hasMedia: media !== void 0,
     isViewOnce: media?.viewOnce ?? false,
-    contentKind: getContentKind(type)
+    contentKind: payloadInspection.payloadKinds.includes("payment_payload") || payloadInspection.payloadKinds.includes("payment_info_embedded") ? "payment" : getContentKind(type)
   };
+  if (payloadInspection.protocolKinds.length > 0) {
+    quoted.protocolKinds = payloadInspection.protocolKinds;
+  }
+  if (payloadInspection.payloadKinds.length > 0) {
+    quoted.payloadKinds = payloadInspection.payloadKinds;
+  }
   const text = getText(content) ?? getCaption(content);
   if (text !== void 0) quoted.text = text;
   if (senderId !== void 0) {
@@ -3112,13 +3289,6 @@ var ZapoProvider = class {
     client.on("message", (event) => {
       const protocol = this.#protocolMessage(event);
       if (protocol && this.#isMessageMutationProtocol(protocol.type)) {
-        if (protocol.type === proto.Message.ProtocolMessage.Type.MESSAGE_EDIT) {
-          this.#logEditDiagnostic("received_message_protocol_payload", {
-            eventMessageId: event.key.id ?? void 0,
-            targetMessageId: protocol.key?.id ?? void 0,
-            offline: event.offline === true
-          });
-        }
         this.#enqueueProtocolEvent({
           ...event,
           protocolMessage: protocol
@@ -3127,11 +3297,6 @@ var ZapoProvider = class {
       }
       const directEdit = this.#directEditedMessage(event.message);
       if (directEdit && event.key.id) {
-        this.#logEditDiagnostic("received_direct_edited_message", {
-          eventMessageId: event.key.id,
-          targetMessageId: event.key.id,
-          offline: event.offline === true
-        });
         this.#enqueueProtocolEvent({
           ...event,
           protocolMessage: {
@@ -3142,14 +3307,6 @@ var ZapoProvider = class {
         });
         return;
       }
-      const encryptedEdit = this.#encryptedEditInfo(event.message);
-      if (encryptedEdit) {
-        this.#logEditDiagnostic("received_encrypted_addon", {
-          eventMessageId: event.key.id ?? void 0,
-          targetMessageId: encryptedEdit.targetMessageId,
-          offline: event.offline === true
-        });
-      }
       this.#handleMessage(event);
     });
     client.on("message_send", (event) => {
@@ -3165,13 +3322,6 @@ var ZapoProvider = class {
       });
     });
     client.on("message_protocol", (event) => {
-      if (event.protocolMessage.type === proto.Message.ProtocolMessage.Type.MESSAGE_EDIT) {
-        this.#logEditDiagnostic("received_message_protocol_event", {
-          eventMessageId: event.key.id ?? void 0,
-          targetMessageId: event.protocolMessage.key?.id ?? void 0,
-          offline: event.offline === true
-        });
-      }
       this.#enqueueProtocolEvent(event);
     });
     client.on("message_addon", (event) => {
@@ -3229,29 +3379,10 @@ var ZapoProvider = class {
     const kind = event.kind ?? this.#stringField(decrypted, "kind") ?? this.#stringField(decrypted, "type");
     const isEdit = kind === "message_edit" || protocol?.type === proto.Message.ProtocolMessage.Type.MESSAGE_EDIT;
     if (!isEdit) return;
-    this.#logEditDiagnostic("received_decrypted_addon", {
-      eventMessageId: event.key.id ?? void 0,
-      targetMessageId: event.targetMessageId ?? this.#stringField(decrypted, "targetMessageId") ?? this.#stringField(decrypted, "targetMessageID") ?? protocol?.key?.id ?? void 0,
-      addonKind: kind ?? void 0,
-      offline: event.offline === true
-    });
     const targetMessageId = event.targetMessageId ?? this.#stringField(decrypted, "targetMessageId") ?? this.#stringField(decrypted, "targetMessageID") ?? protocol?.key?.id ?? void 0;
-    if (!targetMessageId) {
-      this.#logEditDiagnostic("dropped_addon_without_target", {
-        eventMessageId: event.key.id ?? void 0,
-        addonKind: kind ?? void 0
-      }, "warn");
-      return;
-    }
+    if (!targetMessageId) return;
     const editedMessage = protocol?.editedMessage ?? this.#addonEditedMessage(event.decrypted);
-    if (!editedMessage) {
-      this.#logEditDiagnostic("dropped_addon_without_edited_content", {
-        eventMessageId: event.key.id ?? void 0,
-        targetMessageId,
-        addonKind: kind ?? void 0
-      }, "warn");
-      return;
-    }
+    if (!editedMessage) return;
     const protocolKey = protocol?.key;
     const target = {
       ...protocolKey ?? {},
@@ -3334,24 +3465,6 @@ var ZapoProvider = class {
     const nested = message.ephemeralMessage?.message ?? message.deviceSentMessage?.message;
     return nested ? this.#directEditedMessage(nested) : void 0;
   }
-  #encryptedEditInfo(message) {
-    const content = unwrapZapoMessageContent(message);
-    const encrypted = content?.secretEncryptedMessage;
-    if (!encrypted) return void 0;
-    if (encrypted.secretEncType !== proto.Message.SecretEncryptedMessage.SecretEncType.MESSAGE_EDIT) {
-      return void 0;
-    }
-    return {
-      ...encrypted.targetMessageKey?.id ? { targetMessageId: encrypted.targetMessageKey.id } : {}
-    };
-  }
-  #logEditDiagnostic(stage, context, level = "info") {
-    this.#logger[level]("AntiEdit diagnostic", {
-      diagnostic: "antiedit",
-      stage,
-      ...context
-    });
-  }
   #protocolMessage(event) {
     if (event.protocolMessage) return event.protocolMessage;
     const content = unwrapZapoMessageContent(event.message);
@@ -3389,15 +3502,10 @@ var ZapoProvider = class {
     if (!protocol || !this.#isMessageMutationProtocol(protocol.type)) return;
     const protocolKey = protocol.key;
     if (!protocolKey?.id) {
-      const context = {
+      this.#logger.debug("Ignored Zapo protocol mutation without a target message id.", {
         messageId: event.key.id ?? void 0,
         protocolType: protocol.type ?? void 0
-      };
-      if (protocol.type === proto.Message.ProtocolMessage.Type.MESSAGE_EDIT) {
-        this.#logEditDiagnostic("dropped_protocol_without_target", context, "warn");
-      } else {
-        this.#logger.debug("Ignored Zapo protocol mutation without a target message id.", context);
-      }
+      });
       return;
     }
     const remoteJid = protocolKey.remoteJid ?? event.key.remoteJid;
@@ -3412,16 +3520,7 @@ var ZapoProvider = class {
     const stored = await this.#findStoredMessage(target);
     if (stored) target = this.#targetKeyFromStoredMessage(target, stored.key);
     if (!target.remoteJid && stored?.key.remoteJid) target.remoteJid = stored.key.remoteJid;
-    if (!target.remoteJid) {
-      if (protocol.type === proto.Message.ProtocolMessage.Type.MESSAGE_EDIT) {
-        this.#logEditDiagnostic("dropped_edit_without_chat", {
-          eventMessageId: event.key.id ?? void 0,
-          targetMessageId: target.id ?? void 0,
-          previousRecovered: stored !== void 0
-        }, "warn");
-      }
-      return;
-    }
+    if (!target.remoteJid) return;
     const type = protocol.type;
     const mutationKey = this.#protocolDeliveryKey(event, target, type);
     if (mutationKey && this.#handledProtocolStore.has(mutationKey)) {
@@ -3452,13 +3551,7 @@ var ZapoProvider = class {
       return;
     }
     const editedContent = protocol.editedMessage ? this.#unwrapEditedContent(protocol.editedMessage) : void 0;
-    if (!editedContent) {
-      this.#logEditDiagnostic("dropped_edit_without_content", {
-        eventMessageId: event.key.id ?? void 0,
-        targetMessageId: target.id ?? void 0
-      }, "warn");
-      return;
-    }
+    if (!editedContent) return;
     const pushName = event.pushName ?? stored?.pushName;
     const edited = {
       ...stored ?? {},
@@ -3471,31 +3564,18 @@ var ZapoProvider = class {
       ...pushName !== void 0 ? { pushName } : {}
     };
     const message = normalizeZapoMessage(edited);
-    if (!message) {
-      this.#logEditDiagnostic("dropped_edit_normalization_failed", {
-        eventMessageId: event.key.id ?? void 0,
-        targetMessageId: target.id ?? void 0,
-        previousRecovered: stored !== void 0
-      }, "warn");
-      return;
-    }
+    if (!message) return;
     const previous = stored ? normalizeZapoMessage(stored) : void 0;
     if (mutationKey) this.#rememberHandledProtocol(mutationKey);
     this.#remember(edited);
     const editedByMe = event.key.fromMe === true;
     const editedById = event.key.participant ?? event.key.participantAlt ?? (editedByMe ? this.getCurrentUserIds()[0] : event.key.remoteJid ?? void 0);
     if (!previous) {
-      this.#logEditDiagnostic("emitting_without_previous_message", {
+      this.#logger.debug("Zapo edit target was not present in the recent message cache.", {
         targetMessageId: target.id ?? void 0,
         chatId: target.remoteJid ?? void 0
-      }, "warn");
+      });
     }
-    this.#logEditDiagnostic("emitting_message_edited", {
-      eventMessageId: event.key.id ?? void 0,
-      targetMessageId: target.id ?? void 0,
-      previousRecovered: previous !== void 0,
-      editedByMe
-    });
     void this.#events.emit("messageEdited", {
       key: message.keys,
       ...previous ? { previous } : {},
@@ -4591,14 +4671,6 @@ var WhaNextZapoLogger = class _WhaNextZapoLogger {
     this.#logger.info(message, this.#merge(context));
   }
   warn(message, context) {
-    if (message.startsWith("addon parent message secret not found") && context?.kind === "message_edit") {
-      this.#logger.warn("AntiEdit diagnostic", {
-        diagnostic: "antiedit",
-        stage: "decrypt_failed_missing_parent_secret",
-        ...this.#merge(context)
-      });
-      return;
-    }
     this.#logger.warn(message, this.#merge(context));
   }
   error(message, context) {