@openclaw/whatsapp 2026.9.1-beta.1 → 2026.9.2

package/dist/{monitor-C_Nw23PZ.js → monitor-Bc6DC5jl.js}

@@ -1,23 +1,23 @@
-import { a as resolveWhatsAppAccount, s as resolveWhatsAppMediaMaxBytes } from "./accounts-BX2fZUyR.js";
-import { c as normalizeWhatsAppPayloadTextPreservingIndentation, d as listWhatsAppSendResultMessageIds, f as mergeWhatsAppAcceptedSendError, g as withWhatsAppLogicalDeliveryActivity, h as rememberWhatsAppPartialSend, l as prepareWhatsAppOutboundMedia, m as rememberWhatsAppAcceptedSend, o as normalizeWhatsAppOutboundPayload, p as normalizeWhatsAppSendResult, r as sendReactionWhatsApp, v as resolveWhatsAppReactionLevel } from "./send-DLMUc2uZ.js";
+import { a as resolveWhatsAppAccount, s as resolveWhatsAppMediaMaxBytes } from "./accounts-CiKHiuEe.js";
+import { c as normalizeWhatsAppPayloadTextPreservingIndentation, d as listWhatsAppSendResultMessageIds, f as mergeWhatsAppAcceptedSendError, g as withWhatsAppLogicalDeliveryActivity, h as rememberWhatsAppPartialSend, l as prepareWhatsAppOutboundMedia, m as rememberWhatsAppAcceptedSend, o as normalizeWhatsAppOutboundPayload, p as normalizeWhatsAppSendResult, r as sendReactionWhatsApp, v as resolveWhatsAppReactionLevel } from "./send-BDDGPxav.js";
 import { i as getWhatsAppRuntime } from "./runtime-BLlToOi6.js";
 import { r as getWhatsAppConnectionController } from "./connection-controller-runtime-context-DG0tuYuw.js";
-import { a as markdownToWhatsAppChunks, c as toWhatsappJid, l as toWhatsappJidWithLid, n as isSelfChatMode, o as resolveEquivalentWhatsAppDirectChatJids, r as jidToE164, s as resolveJidToE164 } from "./targets-runtime-TMk0lGuy.js";
-import { t as normalizeE164 } from "./text-runtime-CaKLhowd.js";
-import { a as cacheInboundMessageMeta, i as buildQuotedMessageOptions, n as resolveWhatsAppGroupSessionRoute, o as lookupInboundMessageMeta, r as resolveWhatsAppLegacyGroupSessionKey } from "./group-session-key-DmFc_Cqi.js";
-import { C as getMentionIdentities, D as getSenderIdentity, E as getSelfIdentity, O as identitiesOverlap, S as getComparableIdentityValues, T as getReplyContext, g as readWebSelfId, k as resolveComparableIdentity, o as getWebAuthAgeMs, r as WhatsAppAuthUnstableError, v as readWebSelfIdentityForDecision, w as getPrimaryIdentityId } from "./auth-store-CtpBqH5S.js";
+import { a as markdownToWhatsAppChunks, c as toWhatsappJid, l as toWhatsappJidWithLid, n as isSelfChatMode, o as resolveEquivalentWhatsAppDirectChatJids, r as jidToE164, s as resolveJidToE164 } from "./targets-runtime-RBjx3pg_.js";
+import { t as normalizeE164 } from "./text-runtime-DyfmcATV.js";
+import { a as cacheInboundMessageMeta, i as buildQuotedMessageOptions, n as resolveWhatsAppGroupSessionRoute, o as lookupInboundMessageMeta, r as resolveWhatsAppLegacyGroupSessionKey } from "./group-session-key-BmVDSPr1.js";
+import { C as getMentionIdentities, D as getSenderIdentity, E as getSelfIdentity, O as identitiesOverlap, S as getComparableIdentityValues, T as getReplyContext, g as readWebSelfId, k as resolveComparableIdentity, o as getWebAuthAgeMs, r as WhatsAppAuthUnstableError, v as readWebSelfIdentityForDecision, w as getPrimaryIdentityId } from "./auth-store-ZWaclAbd.js";
 import { n as resolveWhatsAppGroupsConfigPath } from "./group-config-path-BGyzT9Lg.js";
-import { a as waitForWaConnection, c as isWhatsAppSocketOperationTimeoutError, d as withWhatsAppSocketOperationTimeout, l as resolveWhatsAppSocketOperationTimeoutMs, r as createWaSocket, s as createWhatsAppSocketOperationTimeoutAdapter, u as resolveWhatsAppSocketTiming } from "./socket-close-2T0_jZTN.js";
+import { a as waitForWaConnection, c as isWhatsAppSocketOperationTimeoutError, d as withWhatsAppSocketOperationTimeout, l as resolveWhatsAppSocketOperationTimeoutMs, r as createWaSocket, s as createWhatsAppSocketOperationTimeoutAdapter, u as resolveWhatsAppSocketTiming } from "./socket-close-B3X9uerq.js";
 import { n as getStatusCode, t as formatError } from "./session-errors-JuazczrA.js";
 import { t as BufferJSON } from "./session.runtime-Nsqaehbd.js";
-import { _ as resolveInboundMediaMimetype, a as addWhatsAppImagePreviewFields, c as extractContextInfo, d as extractMediaKind, f as extractMentionedJids, g as projectWhatsAppInboundMessage, h as hasInboundUserContent, i as resolveWhatsAppOutboundMentions, l as extractExternalAdReplyContext, n as addWhatsAppOutboundMentionsToContent, o as describeReplyContext, p as extractText, r as mayContainWhatsAppOutboundMention, s as extractContactContext, t as createWebSendApi, u as extractLocationData } from "./send-api-BtK45TmZ.js";
+import { _ as resolveInboundMediaMimetype, a as addWhatsAppImagePreviewFields, c as extractContextInfo, d as extractMediaKind, f as extractMentionedJids, g as projectWhatsAppInboundMessage, h as hasInboundUserContent, i as resolveWhatsAppOutboundMentions, l as extractExternalAdReplyContext, n as addWhatsAppOutboundMentionsToContent, o as describeReplyContext, p as extractText, r as mayContainWhatsAppOutboundMention, s as extractContactContext, t as createWebSendApi, u as extractLocationData } from "./send-api-C_Zn4Ij-.js";
 import { t as resolveWhatsAppRuntimeGroupPolicy } from "./runtime-group-policy-DeSRFXEV.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-CIYuBJrs.js";
