@openclaw/whatsapp 2026.10.2 → 2026.10.5-beta.2

package/dist/.setup/{monitor-B5DS4PDV.mjs → monitor-CmXEQad9.mjs}

@@ -1,19 +1,19 @@
 import { n as __reExport, t as __exportAll } from "./rolldown-runtime-BBjsoOtd.mjs";
 import { a as resolveWhatsAppAccount, s as resolveWhatsAppMediaMaxBytes } from "./accounts-F0vHuze2.mjs";
-import { _ as withWhatsAppLogicalDeliveryActivity, c as normalizeWhatsAppPayloadTextPreservingIndentation, f as listWhatsAppSendResultMessageIds, g as rememberWhatsAppPartialSend, h as rememberWhatsAppAcceptedSend, l as prepareWhatsAppOutboundMedia, m as normalizeWhatsAppSendResult, o as normalizeWhatsAppOutboundPayload, p as mergeWhatsAppAcceptedSendError, r as sendReactionWhatsApp, y as resolveWhatsAppReactionLevel } from "./send-CGUsUdoX.mjs";
+import { c as prepareWhatsAppOutboundMedia, d as listWhatsAppSendResultMessageIds, f as mergeWhatsAppAcceptedSendError, g as withWhatsAppLogicalDeliveryActivity, h as rememberWhatsAppPartialSend, m as rememberWhatsAppAcceptedSend, o as normalizeWhatsAppOutboundPayload, p as normalizeWhatsAppSendResult, r as sendReactionWhatsApp, s as normalizeWhatsAppPayloadTextPreservingIndentation, v as resolveWhatsAppReactionLevel } from "./send-CLBfAzd6.mjs";
 import { i as getWhatsAppRuntime } from "./runtime-BLlToOi6.mjs";
 import { r as getWhatsAppConnectionController } from "./connection-controller-runtime-context-hgLJoRc8.mjs";
-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-Dls-Xh4F.mjs";
-import { a as lookupInboundMessageMeta, i as cacheInboundMessageMeta, n as resolveWhatsAppGroupSessionRoute, r as buildQuotedMessageOptions } from "./group-session-key-BV8Le9r8.mjs";
-import { C as getPrimaryIdentityId, D as identitiesOverlap, E as getSenderIdentity, O as resolveComparableIdentity, S as getMentionIdentities, T as getSelfIdentity, _ as readWebSelfIdentityForDecision, h as readWebSelfId, o as getWebAuthAgeMs, r as WhatsAppAuthUnstableError, w as getReplyContext, x as getComparableIdentityValues } from "./auth-store-D2rN-hP5.mjs";
+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-D5ryyPxh.mjs";
+import { a as lookupInboundMessageMeta, i as cacheInboundMessageMeta, n as resolveWhatsAppGroupSessionRoute, r as buildQuotedMessageOptions } from "./group-session-key-BbTPosdy.mjs";
+import { C as getPrimaryIdentityId, D as identitiesOverlap, E as getSenderIdentity, O as resolveComparableIdentity, S as getMentionIdentities, T as getSelfIdentity, _ as readWebSelfIdentityForDecision, h as readWebSelfId, o as getWebAuthAgeMs, r as WhatsAppAuthUnstableError, w as getReplyContext, x as getComparableIdentityValues } from "./auth-store-DOBi5BPe.mjs";
 import { n as resolveWhatsAppGroupsConfigPath } from "./group-config-path-BPrak_bJ.mjs";
-import { a as DEFAULT_RECONNECT_POLICY, c as resolveHeartbeatSeconds, f as createWhatsAppSocketOperationTimeoutAdapter, g as withWhatsAppSocketOperationTimeout, h as resolveWhatsAppSocketTiming, i as waitForWaConnection, l as resolveReconnectPolicy, m as resolveWhatsAppSocketOperationTimeoutMs, o as computeBackoff, p as isWhatsAppSocketOperationTimeoutError, r as createWaSocket, s as newConnectionId, u as sleepWithAbort$1 } from "./socket-close-DU7eerAa.mjs";
+import { a as DEFAULT_RECONNECT_POLICY, c as resolveHeartbeatSeconds, f as createWhatsAppSocketOperationTimeoutAdapter, g as withWhatsAppSocketOperationTimeout, h as resolveWhatsAppSocketTiming, i as waitForWaConnection, l as resolveReconnectPolicy, m as resolveWhatsAppSocketOperationTimeoutMs, o as computeBackoff, p as isWhatsAppSocketOperationTimeoutError, r as createWaSocket, s as newConnectionId, u as sleepWithAbort$1 } from "./socket-close-C9OU9mVN.mjs";
 import { n as getStatusCode, t as formatError } from "./session-errors-B8UcAnZN.mjs";
 import { t as BufferJSON } from "./session.runtime-st1konFI.mjs";
-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-B03VDwZ1.mjs";
-import { n as WHATSAPP_WATCHDOG_TIMEOUT_ERROR, r as WhatsAppConnectionController } from "./connection-controller-COkcq48K.mjs";
-import { n as maybeResolveWhatsAppApprovalReaction } from "./approval-reactions-CD6CDF9k.mjs";
-import { t as maybeResolveWhatsAppQuestionReaction } from "./question-reactions-LMeijbaq.mjs";
+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-COzRvqXx.mjs";
+import { n as WHATSAPP_WATCHDOG_TIMEOUT_ERROR, r as WhatsAppConnectionController } from "./connection-controller-CejM7bhn.mjs";
+import { n as maybeResolveWhatsAppApprovalReaction } from "./approval-reactions-CWkZ_ham.mjs";
+import { t as maybeResolveWhatsAppQuestionReaction } from "./question-reactions-DywNaX8m.mjs";
 import { isRecord, normalizeLowercaseStringOrEmpty, normalizeOptionalString, uniqueStrings } from "openclaw/plugin-sdk/string-coerce-runtime";
 import { createAckReactionHandle, createStatusReactionController, shouldAckReaction } from "openclaw/plugin-sdk/channel-feedback";
 import { bindIngressLifecycleToReplyOptions, createChannelIngressMonitor, createChannelMessageReplyPipeline, createMessageReceiptFromOutboundResults, listMessageReceiptPlatformIds, resolveChannelMessageSourceReplyDeliveryMode, resolveChannelStreamingBlockEnabled } from "openclaw/plugin-sdk/channel-outbound";
@@ -24,11 +24,10 @@ import { resolveMarkdownTableMode as resolveMarkdownTableMode$1 } from "openclaw
 import { createSubsystemLogger as createSubsystemLogger$1, defaultRuntime, formatDurationPrecise, getChildLogger as getChildLogger$1, logVerbose, logVerbose as logVerbose$1, registerUnhandledRejectionHandler, shouldLogVerbose, shouldLogVerbose as shouldLogVerbose$1, warn } from "openclaw/plugin-sdk/runtime-env";
 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, resolveGroupThreadConfig, resolveInboundSessionEnvelopeContext, resolveInboundSupplementalSenderAllowed, runChannelInboundEvent, runGroupThread, shouldDebounceTextInbound, toInboundMediaFactsWithMetadata, toLocationContext } from "openclaw/plugin-sdk/channel-inbound";
