@openclaw/discord 2026.7.1 → 2026.7.2-beta.2

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

@@ -1,29 +1,210 @@
-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 { 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 looksLikeDiscordTargetId, d as parseDiscordTarget, l as normalizeDiscordMessagingTarget } from "./chunk-CHpY_lsO.js";
+import { c as resolveDiscordAccountAllowFrom, i as listEnabledDiscordAccounts, o as resolveDefaultDiscordAccountId, r as listDiscordAccountIds, s as resolveDiscordAccount } from "./accounts-CMd4nzLB.js";
+import { t as resolveDiscordOutboundSessionRoute } from "./outbound-session-route-D4QqePZN.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 projectCredentialSnapshotFields, n as PAIRING_APPROVED_MESSAGE, o as resolveConfiguredFromCredentialStatuses, r as buildTokenChannelStatusSummary, t as DEFAULT_ACCOUNT_ID } from "./channel-api-CAJ0wMoV.js";
+import { d as withAbortTimeout } from "./timeouts-D5lWili0.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-BPcbhCAH.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-BQct-o4T.js";
+import { r as openDiscordCommandDeployHashStore } from "./command-deploy-store-DFkBTViB.js";
+import { n as setThreadBindingMaxAgeBySessionKey, t as setThreadBindingIdleTimeoutBySessionKey } from "./thread-bindings.session-updates-DnTpkroM.js";
+import { n as discordOutbound } from "./outbound-adapter-ByoXsR-V.js";
+import { a as discordSecurityAdapter, i as discordSetupAdapter, n as discordConfigAdapter, t as createDiscordPluginBase } from "./shared-Bngr0I-v.js";
 import { t as normalizeExplicitDiscordSessionKey } from "./session-key-normalization-wJgsKPNF.js";
-import { createLazyRuntimeModule } from "openclaw/plugin-sdk/lazy-runtime";
+import { t as defaultTopLevelPlacement } from "./thread-binding-api-BDZJD4na.js";
 import { normalizeLowercaseStringOrEmpty, normalizeOptionalString, normalizeOptionalStringifiedId } from "openclaw/plugin-sdk/string-coerce-runtime";
-import { createChatChannelPlugin } from "openclaw/plugin-sdk/channel-core";
 import { formatErrorMessage } from "openclaw/plugin-sdk/error-runtime";
 import { sleepWithAbort } from "openclaw/plugin-sdk/runtime-env";
+import { createChatChannelPlugin } from "openclaw/plugin-sdk/channel-core";
 import { createChannelMessageAdapterFromOutbound } from "openclaw/plugin-sdk/channel-outbound";
+import { createLazyRuntimeModule } from "openclaw/plugin-sdk/lazy-runtime";
 import { buildLegacyDmAccountAllowlistAdapter, createAccountScopedAllowlistNameResolver, createNestedAllowlistOverrideResolver } from "openclaw/plugin-sdk/allowlist-config-edit";
 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 { appendMatchMetadata, asString, createComputedAccountStatusAdapter, createDefaultChannelRuntimeState, isRecord as isRecord$1, readAccountStatusSnapshot, 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, scopeKey } 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-B7E1-x5q.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,84 +302,95 @@ 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-G1QwBIdi.js").then((n) => n.t));
