@openclaw/discord 2026.7.2-beta.4 → 2026.7.2-beta.7

package/dist/{message-handler.process-REBztvIW.js → message-handler.process-Dnc_oz9y.js}

@@ -1,19 +1,21 @@
-import { d as discord_exports, gt as deleteChannelMessage, pt as createChannelMessage, t as chunkDiscordTextWithMode, u as resolveDiscordChannelId, vt as editChannelMessage } from "./chunk-BrZocpfs.js";
-import { f as resolveDiscordMaxLinesPerMessage } from "./accounts-D2LKPukU.js";
-import { F as createDiscordRestClient, I as createDiscordRuntimeAccountContext, _ as resolveDiscordMessageFlags, d as resolveDiscordTargetChannelId } from "./send.shared-Dfacnk-E.js";
+import { d as discord_exports, gt as deleteChannelMessage, pt as createChannelMessage, t as chunkDiscordTextWithMode, u as resolveDiscordChannelId, vt as editChannelMessage } from "./chunk-DX4jpFQP.js";
+import { f as resolveDiscordMaxLinesPerMessage } from "./accounts-DJTf1LtA.js";
+import { F as createDiscordRestClient, I as createDiscordRuntimeAccountContext, _ as resolveDiscordMessageFlags, d as resolveDiscordTargetChannelId } from "./send.shared-jpvAG_u6.js";
 import { C as resolveTimestampMs, a as normalizeDiscordSlug, r as normalizeDiscordAllowList } from "./allow-list-DzKrtfah.js";
-import { i as discordTextHasBroadcastMention } from "./send.outbound-BbC2qjpH.js";
-import { s as editMessageDiscord } from "./send-CfnXLUXq.js";
+import { i as discordTextHasBroadcastMention } from "./send.outbound-D-80Ej-t.js";
+import { s as editMessageDiscord } from "./send-CdkZ6zeW.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-bLrJCZ4G.js";
-import "./targets-CB8ahjZk.js";
-import { r as resolveDiscordConversationIdentity } from "./approval-message-safety-LyND6GR3.js";
+import { i as removeReactionDiscord, n as reactMessageDiscord } from "./send.reactions-CtlmGd_o.js";
+import "./targets-Dv_RN7vT.js";
+import { r as resolveDiscordConversationIdentity } from "./approval-message-safety-DEyKVsAw.js";
 import { t as beginDiscordInboundEventDeliveryCorrelation } from "./inbound-event-delivery-CEPlt2uz.js";
-import { t as DISCORD_TEXT_CHUNK_LIMIT } from "./outbound-adapter-XZWo4_HD.js";
-import { D as resolveDiscordAutoThreadReplyPlan, _ as buildDiscordInboundAccessContext, a as sanitizeDiscordFrontChannelReplyPayloads, c as resolveReplyContext, i as formatDiscordReplySkip, k as resolveDiscordThreadStarter, n as deliverDiscordReply, o as buildDirectLabel, r as formatDiscordReplyDeliveryFailure, s as buildGuildLabel, v as createDiscordSupplementalContextAccessChecker } from "./provider-CfiChtjf.js";
-import { a as formatDiscordMediaText, c as resolveReferencedReplyMediaList, i as resolveDiscordMessageText, u as resolveDiscordMessageStickers } from "./message-utils-ajbkdTVA.js";
+import { t as DISCORD_TEXT_CHUNK_LIMIT } from "./outbound-adapter-DtE-i2OJ.js";
+import { D as resolveDiscordAutoThreadReplyPlan, _ as buildDiscordInboundAccessContext, a as sanitizeDiscordFrontChannelReplyPayloads, c as resolveReplyContext, i as formatDiscordReplySkip, k as resolveDiscordThreadStarter, n as deliverDiscordReply, o as buildDirectLabel, r as formatDiscordReplyDeliveryFailure, s as buildGuildLabel, v as createDiscordSupplementalContextAccessChecker } from "./provider-DfQJX3z5.js";
+import { a as formatDiscordMediaText, c as resolveReferencedReplyMediaList, i as resolveDiscordMessageText, u as resolveDiscordMessageStickers } from "./message-utils-BgTwT_q7.js";
 import { n as resolveDiscordWebhookId } from "./sender-identity-mG_zsdox.js";
-import { t as sendTyping } from "./typing-Ci9nhuSi.js";
+import { t as beginDiscordActiveTurnThreadRoute } from "./active-turn-thread-route-MlKWp8RD.js";
+import { n as filterDiscordHistoryEntriesForContext, t as createDiscordHistorySenderProvenance } from "./message-handler.history-CJOsN9w5.js";
+import { t as sendTyping } from "./typing--Mzo2kM7.js";
 import { buildAgentSessionKey, resolveThreadSessionKeys } from "openclaw/plugin-sdk/routing";
 import { expectDefined } from "openclaw/plugin-sdk/expect-runtime";
 import { formatErrorMessage } from "openclaw/plugin-sdk/error-runtime";
