@openclaw/discord 2026.8.1-beta.3 → 2026.8.2

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

@@ -1,13 +1,14 @@
-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 { 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 { W as Message, jt as getChannelMessage, y as discord_exports } from "./retry-t5RcEsPk.js";
+import { s as resolveDefaultDiscordAccountId } from "./accounts-CwJQoLjM.js";
+import { C as resolveTimestampMs, S as resolveDiscordSystemLocation, _ as resolveDiscordShouldRequireMention, a as normalizeDiscordSlug, c as resolveDiscordChannelConfigWithFallback, f as resolveDiscordGuildEntry, i as normalizeDiscordDisplaySlug, p as resolveDiscordMemberAccessState, x as formatDiscordUserTag } from "./allow-list-C2JuH-R0.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-D86uWLt_.js";
+import { a as buildDiscordRoutePeer, c as resolveDiscordEffectiveRoute, f as resolveDiscordRuntimeBindingConversationId, s as resolveDiscordConversationRoute, u as resolveDiscordConversationIdentity } from "./outbound-session-route-CzzerX2K.js";
+import { t as resolveDiscordConversationBindingRoute } from "./conversation-binding-route-DPpBRpYI.js";
+import { c as resolveDiscordChannelInfoSafe, l as resolveDiscordChannelNameSafe } from "./thread-bindings.manager-B-3UHCc1.js";
+import { S as resolveDiscordTextCommandAccess, _ as handleDiscordDmCommandDecision, n as resolveDiscordPreflightChannelAccess, x as resolveDiscordDmCommandAccess } from "./provider-CjI8BSzS.js";
+import { d as resolveDiscordReferencedReplyMessage, h as resolveDiscordMessageChannelId, i as resolveDiscordMessageText, m as resolveDiscordChannelInfo, o as resolveForwardedMediaList, r as resolveDiscordMessageHistoryText, s as resolveMediaList, u as resolveDiscordMessageStickers } from "./message-text-C0K4-fkg.js";
+import { n as resolveDiscordWebhookId, t as resolveDiscordSenderIdentity } from "./sender-identity-Dt0imZyY.js";
 import { t as createDiscordHistorySenderProvenance } from "./message-handler.history-CJOsN9w5.js";
 import { logDebug } from "openclaw/plugin-sdk/logging-core";
 import { MessageReferenceType, MessageType } from "discord-api-types/v10";
@@ -28,7 +29,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-rQIffSYu.js").then((n) => n.t));
+const loadDiscordSendRuntime = createLazyRuntimeModule(() => import("./send-mTKSBdmZ.js").then((n) => n.t));
 function resolveDiscordDmPairingSenderId(sender) {
 	return sender.isPluralKit ? `pk:${sender.id}` : sender.id;
 }
@@ -53,7 +54,9 @@ async function resolveDiscordDmPreflightAccess(params) {
 		sender: {
 			id: params.sender.id,
 			name: params.sender.name,
-			tag: params.sender.tag
+			tag: params.sender.tag,
+			isPluralKit: params.sender.isPluralKit,
+			authorKind: params.author.bot ? "bot" : "user"
 		},
 		allowNameMatching: params.allowNameMatching,
 		cfg: params.preflight.cfg,
@@ -267,72 +270,6 @@ async function hydrateDiscordMessageIfNeeded(params) {
 	};
 }
 //#endregion
-//#region extensions/discord/src/monitor/message-handler.preflight-channel-access.ts
-function resolveDiscordPreflightChannelAccess(params) {
-	if (params.isGuildMessage && params.channelConfig?.enabled === false) {
-		logDebug(`[discord-preflight] drop: channel disabled`);
-		logVerbose(`Blocked discord channel ${params.messageChannelId} (channel disabled, ${params.channelMatchMeta})`);
-		return {
-			allowed: false,
-			channelAllowlistConfigured: false,
-			channelAllowed: false
-		};
-	}
-	const groupDmAllowed = params.isGroupDm && resolveGroupDmAllow({
-		channels: params.groupDmChannels,
-		channelId: params.messageChannelId,
-		channelName: params.displayChannelName,
-		channelSlug: params.displayChannelSlug
-	});
-	if (params.isGroupDm && !groupDmAllowed) return {
-		allowed: false,
-		channelAllowlistConfigured: false,
-		channelAllowed: false
-	};
-	const channelAllowlistConfigured = Boolean(params.guildInfo?.channels) && Object.keys(params.guildInfo?.channels ?? {}).length > 0;
-	const channelAllowed = params.channelConfig?.allowed !== false;
-	if (params.isGuildMessage && !isDiscordGroupAllowedByPolicy({
-		groupPolicy: params.groupPolicy,
-		guildAllowlisted: Boolean(params.guildInfo),
-		channelAllowlistConfigured,
-		channelAllowed
-	})) {
-		if (params.groupPolicy === "disabled") {
-			logDebug(`[discord-preflight] drop: groupPolicy disabled`);
-			logVerbose(`discord: drop guild message (groupPolicy: disabled, ${params.channelMatchMeta})`);
-		} else if (!channelAllowlistConfigured) {
-			logDebug(`[discord-preflight] drop: groupPolicy allowlist, no channel allowlist configured`);
-			logVerbose(`discord: drop guild message (groupPolicy: allowlist, no channel allowlist, ${params.channelMatchMeta})`);
-		} else {
-			logDebug(`[discord] Ignored message from channel ${params.messageChannelId} (not in guild allowlist). Add to guilds.<guildId>.channels to enable.`);
-			logVerbose(`Blocked discord channel ${params.messageChannelId} not in guild channel allowlist (groupPolicy: allowlist, ${params.channelMatchMeta})`);
-		}
-		return {
-			allowed: false,
-			channelAllowlistConfigured,
-			channelAllowed
-		};
-	}
-	if (params.isGuildMessage && params.channelConfig?.allowed === false) {
-		logDebug(`[discord-preflight] drop: channelConfig.allowed===false`);
-		logVerbose(`Blocked discord channel ${params.messageChannelId} not in guild channel allowlist (${params.channelMatchMeta})`);
-		return {
-			allowed: false,
-			channelAllowlistConfigured,
-			channelAllowed
-		};
-	}
-	if (params.isGuildMessage) {
-		logDebug(`[discord-preflight] pass: channel allowed`);
-		logVerbose(`discord: allow channel ${params.messageChannelId} (${params.channelMatchMeta})`);
-	}
-	return {
-		allowed: true,
-		channelAllowlistConfigured,
-		channelAllowed
-	};
-}
-//#endregion
 //#region extensions/discord/src/monitor/message-handler.preflight-channel-context.ts
 function resolveDiscordPreflightChannelContext(params) {
 	const threadName = params.threadChannel?.name;
@@ -401,9 +338,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;
@@ -481,7 +415,8 @@ function buildDiscordPreflightHistoryEntry(params) {
 //#region extensions/discord/src/monitor/message-handler.preflight-logging.ts
 function logDiscordPreflightChannelConfig(params) {
 	if (!shouldLogVerbose()) return;
-	logDebug(`[discord-preflight] channelConfig=${params.channelConfig ? `allowed=${params.channelConfig.allowed} enabled=${params.channelConfig.enabled ?? "unset"} requireMention=${params.channelConfig.requireMention ?? "unset"} ignoreOtherMentions=${params.channelConfig.ignoreOtherMentions ?? "unset"} matchKey=${params.channelConfig.matchKey ?? "none"} matchSource=${params.channelConfig.matchSource ?? "none"} users=${params.channelConfig.users?.length ?? 0} roles=${params.channelConfig.roles?.length ?? 0} skills=${params.channelConfig.skills?.length ?? 0}` : "none"} channelMatchMeta=${params.channelMatchMeta} channelId=${params.channelId}`);
+	const channelConfigSummary = params.channelConfig ? `allowed=${params.channelConfig.allowed} enabled=${params.channelConfig.enabled ?? "unset"} requireMention=${params.channelConfig.requireMention ?? "unset"} ignoreOtherMentions=${params.channelConfig.ignoreOtherMentions ?? "unset"} matchKey=${params.channelConfig.matchKey ?? "none"} matchSource=${params.channelConfig.matchSource ?? "none"} users=${params.channelConfig.users?.length ?? 0} roles=${params.channelConfig.roles?.length ?? 0} skills=${params.channelConfig.skills?.length ?? 0}` : "none";
+	logDebug(`[discord-preflight] channelConfig=${channelConfigSummary} channelMatchMeta=${params.channelMatchMeta} channelId=${params.channelId}`);
 }
 function logDiscordPreflightInboundSummary(params) {
 	if (!shouldLogVerbose()) return;
@@ -489,10 +424,10 @@ function logDiscordPreflightInboundSummary(params) {
 }
 //#endregion
 //#region extensions/discord/src/monitor/message-handler.preflight-runtime.ts
-const loadPluralKitRuntime = createLazyRuntimeModule(() => import("./pluralkit-dUl4v1X3.js").then((n) => n.n));
+const loadPluralKitRuntime = createLazyRuntimeModule(() => import("./pluralkit-B3cUVI7i.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));
+const loadSystemEventsRuntime = createLazyRuntimeModule(() => import("./system-events-Be5EJI3b.js"));
+const loadDiscordThreadingRuntime = createLazyRuntimeModule(() => import("./threading-te5ADPQI.js").then((n) => n.t));
 function isPreflightAborted(abortSignal) {
 	return Boolean(abortSignal?.aborted);
 }
@@ -592,7 +527,7 @@ async function resolveDiscordPreflightRoute(params) {
 //#endregion
 //#region extensions/discord/src/monitor/message-handler.preflight.ts
 const DISCORD_HISTORY_MEDIA_MAX_ATTACHMENTS = 4;
-const DISCORD_HISTORY_MEDIA_MAX_BYTES = 10 * 1024 * 1024;
+const DISCORD_HISTORY_MEDIA_MAX_BYTES = 10485760;
 const DISCORD_HISTORY_MEDIA_IDLE_TIMEOUT_MS = 1e3;
 const DISCORD_HISTORY_MEDIA_TOTAL_TIMEOUT_MS = 3e3;
 function resolveDiscordPreflightConversationKind(params) {
@@ -707,7 +642,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;
@@ -967,7 +902,9 @@ async function preflightDiscordMessage(params) {
 			sender: {
 				id: sender.id,
 				name: sender.name,
-				tag: sender.tag
+				tag: sender.tag,
+				isPluralKit: sender.isPluralKit,
+				authorKind: author.bot ? "bot" : "user"
 			},
 			memberAccessConfigured: hasAccessRestrictions,
 			memberAllowed,
@@ -1046,9 +983,13 @@ async function preflightDiscordMessage(params) {
 		}
 	}
 	const ignoreOtherMentions = channelConfig?.ignoreOtherMentions ?? guildInfo?.ignoreOtherMentions ?? false;
-	if (isGuildMessage && ignoreOtherMentions && hasUserOrRoleMention && !wasMentioned && !mentionDecision.implicitMention) {
-		logDebug(`[discord-preflight] drop: other-mention`);
-		logVerbose(`discord: drop guild message (another user/role mentioned, ignoreOtherMentions=true, botId=${botId})`);
+	const referencedReply = resolveDiscordReferencedReplyMessage(message);
+	const referencedWebhookId = referencedReply ? resolveDiscordWebhookId(referencedReply) : null;
+	const referencedAuthor = referencedReply?.author;
+	const replyTargetsOtherBot = Boolean(botId) && Boolean(referencedAuthor?.bot) && referencedAuthor?.id !== botId && !referencedWebhookId;
+	if (isGuildMessage && ignoreOtherMentions && (hasUserOrRoleMention || replyTargetsOtherBot) && !wasMentioned && !mentionDecision.implicitMention) {
+		logDebug(`[discord-preflight] drop: addressed-to-other`);
+		logVerbose(`discord: drop guild message (addressed to another identity, ignoreOtherMentions=true, botId=${botId})`);
 		await recordDiscordPendingHistoryEntry({
 			preflight: params,
 			historyKey: messageChannelId,

package/dist/{message-handler.process--4_712Ec.js → message-handler.process-cdIJ_fDT.js}

@@ -1,33 +1,31 @@
-import { Ct as editChannelMessage, a as chunkDiscordTextWithMode, p as discord_exports, vt as createChannelMessage, xt as deleteChannelMessage } from "./retry-DNsVTeTo.js";
-import { A as resolveDiscordChannelId, p as resolveDiscordMaxLinesPerMessage } from "./accounts-DNl-oCEw.js";
-import { C as resolveTimestampMs, a as normalizeDiscordSlug, r as normalizeDiscordAllowList } from "./allow-list-BDMimASD.js";
-import { A as resolveDiscordMessageFlags, F as createDiscordRestClient, I as createDiscordRuntimeAccountContext, d as resolveDiscordTargetChannelId } from "./send.shared-B3fpaLWJ.js";
-import { i as discordTextHasBroadcastMention } from "./send.outbound-HIkgji_7.js";
-import { c as editMessageDiscord } from "./send-rQIffSYu.js";
-import { n as DISCORD_ATTACHMENT_TOTAL_TIMEOUT_MS, t as DISCORD_ATTACHMENT_IDLE_TIMEOUT_MS } from "./timeouts-B9cy6RvQ.js";
-import { i as removeReactionDiscord, n as reactMessageDiscord } from "./send.reactions-gmJ6yFPo.js";
-import "./targets-B2pf49zc.js";
-import { i as buildDiscordRoutePeer, l as resolveDiscordConversationIdentity } from "./approval-message-safety-XGFPbDoI.js";
-import { t as discordInboundEventDelivery } from "./inbound-event-delivery-De2qxTrP.js";
-import { t as DISCORD_TEXT_CHUNK_LIMIT } from "./outbound-adapter-DxHTOqiN.js";
-import { a as sanitizeDiscordFrontChannelReplyPayloads, c as resolveReplyContext, h as createDiscordSupplementalContextAccessChecker, i as formatDiscordReplySkip, m as buildDiscordInboundAccessContext, n as deliverDiscordReply, o as buildDirectLabel, r as formatDiscordReplyDeliveryFailure, s as buildGuildLabel } from "./provider-DlK_ynqt.js";
-import { a as formatDiscordMediaText, c as resolveReferencedReplyMediaList, d as resolveDiscordMessageStickers, i as resolveDiscordMessageText } from "./message-utils-BXLLnFl6.js";
-import { a as resolveDiscordThreadStarter, n as resolveDiscordAutoThreadReplyPlan } from "./threading-DU6pgeGm.js";
-import { n as resolveDiscordWebhookId } from "./sender-identity-BJtfyise.js";
+import { Dt as deleteChannelMessage, a as chunkDiscordTextWithMode, kt as editChannelMessage, v as resolveDiscordChannelId, wt as createChannelMessage, y as discord_exports } from "./retry-t5RcEsPk.js";
+import { p as resolveDiscordMaxLinesPerMessage } from "./accounts-CwJQoLjM.js";
+import { C as resolveTimestampMs, a as normalizeDiscordSlug, r as normalizeDiscordAllowList } from "./allow-list-C2JuH-R0.js";
+import { F as createDiscordRuntimeAccountContext, P as createDiscordRestClient, d as resolveDiscordTargetChannelId, k as resolveDiscordMessageFlags } from "./send.shared-BJHt0Vyf.js";
+import { i as discordTextHasBroadcastMention } from "./send.outbound-CaOs9Zy1.js";
+import { a as removeReactionDiscord, f as editMessageDiscord, r as reactMessageDiscord } from "./send-mTKSBdmZ.js";
+import { n as DISCORD_ATTACHMENT_TOTAL_TIMEOUT_MS, t as DISCORD_ATTACHMENT_IDLE_TIMEOUT_MS } from "./timeouts-D86uWLt_.js";
+import "./targets-DQSye1Rv.js";
+import { a as buildDiscordRoutePeer, h as discordInboundEventDelivery, u as resolveDiscordConversationIdentity } from "./outbound-session-route-CzzerX2K.js";
+import { t as DISCORD_TEXT_CHUNK_LIMIT } from "./outbound-adapter-Ch0At5Ra.js";
+import { a as formatDiscordReplySkip, c as buildGuildLabel, g as createDiscordSupplementalContextAccessChecker, h as buildDiscordInboundAccessContext, i as formatDiscordReplyDeliveryFailure, l as resolveReplyContext, o as sanitizeDiscordFrontChannelReplyPayloads, r as deliverDiscordReply, s as buildDirectLabel } from "./provider-CjI8BSzS.js";
+import { a as formatDiscordMediaText, c as resolveReferencedReplyMediaList, i as resolveDiscordMessageText, u as resolveDiscordMessageStickers } from "./message-text-C0K4-fkg.js";
+import { a as resolveDiscordThreadStarter, n as resolveDiscordAutoThreadReplyPlan } from "./threading-te5ADPQI.js";
+import { n as resolveDiscordWebhookId } from "./sender-identity-Dt0imZyY.js";
 import { t as beginDiscordActiveTurnThreadRoute } from "./active-turn-thread-route-fmHl1HNd.js";
 import { n as filterDiscordHistoryEntriesForContext, t as createDiscordHistorySenderProvenance } from "./message-handler.history-CJOsN9w5.js";
-import { t as sendTyping } from "./typing-oLiS5Z13.js";
+import { t as sendTyping } from "./typing-DAwJF5VT.js";
 import { expectDefined } from "openclaw/plugin-sdk/expect-runtime";
 import { formatErrorMessage } from "openclaw/plugin-sdk/error-runtime";
 import { buildAgentSessionKey, resolveThreadSessionKeys } from "openclaw/plugin-sdk/routing";
+import { getReplyPayloadTtsSupplement, isReplyPayloadNonTerminalToolErrorWarning, resolveSendableOutboundReplyParts } from "openclaw/plugin-sdk/reply-payload";
 import { danger, logVerbose, shouldLogVerbose, sleepWithAbort } 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 { resolveChunkMode } from "openclaw/plugin-sdk/reply-chunking";
 import { convertMarkdownTables, stripInlineDirectiveTagsForDelivery, stripReasoningTagsFromText } from "openclaw/plugin-sdk/text-chunking";
-import { bindIngressLifecycleToReplyOptions, buildChannelProgressDraftLine, buildChannelProgressDraftLineForEntry, createChannelMessageReplyPipeline, createChannelProgressDraftCompositor, createFinalizableDraftLifecycle, createTypingCallbacks, defineFinalizableLivePreviewAdapter, deliverWithFinalizableLivePreviewAdapter, resolveChannelDraftStreamingChunking, resolveChannelMessageSourceReplyDeliveryMode, resolveChannelPreviewStreamMode, resolveChannelStreamingBlockEnabled, resolveChannelStreamingPreviewCommandText, resolveChannelStreamingPreviewToolProgress, resolveChannelStreamingProgressNarration, resolveChannelStreamingSuppressDefaultToolProgressMessages, resolveTranscriptBackedChannelFinalText } from "openclaw/plugin-sdk/channel-outbound";
+import { bindIngressLifecycleToReplyOptions, createChannelMessageReplyPipeline, createChannelProgressDraftCompositor, createFinalizableDraftStreamControlsForState, createTypingCallbacks, defineFinalizableLivePreviewAdapter, deliverWithFinalizableLivePreviewAdapter, resolveChannelDraftStreamingChunking, resolveChannelMessageSourceReplyDeliveryMode, resolveChannelPreviewStreamMode, resolveChannelStreamingBlockEnabled, resolveChannelStreamingPreviewCommandText, resolveChannelStreamingProgressNarration, resolveTranscriptBackedChannelFinalText } from "openclaw/plugin-sdk/channel-outbound";
 import { getAgentScopedMediaLocalRoots } from "openclaw/plugin-sdk/media-runtime";
-import { getReplyPayloadTtsSupplement, isReplyPayloadNonTerminalToolErrorWarning, resolveSendableOutboundReplyParts } from "openclaw/plugin-sdk/reply-payload";
 import { evaluateSupplementalContextVisibility } from "openclaw/plugin-sdk/security-runtime";
 import { resolvePinnedMainDmOwnerFromAllowlist } from "openclaw/plugin-sdk/conversation-runtime";
 import { resolveAgentConfig } from "openclaw/plugin-sdk/agent-scope-runtime";
@@ -39,7 +37,7 @@ import { getGlobalHookRunner } from "openclaw/plugin-sdk/plugin-runtime";
 import { buildHistoryContextFromEntries, buildInboundHistoryFromEntries, createChannelHistoryWindow } from "openclaw/plugin-sdk/reply-history";
 import { resolveChannelContextVisibilityMode } from "openclaw/plugin-sdk/context-visibility-runtime";
 import { formatAudioTranscriptForAgent } from "openclaw/plugin-sdk/media-understanding-runtime";
-import { DEFAULT_TIMING, createStatusReactionController, logAckFailure, logTypingFailure, shouldAckReaction } from "openclaw/plugin-sdk/channel-feedback";
+import { createStatusReactionController, logAckFailure, logTypingFailure, shouldAckReaction } from "openclaw/plugin-sdk/channel-feedback";
 import { readLatestAssistantTextByIdentity } from "openclaw/plugin-sdk/session-transcript-runtime";
 //#region extensions/discord/src/monitor/message-handler.retry.ts
 const REPLY_SESSION_INIT_CONFLICT_MESSAGE_RE = /^reply session initialization conflicted for \S+$/u;
@@ -118,10 +116,11 @@ async function buildDiscordMessageProcessContext(params) {
 		channel: "discord",
 		accountId
 	});
+	const allowNameMatching = isDangerousNameMatchingEnabled(discordConfig);
 	const isSupplementalContextSenderAllowed = createDiscordSupplementalContextAccessChecker({
 		channelConfig,
 		guildInfo,
-		allowNameMatching: isDangerousNameMatchingEnabled(discordConfig),
+		allowNameMatching,
 		isGuild: isGuildMessage
 	});
 	const storePath = resolveStorePath(cfg.session?.store, { agentId: route.agentId });
@@ -199,21 +198,24 @@ async function buildDiscordMessageProcessContext(params) {
 			const starter = await resolveDiscordThreadStarter({
 				channel: threadChannel,
 				client,
+				accountId,
 				parentId: threadParentId,
 				parentType: threadParentType,
 				resolveTimestampMs
 			});
-			if (starter?.text) if (evaluateSupplementalContextVisibility({
-				mode: contextVisibilityMode,
-				kind: "thread",
-				senderAllowed: isSupplementalContextSenderAllowed({
-					id: starter.authorId,
-					name: starter.authorName ?? starter.author,
-					tag: starter.authorTag,
-					memberRoleIds: starter.memberRoleIds
-				})
-			}).include) threadStarterBody = starter.text;
-			else logVerbose(`discord: drop thread starter context (mode=${contextVisibilityMode})`);
+			if (starter?.text) {
+				if (evaluateSupplementalContextVisibility({
+					mode: contextVisibilityMode,
+					kind: "thread",
+					senderAllowed: isSupplementalContextSenderAllowed({
+						id: starter.authorId,
+						name: starter.authorName ?? starter.author,
+						tag: starter.authorTag,
+						memberRoleIds: starter.memberRoleIds
+					})
+				}).include) threadStarterBody = starter.text;
+				else logVerbose(`discord: drop thread starter context (mode=${contextVisibilityMode})`);
+			}
 		}
 		const parentName = threadParentName ?? "parent";
 		threadLabel = threadName ? `Discord thread #${normalizeDiscordSlug(parentName)} › ${threadName}` : `Discord thread #${normalizeDiscordSlug(parentName)}`;
@@ -651,15 +653,13 @@ function createDiscordMessageReactionRuntime(params) {
 		messageId: message.id,
 		reactionContext: ackReactionContext
 	});
-	const statusReactionTiming = DEFAULT_TIMING;
 	let statusReactionTarget = `${messageChannelId}/${message.id}`;
 	let statusReactionsActive = statusReactionsEnabled;
 	let statusReactions = createStatusReactionController({
 		enabled: statusReactionsEnabled,
 		adapter: discordAdapter,
 		initialEmoji: ackReaction,
-		emojis: void 0,
-		timing: statusReactionTiming,
+		presentation: "acknowledgement",
 		onError: (err) => {
 			logAckFailure({
 				log: logVerbose,
@@ -712,8 +712,7 @@ function createDiscordMessageReactionRuntime(params) {
 				reactionContext: ackReactionContext
 			}),
 			initialEmoji: emoji,
-			emojis: void 0,
-			timing: statusReactionTiming,
+			presentation: "acknowledgement",
 			onError: (err) => {
 				logAckFailure({
 					log: logVerbose,
@@ -792,7 +791,7 @@ function createDiscordDraftStream(params) {
 	let streamGeneration = 0;
 	let activeCreateGeneration;
 	let discardActiveCreate = false;
-	let retargetedCleanup = [];
+	let pendingCleanupMessages = [];
 	const sendOrEditStreamMessage = async (text) => {
 		const generation = streamGeneration;
 		if (streamState.stopped && !streamState.final) return false;
@@ -833,11 +832,11 @@ function createDiscordDraftStream(params) {
 			activeCreateGeneration = void 0;
 			discardActiveCreate = false;
 			if (generation !== streamGeneration) {
-				if (shouldDiscardStaleCreate && typeof sentMessageId === "string" && sentMessageId) try {
-					await deleteChannelMessage(rest, channelId, sentMessageId);
-				} catch (err) {
-					params.warn?.(`discord stale stream preview cleanup failed: ${formatErrorMessage(err)}`);
-				}
+				if (shouldDiscardStaleCreate && typeof sentMessageId === "string" && sentMessageId) await deleteCleanupMessage({
+					channelId,
+					messageId: sentMessageId,
+					warnPrefix: "discord stale stream preview cleanup failed"
+				});
 				return true;
 			}
 			if (typeof sentMessageId !== "string" || !sentMessageId) {
@@ -858,24 +857,11 @@ function createDiscordDraftStream(params) {
 			return false;
 		}
 	};
-	const readMessageId = () => streamMessageId;
-	const clearMessageId = () => {
-		streamMessageId = void 0;
-	};
-	const isValidStreamMessageId = (value) => typeof value === "string";
-	const deleteStreamMessage = async (messageId) => {
-		await deleteChannelMessage(rest, channelId, messageId);
-	};
-	const { loop, update, stop, clear, discardPending, seal } = createFinalizableDraftLifecycle({
+	const { loop, update, stop, discardPending, seal } = createFinalizableDraftStreamControlsForState({
 		throttleMs,
+		coalesceInFlight: true,
 		state: streamState,
-		sendOrEditStreamMessage,
-		readMessageId,
-		clearMessageId,
-		isValidMessageId: isValidStreamMessageId,
-		deleteMessage: deleteStreamMessage,
-		warn: params.warn,
-		warnPrefix: "discord stream preview cleanup failed"
+		sendOrEditStreamMessage
 	});
 	const forceNewMessage = (mode = "preserve") => {
 		if (mode === "discard" && activeCreateGeneration !== void 0) discardActiveCreate = true;
@@ -887,16 +873,19 @@ function createDiscordDraftStream(params) {
 		loop.resetPending();
 		loop.resetThrottleWindow();
 	};
-	const cleanupRetargeted = async () => {
-		const pending = retargetedCleanup;
-		retargetedCleanup = [];
-		for (const stale of pending) try {
-			await deleteChannelMessage(rest, stale.channelId, stale.messageId);
+	const deleteCleanupMessage = async (message) => {
+		try {
+			await deleteChannelMessage(rest, message.channelId, message.messageId);
 		} catch (err) {
-			retargetedCleanup.push(stale);
-			params.warn?.(`discord stream preview retarget cleanup failed: ${formatErrorMessage(err)}`);
+			pendingCleanupMessages.push(message);
+			params.warn?.(`${message.warnPrefix}: ${formatErrorMessage(err)}`);
 		}
 	};
+	const cleanupPendingMessages = async () => {
+		const pending = pendingCleanupMessages;
+		pendingCleanupMessages = [];
+		for (const message of pending) await deleteCleanupMessage(message);
+	};
 	const retarget = async (nextChannelId) => {
 		const normalized = nextChannelId.trim();
 		if (!normalized || normalized === channelId) return;
@@ -919,33 +908,33 @@ function createDiscordDraftStream(params) {
 		if (previousMessageId) {
 			const stale = {
 				channelId: previousChannelId,
-				messageId: previousMessageId
+				messageId: previousMessageId,
+				warnPrefix: "discord stream preview retarget cleanup failed"
 			};
 			if (!streamMessageId) {
-				retargetedCleanup.push(stale);
+				pendingCleanupMessages.push(stale);
 				throw new Error("discord stream preview retarget replacement failed");
 			}
-			try {
-				await deleteChannelMessage(rest, previousChannelId, previousMessageId);
-			} catch (err) {
-				retargetedCleanup.push(stale);
-				params.warn?.(`discord stream preview retarget cleanup failed: ${formatErrorMessage(err)}`);
-			}
+			await deleteCleanupMessage(stale);
 		}
 	};
 	const deleteCurrentMessage = async () => {
 		loop.resetPending();
 		await loop.waitForInFlight();
-		const messageId = streamMessageId;
+		const currentMessage = streamMessageId ? {
+			channelId,
+			messageId: streamMessageId,
+			warnPrefix: "discord stream preview cleanup failed"
+		} : void 0;
 		streamMessageId = void 0;
 		lastSentText = "";
 		loop.resetThrottleWindow();
-		if (!isValidStreamMessageId(messageId)) return;
-		try {
-			await deleteStreamMessage(messageId);
-		} catch (err) {
-			params.warn?.(`discord stream preview cleanup failed: ${formatErrorMessage(err)}`);
-		}
+		if (!currentMessage) return;
+		await deleteCleanupMessage(currentMessage);
+	};
+	const clear = async () => {
+		await discardPending();
+		await deleteCurrentMessage();
 	};
 	params.log?.(`discord stream preview ready (maxChars=${maxChars}, throttleMs=${throttleMs})`);
 	return {
@@ -958,7 +947,7 @@ function createDiscordDraftStream(params) {
 		seal,
 		stop,
 		retarget,
-		cleanupRetargeted,
+		cleanupPendingMessages,
 		forceNewMessage
 	};
 }
@@ -1002,24 +991,17 @@ function createDiscordDraftPreviewController(params) {
 	let progressDraftStartedBeforeFinal = false;
 	let progressDraftCollapsed = false;
 	let progressNarratorLifecycle;
-	const previewToolProgressEnabled = Boolean(draftStream) && resolveChannelStreamingPreviewToolProgress(params.discordConfig, true, discordStreamMode);
 	const narrationProgressEnabled = Boolean(draftStream) && discordStreamMode === "progress" && resolveChannelStreamingProgressNarration(params.discordConfig);
 	const narrationHideCommandText = narrationProgressEnabled && resolveChannelStreamingPreviewCommandText(params.discordConfig) === "status";
-	const suppressDefaultToolProgressMessages = Boolean(draftStream) && resolveChannelStreamingSuppressDefaultToolProgressMessages(params.discordConfig, {
-		draftStreamActive: true,
-		previewToolProgressEnabled
-	});
 	const progressSeed = `${params.accountId}:${params.deliverChannelId}`;
 	const progressDraft = createChannelProgressDraftCompositor({
+		presentation: discordStreamMode === "progress" ? "summary" : void 0,
 		entry: params.discordConfig,
 		mode: discordStreamMode,
 		active: Boolean(draftStream),
 		seed: progressSeed,
 		reasoningLinePrefix: "🧠 ",
-		commentaryLinePrefix: "💬 ",
-		reasoningGate: previewToolProgressEnabled,
 		commentaryItalics: false,
-		buildProgressEventLine: (input, options) => input.event === "tool" || input.event === "item" || input.event === "command-output" ? buildChannelProgressDraftLineForEntry(params.discordConfig, input, options) : buildChannelProgressDraftLine(input, options),
 		update: async (previewText, options) => {
 			if (!draftStream) return false;
 			lastPartialText = previewText;
@@ -1052,10 +1034,6 @@ function createDiscordDraftPreviewController(params) {
 		}
 		resetProgressState();
 	};
-	const pushPreambleHeadline = async (text, options) => {
-		if (discordStreamMode === "progress") return await progressDraft.pushPreambleHeadline(text, options);
-		return false;
-	};
 	const beginNewProgressTurn = (options) => {
 		const beganNewTurn = progressDraft.beginNewTurn(options);
 		if (beganNewTurn) {
@@ -1072,11 +1050,10 @@ function createDiscordDraftPreviewController(params) {
 	};
 	return {
 		draftStream,
-		previewToolProgressEnabled,
 		narrationProgressEnabled,
 		narrationHideCommandText,
 		commentaryProgressEnabled: progressDraft.commentaryProgressEnabled,
-		suppressDefaultToolProgressMessages,
+		suppressDefaultToolProgressMessages: progressDraft.suppressDefaultToolProgressMessages,
 		get isProgressMode() {
 			return discordStreamMode === "progress";
 		},
@@ -1127,31 +1104,18 @@ function createDiscordDraftPreviewController(params) {
 		disableBlockStreamingForDraft: draftStream ? true : void 0,
 		pushToolEvent: progressDraft.pushToolEvent,
 		pushItemEvent: progressDraft.pushItemEvent,
-		pushApprovalEvent: progressDraft.pushApprovalEvent,
+		pushApprovalEvent: progressDraft.pushApprovalEvent.bind(progressDraft),
 		pushCommandOutputEvent: progressDraft.pushCommandOutputEvent,
 		pushPatchEvent: progressDraft.pushPatchEvent,
-		async pushToolProgress(line, options) {
-			return await progressDraft.pushToolProgress(line, options);
-		},
-		async pushPlanProgress(steps, options) {
-			return await progressDraft.pushPlanProgress(steps, options);
-		},
-		async pushReasoningProgress(text, options) {
-			return await progressDraft.pushReasoningProgress(text, options);
-		},
-		async pushNarrationProgress(text) {
-			return await progressDraft.pushNarrationProgress(text);
-		},
-		pushPreambleHeadline,
+		pushPlanProgress: progressDraft.pushPlanProgress.bind(progressDraft),
+		pushReasoningProgress: progressDraft.pushReasoningProgress.bind(progressDraft),
+		pushNarrationProgress: progressDraft.pushNarrationProgress.bind(progressDraft),
 		async pushPreambleItemEvent(payload) {
-			const headlineAccepted = await pushPreambleHeadline(payload.progressText, { itemId: payload.itemId });
+			const headlineAccepted = await progressDraft.pushPreambleHeadline(payload.progressText, { itemId: payload.itemId });
 			if (!progressDraft.commentaryProgressEnabled) return headlineAccepted;
 			const commentaryAccepted = await progressDraft.pushCommentaryProgress(payload.progressText, { itemId: payload.itemId });
 			return headlineAccepted || commentaryAccepted;
 		},
-		async pushCommentaryProgress(text, options) {
-			return await progressDraft.pushCommentaryProgress(text, options);
-		},
 		resolvePreviewFinalText(text) {
 			if (typeof text !== "string") return;
 			const formatted = convertMarkdownTables(stripInlineDirectiveTagsForDelivery(text).text, params.tableMode);
@@ -1232,7 +1196,7 @@ function createDiscordDraftPreviewController(params) {
 				progressDraft.cancel();
 				if (finalReplyError !== false) await draftStream?.discardPending();
 				if (finalReplyError !== true && !finalizedViaPreviewMessage && draftStream?.messageId()) await draftStream.clear();
-				await draftStream?.cleanupRetargeted();
+				await draftStream?.cleanupPendingMessages();
 			} catch (err) {
 				params.log(`discord: draft cleanup failed: ${String(err)}`);
 			}
@@ -1248,7 +1212,7 @@ function shouldStartDiscordProgressDraftNow(line) {
 }
 //#endregion
 //#region extensions/discord/src/monitor/reply-typing-feedback.ts
-const DISCORD_REPLY_TYPING_MAX_DURATION_MS = 20 * 6e4;
+const DISCORD_REPLY_TYPING_MAX_DURATION_MS = 12e5;
 function createDiscordReplyTypingFeedback(params) {
 	const rest = params.rest ?? createDiscordRestClient({
 		cfg: params.cfg,
@@ -1581,8 +1545,9 @@ async function processDiscordMessageInner(ctx, observer) {
 			const raw = (payload.text ?? "").trim();
 			const body = raw.startsWith("Reasoning:\n") ? raw.slice(11).trim() : raw;
 			if (!body) return { visibleReplySent: false };
+			const chunkLimit = Math.max(256, Math.min(textLimit, 2e3) - 8);
 			const chunks = chunkDiscordTextWithMode(body, {
-				maxChars: Math.max(256, Math.min(textLimit, 2e3) - 8),
+				maxChars: chunkLimit,
 				maxLines: maxLinesPerMessage,
 				chunkMode
 			});
@@ -1609,7 +1574,9 @@ async function processDiscordMessageInner(ctx, observer) {
 				threadBindings,
 				mediaLocalRoots,
 				kind: "block",
-				bindPendingFinalDelivery: info.bindPendingFinalDelivery
+				bindPendingFinalDelivery: info.bindPendingFinalDelivery,
+				onPlatformSendDispatch: info.onPlatformSendDispatch,
+				assertPlatformSendAuthorized: info.assertPlatformSendAuthorized
 			});
 			if (result.visibleReplySent) replyReference.markSent();
 			return result;
@@ -1626,10 +1593,11 @@ async function processDiscordMessageInner(ctx, observer) {
 			finalText: payload.text,
 			resolveCandidateText: resolveCurrentTurnTranscriptFinalText
 		}) : payload.text;
-		const [deliverablePayload] = sanitizeDiscordFrontChannelReplyPayloads([finalText !== payload.text ? {
+		const effectivePayload = finalText !== payload.text ? {
 			...payload,
 			text: finalText
-		} : payload], { kind: info.kind });
+		} : payload;
+		const [deliverablePayload] = sanitizeDiscordFrontChannelReplyPayloads([effectivePayload], { kind: info.kind });
 		if (!deliverablePayload) {
 			logVerbose(formatDiscordReplySkip({
 				kind: info.kind,
@@ -1708,7 +1676,9 @@ async function processDiscordMessageInner(ctx, observer) {
 						mediaLocalRoots,
 						allowedMentions,
 						kind: info.kind,
-						bindPendingFinalDelivery: info.bindPendingFinalDelivery
+						bindPendingFinalDelivery: info.bindPendingFinalDelivery,
+						onPlatformSendDispatch: info.onPlatformSendDispatch,
+						assertPlatformSendAuthorized: info.assertPlatformSendAuthorized
 					})).visibleReplySent;
 				},
 				onNormalDelivered: () => {
@@ -1746,7 +1716,9 @@ async function processDiscordMessageInner(ctx, observer) {
 			threadBindings,
 			mediaLocalRoots,
 			kind: info.kind,
-			bindPendingFinalDelivery: info.bindPendingFinalDelivery
+			bindPendingFinalDelivery: info.bindPendingFinalDelivery,
+			onPlatformSendDispatch: info.onPlatformSendDispatch,
+			assertPlatformSendAuthorized: info.assertPlatformSendAuthorized
 		});
 		if (!result.visibleReplySent) return result;
 		replyReference.markSent();
@@ -1864,7 +1836,11 @@ async function processDiscordMessageInner(ctx, observer) {
 			return;
 		}
 		dispatchError = true;
-		if (await completeDiscordSessionConflict(err, deliverDiscordPayload, onDiscordDeliveryError)) return;
+		if (await completeDiscordSessionConflict(err, (payload, info) => deliverDiscordPayload(payload, {
+			...info,
+			onPlatformSendDispatch: () => Promise.resolve(),
+			assertPlatformSendAuthorized: () => void 0
+		}), onDiscordDeliveryError)) return;
 		throw err;
 	} finally {
 		activeThreadRoute.end();