@openclaw/whatsapp 2026.9.8 → 2026.10.1-beta.1

package/dist/.setup/{accounts-CtRPAQCL.mjs → accounts-F0vHuze2.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-CDATZWWM.mjs";
+import { n as hasWebCredsSync } from "./creds-files-B8WcOAmE.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";
@@ -34,7 +34,7 @@ const DEFAULT_WHATSAPP_MEDIA_MAX_MB = 50;
 function listWhatsAppAuthDirs(cfg) {
 	const oauthDir = resolveOAuthDir();
 	const whatsappDir = path.join(oauthDir, "whatsapp");
-	const authDirs = /* @__PURE__ */ new Set([oauthDir, path.join(whatsappDir, DEFAULT_ACCOUNT_ID)]);
+	const authDirs = /* @__PURE__ */ new Set([path.join(whatsappDir, DEFAULT_ACCOUNT_ID)]);
 	const accountIds = listConfiguredAccountIds(cfg);
 	for (const accountId of accountIds) authDirs.add(resolveWhatsAppAuthDir({
 		cfg,
@@ -65,16 +65,8 @@ function resolveWhatsAppAuthDir(params) {
 		authDir: resolveUserPath(configured),
 		isLegacy: false
 	};
-	const defaultDir = resolveDefaultAuthDir(accountId);
-	if (accountId === DEFAULT_ACCOUNT_ID) {
-		const legacyDir = resolveOAuthDir();
-		if (hasWebCredsRegularFileSync(legacyDir) && !hasWebCredsRegularFileSync(defaultDir)) return {
-			authDir: legacyDir,
-			isLegacy: true
-		};
-	}
 	return {
-		authDir: defaultDir,
+		authDir: resolveDefaultAuthDir(accountId),
 		isLegacy: false
 	};
 }

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

@@ -1,6 +1,6 @@
-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-BGdvf5cC.mjs";
+import { a as resolveWhatsAppAccount } from "./accounts-F0vHuze2.mjs";
+import { t as resolveWhatsAppOutboundTarget } from "./resolve-outbound-target-CzyNKmrl.mjs";
+import { r as sendReactionWhatsApp, y as resolveWhatsAppReactionLevel } from "./send-CGUsUdoX.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) {
@@ -31,8 +31,7 @@ async function handleWhatsAppAction(params, cfg) {
 	const isActionEnabled = createActionGate(whatsAppConfig?.actions);
 	if (action === "react") {
 		const accountId = readStringParam(params, "accountId");
-		if (!whatsAppConfig) throw new Error("WhatsApp reactions are disabled.");
-		if (!isActionEnabled("reactions")) throw new Error("WhatsApp reactions are disabled.");
+		if (!whatsAppConfig || !isActionEnabled("reactions")) throw new Error("WhatsApp reactions are disabled.");
 		const reactionLevelInfo = resolveWhatsAppReactionLevel({
 			cfg,
 			accountId: accountId ?? void 0

package/dist/.setup/{agent-tools-login-CL5C1rA2.mjs → agent-tools-login-B7VEvJO7.mjs}

@@ -1,13 +1,11 @@
 import { startWebLoginWithQr, waitForWebLogin } from "../login-qr-runtime.js";
 import "../login-qr-api.js";
 import { optionalPositiveIntegerSchema, readPositiveIntegerParam } from "openclaw/plugin-sdk/channel-actions";
-import { hasNonEmptyString } from "openclaw/plugin-sdk/string-coerce-runtime";
+import { readNonBlankString } from "openclaw/plugin-sdk/string-coerce-runtime";
+import { textResult } from "openclaw/plugin-sdk/tool-results";
 import { Type } from "typebox";
 //#region extensions/whatsapp/src/agent-tools-login.ts
 const QR_DATA_URL_MAX_LENGTH = 16384;
-function readLoginStringPreservingWhitespace(value) {
-	return hasNonEmptyString(value) ? value : void 0;
-}
 function createWhatsAppLoginTool(context) {
 	if (context.senderIsOwner !== true) return null;
 	return {
@@ -30,44 +28,33 @@ function createWhatsAppLoginTool(context) {
 				if (!signal || signal.aborted) throw new Error("WhatsApp login authority is no longer active.");
 			};
 			const renderQrReply = (params) => {
-				return {
-					content: [{
-						type: "text",
-						text: [
-							params.message,
-							"",
-							"Open WhatsApp → Linked Devices and scan:",
-							"",
-							`![whatsapp-qr](${params.qrDataUrl})`
-						].join("\n")
-					}],
-					details: {
-						connected: params.connected ?? false,
-						qr: true
-					}
-				};
+				const text = [
+					params.message,
+					"",
+					"Open WhatsApp → Linked Devices and scan:",
+					"",
+					`![whatsapp-qr](${params.qrDataUrl})`
+				].join("\n");
+				return textResult(text, {
+					connected: params.connected ?? false,
+					qr: true
+				});
 			};
 			const action = args?.action ?? "start";
-			const accountId = readLoginStringPreservingWhitespace(args.accountId);
+			const accountId = readNonBlankString(args.accountId);
 			const timeoutMs = readPositiveIntegerParam(args, "timeoutMs");
 			if (action === "wait") {
 				const result = await waitForWebLogin({
 					accountId,
 					timeoutMs,
-					currentQrDataUrl: readLoginStringPreservingWhitespace(args.currentQrDataUrl)
+					currentQrDataUrl: readNonBlankString(args.currentQrDataUrl)
 				});
 				if (result.qrDataUrl) return renderQrReply({
 					message: result.message,
 					qrDataUrl: result.qrDataUrl,
 					connected: result.connected
 				});
-				return {
-					content: [{
-						type: "text",
-						text: result.message
-					}],
-					details: { connected: result.connected }
-				};
+				return textResult(result.message, { connected: result.connected });
 			}
 			await beforeCredentialPersistence();
 			const result = await startWebLoginWithQr({
@@ -76,13 +63,7 @@ function createWhatsAppLoginTool(context) {
 				beforeCredentialPersistence,
 				force: typeof args.force === "boolean" ? args.force : false
 			});
-			if (!result.qrDataUrl) return {
-				content: [{
-					type: "text",
-					text: result.message
-				}],
-				details: { qr: false }
-			};
+			if (!result.qrDataUrl) return textResult(result.message, { qr: false });
 			return renderQrReply({
 				message: result.message,
 				qrDataUrl: result.qrDataUrl,

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

@@ -1,9 +1,9 @@
-import "./accounts-CtRPAQCL.mjs";
+import "./accounts-F0vHuze2.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-BGdvf5cC.mjs";
+import { i as sendTypingWhatsApp, t as sendMessageWhatsApp } from "./send-CGUsUdoX.mjs";
 import { i as getWhatsAppRuntime } from "./runtime-BLlToOi6.mjs";
-import { i as unregisterWhatsAppApprovalReactionTarget, r as registerWhatsAppApprovalReactionTarget } from "./approval-reactions-DiOFvb1s.mjs";
+import { i as unregisterWhatsAppApprovalReactionTarget, r as registerWhatsAppApprovalReactionTarget } from "./approval-reactions-CD6CDF9k.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";

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

@@ -1,7 +1,9 @@
 import { t as __exportAll } from "./rolldown-runtime-BBjsoOtd.mjs";
-import { a as resolveWhatsAppAccount } from "./accounts-CtRPAQCL.mjs";
+import { a as resolveWhatsAppAccount } from "./accounts-F0vHuze2.mjs";
+import { d as listWhatsAppDeliveredMessageIdentities } from "./send-CGUsUdoX.mjs";
 import { n as getOptionalWhatsAppRuntime } from "./runtime-BLlToOi6.mjs";
-import { c as getWhatsAppApprovalApprovers, l as whatsappApprovalAuth } from "./group-session-key-2-mja4OF.mjs";
+import { c as whatsappApprovalAuth, s as getWhatsAppApprovalApprovers } from "./group-session-key-BV8Le9r8.mjs";
+import { normalizeUniqueTrimmedStringList } from "openclaw/plugin-sdk/string-coerce-runtime";
 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";
@@ -36,10 +38,6 @@ function buildReactionTargetKey(params) {
 	if (!accountId || !remoteJid || !messageId) return null;
 	return `${accountId}:${remoteJid}:${messageId}`;
 }
-function addCandidateRemoteJid(target, value) {
-	const remoteJid = value?.trim();
-	if (remoteJid && !target.includes(remoteJid)) target.push(remoteJid);
-}
 function reportApprovalBindingCorrelationMismatch(binding) {
 	try {
 		getOptionalWhatsAppRuntime()?.logging.getChildLogger({
@@ -111,33 +109,6 @@ async function registerWhatsAppApprovalReactionTarget(params) {
 	await whatsappApprovalReactionTargets.register(key, target, { ttlMs: params.ttlMs });
 	return target;
 }
-function listWhatsAppDeliveredMessageIdentities(results) {
-	const identities = [];
-	const seen = /* @__PURE__ */ new Set();
-	const add = (params) => {
-		if (params.channel && params.channel !== "whatsapp") return;
-		const messageId = params.messageId?.trim() ?? "";
-		const remoteJid = params.toJid?.trim() ?? "";
-		const key = `${remoteJid}:${messageId}`;
-		if (!messageId || messageId === "unknown" || !remoteJid || seen.has(key)) return;
-		seen.add(key);
-		identities.push({
-			messageId,
-			remoteJid
-		});
-	};
-	for (const result of results) {
-		if (result.channel !== "whatsapp") continue;
-		add(result);
-		for (const raw of result.receipt?.raw ?? []) add(raw);
-		for (const part of result.receipt?.parts ?? []) add({
-			channel: part.raw?.channel,
-			messageId: part.raw?.messageId ?? part.platformMessageId,
-			toJid: part.raw?.toJid
-		});
-	}
-	return identities;
-}
 /** Bind generic forwarded approvals to the exact WhatsApp messages accepted by Baileys. */
 async function registerWhatsAppApprovalReactionTargetForDeliveredPayload(params) {
 	if (params.target.channel.trim().toLowerCase() !== "whatsapp") return false;
@@ -155,7 +126,7 @@ async function registerWhatsAppApprovalReactionTargetForDeliveredPayload(params)
 		accountId: params.target.accountId
 	}).accountId;
 	const registrations = [];
-	for (const { messageId, remoteJid } of listWhatsAppDeliveredMessageIdentities(params.results)) registrations.push(registerWhatsAppApprovalReactionTarget({
+	for (const { messageId, remoteJid } of listWhatsAppDeliveredMessageIdentities(params.results, (channel) => !channel || channel === "whatsapp")) registrations.push(registerWhatsAppApprovalReactionTarget({
 		accountId,
 		remoteJid,
 		messageId,
@@ -187,14 +158,14 @@ async function resolveWhatsAppApprovalReactionTargetWithPersistence(params) {
 async function resolveWhatsAppApprovalReactionTargetFromCandidates(params) {
 	const candidateRemoteJids = [];
 	for (const observedRemoteJid of params.observedRemoteJids) {
-		addCandidateRemoteJid(candidateRemoteJids, observedRemoteJid);
+		candidateRemoteJids.push(observedRemoteJid);
 		try {
-			for (const candidate of await params.resolveReactionTargetJids?.(observedRemoteJid) ?? []) addCandidateRemoteJid(candidateRemoteJids, candidate);
+			candidateRemoteJids.push(...await params.resolveReactionTargetJids?.(observedRemoteJid) ?? []);
 		} catch (error) {
 			params.logVerboseMessage?.(`whatsapp: approval reaction target JID mapping failed for ${observedRemoteJid}: ${String(error)}`);
 		}
 	}
-	for (const remoteJid of candidateRemoteJids) {
+	for (const remoteJid of normalizeUniqueTrimmedStringList(candidateRemoteJids)) {
 		const target = await resolveWhatsAppApprovalReactionTargetWithPersistence({
 			accountId: params.accountId,
 			remoteJid,
@@ -213,9 +184,7 @@ function readWhatsAppApprovalReactionEvent(params) {
 	const reaction = msg.message?.reactionMessage;
 	const reactionKey = reaction?.text?.trim() ?? "";
 	const messageId = reaction?.key?.id?.trim() ?? "";
-	const remoteJids = [];
-	addCandidateRemoteJid(remoteJids, reaction?.key?.remoteJid);
-	addCandidateRemoteJid(remoteJids, msg.key?.remoteJid);
+	const remoteJids = normalizeUniqueTrimmedStringList([reaction?.key?.remoteJid, msg.key?.remoteJid]);
 	const actorJid = msg.key?.participant?.trim() || (msg.key?.fromMe ? params.selfLid?.trim() ?? params.selfJid?.trim() ?? "" : msg.key?.remoteJid?.trim() ?? "");
 	if (!reactionKey || !messageId || remoteJids.length === 0 || !actorJid) return null;
 	return {

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

@@ -1,10 +1,11 @@
 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 { a as readWebCredsJsonRawSync, c as statWebCredsFileSync, i as readWebCredsJsonRaw, n as hasWebCredsSync, o as resolveWebCredsBackupPath, r as isWhatsAppBaileysAuthFileName, s as resolveWebCredsPath, t as assertWebCredsPathRegularFileOrMissing } from "./creds-files-B8WcOAmE.mjs";
+import { r as jidToE164 } from "./targets-runtime-Dls-Xh4F.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 { extractErrorCode } from "openclaw/plugin-sdk/error-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";
@@ -12,6 +13,7 @@ import { DEFAULT_ACCOUNT_ID } from "openclaw/plugin-sdk/routing";
 import { enqueueKeyedTask } from "openclaw/plugin-sdk/keyed-async-queue";
 import { resolveTimerTimeoutMs } from "openclaw/plugin-sdk/number-runtime";
 import { replaceFileAtomic } from "openclaw/plugin-sdk/security-runtime";
+import { raceWithTimeout } from "openclaw/plugin-sdk/time-runtime";
 //#region extensions/whatsapp/src/creds-persistence.ts
 const CREDS_FILE_MODE = 384;
 const CREDS_SAVE_FLUSH_TIMEOUT_MS = 15e3;
@@ -61,12 +63,7 @@ function waitForCredsSaveQueue(authDir) {
 }
 async function waitForCredsSaveQueueWithTimeout(authDir, timeoutMs = CREDS_SAVE_FLUSH_TIMEOUT_MS) {
 	const boundedTimeoutMs = resolveTimerTimeoutMs(timeoutMs, CREDS_SAVE_FLUSH_TIMEOUT_MS, 0);
-	let flushTimeout;
-	return await Promise.race([waitForCredsSaveQueue(authDir).then(() => "drained"), new Promise((resolve) => {
-		flushTimeout = setTimeout(() => resolve("timed_out"), boundedTimeoutMs);
-	})]).finally(() => {
-		if (flushTimeout) clearTimeout(flushTimeout);
-	});
+	return await raceWithTimeout(waitForCredsSaveQueue(authDir).then(() => "drained"), boundedTimeoutMs, () => "timed_out");
 }
 //#endregion
 //#region extensions/whatsapp/src/identity.ts
@@ -150,7 +147,7 @@ var auth_store_exports = /* @__PURE__ */ __exportAll({
 	logWebSelfId: () => logWebSelfId,
 	logoutWeb: () => logoutWeb,
 	pickWebChannel: () => pickWebChannel,
-	readCredsJsonRaw: () => readCredsJsonRaw,
+	readCredsJsonRaw: () => readWebCredsJsonRawSync,
 	readWebAuthExistsBestEffort: () => readWebAuthExistsBestEffort,
 	readWebAuthExistsForDecision: () => readWebAuthExistsForDecision,
 	readWebAuthSnapshot: () => readWebAuthSnapshot,
@@ -183,9 +180,6 @@ function resolveDefaultWebAuthDir() {
 	return path.join(resolveOAuthDir$1(), "whatsapp", DEFAULT_ACCOUNT_ID);
 }
 const WA_WEB_AUTH_DIR = resolveDefaultWebAuthDir();
-function readCredsJsonRaw(filePath) {
-	return readWebCredsJsonRawSync(filePath);
-}
 async function waitForWebAuthBarrier(authDir, context) {
 	const result = await waitForCredsSaveQueueWithTimeout(authDir);
 	if (result === "timed_out") authStoreLogger.warn({
@@ -209,9 +203,9 @@ async function restoreCredsFromBackupIfNeeded(authDir, options) {
 		const credsPath = resolveWebCredsPath(authDir);
 		const backupPath = resolveWebCredsBackupPath(authDir);
 		await assertWebCredsPathRegularFileOrMissing(credsPath);
-		const raw = readCredsJsonRaw(credsPath);
+		const raw = readWebCredsJsonRawSync(credsPath);
 		if (raw && isValidJson(raw)) return false;
-		const backupRaw = readCredsJsonRaw(backupPath);
+		const backupRaw = readWebCredsJsonRawSync(backupPath);
 		if (!backupRaw || !isValidJson(backupRaw)) return false;
 		restore = {
 			content: backupRaw,
@@ -244,7 +238,6 @@ async function readWebAuthStateCore(authDir, context) {
 	const linked = await webAuthExists(resolvedAuthDir);
 	return {
 		authDir: resolvedAuthDir,
-		linked,
 		state: barrierResult === "timed_out" ? "unstable" : linked ? "linked" : "not-linked"
 	};
 }
@@ -312,8 +305,7 @@ async function shouldClearOnLogout(authDir, isLegacyAuthDir) {
 		if ((await fs.lstat(resolveWebCredsPath(authDir)).catch(() => null))?.isFile()) return true;
 		return (await fs.lstat(resolveWebCredsBackupPath(authDir)).catch(() => null))?.isFile() === true;
 	} catch (error) {
-		const codeValue = error && typeof error === "object" && "code" in error ? error.code : void 0;
-		return (typeof codeValue === "string" ? codeValue : "") !== "ENOENT";
+		return extractErrorCode(error) !== "ENOENT";
 	}
 }
 async function pathHasSymlinkComponent(baseDir, targetPath) {
@@ -381,7 +373,8 @@ async function logoutWeb(params) {
 }
 function readWebSelfId(authDir = resolveDefaultWebAuthDir()) {
 	try {
-		const raw = readCredsJsonRaw(resolveWebCredsPath(resolveUserPath(authDir)));
+		const credsPath = resolveWebCredsPath(resolveUserPath(authDir));
+		const raw = readWebCredsJsonRawSync(credsPath);
 		if (!raw) return emptyWebSelfId();
 		const parsed = JSON.parse(raw);
 		const identity = resolveComparableIdentity({
@@ -439,4 +432,4 @@ async function pickWebChannel(pref, authDir = resolveDefaultWebAuthDir()) {
 	return choice;
 }
 //#endregion
-export { enqueueCredsSave as A, getMentionIdentities as C, getSenderIdentity as D, getSelfIdentity as E, waitForCredsSaveQueueWithTimeout as M, writeCredsJsonAtomically as N, identitiesOverlap as O, writeWebCredsRawAtomically as P, getComparableIdentityValues as S, getReplyContext as T, readWebSelfIdentity as _, formatWhatsAppWebAuthStatusState as a, restoreCredsFromBackupIfNeeded as b, logoutWeb as c, readWebAuthExistsBestEffort as d, readWebAuthExistsForDecision as f, readWebSelfId as g, readWebAuthState as h, auth_store_exports as i, waitForCredsSaveQueue as j, resolveComparableIdentity as k, pickWebChannel as l, readWebAuthSnapshotBestEffort as m, WHATSAPP_AUTH_UNSTABLE_CODE as n, getWebAuthAgeMs as o, readWebAuthSnapshot as p, WhatsAppAuthUnstableError as r, logWebSelfId as s, WA_WEB_AUTH_DIR as t, readCredsJsonRaw as u, readWebSelfIdentityForDecision as v, getPrimaryIdentityId as w, webAuthExists as x, resolveDefaultWebAuthDir as y };
+export { waitForCredsSaveQueue as A, getPrimaryIdentityId as C, identitiesOverlap as D, getSenderIdentity as E, writeCredsJsonAtomically as M, writeWebCredsRawAtomically as N, resolveComparableIdentity as O, getMentionIdentities as S, getSelfIdentity as T, readWebSelfIdentityForDecision as _, formatWhatsAppWebAuthStatusState as a, webAuthExists as b, logoutWeb as c, readWebAuthExistsForDecision as d, readWebAuthSnapshot as f, readWebSelfIdentity as g, readWebSelfId as h, auth_store_exports as i, waitForCredsSaveQueueWithTimeout as j, enqueueCredsSave as k, pickWebChannel as l, readWebAuthState as m, WHATSAPP_AUTH_UNSTABLE_CODE as n, getWebAuthAgeMs as o, readWebAuthSnapshotBestEffort as p, WhatsAppAuthUnstableError as r, logWebSelfId as s, WA_WEB_AUTH_DIR as t, readWebAuthExistsBestEffort as u, resolveDefaultWebAuthDir as v, getReplyContext as w, getComparableIdentityValues as x, restoreCredsFromBackupIfNeeded as y };

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

@@ -1,14 +1,14 @@
-import { a as resolveWhatsAppAccount } from "./accounts-CtRPAQCL.mjs";
+import { a as resolveWhatsAppAccount } from "./accounts-F0vHuze2.mjs";
 import { r as resolveDefaultWhatsAppAccountId, t as listAccountIds } from "./account-ids-CB5SOWjc.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-BGdvf5cC.mjs";
+import { t as resolveWhatsAppOutboundTarget } from "./resolve-outbound-target-CzyNKmrl.mjs";
+import { c as normalizeWhatsAppPayloadTextPreservingIndentation, i as sendTypingWhatsApp, n as sendPollWhatsApp, o as normalizeWhatsAppOutboundPayload, s as normalizeWhatsAppPayloadText, t as sendMessageWhatsApp, y as resolveWhatsAppReactionLevel } from "./send-CGUsUdoX.mjs";
 import { i as getWhatsAppRuntime } from "./runtime-BLlToOi6.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 { c as toWhatsappJid } from "./targets-runtime-Dls-Xh4F.mjs";
+import { c as whatsappApprovalAuth, o as lookupInboundMessageMetaForTarget, s as getWhatsAppApprovalApprovers, t as resolveWhatsAppGroupSessionKey } from "./group-session-key-BV8Le9r8.mjs";
+import { a as loadWhatsAppChannelRuntime, t as createWhatsAppPluginBase } from "./shared-CP_zs2U7.mjs";
 import { t as whatsappCommandPolicy } from "./command-policy-BIOSHySD.mjs";
-import { f as readWebAuthExistsForDecision, n as WHATSAPP_AUTH_UNSTABLE_CODE } from "./auth-store-BBonwKks.mjs";
+import { d as readWebAuthExistsForDecision, n as WHATSAPP_AUTH_UNSTABLE_CODE } from "./auth-store-D2rN-hP5.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";
@@ -17,6 +17,7 @@ import { createMessageReceiptFromOutboundResults, defineChannelMessageAdapter, r
 import { formatCliCommand } from "openclaw/plugin-sdk/cli-runtime";
 import { buildChannelOutboundSessionRoute } from "openclaw/plugin-sdk/core";
 import { sendTextMediaPayload } from "openclaw/plugin-sdk/reply-payload";
+import { escapeRegExp } from "openclaw/plugin-sdk/text-utility-runtime";
 import { DEFAULT_ACCOUNT_ID as DEFAULT_ACCOUNT_ID$1 } from "openclaw/plugin-sdk/account-id";
 import { createLazyRuntimeModule } from "openclaw/plugin-sdk/lazy-runtime";
 import { buildDmGroupAccountAllowlistAdapter } from "openclaw/plugin-sdk/allowlist-config-edit";
@@ -81,7 +82,7 @@ const whatsappApproval = createApproverRestrictedNativeApprovalCapabilityFromFor
 			approvalKind,
 			request
 		}),
-		load: async () => (await import("./approval-handler.runtime-CjqMlPOX.mjs")).whatsappApprovalNativeRuntime
+		load: async () => (await import("./approval-handler.runtime-CKposl6w.mjs")).whatsappApprovalNativeRuntime
 	})
 });
 function buildWhatsAppPendingPayload(params, approvalKind) {
@@ -238,8 +239,8 @@ function createWhatsAppOutboundBase({ sendMessageWhatsApp, sendPollWhatsApp, sho
 }
 //#endregion
 //#region extensions/whatsapp/src/channel-outbound.ts
-const loadWhatsAppApprovalReactionsModule = createLazyRuntimeModule(() => import("./approval-reactions-DiOFvb1s.mjs").then((n) => n.t));
-const loadWhatsAppQuestionReactionsModule = createLazyRuntimeModule(() => import("./question-reactions-CPyyi5AY.mjs").then((n) => n.n));
+const loadWhatsAppApprovalReactionsModule = createLazyRuntimeModule(() => import("./approval-reactions-CD6CDF9k.mjs").then((n) => n.t));
+const loadWhatsAppQuestionReactionsModule = createLazyRuntimeModule(() => import("./question-reactions-LMeijbaq.mjs").then((n) => n.n));
 async function prepareWhatsAppApprovalPayloadForDelivery(params) {
 	const questionPayload = questionGatewayRuntime.prepareReactionPayloadForDelivery({
 		payload: params.payload,
@@ -315,7 +316,7 @@ const whatsappMessageAdapter = defineChannelMessageAdapter({
 function resolveWhatsAppMentionStripRegexes(ctx) {
 	const selfE164 = (ctx.To ?? "").replace(/^whatsapp:/i, "");
 	if (!selfE164) return [];
-	const escaped = selfE164.replace(/[.*+?^${}()|[\]\\]/g, "\\$&");
+	const escaped = escapeRegExp(selfE164);
 	return [new RegExp(escaped, "g"), new RegExp(`@${escaped}`, "g")];
 }
 //#endregion
@@ -456,8 +457,8 @@ function collectWhatsAppStatusIssues(accounts) {
 }
 //#endregion
 //#region extensions/whatsapp/src/channel.ts
-const loadWhatsAppDirectoryConfig = createLazyRuntimeModule(() => import("./directory-config-DUiJ5d8I.mjs").then((n) => n.t));
-const loadWhatsAppChannelReactAction = createLazyRuntimeModule(() => import("./channel-react-action-2r_hjLZV.mjs"));
+const loadWhatsAppDirectoryConfig = createLazyRuntimeModule(() => import("./directory-config-RYQomHyB.mjs").then((n) => n.t));
+const loadWhatsAppChannelReactAction = createLazyRuntimeModule(() => import("./channel-react-action-BaBV9X6M.mjs"));
 function projectWhatsAppRuntimeStatus(runtime) {
 	return {
 		connected: runtime?.connected ?? false,
@@ -575,17 +576,7 @@ const whatsappPlugin = createChatChannelPlugin({
 			}),
 			supportsAction: ({ action }) => action === "react" || action === "upload-file",
 			resolveExecutionMode: ({ action }) => action === "react" || action === "upload-file" ? "gateway" : "local",
-			handleAction: async ({ action, params, cfg, accountId, requesterSenderId, mediaAccess, mediaLocalRoots, mediaReadFile, toolContext }) => await (await loadWhatsAppChannelReactAction()).handleWhatsAppMessageAction({
-				action,
-				params,
-				cfg,
-				accountId,
-				requesterSenderId,
-				mediaAccess,
-				mediaLocalRoots,
-				mediaReadFile,
-				toolContext
-			})
+			handleAction: async (params) => await (await loadWhatsAppChannelReactAction()).handleWhatsAppMessageAction(params)
 		},
 		approvalCapability: whatsappApprovalCapability,
 		auth: { login: async ({ cfg, accountId, runtime, verbose }) => {

package/dist/.setup/{channel-react-action-2r_hjLZV.mjs → channel-react-action-BaBV9X6M.mjs}

@@ -1,7 +1,7 @@
-import { a as resolveWhatsAppAccount, s as resolveWhatsAppMediaMaxBytes } from "./accounts-CtRPAQCL.mjs";
+import { a as resolveWhatsAppAccount, s as resolveWhatsAppMediaMaxBytes } from "./accounts-F0vHuze2.mjs";
 import { c as normalizeWhatsAppTarget, t as isWhatsAppGroupJid } from "./normalize-target-BGra1ZnM.mjs";
-import { r as resolveAuthorizedWhatsAppOutboundTarget, t as handleWhatsAppAction } from "./action-runtime-DeVk5V7r.mjs";
-import { a as sendWhatsAppUploadFile } from "./send-BGdvf5cC.mjs";
+import { r as resolveAuthorizedWhatsAppOutboundTarget, t as handleWhatsAppAction } from "./action-runtime-CE3zGstN.mjs";
+import { a as sendWhatsAppUploadFile } from "./send-CGUsUdoX.mjs";
 import { jsonResult, readStringOrNumberParam, readStringParam as readStringParam$1, resolveReactionMessageId } from "openclaw/plugin-sdk/channel-actions";
 import { canonicalizeBase64, estimateBase64DecodedBytes } from "openclaw/plugin-sdk/media-runtime";
 import { readBooleanParam } from "openclaw/plugin-sdk/boolean-param";

package/dist/.setup/{channel.runtime-C94goLw9.mjs → channel.runtime-BniF8Swm.mjs}

@@ -1,9 +1,9 @@
 import { startWebLoginWithQr as startWebLoginWithQr$1, waitForWebLogin as waitForWebLogin$1 } from "../login-qr-runtime.js";
-import { c as logoutWeb, d as readWebAuthExistsBestEffort, f as readWebAuthExistsForDecision, g as readWebSelfId, h as readWebAuthState, m as readWebAuthSnapshotBestEffort, o as getWebAuthAgeMs, p as readWebAuthSnapshot, s as logWebSelfId, x as webAuthExists } from "./auth-store-BBonwKks.mjs";
+import { b as webAuthExists, c as logoutWeb, d as readWebAuthExistsForDecision, f as readWebAuthSnapshot, h as readWebSelfId, m as readWebAuthState, o as getWebAuthAgeMs, p as readWebAuthSnapshotBestEffort, s as logWebSelfId, u as readWebAuthExistsBestEffort } from "./auth-store-D2rN-hP5.mjs";
 import { t as getActiveWebListener } from "./active-listener-CDjoX9QR.mjs";
-import { t as monitorWebChannel } from "./monitor-CGpV2VNN.mjs";
-import { t as loginWeb } from "./login-BFlvSh9h.mjs";
-import { whatsappSetupWizard as whatsappSetupWizard$1 } from "./setup-surface-43fj197P.mjs";
+import { t as monitorWebChannel } from "./monitor-B5DS4PDV.mjs";
+import { t as loginWeb } from "./login-CV_4V021.mjs";
+import { whatsappSetupWizard as whatsappSetupWizard$1 } from "./setup-surface-BuA39k6K.mjs";
 //#region extensions/whatsapp/src/channel.runtime.ts
 async function startWebLoginWithQr(...args) {
 	return await startWebLoginWithQr$1(...args);

package/dist/.setup/{channel.setup-CfN1UfdY.mjs → channel.setup-CsS_NAKQ.mjs}

@@ -1,4 +1,4 @@
-import { t as createWhatsAppPluginBase } from "./shared-DgOG5Iqr.mjs";
+import { t as createWhatsAppPluginBase } from "./shared-CP_zs2U7.mjs";
 //#region extensions/whatsapp/src/channel.setup.ts
 const whatsappSetupPlugin = { ...createWhatsAppPluginBase() };
 //#endregion

package/dist/.setup/{connection-controller-CHo1oRJA.mjs → connection-controller-COkcq48K.mjs}

@@ -1,10 +1,11 @@
 import { r as getWhatsAppChannelRuntime } from "./runtime-BLlToOi6.mjs";
 import { n as WHATSAPP_CONNECTION_OWNER_PENDING_CAPABILITY, t as WHATSAPP_CONNECTION_CONTROLLER_CAPABILITY } from "./connection-controller-runtime-context-hgLJoRc8.mjs";
-import { M as waitForCredsSaveQueueWithTimeout, c as logoutWeb, f as readWebAuthExistsForDecision, k as resolveComparableIdentity, r as WhatsAppAuthUnstableError } from "./auth-store-BBonwKks.mjs";
-import { d as DEFAULT_WHATSAPP_SOCKET_TIMING, i as waitForWaConnection, o as computeBackoff, r as createWaSocket, t as closeWhatsAppSocketAndWait, u as sleepWithAbort, y as acquireWhatsAppGatewayConnectionOwner } from "./socket-close-CT__V2fz.mjs";
+import { O as resolveComparableIdentity, c as logoutWeb, d as readWebAuthExistsForDecision, j as waitForCredsSaveQueueWithTimeout, r as WhatsAppAuthUnstableError } from "./auth-store-D2rN-hP5.mjs";
+import { d as DEFAULT_WHATSAPP_SOCKET_TIMING, i as waitForWaConnection, o as computeBackoff, r as createWaSocket, t as closeWhatsAppSocketAndWait, u as sleepWithAbort$1, y as acquireWhatsAppGatewayConnectionOwner } from "./socket-close-DU7eerAa.mjs";
 import { n as getStatusCode, t as formatError } from "./session-errors-B8UcAnZN.mjs";
 import { info } from "openclaw/plugin-sdk/runtime-env";
 import { registerChannelRuntimeContext } from "openclaw/plugin-sdk/channel-runtime-context";
+import { racePromiseWithAbortSignal } from "openclaw/plugin-sdk/time-runtime";
 import { createDeferred } from "openclaw/plugin-sdk/extension-shared";
 //#region extensions/whatsapp/src/connection-controller.ts
 const LOGGED_OUT_STATUS = 401;
@@ -219,7 +220,7 @@ var WhatsAppConnectionController = class {
 		this.watchdogCheckMs = params.watchdogCheckMs;
 		this.reconnectPolicy = params.reconnectPolicy;
 		this.abortSignal = params.abortSignal;
-		this.sleep = params.sleep ?? sleepWithAbort;
+		this.sleep = params.sleep ?? sleepWithAbort$1;
 		this.isNonRetryableStatus = params.isNonRetryableStatus ?? (() => false);
 		this.socketTiming = {
 			...DEFAULT_WHATSAPP_SOCKET_TIMING,
@@ -546,17 +547,7 @@ var WhatsAppConnectionController = class {
 	}
 	async waitForSetupStep(task) {
 		this.throwIfSetupStopped();
-		const signal = this.setupAbortController.signal;
-		let onAbort;
-		const aborted = new Promise((_resolve, reject) => {
-			onAbort = () => reject(stoppedControllerError());
-			signal.addEventListener("abort", onAbort, { once: true });
-		});
-		try {
-			return await Promise.race([task, aborted]);
-		} finally {
-			if (onAbort) signal.removeEventListener("abort", onAbort);
-		}
+		return await racePromiseWithAbortSignal(task, this.setupAbortController.signal, stoppedControllerError);
 	}
 	async ensureConnectionOwnership() {
 		if (this.retainedOwnerReleaseLease) {

package/dist/.setup/{creds-files-CDATZWWM.mjs → creds-files-B8WcOAmE.mjs}

@@ -73,17 +73,8 @@ function statWebCredsFileSync(filePath) {
 		return null;
 	}
 }
-function hasWebCredsRegularFileSync(authDir) {
-	try {
-		const credsPath = resolveWebCredsPath(authDir);
-		assertNoSymlinkParentsSync(resolveWebCredsParentCheck(credsPath));
-		return !statRegularFileSync(credsPath).missing;
-	} catch {
-		return false;
-	}
-}
 function hasWebCredsSync(authDir) {
 	return statWebCredsFileSync(resolveWebCredsPath(authDir)) !== null;
 }
 //#endregion
-export { readWebCredsJsonRaw as a, resolveWebCredsPath as c, isWhatsAppBaileysAuthFileName as i, statWebCredsFileSync as l, hasWebCredsRegularFileSync as n, readWebCredsJsonRawSync as o, hasWebCredsSync as r, resolveWebCredsBackupPath as s, assertWebCredsPathRegularFileOrMissing as t };
+export { readWebCredsJsonRawSync as a, statWebCredsFileSync as c, readWebCredsJsonRaw as i, hasWebCredsSync as n, resolveWebCredsBackupPath as o, isWhatsAppBaileysAuthFileName as r, resolveWebCredsPath as s, assertWebCredsPathRegularFileOrMissing as t };

package/dist/.setup/{directory-config-DUiJ5d8I.mjs → directory-config-RYQomHyB.mjs}

@@ -1,10 +1,10 @@
 import { t as __exportAll } from "./rolldown-runtime-BBjsoOtd.mjs";
-import { c as resolveMergedWhatsAppAccountConfig, o as resolveWhatsAppAuthDir } from "./accounts-CtRPAQCL.mjs";
+import { c as resolveMergedWhatsAppAccountConfig, o as resolveWhatsAppAuthDir } from "./accounts-F0vHuze2.mjs";
 import { c as normalizeWhatsAppTarget, t as isWhatsAppGroupJid } from "./normalize-target-BGra1ZnM.mjs";
 import { i as hasPendingWhatsAppConnectionOwner, r as getWhatsAppConnectionController } from "./connection-controller-runtime-context-hgLJoRc8.mjs";
-import { M as waitForCredsSaveQueueWithTimeout, f as readWebAuthExistsForDecision } from "./auth-store-BBonwKks.mjs";
+import { d as readWebAuthExistsForDecision, j as waitForCredsSaveQueueWithTimeout } from "./auth-store-D2rN-hP5.mjs";
 import { n as resolveWebAccountId } from "./active-listener-CDjoX9QR.mjs";
-import { b as acquireWhatsAppStandaloneConnectionOwner, i as waitForWaConnection, n as createWaDirectorySocket, t as closeWhatsAppSocketAndWait, v as WhatsAppConnectionOwnerBusyError } from "./socket-close-CT__V2fz.mjs";
+import { b as acquireWhatsAppStandaloneConnectionOwner, i as waitForWaConnection, n as createWaDirectorySocket, t as closeWhatsAppSocketAndWait, v as WhatsAppConnectionOwnerBusyError } from "./socket-close-DU7eerAa.mjs";
 import { listResolvedDirectoryGroupEntriesFromMapKeys, listResolvedDirectoryUserEntriesFromAllowFrom } from "openclaw/plugin-sdk/directory-config-runtime";
 //#region extensions/whatsapp/src/directory-config.ts
 var directory_config_exports = /* @__PURE__ */ __exportAll({
@@ -100,15 +100,12 @@ function scheduleStandaloneCleanupRetry(cleanup) {
 	}, STANDALONE_CLEANUP_RETRY_MS);
 	cleanup.retryTimer.unref?.();
 }
-function retainStandaloneCleanup(cleanup) {
-	pendingStandaloneCleanups.set(cleanup.authDir, cleanup);
-	scheduleStandaloneCleanupRetry(cleanup);
-}
 async function finishStandaloneCleanupOrThrow(cleanup, operationError) {
 	try {
 		await runStandaloneCleanup(cleanup);
 	} catch (cleanupError) {
-		retainStandaloneCleanup(cleanup);
+		pendingStandaloneCleanups.set(cleanup.authDir, cleanup);
+		scheduleStandaloneCleanupRetry(cleanup);
 		throw cleanupUnavailable(operationError === void 0 ? cleanupError : new AggregateError([operationError, cleanupError], "WhatsApp live group lookup and cleanup failed", { cause: operationError }));
 	}
 }
@@ -118,12 +115,7 @@ function cleanupUnavailable(error) {
 async function finishPriorStandaloneCleanup(authDir) {
 	const cleanup = pendingStandaloneCleanups.get(authDir);
 	if (!cleanup) return;
-	try {
-		await runStandaloneCleanup(cleanup);
-	} catch (error) {
-		scheduleStandaloneCleanupRetry(cleanup);
-		throw cleanupUnavailable(error);
-	}
+	await finishStandaloneCleanupOrThrow(cleanup);
 }
 async function listGroupsThroughStandaloneOwner(params) {
 	const account = resolveMergedWhatsAppAccountConfig(params);

package/dist/.setup/{doctor-iMwg0Vhr.mjs → doctor-DKzeBEmH.mjs}

@@ -99,6 +99,12 @@ function createLegacyWebhookListenerDoctorContract(params) {
 	};
 	const prefix = `channels.${params.channelKey}`;
 	return {
+		historicalWebhookListener: {
+			channelId: params.channelKey,
+			port: params.defaultPort,
+			preserveAuthoredActivation: params.preserveAuthoredActivation,
+			...params.defaultHost === void 0 ? {} : { host: params.defaultHost }
+		},
 		legacyConfigRules: [{
 			path: ["channels", params.channelKey],
 			message: `${prefix} webhook listeners moved to Gateway routes. Run "openclaw doctor --fix" to preserve explicitly configured listener settings as legacyWebhook.`,
@@ -164,7 +170,7 @@ function resolveLegacyAckScope(ack) {
 	return group === "always" ? "group-all" : group === "mentions" ? "group-mentions" : group === "never" ? "off" : void 0;
 }
 function resolveDefaultAgentEmoji(cfg) {
-	const entries = (0, runtime_doctor_migrations_exports.asObjectRecord)((0, runtime_doctor_migrations_exports.asObjectRecord)(cfg.agents)?.entries);
+	const entries = (0, runtime_doctor_migrations_exports.asObjectRecord)((0, runtime_doctor_migrations_exports.asObjectRecord)((0, runtime_doctor_migrations_exports.asObjectRecord)(cfg)?.agents)?.entries);
 	const agents = entries ? Object.values(entries).flatMap((value) => {
 		const entry = (0, runtime_doctor_migrations_exports.asObjectRecord)(value);
 		return entry ? [entry] : [];