@openclaw/whatsapp 2026.7.1 → 2026.7.2-beta.2

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

@@ -1,53 +1,53 @@
-import { a as resolveWhatsAppAccount, s as resolveWhatsAppMediaMaxBytes } from "./accounts-4YgwroRU.js";
-import { a as normalizeWhatsAppOutboundPayload, c as prepareWhatsAppOutboundMedia, d as maybeResolveWhatsAppApprovalReaction, g as resolveWhatsAppReactionLevel, l as sendWhatsAppOutboundWithRetry, r as sendReactionWhatsApp, s as normalizeWhatsAppPayloadTextPreservingIndentation } from "./send-C5CpFcBG.js";
+import { a as resolveWhatsAppAccount, s as resolveWhatsAppMediaMaxBytes } from "./accounts-CKOFMPf-.js";
+import { a as normalizeWhatsAppOutboundPayload, c as prepareWhatsAppOutboundMedia, r as sendReactionWhatsApp, s as normalizeWhatsAppPayloadTextPreservingIndentation, u as resolveWhatsAppReactionLevel } from "./send-D9Ydnn4o.js";
 import { n as getWhatsAppRuntime } from "./runtime-BfAdAEYT.js";
-import { t as getRegisteredWhatsAppConnectionController } from "./connection-controller-registry-TSX_udJp.js";
-import { n as getStatusCode, t as formatError } from "./session-errors-BAj9D2La.js";
-import { a as resolveWhatsAppSocketTiming, i as resolveWhatsAppSocketOperationTimeoutMs, n as createWhatsAppSocketOperationTimeoutAdapter, o as withWhatsAppSocketOperationTimeout, r as isWhatsAppSocketOperationTimeoutError } from "./socket-timing-DhbVFjah.js";
-import { a as resolveEquivalentWhatsAppDirectChatJids, c as toWhatsappJidWithLid, i as markdownToWhatsApp, n as isSelfChatMode, o as resolveJidToE164, r as jidToE164, s as toWhatsappJid } from "./targets-runtime-C-GiVn6Y.js";
-import { n as normalizeE164, t as convertMarkdownTables$1 } from "./text-runtime-DdX6-mC_.js";
-import { a as cacheInboundMessageMeta, i as buildQuotedMessageOptions, n as resolveWhatsAppGroupSessionRoute, o as lookupInboundMessageMeta, r as resolveWhatsAppLegacyGroupSessionKey } from "./group-session-key-BhC1RQOE.js";
-import { g as readWebSelfId, o as getWebAuthAgeMs, r as WhatsAppAuthUnstableError, v as readWebSelfIdentityForDecision } from "./auth-store-Db-wfApd.js";
-import { a as getSelfIdentity, c as resolveComparableIdentity, i as getReplyContext, n as getMentionIdentities, o as getSenderIdentity, r as getPrimaryIdentityId, s as identitiesOverlap, t as getComparableIdentityValues } from "./identity-Dqft3mFA.js";
+import { n as getWhatsAppConnectionController } from "./connection-controller-runtime-context-CbTsqmPT.js";
+import { a as resolveEquivalentWhatsAppDirectChatJids, c as toWhatsappJidWithLid, i as markdownToWhatsApp, n as isSelfChatMode, o as resolveJidToE164, r as jidToE164, s as toWhatsappJid } from "./targets-runtime-Bsh0HR9y.js";
+import { n as normalizeE164, t as convertMarkdownTables$1 } from "./text-runtime-BTGkMN0o.js";
+import { a as cacheInboundMessageMeta, i as buildQuotedMessageOptions, n as resolveWhatsAppGroupSessionRoute, o as lookupInboundMessageMeta, r as resolveWhatsAppLegacyGroupSessionKey } from "./group-session-key-CLTZeH_F.js";
+import { g as readWebSelfId, o as getWebAuthAgeMs, r as WhatsAppAuthUnstableError, v as readWebSelfIdentityForDecision } from "./auth-store-BQi9pZqQ.js";
+import { a as getSelfIdentity, c as resolveComparableIdentity, i as getReplyContext, n as getMentionIdentities, o as getSenderIdentity, r as getPrimaryIdentityId, s as identitiesOverlap, t as getComparableIdentityValues } from "./identity-D7L8LCuH.js";
 import { n as resolveWhatsAppGroupsConfigPath } from "./group-config-path-BGyzT9Lg.js";
