@openclaw/discord 2026.9.8 → 2026.10.1-beta.2

package/dist/.setup/{send.outbound-BISKnb-a.mjs → send.outbound-B4QHSEzm.mjs}

@@ -1,14 +1,14 @@
-import { C as withDiscordRequestAuthority, ct as createChannelMessage, lt as createThread } from "./discord-0xJYfdDD.mjs";
-import { i as normalizeDiscordHandleKey, o as resolveDiscordDirectoryUserId } from "./directory-live-DtKRHuGV.mjs";
-import { f as createReusableDiscordReplyReference, l as createDiscordSendReceiptFromResults, u as createDiscordSendResult } from "./retry-pz_cSha2.mjs";
-import { A as resolveDiscordSendEmbeds, D as createDiscordMessageNonce, E as buildDiscordMessageRequest, G as parseAndResolveChannelRecipient, M as createDiscordClient, O as resolveDiscordMessageFlags, c as resolveChannelId, d as sendDiscordMedia, f as sendDiscordText, i as normalizeDiscordPollInput, j as resolveDiscordSuppressEmbeds, k as resolveDiscordSendComponents, l as resolveDiscordChannel, n as buildDiscordTextChunks, s as normalizeStickerIds, t as buildDiscordSendError } from "./send.shared-DGFkbkQR.mjs";
-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";
+import { C as withDiscordRequestAuthority, ct as createThread } from "./discord-J7aRzq2Q.mjs";
+import { a as normalizeDiscordSnowflake, i as normalizeDiscordHandleKey, s as resolveDiscordDirectoryUserId } from "./directory-live-C9xz7IPm.mjs";
+import { f as createReusableDiscordReplyReference, l as createDiscordSendReceiptFromResults, u as createDiscordSendResult } from "./retry-BKzO25k4.mjs";
+import { A as resolveDiscordSendEmbeds, D as createDiscordMessageNonce, E as buildDiscordMessageRequest, G as parseAndResolveChannelRecipient, M as createDiscordClient, O as resolveDiscordMessageFlags, c as resolveChannelId, d as sendDiscordMedia, f as sendDiscordText, i as normalizeDiscordPollInput, j as resolveDiscordSuppressEmbeds, k as resolveDiscordSendComponents, l as resolveDiscordChannel, n as buildDiscordTextChunks, s as normalizeStickerIds, t as buildDiscordSendError } from "./send.shared-BQIUh6Vn.mjs";
+import { normalizeLowercaseStringOrEmpty, normalizeOptionalString } from "openclaw/plugin-sdk/string-coerce-runtime";
+import { ChannelType, Routes } from "discord-api-types/v10";
 import { recordChannelActivity } from "openclaw/plugin-sdk/channel-activity-runtime";
 import { requireRuntimeConfig } from "openclaw/plugin-sdk/plugin-config-runtime";
 import { truncateUtf16Safe } from "openclaw/plugin-sdk/text-utility-runtime";
 import { resolveChunkMode } from "openclaw/plugin-sdk/reply-chunking";
+import { expectDefined } from "openclaw/plugin-sdk/expect-runtime";
 import { resolveMarkdownTableMode } from "openclaw/plugin-sdk/markdown-table-runtime";
 import { fromMarkdown } from "mdast-util-from-markdown";
 import { convertMarkdownTables } from "openclaw/plugin-sdk/text-chunking";
