@openclaw/whatsapp 2026.6.2-beta.1 → 2026.6.5-beta.1

package/dist/api.js

@@ -4,16 +4,16 @@ import { a as normalizeWhatsAppAllowFromEntries, c as normalizeWhatsAppTarget, i
 import { t as resolveWhatsAppOutboundTarget } from "./resolve-outbound-target-CcdugbDf.js";
 import "./send-DSlVXKL_.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-gnvuSqEF.js";
+import { n as WHATSAPP_LEGACY_OUTBOUND_SEND_DEP_KEYS, t as whatsappPlugin } from "./channel-CK_4OwYn.js";
 import { t as whatsappCommandPolicy } from "./command-policy-BIOSHySD.js";
-import { a as resolveWhatsAppGroupRequireMention, o as resolveWhatsAppGroupToolPolicy, s as resolveWhatsAppGroupIntroHint } from "./setup-core-B_mz0POD.js";
+import { a as resolveWhatsAppGroupRequireMention, o as resolveWhatsAppGroupToolPolicy, s as resolveWhatsAppGroupIntroHint } from "./setup-core-DLXi32yR.js";
 import "./config-schema-CROZuhT-.js";
-import { t as whatsappSetupPlugin } from "./channel.setup-WXGct37Q.js";
+import { t as whatsappSetupPlugin } from "./channel.setup-I-zFGu02.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-C53zKYSN.js";
 import { m as extractText, t as createWebSendApi } from "./send-api-Bjn-h80j.js";
-import { r as waitForWaConnection, t as createWaSocket } from "./session-mBuvPUCy.js";
+import { r as waitForWaConnection, t as createWaSocket } from "./session-CoxlXm2K.js";
 import "openclaw/plugin-sdk/channel-actions";
 import "openclaw/plugin-sdk/account-resolution";
 import "openclaw/plugin-sdk/core";
@@ -79,17 +79,11 @@ async function startWhatsAppQaDriverSession(params) {
 		closeSocket(sock);
 	};
 	sock.ev.on("messages.upsert", onMessagesUpsert);
-	let connectionTimeout;
 	try {
-		await Promise.race([waitForWaConnection(sock), new Promise((_, reject) => {
-			connectionTimeout = setTimeout(() => reject(/* @__PURE__ */ new Error("timed out waiting for WhatsApp QA driver session")), params.connectionTimeoutMs ?? 45e3);
-			connectionTimeout.unref?.();
-		})]);
+		await waitForWaConnection(sock, { timeoutMs: params.connectionTimeoutMs ?? 45e3 });
 	} catch (error) {
 		closeSessionResources(error instanceof Error ? error : /* @__PURE__ */ new Error("failed starting WhatsApp QA driver session"));
 		throw error;
-	} finally {
-		if (connectionTimeout) clearTimeout(connectionTimeout);
 	}
 	const sendApi = createWebSendApi({
 		sock,

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

@@ -15,7 +15,7 @@ const CREDS_FILE_MODE = 384;
 const CREDS_SAVE_FLUSH_TIMEOUT_MS = 15e3;
 const credsSaveQueues = /* @__PURE__ */ new Map();
 async function stringifyCreds(creds) {
-	const { BufferJSON } = await import("./session.runtime-LZFdq3yb.js").then((n) => n.o);
+	const { BufferJSON } = await import("./session.runtime-CyooSQvj.js").then((n) => n.a);
 	return JSON.stringify(creds, BufferJSON.replacer);
 }
 async function writeWebCredsRawAtomically(params) {

package/dist/{channel-gnvuSqEF.js → channel-CK_4OwYn.js}

@@ -9,8 +9,8 @@ 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-B_mz0POD.js";
-import { f as readWebAuthExistsForDecision, n as WHATSAPP_AUTH_UNSTABLE_CODE } from "./auth-store-CZ22aNcV.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-DLXi32yR.js";
+import { f as readWebAuthExistsForDecision, n as WHATSAPP_AUTH_UNSTABLE_CODE } from "./auth-store-B2ZibndQ.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";

package/dist/channel-plugin-api.js

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

package/dist/{channel.runtime-BrTuMVQR.js → channel.runtime-DIAo-4Bj.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-CZ22aNcV.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-B2ZibndQ.js";
 import { t as getActiveWebListener$1 } from "./active-listener-CFwkn3ho.js";
-import { t as monitorWebChannel$1 } from "./monitor-CnioHf5V.js";
-import { t as loginWeb$1 } from "./login-CRtqboZq.js";
-import { whatsappSetupWizard as whatsappSetupWizard$1 } from "./setup-surface-BlvVtmwO.js";
+import { t as monitorWebChannel$1 } from "./monitor-CFUAZhBS.js";
+import { t as loginWeb$1 } from "./login-Bflq347x.js";
+import { whatsappSetupWizard as whatsappSetupWizard$1 } from "./setup-surface-YtBXJFy0.js";
 //#region extensions/whatsapp/src/channel.runtime.ts
 function getActiveWebListener(...args) {
 	return getActiveWebListener$1(...args);

package/dist/{channel.setup-WXGct37Q.js → channel.setup-I-zFGu02.js}

@@ -1,8 +1,8 @@
-import { a as resolveWhatsAppGroupRequireMention, i as whatsappSetupWizardProxy, n as createWhatsAppPluginBase, o as resolveWhatsAppGroupToolPolicy, s as resolveWhatsAppGroupIntroHint, t as whatsappSetupAdapter } from "./setup-core-B_mz0POD.js";
+import { a as resolveWhatsAppGroupRequireMention, i as whatsappSetupWizardProxy, n as createWhatsAppPluginBase, o as resolveWhatsAppGroupToolPolicy, s as resolveWhatsAppGroupIntroHint, t as whatsappSetupAdapter } from "./setup-core-DLXi32yR.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-CZ22aNcV.js").then((n) => n.i);
+	const { readWebAuthState } = await import("./auth-store-B2ZibndQ.js").then((n) => n.i);
 	return await readWebAuthState(account.authDir) === "linked";
 }
 const whatsappSetupPlugin = {

package/dist/{connection-controller-B07CNCkw.js → connection-controller-BnRkIjlP.js}

@@ -1,9 +1,8 @@
 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-CZ22aNcV.js";
-import { r as waitForWaConnection, t as createWaSocket } from "./session-mBuvPUCy.js";
+import { c as logoutWeb } from "./auth-store-B2ZibndQ.js";
+import { i as DEFAULT_WHATSAPP_SOCKET_TIMING, r as waitForWaConnection, t as createWaSocket } from "./session-CoxlXm2K.js";
 import { computeBackoff, info, sleepWithAbort } from "openclaw/plugin-sdk/runtime-env";
 import { clamp } from "openclaw/plugin-sdk/text-utility-runtime";
-import { DisconnectReason } from "baileys";
 import { randomUUID } from "node:crypto";
 const DEFAULT_RECONNECT_POLICY = {
 	initialMs: 2e3,
@@ -37,9 +36,9 @@ function newConnectionId() {
 }
 //#endregion
 //#region extensions/whatsapp/src/connection-controller.ts
-const LOGGED_OUT_STATUS = DisconnectReason?.loggedOut ?? 401;
+const LOGGED_OUT_STATUS = 401;
 const POST_PAIRING_RESTART_STATUS = 515;
-const TIMED_OUT_STATUS = DisconnectReason?.timedOut ?? 408;
+const TIMED_OUT_STATUS = 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.";
@@ -105,7 +104,7 @@ async function waitForWhatsAppLoginResult(params) {
 	let postPairingRestarted = false;
 	let timeoutRestarted = false;
 	while (true) try {
-		await wait(currentSock);
+		await wait(currentSock, { timeout: "none" });
 		return {
 			outcome: "connected",
 			restarted: postPairingRestarted || timeoutRestarted,
@@ -176,7 +175,10 @@ var WhatsAppConnectionController = class {
 		this.abortSignal = params.abortSignal;
 		this.sleep = params.sleep ?? ((ms, signal) => sleepWithAbort(ms, signal));
 		this.isNonRetryableStatus = params.isNonRetryableStatus ?? (() => false);
-		this.socketTiming = params.socketTiming ?? {};
+		this.socketTiming = {
+			...DEFAULT_WHATSAPP_SOCKET_TIMING,
+			...params.socketTiming
+		};
 		this.socketRef = { current: null };
 		this.abortPromise = params.abortSignal && new Promise((resolve) => {
 			params.abortSignal?.addEventListener("abort", () => resolve("aborted"), { once: true });
@@ -240,7 +242,7 @@ var WhatsAppConnectionController = class {
 				authDir: this.authDir,
 				...this.socketTiming
 			});
-			await waitForWaConnection(sock);
+			await waitForWaConnection(sock, { timeoutMs: this.socketTiming.connectTimeoutMs });
 			this.socketRef.current = sock;
 			connection = createLiveConnection({
 				connectionId: params.connectionId,
@@ -325,6 +327,15 @@ var WhatsAppConnectionController = class {
 			normalized
 		};
 	}
+	resolveSetupErrorDecision(error) {
+		const statusCode = getStatusCode(error);
+		if (typeof statusCode !== "number") return null;
+		return this.resolveCloseDecision({
+			status: statusCode,
+			isLoggedOut: statusCode === LOGGED_OUT_STATUS,
+			error
+		});
+	}
 	consumeReconnectAttempt() {
 		this.reconnectAttempts += 1;
 		if (this.reconnectPolicy.maxAttempts > 0 && this.reconnectAttempts >= this.reconnectPolicy.maxAttempts) return {

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-CZ22aNcV.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-B2ZibndQ.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-CRtqboZq.js → login-Bflq347x.js}

@@ -1,8 +1,8 @@
 import { t as __exportAll } from "./rolldown-runtime-D7D4PA-g.js";
 import { a as resolveWhatsAppAccount } from "./accounts-DgViSyJx.js";
-import { b as restoreCredsFromBackupIfNeeded } from "./auth-store-CZ22aNcV.js";
-import { a as renderQrTerminal, i as resolveWhatsAppSocketTiming, t as createWaSocket } from "./session-mBuvPUCy.js";
-import { a as closeWaSocketSoon, o as waitForWhatsAppLoginResult } from "./connection-controller-B07CNCkw.js";
+import { b as restoreCredsFromBackupIfNeeded } from "./auth-store-B2ZibndQ.js";
+import { a as resolveWhatsAppSocketTiming, o as renderQrTerminal, t as createWaSocket } from "./session-CoxlXm2K.js";
+import { a as closeWaSocketSoon, o as waitForWhatsAppLoginResult } from "./connection-controller-BnRkIjlP.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-B27eAPhh.js → login-qr-CHWzkQq4.js}

@@ -1,7 +1,7 @@
 import { a as resolveWhatsAppAccount } from "./accounts-DgViSyJx.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-mBuvPUCy.js";
-import { i as closeWaSocket, o as waitForWhatsAppLoginResult, t as WHATSAPP_LOGGED_OUT_QR_MESSAGE } from "./connection-controller-B07CNCkw.js";
+import { f as readWebAuthExistsForDecision, g as readWebSelfId, n as WHATSAPP_AUTH_UNSTABLE_CODE } from "./auth-store-B2ZibndQ.js";
+import { a as resolveWhatsAppSocketTiming, t as createWaSocket } from "./session-CoxlXm2K.js";
+import { i as closeWaSocket, o as waitForWhatsAppLoginResult, t as WHATSAPP_LOGGED_OUT_QR_MESSAGE } from "./connection-controller-BnRkIjlP.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";

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-B27eAPhh.js");
+	loginQrModulePromise ??= import("./login-qr-CHWzkQq4.js");
 	return loginQrModulePromise;
 }
 async function startWebLoginWithQr(...args) {

package/dist/{monitor-CnioHf5V.js → monitor-CFUAZhBS.js}

@@ -5,14 +5,14 @@ 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-CZ22aNcV.js";
+import { c as logoutWeb, g as readWebSelfId, o as getWebAuthAgeMs, r as WhatsAppAuthUnstableError, v as readWebSelfIdentityForDecision } from "./auth-store-B2ZibndQ.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-C53zKYSN.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-Bjn-h80j.js";
-import { i as resolveWhatsAppSocketTiming, r as waitForWaConnection, t as createWaSocket } from "./session-mBuvPUCy.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-B07CNCkw.js";
+import { a as resolveWhatsAppSocketTiming, r as waitForWaConnection, t as createWaSocket } from "./session-CoxlXm2K.js";
+import { t as BufferJSON } from "./session.runtime-CyooSQvj.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-BnRkIjlP.js";
 import { resolveAccountEntry } from "openclaw/plugin-sdk/account-core";
 import { normalizeLowercaseStringOrEmpty, normalizeStringEntries, uniqueStrings } from "openclaw/plugin-sdk/string-coerce-runtime";
 import { createChannelMessageReplyPipeline, createDurableInboundReceiveJournalFromQueue, createMessageReceiptFromOutboundResults, deliverInboundReplyWithMessageSendContext, resolveChannelMessageSourceReplyDeliveryMode } from "openclaw/plugin-sdk/channel-outbound";
@@ -30,7 +30,7 @@ import { DEFAULT_ACCOUNT_ID as DEFAULT_ACCOUNT_ID$1, DEFAULT_MAIN_KEY, buildAgen
 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";
+import { DisconnectReason, downloadMediaMessage, isJidGroup, normalizeMessageContent as normalizeMessageContent$1 } from "baileys";
 import { buildChannelInboundEventContext, filterChannelInboundQuoteContext, formatInboundEnvelope, formatInboundEnvelope as formatInboundEnvelope$1, formatLocationText, hasVisibleInboundReplyDispatch, resolveInboundSessionEnvelopeContext, runChannelInboundEvent, toInboundMediaFacts, toLocationContext } from "openclaw/plugin-sdk/channel-inbound";
 import { recordChannelActivity } from "openclaw/plugin-sdk/channel-activity-runtime";
 import { createHash } from "node:crypto";
@@ -259,7 +259,7 @@ async function downloadQuotedInboundMedia(msg, sock, maxBytes = 50 * 1024 * 1024
 }
 //#endregion
 //#region extensions/whatsapp/src/inbound/monitor.ts
-const LOGGED_OUT_STATUS = DisconnectReason$1?.loggedOut ?? 401;
+const LOGGED_OUT_STATUS = DisconnectReason?.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;
@@ -997,11 +997,17 @@ async function attachWebInboxToSocket(options) {
 	};
 }
 async function monitorWebInbox(options) {
+	const socketTiming = resolveWhatsAppSocketTiming(options.cfg);
 	const sock = await createWaSocket(false, options.verbose, {
 		authDir: options.authDir,
-		...resolveWhatsAppSocketTiming(options.cfg)
+		...socketTiming
 	});
-	await waitForWaConnection(sock);
+	try {
+		await waitForWaConnection(sock, { timeoutMs: socketTiming.connectTimeoutMs });
+	} catch (err) {
+		closeInboundMonitorSocket(sock);
+		throw err;
+	}
 	return attachWebInboxToSocket({
 		...options,
 		sock
@@ -2234,7 +2240,7 @@ async function dispatchWhatsAppBufferedReply(params) {
 		return await deliverNormalizedPayload(pending.payload, pending.info);
 	} });
 	if (statusReactionController) statusReactionController.setThinking();
-	const { queuedFinal, counts } = await dispatchReplyWithBufferedBlockDispatcher({
+	const dispatchResult = await dispatchReplyWithBufferedBlockDispatcher({
 		ctx: params.context,
 		cfg: params.cfg,
 		replyResolver: params.replyResolver,
@@ -2355,10 +2361,9 @@ async function dispatchWhatsAppBufferedReply(params) {
 			} } : {}
 		}
 	});
-	if (!hasVisibleInboundReplyDispatch({
-		queuedFinal,
-		counts
-	})) {
+	const didQueueVisibleReply = hasVisibleInboundReplyDispatch(dispatchResult);
+	const didDeliverVisibleReply = didSendReply || dispatchResult.observedReplyDelivery === true;
+	if (!didQueueVisibleReply) {
 		if (statusReactionController) finalizeWhatsAppStatusReaction({
 			controller: statusReactionController,
 			outcome: "error",
@@ -2372,13 +2377,13 @@ async function dispatchWhatsAppBufferedReply(params) {
 	}
 	if (statusReactionController) finalizeWhatsAppStatusReaction({
 		controller: statusReactionController,
-		outcome: didSendReply ? "done" : "error",
-		hasFinalResponse: didSendReply,
+		outcome: didDeliverVisibleReply ? "done" : "error",
+		hasFinalResponse: didDeliverVisibleReply,
 		removeAckAfterReply,
 		timing: statusReactionTiming
 	});
 	if (params.shouldClearGroupHistory) params.groupHistories.set(params.groupHistoryKey, []);
-	return didSendReply;
+	return didDeliverVisibleReply;
 }
 async function finalizeWhatsAppStatusReaction(params) {
 	if (params.outcome === "done") {
@@ -3321,35 +3326,57 @@ async function monitorWebChannel(verbose, listenerFactory = attachWebInboxToSock
 					}
 				});
 			} catch (error) {
-				if (getStatusCode(error) === 428) {
-					const retryDecision = controller.consumeReconnectAttempt();
-					statusController.noteReconnectAttempts(retryDecision.reconnectAttempts);
+				const setupDecision = controller.resolveSetupErrorDecision(error);
+				if (setupDecision === "aborted") {
+					await controller.shutdown();
+					break;
+				}
+				if (setupDecision) {
+					statusController.noteReconnectAttempts(setupDecision.reconnectAttempts);
 					statusController.noteClose({
-						statusCode: 428,
+						statusCode: setupDecision.normalized.statusCode,
 						error: formatError(error),
-						reconnectAttempts: retryDecision.reconnectAttempts,
-						healthState: retryDecision.healthState
+						reconnectAttempts: setupDecision.reconnectAttempts,
+						healthState: setupDecision.healthState
 					});
-					if (retryDecision.action === "stop") {
+					if (setupDecision.action === "stop") {
 						reconnectLogger.warn({
 							connectionId,
-							status: 428,
-							reconnectAttempts: retryDecision.reconnectAttempts,
+							status: setupDecision.normalized.statusLabel,
+							reconnectAttempts: setupDecision.reconnectAttempts,
 							maxAttempts: reconnectPolicy.maxAttempts
-						}, "web reconnect: 428 during opening; max attempts reached");
-						runtime.error(`WhatsApp Web connection closed during setup (status 428) after ${retryDecision.reconnectAttempts}/${reconnectPolicy.maxAttempts} attempts. Relink with \`${formatCliCommand("openclaw channels login --channel whatsapp")}\` if the issue persists.`);
+						}, "web reconnect: setup status error; max attempts reached");
+						if (setupDecision.healthState === "logged-out") {
+							await clearTerminalWebAuthState({
+								account,
+								runtime,
+								statusLabel: setupDecision.normalized.statusLabel,
+								healthState: setupDecision.healthState,
+								log: reconnectLogger
+							});
+							runtime.error(`WhatsApp session logged out during setup. Run \`${formatCliCommand("openclaw channels login --channel whatsapp")}\` to relink.`);
+						} else if (setupDecision.healthState === "conflict") {
+							await clearTerminalWebAuthState({
+								account,
+								runtime,
+								statusLabel: setupDecision.normalized.statusLabel,
+								healthState: setupDecision.healthState,
+								log: reconnectLogger
+							});
+							runtime.error(`WhatsApp Web connection closed during setup (status ${setupDecision.normalized.statusLabel}: session conflict). Resolve conflicting WhatsApp Web sessions, then relink with \`${formatCliCommand("openclaw channels login --channel whatsapp")}\`. Stopping web monitoring.`);
+						} else runtime.error(`WhatsApp Web connection closed during setup (status ${setupDecision.normalized.statusLabel}) after ${setupDecision.reconnectAttempts}/${reconnectPolicy.maxAttempts} attempts. Relink with \`${formatCliCommand("openclaw channels login --channel whatsapp")}\` if the issue persists.`);
 						await controller.shutdown();
 						break;
 					}
 					reconnectLogger.info({
 						connectionId,
-						status: 428,
-						reconnectAttempts: retryDecision.reconnectAttempts,
-						delayMs: retryDecision.delayMs
-					}, "web reconnect: 428 during opening; retrying");
-					runtime.error(`WhatsApp Web connection closed during setup (status 428). Retry ${retryDecision.reconnectAttempts}/${reconnectPolicy.maxAttempts || "∞"} in ${formatDurationPrecise(retryDecision.delayMs ?? 0)}.`);
+						status: setupDecision.normalized.statusLabel,
+						reconnectAttempts: setupDecision.reconnectAttempts,
+						delayMs: setupDecision.delayMs
+					}, "web reconnect: setup status error; retrying");
+					runtime.error(`WhatsApp Web connection closed during setup (status ${setupDecision.normalized.statusLabel}). Retry ${setupDecision.reconnectAttempts}/${reconnectPolicy.maxAttempts || "∞"} in ${formatDurationPrecise(setupDecision.delayMs ?? 0)}.`);
 					try {
-						await controller.waitBeforeRetry(retryDecision.delayMs ?? 0);
+						await controller.waitBeforeRetry(setupDecision.delayMs ?? 0);
 					} catch {
 						break;
 					}

package/dist/runtime-api.js

@@ -5,12 +5,12 @@ 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-CZ22aNcV.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-B2ZibndQ.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-Bjn-h80j.js";
-import { n as newConnectionId, r as waitForWaConnection, t as createWaSocket } from "./session-mBuvPUCy.js";
+import { n as newConnectionId, r as waitForWaConnection, t as createWaSocket } from "./session-CoxlXm2K.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-CnioHf5V.js";
-import { t as loginWeb } from "./login-CRtqboZq.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-CFUAZhBS.js";
+import { t as loginWeb } from "./login-Bflq347x.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/{session-mBuvPUCy.js → session-CoxlXm2K.js}

@@ -1,7 +1,7 @@
 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-CZ22aNcV.js";
-import { a as makeWASocket, i as makeCacheableSignalKeyStore, n as DisconnectReason, r as fetchLatestBaileysVersion, s as useMultiFileAuthState } from "./session.runtime-LZFdq3yb.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-B2ZibndQ.js";
+import { i as makeWASocket, n as fetchLatestBaileysVersion, o as useMultiFileAuthState, r as makeCacheableSignalKeyStore } from "./session.runtime-CyooSQvj.js";
 import { VERSION, formatCliCommand } from "openclaw/plugin-sdk/cli-runtime";
 import { danger, getChildLogger, success, toPinoLikeLogger } from "openclaw/plugin-sdk/runtime-env";
 import { renderQrTerminal } from "openclaw/plugin-sdk/media-runtime";
@@ -27,7 +27,7 @@ function resolveWhatsAppSocketTiming(cfg, overrides) {
 }
 //#endregion
 //#region extensions/whatsapp/src/session.ts
-const LOGGED_OUT_STATUS = DisconnectReason?.loggedOut ?? 401;
+const LOGGED_OUT_STATUS = 401;
 const WHATSAPP_WEBSOCKET_PROXY_TARGET = "https://mmg.whatsapp.net/";
 const CREDS_FLUSH_TIMEOUT_MESSAGE = "Queued WhatsApp creds save did not finish before auth bootstrap; skipping repair and continuing with primary creds.";
 async function rejectUnsafeWebCredsPath(authDir) {
@@ -185,21 +185,37 @@ function normalizeEnvProxyValue(value) {
 	const trimmed = value.trim();
 	return trimmed.length > 0 ? trimmed : null;
 }
-async function waitForWaConnection(sock) {
+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);
+			if (timer) {
+				clearTimeout(timer);
+				timer = void 0;
+			}
+		};
 		const handler = (...args) => {
 			const update = args[0] ?? {};
 			if (update.connection === "open") {
-				evWithOff.off?.("connection.update", handler);
+				cleanup();
 				resolve();
 			}
 			if (update.connection === "close") {
-				evWithOff.off?.("connection.update", handler);
+				cleanup();
 				reject(toLintErrorObject(update.lastDisconnect ?? /* @__PURE__ */ new Error("Connection closed"), "Non-Error rejection"));
 			}
 		};
 		sock.ev.on("connection.update", handler);
+		if ("timeoutMs" in options) {
+			const timeoutMs = options.timeoutMs;
+			timer = setTimeout(() => {
+				cleanup();
+				reject(createConnectionTimeoutError(timeoutMs));
+			}, timeoutMs);
+			timer.unref?.();
+		}
 	});
 }
 function newConnectionId() {
@@ -212,5 +228,10 @@ function toLintErrorObject(value, fallbackMessage) {
 	if (typeof value === "object" && value !== null || typeof value === "function") Object.assign(error, value);
 	return error;
 }
+function createConnectionTimeoutError(timeoutMs) {
+	const error = /* @__PURE__ */ new Error(`WhatsApp connection timed out after ${timeoutMs}ms`);
+	Object.assign(error, { output: { statusCode: 408 } });
+	return error;
+}
 //#endregion
-export { renderQrTerminal as a, resolveWhatsAppSocketTiming as i, newConnectionId as n, waitForWaConnection as r, createWaSocket as t };
+export { resolveWhatsAppSocketTiming as a, DEFAULT_WHATSAPP_SOCKET_TIMING as i, newConnectionId as n, renderQrTerminal as o, waitForWaConnection as r, createWaSocket as t };

package/dist/{session.runtime-LZFdq3yb.js → session.runtime-CyooSQvj.js}

@@ -1,13 +1,12 @@
 import { t as __exportAll } from "./rolldown-runtime-D7D4PA-g.js";
-import { BufferJSON, DisconnectReason as DisconnectReason$1, fetchLatestBaileysVersion, makeCacheableSignalKeyStore, makeWASocket, useMultiFileAuthState } from "baileys";
+import { BufferJSON, fetchLatestBaileysVersion, makeCacheableSignalKeyStore, makeWASocket, useMultiFileAuthState } from "baileys";
 //#region extensions/whatsapp/src/session.runtime.ts
 var session_runtime_exports = /* @__PURE__ */ __exportAll({
 	BufferJSON: () => BufferJSON,
-	DisconnectReason: () => DisconnectReason$1,
 	fetchLatestBaileysVersion: () => fetchLatestBaileysVersion,
 	makeCacheableSignalKeyStore: () => makeCacheableSignalKeyStore,
 	makeWASocket: () => makeWASocket,
 	useMultiFileAuthState: () => useMultiFileAuthState
 });
 //#endregion
-export { makeWASocket as a, makeCacheableSignalKeyStore as i, DisconnectReason$1 as n, session_runtime_exports as o, fetchLatestBaileysVersion as r, useMultiFileAuthState as s, BufferJSON as t };
+export { session_runtime_exports as a, makeWASocket as i, fetchLatestBaileysVersion as n, useMultiFileAuthState as o, makeCacheableSignalKeyStore as r, BufferJSON as t };

package/dist/{setup-core-B_mz0POD.js → setup-core-DLXi32yR.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-BrTuMVQR.js");
+	return await import("./channel.runtime-DIAo-4Bj.js");
 }
 async function loadWhatsAppSetupSurface() {
-	return await import("./setup-surface-BlvVtmwO.js");
+	return await import("./setup-surface-YtBXJFy0.js");
 }
 const whatsappSetupWizardProxy = createWhatsAppSetupWizardProxy(async () => (await loadWhatsAppSetupSurface()).whatsappSetupWizard);
 const whatsappConfigAdapter = createScopedChannelConfigAdapter({
@@ -227,7 +227,7 @@ function createWhatsAppPluginBase(params) {
 			} }
 		},
 		reload: {
-			configPrefixes: ["web"],
+			configPrefixes: ["web", "channels.whatsapp.accounts"],
 			noopPrefixes: ["channels.whatsapp"]
 		},
 		gatewayMethodDescriptors: [{ name: "web.login.start" }, { name: "web.login.wait" }],

package/dist/{setup-finalize-Ds1tCFvo.js → setup-finalize-B-g0GzHp.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-DgViSyJx.js";
 import { a as normalizeWhatsAppAllowFromEntries, o as normalizeWhatsAppAllowFromEntry } from "./normalize-target-bVWjgftN.js";
-import { t as whatsappSetupAdapter } from "./setup-core-B_mz0POD.js";
+import { t as whatsappSetupAdapter } from "./setup-core-DLXi32yR.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-CRtqboZq.js").then((n) => n.n);
+		const { loginWeb } = await import("./login-Bflq347x.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-WXGct37Q.js";
+import { t as whatsappSetupPlugin } from "./channel.setup-I-zFGu02.js";
 export { whatsappSetupPlugin };

package/dist/{setup-surface-BlvVtmwO.js → setup-surface-YtBXJFy0.js}

@@ -1,6 +1,6 @@
 import { t as listAccountIds } from "./account-ids-CB5SOWjc.js";
 import { o as resolveWhatsAppAuthDir } from "./accounts-DgViSyJx.js";
-import { a as formatWhatsAppWebAuthStatusState, h as readWebAuthState } from "./auth-store-CZ22aNcV.js";
+import { a as formatWhatsAppWebAuthStatusState, h as readWebAuthState } from "./auth-store-B2ZibndQ.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-Ds1tCFvo.js")).finalizeWhatsAppSetup(params),
+	finalize: async (params) => await (await import("./setup-finalize-B-g0GzHp.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.6.2-beta.1",
+  "version": "2026.6.5-beta.1",
   "lockfileVersion": 3,
   "requires": true,
   "packages": {
     "": {
       "name": "@openclaw/whatsapp",
-      "version": "2026.6.2-beta.1",
+      "version": "2026.6.5-beta.1",
       "dependencies": {
         "audio-decode": "2.2.3",
         "baileys": "7.0.0-rc13",
         "typebox": "1.1.39"
       },
       "peerDependencies": {
-        "openclaw": ">=2026.6.2-beta.1"
+        "openclaw": ">=2026.6.5-beta.1"
       },
       "peerDependenciesMeta": {
         "openclaw": {

package/package.json

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