@openclaw/discord 2026.5.26 → 2026.5.27-beta.1

package/dist/{message-handler.process-DO17vBlT.js → message-handler.process-HWGh2NOP.js}

@@ -1,39 +1,36 @@
-import { Ut as resolveDiscordChannelId, c as discord_exports, ft as editChannelMessage, s as chunkDiscordTextWithMode, st as createChannelMessage, ut as deleteChannelMessage } from "./send.receipt-D_6lR7zH.js";
+import { Ut as resolveDiscordChannelId, c as discord_exports, ft as editChannelMessage, s as chunkDiscordTextWithMode, st as createChannelMessage, ut as deleteChannelMessage } from "./send.receipt-BzfsP3Bb.js";
 import { f as resolveDiscordMaxLinesPerMessage } from "./accounts-dXTfmnSZ.js";
-import { N as createDiscordRestClient, P as createDiscordRuntimeAccountContext, _ as resolveDiscordMessageFlags, d as resolveDiscordTargetChannelId } from "./send.shared-aYGYz83q.js";
+import { I as createDiscordRestClient, L as createDiscordRuntimeAccountContext, _ as resolveDiscordMessageFlags, d as resolveDiscordTargetChannelId } from "./send.shared-ehnDGwXx.js";
 import { S as resolveTimestampMs, a as normalizeDiscordSlug, r as normalizeDiscordAllowList } from "./allow-list-BnkWtVpA.js";
-import { a as removeReactionDiscord, f as editMessageDiscord, r as reactMessageDiscord } from "./send-CM1NFFrZ.js";
-import "./targets-CNDNKpqQ.js";
-import { t as resolveDiscordConversationIdentity } from "./conversation-identity-Be5JQPP9.js";
+import { a as removeReactionDiscord, f as editMessageDiscord, r as reactMessageDiscord } from "./send-BzXZ8iUI.js";
+import "./targets-BBVHRaeO.js";
+import { t as resolveDiscordConversationIdentity } from "./conversation-identity-DAEgiGDV.js";
 import { t as beginDiscordInboundEventDeliveryCorrelation } from "./inbound-event-delivery-CEPlt2uz.js";
-import { t as DISCORD_TEXT_CHUNK_LIMIT } from "./outbound-adapter-C8lzfSt6.js";
-import { t as resolveDiscordPreviewStreamMode } from "./preview-streaming-CQ7PsV9J.js";
+import { t as DISCORD_TEXT_CHUNK_LIMIT } from "./outbound-adapter-DYUYRaBd.js";
+import { t as resolveDiscordPreviewStreamMode } from "./preview-streaming-DXT8oJdo.js";
 import { n as DISCORD_ATTACHMENT_TOTAL_TIMEOUT_MS, t as DISCORD_ATTACHMENT_IDLE_TIMEOUT_MS } from "./timeouts-l_PsHQvX.js";
-import { a as resolveReplyContext, i as buildGuildLabel, n as deliverDiscordReply, r as buildDirectLabel, x as resolveDiscordThreadStarter, y as resolveDiscordAutoThreadReplyPlan } from "./provider-D3RwHRhI.js";
-import { a as resolveForwardedMediaList, o as resolveMediaList, r as resolveDiscordMessageText, s as resolveReferencedReplyMediaList } from "./message-utils-DxHZcpPf.js";
-import { t as sendTyping } from "./typing-BhIpRSfR.js";
+import { a as resolveReplyContext, i as buildGuildLabel, n as deliverDiscordReply, r as buildDirectLabel, x as resolveDiscordThreadStarter, y as resolveDiscordAutoThreadReplyPlan } from "./provider-CO6pih5z.js";
+import { a as resolveForwardedMediaList, o as resolveMediaList, r as resolveDiscordMessageText, s as resolveReferencedReplyMediaList } from "./message-utils-4w0_DPFE.js";
+import { t as sendTyping } from "./typing-Cv09OhaY.js";
 import { n as buildDiscordInboundAccessContext, r as createDiscordSupplementalContextAccessChecker } from "./inbound-context-B5EsqsSr.js";
 import { buildAgentSessionKey, normalizeAccountId, resolveAccountEntry, resolveThreadSessionKeys } from "openclaw/plugin-sdk/routing";
 import { MessageFlags } from "discord-api-types/v10";
 import path from "node:path";
 import { evaluateSupplementalContextVisibility } from "openclaw/plugin-sdk/security-runtime";
 import { getAgentScopedMediaLocalRoots } from "openclaw/plugin-sdk/media-runtime";
-import { buildTtsSupplementMediaPayload, getReplyPayloadTtsSupplement, resolveSendableOutboundReplyParts } from "openclaw/plugin-sdk/reply-payload";
+import { buildTtsSupplementMediaPayload, getReplyPayloadTtsSupplement, isReplyPayloadNonTerminalToolErrorWarning, resolveSendableOutboundReplyParts } from "openclaw/plugin-sdk/reply-payload";
 import { resolveChunkMode, resolveTextChunkLimit } from "openclaw/plugin-sdk/reply-chunking";
 import { danger, logVerbose, shouldLogVerbose } from "openclaw/plugin-sdk/runtime-env";
 import { formatErrorMessage } from "openclaw/plugin-sdk/error-runtime";
 import { resolveMarkdownTableMode } from "openclaw/plugin-sdk/markdown-table-runtime";
 import { convertMarkdownTables, stripInlineDirectiveTagsForDelivery, stripReasoningTagsFromText } from "openclaw/plugin-sdk/text-chunking";
