@openclaw/discord 2026.8.1-beta.2 → 2026.8.1

package/dist/{send.components-iJyFXw9L.js → send.components-CrBJpGT_.js}

@@ -1,30 +1,17 @@
-import { H as serializePayload, ft as stripUndefinedFields, tn as __exportAll, wt as editChannelMessage, yt as createChannelMessage } from "./retry-CLpJcXXf.js";
-import { s as resolveDiscordAccount } from "./accounts-DJTf1LtA.js";
-import { f as buildDiscordComponentMessage, g as resolveDiscordComponentAttachmentName, p as buildDiscordComponentMessageFlags } from "./outbound-session-route-DxLkrgKQ.js";
-import { P as createDiscordClient, W as parseAndResolveChannelRecipient, g as createDiscordMessageNonce, l as resolveChannelId, m as SUPPRESS_NOTIFICATIONS_FLAG, t as buildDiscordSendError, u as resolveDiscordChannel } from "./send.shared-BmwFjW6T.js";
+import { c as createDiscordSendResult, kt as editChannelMessage, on as __exportAll, q as serializePayload, wt as createChannelMessage } from "./retry-DqHCW6PV.js";
+import { d as buildDiscordComponentMessage, f as buildDiscordComponentMessageFlags, g as resolveDiscordComponentAttachmentName } from "./components-Dk35LTf_.js";
 import { n as getOptionalDiscordRuntime } from "./runtime-DgnVQ7zW.js";
-import "./config-schema-BgEskFAs.js";
-import "./channel-api-CAJ0wMoV.js";
-import { t as sendMessageDiscord } from "./send.outbound-DS5tHwfR.js";
-import { r as createDiscordSendResult } from "./send.receipt-IPI1p-SP.js";
-import "openclaw/plugin-sdk/account-helpers";
-import "openclaw/plugin-sdk/account-id";
-import "openclaw/plugin-sdk/channel-config-helpers";
-import "openclaw/plugin-sdk/routing";
-import { uniqueStrings } from "openclaw/plugin-sdk/string-coerce-runtime";
-import "openclaw/plugin-sdk/secret-input";
+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-DZJ1akvQ.js";
+import { t as sendMessageDiscord } from "./send.outbound-D7JYmfm9.js";
 import { ChannelType } from "discord-api-types/v10";
 import { asDateTimestampMs, isFutureDateTimestampMs, resolveDateTimestampMs, resolveExpiresAtMsFromDurationMs } from "openclaw/plugin-sdk/number-runtime";
-import { assertMediaNotDataUrl, jsonResult as jsonResult$1, parseAvailableTags, readNonNegativeIntegerParam, readPositiveIntegerParam, readReactionParams, readStringArrayParam, readStringParam as readStringParam$1, resolvePollMaxSelections, withNormalizedTimestamp } from "openclaw/plugin-sdk/channel-actions";
+import { uniqueStrings } from "openclaw/plugin-sdk/string-coerce-runtime";
 import { recordChannelActivity } from "openclaw/plugin-sdk/channel-activity-runtime";
+import { extensionForMime } from "openclaw/plugin-sdk/media-mime";
+import { loadOutboundMediaFromUrl } from "openclaw/plugin-sdk/outbound-media";
 import { requireRuntimeConfig } from "openclaw/plugin-sdk/plugin-config-runtime";
 import { createPluginStateErrorReporter } from "openclaw/plugin-sdk/plugin-state-runtime";
 import { resolveGlobalSingleton } from "openclaw/plugin-sdk/global-singleton";
