commandkit 1.2.3 → 1.2.5

package/dist/{commandkit-CO4Ob2Dw.js → commandkit-BMeeFmdY.js}

@@ -1,32 +1,32 @@
-const require_rolldown_runtime = require('./rolldown-runtime-C_NdSu1c.js');
-const require_utils_colors = require('./utils/colors.js');
-require('./components/interactive/action-row/ActionRow.js');
-const require_utils_error_codes = require('./utils/error-codes.js');
-const require_plugins_CompilerPlugin = require('./plugins/CompilerPlugin.js');
-const require_plugins_RuntimePlugin = require('./plugins/RuntimePlugin.js');
-const require_utils_constants = require('./utils/constants.js');
-const require_utils_resolve_file_url = require('./utils/resolve-file-url.js');
-const require_config_utils = require('./config/utils.js');
-const require_utils_warning = require('./utils/warning.js');
-const require_components_common_EventInterceptor = require('./components/common/EventInterceptor.js');
-const require_utils_types_package = require('./utils/types-package.js');
-const require_analytics_constants = require('./analytics/constants.js');
-const require_app_events_EventWorkerContext = require('./app/events/EventWorkerContext.js');
-const require_app_interrupt_signals = require('./app/interrupt/signals.js');
-const require_app_commands_helpers = require('./app/commands/helpers.js');
-const require_app_commands_MessageCommandParser = require('./app/commands/MessageCommandParser.js');
-const require_app_router_CommandsRouter = require('./app/router/CommandsRouter.js');
-const require_app_router_EventsRouter = require('./app/router/EventsRouter.js');
-const require_app_router_TreeArtifact = require('./app/router/TreeArtifact.js');
-require('./app/router/index.js');
-const require_version = require('./version.js');
-require('./components/display/file.js');
-require('./components/display/separator.js');
-require('./components/display/text-display.js');
-require('./components/display/poll.js');
-const require_cli_common = require('./cli/common.js');
-const require_events_CommandKitEventsChannel = require('./events/CommandKitEventsChannel.js');
-const require_flags_store = require('./flags/store.js');
+const require_rolldown_runtime = require("./rolldown-runtime-AN5ru5iW.js");
+const require_utils_colors = require("./utils/colors.js");
+require("./components/interactive/action-row/ActionRow.js");
+const require_utils_error_codes = require("./utils/error-codes.js");
+const require_plugins_CompilerPlugin = require("./plugins/CompilerPlugin.js");
+const require_plugins_RuntimePlugin = require("./plugins/RuntimePlugin.js");
+const require_utils_constants = require("./utils/constants.js");
+const require_utils_resolve_file_url = require("./utils/resolve-file-url.js");
+const require_config_utils = require("./config/utils.js");
+const require_utils_warning = require("./utils/warning.js");
+const require_components_common_EventInterceptor = require("./components/common/EventInterceptor.js");
+const require_utils_types_package = require("./utils/types-package.js");
+const require_analytics_constants = require("./analytics/constants.js");
+const require_app_events_EventWorkerContext = require("./app/events/EventWorkerContext.js");
+const require_app_interrupt_signals = require("./app/interrupt/signals.js");
+const require_app_commands_helpers = require("./app/commands/helpers.js");
+const require_app_commands_MessageCommandParser = require("./app/commands/MessageCommandParser.js");
+const require_app_router_CommandsRouter = require("./app/router/CommandsRouter.js");
+const require_app_router_EventsRouter = require("./app/router/EventsRouter.js");
+const require_app_router_TreeArtifact = require("./app/router/TreeArtifact.js");
+require("./app/router/index.js");
+const require_version = require("./version.js");
+require("./components/display/file.js");
+require("./components/display/separator.js");
+require("./components/display/text-display.js");
+require("./components/display/poll.js");
+const require_cli_common = require("./cli/common.js");
+const require_events_CommandKitEventsChannel = require("./events/CommandKitEventsChannel.js");
+const require_flags_store = require("./flags/store.js");
 let node_events = require("node:events");
 node_events = require_rolldown_runtime.__toESM(node_events);
 let discord_js = require("discord.js");
@@ -125,7 +125,7 @@ var ButtonKit = class extends discord_js.ButtonBuilder {
 	#onClickHandler = null;
 	#contextData = {
 		autoReset: true,
-		time: 300 * 1e3,
+		time: 3e5,
 		once: false
 	};
 	#unsub = null;
