@openclaw/whatsapp 2026.9.5 → 2026.9.7

package/dist/.setup/{setup-finalize-BYEgU0hb.mjs → setup-finalize-DmPX4EaW.mjs}

@@ -1,8 +1,8 @@
-import { a as resolveWhatsAppAccount, o as resolveWhatsAppAuthDir } from "./accounts-D_NGDjCx.mjs";
+import { a as resolveWhatsAppAccount, o as resolveWhatsAppAuthDir } from "./accounts-CtRPAQCL.mjs";
 import { r as resolveDefaultWhatsAppAccountId } from "./account-ids-CB5SOWjc.mjs";
-import { r as hasWebCredsSync } from "./creds-files-Drg3usj1.mjs";
+import { r as hasWebCredsSync } from "./creds-files-CDATZWWM.mjs";
 import { a as normalizeWhatsAppAllowFromEntries, o as normalizeWhatsAppAllowFromEntry } from "./normalize-target-BGra1ZnM.mjs";
-import { n as whatsappSetupAdapter } from "./shared-C9OEtKgc.mjs";
+import { n as whatsappSetupAdapter } from "./shared-DgOG5Iqr.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
@@ -30,67 +30,38 @@ function resolveWhatsAppConfigPathPrefix(cfg, accountId) {
 }
 function mergeWhatsAppConfig(cfg, accountId, patch, options) {
 	const channelConfig = { ...cfg.channels?.whatsapp };
-	const mutableChannelConfig = channelConfig;
-	if (resolveWhatsAppConfigPathPrefix(cfg, accountId) === "channels.whatsapp") {
-		for (const [key, value] of Object.entries(patch)) {
-			if (value === void 0) {
-				if (options?.unsetOnUndefined?.includes(key)) delete mutableChannelConfig[key];
-				continue;
-			}
-			mutableChannelConfig[key] = value;
-		}
-		return {
-			...cfg,
-			channels: {
-				...cfg.channels,
-				whatsapp: channelConfig
-			}
-		};
-	}
+	const atRoot = resolveWhatsAppConfigPathPrefix(cfg, accountId) === "channels.whatsapp";
 	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 nextAccount = {
+	const target = atRoot ? channelConfig : {
 		...accounts[targetAccountId],
 		...lowerDefaultAccount
 	};
-	const mutableNextAccount = nextAccount;
+	const mutableTarget = target;
 	for (const [key, value] of Object.entries(patch)) {
 		if (value === void 0) {
-			if (options?.unsetOnUndefined?.includes(key)) delete mutableNextAccount[key];
+			if (options?.unsetOnUndefined?.includes(key)) delete mutableTarget[key];
 			continue;
 		}
-		mutableNextAccount[key] = value;
+		mutableTarget[key] = value;
+	}
+	if (!atRoot) {
+		accounts[targetAccountId] = target;
+		if (lowerDefaultAccount) delete accounts[DEFAULT_ACCOUNT_ID];
+		channelConfig.accounts = accounts;
 	}
-	accounts[targetAccountId] = nextAccount;
-	if (lowerDefaultAccount) delete accounts[DEFAULT_ACCOUNT_ID];
 	return {
 		...cfg,
 		channels: {
 			...cfg.channels,
-			whatsapp: {
-				...channelConfig,
-				accounts
-			}
+			whatsapp: channelConfig
 		}
 	};
 }
-function setWhatsAppDmPolicy(cfg, accountId, dmPolicy) {
-	return mergeWhatsAppConfig(cfg, accountId, { dmPolicy });
-}
 function setWhatsAppAllowFrom(cfg, accountId, allowFrom) {
 	return mergeWhatsAppConfig(cfg, accountId, { allowFrom }, { unsetOnUndefined: ["allowFrom"] });
 }
-function setWhatsAppSelfChatMode(cfg, accountId, selfChatMode) {
-	return mergeWhatsAppConfig(cfg, accountId, { selfChatMode });
-}
-async function detectWhatsAppLinked(cfg, accountId) {
-	const { authDir } = resolveWhatsAppAuthDir({
-		cfg,
-		accountId
-	});
-	return hasWebCredsSync(authDir);
-}
 async function promptWhatsAppOwnerAllowFrom(params) {
 	const { prompter, existingAllowFrom } = params;
 	await prompter.note(t("wizard.whatsapp.ownerNumberNote"), t("wizard.whatsapp.numberTitle"));
@@ -116,9 +87,11 @@ async function applyWhatsAppOwnerAllowlist(params) {
 		prompter: params.prompter,
 		existingAllowFrom: params.existingAllowFrom
 	});
-	let next = setWhatsAppSelfChatMode(params.cfg, params.accountId, true);
-	next = setWhatsAppDmPolicy(next, params.accountId, "allowlist");
-	next = setWhatsAppAllowFrom(next, params.accountId, allowFrom);
+	const next = mergeWhatsAppConfig(params.cfg, params.accountId, {
+		selfChatMode: true,
+		dmPolicy: "allowlist",
+		allowFrom
+	});
 	await params.prompter.note([...params.messageLines, `- allowFrom includes ${normalized}`].join("\n"), params.title);
 	return next;
 }