-import { c as requireWhatsAppInboundAdmission, i as resolveWhatsAppInboundPolicy, l as resolveWhatsAppGroupConversationId, o as buildDeprecatedFlatWhatsAppInboundAdmission, r as resolveWhatsAppCommandAuthorized, s as requireAdmittedWhatsAppInboundMessage, t as checkInboundAccessControl } from "./access-control-DYE5dXna.js";
-import { _ as extractLocationData, a as mayContainWhatsAppOutboundMention, b as extractText, c as DisconnectReason, d as normalizeMessageContent, f as resolveInboundMediaMimetype, g as extractExternalAdReplyContext, h as extractContextInfo, i as addWhatsAppOutboundMentionsToContent, l as downloadMediaMessage, m as extractContactContext, n as listWhatsAppSendResultMessageIds, o as resolveWhatsAppOutboundMentions, p as describeReplyContext, r as normalizeWhatsAppSendResult, s as addWhatsAppImagePreviewFields, t as createWebSendApi, u as isJidGroup, v as extractMediaPlaceholder, x as hasInboundUserContent, y as extractMentionedJids } from "./send-api-DLlXl8CH.js";
-import { r as waitForWaConnection, t as createWaSocket } from "./session-DriaHt7V.js";
-import { t as BufferJSON } from "./session.runtime-CyooSQvj.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-DkbrFSIn.js";
+import { c as requireWhatsAppInboundAdmission, i as resolveWhatsAppInboundPolicy, l as resolveWhatsAppGroupConversationId, o as buildDeprecatedFlatWhatsAppInboundAdmission, r as resolveWhatsAppCommandAuthorized, s as requireAdmittedWhatsAppInboundMessage, t as checkInboundAccessControl } from "./access-control-DazDX3RB.js";
+import { _ as extractLocationData, a as mayContainWhatsAppOutboundMention, b as extractText, c as DisconnectReason, d as normalizeMessageContent, f as resolveInboundMediaMimetype, g as extractExternalAdReplyContext, h as extractContextInfo, i as addWhatsAppOutboundMentionsToContent, l as downloadMediaMessage, m as extractContactContext, n as listWhatsAppSendResultMessageIds, o as resolveWhatsAppOutboundMentions, p as describeReplyContext, r as normalizeWhatsAppSendResult, s as addWhatsAppImagePreviewFields, t as createWebSendApi, u as isJidGroup, v as extractMediaPlaceholder, x as hasInboundUserContent, y as extractMentionedJids } from "./send-api-W33lI2nR.js";
+import { a as createWhatsAppSocketOperationTimeoutAdapter, c as resolveWhatsAppSocketTiming, l as withWhatsAppSocketOperationTimeout, o as isWhatsAppSocketOperationTimeoutError, r as waitForWaConnection, s as resolveWhatsAppSocketOperationTimeoutMs, t as createWaSocket } from "./session-mxWFn0eS.js";
+import { n as getStatusCode, t as formatError } from "./session-errors-JuazczrA.js";
+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 { createChannelMessageReplyPipeline, createDurableInboundReceiveJournalFromQueue, createMessageReceiptFromOutboundResults, deliverInboundReplyWithMessageSendContext, resolveChannelMessageSourceReplyDeliveryMode } from "openclaw/plugin-sdk/channel-outbound";
+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";
+import { collectErrorGraphCandidates, formatErrorMessage } from "openclaw/plugin-sdk/error-runtime";
 import { getChildLogger } from "openclaw/plugin-sdk/logging-core";
 import { resolveMarkdownTableMode as resolveMarkdownTableMode$1 } from "openclaw/plugin-sdk/markdown-table-runtime";
 import { createSubsystemLogger, defaultRuntime, formatDurationPrecise, getChildLogger as getChildLogger$1, logVerbose, logVerbose as logVerbose$1, registerUnhandledRejectionHandler, shouldLogVerbose, shouldLogVerbose as shouldLogVerbose$1, warn } from "openclaw/plugin-sdk/runtime-env";
-import { createLazyRuntimeModule } from "openclaw/plugin-sdk/lazy-runtime";
+import { registerChannelRuntimeContext } from "openclaw/plugin-sdk/channel-runtime-context";
+import { createChannelMessageReplyPipeline, createDurableInboundReceiveJournalFromQueue, createMessageReceiptFromOutboundResults, deliverInboundReplyWithMessageSendContext, resolveChannelMessageSourceReplyDeliveryMode, resolveChannelStreamingBlockEnabled } from "openclaw/plugin-sdk/channel-outbound";
 import { getAgentScopedMediaLocalRoots } from "openclaw/plugin-sdk/media-runtime";
