@openclaw/discord 2026.10.2 → 2026.10.5-beta.2

package/dist/.setup/{channel.setup-BmNvkidb.mjs → channel.setup-DdFVN1mr.mjs}

@@ -1,13 +1,13 @@
-import { _ as inspectDiscordAccountTokenState, h as resolveDiscordToken, l as resolveDiscordAccountAllowFrom, o as mergeDiscordAccountConfig, s as resolveDefaultDiscordAccountId, u as resolveDiscordAccountConfig } from "./accounts-HE9-mj1L.mjs";
-import { i as discordSetupContract, t as createDiscordPluginBase } from "./shared-BoBnM5kM.mjs";
-import { t as resolveDiscordChannelAllowlist } from "./resolve-channels-DA6QlhZN.mjs";
-import { t as resolveDiscordUserAllowlist } from "./resolve-users-DNrwvunm.mjs";
+import { c as resolveDefaultDiscordAccountId, g as resolveDiscordToken, n as inspectDiscordAccountConfig, s as mergeDiscordAccountConfig, u as resolveDiscordAccountAllowFrom } from "./accounts-ljrzXBJi.mjs";
+import { i as discordSetupContract, t as createDiscordPluginBase } from "./shared-CestGDpq.mjs";
+import { t as resolveDiscordChannelAllowlist } from "./resolve-channels-UdT38DzU.mjs";
+import { t as resolveDiscordUserAllowlist } from "./resolve-users-DnCsrXZ_.mjs";
 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";
 import { createAccountScopedAllowFromSection, createAccountScopedGroupAccessSection, createSetupTranslator, createStandardChannelSetupStatus, defineTokenCredential, parseMentionOrPrefixedId, patchChannelConfigForAccount, promptResolvedAllowFrom, resolveEntriesWithOptionalToken, resolveSetupAccountId, setSetupChannelEnabled, splitSetupEntries } from "openclaw/plugin-sdk/setup-runtime";
-import { formatDocsLink } from "openclaw/plugin-sdk/setup-tools";
 import { createChannelDmPolicy } from "openclaw/plugin-sdk/channel-dm-policy";
