@openclaw/discord 2026.10.2 → 2026.10.5-beta.2

package/dist/.setup/{channel-Dr-AUnGt.mjs → channel-DI7DMzu0.mjs}

@@ -1,25 +1,27 @@
-import { c as resolveDiscordAccount, i as listDiscordStartupAccountIds, l as resolveDiscordAccountAllowFrom, r as listDiscordAccountIds, s as resolveDefaultDiscordAccountId, u as resolveDiscordAccountConfig } from "./accounts-HE9-mj1L.mjs";
-import { C as withDiscordRequestAuthority } from "./discord-9gysrhzp.mjs";
-import { d as normalizeDiscordMessagingTarget, l as looksLikeDiscordTargetId, p as parseDiscordTarget, u as matchesDiscordToolContextTarget } from "./send.receipt-DVOg2Oaw.mjs";
-import { l as withAbortTimeout } from "./timeouts-pun7VJ02.mjs";
+import { a as listDiscordStartupAccountIds, c as resolveDefaultDiscordAccountId, d as resolveDiscordAccountConfig, i as listDiscordAccountIds, l as resolveDiscordAccount, u as resolveDiscordAccountAllowFrom } from "./accounts-ljrzXBJi.mjs";
+import { W as withDiscordRequestAuthority } from "./discord-BGqgx-yd.mjs";
+import { d as normalizeDiscordMessagingTarget, l as looksLikeDiscordTargetId, u as matchesDiscordToolContextTarget } from "./send.receipt-BAlzXd8e.mjs";
+import { t as parseDiscordTarget } from "./target-parsing-C-HyNxcE.mjs";
+import { l as withAbortTimeout } from "./timeouts-CuNARfyw.mjs";
 import { t as getDiscordRuntime } from "./runtime-DgnVQ7zW.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-BvBH4LC6.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-D4wRAb5S.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-B0Hpwn3Q.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-D8OOIuKn.mjs";
 import { r as openDiscordCommandDeployHashStore } from "./command-deploy-store-DFkBTViB.mjs";
-import { t as resolveDiscordConversationBindingRoute } from "./conversation-binding-route-DicJC1Lj.mjs";
-import { a as discordSecurityAdapter, i as discordSetupContract, n as discordConfigAdapter, t as createDiscordPluginBase } from "./shared-BoBnM5kM.mjs";
+import { t as resolveDiscordConversationBindingRoute } from "./conversation-binding-route-DTjCBx-O.mjs";
+import { a as discordSecurityAdapter, i as discordSetupContract, n as discordConfigAdapter, t as createDiscordPluginBase } from "./shared-CestGDpq.mjs";
 import { t as normalizeExplicitDiscordSessionKey } from "./session-key-normalization-CCHGNSQw.mjs";
-import { i as setThreadBindingMaxAgeBySessionKeyAsync, n as setThreadBindingIdleTimeoutBySessionKeyAsync, r as setThreadBindingMaxAgeBySessionKey, t as setThreadBindingIdleTimeoutBySessionKey } from "./thread-bindings.session-updates-Bu_CGr_O.mjs";
+import { i as setThreadBindingMaxAgeBySessionKeyAsync, n as setThreadBindingIdleTimeoutBySessionKeyAsync, r as setThreadBindingMaxAgeBySessionKey, t as setThreadBindingIdleTimeoutBySessionKey } from "./thread-bindings.session-updates-DGSljVf6.mjs";
 import { t as defaultTopLevelPlacement } from "./thread-binding-api-BDZJD4na.mjs";
 import { createLazyRuntimeModule } from "openclaw/plugin-sdk/lazy-runtime";
 import { formatErrorMessage } from "openclaw/plugin-sdk/error-runtime";
 import { sleepWithAbort } from "openclaw/plugin-sdk/runtime-env";
 import { DEFAULT_ACCOUNT_ID, normalizeAccountId } from "openclaw/plugin-sdk/account-id";
-import { normalizeLowercaseStringOrEmpty, normalizeOptionalString, normalizeOptionalTrimmedStringList } from "openclaw/plugin-sdk/string-coerce-runtime";
 import { PAIRING_APPROVED_MESSAGE, buildTokenChannelStatusSummary, projectCredentialSnapshotFields, resolveConfiguredFromCredentialStatuses } from "openclaw/plugin-sdk/channel-status";
