@openclaw/discord 2026.7.1 → 2026.7.2-beta.2

package/dist/{message-utils-B_3yA5bN.js → message-utils-BU3gc01v.js}

@@ -1,29 +1,30 @@
-import { o as mergeAbortSignals } from "./timeouts-C5TBc_9x.js";
-import { u as resolveDiscordChannelInfoSafe } from "./thread-bindings.discord-api-BjIf9lGs.js";
+import { u as resolveDiscordChannelInfoSafe } from "./thread-bindings.discord-api-DXfXsHGZ.js";
 import { normalizeLowercaseStringOrEmpty, normalizeOptionalString, normalizeOptionalStringifiedId, uniqueStrings } from "openclaw/plugin-sdk/string-coerce-runtime";
 import { ComponentType, StickerFormatType } from "discord-api-types/v10";
 import { asDateTimestampMs, resolveExpiresAtMsFromDurationMs } from "openclaw/plugin-sdk/number-runtime";
+import { logVerbose } from "openclaw/plugin-sdk/runtime-env";
 import { saveRemoteMedia } from "openclaw/plugin-sdk/media-runtime";
 import { buildMediaPayload } from "openclaw/plugin-sdk/reply-payload";
-import { logVerbose } from "openclaw/plugin-sdk/runtime-env";
 import { pruneMapToMaxSize } from "openclaw/plugin-sdk/collection-runtime";
 import { getFileExtension } from "openclaw/plugin-sdk/media-mime";
+//#region extensions/discord/src/monitor/message-channel-info-state.ts
+const discordChannelInfoCacheState = { entries: /* @__PURE__ */ new Map() };
+//#endregion
 //#region extensions/discord/src/monitor/message-channel-info.ts
 const DISCORD_CHANNEL_INFO_CACHE_TTL_MS = 300 * 1e3;
 const DISCORD_CHANNEL_INFO_NEGATIVE_CACHE_TTL_MS = 30 * 1e3;
 const DISCORD_CHANNEL_INFO_CACHE_MAX_ENTRIES = 1e3;
