@openclaw/discord 2026.8.1-beta.3 → 2026.8.1

package/dist/ingress-identity-CzZKcPK8.js

@@ -0,0 +1,60 @@
+import { r as normalizeDiscordAllowList } from "./allow-list-BDMimASD.js";
+import { defineStableChannelIngressIdentity } from "openclaw/plugin-sdk/channel-ingress-runtime";
+//#region extensions/discord/src/monitor/ingress-identity.ts
+const DISCORD_ALLOW_LIST_PREFIXES = [
+	"discord:",
+	"user:",
+	"pk:"
+];
+const DISCORD_USER_ID_KIND = "stable-id";
+const DISCORD_USER_NAME_KIND = "username";
+function normalizeDiscordIdEntry(entry) {
+	const text = entry.trim();
+	if (!text) return null;
+	const maybeId = text.replace(/^<@!?/, "").replace(/>$/, "");
+	if (/^\d+$/.test(maybeId)) return maybeId;
+	const prefix = DISCORD_ALLOW_LIST_PREFIXES.find((entryPrefix) => text.startsWith(entryPrefix));
+	if (prefix) return text.slice(prefix.length).trim() || null;
+	return null;
+}
+function normalizeDiscordNameEntry(entry) {
+	const text = entry.trim();
+	if (!text || text === "*" || normalizeDiscordIdEntry(text) || /#\d{4}$/.test(text)) return null;
+	const nameSlug = normalizeDiscordAllowList([text], DISCORD_ALLOW_LIST_PREFIXES)?.names.values().next().value;
+	return typeof nameSlug === "string" && nameSlug ? nameSlug : null;
+}
+function normalizeDiscordTagEntry(entry) {
+	const text = entry.trim();
+	return /#\d{4}$/.test(text) ? normalizeDiscordNameSubject(text) : null;
+}
+function normalizeDiscordNameSubject(value) {
+	const nameSlug = normalizeDiscordAllowList([value], DISCORD_ALLOW_LIST_PREFIXES)?.names.values().next().value;
+	return typeof nameSlug === "string" && nameSlug ? nameSlug : null;
+}
+const discordIngressIdentity = defineStableChannelIngressIdentity({
+	resolveParticipant: (subject) => {
+		const kind = subject.aliases?.participantKind;
+		const id = subject.stableId;
+		return typeof id === "string" && id && (kind === "user" || kind === "bot" || kind === "pluralkit-member") ? {
+			domain: kind === "pluralkit-member" ? "pluralkit" : "discord",
+			idKind: kind,
+			id
+		} : void 0;
+	},
+	key: "discordUserId",
+	kind: DISCORD_USER_ID_KIND,
+	authentication: "verified",
+	normalizeEntry: normalizeDiscordIdEntry,
+	normalizeSubject: (value) => value.trim() || null,
+	sensitivity: "pii",
+	aliases: [["discordUserName", normalizeDiscordNameEntry], ["discordUserTag", normalizeDiscordTagEntry]].map(([key, normalizeEntry]) => ({
+		key,
+		kind: DISCORD_USER_NAME_KIND,
+		normalizeEntry,
+		normalizeSubject: normalizeDiscordNameSubject,
+		authentication: "mutable",
+		sensitivity: "pii"
+	}))
+});
+//#endregion
+export { discordIngressIdentity as t };

package/dist/{message-handler-B61q5MOF.js → message-handler-C5By3yl5.js}

@@ -1,7 +1,7 @@
 import { t as getDiscordRuntime } from "./runtime-DgnVQ7zW.js";
-import { c as resolveDiscordChannelInfoSafe, d as resolveDiscordChannelParentSafe, l as resolveDiscordChannelNameSafe, s as resolveDiscordChannelIdSafe } from "./thread-bindings.manager-CngsgErq.js";
-import { _ as mapGatewayDispatchData } from "./provider-DlK_ynqt.js";
-import { i as resolveDiscordMessageText, l as resolveDiscordCdnPolicy, p as resolveDiscordMessageChannelId, u as hasDiscordMessageStickers } from "./message-utils-BXLLnFl6.js";
+import { c as resolveDiscordChannelInfoSafe, d as resolveDiscordChannelParentSafe, l as resolveDiscordChannelNameSafe, s as resolveDiscordChannelIdSafe } from "./thread-bindings.manager-Clm77DBM.js";
+import { v as mapGatewayDispatchData } from "./provider-LXiOcJrH.js";
+import { d as resolveDiscordCdnPolicy, i as resolveDiscordMessageText, l as hasDiscordMessageStickers, p as resolveDiscordMessageChannelId } from "./message-text-Ca8M6TU8.js";
 import { logDebug } from "openclaw/plugin-sdk/logging-core";
 import { GatewayDispatchEvents } from "discord-api-types/v10";
 import { formatErrorMessage } from "openclaw/plugin-sdk/error-runtime";
@@ -248,7 +248,7 @@ function applyImplicitReplyBatchGate(ctx, replyToMode, isBatched) {
 }
 //#endregion
 //#region extensions/discord/src/monitor/message-run-queue.ts
-const loadMessageProcessRuntime = createLazyRuntimeModule(() => import("./message-handler.process--4_712Ec.js"));
+const loadMessageProcessRuntime = createLazyRuntimeModule(() => import("./message-handler.process-DyFPDLCt.js"));
 async function processDiscordQueuedMessage(params) {
 	const abortSignal = params.job.runtime.abortSignal && params.lifecycleSignal ? AbortSignal.any([params.job.runtime.abortSignal, params.lifecycleSignal]) : params.job.runtime.abortSignal ?? params.lifecycleSignal;
 	try {
@@ -335,7 +335,7 @@ function createDiscordMessageRunQueue(params) {
 }
 //#endregion
 //#region extensions/discord/src/monitor/message-dispatcher.ts
-const loadMessagePreflightRuntime = createLazyRuntimeModule(() => import("./message-handler.preflight-Bzg_Hawz.js"));
+const loadMessagePreflightRuntime = createLazyRuntimeModule(() => import("./message-handler.preflight-DrszWuHw.js"));
 function isNonEmptyString(value) {
 	return typeof value === "string" && value.length > 0;
 }

package/dist/{message-handler.preflight-Bzg_Hawz.js → message-handler.preflight-DrszWuHw.js}

@@ -1,12 +1,13 @@
-import { R as Message, Tt as getChannelMessage, p as discord_exports } from "./retry-DNsVTeTo.js";
-import { s as resolveDefaultDiscordAccountId } from "./accounts-DNl-oCEw.js";
-import { C as resolveTimestampMs, S as resolveDiscordSystemLocation, _ as resolveDiscordShouldRequireMention, a as normalizeDiscordSlug, c as resolveDiscordChannelConfigWithFallback, f as resolveDiscordGuildEntry, i as normalizeDiscordDisplaySlug, n as isDiscordGroupAllowedByPolicy, p as resolveDiscordMemberAccessState, v as resolveGroupDmAllow, x as formatDiscordUserTag } from "./allow-list-BDMimASD.js";
+import { W as Message, jt as getChannelMessage, y as discord_exports } from "./retry-DqHCW6PV.js";
+import { s as resolveDefaultDiscordAccountId } from "./accounts-CfQ-vSyf.js";
+import { C as resolveTimestampMs, S as resolveDiscordSystemLocation, _ as resolveDiscordShouldRequireMention, a as normalizeDiscordSlug, c as resolveDiscordChannelConfigWithFallback, f as resolveDiscordGuildEntry, i as normalizeDiscordDisplaySlug, p as resolveDiscordMemberAccessState, x as formatDiscordUserTag } from "./allow-list-BDMimASD.js";
+import { t as isDiscordThreadChannelType } from "./channel-type-CVLZyGYS.js";
 import { n as DISCORD_ATTACHMENT_TOTAL_TIMEOUT_MS, t as DISCORD_ATTACHMENT_IDLE_TIMEOUT_MS } from "./timeouts-B9cy6RvQ.js";
-import { d as resolveDiscordRuntimeBindingConversationId, i as buildDiscordRoutePeer, l as resolveDiscordConversationIdentity, o as resolveDiscordConversationRoute, s as resolveDiscordEffectiveRoute } from "./approval-message-safety-XGFPbDoI.js";
-import { t as resolveDiscordConversationBindingRoute } from "./conversation-binding-route-D6rCQ5S0.js";
-import { c as resolveDiscordChannelInfoSafe, l as resolveDiscordChannelNameSafe } from "./thread-bindings.manager-CngsgErq.js";
-import { b as resolveDiscordDmCommandAccess, g as handleDiscordDmCommandDecision, x as resolveDiscordTextCommandAccess } from "./provider-DlK_ynqt.js";
-import { d as resolveDiscordMessageStickers, f as resolveDiscordChannelInfo, i as resolveDiscordMessageText, o as resolveForwardedMediaList, p as resolveDiscordMessageChannelId, r as resolveDiscordMessageHistoryText, s as resolveMediaList } from "./message-utils-BXLLnFl6.js";
+import { a as buildDiscordRoutePeer, c as resolveDiscordEffectiveRoute, f as resolveDiscordRuntimeBindingConversationId, s as resolveDiscordConversationRoute, u as resolveDiscordConversationIdentity } from "./outbound-session-route-Bn4uXaoE.js";
+import { t as resolveDiscordConversationBindingRoute } from "./conversation-binding-route-BjvX4e35.js";
+import { c as resolveDiscordChannelInfoSafe, l as resolveDiscordChannelNameSafe } from "./thread-bindings.manager-Clm77DBM.js";
+import { S as resolveDiscordTextCommandAccess, _ as handleDiscordDmCommandDecision, n as resolveDiscordPreflightChannelAccess, x as resolveDiscordDmCommandAccess } from "./provider-LXiOcJrH.js";
+import { f as resolveDiscordChannelInfo, i as resolveDiscordMessageText, o as resolveForwardedMediaList, p as resolveDiscordMessageChannelId, r as resolveDiscordMessageHistoryText, s as resolveMediaList, u as resolveDiscordMessageStickers } from "./message-text-Ca8M6TU8.js";
 import { n as resolveDiscordWebhookId, t as resolveDiscordSenderIdentity } from "./sender-identity-BJtfyise.js";
 import { t as createDiscordHistorySenderProvenance } from "./message-handler.history-CJOsN9w5.js";
 import { logDebug } from "openclaw/plugin-sdk/logging-core";
@@ -28,7 +29,7 @@ import { shouldHandleTextCommands } from "openclaw/plugin-sdk/command-surface";
 import { createChannelHistoryWindow } from "openclaw/plugin-sdk/reply-history";
 //#region extensions/discord/src/monitor/message-handler.dm-preflight.ts
 const loadConversationRuntime$1 = createLazyRuntimeModule(() => import("openclaw/plugin-sdk/conversation-binding-runtime"));
-const loadDiscordSendRuntime = createLazyRuntimeModule(() => import("./send-rQIffSYu.js").then((n) => n.t));
+const loadDiscordSendRuntime = createLazyRuntimeModule(() => import("./send-UJHiAm4C.js").then((n) => n.t));
 function resolveDiscordDmPairingSenderId(sender) {
 	return sender.isPluralKit ? `pk:${sender.id}` : sender.id;
 }
@@ -53,7 +54,9 @@ async function resolveDiscordDmPreflightAccess(params) {
 		sender: {
 			id: params.sender.id,
 			name: params.sender.name,
-			tag: params.sender.tag
+			tag: params.sender.tag,
+			isPluralKit: params.sender.isPluralKit,
+			authorKind: params.author.bot ? "bot" : "user"
 		},
 		allowNameMatching: params.allowNameMatching,
 		cfg: params.preflight.cfg,
@@ -267,72 +270,6 @@ async function hydrateDiscordMessageIfNeeded(params) {
 	};
 }
 //#endregion
-//#region extensions/discord/src/monitor/message-handler.preflight-channel-access.ts
-function resolveDiscordPreflightChannelAccess(params) {
-	if (params.isGuildMessage && params.channelConfig?.enabled === false) {
-		logDebug(`[discord-preflight] drop: channel disabled`);
-		logVerbose(`Blocked discord channel ${params.messageChannelId} (channel disabled, ${params.channelMatchMeta})`);
-		return {
-			allowed: false,
-			channelAllowlistConfigured: false,
-			channelAllowed: false
-		};
-	}
-	const groupDmAllowed = params.isGroupDm && resolveGroupDmAllow({
-		channels: params.groupDmChannels,
-		channelId: params.messageChannelId,
-		channelName: params.displayChannelName,
-		channelSlug: params.displayChannelSlug
-	});
-	if (params.isGroupDm && !groupDmAllowed) return {
-		allowed: false,
-		channelAllowlistConfigured: false,
-		channelAllowed: false
-	};
-	const channelAllowlistConfigured = Boolean(params.guildInfo?.channels) && Object.keys(params.guildInfo?.channels ?? {}).length > 0;
-	const channelAllowed = params.channelConfig?.allowed !== false;
-	if (params.isGuildMessage && !isDiscordGroupAllowedByPolicy({
-		groupPolicy: params.groupPolicy,
-		guildAllowlisted: Boolean(params.guildInfo),
-		channelAllowlistConfigured,
-		channelAllowed
-	})) {
-		if (params.groupPolicy === "disabled") {
-			logDebug(`[discord-preflight] drop: groupPolicy disabled`);
-			logVerbose(`discord: drop guild message (groupPolicy: disabled, ${params.channelMatchMeta})`);
-		} else if (!channelAllowlistConfigured) {
-			logDebug(`[discord-preflight] drop: groupPolicy allowlist, no channel allowlist configured`);
-			logVerbose(`discord: drop guild message (groupPolicy: allowlist, no channel allowlist, ${params.channelMatchMeta})`);
-		} else {
-			logDebug(`[discord] Ignored message from channel ${params.messageChannelId} (not in guild allowlist). Add to guilds.<guildId>.channels to enable.`);
-			logVerbose(`Blocked discord channel ${params.messageChannelId} not in guild channel allowlist (groupPolicy: allowlist, ${params.channelMatchMeta})`);
-		}
-		return {
-			allowed: false,
-			channelAllowlistConfigured,
-			channelAllowed
-		};
-	}
-	if (params.isGuildMessage && params.channelConfig?.allowed === false) {
-		logDebug(`[discord-preflight] drop: channelConfig.allowed===false`);
-		logVerbose(`Blocked discord channel ${params.messageChannelId} not in guild channel allowlist (${params.channelMatchMeta})`);
-		return {
-			allowed: false,
-			channelAllowlistConfigured,
-			channelAllowed
-		};
-	}
-	if (params.isGuildMessage) {
-		logDebug(`[discord-preflight] pass: channel allowed`);
-		logVerbose(`discord: allow channel ${params.messageChannelId} (${params.channelMatchMeta})`);
-	}
-	return {
-		allowed: true,
-		channelAllowlistConfigured,
-		channelAllowed
-	};
-}
-//#endregion
 //#region extensions/discord/src/monitor/message-handler.preflight-channel-context.ts
 function resolveDiscordPreflightChannelContext(params) {
 	const threadName = params.threadChannel?.name;
@@ -401,9 +338,6 @@ function isBoundThreadBotSystemMessage(params) {
 	if (!text) return false;
 	return DISCORD_BOUND_THREAD_SYSTEM_PREFIXES.some((prefix) => text.startsWith(prefix));
 }
-function isDiscordThreadChannelType(type) {
-	return type === discord_exports.ChannelType.PublicThread || type === discord_exports.ChannelType.PrivateThread || type === discord_exports.ChannelType.AnnouncementThread;
-}
 function isDiscordThreadChannelMessage(params) {
 	if (!params.isGuildMessage) return false;
 	const channel = "channel" in params.message ? params.message.channel : void 0;
@@ -489,10 +423,10 @@ function logDiscordPreflightInboundSummary(params) {
 }
 //#endregion
 //#region extensions/discord/src/monitor/message-handler.preflight-runtime.ts
-const loadPluralKitRuntime = createLazyRuntimeModule(() => import("./pluralkit-dUl4v1X3.js").then((n) => n.n));
+const loadPluralKitRuntime = createLazyRuntimeModule(() => import("./pluralkit-9EuEN4UD.js").then((n) => n.n));
 const loadPreflightAudioRuntime = createLazyRuntimeModule(() => import("./preflight-audio-DrnqFA8U.js"));
-const loadSystemEventsRuntime = createLazyRuntimeModule(() => import("./system-events-Nuwoq_au.js"));
-const loadDiscordThreadingRuntime = createLazyRuntimeModule(() => import("./threading-DU6pgeGm.js").then((n) => n.t));
+const loadSystemEventsRuntime = createLazyRuntimeModule(() => import("./system-events-BEmcj4xJ.js"));
+const loadDiscordThreadingRuntime = createLazyRuntimeModule(() => import("./threading-CXuu_7o9.js").then((n) => n.t));
 function isPreflightAborted(abortSignal) {
 	return Boolean(abortSignal?.aborted);
 }
@@ -707,7 +641,7 @@ async function preflightDiscordMessage(params) {
 		channelType: channelInfo?.type
 	});
 	const messageText = resolveDiscordMessageText(message, { includeForwarded: true });
-	const injectedBoundThreadBinding = !isDirectMessage && !isGroupDm ? resolveInjectedBoundThreadLookupRecord({
+	const injectedBoundThreadBinding = !isDirectMessage && !isGroupDm && (webhookId || author.bot) ? resolveInjectedBoundThreadLookupRecord({
 		threadBindings: params.threadBindings,
 		threadId: messageChannelId
 	}) : void 0;
@@ -967,7 +901,9 @@ async function preflightDiscordMessage(params) {
 			sender: {
 				id: sender.id,
 				name: sender.name,
-				tag: sender.tag
+				tag: sender.tag,
+				isPluralKit: sender.isPluralKit,
+				authorKind: author.bot ? "bot" : "user"
 			},
 			memberAccessConfigured: hasAccessRestrictions,
 			memberAllowed,

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

@@ -1,33 +1,31 @@
-import { Ct as editChannelMessage, a as chunkDiscordTextWithMode, p as discord_exports, vt as createChannelMessage, xt as deleteChannelMessage } from "./retry-DNsVTeTo.js";
-import { A as resolveDiscordChannelId, p as resolveDiscordMaxLinesPerMessage } from "./accounts-DNl-oCEw.js";
+import { Dt as deleteChannelMessage, a as chunkDiscordTextWithMode, kt as editChannelMessage, v as resolveDiscordChannelId, wt as createChannelMessage, y as discord_exports } from "./retry-DqHCW6PV.js";
+import { p as resolveDiscordMaxLinesPerMessage } from "./accounts-CfQ-vSyf.js";
 import { C as resolveTimestampMs, a as normalizeDiscordSlug, r as normalizeDiscordAllowList } from "./allow-list-BDMimASD.js";
-import { A as resolveDiscordMessageFlags, F as createDiscordRestClient, I as createDiscordRuntimeAccountContext, d as resolveDiscordTargetChannelId } from "./send.shared-B3fpaLWJ.js";
-import { i as discordTextHasBroadcastMention } from "./send.outbound-HIkgji_7.js";
-import { c as editMessageDiscord } from "./send-rQIffSYu.js";
+import { F as createDiscordRuntimeAccountContext, P as createDiscordRestClient, d as resolveDiscordTargetChannelId, k as resolveDiscordMessageFlags } from "./send.shared-DZJ1akvQ.js";
+import { i as discordTextHasBroadcastMention } from "./send.outbound-D7JYmfm9.js";
+import { a as removeReactionDiscord, f as editMessageDiscord, r as reactMessageDiscord } from "./send-UJHiAm4C.js";
 import { n as DISCORD_ATTACHMENT_TOTAL_TIMEOUT_MS, t as DISCORD_ATTACHMENT_IDLE_TIMEOUT_MS } from "./timeouts-B9cy6RvQ.js";
-import { i as removeReactionDiscord, n as reactMessageDiscord } from "./send.reactions-gmJ6yFPo.js";
-import "./targets-B2pf49zc.js";
-import { i as buildDiscordRoutePeer, l as resolveDiscordConversationIdentity } from "./approval-message-safety-XGFPbDoI.js";
-import { t as discordInboundEventDelivery } from "./inbound-event-delivery-De2qxTrP.js";
-import { t as DISCORD_TEXT_CHUNK_LIMIT } from "./outbound-adapter-DxHTOqiN.js";
-import { a as sanitizeDiscordFrontChannelReplyPayloads, c as resolveReplyContext, h as createDiscordSupplementalContextAccessChecker, i as formatDiscordReplySkip, m as buildDiscordInboundAccessContext, n as deliverDiscordReply, o as buildDirectLabel, r as formatDiscordReplyDeliveryFailure, s as buildGuildLabel } from "./provider-DlK_ynqt.js";
-import { a as formatDiscordMediaText, c as resolveReferencedReplyMediaList, d as resolveDiscordMessageStickers, i as resolveDiscordMessageText } from "./message-utils-BXLLnFl6.js";
-import { a as resolveDiscordThreadStarter, n as resolveDiscordAutoThreadReplyPlan } from "./threading-DU6pgeGm.js";
+import "./targets-CQp53cGj.js";
+import { a as buildDiscordRoutePeer, h as discordInboundEventDelivery, u as resolveDiscordConversationIdentity } from "./outbound-session-route-Bn4uXaoE.js";
+import { t as DISCORD_TEXT_CHUNK_LIMIT } from "./outbound-adapter-Dif8p481.js";
+import { a as formatDiscordReplySkip, c as buildGuildLabel, g as createDiscordSupplementalContextAccessChecker, h as buildDiscordInboundAccessContext, i as formatDiscordReplyDeliveryFailure, l as resolveReplyContext, o as sanitizeDiscordFrontChannelReplyPayloads, r as deliverDiscordReply, s as buildDirectLabel } from "./provider-LXiOcJrH.js";
+import { a as formatDiscordMediaText, c as resolveReferencedReplyMediaList, i as resolveDiscordMessageText, u as resolveDiscordMessageStickers } from "./message-text-Ca8M6TU8.js";
+import { a as resolveDiscordThreadStarter, n as resolveDiscordAutoThreadReplyPlan } from "./threading-CXuu_7o9.js";
 import { n as resolveDiscordWebhookId } from "./sender-identity-BJtfyise.js";
 import { t as beginDiscordActiveTurnThreadRoute } from "./active-turn-thread-route-fmHl1HNd.js";
 import { n as filterDiscordHistoryEntriesForContext, t as createDiscordHistorySenderProvenance } from "./message-handler.history-CJOsN9w5.js";
-import { t as sendTyping } from "./typing-oLiS5Z13.js";
+import { t as sendTyping } from "./typing-B9snnwMe.js";
 import { expectDefined } from "openclaw/plugin-sdk/expect-runtime";
 import { formatErrorMessage } from "openclaw/plugin-sdk/error-runtime";
 import { buildAgentSessionKey, resolveThreadSessionKeys } from "openclaw/plugin-sdk/routing";
+import { getReplyPayloadTtsSupplement, isReplyPayloadNonTerminalToolErrorWarning, resolveSendableOutboundReplyParts } from "openclaw/plugin-sdk/reply-payload";
 import { danger, logVerbose, shouldLogVerbose, sleepWithAbort } from "openclaw/plugin-sdk/runtime-env";
 import { truncateUtf16Safe } from "openclaw/plugin-sdk/text-utility-runtime";
 import { resolveMarkdownTableMode } from "openclaw/plugin-sdk/markdown-table-runtime";
 import { resolveChunkMode } from "openclaw/plugin-sdk/reply-chunking";
 import { convertMarkdownTables, stripInlineDirectiveTagsForDelivery, stripReasoningTagsFromText } from "openclaw/plugin-sdk/text-chunking";
-import { bindIngressLifecycleToReplyOptions, buildChannelProgressDraftLine, buildChannelProgressDraftLineForEntry, createChannelMessageReplyPipeline, createChannelProgressDraftCompositor, createFinalizableDraftLifecycle, createTypingCallbacks, defineFinalizableLivePreviewAdapter, deliverWithFinalizableLivePreviewAdapter, resolveChannelDraftStreamingChunking, resolveChannelMessageSourceReplyDeliveryMode, resolveChannelPreviewStreamMode, resolveChannelStreamingBlockEnabled, resolveChannelStreamingPreviewCommandText, resolveChannelStreamingPreviewToolProgress, resolveChannelStreamingProgressNarration, resolveChannelStreamingSuppressDefaultToolProgressMessages, resolveTranscriptBackedChannelFinalText } from "openclaw/plugin-sdk/channel-outbound";
+import { bindIngressLifecycleToReplyOptions, buildChannelProgressDraftLine, buildChannelProgressDraftLineForEntry, createChannelMessageReplyPipeline, createChannelProgressDraftCompositor, createFinalizableDraftStreamControlsForState, createTypingCallbacks, defineFinalizableLivePreviewAdapter, deliverWithFinalizableLivePreviewAdapter, resolveChannelDraftStreamingChunking, resolveChannelMessageSourceReplyDeliveryMode, resolveChannelPreviewStreamMode, resolveChannelStreamingBlockEnabled, resolveChannelStreamingPreviewCommandText, resolveChannelStreamingPreviewToolProgress, resolveChannelStreamingProgressNarration, resolveChannelStreamingSuppressDefaultToolProgressMessages, resolveTranscriptBackedChannelFinalText } from "openclaw/plugin-sdk/channel-outbound";
 import { getAgentScopedMediaLocalRoots } from "openclaw/plugin-sdk/media-runtime";
-import { getReplyPayloadTtsSupplement, isReplyPayloadNonTerminalToolErrorWarning, resolveSendableOutboundReplyParts } from "openclaw/plugin-sdk/reply-payload";
 import { evaluateSupplementalContextVisibility } from "openclaw/plugin-sdk/security-runtime";
 import { resolvePinnedMainDmOwnerFromAllowlist } from "openclaw/plugin-sdk/conversation-runtime";
 import { resolveAgentConfig } from "openclaw/plugin-sdk/agent-scope-runtime";
@@ -199,6 +197,7 @@ async function buildDiscordMessageProcessContext(params) {
 			const starter = await resolveDiscordThreadStarter({
 				channel: threadChannel,
 				client,
+				accountId,
 				parentId: threadParentId,
 				parentType: threadParentType,
 				resolveTimestampMs
@@ -792,7 +791,7 @@ function createDiscordDraftStream(params) {
 	let streamGeneration = 0;
 	let activeCreateGeneration;
 	let discardActiveCreate = false;
-	let retargetedCleanup = [];
+	let pendingCleanupMessages = [];
 	const sendOrEditStreamMessage = async (text) => {
 		const generation = streamGeneration;
 		if (streamState.stopped && !streamState.final) return false;
@@ -833,11 +832,11 @@ function createDiscordDraftStream(params) {
 			activeCreateGeneration = void 0;
 			discardActiveCreate = false;
 			if (generation !== streamGeneration) {
-				if (shouldDiscardStaleCreate && typeof sentMessageId === "string" && sentMessageId) try {
-					await deleteChannelMessage(rest, channelId, sentMessageId);
-				} catch (err) {
-					params.warn?.(`discord stale stream preview cleanup failed: ${formatErrorMessage(err)}`);
-				}
+				if (shouldDiscardStaleCreate && typeof sentMessageId === "string" && sentMessageId) await deleteCleanupMessage({
+					channelId,
+					messageId: sentMessageId,
+					warnPrefix: "discord stale stream preview cleanup failed"
+				});
 				return true;
 			}
 			if (typeof sentMessageId !== "string" || !sentMessageId) {
@@ -858,24 +857,10 @@ function createDiscordDraftStream(params) {
 			return false;
 		}
 	};
-	const readMessageId = () => streamMessageId;
-	const clearMessageId = () => {
-		streamMessageId = void 0;
-	};
-	const isValidStreamMessageId = (value) => typeof value === "string";
-	const deleteStreamMessage = async (messageId) => {
-		await deleteChannelMessage(rest, channelId, messageId);
-	};
-	const { loop, update, stop, clear, discardPending, seal } = createFinalizableDraftLifecycle({
+	const { loop, update, stop, discardPending, seal } = createFinalizableDraftStreamControlsForState({
 		throttleMs,
 		state: streamState,
-		sendOrEditStreamMessage,
-		readMessageId,
-		clearMessageId,
-		isValidMessageId: isValidStreamMessageId,
-		deleteMessage: deleteStreamMessage,
-		warn: params.warn,
-		warnPrefix: "discord stream preview cleanup failed"
+		sendOrEditStreamMessage
 	});
 	const forceNewMessage = (mode = "preserve") => {
 		if (mode === "discard" && activeCreateGeneration !== void 0) discardActiveCreate = true;
@@ -887,16 +872,19 @@ function createDiscordDraftStream(params) {
 		loop.resetPending();
 		loop.resetThrottleWindow();
 	};
-	const cleanupRetargeted = async () => {
-		const pending = retargetedCleanup;
-		retargetedCleanup = [];
-		for (const stale of pending) try {
-			await deleteChannelMessage(rest, stale.channelId, stale.messageId);
+	const deleteCleanupMessage = async (message) => {
+		try {
+			await deleteChannelMessage(rest, message.channelId, message.messageId);
 		} catch (err) {
-			retargetedCleanup.push(stale);
-			params.warn?.(`discord stream preview retarget cleanup failed: ${formatErrorMessage(err)}`);
+			pendingCleanupMessages.push(message);
+			params.warn?.(`${message.warnPrefix}: ${formatErrorMessage(err)}`);
 		}
 	};
+	const cleanupPendingMessages = async () => {
+		const pending = pendingCleanupMessages;
+		pendingCleanupMessages = [];
+		for (const message of pending) await deleteCleanupMessage(message);
+	};
 	const retarget = async (nextChannelId) => {
 		const normalized = nextChannelId.trim();
 		if (!normalized || normalized === channelId) return;
@@ -919,33 +907,33 @@ function createDiscordDraftStream(params) {
 		if (previousMessageId) {
 			const stale = {
 				channelId: previousChannelId,
-				messageId: previousMessageId
+				messageId: previousMessageId,
+				warnPrefix: "discord stream preview retarget cleanup failed"
 			};
 			if (!streamMessageId) {
-				retargetedCleanup.push(stale);
+				pendingCleanupMessages.push(stale);
 				throw new Error("discord stream preview retarget replacement failed");
 			}
-			try {
-				await deleteChannelMessage(rest, previousChannelId, previousMessageId);
-			} catch (err) {
-				retargetedCleanup.push(stale);
-				params.warn?.(`discord stream preview retarget cleanup failed: ${formatErrorMessage(err)}`);
-			}
+			await deleteCleanupMessage(stale);
 		}
 	};
 	const deleteCurrentMessage = async () => {
 		loop.resetPending();
 		await loop.waitForInFlight();
-		const messageId = streamMessageId;
+		const currentMessage = streamMessageId ? {
+			channelId,
+			messageId: streamMessageId,
+			warnPrefix: "discord stream preview cleanup failed"
+		} : void 0;
 		streamMessageId = void 0;
 		lastSentText = "";
 		loop.resetThrottleWindow();
-		if (!isValidStreamMessageId(messageId)) return;
-		try {
-			await deleteStreamMessage(messageId);
-		} catch (err) {
-			params.warn?.(`discord stream preview cleanup failed: ${formatErrorMessage(err)}`);
-		}
+		if (!currentMessage) return;
+		await deleteCleanupMessage(currentMessage);
+	};
+	const clear = async () => {
+		await discardPending();
+		await deleteCurrentMessage();
 	};
 	params.log?.(`discord stream preview ready (maxChars=${maxChars}, throttleMs=${throttleMs})`);
 	return {
@@ -958,7 +946,7 @@ function createDiscordDraftStream(params) {
 		seal,
 		stop,
 		retarget,
-		cleanupRetargeted,
+		cleanupPendingMessages,
 		forceNewMessage
 	};
 }
@@ -1232,7 +1220,7 @@ function createDiscordDraftPreviewController(params) {
 				progressDraft.cancel();
 				if (finalReplyError !== false) await draftStream?.discardPending();
 				if (finalReplyError !== true && !finalizedViaPreviewMessage && draftStream?.messageId()) await draftStream.clear();
-				await draftStream?.cleanupRetargeted();
+				await draftStream?.cleanupPendingMessages();
 			} catch (err) {
 				params.log(`discord: draft cleanup failed: ${String(err)}`);
 			}
@@ -1609,7 +1597,8 @@ async function processDiscordMessageInner(ctx, observer) {
 				threadBindings,
 				mediaLocalRoots,
 				kind: "block",
-				bindPendingFinalDelivery: info.bindPendingFinalDelivery
+				bindPendingFinalDelivery: info.bindPendingFinalDelivery,
+				onPlatformSendDispatch: info.onPlatformSendDispatch
 			});
 			if (result.visibleReplySent) replyReference.markSent();
 			return result;
@@ -1708,7 +1697,8 @@ async function processDiscordMessageInner(ctx, observer) {
 						mediaLocalRoots,
 						allowedMentions,
 						kind: info.kind,
-						bindPendingFinalDelivery: info.bindPendingFinalDelivery
+						bindPendingFinalDelivery: info.bindPendingFinalDelivery,
+						onPlatformSendDispatch: info.onPlatformSendDispatch
 					})).visibleReplySent;
 				},
 				onNormalDelivered: () => {
@@ -1746,7 +1736,8 @@ async function processDiscordMessageInner(ctx, observer) {
 			threadBindings,
 			mediaLocalRoots,
 			kind: info.kind,
-			bindPendingFinalDelivery: info.bindPendingFinalDelivery
+			bindPendingFinalDelivery: info.bindPendingFinalDelivery,
+			onPlatformSendDispatch: info.onPlatformSendDispatch
 		});
 		if (!result.visibleReplySent) return result;
 		replyReference.markSent();
@@ -1864,7 +1855,10 @@ async function processDiscordMessageInner(ctx, observer) {
 			return;
 		}
 		dispatchError = true;
-		if (await completeDiscordSessionConflict(err, deliverDiscordPayload, onDiscordDeliveryError)) return;
+		if (await completeDiscordSessionConflict(err, (payload, info) => deliverDiscordPayload(payload, {
+			...info,
+			onPlatformSendDispatch: () => Promise.resolve()
+		}), onDiscordDeliveryError)) return;
 		throw err;
 	} finally {
 		activeThreadRoute.end();

package/dist/{message-utils-BXLLnFl6.js → message-text-Ca8M6TU8.js}

@@ -1,4 +1,4 @@
-import { c as resolveDiscordChannelInfoSafe } from "./thread-bindings.manager-CngsgErq.js";
+import { c as resolveDiscordChannelInfoSafe } from "./thread-bindings.manager-Clm77DBM.js";
 import { ComponentType, StickerFormatType } from "discord-api-types/v10";
 import { asDateTimestampMs, resolveExpiresAtMsFromDurationMs } from "openclaw/plugin-sdk/number-runtime";
 import { normalizeLowercaseStringOrEmpty, normalizeOptionalString, normalizeOptionalStringifiedId, uniqueStrings } from "openclaw/plugin-sdk/string-coerce-runtime";
@@ -68,6 +68,34 @@ async function resolveDiscordChannelInfo(client, channelId) {
 	}
 }
 //#endregion
+//#region extensions/discord/src/monitor/media-ssrf-policy.ts
+const DISCORD_MEDIA_SSRF_POLICY = {
+	hostnameAllowlist: [
+		"cdn.discordapp.com",
+		"media.discordapp.net",
+		"*.discordapp.com",
+		"*.discordapp.net"
+	],
+	allowRfc2544BenchmarkRange: true
+};
+function mergeHostnameList(...lists) {
+	const merged = lists.flatMap((list) => list ?? []).map((value) => value.trim()).filter((value) => value.length > 0);
+	return merged.length > 0 ? uniqueStrings(merged) : void 0;
+}
+/** Merges caller network policy with the Discord-owned CDN allowlist. */
+function resolveDiscordCdnPolicy(policy) {
+	if (!policy) return DISCORD_MEDIA_SSRF_POLICY;
+	const hostnameAllowlist = mergeHostnameList(DISCORD_MEDIA_SSRF_POLICY.hostnameAllowlist, policy.hostnameAllowlist);
+	const allowedHostnames = mergeHostnameList(DISCORD_MEDIA_SSRF_POLICY.allowedHostnames, policy.allowedHostnames);
+	return {
+		...DISCORD_MEDIA_SSRF_POLICY,
+		...policy,
+		...allowedHostnames ? { allowedHostnames } : {},
+		...hostnameAllowlist ? { hostnameAllowlist } : {},
+		allowRfc2544BenchmarkRange: Boolean(DISCORD_MEDIA_SSRF_POLICY.allowRfc2544BenchmarkRange) || Boolean(policy.allowRfc2544BenchmarkRange)
+	};
+}
+//#endregion
 //#region extensions/discord/src/monitor/message-forwarded.ts
 const FORWARD_MESSAGE_REFERENCE_TYPE = 1;
 function normalizeDiscordStickerItems(value) {
@@ -115,34 +143,6 @@ function formatDiscordSnapshotAuthor(author) {
 	if (author.id) return `@${author.id}`;
 }
 //#endregion
-//#region extensions/discord/src/monitor/media-ssrf-policy.ts
-const DISCORD_MEDIA_SSRF_POLICY = {
-	hostnameAllowlist: [
-		"cdn.discordapp.com",
-		"media.discordapp.net",
-		"*.discordapp.com",
-		"*.discordapp.net"
-	],
-	allowRfc2544BenchmarkRange: true
-};
-function mergeHostnameList(...lists) {
-	const merged = lists.flatMap((list) => list ?? []).map((value) => value.trim()).filter((value) => value.length > 0);
-	return merged.length > 0 ? uniqueStrings(merged) : void 0;
-}
-/** Merges caller network policy with the Discord-owned CDN allowlist. */
-function resolveDiscordCdnPolicy(policy) {
-	if (!policy) return DISCORD_MEDIA_SSRF_POLICY;
-	const hostnameAllowlist = mergeHostnameList(DISCORD_MEDIA_SSRF_POLICY.hostnameAllowlist, policy.hostnameAllowlist);
-	const allowedHostnames = mergeHostnameList(DISCORD_MEDIA_SSRF_POLICY.allowedHostnames, policy.allowedHostnames);
-	return {
-		...DISCORD_MEDIA_SSRF_POLICY,
-		...policy,
-		...allowedHostnames ? { allowedHostnames } : {},
-		...hostnameAllowlist ? { hostnameAllowlist } : {},
-		allowRfc2544BenchmarkRange: Boolean(DISCORD_MEDIA_SSRF_POLICY.allowRfc2544BenchmarkRange) || Boolean(policy.allowRfc2544BenchmarkRange)
-	};
-}
-//#endregion
 //#region extensions/discord/src/monitor/message-media.ts
 const AUDIO_ATTACHMENT_EXTENSIONS = /* @__PURE__ */ new Set([
 	".aac",
@@ -366,6 +366,7 @@ async function appendResolvedMediaFromAttachments(params) {
 			});
 			params.out.push({
 				path: saved.path,
+				fileName: attachment.filename,
 				...classification
 			});
 		} catch (err) {
@@ -436,6 +437,7 @@ async function appendResolvedMediaFromStickers(params) {
 			params.out.push({
 				path: saved.path,
 				contentType: saved.contentType,
+				fileName: candidate.fileName,
 				kind: "sticker"
 			});
 			lastError = null;
@@ -495,8 +497,8 @@ function resolveDiscordMentions(text, message) {
 	if (!Array.isArray(mentions) || mentions.length === 0) return text;
 	let out = text;
 	for (const user of mentions) {
-		const label = user.globalName || user.username;
-		out = out.replace(new RegExp(`<@!?${user.id}>`, "g"), `@${label}`);
+		const label = user.globalName || user.username || user.id;
+		out = out.replace(new RegExp(`<@!?${user.id}>`, "g"), () => `@${label}`);
 	}
 	return out;
 }
@@ -561,4 +563,4 @@ function resolveDiscordSnapshotMessageText(snapshot) {
 	return [content || embedText || componentText, attachmentText].filter(Boolean).join("\n");
 }
 //#endregion
-export { formatDiscordMediaText as a, resolveReferencedReplyMediaList as c, resolveDiscordMessageStickers as d, resolveDiscordChannelInfo as f, resolveDiscordMessageText as i, resolveDiscordCdnPolicy as l, resolveDiscordForwardedMessagesTextFromSnapshots as n, resolveForwardedMediaList as o, resolveDiscordMessageChannelId as p, resolveDiscordMessageHistoryText as r, resolveMediaList as s, resolveDiscordEmbedText as t, hasDiscordMessageStickers as u };
+export { formatDiscordMediaText as a, resolveReferencedReplyMediaList as c, resolveDiscordCdnPolicy as d, resolveDiscordChannelInfo as f, resolveDiscordMessageText as i, hasDiscordMessageStickers as l, resolveDiscordForwardedMessagesTextFromSnapshots as n, resolveForwardedMediaList as o, resolveDiscordMessageChannelId as p, resolveDiscordMessageHistoryText as r, resolveMediaList as s, resolveDiscordEmbedText as t, resolveDiscordMessageStickers as u };