@openclaw/discord 2026.10.2 → 2026.10.5-beta.2

package/dist/.setup/{message-handler.process-TKoqcqIP.mjs → message-handler.process-ClgWYH6o.mjs}

@@ -1,29 +1,32 @@
-import { p as resolveDiscordMaxLinesPerMessage } from "./accounts-HE9-mj1L.mjs";
-import { i as normalizeDiscordAllowList, o as normalizeDiscordSlug, w as resolveTimestampMs } from "./allow-list-vxkG9_JD.mjs";
-import { F as createDiscordRuntimeAccountContext, O as resolveDiscordMessageFlags, P as createDiscordRestClient, u as resolveDiscordTargetChannelId } from "./send.shared-C4CN24D9.mjs";
-import { C as withDiscordRequestAuthority, D as Message, ct as deleteChannelMessage, gt as getGuildMember, lt as editChannelMessage, t as discord_exports } from "./discord-9gysrhzp.mjs";
-import { b as chunkDiscordTextWithMode, m as resolveDiscordChannelId } from "./send.receipt-DVOg2Oaw.mjs";
-import { a as removeReactionDiscord, r as reactMessageDiscord } from "./send-CJk3VP5q.mjs";
-import { a as discordTextHasBroadcastMention } from "./send.outbound-rOboMO_6.mjs";
-import { n as DISCORD_ATTACHMENT_TOTAL_TIMEOUT_MS, t as DISCORD_ATTACHMENT_IDLE_TIMEOUT_MS } from "./timeouts-pun7VJ02.mjs";
-import "./targets-bqXQENmX.mjs";
-import { b as discordInboundEventDelivery, h as resolveDiscordConversationIdentity, u as buildDiscordRoutePeer } from "./outbound-session-route-BvBH4LC6.mjs";
-import { t as DISCORD_TEXT_CHUNK_LIMIT } from "./outbound-adapter-D4wRAb5S.mjs";
-import { T as createDiscordSupplementalContextAccessChecker, a as formatDiscordReplySkip, c as buildGuildLabel, i as formatDiscordReplyDeliveryFailure, l as resolveReplyContext, o as sanitizeDiscordFrontChannelReplyPayloads, r as deliverDiscordReply, s as buildDirectLabel, w as buildDiscordInboundAccessContext } from "./provider-YP8gN9_o.mjs";
-import { C as resolveReferencedReplyMediaList, E as resolveDiscordMessageStickers, O as resolveDiscordReferencedReplyMessageId, _ as resolveDiscordMessageHistoryText, b as formatDiscordMediaText, f as resolveDiscordAutoThreadReplyPlan, m as resolveDiscordThreadStarter, y as resolveDiscordMessageText } from "./transcripts-source-CaZQnGRH.mjs";
-import { n as resolveDiscordWebhookId, t as resolveDiscordSenderIdentity } from "./sender-identity-AHpUNr72.mjs";
+import { m as resolveDiscordMaxLinesPerMessage } from "./accounts-ljrzXBJi.mjs";
+import { i as normalizeDiscordAllowList, o as normalizeDiscordSlug, w as resolveTimestampMs } from "./allow-list-B_ToXtew.mjs";
+import { F as createDiscordRuntimeAccountContext, O as resolveDiscordMessageFlags, P as createDiscordRestClient, u as resolveDiscordTargetChannelId } from "./send.shared-CjQ4jbMA.mjs";
+import { U as captureDiscordRequestAuthority, W as withDiscordRequestAuthority, Z as Message, _t as getGuildMember, lt as deleteChannelMessage, t as discord_exports, ut as editChannelMessage } from "./discord-BGqgx-yd.mjs";
+import { v as chunkDiscordTextWithMode } from "./send.receipt-BAlzXd8e.mjs";
+import { n as resolveDiscordChannelId } from "./target-parsing-C-HyNxcE.mjs";
+import { a as removeReactionDiscord, r as reactMessageDiscord } from "./send-DbILKgcm.mjs";
+import { a as discordTextHasBroadcastMention } from "./send.outbound-_jx4Xpd3.mjs";
+import { n as DISCORD_ATTACHMENT_TOTAL_TIMEOUT_MS, t as DISCORD_ATTACHMENT_IDLE_TIMEOUT_MS } from "./timeouts-CuNARfyw.mjs";
+import "./targets-DZJjkzwv.mjs";
+import { b as discordInboundEventDelivery, h as resolveDiscordConversationIdentity, u as buildDiscordRoutePeer } from "./outbound-session-route-B0Hpwn3Q.mjs";
+import { t as DISCORD_TEXT_CHUNK_LIMIT } from "./outbound-adapter-D8OOIuKn.mjs";
+import { T as createDiscordSupplementalContextAccessChecker, c as formatDiscordReplySkip, d as buildGuildLabel, f as resolveReplyContext, l as sanitizeDiscordFrontChannelReplyPayloads, o as deliverDiscordReply, s as formatDiscordReplyDeliveryFailure, u as buildDirectLabel, w as buildDiscordInboundAccessContext } from "./provider-D9EzOfG8.mjs";
+import { D as resolveDiscordMessageStickers, b as resolveDiscordMessageText, h as resolveDiscordThreadStarter, k as resolveDiscordReferencedReplyMessageId, v as resolveDiscordMessageHistoryText, w as resolveReferencedReplyMediaList, x as formatDiscordMediaText } from "./transcripts-source-0qQYVu2H.mjs";
+import { n as resolveDiscordWebhookId, t as resolveDiscordSenderIdentity } from "./sender-identity-BNBvGt1l.mjs";
+import { n as resolveDiscordAutoThreadReplyPlan } from "./threading-BKe3E3tp.mjs";
 import { t as beginDiscordActiveTurnThreadRoute } from "./active-turn-thread-route-C4tp9noA.mjs";