@@ -17,15 +17,10 @@ const MENTION_CANDIDATE_PATTERN = /(^|[\s([{"'.,;:!?])@([a-z0-9_.-]{2,32}(?:#[0-
 const DISCORD_RESERVED_MENTIONS = /* @__PURE__ */ new Set(["everyone", "here"]);
 const DISCORD_DISCRIMINATOR_SUFFIX = /#\d{4}$/;
 const DISCORD_BROADCAST_MENTION_PATTERN = /@(everyone|here)\b/;
-function normalizeSnowflake(value) {
-	const text = normalizeOptionalStringifiedId(value) ?? "";
-	if (!/^\d+$/.test(text)) return null;
-	return text;
-}
 function formatMention(params) {
-	const userId = params.userId == null ? null : normalizeSnowflake(params.userId);
-	const roleId = params.roleId == null ? null : normalizeSnowflake(params.roleId);
-	const channelId = params.channelId == null ? null : normalizeSnowflake(params.channelId);
+	const userId = params.userId == null ? null : normalizeDiscordSnowflake(params.userId);
+	const roleId = params.roleId == null ? null : normalizeDiscordSnowflake(params.roleId);
+	const channelId = params.channelId == null ? null : normalizeDiscordSnowflake(params.channelId);
 	const mentions = [
 		userId ? `<@${userId}>` : null,
 		roleId ? `<@&${roleId}>` : null,
@@ -43,7 +38,7 @@ function resolveConfiguredMentionAlias(handle, mentionAliases) {
 		if (!alias) continue;
 		const aliasWithoutDiscriminator = alias.replace(DISCORD_DISCRIMINATOR_SUFFIX, "");
 		if (alias === key || withoutDiscriminator && withoutDiscriminator !== key && alias === withoutDiscriminator || aliasWithoutDiscriminator && aliasWithoutDiscriminator !== alias && aliasWithoutDiscriminator === key) {
-			const userId = normalizeSnowflake(rawUserId);
+			const userId = normalizeDiscordSnowflake(rawUserId);
 			if (userId) return userId;
 		}
 	}
@@ -392,21 +387,6 @@ function deriveForumThreadName(text) {
 function isForumLikeChannel(channel) {
 	return channel?.type === ChannelType.GuildForum || channel?.type === ChannelType.GuildMedia;
 }
-async function resolveDiscordSendTarget(to, opts) {
-	const cfg = requireRuntimeConfig(opts.cfg, "Discord send target resolution");
-	const { rest, request, account } = createDiscordClient({
-		...opts,
-		cfg
-	});
-	const recipient = await parseAndResolveChannelRecipient(to, cfg, account.accountId);
-	const { channelId } = await resolveChannelId(rest, recipient, request);
-	return {
-		rest,
-		request,
-		channelId,
-		account
-	};
-}
 async function sendMessageDiscord(to, text, opts) {
 	return await withDiscordRequestAuthority(opts.assertPlatformSendAuthorized, () => sendMessageDiscordInternal(to, text, opts));
 }
@@ -610,78 +590,60 @@ async function sendMessageDiscordInternal(to, text, opts) {
 	};
 }
 async function sendStickerDiscord(to, stickerIds, opts) {
-	return await withDiscordRequestAuthority(opts.assertPlatformSendAuthorized, () => sendStickerDiscordInternal(to, stickerIds, opts));
-}
-async function sendStickerDiscordInternal(to, stickerIds, opts) {
-	const context = await resolveDiscordStructuredSendContext(to, opts);
-	const { rewrittenContent, suppressEmbeds } = context;
-	const stickers = normalizeStickerIds(stickerIds);
-	const flags = resolveDiscordMessageFlags({
-		silent: opts.silent,
-		suppressEmbeds
-	});
-	const body = {
-		content: rewrittenContent || void 0,
-		sticker_ids: stickers,
-		nonce: createDiscordMessageNonce(),
-		enforce_nonce: true,
-		...flags ? { flags } : {}
-	};
-	return context.send("sticker", body);
+	return sendDiscordStructuredMessage(to, opts, "sticker", () => ({ sticker_ids: normalizeStickerIds(stickerIds) }));
 }
 async function sendPollDiscord(to, poll, opts) {
-	return await withDiscordRequestAuthority(opts.assertPlatformSendAuthorized, () => sendPollDiscordInternal(to, poll, opts));
-}
-async function sendPollDiscordInternal(to, poll, opts) {
-	const context = await resolveDiscordStructuredSendContext(to, opts);
-	const { rewrittenContent, suppressEmbeds } = context;
-	if (poll.durationSeconds !== void 0) throw new Error("Discord polls do not support durationSeconds; use durationHours");
-	const payload = normalizeDiscordPollInput(poll);
-	const flags = resolveDiscordMessageFlags({
-		silent: opts.silent,
-		suppressEmbeds
+	return sendDiscordStructuredMessage(to, opts, "poll", () => {
+		if (poll.durationSeconds !== void 0) throw new Error("Discord polls do not support durationSeconds; use durationHours");
+		return { poll: normalizeDiscordPollInput(poll) };
 	});
-	const body = {
-		content: rewrittenContent || void 0,
-		poll: payload,
-		nonce: createDiscordMessageNonce(),
-		enforce_nonce: true,
-		...flags ? { flags } : {}
-	};
-	return context.send("poll", body);
 }
-async function resolveDiscordStructuredSendContext(to, opts) {
-	requireRuntimeConfig(opts.cfg, "Discord structured send");
-	const { rest, request, channelId, account: accountInfo } = await resolveDiscordSendTarget(to, opts);
-	const content = opts.content;
-	return {
-		send: async (kind, body) => {
-			const result = await request(async () => {
-				await opts.onPlatformSendDispatch?.();
-				opts.assertPlatformSendAuthorized?.();
-				return createChannelMessage(rest, channelId, { body });
-			}, kind, { safety: "nonce-protected-create" });
-			recordChannelActivity({
-				channel: "discord",
-				accountId: accountInfo.accountId,
-				direction: "outbound"
-			});
-			return createDiscordSendResult({
-				result,
-				fallbackChannelId: channelId,
-				kind: kind === "poll" ? "poll" : "card",
-				threadId: kind === "poll" ? opts.threadId : void 0
-			});
-		},
-		rewrittenContent: content?.trim() ? rewriteDiscordKnownMentions(content, {
-			accountId: accountInfo.accountId,
-			mentionAliases: accountInfo.config.mentionAliases
-		}) : void 0,
-		suppressEmbeds: resolveDiscordSuppressEmbeds({
-			configured: accountInfo.config.suppressEmbeds,
+async function sendDiscordStructuredMessage(to, opts, kind, buildPayload) {
+	return withDiscordRequestAuthority(opts.assertPlatformSendAuthorized, async () => {
+		const cfg = requireRuntimeConfig(opts.cfg, "Discord structured send");
+		const { rest, request, account } = createDiscordClient({
+			...opts,
+			cfg
+		});
+		const recipient = await parseAndResolveChannelRecipient(to, cfg, account.accountId);
+		const { channelId } = await resolveChannelId(rest, recipient, request);
+		const content = opts.content?.trim() ? rewriteDiscordKnownMentions(opts.content, {
+			accountId: account.accountId,
+			mentionAliases: account.config.mentionAliases
+		}) : void 0;
+		const suppressEmbeds = resolveDiscordSuppressEmbeds({
+			configured: account.config.suppressEmbeds,
 			override: opts.suppressEmbeds
-		})
-	};
+		});
+		const payload = buildPayload();
+		const flags = resolveDiscordMessageFlags({
+			silent: opts.silent,
+			suppressEmbeds
+		});
+		const body = {
+			content: content || void 0,
+			...payload,
+			nonce: createDiscordMessageNonce(),
+			enforce_nonce: true,
+			...flags ? { flags } : {}
+		};
+		const result = await request(async () => {
+			await opts.onPlatformSendDispatch?.();
+			opts.assertPlatformSendAuthorized?.();
+			return await rest.post(Routes.channelMessages(channelId), { body });
+		}, kind, { safety: "nonce-protected-create" });
+		recordChannelActivity({
+			channel: "discord",
+			accountId: account.accountId,
+			direction: "outbound"
+		});
+		return createDiscordSendResult({
+			result,
+			fallbackChannelId: channelId,
+			kind: kind === "poll" ? "poll" : "card",
+			threadId: kind === "poll" ? opts.threadId : void 0
+		});
+	});
 }
 //#endregion
 export { discordTextHasBroadcastMention as a, prepareDiscordOutboundText as i, sendPollDiscord as n, formatMention as o, sendStickerDiscord as r, sendMessageDiscord as t };

package/dist/.setup/{send.shared-DGFkbkQR.mjs → send.shared-BQIUh6Vn.mjs}

@@ -1,22 +1,21 @@
-import { A as serializePayload, Mt as getGuildMember, ct as createChannelMessage, g as RequestClient, gt as getThreadMember, it as getCurrentUser, j as Embed, jt as getGuild, k as hasDiscordV2Components, mt as getChannel, rt as createUserDmChannel } from "./discord-0xJYfdDD.mjs";
-import { t as isDiscordThreadChannelType } from "./channel-type-DRCrEMss.mjs";
-import { c as resolveDiscordAccount, m as normalizeDiscordToken, o as mergeDiscordAccountConfig } from "./accounts-ChaMcixG.mjs";
-import { o as chunkDiscordTextWithMode, p as resolveDiscordReplyMessageId, r as createDiscordRetryRunner } from "./retry-pz_cSha2.mjs";
-import { t as parseAndResolveDiscordTarget } from "./target-resolver-BuLapkhy.mjs";
-import { ChannelType, MessageFlags, PermissionFlagsBits } from "discord-api-types/v10";
+import { A as serializePayload, _t as getGuildMember, dt as getChannel, g as RequestClient, gt as getGuild, it as getCurrentUser, j as Embed, k as hasDiscordV2Components, pt as getThreadMember, rt as createUserDmChannel } from "./discord-J7aRzq2Q.mjs";
+import { t as isDiscordThreadChannelType } from "./channel-type-D1_b5UhU.mjs";
+import { c as resolveDiscordAccount, m as normalizeDiscordToken, o as mergeDiscordAccountConfig } from "./accounts-DXHCL8Zm.mjs";
+import { o as chunkDiscordTextWithMode, p as resolveDiscordReplyMessageId, r as createDiscordRetryRunner } from "./retry-BKzO25k4.mjs";
+import { t as parseAndResolveDiscordTarget } from "./target-resolver-Dzxf80Y3.mjs";
+import { normalizeOptionalString, normalizeStringEntries } from "openclaw/plugin-sdk/string-coerce-runtime";
+import { ChannelType, MessageFlags, PermissionFlagsBits, Routes } from "discord-api-types/v10";
 import { randomBytes } from "node:crypto";
 import { makeProxyFetch } from "openclaw/plugin-sdk/fetch-runtime";
 import { normalizeAccountId } from "openclaw/plugin-sdk/routing";
-import { normalizeOptionalString, normalizeStringEntries } from "openclaw/plugin-sdk/string-coerce-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 { 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 { loadWebMedia } from "openclaw/plugin-sdk/web-media";
+import { extensionForMime, normalizePollDurationHours, normalizePollInput } from "openclaw/plugin-sdk/media-runtime";
 //#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.");
 	const resolvedCfg = requireRuntimeConfig(cfg, "Discord recipient resolution");
 	const accountInfo = resolveDiscordAccount({
 		cfg: resolvedCfg,
@@ -103,13 +102,7 @@ function validateDiscordProxyUrl(proxyUrl) {
 //#region extensions/discord/src/proxy-request-client.ts
 const DISCORD_REST_TIMEOUT_MS = 15e3;
 function createDiscordRequestClient(token, options) {
-	if (!options?.fetch) return new RequestClient(token, options);
-	return new RequestClient(token, {
-		maxQueueSize: 1e3,
-		timeout: DISCORD_REST_TIMEOUT_MS,
-		...options,
-		fetch: options.fetch
-	});
+	return new RequestClient(token, options);
 }
 //#endregion
 //#region extensions/discord/src/client.ts
@@ -676,7 +669,7 @@ async function sendDiscordChunks(params, upload) {
 			result = await params.request(async () => {
 				await params.onPlatformSendDispatch?.();
 				params.assertPlatformSendAuthorized?.();
-				return createChannelMessage(params.rest, params.channelId, { body });
+				return await params.rest.post(Routes.channelMessages(params.channelId), { body });
 			}, files ? "media" : "text", { safety: "nonce-protected-create" });
 		} catch (error) {
 			if (files && upload) return upload.onRejected(error);
@@ -696,12 +689,12 @@ async function sendDiscordText(params) {
 	return sendDiscordChunks(params);
 }
 async function sendDiscordMedia(params) {
-	const media = await loadWebMedia(params.mediaUrl, buildOutboundMediaLoadOptions({
+	const media = await loadOutboundMediaFromUrl(params.mediaUrl, {
 		maxBytes: params.maxBytes,
 		mediaAccess: params.mediaAccess,
 		mediaLocalRoots: params.mediaLocalRoots,
 		mediaReadFile: params.mediaReadFile
-	}));
+	});
 	const resolvedFileName = params.filename?.trim() || media.fileName || (media.contentType ? `upload${extensionForMime(media.contentType) ?? ""}` : "") || "upload";
 	return sendDiscordChunks(params, {
 		files: [{

package/dist/.setup/{sender-identity-B9X5Vb9R.mjs → sender-identity-CooeYfAn.mjs}

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

package/dist/.setup/{session-key-normalization-wJgsKPNF.mjs → session-key-normalization-CCHGNSQw.mjs}

@@ -1,16 +1,10 @@
 import { normalizeLowercaseStringOrEmpty } from "openclaw/plugin-sdk/string-coerce-runtime";
 //#region extensions/discord/src/session-key-normalization.ts
-function normalizeDiscordChatType(raw) {
-	const normalized = normalizeLowercaseStringOrEmpty(raw);
-	if (!normalized) return;
-	if (normalized === "dm") return "direct";
-	if (normalized === "group" || normalized === "channel" || normalized === "direct") return normalized;
-}
 function normalizeExplicitDiscordSessionKey(sessionKey, ctx) {
 	let normalized = normalizeLowercaseStringOrEmpty(sessionKey);
-	if (normalizeDiscordChatType(ctx.ChatType) !== "direct") return normalized;
-	normalized = normalized.replace(/^(discord:)dm:/, "$1direct:");
-	normalized = normalized.replace(/^(agent:[^:]+:discord:)dm:/, "$1direct:");
+	const chatType = normalizeLowercaseStringOrEmpty(ctx.ChatType);
+	if (chatType !== "direct" && chatType !== "dm") return normalized;
+	normalized = normalized.replace(/^((?:agent:[^:]+:)?discord:)dm:/, "$1direct:");
 	const match = normalized.match(/^((?:agent:[^:]+:)?)discord:channel:([^:]+)$/);
 	if (!match) return normalized;
 	const from = normalizeLowercaseStringOrEmpty(ctx.From);

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

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

package/dist/.setup/{shared-B3wZ4hN-.mjs → shared-CIJn6AEC.mjs}

@@ -1,8 +1,8 @@
-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-ChaMcixG.mjs";
-import { t as inspectDiscordAccount } from "./account-inspect-De8hOUxG.mjs";
-import { n as discordIngressIdentity, t as selectDiscordLivePolicyConfig } from "./live-policy-config-8Pv20CHc.mjs";
-import { t as DiscordChannelConfigSchema } from "./config-schema-oxELUSDx.mjs";
-import { n as normalizeCompatibilityConfig } from "./doctor-contract-CvvgwrrG.mjs";
+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-DXHCL8Zm.mjs";
+import { t as inspectDiscordAccount } from "./account-inspect-CjKqkDnH.mjs";
+import { n as discordIngressIdentity, t as selectDiscordLivePolicyConfig } from "./live-policy-config-emmPNyh4.mjs";
+import { t as DiscordChannelConfigSchema } from "./config-schema-CsemBDpS.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 { t as deriveLegacySessionChatType } from "./session-contract-BO5tlIdl.mjs";
@@ -57,7 +57,7 @@ const collectDiscordSecurityFindings = createConditionalWarningCollector.finding
 	severity: "warn",
 	title: "Discord security warning"
 });
-const loadDiscordSecurityAuditModule = createLazyRuntimeModule(() => import("./security-audit-Cdaegq7C.mjs").then((n) => n.n));
+const loadDiscordSecurityAuditModule = createLazyRuntimeModule(() => import("./security-audit-D42cp5N7.mjs").then((n) => n.n));
 const discordSecurityAdapter = {
 	resolveDmPolicy: resolveDiscordDmPolicy,
 	collectWarnings: collectDiscordSecurityFindings,
@@ -101,7 +101,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-BCl1H5tl.mjs"));
+const loadDiscordDoctorModule = createLazyRuntimeModule(() => import("./doctor-DxSAngJq.mjs"));
 const discordDoctor = {
 	dmAllowFromMode: "topOnly",
 	groupModel: "route",

package/dist/.setup/{subagent-hooks-nlUE9ow7.mjs → subagent-hooks-BYlVnxzy.mjs}

@@ -1,6 +1,6 @@
 import { t as __exportAll } from "./rolldown-runtime-B4FMCO8f.mjs";
-import { u as ensureBindingsLoadedAsync } from "./thread-bindings.state-g6v9zAym.mjs";
-import { o as listThreadBindingsBySessionKey, u as unbindThreadBindingsBySessionKeyAsync } from "./thread-bindings-D7TfgjR_.mjs";
+import { x as ensureBindingsLoadedAsync } from "./thread-bindings.session-updates-C9aKtVs6.mjs";
+import { o as listThreadBindingsBySessionKey, u as unbindThreadBindingsBySessionKeyAsync } from "./thread-bindings-yNNlcUWE.mjs";
 import { normalizeOptionalLowercaseString, normalizeOptionalStringifiedId } from "openclaw/plugin-sdk/string-coerce-runtime";
 //#region extensions/discord/src/subagent-hooks.ts
 var subagent_hooks_exports = /* @__PURE__ */ __exportAll({
@@ -34,19 +34,14 @@ async function handleDiscordSubagentDeliveryTargetAsync(event) {
 }
 function resolveDiscordDeliveryTarget(event) {
 	const requesterAccountId = event.requesterOrigin?.accountId?.trim();
-	const requesterThreadId = event.requesterOrigin?.threadId != null && event.requesterOrigin.threadId !== "" ? normalizeOptionalStringifiedId(event.requesterOrigin.threadId) ?? "" : "";
+	const requesterThreadId = 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 (requesterThreadId) binding = bindings.find((entry) => entry.threadId === requesterThreadId && (!requesterAccountId || entry.accountId === requesterAccountId));
 	if (!binding && bindings.length === 1) binding = bindings[0];
 	if (!binding) return;
 	return { origin: {

package/dist/.setup/{system-events-CdeZnvPV.mjs → system-events-CQ3if_pS.mjs}

@@ -1,5 +1,5 @@
-import { t as discord_exports } from "./discord-0xJYfdDD.mjs";
-import { S as formatDiscordUserTag } from "./channel-type-DRCrEMss.mjs";
+import { t as discord_exports } from "./discord-J7aRzq2Q.mjs";
+import { C as formatDiscordUserTag } from "./channel-type-D1_b5UhU.mjs";
 //#region extensions/discord/src/monitor/system-events.ts
 const SYSTEM_EVENT_ACTIONS = /* @__PURE__ */ new Map([
 	[discord_exports.MessageType.ChannelPinnedMessage, "pinned a message"],

package/dist/.setup/{target-resolver-BuLapkhy.mjs → target-resolver-Dzxf80Y3.mjs}

@@ -1,7 +1,7 @@
 import { t as __exportAll } from "./rolldown-runtime-B4FMCO8f.mjs";
-import { c as resolveDiscordAccount, l as resolveDiscordAccountAllowFrom } from "./accounts-ChaMcixG.mjs";
-import { a as rememberDiscordDirectoryUser, r as listDiscordDirectoryPeersLive } from "./directory-live-DtKRHuGV.mjs";
-import { b as parseDiscordTarget, h as allowFromContainsDiscordUserId } from "./retry-pz_cSha2.mjs";
+import { c as resolveDiscordAccount, l as resolveDiscordAccountAllowFrom } from "./accounts-DXHCL8Zm.mjs";
+import { o as rememberDiscordDirectoryUser, r as listDiscordDirectoryPeersLive } from "./directory-live-C9xz7IPm.mjs";
+import { b as parseDiscordTarget, h as allowFromContainsDiscordUserId } from "./retry-BKzO25k4.mjs";
 import { buildMessagingTarget } from "openclaw/plugin-sdk/channel-targets";
 //#region extensions/discord/src/target-resolver.ts
 var target_resolver_exports = /* @__PURE__ */ __exportAll({
@@ -15,7 +15,7 @@ var target_resolver_exports = /* @__PURE__ */ __exportAll({
 async function resolveDiscordTarget(raw, options, parseOptions = {}) {
 	const trimmed = raw.trim();
 	if (!trimmed) return;
-	const likelyUsername = isLikelyUsername(trimmed);
+	const likelyUsername = !/^(user:|channel:|discord:|@|<@!?)|[\d]+$/.test(trimmed);
 	const shouldLookup = isExplicitUserLookup(trimmed, parseOptions) || likelyUsername;
 	if (/^\d+$/.test(trimmed) && parseOptions.defaultKind !== "user" && isConfiguredAllowedDiscordDmUser(trimmed, options)) return buildMessagingTarget("user", trimmed, trimmed);
 	const directParse = safeParseDiscordTarget(trimmed, parseOptions);
@@ -67,15 +67,7 @@ function isConfiguredAllowedDiscordDmUser(input, options) {
 	return allowFromContainsDiscordUserId(allowFrom, input);
 }
 function isExplicitUserLookup(input, options) {
-	if (/^<@!?(\d+)>$/.test(input)) return true;
-	if (/^(user:|discord:)/.test(input)) return true;
-	if (input.startsWith("@")) return true;
-	if (/^\d+$/.test(input)) return options.defaultKind === "user";
-	return false;
-}
-function isLikelyUsername(input) {
-	if (/^(user:|channel:|discord:|@|<@!?)|[\d]+$/.test(input)) return false;
-	return true;
+	return /^<@!?(\d+)>$/.test(input) || /^(user:|discord:)/.test(input) || input.startsWith("@") || /^\d+$/.test(input) && options.defaultKind === "user";
 }
 //#endregion
 export { resolveDiscordTarget as n, target_resolver_exports as r, parseAndResolveDiscordTarget as t };

package/dist/.setup/targets-Lf8D55w-.mjs

@@ -0,0 +1,3 @@
+import "./retry-BKzO25k4.mjs";
+import "./target-resolver-Dzxf80Y3.mjs";
+export {};

package/dist/.setup/{thread-bindings-D7TfgjR_.mjs → thread-bindings-yNNlcUWE.mjs}

@@ -1,11 +1,10 @@
 import { t as __exportAll } from "./rolldown-runtime-B4FMCO8f.mjs";
-import { b as parseDiscordTarget } from "./retry-pz_cSha2.mjs";
-import "./targets-0KUcEIYx.mjs";
-import { D as resolveThreadBindingMaxAgeMs$1, E as resolveThreadBindingMaxAgeExpiresAt, T as resolveThreadBindingInactivityExpiresAt, _ as refreshUnboundThreadWebhookIdentity, f as getThreadBindingToken, n as MANAGERS_BY_ACCOUNT_ID, t as BINDINGS_BY_THREAD_ID, w as resolveThreadBindingIdleTimeoutMs$1 } from "./thread-bindings.state-g6v9zAym.mjs";
-import { a as mutateBindingsForTargetSession, i as setThreadBindingMaxAgeBySessionKeyAsync, n as setThreadBindingIdleTimeoutBySessionKeyAsync, o as resolveBindingIdsForTargetSession, r as setThreadBindingMaxAgeBySessionKey, t as setThreadBindingIdleTimeoutBySessionKey, u as removeBindingRecordSync } from "./thread-bindings.session-updates-CshfKghV.mjs";
-import { c as resolveThreadBindingPersonaFromRecord, i as createNoopThreadBindingManager, n as getThreadBindingManager, o as resolveChannelIdForBinding, s as resolveThreadBindingPersona, t as createThreadBindingManager } from "./thread-bindings.manager-DN-NissX.mjs";
-import { normalizeAccountId } from "openclaw/plugin-sdk/routing";
+import { b as parseDiscordTarget } from "./retry-BKzO25k4.mjs";
+import "./targets-Lf8D55w-.mjs";
+import { C as getThreadBindingToken, E as refreshUnboundThreadWebhookIdentity, F as resolveThreadBindingMaxAgeMs$1, M as resolveThreadBindingIdleTimeoutMs$1, N as resolveThreadBindingInactivityExpiresAt, P as resolveThreadBindingMaxAgeExpiresAt, _ as MANAGERS_BY_ACCOUNT_ID, a as mutateBindingsForTargetSession, g as BINDINGS_BY_THREAD_ID, i as setThreadBindingMaxAgeBySessionKeyAsync, n as setThreadBindingIdleTimeoutBySessionKeyAsync, o as resolveBindingIdsForTargetSession, r as setThreadBindingMaxAgeBySessionKey, t as setThreadBindingIdleTimeoutBySessionKey, u as removeBindingRecordSync } from "./thread-bindings.session-updates-C9aKtVs6.mjs";
+import { c as resolveThreadBindingPersonaFromRecord, i as createNoopThreadBindingManager, n as getThreadBindingManager, o as resolveChannelIdForBinding, s as resolveThreadBindingPersona, t as createThreadBindingManager } from "./thread-bindings.manager-plk0zJAW.mjs";
 import { normalizeOptionalLowercaseString, normalizeOptionalString, normalizeOptionalStringifiedId, uniqueStrings } from "openclaw/plugin-sdk/string-coerce-runtime";
+import { normalizeAccountId } from "openclaw/plugin-sdk/routing";
 import { formatThreadBindingDurationLabel as formatThreadBindingDurationLabel$1, resolveThreadBindingIdleTimeoutMs, resolveThreadBindingIntroText, resolveThreadBindingIntroText as resolveThreadBindingIntroText$1, resolveThreadBindingMaxAgeMs, resolveThreadBindingThreadName, resolveThreadBindingThreadName as resolveThreadBindingThreadName$1, resolveThreadBindingsEnabled } from "openclaw/plugin-sdk/conversation-runtime";
 import { readAcpSessionEntry } from "openclaw/plugin-sdk/acp-runtime";
 import { runTasksWithConcurrency } from "openclaw/plugin-sdk/concurrency-runtime";

package/dist/.setup/{thread-bindings.manager-DN-NissX.mjs → thread-bindings.manager-plk0zJAW.mjs}

@@ -1,16 +1,15 @@
 import { t as __exportAll } from "./rolldown-runtime-B4FMCO8f.mjs";
-import { C as withDiscordRequestAuthority, mt as getChannel, nt as createChannelWebhook } from "./discord-0xJYfdDD.mjs";
-import { t as isDiscordThreadChannelType } from "./channel-type-DRCrEMss.mjs";
-import { t as canFallbackDiscordWebhookSend, x as resolveDiscordChannelId } from "./retry-pz_cSha2.mjs";
-import { N as createDiscordRestClient } from "./send.shared-DGFkbkQR.mjs";
-import { t as sendMessageDiscord } from "./send.outbound-BISKnb-a.mjs";
-import { n as resolveDiscordChannelInfoSafe, t as resolveDiscordChannelIdSafe } from "./channel-access-C12aDZ0p.mjs";
-import { c as sendWebhookMessageDiscord, u as createThreadDiscord } from "./send-CrfEI6Bs.mjs";
-import { C as resolvePreparedThreadBindingLifecycle, D as resolveThreadBindingMaxAgeMs$1, M as toReusableWebhookKey, S as resolveBindingRecordKey, _ as refreshUnboundThreadWebhookIdentity, c as THREAD_BINDING_TOUCH_PERSIST_MIN_INTERVAL_MS, d as forgetThreadBindingToken, f as getThreadBindingToken, h as normalizeThreadBindingDurationMs, i as REUSABLE_WEBHOOKS_BY_ACCOUNT_CHANNEL, j as toBindingRecordKey, k as shouldDefaultPersist, m as normalizeTargetKind, n as MANAGERS_BY_ACCOUNT_ID, r as PERSIST_BY_ACCOUNT_ID, t as BINDINGS_BY_THREAD_ID, u as ensureBindingsLoadedAsync, v as rememberReusableWebhook, w as resolveThreadBindingIdleTimeoutMs$1, x as resolveBindingIdsForSession, y as rememberThreadBindingToken } from "./thread-bindings.state-g6v9zAym.mjs";
-import { c as drainThreadBindingAccountOperations, d as runThreadBindingAccountOperation, f as runThreadBindingMutation, h as updateBindingRecordSync, l as drainThreadBindingMutations, m as snapshotThreadBindingJson, p as shouldPersistAnyBindingState, s as commitBindingRecord } from "./thread-bindings.session-updates-CshfKghV.mjs";
-import { parseStrictNonNegativeInteger } from "openclaw/plugin-sdk/number-runtime";
-import { normalizeAccountId } from "openclaw/plugin-sdk/routing";
+import { C as withDiscordRequestAuthority, dt as getChannel, nt as createChannelWebhook } from "./discord-J7aRzq2Q.mjs";
+import { t as isDiscordThreadChannelType } from "./channel-type-D1_b5UhU.mjs";
+import { t as canFallbackDiscordWebhookSend, x as resolveDiscordChannelId } from "./retry-BKzO25k4.mjs";
+import { N as createDiscordRestClient } from "./send.shared-BQIUh6Vn.mjs";
+import { t as sendMessageDiscord } from "./send.outbound-B4QHSEzm.mjs";
+import { n as resolveDiscordChannelInfoSafe, t as resolveDiscordChannelIdSafe } from "./channel-access-BRp3Y-rF.mjs";
+import { c as sendWebhookMessageDiscord, u as createThreadDiscord } from "./send-2X7m2Zmw.mjs";
+import { A as resolveBindingRecordKey, C as getThreadBindingToken, D as rememberReusableWebhook, E as refreshUnboundThreadWebhookIdentity, F as resolveThreadBindingMaxAgeMs$1, I as shouldDefaultPersist, L as toBindingRecordKey, M as resolveThreadBindingIdleTimeoutMs$1, O as rememberThreadBindingToken, R as toReusableWebhookKey, S as forgetThreadBindingToken, T as normalizeThreadBindingDurationMs, _ as MANAGERS_BY_ACCOUNT_ID, b as THREAD_BINDING_TOUCH_PERSIST_MIN_INTERVAL_MS, c as drainThreadBindingAccountOperations, d as runThreadBindingAccountOperation, f as runThreadBindingMutation, g as BINDINGS_BY_THREAD_ID, h as updateBindingRecordSync, j as resolvePreparedThreadBindingLifecycle, k as resolveBindingIdsForSession, l as drainThreadBindingMutations, m as snapshotThreadBindingJson, p as shouldPersistAnyBindingState, s as commitBindingRecord, v as PERSIST_BY_ACCOUNT_ID, w as normalizeTargetKind, x as ensureBindingsLoadedAsync, y as REUSABLE_WEBHOOKS_BY_ACCOUNT_CHANNEL } from "./thread-bindings.session-updates-C9aKtVs6.mjs";
 import { asOptionalObjectRecord, normalizeOptionalString, normalizeOptionalStringifiedId } from "openclaw/plugin-sdk/string-coerce-runtime";
+import { parseStrictNonNegativeInteger as parseStrictNonNegativeInteger$1 } from "openclaw/plugin-sdk/number-runtime";
+import { normalizeAccountId } from "openclaw/plugin-sdk/routing";
 import { getRuntimeConfigSnapshot } from "openclaw/plugin-sdk/runtime-config-snapshot";
 import { createSubsystemLogger, logVerbose } from "openclaw/plugin-sdk/runtime-env";
 import { truncateUtf16Safe } from "openclaw/plugin-sdk/text-utility-runtime";
@@ -63,12 +62,12 @@ function summarizeDiscordError(err) {
 function extractDiscordErrorStatus(err) {
 	if (!err || typeof err !== "object") return;
 	const candidate = err;
-	return parseStrictNonNegativeInteger(candidate.status) ?? parseStrictNonNegativeInteger(candidate.statusCode) ?? parseStrictNonNegativeInteger(candidate.response?.status);
+	return parseStrictNonNegativeInteger$1(candidate.status) ?? parseStrictNonNegativeInteger$1(candidate.statusCode) ?? parseStrictNonNegativeInteger$1(candidate.response?.status);
 }
 function extractDiscordErrorCode(err) {
 	if (!err || typeof err !== "object") return;
 	const candidate = err;
-	return parseStrictNonNegativeInteger(candidate.code) ?? parseStrictNonNegativeInteger(candidate.rawError?.code) ?? parseStrictNonNegativeInteger(candidate.body?.code) ?? parseStrictNonNegativeInteger(candidate.response?.body?.code) ?? parseStrictNonNegativeInteger(candidate.response?.data?.code);
+	return parseStrictNonNegativeInteger$1(candidate.code) ?? parseStrictNonNegativeInteger$1(candidate.rawError?.code) ?? parseStrictNonNegativeInteger$1(candidate.body?.code) ?? parseStrictNonNegativeInteger$1(candidate.response?.body?.code) ?? parseStrictNonNegativeInteger$1(candidate.response?.data?.code);
 }
 function isDiscordThreadGoneError(err) {
 	if (extractDiscordErrorCode(err) === 10003) return true;
@@ -139,19 +138,14 @@ async function createWebhookForChannel(params) {
 	}
 }
 function findReusableWebhook(params) {
-	const reusableKey = toReusableWebhookKey({
-		accountId: params.accountId,
-		channelId: params.channelId
-	});
+	const reusableKey = toReusableWebhookKey(params);
 	const cached = REUSABLE_WEBHOOKS_BY_ACCOUNT_CHANNEL.get(reusableKey);
 	if (cached) return {
 		webhookId: cached.webhookId,
 		webhookToken: cached.webhookToken
 	};
 	for (const record of BINDINGS_BY_THREAD_ID.values()) {
-		if (record.accountId !== params.accountId) continue;
-		if (record.channelId !== params.channelId) continue;
-		if (!record.webhookId || !record.webhookToken) continue;
+		if (record.accountId !== params.accountId || record.channelId !== params.channelId || !record.webhookId || !record.webhookToken) continue;
 		rememberReusableWebhook(record);
 		return {
 			webhookId: record.webhookId,