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

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

@@ -1,21 +1,21 @@
-import { d as discord_exports, gt as deleteChannelMessage, pt as createChannelMessage, t as chunkDiscordTextWithMode, u as resolveDiscordChannelId, vt as editChannelMessage } from "./chunk-DX4jpFQP.js";
+import { 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-jpvAG_u6.js";
-import { C as resolveTimestampMs, a as normalizeDiscordSlug, r as normalizeDiscordAllowList } from "./allow-list-DzKrtfah.js";
-import { i as discordTextHasBroadcastMention } from "./send.outbound-D-80Ej-t.js";
-import { s as editMessageDiscord } from "./send-CdkZ6zeW.js";
+import { F as createDiscordRestClient, I as createDiscordRuntimeAccountContext, _ as resolveDiscordMessageFlags, d as resolveDiscordTargetChannelId } from "./send.shared-BmwFjW6T.js";
+import { C as resolveTimestampMs, a as normalizeDiscordSlug, r as normalizeDiscordAllowList } from "./allow-list-DnxIlPP2.js";
+import { i as discordTextHasBroadcastMention } from "./send.outbound-DS5tHwfR.js";
+import { c as editMessageDiscord } from "./send-B7Q6Oc1I.js";
 import { n as DISCORD_ATTACHMENT_TOTAL_TIMEOUT_MS, t as DISCORD_ATTACHMENT_IDLE_TIMEOUT_MS } from "./timeouts-B9cy6RvQ.js";
-import { i as removeReactionDiscord, n as reactMessageDiscord } from "./send.reactions-CtlmGd_o.js";
-import "./targets-Dv_RN7vT.js";
-import { r as resolveDiscordConversationIdentity } from "./approval-message-safety-DEyKVsAw.js";
-import { t as beginDiscordInboundEventDeliveryCorrelation } from "./inbound-event-delivery-CEPlt2uz.js";
-import { t as DISCORD_TEXT_CHUNK_LIMIT } from "./outbound-adapter-DtE-i2OJ.js";
-import { D as resolveDiscordAutoThreadReplyPlan, _ as buildDiscordInboundAccessContext, a as sanitizeDiscordFrontChannelReplyPayloads, c as resolveReplyContext, i as formatDiscordReplySkip, k as resolveDiscordThreadStarter, n as deliverDiscordReply, o as buildDirectLabel, r as formatDiscordReplyDeliveryFailure, s as buildGuildLabel, v as createDiscordSupplementalContextAccessChecker } from "./provider-DfQJX3z5.js";
-import { a as formatDiscordMediaText, c as resolveReferencedReplyMediaList, i as resolveDiscordMessageText, u as resolveDiscordMessageStickers } from "./message-utils-BgTwT_q7.js";
-import { n as resolveDiscordWebhookId } from "./sender-identity-mG_zsdox.js";
-import { t as beginDiscordActiveTurnThreadRoute } from "./active-turn-thread-route-MlKWp8RD.js";
+import { i as removeReactionDiscord, n as reactMessageDiscord } from "./send.reactions-BAn0iiVQ.js";
+import "./targets-yUFTHoAx.js";
+import { r as resolveDiscordConversationIdentity } from "./approval-message-safety-AcIxvrf3.js";
+import { t as discordInboundEventDelivery } from "./inbound-event-delivery-De2qxTrP.js";
+import { t as DISCORD_TEXT_CHUNK_LIMIT } from "./outbound-adapter-D9nRivT1.js";
+import { D as resolveDiscordAutoThreadReplyPlan, _ as buildDiscordInboundAccessContext, a as sanitizeDiscordFrontChannelReplyPayloads, c as resolveReplyContext, i as formatDiscordReplySkip, k as resolveDiscordThreadStarter, n as deliverDiscordReply, o as buildDirectLabel, r as formatDiscordReplyDeliveryFailure, s as buildGuildLabel, v as createDiscordSupplementalContextAccessChecker } from "./provider-DvSNb-2v.js";
+import { a as formatDiscordMediaText, c as resolveReferencedReplyMediaList, i as resolveDiscordMessageText, u as resolveDiscordMessageStickers } from "./message-utils-BSCPVgy0.js";
+import { n as resolveDiscordWebhookId } from "./sender-identity-QtalnCYv.js";
+import { t as beginDiscordActiveTurnThreadRoute } from "./active-turn-thread-route-fmHl1HNd.js";
 import { n as filterDiscordHistoryEntriesForContext, t as createDiscordHistorySenderProvenance } from "./message-handler.history-CJOsN9w5.js";
-import { t as sendTyping } from "./typing--Mzo2kM7.js";
+import { t as sendTyping } from "./typing-CS-nNVoe.js";
 import { buildAgentSessionKey, resolveThreadSessionKeys } from "openclaw/plugin-sdk/routing";
 import { expectDefined } from "openclaw/plugin-sdk/expect-runtime";
 import { formatErrorMessage } from "openclaw/plugin-sdk/error-runtime";
@@ -24,14 +24,14 @@ import { truncateUtf16Safe } from "openclaw/plugin-sdk/text-utility-runtime";
 import { resolveMarkdownTableMode } from "openclaw/plugin-sdk/markdown-table-runtime";
 import { resolveChunkMode } from "openclaw/plugin-sdk/reply-chunking";
 import { convertMarkdownTables, stripInlineDirectiveTagsForDelivery, stripReasoningTagsFromText } from "openclaw/plugin-sdk/text-chunking";
-import { bindIngressLifecycleToReplyOptions, buildChannelProgressDraftLine, buildChannelProgressDraftLineForEntry, createChannelMessageReplyPipeline, createChannelProgressDraftCompositor, createFinalizableDraftLifecycle, createTypingCallbacks, defineFinalizableLivePreviewAdapter, deliverWithFinalizableLivePreviewAdapter, isChannelProgressDraftWorkToolName, resolveChannelDraftStreamingChunking, resolveChannelMessageSourceReplyDeliveryMode, resolveChannelPreviewStreamMode, resolveChannelStreamingBlockEnabled, resolveChannelStreamingPreviewCommandText, resolveChannelStreamingPreviewToolProgress, resolveChannelStreamingProgressNarration, resolveChannelStreamingSuppressDefaultToolProgressMessages, resolveTranscriptBackedChannelFinalText } from "openclaw/plugin-sdk/channel-outbound";
+import { bindIngressLifecycleToReplyOptions, buildChannelProgressDraftLine, buildChannelProgressDraftLineForEntry, createChannelMessageReplyPipeline, createChannelProgressDraftCompositor, createChannelProgressReceiptTracker, createFinalizableDraftLifecycle, createTypingCallbacks, defineFinalizableLivePreviewAdapter, deliverWithFinalizableLivePreviewAdapter, resolveChannelDraftStreamingChunking, resolveChannelMessageSourceReplyDeliveryMode, resolveChannelPreviewStreamMode, resolveChannelStreamingBlockEnabled, resolveChannelStreamingPreviewCommandText, resolveChannelStreamingPreviewToolProgress, resolveChannelStreamingProgressNarration, resolveChannelStreamingSuppressDefaultToolProgressMessages, resolveTranscriptBackedChannelFinalText } from "openclaw/plugin-sdk/channel-outbound";
 import { getAgentScopedMediaLocalRoots } from "openclaw/plugin-sdk/media-runtime";
 import { getReplyPayloadTtsSupplement, isReplyPayloadNonTerminalToolErrorWarning, resolveSendableOutboundReplyParts } from "openclaw/plugin-sdk/reply-payload";
 import { evaluateSupplementalContextVisibility } from "openclaw/plugin-sdk/security-runtime";
 import { resolvePinnedMainDmOwnerFromAllowlist } from "openclaw/plugin-sdk/conversation-runtime";
 import { EmbeddedBlockChunker, resolveAckReaction, resolveAgentConfig, resolveHumanDelayConfig } from "openclaw/plugin-sdk/agent-runtime";
 import { isDangerousNameMatchingEnabled } from "openclaw/plugin-sdk/dangerous-name-runtime";
-import { buildChannelInboundEventContext, dispatchChannelInboundTurn, formatInboundEnvelope, hasFinalInboundReplyDispatch, resolveEnvelopeFormatOptions, toHistoryMediaEntries, toInboundMediaFactsWithMetadata } from "openclaw/plugin-sdk/channel-inbound";
+import { buildChannelInboundEventContext, dispatchChannelInboundTurn, formatInboundEnvelope, formatInboundMediaUnavailableText, hasFinalInboundReplyDispatch, readAgentRunTerminalOutcome, resolveEnvelopeFormatOptions, toHistoryMediaEntries, toInboundMediaFactsWithMetadata } from "openclaw/plugin-sdk/channel-inbound";
 import { getSessionEntry, readSessionUpdatedAt, resolveStorePath } from "openclaw/plugin-sdk/session-store-runtime";
 import { getGlobalHookRunner } from "openclaw/plugin-sdk/plugin-runtime";
 import { buildHistoryContextFromEntries, buildInboundHistoryFromEntries, createChannelHistoryWindow } from "openclaw/plugin-sdk/reply-history";
@@ -78,7 +78,7 @@ function isContextAborted(abortSignal) {
 }
 async function buildDiscordMessageProcessContext(params) {
 	const { ctx, text, mediaList } = params;
-	const { cfg, discordConfig, accountId, runtime, botUserId, mediaMaxBytes, discordRestFetch, abortSignal, guildHistories, historyLimit, replyToMode, message, author, sender, canonicalMessageId, data, client, channelInfo, channelName, messageChannelId, isGuildMessage, isDirectMessage, baseText, preflightAudioTranscript, threadChannel, threadParentId, threadParentName, threadParentType, threadName, displayChannelSlug, guildInfo, guildSlug, memberRoleIds, channelConfig, baseSessionKey, boundSessionKey, route, commandAuthorized } = ctx;
+	const { cfg, discordConfig, accountId, runtime, botUserId, mediaMaxBytes, discordRestFetch, abortSignal, guildHistories, historyLimit, replyToMode, message, author, sender, canonicalMessageId, data, client, channelInfo, channelName, messageChannelId, isGuildMessage, isDirectMessage, baseText, preflightAudioTranscript, threadChannel, threadParentId, threadParentName, threadParentType, threadName, displayChannelSlug, guildInfo, guildSlug, memberRoleIds, channelConfig, baseSessionKey, boundSessionKey, route, commandAuthorized, resolveChannelIngress } = ctx;
 	const fromLabel = isDirectMessage ? buildDirectLabel(author) : buildGuildLabel({
 		guild: data.guild ?? void 0,
 		channelName: channelName ?? messageChannelId,
@@ -129,11 +129,17 @@ async function buildDiscordMessageProcessContext(params) {
 	});
 	const channelHistory = createChannelHistoryWindow({ historyMap: guildHistories });
 	let visibleChannelHistory;
+	const unavailableMediaCount = mediaList.filter((media) => !media.path).length;
+	const appendMediaUnavailableNotice = (body) => unavailableMediaCount > 0 ? formatInboundMediaUnavailableText({
+		body,
+		notice: `[discord ${unavailableMediaCount > 1 ? `${unavailableMediaCount} attachments` : "attachment"} unavailable]`
+	}) : body;
+	const bodyWithMediaNotice = appendMediaUnavailableNotice(text) ?? text;
 	let combinedBody = formatInboundEnvelope({
 		channel: "Discord",
 		from: fromLabel,
 		timestamp: resolveTimestampMs(message.timestamp),
-		body: text,
+		body: bodyWithMediaNotice,
 		chatType: isDirectMessage ? "direct" : "channel",
 		senderLabel,
 		previousTimestamp,
@@ -270,7 +276,17 @@ async function buildDiscordMessageProcessContext(params) {
 		storePath,
 		sessionKey: effectiveSessionKey
 	});
-	const ctxPayload = await buildChannelInboundEventContext({
+	const channelIngress = await resolveChannelIngress({
+		agentId: route.agentId,
+		sessionKey: effectiveSessionKey,
+		messageId: canonicalMessageId ?? message.id,
+		inboundEventKind: ctx.inboundEventKind
+	}, {
+		parentId: threadChannel ? threadParentId : void 0,
+		threadId: threadChannel?.id ?? autoThreadContext?.createdThreadId ?? void 0
+	});
+	const ctxPayload = await (ctx.buildContext ?? buildChannelInboundEventContext)({
+		channelIngress,
 		channel: "discord",
 		resolveSupplementalMedia: true,
 		contextVisibility: contextVisibilityMode,
@@ -314,7 +330,7 @@ async function buildDiscordMessageProcessContext(params) {
 			inboundEventKind: ctx.inboundEventKind,
 			body: combinedBody,
 			rawBody: preflightAudioTranscript ?? baseText,
-			bodyForAgent: preflightAudioTranscript ?? baseText ?? text,
+			bodyForAgent: appendMediaUnavailableNotice(preflightAudioTranscript ?? baseText ?? text),
 			commandBody: preflightAudioTranscript ?? baseText,
 			inboundHistory
 		},
@@ -437,7 +453,7 @@ function isFailedProgress(payload) {
 }
 function createDiscordMessageProgressRuntime(params) {
 	const { ctx, draftPreview } = params;
-	const { cfg, discordConfig, route, abortSignal } = ctx;
+	const { cfg, route, abortSignal } = ctx;
 	const reasoningLevel = (() => {
 		const normalizedAgentId = (route.agentId ?? "").trim().toLowerCase() || "main";
 		const cfgDefault = cfg.agents?.list?.find((entry) => ((entry?.id ?? "").trim().toLowerCase() || "main") === normalizedAgentId)?.reasoningDefault ?? cfg.agents?.defaults?.reasoningDefault;
@@ -459,41 +475,9 @@ function createDiscordMessageProgressRuntime(params) {
 	const reasoningDurableEnabled = reasoningLevel === "on";
 	const reasoningWindowEnabled = reasoningLevel === "stream";
 	let shouldYieldDraftCommentary = () => false;
-	let progressTurnStartedAt = Date.now();
-	let progressReasoningSteps = 0;
-	let progressToolCalls = 0;
-	let progressCommentaryNotes = 0;
-	const seenCommentaryIds = /* @__PURE__ */ new Set();
-	let lastCommentaryNoteText = "";
-	const noteWindowCommentary = (itemId, noteText) => {
-		const trimmed = noteText?.trim();
-		if (!trimmed) return;
-		if (itemId) {
-			if (seenCommentaryIds.has(itemId)) return;
-			seenCommentaryIds.add(itemId);
-			progressCommentaryNotes += 1;
-			return;
-		}
-		if (trimmed !== lastCommentaryNoteText) {
-			lastCommentaryNoteText = trimmed;
-			progressCommentaryNotes += 1;
-		}
-	};
-	let windowReasoningOpen = false;
-	const closePendingWindowThought = () => {
-		if (windowReasoningOpen) {
-			windowReasoningOpen = false;
-			progressReasoningSteps += 1;
-		}
-	};
+	const progressReceipt = createChannelProgressReceiptTracker();
 	const resetTurnState = () => {
-		progressTurnStartedAt = Date.now();
-		progressReasoningSteps = 0;
-		progressToolCalls = 0;
-		progressCommentaryNotes = 0;
-		seenCommentaryIds.clear();
-		lastCommentaryNoteText = "";
-		windowReasoningOpen = false;
+		progressReceipt.reset();
 	};
 	const handleAssistantMessageBoundary = () => {
 		if (draftPreview.handleAssistantMessageBoundary()) {
@@ -501,28 +485,30 @@ function createDiscordMessageProgressRuntime(params) {
 			params.onTurnReset();
 		}
 	};
-	const buildProgressSummaryLine = () => {
-		closePendingWindowThought();
-		const seconds = Math.max(1, Math.round((Date.now() - progressTurnStartedAt) / 1e3));
-		return `-# ${[
-			...progressReasoningSteps > 0 ? [`🧠 ${progressReasoningSteps} thought${progressReasoningSteps === 1 ? "" : "s"}`] : [],
-			...progressCommentaryNotes > 0 ? [`💬 ${progressCommentaryNotes} note${progressCommentaryNotes === 1 ? "" : "s"}`] : [],
-			...progressToolCalls > 0 ? [`🛠️ ${progressToolCalls} tool call${progressToolCalls === 1 ? "" : "s"}`] : [],
-			`⏱️ ${seconds}s`
-		].join(" · ")}`;
-	};
+	const buildProgressSummaryLine = () => `-# ${progressReceipt.buildSummaryLine()}`;
 	return {
 		replyOptions: {
-			onAssistantMessageStart: draftPreview.draftStream ? handleAssistantMessageBoundary : void 0,
+			onAssistantMessageStart: draftPreview.draftStream ? () => {
+				handleAssistantMessageBoundary();
+				return false;
+			} : void 0,
 			onReasoningEnd: draftPreview.draftStream ? () => {
-				closePendingWindowThought();
+				progressReceipt.closeReasoning();
 				handleAssistantMessageBoundary();
+				return false;
+			} : void 0,
+			onQueuedFollowupAdmitted: draftPreview.draftStream ? () => {
+				if (draftPreview.handleQueuedFollowupAdmitted()) {
+					resetTurnState();
+					params.onTurnReset();
+				}
 			} : void 0,
 			suppressDefaultToolProgressMessages: params.sourceRepliesAreToolOnly && params.reactions.statusReactionsExplicitlyEnabled || draftPreview.suppressDefaultToolProgressMessages ? true : void 0,
 			allowToolLifecycleWhenProgressHidden: params.reactions.statusReactionsEnabled ? true : void 0,
 			commentaryProgressEnabled: draftPreview.isProgressMode ? draftPreview.commentaryProgressEnabled : void 0,
 			progressPreambleEnabled: draftPreview.draftStream && draftPreview.isProgressMode ? true : void 0,
 			commentaryPayloadsEnabled: draftPreview.isProgressMode ? draftPreview.commentaryProgressEnabled : void 0,
+			shouldDeliverCommentaryPayloads: draftPreview.isProgressMode && draftPreview.commentaryProgressEnabled ? () => shouldYieldDraftCommentary() : void 0,
 			reasoningPayloadsEnabled: reasoningDurableEnabled,
 			onVerboseProgressVisibility: (isActive) => {
 				shouldYieldDraftCommentary = isActive;
@@ -535,97 +521,53 @@ function createDiscordMessageProgressRuntime(params) {
 			isProgressDraftVisible: draftPreview.narrationProgressEnabled ? () => draftPreview.isProgressDraftVisible : void 0,
 			narrationHideCommandText: draftPreview.narrationHideCommandText ? true : void 0,
 			onReasoningStream: async (payload) => {
-				if (payload?.requiresReasoningProgressOptIn === true && !reasoningWindowEnabled) return;
-				if (payload?.text) windowReasoningOpen = true;
+				if (payload?.requiresReasoningProgressOptIn === true && !reasoningWindowEnabled) return false;
+				if (payload?.text) progressReceipt.noteReasoning();
 				await params.reactions.controller.setThinking();
-				await draftPreview.pushReasoningProgress(payload?.text, { snapshot: payload?.isReasoningSnapshot === true });
+				return await draftPreview.pushReasoningProgress(payload?.text, { snapshot: payload?.isReasoningSnapshot === true });
 			},
 			streamReasoningInNonStreamModes: reasoningWindowEnabled,
 			onToolStart: async (payload) => {
-				if (isProcessAborted$1(abortSignal)) return;
+				if (isProcessAborted$1(abortSignal)) return false;
 				await params.reactions.maybeBindToToolReaction(payload);
 				await params.reactions.controller.setTool(payload.name);
-				if (payload.phase === "start") closePendingWindowThought();
-				if (payload.phase === "start" && isChannelProgressDraftWorkToolName(payload.name)) progressToolCalls += 1;
-				await draftPreview.pushToolProgress(buildChannelProgressDraftLineForEntry(discordConfig, {
-					event: "tool",
-					itemId: payload.itemId,
-					toolCallId: payload.toolCallId,
-					name: payload.name,
-					phase: payload.phase,
-					args: payload.args
-				}, payload.detailMode ? { detailMode: payload.detailMode } : void 0), { toolName: payload.name });
+				if (payload.phase === "start") progressReceipt.noteToolCall(payload.name);
+				return await draftPreview.pushToolEvent(payload);
 			},
 			onItemEvent: async (payload) => {
 				if (isFailedProgress(payload)) return false;
 				if (payload.kind === "preamble") {
 					if (shouldYieldDraftCommentary()) return;
-					return await draftPreview.pushPreambleItemEvent(payload, noteWindowCommentary);
+					return await draftPreview.pushPreambleItemEvent(payload, (itemId, text) => {
+						progressReceipt.noteCommentary(itemId, text);
+					});
 				}
-				await draftPreview.pushToolProgress(buildChannelProgressDraftLineForEntry(discordConfig, {
-					event: "item",
-					itemId: payload.itemId,
-					toolCallId: payload.toolCallId,
-					itemKind: payload.kind,
-					title: payload.title,
-					name: payload.name,
-					phase: payload.phase,
-					status: payload.status,
-					summary: payload.summary,
-					progressText: payload.progressText,
-					meta: payload.meta
-				}));
+				return await draftPreview.pushItemEvent(payload);
 			},
 			onPlanUpdate: async (payload) => {
-				if (payload.phase === "update") await draftPreview.pushPlanProgress(payload.steps, { explanation: payload.explanation });
+				if (payload.phase === "update") return await draftPreview.pushPlanProgress(payload.steps, { explanation: payload.explanation });
+				return false;
 			},
 			onApprovalEvent: async (payload) => {
-				if (payload.phase === "requested") await draftPreview.pushToolProgress(buildChannelProgressDraftLine({
-					event: "approval",
-					phase: payload.phase,
-					title: payload.title,
-					command: payload.command,
-					reason: payload.reason,
-					message: payload.message
-				}));
+				return await draftPreview.pushApprovalEvent(payload);
 			},
 			onCommandOutput: async (payload) => {
 				if (isFailedProgress(payload)) return false;
-				if (payload.phase !== "end") return;
-				await draftPreview.pushToolProgress(buildChannelProgressDraftLine({
-					event: "command-output",
-					itemId: payload.itemId,
-					toolCallId: payload.toolCallId,
-					phase: payload.phase,
-					title: payload.title,
-					name: payload.name,
-					status: payload.status,
-					exitCode: payload.exitCode
-				}));
+				return await draftPreview.pushCommandOutputEvent(payload);
 			},
 			onPatchSummary: async (payload) => {
-				if (payload.phase !== "end") return;
-				await draftPreview.pushToolProgress(buildChannelProgressDraftLine({
-					event: "patch",
-					itemId: payload.itemId,
-					toolCallId: payload.toolCallId,
-					phase: payload.phase,
-					title: payload.title,
-					name: payload.name,
-					added: payload.added,
-					modified: payload.modified,
-					deleted: payload.deleted,
-					summary: payload.summary
-				}));
+				return await draftPreview.pushPatchEvent(payload);
 			},
 			onCompactionStart: async () => {
 				if (!isProcessAborted$1(abortSignal)) await params.reactions.controller.setCompacting();
+				return false;
 			},
 			onCompactionEnd: async () => {
 				if (!isProcessAborted$1(abortSignal)) {
 					params.reactions.controller.cancelPending();
 					await params.reactions.controller.setThinking();
 				}
+				return false;
 			}
 		},
 		buildProgressSummaryLine
@@ -1029,7 +971,6 @@ function createDiscordDraftStream(params) {
 //#endregion
 //#region extensions/discord/src/preview-streaming.ts
 function resolveDiscordPreviewStreamMode(params = {}) {
-	if (params.streaming === void 0) return "progress";
 	return resolveChannelPreviewStreamMode(params, "off");
 }
 //#endregion
@@ -1039,9 +980,13 @@ function createDiscordDraftPreviewController(params) {
 	const hookRunner = getGlobalHookRunner();
 	const allowProviderPreview = !((hookRunner?.hasHooks("reply_payload_sending") ?? false) || (hookRunner?.hasHooks("message_sending") ?? false));
 	const draftMaxChars = Math.min(params.textLimit, 2e3);
-	const accountBlockStreamingEnabled = resolveChannelStreamingBlockEnabled(params.discordConfig) ?? params.cfg.agents?.defaults?.blockStreamingDefault === "on";
 	const canStreamProgressDraftForToolOnlySource = params.sourceRepliesAreToolOnly && discordStreamMode === "progress";
-	const draftStream = allowProviderPreview && (!params.sourceRepliesAreToolOnly || canStreamProgressDraftForToolOnlySource) && discordStreamMode !== "off" && !accountBlockStreamingEnabled ? createDiscordDraftStream({
+	const previewAvailable = allowProviderPreview && (!params.sourceRepliesAreToolOnly || canStreamProgressDraftForToolOnlySource) && discordStreamMode !== "off";
+	const accountBlockStreamingEnabled = resolveChannelStreamingBlockEnabled(params.discordConfig, {
+		previewAvailable,
+		blockStreamingDefault: params.cfg.agents?.defaults?.blockStreamingDefault
+	});
+	const draftStream = previewAvailable && !accountBlockStreamingEnabled ? createDiscordDraftStream({
 		rest: params.deliveryRest,
 		channelId: params.deliverChannelId,
 		maxChars: draftMaxChars,
@@ -1080,13 +1025,16 @@ function createDiscordDraftPreviewController(params) {
 		commentaryLinePrefix: "💬 ",
 		reasoningGate: previewToolProgressEnabled,
 		commentaryItalics: false,
+		buildProgressEventLine: (input, options) => input.event === "tool" || input.event === "item" || input.event === "command-output" ? buildChannelProgressDraftLineForEntry(params.discordConfig, input, options) : buildChannelProgressDraftLine(input, options),
 		update: async (previewText, options) => {
+			if (!draftStream) return false;
 			lastPartialText = previewText;
 			draftText = previewText;
 			hasStreamedMessage = true;
 			draftChunker?.reset();
-			draftStream?.update(previewText);
-			if (options?.flush) await draftStream?.flush();
+			draftStream.update(previewText);
+			if (options?.flush) await draftStream.flush();
+			return Boolean(draftStream.messageId());
 		},
 		deleteCurrent: async () => {
 			lastPartialText = "";
@@ -1111,7 +1059,22 @@ function createDiscordDraftPreviewController(params) {
 		resetProgressState();
 	};
 	const pushPreambleHeadline = async (text, options) => {
-		if (discordStreamMode === "progress") await progressDraft.pushPreambleHeadline(text, options);
+		if (discordStreamMode === "progress") return await progressDraft.pushPreambleHeadline(text, options);
+		return false;
+	};
+	const beginNewProgressTurn = (options) => {
+		const beganNewTurn = progressDraft.beginNewTurn(options);
+		if (beganNewTurn) {
+			progressDraftCollapsed = false;
+			progressDraftStartedBeforeFinal = false;
+			finalReplyDelivered = false;
+			finalizedViaPreviewMessage = false;
+			progressNarratorLifecycle?.beginTurn();
+		}
+		if (discordStreamMode === "progress") {
+			if (beganNewTurn) draftStream?.forceNewMessage("discard");
+		} else forceNewMessageIfNeeded();
+		return beganNewTurn;
 	};
 	return {
 		draftStream,
@@ -1171,26 +1134,33 @@ function createDiscordDraftPreviewController(params) {
 			return true;
 		},
 		disableBlockStreamingForDraft: draftStream ? true : void 0,
+		pushToolEvent: progressDraft.pushToolEvent,
+		pushItemEvent: progressDraft.pushItemEvent,
+		pushApprovalEvent: progressDraft.pushApprovalEvent,
+		pushCommandOutputEvent: progressDraft.pushCommandOutputEvent,
+		pushPatchEvent: progressDraft.pushPatchEvent,
 		async pushToolProgress(line, options) {
-			await progressDraft.pushToolProgress(line, options);
+			return await progressDraft.pushToolProgress(line, options);
 		},
 		async pushPlanProgress(steps, options) {
-			await progressDraft.pushPlanProgress(steps, options);
+			return await progressDraft.pushPlanProgress(steps, options);
 		},
 		async pushReasoningProgress(text, options) {
-			await progressDraft.pushReasoningProgress(text, options);
+			return await progressDraft.pushReasoningProgress(text, options);
 		},
 		async pushNarrationProgress(text) {
-			await progressDraft.pushNarrationProgress(text);
+			return await progressDraft.pushNarrationProgress(text);
 		},
 		pushPreambleHeadline,
 		async pushPreambleItemEvent(payload, noteCommentary) {
-			await pushPreambleHeadline(payload.progressText, { itemId: payload.itemId });
-			if (!progressDraft.commentaryProgressEnabled) return;
-			if (await progressDraft.pushCommentaryProgress(payload.progressText, { itemId: payload.itemId })) noteCommentary(payload.itemId, payload.progressText);
+			const headlineAccepted = await pushPreambleHeadline(payload.progressText, { itemId: payload.itemId });
+			if (!progressDraft.commentaryProgressEnabled) return headlineAccepted;
+			const commentaryAccepted = await progressDraft.pushCommentaryProgress(payload.progressText, { itemId: payload.itemId });
+			if (commentaryAccepted) noteCommentary(payload.itemId, payload.progressText);
+			return headlineAccepted || commentaryAccepted;
 		},
 		async pushCommentaryProgress(text, options) {
-			await progressDraft.pushCommentaryProgress(text, options);
+			return await progressDraft.pushCommentaryProgress(text, options);
 		},
 		resolvePreviewFinalText(text) {
 			if (typeof text !== "string") return;
@@ -1248,20 +1218,10 @@ function createDiscordDraftPreviewController(params) {
 			});
 		},
 		handleAssistantMessageBoundary() {
-			const beganNewTurn = progressDraft.beginNewTurn();
-			if (beganNewTurn) {
-				progressDraftCollapsed = false;
-				progressDraftStartedBeforeFinal = false;
-				finalReplyDelivered = false;
-				finalizedViaPreviewMessage = false;
-				progressNarratorLifecycle?.beginTurn();
-			}
-			if (discordStreamMode === "progress") {
-				if (beganNewTurn) draftStream?.forceNewMessage("discard");
-				return beganNewTurn;
-			}
-			forceNewMessageIfNeeded();
-			return beganNewTurn;
+			return beginNewProgressTurn();
+		},
+		handleQueuedFollowupAdmitted() {
+			return beginNewProgressTurn({ force: true });
 		},
 		async flush() {
 			if (!draftStream) return;
@@ -1391,7 +1351,7 @@ function createDiscordMessageReplyRuntime(params) {
 			limit: historyLimit
 		});
 	};
-	const beginDeliveryCorrelation = () => params.isRoomEvent ? beginDiscordInboundEventDeliveryCorrelation(ctxPayload.SessionKey, {
+	const beginDeliveryCorrelation = () => params.isRoomEvent ? discordInboundEventDelivery.begin(ctxPayload.SessionKey, {
 		outboundTo: messageChannelId,
 		outboundAccountId: route.accountId,
 		markInboundEventDelivered: clearGroupHistory
@@ -1510,7 +1470,7 @@ async function processDiscordMessage(ctx, observer) {
 }
 async function processDiscordMessageInner(ctx, observer) {
 	const dispatchStartedAt = Date.now();
-	const { cfg, accountId, token, runtime, guildHistories, historyLimit, textLimit, replyToMode, message, messageChannelId, canonicalMessageId, isGuildMessage, isDirectMessage, isGroupDm, messageText, channelConfig, threadBindings, route, abortSignal, turnAdoptionLifecycle, preparedMedia: mediaList } = ctx;
+	const { cfg, accountId, token, runtime, textLimit, replyToMode, message, messageChannelId, isGuildMessage, isDirectMessage, isGroupDm, messageText, threadBindings, route, abortSignal, turnAdoptionLifecycle, preparedMedia: mediaList } = ctx;
 	if (isProcessAborted(abortSignal)) return;
 	const text = messageText;
 	if (!text && mediaList.length === 0) {
@@ -1549,7 +1509,7 @@ async function processDiscordMessageInner(ctx, observer) {
 		sessionKey: ctxPayload.SessionKey,
 		accountId,
 		sourceChannelId: messageChannelId,
-		sourceMessageId: canonicalMessageId ?? message.id,
+		sourceMessageId: ctx.canonicalMessageId ?? message.id,
 		sourceReplyReference,
 		log: logVerbose
 	});
@@ -1668,7 +1628,8 @@ async function processDiscordMessageInner(ctx, observer) {
 				sessionKey: ctxPayload.SessionKey,
 				threadBindings,
 				mediaLocalRoots,
-				kind: "block"
+				kind: "block",
+				bindPendingFinalDelivery: info.bindPendingFinalDelivery
 			});
 			if (result.visibleReplySent) replyReference.markSent();
 			return result;
@@ -1767,7 +1728,8 @@ async function processDiscordMessageInner(ctx, observer) {
 						threadBindings,
 						mediaLocalRoots,
 						allowedMentions,
-						kind: info.kind
+						kind: info.kind,
+						bindPendingFinalDelivery: info.bindPendingFinalDelivery
 					})).visibleReplySent;
 				},
 				onNormalDelivered: () => {
@@ -1809,7 +1771,8 @@ async function processDiscordMessageInner(ctx, observer) {
 			sessionKey: ctxPayload.SessionKey,
 			threadBindings,
 			mediaLocalRoots,
-			kind: info.kind
+			kind: info.kind,
+			bindPendingFinalDelivery: info.bindPendingFinalDelivery
 		});
 		if (!result.visibleReplySent) return result;
 		replyReference.markSent();
@@ -1891,13 +1854,13 @@ async function processDiscordMessageInner(ctx, observer) {
 			history: isRoomEvent ? void 0 : {
 				isGroup: isGuildMessage,
 				historyKey: messageChannelId,
-				historyMap: guildHistories,
-				limit: historyLimit
+				historyMap: ctx.guildHistories,
+				limit: ctx.historyLimit
 			},
 			replyOptions: {
 				...turnAdoptionLifecycle ? bindIngressLifecycleToReplyOptions(turnAdoptionLifecycle) : {},
 				abortSignal,
-				skillFilter: channelConfig?.skills,
+				skillFilter: ctx.channelConfig?.skills,
 				sourceReplyDeliveryMode,
 				typingKeepalive: shouldDisableCoreTypingKeepalive ? false : void 0,
 				queuedDeliveryCorrelations: isRoomEvent ? [{ begin: beginQueuedDeliveryCorrelation }] : void 0,
@@ -1932,6 +1895,7 @@ async function processDiscordMessageInner(ctx, observer) {
 		activeThreadRoute.end();
 		endDeliveryCorrelation();
 		await draftPreview.cleanup();
+		dispatchError ||= readAgentRunTerminalOutcome(dispatchResult) === "failed";
 		const finalDeliveryFailed = (dispatchResult?.failedCounts?.final ?? 0) > 0;
 		await reactions.finish({
 			dispatchAborted,

package/dist/{message-utils-BgTwT_q7.js → message-utils-BSCPVgy0.js}

@@ -1,8 +1,8 @@
-import { f as resolveDiscordChannelInfoSafe } from "./thread-bindings.discord-api-BoDNqamb.js";
+import { c as resolveDiscordChannelInfoSafe } from "./thread-bindings.manager-DCIH6WDC.js";
 import { normalizeLowercaseStringOrEmpty, normalizeOptionalString, normalizeOptionalStringifiedId, uniqueStrings } from "openclaw/plugin-sdk/string-coerce-runtime";
 import { ComponentType, StickerFormatType } from "discord-api-types/v10";
 import { asDateTimestampMs, resolveExpiresAtMsFromDurationMs } from "openclaw/plugin-sdk/number-runtime";
-import { logVerbose } from "openclaw/plugin-sdk/runtime-env";
+import { getChildLogger, logVerbose } from "openclaw/plugin-sdk/runtime-env";
 import { saveRemoteMedia } from "openclaw/plugin-sdk/media-runtime";
 import { pruneMapToMaxSize } from "openclaw/plugin-sdk/collection-runtime";
 import { formatMediaPlaceholderText } from "openclaw/plugin-sdk/channel-inbound";
@@ -368,7 +368,7 @@ async function appendResolvedMediaFromAttachments(params) {
 			});
 		} catch (err) {
 			const id = attachment.id ?? attachmentUrl;
-			logVerbose(`${params.errorPrefix} ${id}: ${String(err)}`);
+			getChildLogger({ module: "discord-media" }).warn(`${params.errorPrefix} ${id}: ${String(err)}`);
 			const classification = resolveDiscordMediaClassification({ attachment });
 			params.out.push({ ...classification });
 		}
@@ -442,7 +442,7 @@ async function appendResolvedMediaFromStickers(params) {
 			lastError = err;
 		}
 		if (lastError) {
-			logVerbose(`${params.errorPrefix} ${sticker.id}: ${formatStickerError(lastError)}`);
+			getChildLogger({ module: "discord-media" }).warn(`${params.errorPrefix} ${sticker.id}: ${formatStickerError(lastError)}`);
 			if (candidates[0]) params.out.push({
 				contentType: inferStickerContentType(sticker),
 				kind: "sticker"

package/dist/{model-picker-preference-primitives-D25pnCOu.js → model-picker-preference-primitives-BHT1LkR_.js}

@@ -1,5 +1,5 @@
 import { createHash } from "node:crypto";
-import { normalizeProviderId } from "openclaw/plugin-sdk/provider-model-shared";
+import { normalizeProviderId } from "openclaw/plugin-sdk/model-ref-parse";
 //#region extensions/discord/src/monitor/model-picker-preference-primitives.ts
 function normalizeModelRef(raw) {
 	const value = raw?.trim();
@@ -29,9 +29,9 @@ function hashSegment(value, length) {
 function buildPreferenceModelKey(scopeKey, modelRef) {
 	return `v1:${hashSegment(scopeKey, 32)}:${hashSegment(modelRef, 24)}`;
 }
-function timestampMs(value) {
+function preferenceTimestampMs(value) {
 	const parsed = typeof value === "string" ? Date.parse(value) : NaN;
 	return Number.isFinite(parsed) ? parsed : 0;
 }
 //#endregion
-export { timestampMs as i, normalizeModelRef as n, sanitizeRecentModels as r, buildPreferenceModelKey as t };
+export { sanitizeRecentModels as i, normalizeModelRef as n, preferenceTimestampMs as r, buildPreferenceModelKey as t };