@@ -22,17 +24,18 @@ 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, isChannelProgressDraftWorkToolName, resolveChannelDraftStreamingChunking, resolveChannelMessageSourceReplyDeliveryMode, resolveChannelPreviewStreamMode, resolveChannelProgressDraftConfig, resolveChannelStreamingBlockEnabled, resolveChannelStreamingPreviewCommandText, resolveChannelStreamingPreviewToolProgress, resolveChannelStreamingProgressNarration, resolveChannelStreamingSuppressDefaultToolProgressMessages, resolveTranscriptBackedChannelFinalText } from "openclaw/plugin-sdk/channel-outbound";
+import { bindIngressLifecycleToReplyOptions, buildChannelProgressDraftLine, buildChannelProgressDraftLineForEntry, createChannelMessageReplyPipeline, createChannelProgressDraftCompositor, createFinalizableDraftLifecycle, createTypingCallbacks, defineFinalizableLivePreviewAdapter, deliverWithFinalizableLivePreviewAdapter, isChannelProgressDraftWorkToolName, resolveChannelDraftStreamingChunking, resolveChannelMessageSourceReplyDeliveryMode, resolveChannelPreviewStreamMode, resolveChannelStreamingBlockEnabled, resolveChannelStreamingPreviewCommandText, resolveChannelStreamingPreviewToolProgress, resolveChannelStreamingProgressNarration, resolveChannelStreamingSuppressDefaultToolProgressMessages, 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 { EmbeddedBlockChunker, resolveAckReaction, resolveAgentConfig, resolveHumanDelayConfig } from "openclaw/plugin-sdk/agent-runtime";
 import { isDangerousNameMatchingEnabled } from "openclaw/plugin-sdk/dangerous-name-runtime";
-import { buildChannelInboundEventContext, dispatchChannelInboundTurn, formatInboundEnvelope, hasFinalInboundReplyDispatch, resolveEnvelopeFormatOptions, toHistoryMediaEntries, toInboundMediaFacts } from "openclaw/plugin-sdk/channel-inbound";
+import { buildChannelInboundEventContext, dispatchChannelInboundTurn, formatInboundEnvelope, hasFinalInboundReplyDispatch, resolveEnvelopeFormatOptions, toHistoryMediaEntries, toInboundMediaFactsWithMetadata } from "openclaw/plugin-sdk/channel-inbound";
 import { getSessionEntry, readSessionUpdatedAt, resolveStorePath } from "openclaw/plugin-sdk/session-store-runtime";
+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 { createChannelHistoryWindow } from "openclaw/plugin-sdk/reply-history";
 import { DEFAULT_TIMING, 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
@@ -90,7 +93,7 @@ async function buildDiscordMessageProcessContext(params) {
 	const groupChannel = isGuildMessage && displayChannelSlug ? `#${displayChannelSlug}` : void 0;
 	const senderName = sender.isPluralKit ? sender.name ?? author.username : data.member?.nickname ?? author.globalName ?? author.username;
 	const senderUsername = sender.isPluralKit ? sender.tag ?? sender.name ?? author.username : author.username;
-	const { groupSystemPrompt, ownerAllowFrom, untrustedContext } = buildDiscordInboundAccessContext({
+	const { groupSystemPrompt, ownerAllowFrom, channelStructuredContext } = buildDiscordInboundAccessContext({
 		channelConfig,
 		guildInfo,
 		sender: {
@@ -125,6 +128,7 @@ async function buildDiscordMessageProcessContext(params) {
 		sessionKey: route.sessionKey
 	});
 	const channelHistory = createChannelHistoryWindow({ historyMap: guildHistories });
+	let visibleChannelHistory;
 	let combinedBody = formatInboundEnvelope({
 		channel: "Discord",
 		from: fromLabel,
@@ -138,20 +142,29 @@ async function buildDiscordMessageProcessContext(params) {
 	const shouldIncludeChannelHistory = !isDirectMessage && (ctx.inboundEventKind === "room_event" || !(isGuildMessage && channelConfig?.autoThread && !threadChannel));
 	if (shouldIncludeChannelHistory) {
 		removeDiscordReplayHistoryEntry(guildHistories, messageChannelId, message.id);
-		combinedBody = channelHistory.buildPendingContext({
-			historyKey: messageChannelId,
-			limit: historyLimit,
-			currentMessage: combinedBody,
-			formatEntry: (entry) => formatInboundEnvelope({
-				channel: "Discord",
-				from: fromLabel,
-				timestamp: entry.timestamp,
-				body: `${entry.body} [id:${entry.messageId ?? "unknown"} channel:${messageChannelId}]`,
-				chatType: "channel",
-				senderLabel: entry.sender,
-				envelope: envelopeOptions
-			})
-		});
+		if (historyLimit > 0) {
+			const filteredHistory = filterDiscordHistoryEntriesForContext({
+				entries: guildHistories.get(messageChannelId) ?? [],
+				mode: contextVisibilityMode,
+				isSenderAllowed: isSupplementalContextSenderAllowed
+			});
+			visibleChannelHistory = filteredHistory.entries;
+			if (filteredHistory.omitted > 0) logVerbose(`discord: omit ${filteredHistory.omitted} pending history entries (mode=${contextVisibilityMode})`);
+			combinedBody = buildHistoryContextFromEntries({
+				entries: visibleChannelHistory,
+				currentMessage: combinedBody,
+				formatEntry: (entry) => formatInboundEnvelope({
+					channel: "Discord",
+					from: fromLabel,
+					timestamp: entry.timestamp,
+					body: `${entry.body} [id:${entry.messageId ?? "unknown"} channel:${messageChannelId}]`,
+					chatType: "channel",
+					senderLabel: entry.sender,
+					envelope: envelopeOptions
+				}),
+				excludeLast: false
+			});
+		}
 	}
 	const replyContext = resolveReplyContext(message, resolveDiscordMessageText);
 	const replySenderAllowed = replyContext ? isSupplementalContextSenderAllowed({
@@ -247,8 +260,8 @@ async function buildDiscordMessageProcessContext(params) {
 		return null;
 	}
 	const lastRouteTo = dmConversationTarget ?? effectiveTo;
-	const inboundHistory = shouldIncludeChannelHistory ? channelHistory.buildInboundHistory({
-		historyKey: messageChannelId,
+	const inboundHistory = shouldIncludeChannelHistory ? buildInboundHistoryFromEntries({
+		entries: visibleChannelHistory ?? [],
 		limit: historyLimit
 	}) : void 0;
 	const originatingTo = autoThreadContext?.OriginatingTo ?? dmConversationTarget ?? replyTarget;
@@ -322,7 +335,7 @@ async function buildDiscordMessageProcessContext(params) {
 			authorized: commandAuthorized,
 			body: preflightAudioTranscript ?? baseText
 		},
-		media: toInboundMediaFacts(mediaList, { transcribed: (_media, index) => index === preflightAudioIndex }),
+		media: await toInboundMediaFactsWithMetadata(mediaList, { transcribed: (_media, index) => index === preflightAudioIndex }),
 		supplemental: {
 			quote: replyContext && replyVisible ? {
 				id: replyContext.id,
@@ -338,7 +351,7 @@ async function buildDiscordMessageProcessContext(params) {
 						totalTimeoutMs: DISCORD_ATTACHMENT_TOTAL_TIMEOUT_MS,
 						abortSignal
 					});
-					return isContextAborted(abortSignal) ? [] : toInboundMediaFacts(referencedReplyMediaList);
+					return isContextAborted(abortSignal) ? [] : await toInboundMediaFactsWithMetadata(referencedReplyMediaList);
 				}
 			} : void 0,
 			thread: {
@@ -353,7 +366,7 @@ async function buildDiscordMessageProcessContext(params) {
 			GroupSubject: isDirectMessage ? void 0 : groupChannel,
 			GroupChannel: groupChannel,
 			...isGuildMessage ? { GroupRequireMention: ctx.groupRequireMention } : {},
-			UntrustedStructuredContext: untrustedContext,
+			ChannelStructuredContext: channelStructuredContext,
 			OwnerAllowFrom: ownerAllowFrom
 		}
 	});
@@ -370,7 +383,11 @@ async function buildDiscordMessageProcessContext(params) {
 				sender: senderName,
 				body: historyText,
 				timestamp: resolveTimestampMs(message.timestamp),
-				messageId: message.id
+				messageId: message.id,
+				senderProvenance: createDiscordHistorySenderProvenance({
+					sender,
+					memberRoleIds
+				})
 			},
 			media: toHistoryMediaEntries(mediaList, { messageId: message.id }),
 			messageId: message.id
@@ -441,7 +458,7 @@ function createDiscordMessageProgressRuntime(params) {
 	})();
 	const reasoningDurableEnabled = reasoningLevel === "on";
 	const reasoningWindowEnabled = reasoningLevel === "stream";
-	let shouldYieldDraftProgress = () => false;
+	let shouldYieldDraftCommentary = () => false;
 	let progressTurnStartedAt = Date.now();
 	let progressReasoningSteps = 0;
 	let progressToolCalls = 0;
@@ -508,10 +525,10 @@ function createDiscordMessageProgressRuntime(params) {
 			commentaryPayloadsEnabled: draftPreview.isProgressMode ? draftPreview.commentaryProgressEnabled : void 0,
 			reasoningPayloadsEnabled: reasoningDurableEnabled,
 			onVerboseProgressVisibility: (isActive) => {
-				shouldYieldDraftProgress = isActive;
+				shouldYieldDraftCommentary = isActive;
 			},
 			onNarrationUpdate: draftPreview.narrationProgressEnabled ? async (payload) => {
-				if (isProcessAborted$1(abortSignal) || shouldYieldDraftProgress()) return;
+				if (isProcessAborted$1(abortSignal) || shouldYieldDraftCommentary()) return;
 				await draftPreview.pushNarrationProgress(payload.text);
 			} : void 0,
 			onProgressNarratorLifecycle: draftPreview.narrationProgressEnabled ? (lifecycle) => draftPreview.setProgressNarratorLifecycle(lifecycle) : void 0,
@@ -529,7 +546,6 @@ function createDiscordMessageProgressRuntime(params) {
 				await params.reactions.maybeBindToToolReaction(payload);
 				await params.reactions.controller.setTool(payload.name);
 				if (payload.phase === "start") closePendingWindowThought();
-				if (shouldYieldDraftProgress()) return;
 				if (payload.phase === "start" && isChannelProgressDraftWorkToolName(payload.name)) progressToolCalls += 1;
 				await draftPreview.pushToolProgress(buildChannelProgressDraftLineForEntry(discordConfig, {
 					event: "tool",
@@ -543,10 +559,9 @@ function createDiscordMessageProgressRuntime(params) {
 			onItemEvent: async (payload) => {
 				if (isFailedProgress(payload)) return false;
 				if (payload.kind === "preamble") {
-					if (shouldYieldDraftProgress()) return;
+					if (shouldYieldDraftCommentary()) return;
 					return await draftPreview.pushPreambleItemEvent(payload, noteWindowCommentary);
 				}
-				if (shouldYieldDraftProgress()) return;
 				await draftPreview.pushToolProgress(buildChannelProgressDraftLineForEntry(discordConfig, {
 					event: "item",
 					itemId: payload.itemId,
@@ -576,7 +591,7 @@ function createDiscordMessageProgressRuntime(params) {
 			},
 			onCommandOutput: async (payload) => {
 				if (isFailedProgress(payload)) return false;
-				if (payload.phase !== "end" || shouldYieldDraftProgress()) return;
+				if (payload.phase !== "end") return;
 				await draftPreview.pushToolProgress(buildChannelProgressDraftLine({
 					event: "command-output",
 					itemId: payload.itemId,
@@ -589,7 +604,7 @@ function createDiscordMessageProgressRuntime(params) {
 				}));
 			},
 			onPatchSummary: async (payload) => {
-				if (payload.phase !== "end" || shouldYieldDraftProgress()) return;
+				if (payload.phase !== "end") return;
 				await draftPreview.pushToolProgress(buildChannelProgressDraftLine({
 					event: "patch",
 					itemId: payload.itemId,
@@ -663,7 +678,7 @@ function readToolBooleanArg(args, key) {
 }
 function createDiscordMessageReactionRuntime(params) {
 	const { ctx } = params;
-	const { cfg, accountId, token, ackReactionScope, message, messageChannelId, isGuildMessage, isDirectMessage, isGroupDm, shouldRequireMention, canDetectMention, effectiveWasMentioned, shouldBypassMention, route } = ctx;
+	const { cfg, accountId, token, ackReactionScope, message, messageChannelId, isGuildMessage, isDirectMessage, isGroupDm, canDetectMention, effectiveWasMentioned, shouldBypassMention, route } = ctx;
 	const ackReaction = resolveAckReaction(cfg, route.agentId, {
 		channel: "discord",
 		accountId
@@ -674,7 +689,6 @@ function createDiscordMessageReactionRuntime(params) {
 		isDirect: isDirectMessage,
 		isGroup: isGuildMessage || isGroupDm,
 		isMentionableGroup: isGuildMessage,
-		requireMention: shouldRequireMention,
 		canDetectMention,
 		effectiveWasMentioned,
 		shouldBypassMention
@@ -829,7 +843,7 @@ function createDiscordDraftStream(params) {
 	const maxChars = Math.min(params.maxChars ?? DISCORD_STREAM_MAX_CHARS, DISCORD_STREAM_MAX_CHARS);
 	const throttleMs = Math.max(250, params.throttleMs ?? DEFAULT_THROTTLE_MS);
 	const minInitialChars = params.minInitialChars;
-	const channelId = params.channelId;
+	let channelId = params.channelId;
 	const rest = params.rest;
 	const flags = resolveDiscordMessageFlags({ suppressEmbeds: params.suppressEmbeds });
 	const resolveReplyToMessageId = () => typeof params.replyToMessageId === "function" ? params.replyToMessageId() : params.replyToMessageId;
@@ -842,6 +856,7 @@ function createDiscordDraftStream(params) {
 	let streamGeneration = 0;
 	let activeCreateGeneration;
 	let discardActiveCreate = false;
+	let retargetedCleanup = [];
 	const sendOrEditStreamMessage = async (text) => {
 		const generation = streamGeneration;
 		if (streamState.stopped && !streamState.final) return false;
@@ -936,6 +951,52 @@ 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);
+		} catch (err) {
+			retargetedCleanup.push(stale);
+			params.warn?.(`discord stream preview retarget cleanup failed: ${formatErrorMessage(err)}`);
+		}
+	};
+	const retarget = async (nextChannelId) => {
+		const normalized = nextChannelId.trim();
+		if (!normalized || normalized === channelId) return;
+		await loop.waitForInFlight();
+		const pendingText = loop.takePending?.() ?? "";
+		const previousChannelId = channelId;
+		const previousMessageId = streamMessageId;
+		const previousText = pendingText || lastSentText;
+		streamGeneration += 1;
+		channelId = normalized;
+		streamMessageId = void 0;
+		lastSentText = "";
+		streamState.stopped = false;
+		streamState.final = false;
+		loop.resetThrottleWindow();
+		if (previousText) {
+			update(previousText);
+			await loop.flush();
+		}
+		if (previousMessageId) {
+			const stale = {
+				channelId: previousChannelId,
+				messageId: previousMessageId
+			};
+			if (!streamMessageId) {
+				retargetedCleanup.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)}`);
+			}
+		}
+	};
 	const deleteCurrentMessage = async () => {
 		loop.resetPending();
 		await loop.waitForInFlight();
@@ -960,6 +1021,8 @@ function createDiscordDraftStream(params) {
 		discardPending,
 		seal,
 		stop,
+		retarget,
+		cleanupRetargeted,
 		forceNewMessage
 	};
 }
@@ -973,10 +1036,12 @@ function resolveDiscordPreviewStreamMode(params = {}) {
 //#region extensions/discord/src/monitor/message-handler.draft-preview.ts
 function createDiscordDraftPreviewController(params) {
 	const discordStreamMode = resolveDiscordPreviewStreamMode(params.discordConfig);
+	const hookRunner = getGlobalHookRunner();
+	const allowProviderPreview = !((hookRunner?.hasHooks("reply_payload_sending") ?? false) || (hookRunner?.hasHooks("message_sending") ?? false));
 	const draftMaxChars = Math.min(params.textLimit, 2e3);
 	const accountBlockStreamingEnabled = resolveChannelStreamingBlockEnabled(params.discordConfig) ?? params.cfg.agents?.defaults?.blockStreamingDefault === "on";
 	const canStreamProgressDraftForToolOnlySource = params.sourceRepliesAreToolOnly && discordStreamMode === "progress";
-	const draftStream = (!params.sourceRepliesAreToolOnly || canStreamProgressDraftForToolOnlySource) && discordStreamMode !== "off" && !accountBlockStreamingEnabled ? createDiscordDraftStream({
+	const draftStream = allowProviderPreview && (!params.sourceRepliesAreToolOnly || canStreamProgressDraftForToolOnlySource) && discordStreamMode !== "off" && !accountBlockStreamingEnabled ? createDiscordDraftStream({
 		rest: params.deliveryRest,
 		channelId: params.deliverChannelId,
 		maxChars: draftMaxChars,
@@ -998,10 +1063,7 @@ function createDiscordDraftPreviewController(params) {
 	let progressDraftStartedBeforeFinal = false;
 	let progressDraftCollapsed = false;
 	let progressNarratorLifecycle;
-	const progressConfig = resolveChannelProgressDraftConfig(params.discordConfig);
-	const progressHasExplicitLabel = progressConfig.label !== void 0 || progressConfig.labels !== void 0;
-	const progressToolDefault = progressConfig.toolProgress ?? progressHasExplicitLabel;
-	const previewToolProgressEnabled = Boolean(draftStream) && resolveChannelStreamingPreviewToolProgress(params.discordConfig, discordStreamMode === "progress" ? progressToolDefault : true);
+	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, {
@@ -1092,6 +1154,22 @@ function createDiscordDraftPreviewController(params) {
 		markPreviewFinalized() {
 			finalizedViaPreviewMessage = true;
 		},
+		async retarget(channelId) {
+			await draftStream?.retarget(channelId);
+		},
+		async finalizeProgressReceipt(receiptLine) {
+			if (!draftStream || discordStreamMode !== "progress") return false;
+			const receipt = receiptLine.trim();
+			if (!receipt) return false;
+			const progressText = lastPartialText.trimEnd();
+			const maxProgressChars = Math.max(0, draftMaxChars - receipt.length - 1);
+			const fittedProgressText = progressText.length > maxProgressChars ? progressText.slice(progressText.length - maxProgressChars).trimStart() : progressText;
+			draftStream.update(fittedProgressText ? `${fittedProgressText}\n${receipt}` : receipt);
+			await draftStream.stop();
+			if (!draftStream.messageId()) return false;
+			finalizedViaPreviewMessage = true;
+			return true;
+		},
 		disableBlockStreamingForDraft: draftStream ? true : void 0,
 		async pushToolProgress(line, options) {
 			await progressDraft.pushToolProgress(line, options);
@@ -1204,6 +1282,7 @@ function createDiscordDraftPreviewController(params) {
 				progressDraft.cancel();
 				if (!finalReplyDelivered) await draftStream?.discardPending();
 				if (!finalizedViaPreviewMessage && draftStream?.messageId()) await draftStream.clear();
+				await draftStream?.cleanupRetargeted();
 			} catch (err) {
 				params.log(`discord: draft cleanup failed: ${String(err)}`);
 			}
@@ -1245,6 +1324,29 @@ function createDiscordReplyTypingFeedback(params) {
 }
 //#endregion
 //#region extensions/discord/src/monitor/message-handler.process-reply-runtime.ts
+function formatDiscordReasoningQuote(quoteText) {
+	const lines = quoteText.split("\n").map((line) => line.trim()).filter(Boolean);
+	if (!lines.length) return;
+	lines[0] = `🧠 ${lines[0]}`;
+	return lines.map((line) => `> ${line}`).join("\n");
+}
+function createDiscordBeforePayloadDelivery(params) {
+	return (payload, info) => {
+		if (params.abortSignal?.aborted) {
+			logVerbose(formatDiscordReplySkip({
+				kind: info.kind,
+				reason: "aborted before delivery",
+				target: params.getDeliverTarget(),
+				sessionKey: params.sessionKey
+			}));
+			return null;
+		}
+		if (payload.isReasoning || payload.isCommentary) return payload;
+		if (params.draftPreview.draftStream && params.draftPreview.isProgressMode && info.kind === "block" && !resolveSendableOutboundReplyParts(payload).hasMedia && !payload.isError) return null;
+		if (info.kind === "final" && !params.isFallbackOnlyToolWarningFinal(payload)) params.draftPreview.markFinalReplyStarted();
+		return payload;
+	};
+}
 function createDiscordMessageReplyRuntime(params) {
 	const { ctx, processContext } = params;
 	const { cfg, discordConfig, accountId, token, guildHistories, historyLimit, textLimit, messageChannelId, isDirectMessage, route } = ctx;
@@ -1348,6 +1450,52 @@ function createDiscordMessageReplyRuntime(params) {
 	};
 }
 //#endregion
+//#region extensions/discord/src/monitor/message-handler.process-thread-route.ts
+async function finalizeDiscordAdoptedThreadProgressReceipt(hasProgressDraft, receipt, finalizeDraft, deliverReceipt, onFinalizeError) {
+	const receiptLine = receipt.trim();
+	if (!hasProgressDraft || !receiptLine) return;
+	try {
+		if (await finalizeDraft(receiptLine)) return;
+	} catch (error) {
+		onFinalizeError?.(error);
+	}
+	await deliverReceipt(receiptLine);
+}
+function createDiscordMessageActiveThreadRoute(params) {
+	let adoptedThreadId;
+	let threadReplyDelivered = false;
+	let onThreadAdopted;
+	return {
+		replyReference: {
+			peek: () => adoptedThreadId ? void 0 : params.sourceReplyReference.peek(),
+			use: () => adoptedThreadId ? void 0 : params.sourceReplyReference.use(),
+			markSent: () => params.sourceReplyReference.markSent(),
+			hasReplied: () => Boolean(adoptedThreadId) || params.sourceReplyReference.hasReplied()
+		},
+		bindThreadAdoption(callback) {
+			onThreadAdopted = callback;
+		},
+		get threadReplyDelivered() {
+			return threadReplyDelivered;
+		},
+		end: beginDiscordActiveTurnThreadRoute(params.sessionKey, {
+			accountId: params.accountId,
+			sourceChannelId: params.sourceChannelId,
+			sourceMessageId: params.sourceMessageId,
+			onThreadAdopted: async (threadId) => {
+				adoptedThreadId = threadId;
+				await onThreadAdopted?.(threadId);
+			},
+			onThreadReplyDelivered: () => {
+				threadReplyDelivered = true;
+			},
+			onThreadAdoptionError: (error) => {
+				params.log(`discord: failed to move active progress into adopted thread (${String(error)})`);
+			}
+		})
+	};
+}
+//#endregion
 //#region extensions/discord/src/monitor/message-handler.process.ts
 const TARGETED_ONLY_ALLOWED_MENTIONS = { parse: ["users", "roles"] };
 function isProcessAborted(abortSignal) {
@@ -1362,7 +1510,7 @@ async function processDiscordMessage(ctx, observer) {
 }
 async function processDiscordMessageInner(ctx, observer) {
 	const dispatchStartedAt = Date.now();
-	const { cfg, accountId, token, runtime, guildHistories, historyLimit, textLimit, replyToMode, message, messageChannelId, isGuildMessage, isDirectMessage, isGroupDm, messageText, channelConfig, threadBindings, route, abortSignal, turnAdoptionLifecycle, preparedMedia: mediaList } = ctx;
+	const { cfg, accountId, token, runtime, guildHistories, historyLimit, textLimit, replyToMode, message, messageChannelId, canonicalMessageId, isGuildMessage, isDirectMessage, isGroupDm, messageText, channelConfig, threadBindings, route, abortSignal, turnAdoptionLifecycle, preparedMedia: mediaList } = ctx;
 	if (isProcessAborted(abortSignal)) return;
 	const text = messageText;
 	if (!text && mediaList.length === 0) {
@@ -1379,9 +1527,8 @@ async function processDiscordMessageInner(ctx, observer) {
 		}
 	});
 	const sourceRepliesAreToolOnly = sourceReplyDeliveryMode === "message_tool_only";
-	const routedAgentConfig = resolveAgentConfig(cfg, route.agentId);
-	const configuredTypingMode = routedAgentConfig?.typingMode ?? cfg.agents?.defaults?.typingMode;
-	const configuredTypingInterval = routedAgentConfig?.typingIntervalSeconds ?? cfg.agents?.defaults?.typingIntervalSeconds;
+	const configuredTypingMode = resolveAgentConfig(cfg, route.agentId)?.typingMode ?? cfg.agents?.defaults?.typingMode;
+	const configuredTypingInterval = cfg.agents?.defaults?.typingIntervalSeconds;
 	const shouldDisableCoreTypingKeepalive = sourceRepliesAreToolOnly && configuredTypingMode === void 0 && configuredTypingInterval === void 0;
 	const mediaLocalRoots = getAgentScopedMediaLocalRoots(cfg, route.agentId);
 	const isRoomEvent = ctx.inboundEventKind === "room_event";
@@ -1396,14 +1543,27 @@ async function processDiscordMessageInner(ctx, observer) {
 		mediaList
 	});
 	if (!processContext) return;
-	const { ctxPayload, persistedSessionKey, turn, replyPlan, deliverTarget, replyTarget, replyReference } = processContext;
+	const { ctxPayload, persistedSessionKey, turn, replyPlan, deliverTarget: initialDeliverTarget, replyTarget, replyReference: sourceReplyReference } = processContext;
+	let deliverTarget = initialDeliverTarget;
+	const activeThreadRoute = createDiscordMessageActiveThreadRoute({
+		sessionKey: ctxPayload.SessionKey,
+		accountId,
+		sourceChannelId: messageChannelId,
+		sourceMessageId: canonicalMessageId ?? message.id,
+		sourceReplyReference,
+		log: logVerbose
+	});
+	const replyReference = activeThreadRoute.replyReference;
 	observer?.onReplyPlanResolved?.({
 		createdThreadId: replyPlan.createdThreadId,
 		sessionKey: persistedSessionKey
 	});
-	const { replyPipeline, onModelSelected, tableMode, maxLinesPerMessage, chunkMode, beginQueuedDeliveryCorrelation, endDeliveryCorrelation, resolveCurrentTurnTranscriptFinalText, deliverChannelId, draftPreview, resolvedBlockStreamingEnabled } = createDiscordMessageReplyRuntime({
+	const { replyPipeline, onModelSelected, tableMode, maxLinesPerMessage, chunkMode, beginQueuedDeliveryCorrelation, endDeliveryCorrelation, resolveCurrentTurnTranscriptFinalText, deliverChannelId: initialDeliverChannelId, draftPreview, resolvedBlockStreamingEnabled } = createDiscordMessageReplyRuntime({
 		ctx,
-		processContext,
+		processContext: {
+			...processContext,
+			replyReference
+		},
 		sourceRepliesAreToolOnly,
 		shouldDisableCoreTypingKeepalive,
 		isRoomEvent,
@@ -1411,6 +1571,12 @@ async function processDiscordMessageInner(ctx, observer) {
 		feedbackRest: reactions.feedbackRest,
 		deliveryRest: reactions.deliveryRest
 	});
+	let deliverChannelId = initialDeliverChannelId;
+	activeThreadRoute.bindThreadAdoption(async (threadId) => {
+		deliverTarget = `channel:${threadId}`;
+		deliverChannelId = threadId;
+		await draftPreview.retarget(threadId);
+	});
 	let finalReplyStartNotified = false;
 	const notifyFinalReplyStart = () => {
 		if (finalReplyStartNotified) return;
@@ -1428,12 +1594,6 @@ async function processDiscordMessageInner(ctx, observer) {
 		draftPreview.markFinalReplyDelivered();
 		observer?.onFinalReplyDelivered?.();
 	};
-	const formatDiscordReasoningQuote = (quoteText) => {
-		const lines = quoteText.split("\n").map((line) => line.trim()).filter(Boolean);
-		if (!lines.length) return;
-		lines[0] = `🧠 ${lines[0]}`;
-		return lines.map((line) => `> ${line}`).join("\n");
-	};
 	let progressReceiptLine;
 	let clearProgressDraftAfterFinalDelivery = false;
 	const resetDeliveryState = () => {
@@ -1459,23 +1619,13 @@ async function processDiscordMessageInner(ctx, observer) {
 		await replyPipeline.typingCallbacks?.onReplyStart();
 		await reactions.controller.setThinking();
 	};
-	const beforeDiscordPayloadDelivery = (payload, info) => {
-		if (isProcessAborted(abortSignal)) {
-			logVerbose(formatDiscordReplySkip({
-				kind: info.kind,
-				reason: "aborted before delivery",
-				target: deliverTarget,
-				sessionKey: ctxPayload.SessionKey
-			}));
-			return null;
-		}
-		if (payload.isReasoning || payload.isCommentary) return payload;
-		if (draftPreview.draftStream && draftPreview.isProgressMode && info.kind === "block") {
-			if (!resolveSendableOutboundReplyParts(payload).hasMedia && !payload.isError) return null;
-		}
-		if (info.kind === "final" && !isFallbackOnlyToolWarningFinal(payload)) draftPreview.markFinalReplyStarted();
-		return payload;
-	};
+	const beforeDiscordPayloadDelivery = createDiscordBeforePayloadDelivery({
+		abortSignal,
+		getDeliverTarget: () => deliverTarget,
+		sessionKey: ctxPayload.SessionKey,
+		draftPreview,
+		isFallbackOnlyToolWarningFinal
+	});
 	const deliverDiscordPayload = async (payload, info, options) => {
 		if (isProcessAborted(abortSignal)) {
 			logVerbose(formatDiscordReplySkip({
@@ -1501,7 +1651,7 @@ async function processDiscordMessageInner(ctx, observer) {
 				isReasoning: void 0
 			}));
 			if (!replies.length) return { visibleReplySent: false };
-			await deliverDiscordReply({
+			const result = await deliverDiscordReply({
 				cfg,
 				replies,
 				target: deliverTarget,
@@ -1520,8 +1670,8 @@ async function processDiscordMessageInner(ctx, observer) {
 				mediaLocalRoots,
 				kind: "block"
 			});
-			replyReference.markSent();
-			return { visibleReplySent: true };
+			if (result.visibleReplySent) replyReference.markSent();
+			return result;
 		}
 		if (isFinal && !options?.allowFallbackOnlyToolWarning && isFallbackOnlyToolWarningFinal(payload)) {
 			if (!userFacingFinalDelivered && (!finalReplyStartNotified || userFacingFinalDeliveryFailed)) pendingToolWarningFinal = {
@@ -1550,7 +1700,7 @@ async function processDiscordMessageInner(ctx, observer) {
 		}
 		if (isFinal && !replyLifecycleStarted && !isRoomEvent && configuredTypingMode !== "never") await onDiscordReplyStart();
 		const draftStream = draftPreview.draftStream;
-		if (draftStream && draftPreview.isProgressMode && info.kind === "block") {
+		if (draftStream && draftPreview.isProgressMode && info.kind === "block" && !options?.allowProgressBlock) {
 			if (!resolveSendableOutboundReplyParts(deliverablePayload).hasMedia && !deliverablePayload.isError) return { visibleReplySent: false };
 		}
 		if (draftStream && isFinal && draftPreview.isProgressMode && !deliverablePayload.isError && draftPreview.hasProgressDraftToCollapse && draftStream) {
@@ -1599,7 +1749,7 @@ async function processDiscordMessageInner(ctx, observer) {
 					const allowedMentions = discordTextHasBroadcastMention(fallbackPayload.text ?? "") ? TARGETED_ONLY_ALLOWED_MENTIONS : void 0;
 					const replyToId = replyReference.use();
 					notifyFinalReplyStart();
-					await deliverDiscordReply({
+					return (await deliverDiscordReply({
 						cfg,
 						replies: [fallbackPayload],
 						target: deliverTarget,
@@ -1618,8 +1768,7 @@ async function processDiscordMessageInner(ctx, observer) {
 						mediaLocalRoots,
 						allowedMentions,
 						kind: info.kind
-					});
-					return true;
+					})).visibleReplySent;
 				},
 				onNormalDelivered: () => {
 					markUserFacingFinalDelivered();
@@ -1643,7 +1792,7 @@ async function processDiscordMessageInner(ctx, observer) {
 			...deliverablePayload,
 			text: deliverablePayload.text?.trim() ? `${deliverablePayload.text.trimEnd()}\n${receiptLine}` : receiptLine
 		} : deliverablePayload;
-		await deliverDiscordReply({
+		const result = await deliverDiscordReply({
 			cfg,
 			replies: [payloadForDelivery],
 			target: deliverTarget,
@@ -1662,6 +1811,7 @@ async function processDiscordMessageInner(ctx, observer) {
 			mediaLocalRoots,
 			kind: info.kind
 		});
+		if (!result.visibleReplySent) return result;
 		replyReference.markSent();
 		if (isFinal && deliverablePayload.isError !== true) {
 			if (receiptLine) {
@@ -1675,7 +1825,7 @@ async function processDiscordMessageInner(ctx, observer) {
 				await draftStream?.clear();
 			}
 		}
-		return { visibleReplySent: true };
+		return result;
 	};
 	const onDiscordDeliveryError = (err, info) => {
 		if (info.kind === "final" && finalReplyStartNotified && !userFacingFinalDelivered) userFacingFinalDeliveryFailed = true;
@@ -1734,7 +1884,7 @@ async function processDiscordMessageInner(ctx, observer) {
 				onFreshSettledDelivery: deliverPendingToolWarningFinalIfNeeded
 			},
 			delivery: {
-				deliver: deliverDiscordPayload,
+				deliverWithProviderMessageSending: deliverDiscordPayload,
 				onError: onDiscordDeliveryError
 			},
 			record: turn.record,
@@ -1765,6 +1915,11 @@ async function processDiscordMessageInner(ctx, observer) {
 			dispatchAborted = true;
 			return;
 		}
+		if (activeThreadRoute.threadReplyDelivered && !userFacingFinalDelivered) {
+			draftPreview.markFinalReplyStarted();
+			await finalizeDiscordAdoptedThreadProgressReceipt(draftPreview.hasProgressDraftToCollapse, progress.buildProgressSummaryLine(), (receiptLine) => draftPreview.finalizeProgressReceipt(receiptLine), (receiptText) => deliverDiscordPayload({ text: receiptText }, { kind: "block" }, { allowProgressBlock: true }), (error) => logVerbose(`discord: failed to finalize adopted thread progress (${String(error)})`));
+			markUserFacingFinalDelivered();
+		}
 	} catch (err) {
 		if (isProcessAborted(abortSignal)) {
 			dispatchAborted = true;
@@ -1774,6 +1929,7 @@ async function processDiscordMessageInner(ctx, observer) {
 		if (await completeDiscordSessionConflict(err, deliverDiscordPayload, onDiscordDeliveryError)) return;
 		throw err;
 	} finally {
+		activeThreadRoute.end();
 		endDeliveryCorrelation();
 		await draftPreview.cleanup();
 		const finalDeliveryFailed = (dispatchResult?.failedCounts?.final ?? 0) > 0;