@openclaw/discord 2026.10.2 → 2026.10.5-beta.2

package/dist/.setup/{send.components-dPljuV24.mjs → send.components-FxOS3CeP.mjs}

@@ -1,12 +1,12 @@
 import { t as __exportAll } from "./rolldown-runtime-B4FMCO8f.mjs";
-import { D as createDiscordMessageNonce, M as parseAndResolveChannelRecipient, N as createDiscordClient, T as SUPPRESS_NOTIFICATIONS_FLAG, c as resolveChannelId, l as resolveDiscordChannel, t as buildDiscordSendError } from "./send.shared-C4CN24D9.mjs";
-import { A as serializePayload, C as withDiscordRequestAuthority, lt as editChannelMessage } from "./discord-9gysrhzp.mjs";
-import { r as createDiscordSendResult } from "./send.receipt-DVOg2Oaw.mjs";
-import { t as sendMessageDiscord } from "./send.outbound-rOboMO_6.mjs";
-import { d as buildDiscordComponentMessage, f as buildDiscordComponentMessageFlags, g as resolveDiscordComponentAttachmentName } from "./components-DLJR0xU-.mjs";
+import { D as createDiscordMessageNonce, M as parseAndResolveChannelRecipient, N as createDiscordClient, T as SUPPRESS_NOTIFICATIONS_FLAG, c as resolveChannelId, l as resolveDiscordChannel, t as buildDiscordSendError } from "./send.shared-CjQ4jbMA.mjs";
+import { K as serializePayload, W as withDiscordRequestAuthority, st as createChannelMessage, ut as editChannelMessage } from "./discord-BGqgx-yd.mjs";
+import { r as createDiscordSendResult } from "./send.receipt-BAlzXd8e.mjs";
+import { t as sendMessageDiscord } from "./send.outbound-_jx4Xpd3.mjs";
+import { d as buildDiscordComponentMessage, f as buildDiscordComponentMessageFlags, g as resolveDiscordComponentAttachmentName } from "./components-HN9052L1.mjs";
 import { n as getOptionalDiscordRuntime } from "./runtime-DgnVQ7zW.mjs";
 import { hasNonEmptyString, uniqueStrings } from "openclaw/plugin-sdk/string-coerce-runtime";
-import { ChannelType, Routes } from "discord-api-types/v10";
+import { ChannelType } from "discord-api-types/v10";
 import { loadOutboundMediaFromUrl } from "openclaw/plugin-sdk/outbound-media";
 import { requireRuntimeConfig } from "openclaw/plugin-sdk/plugin-config-runtime";
 import { asDateTimestampMs, isFutureDateTimestampMs, resolveDateTimestampMs, resolveExpiresAtMsFromDurationMs } from "openclaw/plugin-sdk/number-runtime";