+import { asFiniteNumber, normalizeLowercaseStringOrEmpty, normalizeOptionalString, normalizeOptionalTrimmedStringList } from "openclaw/plugin-sdk/string-coerce-runtime";
 import { createRuntimeConfigReader } from "openclaw/plugin-sdk/runtime-config-snapshot";
 import { createChannelMessageAdapterFromOutbound } from "openclaw/plugin-sdk/channel-outbound";
 import { resolveDefaultGroupPolicy, resolveOpenProviderRuntimeGroupPolicy } from "openclaw/plugin-sdk/runtime-group-policy";
+import { normalizeAtHashSlug } from "openclaw/plugin-sdk/string-normalization-runtime";
 import { buildLegacyDmAccountAllowlistAdapter, createAccountScopedAllowlistNameResolver, createNestedAllowlistOverrideResolver } from "openclaw/plugin-sdk/allowlist-config-edit";
 import { createChatChannelPlugin } from "openclaw/plugin-sdk/channel-core";
 import { createPairingPrefixStripper } from "openclaw/plugin-sdk/channel-pairing";
@@ -32,7 +34,6 @@ import { createChannelApproverDmTargetResolver, createChannelNativeOriginTargetR
 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";
 //#region extensions/discord/src/approval-shared.ts
 function isDiscordApprovalAccountEligible(params) {
 	const account = resolveDiscordAccount(params);
@@ -48,7 +49,7 @@ function isDiscordApprovalAccountEligible(params) {
 }
 function shouldHandleDiscordApprovalRequest(params) {
 	const accountId = params.accountId ?? resolveDefaultDiscordAccountId(params.cfg);
-	if (!doesApprovalRequestSelectChannelAccount({
+	return doesApprovalRequestSelectChannelAccount({
 		...params,
 		channel: "discord",
 		defaultAccountId: resolveDefaultDiscordAccountId(params.cfg),
@@ -56,23 +57,26 @@ function shouldHandleDiscordApprovalRequest(params) {
 			...params,
 			accountId
 		}) ? [accountId] : []
-	})) return false;
-	return isDiscordApprovalAccountEligible(params);
+	}) && isDiscordApprovalAccountEligible(params);
 }
 //#endregion
 //#region extensions/discord/src/approval-native.ts
+function shouldHandleCapabilityRequest({ cfg, accountId, request }) {
+	return shouldHandleDiscordApprovalRequest({
+		cfg,
+		accountId,
+		request
+	});
+}
 function extractDiscordSessionKind(sessionKey) {
 	if (!sessionKey) return null;
-	const match = sessionKey.match(/discord:(?:[^:]+:)?(channel|group|dm|direct):/);
-	if (!match) return null;
-	const raw = match[1];
+	const raw = sessionKey.match(/discord:(?:[^:]+:)?(channel|group|dm|direct):/)?.[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;
@@ -84,19 +88,25 @@ function normalizeDiscordThreadId(value) {
 	return /^\d+$/.test(normalized) ? normalized : void 0;
 }
 function createDiscordOriginTargetResolver() {
+	const resolveConversation = (request) => resolveApprovalRequestSessionConversation({
+		request,
+		channel: "discord",
+		bundledFallback: false
+	});
+	const resolveSessionOrigin = (request, sessionTarget) => {
+		const sessionConversation = resolveConversation(request);
+		if (extractDiscordSessionKind(request.request.sessionKey?.trim() || null) === "dm") return null;
+		const to = normalizeDiscordOriginChannelId(sessionTarget ? sessionTarget.to : sessionConversation?.id);
+		return to ? {
+			to,
+			threadId: (sessionTarget ? normalizeDiscordThreadId(sessionTarget.threadId) : void 0) ?? normalizeDiscordThreadId(sessionConversation?.threadId)
+		} : null;
+	};
 	return createChannelNativeOriginTargetResolver({
 		channel: "discord",
-		shouldHandleRequest: ({ cfg, accountId, request }) => shouldHandleDiscordApprovalRequest({
-			cfg,
-			accountId,
-			request
-		}),
+		shouldHandleRequest: shouldHandleCapabilityRequest,
 		resolveTurnSourceTarget: (request) => {
-			const sessionConversation = resolveApprovalRequestSessionConversation({
-				request,
-				channel: "discord",
-				bundledFallback: false
-			});
+			const sessionConversation = resolveConversation(request);
 			const sessionKind = extractDiscordSessionKind(normalizeOptionalString(request.request.sessionKey) ?? null);
 			const turnSourceChannel = normalizeLowercaseStringOrEmpty(request.request.turnSourceChannel);
 			const rawTurnSourceTo = normalizeOptionalString(request.request.turnSourceTo) ?? "";
@@ -109,46 +119,8 @@ function createDiscordOriginTargetResolver() {
 				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)
-			} : 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)
-			} : null;
-		}
-	});
-}
-function createDiscordApproverDmTargetResolver() {
-	return createChannelApproverDmTargetResolver({
-		shouldHandleRequest: ({ cfg, accountId, request }) => shouldHandleDiscordApprovalRequest({
-			cfg,
-			accountId,
-			request
-		}),
-		resolveApprovers: ({ cfg, accountId }) => getDiscordExecApprovalApprovers({
-			cfg,
-			accountId
-		}),
-		mapApprover: (approver) => ({ to: approver })
+		resolveSessionTarget: (sessionTarget, request) => resolveSessionOrigin(request, sessionTarget),
+		resolveFallbackTarget: (request) => resolveSessionOrigin(request)
 	});
 }
 function createDiscordApprovalCapability() {
@@ -178,7 +150,14 @@ function createDiscordApprovalCapability() {
 			accountId
 		}).config.execApprovals?.target ?? "dm",
 		resolveOriginTarget: createDiscordOriginTargetResolver(),