-import "openclaw/plugin-sdk/channel-status";
-import "openclaw/plugin-sdk/channel-config-schema";
-import { readBooleanParam as readBooleanParam$1 } from "openclaw/plugin-sdk/boolean-param";
-import "openclaw/plugin-sdk/channel-plugin-common";
-import { loadOutboundMediaFromUrl } from "openclaw/plugin-sdk/outbound-media";
 //#region extensions/discord/src/components-registry-state.ts
 const discordComponentRegistryState = resolveGlobalSingleton(Symbol.for("openclaw.discord.componentRegistryState"), () => ({
 	componentEntries: /* @__PURE__ */ new Map(),
@@ -374,7 +361,9 @@ async function buildDiscordComponentPayload(params) {
 			mediaLocalRoots: params.opts.mediaLocalRoots,
 			mediaReadFile: params.opts.mediaReadFile
 		});
-		resolvedFileName = params.opts.filename?.trim() || media.fileName || "upload";
+		const filenameOverride = params.opts.filename?.trim();
+		const explicitAttachmentName = extractComponentAttachmentNames(spec)[0];
+		resolvedFileName = filenameOverride || explicitAttachmentName || media.fileName || `upload${extensionForMime(media.contentType) ?? ""}`;
 		spec = withImplicitComponentAttachmentBlock(spec, resolvedFileName);
 		files = [{
 			data: media.buffer,
@@ -396,7 +385,7 @@ async function buildDiscordComponentPayload(params) {
 	const flags = buildDiscordComponentMessageFlags(buildResult.components);
 	const finalFlags = params.opts.silent ? (flags ?? 0) | SUPPRESS_NOTIFICATIONS_FLAG : flags ?? void 0;
 	return {
-		body: stripUndefinedFields({
+		body: {
 			...serializePayload({
 				components: buildResult.components,
 				allowed_mentions: params.opts.allowedMentions,
@@ -404,7 +393,7 @@ async function buildDiscordComponentPayload(params) {
 				...files ? { files } : {}
 			}),
 			...messageReference ? { message_reference: messageReference } : {}
-		}),
+		},
 		buildResult
 	};
 }
@@ -416,7 +405,7 @@ async function sendDiscordComponentMessage(to, spec, opts) {
 		token: opts.token,
 		rest: opts.rest,
 		mediaUrl: opts.mediaUrl,
-		filename: opts.filename,
+		filename: opts.filename?.trim() || extractComponentAttachmentNames(spec)[0],
 		mediaLocalRoots: opts.mediaLocalRoots,
 		mediaReadFile: opts.mediaReadFile,
 		mediaAccess: opts.mediaAccess,
@@ -431,15 +420,11 @@ async function sendDiscordComponentMessage(to, spec, opts) {
 		...opts.suppressEmbeds === void 0 ? {} : { suppressEmbeds: opts.suppressEmbeds }
 	});
 	const cfg = requireRuntimeConfig(opts.cfg, "Discord component send");
-	const accountInfo = resolveDiscordAccount({
-		cfg,
-		accountId: opts.accountId
-	});
-	const { token, rest, request } = createDiscordClient({
+	const { token, rest, request, account: accountInfo } = createDiscordClient({
 		...opts,
 		cfg
 	});
-	const { channelId } = await resolveChannelId(rest, await parseAndResolveChannelRecipient(to, cfg, opts.accountId), request);
+	const { channelId } = await resolveChannelId(rest, await parseAndResolveChannelRecipient(to, cfg, accountInfo.accountId), 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");
 	const { body: componentBody, buildResult } = await buildDiscordComponentPayload({
@@ -454,8 +439,10 @@ async function sendDiscordComponentMessage(to, spec, opts) {
 	};
 	let result;
 	try {
-		await opts.onPlatformSendDispatch?.();
-		result = await request(() => createChannelMessage(rest, channelId, { body }), "components", { safety: "nonce-protected-create" });
+		result = await request(async () => {
+			await opts.onPlatformSendDispatch?.();
+			return createChannelMessage(rest, channelId, { body });
+		}, "components", { safety: "nonce-protected-create" });
 	} catch (err) {
 		throw await buildDiscordSendError(err, {
 			channelId,
@@ -486,15 +473,11 @@ async function sendDiscordComponentMessage(to, spec, opts) {
 }
 async function editDiscordComponentMessage(to, messageId, spec, opts) {
 	const cfg = requireRuntimeConfig(opts.cfg, "Discord component edit");
-	const accountInfo = resolveDiscordAccount({
-		cfg,
-		accountId: opts.accountId
-	});
-	const { token, rest, request } = createDiscordClient({
+	const { token, rest, request, account: accountInfo } = createDiscordClient({
 		...opts,
 		cfg
 	});
-	const { channelId } = await resolveChannelId(rest, await parseAndResolveChannelRecipient(to, cfg, opts.accountId), request);
+	const { channelId } = await resolveChannelId(rest, await parseAndResolveChannelRecipient(to, cfg, accountInfo.accountId), request);
 	const { body, buildResult } = await buildDiscordComponentPayload({
 		spec,
 		opts,
@@ -533,4 +516,4 @@ async function editDiscordComponentMessage(to, messageId, spec, opts) {
 	});
 }
 //#endregion
-export { resolveDiscordModalEntryWithPersistence as _, assertMediaNotDataUrl as a, readBooleanParam$1 as c, readReactionParams as d, readStringArrayParam as f, resolveDiscordComponentEntryWithPersistence as g, withNormalizedTimestamp as h, send_components_exports as i, readNonNegativeIntegerParam as l, resolvePollMaxSelections as m, registerBuiltDiscordComponentMessage as n, jsonResult$1 as o, readStringParam$1 as p, sendDiscordComponentMessage as r, parseAvailableTags as s, editDiscordComponentMessage as t, readPositiveIntegerParam as u };
+export { resolveDiscordComponentEntryWithPersistence as a, send_components_exports as i, registerBuiltDiscordComponentMessage as n, resolveDiscordModalEntryWithPersistence as o, sendDiscordComponentMessage as r, editDiscordComponentMessage as t };

package/dist/{send.outbound-DS5tHwfR.js → send.outbound-D7JYmfm9.js}

@@ -1,14 +1,12 @@
-import { bt as createThread, o as createReusableDiscordReplyReference, yt as createChannelMessage } from "./retry-CLpJcXXf.js";
-import { s as resolveDiscordAccount } from "./accounts-DJTf1LtA.js";
-import { P as createDiscordClient, W as parseAndResolveChannelRecipient, _ as resolveDiscordMessageFlags, a as normalizeDiscordPollInput, b as resolveDiscordSuppressEmbeds, c as normalizeStickerIds, f as sendDiscordMedia, g as createDiscordMessageNonce, h as buildDiscordMessageRequest, l as resolveChannelId, n as buildDiscordTextChunks, p as sendDiscordText, t as buildDiscordSendError, u as resolveDiscordChannel, v as resolveDiscordSendComponents, y as resolveDiscordSendEmbeds } from "./send.shared-BmwFjW6T.js";
-import { i as normalizeDiscordHandleKey, o as resolveDiscordDirectoryUserId } from "./directory-live-DGIGxpIo.js";
-import { n as createDiscordSendReceiptFromResults, r as createDiscordSendResult } from "./send.receipt-IPI1p-SP.js";
-import { normalizeLowercaseStringOrEmpty, normalizeOptionalString, normalizeOptionalStringifiedId } from "openclaw/plugin-sdk/string-coerce-runtime";
+import { Tt as createThread, c as createDiscordSendResult, s as createDiscordSendReceiptFromResults, u as createReusableDiscordReplyReference, wt as createChannelMessage } from "./retry-DqHCW6PV.js";
+import { i as normalizeDiscordHandleKey, o as resolveDiscordDirectoryUserId } from "./directory-live-DuAXKkan.js";
+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-DZJ1akvQ.js";
 import { ChannelType } from "discord-api-types/v10";
 import { expectDefined } from "openclaw/plugin-sdk/expect-runtime";
-import { truncateUtf16Safe } from "openclaw/plugin-sdk/text-utility-runtime";
+import { normalizeLowercaseStringOrEmpty, normalizeOptionalString, normalizeOptionalStringifiedId } from "openclaw/plugin-sdk/string-coerce-runtime";
 import { recordChannelActivity } from "openclaw/plugin-sdk/channel-activity-runtime";
 import { requireRuntimeConfig } from "openclaw/plugin-sdk/plugin-config-runtime";
+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 { fromMarkdown } from "mdast-util-from-markdown";
@@ -377,23 +375,14 @@ function findFenceEnd(text, startIndex, runLength) {
 	return text.length;
 }
 function findNextMarkdownCodeSegment(text, startIndex) {
-	let searchIndex = startIndex;
-	while (searchIndex < text.length) {
-		const segmentStart = text.indexOf("`", searchIndex);
-		if (segmentStart === -1) return null;
-		const runLength = countBacktickRun(text, segmentStart);
-		const inlineEndIndex = findSameLineBacktickRun(text, segmentStart + runLength, runLength);
-		if (inlineEndIndex !== null) return {
-			startIndex: segmentStart,
-			endIndex: inlineEndIndex
-		};
-		if (runLength >= 3) return {
-			startIndex: segmentStart,
-			endIndex: findFenceEnd(text, segmentStart, runLength)
-		};
-		searchIndex = segmentStart + runLength;
-	}
-	return null;
+	const segmentOffset = text.slice(startIndex).search(/(?<=(?:^|[^\\])(?:\\\\)*)`/);
+	if (segmentOffset === -1) return null;
+	const segmentStart = startIndex + segmentOffset;
+	const runLength = countBacktickRun(text, segmentStart);
+	return {
+		startIndex: segmentStart,
+		endIndex: findSameLineBacktickRun(text, segmentStart + runLength, runLength) ?? (runLength >= 3 ? findFenceEnd(text, segmentStart, runLength) : text.length)
+	};
 }
 function rewriteDiscordKnownMentions(text, params) {
 	if (!text.includes("@")) return text;
@@ -456,22 +445,23 @@ function toDiscordSendResult(result, fallbackChannelId, params = {}) {
 }
 async function resolveDiscordSendTarget(to, opts) {
 	const cfg = requireRuntimeConfig(opts.cfg, "Discord send target resolution");
-	const { rest, request } = createDiscordClient({
+	const { rest, request, account } = createDiscordClient({
 		...opts,
 		cfg
 	});
-	const { channelId } = await resolveChannelId(rest, await parseAndResolveChannelRecipient(to, cfg, opts.accountId), request);
+	const { channelId } = await resolveChannelId(rest, await parseAndResolveChannelRecipient(to, cfg, account.accountId), request);
 	return {
 		rest,
 		request,
-		channelId
+		channelId,
+		account
 	};
 }
 async function sendMessageDiscord(to, text, opts) {
 	const cfg = requireRuntimeConfig(opts.cfg, "Discord send");
-	const accountInfo = resolveDiscordAccount({
-		cfg,
-		accountId: opts.accountId
+	const { token, rest, request, account: accountInfo } = createDiscordClient({
+		...opts,
+		cfg
 	});
 	const tableMode = resolveMarkdownTableMode({
 		cfg,
@@ -492,12 +482,19 @@ async function sendMessageDiscord(to, text, opts) {
 		accountId: accountInfo.accountId,
 		mentionAliases: accountInfo.config.mentionAliases
 	});
-	const { token, rest, request } = createDiscordClient({
-		...opts,
-		cfg
-	});
-	const { channelId } = await resolveChannelId(rest, await parseAndResolveChannelRecipient(to, cfg, opts.accountId), request);
+	const { channelId } = await resolveChannelId(rest, await parseAndResolveChannelRecipient(to, cfg, accountInfo.accountId), request);
 	const channel = await resolveDiscordChannel(rest, channelId);
+	const deliveredResults = [];
+	let deliveryThreadId;
+	const reportResult = async (progressResult, kind, replyToId) => {
+		const deliveredResult = toDiscordSendResult(progressResult, deliveryThreadId ?? channelId, {
+			kind,
+			threadId: deliveryThreadId,
+			reply: createReusableDiscordReplyReference(replyToId)
+		});
+		deliveredResults.push(deliveredResult);
+		await opts.onDeliveryResult?.(deliveredResult);
+	};
 	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);
@@ -529,12 +526,14 @@ async function sendMessageDiscord(to, text, opts) {
 		});
 		let threadRes;
 		try {
-			await opts.onPlatformSendDispatch?.();
-			threadRes = await request(() => createThread(rest, channelId, { body: {
-				name: threadName,
-				...channel.default_auto_archive_duration === void 0 ? {} : { auto_archive_duration: channel.default_auto_archive_duration },
-				message: starterBody
-			} }), "forum-thread", { safety: "non-idempotent-create" });
+			threadRes = await request(async () => {
+				await opts.onPlatformSendDispatch?.();
+				return createThread(rest, channelId, { body: {
+					name: threadName,
+					...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,
@@ -545,6 +544,7 @@ async function sendMessageDiscord(to, text, opts) {
 			});
 		}
 		const threadId = threadRes.id;
+		deliveryThreadId = threadId;
 		const messageId = threadRes.message?.id ?? threadId;
 		const resultChannelId = threadRes.message?.channel_id ?? threadId;
 		const remainingChunks = chunks.slice(1);
@@ -555,16 +555,8 @@ async function sendMessageDiscord(to, text, opts) {
 			kind: "text",
 			threadId
 		});
-		const deliveredResults = [starterResult];
+		deliveredResults.push(starterResult);
 		await opts.onDeliveryResult?.(starterResult);
-		const reportThreadResult = async (result, kind) => {
-			const deliveredResult = toDiscordSendResult(result, threadId, {
-				kind,
-				threadId
-			});
-			deliveredResults.push(deliveredResult);
-			await opts.onDeliveryResult?.(deliveredResult);
-		};
 		try {
 			if (opts.mediaUrl) {
 				const [mediaCaption, ...afterMediaChunks] = remainingChunks;
@@ -585,7 +577,7 @@ async function sendMessageDiscord(to, text, opts) {
 					suppressEmbeds,
 					allowedMentions: opts.allowedMentions,
 					maxChars: textLimit,
-					onResult: reportThreadResult,
+					onResult: reportResult,
 					onPlatformSendDispatch: opts.onPlatformSendDispatch
 				});
 				await sendDiscordThreadTextChunks({
@@ -599,7 +591,7 @@ async function sendMessageDiscord(to, text, opts) {
 					silent: opts.silent,
 					suppressEmbeds,
 					allowedMentions: opts.allowedMentions,
-					onResult: reportThreadResult,
+					onResult: reportResult,
 					onPlatformSendDispatch: opts.onPlatformSendDispatch
 				});
 			} else await sendDiscordThreadTextChunks({
@@ -613,7 +605,7 @@ async function sendMessageDiscord(to, text, opts) {
 				silent: opts.silent,
 				suppressEmbeds,
 				allowedMentions: opts.allowedMentions,
-				onResult: reportThreadResult,
+				onResult: reportResult,
 				onPlatformSendDispatch: opts.onPlatformSendDispatch
 			});
 		} catch (err) {
@@ -639,12 +631,6 @@ async function sendMessageDiscord(to, text, opts) {
 		};
 	}
 	let result;
-	const reportResult = async (progressResult, kind, replyToId) => {
-		await opts.onDeliveryResult?.(toDiscordSendResult(progressResult, channelId, {
-			kind,
-			reply: createReusableDiscordReplyReference(replyToId)
-		}));
-	};
 	try {
 		if (opts.mediaUrl) result = await sendDiscordMedia({
 			rest,
@@ -700,15 +686,20 @@ async function sendMessageDiscord(to, text, opts) {
 		accountId: accountInfo.accountId,
 		direction: "outbound"
 	});
-	return toDiscordSendResult(result, channelId, {
-		kind: opts.mediaUrl ? "media" : opts.components || opts.embeds ? "card" : "text",
-		reply: opts.reply
-	});
+	return {
+		messageId: result.id || "unknown",
+		channelId: result.channel_id ?? channelId,
+		receipt: createDiscordSendReceiptFromResults({ results: deliveredResults })
+	};
 }
 async function sendStickerDiscord(to, stickerIds, opts) {
-	const { rest, request, channelId, rewrittenContent, suppressEmbeds } = await resolveDiscordStructuredSendContext(to, opts);
+	const context = await resolveDiscordStructuredSendContext(to, opts);
+	const { rewrittenContent, suppressEmbeds } = context;
 	const stickers = normalizeStickerIds(stickerIds);
-	const flags = resolveDiscordMessageFlags({ suppressEmbeds });
+	const flags = resolveDiscordMessageFlags({
+		silent: opts.silent,
+		suppressEmbeds
+	});
 	const body = {
 		content: rewrittenContent || void 0,
 		sticker_ids: stickers,
@@ -716,11 +707,11 @@ async function sendStickerDiscord(to, stickerIds, opts) {
 		enforce_nonce: true,
 		...flags ? { flags } : {}
 	};
-	await opts.onPlatformSendDispatch?.();
-	return toDiscordSendResult(await request(() => createChannelMessage(rest, channelId, { body }), "sticker", { safety: "nonce-protected-create" }), channelId, { kind: "card" });
+	return context.send("sticker", body);
 }
 async function sendPollDiscord(to, poll, opts) {
-	const { rest, request, channelId, rewrittenContent, suppressEmbeds } = await resolveDiscordStructuredSendContext(to, opts);
+	const context = await resolveDiscordStructuredSendContext(to, opts);
+	const { rewrittenContent, suppressEmbeds } = context;
 	if (poll.durationSeconds !== void 0) throw new Error("Discord polls do not support durationSeconds; use durationHours");
 	const payload = normalizeDiscordPollInput(poll);
 	const flags = resolveDiscordMessageFlags({
@@ -734,20 +725,28 @@ async function sendPollDiscord(to, poll, opts) {
 		enforce_nonce: true,
 		...flags ? { flags } : {}
 	};
-	await opts.onPlatformSendDispatch?.();
-	return toDiscordSendResult(await request(() => createChannelMessage(rest, channelId, { body }), "poll", { safety: "nonce-protected-create" }), channelId, { kind: "card" });
+	return context.send("poll", body);
 }
 async function resolveDiscordStructuredSendContext(to, opts) {
-	const accountInfo = resolveDiscordAccount({
-		cfg: requireRuntimeConfig(opts.cfg, "Discord structured send"),
-		accountId: opts.accountId
-	});
-	const { rest, request, channelId } = await resolveDiscordSendTarget(to, opts);
+	requireRuntimeConfig(opts.cfg, "Discord structured send");
+	const { rest, request, channelId, account: accountInfo } = await resolveDiscordSendTarget(to, opts);
 	const content = opts.content?.trim();
 	return {
-		rest,
-		request,
-		channelId,
+		send: async (kind, body) => {
+			const result = await request(async () => {
+				await opts.onPlatformSendDispatch?.();
+				return createChannelMessage(rest, channelId, { body });
+			}, kind, { safety: "nonce-protected-create" });
+			recordChannelActivity({
+				channel: "discord",
+				accountId: accountInfo.accountId,
+				direction: "outbound"
+			});
+			return toDiscordSendResult(result, channelId, {
+				kind: kind === "poll" ? "poll" : "card",
+				threadId: kind === "poll" ? opts.threadId : void 0
+			});
+		},
 		rewrittenContent: content ? rewriteDiscordKnownMentions(content, {
 			accountId: accountInfo.accountId,
 			mentionAliases: accountInfo.config.mentionAliases