@openclaw/whatsapp 2026.7.2-beta.7 → 2026.8.1-beta.2

package/dist/{question-reactions-CRsnyoMK.js → question-reactions-D3eAeB0i.js}

@@ -1,43 +1,26 @@
 import { t as __exportAll } from "./rolldown-runtime-D7D4PA-g.js";
-import { a as resolveWhatsAppAccount } from "./accounts-CSqLvCY5.js";
-import { questionGatewayRuntime } from "openclaw/plugin-sdk/question-gateway-runtime";
+import { a as resolveWhatsAppAccount } from "./accounts-BX2fZUyR.js";
+import { createQuestionReactionTargetStore, questionGatewayRuntime } from "openclaw/plugin-sdk/question-gateway-runtime";
 //#region extensions/whatsapp/src/question-reactions.ts
 var question_reactions_exports = /* @__PURE__ */ __exportAll({
-	clearWhatsAppQuestionReactionTargetsForTest: () => clearWhatsAppQuestionReactionTargetsForTest,
 	maybeResolveWhatsAppQuestionReaction: () => maybeResolveWhatsAppQuestionReaction,
 	registerWhatsAppQuestionReactionTargetForDeliveredPayload: () => registerWhatsAppQuestionReactionTargetForDeliveredPayload
 });
-const TARGET_TTL_MS = 1440 * 60 * 1e3;
-const targets = /* @__PURE__ */ new Map();
-function storeTarget(key, binding) {
-	const existing = targets.get(key);
-	if (existing) clearTimeout(existing.cleanupTimer);
-	const target = {
-		...binding,
-		terminal: false,
-		expiresAtMs: Date.now() + TARGET_TTL_MS,
-		cleanupTimer: setTimeout(() => {
-			if (targets.get(key) === target) targets.delete(key);
-		}, TARGET_TTL_MS)
-	};
-	target.cleanupTimer.unref?.();
-	targets.set(key, target);
-	questionGatewayRuntime.registerChannelDelivery({
-		questionId: binding.questionId,
-		deliveryId: `whatsapp-reaction:${key}`,
-		finalize: () => {
-			target.terminal = true;
-		}
-	});
-}
-function buildKey(accountId, remoteJid, messageId) {
+function buildKey(identity) {
 	const parts = [
-		accountId,
-		remoteJid,
-		messageId
+		identity.accountId,
+		identity.remoteJid,
+		identity.messageId
 	].map((part) => part.trim());
 	return parts.every(Boolean) ? parts.join(":") : void 0;
 }
+const questionReactionTargets = createQuestionReactionTargetStore({
+	channel: "whatsapp",
+	channelDisplayName: "WhatsApp",
+	buildKey,
+	registerChannelDelivery: questionGatewayRuntime.registerChannelDelivery,
+	resolveReaction: questionGatewayRuntime.resolveReaction
+});
 function addCandidate(values, value) {
 	const normalized = value?.trim();
 	if (normalized && !values.includes(normalized)) values.push(normalized);
@@ -73,12 +56,10 @@ function registerWhatsAppQuestionReactionTargetForDeliveredPayload(params) {
 		accountId: params.target.accountId
 	}).accountId;
 	let registered = false;
-	for (const identity of listDeliveredIdentities(params.results)) {
-		const key = buildKey(accountId, identity.remoteJid, identity.messageId);
-		if (!key) continue;
-		storeTarget(key, binding);
-		registered = true;
-	}
+	for (const identity of listDeliveredIdentities(params.results)) registered = questionReactionTargets.register(binding, {
+		accountId,
+		...identity
+	}) || registered;
 	return registered;
 }
 async function maybeResolveWhatsAppQuestionReaction(params) {
@@ -95,48 +76,18 @@ async function maybeResolveWhatsAppQuestionReaction(params) {
 		addCandidate(candidates, remoteJid);
 		for (const mapped of await params.resolveReactionTargetJids?.(remoteJid) ?? []) addCandidate(candidates, mapped);
 	}
-	let matched;
-	for (const remoteJid of candidates) {
-		const key = buildKey(params.accountId, remoteJid, messageId);
-		const target = key ? targets.get(key) : void 0;
-		if (key && target) {
-			matched = {
-				key,
-				target
-			};
-			break;
-		}
-	}
-	if (!matched) return false;
-	if (matched.target.expiresAtMs <= Date.now() || matched.target.terminal) {
-		matched.target.terminal = true;
-		params.logDebug?.(`whatsapp: stale question reaction ignored id=${matched.target.questionId}`);
-		return true;
-	}
-	const optionValue = matched.target.optionValues[optionIndex];
-	if (!optionValue) {
-		params.logDebug?.(`whatsapp: out-of-range question reaction ignored id=${matched.target.questionId}`);
-		return true;
-	}
-	try {
-		const result = await questionGatewayRuntime.resolveReaction({
-			cfg: params.cfg,
-			questionId: matched.target.questionId,
-			optionValue,
-			senderId: params.senderId,
-			gatewayUrl: params.gatewayUrl,
-			clientDisplayName: `WhatsApp question (${params.senderId})`
-		});
-		matched.target.terminal = result?.status === "answered" || result?.status === "already-terminal";
-		if (result?.status === "already-terminal") params.logDebug?.(`whatsapp: stale question reaction ignored id=${matched.target.questionId}`);
-	} catch (error) {
-		params.logDebug?.(`whatsapp: question reaction failed id=${matched.target.questionId}: ${String(error)}`);
-	}
-	return true;
-}
-function clearWhatsAppQuestionReactionTargetsForTest() {
-	for (const target of targets.values()) clearTimeout(target.cleanupTimer);
-	targets.clear();
+	return await questionReactionTargets.resolve({
+		identities: candidates.map((remoteJid) => ({
+			accountId: params.accountId,
+			remoteJid,
+			messageId
+		})),
+		optionIndex,
+		cfg: params.cfg,
+		senderId: params.senderId,
+		gatewayUrl: params.gatewayUrl,
+		logDebug: params.logDebug
+	});
 }
 //#endregion
 export { question_reactions_exports as n, maybeResolveWhatsAppQuestionReaction as t };

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-BzfDFPbH.js";
-import { i as sendTypingWhatsApp, n as sendPollWhatsApp, r as sendReactionWhatsApp, t as sendMessageWhatsApp } from "./send-D37ddk22.js";
+import { c as resolveWebCredsPath, r as hasWebCredsSync, s as resolveWebCredsBackupPath } from "./creds-files-W6B3EMZ8.js";
+import { n as whatsAppActionRuntime, t as handleWhatsAppAction } from "./action-runtime-B4e3XFOY.js";
+import { i as sendTypingWhatsApp, n as sendPollWhatsApp, r as sendReactionWhatsApp, t as sendMessageWhatsApp } from "./send-prK8F7Vj.js";
 import { a as setWhatsAppRuntime } from "./runtime-BLlToOi6.js";
 import { startWebLoginWithQr, waitForWebLogin } from "./login-qr-runtime.js";