-		resolveApproverDmTargets: createDiscordApproverDmTargetResolver(),
+		resolveApproverDmTargets: createChannelApproverDmTargetResolver({
+			shouldHandleRequest: shouldHandleCapabilityRequest,
+			resolveApprovers: ({ cfg, accountId }) => getDiscordExecApprovalApprovers({
+				cfg,
+				accountId
+			}),
+			mapApprover: (approver) => ({ to: approver })
+		}),
 		notifyOriginWhenDmOnly: true,
 		nativeRuntime: createLazyChannelApprovalNativeRuntimeAdapter({
 			capabilityBoundary: true,
@@ -191,12 +170,8 @@ function createDiscordApprovalCapability() {
 				cfg,
 				accountId
 			}),
-			shouldHandle: ({ cfg, accountId, request }) => shouldHandleDiscordApprovalRequest({
-				cfg,
-				accountId,
-				request
-			}),
-			load: async () => (await import("./approval-handler.runtime-DmnEa54W.mjs")).discordApprovalNativeRuntime
+			shouldHandle: shouldHandleCapabilityRequest,
+			load: async () => (await import("./approval-handler.runtime-D7FoZSn0.mjs")).discordApprovalNativeRuntime
 		})
 	});
 }
@@ -207,22 +182,22 @@ function getDiscordApprovalCapability() {
 }
 //#endregion
 //#region extensions/discord/src/channel.loaders.ts