-import { asDateTimestampMs, parseStrictFiniteNumber, resolveExpiresAtMsFromDurationMs } from "openclaw/plugin-sdk/number-runtime";
+import { isReasoningReplyPayload, resolveSendableOutboundReplyParts, sendMediaWithLeadingCaption } from "openclaw/plugin-sdk/reply-payload";
 import { truncateUtf16Safe } from "openclaw/plugin-sdk/text-utility-runtime";
 import { LocalMediaAccessError, getDefaultLocalRoots, loadWebMedia as loadWebMedia$1, loadWebMediaRaw, optimizeImageToJpeg, optimizeImageToPng } from "openclaw/plugin-sdk/web-media";
+import { createLazyRuntimeModule } from "openclaw/plugin-sdk/lazy-runtime";
 import { chunkMarkdownTextWithMode } from "openclaw/plugin-sdk/reply-chunking";
-import { isReasoningReplyPayload, resolveSendableOutboundReplyParts, sendMediaWithLeadingCaption } from "openclaw/plugin-sdk/reply-payload";
 import { DEFAULT_ACCOUNT_ID as DEFAULT_ACCOUNT_ID$1, DEFAULT_MAIN_KEY, buildAgentMainSessionKey, buildAgentSessionKey, buildGroupHistoryKey, deriveLastRoutePolicy, normalizeAccountId as normalizeAccountId$1, normalizeAgentId, resolveAgentRoute, resolveInboundLastRouteSessionKey } from "openclaw/plugin-sdk/routing";
+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 { saveMediaStream } from "openclaw/plugin-sdk/media-store";
+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 { registerChannelRuntimeContext } from "openclaw/plugin-sdk/channel-runtime-context";
-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 { createClaimableDedupe } from "openclaw/plugin-sdk/persistent-dedupe";
-import { collectErrorGraphCandidates, formatErrorMessage } from "openclaw/plugin-sdk/error-runtime";
+import { createDedupeCache } from "openclaw/plugin-sdk/dedupe-runtime";
+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";
 import { buildMentionRegexes, implicitMentionKindWhen, normalizeMentionText, resolveInboundMentionDecision } from "openclaw/plugin-sdk/channel-mention-gating";
