@openclaw/discord 2026.8.1-beta.2 → 2026.8.1

package/dist/{send.shared-BmwFjW6T.js → send.shared-DZJ1akvQ.js}

@@ -1,53 +1,19 @@
-import { A as RequestClient, Dt as getThreadMember, H as serializePayload, Ht as getGuild, Tt as getChannel, U as Embed, Ut as getGuildMember, a as chunkDiscordTextWithMode, ft as stripUndefinedFields, ht as getCurrentUser, mt as createUserDmChannel, n as createDiscordRetryRunner, s as resolveDiscordReplyMessageId, yt as createChannelMessage } from "./retry-CLpJcXXf.js";
-import { a as mergeDiscordAccountConfig, p as normalizeDiscordToken, s as resolveDiscordAccount } from "./accounts-DJTf1LtA.js";
-import { t as parseAndResolveDiscordTarget } from "./target-resolver-maOKSqO0.js";
-import { normalizeAccountId } from "openclaw/plugin-sdk/routing";
-import { normalizeOptionalString, normalizeStringEntries } from "openclaw/plugin-sdk/string-coerce-runtime";
+import { At as getChannel, J as Embed, Jt as getGuildMember, K as hasDiscordV2Components, Mt as getThreadMember, P as RequestClient, a as chunkDiscordTextWithMode, bt as getCurrentUser, d as resolveDiscordReplyMessageId, n as createDiscordRetryRunner, q as serializePayload, qt as getGuild, wt as createChannelMessage, yt as createUserDmChannel } from "./retry-DqHCW6PV.js";
+import { c as resolveDiscordAccount, m as normalizeDiscordToken, o as mergeDiscordAccountConfig } from "./accounts-CfQ-vSyf.js";
+import { t as parseAndResolveDiscordTarget } from "./target-resolver-V-IYae6s.js";
+import { t as isDiscordThreadChannelType } from "./channel-type-CVLZyGYS.js";
 import { ChannelType, MessageFlags, PermissionFlagsBits } from "discord-api-types/v10";
 import { randomBytes } from "node:crypto";
 import { expectDefined } from "openclaw/plugin-sdk/expect-runtime";
+import { normalizeAccountId } from "openclaw/plugin-sdk/routing";
+import { normalizeOptionalString, normalizeStringEntries } from "openclaw/plugin-sdk/string-coerce-runtime";
+import { requireRuntimeConfig } from "openclaw/plugin-sdk/plugin-config-runtime";
+import { resolveTextChunksWithFallback } from "openclaw/plugin-sdk/reply-payload";
 import { makeProxyFetch } from "openclaw/plugin-sdk/fetch-runtime";
 import { danger } from "openclaw/plugin-sdk/runtime-env";
-import { requireRuntimeConfig } from "openclaw/plugin-sdk/plugin-config-runtime";
 import { PollLayoutType } from "discord-api-types/payloads/v10";
 import { buildOutboundMediaLoadOptions, extensionForMime, normalizePollDurationHours, normalizePollInput } from "openclaw/plugin-sdk/media-runtime";
-import { resolveTextChunksWithFallback } from "openclaw/plugin-sdk/reply-payload";
 import { loadWebMedia } from "openclaw/plugin-sdk/web-media";
-//#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 resolveDiscordProxyFetchByUrl(proxyUrl, runtime) {
-	return withValidatedDiscordProxy(proxyUrl, runtime, (proxy) => makeProxyFetch(proxy));
-}
-function resolveDiscordProxyFetchForAccount(account, cfg, runtime) {
-	return resolveDiscordProxyFetchByUrl(resolveDiscordProxyUrl(account, cfg), runtime);
-}
-function withValidatedDiscordProxy(proxyUrl, runtime, createValue) {
-	const proxy = proxyUrl?.trim();
-	if (!proxy) return;
-	try {
-		validateDiscordProxyUrl(proxy);
-		return createValue(proxy);
-	} catch (err) {
-		runtime?.error?.(danger(`discord: invalid rest proxy: ${String(err)}`));
-		return;
-	}
-}
-function validateDiscordProxyUrl(proxyUrl) {
-	let parsed;
-	try {
-		parsed = new URL(proxyUrl);
-	} catch {
-		throw new Error("Proxy URL must be a valid http or https URL");
-	}
-	if (!["http:", "https:"].includes(parsed.protocol)) throw new Error("Proxy URL must use http or https");
-	if (!parsed.hostname) throw new Error("Proxy URL must include a host");
-	return proxyUrl;
-}
-//#endregion
 //#region extensions/discord/src/recipient-resolution.ts
 async function parseAndResolveRecipient(raw, cfg, accountId, parseOptions = {}) {
 	if (!cfg) throw new Error("Discord recipient resolution requires a resolved runtime config. Load and resolve config at the command or gateway boundary, then pass cfg through the runtime path.");
@@ -65,7 +31,14 @@ async function parseAndResolveRecipient(raw, cfg, accountId, parseOptions = {})
 	};
 }
 async function parseAndResolveChannelRecipient(raw, cfg, accountId) {
-	return await parseAndResolveRecipient(raw, cfg, accountId, { defaultKind: "channel" });
+	const resolved = await parseAndResolveDiscordTarget(raw, {
+		cfg: requireRuntimeConfig(cfg, "Discord recipient resolution"),
+		accountId
+	}, { defaultKind: "channel" });
+	return {
+		kind: resolved.kind,
+		id: resolved.id
+	};
 }
 //#endregion
 //#region extensions/discord/src/monitor/gateway-registry.ts
