@openclaw/whatsapp 2026.6.6 → 2026.6.8-beta.2

package/dist/{monitor-CXuZBVgk.js → monitor-Ggwn3FDi.js}

@@ -5,14 +5,14 @@ import { n as getWhatsAppRuntime } from "./runtime-BfAdAEYT.js";
 import { n as getStatusCode, r as getRegisteredWhatsAppConnectionController, t as formatError } from "./session-errors-CbsoQqoy.js";
 import { d as markdownToWhatsApp, f as resolveJidToE164, l as isSelfChatMode, n as normalizeE164, t as convertMarkdownTables$1, u as jidToE164 } from "./text-runtime-Dk37KYHj.js";
 import { n as cacheInboundMessageMeta, r as lookupInboundMessageMeta, t as buildQuotedMessageOptions } from "./quoted-message-CveINB35.js";
-import { c as logoutWeb, g as readWebSelfId, o as getWebAuthAgeMs, r as WhatsAppAuthUnstableError, v as readWebSelfIdentityForDecision } from "./auth-store-B2ZibndQ.js";
-import { a as getSelfIdentity, c as resolveComparableIdentity, i as getReplyContext, n as getMentionIdentities, o as getSenderIdentity, r as getPrimaryIdentityId, s as identitiesOverlap, t as getComparableIdentityValues } from "./identity-xoLLdqEv.js";
+import { c as logoutWeb, g as readWebSelfId, o as getWebAuthAgeMs, r as WhatsAppAuthUnstableError, v as readWebSelfIdentityForDecision } from "./auth-store-e9VzLZ-S.js";
+import { a as getSelfIdentity, c as resolveComparableIdentity, i as getReplyContext, n as getMentionIdentities, o as getSenderIdentity, r as getPrimaryIdentityId, s as identitiesOverlap, t as getComparableIdentityValues } from "./identity-Bupuq9vF.js";
 import { n as resolveWhatsAppGroupsConfigPath } from "./group-config-path-BGyzT9Lg.js";
-import { i as resolveWhatsAppInboundPolicy, r as resolveWhatsAppCommandAuthorized, t as checkInboundAccessControl } from "./access-control-C53zKYSN.js";
-import { _ as extractMediaPlaceholder, a as mayContainWhatsAppOutboundMention, b as hasInboundUserContent, c as DisconnectReason, d as normalizeMessageContent, f as resolveInboundMediaMimetype, g as extractLocationData, h as extractContextInfo, i as addWhatsAppOutboundMentionsToContent, l as downloadMediaMessage, m as extractContactContext, n as listWhatsAppSendResultMessageIds, o as resolveWhatsAppOutboundMentions, p as describeReplyContext, r as normalizeWhatsAppSendResult, s as addWhatsAppImagePreviewFields, t as createWebSendApi, u as isJidGroup, v as extractMentionedJids, y as extractText } from "./send-api-CFbAgIbn.js";
-import { a as resolveWhatsAppSocketTiming, r as waitForWaConnection, t as createWaSocket } from "./session-CoxlXm2K.js";
+import { i as resolveWhatsAppInboundPolicy, r as resolveWhatsAppCommandAuthorized, t as checkInboundAccessControl } from "./access-control-BKaMOvIk.js";
+import { _ as extractMediaPlaceholder, a as mayContainWhatsAppOutboundMention, b as hasInboundUserContent, c as DisconnectReason, d as normalizeMessageContent, f as resolveInboundMediaMimetype, g as extractLocationData, h as extractContextInfo, i as addWhatsAppOutboundMentionsToContent, l as downloadMediaMessage, m as extractContactContext, n as listWhatsAppSendResultMessageIds, o as resolveWhatsAppOutboundMentions, p as describeReplyContext, r as normalizeWhatsAppSendResult, s as addWhatsAppImagePreviewFields, t as createWebSendApi, u as isJidGroup, v as extractMentionedJids, y as extractText } from "./send-api-Cp9CUH5P.js";
+import { a as resolveWhatsAppSocketTiming, r as waitForWaConnection, t as createWaSocket } from "./session-BCKUPRkN.js";
 import { t as BufferJSON } from "./session.runtime-CyooSQvj.js";
-import { c as computeBackoff, d as resolveReconnectPolicy, f as sleepWithAbort, l as newConnectionId, n as WHATSAPP_WATCHDOG_TIMEOUT_ERROR, r as WhatsAppConnectionController, s as DEFAULT_RECONNECT_POLICY, u as resolveHeartbeatSeconds } from "./connection-controller-TvY2F126.js";
+import { c as computeBackoff, d as resolveReconnectPolicy, f as sleepWithAbort, l as newConnectionId, n as WHATSAPP_WATCHDOG_TIMEOUT_ERROR, r as WhatsAppConnectionController, s as DEFAULT_RECONNECT_POLICY, u as resolveHeartbeatSeconds } from "./connection-controller-BWBoVQr4.js";
 import { resolveAccountEntry } from "openclaw/plugin-sdk/account-core";
 import { normalizeLowercaseStringOrEmpty, normalizeStringEntries, uniqueStrings } from "openclaw/plugin-sdk/string-coerce-runtime";
 import { createChannelMessageReplyPipeline, createDurableInboundReceiveJournalFromQueue, createMessageReceiptFromOutboundResults, deliverInboundReplyWithMessageSendContext, resolveChannelMessageSourceReplyDeliveryMode } from "openclaw/plugin-sdk/channel-outbound";