-const DISCORD_CHANNEL_INFO_CACHE = /* @__PURE__ */ new Map();
 function resolveDiscordChannelInfoCacheExpiresAt(ttlMs, nowMs) {
 	return resolveExpiresAtMsFromDurationMs(ttlMs, { nowMs });
 }
 function cacheDiscordChannelInfo(channelId, value, ttlMs, nowMs) {
 	const expiresAt = resolveDiscordChannelInfoCacheExpiresAt(ttlMs, nowMs);
 	if (expiresAt !== void 0) {
-		DISCORD_CHANNEL_INFO_CACHE.set(channelId, {
+		discordChannelInfoCacheState.entries.set(channelId, {
 			value,
 			expiresAt
 		});
-		pruneMapToMaxSize(DISCORD_CHANNEL_INFO_CACHE, DISCORD_CHANNEL_INFO_CACHE_MAX_ENTRIES);
+		pruneMapToMaxSize(discordChannelInfoCacheState.entries, DISCORD_CHANNEL_INFO_CACHE_MAX_ENTRIES);
 	}
 }
 function normalizeDiscordChannelId(value) {
@@ -36,10 +37,10 @@ function resolveDiscordMessageChannelId(params) {
 async function resolveDiscordChannelInfo(client, channelId) {
 	const rawNow = Date.now();
 	const now = asDateTimestampMs(rawNow);
-	const cached = DISCORD_CHANNEL_INFO_CACHE.get(channelId);
+	const cached = discordChannelInfoCacheState.entries.get(channelId);
 	if (cached) {
 		if (now !== void 0 && cached.expiresAt > now) return cached.value;
-		DISCORD_CHANNEL_INFO_CACHE.delete(channelId);
+		discordChannelInfoCacheState.entries.delete(channelId);
 	}
 	try {
 		const channel = await client.fetchChannel(channelId);
@@ -275,7 +276,7 @@ async function resolveReferencedReplyMediaList(message, maxBytes, options) {
 }
 async function fetchDiscordMedia(params) {
 	const timeoutAbortController = params.totalTimeoutMs ? new AbortController() : void 0;
-	const signal = mergeAbortSignals([params.abortSignal, timeoutAbortController?.signal]);
+	const signal = params.abortSignal && timeoutAbortController ? AbortSignal.any([params.abortSignal, timeoutAbortController.signal]) : params.abortSignal ?? timeoutAbortController?.signal;
 	let timedOut = false;
 	let timeoutHandle = null;
 	const savePromise = saveRemoteMedia({

package/dist/{outbound-adapter-82RWi_SR.js → outbound-adapter-ByoXsR-V.js}

@@ -1,11 +1,12 @@
-import { a as resolveDiscordReplyReference, l as normalizeDiscordOutboundTarget, t as createDiscordSendReceipt, u as chunkDiscordTextWithMode } from "./send.receipt-BpBQED_5.js";
-import { d as readDiscordComponentSpec } from "./components-BIBizbtZ.js";
+import { n as createDiscordSendReceipt, o as resolveDiscordReplyReference, t as chunkDiscordTextWithMode, u as normalizeDiscordOutboundTarget } from "./chunk-CHpY_lsO.js";
 import { n as notifyDiscordInboundEventOutboundPayloadSuccess } from "./inbound-event-delivery-CEPlt2uz.js";
-import { createLazyRuntimeModule, createLazyRuntimeNamedExport } from "openclaw/plugin-sdk/lazy-runtime";
+import { a as sendDiscordComponentMessageLazy, i as resolveDiscordComponentSpec, n as buildDiscordPresentationPayload, t as DISCORD_PRESENTATION_CAPABILITIES } from "./outbound-components-7wAolLuS.js";
 import { normalizeLowercaseStringOrEmpty, normalizeOptionalString, normalizeOptionalStringifiedId } from "openclaw/plugin-sdk/string-coerce-runtime";
-import { getReplyPayloadTtsSupplement, resolvePayloadMediaUrls, sendPayloadMediaSequenceOrFallback, sendTextMediaPayload } from "openclaw/plugin-sdk/reply-payload";
+import { expectDefined } from "openclaw/plugin-sdk/expect-runtime";
 import { truncateUtf16Safe } from "openclaw/plugin-sdk/text-utility-runtime";
 import { createReplyToFanout, resolveOutboundSendDep } from "openclaw/plugin-sdk/channel-outbound";
+import { getReplyPayloadTtsSupplement, resolvePayloadMediaUrls, sendPayloadMediaSequenceOrFallback, sendTextMediaPayload } from "openclaw/plugin-sdk/reply-payload";
+import { createLazyRuntimeModule } from "openclaw/plugin-sdk/lazy-runtime";
 import { attachChannelToResult, createAttachedChannelResultAdapter } from "openclaw/plugin-sdk/channel-send-result";
 //#region extensions/discord/src/media-detection.ts
 const DISCORD_VIDEO_MEDIA_EXTENSIONS = /* @__PURE__ */ new Set([
@@ -20,7 +21,13 @@ function normalizeMediaPathForExtension(mediaUrl) {
 	const trimmed = mediaUrl.trim();
 	if (!trimmed) return "";
 	try {
-		return normalizeLowercaseStringOrEmpty(new URL(trimmed).pathname);
+		const parsed = new URL(trimmed);
+		const fileName = parsed.pathname.slice(parsed.pathname.lastIndexOf("/") + 1);
+		try {
+			return normalizeLowercaseStringOrEmpty(decodeURIComponent(fileName));
+		} catch {
+			return normalizeLowercaseStringOrEmpty(fileName);
+		}
 	} catch {
 		const withoutHash = trimmed.split("#", 1)[0] ?? trimmed;
 		return normalizeLowercaseStringOrEmpty(withoutHash.split("?", 1)[0] ?? withoutHash);
@@ -48,43 +55,8 @@ function normalizeDiscordApprovalPayload(payload) {
 	} : payload;
 }
 //#endregion
-//#region extensions/discord/src/outbound-components.ts
-const loadDiscordComponentSend = createLazyRuntimeNamedExport(() => import("./send.components-D0I39utR.js").then((n) => n.i), "sendDiscordComponentMessage");
-async function sendDiscordComponentMessageLazy(...args) {
-	return await (await loadDiscordComponentSend())(...args);
-}
-const loadDiscordSharedInteractive = createLazyRuntimeModule(() => import("./components-BIBizbtZ.js").then((n) => n.a));
-function addPayloadTextFallback(spec, payload) {
-	return spec.text ? spec : {
-		...spec,
-		text: payload.text?.trim() ? payload.text : void 0
-	};
-}
-async function buildDiscordPresentationPayload(params) {
-	const componentSpec = (await loadDiscordSharedInteractive()).buildDiscordPresentationComponents(params.presentation);
-	if (!componentSpec) return null;
-	return {
-		...params.payload,
-		channelData: {
-			...params.payload.channelData,
-			discord: {
-				...params.payload.channelData?.discord,
-				presentationComponents: componentSpec
-			}
-		}
-	};
-}
-async function resolveDiscordComponentSpec(payload) {
-	const discordData = payload.channelData?.discord;
-	const rawComponentSpec = discordData?.presentationComponents ?? (discordData?.components && typeof discordData.components === "object" && !Array.isArray(discordData.components) ? readDiscordComponentSpec(discordData.components) : null);
-	if (rawComponentSpec) return addPayloadTextFallback(rawComponentSpec, payload);
-	if (!payload.interactive) return;
-	const interactiveSpec = (await loadDiscordSharedInteractive()).buildDiscordInteractiveComponents(payload.interactive);
-	return interactiveSpec ? addPayloadTextFallback(interactiveSpec, payload) : void 0;
-}
-//#endregion
 //#region extensions/discord/src/outbound-send-context.ts
-const loadDiscordSendRuntime = createLazyRuntimeModule(() => import("./send-iJ0B4bAX.js").then((n) => n.t));
+const loadDiscordSendRuntime = createLazyRuntimeModule(() => import("./send-JJzVo_sK.js").then((n) => n.t));
 function resolveDiscordOutboundTarget(params) {
 	if (params.threadId == null) return params.to;
 	const threadId = normalizeOptionalStringifiedId(params.threadId) ?? "";
@@ -172,7 +144,8 @@ async function sendDiscordOutboundPayload(params) {
 		let deliveredVoice = false;
 		let lastResult;
 		try {
-			lastResult = await sendContext.sendVoice(sendContext.target, mediaUrls[0], { ...resolveDiscordDeliveryOptions(ctx, sendContext, voiceReply) });
+			const voiceUrl = expectDefined(mediaUrls.at(0), "non-empty Discord voice media URLs");
+			lastResult = await sendContext.sendVoice(sendContext.target, voiceUrl, { ...resolveDiscordDeliveryOptions(ctx, sendContext, voiceReply) });
 			deliveredVoice = true;
 		} catch (err) {
 			const supplement = getReplyPayloadTtsSupplement(payload);
@@ -268,7 +241,7 @@ const DISCORD_INTERNAL_RUNTIME_SCAFFOLDING_TAG_RE = /<\s*\/?\s*(?:system-reminde
 function stripDiscordInternalRuntimeScaffolding(text) {
 	return text.replace(DISCORD_INTERNAL_RUNTIME_SCAFFOLDING_BLOCK_RE, "").replace(DISCORD_INTERNAL_RUNTIME_SCAFFOLDING_SELF_CLOSING_RE, "").replace(DISCORD_INTERNAL_RUNTIME_SCAFFOLDING_TAG_RE, "");
 }
-const loadDiscordThreadBindings = createLazyRuntimeModule(() => import("./thread-bindings-DsTxqu3E.js").then((n) => n.t));
+const loadDiscordThreadBindings = createLazyRuntimeModule(() => import("./thread-bindings-4MV-u8vU.js").then((n) => n.t));
 function resolveDiscordWebhookIdentity(params) {
 	const usernameRaw = normalizeOptionalString(params.identity?.name);
 	const fallbackUsername = normalizeOptionalString(params.binding.label) ?? params.binding.agentId;
@@ -312,32 +285,7 @@ const discordOutbound = {
 	sanitizeText: ({ text }) => stripDiscordInternalRuntimeScaffolding(text),
 	pollMaxOptions: 10,
 	normalizePayload: ({ payload }) => normalizeDiscordApprovalPayload(payload),
-	presentationCapabilities: {
-		supported: true,
-		buttons: true,
-		selects: true,
-		context: true,
-		divider: true,
-		limits: {
-			actions: {
-				maxActions: 25,
-				maxActionsPerRow: 5,
-				maxRows: 5,
-				maxLabelLength: 80,
-				supportsDisabled: true
-			},
-			selects: {
-				maxOptions: 25,
-				maxLabelLength: 100,
-				maxValueBytes: 100
-			},
-			text: {
-				maxLength: DISCORD_TEXT_CHUNK_LIMIT,
-				encoding: "characters",
-				markdownDialect: "discord-markdown"
-			}
-		}
-	},
+	presentationCapabilities: DISCORD_PRESENTATION_CAPABILITIES,
 	deliveryCapabilities: { durableFinal: {
 		text: true,
 		media: true,

package/dist/outbound-components-7wAolLuS.js

@@ -0,0 +1,99 @@
+import { m as readDiscordComponentSpec } from "./outbound-session-route-D4QqePZN.js";
+import { createLazyRuntimeModule, createLazyRuntimeNamedExport } from "openclaw/plugin-sdk/lazy-runtime";
+//#region extensions/discord/src/outbound-components.ts
+const DISCORD_MESSAGE_COMPONENT_LIMIT = 40;
+const DISCORD_TEXT_DISPLAY_LIMIT = 2e3;
+const DISCORD_PRESENTATION_CAPABILITIES = {
+	supported: true,
+	buttons: true,
+	selects: true,
+	context: true,
+	divider: true,
+	charts: false,
+	limits: {
+		actions: {
+			maxActions: 25,
+			maxActionsPerRow: 5,
+			maxRows: 5,
+			maxLabelLength: 80,
+			supportsDisabled: true
+		},
+		selects: {
+			maxOptions: 25,
+			maxLabelLength: 100,
+			maxValueBytes: 100
+		},
+		text: {
+			maxLength: DISCORD_TEXT_DISPLAY_LIMIT - Array.from("-# ").length,
+			encoding: "characters",
+			markdownDialect: "discord-markdown"
+		}
+	}
+};
+const loadDiscordComponentSend = createLazyRuntimeNamedExport(() => import("./send.components-CCRW54gK.js").then((n) => n.i), "sendDiscordComponentMessage");
+async function sendDiscordComponentMessageLazy(...args) {
+	return await (await loadDiscordComponentSend())(...args);
+}
+const loadDiscordSharedInteractive = createLazyRuntimeModule(() => import("./outbound-session-route-D4QqePZN.js").then((n) => n.o));
+function addPayloadTextFallback(spec, payload) {
+	return spec.text ? spec : {
+		...spec,
+		text: payload.text?.trim() ? payload.text : void 0
+	};
+}
+function countDiscordComponentBlock(block) {
+	if (block.type === "section") return 1 + (block.texts?.length ? block.texts.length : block.text ? 1 : 0) + (block.accessory ? 1 : 0);
+	if (block.type === "actions") return 1 + (block.buttons?.length ?? (block.select ? 1 : 0));
+	return 1;
+}
+function countDiscordMessageComponents(params) {
+	const blocks = params.spec.blocks ?? [];
+	let count = 1 + (params.spec.text ? 1 : 0);
+	for (const block of blocks) count += countDiscordComponentBlock(block);
+	if (params.spec.modal) {
+		const lastBlock = blocks.at(-1);
+		const triggerFitsLastRow = lastBlock?.type === "actions" && !lastBlock.select && (lastBlock.buttons?.length ?? 0) < 5;
+		count += triggerFitsLastRow ? 1 : 2;
+	}
+	const hasFileBlock = blocks.some((block) => block.type === "file");
+	if (params.includesMedia && !hasFileBlock) count += 1;
+	return count;
+}
+function isDiscordComponentSpecWithinMessageLimit(params) {
+	const countedSpec = addPayloadTextFallback(params.spec, { text: params.fallbackText });
+	if (countedSpec.text && Array.from(countedSpec.text).length > DISCORD_TEXT_DISPLAY_LIMIT) return false;
+	return countDiscordMessageComponents({
+		spec: countedSpec,
+		includesMedia: params.includesMedia === true
+	}) <= DISCORD_MESSAGE_COMPONENT_LIMIT;
+}
+async function buildDiscordPresentationPayload(params) {
+	const componentSpec = (await loadDiscordSharedInteractive()).buildDiscordPresentationComponents(params.presentation);
+	if (!componentSpec) return null;
+	const includesMedia = Boolean(params.payload.mediaUrl || params.payload.mediaUrls?.some((mediaUrl) => mediaUrl));
+	if (!isDiscordComponentSpecWithinMessageLimit({
+		spec: componentSpec,
+		fallbackText: params.payload.text,
+		includesMedia
+	})) return null;
+	return {
+		...params.payload,
+		channelData: {
+			...params.payload.channelData,
+			discord: {
+				...params.payload.channelData?.discord,
+				presentationComponents: componentSpec
+			}
+		}
+	};
+}
+async function resolveDiscordComponentSpec(payload) {
+	const discordData = payload.channelData?.discord;
+	const rawComponentSpec = discordData?.presentationComponents ?? (discordData?.components && typeof discordData.components === "object" && !Array.isArray(discordData.components) ? readDiscordComponentSpec(discordData.components) : null);
+	if (rawComponentSpec) return addPayloadTextFallback(rawComponentSpec, payload);
+	if (!payload.interactive) return;
+	const interactiveSpec = (await loadDiscordSharedInteractive()).buildDiscordInteractiveComponents(payload.interactive);
+	return interactiveSpec ? addPayloadTextFallback(interactiveSpec, payload) : void 0;
+}
+//#endregion
+export { sendDiscordComponentMessageLazy as a, resolveDiscordComponentSpec as i, buildDiscordPresentationPayload as n, isDiscordComponentSpecWithinMessageLimit as r, DISCORD_PRESENTATION_CAPABILITIES as t };

package/dist/{components-BIBizbtZ.js → outbound-session-route-D4QqePZN.js}

@@ -1,81 +1,86 @@
-import { $ as StringSelectMenu, B as RadioGroup, G as File, H as Button, J as MentionableSelectMenu, Jt as __exportAll, K as LinkButton, Kt as parseDiscordTarget, L as CheckboxGroup, Q as Separator, R as Label, U as ChannelSelectMenu, V as TextInput, W as Container, X as Row, Y as RoleSelectMenu, Z as Section, et as TextDisplay, it as parseCustomId, nt as UserSelectMenu, q as MediaGallery, tt as Thumbnail, z as Modal } from "./send.receipt-BpBQED_5.js";
-import { normalizeLowercaseStringOrEmpty } from "openclaw/plugin-sdk/string-coerce-runtime";
+import { $ as RoleSelectMenu, G as TextInput, H as Label, J as Container, K as Button, Q as MentionableSelectMenu, U as Modal, V as CheckboxGroup, W as RadioGroup, X as LinkButton, Y as File, Z as MediaGallery, Zt as __exportAll, at as Thumbnail, ct as parseCustomId, d as parseDiscordTarget, et as Row, it as TextDisplay, nt as Separator, ot as UserSelectMenu, q as ChannelSelectMenu, rt as StringSelectMenu, tt as Section } from "./chunk-CHpY_lsO.js";
 import { buildOutboundBaseSessionKey } from "openclaw/plugin-sdk/routing";
-import { buildThreadAwareOutboundSessionRoute } from "openclaw/plugin-sdk/channel-core";
+import { normalizeLowercaseStringOrEmpty } from "openclaw/plugin-sdk/string-coerce-runtime";
 import { ButtonStyle, MessageFlags, TextInputStyle } from "discord-api-types/v10";
 import crypto from "node:crypto";
-import { reduceInteractiveReply, resolveMessagePresentationControlValue } from "openclaw/plugin-sdk/interactive-runtime";
-//#region extensions/discord/src/outbound-session-route.ts
-function resolveDiscordOutboundSessionRoute(params) {
-	const parsed = parseDiscordTarget(params.target, { defaultKind: resolveDiscordOutboundTargetKindHint(params) });
-	if (!parsed) return null;
-	const explicitThreadId = params.threadId == null ? void 0 : String(params.threadId).trim();
-	const peerId = explicitThreadId || parsed.id;
-	const isDm = parsed.kind === "user" && !explicitThreadId;
-	const recipientSessionExact = /^\d+$/.test(peerId);
-	const peer = {
-		kind: isDm ? "direct" : "channel",
-		id: peerId
-	};
-	const baseSessionKey = buildOutboundBaseSessionKey({
-		cfg: params.cfg,
-		agentId: params.agentId,
-		channel: "discord",
-		accountId: params.accountId,
-		peer
-	});
-	return buildThreadAwareOutboundSessionRoute({
-		route: {
-			sessionKey: baseSessionKey,
-			baseSessionKey,
-			recipientSessionExact,
-			peer,
-			chatType: isDm ? "direct" : "channel",
-			from: isDm ? `discord:${peerId}` : `discord:channel:${peerId}`,
-			to: isDm ? `user:${peerId}` : `channel:${peerId}`
-		},
-		threadId: params.threadId,
-		precedence: ["threadId"],
-		useSuffix: false
-	});
+import { reduceInteractiveReply, resolveMessagePresentationButtonAction, resolveMessagePresentationOptionAction } from "openclaw/plugin-sdk/interactive-runtime";
+import { buildApprovalResolutionRef } from "openclaw/plugin-sdk/approval-reference-runtime";
+import { buildThreadAwareOutboundSessionRoute } from "openclaw/plugin-sdk/channel-core";
+//#region extensions/discord/src/custom-id-codec.ts
+/**
+* URI-component codec for values embedded in `k=v;` custom-id grammars
+* (exec approvals, model picker, command args, agent components).
+* Decode falls back to the raw value: Discord redelivers old component ids
+* indefinitely and historical values may predate strict encoding.
+*/
+function encodeCustomIdComponent(value) {
+	return encodeURIComponent(value);
 }
-function resolveDiscordOutboundTargetKindHint(params) {
-	const resolvedKind = params.resolvedTarget?.kind;
-	if (resolvedKind === "user") return "user";
-	if (resolvedKind === "group" || resolvedKind === "channel") return "channel";
-	const target = params.target.trim();
-	if (/^channel:/i.test(target)) return "channel";
-	if (/^(user:|discord:|@|<@!?)/i.test(target)) return "user";
-	return "channel";
+function decodeCustomIdComponent(value) {
+	try {
+		return decodeURIComponent(value);
+	} catch {
+		return value;
+	}
+}
+/**
+* Minimal field escape for the versioned `occomp`/`ocmodal` grammar: only `%`
+* and the `;` field separator are escaped to preserve the 100-char custom-id
+* budget. The wire format is versioned (`e=1`); do not swap this for the URI
+* codec — in-flight component ids must keep decoding byte-exactly.
+*/
+function escapeCustomIdFieldValue(value) {
+	return value.replace(/%/g, "%25").replace(/;/g, "%3B");
+}
+function needsCustomIdFieldEscaping(value) {
+	return /[%;]/.test(value);
+}
+function unescapeCustomIdFieldValue(value) {
+	return value.replace(/%(25|3B)/gi, (match) => match.toLowerCase() === "%25" ? "%" : ";");
 }
 //#endregion
 //#region extensions/discord/src/component-custom-id.ts
 const DISCORD_COMPONENT_CUSTOM_ID_KEY = "occomp";
 const DISCORD_MODAL_CUSTOM_ID_KEY = "ocmodal";
+const DISCORD_ACTIVITY_CUSTOM_ID_KEY = "ocactivity";
 const ENCODED_CUSTOM_ID_VERSION = "1";
-function encodeCustomIdValue(value) {
-	return value.replace(/%/g, "%25").replace(/;/g, "%3B");
+const DISCORD_ACTIVITY_CUSTOM_ID_PREFIX = `${DISCORD_ACTIVITY_CUSTOM_ID_KEY}${ENCODED_CUSTOM_ID_VERSION}_`;
+function isValidDiscordActivityWidgetId(widgetId) {
+	return /^[A-Za-z0-9_-]{22}$/.test(widgetId);
 }
-function needsCustomIdEncoding(value) {
-	return /[%;]/.test(value);
+function buildDiscordActivityCustomId(widgetId) {
+	return `${DISCORD_ACTIVITY_CUSTOM_ID_PREFIX}${widgetId}`;
 }
-function decodeCustomIdValue(value) {
-	return value.replace(/%(25|3B)/gi, (match) => match.toLowerCase() === "%25" ? "%" : ";");
+function parseDiscordActivityCustomId(id) {
+	if (id.startsWith(DISCORD_ACTIVITY_CUSTOM_ID_PREFIX)) {
+		const widgetId = id.slice(DISCORD_ACTIVITY_CUSTOM_ID_PREFIX.length);
+		return isValidDiscordActivityWidgetId(widgetId) ? { widgetId } : null;
+	}
+	const parsed = parseCustomId(id);
+	if (parsed.key !== DISCORD_ACTIVITY_CUSTOM_ID_KEY || parsed.data.v !== ENCODED_CUSTOM_ID_VERSION || typeof parsed.data.wid !== "string" || !isValidDiscordActivityWidgetId(parsed.data.wid)) return null;
+	return { widgetId: parsed.data.wid };
+}
+function parseDiscordActivityCustomIdForInteraction(id) {
+	const parsed = parseDiscordActivityCustomId(id);
+	return parsed ? {
+		key: DISCORD_ACTIVITY_CUSTOM_ID_KEY,
+		data: { widgetId: parsed.widgetId }
+	} : parseCustomId(id);
 }
 function decodeParsedCustomIdData(data) {
 	if (data.e !== ENCODED_CUSTOM_ID_VERSION) return data;
-	return Object.fromEntries(Object.entries(data).map(([key, value]) => [key, typeof value === "string" ? decodeCustomIdValue(value) : value]));
+	return Object.fromEntries(Object.entries(data).map(([key, value]) => [key, typeof value === "string" ? unescapeCustomIdFieldValue(value) : value]));
 }
 function buildDiscordComponentCustomId(params) {
-	const encoded = needsCustomIdEncoding(params.componentId) || needsCustomIdEncoding(params.modalId ?? "");
-	const componentId = encoded ? encodeCustomIdValue(params.componentId) : params.componentId;
+	const encoded = needsCustomIdFieldEscaping(params.componentId) || needsCustomIdFieldEscaping(params.modalId ?? "");
+	const componentId = encoded ? escapeCustomIdFieldValue(params.componentId) : params.componentId;
 	const base = encoded ? `${DISCORD_COMPONENT_CUSTOM_ID_KEY}:e=${ENCODED_CUSTOM_ID_VERSION};cid=${componentId}` : `${DISCORD_COMPONENT_CUSTOM_ID_KEY}:cid=${componentId}`;
 	const modalId = params.modalId;
 	if (!modalId) return base;
-	return `${base};mid=${encoded ? encodeCustomIdValue(modalId) : modalId}`;
+	return `${base};mid=${encoded ? escapeCustomIdFieldValue(modalId) : modalId}`;
 }
 function buildDiscordModalCustomId(modalId) {
-	return needsCustomIdEncoding(modalId) ? `${DISCORD_MODAL_CUSTOM_ID_KEY}:e=${ENCODED_CUSTOM_ID_VERSION};mid=${encodeCustomIdValue(modalId)}` : `${DISCORD_MODAL_CUSTOM_ID_KEY}:mid=${modalId}`;
+	return needsCustomIdFieldEscaping(modalId) ? `${DISCORD_MODAL_CUSTOM_ID_KEY}:e=${ENCODED_CUSTOM_ID_VERSION};mid=${escapeCustomIdFieldValue(modalId)}` : `${DISCORD_MODAL_CUSTOM_ID_KEY}:mid=${modalId}`;
 }
 function parseDiscordComponentCustomId(id) {
 	const parsed = parseCustomId(id);
@@ -828,6 +833,62 @@ function createDiscordFormModal(entry) {
 	});
 }
 //#endregion
+//#region extensions/discord/src/approval-custom-id.ts
+const DISCORD_APPROVAL_CUSTOM_ID_MAX_CHARS = 100;
+function encodeDiscordApprovalCustomId(action) {
+	return [
+		`execapproval:kind=${action.approvalKind}`,
+		`id=${encodeURIComponent(action.approvalId)}`,
+		`action=${action.decision}`
+	].join(";");
+}
+function encodeBoundedDiscordApprovalCustomId(action) {
+	const exact = encodeDiscordApprovalCustomId(action);
+	if (exact.length <= DISCORD_APPROVAL_CUSTOM_ID_MAX_CHARS) return exact;
+	return encodeDiscordApprovalCustomId({
+		...action,
+		approvalId: buildApprovalResolutionRef({
+			approvalId: action.approvalId,
+			approvalKind: action.approvalKind
+		})
+	});
+}
+function buildDiscordApprovalCustomId(action) {
+	if (!action.approvalId || action.approvalKind !== "exec" && action.approvalKind !== "plugin" || action.decision !== "allow-once" && action.decision !== "allow-always" && action.decision !== "deny") return;
+	return encodeBoundedDiscordApprovalCustomId(action);
+}
+function buildExecApprovalCustomId(approvalId, approvalKind, decision) {
+	return encodeBoundedDiscordApprovalCustomId({
+		type: "approval",
+		approvalId,
+		approvalKind,
+		decision
+	});
+}
+function decodeCustomIdValue(value) {
+	try {
+		return decodeURIComponent(value);
+	} catch {
+		return null;
+	}
+}
+function parseExecApprovalData(data) {
+	if (!data || typeof data !== "object") return null;
+	const coerce = (value) => typeof value === "string" || typeof value === "number" ? String(value) : "";
+	const rawId = coerce(data.id);
+	const rawKind = coerce(data.kind);
+	const rawAction = coerce(data.action);
+	if (!rawId || rawKind !== "exec" && rawKind !== "plugin" || !rawAction) return null;
+	if (rawAction !== "allow-once" && rawAction !== "allow-always" && rawAction !== "deny") return null;
+	const approvalId = decodeCustomIdValue(rawId);
+	if (!approvalId) return null;
+	return {
+		approvalId,
+		approvalKind: rawKind,
+		action: rawAction
+	};
+}
+//#endregion
 //#region extensions/discord/src/shared-interactive.ts
 var shared_interactive_exports = /* @__PURE__ */ __exportAll({
 	buildDiscordInteractiveComponents: () => buildDiscordInteractiveComponents,
@@ -836,14 +897,10 @@ var shared_interactive_exports = /* @__PURE__ */ __exportAll({
 function resolveDiscordInteractiveButtonStyle(style) {
 	return style ?? "secondary";
 }
-function applyDiscordButtonCallback(spec, button) {
-	const callbackData = resolveMessagePresentationControlValue(button);
-	if (!callbackData) return;
-	spec.callbackData = callbackData;
-	if (button.action?.type === "command" || button.action?.type === "callback") spec.callbackDataKind = button.action.type;
-}
 function resolveDiscordSelectOptionValue(option) {
-	return resolveMessagePresentationControlValue(option);
+	const action = resolveMessagePresentationOptionAction(option);
+	if (action?.type === "command") return action.command;
+	if (action?.type === "callback") return action.value;
 }
 function resolveDiscordSelectCallbackDataKind(options) {
 	const renderableOptions = options.filter((option) => resolveDiscordSelectOptionValue(option));
@@ -852,6 +909,47 @@ function resolveDiscordSelectCallbackDataKind(options) {
 	if (renderableOptions.some((option) => option.action)) return "mixed";
 }
 const DISCORD_INTERACTIVE_BUTTON_ROW_SIZE = 5;
+function buildDiscordButtonComponent(button) {
+	const action = resolveMessagePresentationButtonAction(button);
+	if (!action) return;
+	if (action.type === "approval") {
+		const internalCustomId = buildDiscordApprovalCustomId(action);
+		if (!internalCustomId) return;
+		return {
+			label: button.label,
+			style: resolveDiscordInteractiveButtonStyle(button.style),
+			internalCustomId,
+			...button.disabled === true ? { disabled: true } : {}
+		};
+	}
+	if (action.type === "web-app" && action.widgetId && isValidDiscordActivityWidgetId(action.widgetId)) return {
+		label: button.label,
+		style: resolveDiscordInteractiveButtonStyle(button.style),
+		internalCustomId: buildDiscordActivityCustomId(action.widgetId),
+		...button.disabled === true ? { disabled: true } : {},
+		...button.reusable === true ? { reusable: true } : {}
+	};
+	if (action.type === "web-app" && !action.url) return;
+	const component = {
+		label: button.label,
+		style: action.type === "url" || action.type === "web-app" ? "link" : resolveDiscordInteractiveButtonStyle(button.style)
+	};
+	if (action.type === "url" || action.type === "web-app") component.url = action.url;
+	else {
+		component.callbackData = action.type === "command" ? action.command : action.value;
+		if (button.action?.type === "command" || button.action?.type === "callback") component.callbackDataKind = button.action.type;
+	}
+	if (button.disabled === true) component.disabled = true;
+	if (button.reusable === true) component.reusable = true;
+	return component;
+}
+function appendDiscordButtonBlocks(blocks, buttons) {
+	const components = buttons.map((button) => buildDiscordButtonComponent(button)).filter((button) => Boolean(button));
+	for (let index = 0; index < components.length; index += DISCORD_INTERACTIVE_BUTTON_ROW_SIZE) blocks.push({
+		type: "actions",
+		buttons: components.slice(index, index + DISCORD_INTERACTIVE_BUTTON_ROW_SIZE)
+	});
+}
 /**
 * @deprecated Use buildDiscordPresentationComponents with MessagePresentation.
 */
@@ -866,21 +964,7 @@ function buildDiscordInteractiveComponents(interactive) {
 			return state;
 		}
 		if (block.type === "buttons") {
-			if (block.buttons.length === 0) return state;
-			for (let index = 0; index < block.buttons.length; index += DISCORD_INTERACTIVE_BUTTON_ROW_SIZE) state.push({
-				type: "actions",
-				buttons: block.buttons.slice(index, index + DISCORD_INTERACTIVE_BUTTON_ROW_SIZE).map((button) => {
-					const spec = {
-						label: button.label,
-						style: button.url ? "link" : resolveDiscordInteractiveButtonStyle(button.style)
-					};
-					applyDiscordButtonCallback(spec, button);
-					if (button.url) spec.url = button.url;
-					if (button.disabled === true) spec.disabled = true;
-					if (button.reusable === true) spec.reusable = true;
-					return spec;
-				})
-			});
+			appendDiscordButtonBlocks(state, block.buttons);
 			return state;
 		}
 		if (block.type === "select" && block.options.length > 0) {
@@ -953,21 +1037,7 @@ function buildDiscordPresentationComponents(presentation) {
 	return spec.blocks?.length ? spec : void 0;
 }
 function appendDiscordPresentationButtonBlocks(spec, buttons) {
-	if (buttons.length === 0) return;
-	for (let index = 0; index < buttons.length; index += DISCORD_INTERACTIVE_BUTTON_ROW_SIZE) spec.blocks?.push({
-		type: "actions",
-		buttons: buttons.slice(index, index + DISCORD_INTERACTIVE_BUTTON_ROW_SIZE).map((button) => {
-			const component = {
-				label: button.label,
-				style: button.url ? "link" : resolveDiscordInteractiveButtonStyle(button.style)
-			};
-			applyDiscordButtonCallback(component, button);
-			if (button.url) component.url = button.url;
-			if (button.disabled === true) component.disabled = true;
-			if (button.reusable === true) component.reusable = true;
-			return component;
-		})
-	});
+	if (spec.blocks) appendDiscordButtonBlocks(spec.blocks, buttons);
 }
 //#endregion
 //#region extensions/discord/src/components.ts
@@ -998,4 +1068,48 @@ function formatDiscordComponentEventText(params) {
 	return `Selected ${values.join(", ")} from "${params.label}".`;
 }
 //#endregion
-export { parseDiscordComponentCustomId as _, shared_interactive_exports as a, parseDiscordModalCustomIdForInteraction as b, buildDiscordComponentMessage as c, readDiscordComponentSpec as d, resolveDiscordComponentAttachmentName as f, buildDiscordModalCustomId as g, buildDiscordComponentCustomId as h, buildDiscordPresentationComponents as i, buildDiscordComponentMessageFlags as l, DISCORD_MODAL_CUSTOM_ID_KEY as m, formatDiscordComponentEventText as n, DiscordFormModal as o, DISCORD_COMPONENT_CUSTOM_ID_KEY as p, buildDiscordInteractiveComponents as r, createDiscordFormModal as s, components_exports as t, DISCORD_COMPONENT_ATTACHMENT_PREFIX as u, parseDiscordComponentCustomIdForInteraction as v, resolveDiscordOutboundSessionRoute as x, parseDiscordModalCustomId as y };
+//#region extensions/discord/src/outbound-session-route.ts
+function resolveDiscordOutboundSessionRoute(params) {
+	const parsed = parseDiscordTarget(params.target, { defaultKind: resolveDiscordOutboundTargetKindHint(params) });
+	if (!parsed) return null;
+	const explicitThreadId = params.threadId == null ? void 0 : String(params.threadId).trim();
+	const peerId = explicitThreadId || parsed.id;
+	const isDm = parsed.kind === "user" && !explicitThreadId;
+	const recipientSessionExact = /^\d+$/.test(peerId);
+	const peer = {
+		kind: isDm ? "direct" : "channel",
+		id: peerId
+	};
+	const baseSessionKey = buildOutboundBaseSessionKey({
+		cfg: params.cfg,
+		agentId: params.agentId,
+		channel: "discord",
+		accountId: params.accountId,
+		peer
+	});
+	return buildThreadAwareOutboundSessionRoute({
+		route: {
+			sessionKey: baseSessionKey,
+			baseSessionKey,
+			recipientSessionExact,
+			peer,
+			chatType: isDm ? "direct" : "channel",
+			from: isDm ? `discord:${peerId}` : `discord:channel:${peerId}`,
+			to: isDm ? `user:${peerId}` : `channel:${peerId}`
+		},
+		threadId: params.threadId,
+		precedence: ["threadId"],
+		useSuffix: false
+	});
+}
+function resolveDiscordOutboundTargetKindHint(params) {
+	const resolvedKind = params.resolvedTarget?.kind;
+	if (resolvedKind === "user") return "user";
+	if (resolvedKind === "group" || resolvedKind === "channel") return "channel";
+	const target = params.target.trim();
+	if (/^channel:/i.test(target)) return "channel";
+	if (/^(user:|discord:|@|<@!?)/i.test(target)) return "user";
+	return "channel";
+}
+//#endregion
+export { parseDiscordComponentCustomId as C, decodeCustomIdComponent as D, parseDiscordModalCustomIdForInteraction as E, encodeCustomIdComponent as O, parseDiscordActivityCustomIdForInteraction as S, parseDiscordModalCustomId as T, DISCORD_MODAL_CUSTOM_ID_KEY as _, buildDiscordPresentationComponents as a, buildDiscordModalCustomId as b, parseExecApprovalData as c, buildDiscordComponentMessage as d, buildDiscordComponentMessageFlags as f, DISCORD_COMPONENT_CUSTOM_ID_KEY as g, resolveDiscordComponentAttachmentName as h, buildDiscordInteractiveComponents as i, DiscordFormModal as l, readDiscordComponentSpec as m, components_exports as n, shared_interactive_exports as o, DISCORD_COMPONENT_ATTACHMENT_PREFIX as p, formatDiscordComponentEventText as r, buildExecApprovalCustomId as s, resolveDiscordOutboundSessionRoute as t, createDiscordFormModal as u, buildDiscordActivityCustomId as v, parseDiscordComponentCustomIdForInteraction as w, parseDiscordActivityCustomId as x, buildDiscordComponentCustomId as y };