@@ -97,6 +70,41 @@ 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 resolveDiscordProxyFetchByUrl(proxyUrl, runtime) {
+	return withValidatedDiscordProxy(proxyUrl, runtime, (proxy) => makeProxyFetch(proxy));
+}
+function resolveDiscordProxyFetchForAccount(account, cfg, runtime) {
+	return resolveDiscordProxyFetchByUrl(resolveDiscordProxyUrl(account, cfg), runtime);
+}
+function withValidatedDiscordProxy(proxyUrl, runtime, createValue) {
+	const proxy = proxyUrl?.trim();
+	if (!proxy) return;
+	try {
+		validateDiscordProxyUrl(proxy);
+		return createValue(proxy);
+	} catch (err) {
+		runtime?.error?.(danger(`discord: invalid rest proxy: ${String(err)}`));
+		return;
+	}
+}
+function validateDiscordProxyUrl(proxyUrl) {
+	let parsed;
+	try {
+		parsed = new URL(proxyUrl);
+	} catch {
+		throw new Error("Proxy URL must be a valid http or https URL");
+	}
+	if (!["http:", "https:"].includes(parsed.protocol)) throw new Error("Proxy URL must use http or https");
+	if (!parsed.hostname) throw new Error("Proxy URL must include a host");
+	return proxyUrl;
+}
+//#endregion
 //#region extensions/discord/src/proxy-request-client.ts
 const DISCORD_REST_TIMEOUT_MS = 15e3;
 function createDiscordRequestClient(token, options) {
@@ -181,7 +189,11 @@ function createDiscordRestClient(opts) {
 	};
 }
 function createDiscordClient(opts) {
-	const { token, rest, account } = createDiscordRestClient(opts);
+	const { token, rest, account: restAccount } = createDiscordRestClient(opts);
+	const account = normalizeDiscordToken(opts.token, "channels.discord.token") ? resolveDiscordAccount({
+		cfg: opts.cfg,
+		accountId: opts.accountId
+	}) : restAccount;
 	return {
 		token,
 		rest,
@@ -189,16 +201,70 @@ function createDiscordClient(opts) {
 			retry: opts.retry,
 			verbose: opts.verbose,
 			isGatewayDisconnected: () => {
-				const gateway = getGateway(account.accountId);
+				const gateway = getGateway(restAccount.accountId);
 				return gateway !== void 0 && !gateway.isConnected;
 			}
-		})
+		}),
+		account
 	};
 }
 function resolveDiscordRest(opts) {
 	return createDiscordRestClient(opts).rest;
 }
 //#endregion
+//#region extensions/discord/src/send.message-request.ts
+const SUPPRESS_EMBEDS_FLAG = MessageFlags.SuppressEmbeds;
+const SUPPRESS_NOTIFICATIONS_FLAG = MessageFlags.SuppressNotifications;
+function createDiscordMessageNonce() {
+	return randomBytes(12).toString("hex");
+}
+function resolveDiscordSendComponents(params) {
+	if (!params.components || !params.isFirst) return;
+	return typeof params.components === "function" ? params.components(params.text) : params.components;
+}
+function normalizeDiscordEmbeds(embeds) {
+	if (!embeds?.length) return;
+	return embeds.map((embed) => embed instanceof Embed ? embed : new Embed(embed));
+}
+function resolveDiscordSendEmbeds(params) {
+	if (!params.embeds || !params.isFirst) return;
+	return normalizeDiscordEmbeds(params.embeds);
+}
+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;
+}
+function resolveDiscordSuppressEmbeds(params) {
+	return params.override ?? params.configured ?? true;
+}
+function buildDiscordMessageRequest(params) {
+	const payload = buildDiscordMessagePayload(params);
+	const nonce = params.endpoint === "create-message" ? params.nonce ?? createDiscordMessageNonce() : void 0;
+	return {
+		...serializePayload(payload),
+		...params.replyTo ? { message_reference: {
+			message_id: params.replyTo,
+			fail_if_not_exists: false
+		} } : {},
+		...nonce !== void 0 ? { nonce } : {},
+		...nonce ? { enforce_nonce: true } : {}
+	};
+}
+//#endregion
 //#region extensions/discord/src/send.permissions.ts
 const PERMISSION_ENTRIES = Object.entries(PermissionFlagsBits).filter(([, value]) => typeof value === "bigint");
 const ALL_PERMISSIONS = PERMISSION_ENTRIES.reduce((acc, [, value]) => acc | value, 0n);