+import { formatDocsLink } from "openclaw/plugin-sdk/setup-tools";
 //#region extensions/discord/src/setup-account-state.ts
 function resolveDiscordSetupAccountConfig(params) {
 	const accountId = normalizeAccountId(params.accountId ?? resolveDefaultDiscordAccountId(params.cfg));
@@ -17,21 +17,7 @@ function resolveDiscordSetupAccountConfig(params) {
 	};
 }
 function inspectDiscordSetupAccount(params) {
-	const { accountId, config } = resolveDiscordSetupAccountConfig(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"));
-	return inspectDiscordAccountTokenState({
-		base: {
-			accountId,
-			enabled
-		},
-		config,
-		accountToken: accountConfig?.token,
-		hasAccountToken,
-		channelToken: params.cfg.channels?.discord?.token,
-		resolveFallbackToken: () => resolveDiscordToken(params.cfg, { accountId })
-	});
+	return inspectDiscordAccountConfig(params, { resolveFallbackToken: (accountId) => resolveDiscordToken(params.cfg, { accountId }) });
 }
 //#endregion
 //#region extensions/discord/src/setup-core.ts
@@ -44,9 +30,19 @@ const DISCORD_TOKEN_HELP_LINES = [
 	t$1("wizard.discord.tokenHelpMessageContentIntent"),
 	t$1("wizard.channels.docs", { link: formatDocsLink("/discord", "discord") })
 ];
-function mapDiscordSetupAllowlistEntries(resolved) {
-	if (!Array.isArray(resolved)) return [];
-	return resolved.flatMap((entry) => {
+function getDiscordAllowFromHelpLines() {
+	return [
+		t$1("wizard.discord.allowlistIntro"),
+		t$1("wizard.discord.examples"),
+		"- 123456789012345678",
+		"- @alice",
+		"- alice#1234",
+		t$1("wizard.discord.multipleEntries"),
+		t$1("wizard.channels.docs", { link: formatDocsLink("/discord", "discord") })
+	];
+}
+function setDiscordGuildChannelAllowlist(cfg, accountId, resolved) {
+	const entries = Array.isArray(resolved) ? resolved.flatMap((entry) => {
 		if (!entry || typeof entry !== "object") return [];
 		const row = entry;
 		if (row.resolved === false) return [];
@@ -57,12 +53,10 @@ function mapDiscordSetupAllowlistEntries(resolved) {
 			guildKey,
 			channelKey
 		}] : [{ guildKey }];
-	});
-}
-function setDiscordGuildChannelAllowlist(cfg, accountId, entries) {
+	}) : [];
 	const guilds = { ...accountId === DEFAULT_ACCOUNT_ID ? cfg.channels?.discord?.guilds ?? {} : cfg.channels?.discord?.accounts?.[accountId]?.guilds ?? {} };
 	for (const entry of entries) {
-		const guildKey = entry.guildKey || "*";
+		const guildKey = entry.guildKey;
 		const existing = guilds[guildKey] ?? {};
 		if (entry.channelKey) {
 			const channels = { ...existing.channels };
@@ -133,10 +127,7 @@ function createDiscordSetupWizardBase(handlers) {
 			keepPrompt: t$1("wizard.discord.tokenKeepPrompt"),
 			inputPrompt: t$1("wizard.discord.tokenInputPrompt"),
 			allowEnv: ({ accountId }) => accountId === DEFAULT_ACCOUNT_ID,
-			resolveAccount: ({ cfg, accountId }) => inspectDiscordSetupAccount({
-				cfg,
-				accountId
-			}),
+			resolveAccount: inspectDiscordSetupAccount,
 			accountConfigured: (account) => account.configured,
 			hasConfiguredValue: (account) => account.tokenStatus !== "missing",
 			resolvedValue: (account) => normalizeOptionalString(account.token),
@@ -154,8 +145,7 @@ function createDiscordSetupWizardBase(handlers) {
 				cfg,
 				accountId
 			}).config.guilds ?? {}).flatMap(([guildKey, value]) => {
-				const channels = value?.channels ?? {};
-				const channelKeys = Object.keys(channels);
+				const channelKeys = Object.keys(value?.channels ?? {});
 				if (channelKeys.length === 0) return [/^\d+$/.test(guildKey) ? `guild:${guildKey}` : guildKey];
 				return channelKeys.map((channelKey) => `${guildKey}/${channelKey}`);
 			}),
@@ -168,21 +158,13 @@ function createDiscordSetupWizardBase(handlers) {
 				input,
 				resolved: false
 			})),
-			applyAllowlist: ({ cfg, accountId, resolved }) => setDiscordGuildChannelAllowlist(cfg, accountId, mapDiscordSetupAllowlistEntries(resolved))
+			applyAllowlist: ({ cfg, accountId, resolved }) => setDiscordGuildChannelAllowlist(cfg, accountId, resolved)
 		}),
 		allowFrom: createAccountScopedAllowFromSection({
 			channel: channel$1,
 			credentialInputKey: "token",
 			helpTitle: "Discord allowlist",
-			helpLines: [
-				t$1("wizard.discord.allowlistIntro"),
-				t$1("wizard.discord.examples"),
-				"- 123456789012345678",
-				"- @alice",
-				"- alice#1234",
-				t$1("wizard.discord.multipleEntries"),
-				t$1("wizard.channels.docs", { link: formatDocsLink("/discord", "discord") })
-			],
+			helpLines: getDiscordAllowFromHelpLines(),
 			message: t$1("wizard.discord.allowFromPrompt"),
 			placeholder: "@alice, 123456789012345678",
 			invalidWithoutCredentialNote: t$1("wizard.discord.allowFromInvalidWithoutToken"),
@@ -207,15 +189,7 @@ async function promptDiscordAllowFrom(params) {
 		accountId
 	});
 	const noteTitle = t("wizard.discord.allowlistTitle");
-	await params.prompter.note([
-		t("wizard.discord.allowlistIntro"),
-		t("wizard.discord.examples"),
-		"- 123456789012345678",
-		"- @alice",
-		"- alice#1234",
-		t("wizard.discord.multipleEntries"),
-		t("wizard.channels.docs", { link: formatDocsLink("/discord", "discord") })
-	].join("\n"), noteTitle);
+	await params.prompter.note(getDiscordAllowFromHelpLines().join("\n"), noteTitle);
 	const allowFrom = await promptResolvedAllowFrom({
 		prompter: params.prompter,
 		existing: resolveDiscordAccountAllowFrom({
@@ -248,17 +222,6 @@ async function promptDiscordAllowFrom(params) {
 		}
 	});
 }
-async function resolveDiscordGroupAllowlist(params) {
-	return await resolveEntriesWithOptionalToken({
-		token: resolveDiscordToken(params.cfg, { accountId: params.accountId }).token || (typeof params.credentialValues.token === "string" ? params.credentialValues.token : ""),
-		entries: params.entries,
-		buildWithoutToken: (input) => ({
-			input,
-			resolved: false
-		}),
-		resolveEntries: resolveDiscordChannelAllowlist
-	});
-}
 const discordSetupWizard = createDiscordSetupWizardBase({
 	promptAllowFrom: promptDiscordAllowFrom,
 	resolveAllowFromEntries: async ({ cfg, accountId, credentialValues, entries }) => await resolveBasicAllowFromEntries({
@@ -266,7 +229,15 @@ const discordSetupWizard = createDiscordSetupWizardBase({
 		entries,
 		resolveEntries: resolveDiscordUserAllowlist
 	}),
-	resolveGroupAllowlist: resolveDiscordGroupAllowlist
+	resolveGroupAllowlist: async (params) => await resolveEntriesWithOptionalToken({
+		token: resolveDiscordToken(params.cfg, { accountId: params.accountId }).token || (typeof params.credentialValues.token === "string" ? params.credentialValues.token : ""),
+		entries: params.entries,
+		buildWithoutToken: (input) => ({
+			input,
+			resolved: false
+		}),
+		resolveEntries: resolveDiscordChannelAllowlist
+	})
 });
 //#endregion
 //#region extensions/discord/src/channel.setup.ts