@@ -168,7 +168,7 @@ var ButtonKit = class extends discord_js.ButtonBuilder {
 			var _this$contextData, _this$contextData2, _this$contextData3, _this$contextData4;
 			this.#contextData = {
 				autoReset: data.autoReset ?? ((_this$contextData = this.#contextData) === null || _this$contextData === void 0 ? void 0 : _this$contextData.autoReset) ?? true,
-				time: data.time ?? ((_this$contextData2 = this.#contextData) === null || _this$contextData2 === void 0 ? void 0 : _this$contextData2.time) ?? 300 * 1e3,
+				time: data.time ?? ((_this$contextData2 = this.#contextData) === null || _this$contextData2 === void 0 ? void 0 : _this$contextData2.time) ?? 3e5,
 				filter: data.filter ?? ((_this$contextData3 = this.#contextData) === null || _this$contextData3 === void 0 ? void 0 : _this$contextData3.filter),
 				onEnd: data.onEnd ?? ((_this$contextData4 = this.#contextData) === null || _this$contextData4 === void 0 ? void 0 : _this$contextData4.onEnd)
 			};
@@ -201,7 +201,7 @@ var ButtonKit = class extends discord_js.ButtonBuilder {
 	filter(predicate) {
 		this.#contextData ??= {
 			autoReset: true,
-			time: 300 * 1e3
+			time: 3e5
 		};
 		this.#contextData.filter = predicate;
 		return this;
@@ -280,7 +280,7 @@ var ModalKit = class extends discord_js.ModalBuilder {
 	#onSubmitHandler = null;
 	#contextData = {
 		autoReset: false,
-		time: 300 * 1e3,
+		time: 3e5,
 		once: true
 	};
 	#unsub = null;
@@ -314,7 +314,7 @@ var ModalKit = class extends discord_js.ModalBuilder {
 			var _this$contextData, _this$contextData2, _this$contextData3, _this$contextData4;
 			this.#contextData = {
 				autoReset: data.autoReset ?? ((_this$contextData = this.#contextData) === null || _this$contextData === void 0 ? void 0 : _this$contextData.autoReset) ?? true,
-				time: data.time ?? ((_this$contextData2 = this.#contextData) === null || _this$contextData2 === void 0 ? void 0 : _this$contextData2.time) ?? 300 * 1e3,
+				time: data.time ?? ((_this$contextData2 = this.#contextData) === null || _this$contextData2 === void 0 ? void 0 : _this$contextData2.time) ?? 3e5,
 				filter: data.filter ?? ((_this$contextData3 = this.#contextData) === null || _this$contextData3 === void 0 ? void 0 : _this$contextData3.filter),
 				onEnd: data.onEnd ?? ((_this$contextData4 = this.#contextData) === null || _this$contextData4 === void 0 ? void 0 : _this$contextData4.onEnd)
 			};
@@ -352,7 +352,7 @@ var ModalKit = class extends discord_js.ModalBuilder {
 	filter(predicate) {
 		this.#contextData ??= {
 			autoReset: true,
-			time: 300 * 1e3
+			time: 3e5
 		};
 		this.#contextData.filter = predicate;
 		return this;
@@ -583,7 +583,8 @@ function getSrcDir() {
 */
 function getCurrentDirectory() {
 	if (currentDir) return currentDir;
-	let root = (0, node_path.join)(require_utils_constants.COMMANDKIT_CWD, getSrcDir());
+	const src = getSrcDir();
+	let root = (0, node_path.join)(require_utils_constants.COMMANDKIT_CWD, src);
 	if (!(0, node_fs.existsSync)(root)) root = require_utils_constants.COMMANDKIT_CWD;
 	currentDir = root;
 	return root;
@@ -1137,7 +1138,7 @@ var MacroPlugin = class extends require_plugins_CompilerPlugin.CompilerPlugin {
 		if (!this.options.enabled) return null;
 		if (/\.json$/.test(params.id)) return null;
 		if (!params.code.includes("use macro")) return null;
-		const { contents } = await this.macroTransformer.transform(params.code, params.id);
+		const { code: contents } = await this.macroTransformer.transform(params.code, params.id);
 		return {
 			code: typeof contents === "string" ? contents : new TextDecoder().decode(contents),
 			map: null
@@ -1974,11 +1975,13 @@ async function beforeExecute(ctx) {
 		const channel = (interaction === null || interaction === void 0 ? void 0 : interaction.channel) ?? (message === null || message === void 0 ? void 0 : message.channel);
 		const embed = new discord_js.EmbedBuilder().setTitle(":x: Server-only command!").setDescription("This command can only be used in a server.").setColor("Red");
 		try {
-			if (channel === null || channel === void 0 ? void 0 : channel.isSendable()) if (interaction && interaction.isRepliable()) await interaction.reply({
-				embeds: [embed],
-				flags: discord_js.MessageFlags.Ephemeral
-			});
-			else await message.reply({ embeds: [embed] });
+			if (channel === null || channel === void 0 ? void 0 : channel.isSendable()) {
+				if (interaction && interaction.isRepliable()) await interaction.reply({
+					embeds: [embed],
+					flags: discord_js.MessageFlags.Ephemeral
+				});
+				else await message.reply({ embeds: [embed] });
+			}
 		} catch (error) {
 			Logger.error`Could not send 'Server-only command' DM to user ${(interaction === null || interaction === void 0 ? void 0 : interaction.user.id) ?? (message === null || message === void 0 ? void 0 : message.author.id)} for command ${command.command.name}: ${error}`;
 		}
@@ -2138,6 +2141,24 @@ var CommandRegistrar = class {
 		return json;
 	}
 	/**
+	* Keeps duplicate command names within a registration scope from invalidating
+	* the entire bulk overwrite request.
+	*/
+	deduplicateCommands(commands, scope) {
+		const seen = /* @__PURE__ */ new Set();
+		return commands.filter((command) => {
+			const type = command.type ?? discord_js.ApplicationCommandType.ChatInput;
+			const key = `${type}:${command.name.toLowerCase()}`;
+			if (seen.has(key)) {
+				const typeName = type === discord_js.ApplicationCommandType.ChatInput ? "chat-input" : type === discord_js.ApplicationCommandType.User ? "user context-menu" : type === discord_js.ApplicationCommandType.Message ? "message context-menu" : `type ${type}`;
+				Logger.warn`Skipping duplicate ${typeName} application command "${command.name}" in ${scope}; only the first definition will be registered.`;
+				return false;
+			}
+			seen.add(key);
+			return true;
+		});
+	}
+	/**
 	* Builds a top-level Discord payload for a hierarchical command root.
 	*/
 	buildHierarchicalRootPayload(rootNodeId, treeNodes, hierarchicalNodes) {
@@ -2277,7 +2298,8 @@ var CommandRegistrar = class {
 			return plugin.onBeforeRegisterGlobalCommands(ctx, preRegisterEvent);
 		});
 		try {
-			const data = await this.api.put(discord_js.Routes.applicationCommands(this.commandkit.client.user.id), { body: commands.map((c) => ({
+			const uniqueCommands = this.deduplicateCommands(commands, "global");
+			const data = await this.api.put(discord_js.Routes.applicationCommands(this.commandkit.client.user.id), { body: uniqueCommands.map((c) => ({
 				...c,
 				__metadata: void 0,
 				__applyId: void 0
@@ -2285,7 +2307,7 @@ var CommandRegistrar = class {
 			data.forEach((c) => {
 				var _cmd$__applyId;
 				if (!c.id) return;
-				const cmd = commands.find((co) => co.name === c.name && co.type === c.type);
+				const cmd = uniqueCommands.find((co) => co.name === c.name && co.type === c.type);
 				if (!cmd) return;
 				(_cmd$__applyId = cmd.__applyId) === null || _cmd$__applyId === void 0 || _cmd$__applyId.call(cmd, c.id);
 			});
@@ -2336,7 +2358,8 @@ var CommandRegistrar = class {
 					return plugin.onBeforeRegisterGuildCommands(ctx, preRegisterEvent);
 				});
 				if (prevented) continue;
-				const data = await this.api.put(discord_js.Routes.applicationGuildCommands(this.commandkit.client.user.id, guild), { body: guildCommands.map((b) => ({
+				const uniqueGuildCommands = this.deduplicateCommands(guildCommands, `guild ${guild}`);
+				const data = await this.api.put(discord_js.Routes.applicationGuildCommands(this.commandkit.client.user.id, guild), { body: uniqueGuildCommands.map((b) => ({
 					...b,
 					__metadata: void 0,
 					__applyId: void 0
@@ -2344,7 +2367,7 @@ var CommandRegistrar = class {
 				data.forEach((c) => {
 					var _cmd$__applyId2;
 					if (!c.id) return;
-					const cmd = commands.find((co) => co.name === c.name && co.type === c.type);
+					const cmd = uniqueGuildCommands.find((co) => co.name === c.name && co.type === c.type);
 					if (!cmd) return;
 					(_cmd$__applyId2 = cmd.__applyId) === null || _cmd$__applyId2 === void 0 || _cmd$__applyId2.call(cmd, c.id);
 				});
@@ -2525,8 +2548,10 @@ var AppCommandHandler = class {
 			bucket.flat.forEach((cmd) => {
 				const cmdPrefix = entryIndex === totalEntries - 1 && !hasChildren ? "└─" : "├─";
 				const name = cmd.data.command.name;
+				const contextMenuType = cmd.data.command.type;
+				const contextMenuLabel = contextMenuType === discord_js.ApplicationCommandType.User ? require_utils_colors.default.cyan(" [user context menu]") : contextMenuType === discord_js.ApplicationCommandType.Message ? require_utils_colors.default.cyan(" [message context menu]") : "";
 				const middlewareIcon = cmd.command.middlewares.length > 0 ? require_utils_colors.default.magenta(" (λ)") : "";
-				console.log(`${require_utils_colors.default.green(`${cmdIndent}${cmdPrefix}`)} ${require_utils_colors.default.yellow(name)}${middlewareIcon}`);
+				console.log(`${require_utils_colors.default.green(`${cmdIndent}${cmdPrefix}`)} ${require_utils_colors.default.yellow(name)}${contextMenuLabel}${middlewareIcon}`);
 				entryIndex++;
 			});
 			bucket.hierarchical.forEach((root) => {
@@ -2656,33 +2681,35 @@ var AppCommandHandler = class {
 		let parser;
 		let routeKey;
 		if (cmdName) routeKey = this.normalizeRouteKey(cmdName);
-		if (!routeKey) if (source instanceof discord_js.Message) {
-			if (source.author.bot) return null;
-			const prefix = await this.commandkit.appConfig.getMessageCommandPrefix(source);
-			if (!prefix || (typeof prefix === "string" || Array.isArray(prefix)) && !prefix.length) return null;
-			parser = new require_app_commands_MessageCommandParser.MessageCommandParser(source, prefix instanceof RegExp ? prefix : Array.isArray(prefix) ? prefix : [prefix], (command) => {
-				var _loadedCommand$metada, _loadedCommand$metada2, _json$options;
-				const loadedCommand = this.findCommandByRoute(command);
-				if (!loadedCommand) {
-					if (require_utils_constants.COMMANDKIT_IS_DEV && this.commandkit.config.showUnknownPrefixCommandsWarning) Logger.error`Prefix command "${command}" was not found.\nNote: This warning is only shown in development mode as an alert to help you find the command. If you wish to remove this warning, set \`showUnknownPrefixCommandsWarning\` to \`false\` in your commandkit config.`;
+		if (!routeKey) {
+			if (source instanceof discord_js.Message) {
+				if (source.author.bot) return null;
+				const prefix = await this.commandkit.appConfig.getMessageCommandPrefix(source);
+				if (!prefix || (typeof prefix === "string" || Array.isArray(prefix)) && !prefix.length) return null;
+				parser = new require_app_commands_MessageCommandParser.MessageCommandParser(source, prefix instanceof RegExp ? prefix : Array.isArray(prefix) ? prefix : [prefix], (command) => {
+					var _loadedCommand$metada, _loadedCommand$metada2, _json$options;
+					const loadedCommand = this.findCommandByRoute(command);
+					if (!loadedCommand) {
+						if (require_utils_constants.COMMANDKIT_IS_DEV && this.commandkit.config.showUnknownPrefixCommandsWarning) Logger.error`Prefix command "${command}" was not found.\nNote: This warning is only shown in development mode as an alert to help you find the command. If you wish to remove this warning, set \`showUnknownPrefixCommandsWarning\` to \`false\` in your commandkit config.`;
+						return null;
+					}
+					if (source.guildId && ((_loadedCommand$metada = loadedCommand.metadata) === null || _loadedCommand$metada === void 0 || (_loadedCommand$metada = _loadedCommand$metada.guilds) === null || _loadedCommand$metada === void 0 ? void 0 : _loadedCommand$metada.length) && !((_loadedCommand$metada2 = loadedCommand.metadata) === null || _loadedCommand$metada2 === void 0 ? void 0 : _loadedCommand$metada2.guilds.includes(source.guildId))) return null;
+					return ((_json$options = ("toJSON" in loadedCommand.data.command ? loadedCommand.data.command.toJSON() : loadedCommand.data.command).options) === null || _json$options === void 0 ? void 0 : _json$options.reduce((acc, opt) => {
+						acc[opt.name] = opt.type;
+						return acc;
+					}, {})) ?? {};
+				});
+				try {
+					routeKey = this.buildMessageRouteKey(parser);
+				} catch (e) {
+					if (require_utils_error_codes.isErrorType(e, require_utils_error_codes.CommandKitErrorCodes.InvalidCommandPrefix)) return null;
+					Logger.error`${e}`;
 					return null;
 				}
-				if (source.guildId && ((_loadedCommand$metada = loadedCommand.metadata) === null || _loadedCommand$metada === void 0 || (_loadedCommand$metada = _loadedCommand$metada.guilds) === null || _loadedCommand$metada === void 0 ? void 0 : _loadedCommand$metada.length) && !((_loadedCommand$metada2 = loadedCommand.metadata) === null || _loadedCommand$metada2 === void 0 ? void 0 : _loadedCommand$metada2.guilds.includes(source.guildId))) return null;
-				return ((_json$options = ("toJSON" in loadedCommand.data.command ? loadedCommand.data.command.toJSON() : loadedCommand.data.command).options) === null || _json$options === void 0 ? void 0 : _json$options.reduce((acc, opt) => {
-					acc[opt.name] = opt.type;
-					return acc;
-				}, {})) ?? {};
-			});
-			try {
-				routeKey = this.buildMessageRouteKey(parser);
-			} catch (e) {
-				if (require_utils_error_codes.isErrorType(e, require_utils_error_codes.CommandKitErrorCodes.InvalidCommandPrefix)) return null;
-				Logger.error`${e}`;
-				return null;
+			} else {
+				if (!(source.isChatInputCommand() || source.isAutocomplete() || source.isContextMenuCommand())) return null;
+				routeKey = this.buildInteractionRouteKey(source);
 			}
-		} else {
-			if (!(source.isChatInputCommand() || source.isAutocomplete() || source.isContextMenuCommand())) return null;
-			routeKey = this.buildInteractionRouteKey(source);
 		}
 		const hint = require_app_commands_helpers.isInteractionSource(source) ? source.isUserContextMenuCommand() ? "user" : source.isMessageContextMenuCommand() ? "message" : void 0 : void 0;
 		const loadedCommand = hint ? this.findCommandByName(routeKey, hint) : this.findCommandByRoute(routeKey);
@@ -2844,7 +2871,8 @@ var AppCommandHandler = class {
 		if (require_utils_constants.COMMANDKIT_IS_DEV) {
 			const commandNames = Array.from(this.runtimeRouteIndex.keys());
 			const aliases = Array.from(this.runtimeRouteIndex.values()).flatMap((v) => v.metadata.aliases || []);
-			await require_utils_types_package.rewriteCommandDeclaration(Array.from(/* @__PURE__ */ new Set([...commandNames, ...aliases])));
+			const allNames = Array.from(/* @__PURE__ */ new Set([...commandNames, ...aliases]));
+			await require_utils_types_package.rewriteCommandDeclaration(allNames);
 		}
 		await this.commandkit.plugins.execute((ctx, plugin) => {
 			return plugin.onAfterCommandsLoad(ctx);
@@ -3363,7 +3391,7 @@ var StringSelectMenuKit = class extends discord_js.StringSelectMenuBuilder {
 	#onSelectHandler = null;
 	#contextData = {
 		autoReset: false,
-		time: 300 * 1e3,
+		time: 3e5,
 		once: true
 	};
 	#unsub = null;
@@ -3397,7 +3425,7 @@ var StringSelectMenuKit = class extends discord_js.StringSelectMenuBuilder {
 			var _this$contextData, _this$contextData2, _this$contextData3, _this$contextData4;
 			this.#contextData = {
 				autoReset: data.autoReset ?? ((_this$contextData = this.#contextData) === null || _this$contextData === void 0 ? void 0 : _this$contextData.autoReset) ?? true,
-				time: data.time ?? ((_this$contextData2 = this.#contextData) === null || _this$contextData2 === void 0 ? void 0 : _this$contextData2.time) ?? 300 * 1e3,
+				time: data.time ?? ((_this$contextData2 = this.#contextData) === null || _this$contextData2 === void 0 ? void 0 : _this$contextData2.time) ?? 3e5,
 				filter: data.filter ?? ((_this$contextData3 = this.#contextData) === null || _this$contextData3 === void 0 ? void 0 : _this$contextData3.filter),
 				onEnd: data.onEnd ?? ((_this$contextData4 = this.#contextData) === null || _this$contextData4 === void 0 ? void 0 : _this$contextData4.onEnd)
 			};
@@ -3435,7 +3463,7 @@ var StringSelectMenuKit = class extends discord_js.StringSelectMenuBuilder {
 	filter(predicate) {
 		this.#contextData ??= {
 			autoReset: true,
-			time: 300 * 1e3
+			time: 3e5
 		};
 		this.#contextData.filter = predicate;
 		return this;
@@ -3488,7 +3516,7 @@ var ChannelSelectMenuKit = class extends discord_js.ChannelSelectMenuBuilder {
 	#onSelectHandler = null;
 	#contextData = {
 		autoReset: false,
-		time: 300 * 1e3,
+		time: 3e5,
 		once: true
 	};
 	#unsub = null;
@@ -3522,7 +3550,7 @@ var ChannelSelectMenuKit = class extends discord_js.ChannelSelectMenuBuilder {
 			var _this$contextData, _this$contextData2, _this$contextData3, _this$contextData4;
 			this.#contextData = {
 				autoReset: data.autoReset ?? ((_this$contextData = this.#contextData) === null || _this$contextData === void 0 ? void 0 : _this$contextData.autoReset) ?? true,
-				time: data.time ?? ((_this$contextData2 = this.#contextData) === null || _this$contextData2 === void 0 ? void 0 : _this$contextData2.time) ?? 300 * 1e3,
+				time: data.time ?? ((_this$contextData2 = this.#contextData) === null || _this$contextData2 === void 0 ? void 0 : _this$contextData2.time) ?? 3e5,
 				filter: data.filter ?? ((_this$contextData3 = this.#contextData) === null || _this$contextData3 === void 0 ? void 0 : _this$contextData3.filter),
 				onEnd: data.onEnd ?? ((_this$contextData4 = this.#contextData) === null || _this$contextData4 === void 0 ? void 0 : _this$contextData4.onEnd)
 			};
@@ -3560,7 +3588,7 @@ var ChannelSelectMenuKit = class extends discord_js.ChannelSelectMenuBuilder {
 	filter(predicate) {
 		this.#contextData ??= {
 			autoReset: true,
-			time: 300 * 1e3
+			time: 3e5
 		};
 		this.#contextData.filter = predicate;
 		return this;
@@ -3608,7 +3636,7 @@ var MentionableSelectMenuKit = class extends discord_js.MentionableSelectMenuBui
 	#onSelectHandler = null;
 	#contextData = {
 		autoReset: false,
-		time: 300 * 1e3,
+		time: 3e5,
 		once: true
 	};
 	#unsub = null;
@@ -3642,7 +3670,7 @@ var MentionableSelectMenuKit = class extends discord_js.MentionableSelectMenuBui
 			var _this$contextData, _this$contextData2, _this$contextData3, _this$contextData4;
 			this.#contextData = {
 				autoReset: data.autoReset ?? ((_this$contextData = this.#contextData) === null || _this$contextData === void 0 ? void 0 : _this$contextData.autoReset) ?? true,
-				time: data.time ?? ((_this$contextData2 = this.#contextData) === null || _this$contextData2 === void 0 ? void 0 : _this$contextData2.time) ?? 300 * 1e3,
+				time: data.time ?? ((_this$contextData2 = this.#contextData) === null || _this$contextData2 === void 0 ? void 0 : _this$contextData2.time) ?? 3e5,
 				filter: data.filter ?? ((_this$contextData3 = this.#contextData) === null || _this$contextData3 === void 0 ? void 0 : _this$contextData3.filter),
 				onEnd: data.onEnd ?? ((_this$contextData4 = this.#contextData) === null || _this$contextData4 === void 0 ? void 0 : _this$contextData4.onEnd)
 			};
@@ -3680,7 +3708,7 @@ var MentionableSelectMenuKit = class extends discord_js.MentionableSelectMenuBui
 	filter(predicate) {
 		this.#contextData ??= {
 			autoReset: true,
-			time: 300 * 1e3
+			time: 3e5
 		};
 		this.#contextData.filter = predicate;
 		return this;
@@ -3733,7 +3761,7 @@ var UserSelectMenuKit = class extends discord_js.UserSelectMenuBuilder {
 	#onSelectHandler = null;
 	#contextData = {
 		autoReset: false,
-		time: 300 * 1e3,
+		time: 3e5,
 		once: true
 	};
 	#unsub = null;
@@ -3767,7 +3795,7 @@ var UserSelectMenuKit = class extends discord_js.UserSelectMenuBuilder {
 			var _this$contextData, _this$contextData2, _this$contextData3, _this$contextData4;
 			this.#contextData = {
 				autoReset: data.autoReset ?? ((_this$contextData = this.#contextData) === null || _this$contextData === void 0 ? void 0 : _this$contextData.autoReset) ?? true,
-				time: data.time ?? ((_this$contextData2 = this.#contextData) === null || _this$contextData2 === void 0 ? void 0 : _this$contextData2.time) ?? 300 * 1e3,
+				time: data.time ?? ((_this$contextData2 = this.#contextData) === null || _this$contextData2 === void 0 ? void 0 : _this$contextData2.time) ?? 3e5,
 				filter: data.filter ?? ((_this$contextData3 = this.#contextData) === null || _this$contextData3 === void 0 ? void 0 : _this$contextData3.filter),
 				onEnd: data.onEnd ?? ((_this$contextData4 = this.#contextData) === null || _this$contextData4 === void 0 ? void 0 : _this$contextData4.onEnd)
 			};
@@ -3805,7 +3833,7 @@ var UserSelectMenuKit = class extends discord_js.UserSelectMenuBuilder {
 	filter(predicate) {
 		this.#contextData ??= {
 			autoReset: true,
-			time: 300 * 1e3
+			time: 3e5
 		};
 		this.#contextData.filter = predicate;
 		return this;
@@ -3858,7 +3886,7 @@ var RoleSelectMenuKit = class extends discord_js.RoleSelectMenuBuilder {
 	#onSelectHandler = null;
 	#contextData = {
 		autoReset: false,
-		time: 300 * 1e3,
+		time: 3e5,
 		once: true
 	};
 	#unsub = null;
@@ -3892,7 +3920,7 @@ var RoleSelectMenuKit = class extends discord_js.RoleSelectMenuBuilder {
 			var _this$contextData, _this$contextData2, _this$contextData3, _this$contextData4;
 			this.#contextData = {
 				autoReset: data.autoReset ?? ((_this$contextData = this.#contextData) === null || _this$contextData === void 0 ? void 0 : _this$contextData.autoReset) ?? true,
-				time: data.time ?? ((_this$contextData2 = this.#contextData) === null || _this$contextData2 === void 0 ? void 0 : _this$contextData2.time) ?? 300 * 1e3,
+				time: data.time ?? ((_this$contextData2 = this.#contextData) === null || _this$contextData2 === void 0 ? void 0 : _this$contextData2.time) ?? 3e5,
 				filter: data.filter ?? ((_this$contextData3 = this.#contextData) === null || _this$contextData3 === void 0 ? void 0 : _this$contextData3.filter),
 				onEnd: data.onEnd ?? ((_this$contextData4 = this.#contextData) === null || _this$contextData4 === void 0 ? void 0 : _this$contextData4.onEnd)
 			};
@@ -3930,7 +3958,7 @@ var RoleSelectMenuKit = class extends discord_js.RoleSelectMenuBuilder {
 	filter(predicate) {
 		this.#contextData ??= {
 			autoReset: true,
-			time: 300 * 1e3
+			time: 3e5
 		};
 		this.#contextData.filter = predicate;
 		return this;
@@ -4545,10 +4573,14 @@ var AppEventsHandler = class {
 	unregisterAllClientListeners() {
 		const client = this.commandkit.client;
 		for (const [key, { name, mainListener, onceListener, namespace }] of this.loadedEvents.entries()) {
-			if (mainListener) if (namespace) this.commandkit.events.off(namespace, name, mainListener.handler);
-			else client.off(name, mainListener.handler);
-			if (onceListener) if (namespace) this.commandkit.events.off(namespace, name, onceListener.handler);
-			else client.off(name, onceListener.handler);
+			if (mainListener) {
+				if (namespace) this.commandkit.events.off(namespace, name, mainListener.handler);
+				else client.off(name, mainListener.handler);
+			}
+			if (onceListener) {
+				if (namespace) this.commandkit.events.off(namespace, name, onceListener.handler);
+				else client.off(name, onceListener.handler);
+			}
 			this.loadedEvents.delete(key);
 			Logger.info(`🗑️ Unregistered event ${name}${namespace ? ` of namespace ${namespace}` : ""}`);
 		}
@@ -4636,10 +4668,7 @@ function registerDevHooks(commandkit) {
 					await commandkit.eventHandler.reloadEvents(path, changeType);
 					handled = true;
 					break;
-				case require_utils_constants.HMREventType.Unknown:
-					handled = false;
-					break;
-				default: break;
+				case require_utils_constants.HMREventType.Unknown: handled = false;
 			}
 		} finally {
 			if (id && process.send) process.send({
@@ -5035,7 +5064,7 @@ var CommandKit = class CommandKit extends node_events.default {
 		try {
 			const json = await (0, node_fs_promises.readFile)(artifactPath, "utf8");
 			const parsed = JSON.parse(json);
-			if (!require_app_router_TreeArtifact.validateRouterTreeArtifact(parsed, "1.2.3")) {
+			if (!require_app_router_TreeArtifact.validateRouterTreeArtifact(parsed, "1.2.5")) {
 				Logger.warn(`Ignoring router tree artifact at ${artifactPath}: schema/version mismatch. Falling back to dynamic filesystem resolution.`);
 				return false;
 			}
@@ -5114,556 +5143,556 @@ var CommandKit = class CommandKit extends node_events.default {
 const commandkit = CommandKit.instance || new CommandKit();
 
 //#endregion
-Object.defineProperty(exports, 'AnalyticsEngine', {
+Object.defineProperty(exports, "AnalyticsEngine", {
   enumerable: true,
   get: function () {
     return AnalyticsEngine;
   }
 });
-Object.defineProperty(exports, 'AppCommandHandler', {
+Object.defineProperty(exports, "AppCommandHandler", {
   enumerable: true,
   get: function () {
     return AppCommandHandler;
   }
 });
-Object.defineProperty(exports, 'AppCommandRunner', {
+Object.defineProperty(exports, "AppCommandRunner", {
   enumerable: true,
   get: function () {
     return AppCommandRunner;
   }
 });
-Object.defineProperty(exports, 'AppEventsHandler', {
+Object.defineProperty(exports, "AppEventsHandler", {
   enumerable: true,
   get: function () {
     return AppEventsHandler;
   }
 });
-Object.defineProperty(exports, 'Button', {
+Object.defineProperty(exports, "Button", {
   enumerable: true,
   get: function () {
     return Button;
   }
 });
-Object.defineProperty(exports, 'ButtonKit', {
+Object.defineProperty(exports, "ButtonKit", {
   enumerable: true,
   get: function () {
     return ButtonKit;
   }
 });
-Object.defineProperty(exports, 'ChannelSelectMenu', {
+Object.defineProperty(exports, "ChannelSelectMenu", {
   enumerable: true,
   get: function () {
     return ChannelSelectMenu;
   }
 });
-Object.defineProperty(exports, 'ChannelSelectMenuKit', {
+Object.defineProperty(exports, "ChannelSelectMenuKit", {
   enumerable: true,
   get: function () {
     return ChannelSelectMenuKit;
   }
 });
-Object.defineProperty(exports, 'Checkbox', {
+Object.defineProperty(exports, "Checkbox", {
   enumerable: true,
   get: function () {
     return Checkbox;
   }
 });
-Object.defineProperty(exports, 'CheckboxGroup', {
+Object.defineProperty(exports, "CheckboxGroup", {
   enumerable: true,
   get: function () {
     return CheckboxGroup;
   }
 });
-Object.defineProperty(exports, 'CheckboxGroupOption', {
+Object.defineProperty(exports, "CheckboxGroupOption", {
   enumerable: true,
   get: function () {
     return CheckboxGroupOption;
   }
 });
-Object.defineProperty(exports, 'CommandExecutionMode', {
+Object.defineProperty(exports, "CommandExecutionMode", {
   enumerable: true,
   get: function () {
     return CommandExecutionMode;
   }
 });
-Object.defineProperty(exports, 'CommandKit', {
+Object.defineProperty(exports, "CommandKit", {
   enumerable: true,
   get: function () {
     return CommandKit;
   }
 });
-Object.defineProperty(exports, 'CommandKitEnvironment', {
+Object.defineProperty(exports, "CommandKitEnvironment", {
   enumerable: true,
   get: function () {
     return CommandKitEnvironment;
   }
 });
-Object.defineProperty(exports, 'CommandKitEnvironmentType', {
+Object.defineProperty(exports, "CommandKitEnvironmentType", {
   enumerable: true,
   get: function () {
     return CommandKitEnvironmentType;
   }
 });
-Object.defineProperty(exports, 'CommandKitPluginRuntime', {
+Object.defineProperty(exports, "CommandKitPluginRuntime", {
   enumerable: true,
   get: function () {
     return CommandKitPluginRuntime;
   }
 });
-Object.defineProperty(exports, 'CommandRegistrar', {
+Object.defineProperty(exports, "CommandRegistrar", {
   enumerable: true,
   get: function () {
     return CommandRegistrar;
   }
 });
-Object.defineProperty(exports, 'CommonDirectiveTransformer', {
+Object.defineProperty(exports, "CommonDirectiveTransformer", {
   enumerable: true,
   get: function () {
     return CommonDirectiveTransformer;
   }
 });
-Object.defineProperty(exports, 'CompilerPluginRuntime', {
+Object.defineProperty(exports, "CompilerPluginRuntime", {
   enumerable: true,
   get: function () {
     return CompilerPluginRuntime;
   }
 });
-Object.defineProperty(exports, 'Container', {
+Object.defineProperty(exports, "Container", {
   enumerable: true,
   get: function () {
     return Container;
   }
 });
-Object.defineProperty(exports, 'Context', {
+Object.defineProperty(exports, "Context", {
   enumerable: true,
   get: function () {
     return Context;
   }
 });
-Object.defineProperty(exports, 'DefaultLogger', {
+Object.defineProperty(exports, "DefaultLogger", {
   enumerable: true,
   get: function () {
     return DefaultLogger;
   }
 });
-Object.defineProperty(exports, 'ElementType', {
+Object.defineProperty(exports, "ElementType", {
   enumerable: true,
   get: function () {
     return ElementType;
   }
 });
-Object.defineProperty(exports, 'FeatureFlag', {
+Object.defineProperty(exports, "FeatureFlag", {
   enumerable: true,
   get: function () {
     return FeatureFlag;
   }
 });
-Object.defineProperty(exports, 'FileUpload', {
+Object.defineProperty(exports, "FileUpload", {
   enumerable: true,
   get: function () {
     return FileUpload;
   }
 });
-Object.defineProperty(exports, 'Fragment', {
+Object.defineProperty(exports, "Fragment", {
   enumerable: true,
   get: function () {
     return Fragment;
   }
 });
-Object.defineProperty(exports, 'JsonSerialize', {
+Object.defineProperty(exports, "JsonSerialize", {
   enumerable: true,
   get: function () {
     return JsonSerialize;
   }
 });
-Object.defineProperty(exports, 'Label', {
+Object.defineProperty(exports, "Label", {
   enumerable: true,
   get: function () {
     return Label;
   }
 });
-Object.defineProperty(exports, 'Logger', {
+Object.defineProperty(exports, "Logger", {
   enumerable: true,
   get: function () {
     return Logger;
   }
 });
-Object.defineProperty(exports, 'MacroPlugin', {
+Object.defineProperty(exports, "MacroPlugin", {
   enumerable: true,
   get: function () {
     return MacroPlugin;
   }
 });
-Object.defineProperty(exports, 'MediaGallery', {
+Object.defineProperty(exports, "MediaGallery", {
   enumerable: true,
   get: function () {
     return MediaGallery;
   }
 });
-Object.defineProperty(exports, 'MediaGalleryItem', {
+Object.defineProperty(exports, "MediaGalleryItem", {
   enumerable: true,
   get: function () {
     return MediaGalleryItem;
   }
 });
-Object.defineProperty(exports, 'MentionableSelectMenu', {
+Object.defineProperty(exports, "MentionableSelectMenu", {
   enumerable: true,
   get: function () {
     return MentionableSelectMenu;
   }
 });
-Object.defineProperty(exports, 'MentionableSelectMenuKit', {
+Object.defineProperty(exports, "MentionableSelectMenuKit", {
   enumerable: true,
   get: function () {
     return MentionableSelectMenuKit;
   }
 });
-Object.defineProperty(exports, 'MiddlewareContext', {
+Object.defineProperty(exports, "MiddlewareContext", {
   enumerable: true,
   get: function () {
     return MiddlewareContext;
   }
 });
-Object.defineProperty(exports, 'Modal', {
+Object.defineProperty(exports, "Modal", {
   enumerable: true,
   get: function () {
     return Modal;
   }
 });
-Object.defineProperty(exports, 'ModalKit', {
+Object.defineProperty(exports, "ModalKit", {
   enumerable: true,
   get: function () {
     return ModalKit;
   }
 });
-Object.defineProperty(exports, 'ParagraphInput', {
+Object.defineProperty(exports, "ParagraphInput", {
   enumerable: true,
   get: function () {
     return ParagraphInput;
   }
 });
-Object.defineProperty(exports, 'RadioGroup', {
+Object.defineProperty(exports, "RadioGroup", {
   enumerable: true,
   get: function () {
     return RadioGroup;
   }
 });
-Object.defineProperty(exports, 'RadioGroupOption', {
+Object.defineProperty(exports, "RadioGroupOption", {
   enumerable: true,
   get: function () {
     return RadioGroupOption;
   }
 });
-Object.defineProperty(exports, 'RoleSelectMenu', {
+Object.defineProperty(exports, "RoleSelectMenu", {
   enumerable: true,
   get: function () {
     return RoleSelectMenu;
   }
 });
-Object.defineProperty(exports, 'RoleSelectMenuKit', {
+Object.defineProperty(exports, "RoleSelectMenuKit", {
   enumerable: true,
   get: function () {
     return RoleSelectMenuKit;
   }
 });
-Object.defineProperty(exports, 'Section', {
+Object.defineProperty(exports, "Section", {
   enumerable: true,
   get: function () {
     return Section;
   }
 });
-Object.defineProperty(exports, 'ShortInput', {
+Object.defineProperty(exports, "ShortInput", {
   enumerable: true,
   get: function () {
     return ShortInput;
   }
 });
-Object.defineProperty(exports, 'StringSelectMenu', {
+Object.defineProperty(exports, "StringSelectMenu", {
   enumerable: true,
   get: function () {
     return StringSelectMenu;
   }
 });
-Object.defineProperty(exports, 'StringSelectMenuKit', {
+Object.defineProperty(exports, "StringSelectMenuKit", {
   enumerable: true,
   get: function () {
     return StringSelectMenuKit;
   }
 });
-Object.defineProperty(exports, 'StringSelectMenuOption', {
+Object.defineProperty(exports, "StringSelectMenuOption", {
   enumerable: true,
   get: function () {
     return StringSelectMenuOption;
   }
 });
-Object.defineProperty(exports, 'TextInput', {
+Object.defineProperty(exports, "TextInput", {
   enumerable: true,
   get: function () {
     return TextInput;
   }
 });
-Object.defineProperty(exports, 'Thumbnail', {
+Object.defineProperty(exports, "Thumbnail", {
   enumerable: true,
   get: function () {
     return Thumbnail;
   }
 });
-Object.defineProperty(exports, 'UserSelectMenu', {
+Object.defineProperty(exports, "UserSelectMenu", {
   enumerable: true,
   get: function () {
     return UserSelectMenu;
   }
 });
-Object.defineProperty(exports, 'UserSelectMenuKit', {
+Object.defineProperty(exports, "UserSelectMenuKit", {
   enumerable: true,
   get: function () {
     return UserSelectMenuKit;
   }
 });
-Object.defineProperty(exports, 'after', {
+Object.defineProperty(exports, "after", {
   enumerable: true,
   get: function () {
     return after;
   }
 });
-Object.defineProperty(exports, 'applyDefaultOptionalComponentBehavior', {
+Object.defineProperty(exports, "applyDefaultOptionalComponentBehavior", {
   enumerable: true,
   get: function () {
     return applyDefaultOptionalComponentBehavior;
   }
 });
-Object.defineProperty(exports, 'applyId', {
+Object.defineProperty(exports, "applyId", {
   enumerable: true,
   get: function () {
     return applyId;
   }
 });
-Object.defineProperty(exports, 'beforeExecute', {
+Object.defineProperty(exports, "beforeExecute", {
   enumerable: true,
   get: function () {
     return beforeExecute;
   }
 });
-Object.defineProperty(exports, 'buildOnly', {
+Object.defineProperty(exports, "buildOnly", {
   enumerable: true,
   get: function () {
     return buildOnly;
   }
 });
-Object.defineProperty(exports, 'cancelAfter', {
+Object.defineProperty(exports, "cancelAfter", {
   enumerable: true,
   get: function () {
     return cancelAfter;
   }
 });
-Object.defineProperty(exports, 'commandkit', {
+Object.defineProperty(exports, "commandkit", {
   enumerable: true,
   get: function () {
     return commandkit;
   }
 });
-Object.defineProperty(exports, 'createElement', {
+Object.defineProperty(exports, "createElement", {
   enumerable: true,
   get: function () {
     return createElement;
   }
 });
-Object.defineProperty(exports, 'createLogger', {
+Object.defineProperty(exports, "createLogger", {
   enumerable: true,
   get: function () {
     return createLogger;
   }
 });
-Object.defineProperty(exports, 'createProxy', {
+Object.defineProperty(exports, "createProxy", {
   enumerable: true,
   get: function () {
     return createProxy;
   }
 });
-Object.defineProperty(exports, 'debounce', {
+Object.defineProperty(exports, "debounce", {
   enumerable: true,
   get: function () {
     return debounce;
   }
 });
-Object.defineProperty(exports, 'defaultConfig', {
+Object.defineProperty(exports, "defaultConfig", {
   enumerable: true,
   get: function () {
     return defaultConfig;
   }
 });
-Object.defineProperty(exports, 'defer', {
+Object.defineProperty(exports, "defer", {
   enumerable: true,
   get: function () {
     return defer;
   }
 });
-Object.defineProperty(exports, 'defineConfig', {
+Object.defineProperty(exports, "defineConfig", {
   enumerable: true,
   get: function () {
     return defineConfig;
   }
 });
-Object.defineProperty(exports, 'devOnly', {
+Object.defineProperty(exports, "devOnly", {
   enumerable: true,
   get: function () {
     return devOnly;
   }
 });
-Object.defineProperty(exports, 'exitContext', {
+Object.defineProperty(exports, "exitContext", {
   enumerable: true,
   get: function () {
     return exitContext;
   }
 });
-Object.defineProperty(exports, 'findAppDirectory', {
+Object.defineProperty(exports, "findAppDirectory", {
   enumerable: true,
   get: function () {
     return findAppDirectory;
   }
 });
-Object.defineProperty(exports, 'flag', {
+Object.defineProperty(exports, "flag", {
   enumerable: true,
   get: function () {
     return flag;
   }
 });
-Object.defineProperty(exports, 'getCommandKit', {
+Object.defineProperty(exports, "getCommandKit", {
   enumerable: true,
   get: function () {
     return getCommandKit;
   }
 });
-Object.defineProperty(exports, 'getConfig', {
+Object.defineProperty(exports, "getConfig", {
   enumerable: true,
   get: function () {
     return getConfig;
   }
 });
-Object.defineProperty(exports, 'getContext', {
+Object.defineProperty(exports, "getContext", {
   enumerable: true,
   get: function () {
     return getContext;
   }
 });
-Object.defineProperty(exports, 'getCurrentDirectory', {
+Object.defineProperty(exports, "getCurrentDirectory", {
   enumerable: true,
   get: function () {
     return getCurrentDirectory;
   }
 });
-Object.defineProperty(exports, 'getDoNotTrack', {
+Object.defineProperty(exports, "getDoNotTrack", {
   enumerable: true,
   get: function () {
     return getDoNotTrack;
   }
 });
-Object.defineProperty(exports, 'getElement', {
+Object.defineProperty(exports, "getElement", {
   enumerable: true,
   get: function () {
     return getElement;
   }
 });
-Object.defineProperty(exports, 'getPossibleConfigPaths', {
+Object.defineProperty(exports, "getPossibleConfigPaths", {
   enumerable: true,
   get: function () {
     return getPossibleConfigPaths;
   }
 });
-Object.defineProperty(exports, 'getSourceDirectories', {
+Object.defineProperty(exports, "getSourceDirectories", {
   enumerable: true,
   get: function () {
     return getSourceDirectories;
   }
 });
-Object.defineProperty(exports, 'isCommandKitElement', {
+Object.defineProperty(exports, "isCommandKitElement", {
   enumerable: true,
   get: function () {
     return isCommandKitElement;
   }
 });
-Object.defineProperty(exports, 'isCommandWorkerContext', {
+Object.defineProperty(exports, "isCommandWorkerContext", {
   enumerable: true,
   get: function () {
     return isCommandWorkerContext;
   }
 });
-Object.defineProperty(exports, 'loadConfigFile', {
+Object.defineProperty(exports, "loadConfigFile", {
   enumerable: true,
   get: function () {
     return loadConfigFile;
   }
 });
-Object.defineProperty(exports, 'makeContextAwareFunction', {
+Object.defineProperty(exports, "makeContextAwareFunction", {
   enumerable: true,
   get: function () {
     return makeContextAwareFunction;
   }
 });
-Object.defineProperty(exports, 'middlewareId', {
+Object.defineProperty(exports, "middlewareId", {
   enumerable: true,
   get: function () {
     return middlewareId;
   }
 });
-Object.defineProperty(exports, 'noAnalytics', {
+Object.defineProperty(exports, "noAnalytics", {
   enumerable: true,
   get: function () {
     return noAnalytics;
   }
 });
-Object.defineProperty(exports, 'noBuildOnly', {
+Object.defineProperty(exports, "noBuildOnly", {
   enumerable: true,
   get: function () {
     return noBuildOnly;
   }
 });
-Object.defineProperty(exports, 'onApplicationBootstrap', {
+Object.defineProperty(exports, "onApplicationBootstrap", {
   enumerable: true,
   get: function () {
     return onApplicationBootstrap;
   }
 });
-Object.defineProperty(exports, 'onBootstrap', {
+Object.defineProperty(exports, "onBootstrap", {
   enumerable: true,
   get: function () {
     return onBootstrap;
   }
 });
-Object.defineProperty(exports, 'provideContext', {
+Object.defineProperty(exports, "provideContext", {
   enumerable: true,
   get: function () {
     return provideContext;
   }
 });
-Object.defineProperty(exports, 'registerDevHooks', {
+Object.defineProperty(exports, "registerDevHooks", {
   enumerable: true,
   get: function () {
     return registerDevHooks;
   }
 });
-Object.defineProperty(exports, 'setFlagProvider', {
+Object.defineProperty(exports, "setFlagProvider", {
   enumerable: true,
   get: function () {
     return setFlagProvider;
   }
 });
-Object.defineProperty(exports, 'src_default', {
+Object.defineProperty(exports, "src_default", {
   enumerable: true,
   get: function () {
     return src_default;
   }
 });
-Object.defineProperty(exports, 'useEnvironment', {
+Object.defineProperty(exports, "useEnvironment", {
   enumerable: true,
   get: function () {
     return useEnvironment;
   }
 });
-Object.defineProperty(exports, 'useStore', {
+Object.defineProperty(exports, "useStore", {
   enumerable: true,
   get: function () {
     return useStore;
   }
 });
-//# sourceMappingURL=commandkit-CO4Ob2Dw.js.map
+//# sourceMappingURL=commandkit-BMeeFmdY.js.map