@openclaw/discord 2026.7.1-beta.6 → 2026.7.2-beta.1

package/dist/{channel-DGWPH5u3.js → channel-nYmJ7FKQ.js}

@@ -1,16 +1,17 @@
-import { Kt as parseDiscordTarget, c as normalizeDiscordMessagingTarget, s as looksLikeDiscordTargetId } from "./send.receipt-BpBQED_5.js";
-import { c as resolveDiscordAccountAllowFrom, i as listEnabledDiscordAccounts, o as resolveDefaultDiscordAccountId, s as resolveDiscordAccount } from "./accounts-P19jm1lf.js";
+import { Jt as parseDiscordTarget, c as normalizeDiscordMessagingTarget, s as looksLikeDiscordTargetId } from "./send.receipt-aegk69an.js";
+import { c as resolveDiscordAccountAllowFrom, i as listEnabledDiscordAccounts, o as resolveDefaultDiscordAccountId, r as listDiscordAccountIds, s as resolveDiscordAccount } from "./accounts-P19jm1lf.js";
 import { a as projectCredentialSnapshotFields, n as PAIRING_APPROVED_MESSAGE, o as resolveConfiguredFromCredentialStatuses, r as buildTokenChannelStatusSummary, t as DEFAULT_ACCOUNT_ID } from "./channel-api-CAJ0wMoV.js";
-import { x as resolveDiscordOutboundSessionRoute } from "./components-BIBizbtZ.js";
+import { C as resolveDiscordOutboundSessionRoute } from "./components-BVrfRS-F.js";
+import { d as withAbortTimeout } from "./timeouts-ZRc9Lw4y.js";
 import { t as getDiscordRuntime } from "./runtime-DgnVQ7zW.js";
-import { c as shouldSuppressLocalDiscordExecApprovalPrompt, n as resolveDiscordCurrentConversationIdentity, r as getDiscordApprovalCapability } from "./conversation-identity-DWC5d8Sy.js";
+import { a as isDiscordExecApprovalClientEnabled, c as createChannelApproverDmTargetResolver, d as matchesApprovalRequestFilters, i as isDiscordExecApprovalApprover, l as createChannelNativeOriginTargetResolver, n as resolveDiscordCurrentConversationIdentity, o as shouldSuppressLocalDiscordExecApprovalPrompt, r as getDiscordExecApprovalApprovers, s as createApproverRestrictedNativeApprovalCapability, u as isChannelExecApprovalClientEnabledFromConfig } from "./conversation-identity-BpkAzklg.js";
 import { r as resolveRequiredDiscordChannelPermissions } from "./audit-core-xwjIczO0.js";
-import { t as discordMessageActions$1 } from "./channel-actions-D_fjVUZ_.js";
-import { n as setThreadBindingMaxAgeBySessionKey, t as setThreadBindingIdleTimeoutBySessionKey } from "./thread-bindings.session-updates-Chs3HgGa.js";
-import { d as withAbortTimeout } from "./timeouts-C5TBc_9x.js";
-import { n as discordOutbound } from "./outbound-adapter-82RWi_SR.js";
-import { a as discordSecurityAdapter, i as discordSetupAdapter, n as discordConfigAdapter, t as createDiscordPluginBase } from "./shared-BQVKfnev.js";
+import { t as discordMessageActions$1 } from "./channel-actions-ChpBSRcu.js";
+import { n as setThreadBindingMaxAgeBySessionKey, t as setThreadBindingIdleTimeoutBySessionKey } from "./thread-bindings.session-updates-eRcJlzIU.js";
+import { n as discordOutbound } from "./outbound-adapter-Czny0Fae.js";
+import { a as discordSecurityAdapter, i as discordSetupAdapter, n as discordConfigAdapter, t as createDiscordPluginBase } from "./shared-BLYBt5SA.js";
 import { t as normalizeExplicitDiscordSessionKey } from "./session-key-normalization-wJgsKPNF.js";