@@ -208,8 +181,10 @@ async function promptWhatsAppDmAccess(params) {
 			}
 		]
 	});
-	let next = setWhatsAppSelfChatMode(params.cfg, accountId, false);
-	next = setWhatsAppDmPolicy(next, accountId, policy);
+	let next = mergeWhatsAppConfig(params.cfg, accountId, {
+		selfChatMode: false,
+		dmPolicy: policy
+	});
 	if (policy === "open") {
 		const allowFrom = normalizeWhatsAppAllowFromEntries(["*", ...existingAllowFrom]);
 		next = setWhatsAppAllowFrom(next, accountId, allowFrom.length > 0 ? allowFrom : ["*"]);
@@ -238,10 +213,7 @@ async function promptWhatsAppDmAccess(params) {
 	}];
 	const mode = await params.prompter.select({
 		message: t("wizard.whatsapp.allowFromPrompt"),
-		options: allowOptions.map((opt) => ({
-			value: opt.value,
-			label: opt.label
-		}))
+		options: [...allowOptions]
 	});
 	if (mode === "keep") return next;
 	if (mode === "unset") return setWhatsAppAllowFrom(next, accountId, void 0);
@@ -267,11 +239,11 @@ async function finalizeWhatsAppSetup(params) {
 		accountId,
 		input: {}
 	});
-	const linked = await detectWhatsAppLinked(next, accountId);
 	const { authDir } = resolveWhatsAppAuthDir({
 		cfg: next,
 		accountId
 	});
