@openclaw/discord 2026.7.1-beta.1 → 2026.7.1-beta.4

package/dist/{message-handler-ClZrgeka.js → message-handler-DbrX-sHg.js}

@@ -1,13 +1,14 @@
-import { I as createDiscordRestClient } from "./send.shared-YLGCAMjV.js";
+import { I as createDiscordRestClient } from "./send.shared-wAwMhHDN.js";
 import { o as mergeAbortSignals } from "./timeouts-C5TBc_9x.js";
-import { d as resolveDiscordChannelNameSafe, l as resolveDiscordChannelIdSafe, p as resolveDiscordChannelParentSafe, u as resolveDiscordChannelInfoSafe } from "./thread-bindings.discord-api-XBJmlLaf.js";
-import { c as hasDiscordMessageStickers, d as resolveDiscordMessageChannelId, r as resolveDiscordMessageText } from "./message-utils-C_tYBSAu.js";
-import { t as sendTyping } from "./typing-BMQEI8OW.js";
+import { d as resolveDiscordChannelNameSafe, l as resolveDiscordChannelIdSafe, p as resolveDiscordChannelParentSafe, u as resolveDiscordChannelInfoSafe } from "./thread-bindings.discord-api-BjIf9lGs.js";
+import { c as hasDiscordMessageStickers, d as resolveDiscordMessageChannelId, r as resolveDiscordMessageText } from "./message-utils-B_3yA5bN.js";
+import { t as sendTyping } from "./typing-BVcJgILg.js";
+import { createLazyRuntimeModule } from "openclaw/plugin-sdk/lazy-runtime";
 import { finiteSecondsToTimerSafeMilliseconds } from "openclaw/plugin-sdk/number-runtime";
 import { danger, logVerbose } from "openclaw/plugin-sdk/runtime-env";
+import { resolveBatchedReplyThreadingPolicy } from "openclaw/plugin-sdk/reply-reference";
 import { createChannelRunQueue, createTypingCallbacks, resolveChannelMessageSourceReplyDeliveryMode } from "openclaw/plugin-sdk/channel-outbound";
 import { resolveOpenProviderRuntimeGroupPolicy } from "openclaw/plugin-sdk/runtime-group-policy";
-import { resolveBatchedReplyThreadingPolicy } from "openclaw/plugin-sdk/reply-reference";
 import { createChannelInboundDebouncer, shouldDebounceTextInbound } from "openclaw/plugin-sdk/channel-inbound";
 import { createClaimableDedupe } from "openclaw/plugin-sdk/persistent-dedupe";
 import { logTypingFailure } from "openclaw/plugin-sdk/channel-feedback";
@@ -177,11 +178,7 @@ function resolveDiscordAcceptedTypingPrestart(ctx) {
 }
 //#endregion
 //#region extensions/discord/src/monitor/message-run-queue.ts
-let messageProcessRuntimePromise;
-async function loadMessageProcessRuntime() {
-	messageProcessRuntimePromise ??= import("./message-handler.process-OruF8JFV.js");
-	return await messageProcessRuntimePromise;
-}
+const loadMessageProcessRuntime = createLazyRuntimeModule(() => import("./message-handler.process-CV1GmuBj.js"));
 async function processDiscordQueuedMessage(params) {
 	const processDiscordMessageImpl = params.testing?.processDiscordMessage ?? (await loadMessageProcessRuntime()).processDiscordMessage;
 	const abortSignal = mergeAbortSignals([params.job.runtime.abortSignal, params.lifecycleSignal]);
@@ -264,6 +261,9 @@ function createDiscordMessageRunQueue(params) {
 		}
 	};
 }