+import { t as defaultTopLevelPlacement } from "./thread-binding-api-BDZJD4na.js";
 import { createLazyRuntimeModule } from "openclaw/plugin-sdk/lazy-runtime";
 import { normalizeLowercaseStringOrEmpty, normalizeOptionalString, normalizeOptionalStringifiedId } from "openclaw/plugin-sdk/string-coerce-runtime";
 import { createChatChannelPlugin } from "openclaw/plugin-sdk/channel-core";
@@ -22,8 +23,187 @@ import { createPairingPrefixStripper } from "openclaw/plugin-sdk/channel-pairing
 import { createChannelDirectoryAdapter, createRuntimeDirectoryLiveAdapter } from "openclaw/plugin-sdk/directory-runtime";
 import { appendMatchMetadata, asString, createComputedAccountStatusAdapter, createDefaultChannelRuntimeState, isRecord as isRecord$1, resolveEnabledConfiguredAccountId } from "openclaw/plugin-sdk/status-helpers";
 import { resolveTargetsWithOptionalToken } from "openclaw/plugin-sdk/target-resolver-runtime";
-import { resolveToolsBySender } from "openclaw/plugin-sdk/channel-policy";
+import { createLazyChannelApprovalNativeRuntimeAdapter } from "openclaw/plugin-sdk/approval-handler-adapter-runtime";
+import { doesApprovalRequestMatchChannelAccount, resolveApprovalRequestSessionConversation } from "openclaw/plugin-sdk/approval-native-runtime";
+import { resolveScopeRequireMention, resolveScopeToolsPolicy } from "openclaw/plugin-sdk/channel-policy";
 import { normalizeAtHashSlug } from "openclaw/plugin-sdk/string-normalization-runtime";
