@openclaw/discord 2026.9.6 → 2026.9.8

package/dist/.setup/{channel-Dv4e3Jpc.mjs → channel-DxlUVU9t.mjs}

@@ -1,18 +1,20 @@
-import { c as resolveDiscordAccount, i as listDiscordStartupAccountIds, l as resolveDiscordAccountAllowFrom, r as listDiscordAccountIds, s as resolveDefaultDiscordAccountId, u as resolveDiscordAccountConfig } from "./accounts-CwJQoLjM.mjs";
+import { C as withDiscordRequestAuthority } from "./discord-0xJYfdDD.mjs";
+import { c as resolveDiscordAccount, i as listDiscordStartupAccountIds, l as resolveDiscordAccountAllowFrom, r as listDiscordAccountIds, s as resolveDefaultDiscordAccountId, u as resolveDiscordAccountConfig } from "./accounts-ChaMcixG.mjs";
 import { t as getDiscordRuntime } from "./runtime-DgnVQ7zW.mjs";
-import { _ as normalizeDiscordMessagingTarget, g as matchesDiscordToolContextTarget, h as looksLikeDiscordTargetId, y as parseDiscordTarget } from "./retry-BEYkDy0P.mjs";
+import { _ as matchesDiscordToolContextTarget, b as parseDiscordTarget, g as looksLikeDiscordTargetId, v as normalizeDiscordMessagingTarget } from "./retry-pz_cSha2.mjs";
 import { u as withAbortTimeout } from "./timeouts-D86uWLt_.mjs";
-import { A as createChannelApproverDmTargetResolver, D as isDiscordExecApprovalClientEnabled, E as isDiscordExecApprovalApprover, M as isChannelExecApprovalClientEnabledFromConfig, N as matchesApprovalRequestFilters, O as shouldSuppressLocalDiscordExecApprovalPrompt, T as getDiscordExecApprovalApprovers, _ as resolveDiscordRuntimeBindingConversationId, f as resolveDiscordConversationRoute, g as resolveDiscordCurrentConversationIdentity, j as createChannelNativeOriginTargetResolver, k as createApproverRestrictedNativeApprovalCapability, t as resolveDiscordOutboundSessionRoute, v as discordMessageActions, w as resolveRequiredDiscordChannelPermissions } from "./outbound-session-route-VulUE0yV.mjs";
-import { a as discordSecurityAdapter, c as buildTokenChannelStatusSummary, i as discordSetupContract, l as projectCredentialSnapshotFields, n as discordConfigAdapter, o as DEFAULT_ACCOUNT_ID$1, s as PAIRING_APPROVED_MESSAGE, t as createDiscordPluginBase, u as resolveConfiguredFromCredentialStatuses } from "./shared-DHPDaMSx.mjs";
+import { D as isDiscordExecApprovalClientEnabled, E as isDiscordExecApprovalApprover, O as shouldSuppressLocalDiscordExecApprovalPrompt, T as getDiscordExecApprovalApprovers, _ as resolveDiscordRuntimeBindingConversationId, f as resolveDiscordConversationRoute, t as resolveDiscordOutboundSessionRoute, v as discordMessageActions, w as resolveRequiredDiscordChannelPermissions } from "./outbound-session-route-zVGxxceg.mjs";
+import { a as normalizeDiscordAcpConversationId, c as resolveDiscordInboundConversation, i as matchDiscordAcpConversation, n as discordOutbound, o as resolveDiscordAttachedOutboundTarget, r as buildDiscordCrossContextPresentation, s as resolveDiscordCommandConversation } from "./outbound-adapter-BobT-kse.mjs";
 import { r as openDiscordCommandDeployHashStore } from "./command-deploy-store-DFkBTViB.mjs";
-import { t as resolveDiscordConversationBindingRoute } from "./conversation-binding-route-B7qImK_b.mjs";
-import { n as setThreadBindingMaxAgeBySessionKey, t as setThreadBindingIdleTimeoutBySessionKey } from "./thread-bindings.session-updates-DCQq1WZ5.mjs";
-import { n as discordOutbound } from "./outbound-adapter-ClIgmu4F.mjs";
+import { t as resolveDiscordConversationBindingRoute } from "./conversation-binding-route-Caz_XuFH.mjs";
+import { a as discordSecurityAdapter, i as discordSetupContract, n as discordConfigAdapter, t as createDiscordPluginBase } from "./shared-B3wZ4hN-.mjs";
 import { t as normalizeExplicitDiscordSessionKey } from "./session-key-normalization-wJgsKPNF.mjs";
+import { i as setThreadBindingMaxAgeBySessionKeyAsync, n as setThreadBindingIdleTimeoutBySessionKeyAsync, r as setThreadBindingMaxAgeBySessionKey, t as setThreadBindingIdleTimeoutBySessionKey } from "./thread-bindings.session-updates-CshfKghV.mjs";
 import { t as defaultTopLevelPlacement } from "./thread-binding-api-BDZJD4na.mjs";
 import { formatErrorMessage } from "openclaw/plugin-sdk/error-runtime";
