@openclaw/discord 2026.7.2-beta.7 → 2026.8.1-beta.3

package/dist/{channel-vKa-76xY.js → channel-cXYzGc4L.js}

@@ -1,60 +1,59 @@
-import { l as parseDiscordTarget, o as looksLikeDiscordTargetId, s as normalizeDiscordMessagingTarget } from "./chunk-DX4jpFQP.js";
-import { c as resolveDiscordAccountAllowFrom, i as listEnabledDiscordAccounts, o as resolveDefaultDiscordAccountId, r as listDiscordAccountIds, s as resolveDiscordAccount } from "./accounts-DJTf1LtA.js";
-import { t as resolveDiscordOutboundSessionRoute } from "./outbound-session-route-H-HoyH5U.js";
+import { d as normalizeDiscordMessagingTarget, u as looksLikeDiscordTargetId } from "./retry-DNsVTeTo.js";
+import { F as projectCredentialSnapshotFields, I as resolveConfiguredFromCredentialStatuses, M as PAIRING_APPROVED_MESSAGE, N as buildTokenChannelStatusSummary, O as resolveDiscordOutboundSessionRoute, c as resolveDiscordAccount, i as listDiscordStartupAccountIds, j as DEFAULT_ACCOUNT_ID, k as parseDiscordTarget, l as resolveDiscordAccountAllowFrom, r as listDiscordAccountIds, s as resolveDefaultDiscordAccountId } from "./accounts-DNl-oCEw.js";
 import { t as getDiscordRuntime } from "./runtime-DgnVQ7zW.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 { u as withAbortTimeout } from "./timeouts-B9cy6RvQ.js";
-import { a as getDiscordExecApprovalApprovers, c as shouldSuppressLocalDiscordExecApprovalPrompt, d as createChannelNativeOriginTargetResolver, f as isChannelExecApprovalClientEnabledFromConfig, i as resolveDiscordCurrentConversationIdentity, l as createApproverRestrictedNativeApprovalCapability, o as isDiscordExecApprovalApprover, p as matchesApprovalRequestFilters, s as isDiscordExecApprovalClientEnabled, u as createChannelApproverDmTargetResolver } from "./approval-message-safety-DEyKVsAw.js";
-import { r as resolveRequiredDiscordChannelPermissions } from "./audit-core-xwjIczO0.js";
-import { t as discordMessageActions$1 } from "./channel-actions-uXFTJX3o.js";
+import { _ as createChannelApproverDmTargetResolver, b as matchesApprovalRequestFilters, d as resolveDiscordRuntimeBindingConversationId, f as getDiscordExecApprovalApprovers, g as createApproverRestrictedNativeApprovalCapability, h as shouldSuppressLocalDiscordExecApprovalPrompt, m as isDiscordExecApprovalClientEnabled, o as resolveDiscordConversationRoute, p as isDiscordExecApprovalApprover, u as resolveDiscordCurrentConversationIdentity, v as createChannelNativeOriginTargetResolver, y as isChannelExecApprovalClientEnabledFromConfig } from "./approval-message-safety-XGFPbDoI.js";
+import { r as resolveRequiredDiscordChannelPermissions } from "./audit-core-BCX8UeFH.js";
+import { t as discordMessageActions } from "./channel-actions-Dr2QI8Bf.js";
 import { r as openDiscordCommandDeployHashStore } from "./command-deploy-store-DFkBTViB.js";
-import { n as setThreadBindingMaxAgeBySessionKey, t as setThreadBindingIdleTimeoutBySessionKey } from "./thread-bindings.session-updates-DAIlp7Px.js";
-import { n as discordOutbound } from "./outbound-adapter-DtE-i2OJ.js";
-import { a as discordSetupContract, i as discordSetupAdapter, n as discordConfigAdapter, o as discordSecurityAdapter, t as createDiscordPluginBase } from "./shared-CXF1tup1.js";
+import { t as resolveDiscordConversationBindingRoute } from "./conversation-binding-route-D6rCQ5S0.js";
+import { n as setThreadBindingMaxAgeBySessionKey, t as setThreadBindingIdleTimeoutBySessionKey } from "./thread-bindings.session-updates-CJb-BpPL.js";
+import { n as discordOutbound } from "./outbound-adapter-DxHTOqiN.js";
+import { a as discordSecurityAdapter, i as discordSetupContract, n as discordConfigAdapter, t as createDiscordPluginBase } from "./shared-CaAaoksy.js";
 import { t as normalizeExplicitDiscordSessionKey } from "./session-key-normalization-wJgsKPNF.js";
 import { t as defaultTopLevelPlacement } from "./thread-binding-api-BDZJD4na.js";