@@ -55,60 +55,27 @@ 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 { 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 = createRecentMessageCache({
+const recentOutboundMessages = createDedupeCache({
 	ttlMs: RECENT_OUTBOUND_MESSAGE_TTL_MS,
 	maxSize: RECENT_OUTBOUND_MESSAGE_MAX
 });
-function createRecentMessageCache(options) {
-	const ttlMs = Math.max(0, options.ttlMs);
-	const maxSize = Math.max(0, Math.floor(options.maxSize));
-	const cache = /* @__PURE__ */ new Map();
-	const prune = (now) => {
-		if (ttlMs > 0) {
-			const cutoff = now - ttlMs;
-			for (const [key, timestamp] of cache) if (timestamp < cutoff) cache.delete(key);
-		}
-		while (cache.size > maxSize) {
-			const oldest = cache.keys().next().value;
-			if (!oldest) break;
-			cache.delete(oldest);
-		}
-	};
-	const peek = (key, now = Date.now()) => {
-		if (!key) return false;
-		const timestamp = cache.get(key);
-		if (timestamp === void 0) return false;
-		if (ttlMs > 0 && now - timestamp >= ttlMs) {
-			cache.delete(key);
-			return false;
-		}
-		return true;
-	};
-	return {
-		check: (key, now = Date.now()) => {
-			if (!key) return false;
-			const existed = peek(key, now);
-			cache.delete(key);
-			cache.set(key, now);
-			prune(now);
-			return existed;
-		},
-		peek,
-		clear: () => cache.clear()
-	};
-}
 var WhatsAppRetryableInboundError = class extends Error {
 	constructor(message, options) {
 		super(message, options);
@@ -123,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;
@@ -570,12 +528,13 @@ async function downloadQuotedInboundMedia(msg, sock, maxBytes = 50 * 1024 * 1024
 }
 //#endregion
 //#region extensions/whatsapp/src/inbound/monitor.ts
-const LOGGED_OUT_STATUS = DisconnectReason?.loggedOut ?? 401;
+const LOGGED_OUT_STATUS = DisconnectReason.loggedOut;
 const RECONNECT_IN_PROGRESS_ERROR = "no active socket - reconnection in progress";
 const GROUP_META_TTL_MS = 300 * 1e3;
 const BAILEYS_MESSAGE_TTL_MS = 600 * 1e3;
 const INBOUND_CLOSE_DRAIN_TIMEOUT_MS = 5e3;
 const REPLY_SESSION_INIT_CONFLICT_MESSAGE_RE = /reply session initialization conflicted for \S+/u;
+const WHATSAPP_GROUP_METADATA_CACHE_MAX_ENTRIES = 500;
 function resolveRetryableWhatsAppInboundError(error) {
 	if (error instanceof WhatsAppRetryableInboundError) return error;
 	if (!collectErrorGraphCandidates(error, (current) => [current.cause, current.error]).some((candidate) => REPLY_SESSION_INIT_CONFLICT_MESSAGE_RE.test(formatErrorMessage(candidate)))) return null;
@@ -598,7 +557,7 @@ function rememberGroupMetadataCacheEntry(cache, jid, entry) {
 	}
 	if (cache.has(jid)) cache.delete(jid);
 	cache.set(jid, entry);
-	while (cache.size > 500) {
+	while (cache.size > WHATSAPP_GROUP_METADATA_CACHE_MAX_ENTRIES) {
 		const oldest = cache.keys().next();
 		if (oldest.done) break;
 		cache.delete(oldest.value);
@@ -624,7 +583,7 @@ function rememberWhatsAppBaileysCacheEntry(cache, key, value, ttlMs) {
 		expiresAt: Date.now() + ttlMs,
 		value
 	});
-	while (cache.size > 500) {
+	while (cache.size > WHATSAPP_GROUP_METADATA_CACHE_MAX_ENTRIES) {
 		const oldest = cache.keys().next();
 		if (oldest.done) break;
 		cache.delete(oldest.value);
@@ -645,9 +604,6 @@ function logWhatsAppVerbose(enabled, message) {
 	if (!enabled) return;
 	defaultRuntime.log(message);
 }
-function isGroupJid(jid) {
-	return (typeof isJidGroup === "function" ? isJidGroup(jid) : jid.endsWith("@g.us")) === true;
-}
 function isDirectUserJid(jid) {
 	return /^(\d+)(?::\d+)?@(s\.whatsapp\.net|c\.us|lid|hosted|hosted\.lid)$/i.test(jid.trim());
 }
@@ -711,7 +667,7 @@ async function attachWebInboxToSocket(options) {
 		if (!options.socketRef) return sock;
 		if (options.socketRef.current) return options.socketRef.current;
 		if (!self.e164 && !self.jid && !self.lid) return null;
-		const successor = getRegisteredWhatsAppConnectionController(options.accountId);
+		const successor = getWhatsAppConnectionController(options.accountId);
 		if (!successor) return null;
 		const successorIdentity = successor.getSelfIdentity();
 		if (!successorIdentity || !identitiesOverlap(self, successorIdentity)) return null;
@@ -740,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({
@@ -988,7 +944,7 @@ async function attachWebInboxToSocket(options) {
 		}
 	};
 	const resolveOutboundMentionsForGroup = async (jid, text) => {
-		if (!isGroupJid(jid) || !mayContainWhatsAppOutboundMention(text)) return {
+		if (isJidGroup(jid) !== true || !mayContainWhatsAppOutboundMention(text)) return {
 			text,
 			mentionedJids: []
 		};
@@ -1021,7 +977,7 @@ async function attachWebInboxToSocket(options) {
 		const remoteJid = msg.key?.remoteJid;
 		if (!remoteJid) return null;
 		if (remoteJid.endsWith("@status") || remoteJid.endsWith("@broadcast")) return null;
-		const group = isGroupJid(remoteJid);
+		const group = isJidGroup(remoteJid) === true;
 		if (Boolean(msg.key?.fromMe) && id && isRecentOutboundMessage({
 			accountId: options.accountId,
 			remoteJid,
@@ -1162,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);
 			}
@@ -1174,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 () => {
@@ -1339,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
@@ -1770,7 +1727,7 @@ function createEchoTracker(params) {
 			sessionKey: opts.combinedBodySessionKey,
 			combinedBody: opts.combinedBody
 		}));
-		if (opts.logVerboseMessage) params.logVerbose?.(`Added to echo detection set (size now: ${recentlySent.size}): ${text.slice(0, 50)}...`);
+		if (opts.logVerboseMessage) params.logVerbose?.(`Added to echo detection set (size now: ${recentlySent.size}): ${truncateUtf16Safe(text, 50)}...`);
 		trim();
 	};
 	return {
@@ -1831,19 +1788,20 @@ async function resolveGroupActivationFor(params) {
 		sessionKey: params.sessionKey
 	});
 	const activation = (normalizeAccountId$1(params.accountId) === DEFAULT_ACCOUNT_ID$1 && hasNamedWhatsAppAccounts(params.cfg) && isActivationOnlyEntry(scopedEntry) ? void 0 : scopedEntry?.groupActivation) ?? legacyEntry?.groupActivation;
-	if (activation !== void 0 && scopedEntry?.groupActivation === void 0) await patchSessionEntry({
-		...sessionScope,
-		sessionKey: params.sessionKey,
-		fallbackEntry: {},
-		replaceEntry: true,
-		update: (entry) => {
-			if (entry.groupActivation !== void 0) return null;
-			return {
-				...entry,
-				groupActivation: activation
-			};
-		}
-	});
+	if (activation !== void 0 && scopedEntry?.groupActivation === void 0) {
+		if (scopedEntry) await patchSessionEntry({
+			...sessionScope,
+			sessionKey: params.sessionKey,
+			replaceEntry: true,
+			update: (entry) => {
+				if (entry.groupActivation !== void 0) return null;
+				return {
+					...entry,
+					groupActivation: activation
+				};
+			}
+		});
+	}
 	const defaultActivation = !resolveWhatsAppInboundPolicy({
 		cfg: params.cfg,
 		accountId: params.accountId
@@ -2043,17 +2001,12 @@ function formatGroupMembers(params) {
 }
 //#endregion
 //#region extensions/whatsapp/src/auto-reply/monitor/group-gating.ts
-const MAX_GROUP_DROP_WARNINGS = 100;
-const groupDropWarned = /* @__PURE__ */ new Set();
+const groupDropWarned = createDedupeCache({
+	ttlMs: 0,
+	maxSize: 100
+});
 function shouldWarnForGroupDrop(warnKey) {
-	if (groupDropWarned.has(warnKey)) return false;
-	groupDropWarned.add(warnKey);
-	while (groupDropWarned.size > MAX_GROUP_DROP_WARNINGS) {
-		const oldest = groupDropWarned.values().next().value;
-		if (!oldest) break;
-		groupDropWarned.delete(oldest);
-	}
-	return true;
+	return !groupDropWarned.check(warnKey);
 }
 function isOwnerSender(baseMentionConfig, msg, authDir) {
 	const sender = normalizeE164(getSenderIdentity(msg, authDir).e164 ?? "");
@@ -2250,6 +2203,57 @@ function resolveWhatsAppDirectSystemPrompt(params) {
 	return wildcard != null ? wildcard.trim() || void 0 : void 0;
 }
 //#endregion
+//#region extensions/whatsapp/src/outbound-retry.ts
+const WHATSAPP_OUTBOUND_MAX_ATTEMPTS = 3;
+const WHATSAPP_OUTBOUND_MIN_DELAY_MS = 500;
+const WHATSAPP_OUTBOUND_MAX_DELAY_MS = 1e3;
+const WHATSAPP_RETRYABLE_OUTBOUND_ERROR_PATTERN = /closed|reset|timed\s*out|disconnect/i;
+var WhatsAppOutboundRetryError = class extends Error {
+	constructor(original) {
+		super(formatError(original), { cause: original });
+		this.original = original;
+	}
+};
+function isRetryableWhatsAppOutboundError(error) {
+	if (isWhatsAppSocketOperationTimeoutError(error)) return false;
+	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 runWithRetry(async () => {
+			try {
+				return await params.send();
+			} catch (error) {
+				throw new WhatsAppOutboundRetryError(error);
+			}
+		});
+	} catch (error) {
+		if (error instanceof WhatsAppOutboundRetryError) throw error.original;
+		throw error;
+	}
+}
+//#endregion
 //#region extensions/whatsapp/src/auto-reply/util.ts
 function elide(text, limit = 400) {
 	if (!text) return text;
@@ -2369,11 +2373,10 @@ async function deliverWebReply(params) {
 			messageText: cached?.body ?? ""
 		});
 	};
-	const sendWithRetry = async (fn, label, maxAttempts = 3) => {
+	const sendWithRetry = async (fn, label) => {
 		try {
 			return await sendWhatsAppOutboundWithRetry({
 				send: fn,
-				maxAttempts,
 				onRetry: ({ attempt, maxAttempts: retryMaxAttempts, backoffMs, errorText }) => {
 					logVerbose(`Retrying ${label} to ${conversationId} after failure (${attempt}/${retryMaxAttempts - 1}) in ${backoffMs}ms: ${errorText}`);
 				}
@@ -2575,8 +2578,8 @@ function resolveWhatsAppDurableReplyToId(params) {
 	return null;
 }
 function resolveWhatsAppDisableBlockStreaming(cfg) {
-	if (typeof cfg.channels?.whatsapp?.blockStreaming !== "boolean") return;
-	return !cfg.channels.whatsapp.blockStreaming;
+	const enabled = resolveChannelStreamingBlockEnabled(cfg.channels?.whatsapp);
+	return typeof enabled === "boolean" ? !enabled : void 0;
 }
 function resolveWhatsAppDeliverablePayload(payload, info) {
 	if (payload.isReasoning === true || payload.isCompactionNotice === true) return null;
@@ -2659,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,
@@ -2696,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: {
@@ -2704,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,
@@ -2716,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;
@@ -2798,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);
@@ -3340,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,
@@ -3381,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,
@@ -3811,9 +3767,8 @@ function resolveWebMonitorConfigSnapshot(params) {
 					groupAllowFrom: account.groupAllowFrom,
 					groupPolicy: account.groupPolicy,
 					textChunkLimit: account.textChunkLimit,
-					chunkMode: account.chunkMode,
+					streaming: account.streaming,
 					mediaMaxMb: account.mediaMaxMb,
-					blockStreaming: account.blockStreaming,
 					groups: account.groups
 				}
 			}
@@ -3928,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/normalize-C-Z16y7Q.js

@@ -0,0 +1,2 @@
+import "./normalize-target-DSZnHkKF.js";
+export {};

package/dist/{normalize-target-bVWjgftN.js → normalize-target-DSZnHkKF.js}

@@ -1,4 +1,4 @@
-import { normalizeLowercaseStringOrEmpty } from "openclaw/plugin-sdk/string-coerce-runtime";
+import { normalizeLowercaseStringOrEmpty, normalizeStringEntries, uniqueStrings } from "openclaw/plugin-sdk/string-coerce-runtime";
 import { normalizeE164 } from "openclaw/plugin-sdk/account-resolution";
 //#region extensions/whatsapp/src/normalize-target.ts
 const WHATSAPP_USER_JID_RE = /^(\d+)(?::\d+)?@s\.whatsapp\.net$/i;
@@ -34,11 +34,20 @@ function isWhatsAppUserTarget(value) {
 }
 function extractUserJidPhone(jid) {
 	const userMatch = jid.match(WHATSAPP_USER_JID_RE);
-	if (userMatch) return userMatch[1];
+	if (userMatch) {
+		const phone = userMatch[1];
+		return phone ? phone : null;
+	}
 	const legacyUserMatch = jid.match(WHATSAPP_LEGACY_USER_JID_RE);
-	if (legacyUserMatch) return legacyUserMatch[1];
+	if (legacyUserMatch) {
+		const phone = legacyUserMatch[1];
+		return phone ? phone : null;
+	}
 	const lidMatch = jid.match(WHATSAPP_LID_RE);
-	if (lidMatch) return lidMatch[1];
+	if (lidMatch) {
+		const phone = lidMatch[1];
+		return phone ? phone : null;
+	}
 	return null;
 }
 function normalizeWhatsAppTarget(value) {
@@ -67,12 +76,7 @@ function normalizeWhatsAppMessagingTarget(raw) {
 	return normalizeWhatsAppTarget(trimmed) ?? void 0;
 }
 function normalizeWhatsAppAllowFromEntries(allowFrom) {
-	const seen = /* @__PURE__ */ new Set();
-	return allowFrom.map((entry) => String(entry).trim()).filter((entry) => Boolean(entry)).map(normalizeWhatsAppAllowFromEntry).filter((entry) => Boolean(entry)).filter((entry) => {
-		if (seen.has(entry)) return false;
-		seen.add(entry);
-		return true;
-	});
+	return uniqueStrings(normalizeStringEntries(allowFrom).map(normalizeWhatsAppAllowFromEntry).filter((entry) => Boolean(entry)));
 }
 function normalizeWhatsAppAllowFromEntry(entry) {
 	if (entry === "*") return entry;