@openclaw/whatsapp 2026.5.28-beta.4 → 2026.5.30-beta.1

package/dist/{action-runtime-BdhkGtaP.js → action-runtime-BbUDQ78g.js}

@@ -1,6 +1,6 @@
 import { a as resolveWhatsAppAccount } from "./accounts-BMGM1RtF.js";
 import { t as resolveWhatsAppOutboundTarget } from "./resolve-outbound-target-CcdugbDf.js";
-import { g as resolveWhatsAppReactionLevel, r as sendReactionWhatsApp } from "./send-C4LG-Cl6.js";
+import { g as resolveWhatsAppReactionLevel, r as sendReactionWhatsApp } from "./send-DjMBLgiv.js";
 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/action-runtime-api.js

@@ -1,2 +1,2 @@
-import { t as handleWhatsAppAction } from "./action-runtime-BdhkGtaP.js";
+import { t as handleWhatsAppAction } from "./action-runtime-BbUDQ78g.js";
 export { handleWhatsAppAction };

package/dist/action-runtime.runtime.js

@@ -1,2 +1,2 @@
-import { t as handleWhatsAppAction } from "./action-runtime-BdhkGtaP.js";
+import { t as handleWhatsAppAction } from "./action-runtime-BbUDQ78g.js";
 export { handleWhatsAppAction };

package/dist/api.js

@@ -2,18 +2,18 @@ import { r as resolveDefaultWhatsAppAccountId, t as listAccountIds } from "./acc
 import { a as resolveWhatsAppAccount, i as listWhatsAppAuthDirs, n as hasAnyWhatsAppAuth, o as resolveWhatsAppAuthDir, r as listEnabledWhatsAppAccounts, s as resolveWhatsAppMediaMaxBytes, t as DEFAULT_WHATSAPP_MEDIA_MAX_MB } from "./accounts-BMGM1RtF.js";
 import { a as normalizeWhatsAppAllowFromEntries, c as normalizeWhatsAppTarget, i as looksLikeWhatsAppTargetId, r as isWhatsAppUserTarget, s as normalizeWhatsAppMessagingTarget, t as isWhatsAppGroupJid } from "./normalize-target-bVWjgftN.js";
 import { t as resolveWhatsAppOutboundTarget } from "./resolve-outbound-target-CcdugbDf.js";
-import "./send-C4LG-Cl6.js";
+import "./send-DjMBLgiv.js";
 import { c as assertWebChannel, d as markdownToWhatsApp, f as resolveJidToE164, l as isSelfChatMode, m as toWhatsappJidWithLid, n as normalizeE164, p as toWhatsappJid, r as resolveUserPath, u as jidToE164 } from "./text-runtime-Dk37KYHj.js";
-import { n as WHATSAPP_LEGACY_OUTBOUND_SEND_DEP_KEYS, t as whatsappPlugin } from "./channel-CLOhkP85.js";
+import { n as WHATSAPP_LEGACY_OUTBOUND_SEND_DEP_KEYS, t as whatsappPlugin } from "./channel-dHRyqWut.js";
 import { t as whatsappCommandPolicy } from "./command-policy-BIOSHySD.js";
-import { a as resolveWhatsAppGroupRequireMention, o as resolveWhatsAppGroupToolPolicy, s as resolveWhatsAppGroupIntroHint } from "./setup-core-DAgAB2WU.js";
+import { a as resolveWhatsAppGroupRequireMention, o as resolveWhatsAppGroupToolPolicy, s as resolveWhatsAppGroupIntroHint } from "./setup-core-B9CAuPOB.js";
 import "./config-schema-CsNDlDpL.js";
-import { t as whatsappSetupPlugin } from "./channel.setup-COV8culQ.js";
+import { t as whatsappSetupPlugin } from "./channel.setup-BuSd1d1D.js";
 import { t as DEFAULT_WEB_MEDIA_BYTES } from "./constants-HU41RHGI.js";
 import { n as listWhatsAppDirectoryGroupsFromConfig, r as listWhatsAppDirectoryPeersFromConfig } from "./directory-config-Dijefxc3.js";
 import { n as testing } from "./access-control-Z0fYaWrx.js";
-import { m as extractText, t as createWebSendApi } from "./send-api-C66vkRl9.js";
-import { r as waitForWaConnection, t as createWaSocket } from "./session-D8UW2Vbn.js";
+import { m as extractText, t as createWebSendApi } from "./send-api-Cx2qeYqj.js";
+import { r as waitForWaConnection, t as createWaSocket } from "./session-DyGWNClj.js";
 import "openclaw/plugin-sdk/channel-actions";
 import "openclaw/plugin-sdk/account-resolution";
 import "openclaw/plugin-sdk/core";

package/dist/{approval-handler.runtime-C25wPeBf.js → approval-handler.runtime-BIZgAkfR.js}

@@ -1,5 +1,5 @@
 import { s as normalizeWhatsAppMessagingTarget } from "./normalize-target-bVWjgftN.js";
-import { f as registerWhatsAppApprovalReactionTarget, i as sendTypingWhatsApp, p as unregisterWhatsAppApprovalReactionTarget, t as sendMessageWhatsApp } from "./send-C4LG-Cl6.js";
+import { f as registerWhatsAppApprovalReactionTarget, i as sendTypingWhatsApp, p as unregisterWhatsAppApprovalReactionTarget, t as sendMessageWhatsApp } from "./send-DjMBLgiv.js";
 import "./normalize-Bxwqo-bW.js";
 import { n as getWhatsAppRuntime } from "./runtime-BfAdAEYT.js";
 import { createSubsystemLogger } from "openclaw/plugin-sdk/runtime-env";

package/dist/{auth-store-BrKb0mwT.js → auth-store-CZ22aNcV.js}

@@ -7,8 +7,9 @@ import { resolveOAuthDir as resolveOAuthDir$1 } from "openclaw/plugin-sdk/state-
 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 { DEFAULT_ACCOUNT_ID } from "openclaw/plugin-sdk/routing";
 import fs from "node:fs/promises";
+import { DEFAULT_ACCOUNT_ID } from "openclaw/plugin-sdk/routing";
+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;
@@ -52,9 +53,10 @@ function waitForCredsSaveQueue(authDir) {
 	return Promise.all(credsSaveQueues.values()).then(() => {});
 }
 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"), timeoutMs);
+		flushTimeout = setTimeout(() => resolve("timed_out"), boundedTimeoutMs);
 	})]).finally(() => {
 		if (flushTimeout) clearTimeout(flushTimeout);
 	});

package/dist/{channel-CLOhkP85.js → channel-dHRyqWut.js}

@@ -2,15 +2,15 @@ import { r as resolveDefaultWhatsAppAccountId, t as listAccountIds } from "./acc
 import { a as resolveWhatsAppAccount } from "./accounts-BMGM1RtF.js";
 import { c as normalizeWhatsAppTarget, i as looksLikeWhatsAppTargetId, n as isWhatsAppNewsletterJid, o as normalizeWhatsAppAllowFromEntry, s as normalizeWhatsAppMessagingTarget, t as isWhatsAppGroupJid } from "./normalize-target-bVWjgftN.js";
 import { t as resolveWhatsAppOutboundTarget } from "./resolve-outbound-target-CcdugbDf.js";
-import { a as normalizeWhatsAppOutboundPayload, g as resolveWhatsAppReactionLevel, h as whatsappApprovalAuth, i as sendTypingWhatsApp, m as getWhatsAppApprovalApprovers, n as sendPollWhatsApp, o as normalizeWhatsAppPayloadText, s as normalizeWhatsAppPayloadTextPreservingIndentation, t as sendMessageWhatsApp } from "./send-C4LG-Cl6.js";
+import { a as normalizeWhatsAppOutboundPayload, g as resolveWhatsAppReactionLevel, h as whatsappApprovalAuth, i as sendTypingWhatsApp, m as getWhatsAppApprovalApprovers, n as sendPollWhatsApp, o as normalizeWhatsAppPayloadText, s as normalizeWhatsAppPayloadTextPreservingIndentation, t as sendMessageWhatsApp } from "./send-DjMBLgiv.js";
 import "./normalize-Bxwqo-bW.js";
 import { n as getWhatsAppRuntime } from "./runtime-BfAdAEYT.js";
 import { p as toWhatsappJid } from "./text-runtime-Dk37KYHj.js";
 import { t as createWhatsAppLoginTool } from "./agent-tools-login-BX7eHgDm.js";
 import { i as lookupInboundMessageMetaForTarget } from "./quoted-message-CveINB35.js";
 import { t as whatsappCommandPolicy } from "./command-policy-BIOSHySD.js";
