@wednesdayai/whatsapp 0.4.10 → 0.4.12-dev.25

package/dist/index.js

@@ -1,5 +1,5 @@
 import { C as listWhatsAppAccountIds, E as resolveWhatsAppAuthDir, S as stopActiveWebListener, T as resolveWhatsAppAccount$1, _ as webAuthExists, a as waitForWebLogin, b as getActiveWebListener, c as formatError, d as getBaileys, f as getWebAuthAgeMs, g as waitForWebCredsSaveQueue, h as readWebSelfId, i as tryCanonicalWhatsAppAuthDir, l as getStatusCode, m as logoutWeb, o as closeWaSocket, p as logWebSelfId, r as startWebLoginWithQr, s as createWaSocket, t as closeActiveWebLoginsForAuthDir, u as waitForWaConnection, v as getWhatsAppRuntime, w as resolveDefaultWhatsAppAccountId, x as setActiveWebListener, y as setWhatsAppRuntime } from "./login-qr-B5goEXCP.js";
-import { DEFAULT_ACCOUNT_ID, DEFAULT_GROUP_HISTORY_LIMIT, DEFAULT_MAIN_KEY, ToolAuthorizationError, Type, WhatsAppConfigSchema, applyAccountNameToChannelSection, buildAgentMainSessionKey, buildAgentSessionKey, buildChannelConfigSchema, buildGroupHistoryKey, buildHistoryContextFromEntries, buildMentionRegexes, buildPairingReply, chunkMarkdownTextWithMode, computeBackoff, convertMarkdownTables, createActionGate, createDedupeCache, createInboundDebouncer, createReplyPrefixOptions, createSubsystemLogger, danger, defaultRuntime, dispatchReplyWithBufferedBlockDispatcher, emptyPluginConfigSchema, enqueueSystemEvent, escapeRegExp, finalizeInboundContext, formatCliCommand, formatDocsLink, formatDurationPrecise, formatInboundEnvelope, formatLocationText, formatPairingApproveHint, getAgentScopedMediaLocalRoots, getChildLogger, getReplyFromConfig, hasControlCommand, info, isSelfChatMode, jidToE164, jsonResult, loadConfig, loadSessionStore, loadWebMedia, logInfo, logVerbose, markdownToWhatsApp, mergeWhatsAppConfig, migrateBaseNameToDefaultAccount, missingTargetError, normalizeAccountId, normalizeAgentId, normalizeAllowFromEntries, normalizeE164, normalizeGroupActivation, normalizeMentionText, parseActivationCommand, pathExists, readChannelAllowFromStoreSync, readReactionParams, readStoreAllowFromForDmPolicy, readStringParam, recordChannelActivity, recordPendingHistoryEntryIfEnabled, recordSessionMetaFromInbound, registerUnhandledRejectionHandler, resolveAccountIdForConfigure, resolveAgentRoute, resolveAllowlistProviderRuntimeGroupPolicy, resolveChannelGroupPolicy, resolveChannelGroupRequireMention, resolveChunkMode, resolveChunkNewlinePacking, resolveDefaultGroupPolicy, resolveDmGroupAccessWithCommandGate, resolveDmGroupAccessWithLists, resolveGroupSessionKey, resolveIdentityNamePrefix, resolveInboundDebounceMs, resolveInboundSessionEnvelopeContext, resolveJidToE164, resolveMarkdownTableMode, resolveMentionGating, resolveMessagePrefix, resolveOnboardingAccountId, resolveOpenProviderRuntimeGroupPolicy, resolvePinnedMainDmOwnerFromAllowlist, resolveStorePath, resolveTextChunkLimit, resolveWhatsAppAccount, resolveWhatsAppGroupRequireMention, resolveWhatsAppGroupToolPolicy, saveMediaBuffer, shouldAckReactionForWhatsApp, shouldComputeCommandAuthorized, shouldLogVerbose, sleep, sleepWithAbort, splitOnboardingEntries, success, toLocationContext, toWhatsappJid, transcribeFirstAudio, updateLastRoute, upsertChannelPairingRequest, waitForever, warnMissingProviderGroupPolicyFallbackOnce } from "openclaw/plugin-sdk";
+import { DEFAULT_ACCOUNT_ID, DEFAULT_GROUP_HISTORY_LIMIT, DEFAULT_MAIN_KEY, SILENT_REPLY_TOKEN, ToolAuthorizationError, Type, WhatsAppConfigSchema, applyAccountNameToChannelSection, applyMessageSendingHook, buildAgentMainSessionKey, buildAgentSessionKey, buildChannelConfigSchema, buildGroupHistoryKey, buildHistoryContextFromEntries, buildMentionRegexes, buildPairingReply, chunkMarkdownTextWithMode, computeBackoff, convertMarkdownTables, createActionGate, createDedupeCache, createInboundDebouncer, createMessageSentEmitter, createReplyPrefixOptions, createSubsystemLogger, danger, defaultRuntime, dispatchReplyWithBufferedBlockDispatcher, emptyPluginConfigSchema, enqueueSystemEvent, escapeRegExp, finalizeInboundContext, formatCliCommand, formatDocsLink, formatDurationPrecise, formatInboundEnvelope, formatLocationText, formatPairingApproveHint, getAgentScopedMediaLocalRoots, getChildLogger, getGlobalHookRunner, getReplyFromConfig, hasControlCommand, info, isSelfChatMode, isSilentReplyText, jidToE164, jsonResult, loadConfig, loadSessionStore, loadWebMedia, logInfo, logVerbose, markdownToWhatsApp, mergeWhatsAppConfig, migrateBaseNameToDefaultAccount, missingTargetError, normalizeAccountId, normalizeAgentId, normalizeAllowFromEntries, normalizeE164, normalizeGroupActivation, normalizeMentionText, parseActivationCommand, pathExists, readChannelAllowFromStoreSync, readReactionParams, readStoreAllowFromForDmPolicy, readStringParam, recordChannelActivity, recordPendingHistoryEntryIfEnabled, recordSessionMetaFromInbound, registerUnhandledRejectionHandler, resolveAccountIdForConfigure, resolveAgentRoute, resolveAllowlistProviderRuntimeGroupPolicy, resolveChannelGroupPolicy, resolveChannelGroupRequireMention, resolveChunkMode, resolveChunkNewlinePacking, resolveDefaultGroupPolicy, resolveDmGroupAccessWithCommandGate, resolveDmGroupAccessWithLists, resolveGroupSessionKey, resolveIdentityNamePrefix, resolveInboundDebounceMs, resolveInboundSessionEnvelopeContext, resolveJidToE164, resolveMarkdownTableMode, resolveMentionGating, resolveMessagePrefix, resolveOnboardingAccountId, resolveOpenProviderRuntimeGroupPolicy, resolvePinnedMainDmOwnerFromAllowlist, resolveStorePath, resolveTextChunkLimit, resolveWhatsAppAccount, resolveWhatsAppGroupRequireMention, resolveWhatsAppGroupToolPolicy, saveMediaBuffer, shouldAckReactionForWhatsApp, shouldComputeCommandAuthorized, shouldLogVerbose, sleep, sleepWithAbort, splitOnboardingEntries, success, toLocationContext, toWhatsappJid, transcribeFirstAudio, updateLastRoute, upsertChannelPairingRequest, waitForever, warnMissingProviderGroupPolicyFallbackOnce } from "openclaw/plugin-sdk";
 import path from "node:path";
 import { createHash, randomUUID } from "node:crypto";
 import { escapeRegExp as escapeRegExp$1 } from "openclaw/plugin-sdk/escape-regexp";
