@openclaw/whatsapp 2026.5.12-beta.3 → 2026.5.12-beta.4

package/dist/api.js

@@ -5,12 +5,12 @@ import { t as resolveWhatsAppOutboundTarget } from "./resolve-outbound-target-BK
 import "./reaction-level-2m9sWGCw.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-CMxQczvs.js";
 import "./send-DBfXQDd4.js";
-import { t as whatsappPlugin } from "./channel-C-UI9SEF.js";
+import { t as whatsappPlugin } from "./channel-DgVXntVm.js";
 import { n as WHATSAPP_LEGACY_OUTBOUND_SEND_DEP_KEYS } from "./outbound-base-BgtywpNm.js";
 import { t as whatsappCommandPolicy } from "./command-policy-O8sRnqUV.js";
-import { a as resolveWhatsAppGroupToolPolicy, i as resolveWhatsAppGroupRequireMention, o as resolveWhatsAppGroupIntroHint } from "./shared-D4EwdloD.js";
+import { a as resolveWhatsAppGroupToolPolicy, i as resolveWhatsAppGroupRequireMention, o as resolveWhatsAppGroupIntroHint } from "./shared-DW9W6SXy.js";
 import "./config-schema-Dmo66Ubb.js";
-import { t as whatsappSetupPlugin } from "./channel.setup-UUV-rS7F.js";
+import { t as whatsappSetupPlugin } from "./channel.setup-DKp_w5Ru.js";
 import { t as DEFAULT_WEB_MEDIA_BYTES } from "./constants-DLGCIbfl.js";
 import { n as listWhatsAppDirectoryGroupsFromConfig, r as listWhatsAppDirectoryPeersFromConfig } from "./directory-config-CE74HYlw.js";
 import { t as __testing } from "./access-control-BEpPB-Jx.js";

package/dist/{channel-C-UI9SEF.js → channel-DgVXntVm.js}

@@ -10,7 +10,7 @@ import { t as createWhatsAppLoginTool } from "./agent-tools-login-DpRxLNRB.js";
 import { t as createWhatsAppOutboundBase } from "./outbound-base-BgtywpNm.js";
 import { t as getWhatsAppRuntime } from "./runtime-6fZ67abR.js";
 import { t as whatsappCommandPolicy } from "./command-policy-O8sRnqUV.js";
-import { a as resolveWhatsAppGroupToolPolicy, c as formatWhatsAppConfigAllowFromEntries, i as resolveWhatsAppGroupRequireMention, n as loadWhatsAppChannelRuntime, o as resolveWhatsAppGroupIntroHint, r as whatsappSetupWizardProxy, s as resolveWhatsAppMentionStripRegexes, t as createWhatsAppPluginBase } from "./shared-D4EwdloD.js";
+import { a as resolveWhatsAppGroupToolPolicy, c as formatWhatsAppConfigAllowFromEntries, i as resolveWhatsAppGroupRequireMention, n as loadWhatsAppChannelRuntime, o as resolveWhatsAppGroupIntroHint, r as whatsappSetupWizardProxy, s as resolveWhatsAppMentionStripRegexes, t as createWhatsAppPluginBase } from "./shared-DW9W6SXy.js";
 import { d as readWebAuthExistsForDecision, n as WHATSAPP_AUTH_UNSTABLE_CODE } from "./auth-store-_ScMvp7r.js";
 import { t as whatsappSetupAdapter } from "./setup-core-DZKvpzbH.js";
 import { t as detectWhatsAppLegacyStateMigrations } from "./state-migrations-Bm0S67yH.js";

package/dist/channel-plugin-api.js

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

package/dist/{channel.runtime-dC5DBvbA.js → channel.runtime-C4Ywu0dZ.js}

@@ -1,7 +1,7 @@
 import { startWebLoginWithQr as startWebLoginWithQr$1, waitForWebLogin as waitForWebLogin$1 } from "./login-qr-runtime.js";
 import { a as getWebAuthAgeMs$1, b as webAuthExists$1, d as readWebAuthExistsForDecision$1, f as readWebAuthSnapshot$1, h as readWebSelfId$1, m as readWebAuthState$1, o as logWebSelfId$1, p as readWebAuthSnapshotBestEffort$1, s as logoutWeb$1, u as readWebAuthExistsBestEffort$1 } from "./auth-store-_ScMvp7r.js";
 import { t as getActiveWebListener$1 } from "./active-listener-DTbKS-j-.js";