-import { n as maybeResolveWhatsAppApprovalReaction } from "./approval-reactions-Jyr1JaAK.js";
-import { t as maybeResolveWhatsAppQuestionReaction } from "./question-reactions-D3eAeB0i.js";
-import { normalizeLowercaseStringOrEmpty, normalizeOptionalString, normalizeStringEntries } from "openclaw/plugin-sdk/string-coerce-runtime";
-import { filterSupplementalContextItems, resolvePinnedMainDmOwnerFromAllowlist } from "openclaw/plugin-sdk/security-runtime";
+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-DNp6U1NN.js";
+import { n as maybeResolveWhatsAppApprovalReaction } from "./approval-reactions-DrZe-NmN.js";
+import { t as maybeResolveWhatsAppQuestionReaction } from "./question-reactions-bbe0Qnjn.js";
+import { normalizeLowercaseStringOrEmpty, normalizeOptionalString } from "openclaw/plugin-sdk/string-coerce-runtime";
 import { createAckReactionHandle, createStatusReactionController, logAckFailure, removeAckReactionHandleAfterReply, shouldAckReaction } from "openclaw/plugin-sdk/channel-feedback";
+import { bindIngressLifecycleToReplyOptions, createChannelIngressMonitor, createChannelMessageReplyPipeline, createMessageReceiptFromOutboundResults, listMessageReceiptPlatformIds, resolveChannelMessageSourceReplyDeliveryMode, resolveChannelStreamingBlockEnabled } from "openclaw/plugin-sdk/channel-outbound";
 import { formatCliCommand } from "openclaw/plugin-sdk/cli-runtime";
 import { PlatformMessageNotDispatchedError } from "openclaw/plugin-sdk/error-runtime";
 import { createSubsystemLogger, getChildLogger, redactToolPayloadText } from "openclaw/plugin-sdk/logging-core";