+//#endregion
+//#region extensions/discord/src/monitor/reply-typing-feedback.ts
+const DISCORD_REPLY_TYPING_MAX_DURATION_MS = 20 * 6e4;
 function createDiscordReplyTypingFeedback(params) {
 	let channelId = params.channelId;
 	const rest = params.rest ?? createDiscordRestClient({
@@ -285,7 +285,7 @@ function createDiscordReplyTypingFeedback(params) {
 			});
 		},
 		keepaliveIntervalMs: params.keepaliveIntervalMs,
-		maxDurationMs: params.maxDurationMs ?? 12e5
+		maxDurationMs: params.maxDurationMs ?? DISCORD_REPLY_TYPING_MAX_DURATION_MS
 	});
 	const updateChannelId = (nextChannelId) => {
 		const trimmed = nextChannelId.trim();
@@ -307,11 +307,7 @@ function createDiscordReplyTypingFeedback(params) {
 }
 //#endregion
 //#region extensions/discord/src/monitor/message-handler.ts
-let messagePreflightRuntimePromise;
-async function loadMessagePreflightRuntime() {
-	messagePreflightRuntimePromise ??= import("./message-handler.preflight-CjnHwEwP.js");
-	return await messagePreflightRuntimePromise;
-}
+const loadMessagePreflightRuntime = createLazyRuntimeModule(() => import("./message-handler.preflight-Dd-xQ-qv.js"));
 function isNonEmptyString(value) {
 	return typeof value === "string" && value.length > 0;
 }

package/dist/{message-handler.preflight-CjnHwEwP.js → message-handler.preflight-Dd-xQ-qv.js}

@@ -1,13 +1,15 @@
-import { c as discord_exports, k as Message, mt as getChannelMessage } from "./send.receipt-CK162xD0.js";
+import { N as Message, d as discord_exports, vt as getChannelMessage } from "./send.receipt-BpBQED_5.js";
 import { o as resolveDefaultDiscordAccountId } from "./accounts-P19jm1lf.js";
 import { S as resolveTimestampMs, _ as resolveGroupDmAllow, a as normalizeDiscordSlug, b as formatDiscordUserTag, c as resolveDiscordChannelConfigWithFallback, d as resolveDiscordGuildEntry, f as resolveDiscordMemberAccessState, g as resolveDiscordShouldRequireMention, i as normalizeDiscordDisplaySlug, n as isDiscordGroupAllowedByPolicy, x as resolveDiscordSystemLocation } from "./allow-list-C-MqM-B_.js";
-import { t as resolveDiscordConversationIdentity } from "./conversation-identity-BEsyd7A1.js";
+import { t as resolveDiscordConversationIdentity } from "./conversation-identity-DWC5d8Sy.js";
 import { d as isRecentlyUnboundThreadWebhookMessage } from "./thread-bindings.state-iSWjCYjB.js";
-import { d as resolveDiscordChannelNameSafe, u as resolveDiscordChannelInfoSafe } from "./thread-bindings.discord-api-XBJmlLaf.js";
-import "./thread-bindings-C1yhwdOw.js";
-import { D as resolveDiscordDmCommandAccess, O as resolveDiscordTextCommandAccess, _ as resolveDiscordConversationRoute, b as handleDiscordDmCommandDecision, g as buildDiscordRoutePeer, v as resolveDiscordEffectiveRoute, y as shouldIgnoreStaleDiscordRouteBinding } from "./provider-CChQJujf.js";
-import { d as resolveDiscordMessageChannelId, l as resolveDiscordMessageStickers, o as resolveMediaList, r as resolveDiscordMessageText, u as resolveDiscordChannelInfo } from "./message-utils-C_tYBSAu.js";
+import { n as DISCORD_ATTACHMENT_TOTAL_TIMEOUT_MS, t as DISCORD_ATTACHMENT_IDLE_TIMEOUT_MS } from "./timeouts-C5TBc_9x.js";
+import { d as resolveDiscordChannelNameSafe, u as resolveDiscordChannelInfoSafe } from "./thread-bindings.discord-api-BjIf9lGs.js";
+import "./thread-bindings-DsTxqu3E.js";
+import { D as resolveDiscordDmCommandAccess, O as resolveDiscordTextCommandAccess, _ as resolveDiscordConversationRoute, b as handleDiscordDmCommandDecision, g as buildDiscordRoutePeer, v as resolveDiscordEffectiveRoute, y as shouldIgnoreStaleDiscordRouteBinding } from "./provider-Cm9QSAO8.js";
+import { a as resolveForwardedMediaList, d as resolveDiscordMessageChannelId, l as resolveDiscordMessageStickers, o as resolveMediaList, r as resolveDiscordMessageText, u as resolveDiscordChannelInfo } from "./message-utils-B_3yA5bN.js";
 import { n as resolveDiscordWebhookId, t as resolveDiscordSenderIdentity } from "./sender-identity-CEsfDF0L.js";
+import { createLazyRuntimeModule } from "openclaw/plugin-sdk/lazy-runtime";
 import { normalizeOptionalString, readStringValue } from "openclaw/plugin-sdk/string-coerce-runtime";
 import { MessageReferenceType, MessageType } from "discord-api-types/v10";
 import { getChildLogger, logVerbose, shouldLogVerbose } from "openclaw/plugin-sdk/runtime-env";
@@ -16,22 +18,14 @@ import { formatAllowlistMatchMeta } from "openclaw/plugin-sdk/allow-from";
 import { isDangerousNameMatchingEnabled } from "openclaw/plugin-sdk/dangerous-name-runtime";
 import { enqueueSystemEvent } from "openclaw/plugin-sdk/system-event-runtime";
 import { mimeTypeFromFilePath } from "openclaw/plugin-sdk/media-mime";
-import { buildMentionRegexes, classifyChannelInboundEvent, implicitMentionKindWhen, logInboundDrop, matchesMentionWithExplicit, recordDroppedChannelInboundHistory, resolveInboundMentionDecision, resolveUnmentionedGroupInboundPolicy, toInboundMediaFacts } from "openclaw/plugin-sdk/channel-inbound";
+import { buildMentionRegexes, classifyChannelInboundEvent, implicitMentionKindWhen, logInboundDrop, matchesMentionWithExplicit, recordChannelBotPairLoopAndCheckSuppression, recordDroppedChannelInboundHistory, resolveInboundMentionDecision, resolveUnmentionedGroupInboundPolicy, toInboundMediaFacts } from "openclaw/plugin-sdk/channel-inbound";
 import { logDebug } from "openclaw/plugin-sdk/logging-core";
 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";
 //#region extensions/discord/src/monitor/message-handler.dm-preflight.ts
-let conversationRuntimePromise$1;
-let discordSendRuntimePromise;
-async function loadConversationRuntime$1() {
-	conversationRuntimePromise$1 ??= import("openclaw/plugin-sdk/conversation-binding-runtime");
-	return await conversationRuntimePromise$1;
-}
-async function loadDiscordSendRuntime() {
-	discordSendRuntimePromise ??= import("./send-BYTToRY1.js").then((n) => n.t);
-	return await discordSendRuntimePromise;
-}
+const loadConversationRuntime$1 = createLazyRuntimeModule(() => import("openclaw/plugin-sdk/conversation-binding-runtime"));
+const loadDiscordSendRuntime = createLazyRuntimeModule(() => import("./send-iJ0B4bAX.js").then((n) => n.t));
 function resolveDiscordDmPairingSenderId(sender) {
 	return sender.isPluralKit ? `pk:${sender.id}` : sender.id;
 }
@@ -430,26 +424,10 @@ function logDiscordPreflightInboundSummary(params) {
 }
 //#endregion
 //#region extensions/discord/src/monitor/message-handler.preflight-runtime.ts
-let pluralkitRuntimePromise;
-let preflightAudioRuntimePromise;
-let systemEventsRuntimePromise;
-let discordThreadingRuntimePromise;
-async function loadPluralKitRuntime() {
-	pluralkitRuntimePromise ??= import("./pluralkit-DaWTJTmF.js").then((n) => n.n);
-	return await pluralkitRuntimePromise;
-}
-async function loadPreflightAudioRuntime() {
-	preflightAudioRuntimePromise ??= import("./preflight-audio-ClWbnQto.js");
-	return await preflightAudioRuntimePromise;
-}
-async function loadSystemEventsRuntime() {
-	systemEventsRuntimePromise ??= import("./system-events-XRYuwB2n.js");
-	return await systemEventsRuntimePromise;
-}
-async function loadDiscordThreadingRuntime() {
-	discordThreadingRuntimePromise ??= import("./provider-CChQJujf.js").then((n) => n.S);
-	return await discordThreadingRuntimePromise;
-}
+const loadPluralKitRuntime = createLazyRuntimeModule(() => import("./pluralkit-DcD-3EcL.js").then((n) => n.n));
+const loadPreflightAudioRuntime = createLazyRuntimeModule(() => import("./preflight-audio-DYL2ABgA.js"));
+const loadSystemEventsRuntime = createLazyRuntimeModule(() => import("./system-events-DVnqSyTt.js"));
+const loadDiscordThreadingRuntime = createLazyRuntimeModule(() => import("./provider-Cm9QSAO8.js").then((n) => n.S));
 function isPreflightAborted(abortSignal) {
 	return Boolean(abortSignal?.aborted);
 }
@@ -495,11 +473,7 @@ async function resolveDiscordPreflightThreadContext(params) {
 }
 //#endregion
 //#region extensions/discord/src/monitor/message-handler.routing-preflight.ts
-let conversationRuntimePromise;
-async function loadConversationRuntime() {
-	conversationRuntimePromise ??= import("openclaw/plugin-sdk/conversation-binding-runtime");
-	return await conversationRuntimePromise;
-}
+const loadConversationRuntime = createLazyRuntimeModule(() => import("openclaw/plugin-sdk/conversation-binding-runtime"));
 async function resolveDiscordPreflightRoute(params) {
 	const conversationRuntime = await loadConversationRuntime();
 	const route = resolveDiscordConversationRoute({
@@ -1067,6 +1041,25 @@ async function preflightDiscordMessage(params) {
 		defaultEnabled: true,
 		nowMs: resolveTimestampMs(message.timestamp)
 	} : void 0;
+	if (botLoopProtection) {
+		const botLoopResult = recordChannelBotPairLoopAndCheckSuppression(botLoopProtection);
+		if (botLoopResult.suppressed) {
+			logVerbose(`discord: bot-to-bot loop detected before media download, suppressing for ${Math.max(0, Math.ceil((botLoopResult.cooldownUntilMs - Date.now()) / 1e3))}s`);
+			return null;
+		}
+	}
+	const mediaResolveOptions = {
+		fetchImpl: params.discordRestFetch,
+		ssrfPolicy: params.cfg.browser?.ssrfPolicy,
+		readIdleTimeoutMs: DISCORD_ATTACHMENT_IDLE_TIMEOUT_MS,
+		totalTimeoutMs: DISCORD_ATTACHMENT_TOTAL_TIMEOUT_MS,
+		abortSignal: params.abortSignal
+	};
+	const preparedMedia = await resolveMediaList(message, params.mediaMaxBytes, mediaResolveOptions);
+	if (isPreflightAborted(params.abortSignal)) return null;
+	const forwardedMedia = await resolveForwardedMediaList(message, params.mediaMaxBytes, mediaResolveOptions);
+	if (isPreflightAborted(params.abortSignal)) return null;
+	preparedMedia.push(...forwardedMedia);
 	logDebug(`[discord-preflight] success: route=${effectiveRoute.agentId} sessionKey=${effectiveRoute.sessionKey}`);
 	return buildDiscordMessagePreflightContext({
 		preflightParams: params,
@@ -1087,6 +1080,7 @@ async function preflightDiscordMessage(params) {
 		baseText,
 		messageText,
 		...preflightTranscript !== void 0 ? { preflightAudioTranscript: preflightTranscript } : {},
+		preparedMedia,
 		wasMentioned,
 		route: effectiveRoute,
 		threadBinding,
@@ -1108,6 +1102,7 @@ async function preflightDiscordMessage(params) {
 		channelAllowlistConfigured,
 		channelAllowed,
 		shouldRequireMention,
+		groupRequireMention: shouldRequireMentionByConfig,
 		hasAnyMention,
 		hasControlCommand: hasControlCommandInMessage,
 		allowTextCommands,
@@ -1115,8 +1110,7 @@ async function preflightDiscordMessage(params) {
 		effectiveWasMentioned,
 		inboundEventKind,
 		canDetectMention,
-		historyEntry,
-		botLoopProtection
+		historyEntry
 	});
 }
 //#endregion

package/dist/{message-handler.process-OruF8JFV.js → message-handler.process-CV1GmuBj.js}

@@ -1,35 +1,36 @@
-import { Ut as resolveDiscordChannelId, c as discord_exports, ft as editChannelMessage, s as chunkDiscordTextWithMode, st as createChannelMessage, ut as deleteChannelMessage } from "./send.receipt-CK162xD0.js";
-import { f as resolveDiscordMaxLinesPerMessage, s as resolveDiscordAccount } from "./accounts-P19jm1lf.js";
-import { I as createDiscordRestClient, L as createDiscordRuntimeAccountContext, _ as resolveDiscordMessageFlags, d as resolveDiscordTargetChannelId } from "./send.shared-YLGCAMjV.js";
+import { d as discord_exports, dt as createChannelMessage, gt as editChannelMessage, mt as deleteChannelMessage, qt as resolveDiscordChannelId, u as chunkDiscordTextWithMode } from "./send.receipt-BpBQED_5.js";
+import { f as resolveDiscordMaxLinesPerMessage } from "./accounts-P19jm1lf.js";
+import { I as createDiscordRestClient, L as createDiscordRuntimeAccountContext, _ as resolveDiscordMessageFlags, d as resolveDiscordTargetChannelId } from "./send.shared-wAwMhHDN.js";
 import { S as resolveTimestampMs, a as normalizeDiscordSlug, r as normalizeDiscordAllowList } from "./allow-list-C-MqM-B_.js";
-import { a as removeReactionDiscord, f as editMessageDiscord, r as reactMessageDiscord } from "./send-BYTToRY1.js";
-import { a as discordTextHasTargetedMention, i as discordTextHasBroadcastMention, s as rewriteDiscordKnownMentions } from "./send.outbound-BqvRMxXy.js";
-import "./targets-BA7gf0K0.js";
-import { t as resolveDiscordConversationIdentity } from "./conversation-identity-BEsyd7A1.js";
+import { a as removeReactionDiscord, f as editMessageDiscord, r as reactMessageDiscord } from "./send-iJ0B4bAX.js";
+import { i as discordTextHasBroadcastMention } from "./send.outbound-Bj61Q3a0.js";
+import "./targets-69w7c3vU.js";
+import { t as resolveDiscordConversationIdentity } from "./conversation-identity-DWC5d8Sy.js";
 import { t as beginDiscordInboundEventDeliveryCorrelation } from "./inbound-event-delivery-CEPlt2uz.js";
 import { n as DISCORD_ATTACHMENT_TOTAL_TIMEOUT_MS, t as DISCORD_ATTACHMENT_IDLE_TIMEOUT_MS } from "./timeouts-C5TBc_9x.js";
-import { t as DISCORD_TEXT_CHUNK_LIMIT } from "./outbound-adapter-B0iwUl6c.js";
+import { t as DISCORD_TEXT_CHUNK_LIMIT } from "./outbound-adapter-82RWi_SR.js";
 import { t as resolveDiscordPreviewStreamMode } from "./preview-streaming-DXT8oJdo.js";
-import { C as resolveDiscordAutoThreadReplyPlan, T as resolveDiscordThreadStarter, a as buildGuildLabel, h as createDiscordSupplementalContextAccessChecker, i as buildDirectLabel, m as buildDiscordInboundAccessContext, n as deliverDiscordReply, o as resolveReplyContext, r as sanitizeDiscordFrontChannelReplyPayloads } from "./provider-CChQJujf.js";
-import { a as resolveForwardedMediaList, o as resolveMediaList, r as resolveDiscordMessageText, s as resolveReferencedReplyMediaList } from "./message-utils-C_tYBSAu.js";
-import { n as createDiscordReplyTypingFeedback } from "./message-handler-ClZrgeka.js";
+import { C as resolveDiscordAutoThreadReplyPlan, T as resolveDiscordThreadStarter, a as buildGuildLabel, h as createDiscordSupplementalContextAccessChecker, i as buildDirectLabel, m as buildDiscordInboundAccessContext, n as deliverDiscordReply, o as resolveReplyContext, r as sanitizeDiscordFrontChannelReplyPayloads } from "./provider-Cm9QSAO8.js";
+import { r as resolveDiscordMessageText, s as resolveReferencedReplyMediaList } from "./message-utils-B_3yA5bN.js";
+import { n as createDiscordReplyTypingFeedback } from "./message-handler-DbrX-sHg.js";
+import { createLazyRuntimeModule } from "openclaw/plugin-sdk/lazy-runtime";
 import { buildAgentSessionKey, resolveThreadSessionKeys } from "openclaw/plugin-sdk/routing";
 import { MessageFlags } from "discord-api-types/v10";
 import { evaluateSupplementalContextVisibility } from "openclaw/plugin-sdk/security-runtime";
+import { formatErrorMessage } from "openclaw/plugin-sdk/error-runtime";
 import { getAgentScopedMediaLocalRoots } from "openclaw/plugin-sdk/media-runtime";
-import { buildTtsSupplementMediaPayload, getReplyPayloadTtsSupplement, isReplyPayloadNonTerminalToolErrorWarning, resolveSendableOutboundReplyParts } from "openclaw/plugin-sdk/reply-payload";
+import { getReplyPayloadTtsSupplement, isReplyPayloadNonTerminalToolErrorWarning, resolveSendableOutboundReplyParts } from "openclaw/plugin-sdk/reply-payload";
 import { resolveChunkMode } from "openclaw/plugin-sdk/reply-chunking";
-import { danger, logVerbose, shouldLogVerbose } from "openclaw/plugin-sdk/runtime-env";
-import { formatErrorMessage } from "openclaw/plugin-sdk/error-runtime";
+import { danger, logVerbose, shouldLogVerbose, sleep } from "openclaw/plugin-sdk/runtime-env";
+import { truncateUtf16Safe } from "openclaw/plugin-sdk/text-utility-runtime";
 import { resolveMarkdownTableMode } from "openclaw/plugin-sdk/markdown-table-runtime";
 import { convertMarkdownTables, stripInlineDirectiveTagsForDelivery, stripReasoningTagsFromText } from "openclaw/plugin-sdk/text-chunking";
-import { truncateUtf16Safe } from "openclaw/plugin-sdk/text-utility-runtime";
 import { buildChannelProgressDraftLine, buildChannelProgressDraftLineForEntry, createChannelMessageReplyPipeline, createChannelProgressDraftCompositor, createFinalizableDraftLifecycle, defineFinalizableLivePreviewAdapter, deliverWithFinalizableLivePreviewAdapter, isChannelProgressDraftWorkToolName, resolveChannelDraftStreamingChunking, resolveChannelMessageSourceReplyDeliveryMode, resolveChannelStreamingBlockEnabled, resolveChannelStreamingPreviewToolProgress, resolveChannelStreamingSuppressDefaultToolProgressMessages, resolveTranscriptBackedChannelFinalText } from "openclaw/plugin-sdk/channel-outbound";
 import { recordInboundSession, resolvePinnedMainDmOwnerFromAllowlist } from "openclaw/plugin-sdk/conversation-runtime";
 import { EmbeddedBlockChunker, resolveAckReaction, resolveHumanDelayConfig } from "openclaw/plugin-sdk/agent-runtime";
 import { isDangerousNameMatchingEnabled } from "openclaw/plugin-sdk/dangerous-name-runtime";
 import { getSessionEntry, readSessionUpdatedAt, resolveStorePath } from "openclaw/plugin-sdk/session-store-runtime";
-import { buildChannelInboundEventContext, dispatchChannelInboundReply, formatInboundEnvelope, hasFinalInboundReplyDispatch, recordChannelBotPairLoopAndCheckSuppression, resolveEnvelopeFormatOptions, toHistoryMediaEntries, toInboundMediaFacts } from "openclaw/plugin-sdk/channel-inbound";
+import { buildChannelInboundEventContext, dispatchChannelInboundReply, formatInboundEnvelope, hasFinalInboundReplyDispatch, resolveEnvelopeFormatOptions, toHistoryMediaEntries, toInboundMediaFacts } from "openclaw/plugin-sdk/channel-inbound";
 import { DEFAULT_TIMING, createStatusReactionController, logAckFailure, shouldAckReaction } from "openclaw/plugin-sdk/channel-feedback";
 import { createChannelHistoryWindow } from "openclaw/plugin-sdk/reply-history";
 import { readLatestAssistantTextByIdentity } from "openclaw/plugin-sdk/session-transcript-runtime";
@@ -357,6 +358,7 @@ async function buildDiscordMessageProcessContext(params) {
 			...preflightAudioTranscript !== void 0 ? { Transcript: preflightAudioTranscript } : {},
 			GroupSubject: groupSubject,
 			GroupChannel: groupChannel,
+			...isGuildMessage ? { GroupRequireMention: ctx.groupRequireMention } : {},
 			UntrustedStructuredContext: untrustedContext,
 			OwnerAllowFrom: ownerAllowFrom
 		}
@@ -732,16 +734,8 @@ function shouldStartDiscordProgressDraftNow(line) {
 }
 //#endregion
 //#region extensions/discord/src/monitor/message-handler.process.ts
-function sleep(ms) {
-	return new Promise((resolve) => {
-		setTimeout(resolve, ms);
-	});
-}
-let replyRuntimePromise;
-async function loadReplyRuntime() {
-	replyRuntimePromise ??= import("openclaw/plugin-sdk/reply-runtime");
-	return await replyRuntimePromise;
-}
+const loadReplyRuntime = createLazyRuntimeModule(() => import("openclaw/plugin-sdk/reply-runtime"));
+const TARGETED_ONLY_ALLOWED_MENTIONS = { parse: ["users", "roles"] };
 function isProcessAborted(abortSignal) {
 	return Boolean(abortSignal?.aborted);
 }
@@ -773,27 +767,8 @@ async function processDiscordMessage(ctx, observer) {
 }
 async function processDiscordMessageInner(ctx, observer) {
 	const dispatchStartedAt = Date.now();
-	const { cfg, discordConfig, accountId, token, runtime, guildHistories, historyLimit, mediaMaxBytes, textLimit, replyToMode, ackReactionScope, message, messageChannelId, isGuildMessage, isDirectMessage, isGroupDm, messageText, shouldRequireMention, canDetectMention, effectiveWasMentioned, shouldBypassMention, channelConfig, threadBindings, route, discordRestFetch, abortSignal, botLoopProtection, replyTypingFeedback } = ctx;
-	if (isProcessAborted(abortSignal)) return;
-	if (botLoopProtection) {
-		const botLoopResult = recordChannelBotPairLoopAndCheckSuppression(botLoopProtection);
-		if (botLoopResult.suppressed) {
-			logVerbose(`discord: bot-to-bot loop detected before dispatch setup, suppressing for ${Math.max(0, Math.ceil((botLoopResult.cooldownUntilMs - Date.now()) / 1e3))}s`);
-			return;
-		}
-	}
-	const mediaResolveOptions = {
-		fetchImpl: discordRestFetch,
-		ssrfPolicy: cfg.browser?.ssrfPolicy,
-		readIdleTimeoutMs: DISCORD_ATTACHMENT_IDLE_TIMEOUT_MS,
-		totalTimeoutMs: DISCORD_ATTACHMENT_TOTAL_TIMEOUT_MS,
-		abortSignal
-	};
-	const mediaList = await resolveMediaList(message, mediaMaxBytes, mediaResolveOptions);
-	if (isProcessAborted(abortSignal)) return;
-	const forwardedMediaList = await resolveForwardedMediaList(message, mediaMaxBytes, mediaResolveOptions);
+	const { cfg, discordConfig, accountId, token, runtime, guildHistories, historyLimit, textLimit, replyToMode, ackReactionScope, message, messageChannelId, isGuildMessage, isDirectMessage, isGroupDm, messageText, shouldRequireMention, canDetectMention, effectiveWasMentioned, shouldBypassMention, channelConfig, threadBindings, route, abortSignal, replyTypingFeedback, preparedMedia: mediaList } = ctx;
 	if (isProcessAborted(abortSignal)) return;
-	mediaList.push(...forwardedMediaList);
 	const text = messageText;
 	if (!text) {
 		logVerbose("discord: drop message " + message.id + " (empty content)");
@@ -820,8 +795,9 @@ async function processDiscordMessageInner(ctx, observer) {
 	const removeAckAfterReply = cfg.messages?.removeAckAfterReply ?? false;
 	const mediaLocalRoots = getAgentScopedMediaLocalRoots(cfg, route.agentId);
 	const isRoomEvent = ctx.inboundEventKind === "room_event";
-	const shouldAckReaction$1 = () => Boolean(!isRoomEvent && ackReaction && shouldAckReaction({
+	const shouldAckReaction$1 = () => Boolean(ackReaction && shouldAckReaction({
 		scope: ackReactionScope,
+		inboundEventKind: ctx.inboundEventKind,
 		isDirect: isDirectMessage,
 		isGroup: isGuildMessage || isGroupDm,
 		isMentionableGroup: isGuildMessage,
@@ -853,6 +829,10 @@ async function processDiscordMessageInner(ctx, observer) {
 		messageId: message.id,
 		reactionContext: ackReactionContext
 	});
+	const statusReactionTiming = {
+		...DEFAULT_TIMING,
+		...cfg.messages?.statusReactions?.timing
+	};
 	let statusReactionTarget = `${messageChannelId}/${message.id}`;
 	let statusReactionsActive = statusReactionsEnabled;
 	let statusReactions = createStatusReactionController({
@@ -860,7 +840,7 @@ async function processDiscordMessageInner(ctx, observer) {
 		adapter: discordAdapter,
 		initialEmoji: ackReaction,
 		emojis: cfg.messages?.statusReactions?.emojis,
-		timing: cfg.messages?.statusReactions?.timing,
+		timing: statusReactionTiming,
 		onError: (err) => {
 			logAckFailure({
 				log: logVerbose,
@@ -915,7 +895,7 @@ async function processDiscordMessageInner(ctx, observer) {
 			}),
 			initialEmoji: emoji,
 			emojis: cfg.messages?.statusReactions?.emojis,
-			timing: cfg.messages?.statusReactions?.timing,
+			timing: statusReactionTiming,
 			onError: (err) => {
 				logAckFailure({
 					log: logVerbose,
@@ -1260,12 +1240,7 @@ async function processDiscordMessageInner(ctx, observer) {
 			}
 		}
 		if (draftStream && isFinal && !draftPreview.isProgressMode && !deliverablePayload.isError) {
-			const hasMedia = resolveSendableOutboundReplyParts(deliverablePayload).hasMedia;
 			const ttsSupplement = getReplyPayloadTtsSupplement(deliverablePayload);
-			const previewSourceText = deliverablePayload.text ?? ttsSupplement?.spokenText;
-			const previewFinalText = draftPreview.resolvePreviewFinalText(previewSourceText);
-			const previewReplyToId = replyReference.peek();
-			const hasExplicitReplyDirective = Boolean(deliverablePayload.replyToTag || deliverablePayload.replyToCurrent) || typeof previewSourceText === "string" && /\[\[\s*reply_to(?:_current|\s*:)/i.test(previewSourceText);
 			if ((await deliverWithFinalizableLivePreviewAdapter({
 				kind: info.kind,
 				payload: deliverablePayload,
@@ -1277,21 +1252,7 @@ async function processDiscordMessageInner(ctx, observer) {
 						seal: () => draftStream.seal(),
 						id: draftStream.messageId
 					},
-					buildFinalEdit: () => {
-						if (draftPreview.finalizedViaPreviewMessage || hasMedia && !ttsSupplement || typeof previewFinalText !== "string" || hasExplicitReplyDirective || deliverablePayload.isError) return;
-						const rewrittenFinal = rewriteDiscordKnownMentions(previewFinalText, {
-							accountId,
-							mentionAliases: resolveDiscordAccount({
-								cfg,
-								accountId
-							}).config.mentionAliases
-						});
-						if (discordTextHasTargetedMention(rewrittenFinal) && !discordTextHasBroadcastMention(rewrittenFinal)) return;
-						return {
-							content: previewFinalText,
-							...finalPreviewFlags ? { flags: finalPreviewFlags } : {}
-						};
-					},
+					buildFinalEdit: () => {},
 					editFinal: async (previewMessageId, edit) => {
 						if (isProcessAborted(abortSignal)) throw new Error("process aborted");
 						notifyFinalReplyStart();
@@ -1306,31 +1267,6 @@ async function processDiscordMessageInner(ctx, observer) {
 						draftPreview.markPreviewFinalized();
 						replyReference.markSent();
 					},
-					buildSupplementalPayload: () => ttsSupplement ? buildTtsSupplementMediaPayload(deliverablePayload) : void 0,
-					deliverSupplemental: async (supplementalPayload) => {
-						if (isProcessAborted(abortSignal)) return false;
-						const supplementalReplyToId = previewReplyToId ?? replyReference.peek() ?? (replyToMode === "all" ? typeof message.id === "string" && message.id ? message.id : ctxPayload.MessageSid : void 0);
-						await deliverDiscordReply({
-							cfg,
-							replies: [supplementalPayload],
-							target: deliverTarget,
-							token,
-							accountId,
-							rest: deliveryRest,
-							runtime,
-							replyToId: supplementalReplyToId,
-							replyToMode,
-							textLimit,
-							maxLinesPerMessage,
-							tableMode,
-							chunkMode,
-							sessionKey: ctxPayload.SessionKey,
-							threadBindings,
-							mediaLocalRoots,
-							kind: info.kind
-						});
-						return true;
-					},
 					logPreviewEditFailure: (err) => {
 						logVerbose(`discord: preview final edit failed; falling back to standard send (${String(err)})`);
 					}
@@ -1341,6 +1277,7 @@ async function processDiscordMessageInner(ctx, observer) {
 						...deliverablePayload,
 						text: ttsSupplement.spokenText
 					} : deliverablePayload;
+					const allowedMentions = discordTextHasBroadcastMention(fallbackPayload.text ?? "") ? TARGETED_ONLY_ALLOWED_MENTIONS : void 0;
 					const replyToId = replyReference.use();
 					notifyFinalReplyStart();
 					await deliverDiscordReply({
@@ -1360,6 +1297,7 @@ async function processDiscordMessageInner(ctx, observer) {
 						sessionKey: ctxPayload.SessionKey,
 						threadBindings,
 						mediaLocalRoots,
+						allowedMentions,
 						kind: info.kind
 					});
 					return true;
@@ -1624,7 +1562,7 @@ async function processDiscordMessageInner(ctx, observer) {
 			if (dispatchError || finalDeliveryFailed) await statusReactions.setError();
 			else await statusReactions.setDone();
 			if (removeAckAfterReply) (async () => {
-				await sleep(dispatchError || finalDeliveryFailed ? DEFAULT_TIMING.errorHoldMs : DEFAULT_TIMING.doneHoldMs);
+				await sleep(dispatchError || finalDeliveryFailed ? statusReactionTiming.errorHoldMs : statusReactionTiming.doneHoldMs);
 				await statusReactions.clear();
 			})();
 			else statusReactions.restoreInitial();

package/dist/{message-utils-C_tYBSAu.js → message-utils-B_3yA5bN.js}

@@ -1,25 +1,30 @@
 import { o as mergeAbortSignals } from "./timeouts-C5TBc_9x.js";
-import { u as resolveDiscordChannelInfoSafe } from "./thread-bindings.discord-api-XBJmlLaf.js";
+import { u as resolveDiscordChannelInfoSafe } from "./thread-bindings.discord-api-BjIf9lGs.js";
 import { normalizeLowercaseStringOrEmpty, normalizeOptionalString, normalizeOptionalStringifiedId, uniqueStrings } from "openclaw/plugin-sdk/string-coerce-runtime";
 import { ComponentType, StickerFormatType } from "discord-api-types/v10";
 import { asDateTimestampMs, resolveExpiresAtMsFromDurationMs } from "openclaw/plugin-sdk/number-runtime";
 import { saveRemoteMedia } from "openclaw/plugin-sdk/media-runtime";
 import { buildMediaPayload } from "openclaw/plugin-sdk/reply-payload";
 import { logVerbose } from "openclaw/plugin-sdk/runtime-env";
+import { pruneMapToMaxSize } from "openclaw/plugin-sdk/collection-runtime";
 import { getFileExtension } from "openclaw/plugin-sdk/media-mime";
 //#region extensions/discord/src/monitor/message-channel-info.ts
 const DISCORD_CHANNEL_INFO_CACHE_TTL_MS = 300 * 1e3;
 const DISCORD_CHANNEL_INFO_NEGATIVE_CACHE_TTL_MS = 30 * 1e3;
+const DISCORD_CHANNEL_INFO_CACHE_MAX_ENTRIES = 1e3;
 const DISCORD_CHANNEL_INFO_CACHE = /* @__PURE__ */ new Map();
 function resolveDiscordChannelInfoCacheExpiresAt(ttlMs, nowMs) {
 	return resolveExpiresAtMsFromDurationMs(ttlMs, { nowMs });
 }
 function cacheDiscordChannelInfo(channelId, value, ttlMs, nowMs) {
 	const expiresAt = resolveDiscordChannelInfoCacheExpiresAt(ttlMs, nowMs);
-	if (expiresAt !== void 0) DISCORD_CHANNEL_INFO_CACHE.set(channelId, {
-		value,
-		expiresAt
-	});
+	if (expiresAt !== void 0) {
+		DISCORD_CHANNEL_INFO_CACHE.set(channelId, {
+			value,
+			expiresAt
+		});
+		pruneMapToMaxSize(DISCORD_CHANNEL_INFO_CACHE, DISCORD_CHANNEL_INFO_CACHE_MAX_ENTRIES);
+	}
 }
 function normalizeDiscordChannelId(value) {
 	return normalizeOptionalStringifiedId(value) ?? "";
@@ -119,7 +124,7 @@ const DISCORD_MEDIA_SSRF_POLICY = {
 	],
 	allowRfc2544BenchmarkRange: true
 };
-const AUDIO_ATTACHMENT_EXTENSIONS = new Set([
+const AUDIO_ATTACHMENT_EXTENSIONS = /* @__PURE__ */ new Set([
 	".aac",
 	".caf",
 	".flac",