@openclaw/discord 2026.7.2-beta.5 → 2026.8.1-beta.2

package/dist/{message-handler.preflight-D-5zBjwh.js → message-handler.preflight-C9zecxR9.js}

@@ -1,12 +1,12 @@
-import { F as Message, bt as getChannelMessage, d as discord_exports } from "./chunk-CMVEczdm.js";
+import { B as Message, Et as getChannelMessage, h as discord_exports } from "./retry-CLpJcXXf.js";
 import { o as resolveDefaultDiscordAccountId } from "./accounts-DJTf1LtA.js";
-import { C as resolveTimestampMs, S as resolveDiscordSystemLocation, _ as resolveDiscordShouldRequireMention, a as normalizeDiscordSlug, c as resolveDiscordChannelConfigWithFallback, f as resolveDiscordGuildEntry, i as normalizeDiscordDisplaySlug, n as isDiscordGroupAllowedByPolicy, p as resolveDiscordMemberAccessState, v as resolveGroupDmAllow, x as formatDiscordUserTag } from "./allow-list-DzKrtfah.js";
+import { C as resolveTimestampMs, S as resolveDiscordSystemLocation, _ as resolveDiscordShouldRequireMention, a as normalizeDiscordSlug, c as resolveDiscordChannelConfigWithFallback, f as resolveDiscordGuildEntry, i as normalizeDiscordDisplaySlug, n as isDiscordGroupAllowedByPolicy, p as resolveDiscordMemberAccessState, v as resolveGroupDmAllow, x as formatDiscordUserTag } from "./allow-list-DnxIlPP2.js";
 import { n as DISCORD_ATTACHMENT_TOTAL_TIMEOUT_MS, t as DISCORD_ATTACHMENT_IDLE_TIMEOUT_MS } from "./timeouts-B9cy6RvQ.js";
-import { r as resolveDiscordConversationIdentity } from "./approval-message-safety-yjFtfJcK.js";
-import { f as resolveDiscordChannelInfoSafe, p as resolveDiscordChannelNameSafe } from "./thread-bindings.discord-api-DOCKdVgx.js";
-import { C as handleDiscordDmCommandDecision, M as resolveDiscordTextCommandAccess, S as shouldIgnoreStaleDiscordRouteBinding, b as resolveDiscordConversationRoute, j as resolveDiscordDmCommandAccess, x as resolveDiscordEffectiveRoute, y as buildDiscordRoutePeer } from "./provider-Ca5Gua1B.js";
-import { d as resolveDiscordChannelInfo, f as resolveDiscordMessageChannelId, i as resolveDiscordMessageText, o as resolveForwardedMediaList, r as resolveDiscordMessageHistoryText, s as resolveMediaList, u as resolveDiscordMessageStickers } from "./message-utils-DSxXsDcG.js";
-import { n as resolveDiscordWebhookId, t as resolveDiscordSenderIdentity } from "./sender-identity-mG_zsdox.js";
+import { r as resolveDiscordConversationIdentity } from "./approval-message-safety-AcIxvrf3.js";
+import { c as resolveDiscordChannelInfoSafe, l as resolveDiscordChannelNameSafe } from "./thread-bindings.manager-DCIH6WDC.js";
+import { C as handleDiscordDmCommandDecision, M as resolveDiscordTextCommandAccess, S as shouldIgnoreStaleDiscordRouteBinding, b as resolveDiscordConversationRoute, j as resolveDiscordDmCommandAccess, x as resolveDiscordEffectiveRoute, y as buildDiscordRoutePeer } from "./provider-DvSNb-2v.js";
+import { d as resolveDiscordChannelInfo, f as resolveDiscordMessageChannelId, i as resolveDiscordMessageText, o as resolveForwardedMediaList, r as resolveDiscordMessageHistoryText, s as resolveMediaList, u as resolveDiscordMessageStickers } from "./message-utils-BSCPVgy0.js";
+import { n as resolveDiscordWebhookId, t as resolveDiscordSenderIdentity } from "./sender-identity-QtalnCYv.js";
 import { t as createDiscordHistorySenderProvenance } from "./message-handler.history-CJOsN9w5.js";
 import { normalizeOptionalString, readStringValue } from "openclaw/plugin-sdk/string-coerce-runtime";
 import { logDebug } from "openclaw/plugin-sdk/logging-core";