-import { normalizeAccountId } from "openclaw/plugin-sdk/account-id";
-import { normalizeLowercaseStringOrEmpty, normalizeOptionalString, normalizeOptionalStringifiedId } from "openclaw/plugin-sdk/string-coerce-runtime";
+import { DEFAULT_ACCOUNT_ID, normalizeAccountId } from "openclaw/plugin-sdk/account-id";
+import { PAIRING_APPROVED_MESSAGE, buildTokenChannelStatusSummary, projectCredentialSnapshotFields, resolveConfiguredFromCredentialStatuses } from "openclaw/plugin-sdk/channel-status";
+import { normalizeLowercaseStringOrEmpty, normalizeOptionalString } from "openclaw/plugin-sdk/string-coerce-runtime";
 import { createRuntimeConfigReader } from "openclaw/plugin-sdk/runtime-config-snapshot";
 import { sleepWithAbort } from "openclaw/plugin-sdk/runtime-env";
 import { createChannelMessageAdapterFromOutbound } from "openclaw/plugin-sdk/channel-outbound";
@@ -24,8 +26,10 @@ import { createPairingPrefixStripper } from "openclaw/plugin-sdk/channel-pairing
 import { createChannelDirectoryAdapter, createRuntimeDirectoryLiveAdapter } from "openclaw/plugin-sdk/directory-runtime";
 import { appendMatchMetadata, createComputedAccountStatusAdapter, createDefaultChannelRuntimeState, isRecord as isRecord$1, readAccountStatusSnapshot, resolveEnabledConfiguredAccountId } from "openclaw/plugin-sdk/status-helpers";
 import { resolveTargetsWithOptionalToken } from "openclaw/plugin-sdk/target-resolver-runtime";
+import { createApproverRestrictedNativeApprovalCapability } from "openclaw/plugin-sdk/approval-delivery-runtime";
 import { createLazyChannelApprovalNativeRuntimeAdapter } from "openclaw/plugin-sdk/approval-handler-adapter-runtime";
-import { doesApprovalRequestSelectChannelAccount, resolveApprovalRequestSessionConversation } from "openclaw/plugin-sdk/approval-native-runtime";
+import { createChannelApproverDmTargetResolver, createChannelNativeOriginTargetResolver, doesApprovalRequestSelectChannelAccount, resolveApprovalRequestSessionConversation } from "openclaw/plugin-sdk/approval-native-runtime";
+import { isChannelExecApprovalClientEnabledFromConfig, matchesApprovalRequestFilters } from "openclaw/plugin-sdk/approval-client-runtime";
 import { resolveThreadBindingSpawnPolicy } from "openclaw/plugin-sdk/conversation-runtime";
 import { resolveScopeRequireMention, resolveScopeToolsPolicy, scopeKey } from "openclaw/plugin-sdk/channel-policy";
 import { normalizeAtHashSlug } from "openclaw/plugin-sdk/string-normalization-runtime";
@@ -79,14 +83,13 @@ function normalizeDiscordThreadId(value) {
 	const normalized = value.trim();
 	return /^\d+$/.test(normalized) ? normalized : void 0;
 }