-import { a as createDiscordHistorySenderProvenance, l as isBoundThreadBotSystemMessage, m as shouldIgnoreBoundThreadWebhookMessage, o as filterDiscordHistoryEntriesForContext, s as resolveDiscordHistoryMediaIds, t as resolveDiscordPreflightPluralKitInfo } from "./message-handler.preflight-pluralkit-BXGGVmpe.mjs";
+import { a as createDiscordHistorySenderProvenance, l as isBoundThreadBotSystemMessage, m as shouldIgnoreBoundThreadWebhookMessage, o as filterDiscordHistoryEntriesForContext, s as resolveDiscordHistoryMediaIds, t as resolveDiscordPreflightPluralKitInfo } from "./message-handler.preflight-pluralkit-C3iAG--b.mjs";
 import { t as sendTyping } from "./typing-CNlSKY5S.mjs";
 import { formatErrorMessage } from "openclaw/plugin-sdk/error-runtime";
 import { danger, logVerbose, shouldLogVerbose, sleepWithAbort } from "openclaw/plugin-sdk/runtime-env";
-import { normalizeOptionalString } from "openclaw/plugin-sdk/string-coerce-runtime";
 import { buildAgentSessionKey, resolveThreadSessionKeys } from "openclaw/plugin-sdk/routing";
-import { Routes } from "discord-api-types/v10";
+import { normalizeOptionalString } from "openclaw/plugin-sdk/string-coerce-runtime";
+import { AllowedMentionsTypes, Routes } from "discord-api-types/v10";
 import { getAgentScopedMediaLocalRoots } from "openclaw/plugin-sdk/media-runtime";
 import { getReplyPayloadTtsSupplement, isReplyPayloadNonTerminalToolErrorWarning, resolveSendableOutboundReplyParts } from "openclaw/plugin-sdk/reply-payload";
 import { resolveChunkMode } from "openclaw/plugin-sdk/reply-chunking";
 import { stripInlineDirectiveTagsForDelivery, stripReasoningTagsFromText } from "openclaw/plugin-sdk/text-chunking";
+import { AsyncLocalStorage } from "node:async_hooks";
 import { truncateUtf16Safe } from "openclaw/plugin-sdk/text-utility-runtime";
 import { resolveBatchedReplyThreadingPolicy } from "openclaw/plugin-sdk/reply-reference";
 import { resolveMarkdownTableMode } from "openclaw/plugin-sdk/markdown-table-runtime";
