@openclaw/discord 2026.10.2 → 2026.10.5-beta.2

package/dist/.setup/{send.shared-C4CN24D9.mjs → send.shared-CjQ4jbMA.mjs}

@@ -1,19 +1,19 @@
-import { c as resolveDiscordAccount, m as normalizeDiscordToken, o as mergeDiscordAccountConfig } from "./accounts-HE9-mj1L.mjs";
-import { A as isDiscordThreadChannelType } from "./allow-list-vxkG9_JD.mjs";
-import { A as serializePayload, ft as getThreadMember, g as RequestClient, gt as getGuildMember, ht as getGuild, j as Embed, k as hasDiscordV2Components, nt as createUserDmChannel, rt as getCurrentUser, ut as getChannel } from "./discord-9gysrhzp.mjs";
-import { _ as createDiscordRetryRunner, b as chunkDiscordTextWithMode, o as resolveDiscordReplyMessageId } from "./send.receipt-DVOg2Oaw.mjs";
-import { t as parseAndResolveDiscordTarget } from "./target-resolver-CSFoPQ12.mjs";
+import { h as normalizeDiscordToken, l as resolveDiscordAccount, s as mergeDiscordAccountConfig } from "./accounts-ljrzXBJi.mjs";
+import { A as isDiscordThreadChannelType } from "./allow-list-B_ToXtew.mjs";
+import { G as hasDiscordV2Components, I as RequestClient, K as serializePayload, _t as getGuildMember, dt as getChannel, gt as getGuild, nt as createUserDmChannel, pt as getThreadMember, q as Embed, rt as getCurrentUser, st as createChannelMessage } from "./discord-BGqgx-yd.mjs";
+import { h as createDiscordRetryRunner, o as resolveDiscordReplyMessageId, v as chunkDiscordTextWithMode } from "./send.receipt-BAlzXd8e.mjs";
+import { t as parseAndResolveDiscordTarget } from "./target-resolver-Bse8fuTi.mjs";
 import { danger } from "openclaw/plugin-sdk/runtime-env";
-import { normalizeOptionalString, normalizeStringEntries } from "openclaw/plugin-sdk/string-coerce-runtime";
 import { normalizeAccountId } from "openclaw/plugin-sdk/routing";
-import { ChannelType, MessageFlags, PermissionFlagsBits, Routes } from "discord-api-types/v10";
+import { normalizeOptionalString, normalizeStringEntries } from "openclaw/plugin-sdk/string-coerce-runtime";
+import { ChannelType, MessageFlags, PermissionFlagsBits } from "discord-api-types/v10";
 import { PollLayoutType } from "discord-api-types/payloads/v10";
 import { extensionForMime, normalizePollDurationHours, normalizePollInput } from "openclaw/plugin-sdk/media-runtime";
 import { loadOutboundMediaFromUrl } from "openclaw/plugin-sdk/outbound-media";
 import { requireRuntimeConfig } from "openclaw/plugin-sdk/plugin-config-runtime";
 import { resolveTextChunksWithFallback } from "openclaw/plugin-sdk/reply-payload";
-import { randomBytes } from "node:crypto";
 import { makeProxyFetch } from "openclaw/plugin-sdk/fetch-runtime";
+import { randomBytes } from "node:crypto";
 //#region extensions/discord/src/monitor/gateway-registry.ts
 /**
 * Module-level registry of active Discord GatewayPlugin instances.
@@ -23,30 +23,22 @@ import { makeProxyFetch } from "openclaw/plugin-sdk/fetch-runtime";
 */
 const gatewayRegistry = /* @__PURE__ */ new Map();
 const DEFAULT_ACCOUNT_KEY = "\0__default__";
-function resolveAccountKey(accountId) {
-	return accountId ?? DEFAULT_ACCOUNT_KEY;
-}
 function registerGateway(accountId, gateway) {
-	gatewayRegistry.set(resolveAccountKey(accountId), gateway);
+	gatewayRegistry.set(accountId ?? DEFAULT_ACCOUNT_KEY, gateway);
 }
 function unregisterGateway(accountId) {
-	gatewayRegistry.delete(resolveAccountKey(accountId));
+	gatewayRegistry.delete(accountId ?? DEFAULT_ACCOUNT_KEY);
 }
 function getGateway(accountId) {
-	return gatewayRegistry.get(resolveAccountKey(accountId));
+	return gatewayRegistry.get(accountId ?? DEFAULT_ACCOUNT_KEY);
 }
 function clearGateways() {
 	gatewayRegistry.clear();
 }
 //#endregion
 //#region extensions/discord/src/proxy-fetch.ts
