@openclaw/whatsapp 2026.7.2-beta.7 → 2026.7.33

package/README.md

@@ -5,7 +5,7 @@ Official OpenClaw channel plugin for WhatsApp Web chats.
 Install from OpenClaw:
 
 ```bash
-openclaw plugins install @openclaw/whatsapp
+openclaw plugin add @openclaw/whatsapp
 ```
 
 Link a WhatsApp account through the plugin's setup flow, then configure which chats OpenClaw agents should monitor and reply to.

package/dist/{access-control-pZcxTmd5.js → .setup/access-control-C0jumQuO.mjs}

@@ -1,7 +1,7 @@
-import { a as resolveWhatsAppAccount } from "./accounts-CSqLvCY5.js";
-import { n as isSelfChatMode } from "./targets-runtime-TMk0lGuy.js";
-import { t as normalizeE164 } from "./text-runtime-CaKLhowd.js";
-import { a as getSelfIdentity, o as getSenderIdentity } from "./identity-CPrT5aEU.js";
+import { a as resolveWhatsAppAccount } from "./accounts-Dw16pdNl.mjs";
+import { n as isSelfChatMode } from "./targets-runtime-C-GiVn6Y.mjs";
+import { n as normalizeE164 } from "./text-runtime-CUrq1mFq.mjs";
+import { a as getSelfIdentity, o as getSenderIdentity } from "./identity-CDB1bT-p.mjs";
 import { defaultRuntime } from "openclaw/plugin-sdk/runtime-env";
 import { resolveChannelGroupPolicy, resolveChannelGroupRequireMention } from "openclaw/plugin-sdk/channel-policy";
 import { createChannelPairingChallengeIssuer } from "openclaw/plugin-sdk/channel-pairing";
