@openclaw/discord 2026.8.1-beta.2 → 2026.8.1

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

@@ -1,41 +1,42 @@
-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-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 { Dt as deleteChannelMessage, a as chunkDiscordTextWithMode, kt as editChannelMessage, v as resolveDiscordChannelId, wt as createChannelMessage, y as discord_exports } from "./retry-DqHCW6PV.js";
+import { p as resolveDiscordMaxLinesPerMessage } from "./accounts-CfQ-vSyf.js";
+import { C as resolveTimestampMs, a as normalizeDiscordSlug, r as normalizeDiscordAllowList } from "./allow-list-BDMimASD.js";
+import { F as createDiscordRuntimeAccountContext, P as createDiscordRestClient, d as resolveDiscordTargetChannelId, k as resolveDiscordMessageFlags } from "./send.shared-DZJ1akvQ.js";
+import { i as discordTextHasBroadcastMention } from "./send.outbound-D7JYmfm9.js";
+import { a as removeReactionDiscord, f as editMessageDiscord, r as reactMessageDiscord } from "./send-UJHiAm4C.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-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 "./targets-CQp53cGj.js";
+import { a as buildDiscordRoutePeer, h as discordInboundEventDelivery, u as resolveDiscordConversationIdentity } from "./outbound-session-route-Bn4uXaoE.js";
+import { t as DISCORD_TEXT_CHUNK_LIMIT } from "./outbound-adapter-Dif8p481.js";
+import { a as formatDiscordReplySkip, c as buildGuildLabel, g as createDiscordSupplementalContextAccessChecker, h as buildDiscordInboundAccessContext, i as formatDiscordReplyDeliveryFailure, l as resolveReplyContext, o as sanitizeDiscordFrontChannelReplyPayloads, r as deliverDiscordReply, s as buildDirectLabel } from "./provider-LXiOcJrH.js";
+import { a as formatDiscordMediaText, c as resolveReferencedReplyMediaList, i as resolveDiscordMessageText, u as resolveDiscordMessageStickers } from "./message-text-Ca8M6TU8.js";
+import { a as resolveDiscordThreadStarter, n as resolveDiscordAutoThreadReplyPlan } from "./threading-CXuu_7o9.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-CS-nNVoe.js";
-import { buildAgentSessionKey, resolveThreadSessionKeys } from "openclaw/plugin-sdk/routing";
+import { t as sendTyping } from "./typing-B9snnwMe.js";
 import { expectDefined } from "openclaw/plugin-sdk/expect-runtime";
 import { formatErrorMessage } from "openclaw/plugin-sdk/error-runtime";
+import { buildAgentSessionKey, resolveThreadSessionKeys } from "openclaw/plugin-sdk/routing";
+import { getReplyPayloadTtsSupplement, isReplyPayloadNonTerminalToolErrorWarning, resolveSendableOutboundReplyParts } from "openclaw/plugin-sdk/reply-payload";
 import { danger, logVerbose, shouldLogVerbose, sleepWithAbort } from "openclaw/plugin-sdk/runtime-env";
 import { truncateUtf16Safe } from "openclaw/plugin-sdk/text-utility-runtime";
 import { resolveMarkdownTableMode } from "openclaw/plugin-sdk/markdown-table-runtime";
 import { resolveChunkMode } from "openclaw/plugin-sdk/reply-chunking";
 import { convertMarkdownTables, stripInlineDirectiveTagsForDelivery, stripReasoningTagsFromText } from "openclaw/plugin-sdk/text-chunking";
