@openclaw/whatsapp 2026.5.25-beta.1 → 2026.5.26-beta.2

package/dist/{access-control-p_vcYDW7.js → access-control-otOXu5WK.js}

@@ -1,4 +1,4 @@
-import { a as resolveWhatsAppAccount } from "./accounts-BPYgj8Fv.js";
+import { a as resolveWhatsAppAccount } from "./accounts-B3diVrr6.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 { t as resolveWhatsAppRuntimeGroupPolicy } from "./runtime-group-policy-DeSRFXEV.js";

package/dist/{accounts-BPYgj8Fv.js → accounts-B3diVrr6.js}

@@ -100,7 +100,8 @@ function resolveWhatsAppAccount(params) {
 	};
 }
 function resolveWhatsAppMediaMaxBytes(account) {
-	return (typeof account.mediaMaxMb === "number" && account.mediaMaxMb > 0 ? account.mediaMaxMb : 50) * 1024 * 1024;
+	const mediaMaxMb = typeof account.mediaMaxMb === "number" && account.mediaMaxMb > 0 ? account.mediaMaxMb : 50;
+	return Math.floor(mediaMaxMb * 1024 * 1024);
 }
 function listEnabledWhatsAppAccounts(cfg) {
 	return listAccountIds(cfg).map((accountId) => resolveWhatsAppAccount({

package/dist/{action-runtime-BY9Enl8_.js → action-runtime-DcAQibC1.js}

@@ -1,7 +1,7 @@
-import { a as resolveWhatsAppAccount } from "./accounts-BPYgj8Fv.js";
+import { a as resolveWhatsAppAccount } from "./accounts-B3diVrr6.js";
 import { t as resolveWhatsAppOutboundTarget } from "./resolve-outbound-target-CcdugbDf.js";
 import { t as resolveWhatsAppReactionLevel } from "./reaction-level-BqMOEBeq.js";
-import { r as sendReactionWhatsApp } from "./send-59nOuEVY.js";
+import { r as sendReactionWhatsApp } from "./send-BuORvrFd.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-BY9Enl8_.js";
+import { t as handleWhatsAppAction } from "./action-runtime-DcAQibC1.js";
 export { handleWhatsAppAction };

package/dist/action-runtime.runtime.js

@@ -1,2 +1,2 @@
-import { t as handleWhatsAppAction } from "./action-runtime-BY9Enl8_.js";
+import { t as handleWhatsAppAction } from "./action-runtime-DcAQibC1.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-BPYgj8Fv.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-B3diVrr6.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 "./reaction-level-BqMOEBeq.js";
-import "./send-59nOuEVY.js";
+import "./send-BuORvrFd.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 { t as whatsappPlugin } from "./channel-ytMXx8Hq.js";
+import { t as whatsappPlugin } from "./channel-BfG9HEZG.js";
 import { n as WHATSAPP_LEGACY_OUTBOUND_SEND_DEP_KEYS } from "./outbound-base-DwCUu3ab.js";
 import { t as whatsappCommandPolicy } from "./command-policy-BIOSHySD.js";
-import { a as resolveWhatsAppGroupRequireMention, o as resolveWhatsAppGroupToolPolicy, s as resolveWhatsAppGroupIntroHint } from "./setup-core-BNb5y1vb.js";
+import { a as resolveWhatsAppGroupRequireMention, o as resolveWhatsAppGroupToolPolicy, s as resolveWhatsAppGroupIntroHint } from "./setup-core-mK3yptun.js";
 import "./config-schema-CsNDlDpL.js";
-import { t as whatsappSetupPlugin } from "./channel.setup-Bc9iLanw.js";
+import { t as whatsappSetupPlugin } from "./channel.setup-1zhfYJ9v.js";
 import { t as DEFAULT_WEB_MEDIA_BYTES } from "./constants-HU41RHGI.js";
 import { n as listWhatsAppDirectoryGroupsFromConfig, r as listWhatsAppDirectoryPeersFromConfig } from "./directory-config-CfLFAK54.js";
-import { n as testing } from "./access-control-p_vcYDW7.js";
+import { n as testing } from "./access-control-otOXu5WK.js";
 import { m as extractText, t as createWebSendApi } from "./send-api-C3EWzdzp.js";
 import { r as waitForWaConnection, t as createWaSocket } from "./session-CDgpDc0l.js";
 import "openclaw/plugin-sdk/channel-actions";

package/dist/{approval-handler.runtime-CbSmQOxP.js → approval-handler.runtime-D0hxugEn.js}

@@ -1,47 +1,17 @@
 import { s as normalizeWhatsAppMessagingTarget } from "./normalize-target-bVWjgftN.js";
 import "./normalize-Bxwqo-bW.js";
-import { i as sendTypingWhatsApp, l as registerWhatsAppApprovalReactionTarget, s as buildWhatsAppApprovalReactionHint, t as sendMessageWhatsApp, u as unregisterWhatsAppApprovalReactionTarget } from "./send-59nOuEVY.js";
+import { c as unregisterWhatsAppApprovalReactionTarget, i as sendTypingWhatsApp, s as registerWhatsAppApprovalReactionTarget, t as sendMessageWhatsApp } from "./send-BuORvrFd.js";
 import { n as getWhatsAppRuntime } from "./runtime-BfAdAEYT.js";
 import { normalizeOptionalString } from "openclaw/plugin-sdk/string-coerce-runtime";
 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 { buildApprovalResolvedReplyPayload, buildPluginApprovalExpiredMessage, buildPluginApprovalPendingReplyPayload, buildPluginApprovalResolvedMessage } from "openclaw/plugin-sdk/approval-runtime";
 import { createChannelApprovalNativeRuntimeAdapter } from "openclaw/plugin-sdk/approval-handler-runtime";
-import { buildExecApprovalPendingReplyPayload as buildExecApprovalPendingReplyPayload$1 } from "openclaw/plugin-sdk/approval-reply-runtime";
+import { buildApprovalResolvedReplyPayload, buildPluginApprovalExpiredMessage, buildPluginApprovalResolvedMessage } from "openclaw/plugin-sdk/approval-runtime";
 //#region extensions/whatsapp/src/approval-handler.runtime.ts
 const log = createSubsystemLogger("whatsapp/approvals");
-function appendReactionHint(params) {
-	const hint = buildWhatsAppApprovalReactionHint(params.allowedDecisions);
-	return hint ? `${params.text}\n\n${hint}` : params.text;
-}
-function replaceApprovalIdPlaceholder(text, approvalId) {
-	return (text ?? "").replace(/\/approve\s+<id>/g, `/approve ${approvalId}`);
-}
 function buildPendingPayload(params) {
-	const allowedDecisions = params.view.actions.map((action) => action.decision);
-	return {
-		text: appendReactionHint({
-			text: replaceApprovalIdPlaceholder((params.approvalKind === "plugin" ? buildPluginApprovalPendingReplyPayload({
-				request: params.request,
-				nowMs: params.nowMs,
-				allowedDecisions
-			}) : buildExecApprovalPendingReplyPayload$1({
-				approvalId: params.request.id,
-				approvalSlug: params.request.id.slice(0, 8),
-				approvalCommandId: params.request.id,
-				warningText: params.view.approvalKind === "exec" ? params.view.warningText ?? void 0 : void 0,
-				command: params.view.approvalKind === "exec" ? params.view.commandText : "",
-				cwd: params.view.approvalKind === "exec" ? params.view.cwd ?? void 0 : void 0,
-				host: params.view.approvalKind === "exec" && params.view.host === "node" ? "node" : "gateway",
-				nodeId: params.view.approvalKind === "exec" ? params.view.nodeId ?? void 0 : void 0,
-				allowedDecisions,
-				expiresAtMs: params.request.expiresAtMs,
-				nowMs: params.nowMs
-			})).text, params.request.id),
-			allowedDecisions
-		}),
-		allowedDecisions
-	};
+	return buildApprovalReactionPendingContent(params);
 }
 function buildResolvedText(params) {
 	if (params.view.approvalKind === "plugin") return buildPluginApprovalResolvedMessage(params.resolved);
@@ -66,11 +36,10 @@ const whatsappApprovalNativeRuntime = createChannelApprovalNativeRuntimeAdapter(
 		shouldHandle: ({ context }) => Boolean(context)
 	},
 	presentation: {
-		buildPendingPayload: ({ request, approvalKind, nowMs, view }) => buildPendingPayload({
+		buildPendingPayload: ({ request, nowMs, view }) => buildPendingPayload({
 			request,
-			approvalKind,
-			nowMs,
-			view
+			view,
+			nowMs
 		}),
 		buildResolvedResult: ({ request, resolved, view }) => ({
 			kind: "update",
@@ -110,7 +79,7 @@ const whatsappApprovalNativeRuntime = createChannelApprovalNativeRuntimeAdapter(
 				cfg,
 				...preparedTarget.accountId ? { accountId: preparedTarget.accountId } : {}
 			}).catch(() => {});
-			const result = await sendMessageWhatsApp(preparedTarget.to, pendingPayload.text, {
+			const result = await sendMessageWhatsApp(preparedTarget.to, pendingPayload.reactionPayload.text ?? "", {
 				cfg,
 				verbose,
 				preserveLeadingWhitespace: true,
@@ -145,7 +114,7 @@ const whatsappApprovalNativeRuntime = createChannelApprovalNativeRuntimeAdapter(
 			remoteJid: entry.remoteJid,
 			messageId: entry.messageId,
 			approvalId: request.id,
-			allowedDecisions: pendingPayload.allowedDecisions,
+			allowedDecisions: pendingPayload.reactionPayload.allowedDecisions,
 			ttlMs: Math.max(1, view.expiresAtMs - Date.now())
 		}) ? true : null,
 		unbindPending: ({ entry }) => {

package/dist/{channel-ytMXx8Hq.js → channel-BfG9HEZG.js}

@@ -1,16 +1,16 @@
 import { r as resolveDefaultWhatsAppAccountId, t as listAccountIds } from "./account-ids-CB5SOWjc.js";
-import { a as resolveWhatsAppAccount } from "./accounts-BPYgj8Fv.js";
+import { a as resolveWhatsAppAccount } from "./accounts-B3diVrr6.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 { t as resolveWhatsAppReactionLevel } from "./reaction-level-BqMOEBeq.js";
 import "./normalize-Bxwqo-bW.js";
-import { d as getWhatsAppApprovalApprovers, f as whatsappApprovalAuth, i as sendTypingWhatsApp, n as sendPollWhatsApp, o as addWhatsAppApprovalReactionHintToText, t as sendMessageWhatsApp } from "./send-59nOuEVY.js";
+import { i as sendTypingWhatsApp, l as getWhatsAppApprovalApprovers, n as sendPollWhatsApp, t as sendMessageWhatsApp, u as whatsappApprovalAuth } from "./send-BuORvrFd.js";
 import { n as getWhatsAppRuntime } from "./runtime-BfAdAEYT.js";
 import { r as normalizeWhatsAppPayloadTextPreservingIndentation } from "./outbound-media-contract-CA2OGvjJ.js";
 import { t as createWhatsAppLoginTool } from "./agent-tools-login-BDzvb3ee.js";
 import { t as createWhatsAppOutboundBase } from "./outbound-base-DwCUu3ab.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-BNb5y1vb.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-mK3yptun.js";
 import { f as readWebAuthExistsForDecision, n as WHATSAPP_AUTH_UNSTABLE_CODE } from "./auth-store-BrKb0mwT.js";
 import { t as detectWhatsAppLegacyStateMigrations } from "./state-migrations-D_BmQUR9.js";
 import { createActionGate as createActionGate$1 } from "openclaw/plugin-sdk/channel-actions";
@@ -18,6 +18,7 @@ import { normalizeLowercaseStringOrEmpty, normalizeOptionalString } from "opencl
 import { asString, collectIssuesForEnabledAccounts, createAsyncComputedAccountStatusAdapter, createDefaultChannelRuntimeState, isRecord as isRecord$1 } from "openclaw/plugin-sdk/status-helpers";
 import { formatCliCommand } from "openclaw/plugin-sdk/cli-runtime";
 import { buildChannelOutboundSessionRoute } from "openclaw/plugin-sdk/core";
+import { buildApprovalReactionPromptPayloadForRequest } from "openclaw/plugin-sdk/approval-reaction-runtime";
 import { DEFAULT_ACCOUNT_ID } from "openclaw/plugin-sdk/account-id";
 import { buildDmGroupAccountAllowlistAdapter } from "openclaw/plugin-sdk/allowlist-config-edit";
 import { createChatChannelPlugin } from "openclaw/plugin-sdk/channel-core";
@@ -25,19 +26,12 @@ import { createLazyRuntimeModule } from "openclaw/plugin-sdk/lazy-runtime";
 import { matchesApprovalRequestFilters } from "openclaw/plugin-sdk/approval-client-runtime";
 import { createChannelApprovalCapability, splitChannelApprovalCapability } from "openclaw/plugin-sdk/approval-delivery-runtime";
 import { createLazyChannelApprovalNativeRuntimeAdapter } from "openclaw/plugin-sdk/approval-handler-adapter-runtime";
-import { createChannelApproverDmTargetResolver, createChannelNativeOriginTargetResolver, doesApprovalRequestMatchChannelAccount, resolveApprovalRequestSessionTarget } from "openclaw/plugin-sdk/approval-native-runtime";
-import { buildExecApprovalPendingReplyPayload, buildPluginApprovalPendingReplyPayload, resolveExecApprovalCommandDisplay, resolveExecApprovalRequestAllowedDecisions } from "openclaw/plugin-sdk/approval-runtime";
-import { channelRouteTargetsMatchExact } from "openclaw/plugin-sdk/channel-route";
+import { createChannelApproverDmTargetResolver, createChannelNativeOriginTargetResolver, createNativeApprovalForwardingFallbackSuppressor, doesApprovalRequestMatchChannelAccount, nativeApprovalTargetsMatch, resolveApprovalRequestSessionTarget } from "openclaw/plugin-sdk/approval-native-runtime";
 import { normalizeAccountId as normalizeAccountId$1 } from "openclaw/plugin-sdk/routing";
 import { createMessageReceiptFromOutboundResults, defineChannelMessageAdapter } from "openclaw/plugin-sdk/channel-message";
 import { chunkText } from "openclaw/plugin-sdk/reply-chunking";
 //#region extensions/whatsapp/src/approval-native.ts
 const DEFAULT_APPROVAL_FORWARDING_MODE = "session";
-const DEFAULT_PLUGIN_APPROVAL_DECISIONS = [
-	"allow-once",
-	"allow-always",
-	"deny"
-];
 function isWhatsAppApprovalTransportEnabled(params) {
 	return resolveWhatsAppAccount({
 		cfg: params.cfg,
@@ -91,22 +85,6 @@ function normalizeWhatsAppForwardTarget(target) {
 		threadId: target.threadId ?? null
 	};
 }
-function nativeApprovalTargetsMatch(params) {
-	return channelRouteTargetsMatchExact({
-		left: {
-			channel: "whatsapp",
-			to: params.left.to,
-			accountId: params.left.accountId,
-			threadId: params.left.threadId
-		},
-		right: {
-			channel: "whatsapp",
-			to: params.right.to,
-			accountId: params.right.accountId,
-			threadId: params.right.threadId
-		}
-	});
-}
 function hasMatchingWhatsAppTarget(params) {
 	const candidateTarget = params.target ? normalizeWhatsAppForwardTarget(params.target) : null;
 	return (params.config.targets ?? []).some((target) => {
@@ -119,6 +97,7 @@ function hasMatchingWhatsAppTarget(params) {
 		})) return false;
 		if (!candidateTarget) return true;
 		return nativeApprovalTargetsMatch({
+			channel: "whatsapp",
 			left: configuredTarget,
 			right: candidateTarget
 		});
@@ -251,57 +230,24 @@ const resolveWhatsAppApproverDmTargets = createChannelApproverDmTargetResolver({
 		};
 	}
 });
-function appendWhatsAppReactionHint(params) {
-	return addWhatsAppApprovalReactionHintToText({
-		text: params.text ?? "",
-		allowedDecisions: params.allowedDecisions
-	});
-}
-function replaceApprovalIdPlaceholder(text, approvalId) {
-	return (text ?? "").replace(/\/approve\s+<id>/g, `/approve ${approvalId}`);
-}
+const shouldSuppressWhatsAppForwardingFallback = createNativeApprovalForwardingFallbackSuppressor({
+	channel: "whatsapp",
+	normalizeForwardTarget: normalizeWhatsAppForwardTarget,
+	resolveAccountId: ({ forwardingTarget, request }) => forwardingTarget.accountId ?? normalizeOptionalString(request.request.turnSourceAccountId),
+	resolveForwardingTargetForMatch: ({ forwardingTarget, accountId }) => ({
+		...forwardingTarget,
+		accountId
+	}),
+	isSessionRouteEligible: isWhatsAppSessionApprovalEligible,
+	isExplicitTargetEligible: isWhatsAppExplicitTargetEligible,
+	resolveOriginTarget: resolveWhatsAppOriginTarget,
+	resolveApproverDmTargets: resolveWhatsAppApproverDmTargets
+});
 function buildWhatsAppExecPendingPayload(params) {
-	const allowedDecisions = resolveExecApprovalRequestAllowedDecisions(params.request.request);
-	const command = resolveExecApprovalCommandDisplay(params.request.request).commandText;
-	const payload = buildExecApprovalPendingReplyPayload({
-		approvalId: params.request.id,
-		approvalSlug: params.request.id.slice(0, 8),
-		approvalCommandId: params.request.id,
-		warningText: params.request.request.warningText ?? void 0,
-		ask: params.request.request.ask ?? null,
-		agentId: params.request.request.agentId ?? null,
-		allowedDecisions,
-		command,
-		cwd: params.request.request.cwd ?? void 0,
-		host: params.request.request.host === "node" ? "node" : "gateway",
-		nodeId: params.request.request.nodeId ?? void 0,
-		sessionKey: params.request.request.sessionKey ?? null,
-		expiresAtMs: params.request.expiresAtMs,
-		nowMs: params.nowMs
-	});
-	return {
-		...payload,
-		text: appendWhatsAppReactionHint({
-			text: replaceApprovalIdPlaceholder(payload.text, params.request.id),
-			allowedDecisions
-		})
-	};
+	return buildApprovalReactionPromptPayloadForRequest(params);
 }
 function buildWhatsAppPluginPendingPayload(params) {
-	const configuredDecisions = params.request.request.allowedDecisions;
-	const allowedDecisions = configuredDecisions && configuredDecisions.length > 0 ? configuredDecisions : DEFAULT_PLUGIN_APPROVAL_DECISIONS;
-	const payload = buildPluginApprovalPendingReplyPayload({
-		request: params.request,
-		nowMs: params.nowMs,
-		allowedDecisions
-	});
-	return {
-		...payload,
-		text: appendWhatsAppReactionHint({
-			text: replaceApprovalIdPlaceholder(payload.text, params.request.id),
-			allowedDecisions
-		})
-	};
+	return buildApprovalReactionPromptPayloadForRequest(params);
 }
 const whatsappApprovalCapability = createChannelApprovalCapability({
 	...whatsappApprovalAuth,
@@ -333,47 +279,7 @@ const whatsappApprovalCapability = createChannelApprovalCapability({
 				accountId
 			}).length > 0;
 		}),
-		shouldSuppressForwardingFallback: ({ cfg, approvalKind, target, request }) => {
-			const forwardingTarget = normalizeWhatsAppForwardTarget(target);
-			if (!forwardingTarget) return false;
-			const accountId = forwardingTarget.accountId ?? normalizeOptionalString(request.request.turnSourceAccountId);
-			const forwardingTargetForMatch = {
-				...forwardingTarget,
-				accountId
-			};
-			const kind = resolveApprovalKind(request, approvalKind);
-			if (!(target.source === "target" ? isWhatsAppExplicitTargetEligible({
-				cfg,
-				accountId,
-				approvalKind: kind,
-				request,
-				target
-			}) : isWhatsAppSessionApprovalEligible({
-				cfg,
-				accountId,
-				approvalKind: kind,
-				request
-			}))) return false;
-			const originTarget = resolveWhatsAppOriginTarget({
-				cfg,
-				accountId,
-				approvalKind: kind,
-				request
-			});
-			if (originTarget && nativeApprovalTargetsMatch({
-				left: forwardingTargetForMatch,
-				right: originTarget
-			})) return true;
-			return resolveWhatsAppApproverDmTargets({
-				cfg,
-				accountId,
-				approvalKind: kind,
-				request
-			}).some((approverTarget) => nativeApprovalTargetsMatch({
-				left: forwardingTargetForMatch,
-				right: approverTarget
-			}));
-		}
+		shouldSuppressForwardingFallback: shouldSuppressWhatsAppForwardingFallback
 	},
 	render: {
 		exec: { buildPendingPayload: ({ request, nowMs }) => buildWhatsAppExecPendingPayload({
@@ -422,7 +328,7 @@ const whatsappApprovalCapability = createChannelApprovalCapability({
 			accountId,
 			request
 		}),
-		load: async () => (await import("./approval-handler.runtime-CbSmQOxP.js")).whatsappApprovalNativeRuntime
+		load: async () => (await import("./approval-handler.runtime-D0hxugEn.js")).whatsappApprovalNativeRuntime
 	})
 });
 splitChannelApprovalCapability(whatsappApprovalCapability);
@@ -704,7 +610,7 @@ function collectWhatsAppStatusIssues(accounts) {
 //#endregion
 //#region extensions/whatsapp/src/channel.ts
 const loadWhatsAppDirectoryConfig = createLazyRuntimeModule(() => import("./directory-config-CfLFAK54.js").then((n) => n.t));
-const loadWhatsAppChannelReactAction = createLazyRuntimeModule(() => import("./channel-react-action-DCqXFZD4.js"));
+const loadWhatsAppChannelReactAction = createLazyRuntimeModule(() => import("./channel-react-action-VgsrmO3-.js"));
 function resolveWhatsAppTargetInfo(raw) {
 	const normalized = normalizeWhatsAppTarget(raw);
 	if (!normalized) return null;

package/dist/channel-plugin-api.js

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

package/dist/{channel-react-action-DCqXFZD4.js → channel-react-action-VgsrmO3-.js}

@@ -1,8 +1,8 @@
-import { a as resolveWhatsAppAccount, s as resolveWhatsAppMediaMaxBytes } from "./accounts-BPYgj8Fv.js";
+import { a as resolveWhatsAppAccount, s as resolveWhatsAppMediaMaxBytes } from "./accounts-B3diVrr6.js";
 import { c as normalizeWhatsAppTarget, t as isWhatsAppGroupJid } from "./normalize-target-bVWjgftN.js";
-import { r as resolveAuthorizedWhatsAppOutboundTarget, t as handleWhatsAppAction } from "./action-runtime-BY9Enl8_.js";
+import { r as resolveAuthorizedWhatsAppOutboundTarget, t as handleWhatsAppAction } from "./action-runtime-DcAQibC1.js";
 import "./normalize-Bxwqo-bW.js";
-import { t as sendMessageWhatsApp } from "./send-59nOuEVY.js";
+import { t as sendMessageWhatsApp } from "./send-BuORvrFd.js";
 import { jsonResult, readStringOrNumberParam, readStringParam as readStringParam$1, resolveReactionMessageId } from "openclaw/plugin-sdk/channel-actions";
 //#region extensions/whatsapp/src/channel-react-action.ts
 const WHATSAPP_CHANNEL = "whatsapp";

package/dist/{channel.runtime-CoL9KTN0.js → channel.runtime-0kQxYUcI.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 { t as getActiveWebListener$1 } from "./active-listener-B4SDebQ6.js";
-import { t as monitorWebChannel$1 } from "./monitor-5S9CBSEk.js";
-import { t as loginWeb$1 } from "./login-BEkrpJbZ.js";
-import { whatsappSetupWizard as whatsappSetupWizard$1 } from "./setup-surface-a6p2hwne.js";
+import { t as monitorWebChannel$1 } from "./monitor-Cxk7UHkH.js";
+import { t as loginWeb$1 } from "./login-CympQtg8.js";
+import { whatsappSetupWizard as whatsappSetupWizard$1 } from "./setup-surface-sCDFlWd2.js";
 //#region extensions/whatsapp/src/channel.runtime.ts
 function getActiveWebListener(...args) {
 	return getActiveWebListener$1(...args);

package/dist/{channel.setup-Bc9iLanw.js → channel.setup-1zhfYJ9v.js}

@@ -1,5 +1,5 @@
-import "./accounts-BPYgj8Fv.js";
-import { a as resolveWhatsAppGroupRequireMention, i as whatsappSetupWizardProxy, n as createWhatsAppPluginBase, o as resolveWhatsAppGroupToolPolicy, s as resolveWhatsAppGroupIntroHint, t as whatsappSetupAdapter } from "./setup-core-BNb5y1vb.js";
+import "./accounts-B3diVrr6.js";
+import { a as resolveWhatsAppGroupRequireMention, i as whatsappSetupWizardProxy, n as createWhatsAppPluginBase, o as resolveWhatsAppGroupToolPolicy, s as resolveWhatsAppGroupIntroHint, t as whatsappSetupAdapter } from "./setup-core-mK3yptun.js";
 import { t as detectWhatsAppLegacyStateMigrations } from "./state-migrations-D_BmQUR9.js";
 //#region extensions/whatsapp/src/channel.setup.ts
 async function isWhatsAppAuthConfigured(account) {

package/dist/contract-api.js

@@ -5,7 +5,7 @@ import { n as unsupportedSecretRefSurfacePatterns, t as collectUnsupportedSecret
 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-CfLFAK54.js";
 import { t as resolveWhatsAppRuntimeGroupPolicy$1 } from "./runtime-group-policy-DeSRFXEV.js";
-import { n as testing } from "./access-control-p_vcYDW7.js";
+import { n as testing } from "./access-control-otOXu5WK.js";
 //#region extensions/whatsapp/contract-api.ts
 const canonicalizeLegacySessionKey = canonicalizeLegacySessionKey$1;
 const isLegacyGroupSessionKey = isLegacyGroupSessionKey$1;

package/dist/{login-BEkrpJbZ.js → login-CympQtg8.js}

@@ -1,5 +1,5 @@
 import { t as __exportAll } from "./rolldown-runtime-D7D4PA-g.js";
-import { a as resolveWhatsAppAccount } from "./accounts-BPYgj8Fv.js";
+import { a as resolveWhatsAppAccount } from "./accounts-B3diVrr6.js";
 import { b as restoreCredsFromBackupIfNeeded } from "./auth-store-BrKb0mwT.js";
 import { a as renderQrTerminal, i as resolveWhatsAppSocketTiming, t as createWaSocket } from "./session-CDgpDc0l.js";
 import { a as closeWaSocketSoon, o as waitForWhatsAppLoginResult } from "./connection-controller-ja6z4F_k.js";

package/dist/{login-qr-BVRx8j_M.js → login-qr-RCP3gu1G.js}

@@ -1,4 +1,4 @@
-import { a as resolveWhatsAppAccount } from "./accounts-BPYgj8Fv.js";
+import { a as resolveWhatsAppAccount } from "./accounts-B3diVrr6.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-CDgpDc0l.js";
 import { i as closeWaSocket, o as waitForWhatsAppLoginResult, t as WHATSAPP_LOGGED_OUT_QR_MESSAGE } from "./connection-controller-ja6z4F_k.js";

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-BVRx8j_M.js");
+	loginQrModulePromise ??= import("./login-qr-RCP3gu1G.js");
 	return loginQrModulePromise;
 }
 async function startWebLoginWithQr(...args) {

package/dist/{monitor-5S9CBSEk.js → monitor-Cxk7UHkH.js}

@@ -1,7 +1,7 @@
-import { a as resolveWhatsAppAccount, s as resolveWhatsAppMediaMaxBytes } from "./accounts-BPYgj8Fv.js";
+import { a as resolveWhatsAppAccount, s as resolveWhatsAppMediaMaxBytes } from "./accounts-B3diVrr6.js";
 import { t as isWhatsAppGroupJid } from "./normalize-target-bVWjgftN.js";
 import { t as resolveWhatsAppReactionLevel } from "./reaction-level-BqMOEBeq.js";
-import { c as maybeResolveWhatsAppApprovalReaction, r as sendReactionWhatsApp } from "./send-59nOuEVY.js";
+import { o as maybeResolveWhatsAppApprovalReaction, r as sendReactionWhatsApp } from "./send-BuORvrFd.js";
 import { n as getWhatsAppRuntime } from "./runtime-BfAdAEYT.js";
 import { i as prepareWhatsAppOutboundMedia, o as sendWhatsAppOutboundWithRetry, r as normalizeWhatsAppPayloadTextPreservingIndentation, t as normalizeWhatsAppOutboundPayload } from "./outbound-media-contract-CA2OGvjJ.js";
 import { n as getStatusCode, t as formatError } from "./session-errors-BAj9D2La.js";
@@ -10,7 +10,7 @@ import { n as cacheInboundMessageMeta, r as lookupInboundMessageMeta, t as build
 import { c as logoutWeb, g as readWebSelfId, o as getWebAuthAgeMs, r as WhatsAppAuthUnstableError, v as readWebSelfIdentityForDecision } from "./auth-store-BrKb0mwT.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-p_vcYDW7.js";
+import { i as resolveWhatsAppInboundPolicy, r as resolveWhatsAppCommandAuthorized, t as checkInboundAccessControl } from "./access-control-otOXu5WK.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-C3EWzdzp.js";
 import { i as resolveWhatsAppSocketTiming, r as waitForWaConnection, t as createWaSocket } from "./session-CDgpDc0l.js";
 import { t as BufferJSON } from "./session.runtime-LZFdq3yb.js";
@@ -352,6 +352,11 @@ async function attachWebInboxToSocket(options) {
 		return `${msg.accountId}:${conversationKey}:${senderKey}`;
 	};
 	const shouldDebounceInboundMessage = (msg) => options.shouldDebounce?.(msg) ?? true;
+	const orderDebouncedInboundEntries = (entries) => entries.toSorted((a, b) => {
+		const timestampDiff = (a.timestamp ?? 0) - (b.timestamp ?? 0);
+		if (timestampDiff !== 0) return timestampDiff;
+		return (a.receiveOrder ?? 0) - (b.receiveOrder ?? 0);
+	});
 	const finalizeInboundDelivery = async (entries, error) => {
 		const dedupeKeys = uniqueStrings(entries.map((entry) => entry.dedupeKey).filter(isNonEmptyString));
 		const durableEntries = entries.filter((entry) => isNonEmptyString(entry.durableId));
@@ -375,17 +380,18 @@ async function attachWebInboxToSocket(options) {
 			});
 			activeInboundFlushes.add(flushTask);
 			try {
-				const last = entries.at(-1);
+				const orderedEntries = orderDebouncedInboundEntries(entries);
+				const last = orderedEntries.at(-1);
 				if (!last) return;
 				try {
-					if (entries.length === 1) {
+					if (orderedEntries.length === 1) {
 						await options.onMessage(last);
-						await finalizeInboundDelivery(entries);
+						await finalizeInboundDelivery(orderedEntries);
 						return;
 					}
 					const mentioned = /* @__PURE__ */ new Set();
-					for (const entry of entries) for (const jid of entry.mentions ?? entry.mentionedJids ?? []) mentioned.add(jid);
-					const combinedBody = entries.map((entry) => entry.body).filter(Boolean).join("\n");
+					for (const entry of orderedEntries) for (const jid of entry.mentions ?? entry.mentionedJids ?? []) mentioned.add(jid);
+					const combinedBody = orderedEntries.map((entry) => entry.body).filter(Boolean).join("\n");
 					const combinedMessage = {
 						...last,
 						body: combinedBody,
@@ -394,9 +400,9 @@ async function attachWebInboxToSocket(options) {
 						isBatched: true
 					};
 					await options.onMessage(combinedMessage);
-					await finalizeInboundDelivery(entries);
+					await finalizeInboundDelivery(orderedEntries);
 				} catch (error) {
-					await finalizeInboundDelivery(entries, error);
+					await finalizeInboundDelivery(orderedEntries, error);
 					throw error;
 				}
 			} finally {
@@ -637,7 +643,7 @@ async function attachWebInboxToSocket(options) {
 		const msgTsNum = msgTsRaw != null ? Number(msgTsRaw) : NaN;
 		return (Number.isFinite(msgTsNum) ? msgTsNum * 1e3 : 0) < connectedAtMs - APPEND_RECENT_GRACE_MS;
 	};
-	const processDurableInboundMessage = async (msg, upsertType, stored) => {
+	const processDurableInboundMessage = async (msg, upsertType, receiveOrder, stored) => {
 		const inbound = await normalizeInboundMessage(msg);
 		if (!inbound) {
 			if (stored) await completeUndeliverableDurableInbound(stored.id, stored.metadata);
@@ -688,12 +694,13 @@ async function attachWebInboxToSocket(options) {
 		recordAcceptedInboundActivity(options.accountId);
 		await enqueueInboundMessage(msg, inbound, enriched, {
 			durableId,
-			readReceipt: deliveryReadReceipt
+			readReceipt: deliveryReadReceipt,
+			receiveOrder
 		});
 	};
 	const replayPendingDurableInboundMessages = async () => {
 		const pending = await durableInboundJournal.pending();
-		for (const record of pending) await processDurableInboundMessage(deserializeWhatsAppDurableInboundMessage(record.payload.message), record.payload.upsertType, {
+		for (const record of pending) await processDurableInboundMessage(deserializeWhatsAppDurableInboundMessage(record.payload.message), record.payload.upsertType, record.payload.receivedAt, {
 			id: record.id,
 			payload: record.payload,
 			metadata: record.metadata
@@ -816,7 +823,8 @@ async function attachWebInboxToSocket(options) {
 			mediaFileName: enriched.mediaFileName,
 			dedupeKey: inbound.id ? `${options.accountId}:${inbound.remoteJid}:${inbound.id}` : void 0,
 			durableId: durable.durableId,
-			readReceipt: durable.readReceipt
+			readReceipt: durable.readReceipt,
+			receiveOrder: durable.receiveOrder
 		};
 		const debounceKey = buildInboundDebounceKey(inboundMessage);
 		if (debounceKey) {
@@ -840,9 +848,11 @@ async function attachWebInboxToSocket(options) {
 		}
 	};
 	const pendingMessageHandlers = /* @__PURE__ */ new Set();
+	let nextReceiveOrder = 0;
 	const handleMessagesUpsert = async (upsert) => {
 		if (upsert.type !== "notify" && upsert.type !== "append") return;
 		for (const msg of upsert.messages ?? []) {
+			const receiveOrder = nextReceiveOrder++;
 			if (await maybeResolveWhatsAppApprovalReaction({
 				cfg: options.loadConfig?.() ?? options.cfg,
 				accountId: options.accountId,
@@ -852,7 +862,7 @@ async function attachWebInboxToSocket(options) {
 				resolveInboundJid,
 				logVerboseMessage: (message) => logWhatsAppVerbose(options.verbose, message)
 			})) continue;
-			await processDurableInboundMessage(msg, upsert.type);
+			await processDurableInboundMessage(msg, upsert.type, receiveOrder);
 		}
 	};
 	const handleMessagesUpsertEvent = (upsert) => {

package/dist/{outbound-adapter-B_NADUoO.js → outbound-adapter-BiLBIo1h.js}

@@ -7,7 +7,7 @@ import "openclaw/plugin-sdk/channel-send-result";
 //#region extensions/whatsapp/src/outbound-adapter.ts
 let whatsAppSendModulePromise;
 function loadWhatsAppSendModule() {
-	whatsAppSendModulePromise ??= import("./send-59nOuEVY.js").then((n) => n.a);
+	whatsAppSendModulePromise ??= import("./send-BuORvrFd.js").then((n) => n.a);
 	return whatsAppSendModulePromise;
 }
 function normalizeOutboundText(text) {

package/dist/outbound-payload-test-api.js

@@ -1,2 +1,2 @@
-import { t as whatsappOutbound } from "./outbound-adapter-B_NADUoO.js";
+import { t as whatsappOutbound } from "./outbound-adapter-BiLBIo1h.js";
 export { whatsappOutbound };

package/dist/runtime-api.js

@@ -1,6 +1,6 @@
 import { o as resolveWebCredsBackupPath, r as hasWebCredsSync, s as resolveWebCredsPath } from "./creds-files-B1kSWtBg.js";
-import { n as whatsAppActionRuntime, t as handleWhatsAppAction } from "./action-runtime-BY9Enl8_.js";
-import { i as sendTypingWhatsApp, n as sendPollWhatsApp, r as sendReactionWhatsApp, t as sendMessageWhatsApp } from "./send-59nOuEVY.js";
+import { n as whatsAppActionRuntime, t as handleWhatsAppAction } from "./action-runtime-DcAQibC1.js";
+import { i as sendTypingWhatsApp, n as sendPollWhatsApp, r as sendReactionWhatsApp, t as sendMessageWhatsApp } from "./send-BuORvrFd.js";
 import { r as setWhatsAppRuntime } from "./runtime-BfAdAEYT.js";
 import { n as getStatusCode, t as formatError } from "./session-errors-BAj9D2La.js";
 import { startWebLoginWithQr, waitForWebLogin } from "./login-qr-runtime.js";
@@ -10,7 +10,7 @@ import { t as DEFAULT_WEB_MEDIA_BYTES } from "./constants-HU41RHGI.js";
 import { d as extractLocationData, f as extractMediaPlaceholder, l as extractContactContext, m as extractText } from "./send-api-C3EWzdzp.js";
 import { n as newConnectionId, r as waitForWaConnection, t as createWaSocket } from "./session-CDgpDc0l.js";
 import { n as resolveWebAccountId, t as getActiveWebListener } from "./active-listener-B4SDebQ6.js";
-import { a as loadWebMediaRaw, c as monitorWebInbox, i as loadWebMedia, l as resetWebInboundDedupe, n as LocalMediaAccessError, o as optimizeImageToJpeg, r as getDefaultLocalRoots, s as optimizeImageToPng, t as monitorWebChannel } from "./monitor-5S9CBSEk.js";
-import { t as loginWeb } from "./login-BEkrpJbZ.js";
+import { a as loadWebMediaRaw, c as monitorWebInbox, i as loadWebMedia, l as resetWebInboundDedupe, n as LocalMediaAccessError, o as optimizeImageToJpeg, r as getDefaultLocalRoots, s as optimizeImageToPng, t as monitorWebChannel } from "./monitor-Cxk7UHkH.js";
+import { t as loginWeb } from "./login-CympQtg8.js";
 import { HEARTBEAT_PROMPT, HEARTBEAT_TOKEN, SILENT_REPLY_TOKEN, stripHeartbeatToken } from "openclaw/plugin-sdk/reply-runtime";
 export { DEFAULT_WEB_MEDIA_BYTES, HEARTBEAT_PROMPT, HEARTBEAT_TOKEN, LocalMediaAccessError, SILENT_REPLY_TOKEN, WA_WEB_AUTH_DIR, WHATSAPP_AUTH_UNSTABLE_CODE, WhatsAppAuthUnstableError, createWaSocket, createWhatsAppLoginTool, extractContactContext, extractLocationData, extractMediaPlaceholder, extractText, formatError, formatWhatsAppWebAuthStatusState, getActiveWebListener, getDefaultLocalRoots, getStatusCode, getWebAuthAgeMs, handleWhatsAppAction, hasWebCredsSync, loadWebMedia, loadWebMediaRaw, logWebSelfId, loginWeb, logoutWeb, monitorWebChannel, monitorWebInbox, newConnectionId, optimizeImageToJpeg, optimizeImageToPng, pickWebChannel, readCredsJsonRaw, readWebAuthExistsBestEffort, readWebAuthExistsForDecision, readWebAuthSnapshot, readWebAuthSnapshotBestEffort, readWebAuthState, readWebSelfId, readWebSelfIdentity, readWebSelfIdentityForDecision, resetWebInboundDedupe, resolveDefaultWebAuthDir, resolveWebAccountId, resolveWebCredsBackupPath, resolveWebCredsPath, restoreCredsFromBackupIfNeeded, sendMessageWhatsApp, sendPollWhatsApp, sendReactionWhatsApp, sendTypingWhatsApp, setWhatsAppRuntime, startWebLoginWithQr, stripHeartbeatToken, waitForCredsSaveQueue, waitForCredsSaveQueueWithTimeout, waitForWaConnection, waitForWebLogin, webAuthExists, whatsAppActionRuntime, writeCredsJsonAtomically };

package/dist/{send-59nOuEVY.js → send-BuORvrFd.js}

@@ -1,6 +1,6 @@
 import { t as __exportAll } from "./rolldown-runtime-D7D4PA-g.js";
 import { r as resolveDefaultWhatsAppAccountId } from "./account-ids-CB5SOWjc.js";
-import { a as resolveWhatsAppAccount, s as resolveWhatsAppMediaMaxBytes } from "./accounts-BPYgj8Fv.js";
+import { a as resolveWhatsAppAccount, s as resolveWhatsAppMediaMaxBytes } from "./accounts-B3diVrr6.js";
 import { c as normalizeWhatsAppTarget, n as isWhatsAppNewsletterJid } from "./normalize-target-bVWjgftN.js";
 import "./normalize-Bxwqo-bW.js";
 import { t as getOptionalWhatsAppRuntime } from "./runtime-BfAdAEYT.js";
@@ -14,6 +14,7 @@ import { convertMarkdownTables, resolveMarkdownTableMode } from "openclaw/plugin
 import { requireRuntimeConfig } from "openclaw/plugin-sdk/plugin-config-runtime";
 import { normalizePollInput } from "openclaw/plugin-sdk/poll-runtime";
 import { createSubsystemLogger, getChildLogger as getChildLogger$1 } from "openclaw/plugin-sdk/runtime-env";
+import { createApprovalReactionTargetStore, listApprovalReactionBindings, resolveApprovalReactionTarget } from "openclaw/plugin-sdk/approval-reaction-runtime";
 import { createResolvedApproverActionAuthAdapter, resolveApprovalApprovers } from "openclaw/plugin-sdk/approval-auth-runtime";
 import { loadWebMedia } from "openclaw/plugin-sdk/web-media";
 //#region extensions/whatsapp/src/approval-auth.ts
@@ -57,24 +58,18 @@ const whatsappApprovalAuth = { authorizeActorAction({ cfg, accountId, senderId,
 } };
 //#endregion
 //#region extensions/whatsapp/src/approval-reactions.ts
-const WHATSAPP_APPROVAL_REACTION_META = {
-	"allow-once": {
-		emoji: "👍",
-		label: "Allow Once"
-	},
-	deny: {
-		emoji: "👎",
-		label: "Deny"
-	}
-};
-const WHATSAPP_APPROVAL_REACTION_ORDER = ["allow-once", "deny"];
 const PERSISTENT_NAMESPACE = "whatsapp.approval-reactions";
 const PERSISTENT_MAX_ENTRIES = 1e3;
 const DEFAULT_REACTION_TARGET_TTL_MS = 1440 * 60 * 1e3;
-const whatsappApprovalReactionTargets = /* @__PURE__ */ new Map();
-let persistentStore;
-let persistentStoreDisabled = false;
 let resolverRuntimePromise;
+const whatsappApprovalReactionTargets = createApprovalReactionTargetStore({
+	namespace: PERSISTENT_NAMESPACE,
+	maxEntries: PERSISTENT_MAX_ENTRIES,
+	defaultTtlMs: DEFAULT_REACTION_TARGET_TTL_MS,
+	openStore: (storeParams) => getOptionalWhatsAppRuntime()?.state.openKeyedStore(storeParams),
+	logPersistentError: reportPersistentApprovalReactionError,
+	readPersistedTarget
+});
 function loadApprovalResolver() {
 	resolverRuntimePromise ??= import("./approval-resolver-e1hAVRRy.js");
 	return resolverRuntimePromise;
@@ -94,106 +89,17 @@ function reportPersistentApprovalReactionError(error) {
 		}).warn("WhatsApp persistent approval reaction state failed", { error: String(error) });
 	} catch {}
 }
-function disablePersistentApprovalReactionStore(error) {
-	persistentStoreDisabled = true;
-	persistentStore = void 0;
-	reportPersistentApprovalReactionError(error);
-}
-function getPersistentApprovalReactionStore() {
-	if (persistentStoreDisabled) return;
-	if (persistentStore) return persistentStore;
-	const runtime = getOptionalWhatsAppRuntime();
-	if (!runtime) return;
-	try {
-		persistentStore = runtime.state.openKeyedStore({
-			namespace: PERSISTENT_NAMESPACE,
-			maxEntries: PERSISTENT_MAX_ENTRIES,
-			defaultTtlMs: DEFAULT_REACTION_TARGET_TTL_MS
-		});
-		return persistentStore;
-	} catch (error) {
-		disablePersistentApprovalReactionStore(error);
-		return;
-	}
-}
-function readPersistedTarget(value) {
-	const persisted = value;
-	if (persisted?.version !== 1 || !persisted.target || typeof persisted.target.approvalId !== "string" || !Array.isArray(persisted.target.allowedDecisions)) return null;
-	return persisted.target;
-}
-function rememberPersistentApprovalReactionTarget(params) {
-	const ttlMs = params.ttlMs == null ? DEFAULT_REACTION_TARGET_TTL_MS : Math.max(1, params.ttlMs);
-	const store = getPersistentApprovalReactionStore();
-	if (!store) return;
-	store.register(params.key, {
-		version: 1,
-		target: params.target
-	}, { ttlMs }).catch(disablePersistentApprovalReactionStore);
-}
-function forgetPersistentApprovalReactionTarget(key) {
-	const store = getPersistentApprovalReactionStore();
-	if (!store) return;
-	store.delete(key).catch(disablePersistentApprovalReactionStore);
-}
-async function lookupPersistentApprovalReactionTarget(key) {
-	const store = getPersistentApprovalReactionStore();
-	if (!store) return null;
-	try {
-		return readPersistedTarget(await store.lookup(key));
-	} catch (error) {
-		disablePersistentApprovalReactionStore(error);
-		return null;
-	}
+function readPersistedTarget(target) {
+	const value = target;
+	if (!value || typeof value.approvalId !== "string" || !Array.isArray(value.allowedDecisions)) return null;
+	return {
+		approvalId: value.approvalId,
+		...value.approvalKind === "exec" || value.approvalKind === "plugin" ? { approvalKind: value.approvalKind } : {},
+		allowedDecisions: value.allowedDecisions
+	};
 }
 function listWhatsAppApprovalReactionBindings(allowedDecisions) {
-	const allowed = new Set(allowedDecisions);
-	return WHATSAPP_APPROVAL_REACTION_ORDER.filter((decision) => allowed.has(decision)).map((decision) => ({
-		decision,
-		emoji: WHATSAPP_APPROVAL_REACTION_META[decision].emoji,
-		label: WHATSAPP_APPROVAL_REACTION_META[decision].label
-	}));
-}
-function buildWhatsAppApprovalReactionHint(allowedDecisions) {
-	const bindings = listWhatsAppApprovalReactionBindings(allowedDecisions);
-	if (bindings.length === 0) return null;
-	return `React with:\n\n${bindings.map((binding) => `${binding.emoji} ${binding.label}`).join("\n")}`;
-}
-function insertWhatsAppApprovalReactionHintNearHeader(params) {
-	const lines = params.text.split(/\r?\n/);
-	const idLineIndex = lines.findIndex((line) => /^ID:\s*\S+/.test(line.trim()));
-	if (idLineIndex >= 0) {
-		const before = lines.slice(0, idLineIndex + 1).join("\n");
-		const after = lines.slice(idLineIndex + 1).join("\n").replace(/^\n+/, "");
-		return after ? `${before}\n\n${params.hint}\n\n${after}` : `${before}\n\n${params.hint}`;
-	}
-	return `${params.hint}\n\n${params.text}`;
-}
-function addWhatsAppApprovalReactionHintToText(params) {
-	if (/(^|\n)React with:\s*(\n|$)/i.test(params.text)) return params.text;
-	const hint = buildWhatsAppApprovalReactionHint(params.allowedDecisions);
-	return hint ? insertWhatsAppApprovalReactionHintNearHeader({
-		text: params.text,
-		hint
-	}) : params.text;
-}
-function appendWhatsAppApprovalReactionHintForOutboundMessage(text) {
-	if (/(^|\n)React with:\s*(\n|$)/i.test(text)) return text;
-	const binding = extractWhatsAppApprovalPromptBinding(text);
-	if (!binding) return text;
-	return addWhatsAppApprovalReactionHintToText({
-		text,
-		allowedDecisions: binding.allowedDecisions
-	});
-}
-function resolveWhatsAppApprovalReactionDecision(reactionKey, allowedDecisions) {
-	const normalizedReaction = reactionKey.trim();
-	if (!normalizedReaction) return null;
-	const allowed = new Set(allowedDecisions);
-	for (const decision of WHATSAPP_APPROVAL_REACTION_ORDER) {
-		if (!allowed.has(decision)) continue;
-		if (WHATSAPP_APPROVAL_REACTION_META[decision].emoji === normalizedReaction) return decision;
-	}
-	return null;
+	return listApprovalReactionBindings({ allowedDecisions });
 }
 function normalizeApprovalDecision(value) {
 	const normalized = value.trim().toLowerCase();
@@ -201,21 +107,23 @@ function normalizeApprovalDecision(value) {
 	if (normalized === "allow-once" || normalized === "allow-always" || normalized === "deny") return normalized;
 	return null;
 }
+const APPROVAL_ID_LINE_RE = /^\s*ID:\s*([A-Za-z0-9][A-Za-z0-9._:-]*)\s*$/i;
+const APPROVE_COMMAND_LINE_RE = /\/approve(?:@[^\s]+)?\s+([A-Za-z0-9][A-Za-z0-9._:-]*)\s+(.+)$/i;
 function extractWhatsAppApprovalPromptBinding(text) {
+	const lines = text.split(/\r?\n/);
+	const idHeaderMatch = lines.map((line) => line.match(APPROVAL_ID_LINE_RE)).find((match) => Boolean(match));
+	if (!idHeaderMatch) return null;
+	const approvalId = idHeaderMatch[1];
 	const allowedDecisions = [];
-	let approvalId = "";
-	for (const line of text.split(/\r?\n/)) {
-		const match = line.match(/\/approve(?:@[^\s]+)?\s+([A-Za-z0-9][A-Za-z0-9._:-]*)\s+(.+)$/i);
-		if (!match) continue;
-		if (approvalId && match[1] !== approvalId) continue;
-		approvalId ||= match[1];
-		const decisions = match[2].split(/[\s|,]+/);
-		for (const decisionText of decisions) {
+	for (const line of lines) {
+		const match = line.match(APPROVE_COMMAND_LINE_RE);
+		if (!match || match[1] !== approvalId) continue;
+		for (const decisionText of match[2].split(/[\s|,]+/)) {
 			const decision = normalizeApprovalDecision(decisionText);
 			if (decision && !allowedDecisions.includes(decision)) allowedDecisions.push(decision);
 		}
 	}
-	return approvalId && allowedDecisions.length > 0 ? {
+	return allowedDecisions.length > 0 ? {
 		approvalId,
 		allowedDecisions
 	} : null;
@@ -227,14 +135,10 @@ function registerWhatsAppApprovalReactionTarget(params) {
 	if (!key || !approvalId || allowedDecisions.length === 0) return null;
 	const target = {
 		approvalId,
+		approvalKind: approvalId.startsWith("plugin:") ? "plugin" : "exec",
 		allowedDecisions
 	};
-	whatsappApprovalReactionTargets.set(key, target);
-	rememberPersistentApprovalReactionTarget({
-		key,
-		target,
-		ttlMs: params.ttlMs
-	});
+	whatsappApprovalReactionTargets.register(key, target, { ttlMs: params.ttlMs });
 	return target;
 }
 function registerWhatsAppApprovalReactionTargetForOutboundMessage(params) {
@@ -253,27 +157,22 @@ function unregisterWhatsAppApprovalReactionTarget(params) {
 	const key = buildReactionTargetKey(params);
 	if (!key) return;
 	whatsappApprovalReactionTargets.delete(key);
-	forgetPersistentApprovalReactionTarget(key);
 }
 function resolveTarget(params) {
-	const target = params.target;
-	if (!target) return null;
-	const decision = resolveWhatsAppApprovalReactionDecision(params.reactionKey, target.allowedDecisions);
-	return decision ? {
-		approvalId: target.approvalId,
-		decision
+	const resolved = resolveApprovalReactionTarget({
+		target: params.target,
+		reactionKey: params.reactionKey
+	});
+	return resolved ? {
+		approvalId: resolved.approvalId,
+		decision: resolved.decision
 	} : null;
 }
 async function resolveWhatsAppApprovalReactionTargetWithPersistence(params) {
 	const key = buildReactionTargetKey(params);
 	if (!key) return null;
-	const inMemory = resolveTarget({
-		target: whatsappApprovalReactionTargets.get(key),
-		reactionKey: params.reactionKey
-	});
-	if (inMemory) return inMemory;
 	return resolveTarget({
-		target: await lookupPersistentApprovalReactionTarget(key),
+		target: await whatsappApprovalReactionTargets.lookup(key),
 		reactionKey: params.reactionKey
 	});
 }
@@ -503,17 +402,16 @@ async function sendMessageWhatsApp(to, body, options) {
 			...options.quotedMessageKey ? { quotedMessageKey: options.quotedMessageKey } : {},
 			accountId
 		} : void 0;
-		const outboundText = text ? appendWhatsAppApprovalReactionHintForOutboundMessage(text) : text;
-		const result = sendOptions ? await active.sendMessage(to, outboundText, mediaBuffer, mediaType, sendOptions) : await active.sendMessage(to, outboundText, mediaBuffer, mediaType);
+		const result = sendOptions ? await active.sendMessage(to, text, mediaBuffer, mediaType, sendOptions) : await active.sendMessage(to, text, mediaBuffer, mediaType);
 		if (visibleTextAfterVoice) if (sendOptions) await active.sendMessage(to, visibleTextAfterVoice, void 0, void 0, sendOptions);
 		else await active.sendMessage(to, visibleTextAfterVoice, void 0, void 0);
 		const messageId = result?.messageId ?? "unknown";
 		const sentRemoteJid = resolveActualSentRemoteJid(result, jid);
-		if (messageId && messageId !== "unknown" && outboundText) registerWhatsAppApprovalReactionTargetForOutboundMessage({
+		if (messageId && messageId !== "unknown" && text) registerWhatsAppApprovalReactionTargetForOutboundMessage({
 			accountId: resolvedAccountId,
 			remoteJid: sentRemoteJid,
 			messageId,
-			text: outboundText
+			text
 		});
 		const durationMs = Date.now() - startedAt;
 		outboundLog.info(`Sent message ${messageId} -> ${redactedJid}${hasMedia ? " (media)" : ""} (${durationMs}ms)`);
@@ -622,4 +520,4 @@ async function sendPollWhatsApp(to, poll, options) {
 	}
 }
 //#endregion
-export { send_exports as a, maybeResolveWhatsAppApprovalReaction as c, getWhatsAppApprovalApprovers as d, whatsappApprovalAuth as f, sendTypingWhatsApp as i, registerWhatsAppApprovalReactionTarget as l, sendPollWhatsApp as n, addWhatsAppApprovalReactionHintToText as o, sendReactionWhatsApp as r, buildWhatsAppApprovalReactionHint as s, sendMessageWhatsApp as t, unregisterWhatsAppApprovalReactionTarget as u };
+export { send_exports as a, unregisterWhatsAppApprovalReactionTarget as c, sendTypingWhatsApp as i, getWhatsAppApprovalApprovers as l, sendPollWhatsApp as n, maybeResolveWhatsAppApprovalReaction as o, sendReactionWhatsApp as r, registerWhatsAppApprovalReactionTarget as s, sendMessageWhatsApp as t, whatsappApprovalAuth as u };

package/dist/{setup-core-BNb5y1vb.js → setup-core-mK3yptun.js}

@@ -1,5 +1,5 @@
 import { r as resolveDefaultWhatsAppAccountId, t as listAccountIds } from "./account-ids-CB5SOWjc.js";
-import { a as resolveWhatsAppAccount, n as hasAnyWhatsAppAuth } from "./accounts-BPYgj8Fv.js";
+import { a as resolveWhatsAppAccount, n as hasAnyWhatsAppAuth } from "./accounts-B3diVrr6.js";
 import { a as normalizeWhatsAppAllowFromEntries } from "./normalize-target-bVWjgftN.js";
 import { t as WhatsAppChannelConfigSchema } from "./config-schema-CsNDlDpL.js";
 import { n as whatsappDoctor } from "./doctor-By3SB4lm.js";
@@ -99,10 +99,10 @@ async function applyWhatsAppSecurityConfigFixes(params) {
 //#region extensions/whatsapp/src/shared.ts
 const WHATSAPP_CHANNEL = "whatsapp";
 async function loadWhatsAppChannelRuntime() {
-	return await import("./channel.runtime-CoL9KTN0.js");
+	return await import("./channel.runtime-0kQxYUcI.js");
 }
 async function loadWhatsAppSetupSurface() {
-	return await import("./setup-surface-a6p2hwne.js");
+	return await import("./setup-surface-sCDFlWd2.js");
 }
 const whatsappSetupWizardProxy = createWhatsAppSetupWizardProxy(async () => (await loadWhatsAppSetupSurface()).whatsappSetupWizard);
 const whatsappConfigAdapter = createScopedChannelConfigAdapter({

package/dist/{setup-finalize-zKhMJPdG.js → setup-finalize-CkiVDt0B.js}

@@ -1,8 +1,8 @@
 import { r as resolveDefaultWhatsAppAccountId } from "./account-ids-CB5SOWjc.js";
 import { r as hasWebCredsSync } from "./creds-files-B1kSWtBg.js";
-import { a as resolveWhatsAppAccount, o as resolveWhatsAppAuthDir } from "./accounts-BPYgj8Fv.js";
+import { a as resolveWhatsAppAccount, o as resolveWhatsAppAuthDir } from "./accounts-B3diVrr6.js";
 import { a as normalizeWhatsAppAllowFromEntries, o as normalizeWhatsAppAllowFromEntry } from "./normalize-target-bVWjgftN.js";
-import { t as whatsappSetupAdapter } from "./setup-core-BNb5y1vb.js";
+import { t as whatsappSetupAdapter } from "./setup-core-mK3yptun.js";
 import { DEFAULT_ACCOUNT_ID, createSetupTranslator, splitSetupEntries } from "openclaw/plugin-sdk/setup";
 import { formatCliCommand, formatDocsLink } from "openclaw/plugin-sdk/setup-tools";
 //#region extensions/whatsapp/src/setup-finalize.ts
@@ -280,7 +280,7 @@ async function finalizeWhatsAppSetup(params) {
 		message: linked ? t("wizard.whatsapp.relinkPrompt") : t("wizard.whatsapp.linkNowPrompt"),
 		initialValue: !linked
 	})) try {
-		const { loginWeb } = await import("./login-BEkrpJbZ.js").then((n) => n.n);
+		const { loginWeb } = await import("./login-CympQtg8.js").then((n) => n.n);
 		await loginWeb(false, void 0, params.runtime, accountId);
 	} catch (error) {
 		params.runtime.error(`WhatsApp login failed: ${String(error)}`);

package/dist/setup-plugin-api.js

@@ -1,2 +1,2 @@
-import { t as whatsappSetupPlugin } from "./channel.setup-Bc9iLanw.js";
+import { t as whatsappSetupPlugin } from "./channel.setup-1zhfYJ9v.js";
 export { whatsappSetupPlugin };

package/dist/{setup-surface-a6p2hwne.js → setup-surface-sCDFlWd2.js}

@@ -1,5 +1,5 @@
 import { t as listAccountIds } from "./account-ids-CB5SOWjc.js";
-import { o as resolveWhatsAppAuthDir } from "./accounts-BPYgj8Fv.js";
+import { o as resolveWhatsAppAuthDir } from "./accounts-B3diVrr6.js";
 import { a as formatWhatsAppWebAuthStatusState, h as readWebAuthState } from "./auth-store-BrKb0mwT.js";
 import { DEFAULT_ACCOUNT_ID, createSetupTranslator, setSetupChannelEnabled } from "openclaw/plugin-sdk/setup";
 //#region extensions/whatsapp/src/setup-surface.ts
@@ -36,7 +36,7 @@ const whatsappSetupWizard = {
 	},
 	resolveShouldPromptAccountIds: ({ shouldPromptAccountIds }) => shouldPromptAccountIds,
 	credentials: [],
-	finalize: async (params) => await (await import("./setup-finalize-zKhMJPdG.js")).finalizeWhatsAppSetup(params),
+	finalize: async (params) => await (await import("./setup-finalize-CkiVDt0B.js")).finalizeWhatsAppSetup(params),
 	disable: (cfg) => setSetupChannelEnabled(cfg, channel, false),
 	onAccountRecorded: (accountId, options) => {
 		options?.onAccountId?.(channel, accountId);

package/dist/test-api.js

@@ -1,3 +1,3 @@
 import { t as resolveWhatsAppRuntimeGroupPolicy } from "./runtime-group-policy-DeSRFXEV.js";
-import { t as whatsappOutbound } from "./outbound-adapter-B_NADUoO.js";
+import { t as whatsappOutbound } from "./outbound-adapter-BiLBIo1h.js";
 export { resolveWhatsAppRuntimeGroupPolicy, whatsappOutbound };

package/npm-shrinkwrap.json

@@ -1,12 +1,12 @@
 {
   "name": "@openclaw/whatsapp",
-  "version": "2026.5.25-beta.1",
+  "version": "2026.5.26-beta.2",
   "lockfileVersion": 3,
   "requires": true,
   "packages": {
     "": {
       "name": "@openclaw/whatsapp",
-      "version": "2026.5.25-beta.1",
+      "version": "2026.5.26-beta.2",
       "dependencies": {
         "audio-decode": "2.2.3",
         "baileys": "7.0.0-rc13",
@@ -14,7 +14,7 @@
         "typebox": "1.1.38"
       },
       "peerDependencies": {
-        "openclaw": ">=2026.5.25-beta.1"
+        "openclaw": ">=2026.5.26-beta.2"
       },
       "peerDependenciesMeta": {
         "openclaw": {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@openclaw/whatsapp",
-  "version": "2026.5.25-beta.1",
+  "version": "2026.5.26-beta.2",
   "description": "OpenClaw WhatsApp channel plugin",
   "repository": {
     "type": "git",
@@ -14,7 +14,7 @@
     "typebox": "1.1.38"
   },
   "peerDependencies": {
-    "openclaw": ">=2026.5.25-beta.1"
+    "openclaw": ">=2026.5.26-beta.2"
   },
   "peerDependenciesMeta": {
     "openclaw": {
@@ -57,10 +57,10 @@
       "minHostVersion": ">=2026.4.25"
     },
     "compat": {
-      "pluginApi": ">=2026.5.25-beta.1"
+      "pluginApi": ">=2026.5.26-beta.2"
     },
     "build": {
-      "openclawVersion": "2026.5.25-beta.1"
+      "openclawVersion": "2026.5.26-beta.2"
     },
     "release": {
       "publishToClawHub": true,