@openclaw/discord 2026.9.6 → 2026.9.7

package/dist/.setup/{message-handler.preflight-DE_POxFc.mjs → message-handler.preflight-v-__NSDq.mjs}

@@ -1,17 +1,16 @@
-import { D as Message, mt as getChannelMessage, t as discord_exports } from "./discord-BXpHW-cu.mjs";
-import { C as resolveTimestampMs, S as resolveDiscordSystemLocation, _ as resolveDiscordShouldRequireMention, a as normalizeDiscordDisplaySlug, f as resolveDiscordGuildEntry, l as resolveDiscordChannelConfigWithFallback, o as normalizeDiscordSlug, p as resolveDiscordMemberAccessState, x as formatDiscordUserTag } from "./channel-type-DKnjV1XW.mjs";
-import { s as resolveDefaultDiscordAccountId } from "./accounts-CwJQoLjM.mjs";
+import { D as Message, ht as getChannelMessage, t as discord_exports } from "./discord-0xJYfdDD.mjs";
+import { C as resolveDiscordSystemLocation, S as formatDiscordUserTag, a as normalizeDiscordDisplaySlug, f as resolveDiscordGuildEntry, h as resolveDiscordMentionPolicy, l as resolveDiscordChannelConfigWithFallback, o as normalizeDiscordSlug, p as resolveDiscordMemberAccessState, w as resolveTimestampMs } from "./channel-type-DRCrEMss.mjs";
+import { s as resolveDefaultDiscordAccountId } from "./accounts-ChaMcixG.mjs";
 import { n as resolveDiscordChannelInfoSafe, r as resolveDiscordChannelNameSafe } from "./channel-access-C12aDZ0p.mjs";
-import { C as resolveForwardedMediaList, M as resolveDiscordMessageChannelId, O as resolveDiscordMessageStickers, b as resolveDiscordMessageMentionDocuments, j as resolveDiscordChannelInfo, k as resolveDiscordReferencedReplyMessage, v as resolveDiscordMessageBatch, w as resolveMediaList, x as resolveDiscordMessageText, y as resolveDiscordMessageHistoryText } from "./transcripts-source-DVegW0WI.mjs";
+import { A as resolveDiscordMessageChannelId, D as resolveDiscordReferencedReplyMessage, E as resolveDiscordMessageStickers, S as resolveMediaList, _ as resolveDiscordMessageHistoryText, g as resolveDiscordMessageBatch, k as resolveDiscordChannelInfo, v as resolveDiscordMessageMentionDocuments, x as resolveForwardedMediaList, y as resolveDiscordMessageText } from "./transcripts-source-p8EV179h.mjs";
 import { n as DISCORD_ATTACHMENT_TOTAL_TIMEOUT_MS, t as DISCORD_ATTACHMENT_IDLE_TIMEOUT_MS } from "./timeouts-D86uWLt_.mjs";
