@openclaw/discord 2026.7.2-beta.7 → 2026.8.1-beta.3

package/dist/{message-handler.preflight-DibgQFf2.js → message-handler.preflight-Bzg_Hawz.js}

@@ -1,33 +1,34 @@
-import { F as Message, bt as getChannelMessage, d as discord_exports } from "./chunk-DX4jpFQP.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 { R as Message, Tt as getChannelMessage, p as discord_exports } from "./retry-DNsVTeTo.js";
+import { s as resolveDefaultDiscordAccountId } from "./accounts-DNl-oCEw.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-BDMimASD.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-DEyKVsAw.js";
-import { f as resolveDiscordChannelInfoSafe, p as resolveDiscordChannelNameSafe } from "./thread-bindings.discord-api-BoDNqamb.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-DfQJX3z5.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-BgTwT_q7.js";
-import { n as resolveDiscordWebhookId, t as resolveDiscordSenderIdentity } from "./sender-identity-mG_zsdox.js";
+import { d as resolveDiscordRuntimeBindingConversationId, i as buildDiscordRoutePeer, l as resolveDiscordConversationIdentity, o as resolveDiscordConversationRoute, s as resolveDiscordEffectiveRoute } from "./approval-message-safety-XGFPbDoI.js";
+import { t as resolveDiscordConversationBindingRoute } from "./conversation-binding-route-D6rCQ5S0.js";
+import { c as resolveDiscordChannelInfoSafe, l as resolveDiscordChannelNameSafe } from "./thread-bindings.manager-CngsgErq.js";
+import { b as resolveDiscordDmCommandAccess, g as handleDiscordDmCommandDecision, x as resolveDiscordTextCommandAccess } from "./provider-DlK_ynqt.js";
+import { d as resolveDiscordMessageStickers, f as resolveDiscordChannelInfo, i as resolveDiscordMessageText, o as resolveForwardedMediaList, p as resolveDiscordMessageChannelId, r as resolveDiscordMessageHistoryText, s as resolveMediaList } from "./message-utils-BXLLnFl6.js";
+import { n as resolveDiscordWebhookId, t as resolveDiscordSenderIdentity } from "./sender-identity-BJtfyise.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";
 import { MessageReferenceType, MessageType } from "discord-api-types/v10";
-import { getChildLogger, logVerbose, shouldLogVerbose } from "openclaw/plugin-sdk/runtime-env";
+import { normalizeOptionalString, readStringValue } from "openclaw/plugin-sdk/string-coerce-runtime";
 import { recordChannelActivity } from "openclaw/plugin-sdk/channel-activity-runtime";
+import { mimeTypeFromFilePath } from "openclaw/plugin-sdk/media-mime";
+import { getChildLogger, logVerbose, shouldLogVerbose } from "openclaw/plugin-sdk/runtime-env";
 import { formatAllowlistMatchMeta } from "openclaw/plugin-sdk/allow-from";
 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 { 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";
 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-CdkZ6zeW.js").then((n) => n.t));
+const loadDiscordSendRuntime = createLazyRuntimeModule(() => import("./send-rQIffSYu.js").then((n) => n.t));
 function resolveDiscordDmPairingSenderId(sender) {
 	return sender.isPluralKit ? `pk:${sender.id}` : sender.id;
 }
@@ -45,7 +46,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 +58,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,
@@ -475,10 +489,10 @@ function logDiscordPreflightInboundSummary(params) {
 }
 //#endregion
 //#region extensions/discord/src/monitor/message-handler.preflight-runtime.ts
-const loadPluralKitRuntime = createLazyRuntimeModule(() => import("./pluralkit-CD4B11JB.js").then((n) => n.n));
-const loadPreflightAudioRuntime = createLazyRuntimeModule(() => import("./preflight-audio-BjnQZ5yS.js"));
-const loadSystemEventsRuntime = createLazyRuntimeModule(() => import("./system-events-DdUqf91B.js"));
-const loadDiscordThreadingRuntime = createLazyRuntimeModule(() => import("./provider-DfQJX3z5.js").then((n) => n.E));
+const loadPluralKitRuntime = createLazyRuntimeModule(() => import("./pluralkit-dUl4v1X3.js").then((n) => n.n));
+const loadPreflightAudioRuntime = createLazyRuntimeModule(() => import("./preflight-audio-DrnqFA8U.js"));
+const loadSystemEventsRuntime = createLazyRuntimeModule(() => import("./system-events-Nuwoq_au.js"));
+const loadDiscordThreadingRuntime = createLazyRuntimeModule(() => import("./threading-DU6pgeGm.js").then((n) => n.t));
 function isPreflightAborted(abortSignal) {
 	return Boolean(abortSignal?.aborted);
 }
@@ -541,40 +555,21 @@ async function resolveDiscordPreflightRoute(params) {
 		}),
 		parentConversationId: params.earlyThreadParentId
 	});