+const loadDiscordResolveChannelsModule = createLazyRuntimeModule(() => import("./resolve-channels-BO9NUPlS.js").then((n) => n.n));
+const loadDiscordResolveUsersModule = createLazyRuntimeModule(() => import("./resolve-users-CU3oG5-m.js").then((n) => n.n));
+const loadDiscordThreadBindingsManagerModule = createLazyRuntimeModule(() => import("./thread-bindings.manager-DJ4cO5Eu.js").then((n) => n.a));
+const loadDiscordTargetResolverModule = createLazyRuntimeModule(() => import("./target-resolver-BaEmTxeK.js").then((n) => n.r));
+const loadDiscordProviderRuntime = createLazyRuntimeModule(() => import("./provider.runtime-BX8GcCYx.js"));
+const loadDiscordProbeRuntime = createLazyRuntimeModule(() => import("./probe.runtime-CRY-qUke.js"));
+async function probeDiscordStatusAccount(params) {
+	const startedAtMs = Date.now();
+	const runtime = await loadDiscordProbeRuntime();
+	const remainingMs = Math.max(1, params.timeoutMs - Math.max(0, Date.now() - startedAtMs));
+	return await runtime.probeDiscord(params.token, remainingMs, { includeApplication: true });
+}
+const loadDiscordAuditModule = createLazyRuntimeModule(() => import("./audit-CjpnY1yb.js").then((n) => n.n));
+const loadDiscordSendModule = createLazyRuntimeModule(() => import("./send-JJzVo_sK.js").then((n) => n.t));
+const loadDiscordDirectoryLiveModule = createLazyRuntimeModule(() => import("./directory-live-nfvekMil.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 guildScopeKey = (guildKey) => scopeKey(["guild", guildKey]);
+const channelScopeKey = (guildKey, channelKey) => scopeKey(["guild", guildKey], ["channel", 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
-function readDiscordAccountStatus(value) {
-	if (!isRecord$1(value)) return null;
-	return {
-		accountId: value.accountId,
-		enabled: value.enabled,
-		configured: value.configured,
-		running: value.running,
-		connected: value.connected,
-		healthState: value.healthState,
-		application: value.application,
-		audit: value.audit
-	};
-}
 function readDiscordApplicationSummary(value) {
 	if (!isRecord$1(value)) return {};
 	const intentsRaw = value.intents;
@@ -234,7 +426,11 @@ function readDiscordPermissionsAuditSummary(value) {
 function collectDiscordStatusIssues(accounts) {
 	const issues = [];
 	for (const entry of accounts) {
-		const account = readDiscordAccountStatus(entry);
+		const account = readAccountStatusSnapshot(entry, [
+			"healthState",
+			"application",
+			"audit"
+		]);
 		if (!account) continue;
 		const accountId = resolveEnabledConfiguredAccountId(account);
 		if (!accountId) continue;
@@ -433,6 +629,8 @@ const discordPlugin = createChatChannelPlugin({
 		] },
 		messaging: {
 			targetPrefixes: ["discord"],
+			directTargetStyle: "user-prefixed",
+			targetIdComparison: "lowercase",
 			normalizeTarget: normalizeDiscordMessagingTarget,
 			resolveInboundConversation: ({ from, to, conversationId, threadId, threadParentId, isGroup }) => resolveDiscordInboundConversation({
 				from,
@@ -459,11 +657,14 @@ 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;
+					if (!looksLikeDiscordTargetId(resolved.normalized)) return null;
+					if (!looksLikeDiscordTargetId(input) && defaultKind === "channel" && resolved.kind === "user") return null;
 					return {
 						to: resolved.normalized,
 						kind: resolved.kind === "user" ? "user" : "channel",
@@ -543,7 +744,7 @@ const discordPlugin = createChatChannelPlugin({
 		},
 		conversationBindings: {
 			supportsCurrentConversationBinding: true,
-			defaultTopLevelPlacement: "child",
+			defaultTopLevelPlacement,
 			createManager: async ({ cfg, accountId }) => (await loadDiscordThreadBindingsManagerModule()).createThreadBindingManager({
 				cfg,
 				accountId: accountId ?? void 0,
@@ -582,7 +783,10 @@ const discordPlugin = createChatChannelPlugin({
 			}),
 			collectStatusIssues: collectDiscordStatusIssues,
 			buildChannelSummary: ({ snapshot }) => buildTokenChannelStatusSummary(snapshot, { includeMode: false }),
-			probeAccount: async ({ account, timeoutMs }) => (await loadDiscordProbeRuntime()).probeDiscord(account.token, timeoutMs, { includeApplication: true }),
+			probeAccount: async ({ account, timeoutMs }) => await probeDiscordStatusAccount({
+				token: account.token,
+				timeoutMs
+			}),
 			formatCapabilitiesProbe: ({ probe }) => {
 				const discordProbe = probe;
 				const lines = [];
@@ -739,6 +943,12 @@ const discordPlugin = createChatChannelPlugin({
 				log: ctx.log
 			});
 			ctx.log?.info(`[${account.accountId}] starting provider`);
+			let commandDeployHashStore;
+			try {
+				commandDeployHashStore = openDiscordCommandDeployHashStore(getDiscordRuntime().state.openKeyedStore);
+			} catch (error) {
+				ctx.log?.warn?.(`[${account.accountId}] Discord command deploy cache unavailable; continuing without persistence: ${formatErrorMessage(error)}`);
+			}
 			return (await loadDiscordProviderRuntime()).monitorDiscordProvider({
 				token,
 				accountId: account.accountId,
@@ -751,7 +961,8 @@ const discordPlugin = createChatChannelPlugin({
 				setStatus: (patch) => ctx.setStatus({
 					accountId: account.accountId,
 					...patch
-				})
+				}),
+				commandDeployHashStore
 			});
 		} }
 	},
@@ -767,14 +978,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 +1012,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-actions-D_fjVUZ_.js → channel-actions-BQct-o4T.js}

@@ -1,10 +1,10 @@
-import { t as inspectDiscordAccount } from "./account-inspect-DDZtT5C8.js";
-import { r as listDiscordAccountIds, t as createDiscordActionGate } from "./accounts-P19jm1lf.js";
-import { d as readDiscordComponentSpec } from "./components-BIBizbtZ.js";
+import { r as listDiscordAccountIds, t as createDiscordActionGate } from "./accounts-CMd4nzLB.js";
+import { m as readDiscordComponentSpec } from "./outbound-session-route-D4QqePZN.js";
+import { t as inspectDiscordAccount } from "./account-inspect-dFV0JrnR.js";
 import { i as withDiscordInboundEventDeliveryMetadata } from "./inbound-event-delivery-CEPlt2uz.js";
-import { createLazyRuntimeModule } from "openclaw/plugin-sdk/lazy-runtime";
 import { normalizeOptionalString } from "openclaw/plugin-sdk/string-coerce-runtime";
 import { createUnionActionGate } from "openclaw/plugin-sdk/channel-actions";
+import { createLazyRuntimeModule } from "openclaw/plugin-sdk/lazy-runtime";
 import { extractToolSend } from "openclaw/plugin-sdk/tool-send";
 //#region extensions/discord/src/trusted-requester-actions.ts
 const trustedRequesterGuildAdminActions = /* @__PURE__ */ new Set([
@@ -41,7 +41,7 @@ const localExecutionActions = /* @__PURE__ */ new Set([
 function resolveDiscordActionExecutionMode({ action }) {
 	return localExecutionActions.has(action) ? "local" : "gateway";
 }
-const loadDiscordChannelActionsRuntime = createLazyRuntimeModule(() => import("./channel-actions.runtime-CVHlFqQg.js"));
+const loadDiscordChannelActionsRuntime = createLazyRuntimeModule(() => import("./channel-actions.runtime-CC4QwYVO.js"));
 function listDiscoverableDiscordAccounts(cfg) {
 	return listDiscordAccountIds(cfg).map((accountId) => inspectDiscordAccount({
 		cfg,
@@ -185,7 +185,7 @@ const discordMessageActions = {
 			}
 		};
 	},
-	handleAction: async ({ action, params, cfg, accountId, requesterSenderId, senderIsOwner, toolContext, mediaAccess, mediaLocalRoots, mediaReadFile, sessionKey, inboundEventKind }) => {
+	handleAction: async ({ action, params, cfg, accountId, requesterAccountId, requesterSenderId, senderIsOwner, toolContext, mediaAccess, mediaLocalRoots, mediaReadFile, sessionKey, inboundEventKind, conversationReadOrigin }) => {
 		return await (await loadDiscordChannelActionsRuntime()).handleDiscordMessageAction({
 			action,
 			params,
@@ -198,7 +198,9 @@ const discordMessageActions = {
 			mediaLocalRoots,
 			mediaReadFile,
 			...sessionKey ? { sessionKey } : {},
-			...inboundEventKind ? { inboundEventKind } : {}
+			...inboundEventKind ? { inboundEventKind } : {},
+			...requesterAccountId ? { requesterAccountId } : {},
+			...conversationReadOrigin ? { conversationReadOrigin } : {}
 		});
 	}
 };