@openclaw/discord 2026.9.7 → 2026.10.1-beta.1

package/dist/.setup/{channel-type-DRCrEMss.mjs → channel-type-D1_b5UhU.mjs}

@@ -1,9 +1,9 @@
+import { normalizeLowercaseStringOrEmpty, normalizeOptionalString } from "openclaw/plugin-sdk/string-coerce-runtime";
 import { ChannelType } from "discord-api-types/v10";
 import { asFiniteNumberInRange, parseDateStringTimestampMs, parseStrictFiniteNumber } from "openclaw/plugin-sdk/number-runtime";
 import { readResponseWithLimit } from "openclaw/plugin-sdk/response-limit-runtime";
 import { fetchWithSsrFGuard, isBlockedHostnameOrIp, isLoopbackHost } from "openclaw/plugin-sdk/ssrf-runtime";
-import { normalizeLowercaseStringOrEmpty, normalizeOptionalString } from "openclaw/plugin-sdk/string-coerce-runtime";
-import { buildChannelKeyCandidates, resolveChannelEntryMatchWithFallback, resolveChannelMatchConfig } from "openclaw/plugin-sdk/channel-targets";
+import { buildChannelKeyCandidates, normalizeChannelSlug, resolveChannelEntryMatchWithFallback, resolveChannelMatchConfig } from "openclaw/plugin-sdk/channel-targets";
 import { resolveAllowlistMatchByCandidates } from "openclaw/plugin-sdk/allow-from";
 //#region extensions/discord/src/endpoint-runtime.ts
 const DISCORD_ENDPOINT_RESPONSE_MAX_BYTES = 8388608;