@@ -1463,7 +1463,7 @@ async function monitorWebInbox(options) {
 				const cfg = loadConfig();
 				const audioConfig = cfg.tools?.media?.audio;
 				if (audioConfig && audioConfig.enabled !== false) {
-					const transcript = await transcribeFirstAudio({
+					const { transcript } = await transcribeFirstAudio({
 						ctx: {
 							MediaPaths: [enriched.mediaPath],
 							MediaTypes: enriched.mediaType ? [enriched.mediaType] : void 0
@@ -1989,8 +1989,29 @@ async function deliverWebReply(params) {
 	const tableMode = params.tableMode ?? "code";
 	const chunkMode = params.chunkMode ?? "length";
 	const pack = params.pack;
-	const textChunks = chunkMarkdownTextWithMode(markdownToWhatsApp(convertMarkdownTables(replyResult.text || "", tableMode)), textLimit, chunkMode, { pack });
 	const mediaList = replyResult.mediaUrls?.length ? replyResult.mediaUrls : replyResult.mediaUrl ? [replyResult.mediaUrl] : [];
+	const hookRunner = getGlobalHookRunner();
+	const { emitMessageSent } = createMessageSentEmitter({
+		hookRunner,
+		channel: "whatsapp",
+		to: msg.from
+	});
+	const hookResult = await applyMessageSendingHook({
+		hookRunner,
+		enabled: hookRunner?.hasHooks("message_sending") ?? false,
+		payload: replyResult,
+		payloadSummary: {
+			text: convertMarkdownTables(replyResult.text || "", tableMode),
+			mediaUrls: mediaList
+		},
+		to: msg.from,
+		channel: "whatsapp"
+	});
+	if (hookResult.cancelled) return;
+	const hookedText = hookResult.payload.text ?? "";
+	const textChunks = chunkMarkdownTextWithMode(markdownToWhatsApp(convertMarkdownTables(hookedText, tableMode)), textLimit, chunkMode, { pack });
+	const effectiveMediaList = hookResult.payload.mediaUrls?.length ? hookResult.payload.mediaUrls : hookResult.payload.mediaUrl ? [hookResult.payload.mediaUrl] : [];
+	if (effectiveMediaList.length === 0 && (!hookedText.trim() || isSilentReplyText(hookedText.trim(), SILENT_REPLY_TOKEN))) return;
 	const sendWithRetry = async (fn, label, maxAttempts = 3) => {
 		let lastErr;
 		for (let attempt = 1; attempt <= maxAttempts; attempt++) try {
@@ -2006,31 +2027,40 @@ async function deliverWebReply(params) {
 		}
 		throw lastErr;
 	};
-	if (mediaList.length === 0 && textChunks.length) {
-		const totalChunks = textChunks.length;
-		for (const [index, chunk] of textChunks.entries()) {
-			const chunkStarted = Date.now();
-			await sendWithRetry(() => msg.reply(chunk), "text");
-			if (!skipLog) {
-				const durationMs = Date.now() - chunkStarted;
-				getOutboundLog$1().debug(`Sent chunk ${index + 1}/${totalChunks} to ${msg.from} (${durationMs.toFixed(0)}ms)`);
+	let sentAny = false;
+	if (effectiveMediaList.length === 0 && textChunks.length) {
+		try {
+			const totalChunks = textChunks.length;
+			for (const [index, chunk] of textChunks.entries()) {
+				const chunkStarted = Date.now();
+				await sendWithRetry(() => msg.reply(chunk), "text");
+				sentAny = true;
+				if (!skipLog) {
+					const durationMs = Date.now() - chunkStarted;
+					getOutboundLog$1().debug(`Sent chunk ${index + 1}/${totalChunks} to ${msg.from} (${durationMs.toFixed(0)}ms)`);
+				}
 			}
+			replyLogger.info({
+				correlationId: msg.id ?? newConnectionId(),
+				connectionId: connectionId ?? null,
+				to: msg.from,
+				from: msg.to,
+				text: elide(replyResult.text, 240),
+				mediaUrl: null,
+				mediaSizeBytes: null,
+				mediaKind: null,
+				durationMs: Date.now() - replyStarted
+			}, "auto-reply sent (text)");
+		} finally {
+			if (sentAny) emitMessageSent({
+				success: true,
+				content: hookResult.payloadSummary.text
+			});
 		}
-		replyLogger.info({
-			correlationId: msg.id ?? newConnectionId(),
-			connectionId: connectionId ?? null,
-			to: msg.from,
-			from: msg.to,
-			text: elide(replyResult.text, 240),
-			mediaUrl: null,
-			mediaSizeBytes: null,
-			mediaKind: null,
-			durationMs: Date.now() - replyStarted
-		}, "auto-reply sent (text)");
 		return;
 	}
 	const remainingText = [...textChunks];
-	for (const [index, mediaUrl] of mediaList.entries()) {
+	for (const [index, mediaUrl] of effectiveMediaList.entries()) {
 		const caption = index === 0 ? remainingText.shift() || void 0 : void 0;
 		try {
 			const media = await loadWebMedia(mediaUrl, {
@@ -2052,6 +2082,7 @@ async function deliverWebReply(params) {
 					ptt: true,
 					mimetype: media.contentType
 				}), "media:audio");
+				sentAny = true;
 				if (caption) await sendWithRetry(() => msg.reply(caption), "text");
 			} else if (media.kind === "video") await sendWithRetry(() => msg.sendMedia({
 				video: media.buffer,
@@ -2068,6 +2099,7 @@ async function deliverWebReply(params) {
 					mimetype
 				}), "media:document");
 			}
+			sentAny = true;
 			getOutboundLog$1().info(`Sent media reply to ${msg.from} (${(media.buffer.length / (1024 * 1024)).toFixed(2)}MB)`);
 			replyLogger.info({
 				correlationId: msg.id ?? newConnectionId(),
@@ -2091,12 +2123,27 @@ async function deliverWebReply(params) {
 				const fallbackText = [remainingText.shift() ?? caption ?? "", warning].filter(Boolean).join("\n");
 				if (fallbackText) {
 					getOutboundLog$1().warn(`Media skipped; sent text-only to ${msg.from}`);
-					await msg.reply(fallbackText);
+					try {
+						await msg.reply(fallbackText);
+						sentAny = true;
+					} catch (fallbackErr) {
+						getOutboundLog$1().error(`Failed sending fallback text to ${msg.from}: ${formatError(fallbackErr)}`);
+					}
 				}
 			}
 		}
 	}
-	for (const chunk of remainingText) await msg.reply(chunk);
+	try {
+		for (const chunk of remainingText) {
+			await msg.reply(chunk);
+			sentAny = true;
+		}
+	} finally {
+		if (sentAny) emitMessageSent({
+			success: true,
+			content: hookResult.payloadSummary.text
+		});
+	}
 }
 
 //#endregion
@@ -2337,7 +2384,7 @@ async function processMessage(params) {
 		accountId: params.route.accountId
 	});
 	const isSelfChat = params.msg.chatType !== "group" && Boolean(params.msg.selfE164) && normalizeE164(params.msg.from) === normalizeE164(params.msg.selfE164 ?? "");
-	const responsePrefix = prefixOptions.responsePrefix ?? (configuredResponsePrefix === void 0 && isSelfChat ? resolveIdentityNamePrefix(params.cfg, params.route.agentId) ?? "[openclaw]" : void 0);
+	const responsePrefix = prefixOptions.responsePrefix ?? (configuredResponsePrefix === void 0 && isSelfChat ? resolveIdentityNamePrefix(params.cfg, params.route.agentId) ?? "[wednesdayai]" : void 0);
 	const inboundHistory = params.msg.chatType === "group" ? (params.groupHistory ?? params.groupHistories.get(params.groupHistoryKey) ?? []).map((entry) => ({
 		sender: entry.sender,
 		body: entry.body,

package/package.json

@@ -1,7 +1,11 @@
 {
   "name": "@wednesdayai/whatsapp",
-  "version": "0.4.10",
+  "version": "0.4.12-dev.25+46769abdb",
   "description": "WednesdayAI WhatsApp channel plugin",
+  "repository": {
+    "type": "git",
+    "url": "git+https://github.com/ExpansionX/WednesdayAI-core.git"
+  },
   "files": [
     "dist/",
     "openclaw.plugin.json",