@openclaw/discord 2026.7.2-beta.5 → 2026.8.1-beta.2

package/dist/{message-handler.process-W9QxWA1g.js → message-handler.process-DWQ6UHHu.js}

@@ -1,20 +1,21 @@
-import { d as discord_exports, gt as deleteChannelMessage, pt as createChannelMessage, t as chunkDiscordTextWithMode, u as resolveDiscordChannelId, vt as editChannelMessage } from "./chunk-CMVEczdm.js";
+import { St as deleteChannelMessage, a as chunkDiscordTextWithMode, h as discord_exports, m as resolveDiscordChannelId, wt as editChannelMessage, yt as createChannelMessage } from "./retry-CLpJcXXf.js";
 import { f as resolveDiscordMaxLinesPerMessage } from "./accounts-DJTf1LtA.js";
-import { F as createDiscordRestClient, I as createDiscordRuntimeAccountContext, _ as resolveDiscordMessageFlags, d as resolveDiscordTargetChannelId } from "./send.shared-BRGI9T9F.js";
-import { C as resolveTimestampMs, a as normalizeDiscordSlug, r as normalizeDiscordAllowList } from "./allow-list-DzKrtfah.js";
-import { i as discordTextHasBroadcastMention } from "./send.outbound-1t1CryCK.js";
-import { s as editMessageDiscord } from "./send-C_PfNVFH.js";
+import { F as createDiscordRestClient, I as createDiscordRuntimeAccountContext, _ as resolveDiscordMessageFlags, d as resolveDiscordTargetChannelId } from "./send.shared-BmwFjW6T.js";
+import { C as resolveTimestampMs, a as normalizeDiscordSlug, r as normalizeDiscordAllowList } from "./allow-list-DnxIlPP2.js";
+import { i as discordTextHasBroadcastMention } from "./send.outbound-DS5tHwfR.js";
+import { c as editMessageDiscord } from "./send-B7Q6Oc1I.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-gesJG-Yp.js";
-import "./targets-DqNz_mmW.js";
-import { r as resolveDiscordConversationIdentity } from "./approval-message-safety-yjFtfJcK.js";
-import { t as beginDiscordInboundEventDeliveryCorrelation } from "./inbound-event-delivery-CEPlt2uz.js";
-import { t as DISCORD_TEXT_CHUNK_LIMIT } from "./outbound-adapter-kse7KV--.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-Ca5Gua1B.js";
-import { a as formatDiscordMediaText, c as resolveReferencedReplyMediaList, i as resolveDiscordMessageText, u as resolveDiscordMessageStickers } from "./message-utils-DSxXsDcG.js";
-import { n as resolveDiscordWebhookId } from "./sender-identity-mG_zsdox.js";
+import { i as removeReactionDiscord, n as reactMessageDiscord } from "./send.reactions-BAn0iiVQ.js";
+import "./targets-yUFTHoAx.js";
+import { r as resolveDiscordConversationIdentity } from "./approval-message-safety-AcIxvrf3.js";
+import { t as discordInboundEventDelivery } from "./inbound-event-delivery-De2qxTrP.js";
+import { t as DISCORD_TEXT_CHUNK_LIMIT } from "./outbound-adapter-D9nRivT1.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-DvSNb-2v.js";
+import { a as formatDiscordMediaText, c as resolveReferencedReplyMediaList, i as resolveDiscordMessageText, u as resolveDiscordMessageStickers } from "./message-utils-BSCPVgy0.js";
+import { n as resolveDiscordWebhookId } from "./sender-identity-QtalnCYv.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-eAhz8LT2.js";
+import { t as sendTyping } from "./typing-CS-nNVoe.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";
@@ -23,15 +24,16 @@ 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, createChannelProgressReceiptTracker, createFinalizableDraftLifecycle, createTypingCallbacks, defineFinalizableLivePreviewAdapter, deliverWithFinalizableLivePreviewAdapter, 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, formatInboundMediaUnavailableText, hasFinalInboundReplyDispatch, readAgentRunTerminalOutcome, 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 { DEFAULT_TIMING, createStatusReactionController, logAckFailure, logTypingFailure, shouldAckReaction } from "openclaw/plugin-sdk/channel-feedback";
@@ -76,7 +78,7 @@ function isContextAborted(abortSignal) {
 }
 async function buildDiscordMessageProcessContext(params) {
 	const { ctx, text, mediaList } = params;
-	const { cfg, discordConfig, accountId, runtime, botUserId, mediaMaxBytes, discordRestFetch, abortSignal, guildHistories, historyLimit, replyToMode, message, author, sender, canonicalMessageId, data, client, channelInfo, channelName, messageChannelId, isGuildMessage, isDirectMessage, baseText, preflightAudioTranscript, threadChannel, threadParentId, threadParentName, threadParentType, threadName, displayChannelSlug, guildInfo, guildSlug, memberRoleIds, channelConfig, baseSessionKey, boundSessionKey, route, commandAuthorized } = ctx;
+	const { cfg, discordConfig, accountId, runtime, botUserId, mediaMaxBytes, discordRestFetch, abortSignal, guildHistories, historyLimit, replyToMode, message, author, sender, canonicalMessageId, data, client, channelInfo, channelName, messageChannelId, isGuildMessage, isDirectMessage, baseText, preflightAudioTranscript, threadChannel, threadParentId, threadParentName, threadParentType, threadName, displayChannelSlug, guildInfo, guildSlug, memberRoleIds, channelConfig, baseSessionKey, boundSessionKey, route, commandAuthorized, resolveChannelIngress } = ctx;
 	const fromLabel = isDirectMessage ? buildDirectLabel(author) : buildGuildLabel({
 		guild: data.guild ?? void 0,
 		channelName: channelName ?? messageChannelId,
@@ -127,11 +129,17 @@ async function buildDiscordMessageProcessContext(params) {
 	});
 	const channelHistory = createChannelHistoryWindow({ historyMap: guildHistories });
 	let visibleChannelHistory;
+	const unavailableMediaCount = mediaList.filter((media) => !media.path).length;
+	const appendMediaUnavailableNotice = (body) => unavailableMediaCount > 0 ? formatInboundMediaUnavailableText({
+		body,
+		notice: `[discord ${unavailableMediaCount > 1 ? `${unavailableMediaCount} attachments` : "attachment"} unavailable]`
+	}) : body;
+	const bodyWithMediaNotice = appendMediaUnavailableNotice(text) ?? text;
 	let combinedBody = formatInboundEnvelope({
 		channel: "Discord",
 		from: fromLabel,
 		timestamp: resolveTimestampMs(message.timestamp),
-		body: text,
+		body: bodyWithMediaNotice,
 		chatType: isDirectMessage ? "direct" : "channel",
 		senderLabel,
 		previousTimestamp,
@@ -268,7 +276,17 @@ async function buildDiscordMessageProcessContext(params) {
 		storePath,
 		sessionKey: effectiveSessionKey
 	});
-	const ctxPayload = await buildChannelInboundEventContext({
+	const channelIngress = await resolveChannelIngress({
+		agentId: route.agentId,
+		sessionKey: effectiveSessionKey,
+		messageId: canonicalMessageId ?? message.id,
+		inboundEventKind: ctx.inboundEventKind
+	}, {
+		parentId: threadChannel ? threadParentId : void 0,
+		threadId: threadChannel?.id ?? autoThreadContext?.createdThreadId ?? void 0
+	});
+	const ctxPayload = await (ctx.buildContext ?? buildChannelInboundEventContext)({
+		channelIngress,
 		channel: "discord",
 		resolveSupplementalMedia: true,
 		contextVisibility: contextVisibilityMode,
@@ -312,7 +330,7 @@ async function buildDiscordMessageProcessContext(params) {
 			inboundEventKind: ctx.inboundEventKind,
 			body: combinedBody,
 			rawBody: preflightAudioTranscript ?? baseText,
-			bodyForAgent: preflightAudioTranscript ?? baseText ?? text,
+			bodyForAgent: appendMediaUnavailableNotice(preflightAudioTranscript ?? baseText ?? text),
 			commandBody: preflightAudioTranscript ?? baseText,
 			inboundHistory
 		},
@@ -333,7 +351,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,
@@ -349,7 +367,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: {
@@ -435,7 +453,7 @@ function isFailedProgress(payload) {
 }
 function createDiscordMessageProgressRuntime(params) {
 	const { ctx, draftPreview } = params;
-	const { cfg, discordConfig, route, abortSignal } = ctx;
+	const { cfg, route, abortSignal } = ctx;
 	const reasoningLevel = (() => {
 		const normalizedAgentId = (route.agentId ?? "").trim().toLowerCase() || "main";
 		const cfgDefault = cfg.agents?.list?.find((entry) => ((entry?.id ?? "").trim().toLowerCase() || "main") === normalizedAgentId)?.reasoningDefault ?? cfg.agents?.defaults?.reasoningDefault;
@@ -456,42 +474,10 @@ function createDiscordMessageProgressRuntime(params) {
 	})();
 	const reasoningDurableEnabled = reasoningLevel === "on";
 	const reasoningWindowEnabled = reasoningLevel === "stream";
-	let shouldYieldDraftProgress = () => false;
-	let progressTurnStartedAt = Date.now();
-	let progressReasoningSteps = 0;
-	let progressToolCalls = 0;
-	let progressCommentaryNotes = 0;
-	const seenCommentaryIds = /* @__PURE__ */ new Set();
-	let lastCommentaryNoteText = "";
-	const noteWindowCommentary = (itemId, noteText) => {
-		const trimmed = noteText?.trim();
-		if (!trimmed) return;
-		if (itemId) {
-			if (seenCommentaryIds.has(itemId)) return;
-			seenCommentaryIds.add(itemId);
-			progressCommentaryNotes += 1;
-			return;
-		}
-		if (trimmed !== lastCommentaryNoteText) {
-			lastCommentaryNoteText = trimmed;
-			progressCommentaryNotes += 1;
-		}
-	};
-	let windowReasoningOpen = false;
-	const closePendingWindowThought = () => {
-		if (windowReasoningOpen) {
-			windowReasoningOpen = false;
-			progressReasoningSteps += 1;
-		}
-	};
+	let shouldYieldDraftCommentary = () => false;
+	const progressReceipt = createChannelProgressReceiptTracker();
 	const resetTurnState = () => {
-		progressTurnStartedAt = Date.now();
-		progressReasoningSteps = 0;
-		progressToolCalls = 0;
-		progressCommentaryNotes = 0;
-		seenCommentaryIds.clear();
-		lastCommentaryNoteText = "";
-		windowReasoningOpen = false;
+		progressReceipt.reset();
 	};
 	const handleAssistantMessageBoundary = () => {
 		if (draftPreview.handleAssistantMessageBoundary()) {
@@ -499,133 +485,89 @@ function createDiscordMessageProgressRuntime(params) {
 			params.onTurnReset();
 		}
 	};
-	const buildProgressSummaryLine = () => {
-		closePendingWindowThought();
-		const seconds = Math.max(1, Math.round((Date.now() - progressTurnStartedAt) / 1e3));
-		return `-# ${[
-			...progressReasoningSteps > 0 ? [`🧠 ${progressReasoningSteps} thought${progressReasoningSteps === 1 ? "" : "s"}`] : [],
-			...progressCommentaryNotes > 0 ? [`💬 ${progressCommentaryNotes} note${progressCommentaryNotes === 1 ? "" : "s"}`] : [],
-			...progressToolCalls > 0 ? [`🛠️ ${progressToolCalls} tool call${progressToolCalls === 1 ? "" : "s"}`] : [],
-			`⏱️ ${seconds}s`
-		].join(" · ")}`;
-	};
+	const buildProgressSummaryLine = () => `-# ${progressReceipt.buildSummaryLine()}`;
 	return {
 		replyOptions: {
-			onAssistantMessageStart: draftPreview.draftStream ? handleAssistantMessageBoundary : void 0,
+			onAssistantMessageStart: draftPreview.draftStream ? () => {
+				handleAssistantMessageBoundary();
+				return false;
+			} : void 0,
 			onReasoningEnd: draftPreview.draftStream ? () => {
-				closePendingWindowThought();
+				progressReceipt.closeReasoning();
 				handleAssistantMessageBoundary();
+				return false;
+			} : void 0,
+			onQueuedFollowupAdmitted: draftPreview.draftStream ? () => {
+				if (draftPreview.handleQueuedFollowupAdmitted()) {
+					resetTurnState();
+					params.onTurnReset();
+				}
 			} : void 0,
 			suppressDefaultToolProgressMessages: params.sourceRepliesAreToolOnly && params.reactions.statusReactionsExplicitlyEnabled || draftPreview.suppressDefaultToolProgressMessages ? true : void 0,
 			allowToolLifecycleWhenProgressHidden: params.reactions.statusReactionsEnabled ? true : void 0,
 			commentaryProgressEnabled: draftPreview.isProgressMode ? draftPreview.commentaryProgressEnabled : void 0,
 			progressPreambleEnabled: draftPreview.draftStream && draftPreview.isProgressMode ? true : void 0,
 			commentaryPayloadsEnabled: draftPreview.isProgressMode ? draftPreview.commentaryProgressEnabled : void 0,
+			shouldDeliverCommentaryPayloads: draftPreview.isProgressMode && draftPreview.commentaryProgressEnabled ? () => shouldYieldDraftCommentary() : 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,
 			isProgressDraftVisible: draftPreview.narrationProgressEnabled ? () => draftPreview.isProgressDraftVisible : void 0,
 			narrationHideCommandText: draftPreview.narrationHideCommandText ? true : void 0,
 			onReasoningStream: async (payload) => {
-				if (payload?.requiresReasoningProgressOptIn === true && !reasoningWindowEnabled) return;
-				if (payload?.text) windowReasoningOpen = true;
+				if (payload?.requiresReasoningProgressOptIn === true && !reasoningWindowEnabled) return false;
+				if (payload?.text) progressReceipt.noteReasoning();
 				await params.reactions.controller.setThinking();
-				await draftPreview.pushReasoningProgress(payload?.text, { snapshot: payload?.isReasoningSnapshot === true });
+				return await draftPreview.pushReasoningProgress(payload?.text, { snapshot: payload?.isReasoningSnapshot === true });
 			},
 			streamReasoningInNonStreamModes: reasoningWindowEnabled,
 			onToolStart: async (payload) => {
-				if (isProcessAborted$1(abortSignal)) return;
+				if (isProcessAborted$1(abortSignal)) return false;
 				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",
-					itemId: payload.itemId,
-					toolCallId: payload.toolCallId,
-					name: payload.name,
-					phase: payload.phase,
-					args: payload.args
-				}, payload.detailMode ? { detailMode: payload.detailMode } : void 0), { toolName: payload.name });
+				if (payload.phase === "start") progressReceipt.noteToolCall(payload.name);
+				return await draftPreview.pushToolEvent(payload);
 			},
 			onItemEvent: async (payload) => {
 				if (isFailedProgress(payload)) return false;
 				if (payload.kind === "preamble") {
-					if (shouldYieldDraftProgress()) return;
-					return await draftPreview.pushPreambleItemEvent(payload, noteWindowCommentary);
+					if (shouldYieldDraftCommentary()) return;
+					return await draftPreview.pushPreambleItemEvent(payload, (itemId, text) => {
+						progressReceipt.noteCommentary(itemId, text);
+					});
 				}
-				if (shouldYieldDraftProgress()) return;
-				await draftPreview.pushToolProgress(buildChannelProgressDraftLineForEntry(discordConfig, {
-					event: "item",
-					itemId: payload.itemId,
-					toolCallId: payload.toolCallId,
-					itemKind: payload.kind,
-					title: payload.title,
-					name: payload.name,
-					phase: payload.phase,
-					status: payload.status,
-					summary: payload.summary,
-					progressText: payload.progressText,
-					meta: payload.meta
-				}));
+				return await draftPreview.pushItemEvent(payload);
 			},
 			onPlanUpdate: async (payload) => {
-				if (payload.phase === "update") await draftPreview.pushPlanProgress(payload.steps, { explanation: payload.explanation });
+				if (payload.phase === "update") return await draftPreview.pushPlanProgress(payload.steps, { explanation: payload.explanation });
+				return false;
 			},
 			onApprovalEvent: async (payload) => {
-				if (payload.phase === "requested") await draftPreview.pushToolProgress(buildChannelProgressDraftLine({
-					event: "approval",
-					phase: payload.phase,
-					title: payload.title,
-					command: payload.command,
-					reason: payload.reason,
-					message: payload.message
-				}));
+				return await draftPreview.pushApprovalEvent(payload);
 			},
 			onCommandOutput: async (payload) => {
 				if (isFailedProgress(payload)) return false;
-				if (payload.phase !== "end" || shouldYieldDraftProgress()) return;
-				await draftPreview.pushToolProgress(buildChannelProgressDraftLine({
-					event: "command-output",
-					itemId: payload.itemId,
-					toolCallId: payload.toolCallId,
-					phase: payload.phase,
-					title: payload.title,
-					name: payload.name,
-					status: payload.status,
-					exitCode: payload.exitCode
-				}));
+				return await draftPreview.pushCommandOutputEvent(payload);
 			},
 			onPatchSummary: async (payload) => {
-				if (payload.phase !== "end" || shouldYieldDraftProgress()) return;
-				await draftPreview.pushToolProgress(buildChannelProgressDraftLine({
-					event: "patch",
-					itemId: payload.itemId,
-					toolCallId: payload.toolCallId,
-					phase: payload.phase,
-					title: payload.title,
-					name: payload.name,
-					added: payload.added,
-					modified: payload.modified,
-					deleted: payload.deleted,
-					summary: payload.summary
-				}));
+				return await draftPreview.pushPatchEvent(payload);
 			},
 			onCompactionStart: async () => {
 				if (!isProcessAborted$1(abortSignal)) await params.reactions.controller.setCompacting();
+				return false;
 			},
 			onCompactionEnd: async () => {
 				if (!isProcessAborted$1(abortSignal)) {
 					params.reactions.controller.cancelPending();
 					await params.reactions.controller.setThinking();
 				}
+				return false;
 			}
 		},
 		buildProgressSummaryLine
@@ -678,7 +620,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
@@ -689,7 +631,6 @@ function createDiscordMessageReactionRuntime(params) {
 		isDirect: isDirectMessage,
 		isGroup: isGuildMessage || isGroupDm,
 		isMentionableGroup: isGuildMessage,
-		requireMention: shouldRequireMention,
 		canDetectMention,
 		effectiveWasMentioned,
 		shouldBypassMention
@@ -844,7 +785,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;
@@ -857,6 +798,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;
@@ -951,6 +893,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();
@@ -975,23 +963,30 @@ function createDiscordDraftStream(params) {
 		discardPending,
 		seal,
 		stop,
+		retarget,
+		cleanupRetargeted,
 		forceNewMessage
 	};
 }
 //#endregion
 //#region extensions/discord/src/preview-streaming.ts
 function resolveDiscordPreviewStreamMode(params = {}) {
-	if (params.streaming === void 0) return "progress";
 	return resolveChannelPreviewStreamMode(params, "off");
 }
 //#endregion
 //#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 previewAvailable = allowProviderPreview && (!params.sourceRepliesAreToolOnly || canStreamProgressDraftForToolOnlySource) && discordStreamMode !== "off";
+	const accountBlockStreamingEnabled = resolveChannelStreamingBlockEnabled(params.discordConfig, {
+		previewAvailable,
+		blockStreamingDefault: params.cfg.agents?.defaults?.blockStreamingDefault
+	});
+	const draftStream = previewAvailable && !accountBlockStreamingEnabled ? createDiscordDraftStream({
 		rest: params.deliveryRest,
 		channelId: params.deliverChannelId,
 		maxChars: draftMaxChars,
@@ -1013,10 +1008,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, {
@@ -1033,13 +1025,16 @@ function createDiscordDraftPreviewController(params) {
 		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;
 			draftText = previewText;
 			hasStreamedMessage = true;
 			draftChunker?.reset();
-			draftStream?.update(previewText);
-			if (options?.flush) await draftStream?.flush();
+			draftStream.update(previewText);
+			if (options?.flush) await draftStream.flush();
+			return Boolean(draftStream.messageId());
 		},
 		deleteCurrent: async () => {
 			lastPartialText = "";
@@ -1064,7 +1059,22 @@ function createDiscordDraftPreviewController(params) {
 		resetProgressState();
 	};
 	const pushPreambleHeadline = async (text, options) => {
-		if (discordStreamMode === "progress") await progressDraft.pushPreambleHeadline(text, options);
+		if (discordStreamMode === "progress") return await progressDraft.pushPreambleHeadline(text, options);
+		return false;
+	};
+	const beginNewProgressTurn = (options) => {
+		const beganNewTurn = progressDraft.beginNewTurn(options);
+		if (beganNewTurn) {
+			progressDraftCollapsed = false;
+			progressDraftStartedBeforeFinal = false;
+			finalReplyDelivered = false;
+			finalizedViaPreviewMessage = false;
+			progressNarratorLifecycle?.beginTurn();
+		}
+		if (discordStreamMode === "progress") {
+			if (beganNewTurn) draftStream?.forceNewMessage("discard");
+		} else forceNewMessageIfNeeded();
+		return beganNewTurn;
 	};
 	return {
 		draftStream,
@@ -1107,27 +1117,50 @@ 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,
+		pushToolEvent: progressDraft.pushToolEvent,
+		pushItemEvent: progressDraft.pushItemEvent,
+		pushApprovalEvent: progressDraft.pushApprovalEvent,
+		pushCommandOutputEvent: progressDraft.pushCommandOutputEvent,
+		pushPatchEvent: progressDraft.pushPatchEvent,
 		async pushToolProgress(line, options) {
-			await progressDraft.pushToolProgress(line, options);
+			return await progressDraft.pushToolProgress(line, options);
 		},
 		async pushPlanProgress(steps, options) {
-			await progressDraft.pushPlanProgress(steps, options);
+			return await progressDraft.pushPlanProgress(steps, options);
 		},
 		async pushReasoningProgress(text, options) {
-			await progressDraft.pushReasoningProgress(text, options);
+			return await progressDraft.pushReasoningProgress(text, options);
 		},
 		async pushNarrationProgress(text) {
-			await progressDraft.pushNarrationProgress(text);
+			return await progressDraft.pushNarrationProgress(text);
 		},
 		pushPreambleHeadline,
 		async pushPreambleItemEvent(payload, noteCommentary) {
-			await pushPreambleHeadline(payload.progressText, { itemId: payload.itemId });
-			if (!progressDraft.commentaryProgressEnabled) return;
-			if (await progressDraft.pushCommentaryProgress(payload.progressText, { itemId: payload.itemId })) noteCommentary(payload.itemId, payload.progressText);
+			const headlineAccepted = await pushPreambleHeadline(payload.progressText, { itemId: payload.itemId });
+			if (!progressDraft.commentaryProgressEnabled) return headlineAccepted;
+			const commentaryAccepted = await progressDraft.pushCommentaryProgress(payload.progressText, { itemId: payload.itemId });
+			if (commentaryAccepted) noteCommentary(payload.itemId, payload.progressText);
+			return headlineAccepted || commentaryAccepted;
 		},
 		async pushCommentaryProgress(text, options) {
-			await progressDraft.pushCommentaryProgress(text, options);
+			return await progressDraft.pushCommentaryProgress(text, options);
 		},
 		resolvePreviewFinalText(text) {
 			if (typeof text !== "string") return;
@@ -1185,20 +1218,10 @@ function createDiscordDraftPreviewController(params) {
 			});
 		},
 		handleAssistantMessageBoundary() {
-			const beganNewTurn = progressDraft.beginNewTurn();
-			if (beganNewTurn) {
-				progressDraftCollapsed = false;
-				progressDraftStartedBeforeFinal = false;
-				finalReplyDelivered = false;
-				finalizedViaPreviewMessage = false;
-				progressNarratorLifecycle?.beginTurn();
-			}
-			if (discordStreamMode === "progress") {
-				if (beganNewTurn) draftStream?.forceNewMessage("discard");
-				return beganNewTurn;
-			}
-			forceNewMessageIfNeeded();
-			return beganNewTurn;
+			return beginNewProgressTurn();
+		},
+		handleQueuedFollowupAdmitted() {
+			return beginNewProgressTurn({ force: true });
 		},
 		async flush() {
 			if (!draftStream) return;
@@ -1219,6 +1242,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)}`);
 			}
@@ -1260,6 +1284,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;
@@ -1304,7 +1351,7 @@ function createDiscordMessageReplyRuntime(params) {
 			limit: historyLimit
 		});
 	};
-	const beginDeliveryCorrelation = () => params.isRoomEvent ? beginDiscordInboundEventDeliveryCorrelation(ctxPayload.SessionKey, {
+	const beginDeliveryCorrelation = () => params.isRoomEvent ? discordInboundEventDelivery.begin(ctxPayload.SessionKey, {
 		outboundTo: messageChannelId,
 		outboundAccountId: route.accountId,
 		markInboundEventDelivered: clearGroupHistory
@@ -1363,6 +1410,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) {
@@ -1377,7 +1470,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, textLimit, replyToMode, message, messageChannelId, isGuildMessage, isDirectMessage, isGroupDm, messageText, threadBindings, route, abortSignal, turnAdoptionLifecycle, preparedMedia: mediaList } = ctx;
 	if (isProcessAborted(abortSignal)) return;
 	const text = messageText;
 	if (!text && mediaList.length === 0) {
@@ -1410,14 +1503,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: ctx.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,
@@ -1425,6 +1531,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;
@@ -1442,12 +1554,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 = () => {
@@ -1473,23 +1579,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({
@@ -1532,7 +1628,8 @@ async function processDiscordMessageInner(ctx, observer) {
 				sessionKey: ctxPayload.SessionKey,
 				threadBindings,
 				mediaLocalRoots,
-				kind: "block"
+				kind: "block",
+				bindPendingFinalDelivery: info.bindPendingFinalDelivery
 			});
 			if (result.visibleReplySent) replyReference.markSent();
 			return result;
@@ -1564,7 +1661,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) {
@@ -1631,7 +1728,8 @@ async function processDiscordMessageInner(ctx, observer) {
 						threadBindings,
 						mediaLocalRoots,
 						allowedMentions,
-						kind: info.kind
+						kind: info.kind,
+						bindPendingFinalDelivery: info.bindPendingFinalDelivery
 					})).visibleReplySent;
 				},
 				onNormalDelivered: () => {
@@ -1673,7 +1771,8 @@ async function processDiscordMessageInner(ctx, observer) {
 			sessionKey: ctxPayload.SessionKey,
 			threadBindings,
 			mediaLocalRoots,
-			kind: info.kind
+			kind: info.kind,
+			bindPendingFinalDelivery: info.bindPendingFinalDelivery
 		});
 		if (!result.visibleReplySent) return result;
 		replyReference.markSent();
@@ -1755,13 +1854,13 @@ async function processDiscordMessageInner(ctx, observer) {
 			history: isRoomEvent ? void 0 : {
 				isGroup: isGuildMessage,
 				historyKey: messageChannelId,
-				historyMap: guildHistories,
-				limit: historyLimit
+				historyMap: ctx.guildHistories,
+				limit: ctx.historyLimit
 			},
 			replyOptions: {
 				...turnAdoptionLifecycle ? bindIngressLifecycleToReplyOptions(turnAdoptionLifecycle) : {},
 				abortSignal,
-				skillFilter: channelConfig?.skills,
+				skillFilter: ctx.channelConfig?.skills,
 				sourceReplyDeliveryMode,
 				typingKeepalive: shouldDisableCoreTypingKeepalive ? false : void 0,
 				queuedDeliveryCorrelations: isRoomEvent ? [{ begin: beginQueuedDeliveryCorrelation }] : void 0,
@@ -1779,6 +1878,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;
@@ -1788,8 +1892,10 @@ async function processDiscordMessageInner(ctx, observer) {
 		if (await completeDiscordSessionConflict(err, deliverDiscordPayload, onDiscordDeliveryError)) return;
 		throw err;
 	} finally {
+		activeThreadRoute.end();
 		endDeliveryCorrelation();
 		await draftPreview.cleanup();
+		dispatchError ||= readAgentRunTerminalOutcome(dispatchResult) === "failed";
 		const finalDeliveryFailed = (dispatchResult?.failedCounts?.final ?? 0) > 0;
 		await reactions.finish({
 			dispatchAborted,