-import { a as resolveWhatsAppGroupRequireMention, c as resolveWhatsAppMentionStripRegexes, i as whatsappSetupWizardProxy, l as formatWhatsAppConfigAllowFromEntries, n as createWhatsAppPluginBase, o as resolveWhatsAppGroupToolPolicy, r as loadWhatsAppChannelRuntime, s as resolveWhatsAppGroupIntroHint, t as whatsappSetupAdapter } from "./setup-core-DAgAB2WU.js";
-import { f as readWebAuthExistsForDecision, n as WHATSAPP_AUTH_UNSTABLE_CODE } from "./auth-store-BrKb0mwT.js";
+import { a as resolveWhatsAppGroupRequireMention, c as resolveWhatsAppMentionStripRegexes, i as whatsappSetupWizardProxy, l as formatWhatsAppConfigAllowFromEntries, n as createWhatsAppPluginBase, o as resolveWhatsAppGroupToolPolicy, r as loadWhatsAppChannelRuntime, s as resolveWhatsAppGroupIntroHint, t as whatsappSetupAdapter } from "./setup-core-B9CAuPOB.js";
+import { f as readWebAuthExistsForDecision, n as WHATSAPP_AUTH_UNSTABLE_CODE } from "./auth-store-CZ22aNcV.js";
 import { t as detectWhatsAppLegacyStateMigrations } from "./state-migrations-D_BmQUR9.js";
 import { createActionGate as createActionGate$1 } from "openclaw/plugin-sdk/channel-actions";
 import { DEFAULT_ACCOUNT_ID, listCombinedAccountIds, normalizeOptionalAccountId, resolveListedDefaultAccountId } from "openclaw/plugin-sdk/account-core";
@@ -26,31 +26,18 @@ import { createChatChannelPlugin } from "openclaw/plugin-sdk/channel-core";
 import { createLazyRuntimeModule } from "openclaw/plugin-sdk/lazy-runtime";
 import { createChannelApprovalCapability, splitChannelApprovalCapability } from "openclaw/plugin-sdk/approval-delivery-runtime";
 import { createLazyChannelApprovalNativeRuntimeAdapter } from "openclaw/plugin-sdk/approval-handler-adapter-runtime";
-import { createChannelApprovalForwardingEvaluator, createChannelApproverDmTargetResolver, createChannelNativeOriginTargetResolver, createNativeApprovalForwardingFallbackSuppressor, nativeApprovalTargetsMatch, resolveApprovalRequestSessionTarget } from "openclaw/plugin-sdk/approval-native-runtime";
-import { normalizeAccountId as normalizeAccountId$2 } from "openclaw/plugin-sdk/routing";
+import { createChannelApproverDmTargetResolver, createChannelNativeOriginTargetResolver, createNativeApprovalChannelRouteGates, createNativeApprovalForwardingFallbackSuppressor } from "openclaw/plugin-sdk/approval-native-runtime";
 import { chunkText } from "openclaw/plugin-sdk/reply-chunking";
 import { createAttachedChannelResultAdapter } from "openclaw/plugin-sdk/channel-send-result";
 import { sendTextMediaPayload } from "openclaw/plugin-sdk/reply-payload";
 //#region extensions/whatsapp/src/approval-native.ts
+const DEFAULT_APPROVAL_FORWARDING_MODE = "session";
 function isWhatsAppApprovalTransportEnabled(params) {
 	return resolveWhatsAppAccount({
 		cfg: params.cfg,
 		accountId: params.accountId
 	}).enabled;
 }
-function targetAccountMatchesWhatsAppAccount(params) {
-	const targetAccountId = normalizeOptionalString(params.targetAccountId);
-	const accountId = normalizeOptionalString(params.accountId);
-	if (targetAccountId) return !accountId || normalizeAccountId$2(targetAccountId) === normalizeAccountId$2(accountId);
-	if (!accountId) return true;
-	const normalizedAccountId = normalizeAccountId$2(accountId);
-	if (normalizedAccountId === normalizeAccountId$2(resolveDefaultWhatsAppAccountId(params.cfg))) return true;
-	const enabledAccountIds = listAccountIds(params.cfg).filter((candidateAccountId) => isWhatsAppApprovalTransportEnabled({
-		cfg: params.cfg,
-		accountId: candidateAccountId
-	})).map((candidateAccountId) => normalizeAccountId$2(candidateAccountId));
-	return enabledAccountIds.length === 1 && enabledAccountIds[0] === normalizedAccountId;
-}
 function normalizeWhatsAppForwardTarget(target) {
 	if (normalizeLowercaseStringOrEmpty(target.channel) !== "whatsapp") return null;
 	const to = normalizeWhatsAppMessagingTarget(target.to);
@@ -61,46 +48,6 @@ function normalizeWhatsAppForwardTarget(target) {
 		threadId: target.threadId ?? null
 	};
 }
-function hasMatchingWhatsAppTarget(params) {
-	const candidateTarget = params.target ? normalizeWhatsAppForwardTarget(params.target) : null;
-	return (params.config.targets ?? []).some((target) => {
-		const configuredTarget = normalizeWhatsAppForwardTarget(target);
-		if (!configuredTarget) return false;
-		if (!targetAccountMatchesWhatsAppAccount({
-			cfg: params.cfg,
-			targetAccountId: configuredTarget.accountId,
-			accountId: params.accountId
-		})) return false;
-		if (!candidateTarget) return true;
-		return nativeApprovalTargetsMatch({
-			channel: "whatsapp",
-			left: configuredTarget,
-			right: candidateTarget
-		});
-	});
-}
-function hasWhatsAppOriginOrSessionTarget(params) {
-	if (resolveTurnSourceWhatsAppOriginTarget(params.request)) return true;
-	const sessionTarget = resolveApprovalRequestSessionTarget({
-		cfg: params.cfg,
-		request: params.request
-	});
-	return normalizeLowercaseStringOrEmpty(sessionTarget?.channel) === "whatsapp" && targetAccountMatchesWhatsAppAccount({
-		cfg: params.cfg,
-		targetAccountId: sessionTarget?.accountId,
-		accountId: params.accountId
-	});
-}
-const whatsappApprovalForwarding = createChannelApprovalForwardingEvaluator({
-	channel: "whatsapp",
-	isTransportEnabled: isWhatsAppApprovalTransportEnabled,
-	hasMatchingTarget: hasMatchingWhatsAppTarget,
-	hasOriginOrSessionTarget: hasWhatsAppOriginOrSessionTarget
-});
-const canApprovalPotentiallyRouteToWhatsApp = whatsappApprovalForwarding.isPotentialRoute;
-const canAnyApprovalPotentiallyRouteToWhatsApp = whatsappApprovalForwarding.canAnyPotentiallyRoute;
-const isWhatsAppSessionApprovalEligible = whatsappApprovalForwarding.isSessionEligible;
-const isWhatsAppExplicitTargetEligible = whatsappApprovalForwarding.isExplicitTargetEligible;
 function resolveTurnSourceWhatsAppOriginTarget(request) {
 	if (normalizeLowercaseStringOrEmpty(request.request.turnSourceChannel) !== "whatsapp") return null;
 	const to = normalizeWhatsAppMessagingTarget(request.request.turnSourceTo ?? "");
@@ -117,9 +64,15 @@ function resolveSessionWhatsAppOriginTarget(sessionTarget) {
 		accountId: normalizeOptionalString(sessionTarget.accountId)
 	} : null;
 }
