@openclaw/discord 2026.7.2-beta.7 → 2026.8.1-beta.3

package/dist/{chunk-DX4jpFQP.js → retry-DNsVTeTo.js}

@@ -1,17 +1,19 @@
 import { t as parseDiscordRetryAfterBodySeconds } from "./retry-after-DdLPmPoa.js";
+import { k as parseDiscordTarget } from "./accounts-DNl-oCEw.js";
 import "node:module";
+import { redactIdentifier, redactSensitiveFieldValue } from "openclaw/plugin-sdk/logging-core";
 import { ApplicationCommandOptionType, ApplicationCommandType, ButtonStyle, ComponentType, GatewayDispatchEvents, InteractionContextType, InteractionResponseType, InteractionType, MessageFlags, Routes, TextInputStyle } from "discord-api-types/v10";
 import { createHash } from "node:crypto";
-import { asDateTimestampMs, clampTimerTimeoutMs, parseFiniteNumber, parseStrictNonNegativeInteger, resolveExpiresAtMsFromDurationMs, resolveIntegerOption, resolveTimerTimeoutMs } from "openclaw/plugin-sdk/number-runtime";
+import { asDateTimestampMs, clampTimerTimeoutMs, 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";
 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 { collectErrorGraphCandidates, extractErrorCode, formatErrorMessage, readErrorName } from "openclaw/plugin-sdk/error-runtime";
+import { classifyTransientNetworkErrorCode, createChannelApiRetryRunner, parseRetryAfterHeaderSeconds, resolveRetryConfig, retryAsync } from "openclaw/plugin-sdk/retry-runtime";
+import { sleepWithAbort } from "openclaw/plugin-sdk/runtime-env";
 import { resolveAllowlistMatchByCandidates } from "openclaw/plugin-sdk/allow-from";
 import { chunkMarkdownTextWithMode } from "openclaw/plugin-sdk/reply-chunking";
 import { chunkTextForOutbound } from "openclaw/plugin-sdk/text-chunking";
@@ -402,6 +404,11 @@ function stableCommandSetHash(commands) {
 	return createHash("sha256").update(JSON.stringify(stable)).digest("hex");
 }
 //#endregion
+//#region extensions/discord/src/internal/undefined-fields.ts
+function stripUndefinedFields(value) {
+	return Object.fromEntries(Object.entries(value).filter(([, entry]) => entry !== void 0));
+}
+//#endregion
 //#region extensions/discord/src/internal/components.base.ts
 function parseCustomId(id) {
 	const [rawKeyValue, ...parts] = id.split(";");
@@ -423,9 +430,6 @@ function parseCustomId(id) {
 		data
 	};
 }
-function clean$3(value) {
-	return Object.fromEntries(Object.entries(value).filter(([, entry]) => entry !== void 0));
-}
 function colorToNumber(value) {
 	if (typeof value === "number") return Number.isInteger(value) && value >= 0 && value <= 16777215 ? value : void 0;
 	if (typeof value === "string" && /^#?[0-9a-f]{6}$/i.test(value)) return Number.parseInt(value.replace(/^#/, ""), 16);
@@ -458,7 +462,7 @@ var BaseButton = class extends BaseMessageInteractiveComponent {
 };
 var Button = class extends BaseButton {
 	serialize() {
-		return clean$3({
+		return stripUndefinedFields({
 			type: this.type,
 			style: this.style,
 			custom_id: this.customId,
@@ -478,7 +482,7 @@ var LinkButton = class extends BaseButton {
 		throw new Error("Link buttons do not run handlers");
 	}
 	serialize() {
-		return clean$3({
+		return stripUndefinedFields({
 			type: this.type,
 			style: this.style,
 			label: this.label,
@@ -494,7 +498,7 @@ var AnySelectMenu = class extends BaseMessageInteractiveComponent {
 		this.disabled = false;
 	}
 	serialize() {
-		return clean$3({
+		return stripUndefinedFields({
 			...this.serializeOptions(),
 			custom_id: this.customId,
 			placeholder: this.placeholder,
@@ -591,7 +595,7 @@ var TextDisplay = class extends BaseComponent {
 		this.isV2 = true;
 	}
 	serialize() {
-		return clean$3({
+		return stripUndefinedFields({
 			type: this.type,
 			content: this.content
 		});
@@ -608,7 +612,7 @@ var Separator = class extends BaseComponent {
 		this.divider = options?.divider ?? this.divider;
 	}
 	serialize() {
-		return clean$3({
+		return stripUndefinedFields({
 			type: this.type,
 			divider: this.divider,
 			spacing: this.spacing === "large" ? 2 : this.spacing === "small" ? 1 : this.spacing
@@ -623,7 +627,7 @@ var Thumbnail = class extends BaseComponent {
 		this.isV2 = true;
 	}
 	serialize() {
-		return clean$3({
+		return stripUndefinedFields({
 			type: this.type,
 			media: this.url ? { url: this.url } : void 0
 		});
@@ -638,7 +642,7 @@ var Section = class extends BaseComponent {
 		this.isV2 = true;
 	}
 	serialize() {
-		return clean$3({
+		return stripUndefinedFields({
 			type: this.type,
 			components: this.components.map((entry) => entry.serialize()),
 			accessory: this.accessory?.serialize()
@@ -672,7 +676,7 @@ var File = class extends BaseComponent {
 		this.isV2 = true;
 	}
 	serialize() {
-		return clean$3({
+		return stripUndefinedFields({
 			type: this.type,
 			file: this.file ? { url: this.file } : void 0,
 			spoiler: this.spoiler || void 0
@@ -690,7 +694,7 @@ var Container = class extends BaseComponent {
 		this.spoiler = options?.spoiler ?? false;
 	}
 	serialize() {
-		return clean$3({
+		return stripUndefinedFields({
 			type: this.type,
 			components: this.components.map((entry) => entry.serialize()),
 			accent_color: colorToNumber(this.accentColor),
@@ -708,7 +712,7 @@ var TextInput = class extends BaseModalComponent {
 		this.style = TextInputStyle.Short;
 	}
 	serialize() {
-		return clean$3({
+		return stripUndefinedFields({
 			type: this.type,
 			custom_id: this.customId,
 			style: this.style,
@@ -727,7 +731,7 @@ var CheckboxGroup = class extends BaseModalComponent {
 		this.options = [];
 	}
 	serialize() {
-		return clean$3({
+		return stripUndefinedFields({
 			type: this.type,
 			custom_id: this.customId,
 			options: this.options,
@@ -744,7 +748,7 @@ var RadioGroup = class extends BaseModalComponent {
 		this.options = [];
 	}
 	serialize() {
-		return clean$3({
+		return stripUndefinedFields({
 			type: this.type,
 			custom_id: this.customId,
 			options: this.options,
@@ -762,7 +766,7 @@ var Label = class extends BaseModalComponent {
 		this.customId = "";
 	}
 	serialize() {
-		return clean$3({
+		return stripUndefinedFields({
 			type: this.type,
 			label: this.label,
 			description: this.description,
@@ -785,15 +789,12 @@ var Modal = class {
 };
 //#endregion
 //#region extensions/discord/src/internal/embeds.ts
-function clean$2(value) {
-	return Object.fromEntries(Object.entries(value).filter(([, entry]) => entry !== void 0));
-}
 var Embed = class {
 	constructor(embed) {
 		Object.assign(this, embed);
 	}
 	serialize() {
-		return clean$2({
+		return stripUndefinedFields({
 			title: this.title,
 			description: this.description,
 			url: this.url,
@@ -809,28 +810,22 @@ var Embed = class {
 };
 //#endregion
 //#region extensions/discord/src/internal/payload.ts
-function clean$1(value) {
-	return Object.fromEntries(Object.entries(value).filter(([, entry]) => entry !== void 0));
-}
-function serializeAnyComponent(component) {
-	return component.serialize();
-}
-function payloadHasV2Components(payload) {
-	return Boolean(payload.components?.some((component) => component.isV2));
+function hasDiscordV2Components(components) {
+	return Boolean(components?.some((component) => "isV2" in component && component.isV2 || "type" in component && component.type !== ComponentType.ActionRow));
 }
 function normalizePayloadFlags(payload) {
 	const flags = payload.ephemeral ? (payload.flags ?? 0) | MessageFlags.Ephemeral : payload.flags;
-	if (!payloadHasV2Components(payload)) return flags;
+	if (!hasDiscordV2Components(payload.components)) return flags;
 	if (payload.content || payload.embeds?.length) throw new Error("Discord Components V2 payloads cannot include content or embeds");
 	return (flags ?? 0) | MessageFlags.IsComponentsV2;
 }
 function serializePayload(payload) {
 	if (typeof payload === "string") return { content: payload };
 	const flags = normalizePayloadFlags(payload);
-	return clean$1({
+	return stripUndefinedFields({
 		content: payload.content,
 		embeds: payload.embeds?.map((entry) => "serialize" in entry ? entry.serialize() : entry),
-		components: payload.components?.map((entry) => serializeAnyComponent(entry)),
+		components: payload.components?.map((entry) => "serialize" in entry ? entry.serialize() : entry),
 		allowed_mentions: payload.allowed_mentions ?? payload.allowedMentions,
 		flags,
 		tts: payload.tts,
@@ -881,7 +876,7 @@ var ComponentRegistry = class {
 				clearTimeout(existing.timer);
 				existing.resolve({
 					success: false,
-					message,
+					message: existing.message,
 					reason: "timed out"
 				});
 			}
@@ -995,6 +990,12 @@ var Guild = class extends Base {
 	get name() {
 		return this.rawDataValue?.name ?? "";
 	}
+	get icon() {
+		return this.rawDataValue?.icon;
+	}
+	get iconUrl() {
+		return this.icon ? `https://cdn.discordapp.com/icons/${this.id}/${this.icon}.png` : null;
+	}
 };
 var GuildMember = class extends Base {
 	constructor(client, rawData) {
@@ -1169,11 +1170,15 @@ var DiscordEntityCache = class {
 		const raw = data && typeof data === "object" ? data : {};
 		const channelUpdate = GatewayDispatchEvents.ChannelUpdate;
 		const channelDelete = GatewayDispatchEvents.ChannelDelete;
+		const threadUpdate = GatewayDispatchEvents.ThreadUpdate;
+		const threadDelete = GatewayDispatchEvents.ThreadDelete;
 		const guildUpdate = GatewayDispatchEvents.GuildUpdate;
+		const guildMemberAdd = GatewayDispatchEvents.GuildMemberAdd;
+		const guildMemberRemove = GatewayDispatchEvents.GuildMemberRemove;
 		const guildMemberUpdate = GatewayDispatchEvents.GuildMemberUpdate;
-		if (type === channelUpdate || type === channelDelete) this.deleteId("channel", raw.id);
+		if (type === channelUpdate || type === channelDelete || type === threadUpdate || type === threadDelete) this.deleteId("channel", raw.id);
 		if (type === guildUpdate) this.deleteId("guild", raw.id);
-		if (type === guildMemberUpdate) {
+		if (type === guildMemberAdd || type === guildMemberRemove || type === guildMemberUpdate) {
 			const guildId = raw.guild_id;
 			const user = raw.user && typeof raw.user === "object" ? raw.user : {};
 			if (typeof guildId === "string" && typeof user.id === "string") {
@@ -1360,9 +1365,6 @@ function isListenerTimeoutError(error) {
 }
 //#endregion
 //#region extensions/discord/src/internal/commands.ts
-function clean(value) {
-	return Object.fromEntries(Object.entries(value).filter(([, entry]) => entry !== void 0));
-}
 function resolveConditionalCommandOption(value, interaction) {
 	return typeof value === "function" ? value(interaction) : value;
 }
@@ -1382,12 +1384,9 @@ function findCommandOption(options, name) {
 	if (!name) return;
 	return options?.find((option) => option.name === name);
 }
-function hasCommandOptions(command) {
-	return "options" in command;
-}
 function resolveFocusedCommandOptionAutocompleteHandler(command, interaction) {
 	const focusedName = interaction.options.getFocused()?.name;
-	const autocomplete = findCommandOption("subcommands" in command && Array.isArray(command.subcommands) ? findSelectedSubcommand(command.subcommands, interaction)?.options : hasCommandOptions(command) ? command.options : void 0, focusedName)?.autocomplete;
+	const autocomplete = findCommandOption(command.commandKind === "group" ? findSelectedSubcommand(command.subcommands, interaction)?.options : command.options, focusedName)?.autocomplete;
 	return typeof autocomplete === "function" ? autocomplete : void 0;
 }
 var BaseCommand = class {
@@ -1402,7 +1401,7 @@ var BaseCommand = class {
 		];
 	}
 	serialize() {
-		return clean({
+		return stripUndefinedFields({
 			name: this.name,
 			name_localizations: this.nameLocalizations,
 			description: this.type === ApplicationCommandType.ChatInput ? this.description ?? "" : void 0,
@@ -1418,6 +1417,7 @@ var BaseCommand = class {
 var Command = class extends BaseCommand {
 	constructor(..._args) {
 		super(..._args);
+		this.commandKind = "leaf";
 		this.type = ApplicationCommandType.ChatInput;
 	}
 	async autocomplete(interaction) {
@@ -1439,6 +1439,7 @@ var Command = class extends BaseCommand {
 var CommandWithSubcommands = class extends BaseCommand {
 	constructor(..._args2) {
 		super(..._args2);
+		this.commandKind = "group";
 		this.type = ApplicationCommandType.ChatInput;
 	}
 	async run(interaction) {
@@ -1451,7 +1452,7 @@ var CommandWithSubcommands = class extends BaseCommand {
 		return await subcommand.run(interaction);
 	}
 	serializeOptions() {
-		return this.subcommands.map((command) => clean({
+		return this.subcommands.map((command) => stripUndefinedFields({
 			name: command.name,
 			name_localizations: command.nameLocalizations,
 			description: command.description ?? "",
@@ -1660,6 +1661,7 @@ var BaseInteraction = class {
 		this.rawData = rawData;
 		this.message = null;
 		this.response = new InteractionResponseController();
+		this.pendingResponse = Promise.resolve();
 		this.id = rawData.id;
 		this.token = rawData.token;
 		this.user = readInteractionUser(rawData, client);
@@ -1676,18 +1678,30 @@ var BaseInteraction = class {
 	set responseState(nextState) {
 		this.response.state = nextState;
 	}
-	async callback(type, data) {
-		this.response.recordCallback(type);
-		return await createInteractionCallback(this.client.rest, this.id, this.token, data === void 0 ? { type } : {
+	enqueueResponse(operation) {
+		const result = this.pendingResponse.then(operation);
+		this.pendingResponse = result.then(() => void 0, () => void 0);
+		return result;
+	}
+	async performCallback(type, data) {
+		if (this.response.acknowledged) throw new Error("Discord interaction has already been acknowledged.");
+		const result = await createInteractionCallback(this.client.rest, this.id, this.token, data === void 0 ? { type } : {
 			type,
 			data
 		});
+		this.response.recordCallback(type);
+		return result;
+	}
+	async callback(type, data) {
+		return await this.enqueueResponse(() => this.performCallback(type, data));
 	}
 	async reply(payload) {
-		const action = this.response.nextReplyAction();
-		if (action === "edit") return await this.editReply(payload);
-		if (action === "follow-up") return await this.followUp(payload);
-		return await this.callback(InteractionResponseType.ChannelMessageWithSource, serializePayload(payload));
+		return await this.enqueueResponse(async () => {
+			const action = this.response.nextReplyAction();
+			if (action === "edit") return await this.performReplyEdit(payload);
+			if (action === "follow-up") return await this.performFollowUp(payload);
+			return await this.performCallback(InteractionResponseType.ChannelMessageWithSource, serializePayload(payload));
+		});
 	}
 	async defer(options) {
 		return await this.callback(InteractionResponseType.DeferredChannelMessageWithSource, options?.ephemeral ? { flags: 64 } : void 0);
@@ -1696,6 +1710,9 @@ var BaseInteraction = class {
 		return await this.defer();
 	}
 	async editReply(payload) {
+		return await this.enqueueResponse(() => this.performReplyEdit(payload));
+	}
+	async performReplyEdit(payload) {
 		const body = serializePayload(payload);
 		const query = needsComponentsV2Query(body) ? { with_components: true } : void 0;
 		const result = query ? await editWebhookMessage(this.client.rest, this.client.options.clientId, this.token, "@original", { body }, query) : await editWebhookMessage(this.client.rest, this.client.options.clientId, this.token, "@original", { body });
@@ -1703,12 +1720,14 @@ var BaseInteraction = class {
 		return result;
 	}
 	async deleteReply() {
-		const result = await deleteWebhookMessage(this.client.rest, this.client.options.clientId, this.token, "@original");
-		this.response.recordReplyDelete();
-		return result;
+		return await this.enqueueResponse(async () => {
+			const result = await deleteWebhookMessage(this.client.rest, this.client.options.clientId, this.token, "@original");
+			this.response.recordReplyDelete();
+			return result;
+		});
 	}
 	async fetchReply() {
-		return await getWebhookMessage(this.client.rest, this.client.options.clientId, this.token, "@original");
+		return await this.enqueueResponse(() => getWebhookMessage(this.client.rest, this.client.options.clientId, this.token, "@original"));
 	}
 	async replyAndWaitForComponent(payload, timeoutMs = 3e5) {
 		const result = await this.reply(payload);
@@ -1718,6 +1737,9 @@ var BaseInteraction = class {
 		return await this.client.componentHandler.waitForMessageComponent(message, timeoutMs);
 	}
 	async followUp(payload) {
+		return await this.enqueueResponse(() => this.performFollowUp(payload));
+	}
+	async performFollowUp(payload) {
 		const body = serializePayload(payload);
 		return await createWebhookMessage(this.client.rest, this.client.options.clientId, this.token, { body }, needsComponentsV2Query(body) ? { with_components: true } : void 0);
 	}
@@ -1805,12 +1827,12 @@ async function dispatchInteraction(client, rawData) {
 			await optionAutocomplete(autocompleteInteraction);
 			return;
 		}
-		if ("autocomplete" in command) await command.autocomplete(autocompleteInteraction);
+		if (command.commandKind === "leaf") await command.autocomplete(autocompleteInteraction);
 		return;
 	}
 	if (rawData.type === InteractionType.ApplicationCommand) {
 		const command = client.commands.find((entry) => entry.name === readInteractionName(rawData));
-		if (command && "run" in command) {
+		if (command) {
 			await deferCommandInteractionIfNeeded(command, interaction);
 			await command.run(interaction);
 		}
@@ -1933,6 +1955,90 @@ function serializeRequestBody(data, headers) {
 //#endregion
 //#region extensions/discord/src/internal/rest-errors.ts
 const DISCORD_UNKNOWN_VOICE_STATE = 10065;
+const DISCORD_ERROR_BODY_MAX_DEPTH = 64;
+const DISCORD_ERROR_BODY_MAX_NODES = 1e4;
+const DISCORD_ERROR_BODY_MAX_DEPTH_MARKER = "[Discord error body redacted: maximum depth exceeded]";
+const DISCORD_ERROR_BODY_MAX_NODES_MARKER = "[Discord error body redacted: node limit exceeded]";
+const DISCORD_ERROR_BODY_PRIORITY_KEYS = /* @__PURE__ */ new Set([
+	"message",
+	"code",
+	"retry_after",
+	"global"
+]);
+const DISCORD_RATE_LIMIT_SCOPES = /* @__PURE__ */ new Set([
+	"user",
+	"global",
+	"shared"
+]);
+function isSensitiveDiscordErrorKey(key) {
+	return redactSensitiveFieldValue(key, "") !== "";
+}
+function reserveRedactedKey(key, usedKeys, collisionCounts) {
+	let count = (collisionCounts.get(key) ?? 0) + 1;
+	let candidate = count === 1 ? key : `${key} [${count}]`;
+	while (usedKeys.has(candidate)) {
+		count += 1;
+		candidate = `${key} [${count}]`;
+	}
+	collisionCounts.set(key, count);
+	usedKeys.add(candidate);
+	return candidate;
+}
+function redactDiscordErrorBody(body, fieldKey = "", sensitiveAncestorKey, state = {
+	seen: /* @__PURE__ */ new WeakSet(),
+	remainingNodes: DISCORD_ERROR_BODY_MAX_NODES
+}, depth = 0) {
+	if (state.remainingNodes <= 0) return DISCORD_ERROR_BODY_MAX_NODES_MARKER;
+	state.remainingNodes -= 1;
+	if (typeof body === "string") return redactSensitiveFieldValue(sensitiveAncestorKey ?? fieldKey, body);
+	if (sensitiveAncestorKey && (typeof body === "number" || typeof body === "boolean" || typeof body === "bigint")) return redactSensitiveFieldValue(sensitiveAncestorKey, String(body));
+	if (!body || typeof body !== "object") return body;
+	if (depth >= DISCORD_ERROR_BODY_MAX_DEPTH) return DISCORD_ERROR_BODY_MAX_DEPTH_MARKER;
+	if (state.seen.has(body)) return "[Circular]";
+	state.seen.add(body);
+	let redacted;
+	if (Array.isArray(body)) {
+		const items = [];
+		for (const entry of body) {
+			if (state.remainingNodes <= 0) {
+				items.push(DISCORD_ERROR_BODY_MAX_NODES_MARKER);
+				break;
+			}
+			items.push(redactDiscordErrorBody(entry, fieldKey, sensitiveAncestorKey, state, depth + 1));
+		}
+		redacted = items;
+	} else {
+		const usedKeys = /* @__PURE__ */ new Set();
+		const collisionCounts = /* @__PURE__ */ new Map();
+		const entries = [];
+		const appendEntry = (nestedKey) => {
+			if (state.remainingNodes <= 0) return false;
+			const outputKey = reserveRedactedKey(redactSensitiveFieldValue(sensitiveAncestorKey ?? "", nestedKey), usedKeys, collisionCounts);
+			const nestedSensitiveKey = isSensitiveDiscordErrorKey(nestedKey) ? nestedKey : sensitiveAncestorKey;
+			entries.push([outputKey, redactDiscordErrorBody(body[nestedKey], nestedKey, nestedSensitiveKey, state, depth + 1)]);
+			return true;
+		};
+		let truncated = false;
+		for (const priorityKey of DISCORD_ERROR_BODY_PRIORITY_KEYS) if (Object.hasOwn(body, priorityKey) && !appendEntry(priorityKey)) {
+			truncated = true;
+			break;
+		}
+		if (!truncated) for (const nestedKey in body) {
+			if (!Object.hasOwn(body, nestedKey) || DISCORD_ERROR_BODY_PRIORITY_KEYS.has(nestedKey)) continue;
+			if (!appendEntry(nestedKey)) {
+				truncated = true;
+				break;
+			}
+		}
+		if (truncated) {
+			const markerKey = reserveRedactedKey(DISCORD_ERROR_BODY_MAX_NODES_MARKER, usedKeys, collisionCounts);
+			entries.push([markerKey, DISCORD_ERROR_BODY_MAX_NODES_MARKER]);
+		}
+		redacted = Object.fromEntries(entries);
+	}
+	state.seen.delete(body);
+	return redacted;
+}
 function readDiscordCode(body) {
 	return parseStrictNonNegativeInteger(body && typeof body === "object" && "code" in body ? body.code : void 0);
 }
@@ -1946,14 +2052,24 @@ function isUnknownDiscordVoiceStateError(err) {
 function readRetryAfter(body, response, fallbackSeconds = 0) {
 	return parseDiscordRetryAfterBodySeconds(body && typeof body === "object" && "retry_after" in body ? body.retry_after : void 0) ?? parseRetryAfterHeaderSeconds(response.headers.get("Retry-After")) ?? fallbackSeconds;
 }
+function readDiscordRateLimitBucket(response) {
+	const value = response.headers.get("X-RateLimit-Bucket")?.trim();
+	return value ? redactIdentifier(value, { len: 32 }) : null;
+}
+function readDiscordRateLimitScope(response) {
+	const value = response.headers.get("X-RateLimit-Scope");
+	return value && DISCORD_RATE_LIMIT_SCOPES.has(value) ? value : null;
+}
 var DiscordError = class extends Error {
 	constructor(response, body) {
-		super(readDiscordMessage(body, `Discord API request failed (${response.status})`));
+		const redactedMessage = redactSensitiveFieldValue("message", readDiscordMessage(body, `Discord API request failed (${response.status})`));
+		const redactedBody = redactDiscordErrorBody(body);
+		super(redactedMessage);
 		this.name = "DiscordError";
 		this.status = response.status;
 		this.statusCode = response.status;
-		this.rawBody = body;
-		this.rawError = body;
+		this.rawBody = redactedBody;
+		this.rawError = redactedBody;
 		this.discordCode = readDiscordCode(body);
 	}
 };
@@ -1962,21 +2078,30 @@ var RateLimitError = class extends DiscordError {
 		super(response, body);
 		this.name = "RateLimitError";
 		this.retryAfter = readRetryAfter(body, response, 1);
-		this.scope = body.global ? "global" : response.headers.get("X-RateLimit-Scope");
-		this.bucket = response.headers.get("X-RateLimit-Bucket");
+		this.scope = body.global ? "global" : readDiscordRateLimitScope(response);
+		this.bucket = readDiscordRateLimitBucket(response);
 	}
 };
 //#endregion
 //#region extensions/discord/src/internal/rest-routes.ts
 const RATE_LIMIT_HEADER_NUMBER_RE = /^\d+(?:\.\d+)?$/;
+const DISCORD_ROUTE_IDENTIFIER_HASH_LENGTH = 32;
+function redactWebhookTokenInPath(path) {
+	const hasLeadingSlash = path.startsWith("/");
+	const segments = path.replace(/^\/+/, "").split("/");
+	if (segments[0] !== "webhooks" || !segments[1] || !segments[2]) return path;
+	segments[2] = redactIdentifier(segments[2], { len: DISCORD_ROUTE_IDENTIFIER_HASH_LENGTH });
+	return `${hasLeadingSlash ? "/" : ""}${segments.join("/")}`;
+}
 function createRouteKey(method, path) {
-	return `${method.toUpperCase()} ${path.split("?")[0] ?? path}`;
+	const pathname = path.split("?")[0] ?? path;
+	return `${method.toUpperCase()} ${redactWebhookTokenInPath(pathname)}`;
 }
 function readTopLevelRouteKey(path) {
 	const [pathname = path] = path.split("?");
 	const [first, id, token] = pathname.replace(/^\/+/, "").split("/");
 	if (!first || !id) return pathname;
-	if (first === "channels" || first === "guilds" || first === "webhooks") return first === "webhooks" && token ? `${first}/${id}/${token}` : `${first}/${id}`;
+	if (first === "channels" || first === "guilds" || first === "webhooks") return first === "webhooks" && token ? `${first}/${id}/${redactIdentifier(token, { len: DISCORD_ROUTE_IDENTIFIER_HASH_LENGTH })}` : `${first}/${id}`;
 	return first;
 }
 function createBucketKey(bucket, path) {
@@ -2198,7 +2323,7 @@ var RestScheduler = class {
 		return target;
 	}
 	updateRateLimitState(routeKey, path, response, parsed) {
-		const bucketHeader = response.headers.get("X-RateLimit-Bucket");
+		const bucketHeader = readDiscordRateLimitBucket(response);
 		const bucket = bucketHeader ? this.bindRouteToBucket(routeKey, createBucketKey(bucketHeader, path)) : this.getBucket(this.routeBuckets.get(routeKey) ?? routeKey);
 		bucket.bucket = bucketHeader ?? bucket.bucket;
 		const limit = readHeaderNumber(response.headers, "X-RateLimit-Limit");
@@ -2227,7 +2352,7 @@ var RestScheduler = class {
 			status: response.status
 		});
 		this.pruneInvalidRequests(now);
-		const bucketHeader = response.headers.get("X-RateLimit-Bucket");
+		const bucketHeader = readDiscordRateLimitBucket(response);
 		const bucketKey = bucketHeader ? createBucketKey(bucketHeader, path) : this.routeBuckets.get(routeKey) ?? routeKey;
 		const bucket = this.buckets.get(bucketKey);
 		if (bucket) bucket.invalidRequests += 1;
@@ -2440,9 +2565,9 @@ var RequestClient = class {
 		this.options = normalizeRequestClientOptions(options);
 		this.scheduler = new RestScheduler({
 			lanes: normalizeSchedulerLanes(this.options.maxQueueSize, this.options.scheduler?.lanes),
-			maxConcurrency: normalizeIntegerOption(this.options.scheduler?.maxConcurrency, DEFAULT_MAX_CONCURRENT_WORKERS, { min: 1 }),
+			maxConcurrency: resolveIntegerOption(this.options.scheduler?.maxConcurrency, DEFAULT_MAX_CONCURRENT_WORKERS, { min: 1 }),
 			maxQueueSize: this.options.maxQueueSize,
-			maxRateLimitRetries: normalizeIntegerOption(this.options.scheduler?.maxRateLimitRetries, 3, { min: 0 })
+			maxRateLimitRetries: resolveIntegerOption(this.options.scheduler?.maxRateLimitRetries, 3, { min: 0 })
 		}, async (request) => await this.executeRequest(request.method, request.path, {
 			data: request.data,
 			query: request.query
@@ -2540,10 +2665,6 @@ var RequestClient = class {
 		this.requestControllers.clear();
 	}
 };
-function normalizeIntegerOption(value, fallback, params) {
-	const candidate = parseFiniteNumber(value) ?? fallback;
-	return Math.max(params.min, Math.floor(candidate));
-}
 function normalizeRequestClientOptions(options) {
 	const merged = {
 		...defaultOptions,
@@ -2551,13 +2672,13 @@ function normalizeRequestClientOptions(options) {
 	};
 	return {
 		...merged,
-		apiVersion: normalizeIntegerOption(merged.apiVersion, defaultOptions.apiVersion, { min: 1 }),
+		apiVersion: resolveIntegerOption(merged.apiVersion, defaultOptions.apiVersion, { min: 1 }),
 		timeout: clampTimerTimeoutMs(merged.timeout, 1) ?? resolveTimerTimeoutMs(defaultOptions.timeout, 1),
-		maxQueueSize: normalizeIntegerOption(merged.maxQueueSize, defaultOptions.maxQueueSize, { min: 1 })
+		maxQueueSize: resolveIntegerOption(merged.maxQueueSize, defaultOptions.maxQueueSize, { min: 1 })
 	};
 }
 function normalizeSchedulerLanes(maxQueueSize, lanes) {
-	const fallbackMaxQueueSize = normalizeIntegerOption(maxQueueSize, defaultOptions.maxQueueSize, { min: 1 });
+	const fallbackMaxQueueSize = resolveIntegerOption(maxQueueSize, defaultOptions.maxQueueSize, { min: 1 });
 	return {
 		critical: normalizeSchedulerLane("critical", fallbackMaxQueueSize, lanes?.critical),
 		standard: normalizeSchedulerLane("standard", fallbackMaxQueueSize, lanes?.standard),
@@ -2566,11 +2687,11 @@ function normalizeSchedulerLanes(maxQueueSize, lanes) {
 }
 function normalizeSchedulerLane(lane, maxQueueSize, options) {
 	const defaults = defaultLaneOptions[lane];
-	const staleAfterMs = options?.staleAfterMs !== void 0 ? normalizeIntegerOption(options.staleAfterMs, defaults.staleAfterMs ?? 0, { min: 0 }) : defaults.staleAfterMs;
+	const staleAfterMs = options?.staleAfterMs !== void 0 ? resolveIntegerOption(options.staleAfterMs, defaults.staleAfterMs ?? 0, { min: 0 }) : defaults.staleAfterMs;
 	return {
-		maxQueueSize: options?.maxQueueSize !== void 0 ? normalizeIntegerOption(options.maxQueueSize, maxQueueSize, { min: 1 }) : maxQueueSize,
+		maxQueueSize: options?.maxQueueSize !== void 0 ? resolveIntegerOption(options.maxQueueSize, maxQueueSize, { min: 1 }) : maxQueueSize,
 		...staleAfterMs !== void 0 ? { staleAfterMs } : {},
-		weight: options?.weight !== void 0 ? normalizeIntegerOption(options.weight, defaults.weight, { min: 1 }) : defaults.weight
+		weight: options?.weight !== void 0 ? resolveIntegerOption(options.weight, defaults.weight, { min: 1 }) : defaults.weight
 	};
 }
 function getRequestPriority(method, path) {
@@ -2744,6 +2865,12 @@ var ThreadUpdateListener = class extends BaseListener {
 		this.type = GatewayDispatchEvents.ThreadUpdate;
 	}
 };
+var ThreadDeleteListener = class extends BaseListener {
+	constructor(..._args12) {
+		super(..._args12);
+		this.type = GatewayDispatchEvents.ThreadDelete;
+	}
+};
 //#endregion
 //#region extensions/discord/src/internal/discord.ts
 var discord_exports = /* @__PURE__ */ __exportAll({
@@ -2797,6 +2924,7 @@ var discord_exports = /* @__PURE__ */ __exportAll({
 	StringSelectMenuInteraction: () => StringSelectMenuInteraction,
 	TextDisplay: () => TextDisplay,
 	TextInput: () => TextInput,
+	ThreadDeleteListener: () => ThreadDeleteListener,
 	ThreadUpdateListener: () => ThreadUpdateListener,
 	Thumbnail: () => Thumbnail,
 	User: () => User,
@@ -2839,6 +2967,7 @@ var discord_exports = /* @__PURE__ */ __exportAll({
 	getThreadMember: () => getThreadMember,
 	getUser: () => getUser,
 	getWebhookMessage: () => getWebhookMessage,
+	hasDiscordV2Components: () => hasDiscordV2Components,
 	isUnknownDiscordVoiceStateError: () => isUnknownDiscordVoiceStateError,
 	listApplicationCommands: () => listApplicationCommands,
 	listChannelArchivedThreads: () => listChannelArchivedThreads,
@@ -2869,55 +2998,6 @@ 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;
@@ -3224,4 +3304,101 @@ function rebalanceReasoningItalics(source, chunks, maxChars) {
 	return adjusted;
 }
 //#endregion
-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 };
+//#region extensions/discord/src/retry.ts
+const DISCORD_RETRY_DEFAULTS = {
+	attempts: 3,
+	minDelayMs: 500,
+	maxDelayMs: 3e4,
+	jitter: .1
+};
+const DISCORD_GATEWAY_RECONNECT_EXTRA_ATTEMPTS = 2;
+const DISCORD_TRANSIENT_MESSAGE_RE = /\b(?:bad gateway|fetch failed|network error|networkerror|service unavailable|socket hang up|temporarily unavailable|timed out|timeout)\b|connection (?:closed|reset|refused)/i;
+const ambiguousDiscordMessageCreates = /* @__PURE__ */ new WeakSet();
+function readDiscordErrorStatus(err) {
+	if (!err || typeof err !== "object") return;
+	return parseStrictNonNegativeInteger("status" in err && err.status !== void 0 ? err.status : "statusCode" in err && err.statusCode !== void 0 ? err.statusCode : void 0);
+}
+function classifyDiscordDeliveryFailure(error) {
+	const candidates = collectErrorGraphCandidates(error, (current) => [current.cause, current.error]);
+	for (const candidate of candidates) {
+		const status = readDiscordErrorStatus(candidate);
+		if (status !== void 0) {
+			if (status === 408 || status >= 500) return "ambiguous";
+			if (status >= 400) return "rejected";
+		}
+	}
+	if (candidates.some((candidate) => readErrorName(candidate) === "AbortError" || classifyTransientNetworkErrorCode(extractErrorCode(candidate)) === "ambiguous")) return "ambiguous";
+	if (candidates.some((candidate) => classifyTransientNetworkErrorCode(extractErrorCode(candidate)) === "pre-connect")) return "pre-connect";
+	return candidates.some((candidate) => (candidate instanceof Error || candidate !== null && typeof candidate === "object") && DISCORD_TRANSIENT_MESSAGE_RE.test(formatErrorMessage(candidate))) ? "ambiguous" : "unknown";
+}
+function recordDiscordMessageCreateAmbiguity(error) {
+	if (error !== null && typeof error === "object") ambiguousDiscordMessageCreates.add(error);
+}
+function hasDiscordMessageCreateAmbiguity(error) {
+	return collectErrorGraphCandidates(error, (current) => [current.cause, current.error]).some((candidate) => candidate !== null && typeof candidate === "object" && ambiguousDiscordMessageCreates.has(candidate));
+}
+function hasDiscordRateLimitRejection(error) {
+	return error instanceof RateLimitError || collectErrorGraphCandidates(error, (current) => [current.cause, current.error]).some((candidate) => readDiscordErrorStatus(candidate) === 429);
+}
+function isRetryableDiscordTransientError(error) {
+	const failure = classifyDiscordDeliveryFailure(error);
+	return failure === "ambiguous" || failure === "pre-connect" || hasDiscordRateLimitRejection(error);
+}
+function isRetryableDiscordPreConnectError(error) {
+	const failure = classifyDiscordDeliveryFailure(error);
+	return failure === "pre-connect" || failure === "rejected" && hasDiscordRateLimitRejection(error);
+}
+function resolveDiscordRetryPredicate(safety) {
+	return safety === "non-idempotent-create" ? isRetryableDiscordPreConnectError : isRetryableDiscordTransientError;
+}
+function isRetryableDiscordGatewayTransportError(err) {
+	if (!isRetryableDiscordTransientError(err) || err instanceof RateLimitError) return false;
+	return !collectErrorGraphCandidates(err, (current) => [current.cause, current.error]).some((candidate) => readDiscordErrorStatus(candidate) !== void 0);
+}
+function createDiscordRetryRunner(params) {
+	const retryConfig = resolveRetryConfig(DISCORD_RETRY_DEFAULTS, params.retry);
+	const attempts = retryConfig.attempts > 1 ? retryConfig.attempts + DISCORD_GATEWAY_RECONNECT_EXTRA_ATTEMPTS : retryConfig.attempts;
+	return (fn, label, options) => {
+		const isRetryable = resolveDiscordRetryPredicate(options?.safety ?? "idempotent");
+		let observedGatewayDisconnect = false;
+		const runRequest = async () => {
+			if (params.signal?.aborted) throw params.signal.reason instanceof Error ? params.signal.reason : /* @__PURE__ */ new Error("Discord request aborted");
+			observedGatewayDisconnect ||= params.isGatewayDisconnected?.() === true;
+			try {
+				return await fn();
+			} catch (err) {
+				observedGatewayDisconnect ||= params.isGatewayDisconnected?.() === true;
+				throw err;
+			}
+		};
+		const shouldRetry = (err, attempt) => isRetryable(err) && (attempt < retryConfig.attempts || observedGatewayDisconnect && isRetryableDiscordGatewayTransportError(err));
+		const retryAfterMs = (err) => err instanceof RateLimitError ? err.retryAfter * 1e3 : void 0;
+		const signal = params.signal;
+		if (signal) return retryAsync(runRequest, {
+			...retryConfig,
+			attempts,
+			label,
+			shouldRetry,
+			retryAfterMs,
+			sleep: async (delayMs) => {
+				try {
+					await sleepWithAbort(delayMs, signal);
+				} catch (error) {
+					throw signal.aborted && signal.reason instanceof Error ? signal.reason : error;
+				}
+			}
+		});
+		return createChannelApiRetryRunner({
+			retry: {
+				...retryConfig,
+				attempts
+			},
+			shouldRetry,
+			strictShouldRetry: true,
+			retryAfterMs,
+			verbose: params.verbose
+		})(runRequest, label);
+	};
+}
+//#endregion
+export { MediaGallery as $, timeoutGuildMember as $t, RateLimitError as A, pinChannelMessage as At, hasDiscordV2Components as B, deleteChannelPermission as Bt, ThreadDeleteListener as C, editChannelMessage as Ct, Plugin as D, listChannelArchivedThreads as Dt, Client as E, getThreadMember as Et, Command as F, createGuildBan as Ft, Modal as G, listGuildChannels as Gt, Embed as H, getGuildMember as Ht, CommandWithSubcommands as I, createGuildChannel as It, Button as J, listGuildScheduledEvents as Jt, RadioGroup as K, listGuildEmojis as Kt, Guild as L, createGuildEmoji as Lt, readDiscordCode as M, sendChannelTyping as Mt, readDiscordMessage as N, unpinChannelMessage as Nt, RequestClient as O, listChannelMessages as Ot, readRetryAfter as P, addGuildMemberRole as Pt, LinkButton as Q, removeGuildMemberRole as Qt, Message as R, createGuildScheduledEvent as Rt, ResumedListener as S, editChannel as St, VoiceStateUpdateListener as T, getChannelMessage as Tt, CheckboxGroup as U, getGuildVoiceState as Ut, serializePayload as V, getGuild as Vt, Label as W, listGuildActiveThreads as Wt, Container as X, putChannelPermission as Xt, ChannelSelectMenu as Y, moveGuildChannels as Yt, File as Z, removeGuildMember as Zt, MessageCreateListener as _, listMessageReactionUsers as _t, chunkDiscordTextWithMode as a, StringSelectMenu as at, PresenceUpdateListener as b, deleteChannel as bt, resolveDiscordReplyReference as c, UserSelectMenu as ct, normalizeDiscordMessagingTarget as d, stripUndefinedFields as dt, __exportAll as en, MentionableSelectMenu as et, normalizeDiscordOutboundTarget as f, createChannelWebhook as ft, InteractionCreateListener as g, deleteOwnMessageReaction as gt, GuildDeleteListener as h, createOwnMessageReaction as ht, recordDiscordMessageCreateAmbiguity as i, Separator as it, isUnknownDiscordVoiceStateError as j, searchGuildMessages as jt, DiscordError as k, listChannelPins as kt, allowFromContainsDiscordUserId as l, BaseMessageInteractiveComponent as lt, GuildCreateListener as m, getCurrentUser as mt, createDiscordRetryRunner as n, Row as nt, createReusableDiscordReplyReference as o, TextDisplay as ot, discord_exports as p, createUserDmChannel as pt, TextInput as q, listGuildRoles as qt, hasDiscordMessageCreateAmbiguity as r, Section as rt, resolveDiscordReplyMessageId as s, Thumbnail as st, classifyDiscordDeliveryFailure as t, RoleSelectMenu as tt, looksLikeDiscordTargetId as u, parseCustomId as ut, MessageReactionAddListener as v, createChannelMessage as vt, ThreadUpdateListener as w, getChannel as wt, ReadyListener as x, deleteChannelMessage as xt, MessageReactionRemoveListener as y, createThread as yt, User as z, createGuildSticker as zt };