@openclaw/whatsapp 2026.7.2-beta.7 → 2026.8.1-beta.3

package/dist/{accounts-CSqLvCY5.js → accounts-BX2fZUyR.js}

@@ -1,5 +1,5 @@
 import { n as listConfiguredAccountIds, r as resolveDefaultWhatsAppAccountId, t as listAccountIds } from "./account-ids-CB5SOWjc.js";
-import { n as hasWebCredsRegularFileSync, r as hasWebCredsSync } from "./creds-files-B1kSWtBg.js";
+import { n as hasWebCredsRegularFileSync, r as hasWebCredsSync } from "./creds-files-W6B3EMZ8.js";
 import fs from "node:fs";
 import path from "node:path";
 import { DEFAULT_ACCOUNT_ID, mergeAccountConfig, normalizeAccountId, resolveAccountEntry, resolveMergedAccountConfig, resolveUserPath } from "openclaw/plugin-sdk/account-core";

package/dist/action-runtime-api.js

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

package/dist/{action-runtime-BzfDFPbH.js → action-runtime-pM-ExU0l.js}

@@ -1,6 +1,6 @@
-import { a as resolveWhatsAppAccount } from "./accounts-CSqLvCY5.js";
+import { a as resolveWhatsAppAccount } from "./accounts-BX2fZUyR.js";
 import { t as resolveWhatsAppOutboundTarget } from "./resolve-outbound-target-1GqbT1uX.js";
-import { r as sendReactionWhatsApp, u as resolveWhatsAppReactionLevel } from "./send-D37ddk22.js";
+import { r as sendReactionWhatsApp, v as resolveWhatsAppReactionLevel } from "./send-CwvTU4RI.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.runtime.js

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

package/dist/{agent-tools-login-DE9MU98T.js → agent-tools-login-BjRpD-JQ.js}

@@ -1,11 +1,12 @@
 import { startWebLoginWithQr, waitForWebLogin } from "./login-qr-runtime.js";
 import "./login-qr-api.js";
 import { optionalPositiveIntegerSchema, readPositiveIntegerParam } from "openclaw/plugin-sdk/channel-actions";
+import { hasNonEmptyString } from "openclaw/plugin-sdk/string-coerce-runtime";
 import { Type } from "typebox";
 //#region extensions/whatsapp/src/agent-tools-login.ts
 const QR_DATA_URL_MAX_LENGTH = 16384;