-import { _ as resolveDiscordRuntimeBindingConversationId, f as resolveDiscordConversationRoute, h as resolveDiscordConversationIdentity, p as resolveDiscordEffectiveRoute, u as buildDiscordRoutePeer } from "./outbound-session-route-VulUE0yV.mjs";
-import { t as resolveDiscordConversationBindingRoute } from "./conversation-binding-route-B7qImK_b.mjs";
-import { S as resolveDiscordTextCommandAccess, _ as handleDiscordDmCommandDecision, n as resolveDiscordPreflightChannelAccess, x as resolveDiscordDmCommandAccess } from "./provider-iOf73HW-.mjs";
-import { n as resolveDiscordWebhookId, t as resolveDiscordSenderIdentity } from "./sender-identity-0Ymgvmaj.mjs";
-import { a as createDiscordHistorySenderProvenance, c as hasRawDiscordUserMention, d as matchesActiveDiscordMentionPatterns, f as resolveDiscordMentionState, h as shouldIgnoreBoundThreadWebhookMessage, i as loadSystemEventsRuntime, l as isBoundThreadBotSystemMessage, m as resolvePreflightMentionRequirement, n as loadDiscordThreadingRuntime, p as resolveInjectedBoundThreadLookupRecord, r as loadPreflightAudioRuntime, s as resolveDiscordHistoryMediaIds, t as resolveDiscordPreflightPluralKitInfo, u as isDiscordThreadChannelMessage } from "./message-handler.preflight-pluralkit-8Xji34AF.mjs";
+import { _ as resolveDiscordRuntimeBindingConversationId, f as resolveDiscordConversationRoute, h as resolveDiscordConversationIdentity, p as resolveDiscordEffectiveRoute, u as buildDiscordRoutePeer } from "./outbound-session-route-zVGxxceg.mjs";
+import { t as resolveDiscordConversationBindingRoute } from "./conversation-binding-route-Caz_XuFH.mjs";
+import { A as resolveDiscordDmCommandAccess, E as handleDiscordDmCommandDecision, j as resolveDiscordTextCommandAccess, n as resolveDiscordPreflightChannelAccess } from "./provider-B_G5hASF.mjs";
+import { n as resolveDiscordWebhookId, t as resolveDiscordSenderIdentity } from "./sender-identity-B9X5Vb9R.mjs";
+import { a as createDiscordHistorySenderProvenance, c as hasRawDiscordUserMention, d as matchesActiveDiscordMentionPatterns, f as resolveDiscordMentionState, h as shouldIgnoreBoundThreadWebhookMessage, i as loadSystemEventsRuntime, l as isBoundThreadBotSystemMessage, m as resolvePreflightMentionRequirement, n as loadDiscordThreadingRuntime, p as resolveInjectedBoundThreadLookupRecord, r as loadPreflightAudioRuntime, s as resolveDiscordHistoryMediaIds, t as resolveDiscordPreflightPluralKitInfo, u as isDiscordThreadChannelMessage } from "./message-handler.preflight-pluralkit-CWLUBVcx.mjs";
 import { logDebug } from "openclaw/plugin-sdk/logging-core";
 import { MessageReferenceType, MessageType } from "discord-api-types/v10";