-function shouldHandleWhatsAppApprovalRequest(params) {
-	return whatsappApprovalForwarding.shouldHandleRequest(params);
-}
+const { canApprovalPotentiallyRouteToChannel: canApprovalPotentiallyRouteToWhatsApp, canAnyApprovalPotentiallyRouteToChannel: canAnyApprovalPotentiallyRouteToWhatsApp, isSessionApprovalEligible: isWhatsAppSessionApprovalEligible, isExplicitTargetEligible: isWhatsAppExplicitTargetEligible, shouldHandleApprovalRequest: shouldHandleWhatsAppApprovalRequest } = createNativeApprovalChannelRouteGates({
+	channel: "whatsapp",
+	defaultForwardingMode: DEFAULT_APPROVAL_FORWARDING_MODE,
+	isTransportEnabled: isWhatsAppApprovalTransportEnabled,
+	listAccountIds,
+	resolveDefaultAccountId: resolveDefaultWhatsAppAccountId,
+	normalizeForwardTarget: normalizeWhatsAppForwardTarget,
+	resolveTurnSourceTarget: resolveTurnSourceWhatsAppOriginTarget
+});
 const resolveWhatsAppOriginTargetBase = createChannelNativeOriginTargetResolver({
 	channel: "whatsapp",
 	shouldHandleRequest: shouldHandleWhatsAppApprovalRequest,
@@ -252,7 +205,7 @@ const whatsappApprovalCapability = createChannelApprovalCapability({
 			accountId,
 			request
 		}),
-		load: async () => (await import("./approval-handler.runtime-C25wPeBf.js")).whatsappApprovalNativeRuntime
+		load: async () => (await import("./approval-handler.runtime-BIZgAkfR.js")).whatsappApprovalNativeRuntime
 	})
 });
 splitChannelApprovalCapability(whatsappApprovalCapability);