@@ -47,11 +47,281 @@ import { getRuntimeConfig as getRuntimeConfig$1, getRuntimeConfigSourceSnapshot
 import { resolveChannelContextVisibilityMode } from "openclaw/plugin-sdk/context-visibility-runtime";
 import { buildMentionRegexes, implicitMentionKindWhen, normalizeMentionText, resolveInboundMentionDecision } from "openclaw/plugin-sdk/channel-mention-gating";
 import { createConnectedChannelStatusPatch, createTransportActivityStatusPatch } from "openclaw/plugin-sdk/gateway-runtime";
+import { ensureConfiguredBindingRouteReady, resolveConfiguredBindingRoute } from "openclaw/plugin-sdk/conversation-binding-runtime";
 import { resolveAgentIdentity, resolveIdentityNamePrefix as resolveIdentityNamePrefix$1 } from "openclaw/plugin-sdk/agent-runtime";
 import { normalizeGroupActivation, parseActivationCommand } from "openclaw/plugin-sdk/group-activation";
 import { createInternalHookEvent, deriveInboundMessageHookContext, fireAndForgetBoundedHook, toInternalMessageReceivedContext, toPluginMessageContext, toPluginMessageReceivedEvent, triggerInternalHook } from "openclaw/plugin-sdk/hook-runtime";
 import { getGlobalHookRunner } from "openclaw/plugin-sdk/plugin-runtime";
 import { resolveBatchedReplyThreadingPolicy } from "openclaw/plugin-sdk/reply-reference";
+//#region extensions/whatsapp/src/inbound/message-aliases.ts
+function normalizeQuoteSender(sender) {
+	if (!sender?.displayName && !sender?.jid && !sender?.e164) return;
+	return sender;
+}
+function buildQuoteFromFlatAliases(msg) {
+	if (msg.replyTo) return {
+		context: msg.replyTo,
+		id: msg.replyTo.id,
+		body: msg.replyTo.body,
+		sender: normalizeQuoteSender({
+			displayName: msg.replyTo.sender?.label ?? msg.replyToSender,
+			jid: msg.replyTo.sender?.jid ?? msg.replyToSenderJid,
+			e164: msg.replyTo.sender?.e164 ?? msg.replyToSenderE164
+		})
+	};
+	if (!msg.replyToId && !msg.replyToBody && !msg.replyToSender && !msg.replyToSenderJid && !msg.replyToSenderE164) return;
+	return {
+		id: msg.replyToId,
+		body: msg.replyToBody,
+		sender: normalizeQuoteSender({
+			displayName: msg.replyToSender,
+			jid: msg.replyToSenderJid,
+			e164: msg.replyToSenderE164
+		})
+	};
+}
+function buildGroupFromFlatAliases(msg) {
+	const mentionJids = msg.mentions ?? msg.mentionedJids;
+	if (!msg.groupSubject && !msg.groupParticipants?.length && !mentionJids?.length) return;
+	return {
+		subject: msg.groupSubject,
+		participants: msg.groupParticipants,
+		mentions: mentionJids?.length ? { jids: mentionJids } : void 0
+	};
+}
+function ensureQuote(msg) {
+	return msg.quote ??= {};
+}
+function ensureQuoteSender(msg) {
+	const quote = ensureQuote(msg);
+	return quote.sender ??= {};
+}
+function ensureGroup(msg) {
+	return msg.group ??= {};
+}
+function ensureGroupMentions(msg) {
+	const group = ensureGroup(msg);
+	return group.mentions ??= {};
+}
+function ensureMedia(msg) {
+	return msg.payload.media ??= {};
+}
+function setMediaField(msg, key, value) {
+	if (value === void 0 && !msg.payload.media) return;
+	ensureMedia(msg)[key] = value;
+}
+function defineDeprecatedAliasAccessors(msg, descriptors) {
+	Object.defineProperties(msg, Object.fromEntries(Object.entries(descriptors).map(([key, descriptor]) => [key, {
+		configurable: true,
+		enumerable: true,
+		get: descriptor.get,
+		set: descriptor.set
+	}])));
+	return msg;
+}
+function withDeprecatedWebInboundMessageFlatAliases(msg) {
+	return defineDeprecatedAliasAccessors(msg, {
+		id: {
+			get: () => msg.event.id,
+			set: (value) => msg.event.id = value
+		},
+		to: {
+			get: () => msg.platform.recipientJid,
+			set: (value) => msg.platform.recipientJid = value
+		},
+		body: {
+			get: () => msg.payload.body,
+			set: (value) => msg.payload.body = value
+		},
+		pushName: {
+			get: () => msg.platform.pushName,
+			set: (value) => msg.platform.pushName = value
+		},
+		timestamp: {
+			get: () => msg.event.timestamp,
+			set: (value) => msg.event.timestamp = value
+		},
+		chatId: {
+			get: () => msg.platform.chatJid,
+			set: (value) => msg.platform.chatJid = value
+		},
+		sender: {
+			get: () => msg.platform.sender,
+			set: (value) => msg.platform.sender = value
+		},
+		senderJid: {
+			get: () => msg.platform.senderJid,
+			set: (value) => msg.platform.senderJid = value
+		},
+		senderE164: {
+			get: () => msg.platform.senderE164,
+			set: (value) => msg.platform.senderE164 = value
+		},
+		senderName: {
+			get: () => msg.platform.senderName,
+			set: (value) => msg.platform.senderName = value
+		},
+		replyTo: {
+			get: () => msg.quote?.context,
+			set: (value) => ensureQuote(msg).context = value
+		},
+		replyToId: {
+			get: () => msg.quote?.id ?? msg.quote?.context?.id,
+			set: (value) => ensureQuote(msg).id = value
+		},
+		replyToBody: {
+			get: () => msg.quote?.body ?? msg.quote?.context?.body,
+			set: (value) => ensureQuote(msg).body = value
+		},
+		replyToSender: {
+			get: () => msg.quote?.context?.sender?.label ?? msg.quote?.sender?.displayName,
+			set: (value) => {
+				const sender = ensureQuoteSender(msg);
+				sender.displayName = value;
+				if (msg.quote?.context?.sender) msg.quote.context.sender.label = value;
+			}
+		},
+		replyToSenderJid: {
+			get: () => msg.quote?.context?.sender?.jid ?? msg.quote?.sender?.jid,
+			set: (value) => {
+				const jid = value;
+				ensureQuoteSender(msg).jid = jid;
+				if (msg.quote?.context?.sender) msg.quote.context.sender.jid = jid;
+			}
+		},
+		replyToSenderE164: {
+			get: () => msg.quote?.context?.sender?.e164 ?? msg.quote?.sender?.e164,
+			set: (value) => {
+				const e164 = value;
+				ensureQuoteSender(msg).e164 = e164;
+				if (msg.quote?.context?.sender) msg.quote.context.sender.e164 = e164;
+			}
+		},
+		groupSubject: {
+			get: () => msg.group?.subject,
+			set: (value) => ensureGroup(msg).subject = value
+		},
+		groupParticipants: {
+			get: () => msg.group?.participants,
+			set: (value) => ensureGroup(msg).participants = value
+		},
+		mentions: {
+			get: () => msg.group?.mentions?.jids,
+			set: (value) => ensureGroupMentions(msg).jids = value
+		},
+		mentionedJids: {
+			get: () => msg.group?.mentions?.jids,
+			set: (value) => ensureGroupMentions(msg).jids = value
+		},
+		self: {
+			get: () => msg.platform.self,
+			set: (value) => msg.platform.self = value
+		},
+		selfJid: {
+			get: () => msg.platform.selfJid,
+			set: (value) => msg.platform.selfJid = value
+		},
+		selfLid: {
+			get: () => msg.platform.selfLid,
+			set: (value) => msg.platform.selfLid = value
+		},
+		selfE164: {
+			get: () => msg.platform.selfE164,
+			set: (value) => msg.platform.selfE164 = value
+		},
+		fromMe: {
+			get: () => msg.platform.fromMe,
+			set: (value) => msg.platform.fromMe = value
+		},
+		location: {
+			get: () => msg.payload.location,
+			set: (value) => msg.payload.location = value
+		},
+		sendComposing: {
+			get: () => msg.platform.sendComposing,
+			set: (value) => msg.platform.sendComposing = value
+		},
+		reply: {
+			get: () => msg.platform.reply,
+			set: (value) => msg.platform.reply = value
+		},
+		sendMedia: {
+			get: () => msg.platform.sendMedia,
+			set: (value) => msg.platform.sendMedia = value
+		},
+		mediaPath: {
+			get: () => msg.payload.media?.path,
+			set: (value) => setMediaField(msg, "path", value)
+		},
+		mediaType: {
+			get: () => msg.payload.media?.type,
+			set: (value) => setMediaField(msg, "type", value)
+		},
+		mediaFileName: {
+			get: () => msg.payload.media?.fileName,
+			set: (value) => setMediaField(msg, "fileName", value)
+		},
+		mediaUrl: {
+			get: () => msg.payload.media?.url,
+			set: (value) => setMediaField(msg, "url", value)
+		},
+		untrustedStructuredContext: {
+			get: () => msg.payload.untrustedStructuredContext,
+			set: (value) => msg.payload.untrustedStructuredContext = value
+		},
+		isBatched: {
+			get: () => msg.event.isBatched,
+			set: (value) => msg.event.isBatched = value
+		}
+	});
+}
+function normalizeLegacyFlatWebInboundMessage(msg) {
+	const media = msg.mediaPath || msg.mediaType || msg.mediaFileName || msg.mediaUrl ? {
+		path: msg.mediaPath,
+		type: msg.mediaType,
+		fileName: msg.mediaFileName,
+		url: msg.mediaUrl
+	} : void 0;
+	return withDeprecatedWebInboundMessageFlatAliases({
+		...msg,
+		event: {
+			id: msg.id,
+			timestamp: msg.timestamp,
+			isBatched: msg.isBatched
+		},
+		payload: {
+			body: msg.body,
+			media,
+			location: msg.location,
+			untrustedStructuredContext: msg.untrustedStructuredContext
+		},
+		platform: {
+			chatJid: msg.chatId,
+			recipientJid: msg.to,
+			sender: msg.sender,
+			senderJid: msg.senderJid,
+			senderE164: msg.senderE164,
+			senderName: msg.senderName,
+			pushName: msg.pushName,
+			self: msg.self,
+			selfJid: msg.selfJid,
+			selfLid: msg.selfLid,
+			selfE164: msg.selfE164,
+			fromMe: msg.fromMe,
+			sendComposing: msg.sendComposing,
+			reply: msg.reply,
+			sendMedia: msg.sendMedia
+		},
+		quote: buildQuoteFromFlatAliases(msg),
+		group: buildGroupFromFlatAliases(msg)
+	});
+}
+function normalizeWebInboundMessage(msg) {
+	if (msg.event && msg.payload && msg.platform) return withDeprecatedWebInboundMessageFlatAliases(msg);
+	if (msg.event || msg.payload || msg.platform || msg.quote || msg.group) throw new Error("WhatsApp inbound messages must be either legacy flat or canonical nested; partial nested contexts are not supported.");
+	return normalizeLegacyFlatWebInboundMessage(msg);
+}
+//#endregion
 //#region extensions/whatsapp/src/inbound/dedupe.ts
 const RECENT_WEB_MESSAGE_TTL_MS = 20 * 6e4;
 const RECENT_WEB_MESSAGE_MAX = 5e3;
@@ -353,15 +623,15 @@ async function attachWebInboxToSocket(options) {
 	const pendingDebounceKeys = /* @__PURE__ */ new Set();
 	const activeInboundFlushes = /* @__PURE__ */ new Set();
 	const buildInboundDebounceKey = (msg) => {
-		const sender = msg.sender;
-		const senderKey = msg.chatType === "group" ? getPrimaryIdentityId(sender ?? null) ?? msg.senderJid ?? msg.senderE164 ?? msg.senderName ?? msg.from : msg.from;
+		const sender = msg.platform.sender;
+		const senderKey = msg.chatType === "group" ? getPrimaryIdentityId(sender ?? null) ?? msg.platform.senderJid ?? msg.platform.senderE164 ?? msg.platform.senderName ?? msg.from : msg.from;
 		if (!senderKey) return null;
-		const conversationKey = msg.chatType === "group" ? msg.chatId : msg.from;
+		const conversationKey = msg.chatType === "group" ? msg.platform.chatJid : msg.from;
 		return `${msg.accountId}:${conversationKey}:${senderKey}`;
 	};
 	const shouldDebounceInboundMessage = (msg) => options.shouldDebounce?.(msg) ?? true;
 	const orderDebouncedInboundEntries = (entries) => entries.toSorted((a, b) => {
-		const timestampDiff = (a.timestamp ?? 0) - (b.timestamp ?? 0);
+		const timestampDiff = (a.event.timestamp ?? 0) - (b.event.timestamp ?? 0);
 		if (timestampDiff !== 0) return timestampDiff;
 		return (a.receiveOrder ?? 0) - (b.receiveOrder ?? 0);
 	});
@@ -398,15 +668,28 @@ async function attachWebInboxToSocket(options) {
 						return;
 					}
 					const mentioned = /* @__PURE__ */ new Set();
-					for (const entry of orderedEntries) for (const jid of entry.mentions ?? entry.mentionedJids ?? []) mentioned.add(jid);
-					const combinedBody = orderedEntries.map((entry) => entry.body).filter(Boolean).join("\n");
-					const combinedMessage = {
+					for (const entry of orderedEntries) for (const jid of entry.group?.mentions?.jids ?? []) mentioned.add(jid);
+					const combinedBody = orderedEntries.map((entry) => entry.payload.body).filter(Boolean).join("\n");
+					const combinedMentions = mentioned.size > 0 ? {
+						...last.group?.mentions,
+						jids: Array.from(mentioned)
+					} : last.group?.mentions;
+					const combinedGroup = last.group || combinedMentions ? {
+						...last.group,
+						mentions: combinedMentions
+					} : void 0;
+					const combinedMessage = withDeprecatedWebInboundMessageFlatAliases({
 						...last,
-						body: combinedBody,
-						mentions: mentioned.size > 0 ? Array.from(mentioned) : void 0,
-						mentionedJids: mentioned.size > 0 ? Array.from(mentioned) : void 0,
-						isBatched: true
-					};
+						payload: {
+							...last.payload,
+							body: combinedBody
+						},
+						group: combinedGroup,
+						event: {
+							...last.event,
+							isBatched: true
+						}
+					});
 					await options.onMessage(combinedMessage);
 					await finalizeInboundDelivery(orderedEntries);
 				} catch (error) {
@@ -781,69 +1064,85 @@ async function attachWebInboxToSocket(options) {
 			mediaFileName: enriched.mediaFileName,
 			timestamp
 		}, "inbound message");
-		const inboundMessage = {
-			id: inbound.id,
+		const media = enriched.mediaPath || enriched.mediaType || enriched.mediaFileName ? {
+			path: enriched.mediaPath,
+			type: enriched.mediaType,
+			fileName: enriched.mediaFileName
+		} : void 0;
+		const groupMentions = mentionedJids ? { jids: mentionedJids } : void 0;
+		const group = inbound.group && (inbound.groupSubject || inbound.groupParticipants?.length || groupMentions) ? {
+			subject: inbound.groupSubject,
+			participants: inbound.groupParticipants,
+			mentions: groupMentions
+		} : void 0;
+		const inboundMessage = withDeprecatedWebInboundMessageFlatAliases({
+			event: {
+				id: inbound.id,
+				timestamp
+			},
+			payload: {
+				body: enriched.body,
+				location: enriched.location ?? void 0,
+				untrustedStructuredContext: enriched.contactContext ? [{
+					label: "WhatsApp contact",
+					source: "whatsapp",
+					type: enriched.contactContext.kind,
+					payload: enriched.contactContext
+				}] : void 0,
+				media
+			},
+			platform: {
+				chatJid: inbound.remoteJid,
+				recipientJid: self.e164 ?? "me",
+				pushName: senderName,
+				sender: resolveComparableIdentity({
+					jid: inbound.participantJid,
+					e164: inbound.senderE164 ?? void 0,
+					name: senderName
+				}),
+				senderJid: inbound.participantJid,
+				senderE164: inbound.senderE164 ?? void 0,
+				senderName,
+				self,
+				selfJid: self.jid ?? void 0,
+				selfLid: self.lid ?? void 0,
+				selfE164: self.e164 ?? void 0,
+				fromMe: Boolean(msg.key?.fromMe),
+				sendComposing,
+				reply,
+				sendMedia
+			},
 			from: inbound.from,
 			conversationId: inbound.from,
-			to: self.e164 ?? "me",
 			accountId: inbound.access.resolvedAccountId,
 			accessControlPassed: true,
-			body: enriched.body,
-			pushName: senderName,
-			timestamp,
 			chatType: inbound.group ? "group" : "direct",
-			chatId: inbound.remoteJid,
-			sender: resolveComparableIdentity({
-				jid: inbound.participantJid,
-				e164: inbound.senderE164 ?? void 0,
-				name: senderName
-			}),
-			senderJid: inbound.participantJid,
-			senderE164: inbound.senderE164 ?? void 0,
-			senderName,
-			replyTo: enriched.replyContext ?? void 0,
-			replyToId: enriched.replyContext?.id,
-			replyToBody: enriched.replyContext?.body,
-			replyToSender: enriched.replyContext?.sender?.label ?? void 0,
-			replyToSenderJid: enriched.replyContext?.sender?.jid ?? void 0,
-			replyToSenderE164: enriched.replyContext?.sender?.e164 ?? void 0,
-			groupSubject: inbound.groupSubject,
-			groupParticipants: inbound.groupParticipants,
-			mentions: mentionedJids ?? void 0,
-			mentionedJids: mentionedJids ?? void 0,
-			self,
-			selfJid: self.jid ?? void 0,
-			selfLid: self.lid ?? void 0,
-			selfE164: self.e164 ?? void 0,
-			fromMe: Boolean(msg.key?.fromMe),
-			location: enriched.location ?? void 0,
-			untrustedStructuredContext: enriched.contactContext ? [{
-				label: "WhatsApp contact",
-				source: "whatsapp",
-				type: enriched.contactContext.kind,
-				payload: enriched.contactContext
-			}] : void 0,
-			sendComposing,
-			reply,
-			sendMedia,
-			mediaPath: enriched.mediaPath,
-			mediaType: enriched.mediaType,
-			mediaFileName: enriched.mediaFileName,
+			quote: enriched.replyContext ? {
+				context: enriched.replyContext,
+				id: enriched.replyContext.id,
+				body: enriched.replyContext.body,
+				sender: {
+					displayName: enriched.replyContext.sender?.label ?? void 0,
+					jid: enriched.replyContext.sender?.jid ?? void 0,
+					e164: enriched.replyContext.sender?.e164 ?? void 0
+				}
+			} : void 0,
+			group,
 			dedupeKey: inbound.id ? `${options.accountId}:${inbound.remoteJid}:${inbound.id}` : void 0,
 			durableId: durable.durableId,
 			readReceipt: durable.readReceipt,
 			receiveOrder: durable.receiveOrder
-		};
+		});
 		const debounceKey = buildInboundDebounceKey(inboundMessage);
 		if (debounceKey) {
 			inboundMessage.debounceKey = debounceKey;
 			if (inboundDebounceMs > 0 && shouldDebounceInboundMessage(inboundMessage)) pendingDebounceKeys.add(debounceKey);
 		}
-		if (inboundMessage.id) cacheInboundMessageMeta(inboundMessage.accountId, inboundMessage.chatId, inboundMessage.id, {
-			participant: inboundMessage.senderJid,
-			participantE164: inboundMessage.chatType === "direct" ? inboundMessage.senderE164 : void 0,
-			body: inboundMessage.body,
-			fromMe: inboundMessage.fromMe
+		if (inboundMessage.event.id) cacheInboundMessageMeta(inboundMessage.accountId, inboundMessage.platform.chatJid, inboundMessage.event.id, {
+			participant: inboundMessage.platform.senderJid,
+			participantE164: inboundMessage.chatType === "direct" ? inboundMessage.platform.senderE164 : void 0,
+			body: inboundMessage.payload.body,
+			fromMe: inboundMessage.platform.fromMe
 		});
 		try {
 			Promise.resolve(debouncer.enqueue(inboundMessage)).catch((err) => {
@@ -1008,8 +1307,13 @@ async function monitorWebInbox(options) {
 		closeInboundMonitorSocket(sock);
 		throw err;
 	}
+	const shouldDebounce = options.shouldDebounce;
 	return attachWebInboxToSocket({
 		...options,
+		onMessage: async (msg) => {
+			await options.onMessage(normalizeWebInboundMessage(msg));
+		},
+		shouldDebounce: shouldDebounce ? (msg) => shouldDebounce(normalizeWebInboundMessage(msg)) : void 0,
 		sock
 	});
 }
@@ -1043,13 +1347,13 @@ function isBotMentionedFromTargets(msg, mentionCfg, targets) {
 		for (const mention of targets.normalizedMentions) if (identitiesOverlap(targets.self, mention)) return true;
 		return false;
 	} else if (hasMentions && isSelfChat) {}
-	const bodyClean = clean(msg.body);
+	const bodyClean = clean(msg.payload.body);
 	if (mentionCfg.mentionRegexes.some((re) => re.test(bodyClean))) return true;
 	if (targets.self.e164) {
 		const selfDigits = targets.self.e164.replace(/\D/g, "");
 		if (selfDigits) {
 			if (bodyClean.replace(/[^\d]/g, "").includes(selfDigits)) return true;
-			const bodyNoSpace = msg.body.replace(/[\s-]/g, "");
+			const bodyNoSpace = msg.payload.body.replace(/[\s-]/g, "");
 			if (new RegExp(`\\+?${selfDigits}`, "i").test(bodyNoSpace)) return true;
 		}
 	}
@@ -1061,13 +1365,13 @@ function debugMention(msg, mentionCfg, authDir) {
 		wasMentioned: isBotMentionedFromTargets(msg, mentionCfg, mentionTargets),
 		details: {
 			from: msg.from,
-			body: msg.body,
-			bodyClean: normalizeMentionText(msg.body),
-			mentionedJids: msg.mentions ?? msg.mentionedJids ?? null,
+			body: msg.payload.body,
+			bodyClean: normalizeMentionText(msg.payload.body),
+			mentionedJids: msg.group?.mentions?.jids ?? null,
 			normalizedMentionedJids: mentionTargets.normalizedMentions.length ? mentionTargets.normalizedMentions.map((identity) => getComparableIdentityValues(identity)) : null,
-			selfJid: msg.self?.jid ?? msg.selfJid ?? null,
-			selfLid: msg.self?.lid ?? msg.selfLid ?? null,
-			selfE164: msg.self?.e164 ?? msg.selfE164 ?? null,
+			selfJid: msg.platform.self?.jid ?? msg.platform.selfJid ?? null,
+			selfLid: msg.platform.self?.lid ?? msg.platform.selfLid ?? null,
+			selfE164: msg.platform.self?.e164 ?? msg.platform.selfE164 ?? null,
 			resolvedSelf: mentionTargets.self
 		}
 	};
@@ -1277,7 +1581,7 @@ async function resolveGroupActivationFor(params) {
 //#endregion
 //#region extensions/whatsapp/src/auto-reply/monitor/ack-reaction.ts
 async function maybeSendAckReaction(params) {
-	if (!params.msg.id) return null;
+	if (!params.msg.event.id) return null;
 	if (resolveWhatsAppReactionLevel({
 		cfg: params.cfg,
 		accountId: params.accountId
@@ -1309,8 +1613,8 @@ async function maybeSendAckReaction(params) {
 	});
 	if (!shouldSendReaction()) return null;
 	params.info({
-		chatId: params.msg.chatId,
-		messageId: params.msg.id,
+		chatId: params.msg.platform.chatJid,
+		messageId: params.msg.event.id,
 		emoji
 	}, "sending ack reaction");
 	const sender = getSenderIdentity(params.msg);
@@ -1323,15 +1627,15 @@ async function maybeSendAckReaction(params) {
 	};
 	return createAckReactionHandle({
 		ackReactionValue: emoji,
-		send: () => sendReactionWhatsApp(params.msg.chatId, params.msg.id, emoji, reactionOptions),
-		remove: () => sendReactionWhatsApp(params.msg.chatId, params.msg.id, "", reactionOptions),
+		send: () => sendReactionWhatsApp(params.msg.platform.chatJid, params.msg.event.id, emoji, reactionOptions),
+		remove: () => sendReactionWhatsApp(params.msg.platform.chatJid, params.msg.event.id, "", reactionOptions),
 		onSendError: (err) => {
 			params.warn({
 				error: formatError(err),
-				chatId: params.msg.chatId,
-				messageId: params.msg.id
+				chatId: params.msg.platform.chatJid,
+				messageId: params.msg.event.id
 			}, "failed to send ack reaction");
-			logVerbose(`WhatsApp ack reaction failed for chat ${params.msg.chatId}: ${formatError(err)}`);
+			logVerbose(`WhatsApp ack reaction failed for chat ${params.msg.platform.chatJid}: ${formatError(err)}`);
 		}
 	});
 }
@@ -1487,10 +1791,10 @@ function recordPendingGroupHistoryEntry(params) {
 		limit: params.groupHistoryLimit,
 		entry: {
 			sender,
-			body: params.body ?? params.msg.body,
-			timestamp: params.msg.timestamp,
-			id: params.msg.id,
-			senderJid: senderIdentity.jid ?? params.msg.senderJid
+			body: params.body ?? params.msg.payload.body,
+			timestamp: params.msg.event.timestamp,
+			id: params.msg.event.id,
+			senderJid: senderIdentity.jid ?? params.msg.platform.senderJid
 		}
 	});
 }
@@ -1545,9 +1849,12 @@ async function applyGroupGating(params) {
 	};
 	const mentionMsg = params.mentionText !== void 0 ? {
 		...params.msg,
-		body: params.mentionText
+		payload: {
+			...params.msg.payload,
+			body: params.mentionText
+		}
 	} : params.msg;
-	const commandBody = stripMentionsForCommand(mentionMsg.body, mentionConfig.mentionRegexes, self.e164);
+	const commandBody = stripMentionsForCommand(mentionMsg.payload.body, mentionConfig.mentionRegexes, self.e164);
 	const activationCommand = parseActivationCommand(commandBody);
 	const owner = isOwnerSender(baseMentionConfig, params.msg);
 	const shouldBypassMention = owner && hasControlCommand(commandBody, params.cfg);
@@ -1591,7 +1898,7 @@ async function applyGroupGating(params) {
 				needsMentionText: true
 			};
 		}
-		return skipGroupMessageAndStoreHistory(params, `Group message stored for context (no mention detected) in ${params.conversationId}: ${mentionMsg.body}`, params.mentionText);
+		return skipGroupMessageAndStoreHistory(params, `Group message stored for context (no mention detected) in ${params.conversationId}: ${mentionMsg.payload.body}`, params.mentionText);
 	}
 	return { shouldProcess: true };
 }
@@ -1659,6 +1966,21 @@ function elide(text, limit = 400) {
 	if (text.length <= limit) return text;
 	return `${text.slice(0, limit)}… (truncated ${text.length - limit} chars)`;
 }
+function markWhatsAppVisibleDeliveryError(error) {
+	if (typeof error === "object" && error !== null && !Array.isArray(error)) try {
+		Object.assign(error, {
+			sentBeforeError: true,
+			visibleReplySent: true
+		});
+		return error;
+	} catch {}
+	const visibleError = new Error("visible WhatsApp reply delivery failed", { cause: error });
+	Object.assign(visibleError, {
+		sentBeforeError: true,
+		visibleReplySent: true
+	});
+	return visibleError;
+}
 function isLikelyWhatsAppCryptoError(reason) {
 	const formatReason = (value) => {
 		if (value == null) return "";
@@ -1718,21 +2040,6 @@ function createWhatsAppReplyDeliveryReceipt(results) {
 		kind: resolveWhatsAppReceiptKind(results)
 	});
 }
-function markWhatsAppVisibleDeliveryError(error) {
-	if (typeof error === "object" && error !== null && !Array.isArray(error)) try {
-		Object.assign(error, {
-			sentBeforeError: true,
-			visibleReplySent: true
-		});
-		return error;
-	} catch {}
-	const visibleError = new Error("visible WhatsApp reply delivery failed", { cause: error });
-	Object.assign(visibleError, {
-		sentBeforeError: true,
-		visibleReplySent: true
-	});
-	return visibleError;
-}
 async function deliverWebReply(params) {
 	const { replyResult, msg, maxMediaBytes, textLimit, replyLogger, connectionId, skipLog } = params;
 	const replyStarted = Date.now();
@@ -1758,12 +2065,12 @@ async function deliverWebReply(params) {
 	const mediaList = normalizedReply.mediaUrls ?? [];
 	const getQuote = () => {
 		if (!replyResult.replyToId) return;
-		const cached = lookupInboundMessageMeta(msg.accountId, msg.chatId, replyResult.replyToId);
+		const cached = lookupInboundMessageMeta(msg.accountId, msg.platform.chatJid, replyResult.replyToId);
 		return buildQuotedMessageOptions({
 			messageId: replyResult.replyToId,
-			remoteJid: msg.chatId,
+			remoteJid: msg.platform.chatJid,
 			fromMe: cached?.fromMe ?? false,
-			participant: cached?.participant ?? (msg.chatType === "group" ? msg.senderJid : void 0),
+			participant: cached?.participant ?? (msg.chatType === "group" ? msg.platform.senderJid : void 0),
 			messageText: cached?.body ?? ""
 		});
 	};
@@ -1786,7 +2093,7 @@ async function deliverWebReply(params) {
 		for (const [index, chunk] of textChunks.entries()) {
 			const chunkStarted = Date.now();
 			const quote = getQuote();
-			rememberSendResult(await sendWithRetry(() => msg.reply(chunk, quote), "text"));
+			rememberSendResult(await sendWithRetry(() => msg.platform.reply(chunk, quote), "text"));
 			if (!skipLog) {
 				const durationMs = Date.now() - chunkStarted;
 				whatsappOutboundLog.debug(`Sent chunk ${index + 1}/${totalChunks} to ${msg.from} (${durationMs.toFixed(0)}ms)`);
@@ -1794,10 +2101,10 @@ async function deliverWebReply(params) {
 		}
 		const delivery = finishDelivery();
 		const logPayload = {
-			correlationId: msg.id ?? newConnectionId(),
+			correlationId: msg.event.id ?? newConnectionId(),
 			connectionId: connectionId ?? null,
 			to: msg.from,
-			from: msg.to,
+			from: msg.platform.recipientJid,
 			text: elide(replyResult.text, 240),
 			mediaUrl: null,
 			mediaSizeBytes: null,
@@ -1823,29 +2130,29 @@ async function deliverWebReply(params) {
 			}
 			if (media.kind === "image") {
 				const quote = getQuote();
-				rememberSendResult(await sendWithRetry(() => msg.sendMedia({
+				rememberSendResult(await sendWithRetry(() => msg.platform.sendMedia({
 					image: media.buffer,
 					caption,
 					mimetype: media.mimetype
 				}, quote), "media:image"));
 			} else if (media.kind === "audio") {
 				const quote = getQuote();
-				rememberSendResult(await sendWithRetry(() => msg.sendMedia({
+				rememberSendResult(await sendWithRetry(() => msg.platform.sendMedia({
 					audio: media.buffer,
 					ptt: true,
 					mimetype: media.mimetype
 				}, quote), "media:audio"));
-				if (caption) rememberSendResult(await sendWithRetry(() => msg.reply(caption, quote), "media:audio-text"));
+				if (caption) rememberSendResult(await sendWithRetry(() => msg.platform.reply(caption, quote), "media:audio-text"));
 			} else if (media.kind === "video") {
 				const quote = getQuote();
-				rememberSendResult(await sendWithRetry(() => msg.sendMedia({
+				rememberSendResult(await sendWithRetry(() => msg.platform.sendMedia({
 					video: media.buffer,
 					caption,
 					mimetype: media.mimetype
 				}, quote), "media:video"));
 			} else {
 				const quote = getQuote();
-				rememberSendResult(await sendWithRetry(() => msg.sendMedia({
+				rememberSendResult(await sendWithRetry(() => msg.platform.sendMedia({
 					document: media.buffer,
 					fileName: media.fileName,
 					caption,
@@ -1854,10 +2161,10 @@ async function deliverWebReply(params) {
 			}
 			whatsappOutboundLog.info(`Sent media reply to ${msg.from} (${(media.buffer.length / (1024 * 1024)).toFixed(2)}MB)`);
 			replyLogger.info({
-				correlationId: msg.id ?? newConnectionId(),
+				correlationId: msg.event.id ?? newConnectionId(),
 				connectionId: connectionId ?? null,
 				to: msg.from,
-				from: msg.to,
+				from: msg.platform.recipientJid,
 				text: caption ?? null,
 				mediaUrl,
 				mediaSizeBytes: media.buffer.length,
@@ -1875,17 +2182,17 @@ async function deliverWebReply(params) {
 			const fallbackText = [remainingText.shift() ?? caption ?? "", "⚠️ Media failed."].filter(Boolean).join("\n");
 			if (!fallbackText) return;
 			whatsappOutboundLog.warn(`Media skipped; sent text-only to ${msg.from}`);
-			rememberSendResult(await sendWithRetry(() => msg.reply(fallbackText, getQuote()), "media:fallback-text"));
+			rememberSendResult(await sendWithRetry(() => msg.platform.reply(fallbackText, getQuote()), "media:fallback-text"));
 		}
 	});
-	for (const chunk of remainingText) rememberSendResult(await sendWithRetry(() => msg.reply(chunk, getQuote()), "media:text"));
+	for (const chunk of remainingText) rememberSendResult(await sendWithRetry(() => msg.platform.reply(chunk, getQuote()), "media:text"));
 	return finishDelivery();
 }
 //#endregion
 //#region extensions/whatsapp/src/auto-reply/monitor/inbound-context.ts
 function isWhatsAppSupplementalSenderAllowed(params) {
 	if (params.allowFrom.includes("*")) return true;
-	const senderValues = new Set(getComparableIdentityValues(params.sender));
+	const senderValues = new Set(getComparableIdentityValues(resolveComparableIdentity(params.sender, params.authDir)));
 	if (senderValues.size === 0) return false;
 	for (const entry of params.allowFrom) {
 		const rawEntry = entry.trim();
@@ -1903,6 +2210,7 @@ function resolveVisibleWhatsAppGroupHistory(params) {
 		kind: "history",
 		isSenderAllowed: (entry) => isWhatsAppSupplementalSenderAllowed({
 			allowFrom: params.groupAllowFrom,
+			authDir: params.authDir,
 			sender: entry.senderJid ? { jid: entry.senderJid } : null
 		})
 	}).items;
@@ -1912,6 +2220,7 @@ function resolveVisibleWhatsAppReplyContext(params) {
 	if (!replyTo) return null;
 	const senderAllowed = params.msg.chatType !== "group" || params.groupPolicy !== "allowlist" ? true : isWhatsAppSupplementalSenderAllowed({
 		allowFrom: params.groupAllowFrom,
+		authDir: params.authDir,
 		sender: replyTo.sender
 	});
 	return filterChannelInboundQuoteContext(params.mode, {
@@ -1938,34 +2247,19 @@ function whatsAppReplyDeliveryVisibility(visibleReplySent) {
 function whatsAppReplyDeliveryVisibilityFromDurableResult(result) {
 	return whatsAppReplyDeliveryVisibility(result.visibleReplySent === true);
 }
-function markWhatsAppReplyDeliveryErrorVisible(error) {
-	if (typeof error === "object" && error !== null && !Array.isArray(error)) try {
-		Object.assign(error, {
-			sentBeforeError: true,
-			visibleReplySent: true
-		});
-		return error;
-	} catch {}
-	const visibleError = new Error("visible WhatsApp reply delivery failed", { cause: error });
-	Object.assign(visibleError, {
-		sentBeforeError: true,
-		visibleReplySent: true
-	});
-	return visibleError;
-}
 function markWhatsAppReplyDeliveryErrorVisibleAfterFlush(error, flushResult) {
-	return flushResult.delivered > 0 ? markWhatsAppReplyDeliveryErrorVisible(error) : error;
+	return flushResult.delivered > 0 ? markWhatsAppVisibleDeliveryError(error) : error;
 }
 function logWhatsAppReplyDeliveryError(params) {
 	params.replyLogger.error({
 		err: normalizeErrForLog(params.err),
 		replyKind: params.info.kind,
-		correlationId: params.msg.id ?? null,
+		correlationId: params.msg.event.id ?? null,
 		connectionId: params.connectionId,
 		conversationId: params.conversationId,
-		chatId: params.msg.chatId ?? null,
+		chatId: params.msg.platform.chatJid ?? null,
 		to: params.msg.from ?? null,
-		from: params.msg.to ?? null
+		from: params.msg.platform.recipientJid ?? null
 	}, "auto-reply delivery failed");
 }
 function resolveWhatsAppDisableBlockStreaming(cfg) {
@@ -2042,10 +2336,10 @@ async function buildWhatsAppInboundContext(params) {
 		})),
 		limit: params.groupHistory?.length ?? 1
 	}) : void 0;
-	const media = toInboundMediaFacts(params.msg.mediaPath || params.msg.mediaUrl ? [{
-		path: params.msg.mediaPath,
-		url: params.msg.mediaUrl ?? params.msg.mediaPath,
-		contentType: params.msg.mediaType
+	const media = toInboundMediaFacts(params.msg.payload.media?.path || params.msg.payload.media?.url ? [{
+		path: params.msg.payload.media?.path,
+		url: params.msg.payload.media?.url ?? params.msg.payload.media?.path,
+		contentType: params.msg.payload.media?.type
 	}] : void 0, { transcribed: (_entry, index) => params.mediaTranscribedIndexes?.includes(index) === true });
 	return buildChannelInboundEventContext({
 		channel: "whatsapp",
@@ -2057,11 +2351,11 @@ async function buildWhatsAppInboundContext(params) {
 				sender: params.visibleReplyTo.sender?.label ?? void 0
 			} : void 0,
 			groupSystemPrompt: params.groupSystemPrompt,
-			untrustedContext: params.msg.untrustedStructuredContext
+			untrustedContext: params.msg.payload.untrustedStructuredContext
 		},
 		media,
-		messageId: params.msg.id,
-		timestamp: params.msg.timestamp,
+		messageId: params.msg.event.id,
+		timestamp: params.msg.event.timestamp,
 		from: params.msg.from,
 		sender: {
 			id: params.sender.id ?? params.sender.e164,
@@ -2078,15 +2372,15 @@ async function buildWhatsAppInboundContext(params) {
 			routeSessionKey: params.route.sessionKey
 		},
 		reply: {
-			to: params.msg.to,
+			to: params.msg.platform.recipientJid,
 			originatingTo: params.msg.from
 		},
 		message: {
 			body: params.combinedBody,
-			bodyForAgent: params.bodyForAgent ?? params.msg.body,
+			bodyForAgent: params.bodyForAgent ?? params.msg.payload.body,
 			inboundHistory,
-			rawBody: params.rawBody ?? params.msg.body,
-			commandBody: params.commandBody ?? params.msg.body
+			rawBody: params.rawBody ?? params.msg.payload.body,
+			commandBody: params.commandBody ?? params.msg.payload.body
 		},
 		access: {
 			...params.msg.wasMentioned !== void 0 ? { mentions: {
@@ -2098,16 +2392,17 @@ async function buildWhatsAppInboundContext(params) {
 		commandTurn: params.commandTurn,
 		extra: {
 			Transcript: params.transcript,
-			GroupSubject: params.msg.groupSubject,
+			GroupSubject: params.msg.group?.subject,
 			GroupMembers: formatGroupMembers({
-				participants: params.msg.groupParticipants,
+				participants: params.msg.group?.participants,
 				roster: params.groupMemberRoster,
 				fallbackE164: params.sender.e164
 			}),
 			SenderE164: params.sender.e164,
 			CommandSource: params.commandSource ?? (params.commandTurn?.source === "native" || params.commandTurn?.source === "text" ? params.commandTurn.source : void 0),
 			ReplyThreading: params.replyThreading,
-			...params.msg.location ? toLocationContext(params.msg.location) : {}
+			SuppressMessageReceivedHooks: params.suppressMessageReceivedHooks,
+			...params.msg.payload.location ? toLocationContext(params.msg.payload.location) : {}
 		}
 	});
 }
@@ -2215,12 +2510,12 @@ async function dispatchWhatsAppBufferedReply(params) {
 			tableMode
 		})).providerAccepted) {
 			params.replyLogger.warn({
-				correlationId: params.msg.id ?? null,
+				correlationId: params.msg.event.id ?? null,
 				connectionId: params.connectionId,
 				conversationId: params.conversationId,
-				chatId: params.msg.chatId,
+				chatId: params.msg.platform.chatJid,
 				to: params.msg.from,
-				from: params.msg.to,
+				from: params.msg.platform.recipientJid,
 				replyKind: info.kind
 			}, "auto-reply was not accepted by WhatsApp provider");
 			return whatsAppReplyDeliveryVisibility(false);
@@ -2282,7 +2577,7 @@ async function dispatchWhatsAppBufferedReply(params) {
 							}
 						});
 						if (durable.status === "failed") {
-							if (durable.sentBeforeError === true) throw markWhatsAppReplyDeliveryErrorVisible(durable.error);
+							if (durable.sentBeforeError === true) throw markWhatsAppVisibleDeliveryError(durable.error);
 							throw durable.error;
 						}
 						if (durable.status === "handled_visible") {
@@ -2329,7 +2624,7 @@ async function dispatchWhatsAppBufferedReply(params) {
 				logWhatsAppMediaOnlyFlushResult(flushResult);
 				return whatsAppReplyDeliveryVisibility(flushResult.delivered > 0);
 			},
-			onReplyStart: params.msg.sendComposing,
+			onReplyStart: params.msg.platform.sendComposing,
 			...statusReactionController ? {
 				onCompactionStart: async () => {
 					await statusReactionController.setCompacting();
@@ -2429,11 +2724,13 @@ function resolveMessagePrefix(cfg, agentId, opts) {
 }
 //#endregion
 //#region extensions/whatsapp/src/auto-reply/monitor/message-line.ts
-function formatReplyContext(msg) {
-	const replyTo = getReplyContext(msg);
+function formatReplyTarget(replyTo) {
 	if (!replyTo?.body) return null;
 	return `[Replying to ${replyTo.sender?.label ?? replyTo.sender?.e164 ?? "unknown sender"}${replyTo.id ? ` id:${replyTo.id}` : ""}]\n${replyTo.body}\n[/Replying]`;
 }
+function formatReplyContext(msg) {
+	return formatReplyTarget(getReplyContext(msg));
+}
 function buildInboundLine(params) {
 	const { cfg, msg, agentId, previousTimestamp, envelope } = params;
 	const messagePrefix = resolveMessagePrefix(cfg, agentId, {
@@ -2441,13 +2738,13 @@ function buildInboundLine(params) {
 		hasAllowFrom: (cfg.channels?.whatsapp?.allowFrom?.length ?? 0) > 0
 	});
 	const prefixStr = messagePrefix ? `${messagePrefix} ` : "";
-	const replyContext = formatReplyContext(msg);
-	const baseLine = `${prefixStr}${msg.body}${replyContext ? `\n\n${replyContext}` : ""}`;
+	const replyContext = params.visibleReplyTo === void 0 ? formatReplyContext(msg) : formatReplyTarget(params.visibleReplyTo);
+	const baseLine = `${prefixStr}${msg.payload.body}${replyContext ? `\n\n${replyContext}` : ""}`;
 	const sender = getSenderIdentity(msg);
 	return formatInboundEnvelope({
 		channel: "WhatsApp",
 		from: msg.chatType === "group" ? msg.from : msg.from?.replace(/^whatsapp:/, ""),
-		timestamp: msg.timestamp,
+		timestamp: msg.event.timestamp,
 		body: baseLine,
 		chatType: msg.chatType,
 		sender: {
@@ -2457,13 +2754,13 @@ function buildInboundLine(params) {
 		},
 		previousTimestamp,
 		envelope,
-		fromMe: msg.fromMe
+		fromMe: msg.platform.fromMe
 	});
 }
 //#endregion
 //#region extensions/whatsapp/src/auto-reply/monitor/status-reaction.ts
 async function createWhatsAppStatusReactionController(params) {
-	if (!params.msg.id) return null;
+	if (!params.msg.event.id) return null;
 	const statusReactionsConfig = params.cfg.messages?.statusReactions;
 	if (statusReactionsConfig?.enabled !== true) return null;
 	if (resolveWhatsAppReactionLevel({
@@ -2504,8 +2801,8 @@ async function createWhatsAppStatusReactionController(params) {
 		...params.accountId ? { accountId: params.accountId } : {},
 		cfg: params.cfg
 	};
-	const chatId = params.msg.chatId;
-	const msgId = params.msg.id;
+	const chatId = params.msg.platform.chatJid;
+	const msgId = params.msg.event.id;
 	return createStatusReactionController({
 		enabled: true,
 		adapter: {
@@ -2584,15 +2881,15 @@ async function processMessage(params) {
 		sessionKey: params.route.sessionKey
 	});
 	let audioTranscript = params.preflightAudioTranscript ?? void 0;
-	const hasAudioBody = params.msg.mediaType?.startsWith("audio/") === true && params.msg.body === "<media:audio>";
-	if (params.preflightAudioTranscript === void 0 && hasAudioBody && params.msg.mediaPath) try {
+	const hasAudioBody = params.msg.payload.media?.type?.startsWith("audio/") === true && params.msg.payload.body === "<media:audio>";
+	if (params.preflightAudioTranscript === void 0 && hasAudioBody && params.msg.payload.media?.path) try {
 		const { transcribeFirstAudio } = await import("./audio-preflight.runtime-C_glQhZY.js");
 		audioTranscript = await transcribeFirstAudio({
 			ctx: {
-				MediaPaths: [params.msg.mediaPath],
-				MediaTypes: params.msg.mediaType ? [params.msg.mediaType] : void 0,
+				MediaPaths: [params.msg.payload.media?.path],
+				MediaTypes: params.msg.payload.media?.type ? [params.msg.payload.media?.type] : void 0,
 				From: params.msg.from,
-				To: params.msg.to,
+				To: params.msg.platform.recipientJid,
 				Provider: "whatsapp",
 				Surface: "whatsapp",
 				OriginatingChannel: "whatsapp",
@@ -2606,21 +2903,33 @@ async function processMessage(params) {
 	}
 	const msgForAgent = audioTranscript !== void 0 ? {
 		...params.msg,
-		body: audioTranscript
+		payload: {
+			...params.msg.payload,
+			body: audioTranscript
+		}
 	} : params.msg;
+	const visibleReplyTo = resolveVisibleWhatsAppReplyContext({
+		msg: params.msg,
+		authDir: account.authDir,
+		mode: contextVisibilityMode,
+		groupPolicy: inboundPolicy.groupPolicy,
+		groupAllowFrom: inboundPolicy.groupAllowFrom
+	});
 	let combinedBody = buildInboundLine({
 		cfg: params.cfg,
 		msg: msgForAgent,
 		agentId: params.route.agentId,
 		previousTimestamp,
-		envelope: envelopeOptions
+		envelope: envelopeOptions,
+		visibleReplyTo
 	});
 	let shouldClearGroupHistory = false;
 	const visibleGroupHistory = params.msg.chatType === "group" ? resolveVisibleWhatsAppGroupHistory({
 		history: params.groupHistory ?? params.groupHistories.get(params.groupHistoryKey) ?? [],
 		mode: contextVisibilityMode,
 		groupPolicy: inboundPolicy.groupPolicy,
-		groupAllowFrom: inboundPolicy.groupAllowFrom
+		groupAllowFrom: inboundPolicy.groupAllowFrom,
+		authDir: account.authDir
 	}) : void 0;
 	if (params.msg.chatType === "group") {
 		const history = visibleGroupHistory ?? [];
@@ -2677,35 +2986,28 @@ async function processMessage(params) {
 		info: params.replyLogger.info.bind(params.replyLogger),
 		warn: params.replyLogger.warn.bind(params.replyLogger)
 	});
-	const correlationId = params.msg.id ?? newConnectionId();
+	const correlationId = params.msg.event.id ?? newConnectionId();
 	params.replyLogger.info({
 		connectionId: params.connectionId,
 		correlationId,
 		from: params.msg.chatType === "group" ? conversationId : params.msg.from,
-		to: params.msg.to,
+		to: params.msg.platform.recipientJid,
 		body: elide(combinedBody, 240),
-		mediaType: params.msg.mediaType ?? null,
-		mediaPath: params.msg.mediaPath ?? null
+		mediaType: params.msg.payload.media?.type ?? null,
+		mediaPath: params.msg.payload.media?.path ?? null
 	}, "inbound web message");
 	const fromDisplay = params.msg.chatType === "group" ? conversationId : params.msg.from;
-	const kindLabel = params.msg.mediaType ? `, ${params.msg.mediaType}` : "";
-	whatsappInboundLog.info(`Inbound message ${fromDisplay} -> ${params.msg.to} (${params.msg.chatType}${kindLabel}, ${combinedBody.length} chars)`);
+	const kindLabel = params.msg.payload.media?.type ? `, ${params.msg.payload.media?.type}` : "";
+	whatsappInboundLog.info(`Inbound message ${fromDisplay} -> ${params.msg.platform.recipientJid} (${params.msg.chatType}${kindLabel}, ${combinedBody.length} chars)`);
 	if (shouldLogVerbose$1()) whatsappInboundLog.debug(`Inbound body: ${elide(combinedBody, 400)}`);
 	const sender = getSenderIdentity(params.msg);
-	const visibleReplyTo = resolveVisibleWhatsAppReplyContext({
-		msg: params.msg,
-		authDir: account.authDir,
-		mode: contextVisibilityMode,
-		groupPolicy: inboundPolicy.groupPolicy,
-		groupAllowFrom: inboundPolicy.groupAllowFrom
-	});
 	const dmRouteTarget = resolveWhatsAppDmRouteTarget({
 		msg: params.msg,
 		senderE164: sender.e164 ?? void 0,
 		normalizeE164
 	});
-	const shouldCheckCommandAuth = shouldComputeCommandAuthorized(params.msg.body, params.cfg);
-	const isTextCommand = isControlCommandMessage$1(params.msg.body, params.cfg);
+	const shouldCheckCommandAuth = shouldComputeCommandAuthorized(params.msg.payload.body, params.cfg);
+	const isTextCommand = isControlCommandMessage$1(params.msg.payload.body, params.cfg);
 	const commandAuthorized = shouldCheckCommandAuth ? await resolveWhatsAppCommandAuthorized({
 		cfg: params.cfg,
 		msg: params.msg,
@@ -2715,12 +3017,12 @@ async function processMessage(params) {
 		kind: "text-slash",
 		source: "text",
 		authorized: Boolean(commandAuthorized),
-		body: params.msg.body
+		body: params.msg.payload.body
 	} : {
 		kind: "normal",
 		source: "message",
 		authorized: false,
-		body: params.msg.body
+		body: params.msg.payload.body
 	};
 	const { onModelSelected, ...replyPipeline } = createChannelMessageReplyPipeline({
 		cfg: params.cfg,
@@ -2734,7 +3036,7 @@ async function processMessage(params) {
 		isSelfChat: params.msg.chatType !== "group" && inboundPolicy.isSelfChat,
 		pipelineResponsePrefix: replyPipeline.responsePrefix
 	});
-	const replyThreading = resolveBatchedReplyThreadingPolicy(account.replyToMode ?? "off", params.msg.isBatched === true);
+	const replyThreading = resolveBatchedReplyThreadingPolicy(account.replyToMode ?? "off", params.msg.event.isBatched === true);
 	const conversationSystemPrompt = params.msg.chatType === "group" ? resolveWhatsAppGroupSystemPrompt({
 		accountConfig: account,
 		groupId: conversationId
@@ -2743,9 +3045,9 @@ async function processMessage(params) {
 		peerId: dmRouteTarget ?? params.msg.from
 	});
 	const ctxPayload = await buildWhatsAppInboundContext({
-		bodyForAgent: msgForAgent.body,
+		bodyForAgent: msgForAgent.payload.body,
 		combinedBody,
-		commandBody: params.msg.body,
+		commandBody: params.msg.payload.body,
 		commandAuthorized,
 		commandTurn,
 		conversationId,
@@ -2753,7 +3055,7 @@ async function processMessage(params) {
 		groupMemberRoster: params.groupMemberNames.get(params.groupHistoryKey),
 		groupSystemPrompt: conversationSystemPrompt,
 		msg: params.msg,
-		rawBody: params.msg.body,
+		rawBody: params.msg.payload.body,
 		route: params.route,
 		sender: {
 			id: getPrimaryIdentityId(sender) ?? void 0,
@@ -2763,7 +3065,8 @@ async function processMessage(params) {
 		...audioTranscript !== void 0 ? { transcript: audioTranscript } : {},
 		...audioTranscript !== void 0 ? { mediaTranscribedIndexes: [0] } : {},
 		replyThreading,
-		visibleReplyTo: visibleReplyTo ?? void 0
+		visibleReplyTo: visibleReplyTo ?? void 0,
+		suppressMessageReceivedHooks: true
 	});
 	emitWhatsAppMessageReceivedHooksIfEnabled({
 		cfg: params.cfg,
@@ -2791,8 +3094,8 @@ async function processMessage(params) {
 		raw: params.msg,
 		adapter: {
 			ingest: () => ({
-				id: params.msg.id ?? `${conversationId}:${Date.now()}`,
-				timestamp: params.msg.timestamp,
+				id: params.msg.event.id ?? `${conversationId}:${Date.now()}`,
+				timestamp: params.msg.event.timestamp,
 				rawText: ctxPayload.RawBody ?? "",
 				textForAgent: ctxPayload.BodyForAgent,
 				textForCommands: ctxPayload.CommandBody,
@@ -2851,7 +3154,7 @@ async function processMessage(params) {
 			logAckFailure({
 				log: logVerbose$1,
 				channel: "whatsapp",
-				target: `${params.msg.chatId ?? conversationId}/${params.msg.id ?? "unknown"}`,
+				target: `${params.msg.platform.chatJid ?? conversationId}/${params.msg.event.id ?? "unknown"}`,
 				error: err
 			});
 		}
@@ -2861,6 +3164,22 @@ async function processMessage(params) {
 //#endregion
 //#region extensions/whatsapp/src/auto-reply/monitor/on-message.ts
 function createWebOnMessageHandler(params) {
+	const withDirectSenderPeer = (msg, peerId) => {
+		if (msg.chatType === "group" || msg.platform.sender?.e164 || msg.platform.senderE164 || !peerId.startsWith("+")) return msg;
+		const normalized = normalizeE164(peerId);
+		if (!normalized) return msg;
+		return withDeprecatedWebInboundMessageFlatAliases({
+			...msg,
+			platform: {
+				...msg.platform,
+				sender: {
+					...msg.platform.sender,
+					e164: normalized
+				},
+				senderE164: normalized
+			}
+		});
+	};
 	const processForRoute = async (cfg, msg, route, groupHistoryKey, opts) => {
 		const processParams = {
 			cfg,
@@ -2888,10 +3207,12 @@ function createWebOnMessageHandler(params) {
 		if (opts?.statusReactionController !== void 0) processParams.statusReactionController = opts.statusReactionController;
 		return processMessage(processParams);
 	};
-	return async (msg) => {
+	return async (rawMsg) => {
+		const normalizedMsg = normalizeWebInboundMessage(rawMsg);
 		const cfg = params.loadConfig?.() ?? params.cfg;
+		const peerId = resolvePeerId(normalizedMsg);
+		const msg = withDirectSenderPeer(normalizedMsg, peerId);
 		const conversationId = msg.conversationId ?? msg.from;
-		const peerId = resolvePeerId(msg);
 		const baseRoute = resolveAgentRoute({
 			cfg,
 			channel: "whatsapp",
@@ -2901,32 +3222,54 @@ function createWebOnMessageHandler(params) {
 				id: peerId
 			}
 		});
-		const route = msg.chatType === "group" ? resolveWhatsAppGroupSessionRoute(baseRoute) : baseRoute;
-		const groupHistoryKey = msg.chatType === "group" ? buildGroupHistoryKey({
-			channel: "whatsapp",
-			accountId: route.accountId,
-			peerKind: "group",
-			peerId
-		}) : route.sessionKey;
+		const baseConversationRoute = msg.chatType === "group" ? resolveWhatsAppGroupSessionRoute(baseRoute) : baseRoute;
+		const routeAccountId = baseConversationRoute.accountId ?? msg.accountId ?? params.account.accountId ?? "default";
 		const account = resolveWhatsAppAccount({
 			cfg,
-			accountId: route.accountId ?? msg.accountId ?? params.account.accountId
+			accountId: routeAccountId
 		});
 		const baseMentionConfig = buildMentionConfig(cfg);
-		if (msg.from === msg.to) logVerbose(`📱 Same-phone mode detected (from === to: ${msg.from})`);
-		if (params.echoTracker.has(msg.body)) {
+		if (msg.from === msg.platform.recipientJid) logVerbose(`📱 Same-phone mode detected (from === to: ${msg.from})`);
+		if (params.echoTracker.has(msg.payload.body)) {
 			logVerbose("Skipping auto-reply: detected echo (message matches recently sent text)");
-			params.echoTracker.forget(msg.body);
+			params.echoTracker.forget(msg.payload.body);
 			return;
 		}
+		const configuredRoute = resolveConfiguredBindingRoute({
+			cfg,
+			route: baseConversationRoute,
+			channel: "whatsapp",
+			accountId: routeAccountId,
+			conversationId: peerId
+		});
+		const route = configuredRoute.route;
+		const groupHistoryKey = msg.chatType === "group" ? buildGroupHistoryKey({
+			channel: "whatsapp",
+			accountId: route.accountId,
+			peerKind: "group",
+			peerId
+		}) : route.sessionKey;
 		let preflightAudioTranscript;
-		const hasAudioBody = msg.mediaType?.startsWith("audio/") === true && msg.body === "<media:audio>";
+		const hasAudioBody = msg.payload.media?.type?.startsWith("audio/") === true && msg.payload.body === "<media:audio>";
 		const canRunEarlyAudioPreflight = msg.chatType === "group" || msg.accessControlPassed === true;
 		let ackAlreadySent = false;
 		let ackReaction = null;
 		let statusReactionController = null;
+		let recordAcceptedConfiguredGroupRoute = null;
+		const clearPreDispatchReaction = async () => {
+			try {
+				if (statusReactionController) {
+					statusReactionController.cancelPending();
+					await statusReactionController.clear();
+					return;
+				}
+				if (ackReaction && await ackReaction.ackReactionPromise) await ackReaction.remove();
+			} catch (err) {
+				params.replyLogger.warn({ error: String(err) }, "whatsapp: failed to clear pre-dispatch reaction after configured ACP readiness failure");
+			}
+		};
 		const runAudioPreflightOnce = async () => {
-			if (preflightAudioTranscript !== void 0 || !canRunEarlyAudioPreflight || !hasAudioBody || !msg.mediaPath) return;
+			if (preflightAudioTranscript !== void 0 || !canRunEarlyAudioPreflight || !hasAudioBody || !msg.payload.media?.path) return;
 			if (cfg.messages?.statusReactions?.enabled === true) {
 				statusReactionController = await createWhatsAppStatusReactionController({
 					cfg,
@@ -2956,10 +3299,10 @@ function createWebOnMessageHandler(params) {
 				const { transcribeFirstAudio } = await import("./audio-preflight.runtime-C_glQhZY.js");
 				preflightAudioTranscript = await transcribeFirstAudio({
 					ctx: {
-						MediaPaths: [msg.mediaPath],
-						MediaTypes: msg.mediaType ? [msg.mediaType] : void 0,
+						MediaPaths: [msg.payload.media?.path],
+						MediaTypes: msg.payload.media?.type ? [msg.payload.media?.type] : void 0,
 						From: msg.from,
-						To: msg.to,
+						To: msg.platform.recipientJid,
 						Provider: "whatsapp",
 						Surface: "whatsapp",
 						OriginatingChannel: "whatsapp",
@@ -2976,12 +3319,12 @@ function createWebOnMessageHandler(params) {
 			const sender = getSenderIdentity(msg);
 			const metaCtx = {
 				From: msg.from,
-				To: msg.to,
+				To: msg.platform.recipientJid,
 				SessionKey: route.sessionKey,
 				AccountId: route.accountId,
 				ChatType: msg.chatType,
 				ConversationLabel: conversationId,
-				GroupSubject: msg.groupSubject,
+				GroupSubject: msg.group?.subject,
 				SenderName: sender.name ?? void 0,
 				SenderId: getPrimaryIdentityId(sender) ?? void 0,
 				SenderE164: sender.e164 ?? void 0,
@@ -2990,7 +3333,7 @@ function createWebOnMessageHandler(params) {
 				OriginatingChannel: "whatsapp",
 				OriginatingTo: conversationId
 			};
-			updateLastRouteInBackground({
+			const recordGroupRoute = () => updateLastRouteInBackground({
 				cfg,
 				backgroundTasks: params.backgroundTasks,
 				storeAgentId: route.agentId,
@@ -3001,10 +3344,12 @@ function createWebOnMessageHandler(params) {
 				ctx: metaCtx,
 				warn: params.replyLogger.warn.bind(params.replyLogger)
 			});
+			if (configuredRoute.bindingResolution) recordAcceptedConfiguredGroupRoute = recordGroupRoute;
+			else recordGroupRoute();
 			let gating = await applyGroupGating({
 				cfg,
 				msg,
-				deferMissingMention: hasAudioBody && Boolean(msg.mediaPath),
+				deferMissingMention: hasAudioBody && Boolean(msg.payload.media?.path),
 				conversationId,
 				groupHistoryKey,
 				agentId: route.agentId,
@@ -3041,18 +3386,21 @@ function createWebOnMessageHandler(params) {
 				});
 			}
 			if (!gating.shouldProcess) return;
-		} else if (!msg.sender?.e164 && !msg.senderE164 && peerId && peerId.startsWith("+")) {
-			const normalized = normalizeE164(peerId);
-			if (normalized) {
-				msg.sender = {
-					...msg.sender,
-					e164: normalized
-				};
-				msg.senderE164 = normalized;
+		}
+		if (configuredRoute.bindingResolution) {
+			const ensured = await ensureConfiguredBindingRouteReady({
+				cfg,
+				bindingResolution: configuredRoute.bindingResolution
+			});
+			if (!ensured.ok) {
+				params.replyLogger.warn(`whatsapp: configured ACP binding unavailable for conversation ${configuredRoute.bindingResolution.record.conversation.conversationId}: ${ensured.error}`);
+				await clearPreDispatchReaction();
+				return;
 			}
 		}
+		recordAcceptedConfiguredGroupRoute?.();
 		await runAudioPreflightOnce();
-		if (await maybeBroadcastMessage({
+		if (!configuredRoute.bindingResolution && await maybeBroadcastMessage({
 			cfg,
 			msg,
 			peerId,
@@ -3237,10 +3585,11 @@ async function monitorWebChannel(verbose, listenerFactory = attachWebInboxToSock
 				})
 			});
 			const shouldDebounce = (msg) => {
-				if (msg.mediaPath || msg.mediaType) return false;
-				if (msg.location) return false;
-				if (msg.replyToId || msg.replyToBody) return false;
-				return !isControlCommandMessage(msg.body, cfg);
+				const normalized = normalizeWebInboundMessage(msg);
+				if (normalized.payload.media?.path || normalized.payload.media?.type) return false;
+				if (normalized.payload.location) return false;
+				if (normalized.quote?.id || normalized.quote?.body) return false;
+				return !isControlCommandMessage(normalized.payload.body, cfg);
 			};
 			let connection;
 			try {
@@ -3280,10 +3629,11 @@ async function monitorWebChannel(verbose, listenerFactory = attachWebInboxToSock
 							disconnectRetryAbortSignal: controller.getDisconnectRetryAbortSignal(),
 							groupMetadataCache,
 							onMessage: async (msg) => {
+								const normalized = normalizeWebInboundMessage(msg);
 								const inboundAt = Date.now();
 								controller.noteInbound(inboundAt);
 								statusController.noteInbound(inboundAt);
-								await onMessage(msg);
+								await onMessage(normalized);
 							},
 							sock
 						});