@openclaw/discord 2026.7.2-beta.1 → 2026.7.2-beta.3

package/dist/{send.receipt-aegk69an.js → chunk-CWzmeWf_.js}

@@ -1,12 +1,8 @@
-import { n as parseRetryAfterHeaderSeconds, t as parseDiscordRetryAfterBodySeconds } from "./retry-after-D5_VmM-_.js";
+import { t as parseDiscordRetryAfterBodySeconds } from "./retry-after-DdLPmPoa.js";
 import "node:module";
-import { buildMessagingTarget, parseMentionPrefixOrAtUserTarget, requireTargetKind } from "openclaw/plugin-sdk/channel-targets";
 import { ApplicationCommandOptionType, ApplicationCommandType, ButtonStyle, ComponentType, GatewayDispatchEvents, InteractionContextType, InteractionResponseType, InteractionType, MessageFlags, Routes, TextInputStyle } from "discord-api-types/v10";
-import { asDateTimestampMs, clampTimerTimeoutMs, parseFiniteNumber, parseStrictNonNegativeInteger, resolveExpiresAtMsFromDurationMs, resolveIntegerOption, resolveTimerTimeoutMs } from "openclaw/plugin-sdk/number-runtime";
 import { createHash } from "node:crypto";
-import path from "node:path";
-import { KeyedAsyncQueue } from "openclaw/plugin-sdk/keyed-async-queue";
-import { privateFileStore } from "openclaw/plugin-sdk/security-runtime";
+import { asDateTimestampMs, clampTimerTimeoutMs, parseFiniteNumber, parseStrictNonNegativeInteger, resolveExpiresAtMsFromDurationMs, resolveIntegerOption, resolveTimerTimeoutMs } from "openclaw/plugin-sdk/number-runtime";
 import { expectDefined } from "openclaw/plugin-sdk/expect-runtime";
 import { Type } from "typebox";
 import { Check } from "typebox/value";
@@ -14,9 +10,11 @@ import { inspect } from "node:util";
 import { gunzipSync } from "node:zlib";
 import { readResponseWithLimit } from "openclaw/plugin-sdk/response-limit-runtime";
 import { formatErrorMessage } from "openclaw/plugin-sdk/error-runtime";
+import { parseRetryAfterHeaderSeconds } from "openclaw/plugin-sdk/retry-runtime";
+import { buildMessagingTarget, parseMentionPrefixOrAtUserTarget, requireTargetKind } from "openclaw/plugin-sdk/channel-targets";
+import { resolveAllowlistMatchByCandidates } from "openclaw/plugin-sdk/allow-from";
 import { chunkMarkdownTextWithMode } from "openclaw/plugin-sdk/reply-chunking";
 import { isSingleUseReplyToMode } from "openclaw/plugin-sdk/reply-reference";
-import { createMessageReceiptFromOutboundResults } from "openclaw/plugin-sdk/channel-outbound";
 //#region \0rolldown/runtime.js
 var __defProp = Object.defineProperty;
 var __getOwnPropDesc = Object.getOwnPropertyDescriptor;
@@ -43,55 +41,6 @@ var __copyProps = (to, from, except, desc) => {
 };
 var __reExport = (target, mod, secondTarget) => (__copyProps(target, mod, "default"), secondTarget && __copyProps(secondTarget, mod, "default"));
 //#endregion
