@openclaw/discord 2026.5.7 → 2026.5.10-beta.1

package/dist/{message-handler-C9Ohf-ea.js → message-handler-BWHSteQf.js}

@@ -1,8 +1,8 @@
-import { j as createDiscordRestClient } from "./send.shared-BQGiUPvZ.js";
-import { a as resolveDiscordChannelParentSafe, n as resolveDiscordChannelInfoSafe, r as resolveDiscordChannelNameSafe, t as resolveDiscordChannelIdSafe } from "./channel-access-DFIQqbYm.js";
-import { a as mergeAbortSignals } from "./timeouts-CdsmBWWs.js";
-import { l as resolveDiscordMessageChannelId, r as resolveDiscordMessageText, s as hasDiscordMessageStickers } from "./message-utils-9kaGF59d.js";
-import { t as sendTyping } from "./typing-Bw6NKWLZ.js";
+import { j as createDiscordRestClient } from "./send.shared-DzwpAEMP.js";
+import { a as resolveDiscordChannelParentSafe, n as resolveDiscordChannelInfoSafe, r as resolveDiscordChannelNameSafe, t as resolveDiscordChannelIdSafe } from "./channel-access-BL-wemES.js";
+import { a as mergeAbortSignals } from "./timeouts-C3FYXWJX.js";
+import { l as resolveDiscordMessageChannelId, r as resolveDiscordMessageText, s as hasDiscordMessageStickers } from "./message-utils-DEjCwCRz.js";
+import { t as sendTyping } from "./typing-BYeVSviE.js";
 import { danger, logVerbose } from "openclaw/plugin-sdk/runtime-env";
 import { resolveOpenProviderRuntimeGroupPolicy } from "openclaw/plugin-sdk/runtime-group-policy";
 import { resolveBatchedReplyThreadingPolicy } from "openclaw/plugin-sdk/reply-reference";