@@ -651,7 +604,7 @@ function collectWhatsAppStatusIssues(accounts) {
 //#endregion
 //#region extensions/whatsapp/src/channel.ts
 const loadWhatsAppDirectoryConfig = createLazyRuntimeModule(() => import("./directory-config-Dijefxc3.js").then((n) => n.t));
-const loadWhatsAppChannelReactAction = createLazyRuntimeModule(() => import("./channel-react-action-Cd2qkLqp.js"));
+const loadWhatsAppChannelReactAction = createLazyRuntimeModule(() => import("./channel-react-action-CYx128FS.js"));
 function resolveWhatsAppTargetInfo(raw) {
 	const normalized = normalizeWhatsAppTarget(raw);
 	if (!normalized) return null;

package/dist/channel-plugin-api.js

@@ -1,2 +1,2 @@
-import { t as whatsappPlugin } from "./channel-CLOhkP85.js";
+import { t as whatsappPlugin } from "./channel-dHRyqWut.js";
 export { whatsappPlugin };

package/dist/{channel-react-action-Cd2qkLqp.js → channel-react-action-CYx128FS.js}

@@ -1,7 +1,7 @@
 import { a as resolveWhatsAppAccount, s as resolveWhatsAppMediaMaxBytes } from "./accounts-BMGM1RtF.js";
 import { c as normalizeWhatsAppTarget, t as isWhatsAppGroupJid } from "./normalize-target-bVWjgftN.js";
-import { r as resolveAuthorizedWhatsAppOutboundTarget, t as handleWhatsAppAction } from "./action-runtime-BdhkGtaP.js";
-import { t as sendMessageWhatsApp } from "./send-C4LG-Cl6.js";
+import { r as resolveAuthorizedWhatsAppOutboundTarget, t as handleWhatsAppAction } from "./action-runtime-BbUDQ78g.js";
+import { t as sendMessageWhatsApp } from "./send-DjMBLgiv.js";
 import "./normalize-Bxwqo-bW.js";
 import { jsonResult, readStringOrNumberParam, readStringParam as readStringParam$1, resolveReactionMessageId } from "openclaw/plugin-sdk/channel-actions";
 //#region extensions/whatsapp/src/channel-react-action.ts

package/dist/{channel.runtime-CcGhK_F2.js → channel.runtime-3WElbRZG.js}

@@ -1,9 +1,9 @@
 import { startWebLoginWithQr as startWebLoginWithQr$1, waitForWebLogin as waitForWebLogin$1 } from "./login-qr-runtime.js";
-import { c as logoutWeb$1, d as readWebAuthExistsBestEffort$1, f as readWebAuthExistsForDecision$1, g as readWebSelfId$1, h as readWebAuthState$1, m as readWebAuthSnapshotBestEffort$1, o as getWebAuthAgeMs$1, p as readWebAuthSnapshot$1, s as logWebSelfId$1, x as webAuthExists$1 } from "./auth-store-BrKb0mwT.js";
+import { c as logoutWeb$1, d as readWebAuthExistsBestEffort$1, f as readWebAuthExistsForDecision$1, g as readWebSelfId$1, h as readWebAuthState$1, m as readWebAuthSnapshotBestEffort$1, o as getWebAuthAgeMs$1, p as readWebAuthSnapshot$1, s as logWebSelfId$1, x as webAuthExists$1 } from "./auth-store-CZ22aNcV.js";
 import { t as getActiveWebListener$1 } from "./active-listener-CFwkn3ho.js";
-import { t as monitorWebChannel$1 } from "./monitor-D4R-fcMW.js";
-import { t as loginWeb$1 } from "./login-1yyBrXTL.js";
-import { whatsappSetupWizard as whatsappSetupWizard$1 } from "./setup-surface-Bt5mdv4D.js";
+import { t as monitorWebChannel$1 } from "./monitor-NKzAEWeJ.js";
+import { t as loginWeb$1 } from "./login-DygDn79y.js";
+import { whatsappSetupWizard as whatsappSetupWizard$1 } from "./setup-surface-_Cid6xIf.js";
 //#region extensions/whatsapp/src/channel.runtime.ts
 function getActiveWebListener(...args) {
 	return getActiveWebListener$1(...args);

package/dist/{channel.setup-COV8culQ.js → channel.setup-BuSd1d1D.js}

@@ -1,9 +1,9 @@
 import "./accounts-BMGM1RtF.js";
-import { a as resolveWhatsAppGroupRequireMention, i as whatsappSetupWizardProxy, n as createWhatsAppPluginBase, o as resolveWhatsAppGroupToolPolicy, s as resolveWhatsAppGroupIntroHint, t as whatsappSetupAdapter } from "./setup-core-DAgAB2WU.js";
+import { a as resolveWhatsAppGroupRequireMention, i as whatsappSetupWizardProxy, n as createWhatsAppPluginBase, o as resolveWhatsAppGroupToolPolicy, s as resolveWhatsAppGroupIntroHint, t as whatsappSetupAdapter } from "./setup-core-B9CAuPOB.js";
 import { t as detectWhatsAppLegacyStateMigrations } from "./state-migrations-D_BmQUR9.js";
 //#region extensions/whatsapp/src/channel.setup.ts
 async function isWhatsAppAuthConfigured(account) {
-	const { readWebAuthState } = await import("./auth-store-BrKb0mwT.js").then((n) => n.i);
+	const { readWebAuthState } = await import("./auth-store-CZ22aNcV.js").then((n) => n.i);
 	return await readWebAuthState(account.authDir) === "linked";
 }
 const whatsappSetupPlugin = {

package/dist/{connection-controller-BZuzYCGM.js → connection-controller-Bnm4INld.js}

@@ -1,6 +1,6 @@
 import { a as unregisterWhatsAppConnectionController, i as registerWhatsAppConnectionController, n as getStatusCode, t as formatError } from "./session-errors-CbsoQqoy.js";
-import { c as logoutWeb } from "./auth-store-BrKb0mwT.js";
-import { r as waitForWaConnection, t as createWaSocket } from "./session-D8UW2Vbn.js";
+import { c as logoutWeb } from "./auth-store-CZ22aNcV.js";
+import { r as waitForWaConnection, t as createWaSocket } from "./session-DyGWNClj.js";
 import { computeBackoff, info, sleepWithAbort } from "openclaw/plugin-sdk/runtime-env";
 import { clamp } from "openclaw/plugin-sdk/text-utility-runtime";
 import { DisconnectReason } from "baileys";
@@ -38,13 +38,24 @@ function newConnectionId() {
 //#endregion
 //#region extensions/whatsapp/src/connection-controller.ts
 const LOGGED_OUT_STATUS = DisconnectReason?.loggedOut ?? 401;
+const POST_PAIRING_RESTART_STATUS = 515;
+const TIMED_OUT_STATUS = DisconnectReason?.timedOut ?? 408;
 const WHATSAPP_LOGIN_RESTART_MESSAGE = "WhatsApp asked for a restart after pairing (code 515); waiting for creds to save…";
+const WHATSAPP_LOGIN_TIMEOUT_RESTART_MESSAGE = "WhatsApp connection timed out before login; retrying with a fresh socket…";
 const WHATSAPP_LOGGED_OUT_RELINK_MESSAGE = "WhatsApp reported the session is logged out. Cleared cached web session; please rerun openclaw channels login and scan the QR again.";
 const WHATSAPP_LOGGED_OUT_QR_MESSAGE = "WhatsApp reported the session is logged out. Cleared cached web session; please scan a new QR.";
 const WHATSAPP_WATCHDOG_TIMEOUT_ERROR = "watchdog-timeout";
 function createNeverResolvePromise() {
 	return new Promise(() => {});
 }
+function getLoginSocketRestartKind(statusCode) {
+	if (statusCode === POST_PAIRING_RESTART_STATUS) return "post-pairing";
+	if (statusCode === TIMED_OUT_STATUS) return "timeout";
+	return null;
+}
+function getLoginSocketRestartMessage(kind) {
+	return kind === "timeout" ? WHATSAPP_LOGIN_TIMEOUT_RESTART_MESSAGE : WHATSAPP_LOGIN_RESTART_MESSAGE;
+}
 function createLiveConnection(params) {
 	let closeResolved = false;
 	let resolveClosePromise = (_reason) => {};
@@ -91,19 +102,22 @@ async function waitForWhatsAppLoginResult(params) {
 	const wait = params.waitForConnection ?? waitForWaConnection;
 	const createSocket = params.createSocket ?? createWaSocket;
 	let currentSock = params.sock;
-	let restarted = false;
+	let postPairingRestarted = false;
+	let timeoutRestarted = false;
 	while (true) try {
 		await wait(currentSock);
 		return {
 			outcome: "connected",
-			restarted,
+			restarted: postPairingRestarted || timeoutRestarted,
 			sock: currentSock
 		};
 	} catch (err) {
 		const statusCode = getStatusCode(err);
-		if (statusCode === 515 && !restarted) {
-			restarted = true;
-			params.runtime.log(info(WHATSAPP_LOGIN_RESTART_MESSAGE));
+		const restartKind = getLoginSocketRestartKind(statusCode);
+		if (restartKind && (restartKind === "post-pairing" && !postPairingRestarted || restartKind === "timeout" && !timeoutRestarted)) {
+			if (restartKind === "post-pairing") postPairingRestarted = true;
+			else timeoutRestarted = true;
+			params.runtime.log(info(getLoginSocketRestartMessage(restartKind)));
 			closeWaSocket(currentSock);
 			try {
 				currentSock = await createSocket(false, params.verbose, {

package/dist/light-runtime-api.js

@@ -1,5 +1,5 @@
 import { n as getStatusCode, t as formatError } from "./session-errors-CbsoQqoy.js";
 import { t as createWhatsAppLoginTool } from "./agent-tools-login-BX7eHgDm.js";
-import { c as logoutWeb, g as readWebSelfId, l as pickWebChannel, o as getWebAuthAgeMs, s as logWebSelfId, t as WA_WEB_AUTH_DIR, x as webAuthExists, y as resolveDefaultWebAuthDir } from "./auth-store-BrKb0mwT.js";
+import { c as logoutWeb, g as readWebSelfId, l as pickWebChannel, o as getWebAuthAgeMs, s as logWebSelfId, t as WA_WEB_AUTH_DIR, x as webAuthExists, y as resolveDefaultWebAuthDir } from "./auth-store-CZ22aNcV.js";
 import { t as getActiveWebListener } from "./active-listener-CFwkn3ho.js";
 export { WA_WEB_AUTH_DIR, createWhatsAppLoginTool, formatError, getActiveWebListener, getStatusCode, getWebAuthAgeMs, logWebSelfId, logoutWeb, pickWebChannel, readWebSelfId, resolveDefaultWebAuthDir, webAuthExists };

package/dist/{login-1yyBrXTL.js → login-DygDn79y.js}

@@ -1,8 +1,8 @@
 import { t as __exportAll } from "./rolldown-runtime-D7D4PA-g.js";
 import { a as resolveWhatsAppAccount } from "./accounts-BMGM1RtF.js";
-import { b as restoreCredsFromBackupIfNeeded } from "./auth-store-BrKb0mwT.js";
-import { a as renderQrTerminal, i as resolveWhatsAppSocketTiming, t as createWaSocket } from "./session-D8UW2Vbn.js";
-import { a as closeWaSocketSoon, o as waitForWhatsAppLoginResult } from "./connection-controller-BZuzYCGM.js";
+import { b as restoreCredsFromBackupIfNeeded } from "./auth-store-CZ22aNcV.js";
+import { a as renderQrTerminal, i as resolveWhatsAppSocketTiming, t as createWaSocket } from "./session-DyGWNClj.js";
+import { a as closeWaSocketSoon, o as waitForWhatsAppLoginResult } from "./connection-controller-Bnm4INld.js";
 import { formatCliCommand } from "openclaw/plugin-sdk/cli-runtime";
 import { logInfo } from "openclaw/plugin-sdk/logging-core";
 import { danger, defaultRuntime, success } from "openclaw/plugin-sdk/runtime-env";

package/dist/{login-qr-6DdwGlkz.js → login-qr-nPxKvdjP.js}

@@ -1,10 +1,11 @@
 import { a as resolveWhatsAppAccount } from "./accounts-BMGM1RtF.js";
-import { f as readWebAuthExistsForDecision, g as readWebSelfId, n as WHATSAPP_AUTH_UNSTABLE_CODE } from "./auth-store-BrKb0mwT.js";
-import { i as resolveWhatsAppSocketTiming, t as createWaSocket } from "./session-D8UW2Vbn.js";
-import { i as closeWaSocket, o as waitForWhatsAppLoginResult, t as WHATSAPP_LOGGED_OUT_QR_MESSAGE } from "./connection-controller-BZuzYCGM.js";
+import { f as readWebAuthExistsForDecision, g as readWebSelfId, n as WHATSAPP_AUTH_UNSTABLE_CODE } from "./auth-store-CZ22aNcV.js";
+import { i as resolveWhatsAppSocketTiming, t as createWaSocket } from "./session-DyGWNClj.js";
+import { i as closeWaSocket, o as waitForWhatsAppLoginResult, t as WHATSAPP_LOGGED_OUT_QR_MESSAGE } from "./connection-controller-Bnm4INld.js";
 import { logInfo } from "openclaw/plugin-sdk/logging-core";
 import { danger, defaultRuntime, info, success } from "openclaw/plugin-sdk/runtime-env";
 import { renderQrPngDataUrl } from "openclaw/plugin-sdk/media-runtime";
+import { resolveTimerTimeoutMs } from "openclaw/plugin-sdk/number-runtime";
 import { randomUUID } from "node:crypto";
 import { getRuntimeConfig } from "openclaw/plugin-sdk/runtime-config-snapshot";
 //#region extensions/whatsapp/src/login-qr.ts
@@ -14,6 +15,9 @@ function waitForNextTask() {
 const ACTIVE_LOGIN_TTL_MS = 3 * 6e4;
 const MAX_QR_RENDER_CHASES = 10;
 const activeLogins = /* @__PURE__ */ new Map();
+function resolveWhatsAppLoginTimeoutMs(value, fallbackMs, minMs) {
+	return resolveTimerTimeoutMs(value, fallbackMs, minMs);
+}
 function closeSocket(sock) {
 	closeWaSocket(sock);
 }
@@ -90,6 +94,7 @@ function attachLoginWaiter(accountId, login) {
 			const current = activeLogins.get(accountId);
 			if (!current || current.id !== login.id) return;
 			const qrVersion = updateLoginQrState(current, qr);
+			notifyQrUpdate(current);
 			renderLatestQrDataUrlInBackground({
 				accountId,
 				loginId: login.id,
@@ -152,7 +157,27 @@ async function waitForQrOrRecoveredLogin(params) {
 			message: latest.error ? `WhatsApp login failed: ${latest.error}` : "WhatsApp login failed."
 		};
 	});
-	return await Promise.race([qrResult, loginResult]);
+	const qrUpdateResult = params.login.qrUpdatePromise.then(() => {
+		const current = activeLogins.get(params.accountId);
+		if (current?.id !== params.login.id) return {
+			outcome: "failed",
+			message: "WhatsApp login was replaced by a newer request."
+		};
+		if (current.qr) return {
+			outcome: "qr",
+			qr: current.qr
+		};
+		if (current.connected) return { outcome: "connected" };
+		return {
+			outcome: "failed",
+			message: current.error ? `WhatsApp login failed: ${current.error}` : "WhatsApp QR update ended without an active QR."
+		};
+	});
+	return await Promise.race([
+		qrResult,
+		loginResult,
+		qrUpdateResult
+	]);
 }
 async function startWebLoginWithQr(opts = {}) {
 	const runtime = opts.runtime ?? defaultRuntime;
@@ -185,7 +210,7 @@ async function startWebLoginWithQr(opts = {}) {
 	});
 	const qrTimer = setTimeout(() => {
 		rejectQr?.(/* @__PURE__ */ new Error("Timed out waiting for WhatsApp QR"));
-	}, Math.max(opts.timeoutMs ?? 3e4, 5e3));
+	}, resolveWhatsAppLoginTimeoutMs(opts.timeoutMs, 3e4, 5e3));
 	let sock;
 	let pendingQr = null;
 	const loginId = randomUUID();
@@ -310,7 +335,7 @@ async function waitForWebLogin(opts = {}) {
 			message: "The login QR expired. Ask me to generate a new one."
 		};
 	}
-	const timeoutMs = Math.max(opts.timeoutMs ?? 12e4, 1e3);
+	const timeoutMs = resolveWhatsAppLoginTimeoutMs(opts.timeoutMs, 12e4, 1e3);
 	const deadline = Date.now() + timeoutMs;
 	const currentQrDataUrl = opts.currentQrDataUrl;
 	while (true) {

package/dist/login-qr-runtime.js

@@ -1,7 +1,7 @@
 //#region extensions/whatsapp/login-qr-runtime.ts
 let loginQrModulePromise = null;
 function loadLoginQrModule() {
-	loginQrModulePromise ??= import("./login-qr-6DdwGlkz.js");
+	loginQrModulePromise ??= import("./login-qr-nPxKvdjP.js");
 	return loginQrModulePromise;
 }
 async function startWebLoginWithQr(...args) {

package/dist/{monitor-D4R-fcMW.js → monitor-NKzAEWeJ.js}

@@ -1,18 +1,18 @@
 import { a as resolveWhatsAppAccount, s as resolveWhatsAppMediaMaxBytes } from "./accounts-BMGM1RtF.js";
 import { t as isWhatsAppGroupJid } from "./normalize-target-bVWjgftN.js";
-import { a as normalizeWhatsAppOutboundPayload, c as prepareWhatsAppOutboundMedia, d as maybeResolveWhatsAppApprovalReaction, g as resolveWhatsAppReactionLevel, l as sendWhatsAppOutboundWithRetry, r as sendReactionWhatsApp, s as normalizeWhatsAppPayloadTextPreservingIndentation } from "./send-C4LG-Cl6.js";
+import { a as normalizeWhatsAppOutboundPayload, c as prepareWhatsAppOutboundMedia, d as maybeResolveWhatsAppApprovalReaction, g as resolveWhatsAppReactionLevel, l as sendWhatsAppOutboundWithRetry, r as sendReactionWhatsApp, s as normalizeWhatsAppPayloadTextPreservingIndentation } from "./send-DjMBLgiv.js";
 import { n as getWhatsAppRuntime } from "./runtime-BfAdAEYT.js";
 import { n as getStatusCode, t as formatError } from "./session-errors-CbsoQqoy.js";
 import { d as markdownToWhatsApp, f as resolveJidToE164, l as isSelfChatMode, n as normalizeE164, t as convertMarkdownTables$1, u as jidToE164 } from "./text-runtime-Dk37KYHj.js";
 import { n as cacheInboundMessageMeta, r as lookupInboundMessageMeta, t as buildQuotedMessageOptions } from "./quoted-message-CveINB35.js";
-import { c as logoutWeb, g as readWebSelfId, o as getWebAuthAgeMs, r as WhatsAppAuthUnstableError, v as readWebSelfIdentityForDecision } from "./auth-store-BrKb0mwT.js";
+import { c as logoutWeb, g as readWebSelfId, o as getWebAuthAgeMs, r as WhatsAppAuthUnstableError, v as readWebSelfIdentityForDecision } from "./auth-store-CZ22aNcV.js";
 import { a as getSelfIdentity, c as resolveComparableIdentity, i as getReplyContext, n as getMentionIdentities, o as getSenderIdentity, r as getPrimaryIdentityId, s as identitiesOverlap, t as getComparableIdentityValues } from "./identity-xoLLdqEv.js";
 import { n as resolveWhatsAppGroupsConfigPath } from "./group-config-path-BGyzT9Lg.js";
 import { i as resolveWhatsAppInboundPolicy, r as resolveWhatsAppCommandAuthorized, t as checkInboundAccessControl } from "./access-control-Z0fYaWrx.js";
-import { a as mayContainWhatsAppOutboundMention, c as describeReplyContext, d as extractLocationData, f as extractMediaPlaceholder, h as hasInboundUserContent, i as addWhatsAppOutboundMentionsToContent, l as extractContactContext, m as extractText, n as listWhatsAppSendResultMessageIds, o as resolveWhatsAppOutboundMentions, p as extractMentionedJids, r as normalizeWhatsAppSendResult, s as addWhatsAppImagePreviewFields, t as createWebSendApi, u as extractContextInfo } from "./send-api-C66vkRl9.js";
-import { i as resolveWhatsAppSocketTiming, r as waitForWaConnection, t as createWaSocket } from "./session-D8UW2Vbn.js";
+import { a as mayContainWhatsAppOutboundMention, c as describeReplyContext, d as extractLocationData, f as extractMediaPlaceholder, h as hasInboundUserContent, i as addWhatsAppOutboundMentionsToContent, l as extractContactContext, m as extractText, n as listWhatsAppSendResultMessageIds, o as resolveWhatsAppOutboundMentions, p as extractMentionedJids, r as normalizeWhatsAppSendResult, s as addWhatsAppImagePreviewFields, t as createWebSendApi, u as extractContextInfo } from "./send-api-Cx2qeYqj.js";
+import { i as resolveWhatsAppSocketTiming, r as waitForWaConnection, t as createWaSocket } from "./session-DyGWNClj.js";
 import { t as BufferJSON } from "./session.runtime-LZFdq3yb.js";
-import { c as computeBackoff, d as resolveReconnectPolicy, f as sleepWithAbort, l as newConnectionId, n as WHATSAPP_WATCHDOG_TIMEOUT_ERROR, r as WhatsAppConnectionController, s as DEFAULT_RECONNECT_POLICY, u as resolveHeartbeatSeconds } from "./connection-controller-BZuzYCGM.js";
+import { c as computeBackoff, d as resolveReconnectPolicy, f as sleepWithAbort, l as newConnectionId, n as WHATSAPP_WATCHDOG_TIMEOUT_ERROR, r as WhatsAppConnectionController, s as DEFAULT_RECONNECT_POLICY, u as resolveHeartbeatSeconds } from "./connection-controller-Bnm4INld.js";
 import { resolveAccountEntry } from "openclaw/plugin-sdk/account-core";
 import { normalizeLowercaseStringOrEmpty, normalizeStringEntries, uniqueStrings } from "openclaw/plugin-sdk/string-coerce-runtime";
 import { createChannelMessageReplyPipeline, createDurableInboundReceiveJournal, createMessageReceiptFromOutboundResults, deliverInboundReplyWithMessageSendContext, resolveChannelMessageSourceReplyDeliveryMode } from "openclaw/plugin-sdk/channel-outbound";
@@ -24,9 +24,10 @@ import { resolveMarkdownTableMode as resolveMarkdownTableMode$1 } from "openclaw
 import { createSubsystemLogger, defaultRuntime, formatDurationPrecise, getChildLogger as getChildLogger$1, logVerbose, logVerbose as logVerbose$1, registerUnhandledRejectionHandler, shouldLogVerbose, shouldLogVerbose as shouldLogVerbose$1, warn } from "openclaw/plugin-sdk/runtime-env";
 import { getAgentScopedMediaLocalRoots } from "openclaw/plugin-sdk/media-runtime";
 import { LocalMediaAccessError, getDefaultLocalRoots, loadWebMedia as loadWebMedia$1, loadWebMediaRaw, optimizeImageToJpeg, optimizeImageToPng } from "openclaw/plugin-sdk/web-media";
-import { DEFAULT_ACCOUNT_ID as DEFAULT_ACCOUNT_ID$1, DEFAULT_MAIN_KEY, buildAgentMainSessionKey, buildAgentSessionKey, buildGroupHistoryKey, deriveLastRoutePolicy, normalizeAccountId as normalizeAccountId$1, normalizeAgentId, resolveAgentRoute, resolveInboundLastRouteSessionKey, resolveThreadSessionKeys } from "openclaw/plugin-sdk/routing";
 import { chunkMarkdownTextWithMode } from "openclaw/plugin-sdk/reply-chunking";
 import { isReasoningReplyPayload, resolveSendableOutboundReplyParts, sendMediaWithLeadingCaption } from "openclaw/plugin-sdk/reply-payload";
+import { DEFAULT_ACCOUNT_ID as DEFAULT_ACCOUNT_ID$1, DEFAULT_MAIN_KEY, buildAgentMainSessionKey, buildAgentSessionKey, buildGroupHistoryKey, deriveLastRoutePolicy, normalizeAccountId as normalizeAccountId$1, normalizeAgentId, resolveAgentRoute, resolveInboundLastRouteSessionKey, resolveThreadSessionKeys } from "openclaw/plugin-sdk/routing";
+import { asDateTimestampMs, parseStrictFiniteNumber, resolveExpiresAtMsFromDurationMs } from "openclaw/plugin-sdk/number-runtime";
 import { recordInboundSession } from "openclaw/plugin-sdk/conversation-runtime";
 import { loadSessionStore, resolveStorePath, updateLastRoute, updateSessionStore } from "openclaw/plugin-sdk/session-store-runtime";
 import { DisconnectReason as DisconnectReason$1, downloadMediaMessage, isJidGroup, normalizeMessageContent as normalizeMessageContent$1 } from "baileys";
@@ -41,7 +42,6 @@ import { hasControlCommand, isControlCommandMessage, isControlCommandMessage as
 import { drainPendingDeliveries } from "openclaw/plugin-sdk/delivery-queue-runtime";
 import { DEFAULT_GROUP_HISTORY_LIMIT, buildHistoryContextFromEntries, buildInboundHistoryFromEntries, createChannelHistoryWindow } from "openclaw/plugin-sdk/reply-history";
 import { enqueueSystemEvent } from "openclaw/plugin-sdk/system-event-runtime";
-import { parseStrictFiniteNumber } from "openclaw/plugin-sdk/number-runtime";
 import { createClaimableDedupe } from "openclaw/plugin-sdk/persistent-dedupe";
 import { saveMediaStream } from "openclaw/plugin-sdk/media-store";
 import { getRuntimeConfig as getRuntimeConfig$1, getRuntimeConfigSourceSnapshot } from "openclaw/plugin-sdk/runtime-config-snapshot";
@@ -263,6 +263,10 @@ const LOGGED_OUT_STATUS = DisconnectReason$1?.loggedOut ?? 401;
 const RECONNECT_IN_PROGRESS_ERROR = "no active socket - reconnection in progress";
 const GROUP_META_TTL_MS = 300 * 1e3;
 const INBOUND_CLOSE_DRAIN_TIMEOUT_MS = 5e3;
+function resolveGroupMetadataExpiresAt(nowRaw = Date.now()) {
+	const now = asDateTimestampMs(nowRaw);
+	return now === void 0 ? void 0 : resolveExpiresAtMsFromDurationMs(GROUP_META_TTL_MS, { nowMs: now });
+}
 function parseWhatsAppTimestampSeconds(value) {
 	if (value == null) return;
 	if (typeof value === "string") return parseStrictFiniteNumber(value);
@@ -270,6 +274,10 @@ function parseWhatsAppTimestampSeconds(value) {
 	return Number.isFinite(parsed) ? parsed : void 0;
 }
 function rememberGroupMetadataCacheEntry(cache, jid, entry) {
+	if (asDateTimestampMs(entry.expires) === void 0) {
+		cache.delete(jid);
+		return;
+	}
 	if (cache.has(jid)) cache.delete(jid);
 	cache.set(jid, entry);
 	while (cache.size > 500) {
@@ -281,7 +289,9 @@ function rememberGroupMetadataCacheEntry(cache, jid, entry) {
 function readGroupMetadataCacheEntry(cache, jid) {
 	const entry = cache.get(jid);
 	if (!entry) return null;
-	if (entry.expires <= Date.now()) {
+	const now = asDateTimestampMs(Date.now());
+	const expires = asDateTimestampMs(entry.expires);
+	if (now === void 0 || expires === void 0 || expires <= now) {
 		cache.delete(jid);
 		return null;
 	}
@@ -477,12 +487,12 @@ async function attachWebInboxToSocket(options) {
 			subject: meta.subject,
 			participants,
 			mentionParticipants,
-			expires: Date.now() + GROUP_META_TTL_MS
+			expires: resolveGroupMetadataExpiresAt() ?? 0
 		};
 	};
 	const summarizeGroupMetaForReconnectCache = (meta) => ({
 		subject: meta.subject,
-		expires: Date.now() + GROUP_META_TTL_MS
+		expires: resolveGroupMetadataExpiresAt() ?? NaN
 	});
 	const getGroupMeta = async (jid) => {
 		const cached = readGroupMetadataCacheEntry(groupMetaCache, jid);
@@ -503,7 +513,7 @@ async function attachWebInboxToSocket(options) {
 				return hydrated;
 			}
 			logWhatsAppVerbose(options.verbose, `Failed to fetch group metadata for ${jid}: ${String(err)}`);
-			return { expires: Date.now() + GROUP_META_TTL_MS };
+			return { expires: resolveGroupMetadataExpiresAt() ?? 0 };
 		}
 	};
 	const resolveOutboundMentionsForGroup = async (jid, text) => {

package/dist/runtime-api.js

@@ -1,16 +1,16 @@
 import { o as resolveWebCredsBackupPath, r as hasWebCredsSync, s as resolveWebCredsPath } from "./creds-files-B1kSWtBg.js";
-import { n as whatsAppActionRuntime, t as handleWhatsAppAction } from "./action-runtime-BdhkGtaP.js";
-import { i as sendTypingWhatsApp, n as sendPollWhatsApp, r as sendReactionWhatsApp, t as sendMessageWhatsApp } from "./send-C4LG-Cl6.js";
+import { n as whatsAppActionRuntime, t as handleWhatsAppAction } from "./action-runtime-BbUDQ78g.js";
+import { i as sendTypingWhatsApp, n as sendPollWhatsApp, r as sendReactionWhatsApp, t as sendMessageWhatsApp } from "./send-DjMBLgiv.js";
 import { r as setWhatsAppRuntime } from "./runtime-BfAdAEYT.js";
 import { n as getStatusCode, t as formatError } from "./session-errors-CbsoQqoy.js";
 import { startWebLoginWithQr, waitForWebLogin } from "./login-qr-runtime.js";
 import { t as createWhatsAppLoginTool } from "./agent-tools-login-BX7eHgDm.js";
-import { C as waitForCredsSaveQueue, T as writeCredsJsonAtomically, _ as readWebSelfIdentity, a as formatWhatsAppWebAuthStatusState, b as restoreCredsFromBackupIfNeeded, c as logoutWeb, d as readWebAuthExistsBestEffort, f as readWebAuthExistsForDecision, g as readWebSelfId, h as readWebAuthState, l as pickWebChannel, m as readWebAuthSnapshotBestEffort, n as WHATSAPP_AUTH_UNSTABLE_CODE, o as getWebAuthAgeMs, p as readWebAuthSnapshot, r as WhatsAppAuthUnstableError, s as logWebSelfId, t as WA_WEB_AUTH_DIR, u as readCredsJsonRaw, v as readWebSelfIdentityForDecision, w as waitForCredsSaveQueueWithTimeout, x as webAuthExists, y as resolveDefaultWebAuthDir } from "./auth-store-BrKb0mwT.js";
+import { C as waitForCredsSaveQueue, T as writeCredsJsonAtomically, _ as readWebSelfIdentity, a as formatWhatsAppWebAuthStatusState, b as restoreCredsFromBackupIfNeeded, c as logoutWeb, d as readWebAuthExistsBestEffort, f as readWebAuthExistsForDecision, g as readWebSelfId, h as readWebAuthState, l as pickWebChannel, m as readWebAuthSnapshotBestEffort, n as WHATSAPP_AUTH_UNSTABLE_CODE, o as getWebAuthAgeMs, p as readWebAuthSnapshot, r as WhatsAppAuthUnstableError, s as logWebSelfId, t as WA_WEB_AUTH_DIR, u as readCredsJsonRaw, v as readWebSelfIdentityForDecision, w as waitForCredsSaveQueueWithTimeout, x as webAuthExists, y as resolveDefaultWebAuthDir } from "./auth-store-CZ22aNcV.js";
 import { t as DEFAULT_WEB_MEDIA_BYTES } from "./constants-HU41RHGI.js";
-import { d as extractLocationData, f as extractMediaPlaceholder, l as extractContactContext, m as extractText } from "./send-api-C66vkRl9.js";
-import { n as newConnectionId, r as waitForWaConnection, t as createWaSocket } from "./session-D8UW2Vbn.js";
+import { d as extractLocationData, f as extractMediaPlaceholder, l as extractContactContext, m as extractText } from "./send-api-Cx2qeYqj.js";
+import { n as newConnectionId, r as waitForWaConnection, t as createWaSocket } from "./session-DyGWNClj.js";
 import { n as resolveWebAccountId, t as getActiveWebListener } from "./active-listener-CFwkn3ho.js";
-import { a as loadWebMediaRaw, c as monitorWebInbox, i as loadWebMedia, l as resetWebInboundDedupe, n as LocalMediaAccessError, o as optimizeImageToJpeg, r as getDefaultLocalRoots, s as optimizeImageToPng, t as monitorWebChannel } from "./monitor-D4R-fcMW.js";
-import { t as loginWeb } from "./login-1yyBrXTL.js";
+import { a as loadWebMediaRaw, c as monitorWebInbox, i as loadWebMedia, l as resetWebInboundDedupe, n as LocalMediaAccessError, o as optimizeImageToJpeg, r as getDefaultLocalRoots, s as optimizeImageToPng, t as monitorWebChannel } from "./monitor-NKzAEWeJ.js";
+import { t as loginWeb } from "./login-DygDn79y.js";
 import { HEARTBEAT_PROMPT, HEARTBEAT_TOKEN, SILENT_REPLY_TOKEN, stripHeartbeatToken } from "openclaw/plugin-sdk/reply-runtime";
 export { DEFAULT_WEB_MEDIA_BYTES, HEARTBEAT_PROMPT, HEARTBEAT_TOKEN, LocalMediaAccessError, SILENT_REPLY_TOKEN, WA_WEB_AUTH_DIR, WHATSAPP_AUTH_UNSTABLE_CODE, WhatsAppAuthUnstableError, createWaSocket, createWhatsAppLoginTool, extractContactContext, extractLocationData, extractMediaPlaceholder, extractText, formatError, formatWhatsAppWebAuthStatusState, getActiveWebListener, getDefaultLocalRoots, getStatusCode, getWebAuthAgeMs, handleWhatsAppAction, hasWebCredsSync, loadWebMedia, loadWebMediaRaw, logWebSelfId, loginWeb, logoutWeb, monitorWebChannel, monitorWebInbox, newConnectionId, optimizeImageToJpeg, optimizeImageToPng, pickWebChannel, readCredsJsonRaw, readWebAuthExistsBestEffort, readWebAuthExistsForDecision, readWebAuthSnapshot, readWebAuthSnapshotBestEffort, readWebAuthState, readWebSelfId, readWebSelfIdentity, readWebSelfIdentityForDecision, resetWebInboundDedupe, resolveDefaultWebAuthDir, resolveWebAccountId, resolveWebCredsBackupPath, resolveWebCredsPath, restoreCredsFromBackupIfNeeded, sendMessageWhatsApp, sendPollWhatsApp, sendReactionWhatsApp, sendTypingWhatsApp, setWhatsAppRuntime, startWebLoginWithQr, stripHeartbeatToken, waitForCredsSaveQueue, waitForCredsSaveQueueWithTimeout, waitForWaConnection, waitForWebLogin, webAuthExists, whatsAppActionRuntime, writeCredsJsonAtomically };

package/dist/{send-C4LG-Cl6.js → send-DjMBLgiv.js}

@@ -472,6 +472,29 @@ const outboundLog = createSubsystemLogger("gateway/channels/whatsapp").child("ou
 function supportsForcedDocumentDelivery(kind) {
 	return kind === "image" || kind === "video";
 }
+function buildWhatsAppMediaSendState(params) {
+	const { media, caption } = params;
+	const forceDocumentDelivery = Boolean(params.forceDocument && supportsForcedDocumentDelivery(media.kind));
+	let text = caption ?? "";
+	let documentFileName = media.kind === "document" ? media.fileName : void 0;
+	let visibleTextAfterVoice;
+	if (media.kind === "audio" && caption) {
+		visibleTextAfterVoice = caption;
+		text = "";
+	}
+	if (forceDocumentDelivery) documentFileName ??= resolveWhatsAppDocumentFileName({
+		fileName: media.fileName,
+		mimetype: media.mimetype
+	});
+	return {
+		mediaBuffer: media.buffer,
+		mediaType: media.mimetype,
+		text,
+		forceDocumentDelivery,
+		...documentFileName ? { documentFileName } : {},
+		...visibleTextAfterVoice ? { visibleTextAfterVoice } : {}
+	};
+}
 function resolveOutboundWhatsAppAccountId(params) {
 	const explicitAccountId = params.accountId?.trim();
 	if (explicitAccountId) return explicitAccountId;
@@ -535,46 +558,27 @@ async function sendMessageWhatsApp(to, body, options) {
 		let documentFileName;
 		let visibleTextAfterVoice;
 		let forceDocumentDelivery = false;
-		if (mediaPayload) {
-			const media = await prepareWhatsAppOutboundMedia(mediaPayload, primaryMediaUrl);
-			const caption = text || void 0;
-			mediaBuffer = media.buffer;
-			mediaType = media.mimetype;
-			forceDocumentDelivery = Boolean(options.forceDocument && supportsForcedDocumentDelivery(media.kind));
-			if (media.kind === "audio" && caption) {
-				visibleTextAfterVoice = caption;
-				text = "";
-			} else if (media.kind === "document") {
-				text = caption ?? "";
-				documentFileName = media.fileName;
-			} else text = caption ?? "";
-			if (forceDocumentDelivery) documentFileName ??= resolveWhatsAppDocumentFileName({
-				fileName: media.fileName,
-				mimetype: media.mimetype
-			});
-		} else if (primaryMediaUrl) {
-			const media = await prepareWhatsAppOutboundMedia(await loadOutboundMediaFromUrl(primaryMediaUrl, {
-				maxBytes: resolveWhatsAppMediaMaxBytes(account),
-				optimizeImages: options.forceDocument ? false : void 0,
-				mediaAccess: options.mediaAccess,
-				mediaLocalRoots: options.mediaLocalRoots,
-				mediaReadFile: options.mediaReadFile
-			}), primaryMediaUrl);
-			const caption = text || void 0;
-			mediaBuffer = media.buffer;
-			mediaType = media.mimetype;
-			forceDocumentDelivery = Boolean(options.forceDocument && supportsForcedDocumentDelivery(media.kind));
-			if (media.kind === "audio" && caption) {
-				visibleTextAfterVoice = caption;
-				text = "";
-			} else if (media.kind === "document") {
-				text = caption ?? "";
-				documentFileName = media.fileName;
-			} else text = caption ?? "";
-			if (forceDocumentDelivery) documentFileName ??= resolveWhatsAppDocumentFileName({
-				fileName: media.fileName,
-				mimetype: media.mimetype
+		let media;
+		if (mediaPayload) media = await prepareWhatsAppOutboundMedia(mediaPayload, primaryMediaUrl);
+		else if (primaryMediaUrl) media = await prepareWhatsAppOutboundMedia(await loadOutboundMediaFromUrl(primaryMediaUrl, {
+			maxBytes: resolveWhatsAppMediaMaxBytes(account),
+			optimizeImages: options.forceDocument ? false : void 0,
+			mediaAccess: options.mediaAccess,
+			mediaLocalRoots: options.mediaLocalRoots,
+			mediaReadFile: options.mediaReadFile
+		}), primaryMediaUrl);
+		if (media) {
+			const mediaSendState = buildWhatsAppMediaSendState({
+				media,
+				caption: text || void 0,
+				forceDocument: options.forceDocument
 			});
+			mediaBuffer = mediaSendState.mediaBuffer;
+			mediaType = mediaSendState.mediaType;
+			documentFileName = mediaSendState.documentFileName;
+			visibleTextAfterVoice = mediaSendState.visibleTextAfterVoice;
+			forceDocumentDelivery = mediaSendState.forceDocumentDelivery;
+			text = mediaSendState.text;
 		}
 		outboundLog.info(`Sending message -> ${redactedJid}${hasMedia ? " (media)" : ""}`);
 		logger.info({

package/dist/{send-api-C66vkRl9.js → send-api-Cx2qeYqj.js}

@@ -1,5 +1,5 @@
 import { n as isWhatsAppNewsletterJid } from "./normalize-target-bVWjgftN.js";
-import { u as resolveWhatsAppDocumentFileName } from "./send-C4LG-Cl6.js";
+import { u as resolveWhatsAppDocumentFileName } from "./send-DjMBLgiv.js";
 import "./normalize-Bxwqo-bW.js";
 import { m as toWhatsappJidWithLid, p as toWhatsappJid, u as jidToE164 } from "./text-runtime-Dk37KYHj.js";
 import { t as buildQuotedMessageOptions } from "./quoted-message-CveINB35.js";

package/dist/{session-D8UW2Vbn.js → session-DyGWNClj.js}

@@ -1,6 +1,6 @@
 import { o as resolveWebCredsBackupPath, s as resolveWebCredsPath, t as assertWebCredsPathRegularFileOrMissing } from "./creds-files-B1kSWtBg.js";
 import { n as getStatusCode } from "./session-errors-CbsoQqoy.js";
-import { E as writeWebCredsRawAtomically, S as enqueueCredsSave, T as writeCredsJsonAtomically, b as restoreCredsFromBackupIfNeeded, u as readCredsJsonRaw, w as waitForCredsSaveQueueWithTimeout, y as resolveDefaultWebAuthDir } from "./auth-store-BrKb0mwT.js";
+import { E as writeWebCredsRawAtomically, S as enqueueCredsSave, T as writeCredsJsonAtomically, b as restoreCredsFromBackupIfNeeded, u as readCredsJsonRaw, w as waitForCredsSaveQueueWithTimeout, y as resolveDefaultWebAuthDir } from "./auth-store-CZ22aNcV.js";
 import { a as makeWASocket, i as makeCacheableSignalKeyStore, n as DisconnectReason, r as fetchLatestBaileysVersion, s as useMultiFileAuthState } from "./session.runtime-LZFdq3yb.js";
 import { VERSION, formatCliCommand } from "openclaw/plugin-sdk/cli-runtime";
 import { danger, getChildLogger, success, toPinoLikeLogger } from "openclaw/plugin-sdk/runtime-env";

package/dist/{setup-core-DAgAB2WU.js → setup-core-B9CAuPOB.js}

@@ -99,10 +99,10 @@ async function applyWhatsAppSecurityConfigFixes(params) {
 //#region extensions/whatsapp/src/shared.ts
 const WHATSAPP_CHANNEL = "whatsapp";
 async function loadWhatsAppChannelRuntime() {
-	return await import("./channel.runtime-CcGhK_F2.js");
+	return await import("./channel.runtime-3WElbRZG.js");
 }
 async function loadWhatsAppSetupSurface() {
-	return await import("./setup-surface-Bt5mdv4D.js");
+	return await import("./setup-surface-_Cid6xIf.js");
 }
 const whatsappSetupWizardProxy = createWhatsAppSetupWizardProxy(async () => (await loadWhatsAppSetupSurface()).whatsappSetupWizard);
 const whatsappConfigAdapter = createScopedChannelConfigAdapter({

package/dist/{setup-finalize-CDPy4WyU.js → setup-finalize-f95kxYvv.js}

@@ -2,7 +2,7 @@ import { r as resolveDefaultWhatsAppAccountId } from "./account-ids-CB5SOWjc.js"
 import { r as hasWebCredsSync } from "./creds-files-B1kSWtBg.js";
 import { a as resolveWhatsAppAccount, o as resolveWhatsAppAuthDir } from "./accounts-BMGM1RtF.js";
 import { a as normalizeWhatsAppAllowFromEntries, o as normalizeWhatsAppAllowFromEntry } from "./normalize-target-bVWjgftN.js";
-import { t as whatsappSetupAdapter } from "./setup-core-DAgAB2WU.js";
+import { t as whatsappSetupAdapter } from "./setup-core-B9CAuPOB.js";
 import { DEFAULT_ACCOUNT_ID, createSetupTranslator, splitSetupEntries } from "openclaw/plugin-sdk/setup";
 import { formatCliCommand, formatDocsLink } from "openclaw/plugin-sdk/setup-tools";
 //#region extensions/whatsapp/src/setup-finalize.ts
@@ -280,7 +280,7 @@ async function finalizeWhatsAppSetup(params) {
 		message: linked ? t("wizard.whatsapp.relinkPrompt") : t("wizard.whatsapp.linkNowPrompt"),
 		initialValue: !linked
 	})) try {
-		const { loginWeb } = await import("./login-1yyBrXTL.js").then((n) => n.n);
+		const { loginWeb } = await import("./login-DygDn79y.js").then((n) => n.n);
 		await loginWeb(false, void 0, params.runtime, accountId);
 	} catch (error) {
 		params.runtime.error(`WhatsApp login failed: ${String(error)}`);

package/dist/setup-plugin-api.js

@@ -1,2 +1,2 @@
-import { t as whatsappSetupPlugin } from "./channel.setup-COV8culQ.js";
+import { t as whatsappSetupPlugin } from "./channel.setup-BuSd1d1D.js";
 export { whatsappSetupPlugin };

package/dist/{setup-surface-Bt5mdv4D.js → setup-surface-_Cid6xIf.js}

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

package/npm-shrinkwrap.json

@@ -1,19 +1,19 @@
 {
   "name": "@openclaw/whatsapp",
-  "version": "2026.5.28-beta.4",
+  "version": "2026.5.30-beta.1",
   "lockfileVersion": 3,
   "requires": true,
   "packages": {
     "": {
       "name": "@openclaw/whatsapp",
-      "version": "2026.5.28-beta.4",
+      "version": "2026.5.30-beta.1",
       "dependencies": {
         "audio-decode": "2.2.3",
         "baileys": "7.0.0-rc13",
         "typebox": "1.1.38"
       },
       "peerDependencies": {
-        "openclaw": ">=2026.5.28-beta.4"
+        "openclaw": ">=2026.5.30-beta.1"
       },
       "peerDependenciesMeta": {
         "openclaw": {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@openclaw/whatsapp",
-  "version": "2026.5.28-beta.4",
+  "version": "2026.5.30-beta.1",
   "description": "OpenClaw WhatsApp channel plugin for WhatsApp Web chats.",
   "repository": {
     "type": "git",
@@ -13,7 +13,7 @@
     "typebox": "1.1.38"
   },
   "peerDependencies": {
-    "openclaw": ">=2026.5.28-beta.4"
+    "openclaw": ">=2026.5.30-beta.1"
   },
   "peerDependenciesMeta": {
     "openclaw": {
@@ -56,10 +56,10 @@
       "minHostVersion": ">=2026.4.25"
     },
     "compat": {
-      "pluginApi": ">=2026.5.28-beta.4"
+      "pluginApi": ">=2026.5.30-beta.1"
     },
     "build": {
-      "openclawVersion": "2026.5.28-beta.4"
+      "openclawVersion": "2026.5.30-beta.1"
     },
     "release": {
       "publishToClawHub": true,