@@ -233,6 +233,7 @@ async function resolveWhatsAppIngressAccess(params) {
 	});
 }
 async function resolveWhatsAppCommandAuthorized(params) {
+	if (!(params.cfg.commands?.useAccessGroups !== false)) return true;
 	const self = getSelfIdentity(params.msg, params.authDir);
 	const admission = requireWhatsAppInboundAdmission(params.msg);
 	const policy = params.policy ?? resolveWhatsAppInboundPolicy({

package/dist/.setup/account-config-6PTOSfaI.mjs

@@ -0,0 +1,47 @@
+import { DEFAULT_ACCOUNT_ID, mergeAccountConfig, resolveAccountEntry, resolveMergedAccountConfig } from "openclaw/plugin-sdk/account-core";
+import { resolveChannelStreamingBlockEnabled, resolveChannelStreamingChunkMode } from "openclaw/plugin-sdk/channel-outbound";
+//#region extensions/whatsapp/src/account-config.ts
+function resolveWhatsAppDefaultAccountSharedConfig(cfg) {
+	const defaultAccount = resolveAccountEntry(cfg.channels?.whatsapp?.accounts, DEFAULT_ACCOUNT_ID);
+	if (!defaultAccount) return;
+	const { enabled: _ignoredEnabled, name: _ignoredName, authDir: _ignoredAuthDir, selfChatMode: _ignoredSelfChatMode, ...sharedDefaults } = defaultAccount;
+	return sharedDefaults;
+}
+function resolveWhatsAppAccountConfigForTest(cfg, accountId) {
+	return resolveAccountEntry(cfg.channels?.whatsapp?.accounts, accountId);
+}
+function resolveMergedNamedWhatsAppAccountConfig(params) {
+	const rootCfg = params.cfg.channels?.whatsapp;
+	const accountConfig = resolveWhatsAppAccountConfigForTest(params.cfg, params.accountId);
+	return {
+		...mergeAccountConfig({
+			channelConfig: rootCfg,
+			accountConfig: void 0,
+			omitKeys: ["defaultAccount"]
+		}),
+		...resolveWhatsAppDefaultAccountSharedConfig(params.cfg),
+		...accountConfig
+	};
+}
+function resolveMergedWhatsAppAccountConfig(params) {
+	const rootCfg = params.cfg.channels?.whatsapp;
+	const accountId = params.accountId?.trim() || rootCfg?.defaultAccount || DEFAULT_ACCOUNT_ID;
+	const base = resolveMergedAccountConfig({
+		channelConfig: rootCfg,
+		accounts: rootCfg?.accounts,
+		accountId,
+		omitKeys: ["defaultAccount"]
+	});
+	const merged = accountId === DEFAULT_ACCOUNT_ID ? base : resolveMergedNamedWhatsAppAccountConfig({
+		cfg: params.cfg,
+		accountId
+	});
+	return {
+		accountId,
+		...merged,
+		chunkMode: resolveChannelStreamingChunkMode(merged) ?? merged.chunkMode,
+		blockStreaming: resolveChannelStreamingBlockEnabled(merged) ?? merged.blockStreaming
+	};
+}
+//#endregion
+export { resolveMergedWhatsAppAccountConfig as t };

package/dist/{accounts-CSqLvCY5.js → .setup/accounts-Dw16pdNl.mjs}

@@ -1,51 +1,11 @@
-import { n as listConfiguredAccountIds, r as resolveDefaultWhatsAppAccountId, t as listAccountIds } from "./account-ids-CB5SOWjc.js";
-import { n as hasWebCredsRegularFileSync, r as hasWebCredsSync } from "./creds-files-B1kSWtBg.js";
+import { t as resolveMergedWhatsAppAccountConfig } from "./account-config-6PTOSfaI.mjs";
+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-B1kSWtBg.mjs";
 import fs from "node:fs";
 import path from "node:path";
-import { DEFAULT_ACCOUNT_ID, mergeAccountConfig, normalizeAccountId, resolveAccountEntry, resolveMergedAccountConfig, resolveUserPath } from "openclaw/plugin-sdk/account-core";
+import { DEFAULT_ACCOUNT_ID, normalizeAccountId, resolveUserPath } from "openclaw/plugin-sdk/account-core";
 import { resolveOAuthDir } from "openclaw/plugin-sdk/state-paths";
 import { normalizeOptionalString } from "openclaw/plugin-sdk/string-coerce-runtime";
-//#region extensions/whatsapp/src/account-config.ts
-function resolveWhatsAppDefaultAccountSharedConfig(cfg) {
-	const defaultAccount = resolveAccountEntry(cfg.channels?.whatsapp?.accounts, DEFAULT_ACCOUNT_ID);
-	if (!defaultAccount) return;
-	const { enabled: _ignoredEnabled, name: _ignoredName, authDir: _ignoredAuthDir, selfChatMode: _ignoredSelfChatMode, ...sharedDefaults } = defaultAccount;
-	return sharedDefaults;
-}
-function resolveWhatsAppAccountConfigForTest(cfg, accountId) {
-	return resolveAccountEntry(cfg.channels?.whatsapp?.accounts, accountId);
-}
-function resolveMergedNamedWhatsAppAccountConfig(params) {
-	const rootCfg = params.cfg.channels?.whatsapp;
-	const accountConfig = resolveWhatsAppAccountConfigForTest(params.cfg, params.accountId);
-	return {
-		...mergeAccountConfig({
-			channelConfig: rootCfg,
-			accountConfig: void 0,
-			omitKeys: ["defaultAccount"]
-		}),
-		...resolveWhatsAppDefaultAccountSharedConfig(params.cfg),
-		...accountConfig
-	};
-}
-function resolveMergedWhatsAppAccountConfig(params) {
-	const rootCfg = params.cfg.channels?.whatsapp;
-	const accountId = params.accountId?.trim() || rootCfg?.defaultAccount || DEFAULT_ACCOUNT_ID;
-	const base = resolveMergedAccountConfig({
-		channelConfig: rootCfg,
-		accounts: rootCfg?.accounts,
-		accountId,
-		omitKeys: ["defaultAccount"]
-	});
-	return {
-		accountId,
-		...accountId === DEFAULT_ACCOUNT_ID ? base : resolveMergedNamedWhatsAppAccountConfig({
-			cfg: params.cfg,
-			accountId
-		})
-	};
-}
-//#endregion
 //#region extensions/whatsapp/src/accounts.ts
 const DEFAULT_WHATSAPP_MEDIA_MAX_MB = 50;
 function listWhatsAppAuthDirs(cfg) {
@@ -117,7 +77,7 @@ function resolveWhatsAppAccount(params) {
 		name: normalizeOptionalString(merged.name),
 		enabled,
 		sendReadReceipts: merged.sendReadReceipts ?? true,
-		messagePrefix: merged.responsePrefix,
+		messagePrefix: merged.messagePrefix ?? params.cfg.messages?.messagePrefix,
 		defaultTo: merged.defaultTo,
 		authDir,
 		isLegacyAuthDir: isLegacy,
@@ -129,12 +89,14 @@ function resolveWhatsAppAccount(params) {
 		mentionPatterns: merged.mentionPatterns,
 		historyLimit: merged.historyLimit,
 		textChunkLimit: merged.textChunkLimit,
-		streaming: merged.streaming,
+		chunkMode: merged.chunkMode,
 		mediaMaxMb: merged.mediaMaxMb,
+		blockStreaming: merged.blockStreaming,
 		ackReaction: merged.ackReaction,
 		reactionLevel: merged.reactionLevel,
 		groups: merged.groups,
 		direct: merged.direct,
+		debounceMs: merged.debounceMs,
 		replyToMode: merged.replyToMode
 	};
 }
@@ -149,4 +111,4 @@ function listEnabledWhatsAppAccounts(cfg) {
 	})).filter((account) => account.enabled);
 }
 //#endregion
-export { resolveWhatsAppAccount as a, resolveMergedWhatsAppAccountConfig as c, listWhatsAppAuthDirs as i, hasAnyWhatsAppAuth as n, resolveWhatsAppAuthDir as o, listEnabledWhatsAppAccounts as r, resolveWhatsAppMediaMaxBytes as s, DEFAULT_WHATSAPP_MEDIA_MAX_MB as t };
+export { resolveWhatsAppAccount as a, listWhatsAppAuthDirs as i, hasAnyWhatsAppAuth as n, resolveWhatsAppAuthDir as o, listEnabledWhatsAppAccounts as r, resolveWhatsAppMediaMaxBytes as s, DEFAULT_WHATSAPP_MEDIA_MAX_MB as t };

package/dist/{action-runtime-BzfDFPbH.js → .setup/action-runtime-DLK_9v4r.mjs}

@@ -1,6 +1,6 @@
-import { a as resolveWhatsAppAccount } from "./accounts-CSqLvCY5.js";
-import { t as resolveWhatsAppOutboundTarget } from "./resolve-outbound-target-1GqbT1uX.js";
-import { r as sendReactionWhatsApp, u as resolveWhatsAppReactionLevel } from "./send-D37ddk22.js";
+import { a as resolveWhatsAppAccount } from "./accounts-Dw16pdNl.mjs";
+import { t as resolveWhatsAppOutboundTarget } from "./resolve-outbound-target-oI7VpU4w.mjs";
+import { g as resolveWhatsAppReactionLevel, r as sendReactionWhatsApp } from "./send-BQjMC41n.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/{active-listener-BEjWsCNM.js → .setup/active-listener-CloPBx0S.mjs}

@@ -1,11 +1,11 @@
-import { r as resolveDefaultWhatsAppAccountId } from "./account-ids-CB5SOWjc.js";
-import { r as getWhatsAppConnectionController } from "./connection-controller-runtime-context-DG0tuYuw.js";
+import { r as resolveDefaultWhatsAppAccountId } from "./account-ids-CB5SOWjc.mjs";
+import { t as getRegisteredWhatsAppConnectionController } from "./connection-controller-registry-TSX_udJp.mjs";
 //#region extensions/whatsapp/src/active-listener.ts
 function resolveWebAccountId(params) {
 	return (params.accountId ?? "").trim() || resolveDefaultWhatsAppAccountId(params.cfg);
 }
 function getActiveWebListener(accountId) {
-	return getWhatsAppConnectionController(accountId)?.getActiveListener() ?? null;
+	return getRegisteredWhatsAppConnectionController(accountId)?.getActiveListener() ?? null;
 }
 //#endregion
 export { resolveWebAccountId as n, getActiveWebListener as t };

package/dist/{agent-tools-login-DE9MU98T.js → .setup/agent-tools-login-DINqgaYo.mjs}

@@ -1,5 +1,5 @@
-import { startWebLoginWithQr, waitForWebLogin } from "./login-qr-runtime.js";
-import "./login-qr-api.js";
+import { startWebLoginWithQr, waitForWebLogin } from "../login-qr-runtime.js";
+import "../login-qr-api.js";
 import { optionalPositiveIntegerSchema, readPositiveIntegerParam } from "openclaw/plugin-sdk/channel-actions";
 import { Type } from "typebox";
 //#region extensions/whatsapp/src/agent-tools-login.ts
@@ -7,22 +7,29 @@ const QR_DATA_URL_MAX_LENGTH = 16384;
 function readOptionalString(value) {
 	return typeof value === "string" && value.trim() ? value : void 0;
 }
-function createWhatsAppLoginTool() {
+function createWhatsAppLoginTool(context) {
+	if (context.senderIsOwner !== true) return null;
 	return {
 		label: "WhatsApp Login",
 		name: "whatsapp_login",
 		description: "Generate a WhatsApp QR code for linking, or wait for the scan to complete.",
 		parameters: Type.Object({
-			action: Type.Enum(["start", "wait"], { type: "string" }),
+			action: Type.Unsafe({
+				type: "string",
+				enum: ["start", "wait"]
+			}),
 			timeoutMs: optionalPositiveIntegerSchema(),
 			force: Type.Optional(Type.Boolean()),
 			accountId: Type.Optional(Type.String()),
 			currentQrDataUrl: Type.Optional(Type.String({
 				maxLength: QR_DATA_URL_MAX_LENGTH,
-				pattern: "^data:image/png;base64,.+$"
+				pattern: "^data:image/png;base64,"
 			}))
 		}),
-		execute: async (_toolCallId, args) => {
+		execute: async (_toolCallId, args, signal) => {
+			const beforeCredentialPersistence = async () => {
+				if (!signal || signal.aborted) throw new Error("WhatsApp login authority is no longer active.");
+			};
 			const renderQrReply = (params) => {
 				return {
 					content: [{
@@ -63,9 +70,11 @@ function createWhatsAppLoginTool() {
 					details: { connected: result.connected }
 				};
 			}
+			await beforeCredentialPersistence();
 			const result = await startWebLoginWithQr({
 				accountId,
 				timeoutMs,
+				beforeCredentialPersistence,
 				force: typeof args.force === "boolean" ? args.force : false
 			});
 			if (!result.qrDataUrl) return {
@@ -83,5 +92,8 @@ function createWhatsAppLoginTool() {
 		}
 	};
 }
+function registerWhatsAppLoginTool(api) {
+	api.registerTool((context) => createWhatsAppLoginTool(context), { name: "whatsapp_login" });
+}
 //#endregion
-export { createWhatsAppLoginTool as t };
+export { registerWhatsAppLoginTool as n, createWhatsAppLoginTool as t };

package/dist/{approval-handler.runtime-DrA59QSA.js → .setup/approval-handler.runtime-DtJZbu3y.mjs}

@@ -1,14 +1,10 @@
-import "./accounts-CSqLvCY5.js";
-import { r as resolveDefaultWhatsAppAccountId } from "./account-ids-CB5SOWjc.js";
-import { s as normalizeWhatsAppMessagingTarget } from "./normalize-target-CugRyONv.js";
-import { i as sendTypingWhatsApp, t as sendMessageWhatsApp } from "./send-D37ddk22.js";
-import { i as getWhatsAppRuntime } from "./runtime-BLlToOi6.js";
-import "./normalize-C7Hkc_vE.js";
-import { i as unregisterWhatsAppApprovalReactionTarget, r as registerWhatsAppApprovalReactionTarget } from "./approval-reactions-Cu66aYdq.js";
+import { s as normalizeWhatsAppMessagingTarget } from "./normalize-target-bVWjgftN.mjs";
+import { f as registerWhatsAppApprovalReactionTarget, i as sendTypingWhatsApp, p as unregisterWhatsAppApprovalReactionTarget, t as sendMessageWhatsApp } from "./send-BQjMC41n.mjs";
+import "./normalize-eddWWsNV.mjs";
+import { n as getWhatsAppRuntime } from "./runtime-BfAdAEYT.mjs";
 import { createSubsystemLogger } from "openclaw/plugin-sdk/runtime-env";
-import { DEFAULT_ACCOUNT_ID } from "openclaw/plugin-sdk/account-id";
-import { buildChannelApprovalNativeTargetKey } from "openclaw/plugin-sdk/approval-native-runtime";
 import { buildApprovalReactionPendingContent } from "openclaw/plugin-sdk/approval-reaction-runtime";
+import { buildChannelApprovalNativeTargetKey } from "openclaw/plugin-sdk/approval-native-runtime";
 import { buildChannelApprovalExpiredText, buildChannelApprovalResolvedText, createChannelApprovalNativeRuntimeAdapter, resolvePreparedApprovalAccountId } from "openclaw/plugin-sdk/approval-handler-runtime";
 //#region extensions/whatsapp/src/approval-handler.runtime.ts
 const log = createSubsystemLogger("whatsapp/approvals");
@@ -44,15 +40,14 @@ const whatsappApprovalNativeRuntime = createChannelApprovalNativeRuntimeAdapter(
 		})
 	},
 	transport: {
-		prepareTarget: ({ cfg, plannedTarget, accountId }) => {
+		prepareTarget: ({ plannedTarget, accountId }) => {
 			const to = normalizeWhatsAppMessagingTarget(plannedTarget.target.to);
 			if (!to) return null;
 			const prepared = {
 				to,
 				accountId: resolvePreparedApprovalAccountId({
 					plannedAccountId: plannedTarget.target.accountId,
-					contextAccountId: accountId,
-					fallbackAccountId: cfg ? resolveDefaultWhatsAppAccountId(cfg) : DEFAULT_ACCOUNT_ID
+					contextAccountId: accountId
 				})
 			};
 			return {
@@ -64,13 +59,13 @@ const whatsappApprovalNativeRuntime = createChannelApprovalNativeRuntimeAdapter(
 			const verbose = getWhatsAppRuntime().logging.shouldLogVerbose();
 			await sendTypingWhatsApp(preparedTarget.to, {
 				cfg,
-				accountId: preparedTarget.accountId
+				...preparedTarget.accountId ? { accountId: preparedTarget.accountId } : {}
 			}).catch(() => {});
 			const result = await sendMessageWhatsApp(preparedTarget.to, pendingPayload.reactionPayload.text ?? "", {
 				cfg,
 				verbose,
-				accountId: preparedTarget.accountId,
-				preserveLeadingWhitespace: true
+				preserveLeadingWhitespace: true,
+				...preparedTarget.accountId ? { accountId: preparedTarget.accountId } : {}
 			});
 			if (!result.messageId) return null;
 			return {
@@ -85,8 +80,8 @@ const whatsappApprovalNativeRuntime = createChannelApprovalNativeRuntimeAdapter(
 			await sendMessageWhatsApp(entry.to, payload.text, {
 				cfg,
 				verbose,
-				accountId: entry.accountId,
 				preserveLeadingWhitespace: true,
+				...entry.accountId ? { accountId: entry.accountId } : {},
 				quotedMessageKey: {
 					id: entry.messageId,
 					remoteJid: entry.remoteJid,
@@ -97,24 +92,23 @@ const whatsappApprovalNativeRuntime = createChannelApprovalNativeRuntimeAdapter(
 	},
 	interactions: {
 		bindPending: ({ entry, request, view, pendingPayload }) => registerWhatsAppApprovalReactionTarget({
-			accountId: entry.accountId,
+			accountId: entry.accountId ?? "",
 			remoteJid: entry.remoteJid,
 			messageId: entry.messageId,
 			approvalId: request.id,
-			approvalKind: view.approvalKind,
 			allowedDecisions: pendingPayload.reactionPayload.allowedDecisions,
 			ttlMs: Math.max(1, view.expiresAtMs - Date.now())
 		}) ? true : null,
 		unbindPending: ({ entry }) => {
 			unregisterWhatsAppApprovalReactionTarget({
-				accountId: entry.accountId,
+				accountId: entry.accountId ?? "",
 				remoteJid: entry.remoteJid,
 				messageId: entry.messageId
 			});
 		},
 		cancelDelivered: ({ entry }) => {
 			unregisterWhatsAppApprovalReactionTarget({
-				accountId: entry.accountId,
+				accountId: entry.accountId ?? "",
 				remoteJid: entry.remoteJid,
 				messageId: entry.messageId
 			});

package/dist/{approval-resolver-DoeBBt22.js → .setup/approval-resolver-DF-lu8k5.mjs}

@@ -2,10 +2,9 @@ import { isApprovalNotFoundError } from "openclaw/plugin-sdk/error-runtime";
 import { resolveApprovalOverGateway } from "openclaw/plugin-sdk/approval-gateway-runtime";
 //#region extensions/whatsapp/src/approval-resolver.ts
 async function resolveWhatsAppApproval(params) {
-	return await resolveApprovalOverGateway({
+	await resolveApprovalOverGateway({
 		cfg: params.cfg,
 		approvalId: params.approvalId,
-		approvalKind: params.approvalKind,
 		decision: params.decision,
 		senderId: params.senderId,
 		gatewayUrl: params.gatewayUrl,

package/dist/{auth-store-DcEpIOmE.js → .setup/auth-store-BZKGa0tW.mjs}

@@ -1,25 +1,26 @@
-import { t as __exportAll } from "./rolldown-runtime-D7D4PA-g.js";
-import { a as readWebCredsJsonRawSync, c as statWebCredsFileSync, i as readWebCredsJsonRaw, o as resolveWebCredsBackupPath, r as hasWebCredsSync, s as resolveWebCredsPath, t as assertWebCredsPathRegularFileOrMissing } from "./creds-files-B1kSWtBg.js";
-import { n as resolveUserPath } from "./text-runtime-CaKLhowd.js";
-import { c as resolveComparableIdentity } from "./identity-CPrT5aEU.js";
+import { t as __exportAll } from "./rolldown-runtime-D7D4PA-g.mjs";
+import { a as readWebCredsJsonRawSync, c as statWebCredsFileSync, i as readWebCredsJsonRaw, o as resolveWebCredsBackupPath, s as resolveWebCredsPath, t as assertWebCredsPathRegularFileOrMissing } from "./creds-files-B1kSWtBg.mjs";
+import { r as resolveUserPath } from "./text-runtime-CUrq1mFq.mjs";
+import { c as resolveComparableIdentity } from "./identity-CDB1bT-p.mjs";
 import path from "node:path";
 import { resolveOAuthDir as resolveOAuthDir$1 } from "openclaw/plugin-sdk/state-paths";
 import { replaceFileAtomic } from "openclaw/plugin-sdk/security-runtime";
 import { formatCliCommand } from "openclaw/plugin-sdk/cli-runtime";
 import { defaultRuntime, getChildLogger, info, success } from "openclaw/plugin-sdk/runtime-env";
+import { resolveTimerTimeoutMs } from "openclaw/plugin-sdk/number-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";
-import { resolveTimerTimeoutMs } from "openclaw/plugin-sdk/number-runtime";
 //#region extensions/whatsapp/src/creds-persistence.ts
 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-Nsqaehbd.js").then((n) => n.o);
+	const { BufferJSON } = await import("./session.runtime-B-V3rXP6.mjs").then((n) => n.a);
 	return JSON.stringify(creds, BufferJSON.replacer);
 }
 async function writeWebCredsRawAtomically(params) {
+	await params.beforeCredentialPersistence?.();
 	await assertWebCredsPathRegularFileOrMissing(params.filePath);
 	await replaceFileAtomic({
 		filePath: params.filePath,
@@ -31,14 +32,16 @@ async function writeWebCredsRawAtomically(params) {
 		syncParentDir: true,
 		beforeRename: async ({ filePath }) => {
 			await assertWebCredsPathRegularFileOrMissing(filePath);
+			await params.beforeCredentialPersistence?.();
 		}
 	});
 }
-async function writeCredsJsonAtomically(authDir, creds) {
+async function writeCredsJsonAtomically(authDir, creds, beforeCredentialPersistence) {
 	await writeWebCredsRawAtomically({
 		filePath: resolveWebCredsPath(authDir),
 		content: await stringifyCreds(creds),
-		tempPrefix: ".creds"
+		tempPrefix: ".creds",
+		beforeCredentialPersistence
 	});
 }
 function enqueueCredsSave(authDir, saveCreds, onError) {
@@ -75,7 +78,6 @@ var auth_store_exports = /* @__PURE__ */ __exportAll({
 	WhatsAppAuthUnstableError: () => WhatsAppAuthUnstableError,
 	formatWhatsAppWebAuthStatusState: () => formatWhatsAppWebAuthStatusState,
 	getWebAuthAgeMs: () => getWebAuthAgeMs,
-	hasWebCredsSync: () => hasWebCredsSync,
 	logWebSelfId: () => logWebSelfId,
 	logoutWeb: () => logoutWeb,
 	pickWebChannel: () => pickWebChannel,
@@ -131,9 +133,8 @@ function isValidJson(raw) {
 		return false;
 	}
 }
-async function restoreCredsFromBackupIfNeeded(authDir, options) {
+async function restoreCredsFromBackupIfNeeded(authDir, options = {}) {
 	const logger = getChildLogger({ module: "web-session" });
-	let restore;
 	try {
 		const credsPath = resolveWebCredsPath(authDir);
 		const backupPath = resolveWebCredsBackupPath(authDir);
@@ -146,27 +147,21 @@ async function restoreCredsFromBackupIfNeeded(authDir, options) {
 		if (raw && isValidJson(raw)) return false;
 		const backupRaw = readCredsJsonRaw(backupPath);
 		if (!backupRaw || !isValidJson(backupRaw)) return false;
-		restore = {
-			content: backupRaw,
-			credsPath
-		};
-	} catch {
-		return false;
-	}
-	await options?.beforeCredentialPersistence?.();
-	try {
 		await writeWebCredsRawAtomically({
-			filePath: restore.credsPath,
-			content: restore.content,
-			tempPrefix: ".creds.restore"
+			filePath: credsPath,
+			content: backupRaw,
+			tempPrefix: ".creds.restore",
+			beforeCredentialPersistence: options.beforeCredentialPersistence
 		});
-		logger.warn({ credsPath: restore.credsPath }, "restored corrupted WhatsApp creds.json from backup");
+		logger.warn({ credsPath }, "restored corrupted WhatsApp creds.json from backup");
 		return true;
 	} catch {}
 	return false;
 }
 async function webAuthExists(authDir = resolveDefaultWebAuthDir()) {
-	const raw = await readWebCredsJsonRaw(resolveWebCredsPath(resolveUserPath(authDir)));
+	const resolvedAuthDir = resolveUserPath(authDir);
+	const credsPath = resolveWebCredsPath(resolvedAuthDir);
+	const raw = await readWebCredsJsonRaw(credsPath);
 	if (!raw) return false;
 	try {
 		JSON.parse(raw);
@@ -244,10 +239,11 @@ function isBaileysAuthFileName(name) {
 async function clearBaileysAuthFiles(authDir, beforeCredentialPersistence) {
 	const rootStats = await fs.lstat(authDir).catch(() => null);
 	if (!rootStats?.isDirectory() || rootStats.isSymbolicLink()) return;
-	const credentialFiles = (await fs.readdir(authDir, { withFileTypes: true })).filter((entry) => entry.isFile() && isBaileysAuthFileName(entry.name));
-	if (credentialFiles.length === 0) return;
-	await beforeCredentialPersistence?.();
-	await Promise.all(credentialFiles.map(async (entry) => {
+	const entries = await fs.readdir(authDir, { withFileTypes: true });
+	await Promise.all(entries.map(async (entry) => {
+		if (!entry.isFile()) return;
+		if (!isBaileysAuthFileName(entry.name)) return;
+		await beforeCredentialPersistence?.();
 		await fs.rm(path.join(authDir, entry.name), { force: true });
 	}));
 }