@@ -38,19 +38,17 @@ const PERSISTENT_MODAL_NAMESPACE = "discord.modals";
 const PERSISTENT_REGISTRY_MAX_ENTRIES = 500;
 function formatRegistryError(error) {
 	if (!(error instanceof Error)) return { error: formatRegistryErrorValue(error) };
-	const details = {
-		error: String(error),
-		errorName: error.name,
-		errorMessage: error.message
+	const details = {};
+	const appendError = (prefix, entry) => {
+		details[prefix] = String(entry);
+		details[`${prefix}Name`] = entry.name;
+		details[`${prefix}Message`] = entry.message;
+		if (entry.stack) details[`${prefix}Stack`] = entry.stack;
 	};
-	if (error.stack) details.errorStack = error.stack;
+	appendError("error", error);
 	const cause = error.cause;
-	if (cause instanceof Error) {
-		details.errorCause = String(cause);
-		details.errorCauseName = cause.name;
-		details.errorCauseMessage = cause.message;
-		if (cause.stack) details.errorCauseStack = cause.stack;
-	} else if (cause !== void 0) details.errorCause = formatRegistryErrorValue(cause);
+	if (cause instanceof Error) appendError("errorCause", cause);
+	else if (cause !== void 0) details.errorCause = formatRegistryErrorValue(cause);
 	return details;
 }
 const reportPersistentComponentRegistryError = createPluginStateErrorReporter(getOptionalDiscordRuntime, "discord", "component-registry-state", "Discord persistent component registry state failed", formatRegistryError);
@@ -91,11 +89,8 @@ function getPersistentComponentStore() {
 function getPersistentModalStore() {
 	return discordComponentRegistryState.persistentModalStore = openPersistentRegistryStore(discordComponentRegistryState.persistentModalStore, PERSISTENT_MODAL_NAMESPACE);
 }
-function isExpired(entry, now) {
-	return entry.expiresAt !== void 0 && !isFutureDateTimestampMs(entry.expiresAt, { nowMs: now });
-}
 function pruneUndefinedRegistryValues(value) {
-	if (Array.isArray(value)) return value.filter((entry) => entry !== void 0).map((entry) => pruneUndefinedRegistryValues(entry));
+	if (Array.isArray(value)) return value.filter((entry) => entry !== void 0).map(pruneUndefinedRegistryValues);
 	if (!value || typeof value !== "object") return value;
 	const result = {};
 	for (const [key, entry] of Object.entries(value)) {
@@ -119,7 +114,8 @@ function normalizeRegistryEntries(entries, params) {
 function resolveEntry(store, params) {
 	const entry = store.get(params.id);
 	if (!entry) return null;
-	if (isExpired(entry, Date.now())) {
+	const now = Date.now();
+	if (entry.expiresAt !== void 0 && !isFutureDateTimestampMs(entry.expiresAt, { nowMs: now })) {
 		store.delete(params.id);
 		return null;
 	}
@@ -160,12 +156,6 @@ function resolveComponentConsumptionIds(entry) {
 	const ids = entry.consumptionGroupEntryIds?.filter((id) => typeof id === "string" && id) ?? [];
 	return ids.length > 0 ? uniqueStrings(ids) : [entry.id];
 }
-async function deletePersistentComponentConsumptionGroup(entry) {
-	await Promise.all(resolveComponentConsumptionIds(entry).map((id) => deletePersistentEntry({
-		id,
-		openStore: getPersistentComponentStore
-	})));
-}
 async function resolvePersistentRegistryEntry(params) {
 	const store = params.openStore();
 	if (!store) return null;
@@ -179,16 +169,13 @@ async function resolvePersistentRegistryEntry(params) {
 function registerDiscordComponentEntries(params) {
 	const now = Date.now();
 	const ttlMs = params.ttlMs ?? DEFAULT_COMPONENT_TTL_MS;
-	const normalizedEntries = normalizeRegistryEntries(params.entries, {
+	const entryOptions = {
 		now,
 		ttlMs,
 		messageId: params.messageId
-	});
-	const normalizedModals = normalizeRegistryEntries(params.modals, {
-		now,
-		ttlMs,
-		messageId: params.messageId
-	});
+	};
+	const normalizedEntries = normalizeRegistryEntries(params.entries, entryOptions);
+	const normalizedModals = normalizeRegistryEntries(params.modals, entryOptions);
 	return discordComponentRegistryState.withRegistryLock(async () => {
 		for (const entry of normalizedEntries) discordComponentRegistryState.componentEntries.set(entry.id, entry);
 		for (const entry of normalizedModals) discordComponentRegistryState.modalEntries.set(entry.id, entry);
@@ -207,19 +194,18 @@ async function resolveDiscordComponentEntryWithPersistence(params) {
 	return discordComponentRegistryState.withRegistryLock(async () => {
 		const store = discordComponentRegistryState.componentEntries;
 		const inMemory = resolveEntry(store, params);
-		if (inMemory) {
-			if (params.consume !== false) {
-				for (const id of resolveComponentConsumptionIds(inMemory)) store.delete(id);
-				await deletePersistentComponentConsumptionGroup(inMemory);
-			}
-			return inMemory;
-		}
-		const persisted = await resolvePersistentRegistryEntry({
+		const entry = inMemory ?? await resolvePersistentRegistryEntry({
 			...params,
 			openStore: getPersistentComponentStore
 		});
-		if (persisted && params.consume !== false) await deletePersistentComponentConsumptionGroup(persisted);
-		return persisted;
+		if (entry && params.consume !== false) {
+			if (inMemory) for (const id of resolveComponentConsumptionIds(entry)) store.delete(id);
+			await Promise.all(resolveComponentConsumptionIds(entry).map((id) => deletePersistentEntry({
+				id,
+				openStore: getPersistentComponentStore
+			})));
+		}
+		return entry;
 	});
 }
 async function resolveDiscordModalEntryWithPersistence(params) {
@@ -251,19 +237,6 @@ function extractComponentAttachmentNames(spec) {
 	for (const block of spec.blocks ?? []) if (block.type === "file") names.push(resolveDiscordComponentAttachmentName(block.file));
 	return names;
 }
-function hasComponentAttachmentBlock(spec) {
-	return (spec.blocks ?? []).some((block) => block.type === "file");
-}
-function withImplicitComponentAttachmentBlock(spec, attachmentName) {
-	if (!attachmentName || hasComponentAttachmentBlock(spec)) return spec;
-	return {
-		...spec,
-		blocks: [...spec.blocks ?? [], {
-			type: "file",
-			file: `attachment://${attachmentName}`
-		}]
-	};
-}
 function resolveClassicDiscordMessage(spec) {
 	if (spec.modal || spec.container) return;
 	const parts = hasNonEmptyString(spec.text) ? [spec.text] : [];
@@ -300,6 +273,7 @@ async function buildDiscordComponentPayload(params) {
 	let spec = params.spec;
 	let resolvedFileName;
 	let files;
+	let attachmentNames;
 	if (params.opts.mediaUrl) {
 		const media = await loadOutboundMediaFromUrl(params.opts.mediaUrl, {
 			mediaAccess: params.opts.mediaAccess,
@@ -307,17 +281,27 @@ async function buildDiscordComponentPayload(params) {
 			mediaReadFile: params.opts.mediaReadFile
 		});
 		const filenameOverride = params.opts.filename?.trim();
-		const explicitAttachmentName = extractComponentAttachmentNames(spec)[0];
+		attachmentNames = extractComponentAttachmentNames(spec);
+		const explicitAttachmentName = attachmentNames[0];
 		resolvedFileName = filenameOverride || explicitAttachmentName || media.fileName || `upload${extensionForMime(media.contentType) ?? ""}`;
-		spec = withImplicitComponentAttachmentBlock(spec, resolvedFileName);
+		if (attachmentNames.length === 0) {
+			const file = `attachment://${resolvedFileName}`;
+			spec = {
+				...spec,
+				blocks: [...spec.blocks ?? [], {
+					type: "file",
+					file
+				}]
+			};
+			attachmentNames = [resolveDiscordComponentAttachmentName(file)];
+		}
 		files = [{
 			data: media.buffer,
 			name: resolvedFileName,
 			contentType: media.contentType
 		}];
 	}
-	const attachmentNames = extractComponentAttachmentNames(spec);
-	const uniqueAttachmentNames = uniqueStrings(attachmentNames);
+	const uniqueAttachmentNames = uniqueStrings(attachmentNames ?? extractComponentAttachmentNames(spec));
 	if (uniqueAttachmentNames.length > 1) throw new Error("Discord component attachments currently support a single file. Use media-gallery for multiple files.");
 	const expectedAttachmentName = uniqueAttachmentNames[0];
 	if (expectedAttachmentName && resolvedFileName && expectedAttachmentName !== resolvedFileName) throw new Error(`Component file block expects attachment "${expectedAttachmentName}", but the uploaded file is "${resolvedFileName}". Update components.blocks[].file or provide a matching filename.`);
@@ -386,7 +370,7 @@ async function writeDiscordComponentMessage(to, spec, opts, messageId) {
 			if (messageId !== void 0) return editChannelMessage(rest, channelId, messageId, { body });
 			await opts.onPlatformSendDispatch?.();
 			opts.assertPlatformSendAuthorized?.();
-			return await rest.post(Routes.channelMessages(channelId), { body });
+			return createChannelMessage(rest, channelId, { body });
 		}, "components", creating ? { safety: "nonce-protected-create" } : void 0);
 	} catch (err) {
 		throw await buildDiscordSendError(err, {