-import { createChannelMessageReplyPipeline, defineFinalizableLivePreviewAdapter, deliverWithFinalizableLivePreviewAdapter, resolveChannelMessageSourceReplyDeliveryMode } from "openclaw/plugin-sdk/channel-message";
-import { buildChannelProgressDraftLine, buildChannelProgressDraftLineForEntry, createChannelProgressDraftGate, formatChannelProgressDraftText, isChannelProgressDraftWorkToolName, mergeChannelProgressDraftLine, normalizeChannelProgressDraftLineIdentity, resolveChannelProgressDraftMaxLines, resolveChannelStreamingBlockEnabled, resolveChannelStreamingPreviewChunk, resolveChannelStreamingPreviewToolProgress, resolveChannelStreamingSuppressDefaultToolProgressMessages, resolveTranscriptBackedChannelFinalText } from "openclaw/plugin-sdk/channel-streaming";
+import { buildChannelProgressDraftLine, buildChannelProgressDraftLineForEntry, createChannelMessageReplyPipeline, createChannelProgressDraftGate, createFinalizableDraftLifecycle, defineFinalizableLivePreviewAdapter, deliverWithFinalizableLivePreviewAdapter, formatChannelProgressDraftText, isChannelProgressDraftWorkToolName, mergeChannelProgressDraftLine, normalizeChannelProgressDraftLineIdentity, resolveChannelMessageSourceReplyDeliveryMode, resolveChannelProgressDraftMaxLines, resolveChannelStreamingBlockEnabled, resolveChannelStreamingPreviewChunk, resolveChannelStreamingPreviewToolProgress, resolveChannelStreamingSuppressDefaultToolProgressMessages, resolveTranscriptBackedChannelFinalText } from "openclaw/plugin-sdk/channel-outbound";
 import { recordInboundSession, resolvePinnedMainDmOwnerFromAllowlist } from "openclaw/plugin-sdk/conversation-runtime";
 import { EmbeddedBlockChunker, formatReasoningMessage, resolveAckReaction, resolveHumanDelayConfig } from "openclaw/plugin-sdk/agent-runtime";
 import { truncateUtf16Safe } from "openclaw/plugin-sdk/text-utility-runtime";
 import { isDangerousNameMatchingEnabled } from "openclaw/plugin-sdk/dangerous-name-runtime";
 import { loadSessionStore, readLatestAssistantTextFromSessionTranscript, readSessionUpdatedAt, resolveAndPersistSessionFile, resolveSessionStoreEntry, resolveStorePath } from "openclaw/plugin-sdk/session-store-runtime";
-import { buildChannelInboundEventContext, formatInboundEnvelope, resolveEnvelopeFormatOptions, toHistoryMediaEntries, toInboundMediaFacts } from "openclaw/plugin-sdk/channel-inbound";
-import { createFinalizableDraftLifecycle } from "openclaw/plugin-sdk/channel-lifecycle";
-import { hasFinalInboundReplyDispatch, recordChannelBotPairLoopAndCheckSuppression, runPreparedInboundReplyTurn } from "openclaw/plugin-sdk/inbound-reply-dispatch";
+import { buildChannelInboundEventContext, dispatchChannelInboundReply, formatInboundEnvelope, hasFinalInboundReplyDispatch, recordChannelBotPairLoopAndCheckSuppression, resolveEnvelopeFormatOptions, toHistoryMediaEntries, toInboundMediaFacts } from "openclaw/plugin-sdk/channel-inbound";
 import { DEFAULT_TIMING, createStatusReactionController, logAckFailure, logTypingFailure, shouldAckReaction } from "openclaw/plugin-sdk/channel-feedback";
 import { createChannelHistoryWindow } from "openclaw/plugin-sdk/reply-history";
 import { resolveChannelContextVisibilityMode } from "openclaw/plugin-sdk/context-visibility-runtime";
@@ -165,30 +162,18 @@ async function buildDiscordMessageProcessContext(params) {
 		})
 	});
 	const replyContext = resolveReplyContext(message, resolveDiscordMessageText);
-	const replyVisibility = replyContext ? evaluateSupplementalContextVisibility({
+	const replySenderAllowed = replyContext ? isSupplementalContextSenderAllowed({
+		id: replyContext.senderId,
+		name: replyContext.senderName,
+		tag: replyContext.senderTag,
+		memberRoleIds: replyContext.memberRoleIds
+	}) : true;
+	const replyVisible = evaluateSupplementalContextVisibility({
 		mode: contextVisibilityMode,
 		kind: "quote",
-		senderAllowed: isSupplementalContextSenderAllowed({
-			id: replyContext.senderId,
-			name: replyContext.senderName,
-			tag: replyContext.senderTag,
-			memberRoleIds: replyContext.memberRoleIds
-		})
-	}) : null;
-	const filteredReplyContext = replyContext && replyVisibility?.include ? replyContext : null;
-	const replyContextForPromptBody = Boolean(botUserId && filteredReplyContext?.senderId === botUserId) ? null : filteredReplyContext;
-	if (replyContext && !filteredReplyContext && isGuildMessage) logVerbose(`discord: drop reply context (mode=${contextVisibilityMode})`);
-	const mediaListForContext = [...mediaList];
-	if (replyContextForPromptBody) {
-		const referencedReplyMediaList = await resolveReferencedReplyMediaList(message, mediaMaxBytes, {
-			fetchImpl: discordRestFetch,
-			ssrfPolicy: cfg.browser?.ssrfPolicy,
-			readIdleTimeoutMs: DISCORD_ATTACHMENT_IDLE_TIMEOUT_MS,
-			totalTimeoutMs: DISCORD_ATTACHMENT_TOTAL_TIMEOUT_MS,
-			abortSignal
-		});
-		if (!isContextAborted(abortSignal)) mediaListForContext.push(...referencedReplyMediaList);
-	}
+		senderAllowed: replySenderAllowed
+	}).include;
+	if (replyContext && !replyVisible && isGuildMessage) logVerbose(`discord: drop reply context (mode=${contextVisibilityMode})`);
 	if (forumContextLine) combinedBody = `${combinedBody}\n${forumContextLine}`;
 	let threadStarterBody;
 	let threadLabel;
