@openclaw/whatsapp 2026.6.8 → 2026.6.9

package/dist/{access-control-BKaMOvIk.js → access-control-BnFVCHHH.js}

@@ -1,6 +1,6 @@
 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-Bupuq9vF.js";
+import { l as isSelfChatMode, n as normalizeE164 } from "./text-runtime-BBSmIBHN.js";
+import { a as getSelfIdentity, o as getSenderIdentity } from "./identity-Cm6bKAtk.js";
 import { defaultRuntime } from "openclaw/plugin-sdk/runtime-env";
 import { resolveChannelGroupPolicy, resolveChannelGroupRequireMention } from "openclaw/plugin-sdk/channel-policy";
 import { createChannelPairingChallengeIssuer } from "openclaw/plugin-sdk/channel-pairing";
@@ -8,6 +8,128 @@ import { upsertChannelPairingRequest } from "openclaw/plugin-sdk/conversation-ru
 import { resolveDefaultGroupPolicy, resolveOpenProviderRuntimeGroupPolicy, warnMissingProviderGroupPolicyFallbackOnce } from "openclaw/plugin-sdk/runtime-group-policy";
 import { resolveStableChannelMessageIngress } from "openclaw/plugin-sdk/channel-ingress-runtime";
 import { resolveGroupSessionKey } from "openclaw/plugin-sdk/session-store-runtime";
