@openclaw/discord 2026.7.2-beta.7 → 2026.8.1-beta.3

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

@@ -1,41 +1,44 @@
-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-D-80Ej-t.js";
-import { s as editMessageDiscord } from "./send-CdkZ6zeW.js";
+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-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-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 beginDiscordActiveTurnThreadRoute } from "./active-turn-thread-route-MlKWp8RD.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 { 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--Mzo2kM7.js";
-import { buildAgentSessionKey, resolveThreadSessionKeys } from "openclaw/plugin-sdk/routing";
+import { t as sendTyping } from "./typing-oLiS5Z13.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 { 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, isChannelProgressDraftWorkToolName, resolveChannelDraftStreamingChunking, resolveChannelMessageSourceReplyDeliveryMode, resolveChannelPreviewStreamMode, resolveChannelStreamingBlockEnabled, resolveChannelStreamingPreviewCommandText, resolveChannelStreamingPreviewToolProgress, resolveChannelStreamingProgressNarration, resolveChannelStreamingSuppressDefaultToolProgressMessages, resolveTranscriptBackedChannelFinalText } from "openclaw/plugin-sdk/channel-outbound";
+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 { 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 { resolveAgentConfig } from "openclaw/plugin-sdk/agent-scope-runtime";
+import { EmbeddedBlockChunker, resolveAckReaction, resolveAgentConfig as resolveAgentConfig$1, resolveHumanDelayConfig } from "openclaw/plugin-sdk/agent-runtime";
 import { isDangerousNameMatchingEnabled } from "openclaw/plugin-sdk/dangerous-name-runtime";
-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 { buildChannelInboundEventContext, createCommandTurnContext, dispatchChannelInboundTurn, formatInboundEnvelope, formatInboundMediaUnavailableText, hasFinalInboundReplyDispatch, readAgentRunTerminalOutcome, resolveEnvelopeFormatOptions, toHistoryMediaEntries, toInboundMediaFactsWithMetadata } from "openclaw/plugin-sdk/channel-inbound";
 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 { readLatestAssistantTextByIdentity } from "openclaw/plugin-sdk/session-transcript-runtime";
 //#region extensions/discord/src/monitor/message-handler.retry.ts
@@ -78,7 +81,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, isGroupDm, baseText, preflightAudioTranscript, threadChannel, threadParentId, threadParentName, threadParentType, threadName, displayChannelSlug, guildInfo, guildSlug, memberRoleIds, channelConfig, baseSessionKey, boundSessionKey, route, commandAuthorized, hasControlCommand, resolveChannelIngress } = ctx;
 	const fromLabel = isDirectMessage ? buildDirectLabel(author) : buildGuildLabel({
 		guild: data.guild ?? void 0,
 		channelName: channelName ?? messageChannelId,
@@ -129,11 +132,18 @@ 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;
+	const agentFacingBody = preflightAudioTranscript !== void 0 ? formatAudioTranscriptForAgent(preflightAudioTranscript) : baseText ?? text;
 	let combinedBody = formatInboundEnvelope({
 		channel: "Discord",
 		from: fromLabel,
 		timestamp: resolveTimestampMs(message.timestamp),
-		body: text,
+		body: bodyWithMediaNotice,
 		chatType: isDirectMessage ? "direct" : "channel",
 		senderLabel,
 		previousTimestamp,
@@ -210,15 +220,17 @@ async function buildDiscordMessageProcessContext(params) {
 		if (threadParentId) {
 			parentSessionKey = buildAgentSessionKey({
 				agentId: route.agentId,
+				mainKey: cfg.session?.mainKey,
 				channel: route.channel,
 				peer: {
 					kind: "channel",
 					id: threadParentId
-				}
+				},
+				groupScope: route.groupScope
 			});
-			modelParentSessionKey = parentSessionKey;
+			modelParentSessionKey = parentSessionKey === baseSessionKey ? void 0 : parentSessionKey;
 		}
-		if (!threadParentInheritanceEnabled) parentSessionKey = void 0;
+		parentSessionKey = threadParentInheritanceEnabled ? modelParentSessionKey : void 0;
 	}
 	const preflightAudioIndex = preflightAudioTranscript === void 0 ? -1 : mediaList.findIndex((media) => media.contentType?.startsWith("audio/"));
 	const threadKeys = resolveThreadSessionKeys({
@@ -243,12 +255,15 @@ async function buildDiscordMessageProcessContext(params) {
 		agentId: route.agentId,
 		channel: route.channel,
 		cfg,
+		parentSessionKey: route.sessionKey,
+		groupScope: route.groupScope,
 		threadParentInheritanceEnabled
 	});
 	const deliverTarget = replyPlan.deliverTarget;
 	const replyTarget = replyPlan.replyTarget;
 	const replyReference = replyPlan.replyReference;
 	const autoThreadContext = replyPlan.autoThreadContext;
+	const conversationParentId = threadChannel ? threadParentId : autoThreadContext ? messageChannelId : void 0;
 	const effectiveFrom = isDirectMessage ? `discord:${author.id}` : autoThreadContext?.From ?? `discord:channel:${messageChannelId}`;
 	const dmConversationTarget = isDirectMessage ? resolveDiscordConversationIdentity({
 		isDirectMessage,
@@ -270,7 +285,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: conversationParentId,
+		threadId: threadChannel?.id ?? autoThreadContext?.createdThreadId ?? void 0
+	});
+	const ctxPayload = await (ctx.buildContext ?? buildChannelInboundEventContext)({
+		channelIngress,
 		channel: "discord",
 		resolveSupplementalMedia: true,
 		contextVisibility: contextVisibilityMode,
@@ -289,12 +314,19 @@ async function buildDiscordMessageProcessContext(params) {
 			isBot: author.bot && !sender.isPluralKit ? true : void 0
 		},
 		conversation: {
-			kind: isDirectMessage ? "direct" : "channel",
+			kind: isGroupDm ? "group" : isDirectMessage ? "direct" : "channel",
 			id: messageChannelId,
+			routePeer: buildDiscordRoutePeer({
+				isDirectMessage,
+				isGroupDm,
+				directUserId: author.id,
+				conversationId: messageChannelId
+			}),
 			nativeChannelId: messageChannelId,
+			avatar: ctx.conversationAvatar,
 			label: fromLabel,
-			spaceId: isGuildMessage ? (guildInfo?.id ?? guildSlug) || void 0 : void 0,
-			parentId: threadChannel ? threadParentId : void 0,
+			spaceId: isGuildMessage ? (guildInfo?.id ?? data.guild?.id ?? data.guild_id ?? guildSlug) || void 0 : void 0,
+			parentId: conversationParentId,
 			threadId: threadChannel?.id ?? autoThreadContext?.createdThreadId ?? void 0
 		},
 		route: {
@@ -313,9 +345,9 @@ async function buildDiscordMessageProcessContext(params) {
 		message: {
 			inboundEventKind: ctx.inboundEventKind,
 			body: combinedBody,
-			rawBody: preflightAudioTranscript ?? baseText,
-			bodyForAgent: preflightAudioTranscript ?? baseText ?? text,
-			commandBody: preflightAudioTranscript ?? baseText,
+			rawBody: baseText,
+			bodyForAgent: appendMediaUnavailableNotice(agentFacingBody),
+			commandBody: baseText,
 			inboundHistory
 		},
 		sessionTranscript: { historyLimit: shouldIncludeChannelHistory ? historyLimit : 0 },
@@ -329,12 +361,10 @@ async function buildDiscordMessageProcessContext(params) {
 			},
 			commands: { authorized: commandAuthorized }
 		},
-		commandTurn: {
-			kind: "text-slash",
-			source: "text",
+		commandTurn: createCommandTurnContext(hasControlCommand ? "text" : "message", {
 			authorized: commandAuthorized,
-			body: preflightAudioTranscript ?? baseText
-		},
+			body: baseText
+		}),
 		media: await toInboundMediaFactsWithMetadata(mediaList, { transcribed: (_media, index) => index === preflightAudioIndex }),
 		supplemental: {
 			quote: replyContext && replyVisible ? {
@@ -351,7 +381,7 @@ async function buildDiscordMessageProcessContext(params) {
 						totalTimeoutMs: DISCORD_ATTACHMENT_TOTAL_TIMEOUT_MS,
 						abortSignal
 					});
-					return isContextAborted(abortSignal) ? [] : await toInboundMediaFactsWithMetadata(referencedReplyMediaList);
+					return isContextAborted(abortSignal) ? [] : await toInboundMediaFactsWithMetadata(referencedReplyMediaList, { messageId: replyContext.id });
 				}
 			} : void 0,
 			thread: {
@@ -437,10 +467,9 @@ 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;
+		const cfgDefault = resolveAgentConfig(cfg, route.agentId ?? "main")?.reasoningDefault ?? cfg.agents?.defaults?.reasoningDefault;
 		const configDefault = cfgDefault === "on" || cfgDefault === "stream" ? cfgDefault : "off";
 		if (!params.sessionKey) return configDefault;
 		try {
@@ -459,177 +488,84 @@ function createDiscordMessageProgressRuntime(params) {
 	const reasoningDurableEnabled = reasoningLevel === "on";
 	const reasoningWindowEnabled = reasoningLevel === "stream";
 	let shouldYieldDraftCommentary = () => 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;
-		}
-	};
-	const resetTurnState = () => {
-		progressTurnStartedAt = Date.now();
-		progressReasoningSteps = 0;
-		progressToolCalls = 0;
-		progressCommentaryNotes = 0;
-		seenCommentaryIds.clear();
-		lastCommentaryNoteText = "";
-		windowReasoningOpen = false;
-	};
 	const handleAssistantMessageBoundary = () => {
-		if (draftPreview.handleAssistantMessageBoundary()) {
-			resetTurnState();
-			params.onTurnReset();
-		}
+		if (draftPreview.handleAssistantMessageBoundary()) 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(" · ")}`;
-	};
-	return {
-		replyOptions: {
-			onAssistantMessageStart: draftPreview.draftStream ? handleAssistantMessageBoundary : void 0,
-			onReasoningEnd: draftPreview.draftStream ? () => {
-				closePendingWindowThought();
-				handleAssistantMessageBoundary();
-			} : 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,
-			reasoningPayloadsEnabled: reasoningDurableEnabled,
-			onVerboseProgressVisibility: (isActive) => {
-				shouldYieldDraftCommentary = isActive;
-			},
-			onNarrationUpdate: draftPreview.narrationProgressEnabled ? async (payload) => {
-				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;
-				await params.reactions.controller.setThinking();
-				await draftPreview.pushReasoningProgress(payload?.text, { snapshot: payload?.isReasoningSnapshot === true });
-			},
-			streamReasoningInNonStreamModes: reasoningWindowEnabled,
-			onToolStart: async (payload) => {
-				if (isProcessAborted$1(abortSignal)) return;
-				await params.reactions.maybeBindToToolReaction(payload);
-				await params.reactions.controller.setTool(payload.name);
-				if (payload.phase === "start") closePendingWindowThought();
-				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 });
-			},
-			onItemEvent: async (payload) => {
-				if (isFailedProgress(payload)) return false;
-				if (payload.kind === "preamble") {
-					if (shouldYieldDraftCommentary()) return;
-					return await draftPreview.pushPreambleItemEvent(payload, noteWindowCommentary);
-				}
-				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
-				}));
-			},
-			onPlanUpdate: async (payload) => {
-				if (payload.phase === "update") await draftPreview.pushPlanProgress(payload.steps, { explanation: payload.explanation });
-			},
-			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
-				}));
-			},
-			onCommandOutput: async (payload) => {
-				if (isFailedProgress(payload)) return false;
-				if (payload.phase !== "end") 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
-				}));
-			},
-			onPatchSummary: async (payload) => {
-				if (payload.phase !== "end") 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
-				}));
-			},
-			onCompactionStart: async () => {
-				if (!isProcessAborted$1(abortSignal)) await params.reactions.controller.setCompacting();
-			},
-			onCompactionEnd: async () => {
-				if (!isProcessAborted$1(abortSignal)) {
-					params.reactions.controller.cancelPending();
-					await params.reactions.controller.setThinking();
-				}
+	return { replyOptions: {
+		onAssistantMessageStart: draftPreview.draftStream ? () => {
+			handleAssistantMessageBoundary();
+			return false;
+		} : void 0,
+		onReasoningEnd: draftPreview.draftStream ? () => {
+			handleAssistantMessageBoundary();
+			return false;
+		} : void 0,
+		onQueuedFollowupAdmitted: draftPreview.draftStream ? () => {
+			if (draftPreview.handleQueuedFollowupAdmitted()) 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) => {
+			shouldYieldDraftCommentary = isActive;
+		},
+		onNarrationUpdate: draftPreview.narrationProgressEnabled ? async (payload) => {
+			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 false;
+			await params.reactions.controller.setThinking();
+			return await draftPreview.pushReasoningProgress(payload?.text, { snapshot: payload?.isReasoningSnapshot === true });
+		},
+		streamReasoningInNonStreamModes: reasoningWindowEnabled,
+		onToolStart: async (payload) => {
+			if (isProcessAborted$1(abortSignal)) return false;
+			await params.reactions.maybeBindToToolReaction(payload);
+			await params.reactions.controller.setTool(payload.name);
+			return await draftPreview.pushToolEvent(payload);
+		},
+		onItemEvent: async (payload) => {
+			if (isFailedProgress(payload)) return false;
+			if (payload.kind === "preamble") {
+				if (shouldYieldDraftCommentary()) return;
+				return await draftPreview.pushPreambleItemEvent(payload);
 			}
+			return await draftPreview.pushItemEvent(payload);
 		},
-		buildProgressSummaryLine
-	};
+		onPlanUpdate: async (payload) => {
+			if (payload.phase === "update") return await draftPreview.pushPlanProgress(payload.steps, { explanation: payload.explanation });
+			return false;
+		},
+		onApprovalEvent: async (payload) => {
+			return await draftPreview.pushApprovalEvent(payload);
+		},
+		onCommandOutput: async (payload) => {
+			if (isFailedProgress(payload)) return false;
+			return await draftPreview.pushCommandOutputEvent(payload);
+		},
+		onPatchSummary: async (payload) => {
+			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;
+		}
+	} };
 }
 //#endregion
 //#region extensions/discord/src/monitor/ack-reactions.ts
@@ -1029,7 +965,6 @@ function createDiscordDraftStream(params) {
 //#endregion
 //#region extensions/discord/src/preview-streaming.ts
 function resolveDiscordPreviewStreamMode(params = {}) {
-	if (params.streaming === void 0) return "progress";
 	return resolveChannelPreviewStreamMode(params, "off");
 }
 //#endregion
@@ -1039,9 +974,13 @@ function createDiscordDraftPreviewController(params) {
 	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 = allowProviderPreview && (!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,
@@ -1059,7 +998,7 @@ function createDiscordDraftPreviewController(params) {
 	let draftText = "";
 	let hasStreamedMessage = false;
 	let finalizedViaPreviewMessage = false;
-	let finalReplyDelivered = false;
+	let finalReplyError;
 	let progressDraftStartedBeforeFinal = false;
 	let progressDraftCollapsed = false;
 	let progressNarratorLifecycle;
@@ -1080,13 +1019,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 = "";
@@ -1111,7 +1053,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;
+			finalReplyError = void 0;
+			finalizedViaPreviewMessage = false;
+			progressNarratorLifecycle?.beginTurn();
+		}
+		if (discordStreamMode === "progress") {
+			if (beganNewTurn) draftStream?.forceNewMessage("discard");
+		} else forceNewMessageIfNeeded();
+		return beganNewTurn;
 	};
 	return {
 		draftStream,
@@ -1147,8 +1104,8 @@ function createDiscordDraftPreviewController(params) {
 			progressDraft.markFinalReplyStarted();
 			progressNarratorLifecycle?.stopTurn();
 		},
-		markFinalReplyDelivered() {
-			finalReplyDelivered = true;
+		markFinalReplyDelivered(isError = false) {
+			finalReplyError = isError;
 			progressDraft.markFinalReplyDelivered();
 		},
 		markPreviewFinalized() {
@@ -1157,40 +1114,43 @@ function createDiscordDraftPreviewController(params) {
 		async retarget(channelId) {
 			await draftStream?.retarget(channelId);
 		},
-		async finalizeProgressReceipt(receiptLine) {
+		async finalizeProgressDraft() {
 			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);
+			if (!progressText) return false;
+			draftStream.update(progressText);
 			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);
+		async pushPreambleItemEvent(payload) {
+			const headlineAccepted = await 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) {
-			await progressDraft.pushCommentaryProgress(text, options);
+			return await progressDraft.pushCommentaryProgress(text, options);
 		},
 		resolvePreviewFinalText(text) {
 			if (typeof text !== "string") return;
@@ -1248,20 +1208,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;
@@ -1280,8 +1230,8 @@ function createDiscordDraftPreviewController(params) {
 		async cleanup() {
 			try {
 				progressDraft.cancel();
-				if (!finalReplyDelivered) await draftStream?.discardPending();
-				if (!finalizedViaPreviewMessage && draftStream?.messageId()) await draftStream.clear();
+				if (finalReplyError !== false) await draftStream?.discardPending();
+				if (finalReplyError !== true && !finalizedViaPreviewMessage && draftStream?.messageId()) await draftStream.clear();
 				await draftStream?.cleanupRetargeted();
 			} catch (err) {
 				params.log(`discord: draft cleanup failed: ${String(err)}`);
@@ -1391,7 +1341,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
@@ -1451,16 +1401,6 @@ 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;
@@ -1510,7 +1450,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, canonicalMessageId, 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) {
@@ -1527,7 +1467,7 @@ async function processDiscordMessageInner(ctx, observer) {
 		}
 	});
 	const sourceRepliesAreToolOnly = sourceReplyDeliveryMode === "message_tool_only";
-	const configuredTypingMode = resolveAgentConfig(cfg, route.agentId)?.typingMode ?? cfg.agents?.defaults?.typingMode;
+	const configuredTypingMode = resolveAgentConfig$1(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);
@@ -1549,7 +1489,7 @@ async function processDiscordMessageInner(ctx, observer) {
 		sessionKey: ctxPayload.SessionKey,
 		accountId,
 		sourceChannelId: messageChannelId,
-		sourceMessageId: canonicalMessageId ?? message.id,
+		sourceMessageId: ctx.canonicalMessageId ?? message.id,
 		sourceReplyReference,
 		log: logVerbose
 	});
@@ -1587,21 +1527,21 @@ async function processDiscordMessageInner(ctx, observer) {
 	let userFacingFinalDelivered = false;
 	let userFacingFinalDeliveryFailed = false;
 	let pendingToolWarningFinal;
-	const markUserFacingFinalDelivered = () => {
-		userFacingFinalDelivered = true;
-		userFacingFinalDeliveryFailed = false;
-		pendingToolWarningFinal = void 0;
-		draftPreview.markFinalReplyDelivered();
-		observer?.onFinalReplyDelivered?.();
+	const markFinalReplyDelivered = (isError = false) => {
+		draftPreview.markFinalReplyDelivered(isError);
+		if (!isError) {
+			userFacingFinalDelivered = true;
+			userFacingFinalDeliveryFailed = false;
+			pendingToolWarningFinal = void 0;
+			observer?.onFinalReplyDelivered?.();
+		}
 	};
-	let progressReceiptLine;
 	let clearProgressDraftAfterFinalDelivery = false;
 	const resetDeliveryState = () => {
 		finalReplyStartNotified = false;
 		userFacingFinalDelivered = false;
 		userFacingFinalDeliveryFailed = false;
 		pendingToolWarningFinal = void 0;
-		progressReceiptLine = void 0;
 		clearProgressDraftAfterFinalDelivery = false;
 	};
 	const progress = createDiscordMessageProgressRuntime({
@@ -1668,7 +1608,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;
@@ -1705,7 +1646,6 @@ async function processDiscordMessageInner(ctx, observer) {
 		}
 		if (draftStream && isFinal && draftPreview.isProgressMode && !deliverablePayload.isError && draftPreview.hasProgressDraftToCollapse && draftStream) {
 			await draftPreview.flush();
-			progressReceiptLine = progress.buildProgressSummaryLine();
 			clearProgressDraftAfterFinalDelivery = true;
 		}
 		if (draftStream && isFinal && !draftPreview.isProgressMode && !deliverablePayload.isError) {
@@ -1732,7 +1672,7 @@ async function processDiscordMessageInner(ctx, observer) {
 						});
 					},
 					onPreviewFinalized: () => {
-						markUserFacingFinalDelivered();
+						markFinalReplyDelivered();
 						draftPreview.markPreviewFinalized();
 						replyReference.markSent();
 					},
@@ -1767,11 +1707,12 @@ async function processDiscordMessageInner(ctx, observer) {
 						threadBindings,
 						mediaLocalRoots,
 						allowedMentions,
-						kind: info.kind
+						kind: info.kind,
+						bindPendingFinalDelivery: info.bindPendingFinalDelivery
 					})).visibleReplySent;
 				},
 				onNormalDelivered: () => {
-					markUserFacingFinalDelivered();
+					markFinalReplyDelivered();
 					replyReference.markSent();
 				}
 			})).kind !== "normal-skipped") return { visibleReplySent: true };
@@ -1787,14 +1728,9 @@ async function processDiscordMessageInner(ctx, observer) {
 		}
 		const replyToId = replyReference.use();
 		if (isFinal) notifyFinalReplyStart();
-		const receiptLine = isFinal && deliverablePayload.isError !== true ? progressReceiptLine : void 0;
-		const payloadForDelivery = receiptLine ? {
-			...deliverablePayload,
-			text: deliverablePayload.text?.trim() ? `${deliverablePayload.text.trimEnd()}\n${receiptLine}` : receiptLine
-		} : deliverablePayload;
 		const result = await deliverDiscordReply({
 			cfg,
-			replies: [payloadForDelivery],
+			replies: [deliverablePayload],
 			target: deliverTarget,
 			token,
 			accountId,
@@ -1809,18 +1745,16 @@ 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();
-		if (isFinal && deliverablePayload.isError !== true) {
-			if (receiptLine) {
-				progressReceiptLine = void 0;
-				draftPreview.markProgressDraftCollapsed();
-			}
-			markUserFacingFinalDelivered();
-			if (clearProgressDraftAfterFinalDelivery) {
+		if (isFinal) {
+			markFinalReplyDelivered(deliverablePayload.isError === true);
+			if (deliverablePayload.isError !== true && clearProgressDraftAfterFinalDelivery) {
 				clearProgressDraftAfterFinalDelivery = false;
+				draftPreview.markProgressDraftCollapsed();
 				await draftStream?.discardPending();
 				await draftStream?.clear();
 			}
@@ -1891,13 +1825,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,
@@ -1917,8 +1851,12 @@ async function processDiscordMessageInner(ctx, observer) {
 		}
 		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();
+			if (draftPreview.hasProgressDraftToCollapse) try {
+				await draftPreview.finalizeProgressDraft();
+			} catch (error) {
+				logVerbose(`discord: failed to finalize adopted thread progress (${String(error)})`);
+			}
+			markFinalReplyDelivered();
 		}
 	} catch (err) {
 		if (isProcessAborted(abortSignal)) {
@@ -1932,7 +1870,9 @@ async function processDiscordMessageInner(ctx, observer) {
 		activeThreadRoute.end();
 		endDeliveryCorrelation();
 		await draftPreview.cleanup();
-		const finalDeliveryFailed = (dispatchResult?.failedCounts?.final ?? 0) > 0;
+		dispatchError ||= readAgentRunTerminalOutcome(dispatchResult) === "failed";
+		const finalReceipt = dispatchResult?.settledReceipt?.counts.final;
+		const finalDeliveryFailed = (finalReceipt?.failedBeforeSend ?? 0) + (finalReceipt?.failedAfterSend ?? 0) > 0;
 		await reactions.finish({
 			dispatchAborted,
 			dispatchError,
@@ -1943,7 +1883,7 @@ async function processDiscordMessageInner(ctx, observer) {
 	const finalDispatchResult = dispatchResult;
 	if (!finalDispatchResult || !hasFinalInboundReplyDispatch(finalDispatchResult)) return;
 	if (shouldLogVerbose()) {
-		const finalCount = finalDispatchResult.counts.final;
+		const finalCount = finalDispatchResult.settledReceipt?.counts.final.delivered ?? 0;
 		logVerbose(`discord: delivered ${finalCount} reply${finalCount === 1 ? "" : "ies"} to ${replyTarget}`);
 	}
 }