-import { bindIngressLifecycleToReplyOptions, buildChannelProgressDraftLine, buildChannelProgressDraftLineForEntry, createChannelMessageReplyPipeline, createChannelProgressDraftCompositor, createChannelProgressReceiptTracker, createFinalizableDraftLifecycle, createTypingCallbacks, defineFinalizableLivePreviewAdapter, deliverWithFinalizableLivePreviewAdapter, resolveChannelDraftStreamingChunking, resolveChannelMessageSourceReplyDeliveryMode, resolveChannelPreviewStreamMode, resolveChannelStreamingBlockEnabled, resolveChannelStreamingPreviewCommandText, resolveChannelStreamingPreviewToolProgress, resolveChannelStreamingProgressNarration, resolveChannelStreamingSuppressDefaultToolProgressMessages, resolveTranscriptBackedChannelFinalText } from "openclaw/plugin-sdk/channel-outbound";
+import { bindIngressLifecycleToReplyOptions, buildChannelProgressDraftLine, buildChannelProgressDraftLineForEntry, createChannelMessageReplyPipeline, createChannelProgressDraftCompositor, createFinalizableDraftStreamControlsForState, 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, formatInboundMediaUnavailableText, hasFinalInboundReplyDispatch, readAgentRunTerminalOutcome, 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 +79,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, resolveChannelIngress } = 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,
@@ -135,6 +136,7 @@ async function buildDiscordMessageProcessContext(params) {
 		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,
@@ -195,6 +197,7 @@ async function buildDiscordMessageProcessContext(params) {
 			const starter = await resolveDiscordThreadStarter({
 				channel: threadChannel,
 				client,
+				accountId,
 				parentId: threadParentId,
 				parentType: threadParentType,
 				resolveTimestampMs
@@ -216,15 +219,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({
@@ -249,12 +254,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,
@@ -282,7 +290,7 @@ async function buildDiscordMessageProcessContext(params) {
 		messageId: canonicalMessageId ?? message.id,
 		inboundEventKind: ctx.inboundEventKind
 	}, {
-		parentId: threadChannel ? threadParentId : void 0,
+		parentId: conversationParentId,
 		threadId: threadChannel?.id ?? autoThreadContext?.createdThreadId ?? void 0
 	});
 	const ctxPayload = await (ctx.buildContext ?? buildChannelInboundEventContext)({
@@ -305,12 +313,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: {
@@ -329,9 +344,9 @@ async function buildDiscordMessageProcessContext(params) {
 		message: {
 			inboundEventKind: ctx.inboundEventKind,
 			body: combinedBody,
-			rawBody: preflightAudioTranscript ?? baseText,
-			bodyForAgent: appendMediaUnavailableNotice(preflightAudioTranscript ?? baseText ?? text),
-			commandBody: preflightAudioTranscript ?? baseText,
+			rawBody: baseText,
+			bodyForAgent: appendMediaUnavailableNotice(agentFacingBody),
+			commandBody: baseText,
 			inboundHistory
 		},
 		sessionTranscript: { historyLimit: shouldIncludeChannelHistory ? historyLimit : 0 },
@@ -345,12 +360,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 ? {
@@ -367,7 +380,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: {
@@ -455,8 +468,7 @@ function createDiscordMessageProgressRuntime(params) {
 	const { ctx, draftPreview } = params;
 	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 {
@@ -475,103 +487,84 @@ function createDiscordMessageProgressRuntime(params) {
 	const reasoningDurableEnabled = reasoningLevel === "on";
 	const reasoningWindowEnabled = reasoningLevel === "stream";
 	let shouldYieldDraftCommentary = () => false;
-	const progressReceipt = createChannelProgressReceiptTracker();
-	const resetTurnState = () => {
-		progressReceipt.reset();
-	};
 	const handleAssistantMessageBoundary = () => {
-		if (draftPreview.handleAssistantMessageBoundary()) {
-			resetTurnState();
-			params.onTurnReset();
-		}
+		if (draftPreview.handleAssistantMessageBoundary()) params.onTurnReset();
 	};
-	const buildProgressSummaryLine = () => `-# ${progressReceipt.buildSummaryLine()}`;
-	return {
-		replyOptions: {
-			onAssistantMessageStart: draftPreview.draftStream ? () => {
-				handleAssistantMessageBoundary();
-				return false;
-			} : void 0,
-			onReasoningEnd: draftPreview.draftStream ? () => {
-				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) => {
-				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;
-				if (payload?.text) progressReceipt.noteReasoning();
-				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);
-				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 (shouldYieldDraftCommentary()) return;
-					return await draftPreview.pushPreambleItemEvent(payload, (itemId, text) => {
-						progressReceipt.noteCommentary(itemId, text);
-					});
-				}
-				return await draftPreview.pushItemEvent(payload);
-			},
-			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;
+	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
@@ -798,7 +791,7 @@ function createDiscordDraftStream(params) {
 	let streamGeneration = 0;
 	let activeCreateGeneration;
 	let discardActiveCreate = false;
-	let retargetedCleanup = [];
+	let pendingCleanupMessages = [];
 	const sendOrEditStreamMessage = async (text) => {
 		const generation = streamGeneration;
 		if (streamState.stopped && !streamState.final) return false;
@@ -839,11 +832,11 @@ function createDiscordDraftStream(params) {
 			activeCreateGeneration = void 0;
 			discardActiveCreate = false;
 			if (generation !== streamGeneration) {
-				if (shouldDiscardStaleCreate && typeof sentMessageId === "string" && sentMessageId) try {
-					await deleteChannelMessage(rest, channelId, sentMessageId);
-				} catch (err) {
-					params.warn?.(`discord stale stream preview cleanup failed: ${formatErrorMessage(err)}`);
-				}
+				if (shouldDiscardStaleCreate && typeof sentMessageId === "string" && sentMessageId) await deleteCleanupMessage({
+					channelId,
+					messageId: sentMessageId,
+					warnPrefix: "discord stale stream preview cleanup failed"
+				});
 				return true;
 			}
 			if (typeof sentMessageId !== "string" || !sentMessageId) {
@@ -864,24 +857,10 @@ function createDiscordDraftStream(params) {
 			return false;
 		}
 	};
-	const readMessageId = () => streamMessageId;
-	const clearMessageId = () => {
-		streamMessageId = void 0;
-	};
-	const isValidStreamMessageId = (value) => typeof value === "string";
-	const deleteStreamMessage = async (messageId) => {
-		await deleteChannelMessage(rest, channelId, messageId);
-	};
-	const { loop, update, stop, clear, discardPending, seal } = createFinalizableDraftLifecycle({
+	const { loop, update, stop, discardPending, seal } = createFinalizableDraftStreamControlsForState({
 		throttleMs,
 		state: streamState,
-		sendOrEditStreamMessage,
-		readMessageId,
-		clearMessageId,
-		isValidMessageId: isValidStreamMessageId,
-		deleteMessage: deleteStreamMessage,
-		warn: params.warn,
-		warnPrefix: "discord stream preview cleanup failed"
+		sendOrEditStreamMessage
 	});
 	const forceNewMessage = (mode = "preserve") => {
 		if (mode === "discard" && activeCreateGeneration !== void 0) discardActiveCreate = true;
@@ -893,16 +872,19 @@ function createDiscordDraftStream(params) {
 		loop.resetPending();
 		loop.resetThrottleWindow();
 	};
-	const cleanupRetargeted = async () => {
-		const pending = retargetedCleanup;
-		retargetedCleanup = [];
-		for (const stale of pending) try {
-			await deleteChannelMessage(rest, stale.channelId, stale.messageId);
+	const deleteCleanupMessage = async (message) => {
+		try {
+			await deleteChannelMessage(rest, message.channelId, message.messageId);
 		} catch (err) {
-			retargetedCleanup.push(stale);
-			params.warn?.(`discord stream preview retarget cleanup failed: ${formatErrorMessage(err)}`);
+			pendingCleanupMessages.push(message);
+			params.warn?.(`${message.warnPrefix}: ${formatErrorMessage(err)}`);
 		}
 	};
+	const cleanupPendingMessages = async () => {
+		const pending = pendingCleanupMessages;
+		pendingCleanupMessages = [];
+		for (const message of pending) await deleteCleanupMessage(message);
+	};
 	const retarget = async (nextChannelId) => {
 		const normalized = nextChannelId.trim();
 		if (!normalized || normalized === channelId) return;
@@ -925,33 +907,33 @@ function createDiscordDraftStream(params) {
 		if (previousMessageId) {
 			const stale = {
 				channelId: previousChannelId,
-				messageId: previousMessageId
+				messageId: previousMessageId,
+				warnPrefix: "discord stream preview retarget cleanup failed"
 			};
 			if (!streamMessageId) {
-				retargetedCleanup.push(stale);
+				pendingCleanupMessages.push(stale);
 				throw new Error("discord stream preview retarget replacement failed");
 			}
-			try {
-				await deleteChannelMessage(rest, previousChannelId, previousMessageId);
-			} catch (err) {
-				retargetedCleanup.push(stale);
-				params.warn?.(`discord stream preview retarget cleanup failed: ${formatErrorMessage(err)}`);
-			}
+			await deleteCleanupMessage(stale);
 		}
 	};
 	const deleteCurrentMessage = async () => {
 		loop.resetPending();
 		await loop.waitForInFlight();
-		const messageId = streamMessageId;
+		const currentMessage = streamMessageId ? {
+			channelId,
+			messageId: streamMessageId,
+			warnPrefix: "discord stream preview cleanup failed"
+		} : void 0;
 		streamMessageId = void 0;
 		lastSentText = "";
 		loop.resetThrottleWindow();
-		if (!isValidStreamMessageId(messageId)) return;
-		try {
-			await deleteStreamMessage(messageId);
-		} catch (err) {
-			params.warn?.(`discord stream preview cleanup failed: ${formatErrorMessage(err)}`);
-		}
+		if (!currentMessage) return;
+		await deleteCleanupMessage(currentMessage);
+	};
+	const clear = async () => {
+		await discardPending();
+		await deleteCurrentMessage();
 	};
 	params.log?.(`discord stream preview ready (maxChars=${maxChars}, throttleMs=${throttleMs})`);
 	return {
@@ -964,7 +946,7 @@ function createDiscordDraftStream(params) {
 		seal,
 		stop,
 		retarget,
-		cleanupRetargeted,
+		cleanupPendingMessages,
 		forceNewMessage
 	};
 }
@@ -1004,7 +986,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;
@@ -1067,7 +1049,7 @@ function createDiscordDraftPreviewController(params) {
 		if (beganNewTurn) {
 			progressDraftCollapsed = false;
 			progressDraftStartedBeforeFinal = false;
-			finalReplyDelivered = false;
+			finalReplyError = void 0;
 			finalizedViaPreviewMessage = false;
 			progressNarratorLifecycle?.beginTurn();
 		}
@@ -1110,8 +1092,8 @@ function createDiscordDraftPreviewController(params) {
 			progressDraft.markFinalReplyStarted();
 			progressNarratorLifecycle?.stopTurn();
 		},
-		markFinalReplyDelivered() {
-			finalReplyDelivered = true;
+		markFinalReplyDelivered(isError = false) {
+			finalReplyError = isError;
 			progressDraft.markFinalReplyDelivered();
 		},
 		markPreviewFinalized() {
@@ -1120,14 +1102,11 @@ 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;
@@ -1152,11 +1131,10 @@ function createDiscordDraftPreviewController(params) {
 			return await progressDraft.pushNarrationProgress(text);
 		},
 		pushPreambleHeadline,
-		async pushPreambleItemEvent(payload, noteCommentary) {
+		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 });
-			if (commentaryAccepted) noteCommentary(payload.itemId, payload.progressText);
 			return headlineAccepted || commentaryAccepted;
 		},
 		async pushCommentaryProgress(text, options) {
@@ -1240,9 +1218,9 @@ function createDiscordDraftPreviewController(params) {
 		async cleanup() {
 			try {
 				progressDraft.cancel();
-				if (!finalReplyDelivered) await draftStream?.discardPending();
-				if (!finalizedViaPreviewMessage && draftStream?.messageId()) await draftStream.clear();
-				await draftStream?.cleanupRetargeted();
+				if (finalReplyError !== false) await draftStream?.discardPending();
+				if (finalReplyError !== true && !finalizedViaPreviewMessage && draftStream?.messageId()) await draftStream.clear();
+				await draftStream?.cleanupPendingMessages();
 			} catch (err) {
 				params.log(`discord: draft cleanup failed: ${String(err)}`);
 			}
@@ -1411,16 +1389,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;
@@ -1487,7 +1455,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);
@@ -1547,21 +1515,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({
@@ -1629,7 +1597,8 @@ async function processDiscordMessageInner(ctx, observer) {
 				threadBindings,
 				mediaLocalRoots,
 				kind: "block",
-				bindPendingFinalDelivery: info.bindPendingFinalDelivery
+				bindPendingFinalDelivery: info.bindPendingFinalDelivery,
+				onPlatformSendDispatch: info.onPlatformSendDispatch
 			});
 			if (result.visibleReplySent) replyReference.markSent();
 			return result;
@@ -1666,7 +1635,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) {
@@ -1693,7 +1661,7 @@ async function processDiscordMessageInner(ctx, observer) {
 						});
 					},
 					onPreviewFinalized: () => {
-						markUserFacingFinalDelivered();
+						markFinalReplyDelivered();
 						draftPreview.markPreviewFinalized();
 						replyReference.markSent();
 					},
@@ -1729,11 +1697,12 @@ async function processDiscordMessageInner(ctx, observer) {
 						mediaLocalRoots,
 						allowedMentions,
 						kind: info.kind,
-						bindPendingFinalDelivery: info.bindPendingFinalDelivery
+						bindPendingFinalDelivery: info.bindPendingFinalDelivery,
+						onPlatformSendDispatch: info.onPlatformSendDispatch
 					})).visibleReplySent;
 				},
 				onNormalDelivered: () => {
-					markUserFacingFinalDelivered();
+					markFinalReplyDelivered();
 					replyReference.markSent();
 				}
 			})).kind !== "normal-skipped") return { visibleReplySent: true };
@@ -1749,14 +1718,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,
@@ -1772,18 +1736,16 @@ async function processDiscordMessageInner(ctx, observer) {
 			threadBindings,
 			mediaLocalRoots,
 			kind: info.kind,
-			bindPendingFinalDelivery: info.bindPendingFinalDelivery
+			bindPendingFinalDelivery: info.bindPendingFinalDelivery,
+			onPlatformSendDispatch: info.onPlatformSendDispatch
 		});
 		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();
 			}
@@ -1880,8 +1842,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)) {
@@ -1889,14 +1855,18 @@ async function processDiscordMessageInner(ctx, observer) {
 			return;
 		}
 		dispatchError = true;
-		if (await completeDiscordSessionConflict(err, deliverDiscordPayload, onDiscordDeliveryError)) return;
+		if (await completeDiscordSessionConflict(err, (payload, info) => deliverDiscordPayload(payload, {
+			...info,
+			onPlatformSendDispatch: () => Promise.resolve()
+		}), onDiscordDeliveryError)) return;
 		throw err;
 	} finally {
 		activeThreadRoute.end();
 		endDeliveryCorrelation();
 		await draftPreview.cleanup();
 		dispatchError ||= readAgentRunTerminalOutcome(dispatchResult) === "failed";
-		const finalDeliveryFailed = (dispatchResult?.failedCounts?.final ?? 0) > 0;
+		const finalReceipt = dispatchResult?.settledReceipt?.counts.final;
+		const finalDeliveryFailed = (finalReceipt?.failedBeforeSend ?? 0) + (finalReceipt?.failedAfterSend ?? 0) > 0;
 		await reactions.finish({
 			dispatchAborted,
 			dispatchError,
@@ -1907,7 +1877,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}`);
 	}
 }