-import { 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";
@@ -27,10 +26,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-CIBzvXjS.mjs").then((n) => n.t));
-function resolveDiscordDmPairingSenderId(sender) {
-	return sender.isPluralKit ? `pk:${sender.id}` : sender.id;
-}
+const loadDiscordSendRuntime = createLazyRuntimeModule(() => import("./send-CrfEI6Bs.mjs").then((n) => n.t));
 async function resolveDiscordDmPreflightAccess(params) {
 	if (params.dmPolicy === "disabled") {
 		logVerbose("discord: drop dm (dmPolicy: disabled)");
@@ -70,14 +66,12 @@ async function resolveDiscordDmPreflightAccess(params) {
 	const commandAuthorized = dmAccess.senderAccess.allowed && dmAccess.commandAccess.authorized || directBindingRecord != null;
 	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,
-			channelIngress: dmAccess,
 			resolveChannelIngress
 		};
 	}
@@ -85,7 +79,7 @@ async function resolveDiscordDmPreflightAccess(params) {
 		senderAccess: dmAccess.senderAccess,
 		accountId: params.resolvedAccountId,
 		sender: {
-			id: resolveDiscordDmPairingSenderId(params.sender),
+			id: params.sender.isPluralKit ? `pk:${params.sender.id}` : params.sender.id,
 			tag: params.sender.tag ?? formatDiscordUserTag(params.author),
 			name: params.sender.name ?? params.author.username ?? void 0
 		},
@@ -116,100 +110,15 @@ async function resolveDiscordDmPreflightAccess(params) {
 }
 //#endregion
 //#region extensions/discord/src/monitor/message-handler.hydration.ts
-function mergeFetchedDiscordMessage(base, fetched) {
-	const baseRawData = readMessageRawData(base);
-	const baseFallback = readMessageFallback(base);
-	const rawData = {
-		...baseRawData,
-		...fetched,
-		id: fetched.id ?? baseRawData.id ?? baseFallback.id,
-		channel_id: fetched.channel_id ?? baseRawData.channel_id ?? baseFallback.channel_id,
-		content: fetched.content ?? baseRawData.content ?? baseFallback.content,
-		author: fetched.author ?? baseRawData.author ?? baseFallback.author,
-		attachments: fetched.attachments ?? baseRawData.attachments ?? baseFallback.attachments,
-		embeds: fetched.embeds ?? baseRawData.embeds ?? baseFallback.embeds,
-		mentions: fetched.mentions ?? baseRawData.mentions ?? baseFallback.mentions,
-		mention_roles: fetched.mention_roles ?? baseRawData.mention_roles ?? baseFallback.mention_roles,
-		mention_everyone: fetched.mention_everyone ?? baseRawData.mention_everyone ?? baseFallback.mention_everyone,
-		timestamp: fetched.timestamp ?? baseRawData.timestamp ?? baseFallback.timestamp,
-		tts: fetched.tts ?? baseRawData.tts ?? false,
-		pinned: fetched.pinned ?? baseRawData.pinned ?? false,
-		type: fetched.type ?? baseRawData.type ?? 0,
-		message_snapshots: fetched.message_snapshots ?? baseRawData.message_snapshots ?? baseFallback.message_snapshots,
-		sticker_items: fetched.sticker_items ?? baseRawData.sticker_items ?? baseFallback.sticker_items
-	};
-	const hydrated = new Message(readMessageClient(base), rawData);
-	copyRuntimeMessageFields(base, hydrated);
-	return hydrated;
-}
-function readMessageClient(message) {
-	return message.client;
-}
-function readMessageRawData(message) {
-	try {
-		const rawData = message.rawData;
-		return rawData && typeof rawData === "object" ? rawData : {};
-	} catch {
-		return {};
-	}
-}
-function readMessageFallback(message) {
-	const value = message;
-	return {
-		id: typeof value.id === "string" ? value.id : "",
-		channel_id: readStringValue(value.channel_id) ?? readStringValue(value.channelId) ?? "",
-		content: typeof value.content === "string" ? value.content : "",
-		author: normalizeApiUser(value.author),
-		attachments: Array.isArray(value.attachments) ? value.attachments : [],
-		embeds: Array.isArray(value.embeds) ? value.embeds : [],
-		mentions: normalizeApiUsers(value.mentionedUsers),
-		mention_roles: normalizeStringArray(value.mentionedRoles),
-		mention_everyone: value.mentionedEveryone === true,
-		timestamp: readStringValue(value.timestamp) ?? "1970-01-01T00:00:00.000Z",
-		sticker_items: Array.isArray(value.sticker_items) ? value.sticker_items : Array.isArray(value.stickers) ? value.stickers : void 0,
-		message_snapshots: Array.isArray(value.message_snapshots) ? value.message_snapshots : void 0
-	};
-}
-function normalizeStringArray(value) {
-	return Array.isArray(value) ? value.flatMap((entry) => typeof entry === "string" ? [entry] : []) : [];
-}
-function normalizeApiUsers(value) {
-	return Array.isArray(value) ? value.flatMap((entry) => {
-		const user = normalizeApiUser(entry);
-		return user.id ? [user] : [];
-	}) : [];
-}
-function normalizeApiUser(value) {
-	if (!value || typeof value !== "object") return {
-		id: "",
-		username: "",
-		discriminator: "0",
-		global_name: null,
-		avatar: null
-	};
-	const input = value;
-	return {
-		id: readStringValue(input.id) ?? "",
-		username: readStringValue(input.username) ?? "",
-		discriminator: readStringValue(input.discriminator) ?? "0",
-		global_name: readStringValue(input.global_name) ?? readStringValue(input.globalName) ?? null,
-		avatar: input.avatar === null ? null : readStringValue(input.avatar) ?? null,
-		...typeof input.bot === "boolean" ? { bot: input.bot } : {}
-	};
-}
-function copyRuntimeMessageFields(source, target) {
-	const channelDescriptor = Object.getOwnPropertyDescriptor(source, "channel");
-	if (channelDescriptor) Object.defineProperty(target, "channel", channelDescriptor);
-}
-function shouldHydrateDiscordMessagePayload(params) {
+function shouldHydrateDiscordMessagePayload(message) {
 	let currentText;
 	try {
-		currentText = resolveDiscordMessageText(params.message, { includeForwarded: true });
+		currentText = resolveDiscordMessageText(message, { includeForwarded: true });
 	} catch {
 		return true;
 	}
 	if (!currentText) return true;
-	if ((params.message.mentionedUsers?.length ?? 0) > 0 || (params.message.mentionedRoles?.length ?? 0) > 0 || params.message.mentionedEveryone) return false;
+	if ((message.mentionedUsers?.length ?? 0) > 0 || (message.mentionedRoles?.length ?? 0) > 0 || message.mentionedEveryone) return false;
 	return /<@!?\d+>|<@&\d+>|@everyone|@here/u.test(currentText);
 }
 function resolveReferencedMessagePayloadState(message) {
@@ -217,11 +126,13 @@ function resolveReferencedMessagePayloadState(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);
+	const rawData = message.rawData;
 	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";
+	if (typeof referenced !== "object" || referenced.id !== reference.message_id) return "invalid";
+	const reply = message.referencedMessage;
+	return reply?.author && (resolveDiscordMessageText(reply, { includeForwarded: true }) || reply.attachments.length > 0 || resolveDiscordMessageStickers(reply).length > 0) ? "complete" : "missing";
 }
 async function hydrateDiscordReplyReference(params) {
 	const payloadState = resolveReferencedMessagePayloadState(params.message);
@@ -232,26 +143,28 @@ async function hydrateDiscordReplyReference(params) {
 	const referencedChannelId = reference.channel_id ?? params.messageChannelId;
 	try {
 		const referenced = await getChannelMessage(params.client.rest, referencedChannelId, referencedMessageId);
-		return mergeFetchedDiscordMessage(params.message, {
-			...readMessageRawData(params.message),
+		return new Message(params.client, {
+			...params.message.rawData,
 			referenced_message: referenced
 		});
 	} catch (err) {
 		logVerbose(`discord: failed to hydrate referenced message ${referencedMessageId}: ${String(err)}`);
-		if (payloadState === "invalid") return mergeFetchedDiscordMessage(params.message, {
-			...readMessageRawData(params.message),
+		if (payloadState === "invalid") return new Message(params.client, {
+			...params.message.rawData,
 			referenced_message: null
 		});
 		return params.message;
 	}
 }
 async function hydrateDiscordMessageIfNeeded(params) {
-	params.channelInfo;
 	let hydrated = params.message;
-	if (shouldHydrateDiscordMessagePayload({ message: params.message })) try {
+	if (shouldHydrateDiscordMessagePayload(params.message)) try {
 		const fetched = await getChannelMessage(params.client.rest, params.messageChannelId, params.message.id);
 		logVerbose(`discord: hydrated inbound payload via REST for ${params.message.id}`);
-		hydrated = mergeFetchedDiscordMessage(params.message, fetched);
+		hydrated = new Message(params.client, {
+			...params.message.partial ? {} : params.message.rawData,
+			...fetched
+		});
 	} catch (err) {
 		logVerbose(`discord: failed to hydrate message ${params.message.id}: ${String(err)}`);
 		return {
@@ -301,33 +214,6 @@ function resolveDiscordPreflightChannelContext(params) {
 	};
 }
 //#endregion
-//#region extensions/discord/src/monitor/message-handler.preflight-context.ts
-function buildDiscordMessagePreflightContext({ preflightParams, ...fields }) {
-	return {
-		cfg: preflightParams.cfg,
-		client: preflightParams.client,
-		discordConfig: preflightParams.discordConfig,
-		accountId: preflightParams.accountId,
-		token: preflightParams.token,
-		runtime: preflightParams.runtime,
-		buildContext: preflightParams.buildContext,
-		botUserId: preflightParams.botUserId,
-		abortSignal: preflightParams.abortSignal,
-		isPolicyCurrent: preflightParams.isPolicyCurrent,
-		guildHistories: preflightParams.guildHistories,
-		historyLimit: preflightParams.historyLimit,
-		mediaMaxBytes: preflightParams.mediaMaxBytes,
-		textLimit: preflightParams.textLimit,
-		replyToMode: preflightParams.replyToMode,
-		ackReactionScope: preflightParams.ackReactionScope,
-		groupPolicy: preflightParams.groupPolicy,
-		turnAdoptionLifecycle: preflightParams.turnAdoptionLifecycle,
-		...fields,
-		threadBindings: preflightParams.threadBindings,
-		discordRestFetch: preflightParams.discordRestFetch
-	};
-}
-//#endregion
 //#region extensions/discord/src/monitor/message-handler.preflight-history.ts
 function buildDiscordPreflightHistoryEntry(params) {
 	const textForHistory = resolveDiscordMessageHistoryText(params.message, { includeForwarded: true });
@@ -383,8 +269,9 @@ async function resolveDiscordPreflightThreadContext(params) {
 const loadConversationRuntime = createLazyRuntimeModule(() => import("openclaw/plugin-sdk/conversation-binding-runtime"));
 async function resolveDiscordPreflightRoute(params) {
 	const conversationRuntime = await loadConversationRuntime();
-	const route = resolveDiscordConversationRoute({
+	const route = ({ boundAgentId }) => resolveDiscordConversationRoute({
 		cfg: params.preflight.cfg,
+		defaultAgentId: boundAgentId,
 		accountId: params.preflight.accountId,
 		guildId: params.preflight.data.guild_id ?? void 0,
 		memberRoleIds: params.memberRoleIds,
@@ -404,7 +291,7 @@ async function resolveDiscordPreflightRoute(params) {
 	});
 	const { runtimeRoute, configuredRoute } = resolveDiscordConversationBindingRoute({
 		cfg: params.preflight.cfg,
-		route,
+		resolveRoute: route,
 		accountId: params.preflight.accountId,
 		runtimeConversationId: bindingConversationId,
 		configuredConversationId: params.messageChannelId,
@@ -518,8 +405,8 @@ async function preflightDiscordMessage(params) {
 		logVerbose(`discord: drop message ${message.id} (missing channel id)`);
 		return null;
 	}
-	const allowBotsSetting = params.discordConfig?.allowBots;
-	const allowBotsMode = allowBotsSetting === "mentions" ? "mentions" : allowBotsSetting === true ? "all" : "off";
+	const allowBotsSetting = params.discordConfig?.allowBots ?? true;
+	const allowBotsMode = allowBotsSetting === "mentions" ? "mentions" : allowBotsSetting ? "all" : "off";
 	if (params.botUserId && author.id === params.botUserId) return null;
 	const hydratedSources = [];
 	for (const source of [...params.precedingMessages ?? [], message]) {
@@ -610,7 +497,6 @@ 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({
@@ -625,7 +511,6 @@ async function preflightDiscordMessage(params) {
 		if (params.abortSignal?.aborted || params.isPolicyCurrent?.() === false) return null;
 		if (!access) return null;
 		commandAuthorized = access.commandAuthorized;
-		channelIngress = access.channelIngress;
 		resolveChannelIngress = access.resolveChannelIngress;
 	}
 	const botId = params.botUserId;
@@ -645,7 +530,7 @@ async function preflightDiscordMessage(params) {
 		abortSignal: params.abortSignal
 	});
 	if (!threadContext || params.isPolicyCurrent?.() === false) return null;
-	const { earlyThreadChannel, earlyThreadParentId, earlyThreadParentName, earlyThreadParentType } = threadContext;
+	const { earlyThreadChannel: threadChannel, earlyThreadParentId: threadParentId, earlyThreadParentName: threadParentName, earlyThreadParentType: threadParentType } = threadContext;
 	const memberRoleIds = Array.isArray(params.data.rawMember?.roles) ? params.data.rawMember.roles : [];
 	const routeState = await resolveDiscordPreflightRoute({
 		preflight: params,
@@ -654,7 +539,7 @@ async function preflightDiscordMessage(params) {
 		isGroupDm,
 		messageChannelId,
 		memberRoleIds,
-		earlyThreadParentId
+		earlyThreadParentId: threadParentId
 	});
 	if (params.isPolicyCurrent?.() === false) return null;
 	const { conversationRuntime, threadBinding, configuredBinding, boundSessionKey, effectiveRoute, boundAgentId, baseSessionKey } = routeState;
@@ -666,7 +551,7 @@ async function preflightDiscordMessage(params) {
 		logVerbose(`discord: drop bound-thread webhook echo message ${message.id}`);
 		return null;
 	}
-	const isBoundThreadSession = Boolean(threadBinding && earlyThreadChannel);
+	const isBoundThreadSession = Boolean(threadBinding && threadChannel);
 	const bypassMentionRequirement = isBoundThreadSession;
 	if (isBoundThreadBotSystemMessage({
 		isBoundThreadSession,
@@ -710,11 +595,7 @@ async function preflightDiscordMessage(params) {
 		logVerbose(`Blocked discord guild ${params.data.guild_id ?? "unknown"} (not in discord.guilds)`);
 		return null;
 	}
-	const threadChannel = earlyThreadChannel;
-	const threadParentId = earlyThreadParentId;
-	const threadParentName = earlyThreadParentName;
-	const threadParentType = earlyThreadParentType;
-	const { threadName, configChannelName, configChannelSlug, displayChannelName, displayChannelSlug, guildSlug, channelConfig } = resolveDiscordPreflightChannelContext({
+	const { threadName, displayChannelName, displayChannelSlug, guildSlug, channelConfig } = resolveDiscordPreflightChannelContext({
 		isGuildMessage,
 		messageChannelId,
 		channelName,
@@ -730,7 +611,7 @@ async function preflightDiscordMessage(params) {
 		channelMatchMeta,
 		channelId: messageChannelId
 	});
-	const channelAccess = resolveDiscordPreflightChannelAccess({
+	if (!resolveDiscordPreflightChannelAccess({
 		isGuildMessage,
 		isGroupDm,
 		groupPolicy: params.groupPolicy,
@@ -741,9 +622,7 @@ async function preflightDiscordMessage(params) {
 		guildInfo,
 		channelConfig,
 		channelMatchMeta
-	});
-	if (!channelAccess.allowed) return null;
-	const { channelAllowlistConfigured, channelAllowed } = channelAccess;
+	})) return null;
 	const historyEntry = buildDiscordPreflightHistoryEntry({
 		isGuildMessage,
 		historyLimit: params.historyLimit,
@@ -752,15 +631,15 @@ async function preflightDiscordMessage(params) {
 		sender,
 		memberRoleIds
 	});
-	const threadOwnerId = threadChannel ? resolveDiscordChannelInfoSafe(threadChannel).ownerId ?? channelInfo?.ownerId : void 0;
-	const shouldRequireMentionByConfig = resolveDiscordShouldRequireMention({
+	const mentionPolicy = resolveDiscordMentionPolicy({
 		isGuildMessage,
 		isThread: Boolean(threadChannel),
 		botId,
-		threadOwnerId,
+		threadOwnerId: threadChannel ? resolveDiscordChannelInfoSafe(threadChannel).ownerId ?? channelInfo?.ownerId : void 0,
 		channelConfig,
 		guildInfo
 	});
+	const shouldRequireMentionByConfig = mentionPolicy.requireMention;
 	const shouldRequireMention = resolvePreflightMentionRequirement({
 		shouldRequireMention: shouldRequireMentionByConfig,
 		bypassMentionRequirement
@@ -788,15 +667,14 @@ async function preflightDiscordMessage(params) {
 		abortSignal: params.abortSignal
 	});
 	if (params.abortSignal?.aborted || params.isPolicyCurrent?.() === false) return null;
-	const mentionText = hasTypedText ? baseText : "";
 	const { implicitMentionKinds, wasMentioned: wasNormallyMentioned } = resolveDiscordMentionState({
-		authorIsBot: Boolean(author.bot),
 		botId,
+		authorIsBot: Boolean(author.bot),
 		hasAnyMention,
 		isDirectMessage,
 		isExplicitlyMentioned: explicitlyMentioned,
 		mentionRegexes,
-		mentionText,
+		mentionText: hasTypedText ? baseText : "",
 		mentionedEveryone: message.mentionedEveryone,
 		referencedAuthorId: message.referencedMessage?.author?.id,
 		senderIsPluralKit: sender.isPluralKit,
@@ -812,7 +690,7 @@ async function preflightDiscordMessage(params) {
 			directUserId: author.id,
 			conversationId: messageChannelId
 		}).id : params.cfg.broadcast?.[`discord:${messageChannelId}`] !== void 0 ? messageChannelId : threadParentId ?? messageChannelId,
-		text: mentionText || preflightTranscript || "",
+		text: (hasTypedText ? baseText : "") || preflightTranscript || "",
 		sessionKey: boundSessionKey || effectiveRoute.sessionKey,
 		acpBinding: Boolean(configuredBinding)
 	});
@@ -857,7 +735,6 @@ async function preflightDiscordMessage(params) {
 		const commandAccess = await resolveCommandIngress();
 		if (params.isPolicyCurrent?.() === false) return null;
 		commandAuthorized = commandAccess.commandAccess.authorized;
-		channelIngress = commandAccess;
 		resolveChannelIngress = resolveCommandIngress;
 		if (commandAccess.commandAccess.shouldBlockControlCommand) {
 			logInboundDrop({
@@ -880,6 +757,7 @@ async function preflightDiscordMessage(params) {
 		policy: {
 			isGroup: isGuildMessage,
 			requireMention: shouldRequireMention,
+			allowedImplicitMentionKinds: mentionPolicy.allowedImplicitMentionKinds,
 			allowTextCommands,
 			hasControlCommand: hasControlCommandInMessage,
 			commandAuthorized
@@ -1005,8 +883,27 @@ async function preflightDiscordMessage(params) {
 	if (params.abortSignal?.aborted) return null;
 	preparedMedia.push(...forwardedMedia);
 	logDebug(`[discord-preflight] success: route=${effectiveRoute.agentId} sessionKey=${effectiveRoute.sessionKey}`);
-	return buildDiscordMessagePreflightContext({
-		preflightParams: params,
+	return {
+		cfg: params.cfg,
+		client: params.client,
+		discordConfig: params.discordConfig,
+		accountId: params.accountId,
+		token: params.token,
+		runtime: params.runtime,
+		buildContext: params.buildContext,
+		botUserId: params.botUserId,
+		abortSignal: params.abortSignal,
+		isPolicyCurrent: params.isPolicyCurrent,
+		guildHistories: params.guildHistories,
+		historyLimit: params.historyLimit,
+		mediaMaxBytes: params.mediaMaxBytes,
+		textLimit: params.textLimit,
+		replyToMode: params.replyToMode,
+		ackReactionScope: params.ackReactionScope,
+		groupPolicy: params.groupPolicy,
+		turnAdoptionLifecycle: params.turnAdoptionLifecycle,
+		threadBindings: params.threadBindings,
+		discordRestFetch: params.discordRestFetch,
 		groupThread,
 		data,
 		message,
@@ -1022,7 +919,6 @@ async function preflightDiscordMessage(params) {
 		isDirectMessage,
 		isGroupDm,
 		commandAuthorized,
-		channelIngress,
 		resolveChannelIngress,
 		baseText,
 		messageText,
@@ -1041,25 +937,18 @@ async function preflightDiscordMessage(params) {
 		threadParentName,
 		threadParentType,
 		threadName,
-		configChannelName,
-		configChannelSlug,
-		displayChannelName,
 		displayChannelSlug,
 		baseSessionKey,
 		channelConfig,
-		channelAllowlistConfigured,
-		channelAllowed,
 		shouldRequireMention,
 		groupRequireMention: shouldRequireMentionByConfig,
 		hasAnyMention,
 		hasControlCommand: hasControlCommandInMessage,
-		allowTextCommands,
 		shouldBypassMention: mentionDecision.shouldBypassMention,
 		effectiveWasMentioned,
 		inboundEventKind,
-		canDetectMention,
-		historyEntry
-	});
+		canDetectMention
+	};
 }
 //#endregion
-export { preflightDiscordMessage, resolvePreflightMentionRequirement, shouldIgnoreBoundThreadWebhookMessage };
+export { preflightDiscordMessage, shouldIgnoreBoundThreadWebhookMessage };