@openclaw/whatsapp 2026.5.28 → 2026.5.31-beta.1

package/dist/{access-control-Z0fYaWrx.js → access-control-C53zKYSN.js}

@@ -1,4 +1,4 @@
-import { a as resolveWhatsAppAccount } from "./accounts-BMGM1RtF.js";
+import { a as resolveWhatsAppAccount } from "./accounts-DgViSyJx.js";
 import { l as isSelfChatMode, n as normalizeE164 } from "./text-runtime-Dk37KYHj.js";
 import { a as getSelfIdentity, o as getSenderIdentity } from "./identity-xoLLdqEv.js";
 import { defaultRuntime } from "openclaw/plugin-sdk/runtime-env";

package/dist/{accounts-BMGM1RtF.js → accounts-DgViSyJx.js}

@@ -86,6 +86,7 @@ function resolveWhatsAppAccount(params) {
 		allowFrom: merged.allowFrom,
 		groupAllowFrom: merged.groupAllowFrom,
 		groupPolicy: merged.groupPolicy,
+		mentionPatterns: merged.mentionPatterns,
 		historyLimit: merged.historyLimit,
 		textChunkLimit: merged.textChunkLimit,
 		chunkMode: merged.chunkMode,

package/dist/{action-runtime-BdhkGtaP.js → action-runtime-Cyp5GNIT.js}

@@ -1,6 +1,6 @@
-import { a as resolveWhatsAppAccount } from "./accounts-BMGM1RtF.js";
+import { a as resolveWhatsAppAccount } from "./accounts-DgViSyJx.js";
 import { t as resolveWhatsAppOutboundTarget } from "./resolve-outbound-target-CcdugbDf.js";
-import { g as resolveWhatsAppReactionLevel, r as sendReactionWhatsApp } from "./send-C4LG-Cl6.js";
+import { g as resolveWhatsAppReactionLevel, r as sendReactionWhatsApp } from "./send-DSlVXKL_.js";
 import { ToolAuthorizationError, createActionGate, jsonResult, readReactionParams, readStringParam } from "openclaw/plugin-sdk/channel-actions";
 //#region extensions/whatsapp/src/action-runtime-target-auth.ts
 function resolveAuthorizedWhatsAppOutboundTarget(params) {

package/dist/action-runtime-api.js

@@ -1,2 +1,2 @@
-import { t as handleWhatsAppAction } from "./action-runtime-BdhkGtaP.js";
+import { t as handleWhatsAppAction } from "./action-runtime-Cyp5GNIT.js";
 export { handleWhatsAppAction };

package/dist/action-runtime.runtime.js

@@ -1,2 +1,2 @@
-import { t as handleWhatsAppAction } from "./action-runtime-BdhkGtaP.js";
+import { t as handleWhatsAppAction } from "./action-runtime-Cyp5GNIT.js";
 export { handleWhatsAppAction };

package/dist/api.js

@@ -1,19 +1,19 @@
 import { r as resolveDefaultWhatsAppAccountId, t as listAccountIds } from "./account-ids-CB5SOWjc.js";
-import { a as resolveWhatsAppAccount, i as listWhatsAppAuthDirs, n as hasAnyWhatsAppAuth, o as resolveWhatsAppAuthDir, r as listEnabledWhatsAppAccounts, s as resolveWhatsAppMediaMaxBytes, t as DEFAULT_WHATSAPP_MEDIA_MAX_MB } from "./accounts-BMGM1RtF.js";
+import { a as resolveWhatsAppAccount, i as listWhatsAppAuthDirs, n as hasAnyWhatsAppAuth, o as resolveWhatsAppAuthDir, r as listEnabledWhatsAppAccounts, s as resolveWhatsAppMediaMaxBytes, t as DEFAULT_WHATSAPP_MEDIA_MAX_MB } from "./accounts-DgViSyJx.js";
 import { a as normalizeWhatsAppAllowFromEntries, c as normalizeWhatsAppTarget, i as looksLikeWhatsAppTargetId, r as isWhatsAppUserTarget, s as normalizeWhatsAppMessagingTarget, t as isWhatsAppGroupJid } from "./normalize-target-bVWjgftN.js";
 import { t as resolveWhatsAppOutboundTarget } from "./resolve-outbound-target-CcdugbDf.js";
-import "./send-C4LG-Cl6.js";
+import "./send-DSlVXKL_.js";
 import { c as assertWebChannel, d as markdownToWhatsApp, f as resolveJidToE164, l as isSelfChatMode, m as toWhatsappJidWithLid, n as normalizeE164, p as toWhatsappJid, r as resolveUserPath, u as jidToE164 } from "./text-runtime-Dk37KYHj.js";
-import { n as WHATSAPP_LEGACY_OUTBOUND_SEND_DEP_KEYS, t as whatsappPlugin } from "./channel-D3y4A5Dd.js";
+import { n as WHATSAPP_LEGACY_OUTBOUND_SEND_DEP_KEYS, t as whatsappPlugin } from "./channel-DA2BAIo5.js";
 import { t as whatsappCommandPolicy } from "./command-policy-BIOSHySD.js";
-import { a as resolveWhatsAppGroupRequireMention, o as resolveWhatsAppGroupToolPolicy, s as resolveWhatsAppGroupIntroHint } from "./setup-core-DpfT4K-2.js";
-import "./config-schema-CsNDlDpL.js";
-import { t as whatsappSetupPlugin } from "./channel.setup-BJQyTUUP.js";
+import { a as resolveWhatsAppGroupRequireMention, o as resolveWhatsAppGroupToolPolicy, s as resolveWhatsAppGroupIntroHint } from "./setup-core-OvPMaAsx.js";
+import "./config-schema-CROZuhT-.js";
+import { t as whatsappSetupPlugin } from "./channel.setup-DHXOo4h5.js";
 import { t as DEFAULT_WEB_MEDIA_BYTES } from "./constants-HU41RHGI.js";
 import { n as listWhatsAppDirectoryGroupsFromConfig, r as listWhatsAppDirectoryPeersFromConfig } from "./directory-config-Dijefxc3.js";
-import { n as testing } from "./access-control-Z0fYaWrx.js";
-import { m as extractText, t as createWebSendApi } from "./send-api-C66vkRl9.js";
-import { r as waitForWaConnection, t as createWaSocket } from "./session-D8UW2Vbn.js";
+import { n as testing } from "./access-control-C53zKYSN.js";
+import { m as extractText, t as createWebSendApi } from "./send-api-Bjn-h80j.js";
+import { r as waitForWaConnection, t as createWaSocket } from "./session-DyGWNClj.js";
 import "openclaw/plugin-sdk/channel-actions";
 import "openclaw/plugin-sdk/account-resolution";
 import "openclaw/plugin-sdk/core";

package/dist/{approval-handler.runtime-C25wPeBf.js → approval-handler.runtime-BVmOu6x1.js}

@@ -1,12 +1,11 @@
 import { s as normalizeWhatsAppMessagingTarget } from "./normalize-target-bVWjgftN.js";
-import { f as registerWhatsAppApprovalReactionTarget, i as sendTypingWhatsApp, p as unregisterWhatsAppApprovalReactionTarget, t as sendMessageWhatsApp } from "./send-C4LG-Cl6.js";
+import { f as registerWhatsAppApprovalReactionTarget, i as sendTypingWhatsApp, p as unregisterWhatsAppApprovalReactionTarget, t as sendMessageWhatsApp } from "./send-DSlVXKL_.js";
 import "./normalize-Bxwqo-bW.js";
 import { n as getWhatsAppRuntime } from "./runtime-BfAdAEYT.js";
 import { createSubsystemLogger } from "openclaw/plugin-sdk/runtime-env";
 import { buildApprovalReactionPendingContent } from "openclaw/plugin-sdk/approval-reaction-runtime";
 import { buildChannelApprovalNativeTargetKey } from "openclaw/plugin-sdk/approval-native-runtime";
 import { buildChannelApprovalExpiredText, buildChannelApprovalResolvedText, createChannelApprovalNativeRuntimeAdapter, resolvePreparedApprovalAccountId } from "openclaw/plugin-sdk/approval-handler-runtime";
-import "openclaw/plugin-sdk/approval-runtime";
 //#region extensions/whatsapp/src/approval-handler.runtime.ts
 const log = createSubsystemLogger("whatsapp/approvals");
 function buildPendingPayload(params) {

package/dist/{auth-store-BrKb0mwT.js → auth-store-CZ22aNcV.js}

@@ -7,8 +7,9 @@ import { resolveOAuthDir as resolveOAuthDir$1 } from "openclaw/plugin-sdk/state-
 import { replaceFileAtomic } from "openclaw/plugin-sdk/security-runtime";
 import { formatCliCommand } from "openclaw/plugin-sdk/cli-runtime";
 import { defaultRuntime, getChildLogger, info, success } from "openclaw/plugin-sdk/runtime-env";
-import { DEFAULT_ACCOUNT_ID } from "openclaw/plugin-sdk/routing";
 import fs from "node:fs/promises";
+import { DEFAULT_ACCOUNT_ID } from "openclaw/plugin-sdk/routing";
+import { resolveTimerTimeoutMs } from "openclaw/plugin-sdk/number-runtime";
 //#region extensions/whatsapp/src/creds-persistence.ts
 const CREDS_FILE_MODE = 384;
 const CREDS_SAVE_FLUSH_TIMEOUT_MS = 15e3;
@@ -52,9 +53,10 @@ function waitForCredsSaveQueue(authDir) {
 	return Promise.all(credsSaveQueues.values()).then(() => {});
 }
 async function waitForCredsSaveQueueWithTimeout(authDir, timeoutMs = CREDS_SAVE_FLUSH_TIMEOUT_MS) {
+	const boundedTimeoutMs = resolveTimerTimeoutMs(timeoutMs, CREDS_SAVE_FLUSH_TIMEOUT_MS, 0);
 	let flushTimeout;
 	return await Promise.race([waitForCredsSaveQueue(authDir).then(() => "drained"), new Promise((resolve) => {
-		flushTimeout = setTimeout(() => resolve("timed_out"), timeoutMs);
+		flushTimeout = setTimeout(() => resolve("timed_out"), boundedTimeoutMs);
 	})]).finally(() => {
 		if (flushTimeout) clearTimeout(flushTimeout);
 	});

package/dist/{channel-D3y4A5Dd.js → channel-DA2BAIo5.js}

@@ -1,16 +1,16 @@
 import { r as resolveDefaultWhatsAppAccountId, t as listAccountIds } from "./account-ids-CB5SOWjc.js";
-import { a as resolveWhatsAppAccount } from "./accounts-BMGM1RtF.js";
+import { a as resolveWhatsAppAccount } from "./accounts-DgViSyJx.js";
 import { c as normalizeWhatsAppTarget, i as looksLikeWhatsAppTargetId, n as isWhatsAppNewsletterJid, o as normalizeWhatsAppAllowFromEntry, s as normalizeWhatsAppMessagingTarget, t as isWhatsAppGroupJid } from "./normalize-target-bVWjgftN.js";
 import { t as resolveWhatsAppOutboundTarget } from "./resolve-outbound-target-CcdugbDf.js";
-import { a as normalizeWhatsAppOutboundPayload, g as resolveWhatsAppReactionLevel, h as whatsappApprovalAuth, i as sendTypingWhatsApp, m as getWhatsAppApprovalApprovers, n as sendPollWhatsApp, o as normalizeWhatsAppPayloadText, s as normalizeWhatsAppPayloadTextPreservingIndentation, t as sendMessageWhatsApp } from "./send-C4LG-Cl6.js";
+import { a as normalizeWhatsAppOutboundPayload, g as resolveWhatsAppReactionLevel, h as whatsappApprovalAuth, i as sendTypingWhatsApp, m as getWhatsAppApprovalApprovers, n as sendPollWhatsApp, o as normalizeWhatsAppPayloadText, s as normalizeWhatsAppPayloadTextPreservingIndentation, t as sendMessageWhatsApp } from "./send-DSlVXKL_.js";
 import "./normalize-Bxwqo-bW.js";
 import { n as getWhatsAppRuntime } from "./runtime-BfAdAEYT.js";
 import { p as toWhatsappJid } from "./text-runtime-Dk37KYHj.js";
 import { t as createWhatsAppLoginTool } from "./agent-tools-login-BX7eHgDm.js";
 import { i as lookupInboundMessageMetaForTarget } from "./quoted-message-CveINB35.js";
 import { t as whatsappCommandPolicy } from "./command-policy-BIOSHySD.js";
-import { a as resolveWhatsAppGroupRequireMention, c as resolveWhatsAppMentionStripRegexes, i as whatsappSetupWizardProxy, l as formatWhatsAppConfigAllowFromEntries, n as createWhatsAppPluginBase, o as resolveWhatsAppGroupToolPolicy, r as loadWhatsAppChannelRuntime, s as resolveWhatsAppGroupIntroHint, t as whatsappSetupAdapter } from "./setup-core-DpfT4K-2.js";
-import { f as readWebAuthExistsForDecision, n as WHATSAPP_AUTH_UNSTABLE_CODE } from "./auth-store-BrKb0mwT.js";
+import { a as resolveWhatsAppGroupRequireMention, c as resolveWhatsAppMentionStripRegexes, i as whatsappSetupWizardProxy, l as formatWhatsAppConfigAllowFromEntries, n as createWhatsAppPluginBase, o as resolveWhatsAppGroupToolPolicy, r as loadWhatsAppChannelRuntime, s as resolveWhatsAppGroupIntroHint, t as whatsappSetupAdapter } from "./setup-core-OvPMaAsx.js";
+import { f as readWebAuthExistsForDecision, n as WHATSAPP_AUTH_UNSTABLE_CODE } from "./auth-store-CZ22aNcV.js";
 import { t as detectWhatsAppLegacyStateMigrations } from "./state-migrations-D_BmQUR9.js";
 import { createActionGate as createActionGate$1 } from "openclaw/plugin-sdk/channel-actions";
 import { DEFAULT_ACCOUNT_ID, listCombinedAccountIds, normalizeOptionalAccountId, resolveListedDefaultAccountId } from "openclaw/plugin-sdk/account-core";
@@ -26,31 +26,18 @@ import { createChatChannelPlugin } from "openclaw/plugin-sdk/channel-core";
 import { createLazyRuntimeModule } from "openclaw/plugin-sdk/lazy-runtime";
 import { createChannelApprovalCapability, splitChannelApprovalCapability } from "openclaw/plugin-sdk/approval-delivery-runtime";
 import { createLazyChannelApprovalNativeRuntimeAdapter } from "openclaw/plugin-sdk/approval-handler-adapter-runtime";
-import { createChannelApprovalForwardingEvaluator, createChannelApproverDmTargetResolver, createChannelNativeOriginTargetResolver, createNativeApprovalForwardingFallbackSuppressor, nativeApprovalTargetsMatch, resolveApprovalRequestSessionTarget } from "openclaw/plugin-sdk/approval-native-runtime";
-import { normalizeAccountId as normalizeAccountId$2 } from "openclaw/plugin-sdk/routing";
+import { createChannelApproverDmTargetResolver, createChannelNativeOriginTargetResolver, createNativeApprovalChannelRouteGates, createNativeApprovalForwardingFallbackSuppressor } from "openclaw/plugin-sdk/approval-native-runtime";
 import { chunkText } from "openclaw/plugin-sdk/reply-chunking";
 import { createAttachedChannelResultAdapter } from "openclaw/plugin-sdk/channel-send-result";
 import { sendTextMediaPayload } from "openclaw/plugin-sdk/reply-payload";
 //#region extensions/whatsapp/src/approval-native.ts
+const DEFAULT_APPROVAL_FORWARDING_MODE = "session";
 function isWhatsAppApprovalTransportEnabled(params) {
 	return resolveWhatsAppAccount({
 		cfg: params.cfg,
 		accountId: params.accountId
 	}).enabled;
 }
-function targetAccountMatchesWhatsAppAccount(params) {
-	const targetAccountId = normalizeOptionalString(params.targetAccountId);
-	const accountId = normalizeOptionalString(params.accountId);
-	if (targetAccountId) return !accountId || normalizeAccountId$2(targetAccountId) === normalizeAccountId$2(accountId);
-	if (!accountId) return true;
-	const normalizedAccountId = normalizeAccountId$2(accountId);
-	if (normalizedAccountId === normalizeAccountId$2(resolveDefaultWhatsAppAccountId(params.cfg))) return true;
-	const enabledAccountIds = listAccountIds(params.cfg).filter((candidateAccountId) => isWhatsAppApprovalTransportEnabled({
-		cfg: params.cfg,
-		accountId: candidateAccountId
-	})).map((candidateAccountId) => normalizeAccountId$2(candidateAccountId));
-	return enabledAccountIds.length === 1 && enabledAccountIds[0] === normalizedAccountId;
-}
 function normalizeWhatsAppForwardTarget(target) {
 	if (normalizeLowercaseStringOrEmpty(target.channel) !== "whatsapp") return null;
 	const to = normalizeWhatsAppMessagingTarget(target.to);
@@ -61,46 +48,6 @@ function normalizeWhatsAppForwardTarget(target) {
 		threadId: target.threadId ?? null
 	};
 }
-function hasMatchingWhatsAppTarget(params) {
-	const candidateTarget = params.target ? normalizeWhatsAppForwardTarget(params.target) : null;
-	return (params.config.targets ?? []).some((target) => {
-		const configuredTarget = normalizeWhatsAppForwardTarget(target);
-		if (!configuredTarget) return false;
-		if (!targetAccountMatchesWhatsAppAccount({
-			cfg: params.cfg,
-			targetAccountId: configuredTarget.accountId,
-			accountId: params.accountId
-		})) return false;
-		if (!candidateTarget) return true;
-		return nativeApprovalTargetsMatch({
-			channel: "whatsapp",
-			left: configuredTarget,
-			right: candidateTarget
-		});
-	});
-}
-function hasWhatsAppOriginOrSessionTarget(params) {
-	if (resolveTurnSourceWhatsAppOriginTarget(params.request)) return true;
-	const sessionTarget = resolveApprovalRequestSessionTarget({
-		cfg: params.cfg,
-		request: params.request
-	});
-	return normalizeLowercaseStringOrEmpty(sessionTarget?.channel) === "whatsapp" && targetAccountMatchesWhatsAppAccount({
-		cfg: params.cfg,
-		targetAccountId: sessionTarget?.accountId,
-		accountId: params.accountId
-	});
-}
-const whatsappApprovalForwarding = createChannelApprovalForwardingEvaluator({
-	channel: "whatsapp",
-	isTransportEnabled: isWhatsAppApprovalTransportEnabled,
-	hasMatchingTarget: hasMatchingWhatsAppTarget,
-	hasOriginOrSessionTarget: hasWhatsAppOriginOrSessionTarget
-});
-const canApprovalPotentiallyRouteToWhatsApp = whatsappApprovalForwarding.isPotentialRoute;
-const canAnyApprovalPotentiallyRouteToWhatsApp = whatsappApprovalForwarding.canAnyPotentiallyRoute;
-const isWhatsAppSessionApprovalEligible = whatsappApprovalForwarding.isSessionEligible;
-const isWhatsAppExplicitTargetEligible = whatsappApprovalForwarding.isExplicitTargetEligible;
 function resolveTurnSourceWhatsAppOriginTarget(request) {
 	if (normalizeLowercaseStringOrEmpty(request.request.turnSourceChannel) !== "whatsapp") return null;
 	const to = normalizeWhatsAppMessagingTarget(request.request.turnSourceTo ?? "");
@@ -117,9 +64,15 @@ function resolveSessionWhatsAppOriginTarget(sessionTarget) {
 		accountId: normalizeOptionalString(sessionTarget.accountId)
 	} : null;
 }
-function shouldHandleWhatsAppApprovalRequest(params) {
-	return whatsappApprovalForwarding.shouldHandleRequest(params);
-}
+const { canApprovalPotentiallyRouteToChannel: canApprovalPotentiallyRouteToWhatsApp, canAnyApprovalPotentiallyRouteToChannel: canAnyApprovalPotentiallyRouteToWhatsApp, isSessionApprovalEligible: isWhatsAppSessionApprovalEligible, isExplicitTargetEligible: isWhatsAppExplicitTargetEligible, shouldHandleApprovalRequest: shouldHandleWhatsAppApprovalRequest } = createNativeApprovalChannelRouteGates({
+	channel: "whatsapp",
+	defaultForwardingMode: DEFAULT_APPROVAL_FORWARDING_MODE,
+	isTransportEnabled: isWhatsAppApprovalTransportEnabled,
+	listAccountIds,
+	resolveDefaultAccountId: resolveDefaultWhatsAppAccountId,
+	normalizeForwardTarget: normalizeWhatsAppForwardTarget,
+	resolveTurnSourceTarget: resolveTurnSourceWhatsAppOriginTarget
+});
 const resolveWhatsAppOriginTargetBase = createChannelNativeOriginTargetResolver({
 	channel: "whatsapp",
 	shouldHandleRequest: shouldHandleWhatsAppApprovalRequest,
@@ -252,7 +205,7 @@ const whatsappApprovalCapability = createChannelApprovalCapability({
 			accountId,
 			request
 		}),
-		load: async () => (await import("./approval-handler.runtime-C25wPeBf.js")).whatsappApprovalNativeRuntime
+		load: async () => (await import("./approval-handler.runtime-BVmOu6x1.js")).whatsappApprovalNativeRuntime
 	})
 });
 splitChannelApprovalCapability(whatsappApprovalCapability);
@@ -651,7 +604,7 @@ function collectWhatsAppStatusIssues(accounts) {
 //#endregion
 //#region extensions/whatsapp/src/channel.ts
 const loadWhatsAppDirectoryConfig = createLazyRuntimeModule(() => import("./directory-config-Dijefxc3.js").then((n) => n.t));
-const loadWhatsAppChannelReactAction = createLazyRuntimeModule(() => import("./channel-react-action-Cd2qkLqp.js"));
+const loadWhatsAppChannelReactAction = createLazyRuntimeModule(() => import("./channel-react-action-zvbaCnGe.js"));
 function resolveWhatsAppTargetInfo(raw) {
 	const normalized = normalizeWhatsAppTarget(raw);
 	if (!normalized) return null;

package/dist/channel-config-api.js

@@ -1,2 +1,2 @@
-import { t as WhatsAppChannelConfigSchema } from "./config-schema-CsNDlDpL.js";
+import { t as WhatsAppChannelConfigSchema } from "./config-schema-CROZuhT-.js";
 export { WhatsAppChannelConfigSchema };

package/dist/channel-plugin-api.js

@@ -1,2 +1,2 @@
-import { t as whatsappPlugin } from "./channel-D3y4A5Dd.js";
+import { t as whatsappPlugin } from "./channel-DA2BAIo5.js";
 export { whatsappPlugin };

package/dist/{channel-react-action-Cd2qkLqp.js → channel-react-action-zvbaCnGe.js}

@@ -1,7 +1,7 @@
-import { a as resolveWhatsAppAccount, s as resolveWhatsAppMediaMaxBytes } from "./accounts-BMGM1RtF.js";
+import { a as resolveWhatsAppAccount, s as resolveWhatsAppMediaMaxBytes } from "./accounts-DgViSyJx.js";
 import { c as normalizeWhatsAppTarget, t as isWhatsAppGroupJid } from "./normalize-target-bVWjgftN.js";
-import { r as resolveAuthorizedWhatsAppOutboundTarget, t as handleWhatsAppAction } from "./action-runtime-BdhkGtaP.js";
-import { t as sendMessageWhatsApp } from "./send-C4LG-Cl6.js";
+import { r as resolveAuthorizedWhatsAppOutboundTarget, t as handleWhatsAppAction } from "./action-runtime-Cyp5GNIT.js";
+import { t as sendMessageWhatsApp } from "./send-DSlVXKL_.js";
 import "./normalize-Bxwqo-bW.js";
 import { jsonResult, readStringOrNumberParam, readStringParam as readStringParam$1, resolveReactionMessageId } from "openclaw/plugin-sdk/channel-actions";
 //#region extensions/whatsapp/src/channel-react-action.ts

package/dist/{channel.runtime-C228XUjs.js → channel.runtime-Q1LZDB5s.js}

@@ -1,9 +1,9 @@
 import { startWebLoginWithQr as startWebLoginWithQr$1, waitForWebLogin as waitForWebLogin$1 } from "./login-qr-runtime.js";
-import { c as logoutWeb$1, d as readWebAuthExistsBestEffort$1, f as readWebAuthExistsForDecision$1, g as readWebSelfId$1, h as readWebAuthState$1, m as readWebAuthSnapshotBestEffort$1, o as getWebAuthAgeMs$1, p as readWebAuthSnapshot$1, s as logWebSelfId$1, x as webAuthExists$1 } from "./auth-store-BrKb0mwT.js";
+import { c as logoutWeb$1, d as readWebAuthExistsBestEffort$1, f as readWebAuthExistsForDecision$1, g as readWebSelfId$1, h as readWebAuthState$1, m as readWebAuthSnapshotBestEffort$1, o as getWebAuthAgeMs$1, p as readWebAuthSnapshot$1, s as logWebSelfId$1, x as webAuthExists$1 } from "./auth-store-CZ22aNcV.js";
 import { t as getActiveWebListener$1 } from "./active-listener-CFwkn3ho.js";
-import { t as monitorWebChannel$1 } from "./monitor-Ccph7Y8M.js";
-import { t as loginWeb$1 } from "./login-CE4UYnyO.js";
-import { whatsappSetupWizard as whatsappSetupWizard$1 } from "./setup-surface-DRsmp0ZS.js";
+import { t as monitorWebChannel$1 } from "./monitor-BVRq04Dt.js";
+import { t as loginWeb$1 } from "./login-2fuBM7Je.js";
+import { whatsappSetupWizard as whatsappSetupWizard$1 } from "./setup-surface-F-jVrH8u.js";
 //#region extensions/whatsapp/src/channel.runtime.ts
 function getActiveWebListener(...args) {
 	return getActiveWebListener$1(...args);

package/dist/{channel.setup-BJQyTUUP.js → channel.setup-DHXOo4h5.js}

@@ -1,9 +1,8 @@
-import "./accounts-BMGM1RtF.js";
-import { a as resolveWhatsAppGroupRequireMention, i as whatsappSetupWizardProxy, n as createWhatsAppPluginBase, o as resolveWhatsAppGroupToolPolicy, s as resolveWhatsAppGroupIntroHint, t as whatsappSetupAdapter } from "./setup-core-DpfT4K-2.js";
+import { a as resolveWhatsAppGroupRequireMention, i as whatsappSetupWizardProxy, n as createWhatsAppPluginBase, o as resolveWhatsAppGroupToolPolicy, s as resolveWhatsAppGroupIntroHint, t as whatsappSetupAdapter } from "./setup-core-OvPMaAsx.js";
 import { t as detectWhatsAppLegacyStateMigrations } from "./state-migrations-D_BmQUR9.js";
 //#region extensions/whatsapp/src/channel.setup.ts
 async function isWhatsAppAuthConfigured(account) {
-	const { readWebAuthState } = await import("./auth-store-BrKb0mwT.js").then((n) => n.i);
+	const { readWebAuthState } = await import("./auth-store-CZ22aNcV.js").then((n) => n.i);
 	return await readWebAuthState(account.authDir) === "linked";
 }
 const whatsappSetupPlugin = {

package/dist/{config-schema-CsNDlDpL.js → config-schema-CROZuhT-.js}

@@ -21,6 +21,22 @@ const WhatsAppChannelConfigSchema = buildChannelConfigSchema(WhatsAppConfigSchem
 	configWrites: {
 		label: "WhatsApp Config Writes",
 		help: "Allow WhatsApp to write config in response to channel events/commands (default: true)."
+	},
+	mentionPatterns: {
+		label: "WhatsApp Mention Pattern Policy",
+		help: "Scopes configured groupChat mentionPatterns to selected WhatsApp conversation IDs such as 123@g.us."
+	},
+	"mentionPatterns.mode": {
+		label: "WhatsApp Mention Pattern Mode",
+		help: "\"allow\" enables configured regex mention patterns unless denyIn matches; \"deny\" disables them unless allowIn matches."
+	},
+	"mentionPatterns.allowIn": {
+		label: "WhatsApp Mention Pattern Allowlist",
+		help: "WhatsApp conversation IDs where configured regex mention patterns are enabled when mode is deny."
+	},
+	"mentionPatterns.denyIn": {
+		label: "WhatsApp Mention Pattern Denylist",
+		help: "WhatsApp conversation IDs where configured regex mention patterns are disabled."
 	}
 } });
 //#endregion

package/dist/{connection-controller-mpPGmqGq.js → connection-controller-Bnm4INld.js}

@@ -1,6 +1,6 @@
 import { a as unregisterWhatsAppConnectionController, i as registerWhatsAppConnectionController, n as getStatusCode, t as formatError } from "./session-errors-CbsoQqoy.js";
-import { c as logoutWeb } from "./auth-store-BrKb0mwT.js";
-import { r as waitForWaConnection, t as createWaSocket } from "./session-D8UW2Vbn.js";
+import { c as logoutWeb } from "./auth-store-CZ22aNcV.js";
+import { r as waitForWaConnection, t as createWaSocket } from "./session-DyGWNClj.js";
 import { computeBackoff, info, sleepWithAbort } from "openclaw/plugin-sdk/runtime-env";
 import { clamp } from "openclaw/plugin-sdk/text-utility-runtime";
 import { DisconnectReason } from "baileys";

package/dist/contract-api.js

@@ -4,7 +4,7 @@ import { t as resolveLegacyGroupSessionKey$1 } from "./group-session-contract-DD
 import { n as unsupportedSecretRefSurfacePatterns, t as collectUnsupportedSecretRefConfigCandidates } from "./security-contract-nAzD945y.js";
 import { r as isLegacyGroupSessionKey$1, t as canonicalizeLegacySessionKey$1 } from "./session-contract-DMTm6Q_L.js";
 import { n as listWhatsAppDirectoryGroupsFromConfig, r as listWhatsAppDirectoryPeersFromConfig } from "./directory-config-Dijefxc3.js";
-import { a as resolveWhatsAppRuntimeGroupPolicy$1, n as testing } from "./access-control-Z0fYaWrx.js";
+import { a as resolveWhatsAppRuntimeGroupPolicy$1, n as testing } from "./access-control-C53zKYSN.js";
 //#region extensions/whatsapp/contract-api.ts
 const canonicalizeLegacySessionKey = canonicalizeLegacySessionKey$1;
 const isLegacyGroupSessionKey = isLegacyGroupSessionKey$1;

package/dist/light-runtime-api.js

@@ -1,5 +1,5 @@
 import { n as getStatusCode, t as formatError } from "./session-errors-CbsoQqoy.js";
 import { t as createWhatsAppLoginTool } from "./agent-tools-login-BX7eHgDm.js";
-import { c as logoutWeb, g as readWebSelfId, l as pickWebChannel, o as getWebAuthAgeMs, s as logWebSelfId, t as WA_WEB_AUTH_DIR, x as webAuthExists, y as resolveDefaultWebAuthDir } from "./auth-store-BrKb0mwT.js";
+import { c as logoutWeb, g as readWebSelfId, l as pickWebChannel, o as getWebAuthAgeMs, s as logWebSelfId, t as WA_WEB_AUTH_DIR, x as webAuthExists, y as resolveDefaultWebAuthDir } from "./auth-store-CZ22aNcV.js";
 import { t as getActiveWebListener } from "./active-listener-CFwkn3ho.js";
 export { WA_WEB_AUTH_DIR, createWhatsAppLoginTool, formatError, getActiveWebListener, getStatusCode, getWebAuthAgeMs, logWebSelfId, logoutWeb, pickWebChannel, readWebSelfId, resolveDefaultWebAuthDir, webAuthExists };

package/dist/{login-CE4UYnyO.js → login-2fuBM7Je.js}

@@ -1,8 +1,8 @@
 import { t as __exportAll } from "./rolldown-runtime-D7D4PA-g.js";
-import { a as resolveWhatsAppAccount } from "./accounts-BMGM1RtF.js";
-import { b as restoreCredsFromBackupIfNeeded } from "./auth-store-BrKb0mwT.js";
-import { a as renderQrTerminal, i as resolveWhatsAppSocketTiming, t as createWaSocket } from "./session-D8UW2Vbn.js";
-import { a as closeWaSocketSoon, o as waitForWhatsAppLoginResult } from "./connection-controller-mpPGmqGq.js";
+import { a as resolveWhatsAppAccount } from "./accounts-DgViSyJx.js";
+import { b as restoreCredsFromBackupIfNeeded } from "./auth-store-CZ22aNcV.js";
+import { a as renderQrTerminal, i as resolveWhatsAppSocketTiming, t as createWaSocket } from "./session-DyGWNClj.js";
+import { a as closeWaSocketSoon, o as waitForWhatsAppLoginResult } from "./connection-controller-Bnm4INld.js";
 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/{login-qr-LBvhEes5.js → login-qr-B1o7GFy8.js}

@@ -1,10 +1,11 @@
-import { a as resolveWhatsAppAccount } from "./accounts-BMGM1RtF.js";
-import { f as readWebAuthExistsForDecision, g as readWebSelfId, n as WHATSAPP_AUTH_UNSTABLE_CODE } from "./auth-store-BrKb0mwT.js";
-import { i as resolveWhatsAppSocketTiming, t as createWaSocket } from "./session-D8UW2Vbn.js";
-import { i as closeWaSocket, o as waitForWhatsAppLoginResult, t as WHATSAPP_LOGGED_OUT_QR_MESSAGE } from "./connection-controller-mpPGmqGq.js";
+import { a as resolveWhatsAppAccount } from "./accounts-DgViSyJx.js";
+import { f as readWebAuthExistsForDecision, g as readWebSelfId, n as WHATSAPP_AUTH_UNSTABLE_CODE } from "./auth-store-CZ22aNcV.js";
+import { i as resolveWhatsAppSocketTiming, t as createWaSocket } from "./session-DyGWNClj.js";
+import { i as closeWaSocket, o as waitForWhatsAppLoginResult, t as WHATSAPP_LOGGED_OUT_QR_MESSAGE } from "./connection-controller-Bnm4INld.js";
 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 { randomUUID } from "node:crypto";
 import { getRuntimeConfig } from "openclaw/plugin-sdk/runtime-config-snapshot";
 //#region extensions/whatsapp/src/login-qr.ts
@@ -14,6 +15,9 @@ function waitForNextTask() {
 const ACTIVE_LOGIN_TTL_MS = 3 * 6e4;
 const MAX_QR_RENDER_CHASES = 10;
 const activeLogins = /* @__PURE__ */ new Map();
+function resolveWhatsAppLoginTimeoutMs(value, fallbackMs, minMs) {
+	return resolveTimerTimeoutMs(value, fallbackMs, minMs);
+}
 function closeSocket(sock) {
 	closeWaSocket(sock);
 }
@@ -206,7 +210,7 @@ async function startWebLoginWithQr(opts = {}) {
 	});
 	const qrTimer = setTimeout(() => {
 		rejectQr?.(/* @__PURE__ */ new Error("Timed out waiting for WhatsApp QR"));
-	}, Math.max(opts.timeoutMs ?? 3e4, 5e3));
+	}, resolveWhatsAppLoginTimeoutMs(opts.timeoutMs, 3e4, 5e3));
 	let sock;
 	let pendingQr = null;
 	const loginId = randomUUID();
@@ -331,7 +335,7 @@ async function waitForWebLogin(opts = {}) {
 			message: "The login QR expired. Ask me to generate a new one."
 		};
 	}
-	const timeoutMs = Math.max(opts.timeoutMs ?? 12e4, 1e3);
+	const timeoutMs = resolveWhatsAppLoginTimeoutMs(opts.timeoutMs, 12e4, 1e3);
 	const deadline = Date.now() + timeoutMs;
 	const currentQrDataUrl = opts.currentQrDataUrl;
 	while (true) {

package/dist/login-qr-runtime.js

@@ -1,7 +1,7 @@
 //#region extensions/whatsapp/login-qr-runtime.ts
 let loginQrModulePromise = null;
 function loadLoginQrModule() {
-	loginQrModulePromise ??= import("./login-qr-LBvhEes5.js");
+	loginQrModulePromise ??= import("./login-qr-B1o7GFy8.js");
 	return loginQrModulePromise;
 }
 async function startWebLoginWithQr(...args) {

package/dist/{monitor-Ccph7Y8M.js → monitor-BVRq04Dt.js}

@@ -1,18 +1,18 @@
-import { a as resolveWhatsAppAccount, s as resolveWhatsAppMediaMaxBytes } from "./accounts-BMGM1RtF.js";
+import { a as resolveWhatsAppAccount, s as resolveWhatsAppMediaMaxBytes } from "./accounts-DgViSyJx.js";
 import { t as isWhatsAppGroupJid } from "./normalize-target-bVWjgftN.js";
-import { a as normalizeWhatsAppOutboundPayload, c as prepareWhatsAppOutboundMedia, d as maybeResolveWhatsAppApprovalReaction, g as resolveWhatsAppReactionLevel, l as sendWhatsAppOutboundWithRetry, r as sendReactionWhatsApp, s as normalizeWhatsAppPayloadTextPreservingIndentation } from "./send-C4LG-Cl6.js";
+import { a as normalizeWhatsAppOutboundPayload, c as prepareWhatsAppOutboundMedia, d as maybeResolveWhatsAppApprovalReaction, g as resolveWhatsAppReactionLevel, l as sendWhatsAppOutboundWithRetry, r as sendReactionWhatsApp, s as normalizeWhatsAppPayloadTextPreservingIndentation } from "./send-DSlVXKL_.js";
 import { n as getWhatsAppRuntime } from "./runtime-BfAdAEYT.js";
 import { n as getStatusCode, t as formatError } from "./session-errors-CbsoQqoy.js";
 import { d as markdownToWhatsApp, f as resolveJidToE164, l as isSelfChatMode, n as normalizeE164, t as convertMarkdownTables$1, u as jidToE164 } from "./text-runtime-Dk37KYHj.js";
 import { n as cacheInboundMessageMeta, r as lookupInboundMessageMeta, t as buildQuotedMessageOptions } from "./quoted-message-CveINB35.js";
-import { c as logoutWeb, g as readWebSelfId, o as getWebAuthAgeMs, r as WhatsAppAuthUnstableError, v as readWebSelfIdentityForDecision } from "./auth-store-BrKb0mwT.js";
+import { c as logoutWeb, g as readWebSelfId, o as getWebAuthAgeMs, r as WhatsAppAuthUnstableError, v as readWebSelfIdentityForDecision } from "./auth-store-CZ22aNcV.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-xoLLdqEv.js";
 import { n as resolveWhatsAppGroupsConfigPath } from "./group-config-path-BGyzT9Lg.js";
-import { i as resolveWhatsAppInboundPolicy, r as resolveWhatsAppCommandAuthorized, t as checkInboundAccessControl } from "./access-control-Z0fYaWrx.js";
-import { a as mayContainWhatsAppOutboundMention, c as describeReplyContext, d as extractLocationData, f as extractMediaPlaceholder, h as hasInboundUserContent, i as addWhatsAppOutboundMentionsToContent, l as extractContactContext, m as extractText, n as listWhatsAppSendResultMessageIds, o as resolveWhatsAppOutboundMentions, p as extractMentionedJids, r as normalizeWhatsAppSendResult, s as addWhatsAppImagePreviewFields, t as createWebSendApi, u as extractContextInfo } from "./send-api-C66vkRl9.js";
-import { i as resolveWhatsAppSocketTiming, r as waitForWaConnection, t as createWaSocket } from "./session-D8UW2Vbn.js";
+import { i as resolveWhatsAppInboundPolicy, r as resolveWhatsAppCommandAuthorized, t as checkInboundAccessControl } from "./access-control-C53zKYSN.js";
+import { a as mayContainWhatsAppOutboundMention, c as describeReplyContext, d as extractLocationData, f as extractMediaPlaceholder, h as hasInboundUserContent, i as addWhatsAppOutboundMentionsToContent, l as extractContactContext, m as extractText, n as listWhatsAppSendResultMessageIds, o as resolveWhatsAppOutboundMentions, p as extractMentionedJids, r as normalizeWhatsAppSendResult, s as addWhatsAppImagePreviewFields, t as createWebSendApi, u as extractContextInfo } from "./send-api-Bjn-h80j.js";
+import { i as resolveWhatsAppSocketTiming, r as waitForWaConnection, t as createWaSocket } from "./session-DyGWNClj.js";
 import { t as BufferJSON } from "./session.runtime-LZFdq3yb.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-mpPGmqGq.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-Bnm4INld.js";
 import { resolveAccountEntry } from "openclaw/plugin-sdk/account-core";
 import { normalizeLowercaseStringOrEmpty, normalizeStringEntries, uniqueStrings } from "openclaw/plugin-sdk/string-coerce-runtime";
 import { createChannelMessageReplyPipeline, createDurableInboundReceiveJournal, createMessageReceiptFromOutboundResults, deliverInboundReplyWithMessageSendContext, resolveChannelMessageSourceReplyDeliveryMode } from "openclaw/plugin-sdk/channel-outbound";
@@ -24,9 +24,10 @@ import { resolveMarkdownTableMode as resolveMarkdownTableMode$1 } from "openclaw
 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 { getAgentScopedMediaLocalRoots } from "openclaw/plugin-sdk/media-runtime";
 import { LocalMediaAccessError, getDefaultLocalRoots, loadWebMedia as loadWebMedia$1, loadWebMediaRaw, optimizeImageToJpeg, optimizeImageToPng } from "openclaw/plugin-sdk/web-media";
-import { DEFAULT_ACCOUNT_ID as DEFAULT_ACCOUNT_ID$1, DEFAULT_MAIN_KEY, buildAgentMainSessionKey, buildAgentSessionKey, buildGroupHistoryKey, deriveLastRoutePolicy, normalizeAccountId as normalizeAccountId$1, normalizeAgentId, resolveAgentRoute, resolveInboundLastRouteSessionKey, resolveThreadSessionKeys } from "openclaw/plugin-sdk/routing";
 import { chunkMarkdownTextWithMode } from "openclaw/plugin-sdk/reply-chunking";
 import { isReasoningReplyPayload, resolveSendableOutboundReplyParts, sendMediaWithLeadingCaption } from "openclaw/plugin-sdk/reply-payload";
+import { DEFAULT_ACCOUNT_ID as DEFAULT_ACCOUNT_ID$1, DEFAULT_MAIN_KEY, buildAgentMainSessionKey, buildAgentSessionKey, buildGroupHistoryKey, deriveLastRoutePolicy, normalizeAccountId as normalizeAccountId$1, normalizeAgentId, resolveAgentRoute, resolveInboundLastRouteSessionKey, resolveThreadSessionKeys } from "openclaw/plugin-sdk/routing";
+import { asDateTimestampMs, parseStrictFiniteNumber, resolveExpiresAtMsFromDurationMs } from "openclaw/plugin-sdk/number-runtime";
 import { recordInboundSession } from "openclaw/plugin-sdk/conversation-runtime";
 import { loadSessionStore, resolveStorePath, updateLastRoute, updateSessionStore } from "openclaw/plugin-sdk/session-store-runtime";
 import { DisconnectReason as DisconnectReason$1, downloadMediaMessage, isJidGroup, normalizeMessageContent as normalizeMessageContent$1 } from "baileys";
@@ -41,7 +42,6 @@ import { hasControlCommand, isControlCommandMessage, isControlCommandMessage as
 import { drainPendingDeliveries } from "openclaw/plugin-sdk/delivery-queue-runtime";
 import { DEFAULT_GROUP_HISTORY_LIMIT, buildHistoryContextFromEntries, buildInboundHistoryFromEntries, createChannelHistoryWindow } from "openclaw/plugin-sdk/reply-history";
 import { enqueueSystemEvent } from "openclaw/plugin-sdk/system-event-runtime";
-import { parseStrictFiniteNumber } from "openclaw/plugin-sdk/number-runtime";
 import { createClaimableDedupe } from "openclaw/plugin-sdk/persistent-dedupe";
 import { saveMediaStream } from "openclaw/plugin-sdk/media-store";
 import { getRuntimeConfig as getRuntimeConfig$1, getRuntimeConfigSourceSnapshot } from "openclaw/plugin-sdk/runtime-config-snapshot";
@@ -263,6 +263,10 @@ const LOGGED_OUT_STATUS = DisconnectReason$1?.loggedOut ?? 401;
 const RECONNECT_IN_PROGRESS_ERROR = "no active socket - reconnection in progress";
 const GROUP_META_TTL_MS = 300 * 1e3;
 const INBOUND_CLOSE_DRAIN_TIMEOUT_MS = 5e3;
+function resolveGroupMetadataExpiresAt(nowRaw = Date.now()) {
+	const now = asDateTimestampMs(nowRaw);
+	return now === void 0 ? void 0 : resolveExpiresAtMsFromDurationMs(GROUP_META_TTL_MS, { nowMs: now });
+}
 function parseWhatsAppTimestampSeconds(value) {
 	if (value == null) return;
 	if (typeof value === "string") return parseStrictFiniteNumber(value);
@@ -270,6 +274,10 @@ function parseWhatsAppTimestampSeconds(value) {
 	return Number.isFinite(parsed) ? parsed : void 0;
 }
 function rememberGroupMetadataCacheEntry(cache, jid, entry) {
+	if (asDateTimestampMs(entry.expires) === void 0) {
+		cache.delete(jid);
+		return;
+	}
 	if (cache.has(jid)) cache.delete(jid);
 	cache.set(jid, entry);
 	while (cache.size > 500) {
@@ -281,7 +289,9 @@ function rememberGroupMetadataCacheEntry(cache, jid, entry) {
 function readGroupMetadataCacheEntry(cache, jid) {
 	const entry = cache.get(jid);
 	if (!entry) return null;
-	if (entry.expires <= Date.now()) {
+	const now = asDateTimestampMs(Date.now());
+	const expires = asDateTimestampMs(entry.expires);
+	if (now === void 0 || expires === void 0 || expires <= now) {
 		cache.delete(jid);
 		return null;
 	}
@@ -435,7 +445,7 @@ async function attachWebInboxToSocket(options) {
 		});
 	};
 	const sendTrackedMessage = async (jid, content, sendOptions) => {
-		let lastErr = new Error(RECONNECT_IN_PROGRESS_ERROR);
+		let lastErr = /* @__PURE__ */ new Error(RECONNECT_IN_PROGRESS_ERROR);
 		for (let attempt = 1;; attempt++) {
 			const currentSock = getCurrentSock();
 			if (currentSock) try {
@@ -477,12 +487,12 @@ async function attachWebInboxToSocket(options) {
 			subject: meta.subject,
 			participants,
 			mentionParticipants,
-			expires: Date.now() + GROUP_META_TTL_MS
+			expires: resolveGroupMetadataExpiresAt() ?? 0
 		};
 	};
 	const summarizeGroupMetaForReconnectCache = (meta) => ({
 		subject: meta.subject,
-		expires: Date.now() + GROUP_META_TTL_MS
+		expires: resolveGroupMetadataExpiresAt() ?? NaN
 	});
 	const getGroupMeta = async (jid) => {
 		const cached = readGroupMetadataCacheEntry(groupMetaCache, jid);
@@ -503,7 +513,7 @@ async function attachWebInboxToSocket(options) {
 				return hydrated;
 			}
 			logWhatsAppVerbose(options.verbose, `Failed to fetch group metadata for ${jid}: ${String(err)}`);
-			return { expires: Date.now() + GROUP_META_TTL_MS };
+			return { expires: resolveGroupMetadataExpiresAt() ?? 0 };
 		}
 	};
 	const resolveOutboundMentionsForGroup = async (jid, text) => {
@@ -1005,9 +1015,9 @@ const whatsappOutboundLog = whatsappLog.child("outbound");
 const whatsappHeartbeatLog = whatsappLog.child("heartbeat");
 //#endregion
 //#region extensions/whatsapp/src/auto-reply/mentions.ts
-function buildMentionConfig(cfg, agentId) {
+function buildMentionConfig(cfg, agentId, options) {
 	return {
-		mentionRegexes: buildMentionRegexes(cfg, agentId),
+		mentionRegexes: buildMentionRegexes(cfg, agentId, options),
 		allowFrom: cfg.channels?.whatsapp?.allowFrom
 	};
 }
@@ -1520,7 +1530,11 @@ async function applyGroupGating(params) {
 		allowFrom: inboundPolicy.configuredAllowFrom
 	};
 	const mentionConfig = {
-		...buildMentionConfig(params.cfg, params.agentId),
+		...buildMentionConfig(params.cfg, params.agentId, {
+			provider: "whatsapp",
+			conversationId: params.conversationId,
+			providerPolicy: params.providerMentionPatterns
+		}),
 		allowFrom: inboundPolicy.configuredAllowFrom
 	};
 	const mentionMsg = params.mentionText !== void 0 ? {
@@ -2174,7 +2188,8 @@ async function dispatchWhatsAppBufferedReply(params) {
 			CommandAuthorized: sourceReplyCommandAuthorized
 		}
 	}) : void 0;
-	const disableBlockStreaming = sourceReplyDeliveryMode === "message_tool_only" ? true : resolveWhatsAppDisableBlockStreaming(params.cfg);
+	const sourceRepliesAreToolOnly = sourceReplyDeliveryMode === "message_tool_only";
+	const disableBlockStreaming = sourceRepliesAreToolOnly ? true : resolveWhatsAppDisableBlockStreaming(params.cfg);
 	let didSendReply = false;
 	let didLogHeartbeatStrip = false;
 	const deliverNormalizedPayload = async (normalizedDeliveryPayload, info) => {
@@ -2330,6 +2345,7 @@ async function dispatchWhatsAppBufferedReply(params) {
 			}
 		},
 		replyOptions: {
+			suppressTyping: sourceRepliesAreToolOnly && params.msg.chatType === "group" && !params.msg.wasMentioned,
 			disableBlockStreaming,
 			...sourceReplyDeliveryMode ? { sourceReplyDeliveryMode } : {},
 			onModelSelected: params.onModelSelected,
@@ -2983,6 +2999,7 @@ function createWebOnMessageHandler(params) {
 				agentId: route.agentId,
 				sessionKey: route.sessionKey,
 				baseMentionConfig,
+				providerMentionPatterns: account.mentionPatterns,
 				authDir: account.authDir,
 				selfChatMode: account.selfChatMode,
 				groupHistories: params.groupHistories,
@@ -3002,6 +3019,7 @@ function createWebOnMessageHandler(params) {
 					agentId: route.agentId,
 					sessionKey: route.sessionKey,
 					baseMentionConfig,
+					providerMentionPatterns: account.mentionPatterns,
 					authDir: account.authDir,
 					selfChatMode: account.selfChatMode,
 					groupHistories: params.groupHistories,