@openclaw/discord 2026.8.1-beta.3 → 2026.8.1

package/dist/{send.outbound-HIkgji_7.js → send.outbound-D7JYmfm9.js}

@@ -1,8 +1,6 @@
-import { o as createReusableDiscordReplyReference, vt as createChannelMessage, yt as createThread } from "./retry-DNsVTeTo.js";
-import { c as resolveDiscordAccount } from "./accounts-DNl-oCEw.js";
-import { i as normalizeDiscordHandleKey, o as resolveDiscordDirectoryUserId } from "./directory-live-Df0NbFJB.js";
-import { A as resolveDiscordMessageFlags, M as resolveDiscordSendEmbeds, N as resolveDiscordSuppressEmbeds, O as buildDiscordMessageRequest, P as createDiscordClient, a as normalizeDiscordPollInput, c as normalizeStickerIds, f as sendDiscordMedia, j as resolveDiscordSendComponents, k as createDiscordMessageNonce, l as resolveChannelId, n as buildDiscordTextChunks, p as sendDiscordText, q as parseAndResolveChannelRecipient, t as buildDiscordSendError, u as resolveDiscordChannel } from "./send.shared-B3fpaLWJ.js";
-import { n as createDiscordSendReceiptFromResults, r as createDiscordSendResult } from "./send.receipt-Cnhoautb.js";
+import { Tt as createThread, c as createDiscordSendResult, s as createDiscordSendReceiptFromResults, u as createReusableDiscordReplyReference, wt as createChannelMessage } from "./retry-DqHCW6PV.js";
+import { i as normalizeDiscordHandleKey, o as resolveDiscordDirectoryUserId } from "./directory-live-DuAXKkan.js";
+import { A as resolveDiscordSendComponents, D as buildDiscordMessageRequest, K as parseAndResolveChannelRecipient, M as resolveDiscordSuppressEmbeds, N as createDiscordClient, O as createDiscordMessageNonce, a as normalizeDiscordPollInput, c as normalizeStickerIds, f as sendDiscordMedia, j as resolveDiscordSendEmbeds, k as resolveDiscordMessageFlags, l as resolveChannelId, n as buildDiscordTextChunks, p as sendDiscordText, t as buildDiscordSendError, u as resolveDiscordChannel } from "./send.shared-DZJ1akvQ.js";
 import { ChannelType } from "discord-api-types/v10";
 import { expectDefined } from "openclaw/plugin-sdk/expect-runtime";
 import { normalizeLowercaseStringOrEmpty, normalizeOptionalString, normalizeOptionalStringifiedId } from "openclaw/plugin-sdk/string-coerce-runtime";