+import { buildChannelInboundEventContext, createChannelPartialDeliveryError, filterChannelInboundQuoteContext, formatInboundEnvelope, formatInboundEnvelope as formatInboundEnvelope$1, formatInboundMediaUnavailableText, formatLocationText, formatMediaPlaceholderText, hasVisibleInboundReplyDispatch, isChannelPartialDeliveryError, readAgentRunTerminalOutcome, resolveGroupThreadConfig, resolveInboundSessionEnvelopeContextAsync, resolveInboundSupplementalSenderAllowed, runChannelInboundEvent, runGroupThread, shouldDebounceTextInbound, toInboundMediaFactsWithMetadata, toLocationContext } from "openclaw/plugin-sdk/channel-inbound";
 import { getAgentScopedMediaLocalRoots } from "openclaw/plugin-sdk/media-runtime";
 import { isReasoningReplyPayload, resolveSendableOutboundReplyParts, resolveTextChunksWithFallback, sendMediaWithLeadingCaption } from "openclaw/plugin-sdk/reply-payload";
 import { normalizeE164, normalizeE164 as normalizeE164$1, normalizeE164 as normalizeE164$2, 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";
 import { pruneMapToMaxSize } from "openclaw/plugin-sdk/collection-runtime";
 import { DEFAULT_MAIN_KEY, buildAgentMainSessionKey, buildAgentSessionKey, buildGroupHistoryKey, deriveLastRoutePolicy, resolveAgentRoute, resolveInboundLastRouteSessionKey } from "openclaw/plugin-sdk/routing";
@@ -382,22 +381,14 @@ function createWhatsAppGroupMetadataCacheOwner(params) {
 		});
 	};
 	const applyOutboundMentions = async (jid, content) => {
-		if ("text" in content && typeof content.text === "string") {
-			const resolved = await resolveOutboundMentions(jid, content.text);
-			return addWhatsAppOutboundMentionsToContent({
-				...content,
-				text: resolved.text
-			}, resolved.mentionedJids);
-		}
-		const caption = content.caption;
-		if (typeof caption === "string") {
-			const resolved = await resolveOutboundMentions(jid, caption);
-			return addWhatsAppOutboundMentionsToContent({
-				...content,
-				caption: resolved.text
-			}, resolved.mentionedJids);
-		}
-		return content;
+		const field = "text" in content && typeof content.text === "string" ? "text" : "caption";
+		const text = content[field];
+		if (typeof text !== "string") return content;
+		const resolved = await resolveOutboundMentions(jid, text);
+		return addWhatsAppOutboundMentionsToContent({
+			...content,
+			[field]: resolved.text
+		}, resolved.mentionedJids);
 	};
 	const start = () => {
 		if (started || closed) return;
@@ -636,39 +627,33 @@ function createWhatsAppInboundMessageDebouncer(options) {
 					const last = orderedEntries.at(-1);
 					if (!last) return;
 					try {
-						if (orderedEntries.length === 1) {
-							await options.onMessage(attachWhatsAppIngressLifecycle(last, admissionLifecycle));
-							await settle();
-							await Promise.all(orderedEntries.map((entry) => options.markRead(entry.readReceipt)));
-							return;
+						let message = last;
+						if (orderedEntries.length > 1) {
+							const mentioned = /* @__PURE__ */ new Set();
+							for (const entry of orderedEntries) for (const jid of entry.group?.mentions?.jids ?? []) mentioned.add(jid);
+							const combinedMentions = mentioned.size > 0 ? {
+								...last.group?.mentions,
+								jids: Array.from(mentioned)
+							} : last.group?.mentions;
+							message = {
+								...last,
+								turnAdoptionLifecycle: admissionLifecycle,
+								payload: {
+									...last.payload,
+									body: orderedEntries.map((entry) => entry.payload.body).filter(Boolean).join("\n"),
+									commandBody: orderedEntries.map((entry) => entry.payload.commandBody ?? entry.payload.body).filter(Boolean).join("\n")
+								},
+								group: last.group || combinedMentions ? {
+									...last.group,
+									mentions: combinedMentions
+								} : void 0,
+								event: {
+									...last.event,
+									isBatched: true
+								}
+							};
 						}
-						const mentioned = /* @__PURE__ */ new Set();
-						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 combinedCommandBody = orderedEntries.map((entry) => entry.payload.commandBody ?? 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 = attachWhatsAppIngressLifecycle({
-							...last,
-							turnAdoptionLifecycle: admissionLifecycle,
-							payload: {
-								...last.payload,
-								body: combinedBody,
-								commandBody: combinedCommandBody
-							},
-							group: combinedGroup,
-							event: {
-								...last.event,
-								isBatched: true
-							}
-						}, admissionLifecycle);
-						await options.onMessage(combinedMessage);
+						await options.onMessage(attachWhatsAppIngressLifecycle(message, admissionLifecycle));
 						await settle();
 						await Promise.all(orderedEntries.map((entry) => options.markRead(entry.readReceipt)));
 					} catch (error) {
@@ -827,15 +812,17 @@ async function enrichWhatsAppInboundMessage(params) {
 		kind: mediaKind
 	} : void 0;
 	let mediaFileName;
+	let savedContentType;
 	const maxBytes = (typeof params.mediaMaxMb === "number" && params.mediaMaxMb > 0 ? params.mediaMaxMb : 50) * 1024 * 1024;
-	const saveInboundMedia = async (inboundMedia) => {
+	const saveInboundMedia = (inboundMedia) => {
 		if (!inboundMedia) return;
 		mediaPath = inboundMedia.saved.path;
 		mediaType = inboundMedia.mimetype;
 		mediaFileName = inboundMedia.fileName;
+		savedContentType = inboundMedia.saved.contentType;
 	};
 	try {
-		await saveInboundMedia(await downloadInboundMedia(msg, sock, maxBytes, messageProjection[0]));
+		saveInboundMedia(await downloadInboundMedia(msg, sock, maxBytes, messageProjection[0]));
 	} catch (error) {
 		logMediaMaterializationFailure({
 			messageId: msg.key?.id,
@@ -851,7 +838,7 @@ async function enrichWhatsAppInboundMessage(params) {
 		});
 	}
 	if (!mediaPath && !mediaKind && replyContext?.media) try {
-		await saveInboundMedia(await downloadQuotedInboundMedia(msg, sock, maxBytes));
+		saveInboundMedia(await downloadQuotedInboundMedia(msg, sock, maxBytes));
 		mediaKind = replyContext.media.kind ?? void 0;
 		mediaType = mediaType ?? replyContext.media.contentType ?? void 0;
 	} catch (error) {
@@ -868,6 +855,7 @@ async function enrichWhatsAppInboundMessage(params) {
 			notice: "[whatsapp quoted attachment unavailable]"
 		});
 	}
+	if (mediaKind === "document" && savedContentType?.startsWith("image/")) mediaKind = "image";
 	return {
 		body,
 		commandBody,
@@ -1416,10 +1404,7 @@ function createWhatsAppMessageDeliveryCoordinator(options) {
 			}) : void 0;
 			let resolvePrepared;
 			if (durableId && !preparedInboundByDurableId.has(durableId)) {
-				if (preparedInboundByDurableId.size >= 1e3) {
-					const oldest = preparedInboundByDurableId.keys().next().value;
-					if (oldest !== void 0) preparedInboundByDurableId.delete(oldest);
-				}
+				pruneMapToMaxSize(preparedInboundByDurableId, 999);
 				const prepared = createDeferred();
 				resolvePrepared = prepared.resolve;
 				preparedInboundByDurableId.set(durableId, prepared.promise);
@@ -1599,13 +1584,17 @@ async function createWhatsAppAttachedSocketSession(options) {
 			rememberOutboundMessage(jid, result);
 		}, () => {});
 	};
+	const currentSocketOperations = (currentSock) => createWhatsAppSocketOperationTimeoutAdapter(currentSock, sendOperationTimeoutMs, {
+		assertCurrent: () => {
+			if (getCurrentSock() !== currentSock) throw new Error(RECONNECT_IN_PROGRESS_ERROR);
+		},
+		onSendMessageTimeout: ({ jid, promise }) => trackLateAcceptedSend(jid, promise)
+	});
 	let reachoutTimeLock;
 	let reachoutTimeLockFetch;
-	let reachoutTimeLockVersion = 0;
 	let verifiedSendReady;
 	const rememberReachoutTimeLock = (state) => {
 		reachoutTimeLock = state;
-		reachoutTimeLockVersion += 1;
 		verifiedSendReady = void 0;
 	};
 	const fetchReachoutTimeLock = async (currentSock) => {
@@ -1620,28 +1609,22 @@ async function createWhatsAppAttachedSocketSession(options) {
 		});
 		return await reachoutTimeLockFetch;
 	};
-	const rememberVerifiedSendReady = (jid, currentSock) => {
-		verifiedSendReady = {
-			jid,
-			sock: currentSock,
-			reachoutTimeLockVersion
-		};
-	};
-	const consumeVerifiedSendReady = (jid, currentSock) => {
-		if (verifiedSendReady?.jid !== jid || verifiedSendReady.sock !== currentSock || verifiedSendReady.reachoutTimeLockVersion !== reachoutTimeLockVersion) return false;
-		verifiedSendReady = void 0;
-		return true;
-	};
 	const assertCanSendToJid = async (jid, currentSock, readinessOptions) => {
 		if (!isDirectUserJid(jid)) return;
-		if (readinessOptions?.useVerifiedReady && consumeVerifiedSendReady(jid, currentSock)) return;
+		if (readinessOptions?.useVerifiedReady && verifiedSendReady?.jid === jid && verifiedSendReady.sock === currentSock) {
+			verifiedSendReady = void 0;
+			return;
+		}
 		const state = getActiveReachoutTimelock(reachoutTimeLock) ?? await fetchReachoutTimeLock(currentSock);
 		const activeState = getActiveReachoutTimelock(state);
 		if (activeState) {
 			const error = new Error(formatReachoutTimelockError(activeState));
 			throw readinessOptions?.rememberReady ? new PlatformMessageNotDispatchedError(error.message, { cause: error }) : error;
 		}
-		if (readinessOptions?.rememberReady && state) rememberVerifiedSendReady(jid, currentSock);
+		if (readinessOptions?.rememberReady && state) verifiedSendReady = {
+			jid,
+			sock: currentSock
+		};
 	};
 	const assertSendReady = async (to) => {
 		const currentSock = getCurrentSock();
@@ -1655,9 +1638,7 @@ async function createWhatsAppAttachedSocketSession(options) {
 			const currentSock = getCurrentSock();
 			if (currentSock) try {
 				await assertCanSendToJid(jid, currentSock, { useVerifiedReady: true });
-				const result = await createWhatsAppSocketOperationTimeoutAdapter(currentSock, sendOperationTimeoutMs, { onSendMessageTimeout: ({ jid: timedOutJid, promise }) => {
-					trackLateAcceptedSend(timedOutJid, promise);
-				} }).sendMessage(jid, content, sendOptions);
+				const result = await currentSocketOperations(currentSock).sendMessage(jid, content, sendOptions);
 				rememberOutboundMessage(jid, result);
 				return result;
 			} catch (error) {
@@ -1681,7 +1662,7 @@ async function createWhatsAppAttachedSocketSession(options) {
 		sendPresenceUpdate: async (presenceLocal, jid) => {
 			const currentSock = getCurrentSock();
 			if (!currentSock) throw new Error(RECONNECT_IN_PROGRESS_ERROR);
-			return await createWhatsAppSocketOperationTimeoutAdapter(currentSock, sendOperationTimeoutMs).sendPresenceUpdate(presenceLocal, jid);
+			return await currentSocketOperations(currentSock).sendPresenceUpdate(presenceLocal, jid);
 		}
 	};
 	const markRead = async (target) => {
@@ -1921,9 +1902,10 @@ function createWebChannelStatusController(statusSink) {
 			}
 			emit();
 		},
-		noteTransportActivity(at = Date.now()) {
-			if (status.lastTransportActivityAt === at) return;
+		noteTransportActivity(at, authAgeMs) {
+			if (status.lastTransportActivityAt === at && status.authAgeMs === authAgeMs) return;
 			Object.assign(status, createTransportActivityStatusPatch(at));
+			status.authAgeMs = authAgeMs;
 			emit();
 		},
 		noteBusy(busy, at = Date.now()) {
@@ -2167,7 +2149,7 @@ function hasWhatsAppAudioBody(msg) {
 	return (msg.payload.media?.kind === "audio" || msg.payload.media?.type?.startsWith("audio/") === true) && !msg.payload.body.trim();
 }
 async function transcribeWhatsAppAudioMessage(cfg, msg, accountId) {
-	const { transcribeFirstAudio } = await import("./audio-preflight.runtime-C_glQhZY.mjs");
+	const { transcribeFirstAudio } = await import("./audio-preflight.runtime-Dg8oZgre.mjs");
 	const media = msg.payload.media;
 	const conversationId = msg.admission.conversation.id;
 	return await transcribeFirstAudio({
@@ -2495,10 +2477,10 @@ function resolvePeerId(msg) {
 	const admission = requireWhatsAppInboundAdmission(msg);
 	if (admission.conversation.kind === "group") return admission.conversation.id;
 	const sender = getSenderIdentity(msg);
-	if (sender.e164) return normalizeE164(sender.e164) ?? sender.e164;
+	if (sender.e164) return sender.e164;
 	const conversationId = admission.conversation.id;
 	if (conversationId.includes("@")) return jidToE164(conversationId) ?? conversationId;
-	return normalizeE164(conversationId) ?? conversationId;
+	return normalizeE164(conversationId);
 }
 //#endregion
 //#region extensions/whatsapp/src/system-prompt.ts
@@ -2629,24 +2611,17 @@ function resolveWhatsAppReceiptKind(results) {
 function createWhatsAppReplyDeliveryReceipt(results) {
 	const receiptResultsById = /* @__PURE__ */ new Map();
 	for (const result of results) {
-		if (result.receipt?.parts.length) {
-			for (const part of result.receipt.parts) receiptResultsById.set(part.platformMessageId, {
-				...part.raw ?? {
-					channel: "whatsapp",
-					messageId: part.platformMessageId
-				},
-				meta: {
-					...part.raw?.meta,
-					kind: result.kind,
-					providerAccepted: result.providerAccepted
-				}
-			});
-			continue;
-		}
-		for (const messageId of listWhatsAppSendResultMessageIds(result)) receiptResultsById.set(messageId, {
-			channel: "whatsapp",
-			messageId,
+		const parts = result.receipt?.parts.length ? result.receipt.parts : listWhatsAppSendResultMessageIds(result).map((platformMessageId) => ({
+			platformMessageId,
+			raw: void 0
+		}));
+		for (const part of parts) receiptResultsById.set(part.platformMessageId, {
+			...part.raw ?? {
+				channel: "whatsapp",
+				messageId: part.platformMessageId
+			},
 			meta: {
+				...part.raw?.meta,
 				kind: result.kind,
 				providerAccepted: result.providerAccepted
 			}
@@ -2744,12 +2719,15 @@ async function deliverWebReplyInActivityScope(params) {
 			throw error;
 		}
 	};
+	const sendText = async (chunk, label, quote = getQuote) => {
+		rememberSendResult(await sendWithRetry(() => transport.reply(chunk, quote()), label, "text"));
+	};
 	if (mediaList.length === 0 && textChunks.length) {
 		const totalChunks = textChunks.length;
 		for (const [index, chunk] of textChunks.entries()) {
 			const chunkStarted = Date.now();
 			const quote = getQuote();
-			rememberSendResult(await sendWithRetry(() => transport.reply(chunk, quote), "text", "text"));
+			await sendText(chunk, "text", () => quote);
 			if (!skipLog) {
 				const durationMs = Date.now() - chunkStarted;
 				whatsappOutboundLog.debug(`Sent chunk ${index + 1}/${totalChunks} to ${conversationId} (${durationMs.toFixed(0)}ms)`);
@@ -2804,7 +2782,7 @@ async function deliverWebReplyInActivityScope(params) {
 				...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"));
+			if (media.kind === "audio" && caption) await sendText(caption, "media:audio-text", () => quote);
 			whatsappOutboundLog.info(`Sent media reply to ${conversationId} (${(media.buffer.length / 1048576).toFixed(2)}MB)`);
 			replyLogger.info({
 				correlationId: transport.correlationId ?? newConnectionId(),
@@ -2825,48 +2803,41 @@ async function deliverWebReplyInActivityScope(params) {
 				err: error,
 				mediaUrl
 			}, "failed to send web media reply");
-			if (!isFirst) {
-				whatsappOutboundLog.warn(`Trailing media failed; sent warning to ${conversationId}`);
-				rememberSendResult(await sendWithRetry(() => transport.reply("⚠️ Media unavailable.", getQuote()), "media:fallback-unavailable", "text"));
-				return;
-			}
-			const fallbackText = [caption ?? "", "⚠️ Media failed."].filter(Boolean).join("\n");
-			whatsappOutboundLog.warn(`Media skipped; sent text-only to ${conversationId}`);
-			rememberSendResult(await sendWithRetry(() => transport.reply(fallbackText, getQuote()), "media:fallback-text", "text"));
+			const fallbackText = isFirst ? [caption ?? "", "⚠️ Media failed."].filter(Boolean).join("\n") : "⚠️ Media unavailable.";
+			whatsappOutboundLog.warn(isFirst ? `Media skipped; sent text-only to ${conversationId}` : `Trailing media failed; sent warning to ${conversationId}`);
+			await sendText(fallbackText, isFirst ? "media:fallback-text" : "media:fallback-unavailable");
 		}
 	});
-	for (const chunk of remainingText) rememberSendResult(await sendWithRetry(() => transport.reply(chunk, getQuote()), "media:text", "text"));
+	for (const chunk of remainingText) await sendText(chunk, "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(resolveComparableIdentity(params.sender, params.authDir)));
-	if (senderValues.size === 0) return false;
-	for (const entry of params.allowFrom) {
-		const rawEntry = entry.trim();
-		if (!rawEntry) continue;
-		const normalizedEntry = normalizeE164(rawEntry);
-		if (normalizedEntry && senderValues.has(normalizedEntry) || senderValues.has(rawEntry)) return true;
-	}
-	return false;
+function isWhatsAppContextSenderAllowed(params, isGroup, sender) {
+	return resolveInboundSupplementalSenderAllowed({
+		isGroup,
+		groupPolicy: params.groupPolicy,
+		allowFrom: params.groupAllowFrom,
+		isSenderAllowed: (allowFrom) => {
+			if (allowFrom.includes("*")) return true;
+			const senderValues = new Set(getComparableIdentityValues(resolveComparableIdentity(sender, params.authDir)));
+			if (senderValues.size === 0) return false;
+			for (const entry of allowFrom) {
+				const rawEntry = entry.trim();
+				if (!rawEntry) continue;
+				const normalizedEntry = normalizeE164(rawEntry);
+				if (normalizedEntry && senderValues.has(normalizedEntry) || senderValues.has(rawEntry)) return true;
+			}
+			return false;
+		}
+	});
 }
 function resolveVisibleWhatsAppGroupHistory(params) {
 	return filterSupplementalContextItems({
 		items: params.history,
 		mode: params.mode,
 		kind: "history",
-		isSenderAllowed: (entry) => resolveInboundSupplementalSenderAllowed({
-			isGroup: true,
-			groupPolicy: params.groupPolicy,
-			allowFrom: params.groupAllowFrom,
-			isSenderAllowed: (allowFrom) => isWhatsAppSupplementalSenderAllowed({
-				allowFrom,
-				authDir: params.authDir,
-				sender: entry.senderJid ? { jid: entry.senderJid } : null
-			})
-		})
+		isSenderAllowed: (entry) => isWhatsAppContextSenderAllowed(params, true, entry.senderJid ? { jid: entry.senderJid } : null)
 	}).items;
 }
 function resolveVisibleWhatsAppReplyContext(params) {
@@ -2874,16 +2845,7 @@ function resolveVisibleWhatsAppReplyContext(params) {
 	if (!replyTo) return null;
 	const admission = requireWhatsAppInboundAdmission(params.msg);
 	const previewBody = [replyTo.body, formatMediaPlaceholderText(replyTo.media ? [replyTo.media] : [])].filter(Boolean).join("\n");
-	const senderAllowed = resolveInboundSupplementalSenderAllowed({
-		isGroup: admission.conversation.kind === "group",
-		groupPolicy: params.groupPolicy,
-		allowFrom: params.groupAllowFrom,
-		isSenderAllowed: (allowFrom) => isWhatsAppSupplementalSenderAllowed({
-			allowFrom,
-			authDir: params.authDir,
-			sender: replyTo.sender
-		})
-	});
+	const senderAllowed = isWhatsAppContextSenderAllowed(params, admission.conversation.kind === "group", replyTo.sender);
 	const visible = filterChannelInboundQuoteContext(params.mode, {
 		id: replyTo.id,
 		body: previewBody,
@@ -2896,65 +2858,6 @@ function resolveVisibleWhatsAppReplyContext(params) {
 	} : null;
 }
 //#endregion
-//#region extensions/whatsapp/src/auto-reply/monitor/prepared-inbound.ts
-function resolvePreparedCommandFacts(command) {
-	if (!command) return;
-	const { authorization, ...facts } = command;
-	return {
-		...facts,
-		...authorization.kind === "not_checked" ? {} : { authorized: authorization.kind === "authorized" }
-	};
-}
-function projectPreparedChannelInbound(params) {
-	const { inbound, control } = params;
-	const command = resolvePreparedCommandFacts(inbound.command);
-	const commandAuthorization = inbound.command?.authorization;
-	const commandAccess = commandAuthorization && commandAuthorization.kind !== "not_checked" ? { authorized: commandAuthorization.kind === "authorized" } : void 0;
-	return {
-		input: {
-			id: inbound.event.id,
-			timestamp: inbound.event.timestamp,
-			rawText: inbound.message.rawBody,
-			textForAgent: inbound.message.bodyForAgent,
-			textForCommands: inbound.message.commandBody,
-			raw: inbound
-		},
-		context: params.buildContext({
-			...inbound,
-			messageId: inbound.event.id,
-			messageIdFull: inbound.event.fullId,
-			timestamp: inbound.event.timestamp,
-			command,
-			access: inbound.mentions || commandAccess ? {
-				mentions: inbound.mentions,
-				commands: commandAccess
-			} : void 0,
-			extra: {
-				Transcript: inbound.context?.transcript,
-				...inbound.context && "groupSubject" in inbound.context ? { GroupSubject: inbound.context.groupSubject ?? void 0 } : {},
-				GroupMembers: inbound.context?.groupMembers,
-				SenderE164: inbound.context?.senderE164,
-				ReplyThreading: inbound.context?.replyThreading,
-				SuppressMessageReceivedHooks: control.messageReceivedHooks === "channel",
-				...inbound.context?.location ? toLocationContext(inbound.context.location) : {}
-			}
-		})
-	};
-}
-/** Keeps WhatsApp reply-policy mapping beside the transport that applies it. */
-function resolveWhatsAppInboundReplyPolicy(params) {
-	const sourceReplyDeliveryMode = params.ctx.ChatType === "group" || params.ctx.ChatType === "channel" ? resolveChannelMessageSourceReplyDeliveryMode({
-		cfg: params.cfg,
-		ctx: params.ctx
-	}) : void 0;
-	const sourceRepliesAreToolOnly = sourceReplyDeliveryMode === "message_tool_only";
-	return {
-		sourceReplyDeliveryMode,
-		disableBlockStreaming: sourceRepliesAreToolOnly ? true : typeof params.blockStreamingEnabled === "boolean" ? !params.blockStreamingEnabled : void 0,
-		suppressTyping: sourceRepliesAreToolOnly && params.ctx.ChatType === "group" && params.ctx.WasMentioned !== true
-	};
-}
-//#endregion
 //#region extensions/whatsapp/src/auto-reply/monitor/inbound-dispatch.ts
 function normalizeErrForLog(err) {
 	if (err instanceof Error) return {
@@ -2965,35 +2868,14 @@ function normalizeErrForLog(err) {
 	};
 	return err;
 }
-function createWhatsAppChannelDeliveryResult(params) {
-	const messageIds = listMessageReceiptPlatformIds(params.delivery.receipt);
-	return {
-		receipt: params.delivery.receipt,
-		...messageIds.length > 0 ? { messageIds } : {},
-		content: params.content,
-		visibleReplySent: params.delivery.providerAccepted
-	};
-}
 function isWhatsAppVisibleDeliveryError(error) {
 	return isRecord(error) && error.visibleReplySent === true || isChannelPartialDeliveryError(error) && error.deliveryResult.visibleReplySent;
 }
-function markWhatsAppReplyDeliveryErrorVisibleAfterFlush(error, flushResult) {
-	if (flushResult.delivered === 0) return error;
+function markWhatsAppReplyDeliveryErrorVisibleAfterFlush(error, delivered) {
+	if (delivered === 0) return error;
 	if (isWhatsAppVisibleDeliveryError(error)) return error;
 	return markWhatsAppVisibleDeliveryError(new Error("deferred WhatsApp media delivery failed after an earlier visible send", { cause: error }));
 }
-function logWhatsAppReplyDeliveryError(params) {
-	params.replyLogger.error({
-		err: normalizeErrForLog(params.err),
-		replyKind: params.info.kind,
-		correlationId: params.transport.correlationId ?? null,
-		connectionId: params.connectionId,
-		conversationId: params.transport.conversationId,
-		chatId: params.transport.chatJid,
-		to: params.transport.conversationId,
-		from: params.transport.recipientJid
-	}, "auto-reply delivery failed");
-}
 function resolveWhatsAppDurableReplyToId(params) {
 	if (params.payload.replyToId === null) return null;
 	const explicitPayloadReplyToId = normalizeOptionalString(params.payload.replyToId);
@@ -3025,10 +2907,7 @@ function shouldDeferWhatsAppMediaOnlyPayload(params) {
 function createWhatsAppMediaOnlyReplyCoalescer(params) {
 	const pendingMediaOnlyPayloads = [];
 	const flushWhere = async (shouldFlush) => {
-		const flushResult = {
-			delivered: 0,
-			droppedDuplicateMedia: 0
-		};
+		let delivered = 0;
 		const candidates = [];
 		const retained = [];
 		for (const pending of pendingMediaOnlyPayloads.splice(0)) if (shouldFlush(pending)) candidates.push(pending);
@@ -3037,14 +2916,14 @@ function createWhatsAppMediaOnlyReplyCoalescer(params) {
 		for (const [index, candidate] of candidates.entries()) try {
 			const delivery = await params.deliver(candidate);
 			candidate.resolveFinalization(delivery);
-			if (delivery.visibleReplySent) flushResult.delivered += 1;
+			if (delivery.visibleReplySent) delivered += 1;
 		} catch (error) {
-			const visibleError = markWhatsAppReplyDeliveryErrorVisibleAfterFlush(error, flushResult);
+			const visibleError = markWhatsAppReplyDeliveryErrorVisibleAfterFlush(error, delivered);
 			candidate.rejectFinalization(error);
 			for (const remaining of candidates.slice(index + 1)) remaining.rejectFinalization(new Error("deferred WhatsApp media delivery was not attempted", { cause: error }));
 			throw visibleError;
 		}
-		return flushResult;
+		return delivered;
 	};
 	return {
 		defer(pending) {
@@ -3058,14 +2937,11 @@ function createWhatsAppMediaOnlyReplyCoalescer(params) {
 		},
 		flushNonDuplicateMedia: (mediaUrls) => flushWhere((pending) => !hasWhatsAppMediaUrlOverlap(pending.mediaUrls, mediaUrls)),
 		supersedeMedia(mediaUrl) {
-			const flushResult = {
-				delivered: 0,
-				droppedDuplicateMedia: 0
-			};
+			let droppedDuplicateMedia = 0;
 			const retained = [];
 			for (const pending of pendingMediaOnlyPayloads.splice(0)) {
 				if (pending.mediaUrls.delete(mediaUrl)) {
-					flushResult.droppedDuplicateMedia += 1;
+					droppedDuplicateMedia += 1;
 					const mediaUrls = [...pending.mediaUrls];
 					pending.payload = {
 						...pending.payload,
@@ -3080,15 +2956,15 @@ function createWhatsAppMediaOnlyReplyCoalescer(params) {
 				retained.push(pending);
 			}
 			pendingMediaOnlyPayloads.push(...retained);
-			return flushResult;
+			return droppedDuplicateMedia;
 		},
 		flushAll: () => flushWhere(() => true)
 	};
 }
-function logWhatsAppMediaOnlyFlushResult(result) {
+function logWhatsAppMediaOnlyFlushResult(delivered, droppedDuplicateMedia = 0) {
 	if (!shouldLogVerbose$1()) return;
-	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)`);
+	if (droppedDuplicateMedia > 0) logVerbose$1(`Superseded ${droppedDuplicateMedia} deferred WhatsApp attachment(s) with accepted replacement media`);
+	if (delivered > 0) logVerbose$1(`Flushed ${delivered} deferred media-only WhatsApp reply payload(s)`);
 }
 function resolveWhatsAppResponsePrefix(params) {
 	const configuredResponsePrefix = params.cfg.messages?.responsePrefix;
@@ -3128,7 +3004,12 @@ async function prepareWhatsAppInboundContext(params) {
 		contentType: params.msg.payload.media?.type,
 		kind: params.msg.payload.media?.kind
 	}] : void 0, { transcribed: (_entry, index) => params.mediaTranscribedIndexes?.includes(index) === true });
-	const control = { messageReceivedHooks: params.suppressMessageReceivedHooks ? "channel" : "core" };
+	const mentions = wasMentioned !== void 0 ? {
+		canDetectMention: conversationKind === "group",
+		wasMentioned,
+		requireMention: params.msg.groupMention?.requireMention
+	} : void 0;
+	const commands = params.command?.authorized !== void 0 ? { authorized: params.command.authorized } : void 0;
 	const inbound = {
 		channelIngress,
 		channel: "whatsapp",
@@ -3142,10 +3023,8 @@ async function prepareWhatsAppInboundContext(params) {
 			channelStructuredContext: params.msg.payload.channelStructuredContext
 		},
 		media,
-		event: {
-			id: eventId,
-			timestamp: params.msg.event.timestamp
-		},
+		messageId: eventId,
+		timestamp: params.msg.event.timestamp,
 		from: conversationId,
 		sender: {
 			id: params.sender.id ?? params.sender.e164,
@@ -3176,35 +3055,36 @@ async function prepareWhatsAppInboundContext(params) {
 			commandBody: params.command?.body ?? params.msg.payload.body
 		},
 		sessionTranscript: { historyLimit: conversationKind === "group" ? params.groupHistoryLimit ?? params.groupHistory?.length ?? 0 : 0 },
-		mentions: wasMentioned !== void 0 ? {
-			canDetectMention: conversationKind === "group",
-			wasMentioned,
-			requireMention: params.msg.groupMention?.requireMention
+		access: mentions || commands ? {
+			mentions,
+			commands
 		} : void 0,
 		command: params.command,
-		context: {
-			transcript: params.transcript,
-			groupSubject: params.msg.group?.subject ?? null,
-			groupMembers: formatGroupMembers({
+		extra: {
+			Transcript: params.transcript,
+			GroupSubject: params.msg.group?.subject ?? void 0,
+			GroupMembers: formatGroupMembers({
 				participants: params.msg.group?.participants,
 				roster: params.groupMemberRoster,
 				fallbackE164: params.sender.e164
 			}),
-			senderE164: params.sender.e164,
-			replyThreading: params.replyThreading,
-			location: params.msg.payload.location
+			SenderE164: params.sender.e164,
+			ReplyThreading: params.replyThreading,
+			SuppressMessageReceivedHooks: Boolean(params.suppressMessageReceivedHooks),
+			...params.msg.payload.location ? toLocationContext(params.msg.payload.location) : {}
 		}
 	};
-	const projected = projectPreparedChannelInbound({
-		inbound,
-		control,
-		buildContext: params.buildContext ?? buildChannelInboundEventContext
-	});
 	return {
 		inbound,
-		control,
-		turnInput: projected.input,
-		ctxPayload: projected.context
+		turnInput: {
+			id: eventId,
+			timestamp: inbound.timestamp,
+			rawText: inbound.message.rawBody,
+			textForAgent: inbound.message.bodyForAgent,
+			textForCommands: inbound.message.commandBody,
+			raw: inbound
+		},
+		ctxPayload: (params.buildContext ?? buildChannelInboundEventContext)(inbound)
 	};
 }
 function resolveWhatsAppDmRouteTarget(params) {
@@ -3221,7 +3101,8 @@ function updateWhatsAppMainLastRoute(params) {
 		route: params.route,
 		sessionKey: params.route.sessionKey
 	});
-	if (params.dmRouteTarget && inboundLastRouteSessionKey === params.route.mainSessionKey && shouldUpdateMainLastRoute) {
+	if (!params.dmRouteTarget || inboundLastRouteSessionKey !== params.route.mainSessionKey) return;
+	if (shouldUpdateMainLastRoute) {
 		params.updateLastRoute({
 			cfg: params.cfg,
 			backgroundTasks: params.backgroundTasks,
@@ -3235,12 +3116,12 @@ function updateWhatsAppMainLastRoute(params) {
 		});
 		return;
 	}
-	if (params.dmRouteTarget && inboundLastRouteSessionKey === params.route.mainSessionKey && params.pinnedMainDmRecipient) logVerbose$1(`Skipping main-session last route update for ${params.dmRouteTarget} (pinned owner ${params.pinnedMainDmRecipient})`);
+	if (params.pinnedMainDmRecipient) logVerbose$1(`Skipping main-session last route update for ${params.dmRouteTarget} (pinned owner ${params.pinnedMainDmRecipient})`);
 }
 function createWhatsAppReplyPlan(params) {
-	const conversationId = params.inbound.conversation.id;
+	const conversationId = params.conversationId;
 	const statusReactionController = params.statusReactionController ?? null;
-	const textLimit = params.maxMediaTextChunkLimit ?? resolveTextChunkLimit(params.cfg, "whatsapp");
+	const textLimit = resolveTextChunkLimit(params.cfg, "whatsapp");
 	const chunkMode = resolveChunkMode(params.cfg, "whatsapp", params.route.accountId);
 	const tableMode = resolveMarkdownTableMode$1({
 		cfg: params.cfg,
@@ -3248,11 +3129,12 @@ function createWhatsAppReplyPlan(params) {
 		accountId: params.route.accountId
 	});
 	const mediaLocalRoots = getAgentScopedMediaLocalRoots(params.cfg, params.route.agentId);
-	const replyPolicy = resolveWhatsAppInboundReplyPolicy({
+	const sourceReplyDeliveryMode = params.context.ChatType === "group" || params.context.ChatType === "channel" ? resolveChannelMessageSourceReplyDeliveryMode({
 		cfg: params.cfg,
-		ctx: params.context,
-		blockStreamingEnabled: resolveChannelStreamingBlockEnabled(params.cfg.channels?.whatsapp)
-	});
+		ctx: params.context
+	}) : void 0;
+	const sourceRepliesAreToolOnly = sourceReplyDeliveryMode === "message_tool_only";
+	const blockStreamingEnabled = resolveChannelStreamingBlockEnabled(params.cfg.channels?.whatsapp);
 	let didSendReply = false;
 	let didLogHeartbeatStrip = false;
 	const recordDeliveredPayload = (payload) => {
@@ -3289,10 +3171,13 @@ function createWhatsAppReplyPlan(params) {
 			});
 			throw error;
 		}
-		const result = createWhatsAppChannelDeliveryResult({
+		const messageIds = listMessageReceiptPlatformIds(delivery.receipt);
+		const result = {
+			receipt: delivery.receipt,
+			...messageIds.length > 0 ? { messageIds } : {},
 			content: reply.text,
-			delivery
-		});
+			visibleReplySent: delivery.providerAccepted
+		};
 		if (!result.visibleReplySent) {
 			params.replyLogger.warn({
 				correlationId: params.transport.correlationId ?? null,
@@ -3324,9 +3209,9 @@ function createWhatsAppReplyPlan(params) {
 				}
 			},
 			onSettled: async () => {
-				const flushResult = await mediaOnlyCoalescer.flushAll();
-				logWhatsAppMediaOnlyFlushResult(flushResult);
-				return { visibleReplySent: didSendReply || flushResult.delivered > 0 };
+				const delivered = await mediaOnlyCoalescer.flushAll();
+				logWhatsAppMediaOnlyFlushResult(delivered);
+				return { visibleReplySent: didSendReply || delivered > 0 };
 			},
 			onReplyStart: params.transport.sendComposing
 		},
@@ -3347,10 +3232,7 @@ function createWhatsAppReplyPlan(params) {
 					info,
 					mediaUrls,
 					reply
-				}) ? {
-					delivered: 0,
-					droppedDuplicateMedia: 0
-				} : await mediaOnlyCoalescer.flushNonDuplicateMedia(mediaUrls) : await mediaOnlyCoalescer.flushAll());
+				}) ? 0 : await mediaOnlyCoalescer.flushNonDuplicateMedia(mediaUrls) : await mediaOnlyCoalescer.flushAll());
 				return normalizedDeliveryPayload;
 			},
 			durable: (payload, info) => {
@@ -3391,7 +3273,7 @@ function createWhatsAppReplyPlan(params) {
 				};
 				return await deliverNormalizedPayload(normalizedDeliveryPayload, info, { onMediaAccepted: (mediaUrl) => {
 					didSendReply = true;
-					logWhatsAppMediaOnlyFlushResult(mediaOnlyCoalescer.supersedeMedia(mediaUrl));
+					logWhatsAppMediaOnlyFlushResult(0, mediaOnlyCoalescer.supersedeMedia(mediaUrl));
 				} });
 			},
 			onDelivered: (payload, _info, result) => {
@@ -3399,20 +3281,23 @@ function createWhatsAppReplyPlan(params) {
 			},
 			onError: (err, info) => {
 				if (didSendReply) markWhatsAppVisibleDeliveryError(err);
-				logWhatsAppReplyDeliveryError({
-					err,
-					info,
+				params.replyLogger.error({
+					err: normalizeErrForLog(err),
+					replyKind: info.kind,
+					correlationId: params.transport.correlationId ?? null,
 					connectionId: params.connectionId,
-					transport: params.transport,
-					replyLogger: params.replyLogger
-				});
+					conversationId: params.transport.conversationId,
+					chatId: params.transport.chatJid,
+					to: params.transport.conversationId,
+					from: params.transport.recipientJid
+				}, "auto-reply delivery failed");
 			}
 		},
 		replyOptions: {
 			...params.turnAdoptionLifecycle ? { turnAdoptionLifecycle: params.turnAdoptionLifecycle } : {},
-			suppressTyping: replyPolicy.suppressTyping,
-			disableBlockStreaming: replyPolicy.disableBlockStreaming,
-			...replyPolicy.sourceReplyDeliveryMode ? { sourceReplyDeliveryMode: replyPolicy.sourceReplyDeliveryMode } : {},
+			suppressTyping: sourceRepliesAreToolOnly && params.context.ChatType === "group" && params.context.WasMentioned !== true,
+			disableBlockStreaming: sourceRepliesAreToolOnly ? true : typeof blockStreamingEnabled === "boolean" ? !blockStreamingEnabled : void 0,
+			...sourceReplyDeliveryMode ? { sourceReplyDeliveryMode } : {},
 			onModelSelected: params.onModelSelected,
 			...statusReactionController ? {
 				onToolStart: async (payload) => {
@@ -3482,7 +3367,6 @@ function buildInboundLine(params) {
 //#endregion
 //#region extensions/whatsapp/src/auto-reply/monitor/status-reaction.ts
 async function createWhatsAppStatusReactionController(params) {
-	if (!params.msg.event.id) return null;
 	if ((params.cfg.messages?.statusReactions)?.enabled !== true) return null;
 	const eligibility = await resolveWhatsAppReactionEligibility(params);
 	if (eligibility.status === "disabled") return null;
@@ -3490,12 +3374,8 @@ async function createWhatsAppStatusReactionController(params) {
 	return createStatusReactionController({
 		enabled: true,
 		adapter: {
-			setReaction: async (emoji) => {
-				await sendReactionWhatsApp(chatId, messageId, emoji, reactionOptions);
-			},
-			clearReaction: async () => {
-				await sendReactionWhatsApp(chatId, messageId, "", reactionOptions);
-			}
+			setReaction: (emoji) => sendReactionWhatsApp(chatId, messageId, emoji, reactionOptions),
+			clearReaction: () => sendReactionWhatsApp(chatId, messageId, "", reactionOptions)
 		},
 		initialEmoji,
 		emojis: void 0,
@@ -3559,7 +3439,7 @@ async function processMessage(params) {
 		channel: "whatsapp",
 		accountId: account.accountId
 	});
-	const { storePath, envelopeOptions, previousTimestamp } = resolveInboundSessionEnvelopeContext({
+	const { storePath, envelopeOptions, previousTimestamp } = await resolveInboundSessionEnvelopeContextAsync({
 		cfg: params.cfg,
 		agentId: params.route.agentId,
 		sessionKey: params.route.sessionKey
@@ -3681,14 +3561,13 @@ async function processMessage(params) {
 		accountConfig: account,
 		peerId: dmRouteTarget ?? conversationId
 	});
-	const commandAuthorization = commandAuthorized === void 0 ? { kind: "not_checked" } : commandAuthorized ? { kind: "authorized" } : { kind: "denied" };
 	const { inbound, turnInput, ctxPayload } = await prepareWhatsAppInboundContext({
 		bodyForAgent: msgForAgent.payload.body,
 		combinedBody,
 		command: {
 			kind: isTextCommand ? "text-slash" : "normal",
 			body: commandBody,
-			authorization: commandAuthorization
+			...commandAuthorized !== void 0 ? { authorized: commandAuthorized } : {}
 		},
 		groupHistory: visibleGroupHistory,
 		groupHistoryLimit: params.groupHistoryLimit,
@@ -3754,8 +3633,7 @@ async function processMessage(params) {
 					context: ctxPayload,
 					deliverReply: deliverWebReply,
 					maxMediaBytes: params.maxMediaBytes,
-					maxMediaTextChunkLimit: params.maxMediaTextChunkLimit,
-					inbound,
+					conversationId,
 					onModelSelected,
 					replyLogger: params.replyLogger,
 					replyPipeline: {
@@ -4034,7 +3912,6 @@ function createWebOnMessageHandler(params) {
 function isNonRetryableWebCloseStatus(statusCode) {
 	return statusCode === 440;
 }
-const loadReplyResolverRuntime = createLazyRuntimeModule(() => import("./reply-resolver.runtime-Ded8D58Y.mjs"));
 function resolveWebMonitorConfigSnapshot(params) {
 	const account = resolveWhatsAppAccount({
 		cfg: params.cfg,
@@ -4073,7 +3950,7 @@ function isRetryableAuthUnstableError(error) {
 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 activeReplyResolver = replyResolver ?? (await import("./reply-resolver.runtime-Ded8D58Y.mjs")).getReplyFromConfig;
 	const runId = newConnectionId();
 	const replyLogger = getChildLogger$1({
 		module: "web-auto-reply",
@@ -4220,7 +4097,7 @@ async function monitorWebChannel(verbose, listenerFactory = attachWebInboxToSock
 							uptimeMs: snapshot.uptimeMs,
 							...minutesSinceLastMessage !== null && minutesSinceLastMessage > 30 ? { minutesSinceLastMessage } : {}
 						};
-						statusController.noteTransportActivity(snapshot.lastTransportActivityAt);
+						statusController.noteTransportActivity(snapshot.lastTransportActivityAt, authAgeMs);
 						if (minutesSinceLastMessage && minutesSinceLastMessage > 30) heartbeatLogger.warn(logData, "⚠️ web gateway heartbeat - no messages in 30+ minutes");
 						else heartbeatLogger.info(logData, "web gateway heartbeat");
 					},
@@ -4250,67 +4127,41 @@ async function monitorWebChannel(verbose, listenerFactory = attachWebInboxToSock
 					await controller.shutdown();
 					break;
 				}
-				if (setupDecision) {
-					statusController.noteReconnectAttempts(setupDecision.reconnectAttempts);
-					statusController.noteClose({
-						statusCode: setupDecision.normalized.statusCode,
-						error: formatError(error),
-						reconnectAttempts: setupDecision.reconnectAttempts,
-						healthState: setupDecision.healthState
-					});
-					if (setupDecision.action === "stop") {
-						reconnectLogger.warn({
-							connectionId,
-							status: setupDecision.normalized.statusLabel,
-							reconnectAttempts: setupDecision.reconnectAttempts,
-							maxAttempts: reconnectPolicy.maxAttempts
-						}, "web reconnect: setup status error; max attempts reached");
-						if (setupDecision.healthState === "logged-out") runtime.error(`WhatsApp session logged out during setup. Run \`${formatCliCommand("openclaw channels login --channel whatsapp")}\` to relink.`);
-						else if (setupDecision.healthState === "conflict") runtime.error(`WhatsApp Web connection closed during setup (status ${setupDecision.normalized.statusLabel}: session conflict). Resolve conflicting WhatsApp Web sessions, then restart the channel. To force a fresh QR, run \`${formatCliCommand("openclaw channels logout --channel whatsapp")}\` before \`${formatCliCommand("openclaw channels login --channel whatsapp")}\`. Stopping web monitoring.`);
-						else runtime.error(`WhatsApp Web connection closed during setup (status ${setupDecision.normalized.statusLabel}) after ${setupDecision.reconnectAttempts}/${reconnectPolicy.maxAttempts} attempts. Relink with \`${formatCliCommand("openclaw channels login --channel whatsapp")}\` if the issue persists.`);
-						await controller.shutdown();
-						break;
-					}
-					reconnectLogger.info({
-						connectionId,
-						status: setupDecision.normalized.statusLabel,
-						reconnectAttempts: setupDecision.reconnectAttempts,
-						delayMs: setupDecision.delayMs
-					}, "web reconnect: setup status error; retrying");
-					runtime.error(`WhatsApp Web connection closed during setup (status ${setupDecision.normalized.statusLabel}). Retry ${setupDecision.reconnectAttempts}/${reconnectPolicy.maxAttempts || "∞"} in ${formatDurationPrecise(setupDecision.delayMs ?? 0)}.`);
-					try {
-						await controller.waitBeforeRetry(setupDecision.delayMs ?? 0);
-					} catch {
-						break;
-					}
-					continue;
-				}
-				if (!isRetryableAuthUnstableError(error)) throw error;
-				const retryDecision = controller.consumeReconnectAttempt();
-				statusController.noteReconnectAttempts(retryDecision.reconnectAttempts);
+				const authError = !setupDecision && isRetryableAuthUnstableError(error) ? error : void 0;
+				if (!setupDecision && !authError) throw error;
+				const decision = setupDecision ?? controller.consumeReconnectAttempt();
+				const normalized = setupDecision?.normalized;
+				statusController.noteReconnectAttempts(decision.reconnectAttempts);
 				statusController.noteClose({
-					error: error.message,
-					reconnectAttempts: retryDecision.reconnectAttempts,
-					healthState: retryDecision.healthState
+					...normalized ? { statusCode: normalized.statusCode } : {},
+					error: setupDecision ? formatError(error) : authError?.message,
+					reconnectAttempts: decision.reconnectAttempts,
+					healthState: decision.healthState
 				});
-				if (retryDecision.action === "stop") {
+				const logData = {
+					connectionId,
+					...normalized ? { status: normalized.statusLabel } : {},
+					reconnectAttempts: decision.reconnectAttempts
+				};
+				if (decision.action === "stop") {
 					reconnectLogger.warn({
-						connectionId,
-						reconnectAttempts: retryDecision.reconnectAttempts,
+						...logData,
 						maxAttempts: reconnectPolicy.maxAttempts
-					}, "web reconnect: auth state stayed unstable; max attempts reached");
-					runtime.error(`WhatsApp auth state is still stabilizing after ${retryDecision.reconnectAttempts}/${reconnectPolicy.maxAttempts} attempts. Stopping web monitoring.`);
+					}, normalized ? "web reconnect: setup status error; max attempts reached" : "web reconnect: auth state stayed unstable; max attempts reached");
+					if (!normalized) runtime.error(`WhatsApp auth state is still stabilizing after ${decision.reconnectAttempts}/${reconnectPolicy.maxAttempts} attempts. Stopping web monitoring.`);
+					else if (decision.healthState === "logged-out") runtime.error(`WhatsApp session logged out during setup. Run \`${formatCliCommand("openclaw channels login --channel whatsapp")}\` to relink.`);
+					else if (decision.healthState === "conflict") runtime.error(`WhatsApp Web connection closed during setup (status ${normalized.statusLabel}: session conflict). Resolve conflicting WhatsApp Web sessions, then restart the channel. To force a fresh QR, run \`${formatCliCommand("openclaw channels logout --channel whatsapp")}\` before \`${formatCliCommand("openclaw channels login --channel whatsapp")}\`. Stopping web monitoring.`);
+					else runtime.error(`WhatsApp Web connection closed during setup (status ${normalized.statusLabel}) after ${decision.reconnectAttempts}/${reconnectPolicy.maxAttempts} attempts. Relink with \`${formatCliCommand("openclaw channels login --channel whatsapp")}\` if the issue persists.`);
 					await controller.shutdown();
 					break;
 				}
 				reconnectLogger.info({
-					connectionId,
-					reconnectAttempts: retryDecision.reconnectAttempts,
-					delayMs: retryDecision.delayMs
-				}, "web reconnect: auth state still stabilizing during inbox attach; retrying");
-				runtime.error(`WhatsApp auth state is still stabilizing. Retry ${retryDecision.reconnectAttempts}/${reconnectPolicy.maxAttempts || "∞"} for inbox attach in ${formatDurationPrecise(retryDecision.delayMs ?? 0)}.`);
+					...logData,
+					delayMs: decision.delayMs
+				}, normalized ? "web reconnect: setup status error; retrying" : "web reconnect: auth state still stabilizing during inbox attach; retrying");
+				runtime.error(normalized ? `WhatsApp Web connection closed during setup (status ${normalized.statusLabel}). Retry ${decision.reconnectAttempts}/${reconnectPolicy.maxAttempts || "∞"} in ${formatDurationPrecise(decision.delayMs ?? 0)}.` : `WhatsApp auth state is still stabilizing. Retry ${decision.reconnectAttempts}/${reconnectPolicy.maxAttempts || "∞"} for inbox attach in ${formatDurationPrecise(decision.delayMs ?? 0)}.`);
 				try {
-					await controller.waitBeforeRetry(retryDecision.delayMs ?? 0);
+					await controller.waitBeforeRetry(decision.delayMs ?? 0);
 				} catch {
 					break;
 				}