@@ -33,7 +36,7 @@ import { resolvePinnedMainDmOwnerFromAllowlist as resolvePinnedMainDmOwnerFromAl
 import { resolveAgentConfig } from "openclaw/plugin-sdk/agent-scope-runtime";
 import { isDangerousNameMatchingEnabled } from "openclaw/plugin-sdk/dangerous-name-runtime";
 import { EmbeddedBlockChunker, resolveAckReaction, resolveAgentConfig as resolveAgentConfig$1, resolveHumanDelayConfig } from "openclaw/plugin-sdk/agent-runtime";
-import { getSessionEntry, readSessionUpdatedAt, resolveStorePath } from "openclaw/plugin-sdk/session-store-runtime";
+import { getSessionEntry, readSessionUpdatedAtAsync, resolveStorePath } from "openclaw/plugin-sdk/session-store-runtime";
 import { buildChannelInboundEventContext, createCommandTurnContext, dispatchChannelInboundTurn, formatInboundEnvelope, formatInboundMediaUnavailableText, getGroupThreadDeliverySession, 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";
@@ -387,7 +390,7 @@ async function buildDiscordMessageProcessContext(params) {
 		threadParentInheritanceEnabled
 	});
 	if (!isHistoryCurrent()) return null;
-	const { deliverTarget, replyTarget, replyReference, autoThreadContext } = replyPlan;
+	const { deliverTarget, replyTarget, autoThreadContext } = replyPlan;
 	const conversationParentId = threadChannel ? threadParentId : autoThreadContext ? messageChannelId : void 0;
 	const effectiveFrom = isDirectMessage ? `discord:${author.id}` : autoThreadContext?.From ?? `discord:channel:${messageChannelId}`;
 	const dmConversationTarget = isDirectMessage ? resolveDiscordConversationIdentity({
@@ -406,7 +409,7 @@ async function buildDiscordMessageProcessContext(params) {
 	}) : void 0;
 	const originatingTo = autoThreadContext?.OriginatingTo ?? dmConversationTarget ?? replyTarget;
 	const effectiveSessionKey = boundSessionKey ?? autoThreadContext?.SessionKey ?? threadKeys.sessionKey;
-	const effectivePreviousTimestamp = effectiveSessionKey === route.sessionKey ? previousTimestamp : readSessionUpdatedAt({
+	const effectivePreviousTimestamp = effectiveSessionKey === route.sessionKey ? previousTimestamp : await readSessionUpdatedAtAsync({
 		storePath,
 		sessionKey: effectiveSessionKey
 	});
@@ -421,13 +424,6 @@ async function buildDiscordMessageProcessContext(params) {
 		threadId: threadChannel?.id ?? autoThreadContext?.createdThreadId ?? void 0
 	});
 	if (!isHistoryCurrent()) return null;
-	const conversationThreadId = threadChannel?.id ?? autoThreadContext?.createdThreadId;
-	const conversationChannelId = conversationThreadId ?? messageChannelId;
-	const conversationGuildId = isGuildMessage ? guildInfo?.id ?? data.guild?.id ?? data.guild_id : "@me";
-	const conversationLink = /^\d+$/.test(conversationChannelId) && conversationGuildId && (conversationGuildId === "@me" || /^\d+$/.test(conversationGuildId)) ? {
-		url: `https://discord.com/channels/${conversationGuildId}/${conversationChannelId}`,
-		label: conversationThreadId ? "Discord Thread" : "Discord Conversation"
-	} : void 0;
 	const batchMessageIds = ctx.sourceMessageIds && ctx.sourceMessageIds.length > 1 ? [...ctx.sourceMessageIds] : void 0;
 	const ctxPayload = await (ctx.buildContext ?? buildChannelInboundEventContext)({
 		channelIngress,
@@ -459,7 +455,6 @@ async function buildDiscordMessageProcessContext(params) {
 			}),
 			nativeChannelId: messageChannelId,
 			avatar: ctx.conversationAvatar,
-			link: conversationLink,
 			label: fromLabel,
 			spaceId: isGuildMessage ? (guildInfo?.id ?? data.guild?.id ?? data.guild_id ?? guildSlug) || void 0 : void 0,
 			parentId: conversationParentId,
@@ -575,31 +570,25 @@ async function buildDiscordMessageProcessContext(params) {
 	return {
 		ctxPayload,
 		persistedSessionKey,
-		turn: {
-			storePath,
-			record: {
-				updateLastRoute: {
-					sessionKey: persistedSessionKey,
-					channel: "discord",
-					to: lastRouteTo,
-					accountId: route.accountId,
-					mainDmOwnerPin: isDirectMessage && persistedSessionKey === route.mainSessionKey && pinnedMainDmOwner ? {
-						ownerRecipient: pinnedMainDmOwner,
-						senderRecipient: author.id,
-						onSkip: ({ ownerRecipient, senderRecipient }) => {
-							logVerbose(`discord: skip main-session last route for ${senderRecipient} (pinned owner ${ownerRecipient})`);
-						}
-					} : void 0
-				},
-				onRecordError: (err) => {
-					logVerbose(`discord: failed updating session meta: ${String(err)}`);
-				}
+		record: {
+			updateLastRoute: {
+				sessionKey: persistedSessionKey,
+				channel: "discord",
+				to: lastRouteTo,
+				accountId: route.accountId,
+				mainDmOwnerPin: isDirectMessage && persistedSessionKey === route.mainSessionKey && pinnedMainDmOwner ? {
+					ownerRecipient: pinnedMainDmOwner,
+					senderRecipient: author.id,
+					onSkip: ({ ownerRecipient, senderRecipient }) => {
+						logVerbose(`discord: skip main-session last route for ${senderRecipient} (pinned owner ${ownerRecipient})`);
+					}
+				} : void 0
+			},
+			onRecordError: (err) => {
+				logVerbose(`discord: failed updating session meta: ${String(err)}`);
 			}
 		},
-		replyPlan,
-		deliverTarget,
-		replyTarget,
-		replyReference
+		replyPlan
 	};
 }
 //#endregion
@@ -626,13 +615,12 @@ function createDiscordMessageProgressRuntime(params) {
 	})();
 	const reasoningDurableEnabled = reasoningLevel === "on";
 	const reasoningWindowEnabled = reasoningLevel === "stream";
-	let shouldYieldDraftCommentary = () => false;
-	const handleAssistantMessageBoundary = () => {
-		if (draftPreview.handleAssistantMessageBoundary()) params.onTurnReset();
-	};
+	let shouldYieldDraftCommentary = async () => false;
+	let turnCommentaryVisible = false;
 	return { replyOptions: {
+		progressRequiresReply: draftPreview.isProgressMode ? true : void 0,
 		onAssistantMessageStart: draftPreview.draftStream ? () => {
-			handleAssistantMessageBoundary();
+			if (draftPreview.handleAssistantMessageBoundary()) params.onTurnReset();
 			return false;
 		} : void 0,
 		onReasoningEnd: draftPreview.draftStream ? () => {
@@ -648,13 +636,14 @@ function createDiscordMessageProgressRuntime(params) {
 		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,
+		shouldDeliverCommentaryPayloads: draftPreview.isProgressMode && draftPreview.commentaryProgressEnabled ? () => turnCommentaryVisible : void 0,
 		reasoningPayloadsEnabled: reasoningDurableEnabled,
-		onVerboseProgressVisibility: (isActive) => {
+		onVerboseProgressVisibilityAsync: async (isActive) => {
 			shouldYieldDraftCommentary = isActive;
+			turnCommentaryVisible = await isActive();
 		},
 		onNarrationUpdate: draftPreview.narrationProgressEnabled ? async (payload) => {
-			if (abortSignal?.aborted || shouldYieldDraftCommentary()) return;
+			if (await shouldYieldDraftCommentary() || abortSignal?.aborted) return;
 			await draftPreview.pushNarrationProgress(payload.text);
 		} : void 0,
 		onProgressNarratorLifecycle: draftPreview.narrationProgressEnabled ? (lifecycle) => draftPreview.setProgressNarratorLifecycle(lifecycle) : void 0,
@@ -673,7 +662,7 @@ function createDiscordMessageProgressRuntime(params) {
 			return await draftPreview.pushToolEvent(payload);
 		},
 		onItemEvent: async (payload) => {
-			if (payload.kind === "preamble" && shouldYieldDraftCommentary()) return;
+			if (abortSignal?.aborted || payload.kind === "preamble" && await shouldYieldDraftCommentary()) return;
 			return await draftPreview.pushItemEvent(payload);
 		},
 		onPlanUpdate: async (payload) => {
@@ -704,10 +693,7 @@ function createDiscordMessageProgressRuntime(params) {
 function createDiscordAckReactionContext(params) {
 	return {
 		rest: params.rest,
-		...createDiscordRuntimeAccountContext({
-			cfg: params.cfg,
-			accountId: params.accountId
-		})
+		...createDiscordRuntimeAccountContext(params)
 	};
 }
 function createDiscordAckReactionAdapter(params) {
@@ -778,19 +764,18 @@ function createDiscordMessageReactionRuntime(params) {
 	});
 	let statusReactionTarget = `${messageChannelId}/${message.id}`;
 	let statusReactionsActive = statusReactionsEnabled;
+	const logReactionFailure = (target, error) => logAckFailure({
+		log: logVerbose,
+		channel: "discord",
+		target,
+		error
+	});
 	const createController = (enabled, adapter, initialEmoji) => createStatusReactionController({
 		enabled,
 		adapter,
 		initialEmoji,
 		presentation: "acknowledgement",
-		onError: (err) => {
-			logAckFailure({
-				log: logVerbose,
-				channel: "discord",
-				target: statusReactionTarget,
-				error: err
-			});
-		}
+		onError: (err) => logReactionFailure(statusReactionTarget, err)
 	});
 	let statusReactions = createController(statusReactionsEnabled, discordAdapter, ackReaction);
 	const resolveTrackedReactionChannelId = async (args) => {
@@ -818,12 +803,7 @@ function createDiscordMessageReactionRuntime(params) {
 		try {
 			trackedChannelId = await resolveTrackedReactionChannelId(args);
 		} catch (err) {
-			logAckFailure({
-				log: logVerbose,
-				channel: "discord",
-				target: `${normalizeOptionalString(args.to) ?? normalizeOptionalString(args.channelId) ?? messageChannelId}/${trackedMessageId}`,
-				error: err
-			});
+			logReactionFailure(`${normalizeOptionalString(args.to) ?? normalizeOptionalString(args.channelId) ?? messageChannelId}/${trackedMessageId}`, err);
 			return;
 		}
 		statusReactionTarget = `${trackedChannelId}/${trackedMessageId}`;
@@ -850,15 +830,12 @@ function createDiscordMessageReactionRuntime(params) {
 		});
 	};
 	const finish = async (result) => {
-		if (statusReactionsActive) {
-			if (result.dispatchAborted) {
-				statusReactions.restoreInitial();
-				return;
-			}
+		if (!statusReactionsActive) return;
+		if (!result.dispatchAborted) {
 			if (result.dispatchError || result.finalDeliveryFailed) await statusReactions.setError();
 			else await statusReactions.setDone();
-			statusReactions.restoreInitial();
 		}
+		statusReactions.restoreInitial();
 	};
 	return {
 		feedbackRest,
@@ -886,7 +863,6 @@ function createDiscordDraftStream(params) {
 	let channelId = params.channelId;
 	const rest = params.rest;
 	const flags = resolveDiscordMessageFlags({ suppressEmbeds: params.suppressEmbeds });
-	const resolveReplyToMessageId = () => typeof params.replyToMessageId === "function" ? params.replyToMessageId() : params.replyToMessageId;
 	const streamState = {
 		stopped: false,
 		final: false
@@ -918,7 +894,7 @@ function createDiscordDraftStream(params) {
 				if (generation === lifecycle.generation) lastSentText = trimmed;
 				return true;
 			}
-			const replyToMessageId = resolveReplyToMessageId()?.trim();
+			const replyToMessageId = (typeof params.replyToMessageId === "function" ? params.replyToMessageId() : params.replyToMessageId)?.trim();
 			const messageReference = replyToMessageId ? {
 				message_id: replyToMessageId,
 				fail_if_not_exists: false
@@ -949,23 +925,22 @@ function createDiscordDraftStream(params) {
 			return false;
 		}
 	};
-	const clearMessageId = () => {
-		streamMessage = void 0;
-		lastSentText = "";
-		loop.resetThrottleWindow();
-	};
 	const lifecycle = createFinalizableDraftLifecycle({
 		throttleMs,
 		coalesceInFlight: true,
 		state: streamState,
-		sendOrEditStreamMessage,
+		sendOrEditStreamMessage: (update) => withDiscordRequestAuthority(update.assertCurrent, () => sendOrEditStreamMessage(update)),
 		emptyValue: {
 			text: "",
 			complete: false
 		},
 		isEmpty: (value) => !value.text,
 		readMessageId: () => streamMessage,
-		clearMessageId,
+		clearMessageId: () => {
+			streamMessage = void 0;
+			lastSentText = "";
+			loop.resetThrottleWindow();
+		},
 		isValidMessageId: (value) => value !== void 0,
 		deleteMessage: (message) => deleteChannelMessage(rest, message.channelId, message.messageId),
 		warn: params.warn,
@@ -974,7 +949,8 @@ function createDiscordDraftStream(params) {
 	const { loop, update: updateDraft, stop, discardPending, seal } = lifecycle;
 	const update = (text, options) => updateDraft({
 		text,
-		complete: options?.complete === true
+		complete: options?.complete === true,
+		assertCurrent: options?.assertCurrent
 	});
 	/** Move the draft to another channel, preserving its current text. */
 	const retarget = async (nextChannelId) => {
@@ -1004,6 +980,7 @@ function createDiscordDraftStream(params) {
 		flush: loop.flush,
 		messageId: () => streamMessage?.messageId,
 		lastDeliveredText: () => lastSentText,
+		isStopped: () => streamState.stopped,
 		clear: () => lifecycle.retireCurrent(discardPending),
 		deleteCurrentMessage: () => lifecycle.retireCurrent(async () => {
 			loop.resetPending();
@@ -1020,14 +997,76 @@ function createDiscordDraftStream(params) {
 //#endregion
 //#region extensions/discord/src/preview-streaming.ts
 function resolveDiscordPreviewStreamMode(params = {}) {
-	return resolveChannelPreviewStreamMode(params, "off");
+	return resolveChannelPreviewStreamMode(params, "progress");
+}
+//#endregion
+//#region extensions/discord/src/monitor/message-handler.progress-continuation.ts
+/** The registry owns task settlement; Discord keeps the confirmed transport and its cleanup. */
+function retainDiscordProgressDraft(params) {
+	let retired = false;
+	const assertChannelCurrent = () => {
+		params.assertChannelAuthority?.();
+		if (params.isPolicyCurrent?.() === false) throw new Error("Discord channel policy is no longer current");
+	};
+	const assertCurrent = () => {
+		assertChannelCurrent();
+		if (retired) throw new Error("Discord retained progress authority is no longer current");
+	};
+	const compositor = createChannelProgressDraftCompositor({
+		preparedItems: true,
+		showWorkStatus: true,
+		entry: params.entry,
+		mode: "progress",
+		active: true,
+		seed: params.seed,
+		reasoningGate: false,
+		toolIcons: true,
+		initialSnapshot: params.snapshot,
+		update: async (text, options) => {
+			if (retired) return false;
+			params.stream.update(text, {
+				complete: true,
+				assertCurrent
+			});
+			if (options.flush) await params.stream.flush();
+			return params.stream.lastDeliveredText() === text;
+		}
+	});
+	let queue = Promise.resolve();
+	const enqueue = (work) => {
+		queue = params.runInChannelScope(() => queue.then(work).catch((error) => {
+			params.log("discord: retained progress failed (" + String(error) + ")");
+		}));
+	};
+	let started = false;
+	return {
+		push: (item) => enqueue(async () => {
+			if (retired) return;
+			if (!started) {
+				started = true;
+				await compositor.start();
+			}
+			await compositor.pushItemEvent(item);
+		}),
+		retire: () => {
+			if (retired) return;
+			retired = true;
+			compositor.markFinalReplyStarted();
+			enqueue(() => withDiscordRequestAuthority(assertChannelCurrent, async () => {
+				await params.stream.clear();
+				await params.stream.cleanupPendingMessages();
+			}));
+		}
+	};
 }
 //#endregion
 //#region extensions/discord/src/monitor/message-handler.draft-preview.ts
 function createDiscordDraftPreviewController(params) {
+	const runInChannelScope = AsyncLocalStorage.snapshot();
+	const assertChannelAuthority = captureDiscordRequestAuthority();
 	const discordStreamMode = resolveDiscordPreviewStreamMode(params.discordConfig);
 	const hookRunner = getGlobalHookRunner();
-	const allowProviderPreview = !params.groupThread && !((hookRunner?.hasHooks("reply_payload_sending") ?? false) || (hookRunner?.hasHooks("message_sending") ?? false));
+	const allowProviderPreview = !params.groupThread && !params.isRoomEvent && !((hookRunner?.hasHooks("reply_payload_sending") ?? false) || (hookRunner?.hasHooks("message_sending") ?? false));
 	const draftMaxChars = Math.min(params.textLimit, 2e3);
 	const canStreamProgressDraftForToolOnlySource = params.sourceRepliesAreToolOnly && discordStreamMode === "progress";
 	const previewAvailable = allowProviderPreview && (!params.sourceRepliesAreToolOnly || canStreamProgressDraftForToolOnlySource) && discordStreamMode !== "off";
@@ -1035,9 +1074,11 @@ function createDiscordDraftPreviewController(params) {
 		previewAvailable,
 		blockStreamingDefault: params.cfg.agents?.defaults?.blockStreamingDefault
 	});
-	const draftStream = previewAvailable && !accountBlockStreamingEnabled ? createDiscordDraftStream({
+	const canStreamDraft = previewAvailable && !accountBlockStreamingEnabled;
+	let currentChannelId = params.deliverChannelId;
+	const createDraftStream = () => createDiscordDraftStream({
 		rest: params.deliveryRest,
-		channelId: params.deliverChannelId,
+		channelId: currentChannelId,
 		maxChars: draftMaxChars,
 		replyToMessageId: () => params.replyReference.peek(),
 		minInitialChars: discordStreamMode === "progress" ? 0 : 30,
@@ -1045,9 +1086,9 @@ function createDiscordDraftPreviewController(params) {
 		throttleMs: 1200,
 		log: params.log,
 		warn: params.log
-	}) : void 0;
+	});
+	let draftStream = canStreamDraft ? createDraftStream() : void 0;
 	const draftChunking = draftStream && discordStreamMode === "block" ? resolveChannelDraftStreamingChunking(params.cfg, "discord", params.accountId, { fallbackLimit: DISCORD_TEXT_CHUNK_LIMIT }) : void 0;
-	const shouldSplitPreviewMessages = discordStreamMode === "block";
 	const draftChunker = draftChunking ? new EmbeddedBlockChunker(draftChunking) : void 0;
 	let lastPartialText = "";
 	let draftText = "";
@@ -1058,12 +1099,14 @@ function createDiscordDraftPreviewController(params) {
 	const progressSeed = `${params.accountId}:${params.deliverChannelId}`;
 	const progressDraft = createChannelProgressDraftCompositor({
 		preparedItems: true,
+		showWorkStatus: true,
 		entry: params.discordConfig,
 		mode: discordStreamMode,
 		active: Boolean(draftStream),
 		seed: progressSeed,
 		reasoningLinePrefix: "🧠 ",
 		commentaryLinePrefix: "💬 ",
+		toolIcons: true,
 		commentaryItalics: false,
 		update: async (previewText, options) => {
 			if (!draftStream) return false;
@@ -1092,8 +1135,8 @@ function createDiscordDraftPreviewController(params) {
 		if (draftChunker?.hasBuffered()) {
 			draftChunker.drain({
 				force: true,
-				emit: (chunk) => {
-					draftText += chunk;
+				emit: (chunk, metadata) => {
+					draftText += metadata?.sourceText ?? chunk;
 				}
 			});
 			draftChunker.reset();
@@ -1104,10 +1147,14 @@ function createDiscordDraftPreviewController(params) {
 	const lifecycle = createLivePreviewLifecycle({
 		draft: draftStream ? {
 			flush,
-			id: draftStream.messageId,
-			seal: draftStream.seal,
-			discardPending: draftStream.discardPending,
-			clear: draftStream.clear
+			id: () => draftStream?.messageId(),
+			seal: async () => {
+				await draftStream?.seal();
+			},
+			discardPending: async () => {
+				await draftStream?.discardPending();
+			},
+			clear: async () => await draftStream?.clear()
 		} : void 0,
 		retainOnError: true,
 		cleanupUndelivered: true,
@@ -1127,27 +1174,28 @@ function createDiscordDraftPreviewController(params) {
 		hasStreamedAssistantText = false;
 		draftChunker?.reset();
 	};
-	const forceNewMessageIfNeeded = () => {
-		if (shouldSplitPreviewMessages && hasStreamedAssistantText) {
-			params.log("discord: calling forceNewMessage() for draft stream");
-			draftStream?.forceNewMessage();
-		}
-		resetProgressState();
-	};
 	const beginNewProgressTurn = (options) => {
 		const beganNewTurn = progressDraft.beginNewTurn(options);
-		if (!beganNewTurn) progressDraft.beginAssistantMessage();
 		if (beganNewTurn) {
+			if (!draftStream && canStreamDraft) draftStream = createDraftStream();
 			lifecycle.reset();
 			progressNarratorLifecycle?.beginTurn();
-		}
+		} else progressDraft.beginAssistantMessage();
 		if (discordStreamMode === "progress") {
 			if (beganNewTurn) draftStream?.forceNewMessage("discard");
-		} else forceNewMessageIfNeeded();
+		} else {
+			if (discordStreamMode === "block" && hasStreamedAssistantText) {
+				params.log("discord: calling forceNewMessage() for draft stream");
+				draftStream?.forceNewMessage();
+			}
+			resetProgressState();
+		}
 		return beganNewTurn;
 	};
 	return {
-		draftStream,
+		get draftStream() {
+			return draftStream;
+		},
 		lifecycle,
 		narrationProgressEnabled,
 		narrationHideCommandText,
@@ -1163,44 +1211,44 @@ function createDiscordDraftPreviewController(params) {
 			progressNarratorLifecycle = narratorLifecycle;
 		},
 		freezeProgress,
-		async adoptProgressContinuation(payload, info, target) {
-			const adopt = info.adoptProgressContinuation;
-			if (!draftStream || discordStreamMode !== "progress" || !adopt || info.kind !== "final" || payload.isError || payload.isCommentary || resolveSendableOutboundReplyParts(payload).hasMedia || payload.interactive !== void 0 || payload.presentation !== void 0 || payload.channelData !== void 0) return false;
+		async adoptProgressDraft(payload, info) {
+			const stream = draftStream;
+			const adopt = info.adoptProgressDraft;
+			if (!stream || discordStreamMode !== "progress" || !adopt || info.kind !== "final" || payload.isError || payload.isCommentary || payload.isReasoning || resolveSendableOutboundReplyParts(payload).hasMedia || payload.interactive !== void 0 || payload.presentation !== void 0 || payload.channelData !== void 0 || lifecycle.previewFinalized) return false;
 			const snapshot = progressDraft.getSnapshot();
-			if (!snapshot.statusHeadline && !snapshot.plan?.length && !snapshot.lines.length) return false;
+			const text = progressDraft.getText().trimEnd();
+			if (!text || !progressDraft.hasStatusHeadline && !progressDraft.hasPlanProgress && !snapshot.lines.length) return false;
 			const assertCurrent = () => {
 				params.abortSignal?.throwIfAborted();
 				info.assertPlatformSendAuthorized?.();
 			};
-			return await withDiscordRequestAuthority(assertCurrent, async () => {
+			freezeProgress();
+			await withDiscordRequestAuthority(assertCurrent, async () => {
 				assertCurrent();
-				freezeProgress();
-				const text = progressDraft.getText().trimEnd();
-				draftStream.update(text, { complete: true });
-				await draftStream.flush();
+				stream.update(text, { complete: true });
+				await stream.flush();
 				assertCurrent();
-				const messageId = draftStream.messageId();
-				if (!messageId || !text || draftStream.lastDeliveredText() !== text) return false;
-				if (!await adopt({
-					channel: "discord",
-					accountId: params.accountId,
-					...target,
-					messageId,
-					text,
-					snapshot
-				})) return false;
-				if (draftStream.messageId() === messageId) {
-					lifecycle.retainPreview();
-					draftStream.forceNewMessage();
-					progressDraft.markFinalReplyDelivered();
-					resetProgressState();
-					await draftStream.discardPending();
-				}
-				return true;
 			});
+			if (!stream.messageId() || stream.isStopped() || stream.lastDeliveredText() !== text || draftStream !== stream) return false;
+			assertCurrent();
+			if (!adopt(retainDiscordProgressDraft({
+				stream,
+				snapshot,
+				entry: params.discordConfig,
+				seed: progressSeed,
+				log: params.log,
+				runInChannelScope,
+				assertChannelAuthority,
+				isPolicyCurrent: params.isPolicyCurrent
+			}))) return false;
+			lifecycle.retainPreview();
+			draftStream = void 0;
+			resetProgressState();
+			return true;
 		},
 		async retarget(channelId) {
 			await draftStream?.retarget(channelId);
+			currentChannelId = channelId;
 		},
 		async finalizeProgressDraft() {
 			if (!draftStream || discordStreamMode !== "progress") return false;
@@ -1219,20 +1267,19 @@ function createDiscordDraftPreviewController(params) {
 		pushReasoningProgress: progressDraft.pushReasoningProgress.bind(progressDraft),
 		pushNarrationProgress: progressDraft.pushNarrationProgress.bind(progressDraft),
 		updateFromPartial(text) {
-			if (!draftStream || !text) return;
+			const stream = draftStream;
+			if (!stream || !text) return;
 			const cleaned = stripInlineDirectiveTagsForDelivery(stripReasoningTagsFromText(text, {
 				mode: "strict",
 				trim: "both"
 			})).text;
-			if (!cleaned || cleaned.startsWith("Reasoning:\n")) return;
-			if (cleaned === lastPartialText) return;
-			if (discordStreamMode === "progress") return;
+			if (!cleaned || cleaned.startsWith("Reasoning:\n") || cleaned === lastPartialText || discordStreamMode === "progress") return;
 			progressDraft.resetActivity({ suppressed: true });
 			hasStreamedAssistantText = true;
 			if (discordStreamMode === "partial") {
 				if (lastPartialText && lastPartialText.startsWith(cleaned) && cleaned.length < lastPartialText.length) return;
 				lastPartialText = cleaned;
-				draftStream.update(cleaned);
+				stream.update(cleaned);
 				return;
 			}
 			let delta = cleaned;
@@ -1245,15 +1292,16 @@ function createDiscordDraftPreviewController(params) {
 			if (!delta) return;
 			if (!draftChunker) {
 				draftText = cleaned;
-				draftStream.update(draftText);
+				stream.update(draftText);
 				return;
 			}
 			draftChunker.append(delta);
 			draftChunker.drain({
 				force: false,
-				emit: (chunk) => {
-					draftText += chunk;
-					draftStream.update(draftText);
+				mutablePreview: true,
+				emit: (chunk, metadata) => {
+					draftText += metadata?.sourceText ?? chunk;
+					stream.update(draftText);
 				}
 			});
 		},
@@ -1287,11 +1335,7 @@ function shouldStartDiscordProgressDraftNow(line) {
 //#region extensions/discord/src/monitor/reply-typing-feedback.ts
 const DISCORD_REPLY_TYPING_MAX_DURATION_MS = 12e5;
 function createDiscordReplyTypingFeedback(params) {
-	const rest = params.rest ?? createDiscordRestClient({
-		cfg: params.cfg,
-		token: params.token,
-		accountId: params.accountId
-	}).rest;
+	const rest = params.rest ?? createDiscordRestClient(params).rest;
 	return createTypingCallbacks({
 		start: () => sendTyping({
 			rest,
@@ -1340,8 +1384,8 @@ function createDiscordBeforePayloadDelivery(params) {
 function createDiscordMessageReplyRuntime(params) {
 	const { ctx, processContext } = params;
 	const { cfg, discordConfig, accountId, token, guildHistories, historyLimit, textLimit, messageChannelId, isDirectMessage, route } = ctx;
-	const { ctxPayload, deliverTarget, replyReference } = processContext;
-	const deliverChannelId = deliverTarget.startsWith("channel:") ? deliverTarget.slice(8) : messageChannelId;
+	const { ctxPayload, replyPlan } = processContext;
+	const deliverChannelId = replyPlan.deliverTarget.startsWith("channel:") ? replyPlan.deliverTarget.slice(8) : messageChannelId;
 	let typingFeedback;
 	const getTypingFeedback = () => typingFeedback ??= createDiscordReplyTypingFeedback({
 		cfg,
@@ -1422,15 +1466,17 @@ function createDiscordMessageReplyRuntime(params) {
 		resolveCurrentTurnTranscriptFinalText,
 		draftPreview: createDiscordDraftPreviewController({
 			groupThread: Boolean(ctxPayload.GroupThread),
+			isRoomEvent: params.isRoomEvent,
 			cfg,
 			discordConfig,
 			accountId,
 			abortSignal: ctx.abortSignal,
+			isPolicyCurrent: ctx.isPolicyCurrent,
 			sourceRepliesAreToolOnly: params.sourceRepliesAreToolOnly,
 			textLimit,
 			deliveryRest: params.deliveryRest,
 			deliverChannelId,
-			replyReference,
+			replyReference: params.replyReference,
 			onFinalReplyStart: params.onFinalReplyStart,
 			onFinalReplyDelivered: params.onFinalReplyDelivered,
 			log: logVerbose
@@ -1476,16 +1522,15 @@ function createDiscordMessageActiveThreadRoute(params) {
 }
 //#endregion
 //#region extensions/discord/src/monitor/message-handler.process.ts
-const TARGETED_ONLY_ALLOWED_MENTIONS = { parse: ["users", "roles"] };
+const TARGETED_ONLY_ALLOWED_MENTIONS = { parse: [AllowedMentionsTypes.User, AllowedMentionsTypes.Role] };
 function isFallbackOnlyToolWarningFinal(payload) {
 	if (payload.isError !== true || !isReplyPayloadNonTerminalToolErrorWarning(payload)) return false;
 	return !resolveSendableOutboundReplyParts(payload).hasMedia;
 }
 async function processDiscordMessage(ctx, observer) {
 	const dispatchStartedAt = Date.now();
-	const { cfg, accountId, token, runtime, textLimit, replyToMode, message, messageChannelId, isGuildMessage, isDirectMessage, isGroupDm, messageText, threadBindings, route, abortSignal, isPolicyCurrent, turnAdoptionLifecycle, preparedMedia: mediaList } = ctx;
+	const { cfg, accountId, token, runtime, textLimit, replyToMode, message, messageChannelId, isGuildMessage, isDirectMessage, isGroupDm, messageText: text, threadBindings, route, abortSignal, isPolicyCurrent, turnAdoptionLifecycle, preparedMedia: mediaList } = ctx;
 	if (abortSignal?.aborted || isPolicyCurrent?.() === false) return;
-	const text = messageText;
 	if (!text && mediaList.length === 0) {
 		logVerbose("discord: drop message " + message.id + " (empty content)");
 		return;
@@ -1523,14 +1568,14 @@ async function processDiscordMessage(ctx, observer) {
 		mediaList
 	});
 	if (!processContext) return;
-	const { ctxPayload, persistedSessionKey, turn, replyPlan, deliverTarget: initialDeliverTarget, replyTarget, replyReference: sourceReplyReference } = processContext;
-	let deliverTarget = initialDeliverTarget;
+	const { ctxPayload, persistedSessionKey, record, replyPlan } = processContext;
+	let deliverTarget = replyPlan.deliverTarget;
 	const activeThreadRoute = createDiscordMessageActiveThreadRoute({
 		sessionKey: ctxPayload.SessionKey,
 		accountId,
 		sourceChannelId: messageChannelId,
 		sourceMessageId: ctx.canonicalMessageId ?? message.id,
-		sourceReplyReference,
+		sourceReplyReference: replyPlan.replyReference,
 		log: logVerbose
 	});
 	const replyReference = activeThreadRoute.replyReference;
@@ -1540,10 +1585,8 @@ async function processDiscordMessage(ctx, observer) {
 	});
 	const { replyPipeline, onModelSelected, tableMode, maxLinesPerMessage, chunkMode, beginQueuedDeliveryCorrelation, endDeliveryCorrelation, resolveCurrentTurnTranscriptFinalText, draftPreview, resolvedBlockStreamingEnabled } = createDiscordMessageReplyRuntime({
 		ctx,
-		processContext: {
-			...processContext,
-			replyReference
-		},
+		processContext,
+		replyReference,
 		sourceRepliesAreToolOnly,
 		shouldDisableCoreTypingKeepalive,
 		isRoomEvent,
@@ -1553,13 +1596,12 @@ async function processDiscordMessage(ctx, observer) {
 		onFinalReplyStart: observer?.onFinalReplyStart,
 		onFinalReplyDelivered: observer?.onFinalReplyDelivered
 	});
-	let deliverThreadId = ctxPayload.MessageThreadId;
 	activeThreadRoute.bindThreadAdoption(async (threadId) => {
 		deliverTarget = `channel:${threadId}`;
-		deliverThreadId = threadId;
 		await draftPreview.retarget(threadId);
 	});
 	const { lifecycle } = draftPreview;
+	const hasCompletedFinalReply = () => lifecycle.finalSucceeded || lifecycle.previewFinalized;
 	const observeFinalDelivery = async () => {
 		if (lifecycle.finalSucceeded) return;
 		draftPreview.freezeProgress();
@@ -1570,16 +1612,15 @@ async function processDiscordMessage(ctx, observer) {
 		await retainedProgress;
 	};
 	let pendingToolWarningFinal;
-	const resetDeliveryState = () => {
-		pendingToolWarningFinal = void 0;
-	};
 	const progress = createDiscordMessageProgressRuntime({
 		ctx,
 		sessionKey: ctxPayload.SessionKey,
 		sourceRepliesAreToolOnly,
 		draftPreview,
 		reactions,
-		onTurnReset: resetDeliveryState
+		onTurnReset: () => {
+			pendingToolWarningFinal = void 0;
+		}
 	});
 	let replyLifecycleStarted = false;
 	const onDiscordReplyStart = async () => {
@@ -1596,13 +1637,14 @@ async function processDiscordMessage(ctx, observer) {
 		isFallbackOnlyToolWarningFinal
 	});
 	const deliverDiscordPayload = async (incomingPayload, info, options) => {
+		const logSkippedDelivery = (reason) => logVerbose(formatDiscordReplySkip({
+			kind: info.kind,
+			reason,
+			target: deliverTarget,
+			sessionKey: ctxPayload.SessionKey
+		}));
 		if (abortSignal?.aborted) {
-			logVerbose(formatDiscordReplySkip({
-				kind: info.kind,
-				reason: "aborted before delivery",
-				target: deliverTarget,
-				sessionKey: ctxPayload.SessionKey
-			}));
+			logSkippedDelivery("aborted before delivery");
 			return { visibleReplySent: false };
 		}
 		const deliverySession = options?.deliverySession ?? getGroupThreadDeliverySession();
@@ -1655,7 +1697,7 @@ async function processDiscordMessage(ctx, observer) {
 			return result;
 		}
 		if (isFinal && !options?.allowFallbackOnlyToolWarning && isFallbackOnlyToolWarningFinal(payload)) {
-			if (!lifecycle.finalSucceeded && !lifecycle.previewFinalized && (!lifecycle.finalStarted || lifecycle.finalFailed)) pendingToolWarningFinal = {
+			if (!hasCompletedFinalReply() && (!lifecycle.finalStarted || lifecycle.finalFailed)) pendingToolWarningFinal = {
 				payload,
 				info,
 				deliverySession
@@ -1674,18 +1716,10 @@ async function processDiscordMessage(ctx, observer) {
 		} : payload;
 		const [deliverablePayload] = sanitizeDiscordFrontChannelReplyPayloads([effectivePayload], { kind: info.kind });
 		if (!deliverablePayload) {
-			logVerbose(formatDiscordReplySkip({
-				kind: info.kind,
-				reason: "internal-only payload",
-				target: deliverTarget,
-				sessionKey: ctxPayload.SessionKey
-			}));
+			logSkippedDelivery("internal-only payload");
 			return { visibleReplySent: false };
 		}
-		if (await draftPreview.adoptProgressContinuation(deliverablePayload, info, {
-			to: isDirectMessage ? ctxPayload.OriginatingTo ?? ctxPayload.To ?? deliverTarget : deliverTarget,
-			threadId: deliverThreadId
-		})) {
+		if (await draftPreview.adoptProgressDraft(deliverablePayload, info)) {
 			replyReference.markSent();
 			return { visibleReplySent: true };
 		}
@@ -1701,12 +1735,7 @@ async function processDiscordMessage(ctx, observer) {
 			isError: deliverablePayload.isError === true,
 			deliverNormally: async () => {
 				if (abortSignal?.aborted) {
-					logVerbose(formatDiscordReplySkip({
-						kind: info.kind,
-						reason: "aborted before delivery",
-						target: deliverTarget,
-						sessionKey: ctxPayload.SessionKey
-					}));
+					logSkippedDelivery("aborted before delivery");
 					return deliveryResult;
 				}
 				const freshPreviewFinal = draftStream && isFinal && !draftPreview.isProgressMode && !deliverablePayload.isError;
@@ -1743,7 +1772,7 @@ async function processDiscordMessage(ctx, observer) {
 	let dispatchError = false;
 	let dispatchAborted = false;
 	const deliverPendingToolWarningFinalIfNeeded = async () => {
-		if (!pendingToolWarningFinal || lifecycle.finalSucceeded || lifecycle.previewFinalized || abortSignal?.aborted) return;
+		if (!pendingToolWarningFinal || hasCompletedFinalReply() || abortSignal?.aborted) return;
 		const pending = pendingToolWarningFinal;
 		pendingToolWarningFinal = void 0;
 		try {
@@ -1793,7 +1822,7 @@ async function processDiscordMessage(ctx, observer) {
 				deliverWithProviderMessageSending: deliverDiscordPayload,
 				onError: onDiscordDeliveryError
 			},
-			record: turn.record,
+			record,
 			history: isRoomEvent ? void 0 : {
 				isGroup: isGuildMessage,
 				historyKey: messageChannelId,
@@ -1853,11 +1882,10 @@ async function processDiscordMessage(ctx, observer) {
 			finalDeliveryFailed
 		});
 	}
-	const finalDispatchResult = dispatchResult;
-	if (!finalDispatchResult || !hasFinalInboundReplyDispatch(finalDispatchResult)) return;
+	if (!dispatchResult || !hasFinalInboundReplyDispatch(dispatchResult)) return;
 	if (shouldLogVerbose()) {
-		const finalCount = finalDispatchResult.settledReceipt?.counts.final.delivered ?? 0;
-		logVerbose(`discord: delivered ${finalCount} reply${finalCount === 1 ? "" : "ies"} to ${replyTarget}`);
+		const finalCount = dispatchResult.settledReceipt?.counts.final.delivered ?? 0;
+		logVerbose(`discord: delivered ${finalCount} reply${finalCount === 1 ? "" : "ies"} to ${replyPlan.replyTarget}`);
 	}
 }
 //#endregion