@@ -230,7 +215,7 @@ async function buildDiscordMessageProcessContext(params) {
 		}
 		if (!threadParentInheritanceEnabled) parentSessionKey = void 0;
 	}
-	const preflightAudioIndex = preflightAudioTranscript === void 0 ? -1 : mediaListForContext.findIndex((media) => media.contentType?.startsWith("audio/"));
+	const preflightAudioIndex = preflightAudioTranscript === void 0 ? -1 : mediaList.findIndex((media) => media.contentType?.startsWith("audio/"));
 	const threadKeys = resolveThreadSessionKeys({
 		baseSessionKey,
 		threadId: threadChannel ? messageChannelId : void 0,
@@ -280,10 +265,10 @@ async function buildDiscordMessageProcessContext(params) {
 		storePath,
 		sessionKey: effectiveSessionKey
 	});
-	const ctxPayload = buildChannelInboundEventContext({
+	const ctxPayload = await buildChannelInboundEventContext({
 		channel: "discord",
-		provider: "discord",
-		surface: "discord",
+		resolveSupplementalMedia: true,
+		contextVisibility: contextVisibilityMode,
 		accountId: route.accountId,
 		messageId: canonicalMessageId ?? message.id,
 		messageIdFull: canonicalMessageId && canonicalMessageId !== message.id ? message.id : void 0,
@@ -302,11 +287,7 @@ async function buildDiscordMessageProcessContext(params) {
 			id: messageChannelId,
 			label: fromLabel,
 			spaceId: isGuildMessage ? (guildInfo?.id ?? guildSlug) || void 0 : void 0,
-			threadId: threadChannel?.id ?? autoThreadContext?.createdThreadId ?? void 0,
-			routePeer: {
-				kind: isDirectMessage ? "direct" : "channel",
-				id: isDirectMessage ? author.id : messageChannelId
-			}
+			threadId: threadChannel?.id ?? autoThreadContext?.createdThreadId ?? void 0
 		},
 		route: {
 			agentId: route.agentId,
@@ -318,7 +299,7 @@ async function buildDiscordMessageProcessContext(params) {
 		},
 		reply: {
 			to: effectiveTo,
-			originatingTo
+			...originatingTo !== effectiveTo ? { originatingTo } : {}
 		},
 		message: {
 			inboundEventKind: ctx.inboundEventKind,
@@ -326,7 +307,6 @@ async function buildDiscordMessageProcessContext(params) {
 			rawBody: preflightAudioTranscript ?? baseText,
 			bodyForAgent: preflightAudioTranscript ?? baseText ?? text,
 			commandBody: preflightAudioTranscript ?? baseText,
-			envelopeFrom: fromLabel,
 			inboundHistory
 		},
 		access: {
@@ -337,12 +317,7 @@ async function buildDiscordMessageProcessContext(params) {
 				requireMention: ctx.shouldRequireMention,
 				effectiveWasMentioned: ctx.effectiveWasMentioned
 			},
-			commands: {
-				authorized: commandAuthorized,
-				allowTextCommands: ctx.allowTextCommands,
-				useAccessGroups: false,
-				authorizers: []
-			}
+			commands: { authorized: commandAuthorized }
 		},
 		commandTurn: {
 			kind: "text-slash",
@@ -350,16 +325,29 @@ async function buildDiscordMessageProcessContext(params) {
 			authorized: commandAuthorized,
 			body: preflightAudioTranscript ?? baseText
 		},
-		media: toInboundMediaFacts(mediaListForContext, { transcribed: (_media, index) => index === preflightAudioIndex }),
+		media: toInboundMediaFacts(mediaList, { transcribed: (_media, index) => index === preflightAudioIndex }),
 		supplemental: {
-			quote: filteredReplyContext ? {
-				id: filteredReplyContext.id,
-				body: replyContextForPromptBody?.body,
-				sender: filteredReplyContext.sender
+			quote: replyContext && replyVisible ? {
+				id: replyContext.id,
+				body: replyContext.body,
+				sender: replyContext.sender,
+				senderAllowed: replySenderAllowed,
+				isSelf: Boolean(botUserId && replyContext.senderId === botUserId),
+				media: async () => {
+					const referencedReplyMediaList = await resolveReferencedReplyMediaList(message, mediaMaxBytes, {
+						fetchImpl: discordRestFetch,
+						ssrfPolicy: cfg.browser?.ssrfPolicy,
+						readIdleTimeoutMs: DISCORD_ATTACHMENT_IDLE_TIMEOUT_MS,
+						totalTimeoutMs: DISCORD_ATTACHMENT_TOTAL_TIMEOUT_MS,
+						abortSignal
+					});
+					return isContextAborted(abortSignal) ? [] : toInboundMediaFacts(referencedReplyMediaList);
+				}
 			} : void 0,
 			thread: {
 				starterBody: !effectivePreviousTimestamp ? threadStarterBody : void 0,
-				label: threadLabel
+				label: threadLabel,
+				senderAllowed: true
 			},
 			groupSystemPrompt: isGuildMessage ? groupSystemPrompt : void 0
 		},
@@ -809,6 +797,10 @@ function formatDiscordReplyDeliveryFailure(params) {
 	const context = [`target=${params.target}`, params.sessionKey ? `session=${params.sessionKey}` : void 0].filter(Boolean).join(" ");
 	return `discord ${params.kind} reply failed (${context}): ${String(params.err)}`;
 }
+function isFallbackOnlyToolWarningFinal(payload) {
+	if (payload.isError !== true || !isReplyPayloadNonTerminalToolErrorWarning(payload)) return false;
+	return !resolveSendableOutboundReplyParts(payload).hasMedia;
+}
 function formatDiscordReplySkip(params) {
 	const context = [`target=${params.target}`, params.sessionKey ? `session=${params.sessionKey}` : void 0].filter(Boolean).join(" ");
 	return `discord ${params.kind} reply skipped (${params.reason}): ${context}`;
@@ -850,7 +842,7 @@ async function processDiscordMessage(ctx, observer) {
 	}
 	const boundThreadId = ctx.threadBinding?.conversation?.conversationId?.trim();
 	if (boundThreadId && typeof threadBindings.touchThread === "function") threadBindings.touchThread({ threadId: boundThreadId });
-	const { createReplyDispatcherWithTyping, dispatchInboundMessage, settleReplyDispatcher } = await loadReplyRuntime();
+	const { dispatchReplyWithBufferedBlockDispatcher } = await loadReplyRuntime();
 	const sourceReplyDeliveryMode = resolveChannelMessageSourceReplyDeliveryMode({
 		cfg,
 		ctx: {
@@ -1090,128 +1082,133 @@ async function processDiscordMessage(ctx, observer) {
 		draftPreview.markFinalReplyStarted();
 		observer?.onFinalReplyStart?.();
 	};
-	const { dispatcher, replyOptions, markDispatchIdle, markRunComplete } = createReplyDispatcherWithTyping({
-		...replyPipeline,
-		humanDelay: resolveHumanDelayConfig(cfg, route.agentId),
-		deliver: async (payload, info) => {
-			if (isProcessAborted(abortSignal)) {
-				logVerbose(formatDiscordReplySkip({
-					kind: info.kind,
-					reason: "aborted before delivery",
-					target: deliverTarget,
-					sessionKey: ctxPayload.SessionKey
-				}));
-				return;
-			}
-			const isFinal = info.kind === "final";
-			if (payload.isReasoning) {
-				logVerbose(formatDiscordReplySkip({
-					kind: info.kind,
-					reason: "reasoning payload",
-					target: deliverTarget,
-					sessionKey: ctxPayload.SessionKey
-				}));
-				return;
-			}
-			if (isFinal) draftPreview.markFinalReplyStarted();
-			const finalText = isFinal && typeof payload.text === "string" ? await resolveTranscriptBackedChannelFinalText({
-				finalText: payload.text,
-				resolveCandidateText: resolveCurrentTurnTranscriptFinalText
-			}) : payload.text;
-			const effectivePayload = finalText !== payload.text ? {
-				...payload,
-				text: finalText
-			} : payload;
-			const draftStream = draftPreview.draftStream;
-			if (draftStream && draftPreview.isProgressMode && info.kind === "block") {
-				if (!resolveSendableOutboundReplyParts(effectivePayload).hasMedia && !payload.isError) return;
-			}
-			if (draftStream && isFinal && (!draftPreview.isProgressMode || draftPreview.hasProgressDraftStarted) && !payload.isError) {
-				const hasMedia = resolveSendableOutboundReplyParts(effectivePayload).hasMedia;
-				const ttsSupplement = getReplyPayloadTtsSupplement(effectivePayload);
-				const previewSourceText = finalText ?? ttsSupplement?.spokenText;
-				const previewFinalText = draftPreview.resolvePreviewFinalText(previewSourceText);
-				const previewReplyToId = replyReference.peek();
-				const hasExplicitReplyDirective = Boolean(effectivePayload.replyToTag || effectivePayload.replyToCurrent) || typeof previewSourceText === "string" && /\[\[\s*reply_to(?:_current|\s*:)/i.test(previewSourceText);
-				if ((await deliverWithFinalizableLivePreviewAdapter({
-					kind: info.kind,
-					payload: effectivePayload,
-					adapter: defineFinalizableLivePreviewAdapter({
-						draft: {
-							flush: () => draftPreview.flush(),
-							clear: () => draftStream.clear(),
-							discardPending: () => draftStream.discardPending(),
-							seal: () => draftStream.seal(),
-							id: draftStream.messageId
-						},
-						buildFinalEdit: () => {
-							if (draftPreview.finalizedViaPreviewMessage || hasMedia && !ttsSupplement || typeof previewFinalText !== "string" || hasExplicitReplyDirective || payload.isError) return;
-							return {
-								content: previewFinalText,
-								...finalPreviewFlags ? { flags: finalPreviewFlags } : {}
-							};
-						},
-						editFinal: async (previewMessageId, edit) => {
-							if (isProcessAborted(abortSignal)) throw new Error("process aborted");
-							notifyFinalReplyStart();
-							await editMessageDiscord(deliverChannelId, previewMessageId, edit, {
-								cfg,
-								accountId,
-								rest: deliveryRest
-							});
-						},
-						onPreviewFinalized: () => {
-							draftPreview.markFinalReplyDelivered();
-							draftPreview.markPreviewFinalized();
-							replyReference.markSent();
-							observer?.onFinalReplyDelivered?.();
-						},
-						buildSupplementalPayload: () => ttsSupplement ? buildTtsSupplementMediaPayload(effectivePayload) : void 0,
-						deliverSupplemental: async (supplementalPayload) => {
-							if (isProcessAborted(abortSignal)) return false;
-							const supplementalReplyToId = previewReplyToId ?? replyReference.peek() ?? (replyToMode === "all" ? typeof message.id === "string" && message.id ? message.id : ctxPayload.MessageSid : void 0);
-							await deliverDiscordReply({
-								cfg,
-								replies: [supplementalPayload],
-								target: deliverTarget,
-								token,
-								accountId,
-								rest: deliveryRest,
-								runtime,
-								replyToId: supplementalReplyToId,
-								replyToMode,
-								textLimit,
-								maxLinesPerMessage,
-								tableMode,
-								chunkMode,
-								sessionKey: ctxPayload.SessionKey,
-								threadBindings,
-								mediaLocalRoots,
-								kind: info.kind
-							});
-							return true;
-						},
-						logPreviewEditFailure: (err) => {
-							logVerbose(`discord: preview final edit failed; falling back to standard send (${String(err)})`);
-						}
-					}),
-					deliverNormally: async () => {
-						if (isProcessAborted(abortSignal)) return false;
-						const fallbackPayload = ttsSupplement && ttsSupplement.visibleTextAlreadyDelivered !== true && !effectivePayload.text?.trim() ? {
-							...effectivePayload,
-							text: ttsSupplement.spokenText
-						} : effectivePayload;
-						const replyToId = replyReference.use();
+	let userFacingFinalDelivered = false;
+	let userFacingFinalDeliveryFailed = false;
+	let pendingToolWarningFinal;
+	const markUserFacingFinalDelivered = () => {
+		userFacingFinalDelivered = true;
+		userFacingFinalDeliveryFailed = false;
+		pendingToolWarningFinal = void 0;
+		draftPreview.markFinalReplyDelivered();
+		observer?.onFinalReplyDelivered?.();
+	};
+	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) {
+			logVerbose(formatDiscordReplySkip({
+				kind: info.kind,
+				reason: "reasoning payload",
+				target: deliverTarget,
+				sessionKey: ctxPayload.SessionKey
+			}));
+			return null;
+		}
+		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 deliverDiscordPayload = async (payload, info, options) => {
+		if (isProcessAborted(abortSignal)) {
+			logVerbose(formatDiscordReplySkip({
+				kind: info.kind,
+				reason: "aborted before delivery",
+				target: deliverTarget,
+				sessionKey: ctxPayload.SessionKey
+			}));
+			return { visibleReplySent: false };
+		}
+		const isFinal = info.kind === "final";
+		if (payload.isReasoning) {
+			logVerbose(formatDiscordReplySkip({
+				kind: info.kind,
+				reason: "reasoning payload",
+				target: deliverTarget,
+				sessionKey: ctxPayload.SessionKey
+			}));
+			return { visibleReplySent: false };
+		}
+		if (isFinal && !options?.allowFallbackOnlyToolWarning && isFallbackOnlyToolWarningFinal(payload)) {
+			if (!userFacingFinalDelivered && (!finalReplyStartNotified || userFacingFinalDeliveryFailed)) pendingToolWarningFinal = {
+				payload,
+				info
+			};
+			return { visibleReplySent: false };
+		}
+		if (isFinal) draftPreview.markFinalReplyStarted();
+		const finalText = isFinal && typeof payload.text === "string" ? await resolveTranscriptBackedChannelFinalText({
+			finalText: payload.text,
+			resolveCandidateText: resolveCurrentTurnTranscriptFinalText
+		}) : payload.text;
+		const effectivePayload = finalText !== payload.text ? {
+			...payload,
+			text: finalText
+		} : payload;
+		const draftStream = draftPreview.draftStream;
+		if (draftStream && draftPreview.isProgressMode && info.kind === "block") {
+			if (!resolveSendableOutboundReplyParts(effectivePayload).hasMedia && !payload.isError) return { visibleReplySent: false };
+		}
+		if (draftStream && isFinal && (!draftPreview.isProgressMode || draftPreview.hasProgressDraftStarted) && !payload.isError) {
+			const hasMedia = resolveSendableOutboundReplyParts(effectivePayload).hasMedia;
+			const ttsSupplement = getReplyPayloadTtsSupplement(effectivePayload);
+			const previewSourceText = finalText ?? ttsSupplement?.spokenText;
+			const previewFinalText = draftPreview.resolvePreviewFinalText(previewSourceText);
+			const previewReplyToId = replyReference.peek();
+			const hasExplicitReplyDirective = Boolean(effectivePayload.replyToTag || effectivePayload.replyToCurrent) || typeof previewSourceText === "string" && /\[\[\s*reply_to(?:_current|\s*:)/i.test(previewSourceText);
+			if ((await deliverWithFinalizableLivePreviewAdapter({
+				kind: info.kind,
+				payload: effectivePayload,
+				adapter: defineFinalizableLivePreviewAdapter({
+					draft: {
+						flush: () => draftPreview.flush(),
+						clear: () => draftStream.clear(),
+						discardPending: () => draftStream.discardPending(),
+						seal: () => draftStream.seal(),
+						id: draftStream.messageId
+					},
+					buildFinalEdit: () => {
+						if (draftPreview.finalizedViaPreviewMessage || hasMedia && !ttsSupplement || typeof previewFinalText !== "string" || hasExplicitReplyDirective || payload.isError) return;
+						return {
+							content: previewFinalText,
+							...finalPreviewFlags ? { flags: finalPreviewFlags } : {}
+						};
+					},
+					editFinal: async (previewMessageId, edit) => {
+						if (isProcessAborted(abortSignal)) throw new Error("process aborted");
 						notifyFinalReplyStart();
+						await editMessageDiscord(deliverChannelId, previewMessageId, edit, {
+							cfg,
+							accountId,
+							rest: deliveryRest
+						});
+					},
+					onPreviewFinalized: () => {
+						markUserFacingFinalDelivered();
+						draftPreview.markPreviewFinalized();
+						replyReference.markSent();
+					},
+					buildSupplementalPayload: () => ttsSupplement ? buildTtsSupplementMediaPayload(effectivePayload) : void 0,
+					deliverSupplemental: async (supplementalPayload) => {
+						if (isProcessAborted(abortSignal)) return false;
+						const supplementalReplyToId = previewReplyToId ?? replyReference.peek() ?? (replyToMode === "all" ? typeof message.id === "string" && message.id ? message.id : ctxPayload.MessageSid : void 0);
 						await deliverDiscordReply({
 							cfg,
-							replies: [fallbackPayload],
+							replies: [supplementalPayload],
 							target: deliverTarget,
 							token,
 							accountId,
 							rest: deliveryRest,
 							runtime,
-							replyToId,
+							replyToId: supplementalReplyToId,
 							replyToMode,
 							textLimit,
 							maxLinesPerMessage,
@@ -1224,91 +1221,135 @@ async function processDiscordMessage(ctx, observer) {
 						});
 						return true;
 					},
-					onNormalDelivered: () => {
-						draftPreview.markFinalReplyDelivered();
-						replyReference.markSent();
-						observer?.onFinalReplyDelivered?.();
+					logPreviewEditFailure: (err) => {
+						logVerbose(`discord: preview final edit failed; falling back to standard send (${String(err)})`);
 					}
-				})).kind !== "normal-skipped") return;
-			}
-			if (isProcessAborted(abortSignal)) {
-				logVerbose(formatDiscordReplySkip({
-					kind: info.kind,
-					reason: "aborted before delivery",
-					target: deliverTarget,
-					sessionKey: ctxPayload.SessionKey
-				}));
-				return;
-			}
-			const replyToId = replyReference.use();
-			if (isFinal) notifyFinalReplyStart();
-			await deliverDiscordReply({
-				cfg,
-				replies: [effectivePayload],
-				target: deliverTarget,
-				token,
-				accountId,
-				rest: deliveryRest,
-				runtime,
-				replyToId,
-				replyToMode,
-				textLimit,
-				maxLinesPerMessage,
-				tableMode,
-				chunkMode,
-				sessionKey: ctxPayload.SessionKey,
-				threadBindings,
-				mediaLocalRoots,
-				kind: info.kind
-			});
-			replyReference.markSent();
-			if (isFinal && payload.isError !== true) {
-				draftPreview.markFinalReplyDelivered();
-				observer?.onFinalReplyDelivered?.();
-			}
-		},
-		onError: (err, info) => {
-			runtime.error(danger(formatDiscordReplyDeliveryFailure({
+				}),
+				deliverNormally: async () => {
+					if (isProcessAborted(abortSignal)) return false;
+					const fallbackPayload = ttsSupplement && ttsSupplement.visibleTextAlreadyDelivered !== true && !effectivePayload.text?.trim() ? {
+						...effectivePayload,
+						text: ttsSupplement.spokenText
+					} : effectivePayload;
+					const replyToId = replyReference.use();
+					notifyFinalReplyStart();
+					await deliverDiscordReply({
+						cfg,
+						replies: [fallbackPayload],
+						target: deliverTarget,
+						token,
+						accountId,
+						rest: deliveryRest,
+						runtime,
+						replyToId,
+						replyToMode,
+						textLimit,
+						maxLinesPerMessage,
+						tableMode,
+						chunkMode,
+						sessionKey: ctxPayload.SessionKey,
+						threadBindings,
+						mediaLocalRoots,
+						kind: info.kind
+					});
+					return true;
+				},
+				onNormalDelivered: () => {
+					markUserFacingFinalDelivered();
+					replyReference.markSent();
+				}
+			})).kind !== "normal-skipped") return { visibleReplySent: true };
+		}
+		if (isProcessAborted(abortSignal)) {
+			logVerbose(formatDiscordReplySkip({
 				kind: info.kind,
-				err,
+				reason: "aborted before delivery",
 				target: deliverTarget,
 				sessionKey: ctxPayload.SessionKey
-			})));
-		},
-		onReplyStart: async () => {
-			if (isProcessAborted(abortSignal)) return;
-			await replyPipeline.typingCallbacks?.onReplyStart();
-			await statusReactions.setThinking();
+			}));
+			return { visibleReplySent: false };
 		}
-	});
+		const replyToId = replyReference.use();
+		if (isFinal) notifyFinalReplyStart();
+		await deliverDiscordReply({
+			cfg,
+			replies: [effectivePayload],
+			target: deliverTarget,
+			token,
+			accountId,
+			rest: deliveryRest,
+			runtime,
+			replyToId,
+			replyToMode,
+			textLimit,
+			maxLinesPerMessage,
+			tableMode,
+			chunkMode,
+			sessionKey: ctxPayload.SessionKey,
+			threadBindings,
+			mediaLocalRoots,
+			kind: info.kind
+		});
+		replyReference.markSent();
+		if (isFinal && payload.isError !== true) markUserFacingFinalDelivered();
+		return { visibleReplySent: true };
+	};
+	const onDiscordDeliveryError = (err, info) => {
+		if (info.kind === "final" && finalReplyStartNotified && !userFacingFinalDelivered) userFacingFinalDeliveryFailed = true;
+		runtime.error(danger(formatDiscordReplyDeliveryFailure({
+			kind: info.kind,
+			err,
+			target: deliverTarget,
+			sessionKey: ctxPayload.SessionKey
+		})));
+	};
+	const onDiscordReplyStart = async () => {
+		if (isProcessAborted(abortSignal)) return;
+		await replyPipeline.typingCallbacks?.onReplyStart();
+		await statusReactions.setThinking();
+	};
 	const resolvedBlockStreamingEnabled = resolveChannelStreamingBlockEnabled(discordConfig);
 	let dispatchResult = null;
 	let dispatchError = false;
 	let dispatchAborted = false;
-	let dispatchSettledBeforeStart = false;
-	const settleDispatchBeforeStart = async () => {
-		dispatchSettledBeforeStart = true;
-		await settleReplyDispatcher({
-			dispatcher,
-			onSettled: () => {
-				markRunComplete();
-				markDispatchIdle();
-			}
-		});
+	const deliverPendingToolWarningFinalIfNeeded = async () => {
+		if (!pendingToolWarningFinal || userFacingFinalDelivered || isProcessAborted(abortSignal)) return;
+		const pending = pendingToolWarningFinal;
+		pendingToolWarningFinal = void 0;
+		try {
+			return await deliverDiscordPayload(pending.payload, pending.info, { allowFallbackOnlyToolWarning: true });
+		} catch (err) {
+			dispatchError = true;
+			onDiscordDeliveryError(err, pending.info);
+			return { visibleReplySent: false };
+		}
 	};
 	try {
 		if (isProcessAborted(abortSignal)) {
 			dispatchAborted = true;
-			await settleDispatchBeforeStart();
 			return;
 		}
-		const preparedResult = await runPreparedInboundReplyTurn({
+		const preparedResult = await dispatchChannelInboundReply({
+			cfg,
 			channel: "discord",
 			accountId: route.accountId,
+			agentId: route.agentId,
 			routeSessionKey: persistedSessionKey,
 			storePath: turn.storePath,
 			ctxPayload,
 			recordInboundSession,
+			dispatchReplyWithBufferedBlockDispatcher,
+			dispatcherOptions: {
+				...replyPipeline,
+				humanDelay: resolveHumanDelayConfig(cfg, route.agentId),
+				beforeDeliver: beforeDiscordPayloadDelivery,
+				onReplyStart: onDiscordReplyStart,
+				onFreshSettledDelivery: deliverPendingToolWarningFinalIfNeeded
+			},
+			delivery: {
+				deliver: deliverDiscordPayload,
+				onError: onDiscordDeliveryError
+			},
 			record: turn.record,
 			history: isRoomEvent ? void 0 : {
 				isGroup: isGuildMessage,
@@ -1316,111 +1357,104 @@ async function processDiscordMessage(ctx, observer) {
 				historyMap: guildHistories,
 				limit: historyLimit
 			},
-			onPreDispatchFailure: settleDispatchBeforeStart,
-			runDispatch: async () => await dispatchInboundMessage({
-				ctx: ctxPayload,
-				cfg,
-				dispatcher,
-				replyOptions: {
-					...replyOptions,
-					abortSignal,
-					skillFilter: channelConfig?.skills,
-					sourceReplyDeliveryMode,
-					queuedDeliveryCorrelations: isRoomEvent ? [{ begin: beginDeliveryCorrelation }] : void 0,
-					suppressTyping: isRoomEvent ? true : void 0,
-					allowProgressCallbacksWhenSourceDeliverySuppressed: sourceRepliesAreToolOnly && draftPreview.draftStream && draftPreview.isProgressMode ? true : void 0,
-					disableBlockStreaming: sourceRepliesAreToolOnly ? true : draftPreview.disableBlockStreamingForDraft ?? (typeof resolvedBlockStreamingEnabled === "boolean" ? !resolvedBlockStreamingEnabled : void 0),
-					onPartialReply: draftPreview.draftStream && !draftPreview.isProgressMode ? (payload) => draftPreview.updateFromPartial(payload.text) : void 0,
-					onAssistantMessageStart: draftPreview.draftStream ? () => draftPreview.handleAssistantMessageBoundary() : void 0,
-					onReasoningEnd: draftPreview.draftStream ? () => draftPreview.handleAssistantMessageBoundary() : void 0,
-					onModelSelected,
-					suppressDefaultToolProgressMessages: draftPreview.suppressDefaultToolProgressMessages ? true : void 0,
-					onReasoningStream: async (payload) => {
-						await statusReactions.setThinking();
-						const formattedText = payload?.text ? formatReasoningMessage(payload.text) : void 0;
-						await draftPreview.pushReasoningProgress(formattedText);
-					},
-					onToolStart: async (payload) => {
-						if (isProcessAborted(abortSignal)) return;
-						await maybeBindStatusReactionsToToolReaction(payload);
-						await statusReactions.setTool(payload.name);
-						await draftPreview.pushToolProgress(buildChannelProgressDraftLineForEntry(discordConfig, {
-							event: "tool",
-							name: payload.name,
-							phase: payload.phase,
-							args: payload.args
-						}, payload.detailMode ? { detailMode: payload.detailMode } : void 0), { toolName: payload.name });
-					},
-					onItemEvent: async (payload) => {
-						await draftPreview.pushToolProgress(buildChannelProgressDraftLineForEntry(discordConfig, {
-							event: "item",
-							itemId: payload.itemId,
-							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") return;
-						await draftPreview.pushToolProgress(buildChannelProgressDraftLine({
-							event: "plan",
-							phase: payload.phase,
-							title: payload.title,
-							explanation: payload.explanation,
-							steps: payload.steps
-						}));
-					},
-					onApprovalEvent: async (payload) => {
-						if (payload.phase !== "requested") return;
-						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 (payload.phase !== "end") return;
-						await draftPreview.pushToolProgress(buildChannelProgressDraftLine({
-							event: "command-output",
-							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",
-							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(abortSignal)) return;
-						await statusReactions.setCompacting();
-					},
-					onCompactionEnd: async () => {
-						if (isProcessAborted(abortSignal)) return;
-						statusReactions.cancelPending();
-						await statusReactions.setThinking();
-					}
+			replyOptions: {
+				abortSignal,
+				skillFilter: channelConfig?.skills,
+				sourceReplyDeliveryMode,
+				queuedDeliveryCorrelations: isRoomEvent ? [{ begin: beginDeliveryCorrelation }] : void 0,
+				suppressTyping: isRoomEvent ? true : void 0,
+				allowProgressCallbacksWhenSourceDeliverySuppressed: sourceRepliesAreToolOnly && draftPreview.draftStream && draftPreview.isProgressMode ? true : void 0,
+				disableBlockStreaming: sourceRepliesAreToolOnly ? true : draftPreview.disableBlockStreamingForDraft ?? (typeof resolvedBlockStreamingEnabled === "boolean" ? !resolvedBlockStreamingEnabled : void 0),
+				onPartialReply: draftPreview.draftStream && !draftPreview.isProgressMode ? (payload) => draftPreview.updateFromPartial(payload.text) : void 0,
+				onAssistantMessageStart: draftPreview.draftStream ? () => draftPreview.handleAssistantMessageBoundary() : void 0,
+				onReasoningEnd: draftPreview.draftStream ? () => draftPreview.handleAssistantMessageBoundary() : void 0,
+				onModelSelected,
+				suppressDefaultToolProgressMessages: draftPreview.suppressDefaultToolProgressMessages ? true : void 0,
+				onReasoningStream: async (payload) => {
+					await statusReactions.setThinking();
+					const formattedText = payload?.text ? formatReasoningMessage(payload.text) : void 0;
+					await draftPreview.pushReasoningProgress(formattedText);
+				},
+				onToolStart: async (payload) => {
+					if (isProcessAborted(abortSignal)) return;
+					await maybeBindStatusReactionsToToolReaction(payload);
+					await statusReactions.setTool(payload.name);
+					await draftPreview.pushToolProgress(buildChannelProgressDraftLineForEntry(discordConfig, {
+						event: "tool",
+						name: payload.name,
+						phase: payload.phase,
+						args: payload.args
+					}, payload.detailMode ? { detailMode: payload.detailMode } : void 0), { toolName: payload.name });
+				},
+				onItemEvent: async (payload) => {
+					await draftPreview.pushToolProgress(buildChannelProgressDraftLineForEntry(discordConfig, {
+						event: "item",
+						itemId: payload.itemId,
+						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") return;
+					await draftPreview.pushToolProgress(buildChannelProgressDraftLine({
+						event: "plan",
+						phase: payload.phase,
+						title: payload.title,
+						explanation: payload.explanation,
+						steps: payload.steps
+					}));
+				},
+				onApprovalEvent: async (payload) => {
+					if (payload.phase !== "requested") return;
+					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 (payload.phase !== "end") return;
+					await draftPreview.pushToolProgress(buildChannelProgressDraftLine({
+						event: "command-output",
+						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",
+						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(abortSignal)) return;
+					await statusReactions.setCompacting();
+				},
+				onCompactionEnd: async () => {
+					if (isProcessAborted(abortSignal)) return;
+					statusReactions.cancelPending();
+					await statusReactions.setThinking();
 				}
-			})
+			}
 		});
 		if (!preparedResult.dispatched) return;
 		dispatchResult = preparedResult.dispatchResult;
@@ -1437,14 +1471,7 @@ async function processDiscordMessage(ctx, observer) {
 		throw err;
 	} finally {
 		endDiscordInboundEventDeliveryCorrelation();
-		try {
-			await draftPreview.cleanup();
-		} finally {
-			if (!dispatchSettledBeforeStart) {
-				markRunComplete();
-				markDispatchIdle();
-			}
-		}
+		await draftPreview.cleanup();
 		const finalDeliveryFailed = (dispatchResult?.failedCounts?.final ?? 0) > 0;
 		if (statusReactionsActive) if (dispatchAborted) if (removeAckAfterReply) statusReactions.clear();
 		else statusReactions.restoreInitial();