-import { t as monitorWebChannel$1 } from "./monitor-CvCc8fd7.js";
+import { t as monitorWebChannel$1 } from "./monitor-CmK0ER1u.js";
 import { t as loginWeb$1 } from "./login-B_pa3YAU.js";
 import { whatsappSetupWizard as whatsappSetupWizard$1 } from "./setup-surface-BbwSSEsy.js";
 //#region extensions/whatsapp/src/channel.runtime.ts

package/dist/{channel.setup-UUV-rS7F.js → channel.setup-DKp_w5Ru.js}

@@ -1,4 +1,4 @@
-import { a as resolveWhatsAppGroupToolPolicy, i as resolveWhatsAppGroupRequireMention, o as resolveWhatsAppGroupIntroHint, r as whatsappSetupWizardProxy, t as createWhatsAppPluginBase } from "./shared-D4EwdloD.js";
+import { a as resolveWhatsAppGroupToolPolicy, i as resolveWhatsAppGroupRequireMention, o as resolveWhatsAppGroupIntroHint, r as whatsappSetupWizardProxy, t as createWhatsAppPluginBase } from "./shared-DW9W6SXy.js";
 import { m as readWebAuthState } from "./auth-store-_ScMvp7r.js";
 import { t as whatsappSetupAdapter } from "./setup-core-DZKvpzbH.js";
 import { t as detectWhatsAppLegacyStateMigrations } from "./state-migrations-Bm0S67yH.js";

package/dist/{monitor-CvCc8fd7.js → monitor-CmK0ER1u.js}