-import { t as createWhatsAppLoginTool } from "./agent-tools-login-DE9MU98T.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-DcEpIOmE.js";
+import { t as createWhatsAppLoginTool } from "./agent-tools-login-BjRpD-JQ.js";
+import { M as waitForCredsSaveQueueWithTimeout, N 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, j as waitForCredsSaveQueue, 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, x as webAuthExists, y as resolveDefaultWebAuthDir } from "./auth-store-B_DQIdzp.js";
 import { t as DEFAULT_WEB_MEDIA_BYTES } from "./constants-HU41RHGI.js";
 import { n as resolveWebAccountId, t as getActiveWebListener } from "./active-listener-BEjWsCNM.js";
-import { a as waitForWaConnection, i as newConnectionId, r as createWaSocket } from "./socket-close-DridEuzz.js";
+import { a as waitForWaConnection, i as newConnectionId, r as createWaSocket } from "./socket-close-09FojDO2.js";
 import { n as getStatusCode, t as formatError } from "./session-errors-JuazczrA.js";
-import { g as extractLocationData, p as extractContactContext, y as extractText } from "./send-api-7wk6eQyW.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-CfkaUSL2.js";
-import { t as loginWeb } from "./login-CvY2Dhch.js";
+import { p as extractText, s as extractContactContext, u as extractLocationData } from "./send-api-DimZST3E.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-BCe5Mm-1.js";
+import { t as loginWeb } from "./login-D6_rfxTZ.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, 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/runtime-group-policy-DeSRFXEV.js