-const loadDiscordDirectoryConfigModule = createLazyRuntimeModule(() => import("./directory-config-gqsdcplU.mjs").then((n) => n.t));
-const loadDiscordResolveChannelsModule = createLazyRuntimeModule(() => import("./resolve-channels-DA6QlhZN.mjs").then((n) => n.n));
-const loadDiscordResolveUsersModule = createLazyRuntimeModule(() => import("./resolve-users-DNrwvunm.mjs").then((n) => n.n));
-const loadDiscordThreadBindingsManagerModule = createLazyRuntimeModule(() => import("./thread-bindings.manager-D2-GYZ5s.mjs").then((n) => n.r));
-const loadDiscordTargetResolverModule = createLazyRuntimeModule(() => import("./target-resolver-CSFoPQ12.mjs").then((n) => n.r));
-const loadDiscordProviderRuntime = createLazyRuntimeModule(() => import("./provider.runtime-CZ51OIgD.mjs"));
-const loadDiscordProbeRuntime = createLazyRuntimeModule(() => import("./probe-BwSKpnZf.mjs").then((n) => n.o));
+const loadDiscordDirectoryConfigModule = createLazyRuntimeModule(() => import("./directory-config-3iVub-3m.mjs").then((n) => n.t));
+const loadDiscordResolveChannelsModule = createLazyRuntimeModule(() => import("./resolve-channels-UdT38DzU.mjs").then((n) => n.n));
+const loadDiscordResolveUsersModule = createLazyRuntimeModule(() => import("./resolve-users-DnCsrXZ_.mjs").then((n) => n.n));
+const loadDiscordThreadBindingsManagerModule = createLazyRuntimeModule(() => import("./thread-bindings.manager-CdNa6UIs.mjs").then((n) => n.r));
+const loadDiscordTargetResolverModule = createLazyRuntimeModule(() => import("./target-resolver-Bse8fuTi.mjs").then((n) => n.r));
+const loadDiscordProviderRuntime = createLazyRuntimeModule(() => import("./provider.runtime-BQVcM7Pg.mjs"));
+const loadDiscordProbeRuntime = createLazyRuntimeModule(() => import("./probe-D3P1x4aN.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-BpikUwN_.mjs").then((n) => n.n));
-const loadDiscordSendModule = createLazyRuntimeModule(() => import("./send-CJk3VP5q.mjs").then((n) => n.t));
-const loadDiscordDirectoryLiveModule = createLazyRuntimeModule(() => import("./directory-live-Bipr0eUJ.mjs").then((n) => n.t));
+const loadDiscordAuditModule = createLazyRuntimeModule(() => import("./audit-zSawfbsN.mjs").then((n) => n.n));
+const loadDiscordSendModule = createLazyRuntimeModule(() => import("./send-DbILKgcm.mjs").then((n) => n.t));
+const loadDiscordDirectoryLiveModule = createLazyRuntimeModule(() => import("./directory-live-DLygQVtW.mjs").then((n) => n.t));
 //#endregion
 //#region extensions/discord/src/conversation-route-owner.ts
 function inspectDiscordConversationRouteOwner(params) {
@@ -297,28 +272,15 @@ function resolveDiscordChannelKey(channelEntries, params) {
 	if (params.groupId && channelEntries[params.groupId]) return params.groupId;
 	if (channelSlug && channelEntries[channelSlug]) return channelSlug;
 	if (channelSlug && channelEntries[`#${channelSlug}`]) return `#${channelSlug}`;
-	const normalizedGroupChannel = groupChannel ? normalizeAtHashSlug(groupChannel) : void 0;
-	return normalizedGroupChannel !== void 0 && channelEntries[normalizedGroupChannel] ? normalizedGroupChannel : void 0;
-}
-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 };
+	return groupChannel && channelEntries[channelSlug] ? channelSlug : void 0;
 }
 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 tree = { scopes: {} };
