@openclaw/whatsapp 2026.7.2-beta.1 → 2026.7.2-beta.2

package/dist/api.js

@@ -5,11 +5,11 @@ import { t as resolveWhatsAppOutboundTarget } from "./resolve-outbound-target-BR
 import "./send-D9Ydnn4o.js";
 import { c as toWhatsappJidWithLid, i as markdownToWhatsApp, n as isSelfChatMode, o as resolveJidToE164, r as jidToE164, s as toWhatsappJid, t as assertWebChannel } from "./targets-runtime-Bsh0HR9y.js";
 import { n as normalizeE164, r as resolveUserPath } from "./text-runtime-BTGkMN0o.js";
-import { n as resolveWhatsAppGroupIntroHint, r as WHATSAPP_LEGACY_OUTBOUND_SEND_DEP_KEYS, t as whatsappPlugin } from "./channel-D_1cK7-w.js";
+import { n as resolveWhatsAppGroupIntroHint, r as WHATSAPP_LEGACY_OUTBOUND_SEND_DEP_KEYS, t as whatsappPlugin } from "./channel-DbadDUDD.js";
 import { t as whatsappCommandPolicy } from "./command-policy-BIOSHySD.js";
-import { a as resolveWhatsAppGroupRequireMention, o as resolveWhatsAppGroupToolPolicy } from "./setup-core-BXDFGqky.js";
+import { a as resolveWhatsAppGroupRequireMention, o as resolveWhatsAppGroupToolPolicy } from "./setup-core-3aSOoK2T.js";
 import "./config-schema-BZ8h1hWA.js";
-import { t as whatsappSetupPlugin } from "./channel.setup-eX64WZDx.js";
+import { t as whatsappSetupPlugin } from "./channel.setup-BZ-po8fg.js";
 import { t as DEFAULT_WEB_MEDIA_BYTES } from "./constants-HU41RHGI.js";
 import { n as listWhatsAppDirectoryGroupsFromConfig, r as listWhatsAppDirectoryPeersFromConfig } from "./directory-config-CLBQrjtC.js";
 import { n as testing } from "./access-control-DazDX3RB.js";
@@ -22,7 +22,7 @@ import "openclaw/plugin-sdk/core";
 import "openclaw/plugin-sdk/account-id";
 import { createLazyRuntimeModule } from "openclaw/plugin-sdk/lazy-runtime";
 import { formatLocationText } from "openclaw/plugin-sdk/channel-inbound";
