@openclaw/whatsapp 2026.9.8 → 2026.10.1-beta.2

package/dist/.setup/{group-config-path-DZr3ucUO.mjs → group-config-path-BPrak_bJ.mjs}

@@ -1,16 +1,10 @@
-import { DEFAULT_ACCOUNT_ID } from "openclaw/plugin-sdk/account-core";
+import { DEFAULT_ACCOUNT_ID, resolveAccountKey } from "openclaw/plugin-sdk/account-resolution";
 //#region extensions/whatsapp/src/group-config-path.ts
 const WHATSAPP_GROUP_SCOPE_FIELDS = [
 	"groupPolicy",
 	"groupAllowFrom",
 	"groups"
 ];
-function resolveWhatsAppAccountKey(accounts, accountId) {
-	if (!accounts) return;
-	if (Object.hasOwn(accounts, accountId)) return accountId;
-	const normalizedAccountId = accountId.trim().toLowerCase();
-	return Object.keys(accounts).find((key) => key.trim().toLowerCase() === normalizedAccountId);
-}
 function normalizePathAccountId(accountId) {
 	return typeof accountId === "string" ? accountId.trim() || DEFAULT_ACCOUNT_ID : DEFAULT_ACCOUNT_ID;
 }
@@ -21,8 +15,8 @@ function resolveWhatsAppGroupScopeBasePath(params, fields = WHATSAPP_GROUP_SCOPE
 	const accountId = normalizePathAccountId(params.accountId);
 	const whatsapp = params.cfg.channels?.whatsapp;
 	const accounts = whatsapp?.accounts;
-	const accountKey = resolveWhatsAppAccountKey(accounts, accountId);
-	const defaultAccountKey = resolveWhatsAppAccountKey(accounts, DEFAULT_ACCOUNT_ID);
+	const accountKey = resolveAccountKey(accounts, accountId);
+	const defaultAccountKey = resolveAccountKey(accounts, DEFAULT_ACCOUNT_ID);
 	const accountConfig = accountKey ? accounts?.[accountKey] : void 0;
 	const defaultAccountConfig = defaultAccountKey ? accounts?.[defaultAccountKey] : void 0;
 	const hasField = (config) => fields.some((field) => hasConfiguredField(config, field));

package/dist/.setup/{group-session-key-2-mja4OF.mjs → group-session-key-BV8Le9r8.mjs}

@@ -1,9 +1,10 @@
-import { a as resolveWhatsAppAccount } from "./accounts-CtRPAQCL.mjs";
+import { a as resolveWhatsAppAccount } from "./accounts-F0vHuze2.mjs";
 import { c as normalizeWhatsAppTarget } from "./normalize-target-BGra1ZnM.mjs";
-import { r as jidToE164 } from "./targets-runtime-DmiqXIXO.mjs";
+import { r as jidToE164 } from "./targets-runtime-Dls-Xh4F.mjs";
 import { formatMediaPlaceholderText } from "openclaw/plugin-sdk/channel-inbound";
 import { createChannelApprovalAuth } from "openclaw/plugin-sdk/approval-auth-runtime";
 import { isHostedLidUser, isHostedPnUser, isLidUser, isPnUser } from "baileys";
+import { pruneMapToMaxSize } from "openclaw/plugin-sdk/collection-runtime";
 import { DEFAULT_ACCOUNT_ID, normalizeAccountId, resolveThreadSessionKeys } from "openclaw/plugin-sdk/routing";
 //#region extensions/whatsapp/src/approval-auth.ts
 function normalizeWhatsAppApproverId(value) {
@@ -31,17 +32,13 @@ const whatsappApprovalAuth = whatsappApproval.approvalAuth;
 //#endregion
 //#region extensions/whatsapp/src/quoted-message.ts
 const CACHE_TTL_MS = 6e5;
-const MAX_ENTRIES = 500;
 const cache = /* @__PURE__ */ new Map();
 function makeCacheKey(accountId, remoteJid, messageId) {
 	return `${accountId}:${remoteJid}:${messageId}`;
 }
 function cacheInboundMessageMeta(accountId, remoteJid, messageId, meta) {
 	if (!accountId || !messageId || !remoteJid) return;
-	if (cache.size >= MAX_ENTRIES) {
-		const oldest = cache.keys().next().value;
-		if (oldest) cache.delete(oldest);
-	}
+	pruneMapToMaxSize(cache, 499);
 	cache.set(makeCacheKey(accountId, remoteJid, messageId), {
 		...meta,
 		ts: Date.now()
@@ -164,12 +161,6 @@ function resolveWhatsAppGroupSessionKey(params) {
 		threadId: resolveWhatsAppGroupAccountThreadId(accountId)
 	}).sessionKey;
 }
-function resolveWhatsAppLegacyGroupSessionKey(params) {
-	const accountId = normalizeAccountId(params.accountId);
-	if (!accountId || accountId === DEFAULT_ACCOUNT_ID || !params.sessionKey.includes(":group:")) return null;
-	const suffix = `:thread:${resolveWhatsAppGroupAccountThreadId(accountId)}`;
-	return params.sessionKey.endsWith(suffix) ? params.sessionKey.slice(0, -suffix.length) : null;
-}
 function resolveWhatsAppGroupSessionRoute(route) {
 	const sessionKey = resolveWhatsAppGroupSessionKey(route);
 	if (sessionKey === route.sessionKey) return route;
@@ -179,4 +170,4 @@ function resolveWhatsAppGroupSessionRoute(route) {
 	};
 }
 //#endregion
-export { cacheInboundMessageMeta as a, getWhatsAppApprovalApprovers as c, buildQuotedMessageOptions as i, whatsappApprovalAuth as l, resolveWhatsAppGroupSessionRoute as n, lookupInboundMessageMeta as o, resolveWhatsAppLegacyGroupSessionKey as r, lookupInboundMessageMetaForTarget as s, resolveWhatsAppGroupSessionKey as t };
+export { lookupInboundMessageMeta as a, whatsappApprovalAuth as c, cacheInboundMessageMeta as i, resolveWhatsAppGroupSessionRoute as n, lookupInboundMessageMetaForTarget as o, buildQuotedMessageOptions as r, getWhatsAppApprovalApprovers as s, resolveWhatsAppGroupSessionKey as t };

package/dist/.setup/{login-BFlvSh9h.mjs → login-CV_4V021.mjs}

@@ -1,8 +1,8 @@
 import { t as __exportAll } from "./rolldown-runtime-BBjsoOtd.mjs";
-import { a as resolveWhatsAppAccount } from "./accounts-CtRPAQCL.mjs";
-import { b as restoreCredsFromBackupIfNeeded } from "./auth-store-BBonwKks.mjs";
-import { _ as renderQrTerminal, h as resolveWhatsAppSocketTiming, r as createWaSocket } from "./socket-close-CT__V2fz.mjs";
-import { a as closeWaSocketSoon, o as waitForWhatsAppLoginResult } from "./connection-controller-CHo1oRJA.mjs";
+import { a as resolveWhatsAppAccount } from "./accounts-F0vHuze2.mjs";
+import { y as restoreCredsFromBackupIfNeeded } from "./auth-store-D2rN-hP5.mjs";
+import { _ as renderQrTerminal, h as resolveWhatsAppSocketTiming, r as createWaSocket } from "./socket-close-DU7eerAa.mjs";
+import { a as closeWaSocketSoon, o as waitForWhatsAppLoginResult } from "./connection-controller-COkcq48K.mjs";
 import { formatCliCommand } from "openclaw/plugin-sdk/cli-runtime";
 import { logInfo } from "openclaw/plugin-sdk/logging-core";
 import { danger, defaultRuntime, success } from "openclaw/plugin-sdk/runtime-env";

package/dist/.setup/{login-qr-Ayb8i25J.mjs → login-qr-DFhGc5yH.mjs}

@@ -1,13 +1,14 @@
-import { a as resolveWhatsAppAccount } from "./accounts-CtRPAQCL.mjs";
-import { c as logoutWeb, f as readWebAuthExistsForDecision, g as readWebSelfId, n as WHATSAPP_AUTH_UNSTABLE_CODE } from "./auth-store-BBonwKks.mjs";
+import { a as resolveWhatsAppAccount } from "./accounts-F0vHuze2.mjs";
+import { c as logoutWeb, d as readWebAuthExistsForDecision, h as readWebSelfId, n as WHATSAPP_AUTH_UNSTABLE_CODE } from "./auth-store-D2rN-hP5.mjs";
 import { t as getActiveWebListener } from "./active-listener-CDjoX9QR.mjs";
-import { h as resolveWhatsAppSocketTiming, r as createWaSocket } from "./socket-close-CT__V2fz.mjs";
+import { h as resolveWhatsAppSocketTiming, r as createWaSocket } from "./socket-close-DU7eerAa.mjs";
 import { t as formatError } from "./session-errors-B8UcAnZN.mjs";
-import { i as closeWaSocket, o as waitForWhatsAppLoginResult, t as WHATSAPP_LOGGED_OUT_QR_MESSAGE } from "./connection-controller-CHo1oRJA.mjs";
+import { i as closeWaSocket, o as waitForWhatsAppLoginResult, t as WHATSAPP_LOGGED_OUT_QR_MESSAGE } from "./connection-controller-COkcq48K.mjs";
 import { logInfo } from "openclaw/plugin-sdk/logging-core";
 import { danger, defaultRuntime, info, success } from "openclaw/plugin-sdk/runtime-env";
 import { renderQrPngDataUrl } from "openclaw/plugin-sdk/media-runtime";
 import { resolveTimerTimeoutMs } from "openclaw/plugin-sdk/number-runtime";
+import { raceWithTimeout } from "openclaw/plugin-sdk/time-runtime";
 import { createDeferred } from "openclaw/plugin-sdk/extension-shared";
 import { randomUUID } from "node:crypto";
 import { getRuntimeConfig } from "openclaw/plugin-sdk/runtime-config-snapshot";
@@ -187,14 +188,9 @@ async function startWebLoginWithQr(opts = {}) {
 		message: "QR already active. Scan it in WhatsApp → Linked Devices."
 	};
 	await resetActiveLogin(account.accountId);
-	let resolveQr = null;
-	let rejectQr = null;
-	const qrPromise = new Promise((resolve, reject) => {
-		resolveQr = resolve;
-		rejectQr = reject;
-	});
+	const qrReady = createDeferred();
 	const qrTimer = setTimeout(() => {
-		rejectQr?.(/* @__PURE__ */ new Error("Timed out waiting for WhatsApp QR"));
+		qrReady.reject(/* @__PURE__ */ new Error("Timed out waiting for WhatsApp QR"));
 	}, resolveTimerTimeoutMs(opts.timeoutMs, 3e4, 5e3));
 	let sock;
 	let pendingQr = null;
@@ -225,12 +221,8 @@ async function startWebLoginWithQr(opts = {}) {
 						qrVersion
 					});
 				}
-				if (resolveQr) {
-					clearTimeout(qrTimer);
-					resolveQr(qr);
-					resolveQr = null;
-					rejectQr = null;
-				}
+				clearTimeout(qrTimer);
+				qrReady.resolve(qr);
 				runtime.log(info("WhatsApp QR received."));
 			}
 		});