@@ -26,7 +26,6 @@ import { createSubsystemLogger as createSubsystemLogger$1, defaultRuntime, forma
 import { registerChannelRuntimeContext } from "openclaw/plugin-sdk/channel-runtime-context";
 import { recordChannelActivity } from "openclaw/plugin-sdk/channel-activity-runtime";
 import { buildChannelInboundEventContext, createChannelPartialDeliveryError, filterChannelInboundQuoteContext, formatInboundEnvelope, formatInboundEnvelope as formatInboundEnvelope$1, formatInboundMediaUnavailableText, formatLocationText, formatMediaPlaceholderText, hasVisibleInboundReplyDispatch, isChannelPartialDeliveryError, readAgentRunTerminalOutcome, resolveInboundSessionEnvelopeContext, resolveInboundSupplementalSenderAllowed, runChannelInboundEvent, shouldDebounceTextInbound, toInboundMediaFactsWithMetadata, toLocationContext } from "openclaw/plugin-sdk/channel-inbound";
-import { bindIngressLifecycleToReplyOptions, createChannelIngressMonitor, createChannelMessageReplyPipeline, createMessageReceiptFromOutboundResults, listMessageReceiptPlatformIds, resolveChannelMessageSourceReplyDeliveryMode, resolveChannelStreamingBlockEnabled } from "openclaw/plugin-sdk/channel-outbound";
 import { getAgentScopedMediaLocalRoots } from "openclaw/plugin-sdk/media-runtime";
 import { isReasoningReplyPayload, resolveSendableOutboundReplyParts, resolveTextChunksWithFallback, sendMediaWithLeadingCaption } from "openclaw/plugin-sdk/reply-payload";
 import { truncateUtf16Safe } from "openclaw/plugin-sdk/text-utility-runtime";
@@ -35,17 +34,18 @@ import { DisconnectReason, downloadMediaMessage, isHostedLidUser, isHostedPnUser
 import { resolveChannelGroupPolicy, resolveChannelGroupRequireMention } from "openclaw/plugin-sdk/channel-policy";
 import { DEFAULT_ACCOUNT_ID, DEFAULT_MAIN_KEY, buildAgentMainSessionKey, buildAgentSessionKey, buildGroupHistoryKey, deriveLastRoutePolicy, normalizeAccountId, normalizeAgentId, resolveAgentRoute, resolveInboundLastRouteSessionKey } from "openclaw/plugin-sdk/routing";
 import { asDateTimestampMs, parseStrictFiniteNumber, resolveExpiresAtMsFromDurationMs } from "openclaw/plugin-sdk/number-runtime";
+import { filterSupplementalContextItems, resolvePinnedMainDmOwnerFromAllowlist } from "openclaw/plugin-sdk/security-runtime";
 import { createChannelPairingChallengeIssuer } from "openclaw/plugin-sdk/channel-pairing";
 import { createHash } from "node:crypto";
 import { resolveDefaultGroupPolicy, warnMissingProviderGroupPolicyFallbackOnce } from "openclaw/plugin-sdk/runtime-group-policy";
 import { resolveChunkMode, resolveTextChunkLimit } from "openclaw/plugin-sdk/reply-runtime";
 import { CHANNEL_APPROVAL_NATIVE_RUNTIME_CONTEXT_CAPABILITY } from "openclaw/plugin-sdk/approval-handler-runtime";
-import { createInboundDebouncer, resolveInboundDebounceMs } from "openclaw/plugin-sdk/channel-inbound-debounce";
 import { drainPendingDeliveries } from "openclaw/plugin-sdk/delivery-queue-runtime";
 import { DEFAULT_GROUP_HISTORY_LIMIT, buildHistoryContextFromEntries, buildInboundHistoryFromEntries, createChannelHistoryWindow } from "openclaw/plugin-sdk/reply-history";
 import { enqueueSystemEvent } from "openclaw/plugin-sdk/system-event-runtime";
 import { fanInChannelIngressLifecycles, resolveStableChannelMessageIngress } from "openclaw/plugin-sdk/channel-ingress-runtime";
 import { getSessionEntry, patchSessionEntry, resolveGroupSessionKey, resolveStorePath, resolveStorePath as resolveStorePath$1, updateLastRoute } from "openclaw/plugin-sdk/session-store-runtime";
+import { createInboundDebouncer, resolveInboundDebounceMs } from "openclaw/plugin-sdk/channel-inbound-debounce";
 import { saveMediaStream } from "openclaw/plugin-sdk/media-store";
 import { upsertChannelPairingRequest } from "openclaw/plugin-sdk/conversation-runtime";
 import { createDedupeCache } from "openclaw/plugin-sdk/dedupe-runtime";
@@ -357,7 +357,7 @@ function createWhatsAppIngressMonitor(params) {
 		deliver: (admission, lifecycle) => params.dispatch(admission, lifecycle),
 		pollIntervalMs: params.pollIntervalMs,
 		retention: {
-			completedTtlMs: 10080 * 60 * 1e3,
+			completedTtlMs: 6048e5,
 			completedMaxEntries: 5e3,
 			failedMaxEntries: 450
 		},
@@ -381,7 +381,7 @@ function createWhatsAppIngressMonitor(params) {
 }
 //#endregion
 //#region extensions/whatsapp/src/inbound/group-metadata-cache.ts
-const GROUP_META_TTL_MS = 300 * 1e3;
+const GROUP_META_TTL_MS = 3e5;
 const WHATSAPP_GROUP_METADATA_CACHE_MAX_ENTRIES = 500;
 function resolveGroupMetadataExpiresAt(nowRaw = Date.now()) {
 	const now = asDateTimestampMs(nowRaw);
@@ -498,10 +498,11 @@ function createWhatsAppGroupMetadataCacheOwner(params) {
 			text,
 			mentionedJids: []
 		};
+		const meta = await get(jid);
 		return resolveWhatsAppOutboundMentions({
 			chatJid: jid,
 			text,
-			participants: (await get(jid)).mentionParticipants
+			participants: meta.mentionParticipants
 		});
 	};
 	const applyOutboundMentions = async (jid, content) => {
@@ -528,10 +529,10 @@ function createWhatsAppGroupMetadataCacheOwner(params) {
 		const listen = (event, listener) => {
 			detachListeners.push(params.listen(event, listener));
 		};
-		listen("groups.upsert", ((groups) => {
+		listen("groups.upsert", (groups) => {
 			for (const group of groups) if (group.id) rememberFullUpdate(group.id, group);
-		}));
-		listen("groups.update", ((updates) => {
+		});
+		listen("groups.update", (updates) => {
 			for (const update of updates) {
 				if (!update.id) continue;
 				if (typeof update.subject === "string" && Array.isArray(update.participants)) {
@@ -540,10 +541,10 @@ function createWhatsAppGroupMetadataCacheOwner(params) {
 				}
 				forgetFullMetadata(update.id);
 			}
-		}));
-		listen("group-participants.update", ((update) => {
+		});
+		listen("group-participants.update", (update) => {
 			forgetFullMetadata(update.id);
-		}));
+		});
 		(async () => {
 			try {
 				const groups = await params.sock.groupFetchAllParticipating();
@@ -577,13 +578,7 @@ function createWhatsAppGroupMetadataCacheOwner(params) {
 //#region extensions/whatsapp/src/inbound/lifecycle.ts
 function attachEmitterListener(emitter, event, listener) {
 	emitter.on(event, listener);
-	return () => {
-		if (typeof emitter.off === "function") {
-			emitter.off(event, listener);
-			return;
-		}
-		if (typeof emitter.removeListener === "function") emitter.removeListener(event, listener);
-	};
+	return () => emitter.off(event, listener);
 }
 function closeInboundMonitorSocket(sock) {
 	if (typeof sock.end === "function") {
@@ -605,7 +600,6 @@ function resolveWhatsAppIngressLifecycle(message) {
 //#endregion
 //#region extensions/whatsapp/src/inbound/message-debounce.ts
 function createWhatsAppInboundMessageDebouncer(options) {
-	const debounceMs = Math.max(0, Math.trunc(options.debounceMs ?? 0));
 	const pendingKeys = /* @__PURE__ */ new Map();
 	const activeFlushes = /* @__PURE__ */ new Set();
 	const workWaiters = /* @__PURE__ */ new Set();
@@ -635,7 +629,8 @@ function createWhatsAppInboundMessageDebouncer(options) {
 		return timestampDiff !== 0 ? timestampDiff : (a.receiveOrder ?? 0) - (b.receiveOrder ?? 0);
 	});
 	const debouncer = createInboundDebouncer({
-		debounceMs,
+		debounceMs: options.resolveDebounceMs(),
+		resolveDebounceMs: (entry) => entry.debounceMs,
 		buildKey: (msg) => msg.debounceKey ?? buildKey(msg),
 		shouldDebounce,
 		onFlush: (entries, createFlush) => {
@@ -701,11 +696,15 @@ function createWhatsAppInboundMessageDebouncer(options) {
 		},
 		onError: options.onError
 	});
-	const enqueue = async (message) => {
+	const enqueue = async (input) => {
+		const message = {
+			...input,
+			debounceMs: options.resolveDebounceMs()
+		};
 		const key = buildKey(message);
 		if (key) {
 			message.debounceKey = key;
-			if (debounceMs > 0 && shouldDebounce(message)) {
+			if (message.debounceMs > 0 && shouldDebounce(message)) {
 				message.debounceKeyTracked = true;
 				trackKey(key);
 				options.onPendingWorkChanged();
@@ -748,26 +747,25 @@ function createWhatsAppInboundMessageDebouncer(options) {
 function unwrapMessage(message) {
 	return normalizeMessageContent$1(message);
 }
-async function downloadInboundMedia(msg, sock, maxBytes = 50 * 1024 * 1024, normalizedMessage) {
+async function downloadInboundMedia(msg, sock, maxBytes = 52428800, normalizedMessage) {
 	const message = normalizedMessage ?? unwrapMessage(msg.message);
 	if (!message) return;
 	const mimetype = resolveInboundMediaMimetype(message);
 	const fileName = message.documentMessage?.fileName ?? void 0;
 	if (!message.imageMessage && !message.videoMessage && !message.ptvMessage && !message.documentMessage && !message.audioMessage && !message.stickerMessage) return;
+	const stream = await downloadMediaMessage(msg, "stream", {}, {
+		reuploadRequest: sock.updateMediaMessage,
+		logger: sock.logger
+	});
 	return {
-		saved: await saveMediaStream(await downloadMediaMessage(msg, "stream", {}, {
-			reuploadRequest: sock.updateMediaMessage,
-			logger: sock.logger
-		}), mimetype, "inbound", maxBytes, fileName).catch((err) => {
-			if (err instanceof Error && /Media exceeds/i.test(err.message)) throw new Error(`Media exceeds ${Math.round(maxBytes / (1024 * 1024))}MB limit`);
-			throw err;
-		}),
+		saved: await saveMediaStream(stream, mimetype, "inbound", maxBytes, fileName),
 		mimetype,
 		fileName
 	};
 }
-async function downloadQuotedInboundMedia(msg, sock, maxBytes = 50 * 1024 * 1024) {
-	const contextInfo = extractContextInfo(unwrapMessage(msg.message));
+async function downloadQuotedInboundMedia(msg, sock, maxBytes = 52428800) {
+	const message = unwrapMessage(msg.message);
+	const contextInfo = extractContextInfo(message);
 	if (!contextInfo?.quotedMessage) return;
 	const quotedMessage = contextInfo.quotedMessage;
 	const self = sock.user;
@@ -792,7 +790,9 @@ async function downloadQuotedInboundMedia(msg, sock, maxBytes = 50 * 1024 * 1024
 const inboundMediaLogger = createSubsystemLogger("gateway/channels/whatsapp").child("inbound");
 const MAX_MEDIA_ERROR_MESSAGE_CHARS = 256;
 function sanitizeMediaErrorMessage(error) {
-	return truncateUtf16Safe(redactToolPayloadText(error instanceof Error ? error.message : String(error)).replace(/https?:\/\/\S+/giu, "[redacted-url]").replace(/\b[^@\s]+@[a-z][a-z\d.-]*\b/giu, "[redacted-jid]").replace(/\+?\d[\d ().-]{6,}\d/gu, "[redacted-phone]").split("\n", 1)[0]?.trim() || "unknown error", MAX_MEDIA_ERROR_MESSAGE_CHARS);
+	const rawMessage = error instanceof Error ? error.message : String(error);
+	const redacted = redactToolPayloadText(rawMessage).replace(/https?:\/\/\S+/giu, "[redacted-url]").replace(/\b[^@\s]+@[a-z][a-z\d.-]*\b/giu, "[redacted-jid]").replace(/\+?\d[\d ().-]{6,}\d/gu, "[redacted-phone]");
+	return truncateUtf16Safe(redacted.split("\n", 1)[0]?.trim() || "unknown error", MAX_MEDIA_ERROR_MESSAGE_CHARS);
 }
 function logMediaMaterializationFailure(params) {
 	const errorClass = params.error instanceof Error && /^[A-Za-z][A-Za-z0-9_.-]{0,63}$/u.test(params.error.name) ? params.error.name : "Error";
@@ -1001,7 +1001,7 @@ async function checkInboundAccessControl(params) {
 //#endregion
 //#region extensions/whatsapp/src/inbound/dedupe.ts
 const recentOutboundMessages = createDedupeCache({
-	ttlMs: 20 * 6e4,
+	ttlMs: 12e5,
 	maxSize: 5e3
 });
 function buildMessageKey(params) {
@@ -1182,7 +1182,11 @@ function createWhatsAppMessageDeliveryCoordinator(options) {
 		await maybeMarkInboundAsRead(target);
 	};
 	const messageDebouncer = createWhatsAppInboundMessageDebouncer({
-		debounceMs: options.debounceMs,
+		resolveDebounceMs: () => resolveInboundDebounceMs({
+			cfg: options.loadConfig?.() ?? options.cfg,
+			channel: "whatsapp",
+			overrideMs: options.debounceMs
+		}),
 		onMessage: options.onMessage,
 		shouldDebounce: options.shouldDebounce,
 		markRead: maybeMarkInboundAsRead,
@@ -1215,11 +1219,13 @@ function createWhatsAppMessageDeliveryCoordinator(options) {
 		};
 		const reply = async (text, optionsResult) => {
 			const resolved = await groupMetadata.resolveOutboundMentions(chatJid, text);
-			return normalizeWhatsAppSendResult(await sendTrackedMessage(chatJid, addWhatsAppOutboundMentionsToContent({ text: resolved.text }, resolved.mentionedJids), optionsResult), "text");
+			const result = await sendTrackedMessage(chatJid, addWhatsAppOutboundMentionsToContent({ text: resolved.text }, resolved.mentionedJids), optionsResult);
+			return normalizeWhatsAppSendResult(result, "text");
 		};
 		const sendMedia = async (payload, optionsValue) => {
 			const previewPayload = await addWhatsAppImagePreviewFields(payload);
-			return normalizeWhatsAppSendResult(await sendTrackedMessage(chatJid, await groupMetadata.applyOutboundMentions(chatJid, previewPayload), optionsValue), "media");
+			const result = await sendTrackedMessage(chatJid, await groupMetadata.applyOutboundMentions(chatJid, previewPayload), optionsValue);
+			return normalizeWhatsAppSendResult(result, "media");
 		};
 		const timestamp = inbound.messageTimestampMs;
 		const mentionedJids = enriched.mentionedJids;
@@ -1439,14 +1445,15 @@ function createWhatsAppMessageDeliveryCoordinator(options) {
 				finishPreparation(void 0);
 				const inbound = await normalizeInboundMessage(msg);
 				if (inbound) await maybeMarkNonSelfChatReadReceipt(inbound, buildReadReceiptTarget(inbound));
-			} else if (result.kind === "durable" && result.queueResult.kind === "accepted") if (skipRecentOutboundEcho) finishPreparation(null);
-			else try {
-				finishPreparation(await normalizeInboundMessage(msg), true);
-			} catch (error) {
-				finishPreparation(void 0);
-				inboundLogger.warn({ error: formatError(error) }, "failed preparing WhatsApp inbound identity; durable drain will normalize again");
-			}
-			else finishPreparation(void 0);
+			} else if (result.kind === "durable" && result.queueResult.kind === "accepted") {
+				if (skipRecentOutboundEcho) finishPreparation(null);
+				else try {
+					finishPreparation(await normalizeInboundMessage(msg), true);
+				} catch (error) {
+					finishPreparation(void 0);
+					inboundLogger.warn({ error: formatError(error) }, "failed preparing WhatsApp inbound identity; durable drain will normalize again");
+				}
+			} else finishPreparation(void 0);
 		}
 	};
 	const handleMessagesUpsertEvent = (upsert) => {
@@ -1514,7 +1521,7 @@ function createWhatsAppMessageDeliveryCoordinator(options) {
 //#region extensions/whatsapp/src/inbound/socket-session.ts
 const LOGGED_OUT_STATUS = DisconnectReason.loggedOut;
 const RECONNECT_IN_PROGRESS_ERROR = "no active socket - reconnection in progress";
-const BAILEYS_MESSAGE_TTL_MS = 600 * 1e3;
+const BAILEYS_MESSAGE_TTL_MS = 6e5;
 function isDirectUserJid(jid) {
 	return /^(\d+)(?::\d+)?@(s\.whatsapp\.net|c\.us|lid|hosted|hosted\.lid)$/i.test(jid.trim());
 }
@@ -2410,7 +2417,11 @@ async function applyGroupGating(params) {
 	const conversationGroupPolicy = inboundPolicy.resolveConversationGroupPolicy(conversationId);
 	if (conversationGroupPolicy.allowlistEnabled && !conversationGroupPolicy.allowed) {
 		const accountId = inboundPolicy.account.accountId;
-		if (shouldWarnForGroupDrop(`${accountId}:${conversationId}`)) {
+		if (shouldWarnForGroupDrop(JSON.stringify([
+			accountId,
+			conversationId,
+			"group registry"
+		]))) {
 			const groupsPath = resolveWhatsAppGroupsConfigPath({
 				cfg: params.cfg,
 				accountId
@@ -2470,11 +2481,13 @@ async function applyGroupGating(params) {
 		conversationId
 	}) !== "always";
 	const replyContext = getReplyContext(params.msg, params.authDir);
+	const implicitReplyToSelf = params.selfChatMode === true && identitiesOverlap(self, sender);
+	const implicitMentionKinds = implicitMentionKindWhen("quoted_bot", !implicitReplyToSelf && identitiesOverlap(self, replyContext?.sender));
 	const mentionDecision = resolveInboundMentionDecision({
 		facts: {
 			canDetectMention: true,
 			wasMentioned,
-			implicitMentionKinds: implicitMentionKindWhen("quoted_bot", !(params.selfChatMode === true && identitiesOverlap(self, sender)) && identitiesOverlap(self, replyContext?.sender))
+			implicitMentionKinds
 		},
 		policy: {
 			isGroup: true,
@@ -2497,6 +2510,22 @@ async function applyGroupGating(params) {
 				needsMentionText: true
 			};
 		}
+		const accountId = inboundPolicy.account.accountId;
+		if (shouldWarnForGroupDrop(JSON.stringify([
+			accountId,
+			conversationId,
+			"no mention"
+		]))) {
+			const groupsPath = resolveWhatsAppGroupsConfigPath({
+				cfg: params.cfg,
+				accountId
+			});
+			params.replyLogger.warn({
+				conversationId,
+				accountId,
+				groupsPath
+			}, `WhatsApp group ${conversationId}: skipping messages without a mention. Mention patterns can be derived from the agent identity name. Use /activation always for this session, or set ${groupsPath}[${JSON.stringify(conversationId)}].requireMention=false for the default. Preserve existing groups entries; when adding the first groups map, include "*": {} to keep other chats admitted.`);
+		}
 		const pendingHistoryBody = params.mentionText === void 0 ? void 0 : formatAudioTranscriptForAgent(params.mentionText);
 		return skipGroupMessageAndStoreHistory(params, `Group message stored for context (no mention detected) in ${conversationId}: ${mentionMsg.payload.body}`, pendingHistoryBody);
 	}
@@ -2652,7 +2681,8 @@ function isLikelyWhatsAppCryptoError(reason) {
 		if (typeof value === "function") return value.name ? `[function ${value.name}]` : "[function]";
 		return Object.prototype.toString.call(value);
 	};
-	const haystack = normalizeLowercaseStringOrEmpty(reason instanceof Error ? `${reason.message}\n${reason.stack ?? ""}` : formatReason(reason));
+	const raw = reason instanceof Error ? `${reason.message}\n${reason.stack ?? ""}` : formatReason(reason);
+	const haystack = normalizeLowercaseStringOrEmpty(raw);
 	if (!(haystack.includes("unsupported state or unable to authenticate data") || haystack.includes("bad mac"))) return false;
 	return haystack.includes("baileys") || haystack.includes("noise-handler") || haystack.includes("aesdecryptgcm");
 }
@@ -2717,6 +2747,11 @@ async function deliverWebReplyInActivityScope(params) {
 	const isGroupConversation = transport.conversationKind === "group";
 	const replyStarted = Date.now();
 	const sendResults = [];
+	const acceptedMediaUrls = /* @__PURE__ */ new Set();
+	const recordMediaAccepted = (mediaUrl) => {
+		acceptedMediaUrls.add(mediaUrl);
+		params.onMediaAccepted?.(mediaUrl);
+	};
 	const finishDelivery = () => {
 		const receipt = createWhatsAppReplyDeliveryReceipt(sendResults);
 		return {
@@ -2725,20 +2760,22 @@ async function deliverWebReplyInActivityScope(params) {
 			providerAccepted: sendResults.some((result) => result.providerAccepted)
 		};
 	};
-	const preserveAcceptedDeliveryError = (error, kind) => {
+	const preserveAcceptedDeliveryError = (error, kind, mediaUrl) => {
 		const sendKind = kind ?? sendResults[0]?.kind ?? "text";
-		if (isChannelPartialDeliveryError(error)) rememberWhatsAppPartialSend({
-			error,
-			kind: sendKind,
-			results: sendResults
-		});
+		if (isChannelPartialDeliveryError(error)) {
+			if (rememberWhatsAppPartialSend({
+				error,
+				kind: sendKind,
+				results: sendResults
+			}) && mediaUrl) recordMediaAccepted(mediaUrl);
+		}
 		return mergeWhatsAppAcceptedSendError({
 			error,
 			kind: sendKind,
 			results: sendResults
 		});
 	};
-	const rememberSendResult = (result) => {
+	const rememberSendResult = (result, mediaUrl) => {
 		if (!result) return;
 		try {
 			rememberWhatsAppAcceptedSend({
@@ -2749,6 +2786,8 @@ async function deliverWebReplyInActivityScope(params) {
 		} catch (error) {
 			if (sendResults.some((accepted) => accepted.providerAccepted)) throw preserveAcceptedDeliveryError(error, result.kind);
 			throw error;
+		} finally {
+			if (mediaUrl && sendResults.includes(result)) recordMediaAccepted(mediaUrl);
 		}
 	};
 	if (isReasoningReplyPayload(replyResult)) {
@@ -2773,7 +2812,7 @@ async function deliverWebReplyInActivityScope(params) {
 			media: cached?.media
 		});
 	};
-	const sendWithRetry = async (fn, label, kind) => {
+	const sendWithRetry = async (fn, label, kind, mediaUrl) => {
 		try {
 			return await sendWhatsAppOutboundWithRetry({
 				send: fn,
@@ -2782,7 +2821,7 @@ async function deliverWebReplyInActivityScope(params) {
 				}
 			});
 		} catch (error) {
-			if (isChannelPartialDeliveryError(error) || sendResults.some((result) => result.providerAccepted)) throw preserveAcceptedDeliveryError(error, kind);
+			if (isChannelPartialDeliveryError(error) || sendResults.some((result) => result.providerAccepted)) throw preserveAcceptedDeliveryError(error, kind, mediaUrl);
 			throw error;
 		}
 	};
@@ -2815,52 +2854,39 @@ async function deliverWebReplyInActivityScope(params) {
 	}
 	const remainingText = [...textChunks];
 	const leadingCaption = remainingText.shift() || "";
-	let acceptedIdsBeforeCurrentMedia = /* @__PURE__ */ new Set();
 	await sendMediaWithLeadingCaption({
 		mediaUrls: mediaList,
 		caption: leadingCaption,
 		send: async ({ mediaUrl, caption }) => {
-			acceptedIdsBeforeCurrentMedia = new Set(sendResults.flatMap(listWhatsAppSendResultMessageIds));
 			const media = await prepareWhatsAppOutboundMedia(await loadWebMedia(mediaUrl, {
 				maxBytes: maxMediaBytes,
 				localRoots: params.mediaLocalRoots
 			}), mediaUrl);
 			if (shouldLogVerbose()) {
-				logVerbose(`Web auto-reply media size: ${(media.buffer.length / (1024 * 1024)).toFixed(2)}MB`);
+				logVerbose(`Web auto-reply media size: ${(media.buffer.length / 1048576).toFixed(2)}MB`);
 				logVerbose(`Web auto-reply media source: ${mediaUrl} (kind ${media.kind})`);
 			}
-			if (media.kind === "image") {
-				const quote = getQuote();
-				rememberSendResult(await sendWithRetry(() => transport.sendMedia({
-					image: media.buffer,
-					caption,
-					mimetype: media.mimetype
-				}, quote), "media:image", "media"));
-			} else if (media.kind === "audio") {
-				const quote = getQuote();
-				rememberSendResult(await sendWithRetry(() => transport.sendMedia({
-					audio: media.buffer,
-					ptt: true,
-					mimetype: media.mimetype
-				}, quote), "media:audio", "media"));
-				if (caption) rememberSendResult(await sendWithRetry(() => transport.reply(caption, quote), "media:audio-text", "text"));
-			} else if (media.kind === "video") {
-				const quote = getQuote();
-				rememberSendResult(await sendWithRetry(() => transport.sendMedia({
-					video: media.buffer,
-					caption,
-					mimetype: media.mimetype
-				}, quote), "media:video", "media"));
-			} else {
-				const quote = getQuote();
-				rememberSendResult(await sendWithRetry(() => transport.sendMedia({
-					document: media.buffer,
-					fileName: media.fileName,
-					caption,
-					mimetype: media.mimetype
-				}, quote), "media:document", "media"));
-			}
-			whatsappOutboundLog.info(`Sent media reply to ${conversationId} (${(media.buffer.length / (1024 * 1024)).toFixed(2)}MB)`);
+			const quote = getQuote();
+			const mediaContent = media.kind === "image" ? {
+				image: media.buffer,
+				caption
+			} : media.kind === "audio" ? {
+				audio: media.buffer,
+				ptt: true
+			} : media.kind === "video" ? {
+				video: media.buffer,
+				caption
+			} : {
+				document: media.buffer,
+				fileName: media.fileName,
+				caption
+			};
+			rememberSendResult(await sendWithRetry(() => transport.sendMedia({
+				...mediaContent,
+				mimetype: media.mimetype
+			}, quote), `media:${media.kind}`, "media", mediaUrl), mediaUrl);
+			if (media.kind === "audio" && caption) rememberSendResult(await sendWithRetry(() => transport.reply(caption, quote), "media:audio-text", "text"));
+			whatsappOutboundLog.info(`Sent media reply to ${conversationId} (${(media.buffer.length / 1048576).toFixed(2)}MB)`);
 			replyLogger.info({
 				correlationId: transport.correlationId ?? newConnectionId(),
 				connectionId: connectionId ?? null,
@@ -2874,7 +2900,7 @@ async function deliverWebReplyInActivityScope(params) {
 			}, "auto-reply sent (media)");
 		},
 		onError: async ({ error, mediaUrl, caption, isFirst }) => {
-			if (sendResults.some((result) => listWhatsAppSendResultMessageIds(result).some((messageId) => !acceptedIdsBeforeCurrentMedia.has(messageId)))) throw preserveAcceptedDeliveryError(error);
+			if (acceptedMediaUrls.has(mediaUrl)) throw preserveAcceptedDeliveryError(error);
 			whatsappOutboundLog.error(`Failed sending web media to ${conversationId}: ${formatError(error)}`);
 			replyLogger.warn({
 				err: error,
@@ -3067,7 +3093,7 @@ function resolveWhatsAppDurableReplyToId(params) {
 }
 function resolveWhatsAppDeliverablePayload(payload, info) {
 	if (payload.isReasoning === true || payload.isCompactionNotice === true) return null;
-	if (payload.isError === true) return null;
+	if (payload.isError === true && info.kind !== "final") return null;
 	if (info.kind === "tool") {
 		if (!resolveSendableOutboundReplyParts(payload).hasMedia) return null;
 		return {
@@ -3077,9 +3103,6 @@ function resolveWhatsAppDeliverablePayload(payload, info) {
 	}
 	return payload;
 }
-function getWhatsAppPayloadMediaUrls(payload) {
-	return new Set(normalizeStringEntries([...Array.isArray(payload.mediaUrls) ? payload.mediaUrls : [], ...typeof payload.mediaUrl === "string" ? [payload.mediaUrl] : []]));
-}
 function hasWhatsAppMediaUrlOverlap(left, right) {
 	for (const url of left) if (right.has(url)) return true;
 	return false;
@@ -3127,16 +3150,28 @@ function createWhatsAppMediaOnlyReplyCoalescer(params) {
 			return finalization;
 		},
 		flushNonDuplicateMedia: (mediaUrls) => flushWhere((pending) => !hasWhatsAppMediaUrlOverlap(pending.mediaUrls, mediaUrls)),
-		dropDuplicateMedia(mediaUrls) {
+		supersedeMedia(mediaUrl) {
 			const flushResult = {
 				delivered: 0,
 				droppedDuplicateMedia: 0
 			};
 			const retained = [];
-			for (const pending of pendingMediaOnlyPayloads.splice(0)) if (hasWhatsAppMediaUrlOverlap(pending.mediaUrls, mediaUrls)) {
-				pending.resolveFinalization(whatsAppReplyDeliveryVisibility(false));
-				flushResult.droppedDuplicateMedia += 1;
-			} else retained.push(pending);
+			for (const pending of pendingMediaOnlyPayloads.splice(0)) {
+				if (pending.mediaUrls.delete(mediaUrl)) {
+					flushResult.droppedDuplicateMedia += 1;
+					const mediaUrls = [...pending.mediaUrls];
+					pending.payload = {
+						...pending.payload,
+						mediaUrl: mediaUrls[0],
+						mediaUrls
+					};
+				}
+				if (pending.mediaUrls.size === 0) {
+					pending.resolveFinalization(whatsAppReplyDeliveryVisibility(false));
+					continue;
+				}
+				retained.push(pending);
+			}
 			pendingMediaOnlyPayloads.push(...retained);
 			return flushResult;
 		},
@@ -3145,7 +3180,7 @@ function createWhatsAppMediaOnlyReplyCoalescer(params) {
 }
 function logWhatsAppMediaOnlyFlushResult(result) {
 	if (!shouldLogVerbose$1()) return;
-	if (result.droppedDuplicateMedia > 0) logVerbose$1(`Dropped ${result.droppedDuplicateMedia} deferred media-only WhatsApp reply payload(s) superseded by captioned media`);
+	if (result.droppedDuplicateMedia > 0) logVerbose$1(`Superseded ${result.droppedDuplicateMedia} deferred WhatsApp attachment(s) with accepted replacement media`);
 	if (result.delivered > 0) logVerbose$1(`Flushed ${result.delivered} deferred media-only WhatsApp reply payload(s)`);
 }
 function resolveWhatsAppResponsePrefix(params) {
@@ -3207,7 +3242,8 @@ async function prepareWhatsAppInboundContext(params) {
 		from: conversationId,
 		sender: {
 			id: params.sender.id ?? params.sender.e164,
-			name: params.sender.name
+			name: params.sender.name,
+			isSelf: params.msg.platform.fromMe === true
 		},
 		conversation: {
 			kind: conversationKind,
@@ -3316,7 +3352,8 @@ function createWhatsAppReplyPlan(params) {
 		didSendReply = true;
 		if (shouldLogVerbose$1()) {
 			const reply = resolveSendableOutboundReplyParts(payload);
-			logVerbose$1(`Reply body: ${payload.text != null ? reply.text : "<media>"}${reply.hasMedia ? " (media)" : ""} -> ${conversationId}`);
+			const preview = payload.text != null ? reply.text : "<media>";
+			logVerbose$1(`Reply body: ${preview}${reply.hasMedia ? " (media)" : ""} -> ${conversationId}`);
 		}
 	};
 	const deliverNormalizedPayload = async (normalizedDeliveryPayload, info, options) => {
@@ -3335,7 +3372,8 @@ function createWhatsAppReplyPlan(params) {
 				replyLogger: params.replyLogger,
 				connectionId: params.connectionId,
 				skipLog: false,
-				tableMode
+				tableMode,
+				onMediaAccepted: options?.onMediaAccepted
 			});
 		} catch (error) {
 			if (isWhatsAppVisibleDeliveryError(error) && !isChannelPartialDeliveryError(error)) throw createChannelPartialDeliveryError(error, {
@@ -3397,7 +3435,7 @@ function createWhatsAppReplyPlan(params) {
 				} : normalizedOutboundPayload;
 				const reply = resolveSendableOutboundReplyParts(normalizedDeliveryPayload);
 				if (!reply.hasMedia && !reply.text.trim()) return normalizedDeliveryPayload;
-				const mediaUrls = getWhatsAppPayloadMediaUrls(normalizedDeliveryPayload);
+				const mediaUrls = new Set(normalizedDeliveryPayload.mediaUrls);
 				logWhatsAppMediaOnlyFlushResult(reply.hasMedia ? shouldDeferWhatsAppMediaOnlyPayload({
 					info,
 					mediaUrls,
@@ -3431,7 +3469,7 @@ function createWhatsAppReplyPlan(params) {
 				const reply = resolveSendableOutboundReplyParts(normalizedDeliveryPayload);
 				if (!reply.hasMedia && !reply.text.trim()) return whatsAppReplyDeliveryVisibility(false);
 				if (!reply.hasMedia) return await deliverNormalizedPayload(normalizedDeliveryPayload, info, { recordDelivery: false });
-				const mediaUrls = getWhatsAppPayloadMediaUrls(normalizedDeliveryPayload);
+				const mediaUrls = new Set(normalizedDeliveryPayload.mediaUrls);
 				if (shouldDeferWhatsAppMediaOnlyPayload({
 					info,
 					mediaUrls,
@@ -3444,14 +3482,10 @@ function createWhatsAppReplyPlan(params) {
 						payload: normalizedDeliveryPayload
 					})
 				};
-				try {
-					const result = await deliverNormalizedPayload(normalizedDeliveryPayload, info);
-					if (result.visibleReplySent) logWhatsAppMediaOnlyFlushResult(mediaOnlyCoalescer.dropDuplicateMedia(mediaUrls));
-					return result;
-				} catch (error) {
-					if (isWhatsAppVisibleDeliveryError(error)) logWhatsAppMediaOnlyFlushResult(mediaOnlyCoalescer.dropDuplicateMedia(mediaUrls));
-					throw error;
-				}
+				return await deliverNormalizedPayload(normalizedDeliveryPayload, info, { onMediaAccepted: (mediaUrl) => {
+					didSendReply = true;
+					logWhatsAppMediaOnlyFlushResult(mediaOnlyCoalescer.supersedeMedia(mediaUrl));
+				} });
 			},
 			onDelivered: (payload, _info, result) => {
 				if (!resolveSendableOutboundReplyParts(payload).hasMedia && result?.visibleReplySent === true) recordDeliveredPayload(payload);
@@ -3716,27 +3750,30 @@ async function processMessage(params) {
 	}) : void 0;
 	if (conversationKind === "group") {
 		const history = visibleGroupHistory ?? [];
-		if (history.length > 0) combinedBody = buildHistoryContextFromEntries({
-			entries: history.map((m) => ({
+		if (history.length > 0) {
+			const historyEntries = history.map((m) => ({
 				sender: m.sender,
 				body: m.body,
 				timestamp: m.timestamp,
 				media: m.media
-			})),
-			currentMessage: combinedBody,
-			excludeLast: false,
-			formatEntry: (entry) => {
-				return formatInboundEnvelope$1({
-					channel: "WhatsApp",
-					from: conversationId,
-					timestamp: entry.timestamp,
-					body: [entry.body, formatMediaPlaceholderText(entry.media ?? [])].filter(Boolean).join("\n"),
-					chatType: "group",
-					senderLabel: entry.sender,
-					envelope: envelopeOptions
-				});
-			}
-		});
+			}));
+			combinedBody = buildHistoryContextFromEntries({
+				entries: historyEntries,
+				currentMessage: combinedBody,
+				excludeLast: false,
+				formatEntry: (entry) => {
+					return formatInboundEnvelope$1({
+						channel: "WhatsApp",
+						from: conversationId,
+						timestamp: entry.timestamp,
+						body: [entry.body, formatMediaPlaceholderText(entry.media ?? [])].filter(Boolean).join("\n"),
+						chatType: "group",
+						senderLabel: entry.sender,
+						envelope: envelopeOptions
+					});
+				}
+			});
+		}
 		shouldClearGroupHistory = !(params.suppressGroupHistoryClear ?? false);
 	}
 	const statusReactionController = params.statusReactionController ?? (params.cfg.messages?.statusReactions?.enabled === true && !params.ackAlreadySent ? await createWhatsAppStatusReactionController({
@@ -4263,8 +4300,8 @@ function normalizeReconnectAccountId(accountId) {
 function isRetryableAuthUnstableError(error) {
 	return error instanceof WhatsAppAuthUnstableError || typeof error === "object" && error !== null && "code" in error && error.code === "whatsapp-auth-unstable";
 }
-const DEFAULT_TRANSPORT_TIMEOUT_MS = 300 * 1e3;
-const WHATSAPP_RECONNECT_CATCH_UP_MAX_MS = 20 * 6e4;
+const DEFAULT_TRANSPORT_TIMEOUT_MS = 3e5;
+const WHATSAPP_RECONNECT_CATCH_UP_MAX_MS = 12e5;
 async function monitorWebChannel(verbose, listenerFactory = attachWebInboxToSocket, keepAlive = true, replyResolver, runtime = defaultRuntime, abortSignal, tuning = {}) {
 	const activeReplyResolver = replyResolver ?? (await loadReplyResolverRuntime()).getReplyFromConfig;
 	const runId = newConnectionId();
@@ -4309,9 +4346,9 @@ async function monitorWebChannel(verbose, listenerFactory = attachWebInboxToSock
 	};
 	process.once("SIGINT", handleSigint);
 	const transportTimeoutMs = tuning.transportTimeoutMs ?? DEFAULT_TRANSPORT_TIMEOUT_MS;
-	const messageTimeoutMs = tuning.messageTimeoutMs ?? 1800 * 1e3;
+	const messageTimeoutMs = tuning.messageTimeoutMs ?? 18e5;
 	const reconnectCatchUpWindowMs = Math.min(Math.max(messageTimeoutMs, 6e4), WHATSAPP_RECONNECT_CATCH_UP_MAX_MS);
-	const watchdogCheckMs = tuning.watchdogCheckMs ?? 60 * 1e3;
+	const watchdogCheckMs = tuning.watchdogCheckMs ?? 6e4;
 	const controller = new WhatsAppConnectionController({
 		accountId: account.accountId,
 		authDir: account.authDir,
@@ -4333,10 +4370,6 @@ async function monitorWebChannel(verbose, listenerFactory = attachWebInboxToSock
 		while (true) {
 			if (stopRequested()) break;
 			const connectionId = newConnectionId();
-			const inboundDebounceMs = resolveInboundDebounceMs({
-				cfg,
-				channel: "whatsapp"
-			});
 			const shouldDebounce = (msg) => shouldDebounceTextInbound({
 				text: msg.payload.commandBody ?? msg.payload.body,
 				cfg,
@@ -4381,7 +4414,7 @@ async function monitorWebChannel(verbose, listenerFactory = attachWebInboxToSock
 							selfChatMode: account.selfChatMode,
 							sendReadReceipts: account.sendReadReceipts,
 							socketTiming,
-							debounceMs: inboundDebounceMs,
+							debounceMs: tuning.debounceMs,
 							appendReplyWindow: connectionLocal.openedAfterRecentInbound ? {
 								afterMs: connectionLocal.startedAt - reconnectCatchUpWindowMs,
 								untilMs: connectionLocal.startedAt + reconnectCatchUpWindowMs,