@@ -0,0 +1,11 @@
+import { resolveOpenProviderRuntimeGroupPolicy } from "openclaw/plugin-sdk/runtime-group-policy";
+//#region extensions/whatsapp/src/runtime-group-policy.ts
+function resolveWhatsAppRuntimeGroupPolicy(params) {
+	return resolveOpenProviderRuntimeGroupPolicy({
+		providerConfigPresent: params.providerConfigPresent,
+		groupPolicy: params.groupPolicy,
+		defaultGroupPolicy: params.defaultGroupPolicy
+	});
+}
+//#endregion
+export { resolveWhatsAppRuntimeGroupPolicy as t };

package/dist/{send-api-7wk6eQyW.js → send-api-DimZST3E.js}

@@ -1,17 +1,15 @@
 import { n as isWhatsAppNewsletterJid } from "./normalize-target-CugRyONv.js";
-import { l as resolveWhatsAppDocumentFileName } from "./send-D37ddk22.js";
+import { d as mergeWhatsAppAcceptedSendError, f as normalizeWhatsAppSendResult, g as resolveWhatsAppDocumentFileName, l as combineWhatsAppSendResults, p as rememberWhatsAppAcceptedSend } from "./send-prK8F7Vj.js";
 import "./normalize-C7Hkc_vE.js";
 import { c as toWhatsappJid, l as toWhatsappJidWithLid, r as jidToE164 } from "./targets-runtime-TMk0lGuy.js";
 import "./text-runtime-CaKLhowd.js";
-import { i as buildQuotedMessageOptions } from "./group-session-key-DVMZlO3x.js";
-import { c as resolveComparableIdentity } from "./identity-CPrT5aEU.js";
-import { normalizeLowercaseStringOrEmpty, normalizeStringEntries, uniqueStrings } from "openclaw/plugin-sdk/string-coerce-runtime";
+import { i as buildQuotedMessageOptions } from "./group-session-key-DmFc_Cqi.js";
+import { k as resolveComparableIdentity } from "./auth-store-B_DQIdzp.js";
+import { isRecord, normalizeLowercaseStringOrEmpty, uniqueStrings } from "openclaw/plugin-sdk/string-coerce-runtime";
 import { logVerbose } from "openclaw/plugin-sdk/runtime-env";
-import { createMessageReceiptFromOutboundResults, listMessageReceiptPlatformIds } from "openclaw/plugin-sdk/channel-outbound";
-import { getImageMetadata, resizeToJpeg } from "openclaw/plugin-sdk/media-runtime";
 import { formatLocationText } from "openclaw/plugin-sdk/channel-inbound";
