@openclaw/whatsapp 2026.7.2-beta.4 → 2026.7.2-beta.5

package/dist/{monitor-CBVNJ2lb.js → monitor-B7phZF9w.js}

@@ -1,22 +1,21 @@
-import { a as resolveWhatsAppAccount, s as resolveWhatsAppMediaMaxBytes } from "./accounts-CxPuEFi-.js";
-import { a as normalizeWhatsAppOutboundPayload, c as prepareWhatsAppOutboundMedia, r as sendReactionWhatsApp, s as normalizeWhatsAppPayloadTextPreservingIndentation, u as resolveWhatsAppReactionLevel } from "./send-DhJVN30g.js";
+import { a as resolveWhatsAppAccount, s as resolveWhatsAppMediaMaxBytes } from "./accounts-CSqLvCY5.js";
+import { a as normalizeWhatsAppOutboundPayload, c as prepareWhatsAppOutboundMedia, r as sendReactionWhatsApp, s as normalizeWhatsAppPayloadTextPreservingIndentation, u as resolveWhatsAppReactionLevel } from "./send-BTXJAyK4.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-CKFrhoX4.js";
-import { t as normalizeE164 } from "./text-runtime-CU_IlbK5.js";
-import { a as cacheInboundMessageMeta, i as buildQuotedMessageOptions, n as resolveWhatsAppGroupSessionRoute, o as lookupInboundMessageMeta, r as resolveWhatsAppLegacyGroupSessionKey } from "./group-session-key-DJSdYfnb.js";
-import { g as readWebSelfId, o as getWebAuthAgeMs, r as WhatsAppAuthUnstableError, v as readWebSelfIdentityForDecision } from "./auth-store-DirYMTbo.js";
-import { a as getSelfIdentity, c as resolveComparableIdentity, i as getReplyContext, n as getMentionIdentities, o as getSenderIdentity, r as getPrimaryIdentityId, s as identitiesOverlap, t as getComparableIdentityValues } from "./identity-BM4_wZeM.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-DVMZlO3x.js";
+import { g as readWebSelfId, o as getWebAuthAgeMs, r as WhatsAppAuthUnstableError, v as readWebSelfIdentityForDecision } from "./auth-store-DcEpIOmE.js";
+import { a as getSelfIdentity, c as resolveComparableIdentity, i as getReplyContext, n as getMentionIdentities, o as getSenderIdentity, r as getPrimaryIdentityId, s as identitiesOverlap, t as getComparableIdentityValues } from "./identity-CPrT5aEU.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-BoSHhQNJ.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-DridEuzz.js";
 import { n as getStatusCode, t as formatError } from "./session-errors-JuazczrA.js";
 import { t as BufferJSON } from "./session.runtime-Nsqaehbd.js";
-import { c as requireWhatsAppInboundAdmission, i as resolveWhatsAppInboundPolicy, l as resolveWhatsAppGroupConversationId, o as buildDeprecatedFlatWhatsAppInboundAdmission, r as resolveWhatsAppCommandAuthorized, s as requireAdmittedWhatsAppInboundMessage, t as checkInboundAccessControl } from "./access-control-CRz_v6bR.js";
-import { _ as extractMediaKind, a as mayContainWhatsAppOutboundMention, b as hasInboundUserContent, c as DisconnectReason, d as normalizeMessageContent, f as describeReplyContext, g as extractLocationData, h as extractExternalAdReplyContext, i as addWhatsAppOutboundMentionsToContent, l as downloadMediaMessage, m as extractContextInfo, n as listWhatsAppSendResultMessageIds, o as resolveWhatsAppOutboundMentions, p as extractContactContext, r as normalizeWhatsAppSendResult, s as addWhatsAppImagePreviewFields, t as createWebSendApi, u as isJidGroup, v as extractMentionedJids, x as resolveInboundMediaMimetype, y as extractText } from "./send-api-CpHwbor_.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-BVRExqrB.js";
-import { n as maybeResolveWhatsAppApprovalReaction } from "./approval-reactions-P2HXjmln.js";
-import { t as maybeResolveWhatsAppQuestionReaction } from "./question-reactions-CaOrSYzU.js";
-import { resolveAccountEntry } from "openclaw/plugin-sdk/account-core";
+import { c as requireWhatsAppInboundAdmission, i as resolveWhatsAppInboundPolicy, l as resolveWhatsAppGroupConversationId, o as buildDeprecatedFlatWhatsAppInboundAdmission, r as resolveWhatsAppCommandAuthorized, s as requireAdmittedWhatsAppInboundMessage, t as checkInboundAccessControl } from "./access-control-pZcxTmd5.js";
+import { _ as extractMediaKind, a as mayContainWhatsAppOutboundMention, b as hasInboundUserContent, c as DisconnectReason, d as normalizeMessageContent, f as describeReplyContext, g as extractLocationData, h as extractExternalAdReplyContext, i as addWhatsAppOutboundMentionsToContent, l as downloadMediaMessage, m as extractContextInfo, n as listWhatsAppSendResultMessageIds, o as resolveWhatsAppOutboundMentions, p as extractContactContext, r as normalizeWhatsAppSendResult, s as addWhatsAppImagePreviewFields, t as createWebSendApi, u as isJidGroup, v as extractMentionedJids, x as resolveInboundMediaMimetype, y as extractText } from "./send-api-BY_AkSiB.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-BOB2MVKY.js";
+import { n as maybeResolveWhatsAppApprovalReaction } from "./approval-reactions-Cu66aYdq.js";
+import { t as maybeResolveWhatsAppQuestionReaction } from "./question-reactions-CRsnyoMK.js";
 import { normalizeLowercaseStringOrEmpty, normalizeStringEntries } from "openclaw/plugin-sdk/string-coerce-runtime";
 import { filterSupplementalContextItems, resolvePinnedMainDmOwnerFromAllowlist } from "openclaw/plugin-sdk/security-runtime";
 import { createAckReactionHandle, createStatusReactionController, logAckFailure, removeAckReactionHandleAfterReply, shouldAckReactionForWhatsApp } from "openclaw/plugin-sdk/channel-feedback";