-//#region extensions/discord/src/target-parsing.ts
-function parseDiscordTarget(raw, options = {}) {
-	const trimmed = raw.trim();
-	if (!trimmed) return;
-	const providerPrefixedTarget = parseDiscordProviderPrefixedTarget(trimmed);
-	if (providerPrefixedTarget) return providerPrefixedTarget;
-	const userTarget = parseMentionPrefixOrAtUserTarget({
-		raw: trimmed,
-		mentionPattern: /^<@!?(\d+)>$/,
-		prefixes: [
-			{
-				prefix: "user:",
-				kind: "user"
-			},
-			{
-				prefix: "channel:",
-				kind: "channel"
-			},
-			{
-				prefix: "discord:",
-				kind: "user"
-			}
-		],
-		atUserPattern: /^\d+$/,
-		atUserErrorMessage: "Discord DMs require a user id (use user:<id> or a <@id> mention)"
-	});
-	if (userTarget) return userTarget;
-	if (/^\d+$/.test(trimmed)) {
-		if (options.defaultKind) return buildMessagingTarget(options.defaultKind, trimmed, trimmed);
-		throw new Error(options.ambiguousMessage ?? `Ambiguous Discord recipient "${trimmed}". For DMs use "user:${trimmed}" or "<@${trimmed}>"; for channels use "channel:${trimmed}".`);
-	}
-	return buildMessagingTarget("channel", trimmed, trimmed);
-}
-function parseDiscordProviderPrefixedTarget(raw) {
-	const match = /^discord:(channel|user):(.+)$/i.exec(raw);
-	if (!match) return;
-	const kind = match[1]?.toLowerCase();
-	const id = match[2]?.trim();
-	if (!kind || !id) return;
-	return buildMessagingTarget(kind, id, `${kind}:${id}`);
-}
-function resolveDiscordChannelId(raw) {
-	return requireTargetKind({
-		platform: "Discord",
-		target: parseDiscordTarget(raw, { defaultKind: "channel" }),
-		kind: "channel"
-	});
-}
-//#endregion
 //#region extensions/discord/src/internal/api.commands.ts
 async function listApplicationCommands(rest, clientId) {
 	return await rest.get(Routes.applicationCommands(clientId));
@@ -192,6 +141,9 @@ async function createWebhookMessage(rest, applicationId, token, data, query) {
 async function getChannel(rest, channelId) {
 	return await rest.get(Routes.channel(channelId));
 }
+async function getThreadMember(rest, threadId, userId) {
+	return await rest.get(Routes.threadMembers(threadId, userId));
+}
 async function editChannel(rest, channelId, data) {
 	return await rest.patch(Routes.channel(channelId), data);
 }
@@ -263,30 +215,74 @@ async function createChannelWebhook(rest, channelId, data) {
 	return await rest.post(Routes.channelWebhooks(channelId), data);
 }
 //#endregion
-//#region extensions/discord/src/internal/command-deploy.ts
-const DISCORD_APPLICATION_COMMAND_LIMIT_REACHED = 30032;
+//#region extensions/discord/src/internal/command-comparison.ts
+const unorderedCommandArrayFields = /* @__PURE__ */ new Set([
+	"channel_types",
+	"contexts",
+	"integration_types"
+]);
+const optionComparisonOmittedFields = /* @__PURE__ */ new Set([
+	"contexts",
+	"default_member_permissions",
+	"description_localized",
+	"integration_types",
+	"name_localized"
+]);
+const nullableLocalizationFields = /* @__PURE__ */ new Set(["description_localizations", "name_localizations"]);
+function comparableCommand(value) {
+	if (!value || typeof value !== "object") return value;
+	const omit = /* @__PURE__ */ new Set([
+		"application_id",
+		"description_localized",
+		"dm_permission",
+		"guild_id",
+		"id",
+		"name_localized",
+		"nsfw",
+		"version",
+		"default_permission"
+	]);
+	return stableComparableObject(Object.fromEntries(Object.entries(value).filter(([key, entry]) => !omit.has(key) && entry !== void 0)));
+}
+function stableComparableObject(value, pathValue = []) {
+	if (Array.isArray(value)) {
+		const normalized = value.map((entry) => stableComparableObject(entry, pathValue));
+		const key = pathValue.at(-1);
+		if (key && unorderedCommandArrayFields.has(key) && normalized.every((entry) => typeof entry === "string" || typeof entry === "number" || typeof entry === "boolean")) return normalized.toSorted((left, right) => String(left).localeCompare(String(right)));
+		return normalized;
+	}
+	if (!value || typeof value !== "object") return value;
+	return Object.fromEntries(Object.entries(value).filter(([key, entry]) => {
+		if (entry === void 0) return false;
+		if (entry === null && nullableLocalizationFields.has(key)) return false;
+		if (pathValue.includes("options") && optionComparisonOmittedFields.has(key)) return false;
+		if ((key === "required" || key === "autocomplete") && entry === false) return false;
+		return true;
+	}).toSorted(([a], [b]) => a.localeCompare(b)).map(([key, entry]) => [key, shouldNormalizeDescriptionValue(pathValue, key, entry) ? normalizeDescriptionForComparison(entry) : stableComparableObject(entry, [...pathValue, key])]));
+}
+function shouldNormalizeDescriptionValue(pathLocal, key, entry) {
+	return typeof entry === "string" && (key === "description" || pathLocal.at(-1) === "description_localizations");
+}
 /**
-* Per-`command-deploy-cache.json` path async mutex. `server-channels.ts` can
-* start several Discord deployers concurrently in the same Node.js process;
-* each one shares the same on-disk cache file. Without this lock, two
-* deployers can run `persistHashes` in parallel, both read the same on-disk
-* snapshot before either writes, and the later `rename` then overwrites the
-* earlier writer's entries — defeating the rate-limit cache.
-*
-* This is an in-process lock; cross-process serialization would need an OS
-* file lock. Discord deployers only run inside the gateway process, so an
-* in-process mutex is sufficient for the documented concurrency surface.
+* Normalize descriptions to match Discord's server-side storage semantics.
+* Discord collapses whitespace and removes whitespace between CJK characters.
 */
-const cachePersistLocks = new KeyedAsyncQueue();
-async function withCachePersistLock(storePath, fn) {
-	return await cachePersistLocks.enqueue(storePath, fn);
+function normalizeDescriptionForComparison(description) {
+	const collapsed = description.replace(/\s+/g, " ");
+	const cjkBoundaryWhitespace = /([\u3000-\u303F\u4E00-\u9FFF\uFF00-\uFFEF])\s+([\u3000-\u303F\u4E00-\u9FFF\uFF00-\uFFEF])/g;
+	return collapsed.replace(cjkBoundaryWhitespace, "$1$2").replace(cjkBoundaryWhitespace, "$1$2").trim();
+}
+function commandsEqual(a, b) {
+	return JSON.stringify(comparableCommand(a)) === JSON.stringify(comparableCommand(b));
 }
+//#endregion
+//#region extensions/discord/src/internal/command-deploy.ts
+const DISCORD_APPLICATION_COMMAND_LIMIT_REACHED = 30032;
 var DiscordCommandDeployer = class {
 	constructor(params) {
 		this.params = params;
 		this.hashes = /* @__PURE__ */ new Map();
-		this.pendingHashes = /* @__PURE__ */ new Map();
-		this.hashesLoaded = false;
+		this.loadedKeys = /* @__PURE__ */ new Set();
 	}
 	async getCommands() {
 		return await listApplicationCommands(this.rest, this.params.clientId);
@@ -328,7 +324,7 @@ var DiscordCommandDeployer = class {
 	}
 	/**
 	* Scope cache keys by Discord application id so multi-bot setups that share a
-	* single deploy-cache file still reconcile each application separately. The
+	* single command-deploy store still reconcile each application separately. The
 	* prior unscoped `global:reconcile` / `guild:<id>` keys let a later account
 	* with an identical command set reuse the first account's hash and skip its
 	* own application's reconcile entirely (#77359).
@@ -362,51 +358,20 @@ var DiscordCommandDeployer = class {
 	}
 	async putCommandSetIfChanged(key, commands, deploy, options) {
 		const hash = stableCommandSetHash(commands);
-		await this.loadPersistedHashes();
+		await this.loadPersistedHash(key);
 		if (!options.force && this.hashes.get(key) === hash) return;
 		await deploy();
 		this.hashes.set(key, hash);
-		this.pendingHashes.set(key, hash);
-		await this.persistHashes();
-	}
-	async loadPersistedHashes() {
-		if (this.hashesLoaded) return;
-		this.hashesLoaded = true;
-		const storePath = this.params.hashStorePath;
-		if (!storePath) return;
 		try {
-			const parsed = await privateFileStore(path.dirname(storePath)).readJsonIfExists(path.basename(storePath));
-			if (!parsed?.hashes || typeof parsed.hashes !== "object") return;
-			for (const [key, value] of Object.entries(parsed.hashes)) if (typeof value === "string" && key.trim() && value.trim()) this.hashes.set(key, value);
+			await this.params.hashStore?.register(key, hash);
 		} catch {}
 	}
-	async persistHashes() {
-		const storePath = this.params.hashStorePath;
-		if (!storePath) return;
-		await withCachePersistLock(storePath, async () => {
-			await this.persistHashesLocked(storePath);
-		});
-	}
-	async persistHashesLocked(storePath) {
+	async loadPersistedHash(key) {
+		if (this.loadedKeys.has(key)) return;
+		this.loadedKeys.add(key);
 		try {
-			const storeFile = path.basename(storePath);
-			const fileStore = privateFileStore(path.dirname(storePath));
-			const merged = /* @__PURE__ */ new Map();
-			let onDisk = null;
-			try {
-				onDisk = await fileStore.readJsonIfExists(storeFile);
-			} catch {}
-			if (onDisk?.hashes && typeof onDisk.hashes === "object") {
-				for (const [key, value] of Object.entries(onDisk.hashes)) if (typeof value === "string" && key.trim() && value.trim()) merged.set(key, value);
-			}
-			for (const [key, value] of this.pendingHashes.entries()) merged.set(key, value);
-			await fileStore.writeJson(storeFile, {
-				version: 1,
-				updatedAt: (/* @__PURE__ */ new Date()).toISOString(),
-				hashes: Object.fromEntries([...merged.entries()].toSorted(([left], [right]) => left.localeCompare(right)))
-			}, { trailingNewline: true });
-			for (const [key, value] of merged.entries()) this.hashes.set(key, value);
-			this.pendingHashes.clear();
+			const hash = await this.params.hashStore?.lookup(key);
+			if (typeof hash === "string" && hash.trim()) this.hashes.set(key, hash);
 		} catch {}
 	}
 	get rest() {
@@ -428,82 +393,6 @@ function stableCommandKey(command) {
 function isApplicationCommandLimitError(error) {
 	return error !== null && typeof error === "object" && "discordCode" in error && error.discordCode === DISCORD_APPLICATION_COMMAND_LIMIT_REACHED;
 }
-function comparableCommand(value) {
-	if (!value || typeof value !== "object") return value;
-	const omit = /* @__PURE__ */ new Set([
-		"application_id",
-		"description_localized",
-		"dm_permission",
-		"guild_id",
-		"id",
-		"name_localized",
-		"nsfw",
-		"version",
-		"default_permission"
-	]);
-	return stableComparableObject(Object.fromEntries(Object.entries(value).filter(([key, entry]) => !omit.has(key) && entry !== void 0)));
-}
-const unorderedCommandArrayFields = /* @__PURE__ */ new Set([
-	"channel_types",
-	"contexts",
-	"integration_types"
-]);
-const optionComparisonOmittedFields = /* @__PURE__ */ new Set([
-	"contexts",
-	"default_member_permissions",
-	"description_localized",
-	"integration_types",
-	"name_localized"
-]);
-const nullableLocalizationFields = /* @__PURE__ */ new Set(["description_localizations", "name_localizations"]);
-function stableComparableObject(value, pathValue = []) {
-	if (Array.isArray(value)) {
-		const normalized = value.map((entry) => stableComparableObject(entry, pathValue));
-		const key = pathValue.at(-1);
-		if (key && unorderedCommandArrayFields.has(key) && normalized.every((entry) => typeof entry === "string" || typeof entry === "number" || typeof entry === "boolean")) return normalized.toSorted((left, right) => String(left).localeCompare(String(right)));
-		return normalized;
-	}
-	if (!value || typeof value !== "object") return value;
-	return Object.fromEntries(Object.entries(value).filter(([key, entry]) => {
-		if (entry === void 0) return false;
-		if (entry === null && nullableLocalizationFields.has(key)) return false;
-		if (pathValue.includes("options") && optionComparisonOmittedFields.has(key)) return false;
-		if ((key === "required" || key === "autocomplete") && entry === false) return false;
-		return true;
-	}).toSorted(([a], [b]) => a.localeCompare(b)).map(([key, entry]) => [key, shouldNormalizeDescriptionValue(pathValue, key, entry) ? normalizeDescriptionForComparison(entry) : stableComparableObject(entry, [...pathValue, key])]));
-}
-function shouldNormalizeDescriptionValue(pathLocal, key, entry) {
-	return typeof entry === "string" && (key === "description" || pathLocal.at(-1) === "description_localizations");
-}
-/**
-* Normalize a Discord command description for equality comparison.
-*
-* Discord's server-side storage performs two transformations that our local
-* desired descriptors do not:
-*
-* 1. Consecutive whitespace (including `\n`) is collapsed to a single space.
-* 2. Whitespace between two CJK (Chinese, Japanese, Korean) characters is
-*    removed entirely. So a local description `"第一行。\n第二行。"` is stored
-*    as `"第一行。第二行。"` on Discord and returned without the `\n`.
-*
-* Without this normalization every startup for any CJK-heavy deployment reads
-* back Discord's collapsed form, computes a diff against the local `\n`-form,
-* decides the command needs updating, and issues a `PATCH`. Under the global
-* per-application rate limit this quickly produces 429 bursts and some
-* commands silently fail to register (see the Discord deploy 429 reports).
-*
-* Applying the same transformation to both sides before comparison makes the
-* equality check match Discord's storage semantics and prevents spurious
-* reconcile writes on every startup.
-*/
-function normalizeDescriptionForComparison(description) {
-	const collapsed = description.replace(/\s+/g, " ");
-	const cjkBoundaryWhitespace = /([\u3000-\u303F\u4E00-\u9FFF\uFF00-\uFFEF])\s+([\u3000-\u303F\u4E00-\u9FFF\uFF00-\uFFEF])/g;
-	return collapsed.replace(cjkBoundaryWhitespace, "$1$2").replace(cjkBoundaryWhitespace, "$1$2").trim();
-}
-function commandsEqual(a, b) {
-	return JSON.stringify(comparableCommand(a)) === JSON.stringify(comparableCommand(b));
-}
 function stableCommandSetHash(commands) {
 	const stable = commands.map((command) => stableComparableObject(command)).toSorted((a, b) => stableCommandKey(a).localeCompare(stableCommandKey(b)));
 	return createHash("sha256").update(JSON.stringify(stable)).digest("hex");
@@ -947,6 +836,90 @@ function serializePayload(payload) {
 	});
 }
 //#endregion
+//#region extensions/discord/src/internal/component-registry.ts
+var ComponentRegistry = class {
+	constructor() {
+		this.entries = /* @__PURE__ */ new Map();
+		this.oneOffComponents = /* @__PURE__ */ new Map();
+		this.wildcardEntries = [];
+	}
+	register(entry) {
+		const key = parseRegistryKey(entry.customId, entry.customIdParser);
+		if (key === "*") {
+			if (!this.wildcardEntries.includes(entry)) this.wildcardEntries.push(entry);
+			return;
+		}
+		const entries = this.entries.get(key) ?? [];
+		if (!entries.includes(entry)) {
+			entries.push(entry);
+			this.entries.set(key, entries);
+		}
+	}
+	resolve(customId, options) {
+		for (const entries of this.entries.values()) {
+			const match = entries.find((entry) => {
+				if (options?.componentType !== void 0 && entry.type !== options.componentType) return false;
+				const parser = entry.customIdParser ?? parseCustomId;
+				return parseRegistryKey(entry.customId, parser) === parseRegistryKey(customId, parser);
+			});
+			if (match) return match;
+		}
+		return this.wildcardEntries.find((entry) => {
+			if (options?.componentType !== void 0 && entry.type !== options.componentType) return false;
+			return true;
+		});
+	}
+	waitForMessageComponent(message, timeoutMs) {
+		const key = createOneOffComponentKey(message.id, message.channelId);
+		return new Promise((resolve) => {
+			const existing = this.oneOffComponents.get(key);
+			if (existing) {
+				clearTimeout(existing.timer);
+				existing.resolve({
+					success: false,
+					message,
+					reason: "timed out"
+				});
+			}
+			const timer = setTimeout(() => {
+				this.oneOffComponents.delete(key);
+				resolve({
+					success: false,
+					message,
+					reason: "timed out"
+				});
+			}, resolveTimerTimeoutMs(timeoutMs, 0, 0));
+			timer.unref?.();
+			this.oneOffComponents.set(key, {
+				message,
+				timer,
+				resolve
+			});
+		});
+	}
+	resolveOneOffComponent(params) {
+		if (!params.messageId || !params.channelId) return false;
+		const key = createOneOffComponentKey(params.messageId, params.channelId);
+		const entry = this.oneOffComponents.get(key);
+		if (!entry) return false;
+		clearTimeout(entry.timer);
+		this.oneOffComponents.delete(key);
+		entry.resolve({
+			success: true,
+			customId: params.customId,
+			message: entry.message,
+			values: params.values
+		});
+		return true;
+	}
+};
+function parseRegistryKey(customId, parser = parseCustomId) {
+	return parser(customId).key;
+}
+function createOneOffComponentKey(messageId, channelId) {
+	return `${messageId}:${channelId}`;
+}
+//#endregion
 //#region extensions/discord/src/internal/structures.ts
 var Base = class {
 	constructor(client) {
@@ -1323,31 +1296,38 @@ var DiscordEventQueue = class {
 			const job = this.takeNextJob();
 			if (!job) return;
 			this.processing += 1;
-			this.runJob(job).then(job.resolve, job.reject).finally(() => {
-				this.processing -= 1;
+			const listenerPromise = Promise.resolve().then(() => job.run());
+			const runJobPromise = this.runJob(job, listenerPromise);
+			runJobPromise.then(job.resolve, job.reject).finally(() => {
 				this.processedCount += 1;
-				this.processNext();
+			});
+			Promise.allSettled([runJobPromise, listenerPromise]).then(([dispatchResult, listenerResult]) => {
+				if (dispatchResult.status === "fulfilled" && dispatchResult.value === "timed-out" && listenerResult.status === "rejected") console.error(`[EventQueue] Listener ${job.listenerName} failed after timeout for event ${job.eventType}:`, listenerResult.reason);
+				this.processing -= 1;
+				this.processNext();
 			});
 		}
 	}
-	async runJob(job) {
+	async runJob(job, listenerPromise) {
 		const startedAt = Date.now();
 		try {
-			await this.runWithTimeout(job);
+			await this.runWithTimeout(listenerPromise);
 			this.logSlowListener(job, Date.now() - startedAt);
+			return "completed";
 		} catch (error) {
 			if (isListenerTimeoutError(error)) {
 				this.timeoutCount += 1;
 				console.error(`[EventQueue] Listener ${job.listenerName} timed out after ${this.options.listenerTimeout}ms for event ${job.eventType}`);
-				return;
+				return "timed-out";
 			}
 			console.error(`[EventQueue] Listener ${job.listenerName} failed for event ${job.eventType}:`, error);
+			return "failed";
 		}
 	}
-	async runWithTimeout(job) {
+	async runWithTimeout(listenerPromise) {
 		let timeout;
 		try {
-			await Promise.race([job.run(), new Promise((_, reject) => {
+			await Promise.race([listenerPromise, new Promise((_, reject) => {
 				timeout = setTimeout(() => {
 					reject(createListenerTimeoutError(this.options.listenerTimeout));
 				}, this.options.listenerTimeout);
@@ -1756,6 +1736,9 @@ var BaseComponentInteraction = class extends BaseInteraction {
 	async showModal(modal) {
 		return await this.callback(InteractionResponseType.Modal, modal.serialize());
 	}
+	async launchActivity() {
+		return await this.callback(InteractionResponseType.LaunchActivity);
+	}
 };
 var ButtonInteraction = class extends BaseComponentInteraction {};
 var StringSelectMenuInteraction = class extends BaseComponentInteraction {};
@@ -2587,87 +2570,6 @@ function getRequestPriority(method, path) {
 //#endregion
 //#region extensions/discord/src/internal/client.ts
 var Plugin = class {};
-var ComponentRegistry = class {
-	constructor() {
-		this.entries = /* @__PURE__ */ new Map();
-		this.oneOffComponents = /* @__PURE__ */ new Map();
-		this.wildcardEntries = [];
-	}
-	register(entry) {
-		const key = parseRegistryKey(entry.customId, entry.customIdParser);
-		if (key === "*") {
-			if (!this.wildcardEntries.includes(entry)) this.wildcardEntries.push(entry);
-			return;
-		}
-		const entries = this.entries.get(key) ?? [];
-		if (!entries.includes(entry)) {
-			entries.push(entry);
-			this.entries.set(key, entries);
-		}
-	}
-	resolve(customId, options) {
-		for (const entries of this.entries.values()) {
-			const match = entries.find((entry) => {
-				if (options?.componentType !== void 0 && entry.type !== options.componentType) return false;
-				const parser = entry.customIdParser ?? parseCustomId;
-				return parseRegistryKey(entry.customId, parser) === parseRegistryKey(customId, parser);
-			});
-			if (match) return match;
-		}
-		return this.wildcardEntries.find((entry) => {
-			if (options?.componentType !== void 0 && entry.type !== options.componentType) return false;
-			return true;
-		});
-	}
-	waitForMessageComponent(message, timeoutMs) {
-		const key = createOneOffComponentKey(message.id, message.channelId);
-		return new Promise((resolve) => {
-			const existing = this.oneOffComponents.get(key);
-			if (existing) {
-				clearTimeout(existing.timer);
-				existing.resolve({
-					success: false,
-					message,
-					reason: "timed out"
-				});
-			}
-			const timer = setTimeout(() => {
-				this.oneOffComponents.delete(key);
-				resolve({
-					success: false,
-					message,
-					reason: "timed out"
-				});
-			}, resolveTimerTimeoutMs(timeoutMs, 0, 0));
-			timer.unref?.();
-			this.oneOffComponents.set(key, {
-				message,
-				timer,
-				resolve
-			});
-		});
-	}
-	resolveOneOffComponent(params) {
-		if (!params.messageId || !params.channelId) return false;
-		const entry = this.oneOffComponents.get(createOneOffComponentKey(params.messageId, params.channelId));
-		if (!entry) return false;
-		clearTimeout(entry.timer);
-		this.oneOffComponents.delete(createOneOffComponentKey(params.messageId, params.channelId));
-		entry.resolve({
-			success: true,
-			customId: params.customId,
-			message: entry.message,
-			values: params.values
-		});
-		return true;
-	}
-};
-function parseRegistryKey(customId, parser = parseCustomId) {
-	return parser(customId).key;
-}
-function createOneOffComponentKey(messageId, channelId) {
-	return `${messageId}:${channelId}`;
-}
 var Client = class {
 	constructor(options, handlers, plugins = []) {
 		this.routes = [];
@@ -2693,7 +2595,7 @@ var Client = class {
 			clientId: this.options.clientId,
 			commands: this.commands,
 			devGuilds: this.options.devGuilds,
-			hashStorePath: this.options.commandDeployHashStorePath,
+			hashStore: this.options.commandDeployHashStore,
 			rest: () => this.rest
 		});
 		for (const component of handlers.components ?? []) this.componentHandler.register(component);
@@ -2846,7 +2748,6 @@ var discord_exports = /* @__PURE__ */ __exportAll({
 	Command: () => Command,
 	CommandInteraction: () => CommandInteraction,
 	CommandWithSubcommands: () => CommandWithSubcommands,
-	ComponentRegistry: () => ComponentRegistry,
 	Container: () => Container,
 	DiscordError: () => DiscordError,
 	Embed: () => Embed,
@@ -2922,6 +2823,7 @@ var discord_exports = /* @__PURE__ */ __exportAll({
 	getGuild: () => getGuild,
 	getGuildMember: () => getGuildMember,
 	getGuildVoiceState: () => getGuildVoiceState,
+	getThreadMember: () => getThreadMember,
 	getUser: () => getUser,
 	getWebhookMessage: () => getWebhookMessage,
 	isUnknownDiscordVoiceStateError: () => isUnknownDiscordVoiceStateError,
@@ -2954,6 +2856,136 @@ var discord_exports = /* @__PURE__ */ __exportAll({
 import * as import_discord_api_types_v10 from "discord-api-types/v10";
 __reExport(discord_exports, import_discord_api_types_v10);
 //#endregion
+//#region extensions/discord/src/target-parsing.ts
+function parseDiscordTarget(raw, options = {}) {
+	const trimmed = raw.trim();
+	if (!trimmed) return;
+	const providerPrefixedTarget = parseDiscordProviderPrefixedTarget(trimmed);
+	if (providerPrefixedTarget) return providerPrefixedTarget;
+	const userTarget = parseMentionPrefixOrAtUserTarget({
+		raw: trimmed,
+		mentionPattern: /^<@!?(\d+)>$/,
+		prefixes: [
+			{
+				prefix: "user:",
+				kind: "user"
+			},
+			{
+				prefix: "channel:",
+				kind: "channel"
+			},
+			{
+				prefix: "discord:",
+				kind: "user"
+			}
+		],
+		atUserPattern: /^\d+$/,
+		atUserErrorMessage: "Discord DMs require a user id (use user:<id> or a <@id> mention)"
+	});
+	if (userTarget) return userTarget;
+	if (/^\d+$/.test(trimmed)) {
+		if (options.defaultKind) return buildMessagingTarget(options.defaultKind, trimmed, trimmed);
+		throw new Error(options.ambiguousMessage ?? `Ambiguous Discord recipient "${trimmed}". For DMs use "user:${trimmed}" or "<@${trimmed}>"; for channels use "channel:${trimmed}".`);
+	}
+	return buildMessagingTarget("channel", trimmed, trimmed);
+}
+function parseDiscordProviderPrefixedTarget(raw) {
+	const match = /^discord:(channel|user):(.+)$/i.exec(raw);
+	if (!match) return;
+	const kind = match[1]?.toLowerCase();
+	const id = match[2]?.trim();
+	if (!kind || !id) return;
+	return buildMessagingTarget(kind, id, `${kind}:${id}`);
+}
+function resolveDiscordChannelId(raw) {
+	return requireTargetKind({
+		platform: "Discord",
+		target: parseDiscordTarget(raw, { defaultKind: "channel" }),
+		kind: "channel"
+	});
+}
+//#endregion
+//#region extensions/discord/src/normalize.ts
+function normalizeDiscordMessagingTarget(raw) {
+	return parseDiscordTarget(raw, { defaultKind: "channel" })?.normalized;
+}
+/**
+* Normalize a Discord outbound target for delivery. Bare numeric IDs are
+* prefixed with "channel:" to avoid the ambiguous-target error in
+* parseDiscordTarget, unless the ID is explicitly configured as an allowed DM
+* sender. All other formats pass through unchanged.
+*/
+function normalizeDiscordOutboundTarget(to, allowFrom) {
+	const trimmed = to?.trim();
+	if (!trimmed) return {
+		ok: false,
+		error: /* @__PURE__ */ new Error("Discord recipient is required. Use \"channel:<id>\" for channels or \"user:<id>\" for DMs.")
+	};
+	if (/^\d+$/.test(trimmed)) {
+		if (allowFromContainsDiscordUserId(allowFrom, trimmed)) return {
+			ok: true,
+			to: `user:${trimmed}`
+		};
+		return {
+			ok: true,
+			to: `channel:${trimmed}`
+		};
+	}
+	return {
+		ok: true,
+		to: trimmed
+	};
+}
+function allowFromContainsDiscordUserId(allowFrom, userId) {
+	const normalizedUserId = userId.trim();
+	if (!normalizedUserId) return false;
+	return resolveAllowlistMatchByCandidates({
+		allowList: (allowFrom ?? []).map(normalizeAllowFromDiscordUserId).filter((entry) => Boolean(entry)),
+		candidates: [{
+			value: normalizedUserId,
+			source: "id"
+		}]
+	}).allowed;
+}
+function normalizeAllowFromDiscordUserId(entry) {
+	const trimmed = entry.trim().toLowerCase();
+	if (!trimmed || trimmed === "*") return;
+	const mentionMatch = /^<@!?(\d+)>$/.exec(trimmed);
+	if (mentionMatch) return mentionMatch[1];
+	const prefixedMatch = /^(?:discord:)?user:(\d+)$/.exec(trimmed);
+	if (prefixedMatch) return prefixedMatch[1];
+	const discordMatch = /^discord:(\d+)$/.exec(trimmed);
+	if (discordMatch) return discordMatch[1];
+	return /^\d+$/.test(trimmed) ? trimmed : void 0;
+}
+function looksLikeDiscordTargetId(raw) {
+	const trimmed = raw.trim();
+	if (!trimmed) return false;
+	if (/^<@!?\d+>$/.test(trimmed)) return true;
+	if (/^(?:(?:user|channel|discord):\d+|discord:(?:user|channel):\d+)$/i.test(trimmed)) return true;
+	if (/^\d{6,}$/.test(trimmed)) return true;
+	return false;
+}
+//#endregion
+//#region extensions/discord/src/reply-reference.ts
+function resolveDiscordReplyReference(params) {
+	if (!params.replyToId) return;
+	const singleUse = params.replyToIdSource !== "explicit" && params.replyToMode !== void 0 && isSingleUseReplyToMode(params.replyToMode);
+	return {
+		messageId: params.replyToId,
+		scope: singleUse ? "first" : "all"
+	};
+}
+function createReusableDiscordReplyReference(messageId) {
+	return messageId ? {
+		messageId,
+		scope: "all"
+	} : void 0;
+}
+function resolveDiscordReplyMessageId(reply, isFirst) {
+	return reply && (isFirst || reply.scope === "all") ? reply.messageId : void 0;
+}
+//#endregion
 //#region extensions/discord/src/chunk.ts
 const DEFAULT_MAX_CHARS = 2e3;
 const DEFAULT_MAX_LINES = 17;
@@ -3135,125 +3167,4 @@ function rebalanceReasoningItalics(source, chunks) {
 	return adjusted;
 }
 //#endregion
-//#region extensions/discord/src/normalize.ts
-function normalizeDiscordMessagingTarget(raw) {
-	return parseDiscordTarget(raw, { defaultKind: "channel" })?.normalized;
-}
-/**
-* Normalize a Discord outbound target for delivery. Bare numeric IDs are
-* prefixed with "channel:" to avoid the ambiguous-target error in
-* parseDiscordTarget, unless the ID is explicitly configured as an allowed DM
-* sender. All other formats pass through unchanged.
-*/
-function normalizeDiscordOutboundTarget(to, allowFrom) {
-	const trimmed = to?.trim();
-	if (!trimmed) return {
-		ok: false,
-		error: /* @__PURE__ */ new Error("Discord recipient is required. Use \"channel:<id>\" for channels or \"user:<id>\" for DMs.")
-	};
-	if (/^\d+$/.test(trimmed)) {
-		if (allowFromContainsDiscordUserId(allowFrom, trimmed)) return {
-			ok: true,
-			to: `user:${trimmed}`
-		};
-		return {
-			ok: true,
-			to: `channel:${trimmed}`
-		};
-	}
-	return {
-		ok: true,
-		to: trimmed
-	};
-}
-function allowFromContainsDiscordUserId(allowFrom, userId) {
-	const normalizedUserId = userId.trim();
-	if (!normalizedUserId) return false;
-	return (allowFrom ?? []).some((entry) => normalizeAllowFromDiscordUserId(entry) === normalizedUserId);
-}
-function normalizeAllowFromDiscordUserId(entry) {
-	const trimmed = entry.trim().toLowerCase();
-	if (!trimmed || trimmed === "*") return;
-	const mentionMatch = /^<@!?(\d+)>$/.exec(trimmed);
-	if (mentionMatch) return mentionMatch[1];
-	const prefixedMatch = /^(?:discord:)?user:(\d+)$/.exec(trimmed);
-	if (prefixedMatch) return prefixedMatch[1];
-	const discordMatch = /^discord:(\d+)$/.exec(trimmed);
-	if (discordMatch) return discordMatch[1];
-	return /^\d+$/.test(trimmed) ? trimmed : void 0;
-}
-function looksLikeDiscordTargetId(raw) {
-	const trimmed = raw.trim();
-	if (!trimmed) return false;
-	if (/^<@!?\d+>$/.test(trimmed)) return true;
-	if (/^(user|channel|discord):/i.test(trimmed)) return true;
-	if (/^\d{6,}$/.test(trimmed)) return true;
-	return false;
-}
-//#endregion
-//#region extensions/discord/src/reply-reference.ts
-function resolveDiscordReplyReference(params) {
-	if (!params.replyToId) return;
-	const singleUse = params.replyToIdSource !== "explicit" && params.replyToMode !== void 0 && isSingleUseReplyToMode(params.replyToMode);
-	return {
-		messageId: params.replyToId,
-		scope: singleUse ? "first" : "all"
-	};
-}
-function createReusableDiscordReplyReference(messageId) {
-	return messageId ? {
-		messageId,
-		scope: "all"
-	} : void 0;
-}
-function resolveDiscordReplyMessageId(reply, isFirst) {
-	return reply && (isFirst || reply.scope === "all") ? reply.messageId : void 0;
-}
-//#endregion
-//#region extensions/discord/src/send.receipt.ts
-function createDiscordSendReceipt(params) {
-	return createMessageReceiptFromOutboundResults({
-		results: params.platformMessageIds.map((messageId) => messageId.trim()).filter((messageId) => messageId && messageId !== "unknown").map((messageId, index) => {
-			const result = {
-				channel: "discord",
-				messageId
-			};
-			if (params.channelId) result.channelId = params.channelId;
-			if (params.reply?.scope === "first" && index === 0) {
-				const rawResult = {
-					channel: "discord",
-					messageId
-				};
-				if (params.channelId) rawResult.channelId = params.channelId;
-				result.receipt = createMessageReceiptFromOutboundResults({
-					results: [rawResult],
-					kind: params.kind,
-					threadId: params.threadId,
-					replyToId: params.reply.messageId
-				});
-			}
-			return result;
-		}),
-		kind: params.kind,
-		threadId: params.threadId,
-		replyToId: params.reply?.scope === "all" ? params.reply.messageId : void 0
-	});
-}
-function createDiscordSendResult(params) {
-	const messageId = params.result.id || "unknown";
-	const channelId = params.result.channel_id ?? params.fallbackChannelId;
-	const receiptParams = {
-		platformMessageIds: params.result.platformMessageIds?.length ? params.result.platformMessageIds : [messageId],
-		channelId,
-		kind: params.kind
-	};
-	if (params.threadId != null) receiptParams.threadId = String(params.threadId);
-	if (params.reply) receiptParams.reply = params.reply;
-	return {
-		messageId,
-		channelId,
-		receipt: createDiscordSendReceipt(receiptParams)
-	};
-}
-//#endregion
-export { Section as $, readDiscordMessage as A, createGuildChannel as At, Label as B, listGuildEmojis as Bt, Client as C, listChannelPins as Ct, RateLimitError as D, unpinChannelMessage as Dt, DiscordError as E, sendChannelTyping as Et, Message as F, getGuild as Ft, ChannelSelectMenu as G, removeGuildMember as Gt, RadioGroup as H, listGuildScheduledEvents as Ht, User as I, getGuildMember as It, LinkButton as J, parseDiscordTarget as Jt, Container as K, removeGuildMemberRole as Kt, serializePayload as L, getGuildVoiceState as Lt, Command as M, createGuildScheduledEvent as Mt, CommandWithSubcommands as N, createGuildSticker as Nt, isUnknownDiscordVoiceStateError as O, addGuildMemberRole as Ot, Guild as P, deleteChannelPermission as Pt, Row as Q, Embed as R, listGuildActiveThreads as Rt, VoiceStateUpdateListener as S, listChannelMessages as St, RequestClient as T, searchGuildMessages as Tt, TextInput as U, moveGuildChannels as Ut, Modal as V, listGuildRoles as Vt, Button as W, putChannelPermission as Wt, MentionableSelectMenu as X, __exportAll as Xt, MediaGallery as Y, resolveDiscordChannelId as Yt, RoleSelectMenu as Z, MessageReactionRemoveListener as _, editChannel as _t, resolveDiscordReplyReference as a, BaseMessageInteractiveComponent as at, ResumedListener as b, getChannelMessage as bt, normalizeDiscordMessagingTarget as c, createUserDmChannel as ct, discord_exports as d, deleteOwnMessageReaction as dt, Separator as et, GuildCreateListener as f, listMessageReactionUsers as ft, MessageReactionAddListener as g, deleteChannelMessage as gt, MessageCreateListener as h, deleteChannel as ht, resolveDiscordReplyMessageId as i, UserSelectMenu as it, readRetryAfter as j, createGuildEmoji as jt, readDiscordCode as k, createGuildBan as kt, normalizeDiscordOutboundTarget as l, getCurrentUser as lt, InteractionCreateListener as m, createThread as mt, createDiscordSendResult as n, TextDisplay as nt, allowFromContainsDiscordUserId as o, parseCustomId as ot, GuildDeleteListener as p, createChannelMessage as pt, File as q, timeoutGuildMember as qt, createReusableDiscordReplyReference as r, Thumbnail as rt, looksLikeDiscordTargetId as s, createChannelWebhook as st, createDiscordSendReceipt as t, StringSelectMenu as tt, chunkDiscordTextWithMode as u, createOwnMessageReaction as ut, PresenceUpdateListener as v, editChannelMessage as vt, Plugin as w, pinChannelMessage as wt, ThreadUpdateListener as x, listChannelArchivedThreads as xt, ReadyListener as y, getChannel as yt, CheckboxGroup as z, listGuildChannels as zt };
+export { Section as $, readDiscordMessage as A, createGuildBan as At, Label as B, listGuildChannels as Bt, Client as C, listChannelMessages as Ct, RateLimitError as D, sendChannelTyping as Dt, DiscordError as E, searchGuildMessages as Et, Message as F, deleteChannelPermission as Ft, ChannelSelectMenu as G, putChannelPermission as Gt, RadioGroup as H, listGuildRoles as Ht, User as I, getGuild as It, LinkButton as J, timeoutGuildMember as Jt, Container as K, removeGuildMember as Kt, serializePayload as L, getGuildMember as Lt, Command as M, createGuildEmoji as Mt, CommandWithSubcommands as N, createGuildScheduledEvent as Nt, isUnknownDiscordVoiceStateError as O, unpinChannelMessage as Ot, Guild as P, createGuildSticker as Pt, Row as Q, Embed as R, getGuildVoiceState as Rt, VoiceStateUpdateListener as S, listChannelArchivedThreads as St, RequestClient as T, pinChannelMessage as Tt, TextInput as U, listGuildScheduledEvents as Ut, Modal as V, listGuildEmojis as Vt, Button as W, moveGuildChannels as Wt, MentionableSelectMenu as X, MediaGallery as Y, __exportAll as Yt, RoleSelectMenu as Z, MessageReactionRemoveListener as _, editChannel as _t, allowFromContainsDiscordUserId as a, BaseMessageInteractiveComponent as at, ResumedListener as b, getChannelMessage as bt, normalizeDiscordOutboundTarget as c, createUserDmChannel as ct, discord_exports as d, deleteOwnMessageReaction as dt, Separator as et, GuildCreateListener as f, listMessageReactionUsers as ft, MessageReactionAddListener as g, deleteChannelMessage as gt, MessageCreateListener as h, deleteChannel as ht, resolveDiscordReplyReference as i, UserSelectMenu as it, readRetryAfter as j, createGuildChannel as jt, readDiscordCode as k, addGuildMemberRole as kt, parseDiscordTarget as l, getCurrentUser as lt, InteractionCreateListener as m, createThread as mt, createReusableDiscordReplyReference as n, TextDisplay as nt, looksLikeDiscordTargetId as o, parseCustomId as ot, GuildDeleteListener as p, createChannelMessage as pt, File as q, removeGuildMemberRole as qt, resolveDiscordReplyMessageId as r, Thumbnail as rt, normalizeDiscordMessagingTarget as s, createChannelWebhook as st, chunkDiscordTextWithMode as t, StringSelectMenu as tt, resolveDiscordChannelId as u, createOwnMessageReaction as ut, PresenceUpdateListener as v, editChannelMessage as vt, Plugin as w, listChannelPins as wt, ThreadUpdateListener as x, getThreadMember as xt, ReadyListener as y, getChannel as yt, CheckboxGroup as z, listGuildActiveThreads as zt };