-function readOptionalString(value) {
-	return typeof value === "string" && value.trim() ? value : void 0;
+function readLoginStringPreservingWhitespace(value) {
+	return hasNonEmptyString(value) ? value : void 0;
 }
 function createWhatsAppLoginTool() {
 	return {
@@ -42,13 +43,13 @@ function createWhatsAppLoginTool() {
 				};
 			};
 			const action = args?.action ?? "start";
-			const accountId = readOptionalString(args.accountId);
+			const accountId = readLoginStringPreservingWhitespace(args.accountId);
 			const timeoutMs = readPositiveIntegerParam(args, "timeoutMs");
 			if (action === "wait") {
 				const result = await waitForWebLogin({
 					accountId,
 					timeoutMs,
-					currentQrDataUrl: readOptionalString(args.currentQrDataUrl)
+					currentQrDataUrl: readLoginStringPreservingWhitespace(args.currentQrDataUrl)
 				});
 				if (result.qrDataUrl) return renderQrReply({
 					message: result.message,

package/dist/api.js

@@ -1,108 +1,63 @@
-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-CSqLvCY5.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-BX2fZUyR.js";
 import { r as resolveDefaultWhatsAppAccountId, t as listAccountIds } from "./account-ids-CB5SOWjc.js";
 import { a as normalizeWhatsAppAllowFromEntries, c as normalizeWhatsAppTarget, i as looksLikeWhatsAppTargetId, r as isWhatsAppUserTarget, s as normalizeWhatsAppMessagingTarget, t as isWhatsAppGroupJid } from "./normalize-target-CugRyONv.js";
 import { t as resolveWhatsAppOutboundTarget } from "./resolve-outbound-target-1GqbT1uX.js";
 import { c as toWhatsappJid, i as markdownToWhatsApp, l as toWhatsappJidWithLid, n as isSelfChatMode, r as jidToE164, s as resolveJidToE164, t as assertWebChannel } from "./targets-runtime-TMk0lGuy.js";
 import { n as resolveUserPath, t as normalizeE164 } from "./text-runtime-CaKLhowd.js";
-import { n as WHATSAPP_LEGACY_OUTBOUND_SEND_DEP_KEYS, t as whatsappPlugin } from "./channel-Dg62olhy.js";
-import { a as resolveWhatsAppGroupRequireMention, o as resolveWhatsAppGroupToolPolicy } from "./shared-CAxd15bp.js";
+import { n as WHATSAPP_LEGACY_OUTBOUND_SEND_DEP_KEYS, t as whatsappPlugin } from "./channel-DRMYRfZ8.js";
+import { a as resolveWhatsAppGroupRequireMention, o as resolveWhatsAppGroupToolPolicy } from "./shared-wg42NKFB.js";
 import { t as whatsappCommandPolicy } from "./command-policy-BIOSHySD.js";
-import { t as whatsappSetupPlugin } from "./channel.setup-pMwNVkCA.js";
+import { t as whatsappSetupPlugin } from "./channel.setup-DhBBhbQv.js";
 import { t as DEFAULT_WEB_MEDIA_BYTES } from "./constants-HU41RHGI.js";
-import { a as waitForWaConnection, o as DEFAULT_WHATSAPP_SOCKET_TIMING, r as createWaSocket, s as createWhatsAppSocketOperationTimeoutAdapter } from "./socket-close-DridEuzz.js";
+import { a as waitForWaConnection, o as DEFAULT_WHATSAPP_SOCKET_TIMING, r as createWaSocket, s as createWhatsAppSocketOperationTimeoutAdapter } from "./socket-close-2T0_jZTN.js";
 import { n as getStatusCode, t as formatError } from "./session-errors-JuazczrA.js";
-import { n as listWhatsAppDirectoryGroupsFromConfig, r as listWhatsAppDirectoryPeersFromConfig } from "./directory-config-DalGrfGN.js";
-import { n as testing } from "./access-control-pZcxTmd5.js";
-import { d as normalizeMessageContent, f as describeReplyContext, g as extractLocationData, m as extractContextInfo, t as createWebSendApi, x as resolveInboundMediaMimetype, y as extractText } from "./send-api-7wk6eQyW.js";
+import { n as listWhatsAppDirectoryGroupsFromConfig, r as listWhatsAppDirectoryPeersFromConfig } from "./directory-config-P7_3U73Z.js";
+import { _ as resolveInboundMediaMimetype, c as extractContextInfo, m as findMessageSection, o as describeReplyContext, p as extractText, t as createWebSendApi, u as extractLocationData } from "./send-api-obOSm2cC.js";
+import { asBoolean, isRecord, normalizeOptionalString } from "openclaw/plugin-sdk/string-coerce-runtime";
 import { formatLocationText } from "openclaw/plugin-sdk/channel-inbound";
 //#region extensions/whatsapp/src/qa-driver.runtime.ts
-function isRecord(value) {
-	return Boolean(value && typeof value === "object");
-}
-function readString(value) {
-	return typeof value === "string" && value.trim() ? value.trim() : void 0;
-}
-function readBoolean(value) {
-	return typeof value === "boolean" ? value : void 0;
-}
-function findMessageSection(message, sectionNames) {
-	if (!isRecord(message)) return;
-	const queue = [{
-		depth: 0,
-		value: message
-	}];
-	const seen = /* @__PURE__ */ new Set();
-	while (queue.length > 0) {
-		const current = queue.shift();
-		if (!current || seen.has(current.value)) continue;
-		seen.add(current.value);
-		for (const sectionName of sectionNames) {
-			const section = current.value[sectionName];
-			if (isRecord(section)) return section;
-		}
-		if (current.depth >= 4) continue;
-		for (const wrapperName of [
-			"botInvokeMessage",
-			"documentWithCaptionMessage",
-			"ephemeralMessage",
-			"groupMentionedMessage",
-			"viewOnceMessage",
-			"viewOnceMessageV2",
-			"viewOnceMessageV2Extension"
-		]) {
-			const wrapper = current.value[wrapperName];
-			if (isRecord(wrapper) && isRecord(wrapper.message)) queue.push({
-				depth: current.depth + 1,
-				value: wrapper.message
-			});
-		}
-	}
-}
 function readReaction(message) {
-	const reaction = findMessageSection(message, ["reactionMessage"]);
+	const reaction = findMessageSection(message ?? void 0, ["reactionMessage"])?.value;
 	if (!reaction) return;
-	const emoji = readString(reaction.text) ?? "";
+	const emoji = normalizeOptionalString(reaction.text) ?? "";
 	const key = isRecord(reaction.key) ? reaction.key : void 0;
 	return {
 		emoji,
-		fromMe: readBoolean(key?.fromMe),
-		messageId: readString(key?.id),
-		participant: readString(key?.participant)
+		fromMe: asBoolean(key?.fromMe),
+		messageId: normalizeOptionalString(key?.id),
+		participant: normalizeOptionalString(key?.participant)
 	};
 }
 function readPoll(message) {
-	const poll = findMessageSection(message, [
+	const poll = findMessageSection(message ?? void 0, [
 		"pollCreationMessage",
 		"pollCreationMessageV2",
-		"pollCreationMessageV3"
-	]);
+		"pollCreationMessageV3",
+		"pollCreationMessageV5"
+	])?.value;
 	if (!poll) return;
 	return {
-		options: (Array.isArray(poll.options) ? poll.options : []).map((option) => isRecord(option) ? readString(option.optionName) : void 0).filter((option) => Boolean(option)),
-		question: readString(poll.name)
+		options: (Array.isArray(poll.options) ? poll.options : []).map((option) => isRecord(option) ? normalizeOptionalString(option.optionName) : void 0).filter((option) => Boolean(option)),
+		question: normalizeOptionalString(poll.name)
 	};
 }
 function readMedia(message) {
-	const normalizedMessage = isRecord(message) ? normalizeMessageContent(message) : void 0;
-	for (const sectionName of [
+	const media = findMessageSection(message ?? void 0, [
 		"imageMessage",
 		"videoMessage",
+		"ptvMessage",
 		"audioMessage",
 		"documentMessage",
 		"stickerMessage"
-	]) {
-		const section = findMessageSection(normalizedMessage ?? message, [sectionName]);
-		if (!section) continue;
-		const mediaMessage = { [sectionName]: section };
-		return {
-			fileName: readString(section.fileName),
-			mediaType: resolveInboundMediaMimetype(mediaMessage)
-		};
-	}
+	]);
+	return media ? {
+		fileName: normalizeOptionalString(media.value.fileName),
+		mediaType: resolveInboundMediaMimetype({ [media.name]: media.value })
+	} : void 0;
 }
 function readQuotedMessage(message) {
 	const contextInfo = extractContextInfo(message.message ?? void 0);
-	const replyContext = describeReplyContext(message.message);
+	const replyContext = describeReplyContext(message.message ?? void 0);
 	if (!contextInfo && !replyContext) return;
 	if (!contextInfo?.stanzaId && !contextInfo?.participant && !replyContext?.body) return;
 	return {
@@ -114,7 +69,7 @@ function readQuotedMessage(message) {
 function normalizeObservedMessage(message, authDir) {
 	if (message.key.fromMe) return null;
 	const extractedText = extractText(message.message ?? void 0);
-	const location = extractLocationData(message.message);
+	const location = extractLocationData(message.message ?? void 0);
 	const text = [extractedText, location ? formatLocationText(location) : void 0].filter(Boolean).join("\n").trim() || void 0;
 	const reaction = readReaction(message.message);
 	const poll = readPoll(message.message);
@@ -141,15 +96,6 @@ function normalizeObservedMessage(message, authDir) {
 		text: text ?? ""
 	};
 }
-function closeSocket(sock) {
-	const maybeEnd = sock.end;
-	if (typeof maybeEnd === "function") {
-		maybeEnd.call(sock);
-		return;
-	}
-	const maybeClose = sock.ws?.close;
-	if (typeof maybeClose === "function") maybeClose.call(sock.ws);
-}
 function createConnectionClosedError(update) {
 	const reason = update.lastDisconnect?.error;
 	const status = getStatusCode(reason);
@@ -160,32 +106,26 @@ function createConnectionClosedError(update) {
 async function startWhatsAppQaDriverSession(params) {
 	const sock = await createWaSocket(false, false, { authDir: params.authDir });
 	const observedMessages = [];
-	const pendingNotificationsWaiters = [];
-	const waiters = [];
+	const waiters = /* @__PURE__ */ new Set();
+	let pendingNotificationsWaiter;
 	let closed = false;
 	let closedError;
 	let receivedPendingNotifications = false;
 	const removeWaiter = (waiter) => {
-		const index = waiters.indexOf(waiter);
-		if (index >= 0) waiters.splice(index, 1);
+		waiters.delete(waiter);
 		clearTimeout(waiter.timeout);
 	};
-	const removePendingNotificationsWaiter = (waiter) => {
-		const index = pendingNotificationsWaiters.indexOf(waiter);
-		if (index >= 0) pendingNotificationsWaiters.splice(index, 1);
+	const settlePendingNotifications = (error) => {
+		const waiter = pendingNotificationsWaiter;
+		if (!waiter) return;
+		pendingNotificationsWaiter = void 0;
 		clearTimeout(waiter.timeout);
-	};
-	const markPendingNotificationsReceived = () => {
-		if (receivedPendingNotifications) return;
-		receivedPendingNotifications = true;
-		for (const waiter of pendingNotificationsWaiters.slice()) {
-			removePendingNotificationsWaiter(waiter);
-			waiter.resolve();
-		}
+		if (error) waiter.reject(error);
+		else waiter.resolve();
 	};
 	const observe = (message) => {
 		observedMessages.push(message);
-		for (const waiter of waiters.slice()) {
+		for (const waiter of waiters) {
 			if (!waiter.predicate(message)) continue;
 			removeWaiter(waiter);
 			waiter.resolve(message);
@@ -198,28 +138,27 @@ async function startWhatsAppQaDriverSession(params) {
 		}
 	};
 	const onConnectionUpdate = (event) => {
-		if (event.receivedPendingNotifications === true) markPendingNotificationsReceived();
+		if (event.receivedPendingNotifications === true) {
+			receivedPendingNotifications = true;
+			settlePendingNotifications();
+		}
 		if (event.connection === "close") closeSessionResources(createConnectionClosedError(event));
 	};
 	const removeMessageListener = () => {
-		const evWithOff = sock.ev;
-		evWithOff.off?.("messages.upsert", onMessagesUpsert);
-		evWithOff.off?.("connection.update", onConnectionUpdate);
+		sock.ev.off("messages.upsert", onMessagesUpsert);
+		sock.ev.off("connection.update", onConnectionUpdate);
 	};
 	const closeSessionResources = (waiterError) => {
 		if (closed) return;
 		closed = true;
 		closedError = waiterError;
-		for (const waiter of pendingNotificationsWaiters.slice()) {
-			removePendingNotificationsWaiter(waiter);
-			if (waiterError) waiter.reject(waiterError);
-		}
-		for (const waiter of waiters.slice()) {
+		settlePendingNotifications(waiterError);
+		for (const waiter of waiters) {
 			removeWaiter(waiter);
 			if (waiterError) waiter.reject(waiterError);
 		}
 		removeMessageListener();
-		closeSocket(sock);
+		sock.end(void 0);
 	};
 	sock.ev.on("messages.upsert", onMessagesUpsert);
 	sock.ev.on("connection.update", onConnectionUpdate);
@@ -235,15 +174,14 @@ async function startWhatsAppQaDriverSession(params) {
 				return;
 			}
 			const timeoutMs = params.connectionTimeoutMs ?? 45e3;
-			const waiter = {
+			pendingNotificationsWaiter = {
 				resolve,
 				reject,
 				timeout: setTimeout(() => {
-					removePendingNotificationsWaiter(waiter);
+					pendingNotificationsWaiter = void 0;
 					reject(/* @__PURE__ */ new Error(`timed out after ${timeoutMs}ms waiting for WhatsApp QA driver pending notifications`));
 				}, timeoutMs)
 			};
-			pendingNotificationsWaiters.push(waiter);
 		});
 	} catch (error) {
 		closeSessionResources(error instanceof Error ? error : /* @__PURE__ */ new Error("failed starting WhatsApp QA driver session"));
@@ -261,26 +199,26 @@ async function startWhatsAppQaDriverSession(params) {
 		getObservedMessages() {
 			return [...observedMessages];
 		},
-		async sendContact(to, contact) {
-			return { messageId: (await sendApi.sendContact(to, contact)).messageId };
+		sendContact(to, contact) {
+			return toMessageIdResult(sendApi.sendContact(to, contact));
 		},
-		async sendLocation(to, location) {
-			return { messageId: (await sendApi.sendLocation(to, location)).messageId };
+		sendLocation(to, location) {
+			return toMessageIdResult(sendApi.sendLocation(to, location));
 		},
-		async sendMedia(to, text, mediaBuffer, mediaType, options) {
-			return { messageId: (await sendApi.sendMessage(to, text, mediaBuffer, mediaType, options)).messageId };
+		sendMedia(to, text, mediaBuffer, mediaType, options) {
+			return toMessageIdResult(sendApi.sendMessage(to, text, mediaBuffer, mediaType, options));
 		},
-		async sendPoll(to, poll) {
-			return { messageId: (await sendApi.sendPoll(to, poll)).messageId };
+		sendPoll(to, poll) {
+			return toMessageIdResult(sendApi.sendPoll(to, poll));
 		},
-		async sendReaction(chatJid, messageId, emoji, options) {
-			return { messageId: (await sendApi.sendReaction(chatJid, messageId, emoji, options.fromMe, options.participant)).messageId };
+		sendReaction(chatJid, messageId, emoji, options) {
+			return toMessageIdResult(sendApi.sendReaction(chatJid, messageId, emoji, options.fromMe, options.participant));
 		},
-		async sendSticker(to, stickerBuffer, options) {
-			return { messageId: (await sendApi.sendSticker(to, stickerBuffer, options)).messageId };
+		sendSticker(to, stickerBuffer, options) {
+			return toMessageIdResult(sendApi.sendSticker(to, stickerBuffer, options));
 		},
-		async sendText(to, text, options) {
-			return { messageId: (await sendApi.sendMessage(to, text, void 0, void 0, options)).messageId };
+		sendText(to, text, options) {
+			return toMessageIdResult(sendApi.sendMessage(to, text, void 0, void 0, options));
 		},
 		async waitForMessage(paramsLocal) {
 			const predicate = (message) => (!paramsLocal.observedAfter || new Date(message.observedAt).getTime() >= paramsLocal.observedAfter.getTime()) && paramsLocal.match(message);
@@ -297,10 +235,14 @@ async function startWhatsAppQaDriverSession(params) {
 						reject(/* @__PURE__ */ new Error("timed out waiting for WhatsApp QA driver message"));
 					}, paramsLocal.timeoutMs)
 				};
-				waiters.push(waiter);
+				waiters.add(waiter);
 			});
 		}
 	};
 }
+async function toMessageIdResult(pending) {
+	const { messageId } = await pending;
+	return { messageId };
+}
 //#endregion
-export { DEFAULT_WEB_MEDIA_BYTES, DEFAULT_WHATSAPP_MEDIA_MAX_MB, WHATSAPP_LEGACY_OUTBOUND_SEND_DEP_KEYS, assertWebChannel, hasAnyWhatsAppAuth, isSelfChatMode, isWhatsAppGroupJid, isWhatsAppUserTarget, jidToE164, listEnabledWhatsAppAccounts, listAccountIds as listWhatsAppAccountIds, listWhatsAppAuthDirs, listWhatsAppDirectoryGroupsFromConfig, listWhatsAppDirectoryPeersFromConfig, looksLikeWhatsAppTargetId, markdownToWhatsApp, normalizeE164, normalizeWhatsAppAllowFromEntries, normalizeWhatsAppMessagingTarget, normalizeWhatsAppTarget, resolveDefaultWhatsAppAccountId, resolveJidToE164, resolveUserPath, resolveWhatsAppAccount, resolveWhatsAppAuthDir, resolveWhatsAppGroupRequireMention, resolveWhatsAppGroupToolPolicy, resolveWhatsAppMediaMaxBytes, resolveWhatsAppOutboundTarget, startWhatsAppQaDriverSession, toWhatsappJid, toWhatsappJidWithLid, testing as whatsappAccessControlTesting, whatsappCommandPolicy, whatsappPlugin, whatsappSetupPlugin };
+export { DEFAULT_WEB_MEDIA_BYTES, DEFAULT_WHATSAPP_MEDIA_MAX_MB, WHATSAPP_LEGACY_OUTBOUND_SEND_DEP_KEYS, assertWebChannel, hasAnyWhatsAppAuth, isSelfChatMode, isWhatsAppGroupJid, isWhatsAppUserTarget, jidToE164, listEnabledWhatsAppAccounts, listAccountIds as listWhatsAppAccountIds, listWhatsAppAuthDirs, listWhatsAppDirectoryGroupsFromConfig, listWhatsAppDirectoryPeersFromConfig, looksLikeWhatsAppTargetId, markdownToWhatsApp, normalizeE164, normalizeWhatsAppAllowFromEntries, normalizeWhatsAppMessagingTarget, normalizeWhatsAppTarget, resolveDefaultWhatsAppAccountId, resolveJidToE164, resolveUserPath, resolveWhatsAppAccount, resolveWhatsAppAuthDir, resolveWhatsAppGroupRequireMention, resolveWhatsAppGroupToolPolicy, resolveWhatsAppMediaMaxBytes, resolveWhatsAppOutboundTarget, startWhatsAppQaDriverSession, toWhatsappJid, toWhatsappJidWithLid, whatsappCommandPolicy, whatsappPlugin, whatsappSetupPlugin };

package/dist/{approval-handler.runtime-DrA59QSA.js → approval-handler.runtime-CkMMvUjk.js}

@@ -1,15 +1,15 @@
-import "./accounts-CSqLvCY5.js";
+import "./accounts-BX2fZUyR.js";
 import { r as resolveDefaultWhatsAppAccountId } from "./account-ids-CB5SOWjc.js";
 import { s as normalizeWhatsAppMessagingTarget } from "./normalize-target-CugRyONv.js";
-import { i as sendTypingWhatsApp, t as sendMessageWhatsApp } from "./send-D37ddk22.js";
+import { i as sendTypingWhatsApp, t as sendMessageWhatsApp } from "./send-CwvTU4RI.js";
 import { i as getWhatsAppRuntime } from "./runtime-BLlToOi6.js";
 import "./normalize-C7Hkc_vE.js";
-import { i as unregisterWhatsAppApprovalReactionTarget, r as registerWhatsAppApprovalReactionTarget } from "./approval-reactions-Cu66aYdq.js";
+import { i as unregisterWhatsAppApprovalReactionTarget, r as registerWhatsAppApprovalReactionTarget } from "./approval-reactions-Jyr1JaAK.js";
 import { createSubsystemLogger } from "openclaw/plugin-sdk/runtime-env";
 import { DEFAULT_ACCOUNT_ID } from "openclaw/plugin-sdk/account-id";
-import { buildChannelApprovalNativeTargetKey } from "openclaw/plugin-sdk/approval-native-runtime";
 import { buildApprovalReactionPendingContent } from "openclaw/plugin-sdk/approval-reaction-runtime";
 import { buildChannelApprovalExpiredText, buildChannelApprovalResolvedText, createChannelApprovalNativeRuntimeAdapter, resolvePreparedApprovalAccountId } from "openclaw/plugin-sdk/approval-handler-runtime";
+import { buildChannelApprovalNativeTargetKey } from "openclaw/plugin-sdk/approval-native-runtime";
 //#region extensions/whatsapp/src/approval-handler.runtime.ts
 const log = createSubsystemLogger("whatsapp/approvals");
 function buildPendingPayload(params) {

package/dist/{approval-reactions-Cu66aYdq.js → approval-reactions-Jyr1JaAK.js}

@@ -1,9 +1,11 @@
 import { t as __exportAll } from "./rolldown-runtime-D7D4PA-g.js";
-import { a as resolveWhatsAppAccount } from "./accounts-CSqLvCY5.js";
+import { a as resolveWhatsAppAccount } from "./accounts-BX2fZUyR.js";
 import { n as getOptionalWhatsAppRuntime } from "./runtime-BLlToOi6.js";
-import { c as getWhatsAppApprovalApprovers, l as whatsappApprovalAuth } from "./group-session-key-DVMZlO3x.js";
-import { createLazyRuntimeModule } from "openclaw/plugin-sdk/lazy-runtime";
-import { createApprovalReactionTargetStore, listApprovalReactionBindings, resolveTypedApprovalReactionTarget } from "openclaw/plugin-sdk/approval-reaction-runtime";
+import { c as getWhatsAppApprovalApprovers, l as whatsappApprovalAuth } from "./group-session-key-DmFc_Cqi.js";
+import { isApprovalNotFoundError } from "openclaw/plugin-sdk/error-runtime";
+import { createLazyRuntimeSurface } from "openclaw/plugin-sdk/lazy-runtime";
+import { approvalReactionDecisionSetsMatch, buildApprovalReactionDeliveredBindingMarker, createApprovalReactionTargetStore, listApprovalReactionBindings, readApprovalReactionDecisionList, readApprovalReactionDeliveredBinding, readApprovalReactionPresentationBinding, resolveTypedApprovalReactionTarget } from "openclaw/plugin-sdk/approval-reaction-runtime";
+import { createPluginStateErrorReporter } from "openclaw/plugin-sdk/plugin-state-runtime";
 //#region extensions/whatsapp/src/approval-reactions.ts
 var approval_reactions_exports = /* @__PURE__ */ __exportAll({
 	clearWhatsAppApprovalReactionTargetsForTest: () => clearWhatsAppApprovalReactionTargetsForTest,
@@ -18,16 +20,15 @@ const PERSISTENT_NAMESPACE = "whatsapp.approval-reactions";
 const PERSISTENT_MAX_ENTRIES = 1e3;
 const DEFAULT_REACTION_TARGET_TTL_MS = 1440 * 60 * 1e3;
 const DELIVERY_BINDING_CHANNEL_DATA_KEY = "whatsappApprovalReactionBindingV1";
-const resolverRuntimeLoader = createLazyRuntimeModule(() => import("./approval-resolver-DoeBBt22.js"));
+const loadResolveApprovalOverGateway = createLazyRuntimeSurface(() => import("openclaw/plugin-sdk/approval-gateway-runtime"), (runtime) => runtime.resolveApprovalOverGateway);
 const whatsappApprovalReactionTargets = createApprovalReactionTargetStore({
 	namespace: PERSISTENT_NAMESPACE,
 	maxEntries: PERSISTENT_MAX_ENTRIES,
 	defaultTtlMs: DEFAULT_REACTION_TARGET_TTL_MS,
 	openStore: (storeParams) => getOptionalWhatsAppRuntime()?.state.openKeyedStore(storeParams),
-	logPersistentError: reportPersistentApprovalReactionError,
+	logPersistentError: createPluginStateErrorReporter(getOptionalWhatsAppRuntime, "whatsapp", "approval-reaction-state", "WhatsApp persistent approval reaction state failed"),
 	readPersistedTarget
 });
-const loadApprovalResolver = resolverRuntimeLoader;
 function buildReactionTargetKey(params) {
 	const accountId = params.accountId.trim();
 	const remoteJid = params.remoteJid.trim();
@@ -39,14 +40,6 @@ function addCandidateRemoteJid(target, value) {
 	const remoteJid = value?.trim();
 	if (remoteJid && !target.includes(remoteJid)) target.push(remoteJid);
 }
-function reportPersistentApprovalReactionError(error) {
-	try {
-		getOptionalWhatsAppRuntime()?.logging.getChildLogger({
-			plugin: "whatsapp",
-			feature: "approval-reaction-state"
-		}).warn("WhatsApp persistent approval reaction state failed", { error: String(error) });
-	} catch {}
-}
 function reportApprovalBindingCorrelationMismatch(binding) {
 	try {
 		getOptionalWhatsAppRuntime()?.logging.getChildLogger({
@@ -60,58 +53,17 @@ function reportApprovalBindingCorrelationMismatch(binding) {
 }
 function readPersistedTarget(target) {
 	const value = target;
-	if (!value || typeof value.approvalId !== "string" || !Array.isArray(value.allowedDecisions) || value.approvalKind !== "exec" && value.approvalKind !== "plugin") return null;
+	if (!value || typeof value.approvalId !== "string" || value.approvalKind !== "exec" && value.approvalKind !== "plugin") return null;
+	const allowedDecisions = readApprovalReactionDecisionList(value.allowedDecisions);
+	if (!allowedDecisions) return null;
 	return {
 		approvalId: value.approvalId,
 		approvalKind: value.approvalKind,
-		allowedDecisions: value.allowedDecisions
+		allowedDecisions
 	};
 }
-function listWhatsAppApprovalReactionBindings(allowedDecisions) {
-	return listApprovalReactionBindings({ allowedDecisions });
-}
 const APPROVAL_ID_LINE_RE = /^\s*ID:\s*(\S(?:.*\S)?)\s*$/i;
 const APPROVAL_KIND_LINE_RE = /^\s*(?:\S+\s+)?(Exec|Plugin) approval required\s*$/i;
-function isApprovalDecision(value) {
-	return value === "allow-once" || value === "allow-always" || value === "deny";
-}
-function readStrictDecisionList(value) {
-	if (!Array.isArray(value) || value.length === 0 || !value.every(isApprovalDecision)) return null;
-	return new Set(value).size === value.length ? [...value] : null;
-}
-function readStrictApprovalMetadata(payload) {
-	const value = payload.channelData?.execApproval;
-	if (!value || typeof value !== "object" || Array.isArray(value)) return null;
-	const record = value;
-	const approvalId = record.approvalId;
-	const approvalKind = record.approvalKind;
-	const allowedDecisions = readStrictDecisionList(record.allowedDecisions);
-	if (typeof approvalId !== "string" || !approvalId || approvalId !== approvalId.trim() || approvalKind !== "exec" && approvalKind !== "plugin" || !allowedDecisions) return null;
-	return {
-		version: 1,
-		approvalId,
-		approvalKind,
-		allowedDecisions
-	};
-}
-function listTypedApprovalActions(presentation) {
-	return presentation.blocks.flatMap((block) => {
-		if (block.type === "buttons") return block.buttons.flatMap((button) => button.action?.type === "approval" ? [button.action] : []);
-		return [];
-	});
-}
-function decisionSetsMatch(left, right) {
-	return left.length === right.length && left.every((decision) => right.includes(decision));
-}
-function readTypedApprovalDeliveryBinding(params) {
-	const metadata = readStrictApprovalMetadata(params.payload);
-	if (!metadata) return null;
-	const actions = listTypedApprovalActions(params.presentation);
-	if (actions.length === 0 || actions.some((action) => action.approvalId !== metadata.approvalId || action.approvalKind !== metadata.approvalKind)) return null;
-	const actionDecisions = actions.map((action) => action.decision);
-	if (new Set(actionDecisions).size !== actionDecisions.length || !decisionSetsMatch(metadata.allowedDecisions, actionDecisions)) return null;
-	return metadata;
-}
 function visibleApprovalBindingMatches(text, binding) {
 	const lines = (text ?? "").split(/\r?\n/).map((line) => line.replace(/\*\*/g, ""));
 	const kindMatches = lines.map((line) => line.match(APPROVAL_KIND_LINE_RE)).filter((match) => Boolean(match));
@@ -131,27 +83,18 @@ function visibleApprovalBindingMatches(text, binding) {
 		decisionLines.push(decisionLine);
 		cursor += 1;
 	}
-	const knownBindings = listWhatsAppApprovalReactionBindings([
+	const knownBindings = listApprovalReactionBindings({ allowedDecisions: [
 		"allow-once",
 		"allow-always",
 		"deny"
-	]);
-	const visibleDecisions = decisionLines.map((line) => knownBindings.find((entry) => `${entry.emoji} ${entry.label}` === line)?.decision);
-	if (!visibleDecisions.every(isApprovalDecision)) return false;
-	return new Set(visibleDecisions).size === visibleDecisions.length && decisionSetsMatch(binding.allowedDecisions, visibleDecisions);
-}
-function readDeliveredApprovalBinding(payload) {
-	const metadata = readStrictApprovalMetadata(payload);
-	const value = payload.channelData?.[DELIVERY_BINDING_CHANNEL_DATA_KEY];
-	if (!metadata || !value || typeof value !== "object" || Array.isArray(value)) return null;
-	const record = value;
-	const allowedDecisions = readStrictDecisionList(record.allowedDecisions);
-	if (record.version !== 1 || record.approvalId !== metadata.approvalId || record.approvalKind !== metadata.approvalKind || !allowedDecisions || !decisionSetsMatch(metadata.allowedDecisions, allowedDecisions)) return null;
-	return metadata;
+	] });
+	const decisions = readApprovalReactionDecisionList(decisionLines.map((line) => knownBindings.find((entry) => `${entry.emoji} ${entry.label}` === line)?.decision));
+	if (!decisions) return false;
+	return approvalReactionDecisionSetsMatch(binding.allowedDecisions, decisions);
 }
 /** Preserve a validated typed approval binding until the platform message id is known. */
 function prepareWhatsAppApprovalPayloadForDelivery(params) {
-	const binding = readTypedApprovalDeliveryBinding(params);
+	const binding = readApprovalReactionPresentationBinding(params);
 	if (!binding) return null;
 	if (!visibleApprovalBindingMatches(params.payload.text, binding)) {
 		reportApprovalBindingCorrelationMismatch(binding);
@@ -161,14 +104,14 @@ function prepareWhatsAppApprovalPayloadForDelivery(params) {
 		...params.payload,
 		channelData: {
 			...params.payload.channelData,
-			[DELIVERY_BINDING_CHANNEL_DATA_KEY]: binding
+			[DELIVERY_BINDING_CHANNEL_DATA_KEY]: buildApprovalReactionDeliveredBindingMarker(binding)
 		}
 	};
 }
 function registerWhatsAppApprovalReactionTarget(params) {
 	const key = buildReactionTargetKey(params);
 	const approvalId = params.approvalId.trim();
-	const allowedDecisions = listWhatsAppApprovalReactionBindings(params.allowedDecisions).map((binding) => binding.decision);
+	const allowedDecisions = listApprovalReactionBindings({ allowedDecisions: params.allowedDecisions }).map((binding) => binding.decision);
 	if (!key || !approvalId || params.approvalKind !== "exec" && params.approvalKind !== "plugin" || allowedDecisions.length === 0) return null;
 	const target = {
 		approvalId,
@@ -208,7 +151,10 @@ function listWhatsAppDeliveredMessageIdentities(results) {
 /** Bind generic forwarded approvals to the exact WhatsApp messages accepted by Baileys. */
 function registerWhatsAppApprovalReactionTargetForDeliveredPayload(params) {
 	if (params.target.channel.trim().toLowerCase() !== "whatsapp") return false;
-	const binding = readDeliveredApprovalBinding(params.payload);
+	const binding = readApprovalReactionDeliveredBinding({
+		payload: params.payload,
+		channelDataKey: DELIVERY_BINDING_CHANNEL_DATA_KEY
+	});
 	if (!binding) return false;
 	if (!visibleApprovalBindingMatches(params.payload.text, binding)) {
 		reportApprovalBindingCorrelationMismatch(binding);
@@ -333,13 +279,15 @@ async function maybeResolveWhatsAppApprovalReaction(params) {
 		params.logVerboseMessage?.(`whatsapp: approval reaction denied id=${target.approvalId} sender=${actorId}`);
 		return true;
 	}
-	const { isApprovalNotFoundError, resolveWhatsAppApproval } = await loadApprovalResolver();
+	const resolveApprovalOverGateway = await loadResolveApprovalOverGateway();
 	try {
-		const result = await resolveWhatsAppApproval({
+		const result = await resolveApprovalOverGateway({
 			cfg: params.cfg,
 			approvalId: target.approvalId,
 			approvalKind: target.approvalKind,
 			decision: target.decision,
+			channel: "whatsapp",
+			accountId: params.accountId,
 			senderId: actorId,
 			gatewayUrl: params.gatewayUrl
 		});
@@ -367,7 +315,7 @@ async function maybeResolveWhatsAppApprovalReaction(params) {
 }
 function clearWhatsAppApprovalReactionTargetsForTest() {
 	whatsappApprovalReactionTargets.clearForTest();
-	resolverRuntimeLoader.clear();
+	loadResolveApprovalOverGateway.clear();
 }
 //#endregion
 export { unregisterWhatsAppApprovalReactionTarget as i, maybeResolveWhatsAppApprovalReaction as n, registerWhatsAppApprovalReactionTarget as r, approval_reactions_exports as t };

package/dist/auth-presence.js

@@ -1,4 +1,4 @@
-import { r as hasWebCredsSync } from "./creds-files-B1kSWtBg.js";
+import { r as hasWebCredsSync } from "./creds-files-W6B3EMZ8.js";
 import fs from "node:fs";
 import path from "node:path";
 import { resolveOAuthDir } from "openclaw/plugin-sdk/state-paths";