@openclaw/whatsapp 2026.10.2 → 2026.10.5-beta.2

package/dist/.setup/{normalize-target-BGra1ZnM.mjs → normalize-target-D67Kc3g6.mjs}

@@ -1,4 +1,4 @@
-import { normalizeLowercaseStringOrEmpty, uniqueStrings } from "openclaw/plugin-sdk/string-coerce-runtime";
+import { uniqueStrings } from "openclaw/plugin-sdk/string-coerce-runtime";
 import { normalizeE164 } from "openclaw/plugin-sdk/account-resolution";
 import { formatNormalizedAllowFromEntries } from "openclaw/plugin-sdk/allow-from";
 //#region extensions/whatsapp/src/normalize-target.ts
@@ -15,15 +15,12 @@ function stripWhatsAppTargetPrefixes(value) {
 		if (candidate === before) return candidate;
 	}
 }
-function normalizeWhatsAppGroupJid(value) {
-	const candidate = stripWhatsAppTargetPrefixes(value).replace(/^group:/i, "").trim();
-	if (!normalizeLowercaseStringOrEmpty(candidate).endsWith("@g.us")) return null;
-	const localPart = candidate.slice(0, candidate.length - 5);
-	if (!localPart || localPart.includes("@")) return null;
-	return /^[0-9]+(-[0-9]+)*$/.test(localPart) ? `${localPart}@g.us` : null;
+function normalizeWhatsAppGroupJid(candidate) {
+	const match = /^(\d+(?:-\d+)*)@g\.us$/i.exec(candidate.replace(/^group:/i, "").trim());
+	return match ? `${match[1]}@g.us` : null;
 }
 function isWhatsAppGroupJid(value) {
-	return normalizeWhatsAppGroupJid(value) !== null;
+	return normalizeWhatsAppGroupJid(stripWhatsAppTargetPrefixes(value)) !== null;
 }
 function isWhatsAppNewsletterJid(value) {
 	const candidate = stripWhatsAppTargetPrefixes(value);

package/dist/.setup/{question-reactions-LMeijbaq.mjs → question-reactions-DywNaX8m.mjs}

@@ -1,6 +1,7 @@
 import { t as __exportAll } from "./rolldown-runtime-BBjsoOtd.mjs";
 import { a as resolveWhatsAppAccount } from "./accounts-F0vHuze2.mjs";
-import { d as listWhatsAppDeliveredMessageIdentities } from "./send-CGUsUdoX.mjs";
+import { u as listWhatsAppDeliveredMessageIdentities } from "./send-CLBfAzd6.mjs";
+import { t as buildWhatsAppReactionTargetKey } from "./reaction-target-CSPO7gtu.mjs";
 import { normalizeUniqueTrimmedStringList } from "openclaw/plugin-sdk/string-coerce-runtime";
 import { createQuestionReactionTargetStore, questionGatewayRuntime } from "openclaw/plugin-sdk/question-gateway-runtime";
 //#region extensions/whatsapp/src/question-reactions.ts
@@ -8,18 +9,10 @@ var question_reactions_exports = /* @__PURE__ */ __exportAll({
 	maybeResolveWhatsAppQuestionReaction: () => maybeResolveWhatsAppQuestionReaction,
 	registerWhatsAppQuestionReactionTargetForDeliveredPayload: () => registerWhatsAppQuestionReactionTargetForDeliveredPayload
 });
-function buildKey(identity) {
-	const parts = [
-		identity.accountId,
-		identity.remoteJid,
-		identity.messageId
-	].map((part) => part.trim());
-	return parts.every(Boolean) ? parts.join(":") : void 0;
-}
 const questionReactionTargets = createQuestionReactionTargetStore({
 	channel: "whatsapp",
 	channelDisplayName: "WhatsApp",
-	buildKey,
+	buildKey: buildWhatsAppReactionTargetKey,
 	registerChannelDelivery: questionGatewayRuntime.registerChannelDelivery,
 	resolveReaction: questionGatewayRuntime.resolveReaction
 });

package/dist/.setup/reaction-target-CSPO7gtu.mjs

@@ -0,0 +1,11 @@
+//#region extensions/whatsapp/src/reaction-target.ts
+function buildWhatsAppReactionTargetKey(identity) {
+	const parts = [
+		identity.accountId,
+		identity.remoteJid,
+		identity.messageId
+	].map((part) => part.trim());
+	return parts.every(Boolean) ? parts.join(":") : void 0;
+}
+//#endregion
+export { buildWhatsAppReactionTargetKey as t };

package/dist/.setup/{resolve-outbound-target-CzyNKmrl.mjs → resolve-outbound-target-qikGL4r0.mjs}

@@ -1,15 +1,14 @@
-import { c as normalizeWhatsAppTarget, n as isWhatsAppNewsletterJid, t as isWhatsAppGroupJid } from "./normalize-target-BGra1ZnM.mjs";
+import { c as normalizeWhatsAppTarget } from "./normalize-target-D67Kc3g6.mjs";
 import { normalizeStringEntries } from "openclaw/plugin-sdk/string-coerce-runtime";
 import { missingTargetError } from "openclaw/plugin-sdk/channel-feedback";
 //#region extensions/whatsapp/src/resolve-outbound-target.ts
 function resolveWhatsAppOutboundTarget(params) {
-	const trimmed = params.to?.trim() ?? "";
-	const normalizedTo = normalizeWhatsAppTarget(trimmed);
+	const normalizedTo = normalizeWhatsAppTarget(params.to ?? "");
 	if (!normalizedTo) return {
 		ok: false,
 		error: missingTargetError("WhatsApp", "<E.164|group JID|newsletter JID>")
 	};
-	if (isWhatsAppGroupJid(normalizedTo) || isWhatsAppNewsletterJid(normalizedTo)) return {
+	if (normalizedTo.endsWith("@g.us") || normalizedTo.endsWith("@newsletter")) return {
 		ok: true,
 		to: normalizedTo
 	};

package/dist/.setup/{send-CGUsUdoX.mjs → send-CLBfAzd6.mjs}

@@ -1,8 +1,8 @@
 import { a as resolveWhatsAppAccount, c as resolveMergedWhatsAppAccountConfig, s as resolveWhatsAppMediaMaxBytes } from "./accounts-F0vHuze2.mjs";
 import { r as resolveDefaultWhatsAppAccountId } from "./account-ids-CB5SOWjc.mjs";
-import { n as isWhatsAppNewsletterJid } from "./normalize-target-BGra1ZnM.mjs";
+import { n as isWhatsAppNewsletterJid } from "./normalize-target-D67Kc3g6.mjs";
 import { r as getWhatsAppConnectionController } from "./connection-controller-runtime-context-hgLJoRc8.mjs";
-import { a as markdownToWhatsAppChunks, c as toWhatsappJid } from "./targets-runtime-Dls-Xh4F.mjs";
+import { a as markdownToWhatsAppChunks, c as toWhatsappJid } from "./targets-runtime-D5ryyPxh.mjs";
 import path from "node:path";
 import { normalizeStringEntries, normalizeUniqueStringEntries, uniqueStrings } from "openclaw/plugin-sdk/string-coerce-runtime";
 import { resolveReactionLevel } from "openclaw/plugin-sdk/status-helpers";
@@ -210,26 +210,34 @@ function rememberWhatsAppAcceptedSend(params) {
 	}
 	return accepted;
 }
-/** Nested owners already attempted activity accounting before exposing accepted delivery. */
-function rememberWhatsAppPartialSend(params) {
-	if (!isChannelPartialDeliveryError(params.error)) return false;
-	const delivery = params.error.deliveryResult;
-	const messageIds = uniqueStrings([...delivery.receipt ? listMessageReceiptPlatformIds(delivery.receipt) : [], ...normalizeStringEntries(delivery.messageIds ?? [])]).filter((messageId) => messageId !== "unknown");
-	const existingIds = new Set(params.results.flatMap(listWhatsAppSendResultMessageIds));
-	const acceptedIds = messageIds.filter((messageId) => !existingIds.has(messageId));
+function appendUnrecordedPartialReceipt(params) {
+	const receipt = params.delivery?.receipt;
+	const receiptIds = receipt ? listMessageReceiptPlatformIds(receipt) : [];
+	const acceptedIds = uniqueStrings([...receiptIds, ...normalizeStringEntries(params.delivery?.messageIds ?? [])]).filter((id) => id !== "unknown" && !params.recordedIds.has(id));
 	const messageId = acceptedIds[0];
-	if (!messageId) return false;
-	const receiptSources = [];
-	if (delivery.receipt) receiptSources.push({
+	if (receipt && messageId) params.sources.push({
 		channel: "whatsapp",
 		messageId,
-		receipt: delivery.receipt
+		receipt
 	});
-	const receiptIds = new Set(delivery.receipt ? listMessageReceiptPlatformIds(delivery.receipt) : []);
-	for (const acceptedId of acceptedIds) if (!receiptIds.has(acceptedId)) receiptSources.push({
+	const includedIds = new Set(receiptIds);
+	for (const acceptedId of acceptedIds) if (!includedIds.has(acceptedId)) params.sources.push({
 		channel: "whatsapp",
 		messageId: acceptedId
 	});
+	return acceptedIds;
+}
+/** Nested owners already attempted activity accounting before exposing accepted delivery. */
+function rememberWhatsAppPartialSend(params) {
+	if (!isChannelPartialDeliveryError(params.error)) return false;
+	const receiptSources = [];
+	const acceptedIds = appendUnrecordedPartialReceipt({
+		delivery: params.error.deliveryResult,
+		recordedIds: new Set(params.results.flatMap(listWhatsAppSendResultMessageIds)),
+		sources: receiptSources
+	});
+	const messageId = acceptedIds[0];
+	if (!messageId) return false;
 	const receipt = createMessageReceiptFromOutboundResults({
 		kind: resolveWhatsAppReceiptKind(params.kind),
 		results: receiptSources
@@ -260,19 +268,10 @@ function mergeWhatsAppAcceptedSendError(params) {
 		});
 		for (const messageId of resultIds) recordedIds.add(messageId);
 	}
-	const unrecordedNestedIds = uniqueStrings([...nested?.receipt ? listMessageReceiptPlatformIds(nested.receipt) : [], ...normalizeStringEntries(nested?.messageIds ?? [])]).filter((messageId) => messageId !== "unknown").filter((messageId) => !recordedIds.has(messageId));
-	const nestedMessageId = unrecordedNestedIds[0];
-	if (nested?.receipt && nestedMessageId) {
-		receiptSources.push({
-			channel: "whatsapp",
-			messageId: nestedMessageId,
-			receipt: nested.receipt
-		});
-		for (const messageId of listMessageReceiptPlatformIds(nested.receipt)) recordedIds.add(messageId);
-	}
-	for (const messageId of unrecordedNestedIds) if (!recordedIds.has(messageId)) receiptSources.push({
-		channel: "whatsapp",
-		messageId
+	appendUnrecordedPartialReceipt({
+		delivery: nested,
+		recordedIds,
+		sources: receiptSources
 	});
 	const receipt = enrichWhatsAppDeliveryReceipt({
 		receipt: createMessageReceiptFromOutboundResults({
@@ -357,35 +356,28 @@ function inferWhatsAppMediaKind(media, resolvedContentType) {
 	const inferredKind = mediaKindFromMime(normalizeMimeType(resolvedContentType));
 	return !inferredKind || inferredKind === "sticker" || inferredKind === "unknown" ? "document" : inferredKind;
 }
-function normalizeWhatsAppLoadedMedia(media, mediaUrl) {
+async function prepareWhatsAppOutboundMedia(media, mediaUrl) {
 	const filenameMimeType = mimeTypeFromFilePath(media.fileName);
 	const normalizedContentType = normalizeMimeType(media.contentType);
 	const resolvedContentType = !normalizedContentType || normalizedContentType === "application/octet-stream" ? filenameMimeType ?? normalizedContentType : normalizedContentType;
 	const kind = inferWhatsAppMediaKind(media, resolvedContentType);
-	const mimetype = kind === "audio" && isWhatsAppNativeVoiceAudio({
+	const nativeVoice = kind === "audio" && isWhatsAppNativeVoiceAudio({
 		contentType: media.contentType,
 		fileName: media.fileName,
 		mediaUrl
-	}) ? WHATSAPP_VOICE_MIMETYPE : resolvedContentType ?? "application/octet-stream";
+	});
+	const mimetype = nativeVoice ? WHATSAPP_VOICE_MIMETYPE : resolvedContentType ?? "application/octet-stream";
 	const fileName = kind === "document" ? resolveWhatsAppDocumentFileName({
 		fileName: media.fileName ?? deriveWhatsAppDocumentFileName(mediaUrl),
 		mimetype
 	}) : media.fileName;
-	return {
+	const normalized = {
 		buffer: media.buffer,
 		kind,
 		mimetype,
 		...fileName ? { fileName } : {}
 	};
-}
-async function prepareWhatsAppOutboundMedia(media, mediaUrl) {
-	const normalized = normalizeWhatsAppLoadedMedia(media, mediaUrl);
-	if (normalized.kind !== "audio") return normalized;
-	if (isWhatsAppNativeVoiceAudio({
-		contentType: media.contentType,
-		fileName: media.fileName,
-		mediaUrl
-	})) return normalized;
+	if (kind !== "audio" || nativeVoice) return normalized;
 	return {
 		buffer: await transcodeAudioBufferToOpus({
 			audioBuffer: media.buffer,
@@ -709,4 +701,4 @@ async function sendPollWhatsApp(to, poll, options) {
 	}
 }
 //#endregion
-export { withWhatsAppLogicalDeliveryActivity as _, sendWhatsAppUploadFile as a, normalizeWhatsAppPayloadTextPreservingIndentation as c, listWhatsAppDeliveredMessageIdentities as d, listWhatsAppSendResultMessageIds as f, rememberWhatsAppPartialSend as g, rememberWhatsAppAcceptedSend as h, sendTypingWhatsApp as i, prepareWhatsAppOutboundMedia as l, normalizeWhatsAppSendResult as m, sendPollWhatsApp as n, normalizeWhatsAppOutboundPayload as o, mergeWhatsAppAcceptedSendError as p, sendReactionWhatsApp as r, normalizeWhatsAppPayloadText as s, sendMessageWhatsApp as t, combineWhatsAppSendResults as u, resolveWhatsAppDocumentFileName as v, resolveWhatsAppReactionLevel as y };
+export { resolveWhatsAppDocumentFileName as _, sendWhatsAppUploadFile as a, prepareWhatsAppOutboundMedia as c, listWhatsAppSendResultMessageIds as d, mergeWhatsAppAcceptedSendError as f, withWhatsAppLogicalDeliveryActivity as g, rememberWhatsAppPartialSend as h, sendTypingWhatsApp as i, combineWhatsAppSendResults as l, rememberWhatsAppAcceptedSend as m, sendPollWhatsApp as n, normalizeWhatsAppOutboundPayload as o, normalizeWhatsAppSendResult as p, sendReactionWhatsApp as r, normalizeWhatsAppPayloadTextPreservingIndentation as s, sendMessageWhatsApp as t, listWhatsAppDeliveredMessageIdentities as u, resolveWhatsAppReactionLevel as v };

package/dist/.setup/{send-api-B03VDwZ1.mjs → send-api-COzRvqXx.mjs}

@@ -1,9 +1,9 @@
-import { n as isWhatsAppNewsletterJid } from "./normalize-target-BGra1ZnM.mjs";
-import { h as rememberWhatsAppAcceptedSend, m as normalizeWhatsAppSendResult, p as mergeWhatsAppAcceptedSendError, u as combineWhatsAppSendResults, v as resolveWhatsAppDocumentFileName } from "./send-CGUsUdoX.mjs";
-import { c as toWhatsappJid, l as toWhatsappJidWithLid, r as jidToE164 } from "./targets-runtime-Dls-Xh4F.mjs";
-import { r as buildQuotedMessageOptions } from "./group-session-key-BV8Le9r8.mjs";
-import { O as resolveComparableIdentity } from "./auth-store-D2rN-hP5.mjs";
-import { isRecord, normalizeLowercaseStringOrEmpty, uniqueStrings } from "openclaw/plugin-sdk/string-coerce-runtime";
+import { n as isWhatsAppNewsletterJid } from "./normalize-target-D67Kc3g6.mjs";
+import { _ as resolveWhatsAppDocumentFileName, f as mergeWhatsAppAcceptedSendError, l as combineWhatsAppSendResults, m as rememberWhatsAppAcceptedSend, p as normalizeWhatsAppSendResult } from "./send-CLBfAzd6.mjs";
+import { c as toWhatsappJid, l as toWhatsappJidWithLid, r as jidToE164 } from "./targets-runtime-D5ryyPxh.mjs";
+import { r as buildQuotedMessageOptions } from "./group-session-key-BbTPosdy.mjs";
+import { O as resolveComparableIdentity } from "./auth-store-DOBi5BPe.mjs";
+import { isRecord, uniqueStrings } from "openclaw/plugin-sdk/string-coerce-runtime";
 import { logVerbose } from "openclaw/plugin-sdk/runtime-env";
 import { formatLocationText } from "openclaw/plugin-sdk/channel-inbound";
 import { getImageMetadata, resizeToJpeg } from "openclaw/plugin-sdk/media-runtime";
@@ -64,10 +64,7 @@ function normalizeVcardName(value) {
 	return value.replace(/;/g, " ").replace(/\s+/g, " ").trim();
 }
 function normalizeVcardPhone(value) {
-	const trimmed = value.trim();
-	if (!trimmed) return "";
-	if (normalizeLowercaseStringOrEmpty(trimmed).startsWith("tel:")) return trimmed.slice(4).trim();
-	return trimmed;
+	return value.toLowerCase().startsWith("tel:") ? value.slice(4).trim() : value;
 }
 //#endregion
 //#region extensions/whatsapp/src/inbound/media-mimetype.ts
@@ -233,17 +230,12 @@ function extractContactContext(source) {
 	const message = unwrapMessage(source);
 	if (!message) return;
 	const contact = message.contactMessage ?? void 0;
-	if (contact) return {
-		kind: "contact",
-		total: 1,
-		contacts: [describeContact(contact)]
-	};
-	const contactsArray = message.contactsArrayMessage?.contacts ?? void 0;
-	if (!contactsArray || contactsArray.length === 0) return;
+	const contacts = contact ? [contact] : message.contactsArrayMessage?.contacts;
+	if (!contacts?.length) return;
 	return {
-		kind: "contacts",
-		total: contactsArray.length,
-		contacts: contactsArray.map(describeContact)
+		kind: contact ? "contact" : "contacts",
+		total: contacts.length,
+		contacts: contacts.map(describeContact)
 	};
 }
 function describeContact(input) {
@@ -366,9 +358,6 @@ const OUTBOUND_MENTION_RE = /@(\+?\d+)/g;
 const KNOWN_USER_JID_RE = /^(\d+)(?::\d+)?@(s\.whatsapp\.net|hosted|lid|hosted\.lid|c\.us)$/i;
 const PHONE_JID_DOMAIN_RE = /^(s\.whatsapp\.net|hosted|c\.us)$/i;
 const LID_JID_DOMAIN_RE = /^(lid|hosted\.lid)$/i;
-function isWhatsAppGroupJid(jid) {
-	return jid.endsWith("@g.us");
-}
 function mayContainWhatsAppOutboundMention(text) {
 	return /@\+?\d/.test(text);
 }
@@ -465,7 +454,7 @@ function shouldSkipMentionAt(text, index, end, codeRanges) {
 	return Boolean(previous && /[\w@]/.test(previous) || next && /[\w@]/.test(next));
 }
 function resolveWhatsAppOutboundMentions(params) {
-	if (!isWhatsAppGroupJid(params.chatJid) || !mayContainWhatsAppOutboundMention(params.text) || !params.participants?.length) return {
+	if (!params.chatJid.endsWith("@g.us") || !mayContainWhatsAppOutboundMention(params.text) || !params.participants?.length) return {
 		text: params.text,
 		mentionedJids: []
 	};
@@ -475,38 +464,16 @@ function resolveWhatsAppOutboundMentions(params) {
 		mentionedJids: []
 	};
 	const codeRanges = collectCodeRanges(params.text);
-	const replacements = [];
 	const mentionedJids = /* @__PURE__ */ new Set();
-	for (const match of params.text.matchAll(OUTBOUND_MENTION_RE)) {
-		const start = match.index;
-		const token = match[0];
-		if (shouldSkipMentionAt(params.text, start, start + token.length, codeRanges)) continue;
-		const rawDigits = match[1];
-		if (!rawDigits) continue;
-		const digits = rawDigits.replace(/\D/g, "");
-		const target = token.startsWith("@+") ? byPhone.get(digits) ?? byLid.get(digits) : byLid.get(digits) ?? byPhone.get(digits);
-		if (!target) continue;
-		mentionedJids.add(target.mentionJid);
-		if (target.replacementText && target.replacementText !== token) replacements.push({
-			start,
-			end: start + token.length,
-			text: target.replacementText
-		});
-	}
-	if (replacements.length === 0) return {
-		text: params.text,
-		mentionedJids: [...mentionedJids]
-	};
-	let text = "";
-	let cursor = 0;
-	for (const replacement of replacements) {
-		text += params.text.slice(cursor, replacement.start);
-		text += replacement.text;
-		cursor = replacement.end;
-	}
-	text += params.text.slice(cursor);
 	return {
-		text,
+		text: params.text.replace(OUTBOUND_MENTION_RE, (token, rawDigits, start) => {
+			if (shouldSkipMentionAt(params.text, start, start + token.length, codeRanges)) return token;
+			const digits = rawDigits.replace(/\D/g, "");
+			const target = token.startsWith("@+") ? byPhone.get(digits) ?? byLid.get(digits) : byLid.get(digits) ?? byPhone.get(digits);
+			if (!target) return token;
+			mentionedJids.add(target.mentionJid);
+			return target.replacementText ?? token;
+		}),
 		mentionedJids: [...mentionedJids]
 	};
 }
@@ -564,10 +531,13 @@ function createWebSendApi(params) {
 				mentionedJids: []
 			} : await resolveMentions(jid, text);
 			if (mediaBuffer && mediaType) {
-				if (mediaType.startsWith("image/") && sendOptions?.asDocument !== true) payload = await addWhatsAppImagePreviewFields({
-					image: mediaBuffer,
+				const mediaFields = {
 					caption: resolvedPayloadText.text || void 0,
 					mimetype: mediaType
+				};
+				if (mediaType.startsWith("image/") && sendOptions?.asDocument !== true) payload = await addWhatsAppImagePreviewFields({
+					image: mediaBuffer,
+					...mediaFields
 				});
 				else if (mediaType.startsWith("audio/")) payload = {
 					audio: mediaBuffer,
@@ -578,8 +548,7 @@ function createWebSendApi(params) {
 					const gifPlayback = sendOptions?.gifPlayback;
 					payload = {
 						video: mediaBuffer,
-						caption: resolvedPayloadText.text || void 0,
-						mimetype: mediaType,
+						...mediaFields,
 						...gifPlayback ? { gifPlayback: true } : {}
 					};
 				} else payload = {
@@ -588,8 +557,7 @@ function createWebSendApi(params) {
 						fileName: sendOptions?.fileName,
 						mimetype: mediaType
 					}),
-					caption: resolvedPayloadText.text || void 0,
-					mimetype: mediaType
+					...mediaFields
 				};
 			} else payload = { text: resolvedPayloadText.text };
 			payload = addWhatsAppOutboundMentionsToContent(payload, resolvedPayloadText.mentionedJids);

package/dist/.setup/{setup-finalize-GtBmrO8p.mjs → setup-finalize-DSiP_-wa.mjs}

@@ -1,8 +1,8 @@
 import { a as resolveWhatsAppAccount, o as resolveWhatsAppAuthDir } from "./accounts-F0vHuze2.mjs";
 import { r as resolveDefaultWhatsAppAccountId } from "./account-ids-CB5SOWjc.mjs";
 import { n as hasWebCredsSync } from "./creds-files-B8WcOAmE.mjs";
-import { a as normalizeWhatsAppAllowFromEntries, o as normalizeWhatsAppAllowFromEntry } from "./normalize-target-BGra1ZnM.mjs";
-import { n as whatsappSetupAdapter } from "./shared-CP_zs2U7.mjs";
+import { a as normalizeWhatsAppAllowFromEntries, o as normalizeWhatsAppAllowFromEntry } from "./normalize-target-D67Kc3g6.mjs";
+import { n as whatsappSetupAdapter } from "./shared-SqcOkt51.mjs";
 import { formatCliCommand, formatDocsLink } from "openclaw/plugin-sdk/setup-tools";
 import { DEFAULT_ACCOUNT_ID, createSetupTranslator, splitSetupEntries } from "openclaw/plugin-sdk/setup";
 //#region extensions/whatsapp/src/setup-finalize.ts
@@ -13,24 +13,22 @@ function trimPromptText(value) {
 function isDefaultWhatsAppAccountKey(accountId) {
 	return accountId.trim().toLowerCase() === DEFAULT_ACCOUNT_ID;
 }
-function shouldWriteDefaultWhatsAppAccountConfigAtAccountScope(cfg) {
+function resolveWhatsAppAccountWriteKey(cfg, accountId) {
+	if (accountId !== DEFAULT_ACCOUNT_ID) return accountId;
 	const accounts = cfg.channels?.whatsapp?.accounts;
-	return Boolean(accounts && (accounts.default || Object.keys(accounts).some((accountId) => !isDefaultWhatsAppAccountKey(accountId))));
-}
-function resolveDefaultWhatsAppAccountWriteKey(cfg) {
-	const accounts = cfg.channels?.whatsapp?.accounts;
-	if (!accounts) return DEFAULT_ACCOUNT_ID;
-	return Object.keys(accounts).find((accountId) => isDefaultWhatsAppAccountKey(accountId)) ?? DEFAULT_ACCOUNT_ID;
+	const keys = Object.keys(accounts ?? {});
+	if (!accounts?.default && !keys.some((key) => !isDefaultWhatsAppAccountKey(key))) return;
+	return keys.find(isDefaultWhatsAppAccountKey) ?? DEFAULT_ACCOUNT_ID;
 }
 function resolveWhatsAppConfigPathPrefix(cfg, accountId) {
-	if (accountId === DEFAULT_ACCOUNT_ID && shouldWriteDefaultWhatsAppAccountConfigAtAccountScope(cfg)) return `channels.whatsapp.accounts.${resolveDefaultWhatsAppAccountWriteKey(cfg)}`;
-	return accountId === DEFAULT_ACCOUNT_ID ? "channels.whatsapp" : `channels.whatsapp.accounts.${accountId}`;
+	const key = resolveWhatsAppAccountWriteKey(cfg, accountId);
+	return key === void 0 ? "channels.whatsapp" : `channels.whatsapp.accounts.${key}`;
 }
 function mergeWhatsAppConfig(cfg, accountId, patch, options) {
 	const channelConfig = { ...cfg.channels?.whatsapp };
-	const atRoot = resolveWhatsAppConfigPathPrefix(cfg, accountId) === "channels.whatsapp";
+	const targetAccountId = resolveWhatsAppAccountWriteKey(cfg, accountId);
+	const atRoot = targetAccountId === void 0;
 	const accounts = { ...channelConfig.accounts };
-	const targetAccountId = accountId === DEFAULT_ACCOUNT_ID ? resolveDefaultWhatsAppAccountWriteKey(cfg) : accountId;
 	const lowerDefaultAccount = accountId === DEFAULT_ACCOUNT_ID && targetAccountId !== DEFAULT_ACCOUNT_ID ? accounts[DEFAULT_ACCOUNT_ID] : void 0;
 	const target = atRoot ? channelConfig : {
 		...accounts[targetAccountId],
@@ -179,29 +177,22 @@ async function promptWhatsAppDmAccess(params) {
 	});
 	if (policy === "open") return setWhatsAppAllowFrom(next, accountId, normalizeWhatsAppAllowFromEntries(["*", ...existingAllowFrom]));
 	if (policy === "disabled") return next;
-	const allowOptions = existingAllowFrom.length > 0 ? [
-		{
-			value: "keep",
-			label: t("wizard.whatsapp.keepCurrentAllowFrom")
-		},
-		{
-			value: "unset",
-			label: t("wizard.whatsapp.unsetAllowFromPairing")
-		},
-		{
-			value: "list",
-			label: t("wizard.whatsapp.setAllowFromNumbers")
-		}
-	] : [{
-		value: "unset",
-		label: t("wizard.whatsapp.unsetAllowFromDefault")
-	}, {
-		value: "list",
-		label: t("wizard.whatsapp.setAllowFromNumbers")
-	}];
 	const mode = await params.prompter.select({
 		message: t("wizard.whatsapp.allowFromPrompt"),
-		options: [...allowOptions]
+		options: [
+			...existingAllowFrom.length > 0 ? [{
+				value: "keep",
+				label: t("wizard.whatsapp.keepCurrentAllowFrom")
+			}] : [],
+			{
+				value: "unset",
+				label: t(existingAllowFrom.length > 0 ? "wizard.whatsapp.unsetAllowFromPairing" : "wizard.whatsapp.unsetAllowFromDefault")
+			},
+			{
+				value: "list",
+				label: t("wizard.whatsapp.setAllowFromNumbers")
+			}
+		]
 	});
 	if (mode === "keep") return next;
 	if (mode === "unset") return setWhatsAppAllowFrom(next, accountId, void 0);
@@ -232,42 +223,35 @@ async function finalizeWhatsAppSetup(params) {
 		accountId
 	});
 	const linked = hasWebCredsSync(authDir);
-	if (params.options?.deferDeviceLinkToClient) {
-		next = await promptWhatsAppDmAccess({
-			cfg: next,
-			accountId,
-			forceAllowFrom: params.forceAllowFrom,
-			prompter: params.prompter
-		});
-		return { cfg: next };
+	if (!params.options?.deferDeviceLinkToClient) {
+		if (!linked) await params.prompter.note([
+			t("wizard.whatsapp.scanQr"),
+			t("wizard.whatsapp.credentialsStored", { authDir }),
+			t("wizard.channels.docs", { link: formatDocsLink("/whatsapp", "whatsapp") })
+		].join("\n"), t("wizard.whatsapp.linkingTitle"));
+		if (await params.prompter.confirm({
+			message: linked ? t("wizard.whatsapp.relinkPrompt") : t("wizard.whatsapp.linkNowPrompt"),
+			initialValue: !linked
+		})) {
+			let persistenceGuardFailure;
+			try {
+				const { loginWeb } = await import("./login-DUx5JYuW.mjs").then((n) => n.n);
+				const beforeCredentialPersistence = params.options?.beforePersistentEffect ? async () => {
+					try {
+						await params.options?.beforePersistentEffect?.();
+					} catch (error) {
+						persistenceGuardFailure = { error };
+						throw error;
+					}
+				} : void 0;
+				await loginWeb(false, void 0, params.runtime, accountId, { beforeCredentialPersistence });
+			} catch (error) {
+				if (persistenceGuardFailure) throw persistenceGuardFailure.error;
+				params.runtime.error(`WhatsApp login failed: ${String(error)}`);
+				await params.prompter.note(t("wizard.channels.docs", { link: formatDocsLink("/whatsapp", "whatsapp") }), t("wizard.whatsapp.helpTitle"));
+			}
+		} else if (!linked) await params.prompter.note(t("wizard.whatsapp.linkLater", { command: formatCliCommand("openclaw channels login") }), "WhatsApp");
 	}
-	if (!linked) await params.prompter.note([
-		t("wizard.whatsapp.scanQr"),
-		t("wizard.whatsapp.credentialsStored", { authDir }),
-		t("wizard.channels.docs", { link: formatDocsLink("/whatsapp", "whatsapp") })
-	].join("\n"), t("wizard.whatsapp.linkingTitle"));
-	if (await params.prompter.confirm({
-		message: linked ? t("wizard.whatsapp.relinkPrompt") : t("wizard.whatsapp.linkNowPrompt"),
-		initialValue: !linked
-	})) {
-		let persistenceGuardFailure;
-		try {
-			const { loginWeb } = await import("./login-CV_4V021.mjs").then((n) => n.n);
-			const beforeCredentialPersistence = params.options?.beforePersistentEffect ? async () => {
-				try {
-					await params.options?.beforePersistentEffect?.();
-				} catch (error) {
-					persistenceGuardFailure = { error };
-					throw error;
-				}
-			} : void 0;
-			await loginWeb(false, void 0, params.runtime, accountId, { beforeCredentialPersistence });
-		} catch (error) {
-			if (persistenceGuardFailure) throw persistenceGuardFailure.error;
-			params.runtime.error(`WhatsApp login failed: ${String(error)}`);
-			await params.prompter.note(t("wizard.channels.docs", { link: formatDocsLink("/whatsapp", "whatsapp") }), t("wizard.whatsapp.helpTitle"));
-		}
-	} else if (!linked) await params.prompter.note(t("wizard.whatsapp.linkLater", { command: formatCliCommand("openclaw channels login") }), "WhatsApp");
 	next = await promptWhatsAppDmAccess({
 		cfg: next,
 		accountId,

package/dist/.setup/setup-plugin-api-8WdNCjRW.mjs

@@ -0,0 +1,3 @@
+import { t as whatsappSetupPlugin } from "./channel.setup-BJWEyQlF.mjs";
+import "../setup-plugin-api.js";
+export { whatsappSetupPlugin };

package/dist/.setup/{setup-surface-BuA39k6K.mjs → setup-surface-C_flQyHy.mjs}

@@ -1,6 +1,6 @@
 import { o as resolveWhatsAppAuthDir } from "./accounts-F0vHuze2.mjs";
 import { t as listAccountIds } from "./account-ids-CB5SOWjc.mjs";
-import { a as formatWhatsAppWebAuthStatusState, m as readWebAuthState } from "./auth-store-D2rN-hP5.mjs";
+import { a as formatWhatsAppWebAuthStatusState, m as readWebAuthState } from "./auth-store-DOBi5BPe.mjs";
 import { DEFAULT_ACCOUNT_ID, createSetupTranslator, setSetupChannelEnabled } from "openclaw/plugin-sdk/setup";
 //#region extensions/whatsapp/src/setup-surface.ts
 const t = createSetupTranslator();
@@ -36,7 +36,7 @@ const whatsappSetupWizard = {
 	},
 	resolveShouldPromptAccountIds: ({ shouldPromptAccountIds }) => shouldPromptAccountIds,
 	credentials: [],
-	finalize: async (params) => await (await import("./setup-finalize-GtBmrO8p.mjs")).finalizeWhatsAppSetup(params),
+	finalize: async (params) => await (await import("./setup-finalize-DSiP_-wa.mjs")).finalizeWhatsAppSetup(params),
 	disable: (cfg) => setSetupChannelEnabled(cfg, channel, false),
 	onAccountRecorded: (accountId, options) => {
 		options?.onAccountId?.(channel, accountId);

package/dist/.setup/{shared-CP_zs2U7.mjs → shared-SqcOkt51.mjs}

@@ -1,6 +1,6 @@
 import { a as resolveWhatsAppAccount, n as hasAnyWhatsAppAuth } from "./accounts-F0vHuze2.mjs";
 import { r as resolveDefaultWhatsAppAccountId, t as listAccountIds } from "./account-ids-CB5SOWjc.mjs";
-import { a as normalizeWhatsAppAllowFromEntries } from "./normalize-target-BGra1ZnM.mjs";
+import { a as normalizeWhatsAppAllowFromEntries } from "./normalize-target-D67Kc3g6.mjs";
 import { t as WhatsAppChannelConfigSchema } from "./config-schema-BYA6e_Ii.mjs";
 import { n as whatsappDoctor } from "./doctor-DKzeBEmH.mjs";
 import { t as resolveWhatsAppConfigPath } from "./group-config-path-BPrak_bJ.mjs";
@@ -20,14 +20,14 @@ import { readChannelAllowFromStore } from "openclaw/plugin-sdk/channel-pairing";
 import { defineChannelSetupContract } from "openclaw/plugin-sdk/channel-setup";
 import { createPatchedAccountSetupAdapter } from "openclaw/plugin-sdk/setup";
 //#region extensions/whatsapp/src/channel-runtime-loader.ts
-const loadWhatsAppAuthStore = createLazyRuntimeModule(() => import("./auth-store-D2rN-hP5.mjs").then((n) => n.i));
+const loadWhatsAppAuthStore = createLazyRuntimeModule(() => import("./auth-store-DOBi5BPe.mjs").then((n) => n.i));
 async function readWhatsAppAccountLinkState(authDir) {
 	const state = await (await loadWhatsAppAuthStore()).readWebAuthState(authDir);
 	return state === "unstable" ? "unknown" : state;
 }
 const loadWhatsAppChannelRuntime = createLazyRuntimeModule(async () => {
 	await loadWhatsAppAuthStore();
-	return await import("./channel.runtime-BniF8Swm.mjs");
+	return await import("./channel.runtime-DTj-wkEP.mjs");
 });
 //#endregion
 //#region extensions/whatsapp/src/group-policy.ts
@@ -132,7 +132,7 @@ const whatsappResolveDmPolicy = createScopedDmSecurityResolver({
 });
 const whatsappSetupWizardProxy = createDelegatedSetupWizardProxy({
 	channel: WHATSAPP_CHANNEL,
-	loadWizard: async () => (await import("./setup-surface-BuA39k6K.mjs")).whatsappSetupWizard,
+	loadWizard: async () => (await import("./setup-surface-C_flQyHy.mjs")).whatsappSetupWizard,
 	status: {
 		configuredLabel: "linked",
 		unconfiguredLabel: "not linked",