-import { normalizeLowercaseStringOrEmpty, normalizeOptionalString, normalizeOptionalStringifiedId } from "openclaw/plugin-sdk/string-coerce-runtime";
 import { formatErrorMessage } from "openclaw/plugin-sdk/error-runtime";
-import { sleepWithAbort } from "openclaw/plugin-sdk/runtime-env";
+import { normalizeLowercaseStringOrEmpty, normalizeOptionalString, normalizeOptionalStringifiedId } from "openclaw/plugin-sdk/string-coerce-runtime";
 import { createChatChannelPlugin } from "openclaw/plugin-sdk/channel-core";
+import { sleepWithAbort } from "openclaw/plugin-sdk/runtime-env";
 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, readAccountStatusSnapshot, resolveEnabledConfiguredAccountId } from "openclaw/plugin-sdk/status-helpers";
+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 { createLazyChannelApprovalNativeRuntimeAdapter } from "openclaw/plugin-sdk/approval-handler-adapter-runtime";
-import { doesApprovalRequestMatchChannelAccount, resolveApprovalRequestSessionConversation } from "openclaw/plugin-sdk/approval-native-runtime";
+import { doesApprovalRequestSelectChannelAccount, resolveApprovalRequestSessionConversation } from "openclaw/plugin-sdk/approval-native-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 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({
+function isDiscordApprovalAccountEligible(params) {
+	const account = resolveDiscordAccount(params);
+	const config = params.configOverride ?? account.config.execApprovals;
+	return account.enabled && isChannelExecApprovalClientEnabledFromConfig({
 		enabled: config?.enabled,
-		approverCount: approvers.length
-	})) return false;
-	return matchesApprovalRequestFilters({
+		approverCount: getDiscordExecApprovalApprovers(params).length
+	}) && matchesApprovalRequestFilters({
 		request: params.request.request,
 		agentFilter: config?.agentFilter,
 		sessionFilter: config?.sessionFilter
 	});
 }
+function shouldHandleDiscordApprovalRequest(params) {
+	const accountId = params.accountId ?? resolveDefaultDiscordAccountId(params.cfg);
+	if (!doesApprovalRequestSelectChannelAccount({
+		...params,
+		channel: "discord",
+		defaultAccountId: resolveDefaultDiscordAccountId(params.cfg),
+		eligibleAccountIds: isDiscordApprovalAccountEligible({
+			...params,
+			accountId
+		}) ? [accountId] : []
+	})) return false;
+	return isDiscordApprovalAccountEligible(params);
+}
 //#endregion
 //#region extensions/discord/src/approval-native.ts
 function extractDiscordSessionKind(sessionKey) {
@@ -195,7 +194,7 @@ function createDiscordApprovalCapability(configOverride) {
 				request,
 				configOverride
 			}),
-			load: async () => (await import("./approval-handler.runtime-HymvFTYn.js")).discordApprovalNativeRuntime
+			load: async () => (await import("./approval-handler.runtime-B12RCYr8.js")).discordApprovalNativeRuntime
 		})
 	});
 }
@@ -302,22 +301,70 @@ function resolveDiscordInboundConversation(params) {
 }
 //#endregion
 //#region extensions/discord/src/channel.loaders.ts
