@openclaw/discord 2026.9.6 → 2026.9.8

package/dist/.setup/{send.components-ChY21qr-.mjs → send.components-DxQAMfES.mjs}

@@ -1,9 +1,10 @@
-import { A as serializePayload, C as withDiscordRequestAuthority, Ut as __exportAll, ft as editChannelMessage, st as createChannelMessage } from "./discord-BXpHW-cu.mjs";
-import { d as buildDiscordComponentMessage, f as buildDiscordComponentMessageFlags, g as resolveDiscordComponentAttachmentName } from "./components-yBEb75bB.mjs";
+import { t as __exportAll } from "./rolldown-runtime-B4FMCO8f.mjs";
+import { d as buildDiscordComponentMessage, f as buildDiscordComponentMessageFlags, g as resolveDiscordComponentAttachmentName } from "./components-Cq1PvIpN.mjs";
+import { A as serializePayload, C as withDiscordRequestAuthority, ct as createChannelMessage, pt as editChannelMessage } from "./discord-0xJYfdDD.mjs";
 import { n as getOptionalDiscordRuntime } from "./runtime-DgnVQ7zW.mjs";
-import { l as createDiscordSendResult } from "./retry-BEYkDy0P.mjs";
-import { E as SUPPRESS_NOTIFICATIONS_FLAG, K as parseAndResolveChannelRecipient, N as createDiscordClient, O as createDiscordMessageNonce, l as resolveChannelId, t as buildDiscordSendError, u as resolveDiscordChannel } from "./send.shared-VNvWfX2T.mjs";
-import { t as sendMessageDiscord } from "./send.outbound-QTyuFupn.mjs";
+import { u as createDiscordSendResult } from "./retry-pz_cSha2.mjs";
+import { D as createDiscordMessageNonce, G as parseAndResolveChannelRecipient, M as createDiscordClient, T as SUPPRESS_NOTIFICATIONS_FLAG, c as resolveChannelId, l as resolveDiscordChannel, t as buildDiscordSendError } from "./send.shared-DGFkbkQR.mjs";
+import { t as sendMessageDiscord } from "./send.outbound-BISKnb-a.mjs";
 import { ChannelType } from "discord-api-types/v10";
 import { asDateTimestampMs, isFutureDateTimestampMs, resolveDateTimestampMs, resolveExpiresAtMsFromDurationMs } from "openclaw/plugin-sdk/number-runtime";
 import { resolveGlobalSingleton } from "openclaw/plugin-sdk/global-singleton";
@@ -36,12 +37,6 @@ const PERSISTENT_COMPONENT_NAMESPACE = "discord.components";
 const PERSISTENT_MODAL_NAMESPACE = "discord.modals";
 const PERSISTENT_COMPONENT_MAX_ENTRIES = 500;
 const PERSISTENT_MODAL_MAX_ENTRIES = 500;
