@openclaw/discord 2026.5.7 → 2026.5.10-beta.1

package/dist/{provider-CuOh6z_b.js → provider-DBvvDP9A.js}

@@ -1,32 +1,32 @@
+import { A as Button, B as Separator, C as User, D as Modal, G as BaseMessageInteractiveComponent, H as TextDisplay, M as Container, R as Row, S as Message, V as StringSelectMenu, a as MessageReactionRemoveListener, b as CommandWithSubcommands, d as Client, f as Plugin, h as RateLimitError, i as MessageReactionAddListener, l as ThreadUpdateListener, n as InteractionCreateListener, o as PresenceUpdateListener, r as MessageCreateListener, s as ReadyListener, t as discord_exports, x as Guild, y as Command } from "./discord-DtHMmZqJ.js";
 import { t as normalizeDiscordToken } from "./token-BZtonk7d.js";
 import { c as resolveDiscordAccountAllowFrom, d as resolveDiscordAccountDmPolicy, f as resolveDiscordMaxLinesPerMessage, s as resolveDiscordAccount } from "./accounts-CaHGiVB4.js";
-import { s as chunkDiscordTextWithMode } from "./target-resolver-DA84_xbt.js";
-import { a as resolveDiscordComponentEntryWithPersistence, o as resolveDiscordModalEntryWithPersistence, t as editDiscordComponentMessage } from "./send.components-A42c_5tQ.js";
+import { a as resolveDiscordComponentEntryWithPersistence, o as resolveDiscordModalEntryWithPersistence, t as editDiscordComponentMessage } from "./send.components-BoEhxys4.js";
 import { c as setPresence, i as unregisterGateway, r as registerGateway } from "./gateway-registry-BKG4KIVC.js";
-import { A as Button, B as Separator, C as User, D as Modal, G as BaseMessageInteractiveComponent, H as TextDisplay, M as Container, R as Row, S as Message, V as StringSelectMenu, a as MessageReactionRemoveListener, b as CommandWithSubcommands, d as Client, f as Plugin, h as RateLimitError, i as MessageReactionAddListener, l as ThreadUpdateListener, n as InteractionCreateListener, o as PresenceUpdateListener, r as MessageCreateListener, s as ReadyListener, t as discord_exports, x as Guild, y as Command } from "./discord-eZlimVfW.js";
-import { F as DISCORD_REST_TIMEOUT_MS, I as validateDiscordProxyUrl, L as withValidatedDiscordProxy, j as createDiscordRestClient } from "./send.shared-BQGiUPvZ.js";
+import { t as chunkDiscordTextWithMode } from "./chunk-DYl-_5RL.js";
+import { F as DISCORD_REST_TIMEOUT_MS, I as validateDiscordProxyUrl, L as withValidatedDiscordProxy, j as createDiscordRestClient } from "./send.shared-DzwpAEMP.js";
 import { a as summarizeDiscordResponseBody, i as isDiscordRateLimitResponseBody } from "./api-DzNBVTto.js";
 import { n as formatDiscordUserTag, t as formatDiscordReactionEmoji } from "./format-D8TsaXxW.js";
