commandkit 1.2.0 → 1.2.1-dev.20260310123053

package/dist/analytics/analytics-engine.d.ts

@@ -1,2 +1,2 @@
-import { n as FilterFunction, t as AnalyticsEngine } from "../analytics-engine-DnRsHBId.js";
+import { n as FilterFunction, t as AnalyticsEngine } from "../analytics-engine-uBNaD2CQ.js";
 export { AnalyticsEngine, FilterFunction };

package/dist/analytics/analytics-engine.js

@@ -1,4 +1,4 @@
 Object.defineProperty(exports, Symbol.toStringTag, { value: 'Module' });
-const require_commandkit = require('../commandkit--k6yDJEr.js');
+const require_commandkit = require('../commandkit-DNln6BAJ.js');
 
 exports.AnalyticsEngine = require_commandkit.AnalyticsEngine;

package/dist/analytics/analytics-provider.d.ts

@@ -1,2 +1,2 @@
-import { a as IdentifyEvent, i as AnalyticsProvider, r as AnalyticsEvent } from "../analytics-engine-DnRsHBId.js";
+import { a as IdentifyEvent, i as AnalyticsProvider, r as AnalyticsEvent } from "../analytics-engine-uBNaD2CQ.js";
 export { AnalyticsEvent, AnalyticsProvider, IdentifyEvent };

package/dist/analytics/utils.js

@@ -1,5 +1,5 @@
 Object.defineProperty(exports, Symbol.toStringTag, { value: 'Module' });
-const require_commandkit = require('../commandkit--k6yDJEr.js');
+const require_commandkit = require('../commandkit-DNln6BAJ.js');
 
 exports.getDoNotTrack = require_commandkit.getDoNotTrack;
 exports.noAnalytics = require_commandkit.noAnalytics;

package/dist/{analytics-engine-DnRsHBId.d.ts → analytics-engine-uBNaD2CQ.d.ts}