-import { DisconnectReason, downloadMediaMessage, extractMessageContent, getContentType, isJidGroup, normalizeMessageContent, normalizeMessageContent as normalizeMessageContent$1 } from "baileys";
-import { recordChannelActivity } from "openclaw/plugin-sdk/channel-activity-runtime";
+import { getImageMetadata, resizeToJpeg } from "openclaw/plugin-sdk/media-runtime";
+import { extractMessageContent, getContentType, normalizeMessageContent } from "baileys";
 //#region extensions/whatsapp/src/vcard.ts
 const ALLOWED_VCARD_KEYS = /* @__PURE__ */ new Set([
 	"FN",
@@ -79,11 +77,11 @@ function normalizeVcardPhone(value) {
 * Falls back to WhatsApp's standard formats when Baileys omits the MIME.
 */
 function resolveInboundMediaMimetype(message) {
-	const explicit = message.imageMessage?.mimetype ?? message.videoMessage?.mimetype ?? message.documentMessage?.mimetype ?? message.audioMessage?.mimetype ?? message.stickerMessage?.mimetype ?? void 0;
+	const explicit = message.imageMessage?.mimetype ?? message.videoMessage?.mimetype ?? message.ptvMessage?.mimetype ?? message.documentMessage?.mimetype ?? message.audioMessage?.mimetype ?? message.stickerMessage?.mimetype ?? void 0;
 	if (explicit) return explicit;
 	if (message.audioMessage) return "audio/ogg; codecs=opus";
 	if (message.imageMessage) return "image/jpeg";
-	if (message.videoMessage) return "video/mp4";
+	if (message.videoMessage || message.ptvMessage) return "video/mp4";
 	if (message.stickerMessage) return "image/webp";
 }
 //#endregion
@@ -108,6 +106,16 @@ function buildMessageChain(message) {
 	}
 	return chain;
 }
+function findMessageSection(rawMessage, sectionNames) {
+	const chain = buildMessageChain(rawMessage);
+	for (const name of sectionNames) for (const message of chain) {
+		const value = message[name];
+		if (isRecord(value)) return {
+			name,
+			value
+		};
+	}
+}
 function unwrapMessage(message) {
 	return buildMessageChain(message).at(-1);
 }
@@ -140,20 +148,20 @@ function extractContextInfo(message) {
 	}
 }
 function extractMentionedJids(rawMessage) {
-	const message = unwrapMessage(rawMessage);
-	if (!message) return;
-	const flattened = [
-		message.extendedTextMessage?.contextInfo?.mentionedJid,
-		message.imageMessage?.contextInfo?.mentionedJid,
-		message.videoMessage?.contextInfo?.mentionedJid,
-		message.documentMessage?.contextInfo?.mentionedJid,
-		message.audioMessage?.contextInfo?.mentionedJid,
-		message.stickerMessage?.contextInfo?.mentionedJid,
-		message.buttonsResponseMessage?.contextInfo?.mentionedJid,
-		message.listResponseMessage?.contextInfo?.mentionedJid
-	].flatMap((arr) => arr ?? []).filter(Boolean);
-	if (flattened.length === 0) return;
-	return uniqueStrings(flattened);
+	const mentionedJids = extractContextInfo(rawMessage)?.mentionedJid?.filter(Boolean);
+	if (!mentionedJids?.length) return;
+	return uniqueStrings(mentionedJids);
+}
+function extractNativeFlowResponseText(response) {
+	const paramsJson = response?.nativeFlowResponseMessage?.paramsJson;
+	if (!paramsJson) return;
+	try {
+		const params = JSON.parse(paramsJson);
+		if (!isRecord(params)) return;
+		return [params.title, params.id].find((value) => typeof value === "string" && Boolean(value.trim()));
+	} catch {
+		return;
+	}
 }
 function extractText(rawMessage) {
 	const message = unwrapMessage(rawMessage);
@@ -165,8 +173,24 @@ function extractText(rawMessage) {
 		if (typeof candidate.conversation === "string" && candidate.conversation.trim()) return candidate.conversation.trim();
 		const extended = candidate.extendedTextMessage?.text;
 		if (extended?.trim()) return extended.trim();
-		const caption = candidate.imageMessage?.caption ?? candidate.videoMessage?.caption ?? candidate.documentMessage?.caption;
+		const caption = candidate.imageMessage?.caption ?? candidate.videoMessage?.caption ?? candidate.ptvMessage?.caption ?? candidate.documentMessage?.caption;
 		if (caption?.trim()) return caption.trim();
+		const interactiveSelection = [
+			candidate.buttonsResponseMessage?.selectedDisplayText,
+			candidate.buttonsResponseMessage?.selectedButtonId,
+			candidate.listResponseMessage?.title,
+			candidate.listResponseMessage?.singleSelectReply?.selectedRowId,
+			candidate.templateButtonReplyMessage?.selectedDisplayText,
+			candidate.templateButtonReplyMessage?.selectedId,
+			candidate.interactiveResponseMessage?.body?.text,
+			extractNativeFlowResponseText(candidate.interactiveResponseMessage)
+		].find((value) => Boolean(value?.trim()));
+		if (interactiveSelection) return interactiveSelection.trim();
+		const poll = candidate.pollCreationMessage ?? candidate.pollCreationMessageV2 ?? candidate.pollCreationMessageV3 ?? candidate.pollCreationMessageV5;
+		if (poll) {
+			const pollText = [poll.name?.trim(), ...(poll.options ?? []).map((option) => option.optionName?.trim()).filter((option) => Boolean(option)).map((option) => `- ${option}`)].filter(Boolean).join("\n");
+			if (pollText) return pollText;
+		}
 	}
 	const contactPlaceholder = extractContactPlaceholder(message) ?? (extracted && extracted !== message ? extractContactPlaceholder(extracted) : void 0);
 	if (contactPlaceholder) return contactPlaceholder;
@@ -188,7 +212,7 @@ function extractMediaKind(rawMessage) {
 	const message = unwrapMessage(rawMessage);
 	if (!message) return;
 	if (message.imageMessage) return "image";
-	if (message.videoMessage) return "video";
+	if (message.videoMessage || message.ptvMessage) return "video";
 	if (message.audioMessage) return "audio";
 	if (message.documentMessage) return "document";
 	if (message.stickerMessage) return "sticker";
@@ -542,75 +566,7 @@ function addWhatsAppOutboundMentionsToContent(content, mentionedJids) {
 	} : content;
 }
 //#endregion
-//#region extensions/whatsapp/src/inbound/send-result.ts
-function resolveWhatsAppReceiptKind(kind) {
-	if (kind === "media" || kind === "text") return kind;
-	return "unknown";
-}
-function toReceiptSourceResult(key) {
-	return {
-		channel: "whatsapp",
-		messageId: key.id,
-		...key.remoteJid ? { toJid: key.remoteJid } : {},
-		meta: {
-			fromMe: key.fromMe,
-			participant: key.participant
-		}
-	};
-}
-function createWhatsAppSendReceipt(kind, keys) {
-	return createMessageReceiptFromOutboundResults({
-		kind: resolveWhatsAppReceiptKind(kind),
-		results: keys.map(toReceiptSourceResult)
-	});
-}
-function normalizeKey(key) {
-	const id = typeof key?.id === "string" ? key.id.trim() : "";
-	if (!id) return;
-	return {
-		id,
-		remoteJid: key?.remoteJid,
-		fromMe: key?.fromMe,
-		participant: key?.participant
-	};
-}
-function normalizeWhatsAppSendResult(result, kind) {
-	const key = normalizeKey(result?.key);
-	return {
-		kind,
-		messageId: key?.id ?? "unknown",
-		receipt: createWhatsAppSendReceipt(kind, key ? [key] : []),
-		keys: key ? [key] : [],
-		providerAccepted: Boolean(key)
-	};
-}
-function combineWhatsAppSendResults(kind, results) {
-	const messageIds = uniqueStrings(results.flatMap(listWhatsAppSendResultMessageIds));
-	const keys = results.flatMap((result) => result.keys);
-	return {
-		kind,
-		messageId: messageIds[0] ?? "unknown",
-		receipt: createWhatsAppSendReceipt(kind, keys),
-		keys,
-		providerAccepted: results.some((result) => result.providerAccepted)
-	};
-}
-function listWhatsAppSendResultMessageIds(result) {
-	const receiptIds = result.receipt ? listMessageReceiptPlatformIds(result.receipt) : [];
-	if (receiptIds.length > 0) return receiptIds;
-	const keyIds = normalizeStringEntries(result.keys.map((key) => key.id));
-	if (keyIds.length > 0) return uniqueStrings(keyIds);
-	return [];
-}
-//#endregion
 //#region extensions/whatsapp/src/inbound/send-api.ts
-function recordWhatsAppOutbound(accountId) {
-	recordChannelActivity({
-		channel: "whatsapp",
-		accountId,
-		direction: "outbound"
-	});
-}
 function supportsForcedDocumentMediaType(mediaType) {
 	return mediaType.startsWith("image/") || mediaType.startsWith("video/");
 }
@@ -623,11 +579,30 @@ function createWebSendApi(params) {
 		text,
 		mentionedJids: []
 	};
+	const runAcceptedSend = async (kind, accountId, send) => {
+		const results = [];
+		try {
+			await send((result, sendKind) => {
+				rememberWhatsAppAcceptedSend({
+					accountId,
+					result: normalizeWhatsAppSendResult(result, sendKind),
+					results
+				});
+			});
+			return combineWhatsAppSendResults(kind, results);
+		} catch (error) {
+			throw mergeWhatsAppAcceptedSendError({
+				error,
+				kind,
+				results
+			});
+		}
+	};
 	const sendStructuredMessage = async (to, content, kind) => {
 		const jid = resolveOutboundJid(to);
-		const result = await params.sock.sendMessage(jid, content);
-		recordWhatsAppOutbound(params.defaultAccountId);
-		return normalizeWhatsAppSendResult(result, kind);
+		return await runAcceptedSend(kind, params.defaultAccountId, async (capture) => {
+			capture(await params.sock.sendMessage(jid, content), kind);
+		});
 	};
 	return {
 		sendMessage: async (to, text, mediaBuffer, mediaTypeInput, sendOptions) => {
@@ -683,18 +658,22 @@ function createWebSendApi(params) {
 				remoteJid: sendOptions?.quotedMessageKey?.remoteJid,
 				fromMe: sendOptions?.quotedMessageKey?.fromMe,
 				participant: sendOptions?.quotedMessageKey?.participant,
+				destinationJid: jid,
+				requestedJid: toWhatsappJid(to),
+				lookupTargetJid: sendOptions?.quotedMessageKey?.lookupTargetJid,
 				messageText: sendOptions?.quotedMessageKey?.messageText,
 				media: sendOptions?.quotedMessageKey?.media
 			});
-			const results = [normalizeWhatsAppSendResult(quotedOpts ? await params.sock.sendMessage(jid, payload, quotedOpts) : await params.sock.sendMessage(jid, payload), mediaBuffer ? "media" : "text")];
-			if (shouldSendAudioText) {
-				const resolvedAudioText = await resolveMentions(jid, text);
-				const textPayload = addWhatsAppOutboundMentionsToContent({ text: resolvedAudioText.text }, resolvedAudioText.mentionedJids);
-				const textResult = quotedOpts ? await params.sock.sendMessage(jid, textPayload, quotedOpts) : await params.sock.sendMessage(jid, textPayload);
-				results.push(normalizeWhatsAppSendResult(textResult, "text"));
-			}
-			recordWhatsAppOutbound(sendOptions?.accountId ?? params.defaultAccountId);
-			return combineWhatsAppSendResults(mediaBuffer ? "media" : "text", results);
+			const kind = mediaBuffer ? "media" : "text";
+			const accountId = sendOptions?.accountId ?? params.defaultAccountId;
+			return await runAcceptedSend(kind, accountId, async (capture) => {
+				const sendPayload = async (content) => quotedOpts ? await params.sock.sendMessage(jid, content, quotedOpts) : await params.sock.sendMessage(jid, content);
+				capture(await sendPayload(payload), kind);
+				if (shouldSendAudioText) {
+					const resolvedAudioText = await resolveMentions(jid, text);
+					capture(await sendPayload(addWhatsAppOutboundMentionsToContent({ text: resolvedAudioText.text }, resolvedAudioText.mentionedJids)), "text");
+				}
+			});
 		},
 		sendPoll: async (to, poll) => {
 			return await sendStructuredMessage(to, { poll: {
@@ -746,4 +725,4 @@ function createWebSendApi(params) {
 	};
 }
 //#endregion
-export { extractMediaKind as _, mayContainWhatsAppOutboundMention as a, hasInboundUserContent as b, DisconnectReason as c, normalizeMessageContent$1 as d, describeReplyContext as f, extractLocationData as g, extractExternalAdReplyContext as h, addWhatsAppOutboundMentionsToContent as i, downloadMediaMessage as l, extractContextInfo as m, listWhatsAppSendResultMessageIds as n, resolveWhatsAppOutboundMentions as o, extractContactContext as p, normalizeWhatsAppSendResult as r, addWhatsAppImagePreviewFields as s, createWebSendApi as t, isJidGroup as u, extractMentionedJids as v, resolveInboundMediaMimetype as x, extractText as y };
+export { addWhatsAppImagePreviewFields as a, extractContextInfo as c, extractMediaKind as d, extractMentionedJids as f, resolveInboundMediaMimetype as g, hasInboundUserContent as h, resolveWhatsAppOutboundMentions as i, extractExternalAdReplyContext as l, findMessageSection as m, addWhatsAppOutboundMentionsToContent as n, describeReplyContext as o, extractText as p, mayContainWhatsAppOutboundMention as r, extractContactContext as s, createWebSendApi as t, extractLocationData as u };