@openclaw/discord 2026.8.1-beta.2 → 2026.9.1-beta.1

package/dist/{message-handler.preflight-C9zecxR9.js → message-handler.preflight-Ba5LAY_X.js}

@@ -1,18 +1,21 @@
-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-DnxIlPP2.js";
+import { W as Message, jt as getChannelMessage, y as discord_exports } from "./retry-Cv4jCU5Z.js";
+import { s as resolveDefaultDiscordAccountId } from "./accounts-CfQ-vSyf.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 { t as isDiscordThreadChannelType } from "./channel-type-CVLZyGYS.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-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 { a as buildDiscordRoutePeer, c as resolveDiscordEffectiveRoute, f as resolveDiscordRuntimeBindingConversationId, s as resolveDiscordConversationRoute, u as resolveDiscordConversationIdentity } from "./outbound-session-route-Cg15ZFJd.js";
+import { t as resolveDiscordConversationBindingRoute } from "./conversation-binding-route-DJYrY2TQ.js";
+import { c as resolveDiscordChannelInfoSafe, l as resolveDiscordChannelNameSafe } from "./thread-bindings.manager-ByOtwjo_.js";
+import { b as resolveDiscordDmCommandAccess, g as handleDiscordDmCommandDecision, x as resolveDiscordTextCommandAccess } from "./provider-B11xwilq.js";
+import { f as resolveDiscordChannelInfo, i as resolveDiscordMessageText, o as resolveForwardedMediaList, p as resolveDiscordMessageChannelId, r as resolveDiscordMessageHistoryText, s as resolveMediaList, u as resolveDiscordMessageStickers } from "./message-text-aiwO5R2F.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";
@@ -20,14 +23,13 @@ import { createLazyRuntimeModule } from "openclaw/plugin-sdk/lazy-runtime";
 import { isDangerousNameMatchingEnabled } from "openclaw/plugin-sdk/dangerous-name-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-B7Q6Oc1I.js").then((n) => n.t));
+const loadDiscordSendRuntime = createLazyRuntimeModule(() => import("./send-C49MFF9j.js").then((n) => n.t));
 function resolveDiscordDmPairingSenderId(sender) {
 	return sender.isPluralKit ? `pk:${sender.id}` : sender.id;
 }
@@ -400,9 +402,6 @@ function isBoundThreadBotSystemMessage(params) {
 	if (!text) return false;
 	return DISCORD_BOUND_THREAD_SYSTEM_PREFIXES.some((prefix) => text.startsWith(prefix));
 }
-function isDiscordThreadChannelType(type) {
-	return type === discord_exports.ChannelType.PublicThread || type === discord_exports.ChannelType.PrivateThread || type === discord_exports.ChannelType.AnnouncementThread;
-}
 function isDiscordThreadChannelMessage(params) {
 	if (!params.isGuildMessage) return false;
 	const channel = "channel" in params.message ? params.message.channel : void 0;
@@ -488,10 +487,10 @@ function logDiscordPreflightInboundSummary(params) {
 }
 //#endregion
 //#region extensions/discord/src/monitor/message-handler.preflight-runtime.ts
-const loadPluralKitRuntime = createLazyRuntimeModule(() => import("./pluralkit-DdiJ9KMK.js").then((n) => n.n));
+const loadPluralKitRuntime = createLazyRuntimeModule(() => import("./pluralkit-Tiyl70dx.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));
+const loadSystemEventsRuntime = createLazyRuntimeModule(() => import("./system-events-C7yxaHWP.js"));
+const loadDiscordThreadingRuntime = createLazyRuntimeModule(() => import("./threading-agH1T_6s.js").then((n) => n.t));
 function isPreflightAborted(abortSignal) {
 	return Boolean(abortSignal?.aborted);
 }
@@ -554,40 +553,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();
@@ -725,7 +705,7 @@ async function preflightDiscordMessage(params) {
 		channelType: channelInfo?.type
 	});
 	const messageText = resolveDiscordMessageText(message, { includeForwarded: true });
-	const injectedBoundThreadBinding = !isDirectMessage && !isGroupDm ? resolveInjectedBoundThreadLookupRecord({
+	const injectedBoundThreadBinding = !isDirectMessage && !isGroupDm && (webhookId || author.bot) ? resolveInjectedBoundThreadLookupRecord({
 		threadBindings: params.threadBindings,
 		threadId: messageChannelId
 	}) : void 0;
@@ -1121,6 +1101,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,
@@ -1157,6 +1144,7 @@ async function preflightDiscordMessage(params) {
 		...preflightTranscript !== void 0 ? { preflightAudioTranscript: preflightTranscript } : {},
 		preparedMedia,
 		wasMentioned,
+		conversationAvatar,
 		route: effectiveRoute,
 		threadBinding,
 		boundSessionKey: boundSessionKey || void 0,