-const loadDiscordDirectoryConfigModule = createLazyRuntimeModule(() => import("./directory-config-D_LojtCe.js").then((n) => n.t));
-const loadDiscordResolveChannelsModule = createLazyRuntimeModule(() => import("./resolve-channels-BjepAj8b.js").then((n) => n.n));
-const loadDiscordResolveUsersModule = createLazyRuntimeModule(() => import("./resolve-users-Bc28htgt.js").then((n) => n.n));
-const loadDiscordThreadBindingsManagerModule = createLazyRuntimeModule(() => import("./thread-bindings.manager-DYvSlrva.js").then((n) => n.a));
-const loadDiscordTargetResolverModule = createLazyRuntimeModule(() => import("./target-resolver-C3s_2m0t.js").then((n) => n.r));
-const loadDiscordProviderRuntime = createLazyRuntimeModule(() => import("./provider.runtime-Cy7XZmyh.js"));
-const loadDiscordProbeRuntime = createLazyRuntimeModule(() => import("./probe.runtime-DqFGFMbZ.js"));
+const loadDiscordDirectoryConfigModule = createLazyRuntimeModule(() => import("./directory-config-XyCfoqLg.js").then((n) => n.t));
+const loadDiscordResolveChannelsModule = createLazyRuntimeModule(() => import("./resolve-channels-CGeUoIqb.js").then((n) => n.n));
+const loadDiscordResolveUsersModule = createLazyRuntimeModule(() => import("./resolve-users-BtKxLUZv.js").then((n) => n.n));
+const loadDiscordThreadBindingsManagerModule = createLazyRuntimeModule(() => import("./thread-bindings.manager-CngsgErq.js").then((n) => n.i));
+const loadDiscordTargetResolverModule = createLazyRuntimeModule(() => import("./target-resolver-DIXShHaZ.js").then((n) => n.r));
+const loadDiscordProviderRuntime = createLazyRuntimeModule(() => import("./provider.runtime-CzKGRiAF.js"));
+const loadDiscordProbeRuntime = createLazyRuntimeModule(() => import("./probe.runtime-Dq5-PRKT.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-CjsrabP8.js").then((n) => n.n));
-const loadDiscordSendModule = createLazyRuntimeModule(() => import("./send-CdkZ6zeW.js").then((n) => n.t));
-const loadDiscordDirectoryLiveModule = createLazyRuntimeModule(() => import("./directory-live-Bw5Ephzv.js").then((n) => n.t));
+const loadDiscordAuditModule = createLazyRuntimeModule(() => import("./audit-Yc7eZDd6.js").then((n) => n.n));
+const loadDiscordSendModule = createLazyRuntimeModule(() => import("./send-rQIffSYu.js").then((n) => n.t));
+const loadDiscordDirectoryLiveModule = createLazyRuntimeModule(() => import("./directory-live-Df0NbFJB.js").then((n) => n.t));
+//#endregion
+//#region extensions/discord/src/conversation-route-owner.ts
+function inspectDiscordConversationRouteOwner(params) {
+	const direct = params.conversation.kind === "direct";
+	const nativeConversationId = params.conversation.nativeChannelId ?? params.conversation.peerId;
+	const threadConversationId = direct ? void 0 : params.conversation.threadId;
+	const runtimeConversationId = threadConversationId ?? resolveDiscordRuntimeBindingConversationId({
+		isDirectMessage: direct,
+		isGroupDm: params.conversation.kind === "group",
+		userId: direct ? params.conversation.peerId : void 0,
+		channelId: nativeConversationId
+	});
+	const route = resolveDiscordConversationRoute({
+		cfg: params.cfg,
+		accountId: params.accountId,
+		guildId: params.conversation.context?.guildId,
+		memberRoleIds: params.conversation.context?.memberRoleIds,
+		peer: {
+			kind: params.conversation.kind,
+			id: params.conversation.peerId
+		},
+		parentConversationId: params.conversation.context?.parentPeerId
+	});
+	const { runtimeRoute, configuredRoute } = resolveDiscordConversationBindingRoute({
+		cfg: params.cfg,
+		route,
+		accountId: params.accountId,
+		runtimeConversationId,
+		configuredConversationId: threadConversationId ?? nativeConversationId,
+		parentConversationId: params.conversation.context?.parentPeerId,
+		touchBinding: false
+	});
+	if (!runtimeRoute.bindingOwnerAvailable && resolveThreadBindingSpawnPolicy({
+		cfg: params.cfg,
+		channel: "discord",
+		accountId: params.accountId,
+		kind: "subagent"
+	}).enabled) return { kind: "unavailable" };
+	if (runtimeRoute.pluginId) return {
+		kind: "plugin",
+		pluginId: runtimeRoute.pluginId,
+		fallbackAgentId: route.agentId
+	};
+	return {
+		kind: "agent",
+		agentId: runtimeRoute.boundAgentId ?? configuredRoute?.boundAgentId ?? route.agentId
+	};
+}
 //#endregion
 //#region extensions/discord/src/group-policy.ts
 function normalizeDiscordSlug(value) {
@@ -406,13 +453,13 @@ function readDiscordPermissionsAuditSummary(value) {
 		unresolvedChannels,
 		channels: Array.isArray(channelsRaw) ? channelsRaw.map((entry) => {
 			if (!isRecord$1(entry)) return null;
-			const channelId = asString(entry.channelId);
+			const channelId = normalizeOptionalString(entry.channelId);
 			if (!channelId) return null;
 			const ok = typeof entry.ok === "boolean" ? entry.ok : void 0;
-			const missing = Array.isArray(entry.missing) ? entry.missing.map((v) => asString(v)).filter(Boolean) : void 0;
-			const error = asString(entry.error) ?? null;
-			const matchKey = asString(entry.matchKey) ?? void 0;
-			const matchSource = asString(entry.matchSource) ?? void 0;
+			const missing = Array.isArray(entry.missing) ? entry.missing.map((v) => normalizeOptionalString(v)).filter(Boolean) : void 0;
+			const error = normalizeOptionalString(entry.error) ?? null;
+			const matchKey = normalizeOptionalString(entry.matchKey);
+			const matchSource = normalizeOptionalString(entry.matchSource);
 			return {
 				channelId,
 				ok,
@@ -427,32 +474,10 @@ function readDiscordPermissionsAuditSummary(value) {
 function collectDiscordStatusIssues(accounts) {
 	const issues = [];
 	for (const entry of accounts) {
-		const account = readAccountStatusSnapshot(entry, [
-			"healthState",
-			"application",
-			"audit"
-		]);
+		const account = readAccountStatusSnapshot(entry, ["application", "audit"]);
 		if (!account) continue;
 		const accountId = resolveEnabledConfiguredAccountId(account);
 		if (!accountId) continue;
-		const running = account.running === true;
-		const healthState = asString(account.healthState);
-		if (healthState === "stale-socket" || healthState === "stuck" || healthState === "disconnected" || healthState === "not-running") {
-			const runningLabel = running ? "running" : "not running";
-			issues.push({
-				channel: "discord",
-				accountId,
-				kind: "runtime",
-				message: `Discord gateway transport is degraded (${healthState}; account is ${runningLabel}).`,
-				fix: "Check gateway event-loop health and Discord connectivity, then restart the Discord channel or gateway if the transport does not recover."
-			});
-		} else if (running && account.connected === false) issues.push({
-			channel: "discord",
-			accountId,
-			kind: "runtime",
-			message: "Discord gateway transport is running but disconnected.",
-			fix: "Check gateway logs for Discord websocket errors and wait for reconnect; restart the Discord channel or gateway if it does not recover."
-		});
 		if (readDiscordApplicationSummary(account.application).intents?.messageContent === "disabled") issues.push({
 			channel: "discord",
 			accountId,
@@ -536,34 +561,8 @@ function startDiscordStartupProbe(params) {
 function shouldTreatDiscordDeliveredTextAsVisible(params) {
 	return params.kind === "block" && typeof params.text === "string" && params.text.trim().length > 0;
 }
-function resolveRuntimeDiscordMessageActions() {
-	try {
-		return getDiscordRuntime().channel?.discord?.messageActions ?? null;
-	} catch {
-		return null;
-	}
-}
-const discordMessageActions = {
-	resolveExecutionMode: (ctx) => resolveRuntimeDiscordMessageActions()?.resolveExecutionMode?.(ctx) ?? discordMessageActions$1.resolveExecutionMode?.(ctx) ?? "local",
-	describeMessageTool: (ctx) => resolveRuntimeDiscordMessageActions()?.describeMessageTool?.(ctx) ?? discordMessageActions$1.describeMessageTool?.(ctx) ?? null,
-	requiresTrustedRequesterSender: (ctx) => resolveRuntimeDiscordMessageActions()?.requiresTrustedRequesterSender?.(ctx) ?? discordMessageActions$1.requiresTrustedRequesterSender?.(ctx) ?? false,
-	extractToolSend: (ctx) => resolveRuntimeDiscordMessageActions()?.extractToolSend?.(ctx) ?? discordMessageActions$1.extractToolSend?.(ctx) ?? null,
-	prepareSendPayload: (ctx) => resolveRuntimeDiscordMessageActions()?.prepareSendPayload?.(ctx) ?? discordMessageActions$1.prepareSendPayload?.(ctx) ?? null,
-	handleAction: async (ctx) => {
-		const runtimeHandleAction = resolveRuntimeDiscordMessageActions()?.handleAction;
-		if (runtimeHandleAction) return await runtimeHandleAction(ctx);
-		if (!discordMessageActions$1.handleAction) throw new Error("Discord message actions not available");
-		return await discordMessageActions$1.handleAction(ctx);
-	}
-};
-function resolveDiscordStartupAccountIds(cfg) {
-	const startupAccountIds = listEnabledDiscordAccounts(cfg).filter((candidate) => resolveConfiguredFromCredentialStatuses(candidate) ?? Boolean(normalizeOptionalString(candidate.token))).map((candidate) => candidate.accountId);
-	const defaultAccountId = resolveDefaultDiscordAccountId(cfg);
-	if (!startupAccountIds.includes(defaultAccountId)) return startupAccountIds;
-	return [defaultAccountId, ...startupAccountIds.filter((candidateId) => candidateId !== defaultAccountId)];
-}
 function resolveDiscordStartupDelayMs(cfg, accountId) {
-	const startupIndex = resolveDiscordStartupAccountIds(cfg).findIndex((candidateId) => candidateId === accountId);
+	const startupIndex = listDiscordStartupAccountIds(cfg).findIndex((candidateId) => candidateId === accountId);
 	return startupIndex <= 0 ? 0 : startupIndex * DISCORD_ACCOUNT_STARTUP_STAGGER_MS;
 }
 function formatDiscordIntents(intents) {
@@ -600,10 +599,7 @@ function toConversationLifecycleBinding(binding) {
 }
 const discordPlugin = createChatChannelPlugin({
 	base: {
-		...createDiscordPluginBase({
-			setup: discordSetupAdapter,
-			setupContract: discordSetupContract
-		}),
+		...createDiscordPluginBase({ setupContract: discordSetupContract }),
 		allowlist: {
 			...buildLegacyDmAccountAllowlistAdapter({
 				channelId: "discord",
@@ -633,6 +629,7 @@ const discordPlugin = createChatChannelPlugin({
 			"- Forms: add `components.modal` (title, fields). OpenClaw adds a trigger button and routes submissions as new messages."
 		] },
 		messaging: {
+			resolveConversationRouteOwner: inspectDiscordConversationRouteOwner,
 			targetPrefixes: ["discord"],
 			directTargetStyle: "user-prefixed",
 			targetIdComparison: "lowercase",
@@ -749,6 +746,7 @@ const discordPlugin = createChatChannelPlugin({
 		},
 		conversationBindings: {
 			supportsCurrentConversationBinding: true,
+			bindingStore: "adapter",
 			defaultTopLevelPlacement,
 			createManager: async ({ cfg, accountId }) => (await loadDiscordThreadBindingsManagerModule()).createThreadBindingManager({
 				cfg,

package/dist/channel-config-api.js

@@ -1,2 +1,2 @@
-import { t as DiscordChannelConfigSchema } from "./config-schema-WHRQcY19.js";
+import { t as DiscordChannelConfigSchema } from "./config-schema-DC5kDtQ5.js";
 export { DiscordChannelConfigSchema };

package/dist/channel-plugin-api.js

@@ -1,2 +1,2 @@
-import { t as discordPlugin } from "./channel-vKa-76xY.js";
+import { t as discordPlugin } from "./channel-cXYzGc4L.js";
 export { discordPlugin };

package/dist/{channel.setup-CmcwZ_qd.js → channel.setup-CSiwnMgs.js}

@@ -1,8 +1,8 @@
-import { a as mergeDiscordAccountConfig, c as resolveDiscordAccountAllowFrom, l as resolveDiscordAccountConfig, m as resolveDiscordToken, o as resolveDefaultDiscordAccountId } from "./accounts-DJTf1LtA.js";
-import { n as inspectDiscordConfiguredToken } from "./account-inspect-SXiCBCgP.js";
-import { a as discordSetupContract, i as discordSetupAdapter, t as createDiscordPluginBase } from "./shared-CXF1tup1.js";
-import { t as resolveDiscordChannelAllowlist } from "./resolve-channels-BjepAj8b.js";
-import { t as resolveDiscordUserAllowlist } from "./resolve-users-Bc28htgt.js";
+import { h as resolveDiscordToken, l as resolveDiscordAccountAllowFrom, o as mergeDiscordAccountConfig, s as resolveDefaultDiscordAccountId, u as resolveDiscordAccountConfig } from "./accounts-DNl-oCEw.js";
+import { n as inspectDiscordAccountTokenState } from "./account-inspect-D5xmUpnj.js";
+import { i as discordSetupContract, t as createDiscordPluginBase } from "./shared-CaAaoksy.js";
+import { t as resolveDiscordChannelAllowlist } from "./resolve-channels-CGeUoIqb.js";
+import { t as resolveDiscordUserAllowlist } from "./resolve-users-BtKxLUZv.js";
 import { DEFAULT_ACCOUNT_ID, normalizeAccountId } from "openclaw/plugin-sdk/account-id";
 import { normalizeOptionalString } from "openclaw/plugin-sdk/string-coerce-runtime";
 import { resolveBasicAllowFromEntries } from "openclaw/plugin-sdk/allow-from";
@@ -25,54 +25,17 @@ function inspectDiscordSetupAccount(params) {
 	const enabled = params.cfg.channels?.discord?.enabled !== false && config.enabled !== false;
 	const accountConfig = resolveDiscordAccountConfig(params.cfg, accountId);
 	const hasAccountToken = Boolean(accountConfig && Object.hasOwn(accountConfig, "token"));
-	const accountToken = inspectDiscordConfiguredToken(accountConfig?.token);
-	if (accountToken) return {
-		accountId,
-		enabled,
-		token: accountToken.token,
-		tokenSource: accountToken.tokenSource,
-		tokenStatus: accountToken.tokenStatus,
-		configured: true,
-		config
-	};
-	if (hasAccountToken) return {
-		accountId,
-		enabled,
-		token: "",
-		tokenSource: "none",
-		tokenStatus: "missing",
-		configured: false,
-		config
-	};
-	const channelToken = inspectDiscordConfiguredToken(params.cfg.channels?.discord?.token);
-	if (channelToken) return {
-		accountId,
-		enabled,
-		token: channelToken.token,
-		tokenSource: channelToken.tokenSource,
-		tokenStatus: channelToken.tokenStatus,
-		configured: true,
-		config
-	};
-	const tokenResolution = resolveDiscordToken(params.cfg, { accountId });
-	if (tokenResolution.token) return {
-		accountId,
-		enabled,
-		token: tokenResolution.token,
-		tokenSource: tokenResolution.source,
-		tokenStatus: "available",
-		configured: true,
-		config
-	};
-	return {
-		accountId,
-		enabled,
-		token: "",
-		tokenSource: "none",
-		tokenStatus: "missing",
-		configured: false,
-		config
-	};
+	return inspectDiscordAccountTokenState({
+		base: {
+			accountId,
+			enabled
+		},
+		config,
+		accountToken: accountConfig?.token,
+		hasAccountToken,
+		channelToken: params.cfg.channels?.discord?.token,
+		resolveFallbackToken: () => resolveDiscordToken(params.cfg, { accountId })
+	});
 }
 //#endregion
 //#region extensions/discord/src/setup-core.ts
@@ -332,7 +295,6 @@ const discordSetupPlugin = { ...createDiscordPluginBase({
 			entries
 		})
 	}),
-	setup: discordSetupAdapter,
 	setupContract: discordSetupContract
 }) };
 //#endregion