+//#region extensions/discord/src/approval-shared.ts
+function shouldHandleDiscordApprovalRequest(params) {
+	const config = params.configOverride ?? resolveDiscordAccount({
+		cfg: params.cfg,
+		accountId: params.accountId
+	}).config.execApprovals;
+	const approvers = getDiscordExecApprovalApprovers({
+		cfg: params.cfg,
+		accountId: params.accountId,
+		configOverride: params.configOverride
+	});
+	if (!doesApprovalRequestMatchChannelAccount({
+		cfg: params.cfg,
+		request: params.request,
+		channel: "discord",
+		accountId: params.accountId
+	})) return false;
+	if (!isChannelExecApprovalClientEnabledFromConfig({
+		enabled: config?.enabled,
+		approverCount: approvers.length
+	})) return false;
+	return matchesApprovalRequestFilters({
+		request: params.request.request,
+		agentFilter: config?.agentFilter,
+		sessionFilter: config?.sessionFilter
+	});
+}
+//#endregion
+//#region extensions/discord/src/approval-native.ts
+function extractDiscordSessionKind(sessionKey) {
+	if (!sessionKey) return null;
+	const match = sessionKey.match(/discord:(?:[^:]+:)?(channel|group|dm|direct):/);
+	if (!match) return null;
+	const raw = match[1];
+	if (raw === "direct") return "dm";
+	return raw === "channel" || raw === "group" || raw === "dm" ? raw : null;
+}
+function normalizeDiscordOriginChannelId(value) {
+	if (!value) return null;
+	const trimmed = value.trim();
+	if (!trimmed) return null;
+	const prefixed = trimmed.match(/^(?:channel|group):(\d+)$/i);
+	if (prefixed) return prefixed[1] ?? null;
+	return /^\d+$/.test(trimmed) ? trimmed : null;
+}
+function normalizeDiscordThreadId(value) {
+	if (typeof value === "number") return Number.isFinite(value) ? String(value) : void 0;
+	if (typeof value !== "string") return;
+	const normalized = value.trim();
+	return /^\d+$/.test(normalized) ? normalized : void 0;
+}
+function createDiscordOriginTargetResolver(configOverride) {
+	return createChannelNativeOriginTargetResolver({
+		channel: "discord",
+		shouldHandleRequest: ({ cfg, accountId, request }) => shouldHandleDiscordApprovalRequest({
+			cfg,
+			accountId,
+			request,
+			configOverride
+		}),
+		resolveTurnSourceTarget: (request) => {
+			const sessionConversation = resolveApprovalRequestSessionConversation({
+				request,
+				channel: "discord",
+				bundledFallback: false
+			});
+			const sessionKind = extractDiscordSessionKind(normalizeOptionalString(request.request.sessionKey) ?? null);
+			const turnSourceChannel = normalizeLowercaseStringOrEmpty(request.request.turnSourceChannel);
+			const rawTurnSourceTo = normalizeOptionalString(request.request.turnSourceTo) ?? "";
+			const turnSourceTo = normalizeDiscordOriginChannelId(rawTurnSourceTo);
+			const threadId = normalizeDiscordThreadId(request.request.turnSourceThreadId) ?? normalizeDiscordThreadId(sessionConversation?.threadId) ?? void 0;
+			const hasExplicitOriginTarget = /^(?:channel|group):/i.test(rawTurnSourceTo);
+			if (turnSourceChannel !== "discord" || !turnSourceTo || sessionKind === "dm") return null;
+			return hasExplicitOriginTarget || sessionKind === "channel" || sessionKind === "group" ? {
+				to: turnSourceTo,
+				threadId
+			} : null;
+		},
+		resolveSessionTarget: (sessionTarget, request) => {
+			const sessionConversation = resolveApprovalRequestSessionConversation({
+				request,
+				channel: "discord",
+				bundledFallback: false
+			});
+			if (extractDiscordSessionKind(request.request.sessionKey?.trim() || null) === "dm") return null;
+			const targetTo = normalizeDiscordOriginChannelId(sessionTarget.to);
+			return targetTo ? {
+				to: targetTo,
+				threadId: normalizeDiscordThreadId(sessionTarget.threadId) ?? normalizeDiscordThreadId(sessionConversation?.threadId) ?? void 0
+			} : null;
+		},
+		resolveFallbackTarget: (request) => {
+			const sessionConversation = resolveApprovalRequestSessionConversation({
+				request,
+				channel: "discord",
+				bundledFallback: false
+			});
+			if (extractDiscordSessionKind(request.request.sessionKey?.trim() || null) === "dm") return null;
+			const fallbackChannelId = normalizeDiscordOriginChannelId(sessionConversation?.id);
+			return fallbackChannelId ? {
+				to: fallbackChannelId,
+				threadId: normalizeDiscordThreadId(sessionConversation?.threadId) ?? void 0
+			} : null;
+		}
+	});
+}
+function createDiscordApproverDmTargetResolver(configOverride) {
+	return createChannelApproverDmTargetResolver({
+		shouldHandleRequest: ({ cfg, accountId, request }) => shouldHandleDiscordApprovalRequest({
+			cfg,
+			accountId,
+			request,
+			configOverride
+		}),
+		resolveApprovers: ({ cfg, accountId }) => getDiscordExecApprovalApprovers({
+			cfg,
+			accountId,
+			configOverride
+		}),
+		mapApprover: (approver) => ({ to: approver })
+	});
+}
+function createDiscordApprovalCapability(configOverride) {
+	return createApproverRestrictedNativeApprovalCapability({
+		channel: "discord",
+		channelLabel: "Discord",
+		describeExecApprovalSetup: ({ accountId }) => {
+			const prefix = accountId && accountId !== "default" ? `channels.discord.accounts.${accountId}` : "channels.discord";
+			return `Approve it from the Web UI or terminal UI for now. Discord supports native exec approvals for this account. Configure \`${prefix}.execApprovals.approvers\` or \`commands.ownerAllowFrom\`; set \`${prefix}.execApprovals.enabled\` to \`auto\` or \`true\`.`;
+		},
+		listAccountIds: listDiscordAccountIds,
+		hasApprovers: ({ cfg, accountId }) => getDiscordExecApprovalApprovers({
+			cfg,
+			accountId,
+			configOverride
+		}).length > 0,
+		isExecAuthorizedSender: ({ cfg, accountId, senderId }) => isDiscordExecApprovalApprover({
+			cfg,
+			accountId,
+			senderId,
+			configOverride
+		}),
+		isNativeDeliveryEnabled: ({ cfg, accountId }) => isDiscordExecApprovalClientEnabled({
+			cfg,
+			accountId,
+			configOverride
+		}),
+		resolveNativeDeliveryMode: ({ cfg, accountId }) => configOverride?.target ?? resolveDiscordAccount({
+			cfg,
+			accountId
+		}).config.execApprovals?.target ?? "dm",
+		resolveOriginTarget: createDiscordOriginTargetResolver(configOverride),
+		resolveApproverDmTargets: createDiscordApproverDmTargetResolver(configOverride),
+		notifyOriginWhenDmOnly: true,
+		nativeRuntime: createLazyChannelApprovalNativeRuntimeAdapter({
+			eventKinds: ["exec", "plugin"],
+			isConfigured: ({ cfg, accountId }) => isDiscordExecApprovalClientEnabled({
+				cfg,
+				accountId,
+				configOverride
+			}),
+			shouldHandle: ({ cfg, accountId, request }) => shouldHandleDiscordApprovalRequest({
+				cfg,
+				accountId,
+				request,
+				configOverride
+			}),
+			load: async () => (await import("./approval-handler.runtime-DeyIiw5I.js")).discordApprovalNativeRuntime
+		})
+	});
+}
+let cachedDiscordApprovalCapability;
+function getDiscordApprovalCapability() {
+	cachedDiscordApprovalCapability ??= createDiscordApprovalCapability();
+	return cachedDiscordApprovalCapability;
+}
+//#endregion
 //#region extensions/discord/src/channel.conversation.ts
 function resolveDiscordAttachedOutboundTarget(params) {
 	if (params.threadId == null) return params.to;
@@ -121,68 +301,87 @@ function resolveDiscordInboundConversation(params) {
 }
 //#endregion
 //#region extensions/discord/src/channel.loaders.ts
-const loadDiscordDirectoryConfigModule = createLazyRuntimeModule(() => import("./directory-config-ByaUKL1f.js").then((n) => n.t));
-const loadDiscordResolveChannelsModule = createLazyRuntimeModule(() => import("./resolve-channels-CcpvWoRa.js").then((n) => n.n));
-const loadDiscordResolveUsersModule = createLazyRuntimeModule(() => import("./resolve-users-DJamun9s.js").then((n) => n.n));
-const loadDiscordThreadBindingsManagerModule = createLazyRuntimeModule(() => import("./thread-bindings.manager-Bwmtqc3E.js").then((n) => n.a));
-const loadDiscordTargetResolverModule = createLazyRuntimeModule(() => import("./target-resolver-CwHaSLt3.js").then((n) => n.r));
-const loadDiscordProviderRuntime = createLazyRuntimeModule(() => import("./provider.runtime-WrJXikSv.js"));
-const loadDiscordProbeRuntime = createLazyRuntimeModule(() => import("./probe.runtime-B1dsEeBD.js"));
-const loadDiscordAuditModule = createLazyRuntimeModule(() => import("./audit-MLpDpN3Z.js").then((n) => n.n));
-const loadDiscordSendModule = createLazyRuntimeModule(() => import("./send-iJ0B4bAX.js").then((n) => n.t));
-const loadDiscordDirectoryLiveModule = createLazyRuntimeModule(() => import("./directory-live-BX79ImQA.js").then((n) => n.t));
+const loadDiscordDirectoryConfigModule = createLazyRuntimeModule(() => import("./directory-config-BUe-qq_C.js").then((n) => n.t));
+const loadDiscordResolveChannelsModule = createLazyRuntimeModule(() => import("./resolve-channels-BrkWOKdG.js").then((n) => n.n));
+const loadDiscordResolveUsersModule = createLazyRuntimeModule(() => import("./resolve-users-OjrXXvJP.js").then((n) => n.n));
+const loadDiscordThreadBindingsManagerModule = createLazyRuntimeModule(() => import("./thread-bindings.manager-BIBm6bQd.js").then((n) => n.a));
+const loadDiscordTargetResolverModule = createLazyRuntimeModule(() => import("./target-resolver-BQyEHyeS.js").then((n) => n.r));
+const loadDiscordProviderRuntime = createLazyRuntimeModule(() => import("./provider.runtime-C2iIfbTs.js"));
+const loadDiscordProbeRuntime = createLazyRuntimeModule(() => import("./probe.runtime-Bc8Oo6e8.js"));
+const loadDiscordAuditModule = createLazyRuntimeModule(() => import("./audit-Df2w046a.js").then((n) => n.n));
+const loadDiscordSendModule = createLazyRuntimeModule(() => import("./send-BFpa_DHn.js").then((n) => n.t));
+const loadDiscordDirectoryLiveModule = createLazyRuntimeModule(() => import("./directory-live-DZByMdPO.js").then((n) => n.t));
 //#endregion
 //#region extensions/discord/src/group-policy.ts
 function normalizeDiscordSlug(value) {
 	return normalizeAtHashSlug(value);
 }
-function resolveDiscordGuildEntry(guilds, groupSpace) {
-	if (!guilds || Object.keys(guilds).length === 0) return null;
+const encodeScopeSegment = (value) => `${value.length}:${value}`;
+const guildScopeKey = (guildKey) => `guild:${encodeScopeSegment(guildKey)}`;
+const channelScopeKey = (guildKey, channelKey) => `${guildScopeKey(guildKey)}/channel:${encodeScopeSegment(channelKey)}`;
+function resolveDiscordGuildKey(guilds, groupSpace) {
+	if (!guilds || Object.keys(guilds).length === 0) return;
 	const space = normalizeOptionalString(groupSpace) ?? "";
-	if (space && guilds[space]) return guilds[space];
+	if (space && guilds[space]) return space;
 	const normalized = normalizeDiscordSlug(space);
-	if (normalized && guilds[normalized]) return guilds[normalized];
+	if (normalized && guilds[normalized]) return normalized;
 	if (normalized) {
-		const match = Object.values(guilds).find((entry) => normalizeDiscordSlug(entry?.slug ?? void 0) === normalized);
-		if (match) return match;
+		const match = Object.entries(guilds).find(([, entry]) => normalizeDiscordSlug(entry?.slug ?? void 0) === normalized);
+		if (match) return match[0];
 	}
-	return guilds["*"] ?? null;
+	return guilds["*"] ? "*" : void 0;
 }
-function resolveDiscordChannelEntry(channelEntries, params) {
+function resolveDiscordChannelKey(channelEntries, params) {
 	if (!channelEntries || Object.keys(channelEntries).length === 0) return;
 	const groupChannel = params.groupChannel;
 	const channelSlug = normalizeDiscordSlug(groupChannel);
-	return (params.groupId ? channelEntries[params.groupId] : void 0) ?? (channelSlug ? channelEntries[channelSlug] ?? channelEntries[`#${channelSlug}`] : void 0) ?? (groupChannel ? channelEntries[normalizeDiscordSlug(groupChannel)] : void 0);
+	if (params.groupId && channelEntries[params.groupId]) return params.groupId;
+	if (channelSlug && channelEntries[channelSlug]) return channelSlug;
+	if (channelSlug && channelEntries[`#${channelSlug}`]) return `#${channelSlug}`;
+	const normalizedGroupChannel = groupChannel ? normalizeDiscordSlug(groupChannel) : void 0;
+	return normalizedGroupChannel !== void 0 && channelEntries[normalizedGroupChannel] ? normalizedGroupChannel : void 0;
 }
-function resolveSenderToolsEntry(entry, params) {
-	if (!entry) return;
-	return resolveToolsBySender({
-		toolsBySender: entry.toolsBySender,
-		senderId: params.senderId,
-		senderName: params.senderName,
-		senderUsername: params.senderUsername,
-		senderE164: params.senderE164
-	}) ?? entry.tools;
+function buildDiscordPolicyTree(guilds) {
+	const scopes = {};
+	for (const [guildKey, guild] of Object.entries(guilds ?? {})) {
+		scopes[guildScopeKey(guildKey)] = {
+			requireMention: guild.requireMention,
+			tools: guild.tools,
+			toolsBySender: guild.toolsBySender
+		};
+		for (const [channelKey, channel] of Object.entries(guild.channels ?? {})) scopes[channelScopeKey(guildKey, channelKey)] = {
+			requireMention: channel.requireMention,
+			tools: channel.tools,
+			toolsBySender: channel.toolsBySender
+		};
+	}
+	return { scopes };
 }
-function resolveDiscordPolicyContext(params) {
-	const guildEntry = resolveDiscordGuildEntry((params.accountId ? params.cfg.channels?.discord?.accounts?.[params.accountId]?.guilds : void 0) ?? params.cfg.channels?.discord?.guilds, params.groupSpace);
-	const channelEntries = guildEntry?.channels;
+function resolveDiscordPolicyScope(params) {
+	const guilds = (params.accountId ? params.cfg.channels?.discord?.accounts?.[params.accountId]?.guilds : void 0) ?? params.cfg.channels?.discord?.guilds;
+	const tree = buildDiscordPolicyTree(guilds);
+	const guildKey = resolveDiscordGuildKey(guilds, params.groupSpace);
+	if (!guildKey) return {
+		tree,
+		path: []
+	};
+	const channelKey = resolveDiscordChannelKey(guilds?.[guildKey]?.channels, params);
 	return {
-		guildEntry,
-		channelEntry: channelEntries && Object.keys(channelEntries).length > 0 ? resolveDiscordChannelEntry(channelEntries, params) : void 0
+		tree,
+		path: [guildScopeKey(guildKey), ...channelKey !== void 0 ? [channelScopeKey(guildKey, channelKey)] : []]
 	};
 }
 function resolveDiscordGroupRequireMention(params) {
-	const context = resolveDiscordPolicyContext(params);
-	if (typeof context.channelEntry?.requireMention === "boolean") return context.channelEntry.requireMention;
-	if (typeof context.guildEntry?.requireMention === "boolean") return context.guildEntry.requireMention;
-	return true;
+	return resolveScopeRequireMention(resolveDiscordPolicyScope(params));
 }
 function resolveDiscordGroupToolPolicy(params) {
-	const context = resolveDiscordPolicyContext(params);
-	const channelPolicy = resolveSenderToolsEntry(context.channelEntry, params);
-	if (channelPolicy) return channelPolicy;
-	return resolveSenderToolsEntry(context.guildEntry, params);
+	return resolveScopeToolsPolicy({
+		...resolveDiscordPolicyScope(params),
+		senderId: params.senderId,
+		senderName: params.senderName,
+		senderUsername: params.senderUsername,
+		senderE164: params.senderE164
+	});
 }
 //#endregion
 //#region extensions/discord/src/status-issues.ts
@@ -459,10 +658,11 @@ const discordPlugin = createChatChannelPlugin({
 				looksLikeId: looksLikeDiscordTargetId,
 				hint: "<channelId|user:ID|channel:ID>",
 				resolveTarget: async ({ cfg, accountId, input, normalized, preferredKind }) => {
+					const defaultKind = preferredKind === "user" || normalized.startsWith("user:") ? "user" : preferredKind === "channel" || preferredKind === "group" || normalized.startsWith("channel:") ? "channel" : void 0;
 					const resolved = await (await loadDiscordTargetResolverModule()).resolveDiscordTarget(input, {
 						cfg,
 						accountId
-					}, preferredKind === "user" ? { defaultKind: "user" } : preferredKind === "channel" || preferredKind === "group" ? { defaultKind: "channel" } : {});
+					}, defaultKind ? { defaultKind } : {});
 					if (!resolved) return null;
 					return {
 						to: resolved.normalized,
@@ -543,7 +743,7 @@ const discordPlugin = createChatChannelPlugin({
 		},
 		conversationBindings: {
 			supportsCurrentConversationBinding: true,
-			defaultTopLevelPlacement: "child",
+			defaultTopLevelPlacement,
 			createManager: async ({ cfg, accountId }) => (await loadDiscordThreadBindingsManagerModule()).createThreadBindingManager({
 				cfg,
 				accountId: accountId ?? void 0,
@@ -767,14 +967,27 @@ const discordPlugin = createChatChannelPlugin({
 		}
 	} },
 	security: discordSecurityAdapter,
-	threading: { scopedAccountReplyToMode: {
-		resolveAccount: (cfg, accountId) => resolveDiscordAccount({
-			cfg,
-			accountId
-		}),
-		resolveReplyToMode: (account) => account.config.replyToMode,
-		fallback: "off"
-	} },
+	threading: {
+		scopedAccountReplyToMode: {
+			resolveAccount: (cfg, accountId) => resolveDiscordAccount({
+				cfg,
+				accountId
+			}),
+			resolveReplyToMode: (account) => account.config.replyToMode,
+			fallback: "off"
+		},
+		buildToolContext: ({ context, hasRepliedRef }) => {
+			const currentMessagingTarget = normalizeOptionalString(context.To);
+			const currentChatType = context.ChatType === "direct" || context.ChatType === "group" || context.ChatType === "channel" ? context.ChatType : void 0;
+			return {
+				currentChannelId: normalizeOptionalString(context.NativeChannelId) ?? currentMessagingTarget,
+				currentChatType,
+				currentMessagingTarget,
+				currentMessageId: context.CurrentMessageId,
+				hasRepliedRef
+			};
+		}
+	},
 	outbound: {
 		...discordOutbound,
 		preferFinalAssistantVisibleText: true,
@@ -788,4 +1001,4 @@ const discordPlugin = createChatChannelPlugin({
 	}
 });
 //#endregion
-export { resolveDiscordGroupToolPolicy as i, collectDiscordStatusIssues as n, resolveDiscordGroupRequireMention as r, discordPlugin as t };
+export { shouldHandleDiscordApprovalRequest as a, resolveDiscordGroupToolPolicy as i, collectDiscordStatusIssues as n, resolveDiscordGroupRequireMention as r, discordPlugin as t };

package/dist/channel-plugin-api.js

@@ -1,2 +1,2 @@
-import { t as discordPlugin } from "./channel-DGWPH5u3.js";
+import { t as discordPlugin } from "./channel-nYmJ7FKQ.js";
 export { discordPlugin };

package/dist/{channel.setup-tZcpIn4e.js → channel.setup-DyihrqHH.js}

@@ -1,8 +1,8 @@
 import { n as inspectDiscordConfiguredToken } from "./account-inspect-DDZtT5C8.js";
 import { a as mergeDiscordAccountConfig, c as resolveDiscordAccountAllowFrom, l as resolveDiscordAccountConfig, m as resolveDiscordToken, o as resolveDefaultDiscordAccountId } from "./accounts-P19jm1lf.js";
-import { i as discordSetupAdapter, t as createDiscordPluginBase } from "./shared-BQVKfnev.js";
-import { t as resolveDiscordChannelAllowlist } from "./resolve-channels-CcpvWoRa.js";
-import { t as resolveDiscordUserAllowlist } from "./resolve-users-DJamun9s.js";
+import { i as discordSetupAdapter, t as createDiscordPluginBase } from "./shared-BLYBt5SA.js";
+import { t as resolveDiscordChannelAllowlist } from "./resolve-channels-BrkWOKdG.js";
+import { t as resolveDiscordUserAllowlist } from "./resolve-users-OjrXXvJP.js";
 import { DEFAULT_ACCOUNT_ID, normalizeAccountId } from "openclaw/plugin-sdk/account-id";
 import { normalizeOptionalString } from "openclaw/plugin-sdk/string-coerce-runtime";
 import { createAccountScopedAllowFromSection, createAccountScopedGroupAccessSection, createLegacyCompatChannelDmPolicy, createSetupTranslator, createStandardChannelSetupStatus, parseMentionOrPrefixedId, patchChannelConfigForAccount, promptLegacyChannelAllowFromForAccount, resolveEntriesWithOptionalToken, setSetupChannelEnabled } from "openclaw/plugin-sdk/setup-runtime";

package/dist/{components-BIBizbtZ.js → components-BVrfRS-F.js}

@@ -1,10 +1,11 @@
-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 { $ as Section, B as Label, G as ChannelSelectMenu, H as RadioGroup, J as LinkButton, Jt as parseDiscordTarget, K as Container, Q as Row, U as TextInput, V as Modal, W as Button, X as MentionableSelectMenu, Xt as __exportAll, Y as MediaGallery, Z as RoleSelectMenu, et as Separator, it as UserSelectMenu, nt as TextDisplay, ot as parseCustomId, q as File, rt as Thumbnail, tt as StringSelectMenu, z as CheckboxGroup } from "./send.receipt-aegk69an.js";
+import { t as buildDiscordApprovalCustomId } from "./approval-custom-id-NYPYj9Po.js";
 import { normalizeLowercaseStringOrEmpty } from "openclaw/plugin-sdk/string-coerce-runtime";
 import { buildOutboundBaseSessionKey } from "openclaw/plugin-sdk/routing";
 import { buildThreadAwareOutboundSessionRoute } from "openclaw/plugin-sdk/channel-core";
 import { ButtonStyle, MessageFlags, TextInputStyle } from "discord-api-types/v10";
 import crypto from "node:crypto";
-import { reduceInteractiveReply, resolveMessagePresentationControlValue } from "openclaw/plugin-sdk/interactive-runtime";
+import { reduceInteractiveReply, resolveMessagePresentationButtonAction, resolveMessagePresentationOptionAction } 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) });
@@ -49,33 +50,57 @@ function resolveDiscordOutboundTargetKindHint(params) {
 	return "channel";
 }
 //#endregion
-//#region extensions/discord/src/component-custom-id.ts
-const DISCORD_COMPONENT_CUSTOM_ID_KEY = "occomp";
-const DISCORD_MODAL_CUSTOM_ID_KEY = "ocmodal";
-const ENCODED_CUSTOM_ID_VERSION = "1";
-function encodeCustomIdValue(value) {
+//#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 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 needsCustomIdEncoding(value) {
+function needsCustomIdFieldEscaping(value) {
 	return /[%;]/.test(value);
 }
-function decodeCustomIdValue(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 ENCODED_CUSTOM_ID_VERSION = "1";
 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);
@@ -836,14 +861,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 +873,39 @@ 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 } : {}
+		};
+	}
+	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 +920,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 +993,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 +1024,4 @@ 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 };
+export { resolveDiscordOutboundSessionRoute as C, encodeCustomIdComponent as S, 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, decodeCustomIdComponent as x, parseDiscordModalCustomId as y };

package/dist/config-api-B18fR8M5.js

@@ -0,0 +1,3 @@
+import { buildChannelConfigSchema } from "openclaw/plugin-sdk/channel-config-schema";
+import { DiscordConfigSchema } from "openclaw/plugin-sdk/bundled-channel-config-schema";
+export { buildChannelConfigSchema as n, DiscordConfigSchema as t };