@@ -214,6 +214,7 @@ async function downloadQuotedInboundMedia(msg, sock) {
 const LOGGED_OUT_STATUS = DisconnectReason$1?.loggedOut ?? 401;
 const RECONNECT_IN_PROGRESS_ERROR = "no active socket - reconnection in progress";
 const GROUP_META_TTL_MS = 300 * 1e3;
+const INBOUND_CLOSE_DRAIN_TIMEOUT_MS = 5e3;
 function rememberGroupMetadataCacheEntry(cache, jid, entry) {
 	if (cache.has(jid)) cache.delete(jid);
 	cache.set(jid, entry);
@@ -287,6 +288,17 @@ async function attachWebInboxToSocket(options) {
 	const selfIdentity = await readWebSelfIdentityForDecision(options.authDir, sock.user);
 	if (selfIdentity.outcome === "unstable") throw new WhatsAppAuthUnstableError("WhatsApp auth state is still stabilizing; retrying inbox attach.");
 	const self = selfIdentity.identity;
+	const inboundDebounceMs = Math.max(0, Math.trunc(options.debounceMs ?? 0));
+	const pendingDebounceKeys = /* @__PURE__ */ new Set();
+	const activeInboundFlushes = /* @__PURE__ */ new Set();
+	const buildInboundDebounceKey = (msg) => {
+		const sender = msg.sender;
+		const senderKey = msg.chatType === "group" ? getPrimaryIdentityId(sender ?? null) ?? msg.senderJid ?? msg.senderE164 ?? msg.senderName ?? msg.from : msg.from;
+		if (!senderKey) return null;
+		const conversationKey = msg.chatType === "group" ? msg.chatId : msg.from;
+		return `${msg.accountId}:${conversationKey}:${senderKey}`;
+	};
+	const shouldDebounceInboundMessage = (msg) => options.shouldDebounce?.(msg) ?? true;
 	const finalizeInboundDedupe = async (entries, error) => {
 		const dedupeKeys = [...new Set(entries.map((entry) => entry.dedupeKey).filter(isNonEmptyString))];
 		if (dedupeKeys.length === 0) return;
@@ -297,39 +309,44 @@ async function attachWebInboxToSocket(options) {
 		await Promise.all(dedupeKeys.map((dedupeKey) => commitRecentInboundMessage(dedupeKey)));
 	};
 	const debouncer = createInboundDebouncer({
-		debounceMs: options.debounceMs ?? 0,
-		buildKey: (msg) => {
-			const sender = msg.sender;
-			const senderKey = msg.chatType === "group" ? getPrimaryIdentityId(sender ?? null) ?? msg.senderJid ?? msg.senderE164 ?? msg.senderName ?? msg.from : msg.from;
-			if (!senderKey) return null;
-			const conversationKey = msg.chatType === "group" ? msg.chatId : msg.from;
-			return `${msg.accountId}:${conversationKey}:${senderKey}`;
-		},
-		shouldDebounce: options.shouldDebounce,
+		debounceMs: inboundDebounceMs,
+		buildKey: (msg) => msg.debounceKey ?? buildInboundDebounceKey(msg),
+		shouldDebounce: shouldDebounceInboundMessage,
 		onFlush: async (entries) => {
-			const last = entries.at(-1);
-			if (!last) return;
+			let finishFlush;
+			const flushTask = new Promise((resolve) => {
+				finishFlush = resolve;
+			});
+			activeInboundFlushes.add(flushTask);
 			try {
-				if (entries.length === 1) {
-					await options.onMessage(last);
+				const last = entries.at(-1);
+				if (!last) return;
+				try {
+					if (entries.length === 1) {
+						await options.onMessage(last);
+						await finalizeInboundDedupe(entries);
+						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");
+					const combinedMessage = {
+						...last,
+						body: combinedBody,
+						mentions: mentioned.size > 0 ? Array.from(mentioned) : void 0,
+						mentionedJids: mentioned.size > 0 ? Array.from(mentioned) : void 0,
+						isBatched: true
+					};
+					await options.onMessage(combinedMessage);
 					await finalizeInboundDedupe(entries);
-					return;
+				} catch (error) {
+					await finalizeInboundDedupe(entries, error);
+					throw error;
 				}
-				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");
-				const combinedMessage = {
-					...last,
-					body: combinedBody,
-					mentions: mentioned.size > 0 ? Array.from(mentioned) : void 0,
-					mentionedJids: mentioned.size > 0 ? Array.from(mentioned) : void 0,
-					isBatched: true
-				};
-				await options.onMessage(combinedMessage);
-				await finalizeInboundDedupe(entries);
-			} catch (error) {
-				await finalizeInboundDedupe(entries, error);
-				throw error;
+			} finally {
+				for (const entry of entries) if (entry.debounceKey) pendingDebounceKeys.delete(entry.debounceKey);
+				activeInboundFlushes.delete(flushTask);
+				finishFlush();
 			}
 		},
 		onError: (err) => {
@@ -643,6 +660,11 @@ async function attachWebInboxToSocket(options) {
 			mediaFileName: enriched.mediaFileName,
 			dedupeKey: inbound.id ? `${options.accountId}:${inbound.remoteJid}:${inbound.id}` : void 0
 		};
+		const debounceKey = buildInboundDebounceKey(inboundMessage);
+		if (debounceKey) {
+			inboundMessage.debounceKey = debounceKey;
+			if (inboundDebounceMs > 0 && shouldDebounceInboundMessage(inboundMessage)) pendingDebounceKeys.add(debounceKey);
+		}
 		if (inboundMessage.id) cacheInboundMessageMeta(inboundMessage.accountId, inboundMessage.chatId, inboundMessage.id, {
 			participant: inboundMessage.senderJid,
 			participantE164: inboundMessage.chatType === "direct" ? inboundMessage.senderE164 : void 0,
@@ -659,6 +681,7 @@ async function attachWebInboxToSocket(options) {
 			inboundConsoleLog.error(`Failed handling inbound web message: ${String(err)}`);
 		}
 	};
+	const pendingMessageHandlers = /* @__PURE__ */ new Set();
 	const handleMessagesUpsert = async (upsert) => {
 		if (upsert.type !== "notify" && upsert.type !== "append") return;
 		for (const msg of upsert.messages ?? []) {
@@ -679,6 +702,45 @@ async function attachWebInboxToSocket(options) {
 			await enqueueInboundMessage(msg, inbound, enriched);
 		}
 	};
+	const handleMessagesUpsertEvent = (upsert) => {
+		const task = handleMessagesUpsert(upsert).catch((err) => {
+			inboundLogger.error({ error: String(err) }, "messages.upsert handler error");
+			inboundConsoleLog.error(`Messages upsert handler error: ${String(err)}`);
+		});
+		pendingMessageHandlers.add(task);
+		task.finally(() => {
+			pendingMessageHandlers.delete(task);
+		});
+	};
+	const waitForPendingMessageHandlers = async () => {
+		while (pendingMessageHandlers.size > 0) await Promise.all(Array.from(pendingMessageHandlers));
+	};
+	const drainDebouncedInboundMessages = async () => {
+		while (pendingDebounceKeys.size > 0 || activeInboundFlushes.size > 0) {
+			const debounceKeys = Array.from(pendingDebounceKeys);
+			if (debounceKeys.length > 0) await Promise.all(debounceKeys.map((key) => debouncer.flushKey(key)));
+			const flushes = Array.from(activeInboundFlushes);
+			if (flushes.length > 0) await Promise.allSettled(flushes);
+			await Promise.resolve();
+		}
+	};
+	const drainInboundBeforeSocketClose = async () => {
+		await waitForPendingMessageHandlers();
+		await drainDebouncedInboundMessages();
+	};
+	const drainInboundBeforeSocketCloseWithTimeout = async () => {
+		let timeout = null;
+		try {
+			await Promise.race([drainInboundBeforeSocketClose(), new Promise((_, reject) => {
+				timeout = setTimeout(() => {
+					reject(/* @__PURE__ */ new Error(`Timed out draining WhatsApp inbound debounce after ${INBOUND_CLOSE_DRAIN_TIMEOUT_MS}ms`));
+				}, INBOUND_CLOSE_DRAIN_TIMEOUT_MS);
+				timeout.unref?.();
+			})]);
+		} finally {
+			if (timeout) clearTimeout(timeout);
+		}
+	};
 	const handleConnectionUpdate = (update) => {
 		try {
 			if (update.connection === "close") {
@@ -699,7 +761,7 @@ async function attachWebInboxToSocket(options) {
 			});
 		}
 	};
-	const detachMessagesUpsert = attachEmitterListener(sock.ev, "messages.upsert", handleMessagesUpsert);
+	const detachMessagesUpsert = attachEmitterListener(sock.ev, "messages.upsert", handleMessagesUpsertEvent);
 	const detachConnectionUpdate = attachEmitterListener(sock.ev, "connection.update", handleConnectionUpdate);
 	(async () => {
 		try {
@@ -718,6 +780,11 @@ async function attachWebInboxToSocket(options) {
 			try {
 				detachMessagesUpsert();
 				detachConnectionUpdate();
+				await drainInboundBeforeSocketCloseWithTimeout();
+			} catch (err) {
+				logWhatsAppVerbose(options.verbose, `Inbound close drain failed: ${String(err)}`);
+			}
+			try {
 				closeInboundMonitorSocket(sock);
 			} catch (err) {
 				logWhatsAppVerbose(options.verbose, `Socket close failed: ${String(err)}`);

package/dist/runtime-api.js

@@ -10,7 +10,7 @@ import { t as DEFAULT_WEB_MEDIA_BYTES } from "./constants-DLGCIbfl.js";
 import { c as extractContactContext, d as extractMediaPlaceholder, p as extractText, u as extractLocationData } from "./send-api-DD93aPIQ.js";
 import { n as newConnectionId, r as waitForWaConnection, t as createWaSocket } from "./session-ZZQKkOTz.js";
 import { n as resolveWebAccountId, t as getActiveWebListener } from "./active-listener-DTbKS-j-.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-CvCc8fd7.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-CmK0ER1u.js";
 import { t as loginWeb } from "./login-B_pa3YAU.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/setup-plugin-api.js

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

package/dist/{shared-D4EwdloD.js → shared-DW9W6SXy.js}

@@ -124,7 +124,7 @@ function resolveWhatsAppConfigPath(params) {
 	return `${resolveWhatsAppGroupScopeBasePath(params)}.${params.field}`;
 }
 async function loadWhatsAppChannelRuntime() {
-	return await import("./channel.runtime-dC5DBvbA.js");
+	return await import("./channel.runtime-C4Ywu0dZ.js");
 }
 async function loadWhatsAppSetupSurface() {
 	return await import("./setup-surface-BbwSSEsy.js");

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@openclaw/whatsapp",
-  "version": "2026.5.12-beta.3",
+  "version": "2026.5.12-beta.4",
   "description": "OpenClaw WhatsApp channel plugin",
   "repository": {
     "type": "git",
@@ -19,7 +19,7 @@
     "openclaw": "workspace:*"
   },
   "peerDependencies": {
-    "openclaw": ">=2026.5.12-beta.3"
+    "openclaw": ">=2026.5.12-beta.4"
   },
   "peerDependenciesMeta": {
     "openclaw": {
@@ -61,10 +61,10 @@
       "minHostVersion": ">=2026.4.25"
     },
     "compat": {
-      "pluginApi": ">=2026.5.12-beta.3"
+      "pluginApi": ">=2026.5.12-beta.4"
     },
     "build": {
-      "openclawVersion": "2026.5.12-beta.3"
+      "openclawVersion": "2026.5.12-beta.4"
     },
     "release": {
       "publishToClawHub": true,