-createLazyRuntimeModule(() => import("./channel.runtime-BPrKzcYd.js"));
+createLazyRuntimeModule(() => import("./channel.runtime-BDDy4Lhz.js"));
 //#endregion
 //#region extensions/whatsapp/src/qa-driver.runtime.ts
 function isRecord(value) {

package/dist/{channel-D_1cK7-w.js → channel-DbadDUDD.js}

@@ -10,13 +10,13 @@ import "./text-runtime-BTGkMN0o.js";
 import { t as createWhatsAppLoginTool } from "./agent-tools-login-DfyToBpG.js";
 import { c as getWhatsAppApprovalApprovers, l as whatsappApprovalAuth, s as lookupInboundMessageMetaForTarget, t as resolveWhatsAppGroupSessionKey } from "./group-session-key-CLTZeH_F.js";
 import { t as whatsappCommandPolicy } from "./command-policy-BIOSHySD.js";
-import { a as resolveWhatsAppGroupRequireMention, i as whatsappSetupWizardProxy, n as createWhatsAppPluginBase, o as resolveWhatsAppGroupToolPolicy, r as loadWhatsAppChannelRuntime, s as formatWhatsAppConfigAllowFromEntries, t as whatsappSetupAdapter } from "./setup-core-BXDFGqky.js";
+import { a as resolveWhatsAppGroupRequireMention, i as whatsappSetupWizardProxy, n as createWhatsAppPluginBase, o as resolveWhatsAppGroupToolPolicy, r as loadWhatsAppChannelRuntime, s as formatWhatsAppConfigAllowFromEntries, t as whatsappSetupAdapter } from "./setup-core-3aSOoK2T.js";
 import { f as readWebAuthExistsForDecision, n as WHATSAPP_AUTH_UNSTABLE_CODE } from "./auth-store-BQi9pZqQ.js";
-import { t as detectWhatsAppLegacyStateMigrations } from "./state-migrations-D_BmQUR9.js";
+import { t as detectWhatsAppLegacyStateMigrations } from "./state-migrations-CAMTrs2U.js";
 import { createActionGate as createActionGate$1 } from "openclaw/plugin-sdk/channel-actions";
 import { normalizeOptionalAccountId } from "openclaw/plugin-sdk/account-core";
 import { normalizeLowercaseStringOrEmpty, normalizeOptionalString } from "openclaw/plugin-sdk/string-coerce-runtime";
-import { asString, collectIssuesForEnabledAccounts, createAsyncComputedAccountStatusAdapter, createDefaultChannelRuntimeState, isRecord as isRecord$1 } from "openclaw/plugin-sdk/status-helpers";
+import { asString, collectIssuesForEnabledAccounts, createAsyncComputedAccountStatusAdapter, createDefaultChannelRuntimeState, isRecord as isRecord$1, readAccountStatusSnapshot } from "openclaw/plugin-sdk/status-helpers";
 import { formatCliCommand } from "openclaw/plugin-sdk/cli-runtime";
 import { buildChannelOutboundSessionRoute } from "openclaw/plugin-sdk/core";
 import { createMessageReceiptFromOutboundResults, defineChannelMessageAdapter, resolveOutboundSendDep } from "openclaw/plugin-sdk/channel-outbound";
@@ -541,23 +541,16 @@ function resolveWhatsAppOutboundSessionRoute(params) {
 }
 //#endregion
 //#region extensions/whatsapp/src/status-issues.ts
+const WHATSAPP_ACCOUNT_STATUS_FIELDS = [
+	"statusState",
+	"linked",
+	"reconnectAttempts",
+	"lastDisconnect",
+	"lastInboundAt",
+	"lastError",
+	"healthState"
+];
 const RECENT_DISCONNECT_WARNING_WINDOW_MS = 900 * 1e3;
-function readWhatsAppAccountStatus(value) {
-	if (!isRecord$1(value)) return null;
-	return {
-		accountId: value.accountId,
-		statusState: value.statusState,
-		enabled: value.enabled,
-		linked: value.linked,
-		connected: value.connected,
-		running: value.running,
-		reconnectAttempts: value.reconnectAttempts,
-		lastDisconnect: value.lastDisconnect,
-		lastInboundAt: value.lastInboundAt,
-		lastError: value.lastError,
-		healthState: value.healthState
-	};
-}
 function readLastDisconnect(value) {
 	if (typeof value === "string") {
 		const error = asString(value);
@@ -579,7 +572,7 @@ function isRecentDisconnect(disconnect, now = Date.now()) {
 function collectWhatsAppStatusIssues(accounts) {
 	return collectIssuesForEnabledAccounts({
 		accounts,
-		readAccount: readWhatsAppAccountStatus,
+		readAccount: (value) => readAccountStatusSnapshot(value, WHATSAPP_ACCOUNT_STATUS_FIELDS),
 		collectIssues: ({ account, accountId, issues }) => {
 			const linked = account.linked === true;
 			const statusState = asString(account.statusState);

package/dist/channel-plugin-api.js

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

package/dist/{channel.runtime-BPrKzcYd.js → channel.runtime-BDDy4Lhz.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-BQi9pZqQ.js";
 import { t as getActiveWebListener$1 } from "./active-listener-5kHap439.js";
-import { t as monitorWebChannel$1 } from "./monitor-BKtA0lzq.js";
+import { t as monitorWebChannel$1 } from "./monitor-BZ8QvCeV.js";
 import { t as loginWeb$1 } from "./login-DGIoToX8.js";
-import { whatsappSetupWizard as whatsappSetupWizard$1 } from "./setup-surface-5EUmMLHS.js";
+import { whatsappSetupWizard as whatsappSetupWizard$1 } from "./setup-surface-CiKGdNJv.js";
 //#region extensions/whatsapp/src/channel.runtime.ts
 function getActiveWebListener(...args) {
 	return getActiveWebListener$1(...args);

package/dist/{channel.setup-eX64WZDx.js → channel.setup-BZ-po8fg.js}

@@ -1,5 +1,5 @@
-import { a as resolveWhatsAppGroupRequireMention, i as whatsappSetupWizardProxy, n as createWhatsAppPluginBase, o as resolveWhatsAppGroupToolPolicy, t as whatsappSetupAdapter } from "./setup-core-BXDFGqky.js";
-import { t as detectWhatsAppLegacyStateMigrations } from "./state-migrations-D_BmQUR9.js";
+import { a as resolveWhatsAppGroupRequireMention, i as whatsappSetupWizardProxy, n as createWhatsAppPluginBase, o as resolveWhatsAppGroupToolPolicy, t as whatsappSetupAdapter } from "./setup-core-3aSOoK2T.js";
+import { t as detectWhatsAppLegacyStateMigrations } from "./state-migrations-CAMTrs2U.js";
 //#region extensions/whatsapp/src/channel.setup.ts
 async function isWhatsAppAuthConfigured(account) {
 	const { readWebAuthState } = await import("./auth-store-BQi9pZqQ.js").then((n) => n.i);

package/dist/legacy-state-migrations-api.js

@@ -1,2 +1,2 @@
-import { t as detectWhatsAppLegacyStateMigrations } from "./state-migrations-D_BmQUR9.js";
+import { t as detectWhatsAppLegacyStateMigrations } from "./state-migrations-CAMTrs2U.js";
 export { detectWhatsAppLegacyStateMigrations };

package/dist/{monitor-BKtA0lzq.js → monitor-BZ8QvCeV.js}

@@ -16,7 +16,7 @@ import { t as BufferJSON } from "./session.runtime-Nsqaehbd.js";
 import { c as computeBackoff, d as resolveReconnectPolicy, f as sleepWithAbort, l as newConnectionId, n as WHATSAPP_WATCHDOG_TIMEOUT_ERROR, r as WhatsAppConnectionController, s as DEFAULT_RECONNECT_POLICY, u as resolveHeartbeatSeconds } from "./connection-controller-C1rwfWb4.js";
 import { n as maybeResolveWhatsAppApprovalReaction } from "./approval-reactions-BGQoz25s.js";
 import { resolveAccountEntry } from "openclaw/plugin-sdk/account-core";
-import { normalizeLowercaseStringOrEmpty, normalizeStringEntries, uniqueStrings } from "openclaw/plugin-sdk/string-coerce-runtime";
+import { normalizeLowercaseStringOrEmpty, normalizeStringEntries } from "openclaw/plugin-sdk/string-coerce-runtime";
 import { filterSupplementalContextItems, resolvePinnedMainDmOwnerFromAllowlist } from "openclaw/plugin-sdk/security-runtime";
 import { DEFAULT_TIMING, createAckReactionHandle, createStatusReactionController, logAckFailure, removeAckReactionHandleAfterReply, shouldAckReactionForWhatsApp } from "openclaw/plugin-sdk/channel-feedback";
 import { formatCliCommand } from "openclaw/plugin-sdk/cli-runtime";
@@ -36,18 +36,17 @@ import { DEFAULT_ACCOUNT_ID as DEFAULT_ACCOUNT_ID$1, DEFAULT_MAIN_KEY, buildAgen
 import { asDateTimestampMs, parseStrictFiniteNumber, resolveExpiresAtMsFromDurationMs } from "openclaw/plugin-sdk/number-runtime";
 import { recordInboundSession } from "openclaw/plugin-sdk/conversation-runtime";
 import { getSessionEntry, patchSessionEntry, resolveStorePath, resolveStorePath as resolveStorePath$1, updateLastRoute } from "openclaw/plugin-sdk/session-store-runtime";
-import { buildChannelInboundEventContext, filterChannelInboundQuoteContext, formatInboundEnvelope, formatInboundEnvelope as formatInboundEnvelope$1, formatInboundMediaUnavailableText, formatLocationText, hasVisibleInboundReplyDispatch, resolveInboundSessionEnvelopeContext, runChannelInboundEvent, toInboundMediaFacts, toLocationContext } from "openclaw/plugin-sdk/channel-inbound";
+import { buildChannelInboundEventContext, filterChannelInboundQuoteContext, formatInboundEnvelope, formatInboundEnvelope as formatInboundEnvelope$1, formatInboundMediaUnavailableText, formatLocationText, hasVisibleInboundReplyDispatch, resolveInboundSessionEnvelopeContext, runChannelInboundEvent, shouldDebounceTextInbound, toInboundMediaFacts, toLocationContext } from "openclaw/plugin-sdk/channel-inbound";
 import { recordChannelActivity } from "openclaw/plugin-sdk/channel-activity-runtime";
 import { createHash } from "node:crypto";
-import { dispatchReplyWithBufferedBlockDispatcher, finalizeInboundContext, resolveChunkMode, resolveTextChunkLimit } from "openclaw/plugin-sdk/reply-runtime";
+import { dispatchReplyWithBufferedBlockDispatcher, resolveChunkMode, resolveTextChunkLimit } from "openclaw/plugin-sdk/reply-runtime";
 import { CHANNEL_APPROVAL_NATIVE_RUNTIME_CONTEXT_CAPABILITY } from "openclaw/plugin-sdk/approval-handler-runtime";
 import { createInboundDebouncer, resolveInboundDebounceMs } from "openclaw/plugin-sdk/channel-inbound-debounce";
-import { hasControlCommand, isControlCommandMessage, isControlCommandMessage as isControlCommandMessage$1, shouldComputeCommandAuthorized } from "openclaw/plugin-sdk/command-detection";
 import { drainPendingDeliveries } from "openclaw/plugin-sdk/delivery-queue-runtime";
 import { DEFAULT_GROUP_HISTORY_LIMIT, buildHistoryContextFromEntries, buildInboundHistoryFromEntries, createChannelHistoryWindow } from "openclaw/plugin-sdk/reply-history";
 import { enqueueSystemEvent } from "openclaw/plugin-sdk/system-event-runtime";
 import { createDedupeCache } from "openclaw/plugin-sdk/dedupe-runtime";
-import { createClaimableDedupe } from "openclaw/plugin-sdk/persistent-dedupe";
+import { createChannelReplayGuard } from "openclaw/plugin-sdk/persistent-dedupe";
 import { saveMediaStream } from "openclaw/plugin-sdk/media-store";
 import { getRuntimeConfig as getRuntimeConfig$1, getRuntimeConfigSourceSnapshot } from "openclaw/plugin-sdk/runtime-config-snapshot";
 import { resolveChannelContextVisibilityMode } from "openclaw/plugin-sdk/context-visibility-runtime";
@@ -56,18 +55,22 @@ import { createConnectedChannelStatusPatch, createTransportActivityStatusPatch }
 import { ensureConfiguredBindingRouteReady, resolveConfiguredBindingRoute } from "openclaw/plugin-sdk/conversation-binding-runtime";
 import { resolveAgentIdentity, resolveIdentityNamePrefix as resolveIdentityNamePrefix$1 } from "openclaw/plugin-sdk/agent-runtime";
 import { normalizeGroupActivation, parseActivationCommand } from "openclaw/plugin-sdk/group-activation";
+import { hasControlCommand, isControlCommandMessage, shouldComputeCommandAuthorized } from "openclaw/plugin-sdk/command-detection";
 import { createInternalHookEvent, deriveInboundMessageHookContext, fireAndForgetBoundedHook, toInternalMessageReceivedContext, toPluginMessageContext, toPluginMessageReceivedEvent, triggerInternalHook } from "openclaw/plugin-sdk/hook-runtime";
 import { getGlobalHookRunner } from "openclaw/plugin-sdk/plugin-runtime";
 import { resolveBatchedReplyThreadingPolicy } from "openclaw/plugin-sdk/reply-reference";
-import { retryAsync } from "openclaw/plugin-sdk/retry-runtime";
+import { createChannelApiRetryRunner } from "openclaw/plugin-sdk/retry-runtime";
 //#region extensions/whatsapp/src/inbound/dedupe.ts
 const WHATSAPP_INBOUND_DEDUPE_TTL_MS = 20 * 6e4;
 const RECENT_WEB_MESSAGE_MAX = 5e3;
 const RECENT_OUTBOUND_MESSAGE_TTL_MS = 20 * 6e4;
 const RECENT_OUTBOUND_MESSAGE_MAX = 5e3;
-const claimableInboundMessages = createClaimableDedupe({
-	ttlMs: WHATSAPP_INBOUND_DEDUPE_TTL_MS,
-	memoryMaxSize: RECENT_WEB_MESSAGE_MAX
+const whatsAppInboundReplayGuard = createChannelReplayGuard({
+	dedupe: {
+		ttlMs: WHATSAPP_INBOUND_DEDUPE_TTL_MS,
+		memoryMaxSize: RECENT_WEB_MESSAGE_MAX
+	},
+	buildReplayKey: (keys) => keys
 });
 const recentOutboundMessages = createDedupeCache({
 	ttlMs: RECENT_OUTBOUND_MESSAGE_TTL_MS,
@@ -87,18 +90,9 @@ function buildMessageKey(params) {
 	return `${accountId}:${remoteJid}:${messageId}`;
 }
 function resetWebInboundDedupe() {
-	claimableInboundMessages.clearMemory();
+	whatsAppInboundReplayGuard.clearMemory();
 	recentOutboundMessages.clear();
 }
-async function claimRecentInboundMessageDelivery(key) {
-	return (await claimableInboundMessages.claim(key)).kind;
-}
-async function commitRecentInboundMessage(key) {
-	await claimableInboundMessages.commit(key);
-}
-function releaseRecentInboundMessage(key, error) {
-	claimableInboundMessages.release(key, { error });
-}
 function rememberRecentOutboundMessage(params) {
 	const key = buildMessageKey(params);
 	if (!key) return;
@@ -702,16 +696,16 @@ async function attachWebInboxToSocket(options) {
 		return (a.receiveOrder ?? 0) - (b.receiveOrder ?? 0);
 	});
 	const finalizeInboundDelivery = async (entries, error) => {
-		const dedupeKeys = uniqueStrings(entries.map((entry) => entry.dedupeKey).filter(isNonEmptyString));
+		const replayClaims = entries.map((entry) => entry.replayClaim).filter((claim) => claim !== void 0);
 		const durableEntries = entries.filter((entry) => isNonEmptyString(entry.durableId));
 		const readReceiptEntries = entries.filter((entry) => Boolean(entry.readReceipt));
 		const retryableError = resolveRetryableWhatsAppInboundError(error);
 		if (retryableError) {
-			dedupeKeys.forEach((dedupeKey) => releaseRecentInboundMessage(dedupeKey, retryableError));
+			for (const claim of replayClaims) claim.release({ error: retryableError });
 			await Promise.all(durableEntries.map((entry) => durableInboundJournal.release(entry.durableId, { lastError: formatError(retryableError) })));
 			return;
 		}
-		await Promise.all([...dedupeKeys.map((dedupeKey) => commitRecentInboundMessage(dedupeKey)), ...durableEntries.map((entry) => durableInboundJournal.complete(entry.durableId, entry.readReceipt ? { metadata: { readReceipt: entry.readReceipt } } : void 0))]);
+		await Promise.all([...replayClaims.map((claim) => claim.commit()), ...durableEntries.map((entry) => durableInboundJournal.complete(entry.durableId, entry.readReceipt ? { metadata: { readReceipt: entry.readReceipt } } : void 0))]);
 		await Promise.all(readReceiptEntries.map((entry) => maybeMarkInboundAsRead(entry.readReceipt)));
 	};
 	const debouncer = createInboundDebouncer({
@@ -1124,9 +1118,9 @@ async function attachWebInboxToSocket(options) {
 			return;
 		}
 		const dedupeKey = inbound.id ? `${options.accountId}:${inbound.remoteJid}:${inbound.id}` : "";
-		const dedupeClaim = dedupeKey ? await claimRecentInboundMessageDelivery(dedupeKey) : "claimed";
-		if (dedupeClaim !== "claimed") {
-			if (dedupeClaim === "duplicate") {
+		const dedupeClaim = dedupeKey ? await whatsAppInboundReplayGuard.claim(dedupeKey) : { kind: "invalid" };
+		if (dedupeClaim.kind === "duplicate" || dedupeClaim.kind === "inflight") {
+			if (dedupeClaim.kind === "duplicate") {
 				await completeUndeliverableDurableInbound(durableId, durableMetadata);
 				await maybeMarkNonSelfChatReadReceipt(inbound, deliveryReadReceipt);
 			}
@@ -1136,7 +1130,8 @@ async function attachWebInboxToSocket(options) {
 		await enqueueInboundMessage(msg, inbound, enriched, {
 			durableId,
 			readReceipt: deliveryReadReceipt,
-			receiveOrder
+			receiveOrder,
+			...dedupeClaim.kind === "claimed" ? { replayClaim: dedupeClaim.handle } : {}
 		});
 	};
 	const replayPendingDurableInboundMessages = async () => {
@@ -1301,7 +1296,7 @@ async function attachWebInboxToSocket(options) {
 				}
 			} : void 0,
 			group,
-			dedupeKey: inbound.id ? `${options.accountId}:${inbound.remoteJid}:${inbound.id}` : void 0,
+			replayClaim: durable.replayClaim,
 			durableId: durable.durableId,
 			readReceipt: durable.readReceipt,
 			receiveOrder: durable.receiveOrder
@@ -2224,29 +2219,34 @@ function isRetryableWhatsAppOutboundError(error) {
 	return WHATSAPP_RETRYABLE_OUTBOUND_ERROR_PATTERN.test(formatError(error));
 }
 async function sendWhatsAppOutboundWithRetry(params) {
+	const runWithRetry = createChannelApiRetryRunner({
+		retry: {
+			attempts: WHATSAPP_OUTBOUND_MAX_ATTEMPTS,
+			minDelayMs: WHATSAPP_OUTBOUND_MIN_DELAY_MS,
+			maxDelayMs: WHATSAPP_OUTBOUND_MAX_DELAY_MS,
+			jitter: 0
+		},
+		strictShouldRetry: true,
+		retryAfterMs: () => void 0,
+		shouldRetry: (error, attempt) => {
+			if (!(error instanceof WhatsAppOutboundRetryError) || !isRetryableWhatsAppOutboundError(error.original)) return false;
+			params.onRetry?.({
+				attempt,
+				maxAttempts: WHATSAPP_OUTBOUND_MAX_ATTEMPTS,
+				backoffMs: Math.min(WHATSAPP_OUTBOUND_MIN_DELAY_MS * 2 ** (attempt - 1), WHATSAPP_OUTBOUND_MAX_DELAY_MS),
+				error: error.original,
+				errorText: formatError(error.original)
+			});
+			return true;
+		}
+	});
 	try {
-		return await retryAsync(async () => {
+		return await runWithRetry(async () => {
 			try {
 				return await params.send();
 			} catch (error) {
 				throw new WhatsAppOutboundRetryError(error);
 			}
-		}, {
-			attempts: WHATSAPP_OUTBOUND_MAX_ATTEMPTS,
-			minDelayMs: WHATSAPP_OUTBOUND_MIN_DELAY_MS,
-			maxDelayMs: WHATSAPP_OUTBOUND_MAX_DELAY_MS,
-			jitter: 0,
-			shouldRetry: (error) => error instanceof WhatsAppOutboundRetryError && isRetryableWhatsAppOutboundError(error.original),
-			onRetry: ({ attempt, maxAttempts, delayMs, err }) => {
-				if (!(err instanceof WhatsAppOutboundRetryError)) return;
-				params.onRetry?.({
-					attempt,
-					maxAttempts,
-					backoffMs: delayMs,
-					error: err.original,
-					errorText: formatError(err.original)
-				});
-			}
 		});
 	} catch (error) {
 		if (error instanceof WhatsAppOutboundRetryError) throw error.original;
@@ -2662,7 +2662,6 @@ async function buildWhatsAppInboundContext(params) {
 	}] : void 0, { transcribed: (_entry, index) => params.mediaTranscribedIndexes?.includes(index) === true });
 	return buildChannelInboundEventContext({
 		channel: "whatsapp",
-		finalize: finalizeInboundContext,
 		supplemental: {
 			quote: params.visibleReplyTo ? {
 				id: params.visibleReplyTo.id,
@@ -2699,7 +2698,7 @@ async function buildWhatsAppInboundContext(params) {
 			bodyForAgent: params.bodyForAgent ?? params.msg.payload.body,
 			inboundHistory,
 			rawBody: params.rawBody ?? params.msg.payload.body,
-			commandBody: params.commandBody ?? params.msg.payload.body
+			commandBody: params.command?.body ?? params.msg.payload.body
 		},
 		access: {
 			...wasMentioned !== void 0 ? { mentions: {
@@ -2707,9 +2706,9 @@ async function buildWhatsAppInboundContext(params) {
 				wasMentioned,
 				requireMention: params.msg.groupMention?.requireMention
 			} } : {},
-			commands: { authorized: params.commandAuthorized }
+			commands: { authorized: params.command?.authorized === true }
 		},
-		commandTurn: params.commandTurn,
+		command: params.command,
 		extra: {
 			Transcript: params.transcript,
 			GroupSubject: params.msg.group?.subject,
@@ -2719,40 +2718,12 @@ async function buildWhatsAppInboundContext(params) {
 				fallbackE164: params.sender.e164
 			}),
 			SenderE164: params.sender.e164,
-			CommandSource: params.commandSource ?? (params.commandTurn?.source === "native" || params.commandTurn?.source === "text" ? params.commandTurn.source : void 0),
 			ReplyThreading: params.replyThreading,
 			SuppressMessageReceivedHooks: params.suppressMessageReceivedHooks,
 			...params.msg.payload.location ? toLocationContext(params.msg.payload.location) : {}
 		}
 	});
 }
-function normalizeCommandTurnFromContext(value) {
-	if (!value || typeof value !== "object") return;
-	const record = value;
-	const kind = record.kind;
-	const source = record.source;
-	if (kind === "native" && source === "native" && typeof record.authorized === "boolean") return {
-		kind: "native",
-		source: "native",
-		authorized: record.authorized,
-		commandName: typeof record.commandName === "string" ? record.commandName : void 0,
-		body: typeof record.body === "string" ? record.body : void 0
-	};
-	if (kind === "text-slash" && source === "text" && typeof record.authorized === "boolean") return {
-		kind: "text-slash",
-		source: "text",
-		authorized: record.authorized,
-		commandName: typeof record.commandName === "string" ? record.commandName : void 0,
-		body: typeof record.body === "string" ? record.body : void 0
-	};
-	if (kind === "normal" && source === "message") return {
-		kind: "normal",
-		source: "message",
-		authorized: false,
-		commandName: typeof record.commandName === "string" ? record.commandName : void 0,
-		body: typeof record.body === "string" ? record.body : void 0
-	};
-}
 function resolveWhatsAppDmRouteTarget(params) {
 	const admission = requireWhatsAppInboundAdmission(params.msg);
 	const conversationId = admission.conversation.id;
@@ -2801,18 +2772,9 @@ async function dispatchWhatsAppBufferedReply(params) {
 		accountId: params.route.accountId
 	});
 	const mediaLocalRoots = getAgentScopedMediaLocalRoots(params.cfg, params.route.agentId);
-	const sourceReplyChatType = typeof params.context.ChatType === "string" ? params.context.ChatType : conversationKind;
-	const sourceReplyCommandSource = params.context.CommandSource === "native" || params.context.CommandSource === "text" ? params.context.CommandSource : void 0;
-	const sourceReplyCommandTurn = normalizeCommandTurnFromContext(params.context.CommandTurn);
-	const sourceReplyCommandAuthorized = typeof params.context.CommandAuthorized === "boolean" ? params.context.CommandAuthorized : void 0;
-	const sourceReplyDeliveryMode = sourceReplyChatType === "group" || sourceReplyChatType === "channel" ? resolveChannelMessageSourceReplyDeliveryMode({
+	const sourceReplyDeliveryMode = params.context.ChatType === "group" || params.context.ChatType === "channel" ? resolveChannelMessageSourceReplyDeliveryMode({
 		cfg: params.cfg,
-		ctx: {
-			ChatType: sourceReplyChatType,
-			CommandTurn: sourceReplyCommandTurn,
-			CommandSource: sourceReplyCommandSource,
-			CommandAuthorized: sourceReplyCommandAuthorized
-		}
+		ctx: params.context
 	}) : void 0;
 	const sourceRepliesAreToolOnly = sourceReplyDeliveryMode === "message_tool_only";
 	const disableBlockStreaming = sourceRepliesAreToolOnly ? true : resolveWhatsAppDisableBlockStreaming(params.cfg);
@@ -3343,24 +3305,13 @@ async function processMessage(params) {
 		normalizeE164
 	});
 	const shouldCheckCommandAuth = shouldComputeCommandAuthorized(commandBody, params.cfg);
-	const isTextCommand = isControlCommandMessage$1(commandBody, params.cfg);
+	const isTextCommand = isControlCommandMessage(commandBody, params.cfg);
 	const commandAuthorized = shouldCheckCommandAuth ? await resolveWhatsAppCommandAuthorized({
 		cfg: params.cfg,
 		msg: params.msg,
 		policy: inboundPolicy,
 		authDir: account.authDir
 	}) : void 0;
-	const commandTurn = isTextCommand ? {
-		kind: "text-slash",
-		source: "text",
-		authorized: Boolean(commandAuthorized),
-		body: commandBody
-	} : {
-		kind: "normal",
-		source: "message",
-		authorized: false,
-		body: commandBody
-	};
 	const { onModelSelected, ...replyPipeline } = createChannelMessageReplyPipeline({
 		cfg: params.cfg,
 		agentId: params.route.agentId,
@@ -3384,9 +3335,11 @@ async function processMessage(params) {
 	const ctxPayload = await buildWhatsAppInboundContext({
 		bodyForAgent: msgForAgent.payload.body,
 		combinedBody,
-		commandBody,
-		commandAuthorized,
-		commandTurn,
+		command: {
+			kind: isTextCommand ? "text-slash" : "normal",
+			body: commandBody,
+			authorized: commandAuthorized
+		},
 		groupHistory: visibleGroupHistory,
 		groupMemberRoster: params.groupMemberNames.get(params.groupHistoryKey),
 		groupSystemPrompt: conversationSystemPrompt,
@@ -3930,10 +3883,12 @@ async function monitorWebChannel(verbose, listenerFactory = attachWebInboxToSock
 			});
 			const shouldDebounce = (msg) => {
 				const normalized = normalizeWebInboundMessage(msg);
-				if (normalized.payload.media?.path || normalized.payload.media?.type) return false;
-				if (normalized.payload.location) return false;
-				if (normalized.quote?.id || normalized.quote?.body) return false;
-				return !isControlCommandMessage(normalized.payload.commandBody ?? normalized.payload.body, cfg);
+				return shouldDebounceTextInbound({
+					text: normalized.payload.commandBody ?? normalized.payload.body,
+					cfg,
+					hasMedia: Boolean(normalized.payload.media?.path || normalized.payload.media?.type),
+					allowDebounce: !(normalized.payload.location || normalized.quote?.id || normalized.quote?.body)
+				});
 			};
 			let connection;
 			try {

package/dist/runtime-api.js

@@ -10,7 +10,7 @@ import { _ as extractLocationData, b as extractText, m as extractContactContext,
 import { n as newConnectionId, r as waitForWaConnection, t as createWaSocket } from "./session-mxWFn0eS.js";
 import { n as getStatusCode, t as formatError } from "./session-errors-JuazczrA.js";
 import { n as resolveWebAccountId, t as getActiveWebListener } from "./active-listener-5kHap439.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-BKtA0lzq.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-BZ8QvCeV.js";
 import { t as loginWeb } from "./login-DGIoToX8.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-core-BXDFGqky.js → setup-core-3aSOoK2T.js}

@@ -84,10 +84,10 @@ async function applyWhatsAppSecurityConfigFixes(params) {
 //#region extensions/whatsapp/src/shared.ts
 const WHATSAPP_CHANNEL = "whatsapp";
 async function loadWhatsAppChannelRuntime() {
-	return await import("./channel.runtime-BPrKzcYd.js");
+	return await import("./channel.runtime-BDDy4Lhz.js");
 }
 async function loadWhatsAppSetupSurface() {
-	return await import("./setup-surface-5EUmMLHS.js");
+	return await import("./setup-surface-CiKGdNJv.js");
 }
 const whatsappSetupWizardProxy = createWhatsAppSetupWizardProxy(async () => (await loadWhatsAppSetupSurface()).whatsappSetupWizard);
 const whatsappConfigAdapter = createScopedChannelConfigAdapter({

package/dist/{setup-finalize-DzOHXnPj.js → setup-finalize-DBf1jjBj.js}

@@ -2,7 +2,7 @@ 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-CKOFMPf-.js";
 import { a as normalizeWhatsAppAllowFromEntries, o as normalizeWhatsAppAllowFromEntry } from "./normalize-target-DSZnHkKF.js";
-import { t as whatsappSetupAdapter } from "./setup-core-BXDFGqky.js";
+import { t as whatsappSetupAdapter } from "./setup-core-3aSOoK2T.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

package/dist/setup-plugin-api.js

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

package/dist/{setup-surface-5EUmMLHS.js → setup-surface-CiKGdNJv.js}

@@ -36,7 +36,7 @@ const whatsappSetupWizard = {
 	},
 	resolveShouldPromptAccountIds: ({ shouldPromptAccountIds }) => shouldPromptAccountIds,
 	credentials: [],
-	finalize: async (params) => await (await import("./setup-finalize-DzOHXnPj.js")).finalizeWhatsAppSetup(params),
+	finalize: async (params) => await (await import("./setup-finalize-DBf1jjBj.js")).finalizeWhatsAppSetup(params),
 	disable: (cfg) => setSetupChannelEnabled(cfg, channel, false),
 	onAccountRecorded: (accountId, options) => {
 		options?.onAccountId?.(channel, accountId);

package/dist/{state-migrations-D_BmQUR9.js → state-migrations-CAMTrs2U.js}

@@ -1,15 +1,8 @@
 import fs from "node:fs";
 import path from "node:path";
-import { statRegularFileSync } from "openclaw/plugin-sdk/security-runtime";
+import { fileExists } from "openclaw/plugin-sdk/security-runtime";
 import { DEFAULT_ACCOUNT_ID } from "openclaw/plugin-sdk/account-id";
 //#region extensions/whatsapp/src/state-migrations.ts
-function fileExists(pathValue) {
-	try {
-		return !statRegularFileSync(pathValue).missing;
-	} catch {
-		return false;
-	}
-}
 function isLegacyWhatsAppAuthFile(name) {
 	if (name === "creds.json" || name === "creds.json.bak") return true;
 	if (!name.endsWith(".json")) return false;

package/npm-shrinkwrap.json

@@ -1,19 +1,19 @@
 {
   "name": "@openclaw/whatsapp",
-  "version": "2026.7.2-beta.1",
+  "version": "2026.7.2-beta.2",
   "lockfileVersion": 3,
   "requires": true,
   "packages": {
     "": {
       "name": "@openclaw/whatsapp",
-      "version": "2026.7.2-beta.1",
+      "version": "2026.7.2-beta.2",
       "dependencies": {
         "audio-decode": "2.2.3",
         "baileys": "7.0.0-rc13",
         "typebox": "1.3.3"
       },
       "peerDependencies": {
-        "openclaw": ">=2026.7.2-beta.1"
+        "openclaw": ">=2026.7.2-beta.2"
       },
       "peerDependenciesMeta": {
         "openclaw": {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@openclaw/whatsapp",
-  "version": "2026.7.2-beta.1",
+  "version": "2026.7.2-beta.2",
   "description": "OpenClaw WhatsApp channel plugin for WhatsApp Web chats.",
   "repository": {
     "type": "git",
@@ -13,7 +13,7 @@
     "typebox": "1.3.3"
   },
   "peerDependencies": {
-    "openclaw": ">=2026.7.2-beta.1"
+    "openclaw": ">=2026.7.2-beta.2"
   },
   "peerDependenciesMeta": {
     "openclaw": {
@@ -56,10 +56,10 @@
       "minHostVersion": ">=2026.4.25"
     },
     "compat": {
-      "pluginApi": ">=2026.7.2-beta.1"
+      "pluginApi": ">=2026.7.2-beta.2"
     },
     "build": {
-      "openclawVersion": "2026.7.2-beta.1"
+      "openclawVersion": "2026.7.2-beta.2"
     },
     "release": {
       "publishToClawHub": true,

package/dist/constants.js

@@ -1,2 +0,0 @@
-import { t as DEFAULT_WEB_MEDIA_BYTES } from "./constants-HU41RHGI.js";
-export { DEFAULT_WEB_MEDIA_BYTES };

package/dist/targets.js

@@ -1,2 +0,0 @@
-import { c as normalizeWhatsAppTarget, r as isWhatsAppUserTarget, t as isWhatsAppGroupJid } from "./normalize-target-DSZnHkKF.js";
-export { isWhatsAppGroupJid, isWhatsAppUserTarget, normalizeWhatsAppTarget };