@openclaw/discord 2026.10.2 → 2026.10.5-beta.2

package/dist/.setup/{send.outbound-rOboMO_6.mjs → send.outbound-_jx4Xpd3.mjs}

@@ -1,9 +1,9 @@
-import { A as resolveDiscordSendEmbeds, D as createDiscordMessageNonce, E as buildDiscordMessageRequest, M as parseAndResolveChannelRecipient, N 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-C4CN24D9.mjs";
-import { C as withDiscordRequestAuthority, st as createThread } from "./discord-9gysrhzp.mjs";
-import { a as createReusableDiscordReplyReference, n as createDiscordSendReceiptFromResults, r as createDiscordSendResult } from "./send.receipt-DVOg2Oaw.mjs";
-import { a as normalizeDiscordSnowflake, i as normalizeDiscordHandleKey, s as resolveDiscordDirectoryUserId } from "./directory-live-Bipr0eUJ.mjs";
-import { normalizeLowercaseStringOrEmpty, normalizeOptionalString } from "openclaw/plugin-sdk/string-coerce-runtime";
-import { ChannelType, Routes } from "discord-api-types/v10";
+import { A as resolveDiscordSendEmbeds, D as createDiscordMessageNonce, E as buildDiscordMessageRequest, M as parseAndResolveChannelRecipient, N as createDiscordClient, O as resolveDiscordMessageFlags, c as resolveChannelId, d as sendDiscordChunks, f as sendDiscordMedia, i as normalizeDiscordPollInput, j as resolveDiscordSuppressEmbeds, k as resolveDiscordSendComponents, l as resolveDiscordChannel, n as buildDiscordTextChunks, s as normalizeStickerIds, t as buildDiscordSendError } from "./send.shared-CjQ4jbMA.mjs";
+import { W as withDiscordRequestAuthority, ct as createThread, st as createChannelMessage } from "./discord-BGqgx-yd.mjs";
+import { a as createReusableDiscordReplyReference, n as createDiscordSendReceiptFromResults, r as createDiscordSendResult } from "./send.receipt-BAlzXd8e.mjs";
+import { a as normalizeDiscordSnowflake, i as normalizeDiscordHandleKey, s as resolveDiscordDirectoryUserId } from "./directory-live-DLygQVtW.mjs";
+import { normalizeOptionalString } from "openclaw/plugin-sdk/string-coerce-runtime";
+import { ChannelType } from "discord-api-types/v10";
 import { requireRuntimeConfig } from "openclaw/plugin-sdk/plugin-config-runtime";
 import { expectDefined } from "openclaw/plugin-sdk/expect-runtime";
 import { resolveChunkMode } from "openclaw/plugin-sdk/reply-chunking";
@@ -37,25 +37,22 @@ function resolveConfiguredMentionAlias(handle, mentionAliases) {
 		const alias = normalizeDiscordHandleKey(rawAlias);
 		if (!alias) continue;
 		const aliasWithoutDiscriminator = alias.replace(DISCORD_DISCRIMINATOR_SUFFIX, "");
-		if (alias === key || withoutDiscriminator && withoutDiscriminator !== key && alias === withoutDiscriminator || aliasWithoutDiscriminator && aliasWithoutDiscriminator !== alias && aliasWithoutDiscriminator === key) {
+		if (alias === key || alias === withoutDiscriminator || aliasWithoutDiscriminator === key) {
 			const userId = normalizeDiscordSnowflake(rawUserId);
 			if (userId) return userId;
 		}
 	}
 }
 function rewritePlainTextMentions(text, params) {
-	if (!text.includes("@")) return text;
-	return text.replace(MENTION_CANDIDATE_PATTERN, (match, prefix, rawHandle) => {
-		const handle = normalizeOptionalString(rawHandle) ?? "";
-		if (!handle) return match;
-		const lookup = normalizeLowercaseStringOrEmpty(handle);
+	return text.replace(MENTION_CANDIDATE_PATTERN, (match, prefix, handle) => {
+		const lookup = handle.toLowerCase();
 		if (DISCORD_RESERVED_MENTIONS.has(lookup)) return match;
 		const userId = resolveConfiguredMentionAlias(handle, params.mentionAliases) ?? resolveDiscordDirectoryUserId({
 			accountId: params.accountId,
 			handle
 		});
 		if (!userId) return match;
-		return `${String(prefix ?? "")}${formatMention({ userId })}`;
+		return `${prefix}${formatMention({ userId })}`;
 	});
 }
 function countBacktickRun(text, index) {
@@ -118,7 +115,6 @@ function findDiscordUrlRanges(markdown) {
 	const ranges = [];
 	for (const match of markdown.matchAll(DISCORD_URL_START_RE)) {
 		const start = match.index;
-		if (start === void 0) continue;
 		const preceding = markdown[start - 1] ?? "";
 		if (/[\p{L}\p{N}]/u.test(preceding) || preceding === "_" && markdown[start - 2] !== "_") continue;
 		let end = start + match[0].length;
@@ -146,17 +142,15 @@ function markdownSemanticSignature(root) {
 		node: root,
 		parentStrong: false
 	}];
-	while (pending.length > 0) {
-		const event = pending.pop();
-		if (!event) continue;
+	for (let event = pending.pop(); event; event = pending.pop()) {
 		if (event.exiting) {
 			parts.push(")");
 			continue;
 		}
 		const { node } = event;
 		const redundantStrong = event.parentStrong && node.type === "strong";
-		const fields = Object.fromEntries(Object.entries(node).filter(([key]) => key !== "children" && key !== "position"));
-		const children = node.children ?? [];
+		const { children: childNodes, position: _position, ...fields } = node;
+		const children = childNodes ?? [];
 		if (!redundantStrong) {
 			parts.push(`(${JSON.stringify(fields)}`);
 			pending.push({
@@ -185,9 +179,7 @@ function normalizeDiscordBold(markdown) {
 	const sourceTree = fromMarkdown(markdown);
 	const activeSpanIds = [];
 	const pending = [{ node: sourceTree }];
-	while (pending.length > 0) {
-		const event = pending.pop();
-		if (!event) continue;
+	for (let event = pending.pop(); event; event = pending.pop()) {
 		if (event.exiting !== void 0) {
 			activeSpanIds.pop();
 			continue;
@@ -268,10 +260,10 @@ function normalizeDiscordBold(markdown) {
 		const interiorStart = span.start + 2;
 		strongInteriorStartByEnd.set(span.end, Math.min(strongInteriorStartByEnd.get(span.end) ?? interiorStart, interiorStart));
 	}
-	const nativeTokenRanges = [...markdown.matchAll(DISCORD_NATIVE_TOKEN_RE)].flatMap((match) => match.index === void 0 ? [] : [{
+	const nativeTokenRanges = [...markdown.matchAll(DISCORD_NATIVE_TOKEN_RE)].map((match) => ({
 		start: match.index,
 		end: match.index + match[0].length
-	}]);
+	}));
 	const protectedRanges = [
 		...findDiscordUrlRanges(markdown),
 		...astLinkRanges,
@@ -303,9 +295,9 @@ function normalizeDiscordBold(markdown) {
 	}))), ...contentEdits].toSorted((left, right) => left.start - right.start);
 	const editsBySpan = /* @__PURE__ */ new Map();
 	for (const edit of edits) {
-		const spanEdits = editsBySpan.get(edit.spanId);
-		if (spanEdits) spanEdits.push(edit);
-		else editsBySpan.set(edit.spanId, [edit]);
+		const spanEdits = editsBySpan.get(edit.spanId) ?? [];
+		spanEdits.push(edit);
+		editsBySpan.set(edit.spanId, spanEdits);
 	}
 	const renderEdits = (selectedEdits, start = 0, end = markdown.length) => {
 		let cursor = start;
@@ -388,96 +380,105 @@ function isForumLikeChannel(channel) {
 	return channel?.type === ChannelType.GuildForum || channel?.type === ChannelType.GuildMedia;
 }
 async function sendMessageDiscord(to, text, opts) {
-	return await withDiscordRequestAuthority(opts.assertPlatformSendAuthorized, () => sendMessageDiscordInternal(to, text, opts));
-}
-async function sendMessageDiscordInternal(to, text, opts) {
-	const cfg = requireRuntimeConfig(opts.cfg, "Discord send");
-	const { token, rest, request, account: accountInfo } = createDiscordClient({
-		...opts,
-		cfg
-	});
-	const chunkMode = opts.chunkMode ?? resolveChunkMode(cfg, "discord", accountInfo.accountId);
-	const maxLinesPerMessage = opts.maxLinesPerMessage ?? accountInfo.config.maxLinesPerMessage;
-	const suppressEmbeds = resolveDiscordSuppressEmbeds({
-		configured: accountInfo.config.suppressEmbeds,
-		override: opts.suppressEmbeds
-	});
-	const mediaMaxBytes = typeof accountInfo.config.mediaMaxMb === "number" ? accountInfo.config.mediaMaxMb * 1024 * 1024 : DEFAULT_DISCORD_MEDIA_MAX_MB * 1024 * 1024;
-	const { renderedText, textWithMentions, textLimit } = prepareDiscordOutboundText(text ?? "", {
-		cfg,
-		account: accountInfo,
-		tableMode: opts.tableMode,
-		textLimit: opts.textLimit
-	});
-	const recipient = await parseAndResolveChannelRecipient(to, cfg, accountInfo.accountId);
-	const { channelId } = await resolveChannelId(rest, recipient, request);
-	const channel = await resolveDiscordChannel(rest, channelId);
-	const deliveredResults = [];
-	let deliveryThreadId;
-	const reportResult = async (progressResult, kind, replyToId) => {
-		const deliveredResult = createDiscordSendResult({
-			result: progressResult,
-			fallbackChannelId: deliveryThreadId ?? channelId,
-			kind,
-			threadId: deliveryThreadId,
-			reply: createReusableDiscordReplyReference(replyToId)
-		});
-		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);
-		const chunks = buildDiscordTextChunks(textWithMentions, {
-			maxLinesPerMessage,
-			chunkMode,
-			maxChars: textLimit
+	return await withDiscordRequestAuthority(opts.assertPlatformSendAuthorized, async () => {
+		const cfg = requireRuntimeConfig(opts.cfg, "Discord send");
+		const { token, rest, request, account: accountInfo } = createDiscordClient({
+			...opts,
+			cfg
 		});
-		const starterContent = chunks[0]?.trim() ? chunks[0] : threadName;
-		const starterComponents = resolveDiscordSendComponents({
-			components: opts.components,
-			text: starterContent,
-			isFirst: true
+		const chunkMode = opts.chunkMode ?? resolveChunkMode(cfg, "discord", accountInfo.accountId);
+		const maxLinesPerMessage = opts.maxLinesPerMessage ?? accountInfo.config.maxLinesPerMessage;
+		const suppressEmbeds = resolveDiscordSuppressEmbeds({
+			configured: accountInfo.config.suppressEmbeds,
+			override: opts.suppressEmbeds
 		});
-		const starterEmbeds = resolveDiscordSendEmbeds({
-			embeds: opts.embeds,
-			isFirst: true
+		const mediaMaxBytes = typeof accountInfo.config.mediaMaxMb === "number" ? accountInfo.config.mediaMaxMb * 1024 * 1024 : DEFAULT_DISCORD_MEDIA_MAX_MB * 1024 * 1024;
+		const { renderedText, textWithMentions, textLimit } = prepareDiscordOutboundText(text ?? "", {
+			cfg,
+			account: accountInfo,
+			tableMode: opts.tableMode,
+			textLimit: opts.textLimit
 		});
-		const starterFlags = resolveDiscordMessageFlags({
+		const recipient = await parseAndResolveChannelRecipient(to, cfg, accountInfo.accountId);
+		const { channelId } = await resolveChannelId(rest, recipient, request);
+		const channel = await resolveDiscordChannel(rest, channelId);
+		const deliveredResults = [];
+		let deliveryThreadId;
+		const reportResult = async (progressResult, kind, replyToId) => {
+			const deliveredResult = createDiscordSendResult({
+				result: progressResult,
+				fallbackChannelId: deliveryThreadId ?? channelId,
+				kind,
+				threadId: deliveryThreadId,
+				reply: createReusableDiscordReplyReference(replyToId)
+			});
+			deliveredResults.push(deliveredResult);
+			await opts.onDeliveryResult?.(deliveredResult);
+		};
+		const textSendOptions = {
+			rest,
+			request,
+			maxLinesPerMessage,
+			chunkMode,
 			silent: opts.silent,
-			suppressEmbeds: suppressEmbeds && !starterEmbeds?.length
-		});
-		const starterBody = buildDiscordMessageRequest({
-			endpoint: "forum-thread",
-			text: starterContent,
-			components: starterComponents,
-			embeds: starterEmbeds,
-			flags: starterFlags,
-			allowedMentions: opts.allowedMentions
-		});
-		let threadRes;
-		try {
-			threadRes = await request(async () => {
+			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
+		};
+		async function sendWithError(targetChannelId, send) {
+			try {
+				return await send();
+			} catch (err) {
+				throw await buildDiscordSendError(err, {
+					channelId: targetChannelId,
+					cfg,
+					rest,
+					token,
+					hasMedia: Boolean(opts.mediaUrl)
+				});
+			}
+		}
+		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);
+			const chunks = buildDiscordTextChunks(textWithMentions, {
+				maxLinesPerMessage,
+				chunkMode,
+				maxChars: textLimit
+			});
+			const starterContent = chunks[0]?.trim() ? chunks[0] : threadName;
+			const starterComponents = resolveDiscordSendComponents({
+				components: opts.components,
+				text: starterContent,
+				isFirst: true
+			});
+			const starterEmbeds = resolveDiscordSendEmbeds({
+				embeds: opts.embeds,
+				isFirst: true
+			});
+			const starterFlags = resolveDiscordMessageFlags({
+				silent: opts.silent,
+				suppressEmbeds: suppressEmbeds && !starterEmbeds?.length
+			});
+			const starterBody = buildDiscordMessageRequest({
+				endpoint: "forum-thread",
+				text: starterContent,
+				components: starterComponents,
+				embeds: starterEmbeds,
+				flags: starterFlags,
+				allowedMentions: opts.allowedMentions
+			});
+			const threadRes = await sendWithError(channelId, () => request(async () => {
 				await opts.onPlatformSendDispatch?.();
 				opts.assertPlatformSendAuthorized?.();
 				return createThread(rest, channelId, { body: {
@@ -485,109 +486,84 @@ async function sendMessageDiscordInternal(to, text, opts) {
 					...channel.default_auto_archive_duration === void 0 ? {} : { auto_archive_duration: channel.default_auto_archive_duration },
 					message: starterBody
 				} });
-			}, "forum-thread", { safety: "non-idempotent-create" });
-		} catch (err) {
-			throw await buildDiscordSendError(err, {
-				channelId,
-				cfg,
-				rest,
-				token,
-				hasMedia: Boolean(opts.mediaUrl)
+			}, "forum-thread", { safety: "non-idempotent-create" }));
+			const threadId = threadRes.id;
+			deliveryThreadId = threadId;
+			const messageId = threadRes.message?.id ?? threadId;
+			const resultChannelId = threadRes.message?.channel_id ?? threadId;
+			const remainingChunks = chunks.slice(1);
+			const starterResult = createDiscordSendResult({
+				result: {
+					id: messageId,
+					channel_id: resultChannelId
+				},
+				fallbackChannelId: channelId,
+				kind: "text",
+				threadId
 			});
-		}
-		const threadId = threadRes.id;
-		deliveryThreadId = threadId;
-		const messageId = threadRes.message?.id ?? threadId;
-		const resultChannelId = threadRes.message?.channel_id ?? threadId;
-		const remainingChunks = chunks.slice(1);
-		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({
+			deliveredResults.push(starterResult);
+			await opts.onDeliveryResult?.(starterResult);
+			await sendWithError(threadId, async () => {
+				let textChunks = remainingChunks;
+				if (opts.mediaUrl) {
+					const [mediaCaption, ...afterMediaChunks] = remainingChunks;
+					await sendDiscordMedia({
+						...textSendOptions,
+						...mediaSendOptions,
+						channelId: threadId,
+						text: mediaCaption ?? "",
+						mediaUrl: opts.mediaUrl
+					});
+					textChunks = afterMediaChunks;
+				}
+				for (const chunk of textChunks) await sendDiscordChunks({
 					...textSendOptions,
-					...mediaSendOptions,
 					channelId: threadId,
-					text: mediaCaption ?? "",
-					mediaUrl: opts.mediaUrl
+					text: chunk
 				});
-				textChunks = afterMediaChunks;
-			}
-			for (const chunk of textChunks) await sendDiscordText({
-				...textSendOptions,
-				channelId: threadId,
-				text: chunk
 			});
-		} catch (err) {
-			throw await buildDiscordSendError(err, {
-				channelId: threadId,
-				cfg,
-				rest,
-				token,
-				hasMedia: Boolean(opts.mediaUrl)
+			recordChannelActivity({
+				channel: "discord",
+				accountId: accountInfo.accountId,
+				direction: "outbound"
 			});
+			return {
+				...starterResult,
+				receipt: createDiscordSendReceiptFromResults({
+					results: deliveredResults,
+					threadId
+				})
+			};
 		}
+		const result = await sendWithError(channelId, async () => {
+			const message = {
+				...textSendOptions,
+				channelId,
+				text: textWithMentions,
+				reply: opts.reply,
+				components: opts.components,
+				embeds: opts.embeds
+			};
+			return opts.mediaUrl ? await sendDiscordMedia({
+				...message,
+				...mediaSendOptions,
+				mediaUrl: opts.mediaUrl
+			}) : await sendDiscordChunks(message);
+		});
 		recordChannelActivity({
 			channel: "discord",
 			accountId: accountInfo.accountId,
 			direction: "outbound"
 		});
 		return {
-			...starterResult,
-			receipt: createDiscordSendReceiptFromResults({
-				results: deliveredResults,
-				threadId
-			})
+			...createDiscordSendResult({
+				result,
+				fallbackChannelId: channelId,
+				kind: "text"
+			}),
+			receipt: createDiscordSendReceiptFromResults({ results: deliveredResults })
 		};
-	}
-	let result;
-	try {
-		const message = {
-			...textSendOptions,
-			channelId,
-			text: textWithMentions,
-			reply: opts.reply,
-			components: opts.components,
-			embeds: opts.embeds
-		};
-		result = opts.mediaUrl ? await sendDiscordMedia({
-			...message,
-			...mediaSendOptions,
-			mediaUrl: opts.mediaUrl
-		}) : await sendDiscordText(message);
-	} catch (err) {
-		throw await buildDiscordSendError(err, {
-			channelId,
-			cfg,
-			rest,
-			token,
-			hasMedia: Boolean(opts.mediaUrl)
-		});
-	}
-	recordChannelActivity({
-		channel: "discord",
-		accountId: accountInfo.accountId,
-		direction: "outbound"
 	});
-	return {
-		...createDiscordSendResult({
-			result,
-			fallbackChannelId: channelId,
-			kind: "text"
-		}),
-		receipt: createDiscordSendReceiptFromResults({ results: deliveredResults })
-	};
 }
 async function sendStickerDiscord(to, stickerIds, opts) {
 	return sendDiscordStructuredMessage(to, opts, "sticker", () => ({ sticker_ids: normalizeStickerIds(stickerIds) }));
@@ -630,7 +606,7 @@ async function sendDiscordStructuredMessage(to, opts, kind, buildPayload) {
 		const result = await request(async () => {
 			await opts.onPlatformSendDispatch?.();
 			opts.assertPlatformSendAuthorized?.();
-			return await rest.post(Routes.channelMessages(channelId), { body });
+			return createChannelMessage(rest, channelId, { body });
 		}, kind, { safety: "nonce-protected-create" });
 		recordChannelActivity({
 			channel: "discord",