@@ -18,8 +18,8 @@ import { findCodeRegions, isInsideCode } from "openclaw/plugin-sdk/text-chunking
 import { isRecentOutboundMessageIdentity } from "openclaw/plugin-sdk/channel-outbound";
 import { createLazyRuntimeModule } from "openclaw/plugin-sdk/lazy-runtime";
 import { isDangerousNameMatchingEnabled } from "openclaw/plugin-sdk/dangerous-name-runtime";
-import { enqueueSystemEvent } from "openclaw/plugin-sdk/system-event-runtime";
-import { buildMentionRegexes, classifyChannelInboundEvent, implicitMentionKindWhen, logInboundDrop, matchesMentionWithExplicit, recordChannelBotPairLoopAndCheckSuppression, resolveInboundMentionDecision, resolveUnmentionedGroupInboundPolicy, toHistoryMediaEntries, toInboundMediaFacts } from "openclaw/plugin-sdk/channel-inbound";
+import { enqueueRoutedSystemEvent } from "openclaw/plugin-sdk/system-event-runtime";
+import { buildMentionRegexes, classifyChannelInboundEvent, implicitMentionKindWhen, logInboundDrop, matchesMentionWithExplicit, recordChannelBotPairLoopAndCheckSuppression, resolveInboundMentionDecision, resolveUnmentionedGroupInboundPolicy, toHistoryMediaEntries, toInboundMediaFactsWithMetadata } from "openclaw/plugin-sdk/channel-inbound";
 import { mimeTypeFromFilePath } from "openclaw/plugin-sdk/media-mime";
 import { hasControlCommand } from "openclaw/plugin-sdk/command-detection";
 import { isAbortRequestText } from "openclaw/plugin-sdk/command-primitives-runtime";
@@ -27,7 +27,7 @@ import { shouldHandleTextCommands } from "openclaw/plugin-sdk/command-surface";
 import { createChannelHistoryWindow } from "openclaw/plugin-sdk/reply-history";
 //#region extensions/discord/src/monitor/message-handler.dm-preflight.ts
 const loadConversationRuntime$1 = createLazyRuntimeModule(() => import("openclaw/plugin-sdk/conversation-binding-runtime"));
-const loadDiscordSendRuntime = createLazyRuntimeModule(() => import("./send-C_PfNVFH.js").then((n) => n.t));
+const loadDiscordSendRuntime = createLazyRuntimeModule(() => import("./send-B7Q6Oc1I.js").then((n) => n.t));
 function resolveDiscordDmPairingSenderId(sender) {
 	return sender.isPluralKit ? `pk:${sender.id}` : sender.id;
 }
@@ -45,7 +45,7 @@ async function resolveDiscordDmPreflightAccess(params) {
 		accountId: params.preflight.accountId,
 		conversationId: directBindingConversationId
 	});