+	const linked = hasWebCredsSync(authDir);
 	if (params.options?.deferDeviceLinkToClient) {
 		next = await promptWhatsAppDmAccess({
 			cfg: next,
@@ -290,18 +262,9 @@ async function finalizeWhatsAppSetup(params) {
 		message: linked ? t("wizard.whatsapp.relinkPrompt") : t("wizard.whatsapp.linkNowPrompt"),
 		initialValue: !linked
 	})) {
-		const reportLoginFailure = async (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"));
-		};
-		let loginWeb;
+		let persistenceGuardFailure;
 		try {
-			({loginWeb} = await import("./login-2dmd1TfE.mjs").then((n) => n.n));
-		} catch (error) {
-			await reportLoginFailure(error);
-		}
-		if (loginWeb) {
-			let persistenceGuardFailure;
+			const { loginWeb } = await import("./login-BFlvSh9h.mjs").then((n) => n.n);
 			const beforeCredentialPersistence = params.options?.beforePersistentEffect ? async () => {
 				try {
 					await params.options?.beforePersistentEffect?.();
@@ -310,12 +273,11 @@ async function finalizeWhatsAppSetup(params) {
 					throw error;
 				}
 			} : void 0;
-			try {
-				await loginWeb(false, void 0, params.runtime, accountId, { beforeCredentialPersistence });
-			} catch (error) {
-				if (persistenceGuardFailure) throw persistenceGuardFailure.error;
-				await reportLoginFailure(error);
-			}
+			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({

package/dist/.setup/setup-plugin-api-vJlxKzca.mjs

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

package/dist/.setup/{setup-surface-Cd3wN5HD.mjs → setup-surface-43fj197P.mjs}

@@ -1,6 +1,6 @@
-import { o as resolveWhatsAppAuthDir } from "./accounts-D_NGDjCx.mjs";
+import { o as resolveWhatsAppAuthDir } from "./accounts-CtRPAQCL.mjs";
 import { t as listAccountIds } from "./account-ids-CB5SOWjc.mjs";
-import { a as formatWhatsAppWebAuthStatusState, h as readWebAuthState } from "./auth-store-Dh8a3cba.mjs";
+import { a as formatWhatsAppWebAuthStatusState, h as readWebAuthState } from "./auth-store-BBonwKks.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-BYEgU0hb.mjs")).finalizeWhatsAppSetup(params),
+	finalize: async (params) => await (await import("./setup-finalize-DmPX4EaW.mjs")).finalizeWhatsAppSetup(params),
 	disable: (cfg) => setSetupChannelEnabled(cfg, channel, false),
 	onAccountRecorded: (accountId, options) => {
 		options?.onAccountId?.(channel, accountId);

package/dist/.setup/{shared-C9OEtKgc.mjs → shared-DgOG5Iqr.mjs}

@@ -1,9 +1,9 @@
-import { a as resolveWhatsAppAccount, n as hasAnyWhatsAppAuth } from "./accounts-D_NGDjCx.mjs";
+import { a as resolveWhatsAppAccount, n as hasAnyWhatsAppAuth } from "./accounts-CtRPAQCL.mjs";
 import { r as resolveDefaultWhatsAppAccountId, t as listAccountIds } from "./account-ids-CB5SOWjc.mjs";
 import { a as normalizeWhatsAppAllowFromEntries } from "./normalize-target-BGra1ZnM.mjs";
 import { t as WhatsAppChannelConfigSchema } from "./config-schema-BYA6e_Ii.mjs";
-import { n as whatsappDoctor } from "./doctor-BPb-SjdE.mjs";
-import { t as resolveWhatsAppConfigPath } from "./group-config-path-BGyzT9Lg.mjs";
+import { n as whatsappDoctor } from "./doctor-iMwg0Vhr.mjs";
+import { t as resolveWhatsAppConfigPath } from "./group-config-path-DZr3ucUO.mjs";
 import { t as resolveLegacyGroupSessionKey } from "./group-session-contract-DDnZSsJ1.mjs";
 import { n as unsupportedSecretRefSurfacePatterns, t as collectUnsupportedSecretRefConfigCandidates } from "./security-contract-nAzD945y.mjs";
 import { n as deriveLegacySessionChatType, r as isLegacyGroupSessionKey, t as canonicalizeLegacySessionKey } from "./session-contract-DMTm6Q_L.mjs";
@@ -20,21 +20,16 @@ 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-Dh8a3cba.mjs").then((n) => n.i));
+const loadWhatsAppAuthStore = createLazyRuntimeModule(() => import("./auth-store-BBonwKks.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-ddGY37w8.mjs");
+	return await import("./channel.runtime-C94goLw9.mjs");
 });
 //#endregion
-//#region extensions/whatsapp/src/config-accessors.ts
-function formatWhatsAppConfigAllowFromEntries(allowFrom) {
-	return normalizeWhatsAppAllowFromEntries(allowFrom);
-}
-//#endregion
 //#region extensions/whatsapp/src/group-policy.ts
 function resolveScopePath(params) {
 	return params.groupId ? [params.groupId] : [];
@@ -115,10 +110,6 @@ const whatsappSetupContract = defineChannelSetupContract({
 //#endregion
 //#region extensions/whatsapp/src/shared.ts
 const WHATSAPP_CHANNEL = "whatsapp";
-async function loadWhatsAppSetupSurface() {
-	return await import("./setup-surface-Cd3wN5HD.mjs");
-}
-const whatsappSetupWizardProxy = createWhatsAppSetupWizardProxy(async () => (await loadWhatsAppSetupSurface()).whatsappSetupWizard);
 const whatsappConfigAdapter = createScopedChannelConfigAdapter({
 	sectionKey: WHATSAPP_CHANNEL,
 	listAccountIds,
@@ -127,7 +118,7 @@ const whatsappConfigAdapter = createScopedChannelConfigAdapter({
 	clearBaseFields: [],
 	allowTopLevel: false,
 	resolveAllowFrom: (account) => account.allowFrom,
-	formatAllowFrom: (allowFrom) => formatWhatsAppConfigAllowFromEntries(allowFrom),
+	formatAllowFrom: normalizeWhatsAppAllowFromEntries,
 	resolveDefaultTo: (account) => account.defaultTo
 });
 const whatsappResolveDmPolicy = createScopedDmSecurityResolver({
@@ -138,27 +129,25 @@ const whatsappResolveDmPolicy = createScopedDmSecurityResolver({
 	normalizeEntry: (raw) => normalizeE164(raw),
 	inheritSharedDefaultsFromDefaultAccount: true
 });
-function createWhatsAppSetupWizardProxy(loadWizard) {
-	return createDelegatedSetupWizardProxy({
-		channel: WHATSAPP_CHANNEL,
-		loadWizard,
-		status: {
-			configuredLabel: "linked",
-			unconfiguredLabel: "not linked",
-			configuredHint: "linked",
-			unconfiguredHint: "not linked",
-			configuredScore: 5,
-			unconfiguredScore: 4
-		},
-		resolveShouldPromptAccountIds: (params) => params.shouldPromptAccountIds,
-		credentials: [],
-		delegateFinalize: true,
-		disable: (cfg) => setSetupChannelEnabled(cfg, WHATSAPP_CHANNEL, false),
-		onAccountRecorded: (accountId, options) => {
-			options?.onAccountId?.(WHATSAPP_CHANNEL, accountId);
-		}
-	});
-}
+const whatsappSetupWizardProxy = createDelegatedSetupWizardProxy({
+	channel: WHATSAPP_CHANNEL,
+	loadWizard: async () => (await import("./setup-surface-43fj197P.mjs")).whatsappSetupWizard,
+	status: {
+		configuredLabel: "linked",
+		unconfiguredLabel: "not linked",
+		configuredHint: "linked",
+		unconfiguredHint: "not linked",
+		configuredScore: 5,
+		unconfiguredScore: 4
+	},
+	resolveShouldPromptAccountIds: (params) => params.shouldPromptAccountIds,
+	credentials: [],
+	delegateFinalize: true,
+	disable: (cfg) => setSetupChannelEnabled(cfg, WHATSAPP_CHANNEL, false),
+	onAccountRecorded: (accountId, options) => {
+		options?.onAccountId?.(WHATSAPP_CHANNEL, accountId);
+	}
+});
 function createWhatsAppPluginBase() {
 	const collectWhatsAppSecurityWarnings = createAllowlistProviderGroupPolicyWarningCollector({
 		providerConfigPresent: (cfg) => cfg.channels?.whatsapp !== void 0,
@@ -302,4 +291,4 @@ function createWhatsAppPluginBase() {
 	};
 }
 //#endregion
-export { formatWhatsAppConfigAllowFromEntries as a, resolveWhatsAppGroupToolPolicy as i, whatsappSetupAdapter as n, loadWhatsAppChannelRuntime as o, resolveWhatsAppGroupRequireMention as r, createWhatsAppPluginBase as t };
+export { loadWhatsAppChannelRuntime as a, resolveWhatsAppGroupToolPolicy as i, whatsappSetupAdapter as n, resolveWhatsAppGroupRequireMention as r, createWhatsAppPluginBase as t };

package/dist/.setup/{socket-close-CCVSFufF.mjs → socket-close-CT__V2fz.mjs}

@@ -1,17 +1,18 @@
-import { c as resolveWebCredsPath, s as resolveWebCredsBackupPath, t as assertWebCredsPathRegularFileOrMissing } from "./creds-files-Drg3usj1.mjs";
-import { A as enqueueCredsSave, M as waitForCredsSaveQueueWithTimeout, N as writeCredsJsonAtomically, P as writeWebCredsRawAtomically, b as restoreCredsFromBackupIfNeeded, u as readCredsJsonRaw, y as resolveDefaultWebAuthDir } from "./auth-store-Dh8a3cba.mjs";
-import { n as getStatusCode } from "./session-errors-JuazczrA.mjs";
-import { a as makeWASocket, i as makeCacheableSignalKeyStore, n as createBaileysSignalRepository, r as fetchLatestBaileysVersion, s as useMultiFileAuthState } from "./session.runtime-DcJuO42v.mjs";
+import { c as resolveWebCredsPath, s as resolveWebCredsBackupPath, t as assertWebCredsPathRegularFileOrMissing } from "./creds-files-CDATZWWM.mjs";
+import { A as enqueueCredsSave, M as waitForCredsSaveQueueWithTimeout, N as writeCredsJsonAtomically, P as writeWebCredsRawAtomically, b as restoreCredsFromBackupIfNeeded, u as readCredsJsonRaw, y as resolveDefaultWebAuthDir } from "./auth-store-BBonwKks.mjs";
+import { n as getStatusCode } from "./session-errors-B8UcAnZN.mjs";
+import { a as makeWASocket, i as makeCacheableSignalKeyStore, n as createBaileysSignalRepository, r as fetchLatestBaileysVersion, s as useMultiFileAuthState } from "./session.runtime-st1konFI.mjs";
 import { VERSION, formatCliCommand } from "openclaw/plugin-sdk/cli-runtime";
 import { toErrorObject } from "openclaw/plugin-sdk/error-runtime";
-import { danger, getChildLogger, success, toPinoLikeLogger } from "openclaw/plugin-sdk/runtime-env";
+import { computeBackoff, danger, getChildLogger, sleepWithAbort, success, toPinoLikeLogger } from "openclaw/plugin-sdk/runtime-env";
 import { renderQrTerminal } from "openclaw/plugin-sdk/media-runtime";
-import { ensureDir, resolveUserPath } from "openclaw/plugin-sdk/text-utility-runtime";
+import { clamp, ensureDir, resolveUserPath } from "openclaw/plugin-sdk/text-utility-runtime";
 import fs from "node:fs/promises";
 import { parseStrictPositiveInteger, resolveTimerTimeoutMs } from "openclaw/plugin-sdk/number-runtime";
+import { createDeferred } from "openclaw/plugin-sdk/extension-shared";
 import { FILE_LOCK_STALE_ERROR_CODE, FILE_LOCK_TIMEOUT_ERROR_CODE, acquireFileLock } from "openclaw/plugin-sdk/file-lock";
+import { createNodeProxyAgent } from "openclaw/plugin-sdk/fetch-runtime";
 import { randomUUID } from "node:crypto";
-import { createHttp1EnvHttpProxyAgent, createHttp1ProxyAgent, createNodeProxyAgent } from "openclaw/plugin-sdk/fetch-runtime";
 //#region extensions/whatsapp/src/connection-owner.ts
 const WHATSAPP_CONNECTION_OWNER_BUSY_CODE = "whatsapp_connection_owner_busy";
 var WhatsAppConnectionOwnerBusyError = class extends Error {
@@ -48,12 +49,10 @@ async function reserveProcessOwner(params) {
 		if (params.signal?.aborted) throw ownershipCancelledError(params.signal);
 		const current = processOwners.get(params.ownerPath);
 		if (!current) {
-			let resolveReleased = () => {};
+			const released = createDeferred();
 			const owner = {
-				released: new Promise((resolve) => {
-					resolveReleased = resolve;
-				}),
-				resolveReleased,
+				released: released.promise,
+				resolveReleased: released.resolve,
 				token: Symbol(params.ownerPath)
 			};
 			processOwners.set(params.ownerPath, owner);
@@ -233,6 +232,37 @@ function createWhatsAppSocketOperationTimeoutAdapter(sock, timeoutMs, hooks) {
 	};
 }
 //#endregion
+//#region extensions/whatsapp/src/reconnect.ts
+const DEFAULT_HEARTBEAT_SECONDS = 60;
+const DEFAULT_RECONNECT_POLICY = {
+	initialMs: 2e3,
+	maxMs: 3e4,
+	factor: 1.8,
+	jitter: .25,
+	maxAttempts: 12
+};
+function resolveHeartbeatSeconds(cfg, overrideSeconds) {
+	const candidate = overrideSeconds;
+	if (typeof candidate === "number" && candidate > 0) return candidate;
+	return DEFAULT_HEARTBEAT_SECONDS;
+}
+function resolveReconnectPolicy(cfg, overrides) {
+	const overrideConfig = overrides ?? {};
+	const merged = {
+		...DEFAULT_RECONNECT_POLICY,
+		...overrideConfig
+	};
+	merged.initialMs = Math.max(250, merged.initialMs);
+	merged.maxMs = Math.max(merged.initialMs, merged.maxMs);
+	merged.factor = clamp(merged.factor, 1.1, 10);
+	merged.jitter = clamp(merged.jitter, 0, 1);
+	merged.maxAttempts = Math.max(0, Math.floor(merged.maxAttempts));
+	return merged;
+}
+function newConnectionId() {
+	return randomUUID();
+}
+//#endregion
 //#region extensions/whatsapp/src/session.ts
 const LOGGED_OUT_STATUS = 401;
 const WHATSAPP_WEBSOCKET_PROXY_TARGET = "https://mmg.whatsapp.net/";
@@ -241,17 +271,6 @@ const OPENCLAW_WHATSAPP_WEB_SOCKET_URL_ENV = "OPENCLAW_WHATSAPP_WEB_SOCKET_URL";
 async function rejectUnsafeWebCredsPath(authDir) {
 	await assertWebCredsPathRegularFileOrMissing(resolveWebCredsPath(authDir));
 }
-function enqueueSaveCreds(authDir, saveCreds, logger, options) {
-	enqueueCredsSave(authDir, () => safeSaveCreds({
-		authDir,
-		saveCreds,
-		logger,
-		beforeCredentialPersistence: options?.beforeCredentialPersistence
-	}), (err) => {
-		logger.warn({ error: String(err) }, "WhatsApp creds save queue error");
-		options?.onError?.(err);
-	});
-}
 async function safeSaveCreds(params) {
 	let backup;
 	try {
@@ -344,8 +363,11 @@ async function createWaSocketInternal(printQr, verbose, opts, receiveMode) {
 	};
 	const { version } = await fetchLatestBaileysVersion();
 	const waWebSocketUrl = resolveWaWebSocketUrl(opts.waWebSocketUrl) ?? resolveEnvWaWebSocketUrl();
-	const agent = await resolveEnvProxyAgent(sessionLogger);
-	const fetchAgent = await resolveEnvFetchDispatcher(sessionLogger, agent);
+	const fetchAgent = createNodeProxyAgent({
+		mode: "env",
+		protocol: "https"
+	});
+	const agent = resolveEnvProxyAgent(sessionLogger, WHATSAPP_WEBSOCKET_PROXY_TARGET);
 	const socketTiming = {
 		keepAliveIntervalMs: opts.keepAliveIntervalMs ?? DEFAULT_WHATSAPP_SOCKET_TIMING.keepAliveIntervalMs,
 		connectTimeoutMs: opts.connectTimeoutMs ?? DEFAULT_WHATSAPP_SOCKET_TIMING.connectTimeoutMs,
@@ -443,31 +465,36 @@ async function createWaSocketInternal(printQr, verbose, opts, receiveMode) {
 	]) sock.ws.removeAllListeners(event);
 	socketRef.current = sock;
 	if (pendingSocketAbort) abortSocketAfterCredentialPersistenceFailure(sock, pendingSocketAbort.error);
-	sock.ev.on("creds.update", () => enqueueSaveCreds(authDir, saveCreds, sessionLogger, {
-		beforeCredentialPersistence: opts.beforeCredentialPersistence,
-		onError: reportCredentialPersistenceError
+	sock.ev.on("creds.update", () => enqueueCredsSave(authDir, () => safeSaveCreds({
+		authDir,
+		saveCreds,
+		logger: sessionLogger,
+		beforeCredentialPersistence: opts.beforeCredentialPersistence
+	}), (err) => {
+		sessionLogger.warn({ error: String(err) }, "WhatsApp creds save queue error");
+		reportCredentialPersistenceError(err);
 	}));
 	sock.ev.on("connection.update", (update) => {
-		(async () => {
-			try {
-				const { connection, lastDisconnect, qr } = update;
-				if (qr) {
-					opts.onQr?.(qr);
-					if (printQr) {
-						console.log("Open the WhatsApp app, go to Linked Devices, then scan this QR:");
-						printTerminalQr(qr).catch((err) => {
-							sessionLogger.warn({ error: String(err) }, "failed rendering WhatsApp QR");
-						});
-					}
-				}
-				if (connection === "close") {
-					if (getStatusCode(lastDisconnect?.error) === LOGGED_OUT_STATUS) console.error(danger(`WhatsApp session logged out. Run: ${formatCliCommand("openclaw channels login")}`));
+		try {
+			const { connection, lastDisconnect, qr } = update;
+			if (qr) {
+				opts.onQr?.(qr);
+				if (printQr) {
+					console.log("Open the WhatsApp app, go to Linked Devices, then scan this QR:");
+					printTerminalQr(qr).catch((err) => {
+						sessionLogger.warn({ error: String(err) }, "failed rendering WhatsApp QR");
+					});
 				}
-				if (connection === "open" && verbose) console.log(success("WhatsApp Web connected."));
-			} catch (err) {
-				sessionLogger.error({ error: String(err) }, "connection.update handler error");
 			}
-		})();
+			if (connection === "close") {
+				agent?.destroy();
+				fetchAgent?.destroy();
+				if (getStatusCode(lastDisconnect?.error) === LOGGED_OUT_STATUS) console.error(danger(`WhatsApp session logged out. Run: ${formatCliCommand("openclaw channels login")}`));
+			}
+			if (connection === "open" && verbose) console.log(success("WhatsApp Web connected."));
+		} catch (err) {
+			sessionLogger.error({ error: String(err) }, "connection.update handler error");
+		}
 	});
 	if (sock.ws && typeof sock.ws.on === "function") sock.ws.on("error", (err) => {
 		sessionLogger.error({ error: String(err) }, "WebSocket error");
@@ -477,67 +504,31 @@ async function createWaSocketInternal(printQr, verbose, opts, receiveMode) {
 async function createWaDirectorySocket(authDir) {
 	return await createWaSocketInternal(false, false, { authDir }, "directory");
 }
-async function resolveEnvProxyAgent(logger) {
+function resolveEnvProxyAgent(logger, targetUrl) {
 	try {
 		const agent = createNodeProxyAgent({
 			mode: "env",
-			targetUrl: WHATSAPP_WEBSOCKET_PROXY_TARGET,
+			targetUrl,
 			protocol: "https"
 		});
-		if (!agent) return;
-		logger.info("Using ambient env proxy for WhatsApp WebSocket connection");
+		if (agent) logger.info("Using ambient env proxy for WhatsApp connection");
 		return agent;
 	} catch (error) {
-		logger.warn({ error: String(error) }, "Failed to initialize env proxy agent for WhatsApp WebSocket connection");
-		return;
-	}
-}
-async function resolveEnvFetchDispatcher(logger, agent) {
-	const proxyUrl = resolveProxyUrlFromAgent(agent);
-	const envProxyUrl = resolveEnvHttpsProxyUrl();
-	if (!proxyUrl && !envProxyUrl) return;
-	try {
-		return proxyUrl ? createHttp1ProxyAgent({ uri: proxyUrl }) : createHttp1EnvHttpProxyAgent();
-	} catch (error) {
-		logger.warn({ error: String(error) }, "Failed to initialize env proxy dispatcher for WhatsApp media uploads");
+		logger.warn({ error: String(error) }, "Failed to initialize env proxy agent for WhatsApp connection");
 		return;
 	}
 }
-function resolveProxyUrlFromAgent(agent) {
-	if (typeof agent === "object" && agent !== null && "getProxyForUrl" in agent && typeof agent.getProxyForUrl === "function") {
-		const proxyUrl = agent.getProxyForUrl(WHATSAPP_WEBSOCKET_PROXY_TARGET);
-		return typeof proxyUrl === "string" && proxyUrl.length > 0 ? proxyUrl : void 0;
-	}
-	if (typeof agent !== "object" || agent === null || !("proxy" in agent)) return;
-	const proxy = agent.proxy;
-	if (proxy instanceof URL) return proxy.toString();
-	return typeof proxy === "string" && proxy.length > 0 ? proxy : void 0;
-}
-function resolveEnvHttpsProxyUrl(env = process.env) {
-	const lowerHttpsProxy = normalizeEnvProxyValue(env.https_proxy);
-	const lowerHttpProxy = normalizeEnvProxyValue(env.http_proxy);
-	const httpsProxy = lowerHttpsProxy !== void 0 ? lowerHttpsProxy : normalizeEnvProxyValue(env.HTTPS_PROXY);
-	const httpProxy = lowerHttpProxy !== void 0 ? lowerHttpProxy : normalizeEnvProxyValue(env.HTTP_PROXY);
-	return httpsProxy ?? httpProxy ?? void 0;
-}
-function normalizeEnvProxyValue(value) {
-	if (typeof value !== "string") return;
-	const trimmed = value.trim();
-	return trimmed.length > 0 ? trimmed : null;
-}
 async function waitForWaConnection(sock, options = { timeout: "none" }) {
 	return new Promise((resolve, reject) => {
-		const evWithOff = sock.ev;
 		let timer;
 		const cleanup = () => {
-			evWithOff.off?.("connection.update", handler);
+			sock.ev.off?.("connection.update", handler);
 			if (timer) {
 				clearTimeout(timer);
 				timer = void 0;
 			}
 		};
-		const handler = (...args) => {
-			const update = args[0] ?? {};
+		const handler = (update = {}) => {
 			if (update.connection === "open") {
 				cleanup();
 				resolve();
@@ -559,9 +550,6 @@ async function waitForWaConnection(sock, options = { timeout: "none" }) {
 		}
 	});
 }
-function newConnectionId() {
-	return randomUUID();
-}
 function createConnectionTimeoutError(timeoutMs) {
 	const error = /* @__PURE__ */ new Error(`WhatsApp connection timed out after ${timeoutMs}ms`);
 	Object.assign(error, { output: { statusCode: 408 } });
@@ -616,4 +604,4 @@ async function closeWhatsAppSocketAndWait(sock, reason) {
 	throw new AggregateError(errors, "WhatsApp socket close could not be confirmed");
 }
 //#endregion
-export { waitForWaConnection as a, isWhatsAppSocketOperationTimeoutError as c, withWhatsAppSocketOperationTimeout as d, renderQrTerminal as f, acquireWhatsAppStandaloneConnectionOwner as h, newConnectionId as i, resolveWhatsAppSocketOperationTimeoutMs as l, acquireWhatsAppGatewayConnectionOwner as m, createWaDirectorySocket as n, DEFAULT_WHATSAPP_SOCKET_TIMING as o, WhatsAppConnectionOwnerBusyError as p, createWaSocket as r, createWhatsAppSocketOperationTimeoutAdapter as s, closeWhatsAppSocketAndWait as t, resolveWhatsAppSocketTiming as u };
+export { renderQrTerminal as _, DEFAULT_RECONNECT_POLICY as a, acquireWhatsAppStandaloneConnectionOwner as b, resolveHeartbeatSeconds as c, DEFAULT_WHATSAPP_SOCKET_TIMING as d, createWhatsAppSocketOperationTimeoutAdapter as f, withWhatsAppSocketOperationTimeout as g, resolveWhatsAppSocketTiming as h, waitForWaConnection as i, resolveReconnectPolicy as l, resolveWhatsAppSocketOperationTimeoutMs as m, createWaDirectorySocket as n, computeBackoff as o, isWhatsAppSocketOperationTimeoutError as p, createWaSocket as r, newConnectionId as s, closeWhatsAppSocketAndWait as t, sleepWithAbort as u, WhatsAppConnectionOwnerBusyError as v, acquireWhatsAppGatewayConnectionOwner as y };

package/dist/.setup/{targets-runtime-RBjx3pg_.mjs → targets-runtime-DmiqXIXO.mjs}

@@ -100,13 +100,8 @@ const DIRECT_PN_JID_RE = /^(\d+)(?::\d+)?@(s\.whatsapp\.net|hosted)$/i;
 const DIRECT_LID_JID_RE = /^(\d+)(?::\d+)?@(lid|hosted\.lid)$/i;
 function addEquivalentDirectChatCandidate(target, jid) {
 	addUniqueString(target, jid);
-	const pnMatch = jid?.match(DIRECT_PN_JID_RE);
-	if (pnMatch) {
-		addUniqueString(target, `${pnMatch[1]}@${pnMatch[2]}`);
-		return;
-	}
-	const lidMatch = jid?.match(DIRECT_LID_JID_RE);
-	if (lidMatch) addUniqueString(target, `${lidMatch[1]}@${lidMatch[2]}`);
+	const match = jid?.match(DIRECT_PN_JID_RE) ?? jid?.match(DIRECT_LID_JID_RE);
+	if (match) addUniqueString(target, `${match[1]}@${match[2]}`);
 }
 async function resolveEquivalentWhatsAppDirectChatJids(jid, opts) {
 	const normalized = jid?.trim();

package/dist/action-runtime-api.js

@@ -1,2 +1,2 @@
-import { t as handleWhatsAppAction } from "./.setup/action-runtime-DZZFamfl.mjs";
+import { t as handleWhatsAppAction } from "./.setup/action-runtime-DeVk5V7r.mjs";
 export { handleWhatsAppAction };

package/dist/action-runtime.runtime.js

@@ -1,2 +1,2 @@
-import { t as handleWhatsAppAction } from "./.setup/action-runtime-DZZFamfl.mjs";
+import { t as handleWhatsAppAction } from "./.setup/action-runtime-DeVk5V7r.mjs";
 export { handleWhatsAppAction };