-	const bindingConversationId = params.isDirectMessage ? resolveDiscordConversationIdentity({
-		isDirectMessage: true,
-		userId: params.author.id
-	}) ?? `user:${params.author.id}` : params.messageChannelId;
-	let runtimeRoute = conversationRuntime.resolveRuntimeConversationBindingRoute({
-		route,
-		conversation: {
-			channel: "discord",
-			accountId: params.preflight.accountId,
-			conversationId: bindingConversationId,
-			parentConversationId: params.earlyThreadParentId
-		}
+	const bindingConversationId = resolveDiscordRuntimeBindingConversationId({
+		isDirectMessage: params.isDirectMessage,
+		isGroupDm: params.isGroupDm,
+		userId: params.author.id,
+		channelId: params.messageChannelId
 	});
-	if (shouldIgnoreStaleDiscordRouteBinding({
-		bindingRecord: runtimeRoute.bindingRecord,
-		route
-	})) {
-		logVerbose(`discord: ignoring stale route binding for conversation ${bindingConversationId} (${runtimeRoute.bindingRecord?.targetSessionKey} -> ${route.sessionKey})`);
-		runtimeRoute = {
-			bindingRecord: null,
-			route
-		};
-	}
-	let threadBinding = runtimeRoute.bindingRecord ?? void 0;
-	const configuredRoute = threadBinding == null ? conversationRuntime.resolveConfiguredBindingRoute({
+	const { runtimeRoute, configuredRoute } = resolveDiscordConversationBindingRoute({
 		cfg: params.preflight.cfg,
 		route,
-		conversation: {
-			channel: "discord",
-			accountId: params.preflight.accountId,
-			conversationId: params.messageChannelId,
-			parentConversationId: params.earlyThreadParentId
-		}
-	}) : null;
+		accountId: params.preflight.accountId,
+		runtimeConversationId: bindingConversationId,
+		configuredConversationId: params.messageChannelId,
+		parentConversationId: params.earlyThreadParentId
+	});
+	let threadBinding = runtimeRoute.bindingRecord ?? void 0;
 	const configuredBinding = configuredRoute?.bindingResolution ?? null;
 	if (!threadBinding && configuredBinding) threadBinding = configuredBinding.record;
 	const boundSessionKey = conversationRuntime.isPluginOwnedSessionBindingRecord(threadBinding) ? "" : runtimeRoute.boundSessionKey ?? threadBinding?.targetSessionKey?.trim();
@@ -771,6 +766,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,
@@ -778,11 +775,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 });
@@ -960,7 +960,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,
@@ -973,10 +973,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",
@@ -1060,10 +1067,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;
@@ -1099,6 +1103,13 @@ async function preflightDiscordMessage(params) {
 			return null;
 		}
 	}
+	const guildId = isGuildMessage ? data.guild?.id ?? data.guild_id ?? message.guild_id : void 0;
+	const conversationAvatar = isDirectMessage || guildId ? params.avatarResolver?.resolve({
+		client: params.client,
+		conversationId: messageChannelId,
+		author,
+		...guildId ? { guildId } : {}
+	}) : void 0;
 	const mediaResolveOptions = {
 		fetchImpl: params.discordRestFetch,
 		ssrfPolicy: params.cfg.browser?.ssrfPolicy,
@@ -1128,11 +1139,14 @@ async function preflightDiscordMessage(params) {
 		isDirectMessage,
 		isGroupDm,
 		commandAuthorized,
+		channelIngress,
+		resolveChannelIngress,
 		baseText,
 		messageText,
 		...preflightTranscript !== void 0 ? { preflightAudioTranscript: preflightTranscript } : {},
 		preparedMedia,
 		wasMentioned,
+		conversationAvatar,
 		route: effectiveRoute,
 		threadBinding,
 		boundSessionKey: boundSessionKey || void 0,