@@ -25,15 +24,16 @@ import { getChildLogger } from "openclaw/plugin-sdk/logging-core";
 import { resolveMarkdownTableMode as resolveMarkdownTableMode$1 } from "openclaw/plugin-sdk/markdown-table-runtime";
 import { createSubsystemLogger, 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 { bindIngressLifecycleToReplyOptions, createChannelIngressMonitor, createChannelMessageReplyPipeline, createMessageReceiptFromOutboundResults, deliverInboundReplyWithMessageSendContext, resolveChannelMessageSourceReplyDeliveryMode, resolveChannelStreamingBlockEnabled } from "openclaw/plugin-sdk/channel-outbound";
+import { bindIngressLifecycleToReplyOptions, createChannelIngressMonitor, createChannelMessageReplyPipeline, createMessageReceiptFromOutboundResults, 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 { truncateUtf16Safe } from "openclaw/plugin-sdk/text-utility-runtime";
 import { createLazyRuntimeModule } from "openclaw/plugin-sdk/lazy-runtime";
-import { buildChannelInboundEventContext, filterChannelInboundQuoteContext, formatInboundEnvelope, formatInboundEnvelope as formatInboundEnvelope$1, formatInboundMediaUnavailableText, formatLocationText, formatMediaPlaceholderText, hasVisibleInboundReplyDispatch, resolveInboundSessionEnvelopeContext, resolveInboundSupplementalSenderAllowed, runChannelInboundEvent, shouldDebounceTextInbound, toInboundMediaFacts, toLocationContext } from "openclaw/plugin-sdk/channel-inbound";
-import { DEFAULT_ACCOUNT_ID as DEFAULT_ACCOUNT_ID$1, DEFAULT_MAIN_KEY, buildAgentMainSessionKey, buildAgentSessionKey, buildGroupHistoryKey, deriveLastRoutePolicy, normalizeAccountId as normalizeAccountId$1, normalizeAgentId, resolveAgentRoute, resolveInboundLastRouteSessionKey } from "openclaw/plugin-sdk/routing";
+import { buildChannelInboundEventContext, filterChannelInboundQuoteContext, formatInboundEnvelope, formatInboundEnvelope as formatInboundEnvelope$1, formatInboundMediaUnavailableText, formatLocationText, formatMediaPlaceholderText, hasVisibleInboundReplyDispatch, isChannelPartialDeliveryError, resolveInboundSessionEnvelopeContext, resolveInboundSupplementalSenderAllowed, runChannelInboundEvent, shouldDebounceTextInbound, toInboundMediaFacts, toLocationContext } from "openclaw/plugin-sdk/channel-inbound";
+import { DEFAULT_ACCOUNT_ID, DEFAULT_MAIN_KEY, buildAgentMainSessionKey, buildAgentSessionKey, buildGroupHistoryKey, deriveLastRoutePolicy, normalizeAccountId, normalizeAgentId, resolveAgentRoute, resolveInboundLastRouteSessionKey } from "openclaw/plugin-sdk/routing";
 import { asDateTimestampMs, parseStrictFiniteNumber, resolveExpiresAtMsFromDurationMs } from "openclaw/plugin-sdk/number-runtime";
 import { createHash } from "node:crypto";
+import { fanInChannelIngressLifecycles } from "openclaw/plugin-sdk/channel-ingress-runtime";
 import { getSessionEntry, patchSessionEntry, resolveStorePath, resolveStorePath as resolveStorePath$1, updateLastRoute } from "openclaw/plugin-sdk/session-store-runtime";
 import { recordChannelActivity } from "openclaw/plugin-sdk/channel-activity-runtime";
 import { resolveChunkMode, resolveTextChunkLimit } from "openclaw/plugin-sdk/reply-runtime";
@@ -44,7 +44,7 @@ import { DEFAULT_GROUP_HISTORY_LIMIT, buildHistoryContextFromEntries, buildInbou
 import { enqueueSystemEvent } from "openclaw/plugin-sdk/system-event-runtime";
 import { createDedupeCache } from "openclaw/plugin-sdk/dedupe-runtime";
 import { saveMediaStream } from "openclaw/plugin-sdk/media-store";
-import { getRuntimeConfig as getRuntimeConfig$1, getRuntimeConfigSourceSnapshot } from "openclaw/plugin-sdk/runtime-config-snapshot";
+import { getRuntimeConfig as getRuntimeConfig$1 } from "openclaw/plugin-sdk/runtime-config-snapshot";
 import { resolveChannelContextVisibilityMode } from "openclaw/plugin-sdk/context-visibility-runtime";
 import { buildMentionRegexes, implicitMentionKindWhen, normalizeMentionText, resolveInboundMentionDecision } from "openclaw/plugin-sdk/channel-mention-gating";
 import { createConnectedChannelStatusPatch, createTransportActivityStatusPatch } from "openclaw/plugin-sdk/gateway-runtime";
@@ -127,6 +127,18 @@ function defineDeprecatedAliasAccessors(msg, descriptors) {
 	defineDeprecatedAccessors(msg, descriptors);
 	return msg;
 }
+function defineDeprecatedStructuredContextPayloadAlias(msg) {
+	const channelStructuredContext = msg.payload.channelStructuredContext ?? msg.payload.untrustedStructuredContext;
+	if (channelStructuredContext !== void 0) msg.payload.channelStructuredContext = channelStructuredContext;
+	Object.defineProperty(msg.payload, "untrustedStructuredContext", {
+		configurable: true,
+		enumerable: true,
+		get: () => msg.payload.channelStructuredContext,
+		set: (value) => {
+			msg.payload.channelStructuredContext = value;
+		}
+	});
+}
 function defineDeprecatedAdmissionTopLevelAccessors(msg) {
 	let fallbackConversationId = msg.conversationId || msg.from;
 	let fallbackAccountId = msg.accountId;
@@ -178,6 +190,7 @@ function defineDeprecatedAdmissionTopLevelAccessors(msg) {
 	});
 }
 function withDeprecatedWebInboundMessageFlatAliases(msg) {
+	defineDeprecatedStructuredContextPayloadAlias(msg);
 	return defineDeprecatedAliasAccessors(defineDeprecatedAdmissionTopLevelAccessors(msg), {
 		id: {
 			get: () => msg.event.id,
@@ -323,9 +336,13 @@ function withDeprecatedWebInboundMessageFlatAliases(msg) {
 			get: () => msg.payload.media?.url,
 			set: (value) => setMediaField(msg, "url", value)
 		},
+		channelStructuredContext: {
+			get: () => msg.payload.channelStructuredContext,
+			set: (value) => msg.payload.channelStructuredContext = value
+		},
 		untrustedStructuredContext: {
-			get: () => msg.payload.untrustedStructuredContext,
-			set: (value) => msg.payload.untrustedStructuredContext = value
+			get: () => msg.payload.channelStructuredContext,
+			set: (value) => msg.payload.channelStructuredContext = value
 		},
 		isBatched: {
 			get: () => msg.event.isBatched,
@@ -352,7 +369,7 @@ function normalizeLegacyFlatWebInboundMessage(msg) {
 			body: msg.body,
 			media,
 			location: msg.location,
-			untrustedStructuredContext: msg.untrustedStructuredContext
+			channelStructuredContext: msg.channelStructuredContext ?? msg.untrustedStructuredContext
 		},
 		platform: {
 			chatJid: msg.chatId,
@@ -467,22 +484,6 @@ function createWhatsAppDurableInboundQueue(accountId) {
 		stateDir: getWhatsAppRuntime().state.resolveStateDir()
 	});
 }
-/** Raw receive chokepoint: append first, then let the drain normalize and dispatch. */
-async function enqueueWhatsAppDurableInbound(params) {
-	const facts = inspectWhatsAppIngressMessage(params.message);
-	const receivedAt = params.receivedAt ?? Date.now();
-	return await params.queue.enqueue(facts.eventId, {
-		message: serializeWhatsAppDurableInboundMessage(params.message),
-		upsertType: params.upsertType,
-		...params.skipStaleAppend === void 0 ? {} : { skipStaleAppend: params.skipStaleAppend },
-		...params.skipRecentOutboundEcho === void 0 ? {} : { skipRecentOutboundEcho: params.skipRecentOutboundEcho },
-		receivedAt,
-		...params.receiveOrder === void 0 ? {} : { receiveOrder: params.receiveOrder }
-	}, {
-		receivedAt,
-		laneKey: facts.laneKey
-	});
-}
 function resolveWhatsAppIngressNonRetryableFailure(error) {
 	return error instanceof WhatsAppIngressPermanentError ? {
 		reason: error.reason,
@@ -493,14 +494,18 @@ function resolveWhatsAppIngressNonRetryableFailure(error) {
 function createWhatsAppIngressMonitor(params) {
 	return createChannelIngressMonitor({
 		queue: params.queue,
-		inspect: (message) => inspectWhatsAppIngressMessage(message),
+		inspect: (admission) => inspectWhatsAppIngressMessage(admission.message),
 		payload: {
 			version: WHATSAPP_DURABLE_INBOUND_PAYLOAD_VERSION,
-			serialize: (message, { receivedAt }) => ({
-				message: serializeWhatsAppDurableInboundMessage(message),
+			serialize: (admission, { receivedAt }) => ({
+				...admission,
+				message: serializeWhatsAppDurableInboundMessage(admission.message),
 				receivedAt
 			}),
-			deserialize: (payload) => deserializeWhatsAppDurableInboundMessage(payload.message),
+			deserialize: (payload) => ({
+				...payload,
+				message: deserializeWhatsAppDurableInboundMessage(payload.message)
+			}),
 			encode: ({ body }) => body,
 			decode: (payload) => ({
 				version: WHATSAPP_DURABLE_INBOUND_PAYLOAD_VERSION,
@@ -508,7 +513,7 @@ function createWhatsAppIngressMonitor(params) {
 			}),
 			createClaimError: (kind) => new WhatsAppIngressPermanentError(kind === "invalid-version" ? "invalid-payload" : "event-id-mismatch", kind === "invalid-version" ? "WhatsApp ingress row has an invalid payload version" : "WhatsApp ingress row identity does not match its transport message key")
 		},
-		deliver: (message, lifecycle, claim) => params.dispatch(message, claim.payload, lifecycle),
+		deliver: (admission, lifecycle) => params.dispatch(admission, lifecycle),
 		pollIntervalMs: params.pollIntervalMs,
 		retention: {
 			pruneIntervalMs: WHATSAPP_DURABLE_INBOUND_PRUNE_INTERVAL_MS,
@@ -791,48 +796,6 @@ async function attachWebInboxToSocket(options) {
 		if (timestampDiff !== 0) return timestampDiff;
 		return (a.receiveOrder ?? 0) - (b.receiveOrder ?? 0);
 	});
-	const buildFlushIngressLifecycle = (entries) => {
-		const lifecycles = entries.map((entry) => entry.turnAdoptionLifecycle).filter((lifecycle) => lifecycle !== void 0);
-		const [firstLifecycle] = lifecycles;
-		if (!firstLifecycle) return {
-			lifecycle: void 0,
-			settle: async () => {},
-			abandon: async () => {}
-		};
-		let handedOff = false;
-		const adoptAll = async () => {
-			for (const lifecycle of lifecycles) await lifecycle.onAdopted();
-		};
-		return {
-			lifecycle: {
-				abortSignal: lifecycles.length === 1 ? firstLifecycle.abortSignal : AbortSignal.any(lifecycles.map((lifecycle) => lifecycle.abortSignal)),
-				onAdopted: async () => {
-					handedOff = true;
-					await adoptAll();
-				},
-				onDeferred: () => {
-					handedOff = true;
-					for (const lifecycle of lifecycles) lifecycle.onDeferred();
-				},
-				onAdoptionFinalizing: () => {
-					for (const lifecycle of lifecycles) lifecycle.onAdoptionFinalizing();
-				},
-				onAbandoned: async () => {
-					handedOff = true;
-					await Promise.all(lifecycles.map((lifecycle) => Promise.resolve(lifecycle.onAbandoned())));
-				}
-			},
-			settle: async () => {
-				if (!handedOff) await adoptAll();
-			},
-			abandon: async () => {
-				if (!handedOff) {
-					handedOff = true;
-					await Promise.all(lifecycles.map((lifecycle) => Promise.resolve(lifecycle.onAbandoned())));
-				}
-			}
-		};
-	};
 	const debouncer = createInboundDebouncer({
 		debounceMs: inboundDebounceMs,
 		buildKey: (msg) => msg.debounceKey ?? buildInboundDebounceKey(msg),
@@ -849,7 +812,7 @@ async function attachWebInboxToSocket(options) {
 				const orderedEntries = orderDebouncedInboundEntries(entries);
 				const last = orderedEntries.at(-1);
 				if (!last) return;
-				const { lifecycle, settle, abandon } = buildFlushIngressLifecycle(orderedEntries);
+				const { lifecycle, settle, abandon } = fanInChannelIngressLifecycles(orderedEntries.map((entry) => entry.turnAdoptionLifecycle));
 				try {
 					if (orderedEntries.length === 1) {
 						await options.onMessage(attachWhatsAppIngressLifecycle(last, lifecycle));
@@ -1308,7 +1271,7 @@ async function attachWebInboxToSocket(options) {
 			participants: inbound.groupParticipants,
 			mentions: groupMentions
 		} : void 0;
-		const untrustedStructuredContext = [
+		const channelStructuredContext = [
 			...enriched.nativeMedia ? [{
 				label: "WhatsApp media",
 				source: "whatsapp",
@@ -1338,7 +1301,7 @@ async function attachWebInboxToSocket(options) {
 				body: enriched.body,
 				commandBody: enriched.commandBody,
 				location: enriched.location ?? void 0,
-				untrustedStructuredContext: untrustedStructuredContext.length > 0 ? untrustedStructuredContext : void 0,
+				channelStructuredContext: channelStructuredContext.length > 0 ? channelStructuredContext : void 0,
 				media
 			},
 			platform: {
@@ -1399,11 +1362,15 @@ async function attachWebInboxToSocket(options) {
 		}
 		await debouncer.enqueue(inboundMessage);
 	};
-	const processDurableInboundMessage = async (msg, context) => {
+	const processDurableInboundMessage = async (admission, lifecycle) => {
+		const { message: msg, ...context } = admission;
 		rememberBaileysMessage(msg.key?.remoteJid, msg.key?.id, msg.message);
+		const remoteJid = msg.key?.remoteJid;
+		const id = msg.key?.id;
+		const durableId = remoteJid && id ? createHash("sha256").update(`${remoteJid}\n${id}`).digest("hex") : void 0;
+		const preparation = durableId ? preparedInboundByDurableId.get(durableId) : void 0;
+		if (durableId) preparedInboundByDurableId.delete(durableId);
 		if (context.skipRecentOutboundEcho === true) return "completed";
-		const preparation = context.eventId ? preparedInboundByDurableId.get(context.eventId) : void 0;
-		if (context.eventId) preparedInboundByDurableId.delete(context.eventId);
 		const prepared = await preparation;
 		if (prepared === null) return "completed";
 		const inbound = prepared ?? await normalizeInboundMessage(msg);
@@ -1431,24 +1398,13 @@ async function attachWebInboxToSocket(options) {
 		await enqueueInboundMessage(msg, inbound, enriched, {
 			readReceipt: deliveryReadReceipt,
 			receiveOrder: context.receiveOrder ?? context.receivedAt,
-			turnAdoptionLifecycle: context.lifecycle
+			turnAdoptionLifecycle: lifecycle
 		});
 		return "deferred";
 	};
 	const durableInboundMonitor = createWhatsAppIngressMonitor({
 		queue: durableInboundQueue,
-		dispatch: async (msg, payload, lifecycle) => {
-			const remoteJid = msg.key?.remoteJid;
-			const id = msg.key?.id;
-			return { kind: await processDurableInboundMessage(msg, {
-				...payload,
-				...remoteJid && id ? { eventId: createWhatsAppDurableInboundMessageId({
-					remoteJid,
-					id
-				}) } : {},
-				lifecycle
-			}) };
-		},
+		dispatch: async (admission, lifecycle) => ({ kind: await processDurableInboundMessage(admission, lifecycle) }),
 		pollIntervalMs: WHATSAPP_INGRESS_DRAIN_INTERVAL_MS,
 		onLog: (message) => inboundLogger.warn({ message }, "whatsapp ingress drain"),
 		onError: (error) => inboundLogger.error({ error: formatError(error) }, "whatsapp durable inbound drain failed"),
@@ -1477,10 +1433,7 @@ async function attachWebInboxToSocket(options) {
 			const skipRecentOutboundEcho = shouldSkipRecentOutboundEcho(msg);
 			const remoteJid = msg.key?.remoteJid;
 			const id = msg.key?.id;
-			const durableId = remoteJid && id ? createWhatsAppDurableInboundMessageId({
-				remoteJid,
-				id
-			}) : void 0;
+			const durableId = remoteJid && id ? createHash("sha256").update(`${remoteJid}\n${id}`).digest("hex") : void 0;
 			let resolvePrepared;
 			if (durableId && !preparedInboundByDurableId.has(durableId)) {
 				if (preparedInboundByDurableId.size >= 1e3) {
@@ -1496,52 +1449,34 @@ async function attachWebInboxToSocket(options) {
 				if (!keepForDrain && durableId && resolvePrepared) preparedInboundByDurableId.delete(durableId);
 			};
 			let result;
-			let appendError;
-			for (const delayMs of [
-				0,
-				100,
-				300
-			]) {
-				if (delayMs > 0) await new Promise((resolve) => {
-					setTimeout(resolve, delayMs);
-				});
-				try {
-					result = await enqueueWhatsAppDurableInbound({
-						queue: durableInboundQueue,
-						message: msg,
-						upsertType: upsert.type,
-						skipStaleAppend,
-						skipRecentOutboundEcho,
-						receivedAt,
-						receiveOrder
-					});
-					appendError = void 0;
-					break;
-				} catch (error) {
-					appendError = error;
-				}
-			}
-			if (result === void 0) {
+			try {
+				result = await durableInboundMonitor.admit({
+					message: msg,
+					upsertType: upsert.type,
+					skipStaleAppend,
+					skipRecentOutboundEcho,
+					receivedAt,
+					receiveOrder
+				}, { receivedAt });
+			} catch (error) {
 				finishPreparation(void 0);
-				const formattedError = formatError(appendError);
+				const formattedError = formatError(error);
 				inboundLogger.error({ error: formattedError }, "failed persisting durable WhatsApp inbound after retries; message dropped");
 				inboundConsoleLog.error(`Failed persisting durable WhatsApp inbound after retries; message dropped: ${formattedError}`);
 				continue;
 			}
-			if (result.kind === "completed") {
+			if (result.kind === "durable" && result.queueResult.kind === "completed") {
 				finishPreparation(void 0);
 				const inbound = await normalizeInboundMessage(msg);
 				if (inbound) await maybeMarkNonSelfChatReadReceipt(inbound, buildReadReceiptTarget(inbound));
-			} else {
-				if (result.kind === "accepted") try {
-					finishPreparation(skipRecentOutboundEcho ? null : await normalizeInboundMessage(msg), true);
-				} catch (error) {
-					finishPreparation(void 0);
-					throw error;
-				}
-				else finishPreparation(void 0);
-				durableInboundMonitor.requestDrain();
+			} 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) => {
@@ -1963,7 +1898,7 @@ function resolveAgentIdentityEmoji(cfg, agentId) {
 //#endregion
 //#region extensions/whatsapp/src/auto-reply/monitor/group-activation.ts
 function hasNamedWhatsAppAccounts(cfg) {
-	return Object.keys(cfg.channels?.whatsapp?.accounts ?? {}).some((accountId) => normalizeAccountId$1(accountId) !== DEFAULT_ACCOUNT_ID$1);
+	return Object.keys(cfg.channels?.whatsapp?.accounts ?? {}).some((accountId) => normalizeAccountId(accountId) !== DEFAULT_ACCOUNT_ID);
 }
 function isActivationOnlyEntry(entry) {
 	return entry?.groupActivation !== void 0 && typeof entry?.sessionId !== "string" && typeof entry?.updatedAt !== "number";
@@ -1986,7 +1921,7 @@ async function resolveGroupActivationFor(params) {
 		...sessionScope,
 		sessionKey: params.sessionKey
 	});
-	const activation = (normalizeAccountId$1(params.accountId) === DEFAULT_ACCOUNT_ID$1 && hasNamedWhatsAppAccounts(params.cfg) && isActivationOnlyEntry(scopedEntry) ? void 0 : scopedEntry?.groupActivation) ?? legacyEntry?.groupActivation;
+	const activation = (normalizeAccountId(params.accountId) === DEFAULT_ACCOUNT_ID && hasNamedWhatsAppAccounts(params.cfg) && isActivationOnlyEntry(scopedEntry) ? void 0 : scopedEntry?.groupActivation) ?? legacyEntry?.groupActivation;
 	if (activation !== void 0 && scopedEntry?.groupActivation === void 0) {
 		if (scopedEntry) await patchSessionEntry({
 			...sessionScope,
@@ -2014,35 +1949,35 @@ function resolveReactionParticipant(msg) {
 	return sender.jid ?? sender.lid ?? void 0;
 }
 //#endregion
-//#region extensions/whatsapp/src/auto-reply/monitor/ack-reaction.ts
-async function maybeSendAckReaction(params) {
-	if (!params.msg.event.id) return null;
+//#region extensions/whatsapp/src/auto-reply/monitor/reaction-eligibility.ts
+const DISABLED_REACTION = { status: "disabled" };
+async function resolveWhatsAppReactionEligibility(params) {
+	const messageId = params.msg.event.id;
+	if (!messageId) return DISABLED_REACTION;
 	const admission = requireWhatsAppInboundAdmission(params.msg);
 	const accountId = admission.accountId;
 	if (resolveWhatsAppReactionLevel({
 		cfg: params.cfg,
 		accountId
-	}).level === "off") return null;
-	const ackConfig = params.cfg.messages?.ackReaction;
+	}).level === "off") return DISABLED_REACTION;
 	const scope = params.cfg.messages?.ackReactionScope ?? "group-mentions";
-	if (scope === "off" || scope === "none") return null;
+	if (scope === "off" || scope === "none") return DISABLED_REACTION;
 	const emoji = resolveWhatsAppAckEmoji({
 		cfg: params.cfg,
 		agentId: params.agentId,
-		ackConfig
+		ackConfig: params.cfg.messages?.ackReaction
 	});
 	const directEnabled = scope === "all" || scope === "direct";
 	const groupMode = scope === "all" || scope === "group-all" ? "always" : scope === "direct" ? "never" : "mentions";
 	const isGroup = admission.conversation.kind === "group";
-	const conversationIdForCheck = admission.conversation.id;
 	const activation = isGroup ? await resolveGroupActivationFor({
 		cfg: params.cfg,
 		accountId,
 		agentId: params.agentId,
 		sessionKey: params.sessionKey,
-		conversationId: conversationIdForCheck
+		conversationId: admission.conversation.id
 	}) : null;
-	const shouldSendReaction = () => shouldAckReactionForWhatsApp({
+	if (!shouldAckReactionForWhatsApp({
 		emoji,
 		isDirect: admission.conversation.kind === "direct",
 		isGroup,
@@ -2050,32 +1985,50 @@ async function maybeSendAckReaction(params) {
 		groupMode,
 		wasMentioned: (params.msg.groupMention?.wasMentioned ?? params.msg.wasMentioned) === true,
 		groupActivated: activation === "always"
+	})) return DISABLED_REACTION;
+	const participant = resolveReactionParticipant(params.msg);
+	return {
+		status: "prepared",
+		chatId: params.msg.platform.chatJid,
+		messageId,
+		emoji,
+		reactionOptions: {
+			verbose: params.verbose,
+			fromMe: false,
+			...participant ? { participant } : {},
+			accountId,
+			cfg: params.cfg
+		}
+	};
+}
+//#endregion
+//#region extensions/whatsapp/src/auto-reply/monitor/ack-reaction.ts
+async function maybeSendAckReaction(params) {
+	const eligibility = await resolveWhatsAppReactionEligibility({
+		cfg: params.cfg,
+		msg: params.msg,
+		agentId: params.agentId,
+		sessionKey: params.sessionKey,
+		verbose: params.verbose
 	});
-	if (!shouldSendReaction()) return null;
+	if (eligibility.status === "disabled") return null;
+	const { chatId, messageId, emoji, reactionOptions } = eligibility;
 	params.info({
-		chatId: params.msg.platform.chatJid,
-		messageId: params.msg.event.id,
+		chatId,
+		messageId,
 		emoji
 	}, "sending ack reaction");
-	const participant = resolveReactionParticipant(params.msg);
-	const reactionOptions = {
-		verbose: params.verbose,
-		fromMe: false,
-		...participant ? { participant } : {},
-		accountId,
-		cfg: params.cfg
-	};
 	return createAckReactionHandle({
 		ackReactionValue: emoji,
-		send: () => sendReactionWhatsApp(params.msg.platform.chatJid, params.msg.event.id, emoji, reactionOptions),
-		remove: () => sendReactionWhatsApp(params.msg.platform.chatJid, params.msg.event.id, "", reactionOptions),
+		send: () => sendReactionWhatsApp(chatId, messageId, emoji, reactionOptions),
+		remove: () => sendReactionWhatsApp(chatId, messageId, "", reactionOptions),
 		onSendError: (err) => {
 			params.warn({
 				error: formatError(err),
-				chatId: params.msg.platform.chatJid,
-				messageId: params.msg.event.id
+				chatId,
+				messageId
 			}, "failed to send ack reaction");
-			logVerbose(`WhatsApp ack reaction failed for chat ${params.msg.platform.chatJid}: ${formatError(err)}`);
+			logVerbose(`WhatsApp ack reaction failed for chat ${chatId}: ${formatError(err)}`);
 		}
 	});
 }
@@ -2775,14 +2728,16 @@ function normalizeErrForLog(err) {
 function whatsAppReplyDeliveryVisibility(visibleReplySent) {
 	return { visibleReplySent };
 }
-function whatsAppReplyDeliveryVisibilityFromDurableResult(result) {
-	return whatsAppReplyDeliveryVisibility(result.visibleReplySent === true);
+function isWhatsAppVisibleDeliveryError(error) {
+	return typeof error === "object" && error !== null && !Array.isArray(error) && error.visibleReplySent === true || isChannelPartialDeliveryError(error) && error.deliveryResult.visibleReplySent;
 }
 function readTrimmedString(value) {
 	return typeof value === "string" ? value.trim() : "";
 }
 function markWhatsAppReplyDeliveryErrorVisibleAfterFlush(error, flushResult) {
-	return flushResult.delivered > 0 ? markWhatsAppVisibleDeliveryError(error) : error;
+	if (flushResult.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) {
 	const admission = requireWhatsAppInboundAdmission(params.msg);
@@ -2834,31 +2789,58 @@ function shouldDeferWhatsAppMediaOnlyPayload(params) {
 }
 function createWhatsAppMediaOnlyReplyCoalescer(params) {
 	const pendingMediaOnlyPayloads = [];
-	const flushExceptDuplicateMedia = async (mediaUrls) => {
+	const flushWhere = async (shouldFlush) => {
 		const flushResult = {
 			delivered: 0,
 			droppedDuplicateMedia: 0
 		};
-		const pending = pendingMediaOnlyPayloads.splice(0);
-		for (const candidate of pending) {
-			if (mediaUrls && hasWhatsAppMediaUrlOverlap(candidate.mediaUrls, mediaUrls)) {
-				flushResult.droppedDuplicateMedia += 1;
-				continue;
-			}
-			try {
-				if ((await params.deliver(candidate)).visibleReplySent) flushResult.delivered += 1;
-			} catch (error) {
-				throw markWhatsAppReplyDeliveryErrorVisibleAfterFlush(error, flushResult);
-			}
+		const candidates = [];
+		const retained = [];
+		for (const pending of pendingMediaOnlyPayloads.splice(0)) if (shouldFlush(pending)) candidates.push(pending);
+		else retained.push(pending);
+		pendingMediaOnlyPayloads.push(...retained);
+		for (const [index, candidate] of candidates.entries()) try {
+			const delivery = await params.deliver(candidate);
+			candidate.resolveFinalization(delivery);
+			if (delivery.visibleReplySent) flushResult.delivered += 1;
+		} catch (error) {
+			const visibleError = markWhatsAppReplyDeliveryErrorVisibleAfterFlush(error, flushResult);
+			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 {
 		defer(pending) {
-			pendingMediaOnlyPayloads.push(pending);
+			let resolveFinalization;
+			let rejectFinalization;
+			const finalization = new Promise((resolve, reject) => {
+				resolveFinalization = resolve;
+				rejectFinalization = reject;
+			});
+			pendingMediaOnlyPayloads.push({
+				...pending,
+				resolveFinalization,
+				rejectFinalization
+			});
+			return finalization;
 		},
-		flushExceptDuplicateMedia,
-		flushAll: () => flushExceptDuplicateMedia()
+		flushNonDuplicateMedia: (mediaUrls) => flushWhere((pending) => !hasWhatsAppMediaUrlOverlap(pending.mediaUrls, mediaUrls)),
+		dropDuplicateMedia(mediaUrls) {
+			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);
+			pendingMediaOnlyPayloads.push(...retained);
+			return flushResult;
+		},
+		flushAll: () => flushWhere(() => true)
 	};
 }
 function logWhatsAppMediaOnlyFlushResult(result) {
@@ -2900,7 +2882,7 @@ async function buildWhatsAppInboundContext(params) {
 				sender: params.visibleReplyTo.sender?.label ?? void 0
 			} : void 0,
 			groupSystemPrompt: params.groupSystemPrompt,
-			untrustedContext: params.msg.payload.untrustedStructuredContext
+			channelStructuredContext: params.msg.payload.channelStructuredContext
 		},
 		media,
 		messageId: params.msg.event.id,
@@ -3009,7 +2991,20 @@ function createWhatsAppReplyPlan(params) {
 	const disableBlockStreaming = sourceRepliesAreToolOnly ? true : resolveWhatsAppDisableBlockStreaming(params.cfg);
 	let didSendReply = false;
 	let didLogHeartbeatStrip = false;
-	const deliverNormalizedPayload = async (normalizedDeliveryPayload, info) => {
+	const recordDeliveredPayload = (payload) => {
+		didSendReply = true;
+		const shouldLog = payload.text ? true : void 0;
+		params.rememberSentText(payload.text, {
+			combinedBody: params.context.Body,
+			combinedBodySessionKey: params.route.sessionKey,
+			logVerboseMessage: shouldLog
+		});
+		if (shouldLogVerbose$1()) {
+			const reply = resolveSendableOutboundReplyParts(payload);
+			logVerbose$1(`Reply body: ${payload.text != null ? reply.text : "<media>"}${reply.hasMedia ? " (media)" : ""} -> ${conversationId}`);
+		}
+	};
+	const deliverNormalizedPayload = async (normalizedDeliveryPayload, info, options) => {
 		const reply = resolveSendableOutboundReplyParts(normalizedDeliveryPayload);
 		if (!reply.hasMedia && !reply.text.trim()) return whatsAppReplyDeliveryVisibility(false);
 		if (!(await params.deliverReply({
@@ -3036,15 +3031,11 @@ function createWhatsAppReplyPlan(params) {
 			}, "auto-reply was not accepted by WhatsApp provider");
 			return whatsAppReplyDeliveryVisibility(false);
 		}
-		didSendReply = true;
-		const shouldLog = normalizedDeliveryPayload.text ? true : void 0;
-		params.rememberSentText(normalizedDeliveryPayload.text, {
-			combinedBody: params.context.Body,
-			combinedBodySessionKey: params.route.sessionKey,
-			logVerboseMessage: shouldLog
-		});
-		const fromDisplay = conversationId;
-		if (shouldLogVerbose$1()) logVerbose$1(`Reply body: ${normalizedDeliveryPayload.text != null ? reply.text : "<media>"}${reply.hasMedia ? " (media)" : ""} -> ${fromDisplay}`);
+		if (options?.recordDelivery !== false) try {
+			recordDeliveredPayload(normalizedDeliveryPayload);
+		} catch (error) {
+			throw markWhatsAppVisibleDeliveryError(error);
+		}
 		return whatsAppReplyDeliveryVisibility(true);
 	};
 	const mediaOnlyCoalescer = createWhatsAppMediaOnlyReplyCoalescer({ deliver: async (pending) => {
@@ -3065,90 +3056,82 @@ function createWhatsAppReplyPlan(params) {
 			onSettled: async () => {
 				const flushResult = await mediaOnlyCoalescer.flushAll();
 				logWhatsAppMediaOnlyFlushResult(flushResult);
-				return whatsAppReplyDeliveryVisibility(flushResult.delivered > 0);
+				return whatsAppReplyDeliveryVisibility(didSendReply || flushResult.delivered > 0);
 			},
 			onReplyStart: params.msg.platform.sendComposing
 		},
 		delivery: {
-			deliver: async (payload, info) => {
+			preparePayload: async (payload, info) => {
 				const deliveryPayload = resolveWhatsAppDeliverablePayload(payload, info);
-				if (!deliveryPayload) return whatsAppReplyDeliveryVisibility(false);
+				if (!deliveryPayload) return null;
 				const normalizedOutboundPayload = normalizeWhatsAppOutboundPayload(deliveryPayload, { normalizeText: normalizeWhatsAppPayloadTextPreservingIndentation });
 				const normalizedDeliveryPayload = deliveryPayload.text === void 0 ? {
 					...normalizedOutboundPayload,
 					text: void 0
 				} : normalizedOutboundPayload;
 				const reply = resolveSendableOutboundReplyParts(normalizedDeliveryPayload);
-				if (!reply.hasMedia && !reply.text.trim()) return whatsAppReplyDeliveryVisibility(false);
-				if (!reply.hasMedia) {
-					const flushResult = await mediaOnlyCoalescer.flushAll();
-					logWhatsAppMediaOnlyFlushResult(flushResult);
-					try {
-						const durable = await deliverInboundReplyWithMessageSendContext({
-							cfg: params.cfg,
-							channel: "whatsapp",
-							accountId: params.route.accountId,
-							agentId: params.route.agentId,
-							ctxPayload: params.context,
-							payload: normalizedDeliveryPayload,
-							info,
-							to: conversationId,
-							replyToId: resolveWhatsAppDurableReplyToId({
-								context: params.context,
-								info,
-								msg: params.msg,
-								payload: normalizedDeliveryPayload
-							}),
-							formatting: {
-								textLimit,
-								tableMode,
-								chunkMode
-							}
-						});
-						if (durable.status === "failed") {
-							if (durable.sentBeforeError === true) throw markWhatsAppVisibleDeliveryError(durable.error);
-							throw durable.error;
-						}
-						if (durable.status === "handled_visible") {
-							didSendReply = true;
-							const shouldLog = normalizedDeliveryPayload.text ? true : void 0;
-							params.rememberSentText(normalizedDeliveryPayload.text, {
-								combinedBody: params.context.Body,
-								combinedBodySessionKey: params.route.sessionKey,
-								logVerboseMessage: shouldLog
-							});
-							return whatsAppReplyDeliveryVisibilityFromDurableResult(durable.delivery);
-						}
-						if (durable.status === "handled_no_send") return flushResult.delivered > 0 ? whatsAppReplyDeliveryVisibility(true) : whatsAppReplyDeliveryVisibilityFromDurableResult(durable.delivery);
-						const deliveryResult = await deliverNormalizedPayload(normalizedDeliveryPayload, info);
-						return flushResult.delivered > 0 && !deliveryResult.visibleReplySent ? whatsAppReplyDeliveryVisibility(true) : deliveryResult;
-					} catch (error) {
-						throw markWhatsAppReplyDeliveryErrorVisibleAfterFlush(error, flushResult);
+				if (!reply.hasMedia && !reply.text.trim()) return normalizedDeliveryPayload;
+				const mediaUrls = getWhatsAppPayloadMediaUrls(normalizedDeliveryPayload);
+				logWhatsAppMediaOnlyFlushResult(reply.hasMedia ? shouldDeferWhatsAppMediaOnlyPayload({
+					info,
+					mediaUrls,
+					reply
+				}) ? {
+					delivered: 0,
+					droppedDuplicateMedia: 0
+				} : await mediaOnlyCoalescer.flushNonDuplicateMedia(mediaUrls) : await mediaOnlyCoalescer.flushAll());
+				return normalizedDeliveryPayload;
+			},
+			durable: (payload, info) => {
+				const reply = resolveSendableOutboundReplyParts(payload);
+				if (reply.hasMedia || !reply.text.trim()) return false;
+				return {
+					to: conversationId,
+					replyToId: resolveWhatsAppDurableReplyToId({
+						context: params.context,
+						info,
+						msg: params.msg,
+						payload
+					}),
+					formatting: {
+						textLimit,
+						tableMode,
+						chunkMode
 					}
-				}
+				};
+			},
+			deliver: async (payload, info) => {
+				const normalizedDeliveryPayload = payload;
+				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);
 				if (shouldDeferWhatsAppMediaOnlyPayload({
 					info,
 					mediaUrls,
 					reply
-				})) {
-					mediaOnlyCoalescer.defer({
+				})) return {
+					visibleReplySent: false,
+					finalization: mediaOnlyCoalescer.defer({
 						info,
 						mediaUrls,
 						payload: normalizedDeliveryPayload
-					});
-					return whatsAppReplyDeliveryVisibility(false);
-				}
-				const flushResult = await mediaOnlyCoalescer.flushExceptDuplicateMedia(mediaUrls);
-				logWhatsAppMediaOnlyFlushResult(flushResult);
+					})
+				};
 				try {
-					const deliveryResult = await deliverNormalizedPayload(normalizedDeliveryPayload, info);
-					return flushResult.delivered > 0 && !deliveryResult.visibleReplySent ? whatsAppReplyDeliveryVisibility(true) : deliveryResult;
+					const result = await deliverNormalizedPayload(normalizedDeliveryPayload, info);
+					if (result.visibleReplySent) logWhatsAppMediaOnlyFlushResult(mediaOnlyCoalescer.dropDuplicateMedia(mediaUrls));
+					return result;
 				} catch (error) {
-					throw markWhatsAppReplyDeliveryErrorVisibleAfterFlush(error, flushResult);
+					if (isWhatsAppVisibleDeliveryError(error)) logWhatsAppMediaOnlyFlushResult(mediaOnlyCoalescer.dropDuplicateMedia(mediaUrls));
+					throw error;
 				}
 			},
+			onDelivered: (payload, _info, result) => {
+				if (!resolveSendableOutboundReplyParts(payload).hasMedia && result?.visibleReplySent === true) recordDeliveredPayload(payload);
+			},
 			onError: (err, info) => {
+				if (didSendReply) markWhatsAppVisibleDeliveryError(err);
 				logWhatsAppReplyDeliveryError({
 					err,
 					info,
@@ -3182,7 +3165,7 @@ function createWhatsAppReplyPlan(params) {
 		finalize: (dispatchResult) => {
 			const didQueueVisibleReply = hasVisibleInboundReplyDispatch(dispatchResult);
 			const didDeliverVisibleReply = didSendReply || dispatchResult.observedReplyDelivery === true;
-			if (!didQueueVisibleReply) {
+			if (!didQueueVisibleReply && !didDeliverVisibleReply) {
 				if (statusReactionController) finalizeWhatsAppStatusReaction({
 					controller: statusReactionController,
 					outcome: "error"
@@ -3264,65 +3247,29 @@ function buildInboundLine(params) {
 async function createWhatsAppStatusReactionController(params) {
 	if (!params.msg.event.id) return null;
 	if ((params.cfg.messages?.statusReactions)?.enabled !== true) return null;
-	const admission = requireWhatsAppInboundAdmission(params.msg);
-	const accountId = admission.accountId;
-	if (resolveWhatsAppReactionLevel({
-		cfg: params.cfg,
-		accountId
-	}).level === "off") return null;
-	const ackConfig = params.cfg.messages?.ackReaction;
-	const scope = params.cfg.messages?.ackReactionScope ?? "group-mentions";
-	if (scope === "off" || scope === "none") return null;
-	const ackEmoji = resolveWhatsAppAckEmoji({
-		cfg: params.cfg,
-		agentId: params.agentId,
-		ackConfig
-	});
-	if (!ackEmoji) return null;
-	const directEnabled = scope === "all" || scope === "direct";
-	const groupMode = scope === "all" || scope === "group-all" ? "always" : scope === "direct" ? "never" : "mentions";
-	const isGroup = admission.conversation.kind === "group";
-	const conversationIdForCheck = admission.conversation.id;
-	const activation = isGroup ? await resolveGroupActivationFor({
+	const eligibility = await resolveWhatsAppReactionEligibility({
 		cfg: params.cfg,
-		accountId,
+		msg: params.msg,
 		agentId: params.agentId,
 		sessionKey: params.sessionKey,
-		conversationId: conversationIdForCheck
-	}) : null;
-	if (!shouldAckReactionForWhatsApp({
-		emoji: ackEmoji,
-		isDirect: admission.conversation.kind === "direct",
-		isGroup,
-		directEnabled,
-		groupMode,
-		wasMentioned: (params.msg.groupMention?.wasMentioned ?? params.msg.wasMentioned) === true,
-		groupActivated: activation === "always"
-	})) return null;
-	const participant = resolveReactionParticipant(params.msg);
-	const reactionOptions = {
-		verbose: params.verbose,
-		fromMe: false,
-		...participant ? { participant } : {},
-		accountId,
-		cfg: params.cfg
-	};
-	const chatId = params.msg.platform.chatJid;
-	const msgId = params.msg.event.id;
+		verbose: params.verbose
+	});
+	if (eligibility.status === "disabled") return null;
+	const { chatId, messageId, emoji: initialEmoji, reactionOptions } = eligibility;
 	return createStatusReactionController({
 		enabled: true,
 		adapter: {
 			setReaction: async (emoji) => {
-				await sendReactionWhatsApp(chatId, msgId, emoji, reactionOptions);
+				await sendReactionWhatsApp(chatId, messageId, emoji, reactionOptions);
 			},
 			clearReaction: async () => {
-				await sendReactionWhatsApp(chatId, msgId, "", reactionOptions);
+				await sendReactionWhatsApp(chatId, messageId, "", reactionOptions);
 			}
 		},
-		initialEmoji: ackEmoji,
+		initialEmoji,
 		emojis: void 0,
 		onError: (err) => {
-			logVerbose(`WhatsApp status-reaction error for chat ${chatId}/${msgId}: ${String(err)}`);
+			logVerbose(`WhatsApp status-reaction error for chat ${chatId}/${messageId}: ${String(err)}`);
 		}
 	});
 }
@@ -3998,23 +3945,11 @@ function resolveWebMonitorConfigSnapshot(params) {
 		account
 	};
 }
-function normalizeReconnectAccountId(accountId) {
-	return (accountId ?? "").trim() || "default";
-}
 function isNoListenerReconnectError(lastError) {
 	return typeof lastError === "string" && /No active WhatsApp Web listener/i.test(lastError);
 }
-function resolveExplicitWhatsAppDebounceOverride(params) {
-	const channel = params.sourceCfg?.channels?.whatsapp;
-	if (!channel) return;
-	const accountId = normalizeReconnectAccountId(params.accountId);
-	const accountDebounce = resolveAccountEntry(channel.accounts, accountId)?.debounceMs;
-	if (accountDebounce !== void 0) return accountDebounce;
-	if (accountId !== "default") {
-		const defaultAccountDebounce = resolveAccountEntry(channel.accounts, "default")?.debounceMs;
-		if (defaultAccountDebounce !== void 0) return defaultAccountDebounce;
-	}
-	return channel.debounceMs;
+function normalizeReconnectAccountId(accountId) {
+	return (accountId ?? "").trim() || "default";
 }
 function isRetryableAuthUnstableError(error) {
 	return error instanceof WhatsAppAuthUnstableError || typeof error === "object" && error !== null && "code" in error && error.code === "whatsapp-auth-unstable";
@@ -4036,10 +3971,8 @@ async function monitorWebChannel(verbose, listenerFactory = attachWebInboxToSock
 		module: "web-reconnect",
 		runId
 	});
-	const baseCfg = getRuntimeConfig$1();
-	const sourceCfg = getRuntimeConfigSourceSnapshot();
 	const { cfg, account } = resolveWebMonitorConfigSnapshot({
-		cfg: baseCfg,
+		cfg: getRuntimeConfig$1(),
 		accountId: tuning.accountId
 	});
 	const loadCurrentMonitorConfig = () => resolveWebMonitorConfigSnapshot({
@@ -4097,12 +4030,7 @@ async function monitorWebChannel(verbose, listenerFactory = attachWebInboxToSock
 			const connectionId = newConnectionId();
 			const inboundDebounceMs = resolveInboundDebounceMs({
 				cfg,
-				channel: "whatsapp",
-				overrideMs: resolveExplicitWhatsAppDebounceOverride({
-					cfg,
-					sourceCfg,
-					accountId: account.accountId
-				})
+				channel: "whatsapp"
 			});
 			const shouldDebounce = (msg) => {
 				const normalized = normalizeWebInboundMessage(msg);