@@ -375,7 +375,7 @@ declare class CommandRegistrar {
    */
   constructor(commandkit: CommandKit);
   /**
-   * Gets the commands data.
+   * Gets the commands data, consuming pre-generated context menu entries when available.
    */
   getCommandsData(): (CommandData & {
     __metadata?: CommandMetadata;
@@ -850,7 +850,7 @@ declare class AppCommandHandler {
    */
   printBanner(): void;
   /**
-   * Gets an array of all loaded commands.
+   * Gets an array of all loaded commands, including pre-generated context menu entries.
    * @returns Array of loaded commands
    */
   getCommandsArray(): LoadedCommand[];
@@ -918,6 +918,12 @@ declare class AppCommandHandler {
    * @returns The command metadata or null if not found
    */
   getMetadataFor(command: string, hint?: 'user' | 'message'): CommandMetadata | null;
+  /**
+   * Generates context menu commands for the loaded command.
+   * @private
+   * @internal
+   */
+  private generateContextMenuCommands;
 }
 //#endregion
 //#region src/events/CommandKitEventsChannel.d.ts
@@ -2275,4 +2281,4 @@ declare class AnalyticsEngine {
 }
 //#endregion
 export { isRuntimePlugin as $, MessageCommand as $t, flag as A, makeContextAwareFunction as At, CommonPluginRuntime as B, PreRegisterCommandsEvent as Bt, EvaluationContext as C, RunCommandOptions as Ct, FlagRunner as D, getCommandKit as Dt, FeatureFlagDefinition as E, exitContext as Et, CommandKitPluginRuntime as F, CommandKitEnvironmentInternalData as Ft, PluginTransformParameters as G, ChatInputCommand as Gt, CommonDirectiveTransformer as H, AutocompleteCommand as Ht, PluginCommon as I, CommandKitEnvironmentType as It, CommandKitEventDispatch as J, CommandExecutionMode as Jt, TransformedResult as K, ChatInputCommandContext as Kt, PluginOptions as L, after as Lt, FlagConfiguration as M, useEnvironment as Mt, FlagProvider as N, useStore as Nt, IdentifyFunction as O, getContext as Ot, JsonFlagProvider as P, CommandKitEnvironment as Pt, RuntimePlugin as Q, InteractionCommandMiddlewareContext as Qt, PluginType as R, cancelAfter as Rt, DecideFunction as S, AppCommandRunner as St, FeatureFlag as T, GenericFunction as Tt, CommonDirectiveTransformerOptions as U, AutocompleteCommandContext as Ut, CompilerPluginRuntime as V, AnyCommandExecute as Vt, CompilerPlugin as W, AutocompleteCommandMiddlewareContext as Wt, MaybeFalsey as X, ContextParameters as Xt, CommandKitPlugin as Y, Context as Yt, TemplateHandler as Z, InteractionCommandContext as Zt, CommandKitConfig as _, CustomAppCommandProps as _t, IdentifyEvent as a, MiddlewareContext as an, EventListener as at, CustomEvaluationContext as b, ResolvableCommand as bt, CommandKitConfiguration as c, UserContextMenuCommand as cn, ListenerFunction as ct, onBootstrap as d, CommandContext as dn, AppCommandNative as dt, MessageCommandContext as en, CommandKitHMREvent as et, DeepPartial as f, CommandData as fn, CommandBuilderLike as ft, CommandKitCompilerOptions as g, EventHandler as gn, CommandTypeData as gt, mergeDeep as h, CommandMetadataFunction as hn, CommandDataSchemaValue as ht, AnalyticsProvider as i, MessageContextMenuCommandMiddlewareContext as in, AppEventsHandlerLoadedData as it, setFlagProvider as j, provideContext as jt, MaybePromise as k, isCommandWorkerContext as kt, commandkit as l, UserContextMenuCommandContext as ln, AppCommand as lt, ResolvedCommandKitConfig as m, CommandMetadata as mn, CommandDataSchemaKey as mt, FilterFunction as n, MessageContextMenuCommand as nn, registerDevHooks as nt, BootstrapFunction as o, MiddlewareContextArgs as on, LoadedEvent as ot, DeepRequired as p, CommandKitOptions as pn, CommandDataSchema as pt, isCompilerPlugin as q, CommandContextOptions as qt, AnalyticsEvent as r, MessageContextMenuCommandContext as rn, AppEventsHandler as rt, CommandKit as s, SlashCommandMiddlewareContext as sn, CommandKitEventsChannel as st, AnalyticsEngine as t, MessageCommandMiddlewareContext as tn, IpcMessageCommand as tt, onApplicationBootstrap as u, UserContextMenuCommandMiddlewareContext as un, AppCommandHandler as ut, FlagStore as v, LoadedCommand as vt, EventFlagContext as w, AsyncFunction as wt, CustomEvaluationFunction as x, RunCommand as xt, CommandFlagContext as y, PreparedAppCommandExecution as yt, isPlugin as z, CommandRegistrar as zt };
-//# sourceMappingURL=analytics-engine-DnRsHBId.d.ts.map
+//# sourceMappingURL=analytics-engine-uBNaD2CQ.d.ts.map

package/dist/app/commands/AppCommandRunner.d.ts

@@ -1,2 +1,2 @@
-import { Ct as RunCommandOptions, St as AppCommandRunner } from "../../analytics-engine-DnRsHBId.js";
+import { Ct as RunCommandOptions, St as AppCommandRunner } from "../../analytics-engine-uBNaD2CQ.js";
 export { AppCommandRunner, RunCommandOptions };

package/dist/app/commands/AppCommandRunner.js

@@ -1,4 +1,4 @@
 Object.defineProperty(exports, Symbol.toStringTag, { value: 'Module' });
-const require_commandkit = require('../../commandkit--k6yDJEr.js');
+const require_commandkit = require('../../commandkit-DNln6BAJ.js');
 
 exports.AppCommandRunner = require_commandkit.AppCommandRunner;

package/dist/app/commands/Context.d.ts

@@ -1,2 +1,2 @@
-import { $t as MessageCommand, Gt as ChatInputCommand, Ht as AutocompleteCommand, Jt as CommandExecutionMode, Kt as ChatInputCommandContext, Qt as InteractionCommandMiddlewareContext, Ut as AutocompleteCommandContext, Vt as AnyCommandExecute, Wt as AutocompleteCommandMiddlewareContext, Xt as ContextParameters, Yt as Context, Zt as InteractionCommandContext, an as MiddlewareContext, cn as UserContextMenuCommand, en as MessageCommandContext, in as MessageContextMenuCommandMiddlewareContext, ln as UserContextMenuCommandContext, nn as MessageContextMenuCommand, on as MiddlewareContextArgs, qt as CommandContextOptions, rn as MessageContextMenuCommandContext, sn as SlashCommandMiddlewareContext, tn as MessageCommandMiddlewareContext, un as UserContextMenuCommandMiddlewareContext } from "../../analytics-engine-DnRsHBId.js";
+import { $t as MessageCommand, Gt as ChatInputCommand, Ht as AutocompleteCommand, Jt as CommandExecutionMode, Kt as ChatInputCommandContext, Qt as InteractionCommandMiddlewareContext, Ut as AutocompleteCommandContext, Vt as AnyCommandExecute, Wt as AutocompleteCommandMiddlewareContext, Xt as ContextParameters, Yt as Context, Zt as InteractionCommandContext, an as MiddlewareContext, cn as UserContextMenuCommand, en as MessageCommandContext, in as MessageContextMenuCommandMiddlewareContext, ln as UserContextMenuCommandContext, nn as MessageContextMenuCommand, on as MiddlewareContextArgs, qt as CommandContextOptions, rn as MessageContextMenuCommandContext, sn as SlashCommandMiddlewareContext, tn as MessageCommandMiddlewareContext, un as UserContextMenuCommandMiddlewareContext } from "../../analytics-engine-uBNaD2CQ.js";
 export { AnyCommandExecute, AutocompleteCommand, AutocompleteCommandContext, AutocompleteCommandMiddlewareContext, ChatInputCommand, ChatInputCommandContext, CommandContextOptions, CommandExecutionMode, Context, ContextParameters, InteractionCommandContext, InteractionCommandMiddlewareContext, MessageCommand, MessageCommandContext, MessageCommandMiddlewareContext, MessageContextMenuCommand, MessageContextMenuCommandContext, MessageContextMenuCommandMiddlewareContext, MiddlewareContext, MiddlewareContextArgs, SlashCommandMiddlewareContext, UserContextMenuCommand, UserContextMenuCommandContext, UserContextMenuCommandMiddlewareContext };

package/dist/app/commands/Context.js

@@ -1,5 +1,5 @@
 Object.defineProperty(exports, Symbol.toStringTag, { value: 'Module' });
-const require_commandkit = require('../../commandkit--k6yDJEr.js');
+const require_commandkit = require('../../commandkit-DNln6BAJ.js');
 
 exports.CommandExecutionMode = require_commandkit.CommandExecutionMode;
 exports.Context = require_commandkit.Context;

package/dist/app/events/EventWorkerContext.d.ts

@@ -1,4 +1,4 @@
-import { s as CommandKit } from "../../analytics-engine-DnRsHBId.js";
+import { s as CommandKit } from "../../analytics-engine-uBNaD2CQ.js";
 import { i as ParsedEvent } from "../../EventsRouter-EuuSu6NH.js";
 import { AsyncLocalStorage } from "node:async_hooks";
 

package/dist/app/handlers/AppCommandHandler.d.ts

@@ -1,2 +1,2 @@
-import { _t as CustomAppCommandProps, bt as ResolvableCommand, dt as AppCommandNative, ft as CommandBuilderLike, gt as CommandTypeData, ht as CommandDataSchemaValue, lt as AppCommand, mt as CommandDataSchemaKey, pt as CommandDataSchema, ut as AppCommandHandler, vt as LoadedCommand, xt as RunCommand, yt as PreparedAppCommandExecution } from "../../analytics-engine-DnRsHBId.js";
+import { _t as CustomAppCommandProps, bt as ResolvableCommand, dt as AppCommandNative, ft as CommandBuilderLike, gt as CommandTypeData, ht as CommandDataSchemaValue, lt as AppCommand, mt as CommandDataSchemaKey, pt as CommandDataSchema, ut as AppCommandHandler, vt as LoadedCommand, xt as RunCommand, yt as PreparedAppCommandExecution } from "../../analytics-engine-uBNaD2CQ.js";
 export { AppCommand, AppCommandHandler, AppCommandNative, CommandBuilderLike, CommandDataSchema, CommandDataSchemaKey, CommandDataSchemaValue, CommandTypeData, CustomAppCommandProps, LoadedCommand, PreparedAppCommandExecution, ResolvableCommand, RunCommand };

package/dist/app/handlers/AppCommandHandler.js

@@ -1,4 +1,4 @@
 Object.defineProperty(exports, Symbol.toStringTag, { value: 'Module' });
-const require_commandkit = require('../../commandkit--k6yDJEr.js');
+const require_commandkit = require('../../commandkit-DNln6BAJ.js');
 
 exports.AppCommandHandler = require_commandkit.AppCommandHandler;

package/dist/app/handlers/AppEventsHandler.d.ts

@@ -1,2 +1,2 @@
-import { at as EventListener, it as AppEventsHandlerLoadedData, ot as LoadedEvent, rt as AppEventsHandler } from "../../analytics-engine-DnRsHBId.js";
+import { at as EventListener, it as AppEventsHandlerLoadedData, ot as LoadedEvent, rt as AppEventsHandler } from "../../analytics-engine-uBNaD2CQ.js";
 export { AppEventsHandler, AppEventsHandlerLoadedData, EventListener, LoadedEvent };

package/dist/app/handlers/AppEventsHandler.js

@@ -1,4 +1,4 @@
 Object.defineProperty(exports, Symbol.toStringTag, { value: 'Module' });
-const require_commandkit = require('../../commandkit--k6yDJEr.js');
+const require_commandkit = require('../../commandkit-DNln6BAJ.js');
 
 exports.AppEventsHandler = require_commandkit.AppEventsHandler;

package/dist/app/index.d.ts

@@ -1,4 +1,4 @@
-import { $t as MessageCommand, Bt as PreRegisterCommandsEvent, Gt as ChatInputCommand, Ht as AutocompleteCommand, Jt as CommandExecutionMode, Kt as ChatInputCommandContext, Qt as InteractionCommandMiddlewareContext, Ut as AutocompleteCommandContext, Vt as AnyCommandExecute, Wt as AutocompleteCommandMiddlewareContext, Xt as ContextParameters, Yt as Context, Zt as InteractionCommandContext, _t as CustomAppCommandProps, an as MiddlewareContext, bt as ResolvableCommand, cn as UserContextMenuCommand, dt as AppCommandNative, en as MessageCommandContext, ft as CommandBuilderLike, gt as CommandTypeData, ht as CommandDataSchemaValue, in as MessageContextMenuCommandMiddlewareContext, ln as UserContextMenuCommandContext, lt as AppCommand, mt as CommandDataSchemaKey, nn as MessageContextMenuCommand, on as MiddlewareContextArgs, pt as CommandDataSchema, qt as CommandContextOptions, rn as MessageContextMenuCommandContext, sn as SlashCommandMiddlewareContext, tn as MessageCommandMiddlewareContext, un as UserContextMenuCommandMiddlewareContext, ut as AppCommandHandler, vt as LoadedCommand, xt as RunCommand, yt as PreparedAppCommandExecution, zt as CommandRegistrar } from "../analytics-engine-DnRsHBId.js";
+import { $t as MessageCommand, Bt as PreRegisterCommandsEvent, Gt as ChatInputCommand, Ht as AutocompleteCommand, Jt as CommandExecutionMode, Kt as ChatInputCommandContext, Qt as InteractionCommandMiddlewareContext, Ut as AutocompleteCommandContext, Vt as AnyCommandExecute, Wt as AutocompleteCommandMiddlewareContext, Xt as ContextParameters, Yt as Context, Zt as InteractionCommandContext, _t as CustomAppCommandProps, an as MiddlewareContext, bt as ResolvableCommand, cn as UserContextMenuCommand, dt as AppCommandNative, en as MessageCommandContext, ft as CommandBuilderLike, gt as CommandTypeData, ht as CommandDataSchemaValue, in as MessageContextMenuCommandMiddlewareContext, ln as UserContextMenuCommandContext, lt as AppCommand, mt as CommandDataSchemaKey, nn as MessageContextMenuCommand, on as MiddlewareContextArgs, pt as CommandDataSchema, qt as CommandContextOptions, rn as MessageContextMenuCommandContext, sn as SlashCommandMiddlewareContext, tn as MessageCommandMiddlewareContext, un as UserContextMenuCommandMiddlewareContext, ut as AppCommandHandler, vt as LoadedCommand, xt as RunCommand, yt as PreparedAppCommandExecution, zt as CommandRegistrar } from "../analytics-engine-uBNaD2CQ.js";
 import { i as ParsedMessageCommand, n as MessageCommandOptionsSchema, r as MessageCommandParser, t as MessageCommandOptions } from "../MessageCommandParser-DPCbHXCS.js";
 import { i as stopMiddlewares, n as rethrow, r as stopEvents, t as redirect } from "../signals-CBXwugBW.js";
 import { n as isInteractionSource, r as isMessageSource, t as CommandSource } from "../helpers-zmC44Mcu.js";

package/dist/app/index.js

@@ -1,5 +1,5 @@
 Object.defineProperty(exports, Symbol.toStringTag, { value: 'Module' });
-const require_commandkit = require('../commandkit--k6yDJEr.js');
+const require_commandkit = require('../commandkit-DNln6BAJ.js');
 const require_app_interrupt_signals = require('./interrupt/signals.js');
 const require_app_commands_helpers = require('./commands/helpers.js');
 const require_app_commands_MessageCommandParser = require('./commands/MessageCommandParser.js');

package/dist/app/middlewares/permissions.d.ts

@@ -1,4 +1,4 @@
-import { an as MiddlewareContext } from "../../analytics-engine-DnRsHBId.js";
+import { an as MiddlewareContext } from "../../analytics-engine-uBNaD2CQ.js";
 
 //#region src/app/middlewares/permissions.d.ts
 declare const middlewareId: `${string}-${string}-${string}-${string}-${string}`;

package/dist/app/middlewares/permissions.js

@@ -1,5 +1,5 @@
 Object.defineProperty(exports, Symbol.toStringTag, { value: 'Module' });
-const require_commandkit = require('../../commandkit--k6yDJEr.js');
+const require_commandkit = require('../../commandkit-DNln6BAJ.js');
 
 exports.beforeExecute = require_commandkit.beforeExecute;
 exports.middlewareId = require_commandkit.middlewareId;

package/dist/app/register/CommandRegistrar.d.ts

@@ -1,2 +1,2 @@
-import { Bt as PreRegisterCommandsEvent, zt as CommandRegistrar } from "../../analytics-engine-DnRsHBId.js";
+import { Bt as PreRegisterCommandsEvent, zt as CommandRegistrar } from "../../analytics-engine-uBNaD2CQ.js";
 export { CommandRegistrar, PreRegisterCommandsEvent };

package/dist/app/register/CommandRegistrar.js

@@ -1,4 +1,4 @@
 Object.defineProperty(exports, Symbol.toStringTag, { value: 'Module' });
-const require_commandkit = require('../../commandkit--k6yDJEr.js');
+const require_commandkit = require('../../commandkit-DNln6BAJ.js');
 
 exports.CommandRegistrar = require_commandkit.CommandRegistrar;

package/dist/cli/build.d.ts

@@ -1,4 +1,4 @@
-import { W as CompilerPlugin } from "../analytics-engine-DnRsHBId.js";
+import { W as CompilerPlugin } from "../analytics-engine-uBNaD2CQ.js";
 import { t as MaybeArray } from "../types-DZy7U-Ld.js";
 
 //#region src/cli/build.d.ts

package/dist/cli/build.js

@@ -1,6 +1,6 @@
 Object.defineProperty(exports, Symbol.toStringTag, { value: 'Module' });
 const require_chunk = require('../chunk-BE-pF4vm.js');
-const require_commandkit = require('../commandkit--k6yDJEr.js');
+const require_commandkit = require('../commandkit-DNln6BAJ.js');
 const require_utils_constants = require('../utils/constants.js');
 const require_config_utils = require('../config/utils.js');
 const require_cli_common = require('./common.js');

package/dist/cli/common.d.ts

@@ -1,4 +1,4 @@
-import { m as ResolvedCommandKitConfig } from "../analytics-engine-DnRsHBId.js";
+import { m as ResolvedCommandKitConfig } from "../analytics-engine-uBNaD2CQ.js";
 import * as tsdown from "tsdown";
 import * as typescript from "typescript";
 

package/dist/cli/development.js

@@ -1,7 +1,7 @@
 Object.defineProperty(exports, Symbol.toStringTag, { value: 'Module' });
 const require_chunk = require('../chunk-BE-pF4vm.js');
 const require_utils_colors = require('../utils/colors.js');
-const require_commandkit = require('../commandkit--k6yDJEr.js');
+const require_commandkit = require('../commandkit-DNln6BAJ.js');
 const require_plugins_CompilerPlugin = require('../plugins/CompilerPlugin.js');
 const require_utils_constants = require('../utils/constants.js');
 const require_cli_common = require('./common.js');

package/dist/cli/init.js

@@ -1,6 +1,6 @@
 Object.defineProperty(exports, Symbol.toStringTag, { value: 'Module' });
 const require_chunk = require('../chunk-BE-pF4vm.js');
-const require_commandkit = require('../commandkit--k6yDJEr.js');
+const require_commandkit = require('../commandkit-DNln6BAJ.js');
 const require_plugins_CompilerPlugin = require('../plugins/CompilerPlugin.js');
 const require_utils_constants = require('../utils/constants.js');
 const require_utils_types_package = require('../utils/types-package.js');

package/dist/cli/production.js

@@ -1,6 +1,6 @@
 Object.defineProperty(exports, Symbol.toStringTag, { value: 'Module' });
 const require_chunk = require('../chunk-BE-pF4vm.js');
-const require_commandkit = require('../commandkit--k6yDJEr.js');
+const require_commandkit = require('../commandkit-DNln6BAJ.js');
 const require_plugins_CompilerPlugin = require('../plugins/CompilerPlugin.js');
 const require_utils_constants = require('../utils/constants.js');
 const require_cli_common = require('./common.js');

package/dist/{commandkit--k6yDJEr.js → commandkit-DNln6BAJ.js}

@@ -24,6 +24,7 @@ node_events = require_chunk.__toESM(node_events);
 let discord_js = require("discord.js");
 let node_async_hooks = require("node:async_hooks");
 let node_crypto = require("node:crypto");
+let node_console = require("node:console");
 let util = require("util");
 let node_fs = require("node:fs");
 let node_path = require("node:path");
@@ -439,7 +440,7 @@ var DefaultLogger = class {
 	constructor(stdout = process.stdout, stderr = process.stderr) {
 		this.stdout = stdout;
 		this.stderr = stderr;
-		this.logger = new console.Console(this.stdout, this.stderr);
+		this.logger = new node_console.Console(this.stdout, this.stderr);
 	}
 	_formatTime(date) {
 		return `${date.getHours().toString().padStart(2, "0")}:${date.getMinutes().toString().padStart(2, "0")}:${date.getSeconds().toString().padStart(2, "0")}.${date.getMilliseconds().toString().padStart(3, "0")}`;
@@ -2020,23 +2021,35 @@ var CommandRegistrar = class {
 		this.api.setToken(this.commandkit.client.token ?? process.env.DISCORD_TOKEN ?? process.env.TOKEN ?? "");
 	}
 	/**
-	* Gets the commands data.
+	* Gets the commands data, consuming pre-generated context menu entries when available.
 	*/
 	getCommandsData() {
-		return this.commandkit.commandHandler.getCommandsArray().flatMap((cmd) => {
+		const commands = this.commandkit.commandHandler.getCommandsArray();
+		const commandIds = new Set(commands.map((command) => command.command.id));
+		return commands.flatMap((cmd) => {
+			const isPreGeneratedCtx = cmd.command.id.endsWith("::user-ctx") || cmd.command.id.endsWith("::message-ctx");
 			const json = "toJSON" in cmd.data.command ? cmd.data.command.toJSON() : cmd.data.command;
 			const __metadata = cmd.metadata ?? cmd.data.metadata;
+			const isContextMenuType = json.type === discord_js.ApplicationCommandType.User || json.type === discord_js.ApplicationCommandType.Message;
+			const applyId = (id) => {
+				cmd.discordId = id;
+			};
+			if (isPreGeneratedCtx || isContextMenuType) return [{
+				...json,
+				__metadata,
+				__applyId: applyId
+			}];
 			const collections = [];
+			const hasPreGeneratedUserContextMenu = commandIds.has(`${cmd.command.id}::user-ctx`);
+			const hasPreGeneratedMessageContextMenu = commandIds.has(`${cmd.command.id}::message-ctx`);
 			if (cmd.data.chatInput) collections.push({
 				...json,
 				type: discord_js.ApplicationCommandType.ChatInput,
 				description: json.description ?? "No command description set.",
 				__metadata,
-				__applyId: (id) => {
-					cmd.discordId = id;
-				}
+				__applyId: applyId
 			});
-			if (cmd.data.userContextMenu) {
+			if (cmd.data.userContextMenu && !hasPreGeneratedUserContextMenu) {
 				var _metadata$nameAliases;
 				collections.push({
 					...json,
@@ -2046,12 +2059,10 @@ var CommandRegistrar = class {
 					description_localizations: void 0,
 					description: void 0,
 					__metadata,
-					__applyId: (id) => {
-						cmd.discordId = id;
-					}
+					__applyId: applyId
 				});
 			}
-			if (cmd.data.messageContextMenu) {
+			if (cmd.data.messageContextMenu && !hasPreGeneratedMessageContextMenu) {
 				var _metadata$nameAliases2;
 				collections.push({
 					...json,
@@ -2061,9 +2072,7 @@ var CommandRegistrar = class {
 					description: void 0,
 					options: void 0,
 					__metadata,
-					__applyId: (id) => {
-						cmd.discordId = id;
-					}
+					__applyId: applyId
 				});
 			}
 			return collections;
@@ -2353,7 +2362,7 @@ var AppCommandHandler = class {
 		});
 	}
 	/**
-	* Gets an array of all loaded commands.
+	* Gets an array of all loaded commands, including pre-generated context menu entries.
 	* @returns Array of loaded commands
 	*/
 	getCommandsArray() {
@@ -2626,24 +2635,22 @@ var AppCommandHandler = class {
 			});
 			const commandJson = "toJSON" in lastUpdated && typeof lastUpdated.toJSON === "function" ? lastUpdated.toJSON() : lastUpdated;
 			if ("guilds" in commandJson || "aliases" in commandJson) Logger.warn(`Command \`${command.name}\` uses deprecated metadata properties. Please update to use the new \`metadata\` object or \`generateMetadata\` function.`);
+			const resolvedMetadata = {
+				guilds: commandJson.guilds,
+				aliases: commandJson.aliases,
+				...metadata
+			};
 			this.loadedCommands.set(id, {
 				discordId: null,
 				command,
-				metadata: {
-					guilds: commandJson.guilds,
-					aliases: commandJson.aliases,
-					...metadata
-				},
+				metadata: resolvedMetadata,
 				data: {
 					...commandFileData,
-					metadata: {
-						guilds: commandJson.guilds,
-						aliases: commandJson.aliases,
-						...metadata
-					},
+					metadata: resolvedMetadata,
 					command: commandJson
 				}
 			});
+			this.generateContextMenuCommands(id, command, commandFileData, commandJson, resolvedMetadata);
 		} catch (error) {
 			Logger.error`Failed to load command ${command.name} (${id}): ${error}`;
 		}
@@ -2664,6 +2671,63 @@ var AppCommandHandler = class {
 			botPermissions: []
 		};
 	}
+	/**
+	* Generates context menu commands for the loaded command.
+	* @private
+	* @internal
+	*/
+	generateContextMenuCommands(id, command, commandFileData, commandJson, metadata) {
+		if (commandFileData.userContextMenu) {
+			var _metadata$nameAliases;
+			const userCtxId = `${id}::user-ctx`;
+			const userCtxName = ((_metadata$nameAliases = metadata.nameAliases) === null || _metadata$nameAliases === void 0 ? void 0 : _metadata$nameAliases.user) ?? commandJson.name;
+			this.loadedCommands.set(userCtxId, {
+				discordId: null,
+				command: {
+					...command,
+					id: userCtxId,
+					name: userCtxName
+				},
+				metadata,
+				data: {
+					...commandFileData,
+					metadata,
+					command: {
+						...commandJson,
+						name: userCtxName,
+						type: discord_js.ApplicationCommandType.User,
+						description: void 0,
+						options: void 0
+					}
+				}
+			});
+		}
+		if (commandFileData.messageContextMenu) {
+			var _metadata$nameAliases2;
+			const messageCtxId = `${id}::message-ctx`;
+			const messageCtxName = ((_metadata$nameAliases2 = metadata.nameAliases) === null || _metadata$nameAliases2 === void 0 ? void 0 : _metadata$nameAliases2.message) ?? commandJson.name;
+			this.loadedCommands.set(messageCtxId, {
+				discordId: null,
+				command: {
+					...command,
+					id: messageCtxId,
+					name: messageCtxName
+				},
+				metadata,
+				data: {
+					...commandFileData,
+					metadata,
+					command: {
+						...commandJson,
+						name: messageCtxName,
+						type: discord_js.ApplicationCommandType.Message,
+						description: void 0,
+						options: void 0
+					}
+				}
+			});
+		}
+	}
 };
 
 //#endregion
@@ -3658,7 +3722,7 @@ function ChannelSelectMenu(props) {
 function Container(props) {
 	const container = new discord_js.ContainerBuilder();
 	applyId(props, container);
-	container.setAccentColor((0, discord_js.resolveColor)(props.accentColor));
+	if (props.accentColor != null) container.setAccentColor((0, discord_js.resolveColor)(props.accentColor));
 	if (props.spoiler != null) container.setSpoiler(props.spoiler);
 	if (props.children != null) {
 		if (!Array.isArray(props.children)) props.children = [props.children];
@@ -5080,4 +5144,4 @@ Object.defineProperty(exports, 'useStore', {
     return useStore;
   }
 });
-//# sourceMappingURL=commandkit--k6yDJEr.js.map
+//# sourceMappingURL=commandkit-DNln6BAJ.js.map