-function getComponentEntries() {
-	return discordComponentRegistryState.componentEntries;
-}
-function getModalEntries() {
-	return discordComponentRegistryState.modalEntries;
-}
 function formatRegistryError(error) {
 	if (!(error instanceof Error)) return { error: formatRegistryErrorValue(error) };
 	const details = {
@@ -133,15 +128,10 @@ function pruneUndefinedRegistryValues(value) {
 	return result;
 }
 function normalizeRegistryEntries(entries, params) {
-	const normalizedEntries = [];
-	for (const entry of entries) {
-		const normalized = normalizeEntryTimestamps({
-			...entry,
-			messageId: params.messageId ?? entry.messageId
-		}, params.now, params.ttlMs);
-		normalizedEntries.push(normalized);
-	}
-	return normalizedEntries;
+	return entries.map((entry) => normalizeEntryTimestamps({
+		...entry,
+		messageId: params.messageId ?? entry.messageId
+	}, params.now, params.ttlMs));
 }
 function resolveEntry(store, params) {
 	const entry = store.get(params.id);
@@ -199,7 +189,7 @@ function resolveComponentConsumptionIds(entry) {
 	return ids.length > 0 ? uniqueStrings(ids) : [entry.id];
 }
 function deleteComponentConsumptionGroup(entry) {
-	const store = getComponentEntries();
+	const store = discordComponentRegistryState.componentEntries;
 	for (const id of resolveComponentConsumptionIds(entry)) store.delete(id);
 }
 async function deletePersistentComponentConsumptionGroup(entry) {
@@ -232,8 +222,8 @@ function registerDiscordComponentEntries(params) {
 		messageId: params.messageId
 	});
 	return discordComponentRegistryState.withRegistryLock(async () => {
-		for (const entry of normalizedEntries) getComponentEntries().set(entry.id, entry);
-		for (const entry of normalizedModals) getModalEntries().set(entry.id, entry);
+		for (const entry of normalizedEntries) discordComponentRegistryState.componentEntries.set(entry.id, entry);
+		for (const entry of normalizedModals) discordComponentRegistryState.modalEntries.set(entry.id, entry);
 		await registerPersistentEntries({
 			entries: normalizedEntries,
 			modals: normalizedModals,
@@ -242,7 +232,7 @@ function registerDiscordComponentEntries(params) {
 	});
 }
 function resolveDiscordComponentEntry(params) {
-	const entry = resolveEntry(getComponentEntries(), params);
+	const entry = resolveEntry(discordComponentRegistryState.componentEntries, params);
 	if (entry && params.consume !== false) deleteComponentConsumptionGroup(entry);
 	return entry;
 }
@@ -261,12 +251,9 @@ async function resolveDiscordComponentEntryWithPersistence(params) {
 		return persisted;
 	});
 }
-function resolveDiscordModalEntry(params) {
-	return resolveEntry(getModalEntries(), params);
-}
 async function resolveDiscordModalEntryWithPersistence(params) {
 	return discordComponentRegistryState.withRegistryLock(async () => {
-		const inMemory = resolveDiscordModalEntry(params);
+		const inMemory = resolveEntry(discordComponentRegistryState.modalEntries, params);
 		if (inMemory) {
 			if (params.consume !== false) await deletePersistentEntry({
 				...params,
@@ -387,57 +374,66 @@ async function buildDiscordComponentPayload(params) {
 	};
 }
 async function sendDiscordComponentMessage(to, spec, opts) {
-	return await withDiscordRequestAuthority(opts.assertPlatformSendAuthorized, () => sendDiscordComponentMessageInternal(to, spec, opts));
-}
-async function sendDiscordComponentMessageInternal(to, spec, opts) {
-	const classicMessage = opts.mediaUrl ? resolveClassicDiscordMessage(spec) : void 0;
-	if (classicMessage) return await sendMessageDiscord(to, classicMessage.text, {
-		cfg: opts.cfg,
-		accountId: opts.accountId,
-		token: opts.token,
-		rest: opts.rest,
-		mediaUrl: opts.mediaUrl,
-		filename: opts.filename?.trim() || classicMessage.filename,
-		mediaLocalRoots: opts.mediaLocalRoots,
-		mediaReadFile: opts.mediaReadFile,
-		mediaAccess: opts.mediaAccess,
-		reply: opts.reply,
-		silent: opts.silent,
-		textLimit: opts.textLimit,
-		maxLinesPerMessage: opts.maxLinesPerMessage,
-		tableMode: opts.tableMode,
-		chunkMode: opts.chunkMode,
-		onDeliveryResult: opts.onDeliveryResult,
-		onPlatformSendDispatch: opts.onPlatformSendDispatch,
-		assertPlatformSendAuthorized: opts.assertPlatformSendAuthorized,
-		...opts.suppressEmbeds === void 0 ? {} : { suppressEmbeds: opts.suppressEmbeds }
+	return await withDiscordRequestAuthority(opts.assertPlatformSendAuthorized, async () => {
+		const classicMessage = opts.mediaUrl ? resolveClassicDiscordMessage(spec) : void 0;
+		if (classicMessage) return await sendMessageDiscord(to, classicMessage.text, {
+			cfg: opts.cfg,
+			accountId: opts.accountId,
+			token: opts.token,
+			rest: opts.rest,
+			mediaUrl: opts.mediaUrl,
+			filename: opts.filename?.trim() || classicMessage.filename,
+			mediaLocalRoots: opts.mediaLocalRoots,
+			mediaReadFile: opts.mediaReadFile,
+			mediaAccess: opts.mediaAccess,
+			reply: opts.reply,
+			silent: opts.silent,
+			textLimit: opts.textLimit,
+			maxLinesPerMessage: opts.maxLinesPerMessage,
+			tableMode: opts.tableMode,
+			chunkMode: opts.chunkMode,
+			onDeliveryResult: opts.onDeliveryResult,
+			onPlatformSendDispatch: opts.onPlatformSendDispatch,
+			assertPlatformSendAuthorized: opts.assertPlatformSendAuthorized,
+			...opts.suppressEmbeds === void 0 ? {} : { suppressEmbeds: opts.suppressEmbeds }
+		});
+		return await writeDiscordComponentMessage(to, spec, opts);
 	});
-	const cfg = requireRuntimeConfig(opts.cfg, "Discord component send");
+}
+async function editDiscordComponentMessage(to, messageId, spec, opts) {
+	return await writeDiscordComponentMessage(to, spec, opts, messageId);
+}
+async function writeDiscordComponentMessage(to, spec, opts, messageId) {
+	const creating = messageId === void 0;
+	const cfg = requireRuntimeConfig(opts.cfg, creating ? "Discord component send" : "Discord component edit");
 	const { token, rest, request, account: accountInfo } = createDiscordClient({
 		...opts,
 		cfg
 	});
 	const recipient = await parseAndResolveChannelRecipient(to, cfg, accountInfo.accountId);
 	const { channelId } = await resolveChannelId(rest, recipient, request);
-	const channel = await resolveDiscordChannel(rest, channelId);
-	if (channel && DISCORD_FORUM_LIKE_TYPES.has(channel.type)) throw new Error("Discord components are not supported in forum-style channels");
+	if (creating) {
+		const channel = await resolveDiscordChannel(rest, channelId);
+		if (channel && DISCORD_FORUM_LIKE_TYPES.has(channel.type)) throw new Error("Discord components are not supported in forum-style channels");
+	}
 	const { body: componentBody, buildResult } = await buildDiscordComponentPayload({
 		spec,
 		opts,
 		accountId: accountInfo.accountId
 	});
-	const body = {
+	const body = creating ? {
 		...componentBody,
 		nonce: createDiscordMessageNonce(),
 		enforce_nonce: true
-	};
+	} : componentBody;
 	let result;
 	try {
 		result = await request(async () => {
+			if (messageId !== void 0) return editChannelMessage(rest, channelId, messageId, { body });
 			await opts.onPlatformSendDispatch?.();
 			opts.assertPlatformSendAuthorized?.();
 			return createChannelMessage(rest, channelId, { body });
-		}, "components", { safety: "nonce-protected-create" });
+		}, "components", creating ? { safety: "nonce-protected-create" } : void 0);
 	} catch (err) {
 		throw await buildDiscordSendError(err, {
 			channelId,
@@ -447,50 +443,17 @@ async function sendDiscordComponentMessageInternal(to, spec, opts) {
 			hasMedia: Boolean(opts.mediaUrl)
 		});
 	}
-	const deliveryResult = createDiscordSendResult({
-		result,
+	const toDeliveryResult = () => createDiscordSendResult({
+		result: creating ? result : {
+			id: result.id ?? messageId,
+			channel_id: result.channel_id
+		},
 		fallbackChannelId: channelId,
 		kind: "card",
 		...opts.reply ? { reply: opts.reply } : {}
 	});
-	await opts.onDeliveryResult?.(deliveryResult);
-	await registerBuiltDiscordComponentMessage({
-		buildResult,
-		messageId: result.id,
-		ttlMs: resolveDiscordComponentRegistryTtlMs(accountInfo.config)
-	});
-	recordChannelActivity({
-		channel: "discord",
-		accountId: accountInfo.accountId,
-		direction: "outbound"
-	});
-	return deliveryResult;
-}
-async function editDiscordComponentMessage(to, messageId, spec, opts) {
-	const cfg = requireRuntimeConfig(opts.cfg, "Discord component edit");
-	const { token, rest, request, account: accountInfo } = createDiscordClient({
-		...opts,
-		cfg
-	});
-	const recipient = await parseAndResolveChannelRecipient(to, cfg, accountInfo.accountId);
-	const { channelId } = await resolveChannelId(rest, recipient, request);
-	const { body, buildResult } = await buildDiscordComponentPayload({
-		spec,
-		opts,
-		accountId: accountInfo.accountId
-	});
-	let result;
-	try {
-		result = await request(() => editChannelMessage(rest, channelId, messageId, { body }), "components");
-	} catch (err) {
-		throw await buildDiscordSendError(err, {
-			channelId,
-			cfg,
-			rest,
-			token,
-			hasMedia: Boolean(opts.mediaUrl)
-		});
-	}
+	const deliveryResult = creating ? toDeliveryResult() : void 0;
+	if (deliveryResult) await opts.onDeliveryResult?.(deliveryResult);
 	await registerBuiltDiscordComponentMessage({
 		buildResult,
 		messageId: result.id ?? messageId,
@@ -501,15 +464,7 @@ async function editDiscordComponentMessage(to, messageId, spec, opts) {
 		accountId: accountInfo.accountId,
 		direction: "outbound"
 	});
-	return createDiscordSendResult({
-		result: {
-			id: result.id ?? messageId,
-			channel_id: result.channel_id
-		},
-		fallbackChannelId: channelId,
-		kind: "card",
-		...opts.reply ? { reply: opts.reply } : {}
-	});
+	return deliveryResult ?? toDeliveryResult();
 }
 //#endregion
 export { registerDiscordComponentEntries as a, send_components_exports as i, registerBuiltDiscordComponentMessage as n, resolveDiscordComponentEntryWithPersistence as o, sendDiscordComponentMessage as r, resolveDiscordModalEntryWithPersistence as s, editDiscordComponentMessage as t };

package/dist/.setup/{send.outbound-QTyuFupn.mjs → send.outbound-BISKnb-a.mjs}

@@ -1,7 +1,7 @@
-import { C as withDiscordRequestAuthority, ct as createThread, st as createChannelMessage } from "./discord-BXpHW-cu.mjs";
-import { i as normalizeDiscordHandleKey, o as resolveDiscordDirectoryUserId } from "./directory-live--EGTH0DC.mjs";
-import { c as createDiscordSendReceiptFromResults, d as createReusableDiscordReplyReference, l as createDiscordSendResult } from "./retry-BEYkDy0P.mjs";
-import { A as resolveDiscordSendComponents, D as buildDiscordMessageRequest, K as parseAndResolveChannelRecipient, M as resolveDiscordSuppressEmbeds, N as createDiscordClient, O as createDiscordMessageNonce, a as normalizeDiscordPollInput, c as normalizeStickerIds, f as sendDiscordMedia, j as resolveDiscordSendEmbeds, k as resolveDiscordMessageFlags, l as resolveChannelId, n as buildDiscordTextChunks, p as sendDiscordText, t as buildDiscordSendError, u as resolveDiscordChannel } from "./send.shared-VNvWfX2T.mjs";
+import { C as withDiscordRequestAuthority, ct as createChannelMessage, lt as createThread } from "./discord-0xJYfdDD.mjs";
+import { i as normalizeDiscordHandleKey, o as resolveDiscordDirectoryUserId } from "./directory-live-DtKRHuGV.mjs";
+import { f as createReusableDiscordReplyReference, l as createDiscordSendReceiptFromResults, u as createDiscordSendResult } from "./retry-pz_cSha2.mjs";
+import { A as resolveDiscordSendEmbeds, D as createDiscordMessageNonce, E as buildDiscordMessageRequest, G as parseAndResolveChannelRecipient, M as createDiscordClient, O as resolveDiscordMessageFlags, c as resolveChannelId, d as sendDiscordMedia, f as sendDiscordText, i as normalizeDiscordPollInput, j as resolveDiscordSuppressEmbeds, k as resolveDiscordSendComponents, l as resolveDiscordChannel, n as buildDiscordTextChunks, s as normalizeStickerIds, t as buildDiscordSendError } from "./send.shared-DGFkbkQR.mjs";
 import { ChannelType } from "discord-api-types/v10";
 import { expectDefined } from "openclaw/plugin-sdk/expect-runtime";
 import { normalizeLowercaseStringOrEmpty, normalizeOptionalString, normalizeOptionalStringifiedId } from "openclaw/plugin-sdk/string-coerce-runtime";
@@ -26,25 +26,13 @@ function formatMention(params) {
 	const userId = params.userId == null ? null : normalizeSnowflake(params.userId);
 	const roleId = params.roleId == null ? null : normalizeSnowflake(params.roleId);
 	const channelId = params.channelId == null ? null : normalizeSnowflake(params.channelId);
-	const values = [
-		userId ? {
-			kind: "user",
-			id: userId
-		} : null,
-		roleId ? {
-			kind: "role",
-			id: roleId
-		} : null,
-		channelId ? {
-			kind: "channel",
-			id: channelId
-		} : null
+	const mentions = [
+		userId ? `<@${userId}>` : null,
+		roleId ? `<@&${roleId}>` : null,
+		channelId ? `<#${channelId}>` : null
 	].filter((entry) => Boolean(entry));
-	if (values.length !== 1) throw new Error("formatMention requires exactly one of userId, roleId, or channelId");
-	const target = expectDefined(values.at(0), "single Discord mention target");
-	if (target.kind === "user") return `<@${target.id}>`;
-	if (target.kind === "role") return `<@&${target.id}>`;
-	return `<#${target.id}>`;
+	if (mentions.length !== 1) throw new Error("formatMention requires exactly one of userId, roleId, or channelId");
+	return expectDefined(mentions.at(0), "single Discord mention target");
 }
 function resolveConfiguredMentionAlias(handle, mentionAliases) {
 	const key = normalizeDiscordHandleKey(handle);
@@ -393,23 +381,6 @@ function prepareDiscordOutboundText(text, params) {
 const DEFAULT_DISCORD_MEDIA_MAX_MB = 100;
 /** Discord's ChannelFlags.RequireTag is bit 4 on forum/media parent channels. */
 const DISCORD_FORUM_REQUIRE_TAG_FLAG = 16;
-async function sendDiscordThreadTextChunks(params) {
-	for (const chunk of params.chunks) await sendDiscordText({
-		rest: params.rest,
-		channelId: params.threadId,
-		text: chunk,
-		request: params.request,
-		maxLinesPerMessage: params.maxLinesPerMessage,
-		chunkMode: params.chunkMode,
-		silent: params.silent,
-		suppressEmbeds: params.suppressEmbeds,
-		allowedMentions: params.allowedMentions,
-		maxChars: params.maxChars,
-		onResult: params.onResult,
-		onPlatformSendDispatch: params.onPlatformSendDispatch,
-		assertPlatformSendAuthorized: params.assertPlatformSendAuthorized
-	});
-}
 /** Discord thread names are capped at 100 characters. */
 const DISCORD_THREAD_NAME_LIMIT = 100;
 /** Derive a thread title from the first non-empty line of the message text. */
@@ -421,16 +392,6 @@ function deriveForumThreadName(text) {
 function isForumLikeChannel(channel) {
 	return channel?.type === ChannelType.GuildForum || channel?.type === ChannelType.GuildMedia;
 }
-function toDiscordSendResult(result, fallbackChannelId, params = {}) {
-	const resultParams = {
-		result,
-		fallbackChannelId,
-		kind: params.kind ?? "text"
-	};
-	if (params.threadId != null) resultParams.threadId = params.threadId;
-	if (params.reply) resultParams.reply = params.reply;
-	return createDiscordSendResult(resultParams);
-}
 async function resolveDiscordSendTarget(to, opts) {
 	const cfg = requireRuntimeConfig(opts.cfg, "Discord send target resolution");
 	const { rest, request, account } = createDiscordClient({
@@ -474,7 +435,9 @@ async function sendMessageDiscordInternal(to, text, opts) {
 	const deliveredResults = [];
 	let deliveryThreadId;
 	const reportResult = async (progressResult, kind, replyToId) => {
-		const deliveredResult = toDiscordSendResult(progressResult, deliveryThreadId ?? channelId, {
+		const deliveredResult = createDiscordSendResult({
+			result: progressResult,
+			fallbackChannelId: deliveryThreadId ?? channelId,
 			kind,
 			threadId: deliveryThreadId,
 			reply: createReusableDiscordReplyReference(replyToId)
@@ -482,6 +445,26 @@ async function sendMessageDiscordInternal(to, text, opts) {
 		deliveredResults.push(deliveredResult);
 		await opts.onDeliveryResult?.(deliveredResult);
 	};
+	const textSendOptions = {
+		rest,
+		request,
+		maxLinesPerMessage,
+		chunkMode,
+		silent: opts.silent,
+		suppressEmbeds,
+		allowedMentions: opts.allowedMentions,
+		maxChars: textLimit,
+		onResult: reportResult,
+		onPlatformSendDispatch: opts.onPlatformSendDispatch,
+		assertPlatformSendAuthorized: opts.assertPlatformSendAuthorized
+	};
+	const mediaSendOptions = {
+		filename: opts.filename,
+		mediaAccess: opts.mediaAccess,
+		mediaLocalRoots: opts.mediaLocalRoots,
+		mediaReadFile: opts.mediaReadFile,
+		maxBytes: mediaMaxBytes
+	};
 	if (isForumLikeChannel(channel)) {
 		if (((channel.flags ?? 0) & DISCORD_FORUM_REQUIRE_TAG_FLAG) !== 0) throw new Error(`Discord forum channel ${channelId} requires an applied tag; use thread-create with appliedTags, then send to the created thread.`);
 		const threadName = deriveForumThreadName(renderedText);
@@ -537,68 +520,34 @@ async function sendMessageDiscordInternal(to, text, opts) {
 		const messageId = threadRes.message?.id ?? threadId;
 		const resultChannelId = threadRes.message?.channel_id ?? threadId;
 		const remainingChunks = chunks.slice(1);
-		const starterResult = toDiscordSendResult({
-			id: messageId,
-			channel_id: resultChannelId
-		}, channelId, {
+		const starterResult = createDiscordSendResult({
+			result: {
+				id: messageId,
+				channel_id: resultChannelId
+			},
+			fallbackChannelId: channelId,
 			kind: "text",
 			threadId
 		});
 		deliveredResults.push(starterResult);
 		await opts.onDeliveryResult?.(starterResult);
 		try {
+			let textChunks = remainingChunks;
 			if (opts.mediaUrl) {
 				const [mediaCaption, ...afterMediaChunks] = remainingChunks;
 				await sendDiscordMedia({
-					rest,
+					...textSendOptions,
+					...mediaSendOptions,
 					channelId: threadId,
 					text: mediaCaption ?? "",
-					mediaUrl: opts.mediaUrl,
-					filename: opts.filename,
-					mediaAccess: opts.mediaAccess,
-					mediaLocalRoots: opts.mediaLocalRoots,
-					mediaReadFile: opts.mediaReadFile,
-					maxBytes: mediaMaxBytes,
-					request,
-					maxLinesPerMessage,
-					chunkMode,
-					silent: opts.silent,
-					suppressEmbeds,
-					allowedMentions: opts.allowedMentions,
-					maxChars: textLimit,
-					onResult: reportResult,
-					onPlatformSendDispatch: opts.onPlatformSendDispatch,
-					assertPlatformSendAuthorized: opts.assertPlatformSendAuthorized
-				});
-				await sendDiscordThreadTextChunks({
-					rest,
-					threadId,
-					chunks: afterMediaChunks,
-					request,
-					maxLinesPerMessage,
-					chunkMode,
-					maxChars: textLimit,
-					silent: opts.silent,
-					suppressEmbeds,
-					allowedMentions: opts.allowedMentions,
-					onResult: reportResult,
-					onPlatformSendDispatch: opts.onPlatformSendDispatch,
-					assertPlatformSendAuthorized: opts.assertPlatformSendAuthorized
+					mediaUrl: opts.mediaUrl
 				});
-			} else await sendDiscordThreadTextChunks({
-				rest,
-				threadId,
-				chunks: remainingChunks,
-				request,
-				maxLinesPerMessage,
-				chunkMode,
-				maxChars: textLimit,
-				silent: opts.silent,
-				suppressEmbeds,
-				allowedMentions: opts.allowedMentions,
-				onResult: reportResult,
-				onPlatformSendDispatch: opts.onPlatformSendDispatch,
-				assertPlatformSendAuthorized: opts.assertPlatformSendAuthorized
+				textChunks = afterMediaChunks;
+			}
+			for (const chunk of textChunks) await sendDiscordText({
+				...textSendOptions,
+				channelId: threadId,
+				text: chunk
 			});
 		} catch (err) {
 			throw await buildDiscordSendError(err, {
@@ -624,48 +573,19 @@ async function sendMessageDiscordInternal(to, text, opts) {
 	}
 	let result;
 	try {
-		if (opts.mediaUrl) result = await sendDiscordMedia({
-			rest,
-			channelId,
-			text: textWithMentions,
-			mediaUrl: opts.mediaUrl,
-			filename: opts.filename,
-			mediaAccess: opts.mediaAccess,
-			mediaLocalRoots: opts.mediaLocalRoots,
-			mediaReadFile: opts.mediaReadFile,
-			maxBytes: mediaMaxBytes,
-			reply: opts.reply,
-			request,
-			maxLinesPerMessage,
-			components: opts.components,
-			embeds: opts.embeds,
-			chunkMode,
-			silent: opts.silent,
-			suppressEmbeds,
-			allowedMentions: opts.allowedMentions,
-			maxChars: textLimit,
-			onResult: reportResult,
-			onPlatformSendDispatch: opts.onPlatformSendDispatch,
-			assertPlatformSendAuthorized: opts.assertPlatformSendAuthorized
-		});
-		else result = await sendDiscordText({
-			rest,
+		const message = {
+			...textSendOptions,
 			channelId,
 			text: textWithMentions,
 			reply: opts.reply,
-			request,
-			maxLinesPerMessage,
 			components: opts.components,
-			embeds: opts.embeds,
-			chunkMode,
-			silent: opts.silent,
-			suppressEmbeds,
-			allowedMentions: opts.allowedMentions,
-			maxChars: textLimit,
-			onResult: reportResult,
-			onPlatformSendDispatch: opts.onPlatformSendDispatch,
-			assertPlatformSendAuthorized: opts.assertPlatformSendAuthorized
-		});
+			embeds: opts.embeds
+		};
+		result = opts.mediaUrl ? await sendDiscordMedia({
+			...message,
+			...mediaSendOptions,
+			mediaUrl: opts.mediaUrl
+		}) : await sendDiscordText(message);
 	} catch (err) {
 		throw await buildDiscordSendError(err, {
 			channelId,
@@ -681,7 +601,11 @@ async function sendMessageDiscordInternal(to, text, opts) {
 		direction: "outbound"
 	});
 	return {
-		...toDiscordSendResult(result, channelId),
+		...createDiscordSendResult({
+			result,
+			fallbackChannelId: channelId,
+			kind: "text"
+		}),
 		receipt: createDiscordSendReceiptFromResults({ results: deliveredResults })
 	};
 }
@@ -742,7 +666,9 @@ async function resolveDiscordStructuredSendContext(to, opts) {
 				accountId: accountInfo.accountId,
 				direction: "outbound"
 			});
-			return toDiscordSendResult(result, channelId, {
+			return createDiscordSendResult({
+				result,
+				fallbackChannelId: channelId,
 				kind: kind === "poll" ? "poll" : "card",
 				threadId: kind === "poll" ? opts.threadId : void 0
 			});

package/dist/.setup/{send.shared-VNvWfX2T.mjs → send.shared-DGFkbkQR.mjs}

@@ -1,8 +1,8 @@
-import { A as serializePayload, At as getGuild, g as RequestClient, ht as getThreadMember, j as Embed, jt as getGuildMember, k as hasDiscordV2Components, nt as createUserDmChannel, pt as getChannel, rt as getCurrentUser, st as createChannelMessage } from "./discord-BXpHW-cu.mjs";
-import { t as isDiscordThreadChannelType } from "./channel-type-DKnjV1XW.mjs";
-import { c as resolveDiscordAccount, m as normalizeDiscordToken, o as mergeDiscordAccountConfig } from "./accounts-CwJQoLjM.mjs";
-import { f as resolveDiscordReplyMessageId, o as chunkDiscordTextWithMode, r as createDiscordRetryRunner } from "./retry-BEYkDy0P.mjs";
-import { t as parseAndResolveDiscordTarget } from "./target-resolver-BXpy6VT8.mjs";
+import { A as serializePayload, Mt as getGuildMember, ct as createChannelMessage, g as RequestClient, gt as getThreadMember, it as getCurrentUser, j as Embed, jt as getGuild, k as hasDiscordV2Components, mt as getChannel, rt as createUserDmChannel } from "./discord-0xJYfdDD.mjs";
+import { t as isDiscordThreadChannelType } from "./channel-type-DRCrEMss.mjs";
+import { c as resolveDiscordAccount, m as normalizeDiscordToken, o as mergeDiscordAccountConfig } from "./accounts-ChaMcixG.mjs";
+import { o as chunkDiscordTextWithMode, p as resolveDiscordReplyMessageId, r as createDiscordRetryRunner } from "./retry-pz_cSha2.mjs";
+import { t as parseAndResolveDiscordTarget } from "./target-resolver-BuLapkhy.mjs";
 import { ChannelType, MessageFlags, PermissionFlagsBits } from "discord-api-types/v10";
 import { randomBytes } from "node:crypto";
 import { makeProxyFetch } from "openclaw/plugin-sdk/fetch-runtime";
@@ -55,19 +55,15 @@ const DEFAULT_ACCOUNT_KEY = "\0__default__";
 function resolveAccountKey(accountId) {
 	return accountId ?? DEFAULT_ACCOUNT_KEY;
 }
-/** Register a GatewayPlugin instance for an account. */
 function registerGateway(accountId, gateway) {
 	gatewayRegistry.set(resolveAccountKey(accountId), gateway);
 }
-/** Unregister a GatewayPlugin instance for an account. */
 function unregisterGateway(accountId) {
 	gatewayRegistry.delete(resolveAccountKey(accountId));
 }
-/** Get the GatewayPlugin for an account. Returns undefined if not registered. */
 function getGateway(accountId) {
 	return gatewayRegistry.get(resolveAccountKey(accountId));
 }
-/** Clear all registered gateways (for testing). */
 function clearGateways() {
 	gatewayRegistry.clear();
 }
@@ -78,11 +74,8 @@ function resolveDiscordProxyUrl(account, cfg) {
 	if (accountProxy) return accountProxy;
 	return normalizeOptionalString(cfg?.channels?.discord?.proxy);
 }
-function resolveDiscordProxyFetchByUrl(proxyUrl, runtime) {
-	return withValidatedDiscordProxy(proxyUrl, runtime, (proxy) => makeProxyFetch(proxy));
-}
 function resolveDiscordProxyFetchForAccount(account, cfg, runtime) {
-	return resolveDiscordProxyFetchByUrl(resolveDiscordProxyUrl(account, cfg), runtime);
+	return withValidatedDiscordProxy(resolveDiscordProxyUrl(account, cfg), runtime, makeProxyFetch);
 }
 function withValidatedDiscordProxy(proxyUrl, runtime, createValue) {
 	const proxy = proxyUrl?.trim();
@@ -112,7 +105,6 @@ const DISCORD_REST_TIMEOUT_MS = 15e3;
 function createDiscordRequestClient(token, options) {
 	if (!options?.fetch) return new RequestClient(token, options);
 	return new RequestClient(token, {
-		runtimeProfile: "persistent",
 		maxQueueSize: 1e3,
 		timeout: DISCORD_REST_TIMEOUT_MS,
 		...options,
@@ -224,13 +216,9 @@ function resolveDiscordSendComponents(params) {
 	if (!params.components || !params.isFirst) return;
 	return typeof params.components === "function" ? params.components(params.text) : params.components;
 }
-function normalizeDiscordEmbeds(embeds) {
-	if (!embeds?.length) return;
-	return embeds.map((embed) => embed instanceof Embed ? embed : new Embed(embed));
-}
 function resolveDiscordSendEmbeds(params) {
-	if (!params.embeds || !params.isFirst) return;
-	return normalizeDiscordEmbeds(params.embeds);
+	if (!params.embeds?.length || !params.isFirst) return;
+	return params.embeds.map((embed) => embed instanceof Embed ? embed : new Embed(embed));
 }
 function buildDiscordMessagePayload(params) {
 	const payload = {};
@@ -294,7 +282,7 @@ async function fetchBotUserId(rest) {
 	return me.id;
 }
 function resolveMemberGuildPermissionBits(params) {
-	const rolesByIdLocal = new Map((params.guild.roles ?? []).map((role) => [role.id, role]));
+	const rolesByIdLocal = rolesById(params.guild);
 	const everyoneRole = rolesByIdLocal.get(params.guild.id);
 	let permissions = 0n;
 	if (everyoneRole?.permissions) permissions = addPermissionBits(permissions, everyoneRole.permissions);
@@ -736,8 +724,5 @@ function buildReactionIdentifier(emoji) {
 	if (emoji.id && emoji.name) return `${emoji.name}:${emoji.id}`;
 	return emoji.name ?? "";
 }
-function formatReactionEmoji(emoji) {
-	return buildReactionIdentifier(emoji);
-}
 //#endregion
-export { resolveDiscordSendComponents as A, validateDiscordProxyUrl as B, hasAllGuildPermissionsDiscord as C, buildDiscordMessageRequest as D, SUPPRESS_NOTIFICATIONS_FLAG as E, createDiscordRuntimeAccountContext as F, unregisterGateway as G, clearGateways as H, resolveDiscordClientAccountContext as I, parseAndResolveChannelRecipient as K, resolveDiscordRest as L, resolveDiscordSuppressEmbeds as M, createDiscordClient as N, createDiscordMessageNonce as O, createDiscordRestClient as P, DISCORD_REST_TIMEOUT_MS as R, fetchMemberGuildPermissionsDiscord as S, hasAnyGuildPermissionDiscord as T, getGateway as U, withValidatedDiscordProxy as V, registerGateway as W, DiscordSendError as _, normalizeDiscordPollInput as a, canViewDiscordGuildChannel as b, normalizeStickerIds as c, resolveDiscordTargetChannelId as d, sendDiscordMedia as f, DISCORD_MAX_STICKER_BYTES as g, DISCORD_MAX_EVENT_COVER_BYTES as h, formatReactionEmoji as i, resolveDiscordSendEmbeds as j, resolveDiscordMessageFlags as k, resolveChannelId as l, DISCORD_MAX_EMOJI_BYTES as m, buildDiscordTextChunks as n, normalizeEmojiName as o, sendDiscordText as p, buildReactionIdentifier as r, normalizeReactionEmoji as s, buildDiscordSendError as t, resolveDiscordChannel as u, canManageGuildMemberRoleDiscord as v, hasAnyChannelPermissionDiscord as w, fetchChannelPermissionsDiscord as x, canManageGuildRoleDiscord as y, resolveDiscordProxyFetchForAccount as z };
+export { resolveDiscordSendEmbeds as A, withValidatedDiscordProxy as B, hasAnyChannelPermissionDiscord as C, createDiscordMessageNonce as D, buildDiscordMessageRequest as E, resolveDiscordClientAccountContext as F, parseAndResolveChannelRecipient as G, getGateway as H, resolveDiscordRest as I, DISCORD_REST_TIMEOUT_MS as L, createDiscordClient as M, createDiscordRestClient as N, resolveDiscordMessageFlags as O, createDiscordRuntimeAccountContext as P, resolveDiscordProxyFetchForAccount as R, hasAllGuildPermissionsDiscord as S, SUPPRESS_NOTIFICATIONS_FLAG as T, registerGateway as U, clearGateways as V, unregisterGateway as W, canManageGuildMemberRoleDiscord as _, normalizeEmojiName as a, fetchChannelPermissionsDiscord as b, resolveChannelId as c, sendDiscordMedia as d, sendDiscordText as f, DiscordSendError as g, DISCORD_MAX_STICKER_BYTES as h, normalizeDiscordPollInput as i, resolveDiscordSuppressEmbeds as j, resolveDiscordSendComponents as k, resolveDiscordChannel as l, DISCORD_MAX_EVENT_COVER_BYTES as m, buildDiscordTextChunks as n, normalizeReactionEmoji as o, DISCORD_MAX_EMOJI_BYTES as p, buildReactionIdentifier as r, normalizeStickerIds as s, buildDiscordSendError as t, resolveDiscordTargetChannelId as u, canManageGuildRoleDiscord as v, hasAnyGuildPermissionDiscord as w, fetchMemberGuildPermissionsDiscord as x, canViewDiscordGuildChannel as y, validateDiscordProxyUrl as z };

package/dist/.setup/{sender-identity-0Ymgvmaj.mjs → sender-identity-B9X5Vb9R.mjs}

@@ -1,9 +1,8 @@
-import { x as formatDiscordUserTag } from "./channel-type-DKnjV1XW.mjs";
+import { S as formatDiscordUserTag } from "./channel-type-DRCrEMss.mjs";
 import { normalizeOptionalString } from "openclaw/plugin-sdk/string-coerce-runtime";
 //#region extensions/discord/src/monitor/sender-identity.ts
 function resolveDiscordWebhookId(message) {
-	const candidate = message.webhookId ?? message.webhook_id;
-	return typeof candidate === "string" && candidate.trim() ? candidate.trim() : null;
+	return normalizeOptionalString(message.webhookId ?? message.webhook_id) ?? null;
 }
 function resolveDiscordSenderIdentity(params) {
 	const pkInfo = params.pluralkitInfo ?? null;

package/dist/.setup/setup-plugin-api-BQUBxbhe.mjs

@@ -0,0 +1,3 @@
+import { t as discordSetupPlugin } from "./channel.setup-CRo1GjV7.mjs";
+import "../setup-plugin-api.js";
+export { discordSetupPlugin };