-import { _ as resolveGroupDmAllow, a as normalizeDiscordSlug, c as resolveDiscordChannelConfigWithFallback, d as resolveDiscordGuildEntry, f as resolveDiscordMemberAccessState, i as normalizeDiscordDisplaySlug, l as resolveDiscordChannelPolicyCommandAuthorizer, m as resolveDiscordOwnerAccess, n as isDiscordGroupAllowedByPolicy, o as resolveDiscordAllowListMatch, r as normalizeDiscordAllowList, v as shouldEmitDiscordReactionNotification } from "./allow-list-ek-1hMKN.js";
-import { t as formatMention } from "./mentions-BPZUaFk7.js";
-import { _ as parseDiscordModalCustomIdForInteraction, g as parseDiscordModalCustomId, h as parseDiscordComponentCustomIdForInteraction, m as parseDiscordComponentCustomId } from "./components-D5LnN7ZQ.js";
-import { i as isDiscordExecApprovalClientEnabled, n as getDiscordExecApprovalApprovers } from "./approval-shared-Ck6TxKgo.js";
-import "./approval-native-CBdZsAR7.js";
-import { t as resolveDiscordConversationIdentity } from "./conversation-identity-DHhS0ez3.js";
-import { t as resolveDiscordChannelAllowlist } from "./resolve-channels-kyuvrXJg.js";
-import { t as resolveDiscordUserAllowlist } from "./resolve-users-CAwh4EBq.js";
-import { a as isThreadArchived, d as formatThreadBindingDurationLabel } from "./thread-bindings.discord-api-CwWGoyei.js";
-import { i as resolveDiscordChannelParentIdSafe, n as resolveDiscordChannelInfoSafe, o as resolveDiscordChannelTopicSafe, r as resolveDiscordChannelNameSafe, t as resolveDiscordChannelIdSafe } from "./channel-access-DFIQqbYm.js";
-import { r as parseApplicationIdFromToken, t as fetchDiscordApplicationId } from "./probe-E80IMT1X.js";
-import { o as raceWithTimeout, s as withAbortTimeout } from "./timeouts-CdsmBWWs.js";
-import { c as resolveDiscordChannelInfo } from "./message-utils-9kaGF59d.js";
-import { i as resolveDiscordThreadParentInfo } from "./threading-BMmpA2JR.js";
-import { c as resolveDiscordDmAccessGroupEntries, i as resolveDiscordEffectiveRoute, n as resolveDiscordBoundConversationRoute, o as handleDiscordDmCommandDecision, s as resolveDiscordDmCommandAccess } from "./route-resolution-BWErj5Cn.js";
-import { t as resolveDiscordSenderIdentity } from "./sender-identity-BGUfyvOC.js";
-import { n as buildDiscordInboundAccessContext, t as buildDiscordGroupSystemPrompt } from "./inbound-context-CRylwjg0.js";
-import { n as resolveDiscordVoiceEnabled, t as authorizeDiscordVoiceIngress } from "./access-CHY9FK3X.js";
-import { n as buildDirectLabel, r as buildGuildLabel, t as deliverDiscordReply } from "./reply-delivery-D9aKHtDH.js";
-import "./approval-handler.runtime-BBZRYAGs.js";
+import { _ as resolveGroupDmAllow, a as normalizeDiscordSlug, c as resolveDiscordChannelConfigWithFallback, d as resolveDiscordGuildEntry, f as resolveDiscordMemberAccessState, i as normalizeDiscordDisplaySlug, l as resolveDiscordChannelPolicyCommandAuthorizer, m as resolveDiscordOwnerAccess, n as isDiscordGroupAllowedByPolicy, o as resolveDiscordAllowListMatch, r as normalizeDiscordAllowList, v as shouldEmitDiscordReactionNotification } from "./allow-list-4wnZg5P9.js";
+import { t as formatMention } from "./mentions-f806C7MB.js";
+import { _ as parseDiscordModalCustomIdForInteraction, g as parseDiscordModalCustomId, h as parseDiscordComponentCustomIdForInteraction, m as parseDiscordComponentCustomId } from "./components-BJOShoIU.js";
+import { i as isDiscordExecApprovalClientEnabled, n as getDiscordExecApprovalApprovers } from "./approval-shared-Ckk65xSG.js";
+import "./approval-native-CrCc3b4u.js";
+import { t as resolveDiscordConversationIdentity } from "./conversation-identity-BPQm_uhV.js";
+import { t as resolveDiscordChannelAllowlist } from "./resolve-channels-D9Dubj_y.js";
+import { t as resolveDiscordUserAllowlist } from "./resolve-users-DlzKsLQe.js";
+import { a as isThreadArchived, d as formatThreadBindingDurationLabel } from "./thread-bindings.discord-api-dpSDYFKX.js";
+import { i as resolveDiscordChannelParentIdSafe, n as resolveDiscordChannelInfoSafe, o as resolveDiscordChannelTopicSafe, r as resolveDiscordChannelNameSafe, t as resolveDiscordChannelIdSafe } from "./channel-access-BL-wemES.js";
+import { r as parseApplicationIdFromToken, t as fetchDiscordApplicationId } from "./probe-CjO53qsc.js";
+import { o as raceWithTimeout, s as withAbortTimeout } from "./timeouts-C3FYXWJX.js";
+import { i as resolveDiscordEffectiveRoute, n as resolveDiscordBoundConversationRoute, o as handleDiscordDmCommandDecision, s as resolveDiscordDmCommandAccess } from "./route-resolution-foWW8_D1.js";
+import { c as resolveDiscordChannelInfo } from "./message-utils-DEjCwCRz.js";
+import { i as resolveDiscordThreadParentInfo } from "./threading-CTUnZtNi.js";
+import { t as resolveDiscordSenderIdentity } from "./sender-identity-CDOVm5Dk.js";
+import { n as buildDiscordInboundAccessContext, t as buildDiscordGroupSystemPrompt } from "./inbound-context-BAwOn5Iq.js";
+import { n as resolveDiscordVoiceEnabled, t as authorizeDiscordVoiceIngress } from "./access-R4X7pYt4.js";
+import { n as buildDirectLabel, r as buildGuildLabel, t as deliverDiscordReply } from "./reply-delivery-vHSqaKKo.js";
+import "./approval-handler.runtime-B5BCBw4D.js";
 import { normalizeAccountId } from "openclaw/plugin-sdk/account-id";
 import { chunkItems, logDebug, logError, normalizeLowercaseStringOrEmpty, normalizeOptionalLowercaseString, normalizeOptionalString, normalizeStringEntries, summarizeStringEntries, withTimeout } from "openclaw/plugin-sdk/text-runtime";
 import { resolveAgentRoute } from "openclaw/plugin-sdk/routing";
@@ -34,6 +34,7 @@ import { getRuntimeConfig } from "openclaw/plugin-sdk/runtime-config-snapshot";
 import { ApplicationCommandOptionType, ButtonStyle, ChannelType, ComponentType, GatewayCloseCodes, GatewayCloseCodes as GatewayCloseCodes$1, GatewayDispatchEvents, GatewayIntentBits, GatewayOpcodes } from "discord-api-types/v10";
 import { randomUUID } from "node:crypto";
 import path from "node:path";
+import { resolvePinnedMainDmOwnerFromAllowlist as resolvePinnedMainDmOwnerFromAllowlist$1 } from "openclaw/plugin-sdk/security-runtime";
 import { Type } from "typebox";
 import { Check, Errors } from "typebox/value";
 import { inspect } from "node:util";
@@ -45,6 +46,7 @@ import { wrapFetchWithAbortSignal } from "openclaw/plugin-sdk/fetch-runtime";
 import { createNonExitingRuntime, createSubsystemLogger, danger, formatDurationSeconds, isVerbose, logVerbose, shouldLogVerbose, warn } from "openclaw/plugin-sdk/runtime-env";
 import { formatErrorMessage } from "openclaw/plugin-sdk/error-runtime";
 import { resolveMarkdownTableMode } from "openclaw/plugin-sdk/markdown-table-runtime";