+//#region extensions/whatsapp/src/inbound/group-conversation.ts
+function resolveWhatsAppGroupConversationId(conversationId) {
+	return resolveGroupSessionKey({
+		From: conversationId,
+		ChatType: "group",
+		Provider: "whatsapp"
+	})?.id ?? conversationId;
+}
+//#endregion
+//#region extensions/whatsapp/src/inbound/admission.ts
+function copyAccount(account) {
+	const copied = {
+		accountId: account.accountId,
+		enabled: account.enabled,
+		sendReadReceipts: account.sendReadReceipts
+	};
+	if (account.name) copied.name = account.name;
+	if (typeof account.selfChatMode === "boolean") copied.selfChatMode = account.selfChatMode;
+	if (account.replyToMode) copied.replyToMode = account.replyToMode;
+	return copied;
+}
+function buildWhatsAppInboundAdmission(params) {
+	return {
+		accountId: params.policy.account.accountId,
+		isSelfChat: params.policy.isSelfChat,
+		account: copyAccount(params.policy.account),
+		conversation: {
+			kind: params.isGroup ? "group" : "direct",
+			id: params.conversationId,
+			groupSessionId: resolveWhatsAppGroupConversationId(params.conversationId)
+		},
+		sender: {
+			id: params.senderId,
+			isSamePhone: params.policy.isSamePhone(params.senderId)
+		},
+		ingress: {
+			admission: params.access.ingress.admission,
+			decision: params.access.ingress.decision,
+			decisiveGateId: params.access.ingress.decisiveGateId,
+			reasonCode: params.access.ingress.reasonCode
+		},
+		senderAccess: {
+			allowed: params.access.senderAccess.allowed,
+			decision: params.access.senderAccess.decision,
+			reasonCode: params.access.senderAccess.reasonCode,
+			providerMissingFallbackApplied: params.access.senderAccess.providerMissingFallbackApplied
+		},
+		commandAccess: {
+			requested: params.access.commandAccess.requested,
+			authorized: params.access.commandAccess.authorized,
+			shouldBlockControlCommand: params.access.commandAccess.shouldBlockControlCommand,
+			reasonCode: params.access.commandAccess.reasonCode
+		},
+		activationAccess: {
+			ran: params.access.activationAccess.ran,
+			allowed: params.access.activationAccess.allowed,
+			shouldSkip: params.access.activationAccess.shouldSkip,
+			reasonCode: params.access.activationAccess.reasonCode
+		}
+	};
+}
+function buildDeprecatedFlatWhatsAppInboundAdmission(msg) {
+	const conversationId = msg.conversationId || msg.from;
+	if (!conversationId || !msg.accountId || !msg.chatType) throw new Error("WhatsApp legacy flat inbound messages must include deprecated top-level admission fields.");
+	const accountId = msg.accountId;
+	const admitted = msg.accessControlPassed !== false;
+	const platformSender = msg.platform?.sender;
+	const senderE164 = platformSender?.e164 ?? msg.platform?.senderE164 ?? msg.senderE164;
+	const senderJid = platformSender?.jid ?? msg.platform?.senderJid ?? msg.senderJid;
+	const senderName = platformSender?.name ?? msg.platform?.senderName ?? msg.senderName;
+	const senderId = msg.chatType === "group" ? senderE164 ?? senderJid ?? senderName ?? conversationId : senderE164 ?? conversationId;
+	const reasonCode = admitted ? msg.chatType === "group" ? "group_policy_allowed" : "dm_policy_allowlisted" : "no_policy_match";
+	return buildWhatsAppInboundAdmission({
+		policy: {
+			account: {
+				accountId,
+				enabled: true,
+				sendReadReceipts: true
+			},
+			isSelfChat: false,
+			isSamePhone: () => false
+		},
+		access: {
+			ingress: {
+				admission: admitted ? "dispatch" : "drop",
+				decision: admitted ? "allow" : "block",
+				decisiveGateId: "legacy-flat-compat",
+				reasonCode
+			},
+			senderAccess: {
+				allowed: admitted,
+				decision: admitted ? "allow" : "block",
+				reasonCode,
+				providerMissingFallbackApplied: false
+			},
+			commandAccess: {
+				requested: false,
+				authorized: false,
+				shouldBlockControlCommand: false,
+				reasonCode: "command_authorized"
+			},
+			activationAccess: {
+				ran: false,
+				allowed: admitted,
+				shouldSkip: !admitted,
+				reasonCode: admitted ? "activation_allowed" : "activation_skipped"
+			}
+		},
+		isGroup: msg.chatType === "group",
+		conversationId,
+		senderId
+	});
+}
+function requireWhatsAppInboundAdmission(params) {
+	if (!params.admission) throw new Error("WhatsApp inbound message is missing admission facts");
+	return params.admission;
+}
+function requireAdmittedWhatsAppInboundMessage(msg) {
+	requireWhatsAppInboundAdmission(msg);
+	return msg;
+}
+//#endregion
 //#region extensions/whatsapp/src/runtime-group-policy.ts
 function resolveWhatsAppRuntimeGroupPolicy(params) {
 	return resolveOpenProviderRuntimeGroupPolicy({
@@ -23,13 +145,6 @@ function normalizeWhatsAppIngressPhone(value) {
 	if (!trimmed) return null;
 	return normalizeE164(trimmed);
 }
-function resolveGroupConversationId(conversationId) {
-	return resolveGroupSessionKey({
-		From: conversationId,
-		ChatType: "group",
-		Provider: "whatsapp"
-	})?.id ?? conversationId;
-}
 function maybeSamePhoneDmAllowFrom(params) {
 	if (params.isGroup || !params.dmSenderId || !params.policy.isSamePhone(params.dmSenderId)) return [];
 	return [params.dmSenderId];
@@ -73,13 +188,13 @@ function resolveWhatsAppInboundPolicy(params) {
 		resolveConversationGroupPolicy: (conversationId) => resolveChannelGroupPolicy({
 			cfg: resolvedGroupCfg,
 			channel: "whatsapp",
-			groupId: resolveGroupConversationId(conversationId),
+			groupId: resolveWhatsAppGroupConversationId(conversationId),
 			hasGroupAllowFrom: groupAllowFrom.length > 0
 		}),
 		resolveConversationRequireMention: (conversationId) => resolveChannelGroupRequireMention({
 			cfg: resolvedGroupCfg,
 			channel: "whatsapp",
-			groupId: resolveGroupConversationId(conversationId)
+			groupId: resolveWhatsAppGroupConversationId(conversationId)
 		})
 	};
 }
@@ -110,6 +225,7 @@ async function resolveWhatsAppIngressAccess(params) {
 		dmPolicy: params.policy.dmPolicy,
 		groupPolicy: params.policy.groupPolicy,
 		policy: { groupAllowFromFallbackToAllowFrom: false },
+		providerMissingFallbackApplied: params.policy.providerMissingFallbackApplied,
 		allowFrom: dmAllowFrom,
 		groupAllowFrom: params.policy.groupAllowFrom,
 		command: params.includeCommand === true ? {} : void 0
@@ -118,21 +234,22 @@ async function resolveWhatsAppIngressAccess(params) {
 async function resolveWhatsAppCommandAuthorized(params) {
 	if (!(params.cfg.commands?.useAccessGroups !== false)) return true;
 	const self = getSelfIdentity(params.msg);
+	const admission = requireWhatsAppInboundAdmission(params.msg);
 	const policy = params.policy ?? resolveWhatsAppInboundPolicy({
 		cfg: params.cfg,
-		accountId: params.msg.accountId,
+		accountId: admission.accountId,
 		selfE164: self.e164 ?? null
 	});
-	const isGroup = params.msg.chatType === "group";
+	const isGroup = admission.conversation.kind === "group";
 	const sender = getSenderIdentity(params.msg);
-	const dmSender = sender.e164 ?? params.msg.from ?? "";
+	const dmSender = sender.e164 ?? admission.conversation.id;
 	const groupSender = sender.e164 ?? "";
 	if (!normalizeE164(isGroup ? groupSender : dmSender)) return false;
 	return (await resolveWhatsAppIngressAccess({
 		cfg: params.cfg,
 		policy,
 		isGroup,
-		conversationId: params.msg.conversationId ?? params.msg.platform.chatJid ?? params.msg.from,
+		conversationId: admission.conversation.id,
 		senderId: isGroup ? groupSender : dmSender,
 		dmSenderId: dmSender,
 		includeCommand: true
@@ -145,6 +262,14 @@ function logWhatsAppVerbose(enabled, message) {
 	if (!enabled) return;
 	defaultRuntime.log(message);
 }
+function blockedInboundAccess(policy) {
+	return {
+		allowed: false,
+		shouldMarkRead: false,
+		isSelfChat: policy.isSelfChat,
+		resolvedAccountId: policy.account.accountId
+	};
+}
 async function checkInboundAccessControl(params) {
 	const policy = resolveWhatsAppInboundPolicy({
 		cfg: params.cfg,
@@ -159,43 +284,32 @@ async function checkInboundAccessControl(params) {
 		accountId: policy.account.accountId,
 		log: (message) => logWhatsAppVerbose(params.verbose, message)
 	});
-	const { senderAccess } = await resolveWhatsAppIngressAccess({
+	const conversationId = params.group ? params.remoteJid : params.from;
+	const accessSenderId = params.group ? params.senderE164 : params.from;
+	const admissionSenderId = params.group ? params.senderE164 ?? params.senderJid ?? params.from : params.from;
+	const access = await resolveWhatsAppIngressAccess({
 		cfg: params.cfg,
 		policy,
 		isGroup: params.group,
-		conversationId: params.remoteJid,
-		senderId: params.group ? params.senderE164 : params.from,
+		conversationId,
+		senderId: accessSenderId,
 		dmSenderId: params.from
 	});
+	const { senderAccess } = access;
 	if (params.group && senderAccess.decision !== "allow") {
 		if (senderAccess.reasonCode === "group_policy_disabled") logWhatsAppVerbose(params.verbose, "Blocked group message (groupPolicy: disabled)");
 		else if (senderAccess.reasonCode === "group_policy_empty_allowlist") logWhatsAppVerbose(params.verbose, "Blocked group message (groupPolicy: allowlist, no groupAllowFrom)");
 		else logWhatsAppVerbose(params.verbose, `Blocked group message from ${params.senderE164 ?? "unknown sender"} (groupPolicy: allowlist)`);
-		return {
-			allowed: false,
-			shouldMarkRead: false,
-			isSelfChat: policy.isSelfChat,
-			resolvedAccountId: policy.account.accountId
-		};
+		return blockedInboundAccess(policy);
 	}
 	if (!params.group) {
 		if (params.isFromMe && !policy.isSamePhone(params.from)) {
 			logWhatsAppVerbose(params.verbose, "Skipping outbound DM (fromMe); no pairing reply needed.");
-			return {
-				allowed: false,
-				shouldMarkRead: false,
-				isSelfChat: policy.isSelfChat,
-				resolvedAccountId: policy.account.accountId
-			};
+			return blockedInboundAccess(policy);
 		}
 		if (senderAccess.decision === "block" && senderAccess.reasonCode === "dm_policy_disabled") {
 			logWhatsAppVerbose(params.verbose, "Blocked dm (dmPolicy: disabled)");
-			return {
-				allowed: false,
-				shouldMarkRead: false,
-				isSelfChat: policy.isSelfChat,
-				resolvedAccountId: policy.account.accountId
-			};
+			return blockedInboundAccess(policy);
 		}
 		if (senderAccess.decision === "pairing" && !policy.isSamePhone(params.from)) {
 			const candidate = params.from;
@@ -222,30 +336,27 @@ async function checkInboundAccessControl(params) {
 					logWhatsAppVerbose(params.verbose, `whatsapp pairing reply failed for ${candidate}: ${String(err)}`);
 				}
 			});
-			return {
-				allowed: false,
-				shouldMarkRead: false,
-				isSelfChat: policy.isSelfChat,
-				resolvedAccountId: policy.account.accountId
-			};
+			return blockedInboundAccess(policy);
 		}
 		if (senderAccess.decision !== "allow") {
 			logWhatsAppVerbose(params.verbose, `Blocked unauthorized sender ${params.from} (dmPolicy=${policy.dmPolicy})`);
-			return {
-				allowed: false,
-				shouldMarkRead: false,
-				isSelfChat: policy.isSelfChat,
-				resolvedAccountId: policy.account.accountId
-			};
+			return blockedInboundAccess(policy);
 		}
 	}
 	return {
 		allowed: true,
 		shouldMarkRead: true,
 		isSelfChat: policy.isSelfChat,
-		resolvedAccountId: policy.account.accountId
+		resolvedAccountId: policy.account.accountId,
+		admission: buildWhatsAppInboundAdmission({
+			policy,
+			access,
+			isGroup: params.group,
+			conversationId,
+			senderId: admissionSenderId
+		})
 	};
 }
 const testing = { resolveWhatsAppInboundPolicy };
 //#endregion
-export { resolveWhatsAppRuntimeGroupPolicy as a, resolveWhatsAppInboundPolicy as i, testing as n, resolveWhatsAppCommandAuthorized as r, checkInboundAccessControl as t };
+export { resolveWhatsAppRuntimeGroupPolicy as a, requireWhatsAppInboundAdmission as c, resolveWhatsAppInboundPolicy as i, resolveWhatsAppGroupConversationId as l, testing as n, buildDeprecatedFlatWhatsAppInboundAdmission as o, resolveWhatsAppCommandAuthorized as r, requireAdmittedWhatsAppInboundMessage as s, checkInboundAccessControl as t };

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

@@ -1,6 +1,6 @@
 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-DSlVXKL_.js";
+import { g as resolveWhatsAppReactionLevel, r as sendReactionWhatsApp } from "./send-A9EqsNyz.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-Cyp5GNIT.js";
+import { t as handleWhatsAppAction } from "./action-runtime-ClQLHIwf.js";
 export { handleWhatsAppAction };

package/dist/action-runtime.runtime.js

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

package/dist/api.js

@@ -2,19 +2,20 @@ import { r as resolveDefaultWhatsAppAccountId, t as listAccountIds } from "./acc
 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-DSlVXKL_.js";
+import "./send-A9EqsNyz.js";
 import { n as getStatusCode, t as formatError } from "./session-errors-CbsoQqoy.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-DyUm8hqs.js";
+import { n as createWhatsAppSocketOperationTimeoutAdapter, t as DEFAULT_WHATSAPP_SOCKET_TIMING } from "./socket-timing-DvMNkIge.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-BBSmIBHN.js";
+import { n as WHATSAPP_LEGACY_OUTBOUND_SEND_DEP_KEYS, t as whatsappPlugin } from "./channel-CNA0E9wp.js";
 import { t as whatsappCommandPolicy } from "./command-policy-BIOSHySD.js";
-import { a as resolveWhatsAppGroupRequireMention, o as resolveWhatsAppGroupToolPolicy, s as resolveWhatsAppGroupIntroHint } from "./setup-core-Cp0NMO89.js";
+import { a as resolveWhatsAppGroupRequireMention, o as resolveWhatsAppGroupToolPolicy, s as resolveWhatsAppGroupIntroHint } from "./setup-core-DVEkfMVh.js";
 import "./config-schema-CROZuhT-.js";
-import { t as whatsappSetupPlugin } from "./channel.setup-CpyAie9O.js";
+import { t as whatsappSetupPlugin } from "./channel.setup-BfcLCLNn.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-BKaMOvIk.js";
-import { d as normalizeMessageContent, f as resolveInboundMediaMimetype, g as extractLocationData, h as extractContextInfo, p as describeReplyContext, t as createWebSendApi, y as extractText } from "./send-api-Cp9CUH5P.js";
-import { r as waitForWaConnection, t as createWaSocket } from "./session-BCKUPRkN.js";
+import { n as testing } from "./access-control-BnFVCHHH.js";
+import { _ as extractLocationData, b as extractText, d as normalizeMessageContent, f as resolveInboundMediaMimetype, h as extractContextInfo, p as describeReplyContext, t as createWebSendApi } from "./send-api-89SE5WKV.js";
+import { r as waitForWaConnection, t as createWaSocket } from "./session-BW8RcCcb.js";
 import "openclaw/plugin-sdk/channel-actions";
 import "openclaw/plugin-sdk/account-resolution";
 import "openclaw/plugin-sdk/core";
@@ -252,7 +253,7 @@ async function startWhatsAppQaDriverSession(params) {
 		throw error;
 	}
 	const sendApi = createWebSendApi({
-		sock,
+		sock: createWhatsAppSocketOperationTimeoutAdapter(sock, DEFAULT_WHATSAPP_SOCKET_TIMING.defaultQueryTimeoutMs),
 		defaultAccountId: "qa-driver",
 		authDir: params.authDir
 	});

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

@@ -1,5 +1,5 @@
 import { s as normalizeWhatsAppMessagingTarget } from "./normalize-target-bVWjgftN.js";
-import { f as registerWhatsAppApprovalReactionTarget, i as sendTypingWhatsApp, p as unregisterWhatsAppApprovalReactionTarget, t as sendMessageWhatsApp } from "./send-DSlVXKL_.js";
+import { f as registerWhatsAppApprovalReactionTarget, i as sendTypingWhatsApp, p as unregisterWhatsAppApprovalReactionTarget, t as sendMessageWhatsApp } from "./send-A9EqsNyz.js";
 import "./normalize-Bxwqo-bW.js";
 import { n as getWhatsAppRuntime } from "./runtime-BfAdAEYT.js";
 import { createSubsystemLogger } from "openclaw/plugin-sdk/runtime-env";

package/dist/{auth-store-e9VzLZ-S.js → auth-store-RyuCPHE0.js}

@@ -1,15 +1,15 @@
 import { t as __exportAll } from "./rolldown-runtime-D7D4PA-g.js";
 import { a as readWebCredsJsonRawSync, c as statWebCredsFileSync, i as readWebCredsJsonRaw, o as resolveWebCredsBackupPath, s as resolveWebCredsPath, t as assertWebCredsPathRegularFileOrMissing } from "./creds-files-B1kSWtBg.js";
-import { r as resolveUserPath } from "./text-runtime-Dk37KYHj.js";
-import { c as resolveComparableIdentity } from "./identity-Bupuq9vF.js";
+import { r as resolveUserPath } from "./text-runtime-BBSmIBHN.js";
+import { c as resolveComparableIdentity } from "./identity-Cm6bKAtk.js";
 import path from "node:path";
 import { resolveOAuthDir as resolveOAuthDir$1 } from "openclaw/plugin-sdk/state-paths";
 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 { resolveTimerTimeoutMs } from "openclaw/plugin-sdk/number-runtime";
 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;

package/dist/{channel-DyUm8hqs.js → channel-CNA0E9wp.js}

@@ -2,15 +2,15 @@ import { r as resolveDefaultWhatsAppAccountId, t as listAccountIds } from "./acc
 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-DSlVXKL_.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-A9EqsNyz.js";
 import "./normalize-Bxwqo-bW.js";
 import { n as getWhatsAppRuntime } from "./runtime-BfAdAEYT.js";
-import { p as toWhatsappJid } from "./text-runtime-Dk37KYHj.js";
+import { p as toWhatsappJid } from "./text-runtime-BBSmIBHN.js";
 import { t as createWhatsAppLoginTool } from "./agent-tools-login-BX7eHgDm.js";
-import { i as lookupInboundMessageMetaForTarget } from "./quoted-message-CveINB35.js";
+import { i as lookupInboundMessageMetaForTarget } from "./quoted-message-DVOfpEja.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-Cp0NMO89.js";
-import { f as readWebAuthExistsForDecision, n as WHATSAPP_AUTH_UNSTABLE_CODE } from "./auth-store-e9VzLZ-S.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-DVEkfMVh.js";
+import { f as readWebAuthExistsForDecision, n as WHATSAPP_AUTH_UNSTABLE_CODE } from "./auth-store-RyuCPHE0.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";
@@ -24,7 +24,7 @@ import { DEFAULT_ACCOUNT_ID as DEFAULT_ACCOUNT_ID$1 } from "openclaw/plugin-sdk/
 import { buildDmGroupAccountAllowlistAdapter } from "openclaw/plugin-sdk/allowlist-config-edit";
 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 { createChannelApprovalCapability } from "openclaw/plugin-sdk/approval-delivery-runtime";
 import { createLazyChannelApprovalNativeRuntimeAdapter } from "openclaw/plugin-sdk/approval-handler-adapter-runtime";
 import { createChannelApproverDmTargetResolver, createChannelNativeOriginTargetResolver, createNativeApprovalChannelRouteGates, createNativeApprovalForwardingFallbackSuppressor } from "openclaw/plugin-sdk/approval-native-runtime";
 import { chunkText } from "openclaw/plugin-sdk/reply-chunking";
@@ -205,10 +205,9 @@ const whatsappApprovalCapability = createChannelApprovalCapability({
 			accountId,
 			request
 		}),
-		load: async () => (await import("./approval-handler.runtime-BVmOu6x1.js")).whatsappApprovalNativeRuntime
+		load: async () => (await import("./approval-handler.runtime-DLjPf_Mx.js")).whatsappApprovalNativeRuntime
 	})
 });
-splitChannelApprovalCapability(whatsappApprovalCapability);
 //#endregion
 //#region extensions/whatsapp/src/channel-actions.ts
 function areWhatsAppAgentReactionsEnabled(params) {
@@ -604,7 +603,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-zvbaCnGe.js"));
+const loadWhatsAppChannelReactAction = createLazyRuntimeModule(() => import("./channel-react-action-CdYJKJWb.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-DyUm8hqs.js";
+import { t as whatsappPlugin } from "./channel-CNA0E9wp.js";
 export { whatsappPlugin };

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

@@ -1,7 +1,7 @@
 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-Cyp5GNIT.js";
-import { t as sendMessageWhatsApp } from "./send-DSlVXKL_.js";
+import { r as resolveAuthorizedWhatsAppOutboundTarget, t as handleWhatsAppAction } from "./action-runtime-ClQLHIwf.js";
+import { t as sendMessageWhatsApp } from "./send-A9EqsNyz.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
@@ -124,6 +124,5 @@ async function handleWhatsAppMessageAction(params) {
 		fromMe: typeof params.params.fromMe === "boolean" ? params.params.fromMe : void 0
 	}, params.cfg);
 }
-const handleWhatsAppReactAction = handleWhatsAppMessageAction;
 //#endregion
-export { handleWhatsAppMessageAction, handleWhatsAppReactAction };
+export { handleWhatsAppMessageAction };

package/dist/{channel.runtime-BXkzo0j1.js → channel.runtime-ZKS2C0Cw.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-e9VzLZ-S.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-RyuCPHE0.js";
 import { t as getActiveWebListener$1 } from "./active-listener-CFwkn3ho.js";
-import { t as monitorWebChannel$1 } from "./monitor-Ggwn3FDi.js";
-import { t as loginWeb$1 } from "./login-Xv3ujrl0.js";
-import { whatsappSetupWizard as whatsappSetupWizard$1 } from "./setup-surface-BmPcAhIF.js";
+import { t as monitorWebChannel$1 } from "./monitor-C5_QBO1-.js";
+import { t as loginWeb$1 } from "./login-B503Fwb8.js";
+import { whatsappSetupWizard as whatsappSetupWizard$1 } from "./setup-surface-ByAUWXyq.js";
 //#region extensions/whatsapp/src/channel.runtime.ts
 function getActiveWebListener(...args) {
 	return getActiveWebListener$1(...args);

package/dist/{channel.setup-CpyAie9O.js → channel.setup-BfcLCLNn.js}

@@ -1,8 +1,8 @@
-import { a as resolveWhatsAppGroupRequireMention, i as whatsappSetupWizardProxy, n as createWhatsAppPluginBase, o as resolveWhatsAppGroupToolPolicy, s as resolveWhatsAppGroupIntroHint, t as whatsappSetupAdapter } from "./setup-core-Cp0NMO89.js";
+import { a as resolveWhatsAppGroupRequireMention, i as whatsappSetupWizardProxy, n as createWhatsAppPluginBase, o as resolveWhatsAppGroupToolPolicy, s as resolveWhatsAppGroupIntroHint, t as whatsappSetupAdapter } from "./setup-core-DVEkfMVh.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-e9VzLZ-S.js").then((n) => n.i);
+	const { readWebAuthState } = await import("./auth-store-RyuCPHE0.js").then((n) => n.i);
 	return await readWebAuthState(account.authDir) === "linked";
 }
 const whatsappSetupPlugin = {

package/dist/{connection-controller-BWBoVQr4.js → connection-controller-BDuM0Kc7.js}

@@ -1,7 +1,8 @@
 import { a as unregisterWhatsAppConnectionController, i as registerWhatsAppConnectionController, n as getStatusCode, t as formatError } from "./session-errors-CbsoQqoy.js";
-import { c as logoutWeb, f as readWebAuthExistsForDecision, r as WhatsAppAuthUnstableError } from "./auth-store-e9VzLZ-S.js";
-import { c as resolveComparableIdentity } from "./identity-Bupuq9vF.js";
-import { i as DEFAULT_WHATSAPP_SOCKET_TIMING, r as waitForWaConnection, t as createWaSocket } from "./session-BCKUPRkN.js";
+import { t as DEFAULT_WHATSAPP_SOCKET_TIMING } from "./socket-timing-DvMNkIge.js";
+import { c as logoutWeb, f as readWebAuthExistsForDecision, r as WhatsAppAuthUnstableError } from "./auth-store-RyuCPHE0.js";
+import { c as resolveComparableIdentity } from "./identity-Cm6bKAtk.js";
+import { r as waitForWaConnection, t as createWaSocket } from "./session-BW8RcCcb.js";
 import { computeBackoff, info, sleepWithAbort } from "openclaw/plugin-sdk/runtime-env";
 import { clamp } from "openclaw/plugin-sdk/text-utility-runtime";
 import { randomUUID } from "node:crypto";
@@ -45,6 +46,7 @@ const WHATSAPP_LOGIN_TIMEOUT_RESTART_MESSAGE = "WhatsApp connection timed out be
 const WHATSAPP_LOGGED_OUT_RELINK_MESSAGE = "WhatsApp reported the session is logged out. Cleared cached web session; please rerun openclaw channels login and scan the QR again.";
 const WHATSAPP_LOGIN_AUTH_UNSTABLE_MESSAGE = "WhatsApp connected, but saving the linked credentials has not settled on disk yet. Retry login in a moment.";
 const WHATSAPP_LOGIN_AUTH_NOT_PERSISTED_MESSAGE = "WhatsApp connected, but the linked credentials were not found on disk. Retry login in a moment.";
+const WHATSAPP_LOGIN_AUTH_NOT_CLEARED_MESSAGE = "existing auth could not be cleared. Remove or fix the configured WhatsApp auth directory, then retry login.";
 const WHATSAPP_LOGGED_OUT_QR_MESSAGE = "WhatsApp reported the session is logged out. Cleared cached web session; please scan a new QR.";
 const WHATSAPP_WATCHDOG_TIMEOUT_ERROR = "watchdog-timeout";
 function createNeverResolvePromise() {
@@ -106,6 +108,26 @@ async function waitForWhatsAppLoginResult(params) {
 	let currentSock = params.sock;
 	let postPairingRestarted = false;
 	let timeoutRestarted = false;
+	let loggedOutRestarted = false;
+	const replaceLoginSocket = async (opts = {}) => {
+		if (opts.closeCurrent ?? true) closeWaSocket(currentSock);
+		try {
+			currentSock = await createSocket(false, params.verbose, {
+				authDir: params.authDir,
+				...params.socketTiming,
+				onQr: params.onQr
+			});
+			params.onSocketReplaced?.(currentSock);
+			return null;
+		} catch (createErr) {
+			return {
+				outcome: "failed",
+				message: formatError(createErr),
+				statusCode: getStatusCode(createErr),
+				error: createErr
+			};
+		}
+	};
 	while (true) try {
 		await wait(currentSock, { timeout: "none" });
 		const persistedAuth = await readWebAuthExistsForDecision(params.authDir);
@@ -121,7 +143,7 @@ async function waitForWhatsAppLoginResult(params) {
 		};
 		return {
 			outcome: "connected",
-			restarted: postPairingRestarted || timeoutRestarted,
+			restarted: postPairingRestarted || timeoutRestarted || loggedOutRestarted,
 			sock: currentSock
 		};
 	} catch (err) {
@@ -131,36 +153,39 @@ async function waitForWhatsAppLoginResult(params) {
 			if (restartKind === "post-pairing") postPairingRestarted = true;
 			else timeoutRestarted = true;
 			params.runtime.log(info(getLoginSocketRestartMessage(restartKind)));
-			closeWaSocket(currentSock);
-			try {
-				currentSock = await createSocket(false, params.verbose, {
-					authDir: params.authDir,
-					...params.socketTiming,
-					onQr: params.onQr
-				});
-				params.onSocketReplaced?.(currentSock);
-				continue;
-			} catch (createErr) {
-				return {
-					outcome: "failed",
-					message: formatError(createErr),
-					statusCode: getStatusCode(createErr),
-					error: createErr
-				};
-			}
+			const replacementFailure = await replaceLoginSocket();
+			if (replacementFailure) return replacementFailure;
+			continue;
 		}
 		if (statusCode === LOGGED_OUT_STATUS) {
-			await logoutWeb({
-				authDir: params.authDir,
-				isLegacyAuthDir: params.isLegacyAuthDir,
-				runtime: params.runtime
-			});
-			return {
+			if (loggedOutRestarted) return {
 				outcome: "logged-out",
 				message: WHATSAPP_LOGGED_OUT_RELINK_MESSAGE,
 				statusCode: LOGGED_OUT_STATUS,
 				error: err
 			};
+			closeWaSocket(currentSock);
+			if (!await logoutWeb({
+				authDir: params.authDir,
+				isLegacyAuthDir: params.isLegacyAuthDir,
+				runtime: params.runtime
+			})) {
+				const existingAuth = await readWebAuthExistsForDecision(params.authDir);
+				if (existingAuth.outcome === "unstable") return {
+					outcome: "failed",
+					message: WHATSAPP_LOGIN_AUTH_UNSTABLE_MESSAGE,
+					error: new WhatsAppAuthUnstableError(WHATSAPP_LOGIN_AUTH_UNSTABLE_MESSAGE)
+				};
+				if (existingAuth.exists) return {
+					outcome: "failed",
+					message: WHATSAPP_LOGIN_AUTH_NOT_CLEARED_MESSAGE,
+					error: err
+				};
+			}
+			loggedOutRestarted = true;
+			const replacementFailure = await replaceLoginSocket({ closeCurrent: false });
+			if (replacementFailure) return replacementFailure;
+			continue;
 		}
 		return {
 			outcome: "failed",

package/dist/contract-api.js

@@ -2,7 +2,7 @@ import { c as normalizeWhatsAppTarget$1, t as isWhatsAppGroupJid$1 } from "./nor
 import { t as whatsappCommandPolicy$1 } from "./command-policy-BIOSHySD.js";
 import { t as resolveLegacyGroupSessionKey$1 } from "./group-session-contract-DDnZSsJ1.js";
 import { r as isLegacyGroupSessionKey$1, t as canonicalizeLegacySessionKey$1 } from "./session-contract-DMTm6Q_L.js";
-import { a as resolveWhatsAppRuntimeGroupPolicy$1, n as testing } from "./access-control-BKaMOvIk.js";
+import { a as resolveWhatsAppRuntimeGroupPolicy$1, n as testing } from "./access-control-BnFVCHHH.js";
 //#region extensions/whatsapp/contract-api.ts
 const canonicalizeLegacySessionKey = canonicalizeLegacySessionKey$1;
 const isLegacyGroupSessionKey = isLegacyGroupSessionKey$1;

package/dist/{identity-Bupuq9vF.js → identity-Cm6bKAtk.js}

@@ -1,4 +1,4 @@
-import { n as normalizeE164, u as jidToE164 } from "./text-runtime-Dk37KYHj.js";
+import { n as normalizeE164, u as jidToE164 } from "./text-runtime-BBSmIBHN.js";
 //#region extensions/whatsapp/src/identity.ts
 const WHATSAPP_LID_RE = /@(lid|hosted\.lid)$/i;
 function normalizeDeviceScopedJid(jid) {