@openclaw/whatsapp 2026.8.1-beta.3 → 2026.8.2

package/dist/{monitor-IzwQKizW.js → monitor-CTsyo-HE.js}

@@ -1,23 +1,24 @@
-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-CwvTU4RI.js";
+import { a as resolveWhatsAppAccount, s as resolveWhatsAppMediaMaxBytes } from "./accounts-CeKQbu_s.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-DiPjiygK.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-KUguLmSZ.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-DTj1H9pv.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-CpkkJZCU.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-obOSm2cC.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-kFcuhSiY.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 { 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-BvkxsbWi.js";
+import { n as maybeResolveWhatsAppApprovalReaction } from "./approval-reactions-DGDA6hQ7.js";
+import { t as maybeResolveWhatsAppQuestionReaction } from "./question-reactions-B9D6MHXZ.js";
+import { normalizeLowercaseStringOrEmpty, normalizeOptionalString } from "openclaw/plugin-sdk/string-coerce-runtime";
 import { filterSupplementalContextItems, resolvePinnedMainDmOwnerFromAllowlist } from "openclaw/plugin-sdk/security-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,9 +27,8 @@ 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, sendMediaWithLeadingCaption } from "openclaw/plugin-sdk/reply-payload";
+import { isReasoningReplyPayload, resolveSendableOutboundReplyParts, resolveTextChunksWithFallback, sendMediaWithLeadingCaption } from "openclaw/plugin-sdk/reply-payload";
 import { truncateUtf16Safe } from "openclaw/plugin-sdk/text-utility-runtime";
 import { createLazyRuntimeModule } from "openclaw/plugin-sdk/lazy-runtime";
 import { DisconnectReason, downloadMediaMessage, isHostedLidUser, isHostedPnUser, isJidGroup, isJidGroup as isJidGroup$1, jidDecode, jidEncode, jidNormalizedUser, normalizeMessageContent as normalizeMessageContent$1 } from "baileys";