-	const dmAccess = await resolveDiscordDmCommandAccess({
+	const resolveChannelIngress = async (contextBinding, conversation) => await resolveDiscordDmCommandAccess({
 		accountId: params.resolvedAccountId,
 		dmPolicy: params.dmPolicy,
 		configuredAllowFrom: params.preflight.allowFrom ?? [],
@@ -57,13 +57,26 @@ async function resolveDiscordDmPreflightAccess(params) {
 		allowNameMatching: params.allowNameMatching,
 		cfg: params.preflight.cfg,
 		token: params.preflight.token,
-		rest: params.preflight.client.rest
+		rest: params.preflight.client.rest,
+		conversationId: params.conversationId,
+		conversationParentId: conversation?.parentId,
+		conversationThreadId: conversation?.threadId,
+		...contextBinding ? { contextBinding } : {}
 	});
+	const dmAccess = await resolveChannelIngress();
 	const commandAuthorized = dmAccess.senderAccess.allowed && dmAccess.commandAccess.authorized || directBindingRecord != null;
-	if (dmAccess.senderAccess.decision === "allow") return { commandAuthorized };
+	if (dmAccess.senderAccess.decision === "allow") return {
+		commandAuthorized,
+		channelIngress: dmAccess,
+		resolveChannelIngress
+	};
 	if (directBindingRecord) {
 		logVerbose(`discord: allow bound DM conversation ${directBindingConversationId} despite dmPolicy=${params.dmPolicy}`);
-		return { commandAuthorized };
+		return {
+			commandAuthorized,
+			channelIngress: dmAccess,
+			resolveChannelIngress
+		};
 	}
 	await handleDiscordDmCommandDecision({
 		senderAccess: dmAccess.senderAccess,
@@ -196,15 +209,20 @@ function shouldHydrateDiscordMessagePayload(params) {
 	if ((params.message.mentionedUsers?.length ?? 0) > 0 || (params.message.mentionedRoles?.length ?? 0) > 0 || params.message.mentionedEveryone) return false;
 	return /<@!?\d+>|<@&\d+>|@everyone|@here/u.test(currentText);
 }
-function hasMissingReferencedMessagePayload(message) {
+function resolveReferencedMessagePayloadState(message) {
 	const reference = message.messageReference;
-	if (!reference?.message_id) return false;
-	if (reference.type != null && reference.type !== MessageReferenceType.Default) return false;
-	if (message.type != null && message.type !== MessageType.Reply) return false;
-	return !Object.hasOwn(readMessageRawData(message), "referenced_message");
+	if (!reference?.message_id) return "complete";
+	if (reference.type != null && reference.type !== MessageReferenceType.Default) return "complete";
+	if (message.type != null && message.type !== MessageType.Reply) return "complete";
+	const rawData = readMessageRawData(message);
+	if (!Object.hasOwn(rawData, "referenced_message")) return "missing";
+	const referenced = rawData.referenced_message;
+	if (referenced == null) return "complete";
+	return typeof referenced === "object" && typeof referenced.id === "string" && referenced.id === reference.message_id ? "complete" : "invalid";
 }
 async function hydrateDiscordReplyReference(params) {
-	if (!hasMissingReferencedMessagePayload(params.message)) return params.message;
+	const payloadState = resolveReferencedMessagePayloadState(params.message);
+	if (payloadState === "complete") return params.message;
 	const reference = params.message.messageReference;
 	const referencedMessageId = reference?.message_id;
 	if (!referencedMessageId) return params.message;
@@ -217,6 +235,10 @@ async function hydrateDiscordReplyReference(params) {
 		});
 	} catch (err) {
 		logVerbose(`discord: failed to hydrate referenced message ${referencedMessageId}: ${String(err)}`);
+		if (payloadState === "invalid") return mergeFetchedDiscordMessage(params.message, {
+			...readMessageRawData(params.message),
+			referenced_message: null
+		});
 		return params.message;
 	}
 }
@@ -466,17 +488,17 @@ function logDiscordPreflightInboundSummary(params) {
 }
 //#endregion
 //#region extensions/discord/src/monitor/message-handler.preflight-runtime.ts
-const loadPluralKitRuntime = createLazyRuntimeModule(() => import("./pluralkit-DbN-Z7BG.js").then((n) => n.n));
-const loadPreflightAudioRuntime = createLazyRuntimeModule(() => import("./preflight-audio-BjnQZ5yS.js"));
-const loadSystemEventsRuntime = createLazyRuntimeModule(() => import("./system-events-tVfIe6Xm.js"));
-const loadDiscordThreadingRuntime = createLazyRuntimeModule(() => import("./provider-Ca5Gua1B.js").then((n) => n.E));
+const loadPluralKitRuntime = createLazyRuntimeModule(() => import("./pluralkit-DdiJ9KMK.js").then((n) => n.n));
+const loadPreflightAudioRuntime = createLazyRuntimeModule(() => import("./preflight-audio-DrnqFA8U.js"));
+const loadSystemEventsRuntime = createLazyRuntimeModule(() => import("./system-events-CTqDf6_s.js"));
+const loadDiscordThreadingRuntime = createLazyRuntimeModule(() => import("./provider-DvSNb-2v.js").then((n) => n.E));
 function isPreflightAborted(abortSignal) {
 	return Boolean(abortSignal?.aborted);
 }
 //#endregion
 //#region extensions/discord/src/monitor/message-handler.preflight-pluralkit.ts
 async function resolveDiscordPreflightPluralKitInfo(params) {
-	if (!params.config?.enabled) return null;
+	if (!params.config?.enabled || !params.webhookId) return null;
 	try {
 		const { fetchPluralKitMessageInfo } = await loadPluralKitRuntime();
 		const info = await fetchPluralKitMessageInfo({
@@ -632,11 +654,14 @@ async function resolveDiscordHistoryMediaForPendingRecord(params) {
 		abortSignal: params.preflight.abortSignal
 	});
 	const stickerStartIndex = Math.max(0, mediaList.length - stickers.length);
-	return toInboundMediaFacts(mediaList, { messageId: params.message.id }).map((media, index) => ({
+	return (await toInboundMediaFactsWithMetadata(mediaList, { messageId: params.message.id })).map((media, index) => ({
 		path: media.path,
 		url: media.url,
 		contentType: media.contentType,
 		kind: index >= stickerStartIndex ? "sticker" : media.kind ?? "image",
+		durationMs: media.durationMs,
+		width: media.width,
+		height: media.height,
 		transcribed: media.transcribed,
 		messageId: media.messageId
 	}));
@@ -726,6 +751,7 @@ async function preflightDiscordMessage(params) {
 	}
 	const pluralkitInfo = await resolveDiscordPreflightPluralKitInfo({
 		message,
+		webhookId,
 		config: pluralkitConfig,
 		abortSignal: params.abortSignal
 	});
@@ -758,6 +784,8 @@ async function preflightDiscordMessage(params) {
 	const resolvedAccountId = params.accountId ?? resolveDefaultDiscordAccountId(params.cfg);
 	const allowNameMatching = isDangerousNameMatchingEnabled(params.discordConfig);
 	let commandAuthorized = true;
+	let channelIngress;
+	let resolveChannelIngress;
 	if (isDirectMessage) {
 		const access = await resolveDiscordDmPreflightAccess({
 			preflight: params,
@@ -765,11 +793,14 @@ async function preflightDiscordMessage(params) {
 			sender,
 			dmPolicy,
 			resolvedAccountId,
-			allowNameMatching
+			allowNameMatching,
+			conversationId: messageChannelId
 		});
 		if (isPreflightAborted(params.abortSignal)) return null;
 		if (!access) return null;
 		commandAuthorized = access.commandAuthorized;
+		channelIngress = access.channelIngress;
+		resolveChannelIngress = access.resolveChannelIngress;
 	}
 	const botId = params.botUserId;
 	const baseText = resolveDiscordMessageText(message, { includeForwarded: false });
@@ -947,7 +978,7 @@ async function preflightDiscordMessage(params) {
 	const hasControlCommandInMessage = hasControlCommand(baseText, params.cfg);
 	const hasAbortRequest = isAbortRequestText(baseText);
 	if (!isDirectMessage) {
-		const commandAccess = await resolveDiscordTextCommandAccess({
+		const resolveCommandIngress = async (contextBinding, conversation) => await resolveDiscordTextCommandAccess({
 			accountId: params.accountId,
 			cfg: params.cfg,
 			ownerAllowFrom: params.allowFrom,
@@ -960,10 +991,17 @@ async function preflightDiscordMessage(params) {
 			memberAllowed,
 			allowNameMatching,
 			allowTextCommands,
-			hasControlCommand: hasControlCommandInMessage
+			hasControlCommand: hasControlCommandInMessage,
+			conversationId: messageChannelId,
+			conversationParentId: conversation?.parentId,
+			conversationThreadId: conversation?.threadId,
+			...contextBinding ? { contextBinding } : {}
 		});
-		commandAuthorized = commandAccess.authorized;
-		if (commandAccess.shouldBlockControlCommand) {
+		const commandAccess = await resolveCommandIngress();
+		commandAuthorized = commandAccess.commandAccess.authorized;
+		channelIngress = commandAccess;
+		resolveChannelIngress = resolveCommandIngress;
+		if (commandAccess.commandAccess.shouldBlockControlCommand) {
 			logInboundDrop({
 				log: logVerbose,
 				channel: "discord",
@@ -1047,10 +1085,7 @@ async function preflightDiscordMessage(params) {
 	const systemText = resolveDiscordSystemEvent(message, systemLocation);
 	if (systemText) {
 		logDebug(`[discord-preflight] drop: system event`);
-		enqueueSystemEvent(systemText, {
-			sessionKey: effectiveRoute.sessionKey,
-			contextKey: `discord:system:${messageChannelId}:${message.id}`
-		});
+		enqueueRoutedSystemEvent(systemText, effectiveRoute, { contextKey: `discord:system:${messageChannelId}:${message.id}` });
 		return null;
 	}
 	const hasNativeMedia = (message.attachments?.length ?? 0) > 0 || resolveDiscordMessageStickers(message).length > 0;
@@ -1115,6 +1150,8 @@ async function preflightDiscordMessage(params) {
 		isDirectMessage,
 		isGroupDm,
 		commandAuthorized,
+		channelIngress,
+		resolveChannelIngress,
 		baseText,
 		messageText,
 		...preflightTranscript !== void 0 ? { preflightAudioTranscript: preflightTranscript } : {},