@@ -277,7 +269,7 @@ async function startWebLoginWithQr(opts = {}) {
 	const loginStartResult = await waitForQrOrRecoveredLogin({
 		accountId: account.accountId,
 		login: nextLogin,
-		qrPromise
+		qrPromise: qrReady.promise
 	});
 	clearTimeout(qrTimer);
 	if (loginStartResult.outcome === "connected") {
@@ -369,15 +361,7 @@ async function waitForWebLogin(opts = {}) {
 			connected: false,
 			message: "Still waiting for the QR scan. Let me know when you’ve scanned it."
 		};
-		let timer;
-		const timeout = new Promise((resolve) => {
-			timer = setTimeout(() => resolve("timeout"), remaining);
-		});
-		const result = await Promise.race([
-			login.waitPromise.then(() => "done"),
-			login.qrUpdate.promise.then(() => "qr-update"),
-			timeout
-		]).finally(() => clearTimeout(timer));
+		const result = await raceWithTimeout(Promise.race([login.waitPromise.then(() => "done"), login.qrUpdate.promise.then(() => "qr-update")]), remaining, () => "timeout");
 		if (result === "timeout") return {
 			connected: false,
 			message: "Still waiting for the QR scan. Let me know when you’ve scanned it."

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

@@ -1,21 +1,21 @@
 import { n as __reExport, t as __exportAll } from "./rolldown-runtime-BBjsoOtd.mjs";
-import { a as resolveWhatsAppAccount, s as resolveWhatsAppMediaMaxBytes } from "./accounts-CtRPAQCL.mjs";
-import { c as normalizeWhatsAppPayloadTextPreservingIndentation, d as listWhatsAppSendResultMessageIds, f as mergeWhatsAppAcceptedSendError, g as withWhatsAppLogicalDeliveryActivity, h as rememberWhatsAppPartialSend, l as prepareWhatsAppOutboundMedia, m as rememberWhatsAppAcceptedSend, o as normalizeWhatsAppOutboundPayload, p as normalizeWhatsAppSendResult, r as sendReactionWhatsApp, v as resolveWhatsAppReactionLevel } from "./send-BGdvf5cC.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 { 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-DmiqXIXO.mjs";
-import { a as cacheInboundMessageMeta, i as buildQuotedMessageOptions, n as resolveWhatsAppGroupSessionRoute, o as lookupInboundMessageMeta, r as resolveWhatsAppLegacyGroupSessionKey } from "./group-session-key-2-mja4OF.mjs";
-import { C as getMentionIdentities, D as getSenderIdentity, E as getSelfIdentity, O as identitiesOverlap, S as getComparableIdentityValues, T as getReplyContext, g as readWebSelfId, k as resolveComparableIdentity, o as getWebAuthAgeMs, r as WhatsAppAuthUnstableError, v as readWebSelfIdentityForDecision, w as getPrimaryIdentityId } from "./auth-store-BBonwKks.mjs";
-import { n as resolveWhatsAppGroupsConfigPath } from "./group-config-path-DZr3ucUO.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 } from "./socket-close-CT__V2fz.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 { 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 { 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-H4AkQJjT.mjs";
-import { n as WHATSAPP_WATCHDOG_TIMEOUT_ERROR, r as WhatsAppConnectionController } from "./connection-controller-CHo1oRJA.mjs";
-import { n as maybeResolveWhatsAppApprovalReaction } from "./approval-reactions-DiOFvb1s.mjs";
-import { t as maybeResolveWhatsAppQuestionReaction } from "./question-reactions-CPyyi5AY.mjs";
-import { normalizeLowercaseStringOrEmpty, normalizeOptionalString } from "openclaw/plugin-sdk/string-coerce-runtime";
-import { createAckReactionHandle, createStatusReactionController, logAckFailure, removeAckReactionHandleAfterReply, shouldAckReaction } from "openclaw/plugin-sdk/channel-feedback";
+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 { 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";
 import { formatCliCommand } from "openclaw/plugin-sdk/cli-runtime";
 import { PlatformMessageNotDispatchedError } from "openclaw/plugin-sdk/error-runtime";
@@ -30,9 +30,11 @@ import { isReasoningReplyPayload, resolveSendableOutboundReplyParts, resolveText
 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 { DEFAULT_ACCOUNT_ID, DEFAULT_MAIN_KEY, buildAgentMainSessionKey, buildAgentSessionKey, buildGroupHistoryKey, deriveLastRoutePolicy, normalizeAccountId, resolveAgentRoute, resolveInboundLastRouteSessionKey } from "openclaw/plugin-sdk/routing";
+import { pruneMapToMaxSize } from "openclaw/plugin-sdk/collection-runtime";
+import { DEFAULT_MAIN_KEY, buildAgentMainSessionKey, buildAgentSessionKey, buildGroupHistoryKey, deriveLastRoutePolicy, resolveAgentRoute, resolveInboundLastRouteSessionKey } from "openclaw/plugin-sdk/routing";
 import { asDateTimestampMs, parseStrictFiniteNumber, resolveExpiresAtMsFromDurationMs, resolvePromptHistoryLimit } from "openclaw/plugin-sdk/number-runtime";
 import { filterSupplementalContextItems, resolvePinnedMainDmOwnerFromAllowlist } from "openclaw/plugin-sdk/security-runtime";
+import { raceWithTimeout } from "openclaw/plugin-sdk/time-runtime";
 import { resolveChannelGroupPolicy, resolveChannelGroupRequireMention } from "openclaw/plugin-sdk/channel-policy";
 import { createChannelPairingChallengeIssuer } from "openclaw/plugin-sdk/channel-pairing";
 import { createDeferred } from "openclaw/plugin-sdk/extension-shared";
@@ -42,8 +44,7 @@ import { resolveChunkMode, resolveTextChunkLimit } from "openclaw/plugin-sdk/rep
 import { CHANNEL_APPROVAL_NATIVE_RUNTIME_CONTEXT_CAPABILITY } from "openclaw/plugin-sdk/approval-handler-runtime";
 import { drainPendingDeliveries } from "openclaw/plugin-sdk/delivery-queue-runtime";
 import { enqueueSystemEvent } from "openclaw/plugin-sdk/system-event-runtime";
-import { getSessionEntry, patchSessionEntry, resolveGroupSessionKey, resolveStorePath, resolveStorePath as resolveStorePath$1, updateLastRoute } from "openclaw/plugin-sdk/session-store-runtime";
-import { pruneMapToMaxSize } from "openclaw/plugin-sdk/collection-runtime";
+import { getSessionEntry, resolveGroupSessionKey, resolveStorePath, resolveStorePath as resolveStorePath$1, updateLastRoute } from "openclaw/plugin-sdk/session-store-runtime";
 import { createInboundDebouncer, resolveInboundDebounceMs } from "openclaw/plugin-sdk/channel-inbound-debounce";
 import { fanInChannelIngressLifecycles } from "openclaw/plugin-sdk/channel-ingress-runtime";
 import { saveMediaStream } from "openclaw/plugin-sdk/media-store";
@@ -1488,16 +1489,11 @@ function createWhatsAppMessageDeliveryCoordinator(options) {
 		await durableInboundMonitor.stop();
 	};
 	const drainInboundBeforeSocketCloseWithTimeout = async () => {
-		let timeout = null;
 		try {
-			await Promise.race([drainInboundBeforeSocketClose(), new Promise((_, reject) => {
-				timeout = setTimeout(() => {
-					reject(/* @__PURE__ */ new Error(`Timed out draining WhatsApp inbound debounce after ${INBOUND_CLOSE_DRAIN_TIMEOUT_MS}ms`));
-				}, INBOUND_CLOSE_DRAIN_TIMEOUT_MS);
-				timeout.unref?.();
-			})]);
+			await raceWithTimeout(drainInboundBeforeSocketClose(), INBOUND_CLOSE_DRAIN_TIMEOUT_MS, () => {
+				throw new Error(`Timed out draining WhatsApp inbound debounce after ${INBOUND_CLOSE_DRAIN_TIMEOUT_MS}ms`);
+			}, { ref: false });
 		} finally {
-			if (timeout) clearTimeout(timeout);
 			durableInboundMonitor.stop();
 		}
 	};
@@ -1674,7 +1670,7 @@ async function createWhatsAppAttachedSocketSession(options) {
 			const delayMs = computeBackoff(disconnectRetryPolicy, attempt);
 			options.logVerbose(`Waiting ${delayMs}ms for WhatsApp reconnect before retrying send to ${jid}: ${formatError(lastError)}`);
 			try {
-				await sleepWithAbort(delayMs, options.disconnectRetryAbortSignal);
+				await sleepWithAbort$1(delayMs, options.disconnectRetryAbortSignal);
 			} catch {
 				throw lastError;
 			}
@@ -1769,16 +1765,7 @@ async function attachWebInboxToSocket(options) {
 	const inboundLogger = getChildLogger({ module: "web-inbound" });
 	const inboundConsoleLog = createSubsystemLogger$1("gateway/channels/whatsapp").child("inbound");
 	const socketSession = await createWhatsAppAttachedSocketSession({
-		sock: options.sock,
-		socketRef: options.socketRef,
-		accountId: options.accountId,
-		authDir: options.authDir,
-		selfChatMode: options.selfChatMode,
-		socketTiming: options.socketTiming,
-		shouldRetryDisconnect: options.shouldRetryDisconnect,
-		disconnectRetryPolicy: options.disconnectRetryPolicy,
-		disconnectRetryAbortSignal: options.disconnectRetryAbortSignal,
-		recentMessageKeys: options.recentMessageKeys,
+		...options,
 		logVerbose: (message) => logWhatsAppVerbose(options.verbose, message),
 		logConnectionError: (error) => {
 			inboundLogger.error({ error: String(error) }, "connection.update handler error");
@@ -1798,21 +1785,9 @@ async function attachWebInboxToSocket(options) {
 		}
 	});
 	const delivery = createWhatsAppMessageDeliveryCoordinator({
-		cfg: options.cfg,
-		loadConfig: options.loadConfig,
-		verbose: options.verbose,
-		accountId: options.accountId,
-		sock: options.sock,
+		...options,
 		socketSession,
-		groupMetadata,
-		onMessage: options.onMessage,
-		mediaMaxMb: options.mediaMaxMb,
-		sendReadReceipts: options.sendReadReceipts,
-		debounceMs: options.debounceMs,
-		appendReplyWindow: options.appendReplyWindow,
-		shouldDebounce: options.shouldDebounce,
-		onPendingWorkChanged: options.onPendingWorkChanged,
-		durableInboundQueue: options.durableInboundQueue
+		groupMetadata
 	});
 	const sendApi = createWebSendApi({
 		sock: socketSession.socketOperations,
@@ -2055,15 +2030,8 @@ function isBotMentionedFromTargets(msg, mentionCfg, targets) {
 	const bodyClean = (0, channel_mention_gating_exports.normalizeMentionText)(msg.payload.body);
 	if (mentionCfg.mentionRegexes.some((re) => re.test(bodyClean))) return true;
 	if (hasNativeMentionsOutsideSelfChat) return false;
-	if (targets.self.e164) {
-		const selfDigits = targets.self.e164.replace(/\D/g, "");
-		if (selfDigits) {
-			if (bodyClean.replace(/[^\d]/g, "").includes(selfDigits)) return true;
-			const bodyNoSpace = msg.payload.body.replace(/[\s-]/g, "");
-			if (new RegExp(`\\+?${selfDigits}`, "i").test(bodyNoSpace)) return true;
-		}
-	}
-	return false;
+	const selfDigits = targets.self.e164?.replace(/\D/g, "");
+	return Boolean(selfDigits && bodyClean.replace(/\D/g, "").includes(selfDigits));
 }
 function debugMention(msg, mentionCfg, authDir) {
 	const mentionTargets = {
@@ -2094,57 +2062,22 @@ function resolveOwnerList(mentionCfg, selfE164) {
 const DEFAULT_WHATSAPP_ACK_REACTION = "👀";
 function resolveWhatsAppAckEmoji(params) {
 	if (!params.ackConfig) return "";
-	return (typeof params.ackConfig === "string" ? params.ackConfig : params.ackConfig.emoji)?.trim() || resolveAgentIdentityEmoji(params.cfg, params.agentId) || DEFAULT_WHATSAPP_ACK_REACTION;
-}
-function resolveAgentIdentityEmoji(cfg, agentId) {
-	return resolveAgentIdentity(cfg, agentId)?.emoji?.trim() || void 0;
+	return (typeof params.ackConfig === "string" ? params.ackConfig : params.ackConfig.emoji)?.trim() || resolveAgentIdentity(params.cfg, params.agentId)?.emoji?.trim() || DEFAULT_WHATSAPP_ACK_REACTION;
 }
 //#endregion
 //#region extensions/whatsapp/src/auto-reply/monitor/group-activation.ts
-function hasNamedWhatsAppAccounts(cfg) {
-	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";
-}
-/** Resolves group activation for a WhatsApp conversation and backfills scoped session metadata. */
 async function resolveGroupActivationFor(params) {
-	const sessionScope = {
-		storePath: resolveStorePath(params.cfg.session?.store, { agentId: params.agentId }),
-		agentId: params.agentId
-	};
-	const legacySessionKey = resolveWhatsAppLegacyGroupSessionKey({
-		sessionKey: params.sessionKey,
-		accountId: params.accountId
-	});
-	const legacyEntry = legacySessionKey ? getSessionEntry({
-		...sessionScope,
-		sessionKey: legacySessionKey
-	}) : void 0;
-	const scopedEntry = getSessionEntry({
-		...sessionScope,
+	const storePath = resolveStorePath(params.cfg.session?.store, { agentId: params.agentId });
+	const entry = getSessionEntry({
+		storePath,
+		agentId: params.agentId,
 		sessionKey: params.sessionKey
 	});
-	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,
-			sessionKey: params.sessionKey,
-			replaceEntry: true,
-			update: (entry) => {
-				if (entry.groupActivation !== void 0) return null;
-				return {
-					...entry,
-					groupActivation: activation
-				};
-			}
-		});
-	}
 	const defaultActivation = !resolveWhatsAppInboundPolicy({
 		cfg: params.cfg,
 		accountId: params.accountId
 	}).resolveConversationRequireMention(params.conversationId) ? "always" : "mention";
-	return normalizeGroupActivation(activation) ?? defaultActivation;
+	return normalizeGroupActivation(entry?.groupActivation) ?? defaultActivation;
 }
 //#endregion
 //#region extensions/whatsapp/src/auto-reply/monitor/reaction-participant.ts
@@ -2346,17 +2279,9 @@ function stripMentionsForCommand(text, mentionRegexes, selfE164) {
 }
 //#endregion
 //#region extensions/whatsapp/src/auto-reply/monitor/group-members.ts
-function appendNormalizedUnique(entries, seen, ordered) {
-	for (const entry of entries) {
-		const normalized = normalizeE164(entry) ?? entry;
-		if (!normalized || seen.has(normalized)) continue;
-		seen.add(normalized);
-		ordered.push(normalized);
-	}
-}
 function noteGroupMember(groupMemberNames, conversationId, e164, name) {
 	if (!e164 || !name) return;
-	const key = normalizeE164(e164) ?? e164;
+	const key = normalizeE164(e164);
 	if (!key) return;
 	let roster = groupMemberNames.get(conversationId);
 	if (!roster) {
@@ -2367,12 +2292,9 @@ function noteGroupMember(groupMemberNames, conversationId, e164, name) {
 }
 function formatGroupMembers(params) {
 	const { participants, roster, fallbackE164 } = params;
-	const seen = /* @__PURE__ */ new Set();
-	const ordered = [];
-	if (participants?.length) appendNormalizedUnique(participants, seen, ordered);
-	if (roster) appendNormalizedUnique(roster.keys(), seen, ordered);
+	const ordered = uniqueStrings([...participants ?? [], ...roster?.keys() ?? []].map(normalizeE164).filter(Boolean));
 	if (ordered.length === 0 && fallbackE164) {
-		const normalized = normalizeE164(fallbackE164) ?? fallbackE164;
+		const normalized = normalizeE164(fallbackE164);
 		if (normalized) ordered.push(normalized);
 	}
 	if (ordered.length === 0) return;
@@ -2392,7 +2314,8 @@ function isOwnerSender(baseMentionConfig, msg, authDir) {
 	if (!sender) return false;
 	return resolveOwnerList(baseMentionConfig, getSelfIdentity(msg, authDir).e164 ?? void 0).includes(sender);
 }
-function recordPendingGroupHistoryEntry(params) {
+function skipGroupMessageAndStoreHistory(params, verboseMessage, body) {
+	params.logVerbose(verboseMessage);
 	const senderIdentity = getSenderIdentity(params.msg);
 	const sender = senderIdentity.name && senderIdentity.e164 ? `${senderIdentity.name} (${senderIdentity.e164})` : senderIdentity.name ?? senderIdentity.e164 ?? getPrimaryIdentityId(senderIdentity) ?? "Unknown";
 	createChannelHistoryWindow({ historyMap: params.groupHistories }).record({
@@ -2400,7 +2323,7 @@ function recordPendingGroupHistoryEntry(params) {
 		limit: params.groupHistoryLimit,
 		entry: {
 			sender,
-			body: params.body ?? params.msg.payload.body,
+			body: body ?? params.msg.payload.body,
 			timestamp: params.msg.event.timestamp,
 			id: params.msg.event.id,
 			senderJid: senderIdentity.jid ?? params.msg.platform.senderJid,
@@ -2412,16 +2335,6 @@ function recordPendingGroupHistoryEntry(params) {
 			}] } : {}
 		}
 	});
-}
-function skipGroupMessageAndStoreHistory(params, verboseMessage, body) {
-	params.logVerbose(verboseMessage);
-	recordPendingGroupHistoryEntry({
-		msg: params.msg,
-		body,
-		groupHistories: params.groupHistories,
-		groupHistoryKey: params.groupHistoryKey,
-		groupHistoryLimit: params.groupHistoryLimit
-	});
 	return { shouldProcess: false };
 }
 async function applyGroupGating(params) {
@@ -2659,7 +2572,7 @@ function elide(text, limit = 400) {
 	return `${truncated}… (truncated ${text.length - truncated.length} chars)`;
 }
 function markWhatsAppVisibleDeliveryError(error) {
-	if (typeof error === "object" && error !== null && !Array.isArray(error)) try {
+	if (isRecord(error)) try {
 		Object.assign(error, {
 			sentBeforeError: true,
 			visibleReplySent: true
@@ -3062,10 +2975,7 @@ function createWhatsAppChannelDeliveryResult(params) {
 	};
 }
 function isWhatsAppVisibleDeliveryError(error) {
-	return typeof error === "object" && error !== null && !Array.isArray(error) && error.visibleReplySent === true || isChannelPartialDeliveryError(error) && error.deliveryResult.visibleReplySent;
-}
-function readTrimmedString(value) {
-	return normalizeOptionalString(value) ?? "";
+	return isRecord(error) && error.visibleReplySent === true || isChannelPartialDeliveryError(error) && error.deliveryResult.visibleReplySent;
 }
 function markWhatsAppReplyDeliveryErrorVisibleAfterFlush(error, flushResult) {
 	if (flushResult.delivered === 0) return error;
@@ -3086,10 +2996,10 @@ function logWhatsAppReplyDeliveryError(params) {
 }
 function resolveWhatsAppDurableReplyToId(params) {
 	if (params.payload.replyToId === null) return null;
-	const explicitPayloadReplyToId = readTrimmedString(params.payload.replyToId);
+	const explicitPayloadReplyToId = normalizeOptionalString(params.payload.replyToId);
 	if (explicitPayloadReplyToId) return explicitPayloadReplyToId;
-	const hasVisibleInboundReplyTarget = Boolean(readTrimmedString(params.context.ReplyToId)) || Boolean(readTrimmedString(params.context.ReplyToIdFull));
-	const currentInboundMessageId = readTrimmedString(params.currentMessageId);
+	const hasVisibleInboundReplyTarget = Boolean(normalizeOptionalString(params.context.ReplyToId)) || Boolean(normalizeOptionalString(params.context.ReplyToIdFull));
+	const currentInboundMessageId = normalizeOptionalString(params.currentMessageId);
 	if (params.info.kind === "final" && hasVisibleInboundReplyTarget && currentInboundMessageId) return currentInboundMessageId;
 	return null;
 }
@@ -3689,30 +3599,22 @@ async function processMessage(params) {
 	}) : void 0;
 	if (conversationKind === "group") {
 		const history = visibleGroupHistory ?? [];
-		if (history.length > 0) {
-			const historyEntries = history.map((m) => ({
-				sender: m.sender,
-				body: m.body,
-				timestamp: m.timestamp,
-				media: m.media
-			}));
-			combinedBody = buildHistoryContextFromEntries({
-				entries: historyEntries,
-				currentMessage: combinedBody,
-				excludeLast: false,
-				formatEntry: (entry) => {
-					return formatInboundEnvelope$1({
-						channel: "WhatsApp",
-						from: conversationId,
-						timestamp: entry.timestamp,
-						body: [entry.body, formatMediaPlaceholderText(entry.media ?? [])].filter(Boolean).join("\n"),
-						chatType: "group",
-						senderLabel: entry.sender,
-						envelope: envelopeOptions
-					});
-				}
-			});
-		}
+		if (history.length > 0) combinedBody = buildHistoryContextFromEntries({
+			entries: history,
+			currentMessage: combinedBody,
+			excludeLast: false,
+			formatEntry: (entry) => {
+				return formatInboundEnvelope$1({
+					channel: "WhatsApp",
+					from: conversationId,
+					timestamp: entry.timestamp,
+					body: [entry.body, formatMediaPlaceholderText(entry.media ?? [])].filter(Boolean).join("\n"),
+					chatType: "group",
+					senderLabel: entry.sender,
+					envelope: envelopeOptions
+				});
+			}
+		});
 	}
 	const statusReactionController = params.statusReactionController ?? (params.cfg.messages?.statusReactions?.enabled === true && !params.ackAlreadySent ? await createWhatsAppStatusReactionController({
 		cfg: params.cfg,
@@ -3722,8 +3624,7 @@ async function processMessage(params) {
 		verbose: params.verbose
 	}) : null);
 	if (statusReactionController && !params.statusReactionController) statusReactionController.setQueued();
-	let ackReaction = params.ackReaction ?? null;
-	if (!statusReactionController && !ackReaction && params.ackAlreadySent !== true) ackReaction = await maybeSendAckReaction({
+	if (!statusReactionController && !params.ackReaction && params.ackAlreadySent !== true) await maybeSendAckReaction({
 		cfg: params.cfg,
 		msg: params.msg,
 		agentId: params.route.agentId,
@@ -3895,20 +3796,7 @@ async function processMessage(params) {
 			}
 		}
 	});
-	const didSendReply = turnResult.dispatched ? finalizeReply?.(turnResult.dispatchResult) ?? false : false;
-	removeAckReactionHandleAfterReply({
-		removeAfterReply: false,
-		ackReaction,
-		onError: (err) => {
-			logAckFailure({
-				log: logVerbose$1,
-				channel: "whatsapp",
-				target: `${params.msg.platform.chatJid ?? conversationId}/${params.msg.event.id ?? "unknown"}`,
-				error: err
-			});
-		}
-	});
-	return didSendReply;
+	return turnResult.dispatched ? finalizeReply?.(turnResult.dispatchResult) ?? false : false;
 }
 //#endregion
 //#region extensions/whatsapp/src/auto-reply/monitor/on-message.ts
@@ -3931,21 +3819,12 @@ function createWebOnMessageHandler(params) {
 	};
 	const processForRoute = async (cfg, msg, route, groupHistoryKey, opts) => {
 		return processMessage({
+			...params,
 			cfg,
 			msg,
 			route,
 			groupHistoryKey,
-			groupHistories: params.groupHistories,
-			groupHistoryLimit: params.groupHistoryLimit,
-			groupMemberNames: params.groupMemberNames,
-			connectionId: params.connectionId,
-			verbose: params.verbose,
-			maxMediaBytes: params.maxMediaBytes,
-			replyResolver: params.replyResolver,
-			replyLogger: params.replyLogger,
-			backgroundTasks: params.backgroundTasks,
 			buildContext: params.buildContext,
-			dispatchReplyFromConfig: params.dispatchReplyFromConfig,
 			...opts
 		});
 	};
@@ -4217,8 +4096,8 @@ async function monitorWebChannel(verbose, listenerFactory = attachWebInboxToSock
 		accountId: account.accountId
 	}).cfg;
 	const maxMediaBytes = resolveWhatsAppMediaMaxBytes(account);
-	const heartbeatSeconds = resolveHeartbeatSeconds(cfg, tuning.heartbeatSeconds);
-	const reconnectPolicy = resolveReconnectPolicy(cfg, tuning.reconnect);
+	const heartbeatSeconds = resolveHeartbeatSeconds(tuning.heartbeatSeconds);
+	const reconnectPolicy = resolveReconnectPolicy(tuning.reconnect);
 	const socketTiming = resolveWhatsAppSocketTiming(tuning.socketTiming);
 	const groupHistoryLimit = resolvePromptHistoryLimit(account.historyLimit ?? cfg.channels?.whatsapp?.historyLimit ?? cfg.messages?.groupChat?.historyLimit);
 	const groupHistories = /* @__PURE__ */ new Map();
@@ -4226,7 +4105,7 @@ async function monitorWebChannel(verbose, listenerFactory = attachWebInboxToSock
 	const groupMetadataCache = /* @__PURE__ */ new Map();
 	const recentMessageKeys = /* @__PURE__ */ new Map();
 	const baileysGroupMetaCache = /* @__PURE__ */ new Map();
-	const sleep = tuning.sleep ?? ((ms, signal) => sleepWithAbort(ms, signal ?? abortSignal));
+	const sleep = tuning.sleep ?? ((ms, signal) => sleepWithAbort$1(ms, signal ?? abortSignal));
 	const stopRequested = () => abortSignal?.aborted === true;
 	const currentMaxListeners = process.getMaxListeners?.() ?? 10;
 	if (process.setMaxListeners && currentMaxListeners < 50) process.setMaxListeners(50);