-function resolveDiscordProxyUrl(account, cfg) {
-	const accountProxy = normalizeOptionalString(account.config.proxy);
-	if (accountProxy) return accountProxy;
-	return normalizeOptionalString(cfg?.channels?.discord?.proxy);
-}
 function resolveDiscordProxyFetchForAccount(account, cfg, runtime) {
-	return withValidatedDiscordProxy(resolveDiscordProxyUrl(account, cfg), runtime, makeProxyFetch);
+	return withValidatedDiscordProxy(normalizeOptionalString(account.config.proxy) ?? normalizeOptionalString(cfg?.channels?.discord?.proxy), runtime, makeProxyFetch);
 }
 function withValidatedDiscordProxy(proxyUrl, runtime, createValue) {
 	const proxy = proxyUrl?.trim();
@@ -86,48 +78,31 @@ function createDiscordRuntimeAccountContext(params) {
 }
 function resolveDiscordClientAccountContext(opts, runtime) {
 	const resolvedCfg = requireRuntimeConfig(opts.cfg, "Discord client");
-	const account = resolveAccountWithoutToken({
-		cfg: resolvedCfg,
-		accountId: opts.accountId
-	});
+	const accountId = normalizeAccountId(opts.accountId);
+	const config = mergeDiscordAccountConfig(resolvedCfg, accountId);
+	const account = {
+		accountId,
+		enabled: resolvedCfg.channels?.discord?.enabled !== false && config.enabled !== false,
+		name: normalizeOptionalString(config.name),
+		token: "",
+		tokenSource: "none",
+		tokenStatus: "missing",
+		config
+	};
 	return {
 		cfg: resolvedCfg,
 		account,
 		proxyFetch: resolveDiscordProxyFetchForAccount(account, resolvedCfg, runtime)
 	};
 }
-function resolveToken(params) {
-	const fallback = normalizeDiscordToken(params.fallbackToken, "channels.discord.token");
+function resolveToken(account) {
+	const fallback = normalizeDiscordToken(account.token, "channels.discord.token");
 	if (!fallback) {
-		if (params.account.tokenStatus === "configured_unavailable") throw new Error(`Discord bot token configured for account "${params.accountId}" is unavailable; resolve SecretRefs against the active runtime snapshot before using this account.`);
-		throw new Error(`Discord bot token missing for account "${params.accountId}" (set discord.accounts.${params.accountId}.token or DISCORD_BOT_TOKEN for default).`);
+		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.`);
+		throw new Error(`Discord bot token missing for account "${account.accountId}" (set discord.accounts.${account.accountId}.token or DISCORD_BOT_TOKEN for default).`);
 	}
 	return fallback;
 }
-function resolveRest(token, account, cfg, rest, proxyFetch, signal, timeoutMs) {
-	if (rest) return rest;
-	const resolvedProxyFetch = proxyFetch ?? resolveDiscordProxyFetchForAccount(account, cfg);
-	return createDiscordRequestClient(token, {
-		...resolvedProxyFetch ? { fetch: resolvedProxyFetch } : {},
-		...signal ? { signal } : {},
-		...timeoutMs !== void 0 ? { timeout: timeoutMs } : {}
-	});
-}
-function resolveAccountWithoutToken(params) {
-	const accountId = normalizeAccountId(params.accountId);
-	const merged = mergeDiscordAccountConfig(params.cfg, accountId);
-	const baseEnabled = params.cfg.channels?.discord?.enabled !== false;
-	const accountEnabled = merged.enabled !== false;
-	return {
-		accountId,
-		enabled: baseEnabled && accountEnabled,
-		name: normalizeOptionalString(merged.name),
-		token: "",
-		tokenSource: "none",
-		tokenStatus: "missing",
-		config: merged
-	};
-}
 function createDiscordRestClient(opts) {
 	const explicitToken = normalizeDiscordToken(opts.token, "channels.discord.token");
 	const proxyContext = resolveDiscordClientAccountContext(opts);
@@ -136,14 +111,21 @@ function createDiscordRestClient(opts) {
 		cfg: resolvedCfg,
 		accountId: opts.accountId
 	});
-	const token = explicitToken ?? resolveToken({
-		account,
-		accountId: account.accountId,
-		fallbackToken: account.token
-	});
+	const token = explicitToken ?? resolveToken(account);
+	const { rest, signal, timeoutMs } = opts;
+	if (rest) return {
+		token,
+		rest,
+		account
+	};
+	const proxyFetch = proxyContext.proxyFetch ?? resolveDiscordProxyFetchForAccount(account, resolvedCfg);
 	return {
 		token,
-		rest: resolveRest(token, account, resolvedCfg, opts.rest, proxyContext.proxyFetch, opts.signal, opts.timeoutMs),
+		rest: createDiscordRequestClient(token, {
+			...proxyFetch ? { fetch: proxyFetch } : {},
+			...signal ? { signal } : {},
+			...timeoutMs !== void 0 ? { timeout: timeoutMs } : {}
+		}),
 		account
 	};
 }
@@ -213,29 +195,23 @@ function resolveDiscordSendEmbeds(params) {
 	if (!params.embeds?.length || !params.isFirst) return;
 	return params.embeds.map((embed) => embed instanceof Embed ? embed : new Embed(embed));
 }
-function buildDiscordMessagePayload(params) {
-	const payload = {};
-	const hasV2 = hasDiscordV2Components(params.components);
-	const trimmed = params.text.trim();
-	if (!hasV2 && trimmed) payload.content = params.text;
-	if (params.components?.length) payload.components = params.components;
-	if (!hasV2 && params.embeds?.length) payload.embeds = params.embeds;
-	if (params.allowedMentions) payload.allowed_mentions = params.allowedMentions;
-	if (params.flags !== void 0) payload.flags = params.flags;
-	if (params.files?.length) payload.files = params.files;
-	return payload;
-}
 function resolveDiscordMessageFlags(params) {
-	let flags = 0;
-	if (params.suppressEmbeds) flags |= SUPPRESS_EMBEDS_FLAG;
-	if (params.silent) flags |= SUPPRESS_NOTIFICATIONS_FLAG;
-	return flags || void 0;
+	return (params.suppressEmbeds ? SUPPRESS_EMBEDS_FLAG : 0) | (params.silent ? SUPPRESS_NOTIFICATIONS_FLAG : 0) || void 0;
 }
 function resolveDiscordSuppressEmbeds(params) {
 	return params.override ?? params.configured ?? true;
 }
 function buildDiscordMessageRequest(params) {
-	const payload = buildDiscordMessagePayload(params);
+	const hasV2 = hasDiscordV2Components(params.components);
+	const trimmed = params.text.trim();
+	const payload = {
+		content: !hasV2 && trimmed ? params.text : void 0,
+		components: params.components?.length ? params.components : void 0,
+		embeds: !hasV2 && params.embeds?.length ? params.embeds : void 0,
+		allowed_mentions: params.allowedMentions || void 0,
+		flags: params.flags,
+		files: params.files?.length ? params.files : void 0
+	};
 	const nonce = params.endpoint === "create-message" ? params.nonce ?? createDiscordMessageNonce() : void 0;
 	return {
 		...serializePayload(payload),
@@ -253,12 +229,10 @@ const PERMISSION_ENTRIES = Object.entries(PermissionFlagsBits).filter(([, value]
 const ALL_PERMISSIONS = PERMISSION_ENTRIES.reduce((acc, [, value]) => acc | value, 0n);
 const ADMINISTRATOR_BIT = PermissionFlagsBits.Administrator;
 function addPermissionBits(base, add) {
-	if (!add) return base;
-	return base | BigInt(add);
+	return base | BigInt(add || "0");
 }
 function removePermissionBits(base, deny) {
-	if (!deny) return base;
-	return base & ~BigInt(deny);
+	return base & ~BigInt(deny || "0");
 }
 function bitfieldToPermissions(bitfield) {
 	return PERMISSION_ENTRIES.filter(([, value]) => (bitfield & value) === value).map(([name]) => name).toSorted();
@@ -276,13 +250,8 @@ async function fetchBotUserId(rest) {
 }
 function resolveMemberGuildPermissionBits(params) {
 	const rolesByIdLocal = rolesById(params.guild);
-	const everyoneRole = rolesByIdLocal.get(params.guild.id);
-	let permissions = 0n;
-	if (everyoneRole?.permissions) permissions = addPermissionBits(permissions, everyoneRole.permissions);
-	for (const roleId of params.member.roles ?? []) {
-		const role = rolesByIdLocal.get(roleId);
-		if (role?.permissions) permissions = addPermissionBits(permissions, role.permissions);
-	}
+	let permissions = addPermissionBits(0n, rolesByIdLocal.get(params.guild.id)?.permissions);
+	for (const roleId of params.member.roles ?? []) permissions = addPermissionBits(permissions, rolesByIdLocal.get(roleId)?.permissions);
 	return permissions;
 }
 function rolesById(guild) {
@@ -303,20 +272,19 @@ function resolveMemberChannelPermissionBits(params) {
 	if (hasAdministrator(permissions)) return ALL_PERMISSIONS;
 	const overwrites = "permission_overwrites" in params.channel ? params.channel.permission_overwrites ?? [] : [];
 	for (const overwrite of overwrites) if (overwrite.id === params.guildId) {
-		permissions = removePermissionBits(permissions, overwrite.deny ?? "0");
-		permissions = addPermissionBits(permissions, overwrite.allow ?? "0");
+		permissions = removePermissionBits(permissions, overwrite.deny);
+		permissions = addPermissionBits(permissions, overwrite.allow);
 	}
 	let roleDeny = 0n;
 	let roleAllow = 0n;
 	for (const overwrite of overwrites) if (params.member.roles?.includes(overwrite.id)) {
-		roleDeny = addPermissionBits(roleDeny, overwrite.deny ?? "0");
-		roleAllow = addPermissionBits(roleAllow, overwrite.allow ?? "0");
+		roleDeny = addPermissionBits(roleDeny, overwrite.deny);
+		roleAllow = addPermissionBits(roleAllow, overwrite.allow);
 	}
-	permissions = permissions & ~roleDeny;
-	permissions = permissions | roleAllow;
+	permissions = permissions & ~roleDeny | roleAllow;
 	for (const overwrite of overwrites) if (overwrite.id === params.userId) {
-		permissions = removePermissionBits(permissions, overwrite.deny ?? "0");
-		permissions = addPermissionBits(permissions, overwrite.allow ?? "0");
+		permissions = removePermissionBits(permissions, overwrite.deny);
+		permissions = addPermissionBits(permissions, overwrite.allow);
 	}
 	return permissions;
 }
@@ -342,53 +310,41 @@ async function fetchMemberGuildPermissionsDiscord(guildId, userId, opts) {
 		return null;
 	}
 }
-async function canViewDiscordGuildChannel(guildId, channelId, userId, opts) {
+async function checkMemberChannelPermissions(guildId, channelId, userId, opts, check) {
 	const rest = resolveDiscordRest(opts);
 	try {
 		const channel = await getChannel(rest, channelId);
 		const permissionChannel = await resolveChannelPermissionSubject(rest, channel);
-		if (("guild_id" in permissionChannel ? permissionChannel.guild_id : void 0) !== guildId) return false;
+		if (!("guild_id" in permissionChannel) || permissionChannel.guild_id !== guildId) return false;
 		const [guild, member] = await Promise.all([getGuild(rest, guildId), getGuildMember(rest, guildId, userId)]);
 		if (guild.owner_id === userId) return true;
-		const permissions = resolveMemberChannelPermissionBits({
+		return await check(resolveMemberChannelPermissionBits({
 			guildId,
 			userId,
 			guild,
 			member,
 			channel: permissionChannel
-		});
+		}), channel, rest);
+	} catch {
+		return false;
+	}
+}
+async function canViewDiscordGuildChannel(guildId, channelId, userId, opts) {
+	return checkMemberChannelPermissions(guildId, channelId, userId, opts, async (permissions, channel, rest) => {
 		if (!hasPermissionBit(permissions, PermissionFlagsBits.ViewChannel)) return false;
 		if ("type" in channel && channel.type === ChannelType.PrivateThread) {
 			if (hasPermissionBit(permissions, PermissionFlagsBits.ManageThreads)) return true;
 			await getThreadMember(rest, channel.id, userId);
 		}
 		return true;
-	} catch {
-		return false;
-	}
+	});
 }
 /**
 * Returns true when the user has ADMINISTRATOR or any required permission bit
 * after applying channel/category overwrites.
 */
 async function hasAnyChannelPermissionDiscord(guildId, channelId, userId, requiredPermissions, opts) {
-	const rest = resolveDiscordRest(opts);
-	try {
-		const permissionChannel = await resolveChannelPermissionSubject(rest, await getChannel(rest, channelId));
-		if (("guild_id" in permissionChannel ? permissionChannel.guild_id : void 0) !== guildId) return false;
-		const [guild, member] = await Promise.all([getGuild(rest, guildId), getGuildMember(rest, guildId, userId)]);
-		if (guild.owner_id === userId) return true;
-		const permissions = resolveMemberChannelPermissionBits({
-			guildId,
-			userId,
-			guild,
-			member,
-			channel: permissionChannel
-		});
-		return requiredPermissions.some((permission) => hasPermissionBit(permissions, permission));
-	} catch {
-		return false;
-	}
+	return checkMemberChannelPermissions(guildId, channelId, userId, opts, (permissions) => requiredPermissions.some((permission) => hasPermissionBit(permissions, permission)));
 }
 async function canManageGuildMemberRoleDiscord(guildId, senderUserId, targetUserId, roleId, opts, requirements) {
 	const rest = resolveDiscordRest(opts);
@@ -428,26 +384,23 @@ async function canManageGuildRoleDiscord(guildId, senderUserId, roleId, opts) {
 	}
 }
 /**
-* Returns true when the user has ADMINISTRATOR or required permission bits
-* matching the provided predicate.
+* Returns true when the user has ADMINISTRATOR or the required permission bits.
 */
-async function hasGuildPermissionsDiscord(guildId, userId, requiredPermissions, check, opts) {
+async function hasGuildPermissionsDiscord(guildId, userId, requiredPermissions, match, opts) {
 	const permissions = await fetchMemberGuildPermissionsDiscord(guildId, userId, opts);
-	if (permissions === null) return false;
-	if (hasAdministrator(permissions)) return true;
-	return check(permissions, requiredPermissions);
+	return permissions !== null && (hasAdministrator(permissions) || requiredPermissions[match]((permission) => hasPermissionBit(permissions, permission)));
 }
 /**
 * Returns true when the user has ADMINISTRATOR or any required permission bit.
 */
 async function hasAnyGuildPermissionDiscord(guildId, userId, requiredPermissions, opts) {
-	return await hasGuildPermissionsDiscord(guildId, userId, requiredPermissions, (permissions, required) => required.some((permission) => hasPermissionBit(permissions, permission)), opts);
+	return await hasGuildPermissionsDiscord(guildId, userId, requiredPermissions, "some", opts);
 }
 /**
 * Returns true when the user has ADMINISTRATOR or all required permission bits.
 */
 async function hasAllGuildPermissionsDiscord(guildId, userId, requiredPermissions, opts) {
-	return await hasGuildPermissionsDiscord(guildId, userId, requiredPermissions, (permissions, required) => required.every((permission) => hasPermissionBit(permissions, permission)), opts);
+	return await hasGuildPermissionsDiscord(guildId, userId, requiredPermissions, "every", opts);
 }
 async function fetchChannelPermissionsDiscord(channelId, opts) {
 	opts.signal?.throwIfAborted();
@@ -491,7 +444,7 @@ var DiscordSendError = class extends Error {
 	constructor(message, opts) {
 		super(message);
 		this.name = "DiscordSendError";
-		if (opts) Object.assign(this, opts);
+		Object.assign(this, opts);
 	}
 	toString() {
 		return this.message;
@@ -511,8 +464,10 @@ const DISCORD_CANNOT_DM = 50007;
 const DISCORD_UPLOAD_TOO_LARGE = 40005;
 const DISCORD_UPLOAD_TOO_LARGE_STATUS = 413;
 const DISCORD_UPLOAD_TOO_LARGE_NOTICE = "Attachment skipped: Discord rejected the file as too large.";
-function resolveRequiredDiscordSendPermissions(channelType) {
-	return isDiscordThreadChannelType(channelType) ? ["ViewChannel", "SendMessagesInThreads"] : ["ViewChannel", "SendMessages"];
+function resolveRequiredDiscordSendPermissions(channelType, hasMedia) {
+	const permissions = isDiscordThreadChannelType(channelType) ? ["ViewChannel", "SendMessagesInThreads"] : ["ViewChannel", "SendMessages"];
+	if (hasMedia) permissions.push("AttachFiles");
+	return permissions;
 }
 function normalizeReactionEmoji(raw) {
 	const trimmed = raw.trim();
@@ -546,17 +501,17 @@ function normalizeDiscordPollInput(input) {
 		layout_type: PollLayoutType.Default
 	};
 }
+function readDiscordErrorNumber(value, finiteNumbers = false) {
+	if (typeof value === "number") return !finiteNumbers || Number.isFinite(value) ? value : void 0;
+	return typeof value === "string" && /^\d+$/.test(value) ? Number(value) : void 0;
+}
 function getDiscordErrorCode(err) {
 	if (!err || typeof err !== "object") return;
-	const candidate = "code" in err && err.code !== void 0 ? err.code : "rawError" in err && err.rawError && typeof err.rawError === "object" ? err.rawError.code : void 0;
-	if (typeof candidate === "number") return candidate;
-	if (typeof candidate === "string" && /^\d+$/.test(candidate)) return Number(candidate);
+	return readDiscordErrorNumber("code" in err && err.code !== void 0 ? err.code : "rawError" in err && err.rawError && typeof err.rawError === "object" ? err.rawError.code : void 0);
 }
 function getDiscordErrorStatus(err) {
 	if (!err || typeof err !== "object") return;
-	const candidate = "status" in err && err.status !== void 0 ? err.status : "statusCode" in err && err.statusCode !== void 0 ? err.statusCode : void 0;
-	if (typeof candidate === "number" && Number.isFinite(candidate)) return candidate;
-	if (typeof candidate === "string" && /^\d+$/.test(candidate)) return Number(candidate);
+	return readDiscordErrorNumber("status" in err && err.status !== void 0 ? err.status : "statusCode" in err && err.statusCode !== void 0 ? err.statusCode : void 0, true);
 }
 function isDiscordUploadTooLargeError(err) {
 	return getDiscordErrorCode(err) === DISCORD_UPLOAD_TOO_LARGE || getDiscordErrorStatus(err) === DISCORD_UPLOAD_TOO_LARGE_STATUS;
@@ -583,16 +538,12 @@ async function buildDiscordSendError(err, ctx) {
 		});
 		probedChannelType = permissions.channelType;
 		const current = new Set(permissions.permissions);
-		const required = resolveRequiredDiscordSendPermissions(probedChannelType);
-		if (ctx.hasMedia) required.push("AttachFiles");
-		missing = required.filter((permission) => !current.has(permission));
+		missing = resolveRequiredDiscordSendPermissions(probedChannelType, ctx.hasMedia).filter((permission) => !current.has(permission));
 	} catch {}
 	const status = getDiscordErrorStatus(err);
 	const apiDetails = [`code=${code}`, status != null ? `status=${status}` : void 0].filter(Boolean).join(" ");
-	const probedPermissions = resolveRequiredDiscordSendPermissions(probedChannelType);
-	if (ctx.hasMedia) probedPermissions.push("AttachFiles");
-	const probeSummary = probedPermissions.join("/");
-	return new DiscordSendError(`${missing.length ? `discord missing permissions in channel ${ctx.channelId}: ${missing.join(", ")}` : `discord missing permissions in channel ${ctx.channelId}; permission probe did not identify missing ${probeSummary}`} (${apiDetails}). bot might be blocked by channel/thread overrides, archived thread state, reply target visibility, or app-role position`, {
+	const probeSummary = resolveRequiredDiscordSendPermissions(probedChannelType, ctx.hasMedia).join("/");
+	return new DiscordSendError(`${missing.length ? `discord missing permissions in channel ${ctx.channelId}: ${missing.join(", ")}` : `discord missing permissions in channel ${ctx.channelId}; permission check did not identify missing ${probeSummary}`} (${apiDetails}). bot might be blocked by channel/thread overrides, archived thread state, reply target visibility, or app-role position`, {
 		kind: "missing-permissions",
 		channelId: ctx.channelId,
 		missingPermissions: missing,
@@ -615,11 +566,7 @@ async function resolveDiscordTargetChannelId(raw, opts) {
 	return await resolveChannelId(rest, recipient, request);
 }
 async function resolveDiscordChannel(rest, channelId) {
-	try {
-		return await getChannel(rest, channelId);
-	} catch {
-		return;
-	}
+	return getChannel(rest, channelId).catch(() => void 0);
 }
 function buildDiscordTextChunks(text, opts = {}) {
 	if (!text) return [];
@@ -669,7 +616,7 @@ async function sendDiscordChunks(params, upload) {
 			result = await params.request(async () => {
 				await params.onPlatformSendDispatch?.();
 				params.assertPlatformSendAuthorized?.();
-				return await params.rest.post(Routes.channelMessages(params.channelId), { body });
+				return createChannelMessage(params.rest, params.channelId, { body });
 			}, files ? "media" : "text", { safety: "nonce-protected-create" });
 		} catch (error) {
 			if (files && upload) return upload.onRejected(error);
@@ -685,9 +632,6 @@ async function sendDiscordChunks(params, upload) {
 		platformMessageIds
 	};
 }
-async function sendDiscordText(params) {
-	return sendDiscordChunks(params);
-}
 async function sendDiscordMedia(params) {
 	const media = await loadOutboundMediaFromUrl(params.mediaUrl, {
 		maxBytes: params.maxBytes,
@@ -704,7 +648,7 @@ async function sendDiscordMedia(params) {
 		}],
 		onRejected(error) {
 			if (!isDiscordUploadTooLargeError(error)) throw error;
-			return sendDiscordText({
+			return sendDiscordChunks({
 				...params,
 				text: buildDiscordUploadTooLargeFallbackText(params.text),
 				components: void 0,
@@ -718,4 +662,4 @@ function buildReactionIdentifier(emoji) {
 	return emoji.name ?? "";
 }
 //#endregion
-export { resolveDiscordSendEmbeds as A, validateDiscordProxyUrl as B, hasAnyChannelPermissionDiscord as C, createDiscordMessageNonce as D, buildDiscordMessageRequest as E, createDiscordRuntimeAccountContext as F, unregisterGateway as G, clearGateways as H, resolveDiscordClientAccountContext as I, resolveDiscordRest as L, parseAndResolveChannelRecipient as M, createDiscordClient as N, resolveDiscordMessageFlags as O, createDiscordRestClient as P, DISCORD_REST_TIMEOUT_MS as R, hasAllGuildPermissionsDiscord as S, SUPPRESS_NOTIFICATIONS_FLAG as T, getGateway as U, withValidatedDiscordProxy as V, registerGateway as W, canManageGuildMemberRoleDiscord as _, normalizeEmojiName as a, fetchChannelPermissionsDiscord as b, resolveChannelId as c, sendDiscordMedia as d, sendDiscordText as f, DiscordSendError as g, DISCORD_MAX_STICKER_BYTES as h, normalizeDiscordPollInput as i, resolveDiscordSuppressEmbeds as j, resolveDiscordSendComponents as k, resolveDiscordChannel as l, DISCORD_MAX_EVENT_COVER_BYTES as m, buildDiscordTextChunks as n, normalizeReactionEmoji as o, DISCORD_MAX_EMOJI_BYTES as p, buildReactionIdentifier as r, normalizeStickerIds as s, buildDiscordSendError as t, resolveDiscordTargetChannelId as u, canManageGuildRoleDiscord as v, hasAnyGuildPermissionDiscord as w, fetchMemberGuildPermissionsDiscord as x, canViewDiscordGuildChannel as y, resolveDiscordProxyFetchForAccount as z };
+export { resolveDiscordSendEmbeds as A, validateDiscordProxyUrl as B, hasAnyChannelPermissionDiscord as C, createDiscordMessageNonce as D, buildDiscordMessageRequest as E, createDiscordRuntimeAccountContext as F, unregisterGateway as G, clearGateways as H, resolveDiscordClientAccountContext as I, resolveDiscordRest as L, parseAndResolveChannelRecipient as M, createDiscordClient as N, resolveDiscordMessageFlags as O, createDiscordRestClient as P, DISCORD_REST_TIMEOUT_MS as R, hasAllGuildPermissionsDiscord as S, SUPPRESS_NOTIFICATIONS_FLAG as T, getGateway as U, withValidatedDiscordProxy as V, registerGateway as W, canManageGuildMemberRoleDiscord as _, normalizeEmojiName as a, fetchChannelPermissionsDiscord as b, resolveChannelId as c, sendDiscordChunks as d, sendDiscordMedia as f, DiscordSendError as g, DISCORD_MAX_STICKER_BYTES as h, normalizeDiscordPollInput as i, resolveDiscordSuppressEmbeds as j, resolveDiscordSendComponents as k, resolveDiscordChannel as l, DISCORD_MAX_EVENT_COVER_BYTES as m, buildDiscordTextChunks as n, normalizeReactionEmoji as o, DISCORD_MAX_EMOJI_BYTES as p, buildReactionIdentifier as r, normalizeStickerIds as s, buildDiscordSendError as t, resolveDiscordTargetChannelId as u, canManageGuildRoleDiscord as v, hasAnyGuildPermissionDiscord as w, fetchMemberGuildPermissionsDiscord as x, canViewDiscordGuildChannel as y, resolveDiscordProxyFetchForAccount as z };

package/dist/.setup/{sender-identity-AHpUNr72.mjs → sender-identity-BNBvGt1l.mjs}

@@ -1,4 +1,4 @@
-import { S as formatDiscordUserTag } from "./allow-list-vxkG9_JD.mjs";
+import { S as formatDiscordUserTag } from "./allow-list-B_ToXtew.mjs";
 import { normalizeOptionalString } from "openclaw/plugin-sdk/string-coerce-runtime";
 //#region extensions/discord/src/monitor/sender-identity.ts
 function resolveDiscordWebhookId(message) {

package/dist/.setup/setup-plugin-api-xfOFmxHP.mjs

@@ -0,0 +1,3 @@
+import { t as discordSetupPlugin } from "./channel.setup-DdFVN1mr.mjs";
+import "../setup-plugin-api.js";
+export { discordSetupPlugin };

package/dist/.setup/{shared-BoBnM5kM.mjs → shared-CestGDpq.mjs}

@@ -1,10 +1,11 @@
-import { c as resolveDiscordAccount, d as resolveDiscordAccountDisabledReason, f as resolveDiscordAccountDmPolicy, l as resolveDiscordAccountAllowFrom, n as isDiscordAccountEnabledForRuntime, o as mergeDiscordAccountConfig, r as listDiscordAccountIds, s as resolveDefaultDiscordAccountId } from "./accounts-HE9-mj1L.mjs";
-import { t as inspectDiscordAccount } from "./account-inspect-DsER5ILV.mjs";
-import { n as discordIngressIdentity, t as selectDiscordLivePolicyConfig } from "./live-policy-config-VxexfRKo.mjs";
-import { t as DiscordChannelConfigSchema } from "./config-schema-BQWfnSCx.mjs";
-import { n as normalizeCompatibilityConfig } from "./doctor-contract-Bg3NPAMw.mjs";
-import { r as secretTargetRegistryEntries, t as collectRuntimeConfigAssignments } from "./secret-config-contract-uOE2J7yM.mjs";
-import { n as unsupportedSecretRefSurfacePatterns, t as collectUnsupportedSecretRefConfigCandidates } from "./security-contract-DSHk7I2w.mjs";
+import { c as resolveDefaultDiscordAccountId, f as resolveDiscordAccountDisabledReason, i as listDiscordAccountIds, l as resolveDiscordAccount, p as resolveDiscordAccountDmPolicy, r as isDiscordAccountEnabledForRuntime, s as mergeDiscordAccountConfig, u as resolveDiscordAccountAllowFrom } from "./accounts-ljrzXBJi.mjs";
+import { t as inspectDiscordAccount } from "./account-inspect-8cCu6uPG.mjs";
+import { t as parseDiscordTarget } from "./target-parsing-C-HyNxcE.mjs";
+import { n as discordIngressIdentity, t as selectDiscordLivePolicyConfig } from "./live-policy-config-BPoB3eQi.mjs";
+import { t as DiscordChannelConfigSchema } from "./config-schema-_uBILpQf.mjs";
+import { n as normalizeCompatibilityConfig } from "./doctor-contract-Bwv8EuQ_.mjs";
+import { r as secretTargetRegistryEntries, t as collectRuntimeConfigAssignments } from "./secret-config-contract-CIsH7R3B.mjs";
+import { n as unsupportedSecretRefSurfacePatterns, t as collectUnsupportedSecretRefConfigCandidates } from "./security-contract-DNyyjTZZ.mjs";
 import { t as deriveLegacySessionChatType } from "./session-contract-BO5tlIdl.mjs";
 import { createLazyRuntimeModule } from "openclaw/plugin-sdk/lazy-runtime";
 import { normalizeAccountId } from "openclaw/plugin-sdk/account-id";
@@ -51,17 +52,15 @@ const collectDiscordSecurityWarnings = createOpenProviderConfiguredRouteWarningC
 		remediation: "Set channels.discord.groupPolicy=\"allowlist\" and configure channels.discord.guilds.<id>.channels"
 	}
 });
-const collectDiscordSecurityFindings = createConditionalWarningCollector.findings({
-	collectWarnings: collectDiscordSecurityWarnings,
-	checkId: "channels.discord.groups.open",
-	severity: "warn",
-	title: "Discord security warning"
-});
-const loadDiscordSecurityAuditModule = createLazyRuntimeModule(() => import("./security-audit-D42cp5N7.mjs").then((n) => n.n));
 const discordSecurityAdapter = {
 	resolveDmPolicy: resolveDiscordDmPolicy,
-	collectWarnings: collectDiscordSecurityFindings,
-	collectAuditFindings: async (params) => (await loadDiscordSecurityAuditModule()).collectDiscordSecurityAuditFindings(params)
+	collectWarnings: createConditionalWarningCollector.findings({
+		collectWarnings: collectDiscordSecurityWarnings,
+		checkId: "channels.discord.groups.open",
+		severity: "warn",
+		title: "Discord security warning"
+	}),
+	collectAuditFindings: async (params) => (await import("./security-audit-BFT84Uny.mjs").then((n) => n.n)).collectDiscordSecurityAuditFindings(params)
 };
 //#endregion
 //#region extensions/discord/src/setup-adapter.ts
@@ -101,7 +100,7 @@ const DISCORD_LEGACY_CONFIG_RULES = [];
 //#region extensions/discord/src/shared.ts
 const DISCORD_CHANNEL = "discord";
 const livePolicyConfigPrefixes = Object.keys(selectDiscordLivePolicyConfig({})).flatMap((key) => [`channels.discord.${key}`, `channels.discord.accounts.*.${key}`]);
-const loadDiscordDoctorModule = createLazyRuntimeModule(() => import("./doctor-B2bskDcF.mjs"));
+const loadDiscordDoctorModule = createLazyRuntimeModule(() => import("./doctor-DSrNJ7m2.mjs"));
 const discordDoctor = {
 	dmAllowFromMode: "topOnly",
 	groupModel: "route",
@@ -194,8 +193,8 @@ function createDiscordPluginBase(params) {
 		config: {
 			...discordConfigAdapter,
 			hasConfiguredState: ({ env }) => typeof env?.DISCORD_BOT_TOKEN === "string" && env.DISCORD_BOT_TOKEN.trim().length > 0,
-			isEnabled: (account, cfg) => isDiscordAccountEnabledForRuntime(account, cfg),
-			disabledReason: (account, cfg) => resolveDiscordAccountDisabledReason(account, cfg),
+			isEnabled: isDiscordAccountEnabledForRuntime,
+			disabledReason: resolveDiscordAccountDisabledReason,
 			isConfigured: (account) => resolveConfiguredFromCredentialStatuses(account) ?? Boolean(account.token?.trim()),
 			describeAccount: (account) => describeAccountSnapshot({
 				account,
@@ -206,7 +205,18 @@ function createDiscordPluginBase(params) {
 				}
 			})
 		},
-		messaging: { deriveLegacySessionChatType },
+		messaging: {
+			deriveLegacySessionChatType,
+			directTargetStyle: "user-prefixed",
+			inferTargetChatType: ({ to }) => {
+				try {
+					const parsed = parseDiscordTarget(to, { defaultKind: "channel" });
+					return parsed ? parsed.kind === "user" ? "direct" : "channel" : void 0;
+				} catch {
+					return;
+				}
+			}
+		},
 		security: discordSecurityAdapter,
 		secrets: {
 			secretTargetRegistryEntries,

package/dist/.setup/{subagent-hooks-HH8Uy9cx.mjs → subagent-hooks-CME7dSGf.mjs}

@@ -1,6 +1,6 @@
 import { t as __exportAll } from "./rolldown-runtime-B4FMCO8f.mjs";
-import { x as ensureBindingsLoadedAsync } from "./thread-bindings.session-updates-Bu_CGr_O.mjs";
-import { o as listThreadBindingsBySessionKey, u as unbindThreadBindingsBySessionKeyAsync } from "./thread-bindings-DjQCkmsd.mjs";
+import { x as ensureBindingsLoadedAsync } from "./thread-bindings.session-updates-DGSljVf6.mjs";
+import { o as listThreadBindingsBySessionKey, u as unbindThreadBindingsBySessionKeyAsync } from "./thread-bindings-0hPTSK14.mjs";
 import { normalizeOptionalLowercaseString, normalizeOptionalStringifiedId } from "openclaw/plugin-sdk/string-coerce-runtime";
 //#region extensions/discord/src/subagent-hooks.ts
 var subagent_hooks_exports = /* @__PURE__ */ __exportAll({
@@ -8,15 +8,12 @@ var subagent_hooks_exports = /* @__PURE__ */ __exportAll({
 	handleDiscordSubagentDeliveryTargetAsync: () => handleDiscordSubagentDeliveryTargetAsync,
 	handleDiscordSubagentEnded: () => handleDiscordSubagentEnded
 });
-function normalizeThreadBindingTargetKind(raw) {
-	const normalized = normalizeOptionalLowercaseString(raw);
-	if (normalized === "subagent" || normalized === "acp") return normalized;
-}
 async function handleDiscordSubagentEnded(event) {
+	const targetKind = normalizeOptionalLowercaseString(event.targetKind);
 	await unbindThreadBindingsBySessionKeyAsync({
 		targetSessionKey: event.targetSessionKey,
 		accountId: event.accountId,
-		targetKind: normalizeThreadBindingTargetKind(event.targetKind),
+		targetKind: targetKind === "subagent" || targetKind === "acp" ? targetKind : void 0,
 		reason: event.reason,
 		sendFarewell: event.sendFarewell
 	});
@@ -40,9 +37,7 @@ function resolveDiscordDeliveryTarget(event) {
 		...requesterAccountId ? { accountId: requesterAccountId } : {},
 		targetKind: "subagent"
 	});
-	let binding;
-	if (requesterThreadId) binding = bindings.find((entry) => entry.threadId === requesterThreadId && (!requesterAccountId || entry.accountId === requesterAccountId));
-	if (!binding && bindings.length === 1) binding = bindings[0];
+	const binding = (requesterThreadId ? bindings.find((entry) => entry.threadId === requesterThreadId && (!requesterAccountId || entry.accountId === requesterAccountId)) : void 0) ?? (bindings.length === 1 ? bindings[0] : void 0);
 	if (!binding) return;
 	return { origin: {
 		channel: "discord",

package/dist/.setup/{system-events-Cwxaww8i.mjs → system-events-BwwSDCw4.mjs}

@@ -1,5 +1,5 @@
-import { S as formatDiscordUserTag } from "./allow-list-vxkG9_JD.mjs";
-import { t as discord_exports } from "./discord-9gysrhzp.mjs";
+import { S as formatDiscordUserTag } from "./allow-list-B_ToXtew.mjs";
+import { t as discord_exports } from "./discord-BGqgx-yd.mjs";
 //#region extensions/discord/src/monitor/system-events.ts
 const SYSTEM_EVENT_ACTIONS = /* @__PURE__ */ new Map([
 	[discord_exports.MessageType.ChannelPinnedMessage, "pinned a message"],