@@ -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);
@@ -416,8 +416,7 @@ function readGroupMetadataCacheEntry(cache, jid) {
 function createWhatsAppGroupMetadataCacheOwner(params) {
 	const reconnectCache = params.reconnectCache ?? /* @__PURE__ */ new Map();
 	const localCache = /* @__PURE__ */ new Map();
-	const publishedJids = /* @__PURE__ */ new Set();
-	const invalidatedJids = /* @__PURE__ */ new Set();
+	const groupMetadataGenerations = /* @__PURE__ */ new Map();
 	const detachListeners = [];
 	let closed = false;
 	let started = false;
@@ -447,46 +446,51 @@ function createWhatsAppGroupMetadataCacheOwner(params) {
 	});
 	const rememberFullUpdate = (jid, meta) => {
 		if (closed) return;
+		groupMetadataGenerations.set(jid, {});
 		rememberWhatsAppBaileysCacheEntry(params.baileysCache, jid, meta, GROUP_META_TTL_MS);
-		publishedJids.add(jid);
-		invalidatedJids.delete(jid);
 		rememberGroupMetadataCacheEntry(reconnectCache, jid, summarizeForReconnect(meta));
 		localCache.delete(jid);
 	};
 	const forgetFullMetadata = (jid) => {
+		groupMetadataGenerations.set(jid, {});
 		params.baileysCache?.delete(jid);
 		reconnectCache.delete(jid);
 		localCache.delete(jid);
-		publishedJids.delete(jid);
-		invalidatedJids.add(jid);
 	};
 	const get = async (jid) => {
-		const cached = readGroupMetadataCacheEntry(localCache, jid);
-		if (cached) return cached;
-		try {
-			const hydratedEntry = params.baileysCache?.get(jid);
-			const providerMetadata = params.baileysCache ? readWhatsAppBaileysCacheEntry(params.baileysCache, jid) : void 0;
-			const hydratedMetadata = providerMetadata?.participants?.length ? providerMetadata : void 0;
-			const meta = hydratedMetadata ?? await (params.getCurrentSock() ?? params.sock).groupMetadata(jid);
-			if (!hydratedMetadata) rememberWhatsAppBaileysCacheEntry(params.baileysCache, jid, meta, GROUP_META_TTL_MS);
-			publishedJids.add(jid);
-			const entry = await summarize(meta);
-			if (hydratedMetadata && hydratedEntry) entry.expires = hydratedEntry.expiresAt;
-			rememberGroupMetadataCacheEntry(reconnectCache, jid, {
-				subject: entry.subject,
-				expires: entry.expires
-			});
-			rememberGroupMetadataCacheEntry(localCache, jid, entry);
-			return entry;
-		} catch (error) {
-			const hydrated = readGroupMetadataCacheEntry(reconnectCache, jid);
-			if (hydrated) {
-				rememberGroupMetadataCacheEntry(localCache, jid, hydrated);
-				params.logVerbose(`Using cached group metadata for ${jid} after fetch failure: ${String(error)}`);
-				return hydrated;
+		for (;;) {
+			if (closed) return { expires: resolveGroupMetadataExpiresAt() ?? 0 };
+			const cached = readGroupMetadataCacheEntry(localCache, jid);
+			if (cached) return cached;
+			const generation = groupMetadataGenerations.get(jid);
+			try {
+				const hydratedEntry = params.baileysCache?.get(jid);
+				const providerMetadata = params.baileysCache ? readWhatsAppBaileysCacheEntry(params.baileysCache, jid) : void 0;
+				const hydratedMetadata = providerMetadata?.participants?.length ? providerMetadata : void 0;
+				const meta = hydratedMetadata ?? await (params.getCurrentSock() ?? params.sock).groupMetadata(jid);
+				if (closed || groupMetadataGenerations.get(jid) !== generation) continue;
+				const entry = await summarize(meta);
+				if (closed || groupMetadataGenerations.get(jid) !== generation) continue;
+				if (hydratedMetadata && hydratedEntry) entry.expires = hydratedEntry.expiresAt;
+				else rememberWhatsAppBaileysCacheEntry(params.baileysCache, jid, meta, GROUP_META_TTL_MS);
+				groupMetadataGenerations.set(jid, {});
+				rememberGroupMetadataCacheEntry(reconnectCache, jid, {
+					subject: entry.subject,
+					expires: entry.expires
+				});
+				rememberGroupMetadataCacheEntry(localCache, jid, entry);
+				return entry;
+			} catch (error) {
+				if (closed || groupMetadataGenerations.get(jid) !== generation) continue;
+				const hydrated = readGroupMetadataCacheEntry(reconnectCache, jid);
+				if (hydrated) {
+					rememberGroupMetadataCacheEntry(localCache, jid, hydrated);
+					params.logVerbose(`Using cached group metadata for ${jid} after fetch failure: ${String(error)}`);
+					return hydrated;
+				}
+				params.logVerbose(`Failed to fetch group metadata for ${jid}: ${String(error)}`);
+				return { expires: resolveGroupMetadataExpiresAt() ?? 0 };
 			}
-			params.logVerbose(`Failed to fetch group metadata for ${jid}: ${String(error)}`);
-			return { expires: resolveGroupMetadataExpiresAt() ?? 0 };
 		}
 	};
 	const resolveOutboundMentions = async (jid, text) => {
@@ -494,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) => {
@@ -544,10 +549,10 @@ function createWhatsAppGroupMetadataCacheOwner(params) {
 			try {
 				const groups = await params.sock.groupFetchAllParticipating();
 				if (closed) return;
-				for (const [jid, meta] of Object.entries(groups ?? {})) if (meta && !publishedJids.has(jid) && !invalidatedJids.has(jid)) {
+				for (const [jid, meta] of Object.entries(groups ?? {})) if (meta && !groupMetadataGenerations.has(jid)) {
 					rememberGroupMetadataCacheEntry(reconnectCache, jid, summarizeForReconnect(meta));
 					rememberWhatsAppBaileysCacheEntry(params.baileysCache, jid, meta, GROUP_META_TTL_MS);
-					publishedJids.add(jid);
+					groupMetadataGenerations.set(jid, {});
 				}
 				params.logVerbose(`Hydrated ${Object.keys(groups ?? {}).length} participating groups on connect`);
 			} catch (error) {
@@ -744,26 +749,28 @@ 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`);
+		saved: await saveMediaStream(stream, mimetype, "inbound", maxBytes, fileName).catch((err) => {
+			if (err instanceof Error && /Media exceeds/i.test(err.message)) throw new Error(`Media exceeds ${Math.round(maxBytes / 1048576)}MB limit`);
 			throw err;
 		}),
 		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;
@@ -788,7 +795,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";
@@ -997,7 +1006,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) {
@@ -1211,11 +1220,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;
@@ -1435,14 +1446,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) => {
@@ -1510,7 +1522,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());
 }
@@ -2466,11 +2478,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,
@@ -2648,7 +2662,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");
 }
@@ -2713,6 +2728,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 {
@@ -2721,20 +2741,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({
@@ -2745,6 +2767,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)) {
@@ -2754,7 +2778,8 @@ async function deliverWebReplyInActivityScope(params) {
 	const tableMode = params.tableMode ?? "code";
 	const chunkMode = params.chunkMode ?? "length";
 	const normalizedReply = params.normalizedReplyResult ?? normalizeWhatsAppOutboundPayload(replyResult, { normalizeText: normalizeWhatsAppPayloadTextPreservingIndentation });
-	const textChunks = markdownToWhatsAppChunks(normalizedReply.text ?? "", textLimit, tableMode, chunkMode);
+	const text = normalizedReply.text ?? "";
+	const textChunks = resolveTextChunksWithFallback(text, markdownToWhatsAppChunks(text, textLimit, tableMode, chunkMode));
 	const mediaList = normalizedReply.mediaUrls ?? [];
 	const getQuote = () => {
 		if (!replyResult.replyToId) return;
@@ -2768,7 +2793,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,
@@ -2777,7 +2802,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;
 		}
 	};
@@ -2810,52 +2835,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,
@@ -2869,7 +2881,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,
@@ -3072,9 +3084,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;
@@ -3122,16 +3131,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;
 		},
@@ -3140,7 +3161,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) {
@@ -3202,7 +3223,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,
@@ -3311,7 +3333,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) => {
@@ -3330,7 +3353,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, {
@@ -3392,7 +3416,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,
@@ -3426,7 +3450,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,
@@ -3439,14 +3463,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);
@@ -3711,27 +3731,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({
@@ -4258,8 +4281,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();
@@ -4304,9 +4327,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,