@openclaw/whatsapp 2026.9.6 → 2026.9.7

package/dist/.setup/{accounts-D_NGDjCx.mjs → accounts-CtRPAQCL.mjs}

@@ -1,5 +1,5 @@
 import { n as listConfiguredAccountIds, r as resolveDefaultWhatsAppAccountId, t as listAccountIds } from "./account-ids-CB5SOWjc.mjs";
-import { n as hasWebCredsRegularFileSync, r as hasWebCredsSync } from "./creds-files-Drg3usj1.mjs";
+import { n as hasWebCredsRegularFileSync, r as hasWebCredsSync } from "./creds-files-CDATZWWM.mjs";
 import fs from "node:fs";
 import path from "node:path";
 import { DEFAULT_ACCOUNT_ID, normalizeAccountId, resolveAccountEntry, resolveMergedAccountConfig, resolveUserPath } from "openclaw/plugin-sdk/account-core";
@@ -55,12 +55,6 @@ function hasAnyWhatsAppAuth(cfg) {
 function resolveDefaultAuthDir(accountId) {
 	return path.join(resolveOAuthDir(), "whatsapp", normalizeAccountId(accountId));
 }
-function resolveLegacyAuthDir() {
-	return resolveOAuthDir();
-}
-function legacyAuthExists(authDir) {
-	return hasWebCredsRegularFileSync(authDir);
-}
 function resolveWhatsAppAuthDir(params) {
 	const accountId = params.accountId.trim() || DEFAULT_ACCOUNT_ID;
 	const configured = resolveMergedWhatsAppAccountConfig({
@@ -73,8 +67,8 @@ function resolveWhatsAppAuthDir(params) {
 	};
 	const defaultDir = resolveDefaultAuthDir(accountId);
 	if (accountId === DEFAULT_ACCOUNT_ID) {
-		const legacyDir = resolveLegacyAuthDir();
-		if (legacyAuthExists(legacyDir) && !legacyAuthExists(defaultDir)) return {
+		const legacyDir = resolveOAuthDir();
+		if (hasWebCredsRegularFileSync(legacyDir) && !hasWebCredsRegularFileSync(defaultDir)) return {
 			authDir: legacyDir,
 			isLegacy: true
 		};

package/dist/.setup/{action-runtime-DZZFamfl.mjs → action-runtime-DeVk5V7r.mjs}

@@ -1,6 +1,6 @@
-import { a as resolveWhatsAppAccount } from "./accounts-D_NGDjCx.mjs";
+import { a as resolveWhatsAppAccount } from "./accounts-CtRPAQCL.mjs";
 import { t as resolveWhatsAppOutboundTarget } from "./resolve-outbound-target-C2eUvsTc.mjs";
-import { r as sendReactionWhatsApp, v as resolveWhatsAppReactionLevel } from "./send-C6jDmcL9.mjs";
+import { r as sendReactionWhatsApp, v as resolveWhatsAppReactionLevel } from "./send-BGdvf5cC.mjs";
 import { ToolAuthorizationError, createActionGate, jsonResult, readReactionParams, readStringParam } from "openclaw/plugin-sdk/channel-actions";
 //#region extensions/whatsapp/src/action-runtime-target-auth.ts
 function resolveAuthorizedWhatsAppOutboundTarget(params) {

package/dist/.setup/{approval-handler.runtime-C0hzmMSj.mjs → approval-handler.runtime-CjqMlPOX.mjs}

@@ -1,10 +1,9 @@
-import "./accounts-D_NGDjCx.mjs";
+import "./accounts-CtRPAQCL.mjs";
 import { r as resolveDefaultWhatsAppAccountId } from "./account-ids-CB5SOWjc.mjs";
 import { s as normalizeWhatsAppMessagingTarget } from "./normalize-target-BGra1ZnM.mjs";
-import { i as sendTypingWhatsApp, t as sendMessageWhatsApp } from "./send-C6jDmcL9.mjs";
+import { i as sendTypingWhatsApp, t as sendMessageWhatsApp } from "./send-BGdvf5cC.mjs";
 import { i as getWhatsAppRuntime } from "./runtime-BLlToOi6.mjs";
-import "./normalize-DdsROMMa.mjs";
-import { i as unregisterWhatsAppApprovalReactionTarget, r as registerWhatsAppApprovalReactionTarget } from "./approval-reactions-BnXw-UZI.mjs";
+import { i as unregisterWhatsAppApprovalReactionTarget, r as registerWhatsAppApprovalReactionTarget } from "./approval-reactions-DiOFvb1s.mjs";
 import { createSubsystemLogger } from "openclaw/plugin-sdk/runtime-env";
 import { DEFAULT_ACCOUNT_ID } from "openclaw/plugin-sdk/account-id";
 import { buildApprovalReactionPendingContent } from "openclaw/plugin-sdk/approval-reaction-runtime";
@@ -12,9 +11,6 @@ import { buildChannelApprovalExpiredText, buildChannelApprovalResolvedText, crea
 import { buildChannelApprovalNativeTargetKey } from "openclaw/plugin-sdk/approval-native-runtime";
 //#region extensions/whatsapp/src/approval-handler.runtime.ts
 const log = createSubsystemLogger("whatsapp/approvals");
-function buildPendingPayload(params) {
-	return buildApprovalReactionPendingContent(params);
-}
 const whatsappApprovalNativeRuntime = createChannelApprovalNativeRuntimeAdapter({
 	eventKinds: [
 		"exec",
@@ -26,11 +22,7 @@ const whatsappApprovalNativeRuntime = createChannelApprovalNativeRuntimeAdapter(
 		shouldHandle: ({ context }) => Boolean(context)
 	},
 	presentation: {
-		buildPendingPayload: ({ request, nowMs, view }) => buildPendingPayload({
-			request,
-			view,
-			nowMs
-		}),
+		buildPendingPayload: buildApprovalReactionPendingContent,
 		buildResolvedResult: ({ request, resolved, view }) => ({
 			kind: "update",
 			payload: { text: buildChannelApprovalResolvedText({
@@ -109,20 +101,8 @@ const whatsappApprovalNativeRuntime = createChannelApprovalNativeRuntimeAdapter(
 			allowedDecisions: pendingPayload.reactionPayload.allowedDecisions,
 			ttlMs: Math.max(1, view.expiresAtMs - Date.now())
 		}) ? true : null,
-		unbindPending: async ({ entry }) => {
-			await unregisterWhatsAppApprovalReactionTarget({
-				accountId: entry.accountId,
-				remoteJid: entry.remoteJid,
-				messageId: entry.messageId
-			});
-		},
-		cancelDelivered: async ({ entry }) => {
-			await unregisterWhatsAppApprovalReactionTarget({
-				accountId: entry.accountId,
-				remoteJid: entry.remoteJid,
-				messageId: entry.messageId
-			});
-		}
+		unbindPending: ({ entry }) => unregisterWhatsAppApprovalReactionTarget(entry),
+		cancelDelivered: ({ entry }) => unregisterWhatsAppApprovalReactionTarget(entry)
 	},
 	observe: { onDeliveryError: ({ error, request }) => {
 		log.error(`whatsapp approvals: failed to send request ${request.id}: ${String(error)}`);

package/dist/.setup/{approval-reactions-BnXw-UZI.mjs → approval-reactions-DiOFvb1s.mjs}

@@ -1,7 +1,7 @@
-import { t as __exportAll } from "./rolldown-runtime-D7D4PA-g.mjs";
-import { a as resolveWhatsAppAccount } from "./accounts-D_NGDjCx.mjs";
+import { t as __exportAll } from "./rolldown-runtime-BBjsoOtd.mjs";
+import { a as resolveWhatsAppAccount } from "./accounts-CtRPAQCL.mjs";
 import { n as getOptionalWhatsAppRuntime } from "./runtime-BLlToOi6.mjs";
-import { c as getWhatsAppApprovalApprovers, l as whatsappApprovalAuth } from "./group-session-key-D22hYMdE.mjs";
+import { c as getWhatsAppApprovalApprovers, l as whatsappApprovalAuth } from "./group-session-key-2-mja4OF.mjs";
 import { createLazyRuntimeSurface } from "openclaw/plugin-sdk/lazy-runtime";
 import { approvalReactionDecisionSetsMatch, buildApprovalReactionDeliveredBindingMarker, createApprovalReactionTargetStore, listApprovalReactionBindings, readApprovalReactionDecisionList, readApprovalReactionDeliveredBinding, readApprovalReactionPresentationBinding, readApprovalReactionTargetRecord, resolveTypedApprovalReactionTarget, settleApprovalReaction } from "openclaw/plugin-sdk/approval-reaction-runtime";
 import { createPluginStateErrorReporter } from "openclaw/plugin-sdk/plugin-state-runtime";
@@ -102,7 +102,7 @@ async function registerWhatsAppApprovalReactionTarget(params) {
 	const key = buildReactionTargetKey(params);
 	const approvalId = params.approvalId.trim();
 	const allowedDecisions = listApprovalReactionBindings({ allowedDecisions: params.allowedDecisions }).map((binding) => binding.decision);
-	if (!key || !approvalId || params.approvalKind !== "exec" && params.approvalKind !== "plugin" || allowedDecisions.length === 0) return null;
+	if (!key || !approvalId || params.approvalKind !== "exec" && params.approvalKind !== "plugin" && params.approvalKind !== "system-agent" || allowedDecisions.length === 0) return null;
 	const target = {
 		approvalId,
 		approvalKind: params.approvalKind,
@@ -171,9 +171,11 @@ async function unregisterWhatsAppApprovalReactionTarget(params) {
 	if (!key) return;
 	await whatsappApprovalReactionTargets.delete(key);
 }
-function resolveTarget(params) {
+async function resolveWhatsAppApprovalReactionTargetWithPersistence(params) {
+	const key = buildReactionTargetKey(params);
+	if (!key) return null;
 	const resolved = resolveTypedApprovalReactionTarget({
-		target: params.target,
+		target: await whatsappApprovalReactionTargets.lookup(key),
 		reactionKey: params.reactionKey
 	});
 	return resolved ? {
@@ -182,14 +184,6 @@ function resolveTarget(params) {
 		decision: resolved.decision
 	} : null;
 }
-async function resolveWhatsAppApprovalReactionTargetWithPersistence(params) {
-	const key = buildReactionTargetKey(params);
-	if (!key) return null;
-	return resolveTarget({
-		target: await whatsappApprovalReactionTargets.lookup(key),
-		reactionKey: params.reactionKey
-	});
-}
 async function resolveWhatsAppApprovalReactionTargetFromCandidates(params) {
 	const candidateRemoteJids = [];
 	for (const observedRemoteJid of params.observedRemoteJids) {

package/dist/.setup/{auth-store-Dh8a3cba.mjs → auth-store-BBonwKks.mjs}

@@ -1,12 +1,12 @@
-import { t as __exportAll } from "./rolldown-runtime-D7D4PA-g.mjs";
-import { a as readWebCredsJsonRaw, c as resolveWebCredsPath, i as isWhatsAppBaileysAuthFileName, l as statWebCredsFileSync, o as readWebCredsJsonRawSync, r as hasWebCredsSync, s as resolveWebCredsBackupPath, t as assertWebCredsPathRegularFileOrMissing } from "./creds-files-Drg3usj1.mjs";
-import { r as jidToE164 } from "./targets-runtime-RBjx3pg_.mjs";
-import { n as resolveUserPath, t as normalizeE164 } from "./text-runtime-CHl0iPYe.mjs";
+import { t as __exportAll } from "./rolldown-runtime-BBjsoOtd.mjs";
+import { a as readWebCredsJsonRaw, c as resolveWebCredsPath, i as isWhatsAppBaileysAuthFileName, l as statWebCredsFileSync, o as readWebCredsJsonRawSync, r as hasWebCredsSync, s as resolveWebCredsBackupPath, t as assertWebCredsPathRegularFileOrMissing } from "./creds-files-CDATZWWM.mjs";
+import { r as jidToE164 } from "./targets-runtime-DmiqXIXO.mjs";
 import path from "node:path";
 import { resolveOAuthDir as resolveOAuthDir$1 } from "openclaw/plugin-sdk/state-paths";
 import { isPathStrictlyInside } from "openclaw/plugin-sdk/file-access-runtime";
 import { formatCliCommand } from "openclaw/plugin-sdk/cli-runtime";
 import { defaultRuntime, getChildLogger, info, success } from "openclaw/plugin-sdk/runtime-env";
+import { normalizeE164, resolveUserPath } from "openclaw/plugin-sdk/text-utility-runtime";
 import fs from "node:fs/promises";
 import { DEFAULT_ACCOUNT_ID } from "openclaw/plugin-sdk/routing";
 import { enqueueKeyedTask } from "openclaw/plugin-sdk/keyed-async-queue";
@@ -17,7 +17,7 @@ const CREDS_FILE_MODE = 384;
 const CREDS_SAVE_FLUSH_TIMEOUT_MS = 15e3;
 const credsSaveQueues = /* @__PURE__ */ new Map();
 async function stringifyCreds(creds) {
-	const { BufferJSON } = await import("./session.runtime-DcJuO42v.mjs").then((n) => n.o);
+	const { BufferJSON } = await import("./session.runtime-st1konFI.mjs").then((n) => n.o);
 	return JSON.stringify(creds, BufferJSON.replacer);
 }
 async function writeWebCredsRawAtomically(params) {
@@ -132,11 +132,8 @@ function getReplyContext(msg, authDir) {
 		}, authDir)
 	};
 }
-function getMentionJids(msg) {
-	return msg.group?.mentions?.jids ?? [];
-}
 function getMentionIdentities(msg, authDir) {
-	return getMentionJids(msg).map((jid) => resolveComparableIdentity({ jid }, authDir));
+	return (msg.group?.mentions?.jids ?? []).map((jid) => resolveComparableIdentity({ jid }, authDir));
 }
 function getPrimaryIdentityId(identity) {
 	return identity?.e164 || identity?.jid?.trim() || identity?.lid || null;
@@ -211,11 +208,7 @@ async function restoreCredsFromBackupIfNeeded(authDir, options) {
 	try {
 		const credsPath = resolveWebCredsPath(authDir);
 		const backupPath = resolveWebCredsBackupPath(authDir);
-		try {
-			await assertWebCredsPathRegularFileOrMissing(credsPath);
-		} catch {
-			return false;
-		}
+		await assertWebCredsPathRegularFileOrMissing(credsPath);
 		const raw = readCredsJsonRaw(credsPath);
 		if (raw && isValidJson(raw)) return false;
 		const backupRaw = readCredsJsonRaw(backupPath);
@@ -243,17 +236,7 @@ async function webAuthExists(authDir = resolveDefaultWebAuthDir()) {
 	const resolvedAuthDir = resolveUserPath(authDir);
 	const credsPath = resolveWebCredsPath(resolvedAuthDir);
 	const raw = await readWebCredsJsonRaw(credsPath);
-	if (!raw) return false;
-	try {
-		JSON.parse(raw);
-		return true;
-	} catch {
-		return false;
-	}
-}
-function resolveWebAuthState(params) {
-	if (params.barrierResult === "timed_out") return "unstable";
-	return params.linked ? "linked" : "not-linked";
+	return raw !== null && isValidJson(raw);
 }
 async function readWebAuthStateCore(authDir, context) {
 	const resolvedAuthDir = resolveUserPath(authDir);
@@ -262,10 +245,7 @@ async function readWebAuthStateCore(authDir, context) {
 	return {
 		authDir: resolvedAuthDir,
 		linked,
-		state: resolveWebAuthState({
-			linked,
-			barrierResult
-		})
+		state: barrierResult === "timed_out" ? "unstable" : linked ? "linked" : "not-linked"
 	};
 }
 function formatWhatsAppWebAuthStatusState(state) {
@@ -440,10 +420,6 @@ async function readWebSelfIdentityForDecision(authDir = resolveDefaultWebAuthDir
 		identity: await readWebSelfIdentity(resolvedAuthDir, fallback)
 	};
 }
-/**
-* Return the age (in milliseconds) of the cached WhatsApp web auth state, or null when missing.
-* Helpful for heartbeats/observability to spot stale credentials.
-*/
 function getWebAuthAgeMs(authDir = resolveDefaultWebAuthDir()) {
 	const stats = statWebCredsFileSync(resolveWebCredsPath(resolveUserPath(authDir)));
 	return stats ? Math.max(0, Date.now() - stats.mtimeMs) : null;

package/dist/.setup/{channel-Bg_fS2iF.mjs → channel-CJFE0kD_.mjs}

@@ -1,17 +1,15 @@
-import { a as resolveWhatsAppAccount } from "./accounts-D_NGDjCx.mjs";
+import { a as resolveWhatsAppAccount } from "./accounts-CtRPAQCL.mjs";
 import { r as resolveDefaultWhatsAppAccountId, t as listAccountIds } from "./account-ids-CB5SOWjc.mjs";
-import { c as normalizeWhatsAppTarget, i as looksLikeWhatsAppTargetId, n as isWhatsAppNewsletterJid, o as normalizeWhatsAppAllowFromEntry, s as normalizeWhatsAppMessagingTarget, t as isWhatsAppGroupJid } from "./normalize-target-BGra1ZnM.mjs";
+import { a as normalizeWhatsAppAllowFromEntries, c as normalizeWhatsAppTarget, i as looksLikeWhatsAppTargetId, n as isWhatsAppNewsletterJid, o as normalizeWhatsAppAllowFromEntry, s as normalizeWhatsAppMessagingTarget, t as isWhatsAppGroupJid } from "./normalize-target-BGra1ZnM.mjs";
 import { t as resolveWhatsAppOutboundTarget } from "./resolve-outbound-target-C2eUvsTc.mjs";
-import { c as normalizeWhatsAppPayloadTextPreservingIndentation, i as sendTypingWhatsApp, n as sendPollWhatsApp, o as normalizeWhatsAppOutboundPayload, s as normalizeWhatsAppPayloadText, t as sendMessageWhatsApp, v as resolveWhatsAppReactionLevel } from "./send-C6jDmcL9.mjs";
+import { c as normalizeWhatsAppPayloadTextPreservingIndentation, i as sendTypingWhatsApp, n as sendPollWhatsApp, o as normalizeWhatsAppOutboundPayload, s as normalizeWhatsAppPayloadText, t as sendMessageWhatsApp, v as resolveWhatsAppReactionLevel } from "./send-BGdvf5cC.mjs";
 import { i as getWhatsAppRuntime } from "./runtime-BLlToOi6.mjs";
-import "./normalize-DdsROMMa.mjs";
-import { c as toWhatsappJid } from "./targets-runtime-RBjx3pg_.mjs";
-import "./text-runtime-CHl0iPYe.mjs";
-import { c as getWhatsAppApprovalApprovers, l as whatsappApprovalAuth, s as lookupInboundMessageMetaForTarget, t as resolveWhatsAppGroupSessionKey } from "./group-session-key-D22hYMdE.mjs";
-import { a as formatWhatsAppConfigAllowFromEntries, o as loadWhatsAppChannelRuntime, t as createWhatsAppPluginBase } from "./shared-DVgQ8kRG.mjs";
+import { c as toWhatsappJid } from "./targets-runtime-DmiqXIXO.mjs";
+import { c as getWhatsAppApprovalApprovers, l as whatsappApprovalAuth, s as lookupInboundMessageMetaForTarget, t as resolveWhatsAppGroupSessionKey } from "./group-session-key-2-mja4OF.mjs";
+import { a as loadWhatsAppChannelRuntime, t as createWhatsAppPluginBase } from "./shared-DgOG5Iqr.mjs";
 import { t as whatsappCommandPolicy } from "./command-policy-BIOSHySD.mjs";
-import { f as readWebAuthExistsForDecision, n as WHATSAPP_AUTH_UNSTABLE_CODE } from "./auth-store-Dh8a3cba.mjs";
-import { createActionGate as createActionGate$1 } from "openclaw/plugin-sdk/channel-actions";
+import { f as readWebAuthExistsForDecision, n as WHATSAPP_AUTH_UNSTABLE_CODE } from "./auth-store-BBonwKks.mjs";
+import { createActionGate } from "openclaw/plugin-sdk/channel-actions";
 import { normalizeOptionalAccountId } from "openclaw/plugin-sdk/account-core";
 import { normalizeOptionalString } from "openclaw/plugin-sdk/string-coerce-runtime";
 import { collectIssuesForEnabledAccounts, createComputedAccountStatusAdapter, createDefaultChannelRuntimeState, isRecord as isRecord$1, readAccountStatusSnapshot } from "openclaw/plugin-sdk/status-helpers";
@@ -83,7 +81,7 @@ const whatsappApproval = createApproverRestrictedNativeApprovalCapabilityFromFor
 			approvalKind,
 			request
 		}),
-		load: async () => (await import("./approval-handler.runtime-C0hzmMSj.mjs")).whatsappApprovalNativeRuntime
+		load: async () => (await import("./approval-handler.runtime-CjqMlPOX.mjs")).whatsappApprovalNativeRuntime
 	})
 });
 function buildWhatsAppPendingPayload(params, approvalKind) {
@@ -100,13 +98,17 @@ function buildWhatsAppPendingPayload(params, approvalKind) {
 const whatsappApprovalCapability = whatsappApproval.capability;
 //#endregion
 //#region extensions/whatsapp/src/channel-actions.ts
-function areWhatsAppAgentReactionsEnabled(params) {
-	if (!params.cfg.channels?.whatsapp) return false;
-	if (!createActionGate$1(params.cfg.channels.whatsapp.actions)("reactions")) return false;
-	return resolveWhatsAppReactionLevel({
+function resolveEnabledWhatsAppAgentReactions(params) {
+	if (!params.cfg.channels?.whatsapp) return;
+	if (!createActionGate(params.cfg.channels.whatsapp.actions)("reactions")) return;
+	const resolved = resolveWhatsAppReactionLevel({
 		cfg: params.cfg,
 		accountId: params.accountId
-	}).agentReactionsEnabled;
+	});
+	return resolved.agentReactionsEnabled ? resolved : void 0;
+}
+function resolveWhatsAppAgentReactionGuidance(params) {
+	return resolveEnabledWhatsAppAgentReactions(params)?.agentReactionGuidance;
 }
 function hasAnyWhatsAppAccountWithAgentReactionsEnabled(cfg) {
 	if (!cfg.channels?.whatsapp) return false;
@@ -115,30 +117,20 @@ function hasAnyWhatsAppAccountWithAgentReactionsEnabled(cfg) {
 			cfg,
 			accountId
 		}).enabled) return false;
-		return areWhatsAppAgentReactionsEnabled({
+		return Boolean(resolveEnabledWhatsAppAgentReactions({
 			cfg,
 			accountId
-		});
-	});
-}
-function resolveWhatsAppAgentReactionGuidance(params) {
-	if (!params.cfg.channels?.whatsapp) return;
-	if (!createActionGate$1(params.cfg.channels.whatsapp.actions)("reactions")) return;
-	const resolved = resolveWhatsAppReactionLevel({
-		cfg: params.cfg,
-		accountId: params.accountId
+		}));
 	});
-	if (!resolved.agentReactionsEnabled) return;
-	return resolved.agentReactionGuidance;
 }
 function describeWhatsAppMessageActions(params) {
 	if (!params.cfg.channels?.whatsapp) return null;
-	const gate = createActionGate$1(params.cfg.channels.whatsapp.actions);
+	const gate = createActionGate(params.cfg.channels.whatsapp.actions);
 	const actions = /* @__PURE__ */ new Set();
-	if (params.accountId != null ? areWhatsAppAgentReactionsEnabled({
+	if (params.accountId != null ? Boolean(resolveEnabledWhatsAppAgentReactions({
 		cfg: params.cfg,
-		accountId: params.accountId ?? void 0
-	}) : hasAnyWhatsAppAccountWithAgentReactionsEnabled(params.cfg)) actions.add("react");
+		accountId: params.accountId
+	})) : hasAnyWhatsAppAccountWithAgentReactionsEnabled(params.cfg)) actions.add("react");
 	if (gate("polls")) actions.add("poll");
 	actions.add("upload-file");
 	return { actions: Array.from(actions) };
@@ -148,12 +140,7 @@ function describeWhatsAppMessageActions(params) {
 const WHATSAPP_LEGACY_OUTBOUND_SEND_DEP_KEYS = ["sendWhatsApp"];
 //#endregion
 //#region extensions/whatsapp/src/outbound-base.ts
-function resolveQuoteLookupAccountId(cfg, accountId) {
-	const explicitAccountId = normalizeOptionalAccountId(accountId);
-	if (explicitAccountId) return explicitAccountId;
-	return resolveDefaultWhatsAppAccountId(cfg ?? {});
-}
-function createWhatsAppOutboundBase({ sendMessageWhatsApp, sendPollWhatsApp, shouldLogVerbose, resolveTarget, normalizeText = normalizeWhatsAppPayloadText, skipEmptyText = true }) {
+function createWhatsAppOutboundBase({ sendMessageWhatsApp, sendPollWhatsApp, shouldLogVerbose, resolveTarget, normalizeText = normalizeWhatsAppPayloadText }) {
 	const resolveQuotedMessageKey = (params) => {
 		const replyToId = params.replyToId?.trim();
 		if (!replyToId) return;
@@ -169,8 +156,8 @@ function createWhatsAppOutboundBase({ sendMessageWhatsApp, sendPollWhatsApp, sho
 			media: cachedMeta?.media
 		};
 	};
-	const dispatchMessage = async (params, text, mediaOptions, mediaDeliveryOptions) => {
-		const lookupAccountId = resolveQuoteLookupAccountId(params.cfg, params.accountId);
+	const dispatchMessage = async (params, text, mediaOptions) => {
+		const lookupAccountId = normalizeOptionalAccountId(params.accountId) ?? resolveDefaultWhatsAppAccountId(params.cfg);
 		const quotedMessageKey = resolveQuotedMessageKey({
 			accountId: lookupAccountId,
 			to: params.to,
@@ -184,7 +171,6 @@ function createWhatsAppOutboundBase({ sendMessageWhatsApp, sendPollWhatsApp, sho
 			...mediaOptions,
 			accountId: params.accountId ?? void 0,
 			gifPlayback: params.gifPlayback,
-			...mediaDeliveryOptions,
 			replyToIdSource: params.replyToIdSource,
 			replyToMode: params.replyToMode,
 			formatting: params.formatting,
@@ -210,7 +196,7 @@ function createWhatsAppOutboundBase({ sendMessageWhatsApp, sendPollWhatsApp, sho
 			channel: "whatsapp",
 			sendText: async (params) => {
 				const normalizedText = normalizeText(params.text);
-				if (skipEmptyText && !normalizedText) return { messageId: "" };
+				if (!normalizedText) return { messageId: "" };
 				return await dispatchMessage(params, normalizedText);
 			},
 			sendMedia: async (params) => await dispatchMessage(params, void 0, {
@@ -218,8 +204,9 @@ function createWhatsAppOutboundBase({ sendMessageWhatsApp, sendPollWhatsApp, sho
 				mediaAccess: params.mediaAccess,
 				mediaLocalRoots: params.mediaLocalRoots,
 				mediaReadFile: params.mediaReadFile,
-				...params.audioAsVoice === void 0 ? {} : { audioAsVoice: params.audioAsVoice }
-			}, { forceDocument: params.forceDocument }),
+				...params.audioAsVoice === void 0 ? {} : { audioAsVoice: params.audioAsVoice },
+				forceDocument: params.forceDocument
+			}),
 			sendPoll: async ({ cfg, to, poll, accountId }) => await sendPollWhatsApp(to, poll, {
 				verbose: shouldLogVerbose(),
 				accountId: accountId ?? void 0,
@@ -251,15 +238,8 @@ function createWhatsAppOutboundBase({ sendMessageWhatsApp, sendPollWhatsApp, sho
 }
 //#endregion
 //#region extensions/whatsapp/src/channel-outbound.ts
-const loadWhatsAppApprovalReactionsModule = createLazyRuntimeModule(() => import("./approval-reactions-BnXw-UZI.mjs").then((n) => n.t));
-const loadWhatsAppQuestionReactionsModule = createLazyRuntimeModule(() => import("./question-reactions-D3Zq9Gbn.mjs").then((n) => n.n));
-function normalizeWhatsAppChannelPayloadText(text) {
-	return normalizeWhatsAppPayloadTextPreservingIndentation(text);
-}
-function normalizeWhatsAppChannelSendText(text) {
-	const normalized = normalizeWhatsAppChannelPayloadText(text);
-	return normalized.trim() ? normalized : "";
-}
+const loadWhatsAppApprovalReactionsModule = createLazyRuntimeModule(() => import("./approval-reactions-DiOFvb1s.mjs").then((n) => n.t));
+const loadWhatsAppQuestionReactionsModule = createLazyRuntimeModule(() => import("./question-reactions-CPyyi5AY.mjs").then((n) => n.n));
 async function prepareWhatsAppApprovalPayloadForDelivery(params) {
 	const questionPayload = questionGatewayRuntime.prepareReactionPayloadForDelivery({
 		payload: params.payload,
@@ -288,14 +268,14 @@ const whatsappChannelOutbound = {
 			allowFrom,
 			mode
 		}),
-		normalizeText: normalizeWhatsAppChannelSendText
+		normalizeText: normalizeWhatsAppPayloadTextPreservingIndentation
 	}),
 	sendTextOnlyErrorPayloads: true,
 	renderPresentation: prepareWhatsAppApprovalPayloadForDelivery,
 	afterDeliverPayload: registerDeliveredWhatsAppApprovalPayload,
 	normalizePayload: ({ payload }) => ({
 		...payload,
-		text: normalizeWhatsAppChannelPayloadText(payload.text)
+		text: normalizeWhatsAppPayloadTextPreservingIndentation(payload.text)
 	})
 };
 function toWhatsAppMessageSendResult(result, replyToId) {
@@ -441,88 +421,56 @@ function collectWhatsAppStatusIssues(accounts) {
 			const lastDisconnect = readLastDisconnect(account.lastDisconnect);
 			const lastError = normalizeOptionalString(account.lastError) ?? lastDisconnect?.error;
 			const healthState = normalizeOptionalString(account.healthState);
-			if (statusState === "unstable") {
+			const addIssue = (kind, message, fix) => {
 				issues.push({
 					channel: "whatsapp",
 					accountId,
-					kind: "auth",
-					message: "Auth state is still stabilizing.",
-					fix: "Wait a moment for queued credential writes to finish, then retry the command or rerun health."
+					kind,
+					message,
+					fix
 				});
-				return;
-			}
-			if (healthState === "logged-out") {
-				issues.push({
-					channel: "whatsapp",
-					accountId,
-					kind: "auth",
-					message: `Session logged out${lastError ? `: ${lastError}` : "."}`,
-					fix: `Run: ${formatCliCommand("openclaw channels login")} (scan QR on the gateway host).`
-				});
-				return;
-			}
-			if (!linked) {
-				issues.push({
-					channel: "whatsapp",
-					accountId,
-					kind: "auth",
-					message: "Not linked (no WhatsApp Web session).",
-					fix: `Run: ${formatCliCommand("openclaw channels login")} (scan QR on the gateway host).`
-				});
-				return;
-			}
+			};
+			const relink = `Run: ${formatCliCommand("openclaw channels login")} (scan QR on the gateway host).`;
+			const repair = `Run: ${formatCliCommand("openclaw doctor")} (or restart the gateway). If it persists, relink via channels login and check logs.`;
+			const linkedRuntimePrefix = linked ? "Linked but " : "";
+			if (statusState === "unstable") addIssue("auth", "Auth state is still stabilizing.", "Wait a moment for queued credential writes to finish, then retry the command or rerun health.");
+			else if (healthState === "logged-out") addIssue("auth", `Session logged out${lastError ? `: ${lastError}` : "."}`, relink);
+			else if (!linked) addIssue("auth", "Not linked (no WhatsApp Web session).", relink);
+			if (healthState === "logged-out") return;
+			if (!linked && healthState === "stopped" && !lastError && lastDisconnect?.at == null && (reconnectAttempts ?? 0) === 0) return;
 			if (healthState === "stale") {
-				const staleSuffix = lastInboundAt != null ? ` (last inbound ${Math.max(0, Math.floor((Date.now() - lastInboundAt) / 6e4))}m ago)` : "";
-				issues.push({
-					channel: "whatsapp",
-					accountId,
-					kind: "runtime",
-					message: `Linked but stale${staleSuffix}${lastError ? `: ${lastError}` : "."}`,
-					fix: `Run: ${formatCliCommand("openclaw doctor")} (or restart the gateway). If it persists, relink via channels login and check logs.`
-				});
+				addIssue("runtime", `${linkedRuntimePrefix}stale${lastInboundAt != null ? ` (last inbound ${Math.max(0, Math.floor((Date.now() - lastInboundAt) / 6e4))}m ago)` : ""}${lastError ? `: ${lastError}` : "."}`, repair);
 				return;
 			}
 			if (healthState === "reconnecting" || healthState === "conflict" || healthState === "stopped") {
-				const stateLabel = healthState === "conflict" ? "session conflict" : healthState === "reconnecting" ? "reconnecting" : "stopped";
-				issues.push({
-					channel: "whatsapp",
-					accountId,
-					kind: "runtime",
-					message: `Linked but ${stateLabel}${reconnectAttempts != null ? ` (reconnectAttempts=${reconnectAttempts})` : ""}${lastError ? `: ${lastError}` : "."}`,
-					fix: `Run: ${formatCliCommand("openclaw doctor")} (or restart the gateway). If it persists, relink via channels login and check logs.`
-				});
+				addIssue("runtime", `${linkedRuntimePrefix}${healthState === "conflict" ? "session conflict" : healthState === "reconnecting" ? "reconnecting" : "stopped"}${reconnectAttempts != null ? ` (reconnectAttempts=${reconnectAttempts})` : ""}${lastError ? `: ${lastError}` : "."}`, repair);
 				return;
 			}
 			if (linked && running && connected && reconnectAttempts != null && reconnectAttempts > 0 && isRecentDisconnect(lastDisconnect)) {
-				issues.push({
-					channel: "whatsapp",
-					accountId,
-					kind: "runtime",
-					message: `Linked but recently reconnected (reconnectAttempts=${reconnectAttempts})${lastError ? `: ${lastError}` : "."}`,
-					fix: `Watch: ${formatCliCommand("openclaw logs --follow")} and run ${formatCliCommand("openclaw channels status --probe")} if disconnects continue. If it keeps flapping, restart the gateway or relink via channels login.`
-				});
+				addIssue("runtime", `Linked but recently reconnected (reconnectAttempts=${reconnectAttempts})${lastError ? `: ${lastError}` : "."}`, `Watch: ${formatCliCommand("openclaw logs --follow")} and run ${formatCliCommand("openclaw channels status --probe")} if disconnects continue. If it keeps flapping, restart the gateway or relink via channels login.`);
 				return;
 			}
-			if (running && !connected) issues.push({
-				channel: "whatsapp",
-				accountId,
-				kind: "runtime",
-				message: `Linked but disconnected${reconnectAttempts != null ? ` (reconnectAttempts=${reconnectAttempts})` : ""}${lastError ? `: ${lastError}` : "."}`,
-				fix: `Run: ${formatCliCommand("openclaw doctor")} (or restart the gateway). If it persists, relink via channels login and check logs.`
-			});
+			if (running && !connected) addIssue("runtime", `${linkedRuntimePrefix}disconnected${reconnectAttempts != null ? ` (reconnectAttempts=${reconnectAttempts})` : ""}${lastError ? `: ${lastError}` : "."}`, repair);
 		}
 	});
 }
 //#endregion
 //#region extensions/whatsapp/src/channel.ts
-const loadWhatsAppDirectoryConfig = createLazyRuntimeModule(() => import("./directory-config-BHPoBklt.mjs").then((n) => n.t));
-const loadWhatsAppChannelReactAction = createLazyRuntimeModule(() => import("./channel-react-action-1iBiEnq7.mjs"));
-function resolveWhatsAppTargetInfo(raw) {
-	const normalized = normalizeWhatsAppTarget(raw);
-	if (!normalized) return null;
+const loadWhatsAppDirectoryConfig = createLazyRuntimeModule(() => import("./directory-config-DUiJ5d8I.mjs").then((n) => n.t));
+const loadWhatsAppChannelReactAction = createLazyRuntimeModule(() => import("./channel-react-action-2r_hjLZV.mjs"));
+function projectWhatsAppRuntimeStatus(runtime) {
 	return {
-		to: normalized,
-		chatType: isWhatsAppGroupJid(normalized) ? "group" : isWhatsAppNewsletterJid(normalized) ? "channel" : "direct"
+		connected: runtime?.connected ?? false,
+		reconnectAttempts: runtime?.reconnectAttempts,
+		lastConnectedAt: runtime?.lastConnectedAt ?? null,
+		lastDisconnect: runtime?.lastDisconnect ?? null,
+		lastInboundAt: runtime?.lastInboundAt ?? runtime?.lastMessageAt ?? null,
+		lastMessageAt: runtime?.lastMessageAt ?? null,
+		lastEventAt: runtime?.lastEventAt ?? null,
+		busy: runtime?.busy ?? false,
+		lastRunActivityAt: runtime?.lastRunActivityAt ?? null,
+		healthState: runtime?.healthState ?? void 0,
+		...runtime?.terminalDisconnect ? { terminalDisconnect: runtime.terminalDisconnect } : {}
 	};
 }
 function resolveWhatsAppMessageActionTarget(params) {
@@ -547,7 +495,7 @@ const whatsappPlugin = createChatChannelPlugin({
 		allowlist: buildDmGroupAccountAllowlistAdapter({
 			channelId: "whatsapp",
 			resolveAccount: resolveWhatsAppAccount,
-			normalize: ({ values }) => formatWhatsAppConfigAllowFromEntries(values),
+			normalize: ({ values }) => normalizeWhatsAppAllowFromEntries(values),
 			resolveDmAllowFrom: (account) => account.allowFrom,
 			resolveGroupAllowFrom: (account) => account.groupAllowFrom,
 			resolveDmPolicy: (account) => account.dmPolicy,
@@ -581,8 +529,11 @@ const whatsappPlugin = createChatChannelPlugin({
 		messaging: {
 			targetPrefixes: ["whatsapp"],
 			normalizeTarget: normalizeWhatsAppMessagingTarget,
-			resolveOutboundSessionRoute: (params) => resolveWhatsAppOutboundSessionRoute(params),
-			inferTargetChatType: ({ to }) => resolveWhatsAppTargetInfo(to)?.chatType,
+			resolveOutboundSessionRoute: resolveWhatsAppOutboundSessionRoute,
+			inferTargetChatType: ({ to }) => {
+				const normalized = normalizeWhatsAppTarget(to);
+				return !normalized ? void 0 : isWhatsAppGroupJid(normalized) ? "group" : isWhatsAppNewsletterJid(normalized) ? "channel" : "direct";
+			},
 			targetResolver: {
 				looksLikeId: looksLikeWhatsAppTargetId,
 				hint: "<E.164|group JID|newsletter JID>"
@@ -682,34 +633,21 @@ const whatsappPlugin = createChatChannelPlugin({
 					}
 				};
 				const linked = snapshot.healthState === "logged-out" ? false : typeof snapshot.linked === "boolean" ? snapshot.linked : auth.state === "unstable" ? void 0 : auth.state === "linked";
-				const summaryAuthState = auth.state === "unstable" ? auth.state : linked === true ? "linked" : linked === false ? "not-linked" : void 0;
-				const statusState = summaryAuthState === void 0 ? void 0 : summaryAuthState;
-				const authAgeMs = typeof linked === "boolean" && linked ? auth.authAgeMs : null;
-				const self = typeof linked === "boolean" && linked ? auth.selfId : {
-					e164: null,
-					jid: null,
-					lid: null
-				};
+				const statusState = auth.state === "unstable" ? auth.state : linked === true ? "linked" : linked === false ? "not-linked" : void 0;
 				return {
 					configured: Boolean(account.authDir),
 					...statusState ? { statusState } : {},
 					...typeof linked === "boolean" ? { linked } : {},
-					authAgeMs,
-					self,
+					authAgeMs: linked ? auth.authAgeMs : null,
+					self: linked ? auth.selfId : {
+						e164: null,
+						jid: null,
+						lid: null
+					},
 					running: snapshot.running ?? false,
-					connected: snapshot.connected ?? false,
-					lastConnectedAt: snapshot.lastConnectedAt ?? null,
-					lastDisconnect: snapshot.lastDisconnect ?? null,
-					reconnectAttempts: snapshot.reconnectAttempts,
-					lastInboundAt: snapshot.lastInboundAt ?? snapshot.lastMessageAt ?? null,
-					lastMessageAt: snapshot.lastMessageAt ?? null,
-					lastEventAt: snapshot.lastEventAt ?? null,
-					busy: snapshot.busy ?? false,
-					lastRunActivityAt: snapshot.lastRunActivityAt ?? null,
+					...projectWhatsAppRuntimeStatus(snapshot),
 					lastError: snapshot.lastError ?? null,
-					healthState: snapshot.healthState ?? void 0,
-					lifecycle: snapshot.lifecycle ?? void 0,
-					...snapshot.terminalDisconnect ? { terminalDisconnect: snapshot.terminalDisconnect } : {}
+					lifecycle: snapshot.lifecycle ?? void 0
 				};
 			},
 			resolveAccountSnapshot: ({ account, runtime }) => {
@@ -724,17 +662,7 @@ const whatsappPlugin = createChatChannelPlugin({
 							statusState: "not-linked",
 							linked: false
 						} : {},
-						connected: runtime?.connected ?? false,
-						reconnectAttempts: runtime?.reconnectAttempts,
-						lastConnectedAt: runtime?.lastConnectedAt ?? null,
-						lastDisconnect: runtime?.lastDisconnect ?? null,
-						lastInboundAt: runtime?.lastInboundAt ?? runtime?.lastMessageAt ?? null,
-						lastMessageAt: runtime?.lastMessageAt ?? null,
-						lastEventAt: runtime?.lastEventAt ?? null,
-						busy: runtime?.busy ?? false,
-						lastRunActivityAt: runtime?.lastRunActivityAt ?? null,
-						healthState: runtime?.healthState ?? void 0,
-						...runtime?.terminalDisconnect ? { terminalDisconnect: runtime.terminalDisconnect } : {},
+						...projectWhatsAppRuntimeStatus(runtime),
 						dmPolicy: account.dmPolicy,
 						allowFrom: account.allowFrom
 					}