+import { createChannelMessageReplyPipeline } from "openclaw/plugin-sdk/channel-message";
 import { fetchWithSsrFGuard, formatErrorMessage as formatErrorMessage$1 } from "openclaw/plugin-sdk/ssrf-runtime";
 import { createChannelPairingChallengeIssuer } from "openclaw/plugin-sdk/channel-pairing";
 import { CHANNEL_APPROVAL_NATIVE_RUNTIME_CONTEXT_CAPABILITY } from "openclaw/plugin-sdk/approval-handler-adapter-runtime";
@@ -57,15 +59,13 @@ import { clearExpiredCooldowns, ensureAuthProfileStore, isProfileInCooldown, res
 import { GROUP_POLICY_BLOCKED_LABEL, resolveDefaultGroupPolicy, resolveOpenProviderRuntimeGroupPolicy, warnMissingProviderGroupPolicyFallbackOnce } from "openclaw/plugin-sdk/runtime-group-policy";
 import { isDangerousNameMatchingEnabled } from "openclaw/plugin-sdk/dangerous-name-runtime";
 import { resolveNativeCommandsEnabled, resolveNativeSkillsEnabled } from "openclaw/plugin-sdk/native-command-config-runtime";
-import { readStoreAllowFromForDmPolicy, readStoreAllowFromForDmPolicy as readStoreAllowFromForDmPolicy$1, resolveDmGroupAccessWithLists, resolvePinnedMainDmOwnerFromAllowlist as resolvePinnedMainDmOwnerFromAllowlist$1 } from "openclaw/plugin-sdk/security-runtime";
 import { enqueueSystemEvent, enqueueSystemEvent as enqueueSystemEvent$1 } from "openclaw/plugin-sdk/system-event-runtime";
+import { readChannelIngressStoreAllowFromForDmPolicy } from "openclaw/plugin-sdk/channel-ingress-runtime";
 import { applyModelOverrideToSessionEntry } from "openclaw/plugin-sdk/model-session-runtime";
 import { loadSessionStore, readSessionUpdatedAt as readSessionUpdatedAt$1, resolveStorePath, resolveStorePath as resolveStorePath$1, updateSessionStore } from "openclaw/plugin-sdk/session-store-runtime";
 import { formatInboundEnvelope, resolveEnvelopeFormatOptions } from "openclaw/plugin-sdk/channel-inbound";
-import { resolveCommandAuthorizedFromAuthorizers, resolveNativeCommandSessionTargets } from "openclaw/plugin-sdk/command-auth-native";
-import { buildCommandTextFromArgs, findCommandByNativeName, parseCommandArgs, resolveCommandArgChoices, resolveCommandArgMenu, serializeCommandArgs } from "openclaw/plugin-sdk/native-command-registry";
-import { buildCommandTextFromArgs as buildCommandTextFromArgs$1, findCommandByNativeName as findCommandByNativeName$1, formatCommandArgMenuTitle, listChatCommands, listNativeCommandSpecsForConfig, listSkillCommandsForAgents, resolveStoredModelOverride, serializeCommandArgs as serializeCommandArgs$1 } from "openclaw/plugin-sdk/command-auth";
-import { createChannelReplyPipeline } from "openclaw/plugin-sdk/channel-reply-pipeline";
+import { buildCommandTextFromArgs, findCommandByNativeName, formatCommandArgMenuTitle, listChatCommands, listNativeCommandSpecsForConfig, listSkillCommandsForAgents, resolveCommandAuthorizedFromAuthorizers, resolveNativeCommandSessionTargets, resolveStoredModelOverride, serializeCommandArgs } from "openclaw/plugin-sdk/command-auth-native";
+import { buildCommandTextFromArgs as buildCommandTextFromArgs$1, findCommandByNativeName as findCommandByNativeName$1, parseCommandArgs, resolveCommandArgChoices, resolveCommandArgMenu, serializeCommandArgs as serializeCommandArgs$1 } from "openclaw/plugin-sdk/native-command-registry";
 import { resolveDirectStatusReplyForSession } from "openclaw/plugin-sdk/command-status-runtime";
 import * as pluginRuntime from "openclaw/plugin-sdk/plugin-runtime";
 import { createInteractiveConversationBindingHelpers, dispatchPluginInteractiveHandler } from "openclaw/plugin-sdk/plugin-runtime";
@@ -275,38 +275,22 @@ async function authorizeDiscordReactionIngress(params) {
 		reason: "group-dm-disabled"
 	};
 	if (params.isDirectMessage) {
-		const storeAllowFrom = await readStoreAllowFromForDmPolicy({
-			provider: "discord",
+		const access = await resolveDiscordDmCommandAccess({
+			cfg: params.cfg,
 			accountId: params.accountId,
-			dmPolicy: params.dmPolicy
-		});
-		const access = resolveDmGroupAccessWithLists({
-			isGroup: false,
 			dmPolicy: params.dmPolicy,
-			groupPolicy: params.groupPolicy,
-			allowFrom: params.allowFrom,
-			groupAllowFrom: [],
-			storeAllowFrom,
-			isSenderAllowed: (allowEntries) => {
-				const allowList = normalizeDiscordAllowList(allowEntries, [
-					"discord:",
-					"user:",
-					"pk:"
-				]);
-				return (allowList ? resolveDiscordAllowListMatch({
-					allowList,
-					candidate: {
-						id: params.user.id,
-						name: params.user.username,
-						tag: formatDiscordUserTag(params.user)
-					},
-					allowNameMatching: params.allowNameMatching
-				}) : { allowed: false }).allowed;
-			}
+			configuredAllowFrom: params.allowFrom,
+			sender: {
+				id: params.user.id,
+				name: params.user.username,
+				tag: formatDiscordUserTag(params.user)
+			},
+			allowNameMatching: params.allowNameMatching,
+			eventKind: "reaction"
 		});
-		if (access.decision !== "allow") return {
+		if (access.senderAccess.decision !== "allow") return {
 			allowed: false,
-			reason: access.reason
+			reason: access.senderAccess.reasonCode
 		};
 	}
 	if (params.isGroupDm && !resolveGroupDmAllow({
@@ -453,6 +437,7 @@ async function handleDiscordReactionEvent(params) {
 		const isGroupDm = channelType === discord_exports.ChannelType.GroupDM;
 		const isThreadChannel = channelContext.isThreadChannel;
 		const reactionIngressBase = {
+			cfg: params.cfg,
 			accountId: params.accountId,
 			user,
 			memberRoleIds,
@@ -509,7 +494,8 @@ async function handleDiscordReactionEvent(params) {
 						id: parentPeerId
 					} : void 0
 				}).sessionKey,
-				contextKey
+				contextKey,
+				trusted: false
 			});
 		};
 		const shouldNotifyReaction = (options) => shouldEmitDiscordReactionNotification({
@@ -860,7 +846,7 @@ const nativeCommandRuntime = {
 //#endregion
 //#region extensions/discord/src/monitor/native-command-agent-reply.ts
 async function dispatchDiscordNativeAgentReply(params) {
-	const { onModelSelected, ...replyPipeline } = createChannelReplyPipeline({
+	const { onModelSelected, ...replyPipeline } = createChannelMessageReplyPipeline({
 		cfg: params.cfg,
 		agentId: params.effectiveRoute.agentId,
 		channel: "discord",
@@ -985,7 +971,7 @@ function resolveDiscordNativeCommandAllowlistAccess(params) {
 		}).allowed
 	};
 }
-function resolveDiscordGuildNativeCommandAuthorized(params) {
+async function resolveDiscordGuildNativeCommandAuthorized(params) {
 	const { groupPolicy } = resolveOpenProviderRuntimeGroupPolicy({
 		providerConfigPresent: params.cfg.channels?.discord !== void 0,
 		groupPolicy: params.discordConfig?.groupPolicy,
@@ -1137,10 +1123,9 @@ async function resolveDiscordNativeAutocompleteAuthorized(params) {
 				tag: sender.tag
 			},
 			allowNameMatching,
-			useAccessGroups,
 			cfg,
 			rest: interaction.client.rest
-		})).decision !== "allow") return false;
+		})).senderAccess.decision !== "allow") return false;
 	}
 	if (!resolveDiscordNativeGroupDmAccess({
 		isGroupDm,
@@ -1152,6 +1137,7 @@ async function resolveDiscordNativeAutocompleteAuthorized(params) {
 	}).allowed) return false;
 	if (!isDirectMessage) return resolveDiscordGuildNativeCommandAuthorized({
 		cfg,
+		accountId,
 		discordConfig,
 		useAccessGroups,
 		commandsAllowFromAccess,
@@ -1325,7 +1311,7 @@ async function handleDiscordCommandArgInteraction(params) {
 		await params.safeInteractionCall("command arg ack", () => interaction.acknowledge());
 		return;
 	}
-	const commandDefinition = findCommandByNativeName$1(parsed.command, "discord") ?? listChatCommands().find((entry) => entry.key === parsed.command);
+	const commandDefinition = findCommandByNativeName(parsed.command, "discord") ?? listChatCommands().find((entry) => entry.key === parsed.command);
 	if (!commandDefinition) {
 		await clearWithMessage("Sorry, that command is no longer available.");
 		return;
@@ -1337,9 +1323,9 @@ async function handleDiscordCommandArgInteraction(params) {
 	});
 	const commandArgsWithRaw = {
 		...commandArgs,
-		raw: serializeCommandArgs$1(commandDefinition, commandArgs)
+		raw: serializeCommandArgs(commandDefinition, commandArgs)
 	};
-	const prompt = buildCommandTextFromArgs$1(commandDefinition, commandArgsWithRaw);
+	const prompt = buildCommandTextFromArgs(commandDefinition, commandArgsWithRaw);
 	await params.dispatchCommandInteraction({
 		interaction,
 		prompt,
@@ -2226,7 +2212,7 @@ function resolveCommandArgStringValue(args, key) {
 function shouldOpenDiscordModelPickerFromCommand(params) {
 	const context = resolveDiscordModelPickerCommandContext(params.command);
 	if (!context) return null;
-	const serializedArgs = normalizeOptionalString(serializeCommandArgs$1(params.command, params.commandArgs)) ?? "";
+	const serializedArgs = normalizeOptionalString(serializeCommandArgs(params.command, params.commandArgs)) ?? "";
 	if (context === "model") return !resolveCommandArgStringValue(params.commandArgs, "model") && !serializedArgs ? context : null;
 	return serializedArgs ? null : context;
 }
@@ -2371,12 +2357,14 @@ async function replyWithDiscordModelPickerProviders(params) {
 		allowedModelRefs: buildDiscordModelPickerAllowedModelRefs(data),
 		limit: 5
 	});
+	const currentProvider = splitDiscordModelRef(currentModel ?? "")?.provider;
+	const initialProvider = currentProvider && data.byProvider.has(currentProvider) ? currentProvider : data.providers[0] ?? data.resolvedDefault.provider;
 	const payload = {
 		...toDiscordModelPickerMessagePayload(renderDiscordModelPickerModelsView({
 			command: params.command,
 			userId: params.userId,
 			data,
-			provider: splitDiscordModelRef(currentModel ?? "")?.provider ?? data.resolvedDefault.provider,
+			provider: initialProvider,
 			page: 1,
 			providerPage: 1,
 			currentModel,
@@ -2415,7 +2403,7 @@ function resolveModelPickerSelectionValue(interaction) {
 	return first.trim() || null;
 }
 function buildDiscordModelPickerSelectionCommand(params) {
-	const commandDefinition = findCommandByNativeName$1("model", "discord") ?? listChatCommands().find((entry) => entry.key === "model");
+	const commandDefinition = findCommandByNativeName("model", "discord") ?? listChatCommands().find((entry) => entry.key === "model");
 	if (!commandDefinition) return null;
 	const runtime = normalizeOptionalString(params.runtime);
 	const raw = runtime ? `${params.modelRef} --runtime ${runtime}` : params.modelRef;
@@ -2426,7 +2414,7 @@ function buildDiscordModelPickerSelectionCommand(params) {
 	return {
 		command: commandDefinition,
 		args: commandArgs,
-		prompt: buildCommandTextFromArgs$1(commandDefinition, commandArgs)
+		prompt: buildCommandTextFromArgs(commandDefinition, commandArgs)
 	};
 }
 function listDiscordModelPickerProviderModels(data, provider) {
@@ -2458,6 +2446,11 @@ async function handleDiscordModelPickerInteraction(params) {
 		await params.safeInteractionCall("model picker ack", () => interaction.acknowledge());
 		return;
 	}
+	let deferredUpdate = interaction.acknowledged;
+	if (!deferredUpdate) {
+		if (await params.safeInteractionCall("model picker defer", () => interaction.acknowledge()) === null) return;
+		deferredUpdate = true;
+	}
 	const route = await resolveDiscordModelPickerRoute({
 		interaction,
 		cfg: ctx.cfg,
@@ -2485,7 +2478,7 @@ async function handleDiscordModelPickerInteraction(params) {
 		allowedModelRefs,
 		limit: 5
 	});
-	const updatePicker = async (payload) => await params.safeInteractionCall("model picker update", () => interaction.update(payload));
+	const updatePicker = async (payload) => await params.safeInteractionCall("model picker update", () => deferredUpdate ? interaction.editReply(payload) : interaction.update(payload));
 	const showNotice = async (message) => await updatePicker(buildDiscordModelPickerNoticePayload(message));
 	if (parsed.action === "recents") {
 		await updatePicker(toDiscordModelPickerMessagePayload(renderDiscordModelPickerRecentsView({
@@ -2854,7 +2847,7 @@ function resolveDiscordCommandOwnerAllowFrom(cfg) {
 function createDiscordNativeCommand(params) {
 	const { command, cfg, discordConfig, accountId, sessionPrefix, ephemeralDefault, threadBindings } = params;
 	const fallbackCommandDefinition = createNativeCommandDefinition(command);
-	const commandDefinition = nativeCommandRuntime.matchPluginCommand(`/${command.name}`) !== null ? fallbackCommandDefinition : findCommandByNativeName(command.name, "discord", { includeBundledChannelFallback: false }) ?? fallbackCommandDefinition;
+	const commandDefinition = nativeCommandRuntime.matchPluginCommand(`/${command.name}`) !== null ? fallbackCommandDefinition : findCommandByNativeName$1(command.name, "discord", { includeBundledChannelFallback: false }) ?? fallbackCommandDefinition;
 	const argDefinitions = commandDefinition.args ?? command.args;
 	const commandOptions = buildDiscordCommandOptions({
 		command: commandDefinition,
@@ -2899,11 +2892,11 @@ function createDiscordNativeCommand(params) {
 			const commandArgs = argDefinitions?.length ? readDiscordCommandArgs(interaction, argDefinitions) : command.acceptsArgs ? parseCommandArgs(commandDefinition, interaction.options.getString("input") ?? "") : void 0;
 			const commandArgsWithRaw = commandArgs ? {
 				...commandArgs,
-				raw: serializeCommandArgs(commandDefinition, commandArgs) ?? commandArgs.raw
+				raw: serializeCommandArgs$1(commandDefinition, commandArgs) ?? commandArgs.raw
 			} : void 0;
 			await dispatchDiscordCommandInteraction({
 				interaction,
-				prompt: buildCommandTextFromArgs(commandDefinition, commandArgsWithRaw),
+				prompt: buildCommandTextFromArgs$1(commandDefinition, commandArgsWithRaw),
 				command: commandDefinition,
 				commandArgs: commandArgsWithRaw,
 				cfg,
@@ -3067,14 +3060,13 @@ async function dispatchDiscordCommandInteraction(params) {
 				tag: sender.tag
 			},
 			allowNameMatching,
-			useAccessGroups,
 			cfg,
 			rest: interaction.client.rest
 		});
-		commandAuthorized = dmAccess.commandAuthorized;
-		if (dmAccess.decision !== "allow") {
+		commandAuthorized = dmAccess.senderAccess.allowed ? dmAccess.commandAccess.authorized : false;
+		if (dmAccess.senderAccess.decision !== "allow") {
 			await handleDiscordDmCommandDecision({
-				dmAccess,
+				senderAccess: dmAccess.senderAccess,
 				accountId,
 				sender: {
 					id: user.id,
@@ -3108,8 +3100,9 @@ async function dispatchDiscordCommandInteraction(params) {
 		return { accepted: false };
 	}
 	if (!isDirectMessage) {
-		commandAuthorized = resolveDiscordGuildNativeCommandAuthorized({
+		commandAuthorized = await resolveDiscordGuildNativeCommandAuthorized({
 			cfg,
+			accountId,
 			discordConfig,
 			useAccessGroups,
 			commandsAllowFromAccess,
@@ -4953,18 +4946,20 @@ async function resolveDiscordAllowlistConfig(params) {
 		fetcher: params.fetcher,
 		runtime: params.runtime
 	});
-	allowFrom = await resolveAllowFromByUserAllowlist({
-		token: params.token,
-		allowFrom,
-		fetcher: params.fetcher,
-		runtime: params.runtime
-	});
-	if (hasGuildEntries(guildEntries)) guildEntries = await resolveGuildEntriesByUserAllowlist({
-		token: params.token,
-		guildEntries,
-		fetcher: params.fetcher,
-		runtime: params.runtime
-	});
+	if (isDangerousNameMatchingEnabled(params.discordConfig)) {
+		allowFrom = await resolveAllowFromByUserAllowlist({
+			token: params.token,
+			allowFrom,
+			fetcher: params.fetcher,
+			runtime: params.runtime
+		});
+		if (hasGuildEntries(guildEntries)) guildEntries = await resolveGuildEntriesByUserAllowlist({
+			token: params.token,
+			guildEntries,
+			fetcher: params.fetcher,
+			runtime: params.runtime
+		});
+	}
 	return {
 		guildEntries: hasGuildEntries(guildEntries) ? guildEntries : void 0,
 		allowFrom
@@ -5413,6 +5408,7 @@ async function authorizeVoiceCommand(interaction, params, options) {
 	const access = await authorizeDiscordVoiceIngress({
 		cfg: params.cfg,
 		discordConfig: params.discordConfig,
+		accountId: params.accountId,
 		groupPolicy: params.groupPolicy,
 		useAccessGroups: params.useAccessGroups,
 		guild: interaction.guild,
@@ -5730,35 +5726,6 @@ async function replySilently(interaction, params) {
 //#region extensions/discord/src/monitor/agent-components-dm-auth.ts
 async function ensureDmComponentAuthorized(params) {
 	const { ctx, interaction, user, componentLabel, replyOpts } = params;
-	const allowFromPrefixes = [
-		"discord:",
-		"user:",
-		"pk:"
-	];
-	const resolveAllowMatch = (entries) => {
-		const allowList = normalizeDiscordAllowList(entries, allowFromPrefixes);
-		return allowList ? resolveDiscordAllowListMatch({
-			allowList,
-			candidate: {
-				id: user.id,
-				name: user.username,
-				tag: formatDiscordUserTag(user)
-			},
-			allowNameMatching: isDangerousNameMatchingEnabled(ctx.discordConfig)
-		}) : { allowed: false };
-	};
-	const resolveAllowMatchWithAccessGroups = async (entries) => {
-		const staticMatch = resolveAllowMatch(entries);
-		if (staticMatch.allowed) return staticMatch;
-		return (await resolveDiscordDmAccessGroupEntries({
-			cfg: ctx.cfg,
-			allowFrom: entries,
-			sender: { id: user.id },
-			accountId: ctx.accountId,
-			token: ctx.token,
-			isSenderAllowed: (senderId, allowFrom) => resolveAllowMatch(allowFrom).allowed || allowFrom.includes(senderId)
-		})).length > 0 ? resolveAllowMatch([...entries, `discord:${user.id}`]) : staticMatch;
-	};
 	const dmPolicy = ctx.dmPolicy ?? "pairing";
 	if (dmPolicy === "disabled") {
 		logVerbose(`agent ${componentLabel}: blocked (DM policy disabled)`);
@@ -5768,8 +5735,27 @@ async function ensureDmComponentAuthorized(params) {
 		});
 		return false;
 	}
-	if (dmPolicy === "allowlist") {
-		if ((await resolveAllowMatchWithAccessGroups(ctx.allowFrom ?? [])).allowed) return true;
+	const access = await resolveDiscordDmCommandAccess({
+		accountId: ctx.accountId,
+		dmPolicy,
+		configuredAllowFrom: ctx.allowFrom ?? [],
+		sender: {
+			id: user.id,
+			name: user.username,
+			tag: formatDiscordUserTag(user)
+		},
+		allowNameMatching: isDangerousNameMatchingEnabled(ctx.discordConfig),
+		cfg: ctx.cfg,
+		token: ctx.token,
+		readStoreAllowFrom: async ({ accountId, dmPolicy }) => await readChannelIngressStoreAllowFromForDmPolicy({
+			provider: "discord",
+			accountId,
+			dmPolicy
+		}),
+		eventKind: "button"
+	});
+	if (access.senderAccess.decision === "allow") return true;
+	if (access.senderAccess.decision !== "pairing") {
 		logVerbose(`agent ${componentLabel}: blocked DM user ${user.id} (not in allowFrom)`);
 		await replySilently(interaction, {
 			content: `You are not authorized to use this ${componentLabel}.`,
@@ -5777,46 +5763,31 @@ async function ensureDmComponentAuthorized(params) {
 		});
 		return false;
 	}
-	const storeAllowFrom = dmPolicy === "open" ? [] : await readStoreAllowFromForDmPolicy$1({
-		provider: "discord",
-		accountId: ctx.accountId,
-		dmPolicy
-	});
-	const allowMatch = resolveAllowMatch([...ctx.allowFrom ?? [], ...storeAllowFrom]);
-	if ((allowMatch.allowed ? allowMatch : await resolveAllowMatchWithAccessGroups([...ctx.allowFrom ?? [], ...storeAllowFrom])).allowed) return true;
-	if (dmPolicy === "pairing") {
-		if (!(await createChannelPairingChallengeIssuer({
-			channel: "discord",
-			upsertPairingRequest: async ({ id, meta }) => {
-				return await upsertChannelPairingRequest$1({
-					channel: "discord",
-					id,
-					accountId: ctx.accountId,
-					meta
-				});
-			}
-		})({
-			senderId: user.id,
-			senderIdLine: `Your Discord user id: ${user.id}`,
-			meta: {
-				tag: formatDiscordUserTag(user),
-				name: user.username
-			},
-			sendPairingReply: async (text) => {
-				await interaction.reply({
-					content: text,
-					...replyOpts
-				});
-			}
-		})).created) await replySilently(interaction, {
-			content: "Pairing already requested. Ask the bot owner to approve your code.",
-			...replyOpts
-		});
-		return false;
-	}
-	logVerbose(`agent ${componentLabel}: blocked DM user ${user.id} (not in allowFrom)`);
-	await replySilently(interaction, {
-		content: `You are not authorized to use this ${componentLabel}.`,
+	if (!(await createChannelPairingChallengeIssuer({
+		channel: "discord",
+		upsertPairingRequest: async ({ id, meta }) => {
+			return await upsertChannelPairingRequest$1({
+				channel: "discord",
+				id,
+				accountId: ctx.accountId,
+				meta
+			});
+		}
+	})({
+		senderId: user.id,
+		senderIdLine: `Your Discord user id: ${user.id}`,
+		meta: {
+			tag: formatDiscordUserTag(user),
+			name: user.username
+		},
+		sendPairingReply: async (text) => {
+			await interaction.reply({
+				content: text,
+				...replyOpts
+			});
+		}
+	})).created) await replySilently(interaction, {
+		content: "Pairing already requested. Ask the bot owner to approve your code.",
 		...replyOpts
 	});
 	return false;
@@ -6028,7 +5999,7 @@ async function resolveAuthorizedComponentInteraction(params) {
 		guildInfo,
 		channelConfig,
 		allowNameMatching,
-		commandAuthorized: resolveComponentCommandAuthorized({
+		commandAuthorized: await resolveComponentCommandAuthorized({
 			ctx: params.ctx,
 			interactionCtx,
 			channelConfig,
@@ -6039,7 +6010,7 @@ async function resolveAuthorizedComponentInteraction(params) {
 		replyOpts
 	};
 }
-function resolveComponentCommandAuthorized(params) {
+async function resolveComponentCommandAuthorized(params) {
 	const { ctx, interactionCtx, channelConfig, guildInfo } = params;
 	if (interactionCtx.isDirectMessage) return true;
 	const { ownerAllowList, ownerAllowed: ownerOk } = resolveDiscordOwnerAccess({
@@ -6206,18 +6177,13 @@ const AGENT_SELECT_KEY = "agentsel";
 //#endregion
 //#region extensions/discord/src/monitor/agent-components.dispatch.ts
 let conversationRuntimePromise$1;
-let replyPipelineRuntimePromise;
 let typingRuntimePromise;
 async function loadConversationRuntime$1() {
-	conversationRuntimePromise$1 ??= import("./agent-components.runtime-Dof1YMSz.js");
+	conversationRuntimePromise$1 ??= import("./agent-components.runtime-zT8qPsnM.js");
 	return await conversationRuntimePromise$1;
 }
-async function loadReplyPipelineRuntime() {
-	replyPipelineRuntimePromise ??= import("openclaw/plugin-sdk/channel-reply-pipeline");
-	return await replyPipelineRuntimePromise;
-}
 async function loadTypingRuntime() {
-	typingRuntimePromise ??= import("./typing-Bw6NKWLZ.js").then((n) => n.n);
+	typingRuntimePromise ??= import("./typing-BYeVSviE.js").then((n) => n.n);
 	return await typingRuntimePromise;
 }
 function buildDiscordComponentConversationLabel(params) {
@@ -6303,7 +6269,7 @@ async function dispatchDiscordComponentEvent(params) {
 			return typeof candidate === "string" && /^\d+$/.test(candidate) ? candidate : void 0;
 		}
 	}) : null;
-	const commandAuthorized = resolveComponentCommandAuthorized({
+	const commandAuthorized = await resolveComponentCommandAuthorized({
 		ctx,
 		interactionCtx,
 		channelConfig,
@@ -6363,13 +6329,6 @@ async function dispatchDiscordComponentEvent(params) {
 	});
 	const deliverTarget = `channel:${interactionCtx.channelId}`;
 	const typingChannelId = interactionCtx.channelId;
-	const { createChannelReplyPipeline } = await loadReplyPipelineRuntime();
-	const { onModelSelected, ...replyPipeline } = createChannelReplyPipeline({
-		cfg: ctx.cfg,
-		agentId,
-		channel: "discord",
-		accountId
-	});
 	const tableMode = resolveMarkdownTableMode({
 		cfg: ctx.cfg,
 		channel: "discord",
@@ -6401,12 +6360,15 @@ async function dispatchDiscordComponentEvent(params) {
 				raw: interaction
 			}),
 			resolveTurn: () => ({
+				cfg: ctx.cfg,
 				channel: "discord",
 				accountId,
+				agentId,
 				routeSessionKey: sessionKey,
 				storePath,
 				ctxPayload,
 				recordInboundSession,
+				dispatchReplyWithBufferedBlockDispatcher,
 				record: {
 					updateLastRoute: interactionCtx.isDirectMessage ? {
 						sessionKey: route.mainSessionKey,
@@ -6425,53 +6387,50 @@ async function dispatchDiscordComponentEvent(params) {
 						logVerbose(`discord: failed updating component session meta: ${String(err)}`);
 					}
 				},
-				runDispatch: () => dispatchReplyWithBufferedBlockDispatcher({
-					ctx: ctxPayload,
-					cfg: ctx.cfg,
-					replyOptions: { onModelSelected },
-					dispatcherOptions: {
-						...replyPipeline,
-						humanDelay: resolveHumanDelayConfig(ctx.cfg, agentId),
-						deliver: async (payload) => {
-							const replyToId = replyReference.use();
-							await deliverDiscordReply({
+				delivery: {
+					deliver: async (payload) => {
+						const replyToId = replyReference.use();
+						await deliverDiscordReply({
+							cfg: ctx.cfg,
+							replies: [payload],
+							target: deliverTarget,
+							token,
+							accountId,
+							rest: interaction.client.rest,
+							runtime,
+							replyToId,
+							replyToMode,
+							textLimit,
+							maxLinesPerMessage: resolveDiscordMaxLinesPerMessage({
 								cfg: ctx.cfg,
-								replies: [payload],
-								target: deliverTarget,
-								token,
-								accountId,
-								rest: interaction.client.rest,
-								runtime,
-								replyToId,
-								replyToMode,
-								textLimit,
-								maxLinesPerMessage: resolveDiscordMaxLinesPerMessage({
-									cfg: ctx.cfg,
-									discordConfig: ctx.discordConfig,
-									accountId
-								}),
-								tableMode,
-								chunkMode: resolveChunkMode(ctx.cfg, "discord", accountId),
-								mediaLocalRoots
+								discordConfig: ctx.discordConfig,
+								accountId
+							}),
+							tableMode,
+							chunkMode: resolveChunkMode(ctx.cfg, "discord", accountId),
+							mediaLocalRoots
+						});
+						replyReference.markSent();
+					},
+					onError: (err) => {
+						logError(`discord component dispatch failed: ${String(err)}`);
+					}
+				},
+				replyPipeline: {},
+				dispatcherOptions: {
+					humanDelay: resolveHumanDelayConfig(ctx.cfg, agentId),
+					onReplyStart: async () => {
+						try {
+							const { sendTyping } = await loadTypingRuntime();
+							await sendTyping({
+								rest: feedbackRest,
+								channelId: typingChannelId
 							});
-							replyReference.markSent();
-						},
-						onReplyStart: async () => {
-							try {
-								const { sendTyping } = await loadTypingRuntime();
-								await sendTyping({
-									rest: feedbackRest,
-									channelId: typingChannelId
-								});
-							} catch (err) {
-								logVerbose(`discord: typing failed for component reply: ${String(err)}`);
-							}
-						},
-						onError: (err) => {
-							logError(`discord component dispatch failed: ${String(err)}`);
+						} catch (err) {
+							logVerbose(`discord: typing failed for component reply: ${String(err)}`);
 						}
 					}
-				})
+				}
 			})
 		}
 	});
@@ -6511,7 +6470,7 @@ async function dispatchDiscordPluginInteractiveHandler(params) {
 //#region extensions/discord/src/monitor/agent-components.plugin-interactive.ts
 let conversationRuntimePromise;
 async function loadConversationRuntime() {
-	conversationRuntimePromise ??= import("./agent-components.runtime-Dof1YMSz.js");
+	conversationRuntimePromise ??= import("./agent-components.runtime-zT8qPsnM.js");
 	return await conversationRuntimePromise;
 }
 async function dispatchPluginDiscordInteractiveEvent(params) {
@@ -6637,7 +6596,7 @@ async function dispatchPluginDiscordInteractiveEvent(params) {
 //#region extensions/discord/src/monitor/agent-components.handlers.ts
 let componentsRuntimePromise;
 async function loadComponentsRuntime() {
-	componentsRuntimePromise ??= import("./components-D5LnN7ZQ.js").then((n) => n.t);
+	componentsRuntimePromise ??= import("./components-BJOShoIU.js").then((n) => n.t);
 	return await componentsRuntimePromise;
 }
 async function handleDiscordComponentEvent(params) {
@@ -8142,7 +8101,7 @@ function logDiscordStartupPhase(params) {
 	});
 }
 async function loadDiscordVoiceRuntime() {
-	const promise = discordVoiceRuntimePromise ?? import("./manager.runtime-Cug1PoeZ.js");
+	const promise = discordVoiceRuntimePromise ?? import("./manager.runtime-DGvCDWI5.js");
 	discordVoiceRuntimePromise = promise;
 	try {
 		return await promise;
@@ -8152,7 +8111,7 @@ async function loadDiscordVoiceRuntime() {
 	}
 }
 async function loadDiscordProviderSessionRuntime() {
-	const promise = discordProviderSessionRuntimePromise ?? import("./provider-session.runtime-CCESIHVo.js");
+	const promise = discordProviderSessionRuntimePromise ?? import("./provider-session.runtime-DepAOR1U.js");
 	discordProviderSessionRuntimePromise = promise;
 	try {
 		return await promise;
@@ -8247,6 +8206,7 @@ async function monitorDiscordProvider(opts = {}) {
 		token,
 		guildEntries,
 		allowFrom,
+		discordConfig: discordCfg,
 		fetcher: discordRestFetch,
 		runtime
 	});