-function createDiscordOriginTargetResolver(configOverride) {
+function createDiscordOriginTargetResolver() {
 	return createChannelNativeOriginTargetResolver({
 		channel: "discord",
 		shouldHandleRequest: ({ cfg, accountId, request }) => shouldHandleDiscordApprovalRequest({
 			cfg,
 			accountId,
-			request,
-			configOverride
+			request
 		}),
 		resolveTurnSourceTarget: (request) => {
 			const sessionConversation = resolveApprovalRequestSessionConversation({
@@ -98,7 +101,7 @@ function createDiscordOriginTargetResolver(configOverride) {
 			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 threadId = normalizeDiscordThreadId(request.request.turnSourceThreadId) ?? normalizeDiscordThreadId(sessionConversation?.threadId);
 			const hasExplicitOriginTarget = /^(?:channel|group):/i.test(rawTurnSourceTo);
 			if (turnSourceChannel !== "discord" || !turnSourceTo || sessionKind === "dm") return null;
 			return hasExplicitOriginTarget || sessionKind === "channel" || sessionKind === "group" ? {
@@ -116,7 +119,7 @@ function createDiscordOriginTargetResolver(configOverride) {
 			const targetTo = normalizeDiscordOriginChannelId(sessionTarget.to);
 			return targetTo ? {
 				to: targetTo,
-				threadId: normalizeDiscordThreadId(sessionTarget.threadId) ?? normalizeDiscordThreadId(sessionConversation?.threadId) ?? void 0
+				threadId: normalizeDiscordThreadId(sessionTarget.threadId) ?? normalizeDiscordThreadId(sessionConversation?.threadId)
 			} : null;
 		},
 		resolveFallbackTarget: (request) => {
@@ -129,58 +132,53 @@ function createDiscordOriginTargetResolver(configOverride) {
 			const fallbackChannelId = normalizeDiscordOriginChannelId(sessionConversation?.id);
 			return fallbackChannelId ? {
 				to: fallbackChannelId,
-				threadId: normalizeDiscordThreadId(sessionConversation?.threadId) ?? void 0
+				threadId: normalizeDiscordThreadId(sessionConversation?.threadId)
 			} : null;
 		}
 	});
 }
-function createDiscordApproverDmTargetResolver(configOverride) {
+function createDiscordApproverDmTargetResolver() {
 	return createChannelApproverDmTargetResolver({
 		shouldHandleRequest: ({ cfg, accountId, request }) => shouldHandleDiscordApprovalRequest({
 			cfg,
 			accountId,
-			request,
-			configOverride
+			request
 		}),
 		resolveApprovers: ({ cfg, accountId }) => getDiscordExecApprovalApprovers({
 			cfg,
-			accountId,
-			configOverride
+			accountId
 		}),
 		mapApprover: (approver) => ({ to: approver })
 	});
 }
-function createDiscordApprovalCapability(configOverride) {
+function createDiscordApprovalCapability() {
 	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\`.`;
+			return `Approve it from the Web 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
+			accountId
 		}).length > 0,
 		isExecAuthorizedSender: ({ cfg, accountId, senderId }) => isDiscordExecApprovalApprover({
 			cfg,
 			accountId,
-			senderId,
-			configOverride
+			senderId
 		}),
 		isNativeDeliveryEnabled: ({ cfg, accountId }) => isDiscordExecApprovalClientEnabled({
 			cfg,
-			accountId,
-			configOverride
+			accountId
 		}),
-		resolveNativeDeliveryMode: ({ cfg, accountId }) => configOverride?.target ?? resolveDiscordAccount({
+		resolveNativeDeliveryMode: ({ cfg, accountId }) => resolveDiscordAccount({
 			cfg,
 			accountId
 		}).config.execApprovals?.target ?? "dm",
-		resolveOriginTarget: createDiscordOriginTargetResolver(configOverride),
-		resolveApproverDmTargets: createDiscordApproverDmTargetResolver(configOverride),
+		resolveOriginTarget: createDiscordOriginTargetResolver(),
+		resolveApproverDmTargets: createDiscordApproverDmTargetResolver(),
 		notifyOriginWhenDmOnly: true,
 		nativeRuntime: createLazyChannelApprovalNativeRuntimeAdapter({
 			capabilityBoundary: true,
@@ -191,16 +189,14 @@ function createDiscordApprovalCapability(configOverride) {
 			],
 			isConfigured: ({ cfg, accountId }) => isDiscordExecApprovalClientEnabled({
 				cfg,
-				accountId,
-				configOverride
+				accountId
 			}),
 			shouldHandle: ({ cfg, accountId, request }) => shouldHandleDiscordApprovalRequest({
 				cfg,
 				accountId,
-				request,
-				configOverride
+				request
 			}),
-			load: async () => (await import("./approval-handler.runtime-CbBktBb4.mjs")).discordApprovalNativeRuntime
+			load: async () => (await import("./approval-handler.runtime-DxCK2Rux.mjs")).discordApprovalNativeRuntime
 		})
 	});
 }
@@ -210,119 +206,23 @@ function getDiscordApprovalCapability() {
 	return cachedDiscordApprovalCapability;
 }
 //#endregion
-//#region extensions/discord/src/channel.conversation.ts
-function resolveDiscordAttachedOutboundTarget(params) {
-	if (params.threadId == null) return params.to;
-	const threadId = normalizeOptionalStringifiedId(params.threadId) ?? "";
-	return threadId ? `channel:${threadId}` : params.to;
-}
-function buildDiscordCrossContextPresentation(params) {
-	return {
-		tone: "neutral",
-		blocks: [...params.message.trim() ? [{
-			type: "text",
-			text: params.message
-		}, { type: "divider" }] : [], {
-			type: "context",
-			text: `From ${params.originLabel}`
-		}]
-	};
-}
-function normalizeDiscordAcpConversationId(conversationId) {
-	const normalized = conversationId.trim();
-	return normalized ? { conversationId: normalized } : null;
-}
-function matchDiscordAcpConversation(params) {
-	if (params.bindingConversationId === params.conversationId) return {
-		conversationId: params.conversationId,
-		matchPriority: 2
-	};
-	if (params.parentConversationId && params.parentConversationId !== params.conversationId && params.bindingConversationId === params.parentConversationId) return {
-		conversationId: params.parentConversationId,
-		matchPriority: 1
-	};
-	return null;
-}
-function resolveDiscordConversationIdFromTargets(targets) {
-	for (const raw of targets) {
-		const trimmed = raw?.trim();
-		if (!trimmed) continue;
-		try {
-			const target = parseDiscordTarget(trimmed, { defaultKind: "channel" });
-			if (target?.normalized) return target.normalized;
-		} catch {
-			const mentionMatch = trimmed.match(/^<#(\d+)>$/);
-			if (mentionMatch?.[1]) return `channel:${mentionMatch[1]}`;
-			if (/^\d{6,}$/.test(trimmed)) return normalizeDiscordMessagingTarget(trimmed);
-		}
-	}
-}
-function parseDiscordParentChannelFromSessionKey(raw) {
-	const sessionKey = normalizeLowercaseStringOrEmpty(raw);
-	if (!sessionKey) return;
-	const match = sessionKey.match(/(?:^|:)channel:([^:]+)$/);
-	return match?.[1] ? `channel:${match[1]}` : void 0;
-}
-function resolveDiscordCommandConversation(params) {
-	const threadConversation = resolveDiscordThreadConversationRef(params);
-	if (threadConversation) return threadConversation;
-	const conversationId = resolveDiscordCurrentConversationIdentity({
-		from: params.from,
-		chatType: params.chatType,
-		originatingTo: params.originatingTo,
-		commandTo: params.commandTo,
-		fallbackTo: params.fallbackTo
-	});
-	return conversationId ? { conversationId } : null;
-}
-function resolveDiscordThreadConversationRef(params) {
-	const threadId = normalizeOptionalStringifiedId(params.threadId);
-	if (!threadId) return null;
-	const targets = [
-		params.originatingTo ?? params.to,
-		params.commandTo,
-		params.fallbackTo ?? params.conversationId
-	];
-	const parentConversationId = normalizeDiscordMessagingTarget(normalizeOptionalStringifiedId(params.threadParentId) ?? "") || parseDiscordParentChannelFromSessionKey(params.parentSessionKey) || resolveDiscordConversationIdFromTargets(targets);
-	return {
-		conversationId: threadId,
-		...parentConversationId && parentConversationId !== threadId ? { parentConversationId } : {}
-	};
-}
-function resolveDiscordInboundConversation(params) {
-	const threadConversation = resolveDiscordThreadConversationRef({
-		to: params.to,
-		conversationId: params.conversationId,
-		threadId: params.threadId,
-		threadParentId: params.threadParentId
-	});
-	if (threadConversation) return threadConversation;
-	const conversationId = resolveDiscordCurrentConversationIdentity({
-		from: params.from,
-		chatType: params.isGroup ? "group" : "direct",
-		originatingTo: params.to,
-		fallbackTo: params.conversationId
-	});
-	return conversationId ? { conversationId } : null;
-}
-//#endregion
 //#region extensions/discord/src/channel.loaders.ts
-const loadDiscordDirectoryConfigModule = createLazyRuntimeModule(() => import("./directory-config-BytTftz-.mjs").then((n) => n.t));
-const loadDiscordResolveChannelsModule = createLazyRuntimeModule(() => import("./resolve-channels-BbvsLQOZ.mjs").then((n) => n.n));
-const loadDiscordResolveUsersModule = createLazyRuntimeModule(() => import("./resolve-users-ByFlR7LQ.mjs").then((n) => n.n));
-const loadDiscordThreadBindingsManagerModule = createLazyRuntimeModule(() => import("./thread-bindings.manager-ve-i6oqt.mjs").then((n) => n.i));
-const loadDiscordTargetResolverModule = createLazyRuntimeModule(() => import("./target-resolver-BXpy6VT8.mjs").then((n) => n.r));
-const loadDiscordProviderRuntime = createLazyRuntimeModule(() => import("./provider.runtime-BmjW_pIw.mjs"));
-const loadDiscordProbeRuntime = createLazyRuntimeModule(() => import("./probe.runtime-DBQ_AGPe.mjs"));
+const loadDiscordDirectoryConfigModule = createLazyRuntimeModule(() => import("./directory-config-esqNn0Eo.mjs").then((n) => n.t));
+const loadDiscordResolveChannelsModule = createLazyRuntimeModule(() => import("./resolve-channels-BFPNRmVv.mjs").then((n) => n.n));
+const loadDiscordResolveUsersModule = createLazyRuntimeModule(() => import("./resolve-users-0-aBuCy3.mjs").then((n) => n.n));
+const loadDiscordThreadBindingsManagerModule = createLazyRuntimeModule(() => import("./thread-bindings.manager-DN-NissX.mjs").then((n) => n.r));
+const loadDiscordTargetResolverModule = createLazyRuntimeModule(() => import("./target-resolver-BuLapkhy.mjs").then((n) => n.r));
+const loadDiscordProviderRuntime = createLazyRuntimeModule(() => import("./provider.runtime-CUE3UxER.mjs"));
+const loadDiscordProbeRuntime = createLazyRuntimeModule(() => import("./probe-LYrIHlBF.mjs").then((n) => n.o));
 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-vKbh-LFR.mjs").then((n) => n.n));
-const loadDiscordSendModule = createLazyRuntimeModule(() => import("./send-CIBzvXjS.mjs").then((n) => n.t));
-const loadDiscordDirectoryLiveModule = createLazyRuntimeModule(() => import("./directory-live--EGTH0DC.mjs").then((n) => n.t));
+const loadDiscordAuditModule = createLazyRuntimeModule(() => import("./audit-CLg9I71N.mjs").then((n) => n.n));
+const loadDiscordSendModule = createLazyRuntimeModule(() => import("./send-CrfEI6Bs.mjs").then((n) => n.t));
+const loadDiscordDirectoryLiveModule = createLazyRuntimeModule(() => import("./directory-live-DtKRHuGV.mjs").then((n) => n.t));
 //#endregion
 //#region extensions/discord/src/conversation-route-owner.ts
 function inspectDiscordConversationRouteOwner(params) {
@@ -337,8 +237,9 @@ function inspectDiscordConversationRouteOwner(params) {
 		userId: direct ? params.conversation.peerId : void 0,
 		channelId: nativeConversationId
 	});
-	const route = resolveDiscordConversationRoute({
+	const route = ({ boundAgentId }) => resolveDiscordConversationRoute({
 		cfg: params.cfg,
+		defaultAgentId: boundAgentId,
 		accountId,
 		guildId: params.conversation.context?.guildId,
 		memberRoleIds: params.conversation.context?.memberRoleIds,
@@ -350,7 +251,7 @@ function inspectDiscordConversationRouteOwner(params) {
 	});
 	const { runtimeRoute, configuredRoute } = resolveDiscordConversationBindingRoute({
 		cfg: params.cfg,
-		route,
+		resolveRoute: route,
 		accountId,
 		runtimeConversationId,
 		configuredConversationId: threadConversationId ?? nativeConversationId,
@@ -366,28 +267,25 @@ function inspectDiscordConversationRouteOwner(params) {
 	if (runtimeRoute.pluginId) return {
 		kind: "plugin",
 		pluginId: runtimeRoute.pluginId,
-		fallbackAgentId: route.agentId
+		fallbackAgentId: runtimeRoute.route.agentId
 	};
 	return {
 		kind: "agent",
-		agentId: runtimeRoute.boundAgentId ?? configuredRoute?.boundAgentId ?? route.agentId
+		agentId: runtimeRoute.boundAgentId ?? configuredRoute?.boundAgentId ?? runtimeRoute.route.agentId
 	};
 }
 //#endregion
 //#region extensions/discord/src/group-policy.ts
-function normalizeDiscordSlug(value) {
-	return normalizeAtHashSlug(value);
-}
 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 space;
-	const normalized = normalizeDiscordSlug(space);
+	const normalized = normalizeAtHashSlug(space);
 	if (normalized && guilds[normalized]) return normalized;
 	if (normalized) {
-		const match = Object.entries(guilds).find(([, entry]) => normalizeDiscordSlug(entry?.slug ?? void 0) === normalized);
+		const match = Object.entries(guilds).find(([, entry]) => normalizeAtHashSlug(entry?.slug ?? void 0) === normalized);
 		if (match) return match[0];
 	}
 	return guilds["*"] ? "*" : void 0;
@@ -395,11 +293,11 @@ function resolveDiscordGuildKey(guilds, groupSpace) {
 function resolveDiscordChannelKey(channelEntries, params) {
 	if (!channelEntries || Object.keys(channelEntries).length === 0) return;
 	const groupChannel = params.groupChannel;
-	const channelSlug = normalizeDiscordSlug(groupChannel);
+	const channelSlug = normalizeAtHashSlug(groupChannel);
 	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;
+	const normalizedGroupChannel = groupChannel ? normalizeAtHashSlug(groupChannel) : void 0;
 	return normalizedGroupChannel !== void 0 && channelEntries[normalizedGroupChannel] ? normalizedGroupChannel : void 0;
 }
 function buildDiscordPolicyTree(guilds) {
@@ -448,11 +346,8 @@ function resolveDiscordGroupToolPolicy(params) {
 }
 //#endregion
 //#region extensions/discord/src/status-issues.ts
-function readDiscordApplicationSummary(value) {
-	if (!isRecord$1(value)) return {};
-	const intentsRaw = value.intents;
-	if (!isRecord$1(intentsRaw)) return {};
-	return { intents: { messageContent: intentsRaw.messageContent === "enabled" || intentsRaw.messageContent === "limited" || intentsRaw.messageContent === "disabled" ? intentsRaw.messageContent : void 0 } };
+function isDiscordMessageContentIntentDisabled(value) {
+	return isRecord$1(value) && isRecord$1(value.intents) && value.intents.messageContent === "disabled";
 }
 function readDiscordPermissionsAuditSummary(value) {
 	if (!isRecord$1(value)) return {};
@@ -492,7 +387,6 @@ function collectDiscordStatusIssues(accounts) {
 		if (!account) continue;
 		const accountId = resolveEnabledConfiguredAccountId(account);
 		if (!accountId) continue;
-		const app = readDiscordApplicationSummary(account.application);
 		if (account.groupPolicy === "allowlist" && account.guildsConfigured === 0) {
 			const guildGuidance = accountId === "default" ? "Add your server under channels.discord.guilds. If channels.discord.accounts.default.guilds is set, add it there instead." : `Add your server under channels.discord.accounts.${accountId}.guilds.`;
 			issues.push({
@@ -503,7 +397,7 @@ function collectDiscordStatusIssues(accounts) {
 				fix: `${guildGuidance} Refresh channel status after the configuration reload applies.`
 			});
 		}
-		if (app.intents?.messageContent === "disabled") issues.push({
+		if (isDiscordMessageContentIntentDisabled(account.application)) issues.push({
 			channel: "discord",
 			accountId,
 			kind: "intent",
@@ -538,6 +432,47 @@ function collectDiscordStatusIssues(accounts) {
 	return issues;
 }
 //#endregion
+//#region extensions/discord/src/thread-bindings-channel.ts
+function toConversationLifecycleBinding(binding) {
+	return {
+		boundAt: binding.boundAt,
+		lastActivityAt: typeof binding.lastActivityAt === "number" ? binding.lastActivityAt : binding.boundAt,
+		idleTimeoutMs: typeof binding.idleTimeoutMs === "number" ? binding.idleTimeoutMs : void 0,
+		maxAgeMs: typeof binding.maxAgeMs === "number" ? binding.maxAgeMs : void 0
+	};
+}
+const discordConversationBindings = {
+	supportsCurrentConversationBinding: true,
+	bindingStore: "adapter",
+	defaultTopLevelPlacement,
+	createManager: async ({ cfg, accountId }) => (await loadDiscordThreadBindingsManagerModule()).createThreadBindingManager({
+		cfg,
+		accountId: accountId ?? void 0,
+		persist: false,
+		enableSweeper: false
+	}),
+	setIdleTimeoutBySessionKey: ({ targetSessionKey, accountId, idleTimeoutMs }) => setThreadBindingIdleTimeoutBySessionKey({
+		targetSessionKey,
+		accountId: accountId ?? void 0,
+		idleTimeoutMs
+	}).map(toConversationLifecycleBinding),
+	setMaxAgeBySessionKey: ({ targetSessionKey, accountId, maxAgeMs }) => setThreadBindingMaxAgeBySessionKey({
+		targetSessionKey,
+		accountId: accountId ?? void 0,
+		maxAgeMs
+	}).map(toConversationLifecycleBinding),
+	setIdleTimeoutBySessionKeyAsync: async ({ targetSessionKey, accountId, idleTimeoutMs }) => (await setThreadBindingIdleTimeoutBySessionKeyAsync({
+		targetSessionKey,
+		accountId: accountId ?? void 0,
+		idleTimeoutMs
+	})).map(toConversationLifecycleBinding),
+	setMaxAgeBySessionKeyAsync: async ({ targetSessionKey, accountId, maxAgeMs }) => (await setThreadBindingMaxAgeBySessionKeyAsync({
+		targetSessionKey,
+		accountId: accountId ?? void 0,
+		maxAgeMs
+	})).map(toConversationLifecycleBinding)
+};
+//#endregion
 //#region extensions/discord/src/channel.ts
 const DISCORD_ACCOUNT_STARTUP_STAGGER_MS = 1e4;
 const discordMessageAdapter = createChannelMessageAdapterFromOutbound({
@@ -556,6 +491,22 @@ const discordMessageAdapter = createChannelMessageAdapterFromOutbound({
 		} }
 	}
 });
+async function sendDiscordHeartbeatTyping(params) {
+	const resolvedTo = resolveDiscordAttachedOutboundTarget(params);
+	const target = parseDiscordTarget(resolvedTo, { defaultKind: "channel" });
+	if (!target || target.kind !== "channel") return;
+	const { sendTypingDiscord } = await loadDiscordSendModule();
+	const assertCurrent = () => {
+		params.signal?.throwIfAborted();
+		params.assertPlatformSendAuthorized?.();
+	};
+	assertCurrent();
+	await withDiscordRequestAuthority(assertCurrent, () => sendTypingDiscord(target.id, {
+		cfg: params.cfg,
+		accountId: params.accountId ?? void 0,
+		signal: params.signal
+	}));
+}
 function startDiscordStartupProbe(params) {
 	(async () => {
 		try {
@@ -614,14 +565,6 @@ const resolveDiscordAllowlistNames = createAccountScopedAllowlistNameResolver({
 		entries
 	})
 });
-function toConversationLifecycleBinding(binding) {
-	return {
-		boundAt: binding.boundAt,
-		lastActivityAt: typeof binding.lastActivityAt === "number" ? binding.lastActivityAt : binding.boundAt,
-		idleTimeoutMs: typeof binding.idleTimeoutMs === "number" ? binding.idleTimeoutMs : void 0,
-		maxAgeMs: typeof binding.maxAgeMs === "number" ? binding.maxAgeMs : void 0
-	};
-}
 const discordPlugin = createChatChannelPlugin({
 	base: {
 		...createDiscordPluginBase({ setupContract: discordSetupContract }),
@@ -659,14 +602,7 @@ const discordPlugin = createChatChannelPlugin({
 			directTargetStyle: "user-prefixed",
 			targetIdComparison: "lowercase",
 			normalizeTarget: normalizeDiscordMessagingTarget,
-			resolveInboundConversation: ({ from, to, conversationId, threadId, threadParentId, isGroup }) => resolveDiscordInboundConversation({
-				from,
-				to,
-				conversationId,
-				threadId,
-				threadParentId,
-				isGroup
-			}),
+			resolveInboundConversation: resolveDiscordInboundConversation,
 			normalizeExplicitSessionKey: ({ sessionKey, ctx }) => normalizeExplicitDiscordSessionKey(sessionKey, ctx),
 			resolveSessionTarget: ({ id }) => normalizeDiscordMessagingTarget(`channel:${id}`),
 			inferTargetChatType: ({ to }) => {
@@ -679,7 +615,7 @@ const discordPlugin = createChatChannelPlugin({
 				}
 			},
 			buildCrossContextPresentation: buildDiscordCrossContextPresentation,
-			resolveOutboundSessionRoute: (params) => resolveDiscordOutboundSessionRoute(params),
+			resolveOutboundSessionRoute: resolveDiscordOutboundSessionRoute,
 			targetResolver: {
 				looksLikeId: looksLikeDiscordTargetId,
 				hint: "<channelId|user:ID|channel:ID>",
@@ -758,52 +694,15 @@ const discordPlugin = createChatChannelPlugin({
 				conversationId,
 				parentConversationId
 			}),
-			resolveCommandConversation: ({ threadId, threadParentId, parentSessionKey, from, chatType, originatingTo, commandTo, fallbackTo }) => resolveDiscordCommandConversation({
-				threadId,
-				threadParentId,
-				parentSessionKey,
-				from,
-				chatType,
-				originatingTo,
-				commandTo,
-				fallbackTo
-			})
+			resolveCommandConversation: resolveDiscordCommandConversation
 		},
-		conversationBindings: {
-			supportsCurrentConversationBinding: true,
-			bindingStore: "adapter",
-			defaultTopLevelPlacement,
-			createManager: async ({ cfg, accountId }) => (await loadDiscordThreadBindingsManagerModule()).createThreadBindingManagerAsync({
-				cfg,
-				accountId: accountId ?? void 0,
-				persist: false,
-				enableSweeper: false
-			}),
-			setIdleTimeoutBySessionKey: ({ targetSessionKey, accountId, idleTimeoutMs }) => setThreadBindingIdleTimeoutBySessionKey({
-				targetSessionKey,
-				accountId: accountId ?? void 0,
-				idleTimeoutMs
-			}).map(toConversationLifecycleBinding),
-			setMaxAgeBySessionKey: ({ targetSessionKey, accountId, maxAgeMs }) => setThreadBindingMaxAgeBySessionKey({
-				targetSessionKey,
-				accountId: accountId ?? void 0,
-				maxAgeMs
-			}).map(toConversationLifecycleBinding)
+		conversationBindings: discordConversationBindings,
+		heartbeat: {
+			sendTyping: sendDiscordHeartbeatTyping,
+			sendTypingGuarded: sendDiscordHeartbeatTyping
 		},
-		heartbeat: { sendTyping: async ({ cfg, to, accountId, threadId }) => {
-			const resolvedTo = resolveDiscordAttachedOutboundTarget({
-				to,
-				threadId
-			});
-			const target = parseDiscordTarget(resolvedTo, { defaultKind: "channel" });
-			if (!target || target.kind !== "channel") return;
-			await (await loadDiscordSendModule()).sendTypingDiscord(target.id, {
-				cfg,
-				accountId: accountId ?? void 0
-			});
-		} },
 		status: createComputedAccountStatusAdapter({
-			defaultRuntime: createDefaultChannelRuntimeState(DEFAULT_ACCOUNT_ID$1, {
+			defaultRuntime: createDefaultChannelRuntimeState(DEFAULT_ACCOUNT_ID, {
 				connected: false,
 				reconnectAttempts: 0,
 				lastConnectedAt: null,
@@ -1043,12 +942,7 @@ const discordPlugin = createChatChannelPlugin({
 		...discordOutbound,
 		preferFinalAssistantVisibleText: true,
 		shouldTreatDeliveredTextAsVisible: shouldTreatDiscordDeliveredTextAsVisible,
-		shouldSuppressLocalPayloadPrompt: ({ cfg, accountId, payload, hint }) => shouldSuppressLocalDiscordExecApprovalPrompt({
-			cfg,
-			accountId,
-			payload,
-			hint
-		})
+		shouldSuppressLocalPayloadPrompt: shouldSuppressLocalDiscordExecApprovalPrompt
 	}
 });
 //#endregion

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

@@ -243,12 +243,11 @@ function resolveDiscordAllowListNameMatch(list, candidate) {
 	return null;
 }
 function allowListMatches(list, candidate, params) {
-	if (list.allowAll) return true;
-	if (candidate.id && list.ids.has(candidate.id)) return true;
-	if (params?.allowNameMatching === true) {
-		if (resolveDiscordAllowListNameMatch(list, candidate)) return true;
-	}
-	return false;
+	return resolveDiscordAllowListMatch({
+		allowList: list,
+		candidate,
+		allowNameMatching: params?.allowNameMatching
+	}).allowed;
 }
 function resolveDiscordAllowListMatch(params) {
 	const { allowList, candidate } = params;
@@ -414,6 +413,7 @@ function resolveDiscordChannelConfigEntry(entry) {
 	return {
 		allowed: entry.enabled !== false,
 		requireMention: entry.requireMention,
+		requireMentionInBotThreads: entry.requireMentionInBotThreads,
 		ignoreOtherMentions: entry.ignoreOtherMentions,
 		skills: entry.skills,
 		enabled: entry.enabled,
@@ -427,15 +427,12 @@ function resolveDiscordChannelConfigEntry(entry) {
 	};
 }
 function resolveDiscordChannelConfig(params) {
-	const { guildInfo, channelId, channelName, channelSlug } = params;
-	const channels = guildInfo?.channels;
-	if (!hasConfiguredDiscordChannels(channels)) return null;
-	const match = resolveDiscordChannelEntryMatch(channels, {
-		id: channelId,
-		name: channelName,
-		slug: channelSlug
+	return resolveDiscordChannelConfigWithFallback({
+		guildInfo: params.guildInfo,
+		channelId: params.channelId,
+		channelName: params.channelName,
+		channelSlug: params.channelSlug
 	});
-	return resolveChannelMatchConfig(match, resolveDiscordChannelConfigEntry) ?? { allowed: false };
 }
 function resolveDiscordChannelConfigWithFallback(params) {
 	const { guildInfo, channelId, channelName, channelSlug, parentId, parentName, parentSlug, scope } = params;
@@ -454,17 +451,20 @@ function resolveDiscordChannelConfigWithFallback(params) {
 	} : void 0);
 	return resolveChannelMatchConfig(match, resolveDiscordChannelConfigEntry) ?? { allowed: false };
 }
+/** Boolean runtime API retained for plugins built against OpenClaw 2026.9.6. */
 function resolveDiscordShouldRequireMention(params) {
-	if (!params.isGuildMessage) return false;
-	if (params.isAutoThreadOwnedByBot ?? isDiscordAutoThreadOwnedByBot(params)) return false;
-	return params.channelConfig?.requireMention ?? params.guildInfo?.requireMention ?? true;
+	return resolveDiscordMentionPolicy(params).requireMention;
 }
-function isDiscordAutoThreadOwnedByBot(params) {
-	if (!params.isThread) return false;
-	if (!params.channelConfig?.autoThread) return false;
+function resolveDiscordMentionPolicy(params) {
 	const botId = params.botId?.trim();
 	const threadOwnerId = params.threadOwnerId?.trim();
-	return Boolean(botId && threadOwnerId && botId === threadOwnerId);
+	const isBotOwnedThread = Boolean(params.isGuildMessage && (params.isAutoThreadOwnedByBot === true || params.isThread && botId && threadOwnerId === botId));
+	const isAutoThreadOwnedByBot = params.isAutoThreadOwnedByBot ?? (isBotOwnedThread && params.channelConfig?.autoThread);
+	const requireMentionInBotThreads = isBotOwnedThread ? params.channelConfig?.requireMentionInBotThreads ?? params.guildInfo?.requireMentionInBotThreads : void 0;
+	return {
+		requireMention: requireMentionInBotThreads ?? (params.isGuildMessage && !isAutoThreadOwnedByBot ? params.channelConfig?.requireMention ?? params.guildInfo?.requireMention ?? true : false),
+		allowedImplicitMentionKinds: requireMentionInBotThreads === true ? ["native"] : void 0
+	};
 }
 function isDiscordGroupAllowedByPolicy(params) {
 	if (params.groupPolicy === "allowlist" && !params.guildAllowlisted) return false;
@@ -531,4 +531,4 @@ function isDiscordThreadChannelType(channelType) {
 	return channelType === ChannelType.AnnouncementThread || channelType === ChannelType.PublicThread || channelType === ChannelType.PrivateThread;
 }
 //#endregion
-export { resolveTimestampMs as C, resolveDiscordEndpointAttachmentGuard as D, getDiscordEndpointRuntime as E, resolveDiscordEndpointMediaGuard as O, resolveDiscordSystemLocation as S, assertDiscordEndpointGatewayUrl as T, resolveDiscordShouldRequireMention as _, normalizeDiscordDisplaySlug as a, formatDiscordReactionEmoji as b, resolveDiscordChannelConfig as c, resolveDiscordCommandAuthorized as d, resolveDiscordGuildEntry as f, resolveDiscordOwnerAllowFrom as g, resolveDiscordOwnerAccess as h, normalizeDiscordAllowList as i, resolveDiscordChannelConfigWithFallback as l, resolveDiscordMemberAllowed as m, allowListMatches as n, normalizeDiscordSlug as o, resolveDiscordMemberAccessState as p, isDiscordGroupAllowedByPolicy as r, resolveDiscordAllowListMatch as s, isDiscordThreadChannelType as t, resolveDiscordChannelPolicyCommandAuthorizer as u, resolveGroupDmAllow as v, parseDiscordRetryAfterBodySeconds as w, formatDiscordUserTag as x, shouldEmitDiscordReactionNotification as y };
+export { resolveDiscordSystemLocation as C, getDiscordEndpointRuntime as D, assertDiscordEndpointGatewayUrl as E, resolveDiscordEndpointAttachmentGuard as O, formatDiscordUserTag as S, parseDiscordRetryAfterBodySeconds as T, resolveDiscordOwnerAllowFrom as _, normalizeDiscordDisplaySlug as a, shouldEmitDiscordReactionNotification as b, resolveDiscordChannelConfig as c, resolveDiscordCommandAuthorized as d, resolveDiscordGuildEntry as f, resolveDiscordOwnerAccess as g, resolveDiscordMentionPolicy as h, normalizeDiscordAllowList as i, resolveDiscordEndpointMediaGuard as k, resolveDiscordChannelConfigWithFallback as l, resolveDiscordMemberAllowed as m, allowListMatches as n, normalizeDiscordSlug as o, resolveDiscordMemberAccessState as p, isDiscordGroupAllowedByPolicy as r, resolveDiscordAllowListMatch as s, isDiscordThreadChannelType as t, resolveDiscordChannelPolicyCommandAuthorizer as u, resolveDiscordShouldRequireMention as v, resolveTimestampMs as w, formatDiscordReactionEmoji as x, resolveGroupDmAllow as y };