+	for (const [guildKey, guild] of Object.entries(guilds ?? {})) {
+		tree.scopes[guildScopeKey(guildKey)] = guild;
+		for (const [channelKey, channel] of Object.entries(guild.channels ?? {})) tree.scopes[channelScopeKey(guildKey, channelKey)] = channel;
+	}
 	const guildKey = resolveDiscordGuildKey(guilds, params.groupSpace);
 	if (!guildKey) return {
 		tree,
@@ -351,7 +313,7 @@ function isDiscordMessageContentIntentDisabled(value) {
 }
 function readDiscordPermissionsAuditSummary(value) {
 	if (!isRecord$1(value)) return {};
-	const unresolvedChannels = typeof value.unresolvedChannels === "number" && Number.isFinite(value.unresolvedChannels) ? value.unresolvedChannels : void 0;
+	const unresolvedChannels = asFiniteNumber(value.unresolvedChannels);
 	const channelsRaw = value.channels;
 	return {
 		unresolvedChannels,
@@ -382,27 +344,28 @@ function collectDiscordStatusIssues(accounts) {
 		if (!account) continue;
 		const accountId = resolveEnabledConfiguredAccountId(account);
 		if (!accountId) continue;
+		const scope = {
+			channel: "discord",
+			accountId
+		};
 		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({
-				channel: "discord",
-				accountId,
+				...scope,
 				kind: "config",
 				message: "Discord guild messages are blocked: effective groupPolicy is \"allowlist\", but no guilds are configured.",
 				fix: `${guildGuidance} Refresh channel status after the configuration reload applies.`
 			});
 		}
 		if (isDiscordMessageContentIntentDisabled(account.application)) issues.push({
-			channel: "discord",
-			accountId,
+			...scope,
 			kind: "intent",
 			message: "Message Content Intent is disabled. Bot may not see normal channel messages.",
 			fix: "Enable Message Content Intent in Discord Dev Portal → Bot → Privileged Gateway Intents, or require mention-only operation."
 		});
 		const audit = readDiscordPermissionsAuditSummary(account.audit);
 		if (audit.unresolvedChannels && audit.unresolvedChannels > 0) issues.push({
-			channel: "discord",
-			accountId,
+			...scope,
 			kind: "config",
 			message: `Some configured guild channels are not numeric IDs (unresolvedChannels=${audit.unresolvedChannels}). Permission audit can only check numeric channel IDs.`,
 			fix: "Use numeric channel IDs as keys in channels.discord.guilds.*.channels (then rerun channels status --probe)."
@@ -413,13 +376,9 @@ function collectDiscordStatusIssues(accounts) {
 			const error = channel.error ? `: ${channel.error}` : "";
 			const baseMessage = `Channel ${channel.channelId} permission check failed.${missing}${error}`;
 			issues.push({
-				channel: "discord",
-				accountId,
+				...scope,
 				kind: "permissions",
-				message: appendMatchMetadata(baseMessage, {
-					matchKey: channel.matchKey,
-					matchSource: channel.matchSource
-				}),
+				message: appendMatchMetadata(baseMessage, channel),
 				fix: "Ensure the bot role can view + send in this channel (and that channel overrides don't deny it)."
 			});
 		}
@@ -446,25 +405,21 @@ const discordConversationBindings = {
 		persist: false,
 		enableSweeper: false
 	}),
-	setIdleTimeoutBySessionKey: ({ targetSessionKey, accountId, idleTimeoutMs }) => setThreadBindingIdleTimeoutBySessionKey({
-		targetSessionKey,
-		accountId: accountId ?? void 0,
-		idleTimeoutMs
+	setIdleTimeoutBySessionKey: (params) => setThreadBindingIdleTimeoutBySessionKey({
+		...params,
+		accountId: params.accountId ?? void 0
 	}).map(toConversationLifecycleBinding),
-	setMaxAgeBySessionKey: ({ targetSessionKey, accountId, maxAgeMs }) => setThreadBindingMaxAgeBySessionKey({
-		targetSessionKey,
-		accountId: accountId ?? void 0,
-		maxAgeMs
+	setMaxAgeBySessionKey: (params) => setThreadBindingMaxAgeBySessionKey({
+		...params,
+		accountId: params.accountId ?? void 0
 	}).map(toConversationLifecycleBinding),
-	setIdleTimeoutBySessionKeyAsync: async ({ targetSessionKey, accountId, idleTimeoutMs }) => (await setThreadBindingIdleTimeoutBySessionKeyAsync({
-		targetSessionKey,
-		accountId: accountId ?? void 0,
-		idleTimeoutMs
+	setIdleTimeoutBySessionKeyAsync: async (params) => (await setThreadBindingIdleTimeoutBySessionKeyAsync({
+		...params,
+		accountId: params.accountId ?? void 0
 	})).map(toConversationLifecycleBinding),
-	setMaxAgeBySessionKeyAsync: async ({ targetSessionKey, accountId, maxAgeMs }) => (await setThreadBindingMaxAgeBySessionKeyAsync({
-		targetSessionKey,
-		accountId: accountId ?? void 0,
-		maxAgeMs
+	setMaxAgeBySessionKeyAsync: async (params) => (await setThreadBindingMaxAgeBySessionKeyAsync({
+		...params,
+		accountId: params.accountId ?? void 0
 	})).map(toConversationLifecycleBinding)
 };
 //#endregion
@@ -502,48 +457,6 @@ async function sendDiscordHeartbeatTyping(params) {
 		signal: params.signal
 	}));
 }
-function startDiscordStartupProbe(params) {
-	(async () => {
-		try {
-			const probe = await (await loadDiscordProbeRuntime()).probeDiscord(params.token, 2500, { includeApplication: true });
-			if (params.abortSignal.aborted) return;
-			params.setStatus({
-				accountId: params.accountId,
-				bot: probe.bot,
-				application: probe.application
-			});
-			if (probe.ok) {
-				const username = probe.bot?.username?.trim();
-				if (username) params.log?.info?.(`[${params.accountId}] Discord bot probe resolved @${username}`);
-			} else if (getDiscordRuntime().logging.shouldLogVerbose()) params.log?.debug?.(`[${params.accountId}] bot probe degraded: ${probe.error ?? `status ${probe.status ?? "unknown"}`}`);
-			const messageContent = probe.application?.intents?.messageContent;
-			if (messageContent === "disabled") params.log?.warn?.(`[${params.accountId}] Discord Message Content Intent is disabled; bot may not respond to channel messages. Enable it in Discord Dev Portal (Bot → Privileged Gateway Intents) or require mentions.`);
-			else if (messageContent === "limited") params.log?.info?.(`[${params.accountId}] Discord Message Content Intent is limited; bots under 100 servers can use it without verification.`);
-		} catch (err) {
-			if (!params.abortSignal.aborted) params.setStatus({
-				accountId: params.accountId,
-				bot: void 0,
-				application: void 0
-			});
-			if (getDiscordRuntime().logging.shouldLogVerbose()) params.log?.debug?.(`[${params.accountId}] bot probe failed: ${String(err)}`);
-		}
-	})();
-}
-function shouldTreatDiscordDeliveredTextAsVisible(params) {
-	return params.kind === "block" && typeof params.text === "string" && params.text.trim().length > 0;
-}
-function resolveDiscordStartupDelayMs(cfg, accountId) {
-	const startupIndex = listDiscordStartupAccountIds(cfg).findIndex((candidateId) => candidateId === accountId);
-	return startupIndex <= 0 ? 0 : startupIndex * DISCORD_ACCOUNT_STARTUP_STAGGER_MS;
-}
-function formatDiscordIntents(intents) {
-	if (!intents) return "unknown";
-	return [
-		`messageContent=${intents.messageContent ?? "unknown"}`,
-		`guildMembers=${intents.guildMembers ?? "unknown"}`,
-		`presence=${intents.presence ?? "unknown"}`
-	].join(" ");
-}
 const resolveDiscordAllowlistGroupOverrides = createNestedAllowlistOverrideResolver({
 	resolveRecord: (account) => account.config.guilds,
 	outerLabel: (guildKey) => `guild ${guildKey}`,
@@ -560,9 +473,10 @@ const resolveDiscordAllowlistNames = createAccountScopedAllowlistNameResolver({
 		entries
 	})
 });
+const discordPluginBase = createDiscordPluginBase({ setupContract: discordSetupContract });
 const discordPlugin = createChatChannelPlugin({
 	base: {
-		...createDiscordPluginBase({ setupContract: discordSetupContract }),
+		...discordPluginBase,
 		allowlist: {
 			...buildLegacyDmAccountAllowlistAdapter({
 				channelId: "discord",
@@ -592,23 +506,15 @@ const discordPlugin = createChatChannelPlugin({
 			"- Forms: add `components.modal` (title, fields). OpenClaw adds a trigger button and routes submissions as new messages."
 		] },
 		messaging: {
+			directTargetStyle: discordPluginBase.messaging?.directTargetStyle,
+			inferTargetChatType: discordPluginBase.messaging?.inferTargetChatType,
 			resolveConversationRouteOwner: inspectDiscordConversationRouteOwner,
 			targetPrefixes: ["discord"],
-			directTargetStyle: "user-prefixed",
 			targetIdComparison: "lowercase",
 			normalizeTarget: normalizeDiscordMessagingTarget,
 			resolveInboundConversation: resolveDiscordInboundConversation,
 			normalizeExplicitSessionKey: ({ sessionKey, ctx }) => normalizeExplicitDiscordSessionKey(sessionKey, ctx),
 			resolveSessionTarget: ({ id }) => normalizeDiscordMessagingTarget(`channel:${id}`),
-			inferTargetChatType: ({ to }) => {
-				try {
-					const parsed = parseDiscordTarget(to, { defaultKind: "channel" });
-					if (!parsed) return;
-					return parsed?.kind === "user" ? "direct" : "channel";
-				} catch {
-					return;
-				}
-			},
 			buildCrossContextPresentation: buildDiscordCrossContextPresentation,
 			resolveOutboundSessionRoute: resolveDiscordOutboundSessionRoute,
 			targetResolver: {
@@ -620,8 +526,7 @@ const discordPlugin = createChatChannelPlugin({
 						cfg,
 						accountId
 					}, defaultKind ? { defaultKind } : {});
-					if (!resolved) return null;
-					if (!looksLikeDiscordTargetId(resolved.normalized)) return null;
+					if (!resolved || !looksLikeDiscordTargetId(resolved.normalized)) return null;
 					if (!looksLikeDiscordTargetId(input) && defaultKind === "channel" && resolved.kind === "user") return null;
 					return {
 						to: resolved.normalized,
@@ -717,7 +622,15 @@ const discordPlugin = createChatChannelPlugin({
 					const botId = discordProbe.bot.id ? ` (${discordProbe.bot.id})` : "";
 					lines.push({ text: `Bot: @${discordProbe.bot.username}${botId}` });
 				}
-				if (discordProbe?.application?.intents) lines.push({ text: `Intents: ${formatDiscordIntents(discordProbe.application.intents)}` });
+				const intents = discordProbe?.application?.intents;
+				if (intents) {
+					const summary = [
+						`messageContent=${intents.messageContent ?? "unknown"}`,
+						`guildMembers=${intents.guildMembers ?? "unknown"}`,
+						`presence=${intents.presence ?? "unknown"}`
+					].join(" ");
+					lines.push({ text: `Intents: ${summary}` });
+				}
 				return lines;
 			},
 			buildCapabilitiesDiagnostics: async ({ account, target, timeoutMs }) => {
@@ -729,21 +642,16 @@ const discordPlugin = createChatChannelPlugin({
 					kind: parsedTarget?.kind,
 					channelId: parsedTarget?.kind === "channel" ? parsedTarget.id : void 0
 				} };
-				if (!parsedTarget || parsedTarget.kind !== "channel") return {
+				const permissionError = (text) => ({
 					details,
 					lines: [{
-						text: "Permissions: Target looks like a DM user; pass channel:<id> to audit channel permissions.",
+						text,
 						tone: "error"
 					}]
-				};
+				});
+				if (!parsedTarget || parsedTarget.kind !== "channel") return permissionError("Permissions: Target looks like a DM user; pass channel:<id> to audit channel permissions.");
 				const token = account.token?.trim();
-				if (!token) return {
-					details,
-					lines: [{
-						text: "Permissions: Discord bot token missing for permission audit.",
-						tone: "error"
-					}]
-				};
+				if (!token) return permissionError("Permissions: Discord bot token missing for permission audit.");
 				const statusCfg = { channels: { discord: { accounts: { [account.accountId]: {
 					...account.config,
 					token
@@ -787,13 +695,7 @@ const discordPlugin = createChatChannelPlugin({
 						channelId: parsedTarget.id,
 						error: message
 					};
-					return {
-						details,
-						lines: [{
-							text: `Permissions: ${message}`,
-							tone: "error"
-						}]
-					};
+					return permissionError(`Permissions: ${message}`);
 				}
 			},
 			auditAccount: async ({ account, timeoutMs, cfg }) => {
@@ -858,7 +760,8 @@ const discordPlugin = createChatChannelPlugin({
 				const readConfig = createRuntimeConfigReader(ctx.cfg);
 				const account = ctx.account;
 				if (account.tokenStatus === "configured_unavailable") throw new Error(`Discord bot token configured for account "${account.accountId}" is unavailable; resolve SecretRefs against the active runtime snapshot before using this account.`);
-				const startupDelayMs = resolveDiscordStartupDelayMs(ctx.cfg, account.accountId);
+				const startupIndex = listDiscordStartupAccountIds(ctx.cfg).indexOf(account.accountId);
+				const startupDelayMs = Math.max(0, startupIndex) * DISCORD_ACCOUNT_STARTUP_STAGGER_MS;
 				if (startupDelayMs > 0) {
 					ctx.log?.info(`[${account.accountId}] delaying provider startup ${Math.round(startupDelayMs / 1e3)}s to reduce Discord startup rate limits`);
 					try {
@@ -868,13 +771,31 @@ const discordPlugin = createChatChannelPlugin({
 					}
 				}
 				const token = account.token.trim();
-				startDiscordStartupProbe({
-					accountId: account.accountId,
-					token,
-					abortSignal: ctx.abortSignal,
-					setStatus: ctx.setStatus,
-					log: ctx.log
-				});
+				(async () => {
+					try {
+						const probe = await (await loadDiscordProbeRuntime()).probeDiscord(token, 2500, { includeApplication: true });
+						if (ctx.abortSignal.aborted) return;
+						ctx.setStatus({
+							accountId: account.accountId,
+							bot: probe.bot,
+							application: probe.application
+						});
+						if (probe.ok) {
+							const username = probe.bot?.username?.trim();
+							if (username) ctx.log?.info?.(`[${account.accountId}] Discord bot check resolved @${username}`);
+						} else if (getDiscordRuntime().logging.shouldLogVerbose()) ctx.log?.debug?.(`[${account.accountId}] bot check degraded: ${probe.error ?? `status ${probe.status ?? "unknown"}`}`);
+						const messageContent = probe.application?.intents?.messageContent;
+						if (messageContent === "disabled") ctx.log?.warn?.(`[${account.accountId}] Discord Message Content Intent is disabled; bot may not respond to channel messages. Enable it in Discord Dev Portal (Bot → Privileged Gateway Intents) or require mentions.`);
+						else if (messageContent === "limited") ctx.log?.info?.(`[${account.accountId}] Discord Message Content Intent is limited; bots under 100 servers can use it without verification.`);
+					} catch (err) {
+						if (!ctx.abortSignal.aborted) ctx.setStatus({
+							accountId: account.accountId,
+							bot: void 0,
+							application: void 0
+						});
+						if (getDiscordRuntime().logging.shouldLogVerbose()) ctx.log?.debug?.(`[${account.accountId}] bot check failed: ${String(err)}`);
+					}
+				})();
 				ctx.log?.info(`[${account.accountId}] starting provider`);
 				let commandDeployHashStore;
 				try {
@@ -945,7 +866,7 @@ const discordPlugin = createChatChannelPlugin({
 	outbound: {
 		...discordOutbound,
 		preferFinalAssistantVisibleText: true,
-		shouldTreatDeliveredTextAsVisible: shouldTreatDiscordDeliveredTextAsVisible,
+		shouldTreatDeliveredTextAsVisible: ({ kind, text }) => kind === "block" && typeof text === "string" && text.trim().length > 0,
 		shouldSuppressLocalPayloadPrompt: shouldSuppressLocalDiscordExecApprovalPrompt
 	}
 });

package/dist/.setup/{channel-access-BRp3Y-rF.mjs → channel-access-DasWY_OV.mjs}

@@ -12,10 +12,6 @@ function resolveDiscordChannelStringPropertySafe(channel, key) {
 	const value = readDiscordChannelPropertySafe(channel, key);
 	return typeof value === "string" ? value : void 0;
 }
-function resolveDiscordChannelNumberPropertySafe(channel, key) {
-	const value = readDiscordChannelPropertySafe(channel, key);
-	return typeof value === "number" ? value : void 0;
-}
 function resolveDiscordChannelStringWithAliasSafe(channel, camelKey, snakeKey) {
 	return resolveDiscordChannelStringPropertySafe(channel, camelKey) ?? resolveDiscordChannelStringPropertySafe(channel, snakeKey) ?? resolveDiscordChannelStringPropertySafe(readDiscordChannelPropertySafe(channel, "rawData"), snakeKey);
 }
@@ -36,10 +32,13 @@ function resolveDiscordChannelParentSafe(channel) {
 }
 function resolveDiscordChannelInfoSafe(channel) {
 	const parent = resolveDiscordChannelParentSafe(channel);
+	const name = resolveDiscordChannelNameSafe(channel);
+	const topic = resolveDiscordChannelTopicSafe(channel);
+	const type = readDiscordChannelPropertySafe(channel, "type");
 	return {
-		name: resolveDiscordChannelNameSafe(channel),
-		topic: resolveDiscordChannelTopicSafe(channel),
-		type: resolveDiscordChannelNumberPropertySafe(channel, "type"),
+		name,
+		topic,
+		type: typeof type === "number" ? type : void 0,
 		parentId: resolveDiscordChannelParentIdSafe(channel),
 		ownerId: resolveDiscordChannelStringWithAliasSafe(channel, "ownerId", "owner_id"),
 		parentName: resolveDiscordChannelNameSafe(parent)