@@ -121,7 +121,7 @@ function applyImplicitReplyBatchGate(ctx, replyToMode, isBatched) {
 //#region extensions/discord/src/monitor/message-run-queue.ts
 let messageProcessRuntimePromise;
 async function loadMessageProcessRuntime() {
-	messageProcessRuntimePromise ??= import("./message-handler.process-CEnzuLiN.js");
+	messageProcessRuntimePromise ??= import("./message-handler.process-BN8bE7AE.js");
 	return await messageProcessRuntimePromise;
 }
 async function processDiscordQueuedMessage(params) {
@@ -173,7 +173,7 @@ function createDiscordMessageRunQueue(params) {
 //#region extensions/discord/src/monitor/message-handler.ts
 let messagePreflightRuntimePromise;
 async function loadMessagePreflightRuntime() {
-	messagePreflightRuntimePromise ??= import("./message-handler.preflight-BrvazsYn.js");
+	messagePreflightRuntimePromise ??= import("./message-handler.preflight-q7ose9Ta.js");
 	return await messagePreflightRuntimePromise;
 }
 function isNonEmptyString(value) {

package/dist/{message-handler.preflight-BrvazsYn.js → message-handler.preflight-q7ose9Ta.js}

@@ -1,14 +1,14 @@
+import { S as Message, ot as getChannelMessage, t as discord_exports } from "./discord-DtHMmZqJ.js";
 import { o as resolveDefaultDiscordAccountId } from "./accounts-CaHGiVB4.js";
-import { S as Message, ot as getChannelMessage, t as discord_exports } from "./discord-eZlimVfW.js";
 import { i as resolveTimestampMs, n as formatDiscordUserTag, r as resolveDiscordSystemLocation } from "./format-D8TsaXxW.js";
-import { _ as resolveGroupDmAllow, a as normalizeDiscordSlug, c as resolveDiscordChannelConfigWithFallback, d as resolveDiscordGuildEntry, f as resolveDiscordMemberAccessState, g as resolveDiscordShouldRequireMention, i as normalizeDiscordDisplaySlug, m as resolveDiscordOwnerAccess, n as isDiscordGroupAllowedByPolicy } from "./allow-list-ek-1hMKN.js";
-import { t as resolveDiscordConversationIdentity } from "./conversation-identity-DHhS0ez3.js";
-import { l as isRecentlyUnboundThreadWebhookMessage } from "./thread-bindings.state-WU4duXKY.js";
-import "./thread-bindings-CMpZjP50.js";
-import { n as resolveDiscordChannelInfoSafe, r as resolveDiscordChannelNameSafe } from "./channel-access-DFIQqbYm.js";
-import { c as resolveDiscordChannelInfo, l as resolveDiscordMessageChannelId, r as resolveDiscordMessageText } from "./message-utils-9kaGF59d.js";
-import { a as shouldIgnoreStaleDiscordRouteBinding, i as resolveDiscordEffectiveRoute, o as handleDiscordDmCommandDecision, r as resolveDiscordConversationRoute, s as resolveDiscordDmCommandAccess, t as buildDiscordRoutePeer } from "./route-resolution-BWErj5Cn.js";
-import { n as resolveDiscordWebhookId, t as resolveDiscordSenderIdentity } from "./sender-identity-BGUfyvOC.js";
+import { _ as resolveGroupDmAllow, a as normalizeDiscordSlug, c as resolveDiscordChannelConfigWithFallback, d as resolveDiscordGuildEntry, f as resolveDiscordMemberAccessState, g as resolveDiscordShouldRequireMention, i as normalizeDiscordDisplaySlug, n as isDiscordGroupAllowedByPolicy } from "./allow-list-4wnZg5P9.js";
+import { t as resolveDiscordConversationIdentity } from "./conversation-identity-BPQm_uhV.js";
+import { l as isRecentlyUnboundThreadWebhookMessage } from "./thread-bindings.state-DwgDYzBM.js";
+import "./thread-bindings-DUzBL8jL.js";
+import { n as resolveDiscordChannelInfoSafe, r as resolveDiscordChannelNameSafe } from "./channel-access-BL-wemES.js";
+import { a as shouldIgnoreStaleDiscordRouteBinding, c as resolveDiscordTextCommandAccess, i as resolveDiscordEffectiveRoute, o as handleDiscordDmCommandDecision, r as resolveDiscordConversationRoute, s as resolveDiscordDmCommandAccess, t as buildDiscordRoutePeer } from "./route-resolution-foWW8_D1.js";
+import { c as resolveDiscordChannelInfo, l as resolveDiscordMessageChannelId, r as resolveDiscordMessageText } from "./message-utils-DEjCwCRz.js";
+import { n as resolveDiscordWebhookId, t as resolveDiscordSenderIdentity } from "./sender-identity-CDOVm5Dk.js";
 import { logDebug, normalizeOptionalString } from "openclaw/plugin-sdk/text-runtime";
 import { getChildLogger, logVerbose, shouldLogVerbose } from "openclaw/plugin-sdk/runtime-env";
 import { recordChannelActivity } from "openclaw/plugin-sdk/channel-activity-runtime";
@@ -16,7 +16,6 @@ import { formatAllowlistMatchMeta } from "openclaw/plugin-sdk/allow-from";
 import { isDangerousNameMatchingEnabled } from "openclaw/plugin-sdk/dangerous-name-runtime";
 import { enqueueSystemEvent } from "openclaw/plugin-sdk/system-event-runtime";
 import { buildMentionRegexes, implicitMentionKindWhen, logInboundDrop, matchesMentionWithExplicit, resolveInboundMentionDecision } from "openclaw/plugin-sdk/channel-inbound";
-import { resolveControlCommandGate } from "openclaw/plugin-sdk/command-auth-native";
 import { hasControlCommand } from "openclaw/plugin-sdk/command-detection";
 import { shouldHandleTextCommands } from "openclaw/plugin-sdk/command-surface";
 import { recordPendingHistoryEntryIfEnabled } from "openclaw/plugin-sdk/reply-history";
@@ -28,7 +27,7 @@ async function loadConversationRuntime$1() {
 	return await conversationRuntimePromise$1;
 }
 async function loadDiscordSendRuntime() {
-	discordSendRuntimePromise ??= import("./send-8S_HKJpQ.js").then((n) => n.t);
+	discordSendRuntimePromise ??= import("./send-BSBMchf8.js").then((n) => n.t);
 	return await discordSendRuntimePromise;
 }
 async function resolveDiscordDmPreflightAccess(params) {
@@ -55,20 +54,18 @@ async function resolveDiscordDmPreflightAccess(params) {
 			tag: params.sender.tag
 		},
 		allowNameMatching: params.allowNameMatching,
-		useAccessGroups: params.useAccessGroups,
 		cfg: params.preflight.cfg,
 		token: params.preflight.token,
 		rest: params.preflight.client.rest
 	});
-	const commandAuthorized = dmAccess.commandAuthorized || directBindingRecord != null;
-	if (dmAccess.decision === "allow") return { commandAuthorized };
+	const commandAuthorized = dmAccess.senderAccess.allowed && dmAccess.commandAccess.authorized || directBindingRecord != null;
+	if (dmAccess.senderAccess.decision === "allow") return { commandAuthorized };
 	if (directBindingRecord) {
 		logVerbose(`discord: allow bound DM conversation ${directBindingConversationId} despite dmPolicy=${params.dmPolicy}`);
 		return { commandAuthorized };
 	}
-	const allowMatchMeta = formatAllowlistMatchMeta(dmAccess.allowMatch.allowed ? dmAccess.allowMatch : void 0);
 	await handleDiscordDmCommandDecision({
-		dmAccess,
+		senderAccess: dmAccess.senderAccess,
 		accountId: params.resolvedAccountId,
 		sender: {
 			id: params.author.id,
@@ -76,7 +73,7 @@ async function resolveDiscordDmPreflightAccess(params) {
 			name: params.author.username ?? void 0
 		},
 		onPairingCreated: async (code) => {
-			logVerbose(`discord pairing request sender=${params.author.id} tag=${formatDiscordUserTag(params.author)} (${allowMatchMeta})`);
+			logVerbose(`discord pairing request sender=${params.author.id} tag=${formatDiscordUserTag(params.author)} reason=${dmAccess.senderAccess.reasonCode}`);
 			try {
 				const conversationRuntime = await loadConversationRuntime$1();
 				const { sendMessageDiscord } = await loadDiscordSendRuntime();
@@ -95,7 +92,7 @@ async function resolveDiscordDmPreflightAccess(params) {
 			}
 		},
 		onUnauthorized: async () => {
-			logVerbose(`Blocked unauthorized discord sender ${params.sender.id} (dmPolicy=${params.dmPolicy}, ${allowMatchMeta})`);
+			logVerbose(`Blocked unauthorized discord sender ${params.sender.id} (dmPolicy=${params.dmPolicy}, reason=${dmAccess.senderAccess.reasonCode})`);
 		}
 	});
 	return null;
@@ -428,19 +425,19 @@ let preflightAudioRuntimePromise;
 let systemEventsRuntimePromise;
 let discordThreadingRuntimePromise;
 async function loadPluralKitRuntime() {
-	pluralkitRuntimePromise ??= import("./pluralkit-OFss_pIy.js").then((n) => n.n);
+	pluralkitRuntimePromise ??= import("./pluralkit-CUfobeQu.js").then((n) => n.n);
 	return await pluralkitRuntimePromise;
 }
 async function loadPreflightAudioRuntime() {
-	preflightAudioRuntimePromise ??= import("./preflight-audio-CRmUxxuM.js");
+	preflightAudioRuntimePromise ??= import("./preflight-audio-BcsH127L.js");
 	return await preflightAudioRuntimePromise;
 }
 async function loadSystemEventsRuntime() {
-	systemEventsRuntimePromise ??= import("./system-events-_fzSG--3.js");
+	systemEventsRuntimePromise ??= import("./system-events-BeVImqnV.js");
 	return await systemEventsRuntimePromise;
 }
 async function loadDiscordThreadingRuntime() {
-	discordThreadingRuntimePromise ??= import("./threading-BMmpA2JR.js").then((n) => n.t);
+	discordThreadingRuntimePromise ??= import("./threading-CTUnZtNi.js").then((n) => n.t);
 	return await discordThreadingRuntimePromise;
 }
 function isPreflightAborted(abortSignal) {
@@ -659,7 +656,6 @@ async function preflightDiscordMessage(params) {
 		return null;
 	}
 	const dmPolicy = params.dmPolicy;
-	const useAccessGroups = params.cfg.commands?.useAccessGroups !== false;
 	const resolvedAccountId = params.accountId ?? resolveDefaultDiscordAccountId(params.cfg);
 	const allowNameMatching = isDangerousNameMatchingEnabled(params.discordConfig);
 	let commandAuthorized = true;
@@ -670,8 +666,7 @@ async function preflightDiscordMessage(params) {
 			sender,
 			dmPolicy,
 			resolvedAccountId,
-			allowNameMatching,
-			useAccessGroups
+			allowNameMatching
 		});
 		if (isPreflightAborted(params.abortSignal)) return null;
 		if (!access) return null;
@@ -847,30 +842,23 @@ async function preflightDiscordMessage(params) {
 	});
 	const hasControlCommandInMessage = hasControlCommand(baseText, params.cfg);
 	if (!isDirectMessage) {
-		const { ownerAllowList, ownerAllowed: ownerOk } = resolveDiscordOwnerAccess({
-			allowFrom: params.allowFrom,
+		const commandAccess = await resolveDiscordTextCommandAccess({
+			accountId: params.accountId,
+			cfg: params.cfg,
+			ownerAllowFrom: params.allowFrom,
 			sender: {
 				id: sender.id,
 				name: sender.name,
 				tag: sender.tag
 			},
-			allowNameMatching
-		});
-		const commandGate = resolveControlCommandGate({
-			useAccessGroups,
-			authorizers: [{
-				configured: ownerAllowList != null,
-				allowed: ownerOk
-			}, {
-				configured: hasAccessRestrictions,
-				allowed: memberAllowed
-			}],
-			modeWhenAccessGroupsOff: "configured",
+			memberAccessConfigured: hasAccessRestrictions,
+			memberAllowed,
+			allowNameMatching,
 			allowTextCommands,
 			hasControlCommand: hasControlCommandInMessage
 		});
-		commandAuthorized = commandGate.commandAuthorized;
-		if (commandGate.shouldBlock) {
+		commandAuthorized = commandAccess.authorized;
+		if (commandAccess.shouldBlockControlCommand) {
 			logInboundDrop({
 				log: logVerbose,
 				channel: "discord",
@@ -946,7 +934,8 @@ async function preflightDiscordMessage(params) {
 		logDebug(`[discord-preflight] drop: system event`);
 		enqueueSystemEvent(systemText, {
 			sessionKey: effectiveRoute.sessionKey,
-			contextKey: `discord:system:${messageChannelId}:${message.id}`
+			contextKey: `discord:system:${messageChannelId}:${message.id}`,
+			trusted: false
 		});
 		return null;
 	}

package/dist/{message-handler.process-CEnzuLiN.js → message-handler.process-BN8bE7AE.js}

@@ -1,37 +1,38 @@
+import { $ as createChannelMessage, it as editChannelMessage, nt as deleteChannelMessage, t as discord_exports } from "./discord-DtHMmZqJ.js";
 import { f as resolveDiscordMaxLinesPerMessage } from "./accounts-CaHGiVB4.js";
-import { l as resolveDiscordChannelId, s as chunkDiscordTextWithMode } from "./target-resolver-DA84_xbt.js";
-import { $ as createChannelMessage, it as editChannelMessage, nt as deleteChannelMessage, t as discord_exports } from "./discord-eZlimVfW.js";
-import { M as createDiscordRuntimeAccountContext, d as resolveDiscordTargetChannelId, j as createDiscordRestClient } from "./send.shared-BQGiUPvZ.js";
+import { n as resolveDiscordChannelId } from "./target-parsing-D-H7nnh2.js";
+import { t as chunkDiscordTextWithMode } from "./chunk-DYl-_5RL.js";
+import { M as createDiscordRuntimeAccountContext, d as resolveDiscordTargetChannelId, j as createDiscordRestClient } from "./send.shared-DzwpAEMP.js";
 import { i as resolveTimestampMs } from "./format-D8TsaXxW.js";
-import { a as normalizeDiscordSlug, r as normalizeDiscordAllowList } from "./allow-list-ek-1hMKN.js";
-import { a as removeReactionDiscord, f as editMessageDiscord, r as reactMessageDiscord } from "./send-8S_HKJpQ.js";
-import "./targets-FwL1BPTU.js";
-import { t as resolveDiscordConversationIdentity } from "./conversation-identity-DHhS0ez3.js";
-import { t as DISCORD_TEXT_CHUNK_LIMIT } from "./outbound-adapter-DNsTVJfH.js";
-import { t as resolveDiscordPreviewStreamMode } from "./preview-streaming-Cc_oeIPP.js";
-import { n as DISCORD_ATTACHMENT_TOTAL_TIMEOUT_MS, t as DISCORD_ATTACHMENT_IDLE_TIMEOUT_MS } from "./timeouts-CdsmBWWs.js";
-import { a as resolveForwardedMediaList, i as buildDiscordMediaPayload, o as resolveMediaList, r as resolveDiscordMessageText } from "./message-utils-9kaGF59d.js";
-import { a as resolveDiscordThreadStarter, n as resolveDiscordAutoThreadReplyPlan } from "./threading-BMmpA2JR.js";
-import { t as sendTyping } from "./typing-Bw6NKWLZ.js";
-import { n as buildDiscordInboundAccessContext, r as createDiscordSupplementalContextAccessChecker } from "./inbound-context-CRylwjg0.js";
-import { i as resolveReplyContext, n as buildDirectLabel, r as buildGuildLabel, t as deliverDiscordReply } from "./reply-delivery-D9aKHtDH.js";
+import { a as normalizeDiscordSlug, r as normalizeDiscordAllowList } from "./allow-list-4wnZg5P9.js";
+import { a as removeReactionDiscord, f as editMessageDiscord, r as reactMessageDiscord } from "./send-BSBMchf8.js";
+import "./targets-Dj-qyUaE.js";
+import { t as resolveDiscordConversationIdentity } from "./conversation-identity-BPQm_uhV.js";
+import { t as DISCORD_TEXT_CHUNK_LIMIT } from "./outbound-adapter-Bt8FL3yO.js";
+import { t as resolveDiscordPreviewStreamMode } from "./preview-streaming-DCPAe24T.js";
+import { n as DISCORD_ATTACHMENT_TOTAL_TIMEOUT_MS, t as DISCORD_ATTACHMENT_IDLE_TIMEOUT_MS } from "./timeouts-C3FYXWJX.js";
+import { a as resolveForwardedMediaList, i as buildDiscordMediaPayload, o as resolveMediaList, r as resolveDiscordMessageText } from "./message-utils-DEjCwCRz.js";
+import { a as resolveDiscordThreadStarter, n as resolveDiscordAutoThreadReplyPlan } from "./threading-CTUnZtNi.js";
+import { t as sendTyping } from "./typing-BYeVSviE.js";
+import { n as buildDiscordInboundAccessContext, r as createDiscordSupplementalContextAccessChecker } from "./inbound-context-BAwOn5Iq.js";
+import { i as resolveReplyContext, n as buildDirectLabel, r as buildGuildLabel, t as deliverDiscordReply } from "./reply-delivery-vHSqaKKo.js";
 import { convertMarkdownTables, stripInlineDirectiveTagsForDelivery, stripReasoningTagsFromText, truncateUtf16Safe } from "openclaw/plugin-sdk/text-runtime";
 import { buildAgentSessionKey, normalizeAccountId, resolveAccountEntry, resolveThreadSessionKeys } from "openclaw/plugin-sdk/routing";
+import { evaluateSupplementalContextVisibility } from "openclaw/plugin-sdk/security-runtime";
 import { getAgentScopedMediaLocalRoots } from "openclaw/plugin-sdk/media-runtime";
 import { resolveSendableOutboundReplyParts } from "openclaw/plugin-sdk/reply-payload";
 import { resolveChunkMode, resolveTextChunkLimit } from "openclaw/plugin-sdk/reply-chunking";
 import { danger, logVerbose, shouldLogVerbose } from "openclaw/plugin-sdk/runtime-env";
 import { formatErrorMessage } from "openclaw/plugin-sdk/error-runtime";
 import { resolveMarkdownTableMode } from "openclaw/plugin-sdk/markdown-table-runtime";
-import { createChannelProgressDraftGate, formatChannelProgressDraftLine, formatChannelProgressDraftLineForEntry, formatChannelProgressDraftText, isChannelProgressDraftWorkToolName, resolveChannelProgressDraftMaxLines, resolveChannelStreamingBlockEnabled, resolveChannelStreamingPreviewChunk, resolveChannelStreamingPreviewToolProgress, resolveChannelStreamingSuppressDefaultToolProgressMessages } from "openclaw/plugin-sdk/channel-streaming";
+import { createChannelMessageReplyPipeline, defineFinalizableLivePreviewAdapter, deliverWithFinalizableLivePreviewAdapter, resolveChannelMessageSourceReplyDeliveryMode } from "openclaw/plugin-sdk/channel-message";
+import { buildChannelProgressDraftLine, buildChannelProgressDraftLineForEntry, createChannelProgressDraftGate, formatChannelProgressDraftText, isChannelProgressDraftWorkToolName, resolveChannelProgressDraftMaxLines, resolveChannelStreamingBlockEnabled, resolveChannelStreamingPreviewChunk, resolveChannelStreamingPreviewToolProgress, resolveChannelStreamingSuppressDefaultToolProgressMessages } from "openclaw/plugin-sdk/channel-streaming";
 import { recordInboundSession, resolvePinnedMainDmOwnerFromAllowlist } from "openclaw/plugin-sdk/conversation-runtime";
-import { EmbeddedBlockChunker, resolveAckReaction, resolveHumanDelayConfig } from "openclaw/plugin-sdk/agent-runtime";
+import { EmbeddedBlockChunker, formatReasoningMessage, resolveAckReaction, resolveHumanDelayConfig } from "openclaw/plugin-sdk/agent-runtime";
 import { isDangerousNameMatchingEnabled } from "openclaw/plugin-sdk/dangerous-name-runtime";
-import { evaluateSupplementalContextVisibility } from "openclaw/plugin-sdk/security-runtime";
 import { readSessionUpdatedAt, resolveStorePath } from "openclaw/plugin-sdk/session-store-runtime";
 import { formatInboundEnvelope, resolveEnvelopeFormatOptions } from "openclaw/plugin-sdk/channel-inbound";
-import { createFinalizableDraftLifecycle, deliverFinalizableDraftPreview } from "openclaw/plugin-sdk/channel-lifecycle";
-import { createChannelReplyPipeline, resolveChannelSourceReplyDeliveryMode } from "openclaw/plugin-sdk/channel-reply-pipeline";
+import { createFinalizableDraftLifecycle } from "openclaw/plugin-sdk/channel-lifecycle";
 import { finalizeInboundContext } from "openclaw/plugin-sdk/reply-dispatch-runtime";
 import { hasFinalInboundReplyDispatch, runInboundReplyTurn } from "openclaw/plugin-sdk/inbound-reply-dispatch";
 import { buildPendingHistoryContextFromMap } from "openclaw/plugin-sdk/reply-history";
@@ -557,12 +558,14 @@ function createDiscordDraftPreviewController(params) {
 		async pushToolProgress(line, options) {
 			if (!draftStream) return;
 			if (options?.toolName !== void 0 && !isChannelProgressDraftWorkToolName(options.toolName)) return;
-			const normalized = line?.replace(/\s+/g, " ").trim();
+			if (isEmptyDiscordProgressLine(line)) return;
+			const normalized = normalizeProgressLineIdentity(line);
 			if (!normalized) return;
+			const progressLine = typeof line === "object" && line !== void 0 ? line : normalized;
 			if (discordStreamMode !== "progress") {
 				if (!previewToolProgressEnabled || previewToolProgressSuppressed) return;
-				if (previewToolProgressLines.at(-1) === normalized) return;
-				previewToolProgressLines = [...previewToolProgressLines, normalized].slice(-resolveChannelProgressDraftMaxLines(params.discordConfig));
+				if (normalizeProgressLineIdentity(previewToolProgressLines.at(-1)) === normalized) return;
+				previewToolProgressLines = [...previewToolProgressLines, progressLine].slice(-resolveChannelProgressDraftMaxLines(params.discordConfig));
 				const previewText = formatChannelProgressDraftText({
 					entry: params.discordConfig,
 					lines: previewToolProgressLines,
@@ -576,10 +579,11 @@ function createDiscordDraftPreviewController(params) {
 				return;
 			}
 			if (previewToolProgressEnabled && !previewToolProgressSuppressed && normalized) {
-				if (previewToolProgressLines.at(-1) !== normalized) previewToolProgressLines = [...previewToolProgressLines, normalized].slice(-resolveChannelProgressDraftMaxLines(params.discordConfig));
+				if (normalizeProgressLineIdentity(previewToolProgressLines.at(-1)) !== normalized) previewToolProgressLines = [...previewToolProgressLines, progressLine].slice(-resolveChannelProgressDraftMaxLines(params.discordConfig));
 			}
 			const alreadyStarted = progressDraftGate.hasStarted;
-			await progressDraftGate.noteWork();
+			if (shouldStartDiscordProgressDraftNow(line)) await progressDraftGate.startNow();
+			else await progressDraftGate.noteWork();
 			if (alreadyStarted && progressDraftGate.hasStarted) await renderProgressDraft();
 		},
 		async pushReasoningProgress(text) {
@@ -698,6 +702,16 @@ function mergeReasoningProgressText(current, incoming) {
 function isReasoningSnapshotText(text) {
 	return /^\s*(?:>\s*)?Reasoning:\s*/i.test(text);
 }
+function normalizeProgressLineIdentity(line) {
+	return (typeof line === "string" ? line : line?.text)?.replace(/\s+/g, " ").trim() ?? "";
+}
+function isEmptyDiscordProgressLine(line) {
+	if (!line || typeof line === "string") return false;
+	return line.toolName === "apply_patch" && !line.detail && !line.status;
+}
+function shouldStartDiscordProgressDraftNow(line) {
+	return typeof line === "object" && line?.kind === "patch" && Boolean(line.detail);
+}
 //#endregion
 //#region extensions/discord/src/monitor/message-handler.process.ts
 function sleep(ms) {
@@ -748,7 +762,7 @@ async function processDiscordMessage(ctx, observer) {
 	const boundThreadId = ctx.threadBinding?.conversation?.conversationId?.trim();
 	if (boundThreadId && typeof threadBindings.touchThread === "function") threadBindings.touchThread({ threadId: boundThreadId });
 	const { createReplyDispatcherWithTyping, dispatchInboundMessage, settleReplyDispatcher } = await loadReplyRuntime();
-	const sourceReplyDeliveryMode = resolveChannelSourceReplyDeliveryMode({
+	const sourceReplyDeliveryMode = resolveChannelMessageSourceReplyDeliveryMode({
 		cfg,
 		ctx: { ChatType: isGuildMessage ? "channel" : void 0 }
 	});
@@ -887,7 +901,7 @@ async function processDiscordMessage(ctx, observer) {
 		sessionKey: persistedSessionKey
 	});
 	const typingChannelId = deliverTarget.startsWith("channel:") ? deliverTarget.slice(8) : messageChannelId;
-	const { onModelSelected, ...replyPipeline } = createChannelReplyPipeline({
+	const { onModelSelected, ...replyPipeline } = createChannelMessageReplyPipeline({
 		cfg,
 		agentId: route.agentId,
 		channel: "discord",
@@ -957,29 +971,39 @@ async function processDiscordMessage(ctx, observer) {
 				const finalText = payload.text;
 				const previewFinalText = draftPreview.resolvePreviewFinalText(finalText);
 				const hasExplicitReplyDirective = Boolean(payload.replyToTag || payload.replyToCurrent) || typeof finalText === "string" && /\[\[\s*reply_to(?:_current|\s*:)/i.test(finalText);
-				if (await deliverFinalizableDraftPreview({
+				if ((await deliverWithFinalizableLivePreviewAdapter({
 					kind: info.kind,
 					payload,
-					draft: {
-						flush: () => draftPreview.flush(),
-						clear: () => draftStream.clear(),
-						discardPending: () => draftStream.discardPending(),
-						seal: () => draftStream.seal(),
-						id: draftStream.messageId
-					},
-					buildFinalEdit: () => {
-						if (draftPreview.finalizedViaPreviewMessage || hasMedia || typeof previewFinalText !== "string" || hasExplicitReplyDirective || payload.isError) return;
-						return { content: previewFinalText };
-					},
-					editFinal: async (previewMessageId, edit) => {
-						if (isProcessAborted(abortSignal)) throw new Error("process aborted");
-						notifyFinalReplyStart();
-						await editMessageDiscord(deliverChannelId, previewMessageId, edit, {
-							cfg,
-							accountId,
-							rest: deliveryRest
-						});
-					},
+					adapter: defineFinalizableLivePreviewAdapter({
+						draft: {
+							flush: () => draftPreview.flush(),
+							clear: () => draftStream.clear(),
+							discardPending: () => draftStream.discardPending(),
+							seal: () => draftStream.seal(),
+							id: draftStream.messageId
+						},
+						buildFinalEdit: () => {
+							if (draftPreview.finalizedViaPreviewMessage || hasMedia || typeof previewFinalText !== "string" || hasExplicitReplyDirective || payload.isError) return;
+							return { content: previewFinalText };
+						},
+						editFinal: async (previewMessageId, edit) => {
+							if (isProcessAborted(abortSignal)) throw new Error("process aborted");
+							notifyFinalReplyStart();
+							await editMessageDiscord(deliverChannelId, previewMessageId, edit, {
+								cfg,
+								accountId,
+								rest: deliveryRest
+							});
+						},
+						onPreviewFinalized: () => {
+							draftPreview.markPreviewFinalized();
+							replyReference.markSent();
+							observer?.onFinalReplyDelivered?.();
+						},
+						logPreviewEditFailure: (err) => {
+							logVerbose(`discord: preview final edit failed; falling back to standard send (${String(err)})`);
+						}
+					}),
 					deliverNormally: async () => {
 						if (isProcessAborted(abortSignal)) return false;
 						const replyToId = replyReference.use();
@@ -1005,16 +1029,8 @@ async function processDiscordMessage(ctx, observer) {
 						replyReference.markSent();
 						observer?.onFinalReplyDelivered?.();
 						return true;
-					},
-					onPreviewFinalized: () => {
-						draftPreview.markPreviewFinalized();
-						replyReference.markSent();
-						observer?.onFinalReplyDelivered?.();
-					},
-					logPreviewEditFailure: (err) => {
-						logVerbose(`discord: preview final edit failed; falling back to standard send (${String(err)})`);
 					}
-				}) !== "normal-skipped") return;
+				})).kind !== "normal-skipped") return;
 			}
 			if (isProcessAborted(abortSignal)) return;
 			const replyToId = replyReference.use();
@@ -1121,13 +1137,14 @@ async function processDiscordMessage(ctx, observer) {
 								suppressDefaultToolProgressMessages: draftPreview.suppressDefaultToolProgressMessages ? true : void 0,
 								onReasoningStream: async (payload) => {
 									await statusReactions.setThinking();
-									await draftPreview.pushReasoningProgress(payload?.text);
+									const formattedText = payload?.text ? formatReasoningMessage(payload.text) : void 0;
+									await draftPreview.pushReasoningProgress(formattedText);
 								},
 								onToolStart: async (payload) => {
 									if (isProcessAborted(abortSignal)) return;
 									await maybeBindStatusReactionsToToolReaction(payload);
 									await statusReactions.setTool(payload.name);
-									await draftPreview.pushToolProgress(formatChannelProgressDraftLineForEntry(discordConfig, {
+									await draftPreview.pushToolProgress(buildChannelProgressDraftLineForEntry(discordConfig, {
 										event: "tool",
 										name: payload.name,
 										phase: payload.phase,
@@ -1135,7 +1152,7 @@ async function processDiscordMessage(ctx, observer) {
 									}, payload.detailMode ? { detailMode: payload.detailMode } : void 0), { toolName: payload.name });
 								},
 								onItemEvent: async (payload) => {
-									await draftPreview.pushToolProgress(formatChannelProgressDraftLineForEntry(discordConfig, {
+									await draftPreview.pushToolProgress(buildChannelProgressDraftLineForEntry(discordConfig, {
 										event: "item",
 										itemKind: payload.kind,
 										title: payload.title,
@@ -1149,7 +1166,7 @@ async function processDiscordMessage(ctx, observer) {
 								},
 								onPlanUpdate: async (payload) => {
 									if (payload.phase !== "update") return;
-									await draftPreview.pushToolProgress(formatChannelProgressDraftLine({
+									await draftPreview.pushToolProgress(buildChannelProgressDraftLine({
 										event: "plan",
 										phase: payload.phase,
 										title: payload.title,
@@ -1159,7 +1176,7 @@ async function processDiscordMessage(ctx, observer) {
 								},
 								onApprovalEvent: async (payload) => {
 									if (payload.phase !== "requested") return;
-									await draftPreview.pushToolProgress(formatChannelProgressDraftLine({
+									await draftPreview.pushToolProgress(buildChannelProgressDraftLine({
 										event: "approval",
 										phase: payload.phase,
 										title: payload.title,
@@ -1170,7 +1187,7 @@ async function processDiscordMessage(ctx, observer) {
 								},
 								onCommandOutput: async (payload) => {
 									if (payload.phase !== "end") return;
-									await draftPreview.pushToolProgress(formatChannelProgressDraftLine({
+									await draftPreview.pushToolProgress(buildChannelProgressDraftLine({
 										event: "command-output",
 										phase: payload.phase,
 										title: payload.title,
@@ -1181,7 +1198,7 @@ async function processDiscordMessage(ctx, observer) {
 								},
 								onPatchSummary: async (payload) => {
 									if (payload.phase !== "end") return;
-									await draftPreview.pushToolProgress(formatChannelProgressDraftLine({
+									await draftPreview.pushToolProgress(buildChannelProgressDraftLine({
 										event: "patch",
 										phase: payload.phase,
 										title: payload.title,

package/dist/{message-utils-9kaGF59d.js → message-utils-DEjCwCRz.js}

@@ -1,5 +1,5 @@
-import { n as resolveDiscordChannelInfoSafe } from "./channel-access-DFIQqbYm.js";
-import { a as mergeAbortSignals } from "./timeouts-CdsmBWWs.js";
+import { n as resolveDiscordChannelInfoSafe } from "./channel-access-BL-wemES.js";
+import { a as mergeAbortSignals } from "./timeouts-C3FYXWJX.js";
 import { normalizeLowercaseStringOrEmpty, normalizeOptionalString, normalizeOptionalStringifiedId } from "openclaw/plugin-sdk/text-runtime";
 import { ComponentType, StickerFormatType } from "discord-api-types/v10";
 import { fetchRemoteMedia, saveMediaBuffer } from "openclaw/plugin-sdk/media-runtime";

package/dist/normalize-Cu94FOqy.js

@@ -0,0 +1,58 @@
+import { t as parseDiscordTarget } from "./target-parsing-D-H7nnh2.js";
+//#region extensions/discord/src/normalize.ts
+function normalizeDiscordMessagingTarget(raw) {
+	return parseDiscordTarget(raw, { defaultKind: "channel" })?.normalized;
+}
+/**
+* Normalize a Discord outbound target for delivery. Bare numeric IDs are
+* prefixed with "channel:" to avoid the ambiguous-target error in
+* parseDiscordTarget, unless the ID is explicitly configured as an allowed DM
+* sender. All other formats pass through unchanged.
+*/
+function normalizeDiscordOutboundTarget(to, allowFrom) {
+	const trimmed = to?.trim();
+	if (!trimmed) return {
+		ok: false,
+		error: /* @__PURE__ */ new Error("Discord recipient is required. Use \"channel:<id>\" for channels or \"user:<id>\" for DMs.")
+	};
+	if (/^\d+$/.test(trimmed)) {
+		if (allowFromContainsDiscordUserId(allowFrom, trimmed)) return {
+			ok: true,
+			to: `user:${trimmed}`
+		};
+		return {
+			ok: true,
+			to: `channel:${trimmed}`
+		};
+	}
+	return {
+		ok: true,
+		to: trimmed
+	};
+}
+function allowFromContainsDiscordUserId(allowFrom, userId) {
+	const normalizedUserId = userId.trim();
+	if (!normalizedUserId) return false;
+	return (allowFrom ?? []).some((entry) => normalizeAllowFromDiscordUserId(entry) === normalizedUserId);
+}
+function normalizeAllowFromDiscordUserId(entry) {
+	const trimmed = entry.trim().toLowerCase();
+	if (!trimmed || trimmed === "*") return;
+	const mentionMatch = /^<@!?(\d+)>$/.exec(trimmed);
+	if (mentionMatch) return mentionMatch[1];
+	const prefixedMatch = /^(?:discord:)?user:(\d+)$/.exec(trimmed);
+	if (prefixedMatch) return prefixedMatch[1];
+	const discordMatch = /^discord:(\d+)$/.exec(trimmed);
+	if (discordMatch) return discordMatch[1];
+	return /^\d+$/.test(trimmed) ? trimmed : void 0;
+}
+function looksLikeDiscordTargetId(raw) {
+	const trimmed = raw.trim();
+	if (!trimmed) return false;
+	if (/^<@!?\d+>$/.test(trimmed)) return true;
+	if (/^(user|channel|discord):/i.test(trimmed)) return true;
+	if (/^\d{6,}$/.test(trimmed)) return true;
+	return false;
+}
+//#endregion
+export { normalizeDiscordOutboundTarget as i, looksLikeDiscordTargetId as n, normalizeDiscordMessagingTarget as r, allowFromContainsDiscordUserId as t };