@@ -377,23 +375,14 @@ function findFenceEnd(text, startIndex, runLength) {
 	return text.length;
 }
 function findNextMarkdownCodeSegment(text, startIndex) {
-	let searchIndex = startIndex;
-	while (searchIndex < text.length) {
-		const segmentStart = text.indexOf("`", searchIndex);
-		if (segmentStart === -1) return null;
-		const runLength = countBacktickRun(text, segmentStart);
-		const inlineEndIndex = findSameLineBacktickRun(text, segmentStart + runLength, runLength);
-		if (inlineEndIndex !== null) return {
-			startIndex: segmentStart,
-			endIndex: inlineEndIndex
-		};
-		if (runLength >= 3) return {
-			startIndex: segmentStart,
-			endIndex: findFenceEnd(text, segmentStart, runLength)
-		};
-		searchIndex = segmentStart + runLength;
-	}
-	return null;
+	const segmentOffset = text.slice(startIndex).search(/(?<=(?:^|[^\\])(?:\\\\)*)`/);
+	if (segmentOffset === -1) return null;
+	const segmentStart = startIndex + segmentOffset;
+	const runLength = countBacktickRun(text, segmentStart);
+	return {
+		startIndex: segmentStart,
+		endIndex: findSameLineBacktickRun(text, segmentStart + runLength, runLength) ?? (runLength >= 3 ? findFenceEnd(text, segmentStart, runLength) : text.length)
+	};
 }
 function rewriteDiscordKnownMentions(text, params) {
 	if (!text.includes("@")) return text;
@@ -456,22 +445,23 @@ function toDiscordSendResult(result, fallbackChannelId, params = {}) {
 }
 async function resolveDiscordSendTarget(to, opts) {
 	const cfg = requireRuntimeConfig(opts.cfg, "Discord send target resolution");
-	const { rest, request } = createDiscordClient({
+	const { rest, request, account } = createDiscordClient({
 		...opts,
 		cfg
 	});
-	const { channelId } = await resolveChannelId(rest, await parseAndResolveChannelRecipient(to, cfg, opts.accountId), request);
+	const { channelId } = await resolveChannelId(rest, await parseAndResolveChannelRecipient(to, cfg, account.accountId), request);
 	return {
 		rest,
 		request,
-		channelId
+		channelId,
+		account
 	};
 }
 async function sendMessageDiscord(to, text, opts) {
 	const cfg = requireRuntimeConfig(opts.cfg, "Discord send");
-	const accountInfo = resolveDiscordAccount({
-		cfg,
-		accountId: opts.accountId
+	const { token, rest, request, account: accountInfo } = createDiscordClient({
+		...opts,
+		cfg
 	});
 	const tableMode = resolveMarkdownTableMode({
 		cfg,
@@ -492,12 +482,19 @@ async function sendMessageDiscord(to, text, opts) {
 		accountId: accountInfo.accountId,
 		mentionAliases: accountInfo.config.mentionAliases
 	});
-	const { token, rest, request } = createDiscordClient({
-		...opts,
-		cfg
-	});
-	const { channelId } = await resolveChannelId(rest, await parseAndResolveChannelRecipient(to, cfg, opts.accountId), request);
+	const { channelId } = await resolveChannelId(rest, await parseAndResolveChannelRecipient(to, cfg, accountInfo.accountId), request);
 	const channel = await resolveDiscordChannel(rest, channelId);
+	const deliveredResults = [];
+	let deliveryThreadId;
+	const reportResult = async (progressResult, kind, replyToId) => {
+		const deliveredResult = toDiscordSendResult(progressResult, deliveryThreadId ?? channelId, {
+			kind,
+			threadId: deliveryThreadId,
+			reply: createReusableDiscordReplyReference(replyToId)
+		});
+		deliveredResults.push(deliveredResult);
+		await opts.onDeliveryResult?.(deliveredResult);
+	};
 	if (isForumLikeChannel(channel)) {
 		if (((channel.flags ?? 0) & DISCORD_FORUM_REQUIRE_TAG_FLAG) !== 0) throw new Error(`Discord forum channel ${channelId} requires an applied tag; use thread-create with appliedTags, then send to the created thread.`);
 		const threadName = deriveForumThreadName(renderedText);
@@ -529,12 +526,14 @@ async function sendMessageDiscord(to, text, opts) {
 		});
 		let threadRes;
 		try {
-			await opts.onPlatformSendDispatch?.();
-			threadRes = await request(() => createThread(rest, channelId, { body: {
-				name: threadName,
-				...channel.default_auto_archive_duration === void 0 ? {} : { auto_archive_duration: channel.default_auto_archive_duration },
-				message: starterBody
-			} }), "forum-thread", { safety: "non-idempotent-create" });
+			threadRes = await request(async () => {
+				await opts.onPlatformSendDispatch?.();
+				return createThread(rest, channelId, { body: {
+					name: threadName,
+					...channel.default_auto_archive_duration === void 0 ? {} : { auto_archive_duration: channel.default_auto_archive_duration },
+					message: starterBody
+				} });
+			}, "forum-thread", { safety: "non-idempotent-create" });
 		} catch (err) {
 			throw await buildDiscordSendError(err, {
 				channelId,
@@ -545,6 +544,7 @@ async function sendMessageDiscord(to, text, opts) {
 			});
 		}
 		const threadId = threadRes.id;
+		deliveryThreadId = threadId;
 		const messageId = threadRes.message?.id ?? threadId;
 		const resultChannelId = threadRes.message?.channel_id ?? threadId;
 		const remainingChunks = chunks.slice(1);
@@ -555,16 +555,8 @@ async function sendMessageDiscord(to, text, opts) {
 			kind: "text",
 			threadId
 		});
-		const deliveredResults = [starterResult];
+		deliveredResults.push(starterResult);
 		await opts.onDeliveryResult?.(starterResult);
-		const reportThreadResult = async (result, kind) => {
-			const deliveredResult = toDiscordSendResult(result, threadId, {
-				kind,
-				threadId
-			});
-			deliveredResults.push(deliveredResult);
-			await opts.onDeliveryResult?.(deliveredResult);
-		};
 		try {
 			if (opts.mediaUrl) {
 				const [mediaCaption, ...afterMediaChunks] = remainingChunks;
@@ -585,7 +577,7 @@ async function sendMessageDiscord(to, text, opts) {
 					suppressEmbeds,
 					allowedMentions: opts.allowedMentions,
 					maxChars: textLimit,
-					onResult: reportThreadResult,
+					onResult: reportResult,
 					onPlatformSendDispatch: opts.onPlatformSendDispatch
 				});
 				await sendDiscordThreadTextChunks({
@@ -599,7 +591,7 @@ async function sendMessageDiscord(to, text, opts) {
 					silent: opts.silent,
 					suppressEmbeds,
 					allowedMentions: opts.allowedMentions,
-					onResult: reportThreadResult,
+					onResult: reportResult,
 					onPlatformSendDispatch: opts.onPlatformSendDispatch
 				});
 			} else await sendDiscordThreadTextChunks({
@@ -613,7 +605,7 @@ async function sendMessageDiscord(to, text, opts) {
 				silent: opts.silent,
 				suppressEmbeds,
 				allowedMentions: opts.allowedMentions,
-				onResult: reportThreadResult,
+				onResult: reportResult,
 				onPlatformSendDispatch: opts.onPlatformSendDispatch
 			});
 		} catch (err) {
@@ -639,12 +631,6 @@ async function sendMessageDiscord(to, text, opts) {
 		};
 	}
 	let result;
-	const reportResult = async (progressResult, kind, replyToId) => {
-		await opts.onDeliveryResult?.(toDiscordSendResult(progressResult, channelId, {
-			kind,
-			reply: createReusableDiscordReplyReference(replyToId)
-		}));
-	};
 	try {
 		if (opts.mediaUrl) result = await sendDiscordMedia({
 			rest,
@@ -700,16 +686,20 @@ async function sendMessageDiscord(to, text, opts) {
 		accountId: accountInfo.accountId,
 		direction: "outbound"
 	});
-	return toDiscordSendResult(result, channelId, {
-		kind: opts.mediaUrl ? "media" : opts.components || opts.embeds ? "card" : "text",
-		reply: opts.reply
-	});
+	return {
+		messageId: result.id || "unknown",
+		channelId: result.channel_id ?? channelId,
+		receipt: createDiscordSendReceiptFromResults({ results: deliveredResults })
+	};
 }
 async function sendStickerDiscord(to, stickerIds, opts) {
 	const context = await resolveDiscordStructuredSendContext(to, opts);
 	const { rewrittenContent, suppressEmbeds } = context;
 	const stickers = normalizeStickerIds(stickerIds);
-	const flags = resolveDiscordMessageFlags({ suppressEmbeds });
+	const flags = resolveDiscordMessageFlags({
+		silent: opts.silent,
+		suppressEmbeds
+	});
 	const body = {
 		content: rewrittenContent || void 0,
 		sticker_ids: stickers,
@@ -738,16 +728,15 @@ async function sendPollDiscord(to, poll, opts) {
 	return context.send("poll", body);
 }
 async function resolveDiscordStructuredSendContext(to, opts) {
-	const accountInfo = resolveDiscordAccount({
-		cfg: requireRuntimeConfig(opts.cfg, "Discord structured send"),
-		accountId: opts.accountId
-	});
-	const { rest, request, channelId } = await resolveDiscordSendTarget(to, opts);
+	requireRuntimeConfig(opts.cfg, "Discord structured send");
+	const { rest, request, channelId, account: accountInfo } = await resolveDiscordSendTarget(to, opts);
 	const content = opts.content?.trim();
 	return {
 		send: async (kind, body) => {
-			await opts.onPlatformSendDispatch?.();
-			const result = await request(() => createChannelMessage(rest, channelId, { body }), kind, { safety: "nonce-protected-create" });
+			const result = await request(async () => {
+				await opts.onPlatformSendDispatch?.();
+				return createChannelMessage(rest, channelId, { body });
+			}, kind, { safety: "nonce-protected-create" });
 			recordChannelActivity({
 				channel: "discord",
 				accountId: accountInfo.accountId,

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

@@ -1,17 +1,18 @@
-import { B as hasDiscordV2Components, Et as getThreadMember, H as Embed, Ht as getGuildMember, O as RequestClient, V as serializePayload, Vt as getGuild, a as chunkDiscordTextWithMode, mt as getCurrentUser, n as createDiscordRetryRunner, pt as createUserDmChannel, s as resolveDiscordReplyMessageId, vt as createChannelMessage, wt as getChannel } from "./retry-DNsVTeTo.js";
-import { c as resolveDiscordAccount, m as normalizeDiscordToken, o as mergeDiscordAccountConfig } from "./accounts-DNl-oCEw.js";
-import { t as parseAndResolveDiscordTarget } from "./target-resolver-DIXShHaZ.js";
+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 { 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/recipient-resolution.ts
 async function parseAndResolveRecipient(raw, cfg, accountId, parseOptions = {}) {
@@ -30,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
@@ -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,10 +201,11 @@ 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) {
@@ -273,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");
@@ -330,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;
 }
 /**
@@ -365,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);
 		}
@@ -586,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`, {
@@ -667,9 +677,11 @@ async function sendDiscordText(params) {
 			flags,
 			replyTo: chunkReplyTo
 		});
-		await onPlatformSendDispatch?.();
 		return {
-			result: await request(() => createChannelMessage(rest, channelId, { body }), "text", { safety: "nonce-protected-create" }),
+			result: await request(async () => {
+				await onPlatformSendDispatch?.();
+				return createChannelMessage(rest, channelId, { body });
+			}, "text", { safety: "nonce-protected-create" }),
 			replyToId: chunkReplyTo,
 			kind
 		};
@@ -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 { resolveDiscordMessageFlags as A, resolveDiscordProxyFetchForAccount as B, hasAllGuildPermissionsDiscord as C, SUPPRESS_NOTIFICATIONS_FLAG as D, isThreadChannelType as E, createDiscordRestClient as F, registerGateway as G, withValidatedDiscordProxy as H, createDiscordRuntimeAccountContext as I, unregisterGateway as K, resolveDiscordClientAccountContext as L, resolveDiscordSendEmbeds as M, resolveDiscordSuppressEmbeds as N, buildDiscordMessageRequest as O, createDiscordClient as P, resolveDiscordRest as R, fetchMemberGuildPermissionsDiscord as S, hasAnyGuildPermissionDiscord as T, clearGateways as U, validateDiscordProxyUrl as V, getGateway 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, resolveDiscordSendComponents as j, createDiscordMessageNonce as k, resolveChannelId as l, DISCORD_MAX_EMOJI_BYTES as m, buildDiscordTextChunks as n, normalizeEmojiName as o, sendDiscordText as p, parseAndResolveChannelRecipient as q, buildReactionIdentifier as r, normalizeReactionEmoji as s, buildDiscordSendError as t, resolveDiscordChannel as u, canManageGuildMemberRoleDiscord as v, hasAnyChannelPermissionDiscord as w, fetchChannelPermissionsDiscord as x, canManageGuildRoleDiscord 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/setup-plugin-api.js

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

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

@@ -1,18 +1,39 @@
-import { t as DiscordChannelConfigSchema } from "./config-schema-DC5kDtQ5.js";
-import { I as resolveConfiguredFromCredentialStatuses, P as getChatChannelMeta, 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-DNl-oCEw.js";
-import { t as inspectDiscordAccount } from "./account-inspect-D5xmUpnj.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 { 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",
@@ -29,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({
@@ -53,7 +75,7 @@ const collectDiscordSecurityFindings = createConditionalWarningCollector.finding
 	severity: "critical",
 	title: "Discord security warning"
 });
-const loadDiscordSecurityAuditModule = createLazyRuntimeModule(() => import("./security-audit.runtime-BVKF9VtY.js"));
+const loadDiscordSecurityAuditModule = createLazyRuntimeModule(() => import("./security-audit.runtime-sKZyKgpx.js"));
 const discordSecurityAdapter = {
 	resolveDmPolicy: resolveDiscordDmPolicy,
 	collectWarnings: collectDiscordSecurityFindings,
@@ -92,7 +114,7 @@ const DISCORD_LEGACY_CONFIG_RULES = [];
 //#endregion
 //#region extensions/discord/src/shared.ts
 const DISCORD_CHANNEL = "discord";
-const loadDiscordDoctorModule = createLazyRuntimeModule(() => import("./doctor-DYY31GrO.js"));
+const loadDiscordDoctorModule = createLazyRuntimeModule(() => import("./doctor-zQTtn6hm.js"));
 const discordDoctor = {
 	dmAllowFromMode: "topOnly",
 	groupModel: "route",
@@ -166,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
@@ -187,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-CNT2ZJTJ.js → subagent-hooks-JyGrtQIl.js}

@@ -1,5 +1,5 @@
-import { en as __exportAll } from "./retry-DNsVTeTo.js";
-import { o as unbindThreadBindingsBySessionKey, r as listThreadBindingsBySessionKey } from "./thread-bindings-VlymUnbz.js";
+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({

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-CNT2ZJTJ.js").then((n) => n.r));
-const loadDiscordSubagentProgressModule = createLazyRuntimeModule(() => import("./subagent-progress-FPLqBY1s.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-Nuwoq_au.js → system-events-BEmcj4xJ.js}

@@ -1,4 +1,4 @@
-import { p as discord_exports } from "./retry-DNsVTeTo.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) {

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

@@ -1,6 +1,6 @@
-import { en as __exportAll, l as allowFromContainsDiscordUserId } from "./retry-DNsVTeTo.js";
-import { c as resolveDiscordAccount, k as parseDiscordTarget, l as resolveDiscordAccountAllowFrom } from "./accounts-DNl-oCEw.js";
-import { a as rememberDiscordDirectoryUser, r as listDiscordDirectoryPeersLive } from "./directory-live-Df0NbFJB.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 {};

package/dist/{thread-bindings-VlymUnbz.js → thread-bindings-DvYP79fy.js}

@@ -1,9 +1,8 @@
-import { en as __exportAll } from "./retry-DNsVTeTo.js";
-import { k as parseDiscordTarget } from "./accounts-DNl-oCEw.js";
-import "./targets-B2pf49zc.js";
+import { _ as parseDiscordTarget, on as __exportAll } from "./retry-DqHCW6PV.js";
+import "./targets-CQp53cGj.js";
 import { C as resolveThreadBindingMaxAgeExpiresAt, O as shouldPersistBindingMutations, S as resolveThreadBindingInactivityExpiresAt, T as saveBindingsToDisk, h as refreshUnboundThreadWebhookIdentity, m as normalizeThreadId, n as MANAGERS_BY_ACCOUNT_ID, t as BINDINGS_BY_THREAD_ID, u as getThreadBindingToken, v as removeBindingRecord, w as resolveThreadBindingMaxAgeMs$1, x as resolveThreadBindingIdleTimeoutMs$1 } from "./thread-bindings.state-D8OMdk4O.js";
 import { n as setThreadBindingMaxAgeBySessionKey, r as resolveBindingIdsForTargetSession, t as setThreadBindingIdleTimeoutBySessionKey } from "./thread-bindings.session-updates-CJb-BpPL.js";
-import { _ as resolveThreadBindingThreadName, g as resolveThreadBindingIntroText, h as formatThreadBindingDurationLabel, m as resolveThreadBindingPersonaFromRecord, n as createThreadBindingManager, o as resolveChannelIdForBinding, p as resolveThreadBindingPersona, r as getThreadBindingManager, t as createNoopThreadBindingManager } from "./thread-bindings.manager-CngsgErq.js";
+import { _ as resolveThreadBindingThreadName, g as resolveThreadBindingIntroText, h as formatThreadBindingDurationLabel, m as resolveThreadBindingPersonaFromRecord, n as createThreadBindingManager, o as resolveChannelIdForBinding, p as resolveThreadBindingPersona, r as getThreadBindingManager, t as createNoopThreadBindingManager } from "./thread-bindings.manager-Clm77DBM.js";
 import { normalizeAccountId } from "openclaw/plugin-sdk/routing";
 import { normalizeOptionalLowercaseString, normalizeOptionalString, uniqueStrings } from "openclaw/plugin-sdk/string-coerce-runtime";
 import { resolveThreadBindingIdleTimeoutMs, resolveThreadBindingMaxAgeMs, resolveThreadBindingsEnabled } from "openclaw/plugin-sdk/conversation-runtime";

package/dist/{thread-bindings.manager-CngsgErq.js → thread-bindings.manager-Clm77DBM.js}

@@ -1,10 +1,9 @@
-import { en as __exportAll, ft as createChannelWebhook, wt as getChannel } from "./retry-DNsVTeTo.js";
-import { A as resolveDiscordChannelId } from "./accounts-DNl-oCEw.js";
-import { F as createDiscordRestClient } from "./send.shared-B3fpaLWJ.js";
-import { t as sendMessageDiscord } from "./send.outbound-HIkgji_7.js";
-import { i as sendWebhookMessageDiscord, o as createThreadDiscord } from "./send-rQIffSYu.js";
+import { At as getChannel, on as __exportAll, v as resolveDiscordChannelId, vt as createChannelWebhook } from "./retry-DqHCW6PV.js";
+import { P as createDiscordRestClient } from "./send.shared-DZJ1akvQ.js";
+import { t as sendMessageDiscord } from "./send.outbound-D7JYmfm9.js";
+import { t as isDiscordThreadChannelType } from "./channel-type-CVLZyGYS.js";
+import { c as sendWebhookMessageDiscord, u as createThreadDiscord } from "./send-UJHiAm4C.js";
 import { A as toReusableWebhookKey, C as resolveThreadBindingMaxAgeExpiresAt, D as shouldDefaultPersist, E as setBindingRecord, S as resolveThreadBindingInactivityExpiresAt, T as saveBindingsToDisk, _ as rememberThreadBindingToken, b as resolveBindingRecordKey, c as ensureBindingsLoaded, f as normalizeTargetKind, g as rememberReusableWebhook, h as refreshUnboundThreadWebhookIdentity, i as REUSABLE_WEBHOOKS_BY_ACCOUNT_CHANNEL, l as forgetThreadBindingToken, m as normalizeThreadId, n as MANAGERS_BY_ACCOUNT_ID, p as normalizeThreadBindingDurationMs, r as PERSIST_BY_ACCOUNT_ID, s as THREAD_BINDING_TOUCH_PERSIST_MIN_INTERVAL_MS, t as BINDINGS_BY_THREAD_ID, u as getThreadBindingToken, v as removeBindingRecord, w as resolveThreadBindingMaxAgeMs$1, x as resolveThreadBindingIdleTimeoutMs$1, y as resolveBindingIdsForSession } from "./thread-bindings.state-D8OMdk4O.js";
-import { ChannelType } from "discord-api-types/v10";
 import { parseStrictNonNegativeInteger } from "openclaw/plugin-sdk/number-runtime";
 import { normalizeAccountId } from "openclaw/plugin-sdk/routing";
 import { normalizeOptionalString } from "openclaw/plugin-sdk/string-coerce-runtime";
@@ -13,7 +12,7 @@ import { logVerbose } from "openclaw/plugin-sdk/runtime-env";
 import { truncateUtf16Safe } from "openclaw/plugin-sdk/text-utility-runtime";
 import { SYSTEM_MARK } from "openclaw/plugin-sdk/text-chunking";
 import { formatThreadBindingDurationLabel, registerSessionBindingAdapter, resolveThreadBindingConversationIdFromBindingId, resolveThreadBindingFarewellText, resolveThreadBindingIntroText, resolveThreadBindingThreadName, unregisterSessionBindingAdapter } from "openclaw/plugin-sdk/conversation-runtime";
-import { resolveSessionAgentId } from "openclaw/plugin-sdk/agent-scope-runtime";
+import { resolveSessionAgentIdStrict } from "openclaw/plugin-sdk/agent-scope-runtime";
 //#region extensions/discord/src/monitor/thread-bindings.persona.ts
 const THREAD_BINDING_PERSONA_MAX_CHARS = 80;
 function normalizePersonaLabel(value) {
@@ -107,9 +106,6 @@ function isThreadArchived(raw) {
 	if (asRecord.threadMetadata?.archived === true) return true;
 	return false;
 }
-function isThreadChannelType(type) {
-	return type === ChannelType.PublicThread || type === ChannelType.PrivateThread || type === ChannelType.AnnouncementThread;
-}
 function normalizeDiscordBindingChannelId(raw) {
 	const trimmed = normalizeOptionalString(raw) ?? "";
 	if (!trimmed) return null;
@@ -227,7 +223,7 @@ async function resolveChannelIdForBinding(params) {
 		const channelId = normalizeOptionalString(resolveDiscordChannelIdSafe(channel)) ?? "";
 		const type = channelInfo.type;
 		const parentId = normalizeOptionalString(channelInfo.parentId) ?? "";
-		if (parentId && isThreadChannelType(type)) return parentId;
+		if (parentId && isDiscordThreadChannelType(type)) return parentId;
 		return channelId || null;
 	} catch (err) {
 		logVerbose(`discord thread binding channel resolve failed for ${lookupThreadId}: ${summarizeDiscordError(err)}`);
@@ -635,7 +631,7 @@ function createThreadBindingManager(params) {
 				threadId,
 				targetKind,
 				targetSessionKey,
-				agentId: normalizeOptionalString(bindParams.agentId) ?? normalizeOptionalString(existingValue?.agentId) ?? resolveSessionAgentId({
+				agentId: normalizeOptionalString(bindParams.agentId) ?? normalizeOptionalString(existingValue?.agentId) ?? resolveSessionAgentIdStrict({
 					config: cfg,
 					sessionKey: targetSessionKey
 				}),