@@ -224,7 +224,7 @@ function normalizeDiscordAllowList(raw, prefixes) {
 	};
 }
 function normalizeDiscordSlug(value) {
-	return normalizeLowercaseStringOrEmpty(value).replace(/^#/, "").replace(/[^a-z0-9]+/g, "-").replace(/^-+|-+$/g, "");
+	return normalizeChannelSlug(value);
 }
 function normalizeDiscordDisplaySlug(value) {
 	return normalizeLowercaseStringOrEmpty(value).normalize("NFC").replace(/^#/, "").replace(/[\s_]+/g, "-").replace(/[^\p{L}\p{M}\p{N}-]+/gu, "-").replace(/-{2,}/g, "-").replace(/^-+|-+$/g, "");
@@ -354,17 +354,13 @@ function resolveDiscordOwnerAccess(params) {
 }
 function resolveDiscordCommandAuthorized(params) {
 	if (!params.isDirectMessage) return true;
-	const allowList = normalizeDiscordAllowList(params.allowFrom, [
-		"discord:",
-		"user:",
-		"pk:"
-	]);
-	if (!allowList) return true;
-	return allowListMatches(allowList, {
-		id: params.author.id,
-		name: params.author.username,
-		tag: formatDiscordUserTag(params.author)
-	}, { allowNameMatching: params.allowNameMatching });
+	return resolveDiscordUserAllowed({
+		allowList: params.allowFrom,
+		userId: params.author.id,
+		userName: params.author.username,
+		userTag: formatDiscordUserTag(params.author),
+		allowNameMatching: params.allowNameMatching
+	});
 }
 function resolveDiscordGuildEntry(params) {
 	const guild = params.guild;
@@ -472,7 +468,7 @@ function isDiscordGroupAllowedByPolicy(params) {
 	return params.groupPolicy !== "allowlist" || !params.channelAllowlistConfigured || params.channelAllowed;
 }
 function resolveDiscordChannelPolicyCommandAuthorizer(params) {
-	const channelAllowlistConfigured = Boolean(params.guildInfo?.channels) && Object.keys(params.guildInfo?.channels ?? {}).length > 0;
+	const channelAllowlistConfigured = hasConfiguredDiscordChannels(params.guildInfo?.channels);
 	return {
 		configured: params.groupPolicy === "allowlist" && (Boolean(params.guildInfo) || channelAllowlistConfigured),
 		allowed: isDiscordGroupAllowedByPolicy({
@@ -531,4 +527,4 @@ function isDiscordThreadChannelType(channelType) {
 	return channelType === ChannelType.AnnouncementThread || channelType === ChannelType.PublicThread || channelType === ChannelType.PrivateThread;
 }
 //#endregion
-export { resolveDiscordSystemLocation as C, getDiscordEndpointRuntime as D, assertDiscordEndpointGatewayUrl as E, resolveDiscordEndpointAttachmentGuard as O, formatDiscordUserTag as S, parseDiscordRetryAfterBodySeconds as T, resolveDiscordOwnerAllowFrom as _, normalizeDiscordDisplaySlug as a, shouldEmitDiscordReactionNotification as b, resolveDiscordChannelConfig as c, resolveDiscordCommandAuthorized as d, resolveDiscordGuildEntry as f, resolveDiscordOwnerAccess as g, resolveDiscordMentionPolicy as h, normalizeDiscordAllowList as i, resolveDiscordEndpointMediaGuard as k, resolveDiscordChannelConfigWithFallback as l, resolveDiscordMemberAllowed as m, allowListMatches as n, normalizeDiscordSlug as o, resolveDiscordMemberAccessState as p, isDiscordGroupAllowedByPolicy as r, resolveDiscordAllowListMatch as s, isDiscordThreadChannelType as t, resolveDiscordChannelPolicyCommandAuthorizer as u, resolveDiscordShouldRequireMention as v, resolveTimestampMs as w, formatDiscordReactionEmoji as x, resolveGroupDmAllow as y };
+export { resolveDiscordEndpointMediaGuard as A, formatDiscordUserTag as C, assertDiscordEndpointGatewayUrl as D, parseDiscordRetryAfterBodySeconds as E, getDiscordEndpointRuntime as O, formatDiscordReactionEmoji as S, resolveTimestampMs as T, resolveDiscordOwnerAccess as _, normalizeDiscordAllowList as a, resolveGroupDmAllow as b, resolveDiscordAllowListMatch as c, resolveDiscordChannelPolicyCommandAuthorizer as d, resolveDiscordCommandAuthorized as f, resolveDiscordMentionPolicy as g, resolveDiscordMemberAllowed as h, isDiscordGroupAllowedByPolicy as i, resolveDiscordEndpointAttachmentGuard as k, resolveDiscordChannelConfig as l, resolveDiscordMemberAccessState as m, allowListMatches as n, normalizeDiscordDisplaySlug as o, resolveDiscordGuildEntry as p, hasConfiguredDiscordChannels as r, normalizeDiscordSlug as s, isDiscordThreadChannelType as t, resolveDiscordChannelConfigWithFallback as u, resolveDiscordOwnerAllowFrom as v, resolveDiscordSystemLocation as w, shouldEmitDiscordReactionNotification as x, resolveDiscordShouldRequireMention as y };

package/dist/.setup/{channel.setup-CRo1GjV7.mjs → channel.setup-DBJtugJO.mjs}

@@ -1,9 +1,9 @@
-import { _ as inspectDiscordAccountTokenState, h as resolveDiscordToken, l as resolveDiscordAccountAllowFrom, o as mergeDiscordAccountConfig, s as resolveDefaultDiscordAccountId, u as resolveDiscordAccountConfig } from "./accounts-ChaMcixG.mjs";
-import { i as discordSetupContract, t as createDiscordPluginBase } from "./shared-B3wZ4hN-.mjs";
-import { t as resolveDiscordChannelAllowlist } from "./resolve-channels-BFPNRmVv.mjs";
-import { t as resolveDiscordUserAllowlist } from "./resolve-users-0-aBuCy3.mjs";
-import { DEFAULT_ACCOUNT_ID, normalizeAccountId } from "openclaw/plugin-sdk/account-id";
+import { _ as inspectDiscordAccountTokenState, h as resolveDiscordToken, l as resolveDiscordAccountAllowFrom, o as mergeDiscordAccountConfig, s as resolveDefaultDiscordAccountId, u as resolveDiscordAccountConfig } from "./accounts-DXHCL8Zm.mjs";
+import { i as discordSetupContract, t as createDiscordPluginBase } from "./shared-CIJn6AEC.mjs";
+import { t as resolveDiscordChannelAllowlist } from "./resolve-channels--MUatisx.mjs";
+import { t as resolveDiscordUserAllowlist } from "./resolve-users-CxLcDmM0.mjs";
 import { normalizeOptionalString } from "openclaw/plugin-sdk/string-coerce-runtime";
+import { DEFAULT_ACCOUNT_ID, normalizeAccountId } from "openclaw/plugin-sdk/account-id";
 import { resolveBasicAllowFromEntries } from "openclaw/plugin-sdk/allow-from";
 import { createAccountScopedAllowFromSection, createAccountScopedGroupAccessSection, createSetupTranslator, createStandardChannelSetupStatus, defineTokenCredential, parseMentionOrPrefixedId, patchChannelConfigForAccount, promptResolvedAllowFrom, resolveEntriesWithOptionalToken, resolveSetupAccountId, setSetupChannelEnabled, splitSetupEntries } from "openclaw/plugin-sdk/setup-runtime";
 import { formatDocsLink } from "openclaw/plugin-sdk/setup-tools";
@@ -197,16 +197,6 @@ function createDiscordSetupWizardBase(handlers) {
 //#region extensions/discord/src/setup-surface.ts
 const t = createSetupTranslator();
 const channel = "discord";
-async function resolveDiscordAllowFromEntries(params) {
-	return await resolveBasicAllowFromEntries({
-		token: params.token,
-		entries: params.entries,
-		resolveEntries: async ({ token, entries }) => await resolveDiscordUserAllowlist({
-			token,
-			entries
-		})
-	});
-}
 async function promptDiscordAllowFrom(params) {
 	const accountId = resolveSetupAccountId({
 		accountId: params.accountId,
@@ -239,14 +229,11 @@ async function promptDiscordAllowFrom(params) {
 		parseInputs: splitSetupEntries,
 		parseId: parseDiscordAllowFromId,
 		invalidWithoutTokenNote: t("wizard.discord.allowFromInvalidWithoutToken"),
-		resolveEntries: async ({ token, entries }) => (await resolveDiscordUserAllowlist({
+		resolveEntries: async ({ token, entries }) => await resolveBasicAllowFromEntries({
 			token,
-			entries
-		})).map((entry) => ({
-			input: entry.input,
-			resolved: entry.resolved,
-			id: entry.id ?? null
-		}))
+			entries,
+			resolveEntries: resolveDiscordUserAllowlist
+		})
 	});
 	return patchChannelConfigForAccount({
 		cfg: params.cfg,
@@ -269,24 +256,17 @@ async function resolveDiscordGroupAllowlist(params) {
 			input,
 			resolved: false
 		}),
-		resolveEntries: async ({ token, entries }) => await resolveDiscordChannelAllowlist({
-			token,
-			entries
-		})
+		resolveEntries: resolveDiscordChannelAllowlist
 	});
 }
 const discordSetupWizard = createDiscordSetupWizardBase({
 	promptAllowFrom: promptDiscordAllowFrom,
-	resolveAllowFromEntries: async ({ cfg, accountId, credentialValues, entries }) => await resolveDiscordAllowFromEntries({
+	resolveAllowFromEntries: async ({ cfg, accountId, credentialValues, entries }) => await resolveBasicAllowFromEntries({
 		token: resolveDiscordToken(cfg, { accountId }).token || (typeof credentialValues.token === "string" ? credentialValues.token : ""),
-		entries
+		entries,
+		resolveEntries: resolveDiscordUserAllowlist
 	}),
-	resolveGroupAllowlist: async ({ cfg, accountId, credentialValues, entries }) => await resolveDiscordGroupAllowlist({
-		cfg,
-		accountId,
-		credentialValues,
-		entries
-	})
+	resolveGroupAllowlist: resolveDiscordGroupAllowlist
 });
 //#endregion
 //#region extensions/discord/src/channel.setup.ts

package/dist/.setup/{components-Cq1PvIpN.mjs → components-CzXLR3QH.mjs}

@@ -1,8 +1,8 @@
 import { t as __exportAll } from "./rolldown-runtime-B4FMCO8f.mjs";
-import { B as Container, F as RadioGroup, G as RoleSelectMenu, H as LinkButton, I as TextInput, J as Separator, K as Row, L as AnySelectMenu, M as CheckboxGroup, N as Label, P as Modal, Q as UserSelectMenu, R as Button, U as MediaGallery, V as File, W as MentionableSelectMenu, X as TextDisplay, Y as StringSelectMenu, Z as Thumbnail, et as parseCustomId, q as Section, z as ChannelSelectMenu } from "./discord-0xJYfdDD.mjs";
+import { B as Container, F as RadioGroup, G as RoleSelectMenu, H as LinkButton, I as TextInput, J as Separator, K as Row, L as AnySelectMenu, M as CheckboxGroup, N as Label, P as Modal, Q as UserSelectMenu, R as Button, U as MediaGallery, V as File, W as MentionableSelectMenu, X as TextDisplay, Y as StringSelectMenu, Z as Thumbnail, et as parseCustomId, q as Section, tt as stripUndefinedFields, z as ChannelSelectMenu } from "./discord-J7aRzq2Q.mjs";
+import { asOptionalRecord, normalizeLowercaseStringOrEmpty, normalizeOptionalString, readNonBlankString } from "openclaw/plugin-sdk/string-coerce-runtime";
 import { ButtonStyle, MessageFlags, TextInputStyle } from "discord-api-types/v10";
 import crypto from "node:crypto";
-import { normalizeLowercaseStringOrEmpty, normalizeOptionalString, readNonBlankString } from "openclaw/plugin-sdk/string-coerce-runtime";
 import { legacyInteractiveReplyToPresentation, resolveMessagePresentationActionValue, resolveMessagePresentationButtonAction, resolveMessagePresentationOptionAction } from "openclaw/plugin-sdk/interactive-runtime";
 import { resolveAskUserQuestionOptionIndex } from "openclaw/plugin-sdk/reply-payload";
 import { buildApprovalResolutionRef } from "openclaw/plugin-sdk/approval-reference-runtime";
@@ -86,20 +86,17 @@ function parseDiscordComponentCustomId(id) {
 	const parsed = parseCustomId(id);
 	if (parsed.key !== "occomp") return null;
 	const data = decodeParsedCustomIdData(parsed.data);
-	const componentId = data.cid;
-	if (typeof componentId !== "string" || !componentId.trim()) return null;
-	const modalId = data.mid;
+	const componentId = readNonBlankString(data.cid);
+	if (!componentId) return null;
 	return {
 		componentId,
-		modalId: typeof modalId === "string" && modalId.trim() ? modalId : void 0
+		modalId: readNonBlankString(data.mid)
 	};
 }
 function parseDiscordModalCustomId(id) {
 	const parsed = parseCustomId(id);
 	if (parsed.key !== "ocmodal") return null;
-	const modalId = decodeParsedCustomIdData(parsed.data).mid;
-	if (typeof modalId !== "string" || !modalId.trim()) return null;
-	return modalId;
+	return readNonBlankString(decodeParsedCustomIdData(parsed.data).mid) ?? null;
 }
 function isDiscordComponentWildcardRegistrationId(id) {
 	return /^__openclaw_discord_component_[a-z_]+_wildcard__$/.test(id);
@@ -127,8 +124,9 @@ function parseDiscordModalCustomIdForInteraction(id) {
 const DISCORD_COMPONENT_ATTACHMENT_PREFIX = "attachment://";
 const BLOCK_ALIASES = /* @__PURE__ */ new Map([["row", "actions"], ["action-row", "actions"]]);
 function requireObject(value, label) {
-	if (!value || typeof value !== "object" || Array.isArray(value)) throw new Error(`${label} must be an object`);
-	return value;
+	const record = asOptionalRecord(value);
+	if (!record) throw new Error(`${label} must be an object`);
+	return record;
 }
 function readRequiredString(value, label, trim = true) {
 	if (typeof value !== "string") throw new Error(`${label} must be a string`);
@@ -150,14 +148,14 @@ function readOptionalStringArray(value, label) {
 }
 function readOptionalInteger(value, label, bounds) {
 	if (value == null) return;
-	if (typeof value !== "number" || !Number.isFinite(value) || !Number.isInteger(value)) throw new Error(`${label} must be an integer`);
+	if (typeof value !== "number" || !Number.isInteger(value)) throw new Error(`${label} must be an integer`);
 	if (bounds?.min !== void 0 && value < bounds.min) throw new Error(`${label} must be at least ${bounds.min}`);
 	if (bounds?.max !== void 0 && value > bounds.max) throw new Error(`${label} must be at most ${bounds.max}`);
 	return value;
 }
 function readOptionalEmoji(value, label) {
-	if (!value || typeof value !== "object" || Array.isArray(value)) return;
-	const obj = value;
+	const obj = asOptionalRecord(value);
+	if (!obj) return;
 	return {
 		name: readRequiredString(obj.name, `${label}.name`),
 		id: normalizeOptionalString(obj.id),
@@ -165,9 +163,7 @@ function readOptionalEmoji(value, label) {
 	};
 }
 function normalizeModalFieldName(value, index) {
-	const trimmed = value?.trim();
-	if (trimmed) return trimmed;
-	return `field_${index + 1}`;
+	return value?.trim() || `field_${index + 1}`;
 }
 function readAttachmentName(value, label, filenameLabel = "a filename") {
 	const trimmed = value.trim();
@@ -209,7 +205,7 @@ function parseButtonSpec(raw, label) {
 	const obj = requireObject(raw, label);
 	const style = normalizeOptionalString(obj.style);
 	const url = normalizeOptionalString(obj.url);
-	if ((style === "link" || url) && !url) throw new Error(`${label}.url is required for link buttons`);
+	if (style === "link" && !url) throw new Error(`${label}.url is required for link buttons`);
 	return {
 		label: readRequiredString(obj.label, `${label}.label`),
 		style,
@@ -334,15 +330,11 @@ function parseComponentBlock(raw, label) {
 		}
 		case "separator": {
 			const spacingRaw = obj.spacing;
-			let spacing;
-			if (spacingRaw === "small" || spacingRaw === "large") spacing = spacingRaw;
-			else if (spacingRaw === 1 || spacingRaw === 2) spacing = spacingRaw;
-			else if (spacingRaw !== void 0) throw new Error(`${label}.spacing must be "small", "large", 1, or 2`);
-			const divider = typeof obj.divider === "boolean" ? obj.divider : void 0;
+			if (spacingRaw !== void 0 && spacingRaw !== "small" && spacingRaw !== "large" && spacingRaw !== 1 && spacingRaw !== 2) throw new Error(`${label}.spacing must be "small", "large", 1, or 2`);
 			return {
 				type: "separator",
-				spacing,
-				divider
+				spacing: spacingRaw,
+				divider: typeof obj.divider === "boolean" ? obj.divider : void 0
 			};
 		}
 		case "actions": {
@@ -413,12 +405,13 @@ function readDiscordComponentSpec(raw) {
 			fields
 		};
 	}
+	const container = asOptionalRecord(obj.container);
 	return {
 		text: readNonBlankString(obj.text),
 		reusable: typeof obj.reusable === "boolean" ? obj.reusable : void 0,
-		container: typeof obj.container === "object" && obj.container && !Array.isArray(obj.container) ? {
-			accentColor: obj.container.accentColor,
-			spoiler: typeof obj.container.spoiler === "boolean" ? obj.container.spoiler : void 0
+		container: container ? {
+			accentColor: container.accentColor,
+			spoiler: typeof container.spoiler === "boolean" ? container.spoiler : void 0
 		} : void 0,
 		blocks,
 		modal
@@ -469,11 +462,6 @@ function createDiscordSelectMenu(type, customId, options) {
 	if (select instanceof StringSelectMenu) select.options = options ?? [];
 	return select;
 }
-function buildTextDisplays(text, texts) {
-	if (texts && texts.length > 0) return texts.map((entry) => new TextDisplay(entry));
-	if (text) return [new TextDisplay(text)];
-	return [];
-}
 function createButtonComponent(params) {
 	const style = mapButtonStyle(params.spec.style);
 	if (style === ButtonStyle.Link || Boolean(params.spec.url)) {
@@ -509,16 +497,16 @@ function createButtonComponent(params) {
 	if (internalCustomId) return { component: new DynamicButton() };
 	return {
 		component: new DynamicButton(),
-		entry: {
+		entry: stripUndefinedFields({
 			id: componentId,
 			kind: params.modalId ? "modal-trigger" : "button",
 			label: params.spec.label,
-			...params.spec.callbackData !== void 0 ? { callbackData: params.spec.callbackData } : {},
-			...params.spec.callbackDataKind !== void 0 ? { callbackDataKind: params.spec.callbackDataKind } : {},
-			...params.modalId !== void 0 ? { modalId: params.modalId } : {},
-			...params.spec.reusable !== void 0 ? { reusable: params.spec.reusable } : {},
-			...params.spec.allowedUsers !== void 0 ? { allowedUsers: params.spec.allowedUsers } : {}
-		}
+			callbackData: params.spec.callbackData,
+			callbackDataKind: params.spec.callbackDataKind,
+			modalId: params.modalId,
+			reusable: params.spec.reusable,
+			allowedUsers: params.spec.allowedUsers
+		})
 	};
 }
 function createSelectComponent(params) {
@@ -534,7 +522,7 @@ function createSelectComponent(params) {
 	select.disabled = false;
 	return {
 		component: select,
-		entry: {
+		entry: stripUndefinedFields({
 			id: componentId,
 			kind: "select",
 			label: params.spec.placeholder ?? {
@@ -544,22 +532,21 @@ function createSelectComponent(params) {
 				mentionable: "mentionable select",
 				channel: "channel select"
 			}[type],
-			...params.spec.callbackData !== void 0 ? { callbackData: params.spec.callbackData } : {},
-			...params.spec.callbackDataKind !== void 0 ? { callbackDataKind: params.spec.callbackDataKind } : {},
+			callbackData: params.spec.callbackData,
+			callbackDataKind: params.spec.callbackDataKind,
 			selectType: type,
-			...type === "string" ? { options: options.map((option) => ({
+			options: type === "string" ? options.map((option) => ({
 				value: option.value,
 				label: option.label
-			})) } : {},
-			...params.spec.allowedUsers !== void 0 ? { allowedUsers: params.spec.allowedUsers } : {}
-		}
+			})) : void 0,
+			allowedUsers: params.spec.allowedUsers
+		})
 	};
 }
 function buildDiscordComponentMessage(params) {
 	const entries = [];
 	const consumptionGroupId = createShortId("grp_");
 	const modals = [];
-	const components = [];
 	const containerChildren = [];
 	const addEntry = (entry) => {
 		const reusable = entry.reusable ?? params.spec.reusable;
@@ -580,7 +567,7 @@ function buildDiscordComponentMessage(params) {
 			continue;
 		}
 		if (block.type === "section") {
-			const displays = buildTextDisplays(block.text, block.texts);
+			const displays = (block.texts?.length ? block.texts : block.text ? [block.text] : []).map((entry) => new TextDisplay(entry));
 			if (displays.length > 3) throw new Error("Section blocks support up to 3 text displays");
 			let accessory;
 			if (block.accessory?.type === "thumbnail") accessory = new Thumbnail(block.accessory.url);
@@ -626,32 +613,32 @@ function buildDiscordComponentMessage(params) {
 	}
 	if (params.spec.modal) {
 		const modalId = createShortId("mdl_");
-		const fields = params.spec.modal.fields.map((field, index) => ({
+		const fields = params.spec.modal.fields.map((field, index) => stripUndefinedFields({
 			id: createShortId("fld_"),
 			name: normalizeModalFieldName(field.name, index),
 			label: field.label,
 			type: field.type,
-			...field.description !== void 0 ? { description: field.description } : {},
-			...field.placeholder !== void 0 ? { placeholder: field.placeholder } : {},
-			...field.required !== void 0 ? { required: field.required } : {},
-			...field.options !== void 0 ? { options: field.options } : {},
-			...field.minValues !== void 0 ? { minValues: field.minValues } : {},
-			...field.maxValues !== void 0 ? { maxValues: field.maxValues } : {},
-			...field.minLength !== void 0 ? { minLength: field.minLength } : {},
-			...field.maxLength !== void 0 ? { maxLength: field.maxLength } : {},
-			...field.style !== void 0 ? { style: field.style } : {}
+			description: field.description,
+			placeholder: field.placeholder,
+			required: field.required,
+			options: field.options,
+			minValues: field.minValues,
+			maxValues: field.maxValues,
+			minLength: field.minLength,
+			maxLength: field.maxLength,
+			style: field.style
 		}));
-		modals.push({
+		modals.push(stripUndefinedFields({
 			id: modalId,
 			title: params.spec.modal.title,
 			fields,
-			...params.spec.modal.callbackData !== void 0 ? { callbackData: params.spec.modal.callbackData } : {},
-			...params.sessionKey !== void 0 ? { sessionKey: params.sessionKey } : {},
-			...params.agentId !== void 0 ? { agentId: params.agentId } : {},
-			...params.accountId !== void 0 ? { accountId: params.accountId } : {},
-			...params.spec.reusable !== void 0 ? { reusable: params.spec.reusable } : {},
-			...params.spec.modal.allowedUsers !== void 0 ? { allowedUsers: params.spec.modal.allowedUsers } : {}
-		});
+			callbackData: params.spec.modal.callbackData,
+			sessionKey: params.sessionKey,
+			agentId: params.agentId,
+			accountId: params.accountId,
+			reusable: params.spec.reusable,
+			allowedUsers: params.spec.modal.allowedUsers
+		}));
 		const { component, entry } = createButtonComponent({
 			spec: {
 				label: params.spec.modal.triggerLabel ?? "Open form",
@@ -667,11 +654,10 @@ function buildDiscordComponentMessage(params) {
 	}
 	if (containerChildren.length === 0) throw new Error("components must include at least one block, text, or modal trigger");
 	const container = new Container(containerChildren, params.spec.container);
-	components.push(container);
 	const consumptionGroupEntryIds = entries.map((entry) => entry.id);
 	for (const entry of entries) entry.consumptionGroupEntryIds = consumptionGroupEntryIds;
 	return {
-		components,
+		components: [container],
 		entries,
 		modals
 	};
@@ -818,12 +804,10 @@ function parseExecApprovalData(data) {
 }
 //#endregion
 //#region extensions/discord/src/question-custom-id.ts
-const DISCORD_QUESTION_CUSTOM_ID_MAX_CHARS = 100;
 const QUESTION_RECORD_ID_PATTERN = /^ask_[a-f0-9]{32}$/u;
 function buildDiscordQuestionCustomId(callback) {
 	if (!QUESTION_RECORD_ID_PATTERN.test(callback.questionId) || !Number.isInteger(callback.optionIndex) || callback.optionIndex < 0 || callback.optionIndex > 3) return;
-	const customId = `ocq:id=${callback.questionId};i=${callback.optionIndex}`;
-	return customId.length <= DISCORD_QUESTION_CUSTOM_ID_MAX_CHARS ? customId : void 0;
+	return `ocq:id=${callback.questionId};i=${callback.optionIndex}`;
 }
 function parseDiscordQuestionData(data) {
 	const questionId = typeof data.id === "string" ? data.id : "";

package/dist/.setup/{config-schema-oxELUSDx.mjs → config-schema-CsemBDpS.mjs}

@@ -1,9 +1,9 @@
-import { t as runtime_doctor_migrations_exports } from "./runtime-doctor-migrations-CshUGl36.mjs";
-import { normalizeLegacyDmAliases } from "openclaw/plugin-sdk/channel-config-helpers";
+import { t as runtime_doctor_migrations_exports } from "./runtime-doctor-migrations-BPV-R4G9.mjs";
 import { normalizeOptionalString } from "openclaw/plugin-sdk/string-coerce-runtime";
+import { normalizeLegacyDmAliases } from "openclaw/plugin-sdk/channel-config-helpers";
 import { buildSecretInputSchema, registerSensitiveConfigSchema } from "openclaw/plugin-sdk/secret-input";
 import { createChannelConfigUiHints } from "openclaw/plugin-sdk/channel-core";
-import { ChannelBotLoopProtectionSchema, ChannelDangerouslyAllowNameMatchingSchema, ChannelPreviewStreamingConfigSchema, ChannelStreamingProgressSchema, ProviderCommandsSchema, TtsConfigSchema, buildChannelAccountSchemaParts, buildChannelAllowBotsSchema, buildChannelConfigSchema, buildChannelExecApprovalsSchema, buildChannelReactionShape, buildGroupEntrySchema, refineChannelDmPolicy } from "openclaw/plugin-sdk/channel-config-schema";
+import { ChannelBotLoopProtectionSchema, ChannelDangerouslyAllowNameMatchingSchema, ChannelPreviewStreamingConfigSchema, ChannelThreadBindingsSchema, ProviderCommandsSchema, TtsConfigSchema, buildChannelAccountSchemaParts, buildChannelAllowBotsSchema, buildChannelConfigSchema, buildChannelExecApprovalsSchema, buildChannelReactionShape, buildGroupEntrySchema, refineChannelDmPolicy } from "openclaw/plugin-sdk/channel-config-schema";
 import { z } from "zod";
 //#region extensions/discord/src/config-ui-hints.ts
 const discordChannelConfigUiHints = {
@@ -334,7 +334,6 @@ const discordChannelConfigUiHints = {
 //#endregion
 //#region extensions/discord/src/config-schema.ts
 const SecretInputSchema = buildSecretInputSchema();
-const DiscordPreviewStreamingConfigSchema = ChannelPreviewStreamingConfigSchema.extend({ progress: ChannelStreamingProgressSchema.optional() }).strict();
 const DiscordIdSchema = z.union([z.string(), z.number()]).transform((value, ctx) => {
 	if (typeof value === "number") {
 		if (!Number.isSafeInteger(value) || value < 0) {
@@ -407,15 +406,11 @@ const DiscordGuildSchema = buildGroupEntrySchema({
 	"allowFrom",
 	"systemPrompt"
 ] });
-const DiscordVoiceAutoJoinSchema = z.object({
-	guildId: z.string().min(1),
-	channelId: z.string().min(1),
-	whenOccupied: z.boolean().optional()
-}).strict();
 const DiscordVoiceAllowedChannelSchema = z.object({
 	guildId: z.string().min(1),
 	channelId: z.string().min(1)
 }).strict();
+const DiscordVoiceAutoJoinSchema = DiscordVoiceAllowedChannelSchema.extend({ whenOccupied: z.boolean().optional() });
 const DiscordVoiceRealtimeToolPolicySchema = z.enum([
 	"safe-read-only",
 	"owner",
@@ -478,7 +473,7 @@ const DiscordVoiceSchema = z.object({
 const { accountShape, rootPolicyShape } = buildChannelAccountSchemaParts({
 	omit: ["groupAllowFrom"],
 	allowFrom: DiscordIdListSchema.optional(),
-	streaming: DiscordPreviewStreamingConfigSchema.optional()
+	streaming: ChannelPreviewStreamingConfigSchema.optional()
 });
 const DiscordAccountSchemaBase = z.object({
 	...accountShape,
@@ -527,13 +522,7 @@ const DiscordAccountSchemaBase = z.object({
 		ttlMs: z.number().int().positive().max(864e5).optional()
 	}).strict().optional(),
 	slashCommand: z.object({ ephemeral: z.boolean().optional() }).strict().optional(),
-	threadBindings: z.object({
-		enabled: z.boolean().optional(),
-		idleHours: z.number().nonnegative().optional(),
-		maxAgeHours: z.number().nonnegative().optional(),
-		spawnSessions: z.boolean().optional(),
-		defaultSpawnContext: z.enum(["isolated", "fork"]).optional()
-	}).strict().optional(),
+	threadBindings: ChannelThreadBindingsSchema.optional(),
 	intents: z.object({
 		messageContent: z.boolean().optional(),
 		presence: z.boolean().optional(),

package/dist/.setup/{conversation-binding-route-Caz_XuFH.mjs → conversation-binding-route-Bi62ApSt.mjs}

@@ -1,4 +1,4 @@
-import { m as shouldIgnoreStaleDiscordRouteBinding } from "./outbound-session-route-zVGxxceg.mjs";
+import { m as shouldIgnoreStaleDiscordRouteBinding } from "./outbound-session-route-DGPPKA0z.mjs";
 import { logVerbose } from "openclaw/plugin-sdk/runtime-env";
 import { resolveConfiguredBindingRoute, resolveRuntimeConversationBindingRoute } from "openclaw/plugin-sdk/conversation-binding-runtime";
 //#region extensions/discord/src/monitor/conversation-binding-route.ts

package/dist/.setup/{directory-config-esqNn0Eo.mjs → directory-config-BH1LA-gi.mjs}

@@ -1,5 +1,5 @@
 import { t as __exportAll } from "./rolldown-runtime-B4FMCO8f.mjs";
-import { l as resolveDiscordAccountAllowFrom, o as mergeDiscordAccountConfig, s as resolveDefaultDiscordAccountId } from "./accounts-ChaMcixG.mjs";
+import { l as resolveDiscordAccountAllowFrom, o as mergeDiscordAccountConfig, s as resolveDefaultDiscordAccountId } from "./accounts-DXHCL8Zm.mjs";
 import { normalizeAccountId } from "openclaw/plugin-sdk/account-id";
 import { createResolvedDirectoryEntriesLister } from "openclaw/plugin-sdk/directory-config-runtime";
 //#region extensions/discord/src/directory-config.ts

package/dist/.setup/{directory-live-DtKRHuGV.mjs → directory-live-C9xz7IPm.mjs}

@@ -1,19 +1,16 @@
 import { t as __exportAll } from "./rolldown-runtime-B4FMCO8f.mjs";
-import { o as normalizeDiscordSlug } from "./channel-type-DRCrEMss.mjs";
-import { c as resolveDiscordAccount, m as normalizeDiscordToken } from "./accounts-ChaMcixG.mjs";
-import { r as fetchDiscord, t as DISCORD_DIRECTORY_LOOKUP_TIMEOUT_MS } from "./api-DVbJwZVt.mjs";
-import { DEFAULT_ACCOUNT_ID, normalizeAccountId } from "openclaw/plugin-sdk/routing";
+import { s as normalizeDiscordSlug } from "./channel-type-D1_b5UhU.mjs";
+import { c as resolveDiscordAccount, m as normalizeDiscordToken } from "./accounts-DXHCL8Zm.mjs";
+import { r as fetchDiscord, t as DISCORD_DIRECTORY_LOOKUP_TIMEOUT_MS } from "./api-_oznjffB.mjs";
 import { normalizeLowercaseStringOrEmpty, normalizeOptionalLowercaseString, normalizeOptionalString, normalizeOptionalStringifiedId } from "openclaw/plugin-sdk/string-coerce-runtime";
+import { normalizeAccountId } from "openclaw/plugin-sdk/routing";
 //#region extensions/discord/src/directory-cache-state.ts
 const discordDirectoryCacheState = { handlesByAccount: /* @__PURE__ */ new Map() };
 //#endregion
 //#region extensions/discord/src/directory-cache.ts
 const DISCORD_DIRECTORY_CACHE_MAX_ENTRIES = 4e3;
 const DISCORD_DISCRIMINATOR_SUFFIX = /#\d{4}$/;
-function normalizeAccountCacheKey(accountId) {
-	return normalizeAccountId(accountId ?? DEFAULT_ACCOUNT_ID) || DEFAULT_ACCOUNT_ID;
-}
-function normalizeSnowflake(value) {
+function normalizeDiscordSnowflake(value) {
 	const text = normalizeOptionalStringifiedId(value) ?? "";
 	if (!/^\d+$/.test(text)) return null;
 	return text;
@@ -26,7 +23,7 @@ function normalizeDiscordHandleKey(raw) {
 	return normalizeLowercaseStringOrEmpty(handle);
 }
 function ensureAccountCache(accountId) {
-	const cacheKey = normalizeAccountCacheKey(accountId);
+	const cacheKey = normalizeAccountId(accountId);
 	const existing = discordDirectoryCacheState.handlesByAccount.get(cacheKey);
 	if (existing) return existing;
 	const created = /* @__PURE__ */ new Map();
@@ -34,14 +31,14 @@ function ensureAccountCache(accountId) {
 	return created;
 }
 function setCacheEntry(cache, key, userId) {
-	if (cache.has(key)) cache.delete(key);
+	cache.delete(key);
 	cache.set(key, userId);
 	if (cache.size <= DISCORD_DIRECTORY_CACHE_MAX_ENTRIES) return;
 	const oldest = cache.keys().next();
 	if (!oldest.done) cache.delete(oldest.value);
 }
 function rememberDiscordDirectoryUser(params) {
-	const userId = normalizeSnowflake(params.userId);
+	const userId = normalizeDiscordSnowflake(params.userId);
 	if (!userId) return;
 	const cache = ensureAccountCache(params.accountId);
 	for (const candidate of params.handles) {
@@ -54,7 +51,7 @@ function rememberDiscordDirectoryUser(params) {
 	}
 }
 function resolveDiscordDirectoryUserId(params) {
-	const cache = discordDirectoryCacheState.handlesByAccount.get(normalizeAccountCacheKey(params.accountId));
+	const cache = discordDirectoryCacheState.handlesByAccount.get(normalizeAccountId(params.accountId));
 	if (!cache) return;
 	const handle = normalizeDiscordHandleKey(params.handle);
 	if (!handle) return;
@@ -155,4 +152,4 @@ async function listDiscordDirectoryPeersLive(params) {
 	return rows;
 }
 //#endregion
-export { rememberDiscordDirectoryUser as a, normalizeDiscordHandleKey as i, listDiscordDirectoryGroupsLive as n, resolveDiscordDirectoryUserId as o, listDiscordDirectoryPeersLive as r, directory_live_exports as t };
+export { normalizeDiscordSnowflake as a, normalizeDiscordHandleKey as i, listDiscordDirectoryGroupsLive as n, rememberDiscordDirectoryUser as o, listDiscordDirectoryPeersLive as r, resolveDiscordDirectoryUserId as s, directory_live_exports as t };