@@ -220,9 +286,6 @@ function hasAdministrator(bitfield) {
 function hasPermissionBit(bitfield, permission) {
 	return (bitfield & permission) === permission;
 }
-function isThreadChannelType(channelType) {
-	return channelType === ChannelType.GuildNewsThread || channelType === ChannelType.GuildPublicThread || channelType === ChannelType.GuildPrivateThread;
-}
 async function fetchBotUserId(rest) {
 	const me = await getCurrentUser(rest);
 	if (!me?.id) throw new Error("Failed to resolve bot user id");
@@ -277,7 +340,7 @@ function resolveMemberChannelPermissionBits(params) {
 async function resolveChannelPermissionSubject(rest, channel) {
 	const channelType = "type" in channel ? channel.type : void 0;
 	const parentId = "parent_id" in channel ? channel.parent_id : void 0;
-	if (isThreadChannelType(channelType) && parentId) return await getChannel(rest, parentId);
+	if (isDiscordThreadChannelType(channelType) && parentId) return await getChannel(rest, parentId);
 	return channel;
 }
 /**
@@ -312,7 +375,7 @@ async function canViewDiscordGuildChannel(guildId, channelId, userId, opts) {
 			channel: permissionChannel
 		});
 		if (!hasPermissionBit(permissions, PermissionFlagsBits.ViewChannel)) return false;
-		if ("type" in channel && channel.type === ChannelType.GuildPrivateThread) {
+		if ("type" in channel && channel.type === ChannelType.PrivateThread) {
 			if (hasPermissionBit(permissions, PermissionFlagsBits.ManageThreads)) return true;
 			await getThreadMember(rest, channel.id, userId);
 		}
@@ -453,62 +516,6 @@ const DISCORD_MAX_EMOJI_BYTES = 256 * 1024;
 const DISCORD_MAX_STICKER_BYTES = 512 * 1024;
 const DISCORD_MAX_EVENT_COVER_BYTES = 8 * 1024 * 1024;
 //#endregion
-//#region extensions/discord/src/send.message-request.ts
-const SUPPRESS_EMBEDS_FLAG = MessageFlags.SuppressEmbeds;
-const SUPPRESS_NOTIFICATIONS_FLAG = MessageFlags.SuppressNotifications;
-function createDiscordMessageNonce() {
-	return randomBytes(12).toString("hex");
-}
-function resolveDiscordSendComponents(params) {
-	if (!params.components || !params.isFirst) return;
-	return typeof params.components === "function" ? params.components(params.text) : params.components;
-}
-function normalizeDiscordEmbeds(embeds) {
-	if (!embeds?.length) return;
-	return embeds.map((embed) => embed instanceof Embed ? embed : new Embed(embed));
-}
-function resolveDiscordSendEmbeds(params) {
-	if (!params.embeds || !params.isFirst) return;
-	return normalizeDiscordEmbeds(params.embeds);
-}
-function buildDiscordMessagePayload(params) {
-	const payload = {};
-	const hasV2 = hasV2Components(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;
-}
-function resolveDiscordSuppressEmbeds(params) {
-	return params.override ?? params.configured ?? true;
-}
-function buildDiscordMessageRequest(params) {
-	const payload = buildDiscordMessagePayload(params);
-	const nonce = params.endpoint === "create-message" ? params.nonce ?? createDiscordMessageNonce() : void 0;
-	return stripUndefinedFields({
-		...serializePayload(payload),
-		...params.replyTo ? { message_reference: {
-			message_id: params.replyTo,
-			fail_if_not_exists: false
-		} } : {},
-		nonce,
-		enforce_nonce: nonce ? true : void 0
-	});
-}
-function hasV2Components(components) {
-	return Boolean(components?.some((component) => "isV2" in component && component.isV2));
-}
-//#endregion
 //#region extensions/discord/src/send.shared.ts
 const DISCORD_TEXT_LIMIT = 2e3;
 const DISCORD_MAX_STICKERS = 3;
@@ -589,14 +596,14 @@ async function buildDiscordSendError(err, ctx) {
 		probedChannelType = permissions.channelType;
 		const current = new Set(permissions.permissions);
 		const required = ["ViewChannel", "SendMessages"];
-		if (isThreadChannelType(probedChannelType)) required.push("SendMessagesInThreads");
+		if (isDiscordThreadChannelType(probedChannelType)) required.push("SendMessagesInThreads");
 		if (ctx.hasMedia) required.push("AttachFiles");
 		missing = required.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 = ["ViewChannel", "SendMessages"];
-	if (isThreadChannelType(probedChannelType)) probedPermissions.push("SendMessagesInThreads");
+	if (isDiscordThreadChannelType(probedChannelType)) probedPermissions.push("SendMessagesInThreads");
 	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`, {
@@ -638,14 +645,13 @@ function buildDiscordTextChunks(text, opts = {}) {
 }
 async function sendDiscordText(params) {
 	const { rest, channelId, text, request, reply, maxLinesPerMessage, components, embeds, allowedMentions, chunkMode, silent, suppressEmbeds, maxChars, onResult, onPlatformSendDispatch } = params;
-	if (!text.trim()) throw new Error("Message must be non-empty for Discord sends");
 	const chunks = buildDiscordTextChunks(text, {
 		maxLinesPerMessage,
 		chunkMode,
 		maxChars
 	});
+	if (!chunks.length) chunks.push("");
 	const sendChunk = async (chunk, isFirst) => {
-		const chunkReplyTo = resolveDiscordReplyMessageId(reply, isFirst);
 		const chunkComponents = resolveDiscordSendComponents({
 			components,
 			text: chunk,
@@ -655,6 +661,9 @@ async function sendDiscordText(params) {
 			embeds,
 			isFirst
 		});
+		if (!chunk.trim() && !chunkComponents?.length && !chunkEmbeds?.length) throw new Error("Message must be non-empty for Discord sends");
+		const chunkReplyTo = resolveDiscordReplyMessageId(reply, isFirst);
+		const kind = chunkComponents?.length || chunkEmbeds?.length ? "card" : "text";
 		const flags = resolveDiscordMessageFlags({
 			silent,
 			suppressEmbeds: suppressEmbeds && !chunkEmbeds?.length
@@ -668,15 +677,18 @@ async function sendDiscordText(params) {
 			flags,
 			replyTo: chunkReplyTo
 		});
-		await onPlatformSendDispatch?.();
 		return {
-			result: await request(() => createChannelMessage(rest, channelId, { body }), "text", { safety: "nonce-protected-create" }),
-			replyToId: chunkReplyTo
+			result: await request(async () => {
+				await onPlatformSendDispatch?.();
+				return createChannelMessage(rest, channelId, { body });
+			}, "text", { safety: "nonce-protected-create" }),
+			replyToId: chunkReplyTo,
+			kind
 		};
 	};
 	if (chunks.length === 1) {
-		const { result, replyToId } = await sendChunk(expectDefined(chunks.at(0), "single Discord text chunk"), true);
-		await onResult?.(result, "text", replyToId);
+		const { result, replyToId, kind } = await sendChunk(expectDefined(chunks.at(0), "single Discord text chunk"), true);
+		await onResult?.(result, kind, replyToId);
 		return {
 			...result,
 			platformMessageIds: result.id ? [result.id] : []
@@ -687,7 +699,7 @@ async function sendDiscordText(params) {
 	for (const [index, chunk] of chunks.entries()) {
 		const sent = await sendChunk(chunk, index === 0);
 		last = sent.result;
-		await onResult?.(last, "text", sent.replyToId);
+		await onResult?.(last, sent.kind, sent.replyToId);
 		if (last.id) platformMessageIds.push(last.id);
 	}
 	if (!last) throw new Error("Discord send failed (empty chunk result)");
@@ -739,8 +751,10 @@ async function sendDiscordMedia(params) {
 	});
 	let res;
 	try {
-		await onPlatformSendDispatch?.();
-		res = await request(() => createChannelMessage(rest, channelId, { body }), "media", { safety: "nonce-protected-create" });
+		res = await request(async () => {
+			await onPlatformSendDispatch?.();
+			return createChannelMessage(rest, channelId, { body });
+		}, "media", { safety: "nonce-protected-create" });
 	} catch (err) {
 		if (!isDiscordUploadTooLargeError(err)) throw err;
 		return sendDiscordText({
@@ -776,7 +790,8 @@ async function sendDiscordMedia(params) {
 			suppressEmbeds,
 			allowedMentions,
 			maxChars,
-			onResult
+			onResult,
+			onPlatformSendDispatch
 		});
 		for (const id of followup.platformMessageIds) if (id) platformMessageIds.push(id);
 	}
@@ -793,4 +808,4 @@ function formatReactionEmoji(emoji) {
 	return buildReactionIdentifier(emoji);
 }
 //#endregion
-export { hasAllGuildPermissionsDiscord as A, clearGateways as B, DISCORD_MAX_STICKER_BYTES as C, canViewDiscordGuildChannel as D, canManageGuildRoleDiscord as E, createDiscordRestClient as F, resolveDiscordProxyFetchForAccount as G, registerGateway as H, createDiscordRuntimeAccountContext as I, validateDiscordProxyUrl as K, resolveDiscordClientAccountContext as L, hasAnyGuildPermissionDiscord as M, isThreadChannelType as N, fetchChannelPermissionsDiscord as O, createDiscordClient as P, resolveDiscordRest as R, DISCORD_MAX_EVENT_COVER_BYTES as S, canManageGuildMemberRoleDiscord as T, unregisterGateway as U, getGateway as V, parseAndResolveChannelRecipient as W, resolveDiscordMessageFlags as _, normalizeDiscordPollInput as a, resolveDiscordSuppressEmbeds as b, normalizeStickerIds as c, resolveDiscordTargetChannelId as d, sendDiscordMedia as f, createDiscordMessageNonce as g, buildDiscordMessageRequest as h, formatReactionEmoji as i, hasAnyChannelPermissionDiscord as j, fetchMemberGuildPermissionsDiscord as k, resolveChannelId as l, SUPPRESS_NOTIFICATIONS_FLAG as m, buildDiscordTextChunks as n, normalizeEmojiName as o, sendDiscordText as p, withValidatedDiscordProxy as q, buildReactionIdentifier as r, normalizeReactionEmoji as s, buildDiscordSendError as t, resolveDiscordChannel as u, resolveDiscordSendComponents as v, DiscordSendError as w, DISCORD_MAX_EMOJI_BYTES as x, resolveDiscordSendEmbeds as y, DISCORD_REST_TIMEOUT_MS as z };
+export { resolveDiscordSendComponents as A, validateDiscordProxyUrl as B, hasAllGuildPermissionsDiscord as C, buildDiscordMessageRequest as D, SUPPRESS_NOTIFICATIONS_FLAG as E, createDiscordRuntimeAccountContext as F, unregisterGateway as G, clearGateways as H, resolveDiscordClientAccountContext as I, parseAndResolveChannelRecipient as K, resolveDiscordRest as L, resolveDiscordSuppressEmbeds as M, createDiscordClient as N, createDiscordMessageNonce as O, createDiscordRestClient as P, DISCORD_REST_TIMEOUT_MS as R, fetchMemberGuildPermissionsDiscord as S, hasAnyGuildPermissionDiscord as T, getGateway as U, withValidatedDiscordProxy as V, registerGateway as W, DiscordSendError as _, normalizeDiscordPollInput as a, canViewDiscordGuildChannel as b, normalizeStickerIds as c, resolveDiscordTargetChannelId as d, sendDiscordMedia as f, DISCORD_MAX_STICKER_BYTES as g, DISCORD_MAX_EVENT_COVER_BYTES as h, formatReactionEmoji as i, resolveDiscordSendEmbeds as j, resolveDiscordMessageFlags as k, resolveChannelId as l, DISCORD_MAX_EMOJI_BYTES as m, buildDiscordTextChunks as n, normalizeEmojiName as o, sendDiscordText as p, buildReactionIdentifier as r, normalizeReactionEmoji as s, buildDiscordSendError as t, resolveDiscordChannel as u, canManageGuildMemberRoleDiscord as v, hasAnyChannelPermissionDiscord as w, fetchChannelPermissionsDiscord as x, canManageGuildRoleDiscord as y, resolveDiscordProxyFetchForAccount as z };

package/dist/{sender-identity-QtalnCYv.js → sender-identity-BJtfyise.js}

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

package/dist/setup-plugin-api.js

@@ -1,2 +1,2 @@
-import { t as discordSetupPlugin } from "./channel.setup-BFAO-V1P.js";
+import { t as discordSetupPlugin } from "./channel.setup-rPs4dsk_.js";
 export { discordSetupPlugin };

package/dist/{shared-BIXIX6uJ.js → shared-Dii2HTn7.js}

@@ -1,19 +1,39 @@
-import { a as mergeDiscordAccountConfig, c as resolveDiscordAccountAllowFrom, d as resolveDiscordAccountDmPolicy, n as isDiscordAccountEnabledForRuntime, o as resolveDefaultDiscordAccountId, r as listDiscordAccountIds, s as resolveDiscordAccount, u as resolveDiscordAccountDisabledReason } from "./accounts-DJTf1LtA.js";
-import { t as DiscordChannelConfigSchema } from "./config-schema-BgEskFAs.js";
-import { i as getChatChannelMeta, o as resolveConfiguredFromCredentialStatuses } from "./channel-api-CAJ0wMoV.js";
-import { t as inspectDiscordAccount } from "./account-inspect-CqzrH14k.js";
-import { n as normalizeCompatibilityConfig } from "./doctor-contract-DLa-BTiU.js";
-import { n as secretTargetRegistryEntries, t as collectRuntimeConfigAssignments } from "./secret-config-contract-B1akrlyY.js";
+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-CfQ-vSyf.js";
+import { t as inspectDiscordAccount } from "./account-inspect-BDfKyuvL.js";
+import { t as discordIngressIdentity } from "./ingress-identity-CzZKcPK8.js";
+import { t as DiscordChannelConfigSchema } from "./config-schema-CxPqtVI1.js";
+import { n as normalizeCompatibilityConfig } from "./doctor-contract-DsWvKIXF.js";
+import { r as secretTargetRegistryEntries, t as collectRuntimeConfigAssignments } from "./secret-config-contract-B3i6WxV5.js";
 import { n as unsupportedSecretRefSurfacePatterns, t as collectUnsupportedSecretRefConfigCandidates } from "./security-contract-DSHk7I2w.js";
 import { t as deriveLegacySessionChatType } from "./session-contract-BO5tlIdl.js";
 import { describeAccountSnapshot } from "openclaw/plugin-sdk/account-helpers";
-import { normalizeAccountId } from "openclaw/plugin-sdk/account-id";
+import { DEFAULT_ACCOUNT_ID as DEFAULT_ACCOUNT_ID$1, normalizeAccountId } from "openclaw/plugin-sdk/account-id";
 import { adaptScopedAccountAccessor, createScopedChannelConfigAdapter, createScopedDmSecurityResolver } from "openclaw/plugin-sdk/channel-config-helpers";
+import { PAIRING_APPROVED_MESSAGE, buildTokenChannelStatusSummary, projectCredentialSnapshotFields, resolveConfiguredFromCredentialStatuses as resolveConfiguredFromCredentialStatuses$1 } from "openclaw/plugin-sdk/channel-status";
 import { formatAllowFromLowercase } from "openclaw/plugin-sdk/allow-from";
 import { createLazyRuntimeModule } from "openclaw/plugin-sdk/lazy-runtime";
-import { createOpenProviderConfiguredRouteWarningCollector } from "openclaw/plugin-sdk/channel-policy";
+import { createConditionalWarningCollector, createOpenProviderConfiguredRouteWarningCollector } from "openclaw/plugin-sdk/channel-policy";
+import { identityEntryAuthenticationClassifier } from "openclaw/plugin-sdk/channel-ingress-runtime";
 import { defineChannelSetupContract } from "openclaw/plugin-sdk/channel-setup";
 import { createEnvPatchedAccountSetupAdapter } from "openclaw/plugin-sdk/setup-runtime";
+//#region extensions/discord/src/channel-api.ts
+const DISCORD_CHANNEL_META = {
+	id: "discord",
+	label: "Discord",
+	selectionLabel: "Discord (Bot API)",
+	detailLabel: "Discord Bot",
+	docsPath: "/channels/discord",
+	docsLabel: "discord",
+	blurb: "very well supported right now.",
+	systemImage: "bubble.left.and.bubble.right",
+	markdownCapable: true,
+	preferSessionLookupForAnnounceTarget: true
+};
+function getChatChannelMeta(id) {
+	if (id !== DISCORD_CHANNEL_META.id) throw new Error(`Unsupported Discord channel meta lookup: ${id}`);
+	return DISCORD_CHANNEL_META;
+}
+//#endregion
 //#region extensions/discord/src/security.ts
 const resolveDiscordDmPolicy = createScopedDmSecurityResolver({
 	channelKey: "discord",
@@ -30,6 +50,7 @@ const resolveDiscordDmPolicy = createScopedDmSecurityResolver({
 		})
 	}),
 	policyPathSuffix: "dmPolicy",
+	classifyEntryAuthentication: identityEntryAuthenticationClassifier(discordIngressIdentity),
 	normalizeEntry: (raw) => raw.trim().replace(/^(discord|user):/i, "").replace(/^<@!?(\d+)>$/, "$1")
 });
 const collectDiscordSecurityWarnings = createOpenProviderConfiguredRouteWarningCollector({
@@ -48,10 +69,16 @@ const collectDiscordSecurityWarnings = createOpenProviderConfiguredRouteWarningC
 		remediation: "Set channels.discord.groupPolicy=\"allowlist\" and configure channels.discord.guilds.<id>.channels"
 	}
 });
-const loadDiscordSecurityAuditModule = createLazyRuntimeModule(() => import("./security-audit.runtime-CPN0xFYz.js"));
+const collectDiscordSecurityFindings = createConditionalWarningCollector.findings({
+	collectWarnings: collectDiscordSecurityWarnings,
+	checkId: "channels.discord.groups.open",
+	severity: "critical",
+	title: "Discord security warning"
+});
+const loadDiscordSecurityAuditModule = createLazyRuntimeModule(() => import("./security-audit.runtime-sKZyKgpx.js"));
 const discordSecurityAdapter = {
 	resolveDmPolicy: resolveDiscordDmPolicy,
-	collectWarnings: collectDiscordSecurityWarnings,
+	collectWarnings: collectDiscordSecurityFindings,
 	collectAuditFindings: async (params) => (await loadDiscordSecurityAuditModule()).collectDiscordSecurityAuditFindings(params)
 };
 const discordSetupContract = defineChannelSetupContract({
@@ -87,7 +114,7 @@ const DISCORD_LEGACY_CONFIG_RULES = [];
 //#endregion
 //#region extensions/discord/src/shared.ts
 const DISCORD_CHANNEL = "discord";
-const loadDiscordDoctorModule = createLazyRuntimeModule(() => import("./doctor-BzC-TLnB.js"));
+const loadDiscordDoctorModule = createLazyRuntimeModule(() => import("./doctor-zQTtn6hm.js"));
 const discordDoctor = {
 	dmAllowFromMode: "topOnly",
 	groupModel: "route",
@@ -161,10 +188,10 @@ function createDiscordPluginBase(params) {
 			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),
-			isConfigured: (account) => resolveConfiguredFromCredentialStatuses(account) ?? Boolean(account.token?.trim()),
+			isConfigured: (account) => resolveConfiguredFromCredentialStatuses$1(account) ?? Boolean(account.token?.trim()),
 			describeAccount: (account) => describeAccountSnapshot({
 				account,
-				configured: resolveConfiguredFromCredentialStatuses(account) ?? Boolean(account.token?.trim()),
+				configured: resolveConfiguredFromCredentialStatuses$1(account) ?? Boolean(account.token?.trim()),
 				extra: {
 					tokenSource: account.tokenSource,
 					tokenStatus: account.tokenStatus
@@ -182,4 +209,4 @@ function createDiscordPluginBase(params) {
 	};
 }
 //#endregion
-export { discordSecurityAdapter as a, discordSetupContract as i, discordConfigAdapter as n, DISCORD_LEGACY_CONFIG_RULES as r, createDiscordPluginBase as t };
+export { discordSecurityAdapter as a, buildTokenChannelStatusSummary as c, discordSetupContract as i, projectCredentialSnapshotFields as l, discordConfigAdapter as n, DEFAULT_ACCOUNT_ID$1 as o, DISCORD_LEGACY_CONFIG_RULES as r, PAIRING_APPROVED_MESSAGE as s, createDiscordPluginBase as t, resolveConfiguredFromCredentialStatuses$1 as u };

package/dist/subagent-hooks-JyGrtQIl.js

@@ -0,0 +1,49 @@
+import { on as __exportAll } from "./retry-DqHCW6PV.js";
+import { o as unbindThreadBindingsBySessionKey, r as listThreadBindingsBySessionKey } from "./thread-bindings-DvYP79fy.js";
+import { normalizeOptionalLowercaseString, normalizeOptionalStringifiedId } from "openclaw/plugin-sdk/string-coerce-runtime";
+//#region extensions/discord/src/subagent-hooks.ts
+var subagent_hooks_exports = /* @__PURE__ */ __exportAll({
+	handleDiscordSubagentDeliveryTarget: () => handleDiscordSubagentDeliveryTarget,
+	handleDiscordSubagentEnded: () => handleDiscordSubagentEnded
+});
+function normalizeThreadBindingTargetKind(raw) {
+	const normalized = normalizeOptionalLowercaseString(raw);
+	if (normalized === "subagent" || normalized === "acp") return normalized;
+}
+function handleDiscordSubagentEnded(event) {
+	unbindThreadBindingsBySessionKey({
+		targetSessionKey: event.targetSessionKey,
+		accountId: event.accountId,
+		targetKind: normalizeThreadBindingTargetKind(event.targetKind),
+		reason: event.reason,
+		sendFarewell: event.sendFarewell
+	});
+}
+function handleDiscordSubagentDeliveryTarget(event) {
+	if (!event.expectsCompletionMessage) return;
+	if (normalizeOptionalLowercaseString(event.requesterOrigin?.channel) !== "discord") return;
+	const requesterAccountId = event.requesterOrigin?.accountId?.trim();
+	const requesterThreadId = event.requesterOrigin?.threadId != null && event.requesterOrigin.threadId !== "" ? normalizeOptionalStringifiedId(event.requesterOrigin.threadId) ?? "" : "";
+	const bindings = listThreadBindingsBySessionKey({
+		targetSessionKey: event.childSessionKey,
+		...requesterAccountId ? { accountId: requesterAccountId } : {},
+		targetKind: "subagent"
+	});
+	if (bindings.length === 0) return;
+	let binding;
+	if (requesterThreadId) binding = bindings.find((entry) => {
+		if (entry.threadId !== requesterThreadId) return false;
+		if (requesterAccountId && entry.accountId !== requesterAccountId) return false;
+		return true;
+	});
+	if (!binding && bindings.length === 1) binding = bindings[0];
+	if (!binding) return;
+	return { origin: {
+		channel: "discord",
+		accountId: binding.accountId,
+		to: `channel:${binding.threadId}`,
+		threadId: binding.threadId
+	} };
+}
+//#endregion
+export { handleDiscordSubagentEnded as n, subagent_hooks_exports as r, handleDiscordSubagentDeliveryTarget as t };

package/dist/subagent-hooks-api.js

@@ -1,12 +1,7 @@
 import { createLazyRuntimeModule } from "openclaw/plugin-sdk/lazy-runtime";
 //#region extensions/discord/subagent-hooks-api.ts
-const loadDiscordSubagentHooksModule = createLazyRuntimeModule(() => import("./subagent-hooks-CTt5KCJr.js").then((n) => n.i));
-const loadDiscordSubagentProgressModule = createLazyRuntimeModule(() => import("./subagent-progress-DhaE_h8a.js"));
+const loadDiscordSubagentHooksModule = createLazyRuntimeModule(() => import("./subagent-hooks-JyGrtQIl.js").then((n) => n.r));
 function registerDiscordSubagentHooks(api) {
-	api.on("gateway_start", async () => {
-		const { recoverDiscordSubagentProgress } = await loadDiscordSubagentProgressModule();
-		await recoverDiscordSubagentProgress(api);
-	});
 	api.on("subagent_ended", async (event) => {
 		const { handleDiscordSubagentEnded } = await loadDiscordSubagentHooksModule();
 		handleDiscordSubagentEnded(event);

package/dist/{system-events-CTqDf6_s.js → system-events-BEmcj4xJ.js}

@@ -1,5 +1,5 @@
-import { h as discord_exports } from "./retry-CLpJcXXf.js";
-import { x as formatDiscordUserTag } from "./allow-list-DnxIlPP2.js";
+import { y as discord_exports } from "./retry-DqHCW6PV.js";
+import { x as formatDiscordUserTag } from "./allow-list-BDMimASD.js";
 //#region extensions/discord/src/monitor/system-events.ts
 function resolveDiscordSystemEvent(message, location) {
 	switch (message.type) {

package/dist/{target-resolver-maOKSqO0.js → target-resolver-V-IYae6s.js}

@@ -1,6 +1,6 @@
-import { l as allowFromContainsDiscordUserId, p as parseDiscordTarget, tn as __exportAll } from "./retry-CLpJcXXf.js";
-import { c as resolveDiscordAccountAllowFrom, s as resolveDiscordAccount } from "./accounts-DJTf1LtA.js";
-import { a as rememberDiscordDirectoryUser, r as listDiscordDirectoryPeersLive } from "./directory-live-DGIGxpIo.js";
+import { _ as parseDiscordTarget, on as __exportAll, p as allowFromContainsDiscordUserId } from "./retry-DqHCW6PV.js";
+import { c as resolveDiscordAccount, l as resolveDiscordAccountAllowFrom } from "./accounts-CfQ-vSyf.js";
+import { a as rememberDiscordDirectoryUser, r as listDiscordDirectoryPeersLive } from "./directory-live-DuAXKkan.js";
 import { buildMessagingTarget } from "openclaw/plugin-sdk/channel-targets";
 //#region extensions/discord/src/send-target-parsing.ts
 const parseDiscordSendTarget = (raw, options = {}) => parseDiscordTarget(raw, options);

package/dist/targets-CQp53cGj.js

@@ -0,0 +1,3 @@
+import "./retry-DqHCW6PV.js";
+import "./target-resolver-V-IYae6s.js";
+export {};