commandkit 0.1.11-dev.20250328083250 → 0.1.11-dev.20250330063035

package/dist/index.js

@@ -176,8 +176,6 @@ var init_error_codes = __esm({
     "use strict";
     init_cjs_shims();
     CommandKitErrorCodes = {
-      GuildOnlyException: Symbol("kGuildOnlyException"),
-      DMOnlyException: Symbol("kDMOnlyException"),
       ExitMiddleware: Symbol("kExitMiddleware"),
       ForwardedCommand: Symbol("kForwardedCommand"),
       InvalidCommandPrefix: Symbol("kInvalidCommandPrefix"),
@@ -193,40 +191,19 @@ var init_error_codes = __esm({
 function exitContext(fn) {
   return context.exit(fn);
 }
+function provideContext(value, receiver) {
+  return context.run(value, receiver);
+}
 function makeContextAwareFunction(env, fn, finalizer) {
   const _fn = /* @__PURE__ */ __name((...args) => {
-    return context.run(env, async () => {
+    return provideContext(env, async () => {
       try {
         const result = await fn(...args);
         return result;
       } catch (e) {
-        if (isCommandKitError(e)) {
-          const code = Reflect.get(e, "code");
-          const interaction = env.variables.get("interaction");
-          if (!interaction) return;
-          switch (code) {
-            case CommandKitErrorCodes.GuildOnlyException: {
-              if (interaction.isRepliable()) {
-                await interaction.reply({
-                  content: "This command is only available in guilds.",
-                  flags: import_discord2.MessageFlags.Ephemeral
-                });
-              }
-              return;
-            }
-            case CommandKitErrorCodes.DMOnlyException: {
-              if (interaction.isRepliable()) {
-                await interaction.reply({
-                  content: "This command is only available in DMs.",
-                  flags: import_discord2.MessageFlags.Ephemeral
-                });
-              }
-              return;
-            }
-          }
-          return;
+        if (!isCommandKitError(e)) {
+          env.setExecutionError(e);
         }
-        env.setExecutionError(e);
       } finally {
         if (typeof finalizer === "function") {
           try {
@@ -260,59 +237,33 @@ function useEnvironment() {
   }
   return ctx;
 }
-function guildOnly() {
-  const env = useEnvironment();
-  const interaction = env.variables.get("interaction");
-  if (!interaction) {
-    throw new Error("No interaction found in environment.");
-  }
-  if (!interaction.guild) {
-    const error = new Error("This command is only available in guilds.");
-    Reflect.set(error, "code", CommandKitErrorCodes.GuildOnlyException);
-    throw error;
-  }
-}
-function dmOnly() {
-  const env = useEnvironment();
-  const interaction = env.variables.get("interaction");
-  if (!interaction) {
-    throw new Error("No interaction found in environment.");
-  }
-  if (interaction.guild) {
-    const error = new Error("This command is only available in DMs.");
-    Reflect.set(error, "code", CommandKitErrorCodes.DMOnlyException);
-    throw error;
-  }
-}
-var import_node_async_hooks, import_discord2, context;
+var import_node_async_hooks, context;
 var init_async_context = __esm({
   "src/context/async-context.ts"() {
     "use strict";
     init_cjs_shims();
     import_node_async_hooks = require("async_hooks");
-    init_error_codes();
-    import_discord2 = require("discord.js");
     init_CommandKit();
+    init_error_codes();
     context = new import_node_async_hooks.AsyncLocalStorage();
     __name(exitContext, "exitContext");
+    __name(provideContext, "provideContext");
     __name(makeContextAwareFunction, "makeContextAwareFunction");
     __name(getCommandKit, "getCommandKit");
     __name(getContext, "getContext");
     __name(useEnvironment, "useEnvironment");
-    __name(guildOnly, "guildOnly");
-    __name(dmOnly, "dmOnly");
   }
 });
 
 // src/components/button/ButtonKit.ts
-var import_discord3, _onClickHandler, _contextData, _unsub, _ButtonKit_instances, getEventInterceptor_fn, setupInteractionCollector_fn, destroyCollector_fn, _ButtonKit, ButtonKit;
+var import_discord2, _onClickHandler, _contextData, _unsub, _ButtonKit_instances, getEventInterceptor_fn, setupInteractionCollector_fn, destroyCollector_fn, _ButtonKit, ButtonKit;
 var init_ButtonKit = __esm({
   "src/components/button/ButtonKit.ts"() {
     "use strict";
     init_cjs_shims();
-    import_discord3 = require("discord.js");
+    import_discord2 = require("discord.js");
     init_async_context();
-    _ButtonKit = class _ButtonKit extends import_discord3.ButtonBuilder {
+    _ButtonKit = class _ButtonKit extends import_discord2.ButtonBuilder {
       constructor() {
         super(...arguments);
         __privateAdd(this, _ButtonKit_instances);
@@ -351,7 +302,7 @@ var init_ButtonKit = __esm({
        */
       onClick(handler, data) {
         var _a, _b, _c, _d;
-        if (this.data.style === import_discord3.ButtonStyle.Link) {
+        if (this.data.style === import_discord2.ButtonStyle.Link) {
           throw new TypeError('Cannot setup "onClick" handler on link buttons.');
         }
         if (!handler) {
@@ -375,7 +326,7 @@ var init_ButtonKit = __esm({
         return this;
       }
       onEnd(handler) {
-        if (this.data.style === import_discord3.ButtonStyle.Link) {
+        if (this.data.style === import_discord2.ButtonStyle.Link) {
           throw new TypeError('Cannot setup "onEnd" handler on link buttons.');
         }
         if (!handler) {
@@ -432,7 +383,7 @@ var init_ButtonKit = __esm({
       return exitContext(() => ctx.commandkit.eventInterceptor);
     }, "#getEventInterceptor");
     setupInteractionCollector_fn = /* @__PURE__ */ __name(function() {
-      if (this.data.style === import_discord3.ButtonStyle.Link || !__privateGet(this, _contextData) || !__privateGet(this, _onClickHandler))
+      if (this.data.style === import_discord2.ButtonStyle.Link || !__privateGet(this, _contextData) || !__privateGet(this, _onClickHandler))
         return;
       const myCustomId = this.customId ?? null;
       if (myCustomId === null) {
@@ -442,7 +393,7 @@ var init_ButtonKit = __esm({
       }
       const interceptor = __privateMethod(this, _ButtonKit_instances, getEventInterceptor_fn).call(this);
       __privateSet(this, _unsub, interceptor.subscribe(
-        import_discord3.Events.InteractionCreate,
+        import_discord2.Events.InteractionCreate,
         async (interaction) => {
           var _a, _b;
           if (!interaction.isButton()) return;
@@ -473,7 +424,7 @@ var init_ButtonKit = __esm({
 // src/components/button/Button.ts
 function Button(props) {
   const button = new ButtonKit();
-  props.style ??= import_discord4.ButtonStyle.Primary;
+  props.style ??= import_discord3.ButtonStyle.Primary;
   if (props.onClick) {
     props.customId ??= `buttonkit::${crypto.randomUUID()}`;
   }
@@ -512,26 +463,26 @@ function Button(props) {
   }
   return button;
 }
-var import_discord4;
+var import_discord3;
 var init_Button = __esm({
   "src/components/button/Button.ts"() {
     "use strict";
     init_cjs_shims();
-    import_discord4 = require("discord.js");
+    import_discord3 = require("discord.js");
     init_ButtonKit();
     __name(Button, "Button");
   }
 });
 
 // src/components/modal/ModalKit.ts
-var import_discord5, _onSubmitHandler, _contextData2, _unsub2, _ModalKit_instances, getEventInterceptor_fn2, setupCollector_fn, destroyCollector_fn2, _ModalKit, ModalKit;
+var import_discord4, _onSubmitHandler, _contextData2, _unsub2, _ModalKit_instances, getEventInterceptor_fn2, setupCollector_fn, destroyCollector_fn2, _ModalKit, ModalKit;
 var init_ModalKit = __esm({
   "src/components/modal/ModalKit.ts"() {
     "use strict";
     init_cjs_shims();
-    import_discord5 = require("discord.js");
+    import_discord4 = require("discord.js");
     init_async_context();
-    _ModalKit = class _ModalKit extends import_discord5.ModalBuilder {
+    _ModalKit = class _ModalKit extends import_discord4.ModalBuilder {
       constructor() {
         super(...arguments);
         __privateAdd(this, _ModalKit_instances);
@@ -652,7 +603,7 @@ var init_ModalKit = __esm({
       const interceptor = __privateMethod(this, _ModalKit_instances, getEventInterceptor_fn2).call(this);
       if (!interceptor) return;
       __privateSet(this, _unsub2, interceptor.subscribe(
-        import_discord5.Events.InteractionCreate,
+        import_discord4.Events.InteractionCreate,
         async (interaction) => {
           var _a, _b;
           if (!interaction.isModalSubmit()) return;
@@ -697,9 +648,9 @@ function Modal(props) {
   }
   if (props.children) {
     const childs = (Array.isArray(props.children) ? props.children : [props.children]).map((c) => {
-      if (c instanceof import_discord6.ActionRowBuilder) return c;
-      if (c instanceof import_discord6.TextInputBuilder)
-        return new import_discord6.ActionRowBuilder().addComponents(c);
+      if (c instanceof import_discord5.ActionRowBuilder) return c;
+      if (c instanceof import_discord5.TextInputBuilder)
+        return new import_discord5.ActionRowBuilder().addComponents(c);
     }).filter((c) => c != null);
     modal.addComponents(childs);
   }
@@ -712,7 +663,7 @@ function Modal(props) {
   return modal;
 }
 function TextInput(props) {
-  const input = new import_discord6.TextInputBuilder().setStyle(props.style);
+  const input = new import_discord5.TextInputBuilder().setStyle(props.style);
   if (props.customId) {
     input.setCustomId(props.customId);
   }
@@ -737,17 +688,17 @@ function TextInput(props) {
   return input;
 }
 function ShortInput(props) {
-  return TextInput({ ...props, style: import_discord6.TextInputStyle.Short });
+  return TextInput({ ...props, style: import_discord5.TextInputStyle.Short });
 }
 function ParagraphInput(props) {
-  return TextInput({ ...props, style: import_discord6.TextInputStyle.Paragraph });
+  return TextInput({ ...props, style: import_discord5.TextInputStyle.Paragraph });
 }
-var import_discord6;
+var import_discord5;
 var init_Modal = __esm({
   "src/components/modal/Modal.ts"() {
     "use strict";
     init_cjs_shims();
-    import_discord6 = require("discord.js");
+    import_discord5 = require("discord.js");
     init_ModalKit();
     __name(Modal, "Modal");
     __name(TextInput, "TextInput");
@@ -1128,12 +1079,6 @@ var init_RuntimePlugin = __esm({
        */
       async onBeforeInteraction(ctx, interaction) {
       }
-      /**
-       * Called after interaction is handled
-       * @param interaction The interaction that was handled
-       */
-      async onAfterInteraction(ctx, interaction) {
-      }
       /**
        * Called before message command is processed
        * @param message The message
@@ -1152,7 +1097,7 @@ var init_RuntimePlugin = __esm({
        * @param command The command
        * @param execute The function that executes the command
        */
-      async executeCommand(ctx, source, command, execute) {
+      async executeCommand(ctx, env, source, command, execute) {
         return false;
       }
     };
@@ -1229,10 +1174,12 @@ var init_DefaultLogger = __esm({
         if (!kind && !commandHandler) return "";
         const h = execHandlerKind[kind];
         if (!h && !commandHandler) return "";
-        const t2 = commandHandler === "app" ? "(app \u2728) " : "";
+        const forwardedBy = ctx.variables.get("forwardedBy");
+        const forwardedTo = ctx.variables.get("forwardedTo");
         const cmdText = command ? colors_default.magenta(`/${command}`) + " " : "";
+        const forward = forwardedTo ? `${colors_default.yellowBright(`(${forwardedBy || command} \u2192 ${forwardedTo})`)} ` : "";
         return colors_default.dim(`${BoxChars.vertical} `) + colors_default.cyanBright(
-          `${t2}${cmdText}${h ? colors_default.gray(`[${h}]`) : ""}`.trim()
+          `${cmdText}${forward}${h ? colors_default.gray(`[${h}]`) : ""}`.trim()
         );
       }
       _getLevelLabel(level) {
@@ -1333,53 +1280,20 @@ var init_Logger = __esm({
   }
 });
 
-// src/plugins/runtime/runtime-events/index.ts
-var CommandKitPluginEvents, PluginEvents;
-var init_runtime_events = __esm({
-  "src/plugins/runtime/runtime-events/index.ts"() {
-    "use strict";
-    init_cjs_shims();
-    CommandKitPluginEvents = {
-      "client-login": {
-        name: "ClientLogin",
-        cancelable: false
-      }
-    };
-    PluginEvents = Object.fromEntries(
-      Object.entries(CommandKitPluginEvents).map(
-        ([key, value]) => [
-          value.name,
-          class extends Event {
-            target;
-            constructor() {
-              super(key, { cancelable: value.cancelable });
-            }
-          }
-        ]
-      )
-    );
-  }
-});
-
 // src/plugins/runtime/CommandKitPluginRuntime.ts
-var import_discord7, _CommandKitPluginRuntime, CommandKitPluginRuntime;
+var import_discord6, _CommandKitPluginRuntime, CommandKitPluginRuntime;
 var init_CommandKitPluginRuntime = __esm({
   "src/plugins/runtime/CommandKitPluginRuntime.ts"() {
     "use strict";
     init_cjs_shims();
-    import_discord7 = require("discord.js");
+    import_discord6 = require("discord.js");
     init_error_codes();
     init_Logger();
-    init_runtime_events();
-    _CommandKitPluginRuntime = class _CommandKitPluginRuntime extends EventTarget {
+    _CommandKitPluginRuntime = class _CommandKitPluginRuntime {
       constructor(commandkit2) {
-        super();
         this.commandkit = commandkit2;
       }
-      plugins = new import_discord7.Collection();
-      onClientLogin = /* @__PURE__ */ __name(() => {
-        this.dispatchEvent(new PluginEvents.ClientLogin());
-      }, "onClientLogin");
+      plugins = new import_discord6.Collection();
       getPlugin(pluginName) {
         return this.plugins.get(pluginName) ?? null;
       }
@@ -2205,12 +2119,12 @@ var init_resolve_file_url = __esm({
 });
 
 // src/app/commands/MessageCommandParser.ts
-var import_discord8, _parsed, _options, _args, _MessageCommandParser, MessageCommandParser, _MessageCommandOptions, MessageCommandOptions;
+var import_discord7, _parsed, _options, _args, _MessageCommandParser, MessageCommandParser, _MessageCommandOptions, MessageCommandOptions;
 var init_MessageCommandParser = __esm({
   "src/app/commands/MessageCommandParser.ts"() {
     "use strict";
     init_cjs_shims();
-    import_discord8 = require("discord.js");
+    import_discord7 = require("discord.js");
     init_error_codes();
     _MessageCommandParser = class _MessageCommandParser {
       constructor(message, prefix, schema) {
@@ -2285,36 +2199,36 @@ var init_MessageCommandParser = __esm({
             const [name, value] = part.split(":");
             if (!(name in schema)) return null;
             switch (schema[name]) {
-              case import_discord8.ApplicationCommandOptionType.Boolean:
+              case import_discord7.ApplicationCommandOptionType.Boolean:
                 return { name, value: value === "true" };
-              case import_discord8.ApplicationCommandOptionType.Integer:
+              case import_discord7.ApplicationCommandOptionType.Integer:
                 return { name, value: parseInt(value, 10) };
-              case import_discord8.ApplicationCommandOptionType.Number:
+              case import_discord7.ApplicationCommandOptionType.Number:
                 return { name, value: parseFloat(value) };
-              case import_discord8.ApplicationCommandOptionType.String:
+              case import_discord7.ApplicationCommandOptionType.String:
                 return { name, value };
-              case import_discord8.ApplicationCommandOptionType.User:
+              case import_discord7.ApplicationCommandOptionType.User:
                 return {
                   name,
                   value: this.message.mentions.users.find((u) => {
                     return u.id === value.replace(/[<@!>]/g, "");
                   })
                 };
-              case import_discord8.ApplicationCommandOptionType.Channel:
+              case import_discord7.ApplicationCommandOptionType.Channel:
                 return {
                   name,
                   value: this.message.mentions.channels.find((c) => {
                     return c.id === value.replace(/[<#>]/g, "");
                   })
                 };
-              case import_discord8.ApplicationCommandOptionType.Role:
+              case import_discord7.ApplicationCommandOptionType.Role:
                 return {
                   name,
                   value: this.message.mentions.roles.find((r) => {
                     return r.id === value.replace(/[<@&>]/g, "");
                   })
                 };
-              case import_discord8.ApplicationCommandOptionType.Attachment:
+              case import_discord7.ApplicationCommandOptionType.Attachment:
                 return {
                   name,
                   value: this.message.attachments.find((a) => {
@@ -2388,7 +2302,7 @@ var init_MessageCommandParser = __esm({
       }
       getMentionable(name, required = false) {
         const target = this.assertOption(name, required);
-        if (target instanceof import_discord8.GuildMember || target instanceof import_discord8.User || target instanceof import_discord8.Role) {
+        if (target instanceof import_discord7.GuildMember || target instanceof import_discord7.User || target instanceof import_discord7.Role) {
           return target;
         }
         if (required) {
@@ -2417,12 +2331,12 @@ var init_MessageCommandParser = __esm({
 });
 
 // src/app/register/CommandRegistrar.ts
-var import_discord9, _CommandRegistrar, CommandRegistrar;
+var import_discord8, _CommandRegistrar, CommandRegistrar;
 var init_CommandRegistrar = __esm({
   "src/app/register/CommandRegistrar.ts"() {
     "use strict";
     init_cjs_shims();
-    import_discord9 = require("discord.js");
+    import_discord8 = require("discord.js");
     init_Logger();
     _CommandRegistrar = class _CommandRegistrar {
       /**
@@ -2435,7 +2349,7 @@ var init_CommandRegistrar = __esm({
           this.commandkit.client.token ?? process.env.DISCORD_TOKEN ?? process.env.TOKEN ?? ""
         );
       }
-      api = new import_discord9.REST();
+      api = new import_discord8.REST();
       /**
        * Gets the commands data.
        */
@@ -2445,20 +2359,20 @@ var init_CommandRegistrar = __esm({
         return commands.flatMap((cmd) => {
           const json = "toJSON" in cmd.data.command ? cmd.data.command.toJSON() : cmd.data.command;
           const collections = [json];
-          if (cmd.data.userContextMenu && json.type !== import_discord9.ApplicationCommandType.User) {
+          if (cmd.data.userContextMenu && json.type !== import_discord8.ApplicationCommandType.User) {
             collections.push({
               ...json,
-              type: import_discord9.ApplicationCommandType.User,
+              type: import_discord8.ApplicationCommandType.User,
               options: void 0,
               description_localizations: void 0,
               // @ts-ignore
               description: void 0
             });
           }
-          if (cmd.data.messageContextMenu && json.type !== import_discord9.ApplicationCommandType.Message) {
+          if (cmd.data.messageContextMenu && json.type !== import_discord8.ApplicationCommandType.Message) {
             collections.push({
               ...json,
-              type: import_discord9.ApplicationCommandType.Message,
+              type: import_discord8.ApplicationCommandType.Message,
               description_localizations: void 0,
               // @ts-ignore
               description: void 0,
@@ -2502,7 +2416,7 @@ var init_CommandRegistrar = __esm({
         if (!commands.length) return;
         try {
           const data = await this.api.put(
-            import_discord9.Routes.applicationCommands(this.commandkit.client.user.id),
+            import_discord8.Routes.applicationCommands(this.commandkit.client.user.id),
             {
               body: commands.map((c) => ({
                 ...c,
@@ -2537,7 +2451,7 @@ var init_CommandRegistrar = __esm({
           let count = 0;
           for (const [guild, guildCommands] of guildCommandsMap) {
             const data = await this.api.put(
-              import_discord9.Routes.applicationGuildCommands(
+              import_discord8.Routes.applicationGuildCommands(
                 this.commandkit.client.user.id,
                 guild
               ),
@@ -2697,7 +2611,9 @@ var init_environment = __esm({
        * @internal
        */
       markEnd() {
-        if (!__privateGet(this, _data).markEnd) __privateGet(this, _data).markEnd = performance.now();
+        if (!__privateGet(this, _data).markEnd) {
+          __privateGet(this, _data).markEnd = performance.now();
+        }
       }
       /**
        * Get the marker.
@@ -3038,12 +2954,11 @@ var init_Context = __esm({
        */
       async forwardCommand(command) {
         const target = await this.commandkit.commandHandler.prepareCommandRun(
-          this.isInteraction() ? this.interaction : this.message
+          this.isInteraction() ? this.interaction : this.message,
+          command
         );
         if (!target) {
-          throw new Error(
-            `Command ${command} not found! If you are trying to forward to a legacy command, ctx.forwardCommand is not compatible with legacy commands.`
-          );
+          throw new Error(`Command ${command} not found`);
         }
         const env = this.config.environment ?? getContext();
         if (!env) {
@@ -3066,6 +2981,8 @@ var init_Context = __esm({
         if (!handler) {
           throw new Error(`No handler found for ${handlerKind}`);
         }
+        env.variables.set("forwardedBy", this.commandName);
+        env.variables.set("forwardedTo", command);
         await handler(this.clone({ forwarded: true }));
         redirect();
       }
@@ -3271,23 +3188,24 @@ var init_Context = __esm({
 });
 
 // src/app/commands/AppCommandRunner.ts
-var import_discord10, _AppCommandRunner_instances, finalizer_fn, _AppCommandRunner, AppCommandRunner;
+var import_discord9, _AppCommandRunner_instances, finalizer_fn, _AppCommandRunner, AppCommandRunner;
 var init_AppCommandRunner = __esm({
   "src/app/commands/AppCommandRunner.ts"() {
     "use strict";
     init_cjs_shims();
-    import_discord10 = require("discord.js");
+    import_discord9 = require("discord.js");
     init_environment();
     init_Logger();
     init_Context();
     init_async_context();
+    init_error_codes();
     _AppCommandRunner = class _AppCommandRunner {
       constructor(handler) {
         this.handler = handler;
         __privateAdd(this, _AppCommandRunner_instances);
       }
       async runCommand(prepared, source) {
-        if (source instanceof import_discord10.Message && (source.editedTimestamp || source.partial)) {
+        if (source instanceof import_discord9.Message && (source.editedTimestamp || source.partial)) {
           return;
         }
         const { commandkit: commandkit2 } = this.handler;
@@ -3301,70 +3219,113 @@ var init_AppCommandRunner = __esm({
         const ctx = new MiddlewareContext(commandkit2, {
           environment: env,
           executionMode,
-          interaction: !(source instanceof import_discord10.Message) ? source : null,
-          message: source instanceof import_discord10.Message ? source : null,
+          interaction: !(source instanceof import_discord9.Message) ? source : null,
+          message: source instanceof import_discord9.Message ? source : null,
           forwarded: false,
           customArgs: {
-            setCommandRunner: /* @__PURE__ */ __name((fn2) => {
-              runCommand = fn2;
+            setCommandRunner: /* @__PURE__ */ __name((fn) => {
+              runCommand = fn;
             }, "setCommandRunner")
-          }
+          },
+          messageCommandParser: prepared.messageCommandParser
         });
-        for (const middleware of prepared.middlewares) {
-          await middleware.data.beforeExecute(ctx);
-        }
-        const targetData = prepared.command.data;
-        const fn = targetData[executionMode];
-        if (!fn) {
-          Logger.warn(
-            `Command ${prepared.command.command.name} has no handler for ${executionMode}`
-          );
+        let middlewaresCanceled = false;
+        if (prepared.middlewares.length) {
+          await provideContext(env, async () => {
+            for (const middleware of prepared.middlewares) {
+              try {
+                await middleware.data.beforeExecute(ctx);
+              } catch (e) {
+                if (isErrorType(e, CommandKitErrorCodes.ExitMiddleware)) {
+                  middlewaresCanceled = true;
+                  return;
+                }
+                if (isErrorType(
+                  e,
+                  [
+                    CommandKitErrorCodes.ForwardedCommand,
+                    CommandKitErrorCodes.InvalidCommandPrefix
+                  ]
+                )) {
+                  continue;
+                }
+                throw e;
+              }
+            }
+          });
         }
-        if (fn) {
-          try {
-            const _executeCommand = makeContextAwareFunction(
-              env,
-              async () => {
-                afterCommand((env2) => {
-                  const error = env2.getExecutionError();
-                  const marker = env2.getMarker();
-                  const time = `${env2.getExecutionTime().toFixed(2)}ms`;
-                  if (error) {
-                    Logger.error(
-                      `[${marker} - ${time}] Error executing command: ${error.stack || error}`
-                    );
-                    return;
-                  }
-                  Logger.info(
-                    `[${marker} - ${time}] Command executed successfully`
-                  );
-                });
-                return fn(ctx.clone());
-              },
-              __privateMethod(this, _AppCommandRunner_instances, finalizer_fn).bind(this)
+        if (!ctx.cancelled) {
+          const targetData = prepared.command.data;
+          const fn = targetData[executionMode];
+          if (!fn) {
+            Logger.warn(
+              `Command ${prepared.command.command.name} has no handler for ${executionMode}`
             );
-            const executeCommand = runCommand != null ? runCommand(_executeCommand) : _executeCommand;
-            env.markStart(prepared.command.command.name);
-            const res = await commandkit2.plugins.execute(async (ctx2, plugin) => {
-              return plugin.executeCommand(ctx2, source, prepared, executeCommand);
-            });
-            if (!res) {
-              await executeCommand();
+          }
+          if (fn) {
+            try {
+              const _executeCommand = makeContextAwareFunction(
+                env,
+                async () => {
+                  env.registerDeferredFunction((env2) => {
+                    env2.markEnd();
+                    const error = env2.getExecutionError();
+                    const marker = env2.getMarker();
+                    const time = `${env2.getExecutionTime().toFixed(2)}ms`;
+                    if (error) {
+                      Logger.error(
+                        `[${marker} - ${time}] Error executing command: ${error.stack || error}`
+                      );
+                      return;
+                    }
+                    Logger.info(
+                      `[${marker} - ${time}] Command executed successfully`
+                    );
+                  });
+                  return fn(ctx.clone());
+                },
+                __privateMethod(this, _AppCommandRunner_instances, finalizer_fn).bind(this)
+              );
+              const executeCommand = runCommand != null ? runCommand(_executeCommand) : _executeCommand;
+              env.markStart(prepared.command.data.command.name);
+              const res = await commandkit2.plugins.execute(async (ctx2, plugin) => {
+                return plugin.executeCommand(
+                  ctx2,
+                  env,
+                  source,
+                  prepared,
+                  executeCommand
+                );
+              });
+              if (!res) {
+                await executeCommand();
+              }
+            } catch (e) {
+              if (isErrorType(e, CommandKitErrorCodes.ExitMiddleware)) {
+                middlewaresCanceled = true;
+              }
+              if (!isErrorType(
+                e,
+                [
+                  CommandKitErrorCodes.ForwardedCommand,
+                  CommandKitErrorCodes.ExitMiddleware
+                ]
+              )) {
+                Logger.error(e);
+              }
             }
-          } catch (e) {
-            Logger.error(e);
           }
         }
-        try {
-          for (const middleware of prepared.middlewares) {
-            await middleware.data.afterExecute(ctx);
-          }
-        } finally {
-          env.markEnd();
+        if (!middlewaresCanceled && prepared.middlewares.length) {
+          await provideContext(env, async () => {
+            for (const middleware of prepared.middlewares) {
+              await middleware.data.afterExecute(ctx);
+            }
+          });
         }
       }
       getExecutionMode(source) {
-        if (source instanceof import_discord10.Message) return CommandExecutionMode.Message;
+        if (source instanceof import_discord9.Message) return CommandExecutionMode.Message;
         if (source.isChatInputCommand()) return CommandExecutionMode.SlashCommand;
         if (source.isAutocomplete()) {
           return CommandExecutionMode.Autocomplete;
@@ -3462,12 +3423,12 @@ var init_types_package = __esm({
 });
 
 // src/app/handlers/AppCommandHandler.ts
-var import_discord11, commandDataSchema, middlewareDataSchema, _AppCommandHandler, AppCommandHandler;
+var import_discord10, commandDataSchema, middlewareDataSchema, _AppCommandHandler, AppCommandHandler;
 var init_AppCommandHandler = __esm({
   "src/app/handlers/AppCommandHandler.ts"() {
     "use strict";
     init_cjs_shims();
-    import_discord11 = require("discord.js");
+    import_discord10 = require("discord.js");
     init_resolve_file_url();
     init_MessageCommandParser();
     init_error_codes();
@@ -3477,7 +3438,7 @@ var init_AppCommandHandler = __esm({
     init_constants();
     init_types_package();
     commandDataSchema = {
-      command: /* @__PURE__ */ __name((c) => c instanceof import_discord11.SlashCommandBuilder || c instanceof import_discord11.ContextMenuCommandBuilder || c && typeof c === "object", "command"),
+      command: /* @__PURE__ */ __name((c) => c instanceof import_discord10.SlashCommandBuilder || c instanceof import_discord10.ContextMenuCommandBuilder || c && typeof c === "object", "command"),
       chatInput: /* @__PURE__ */ __name((c) => typeof c === "function", "chatInput"),
       autocomplete: /* @__PURE__ */ __name((c) => typeof c === "function", "autocomplete"),
       message: /* @__PURE__ */ __name((c) => typeof c === "function", "message"),
@@ -3493,8 +3454,8 @@ var init_AppCommandHandler = __esm({
         this.commandkit = commandkit2;
         this.registrar = new CommandRegistrar(this.commandkit);
       }
-      loadedCommands = new import_discord11.Collection();
-      loadedMiddlewares = new import_discord11.Collection();
+      loadedCommands = new import_discord10.Collection();
+      loadedMiddlewares = new import_discord10.Collection();
       // Name-to-ID mapping for easier lookup
       commandNameToId = /* @__PURE__ */ new Map();
       subcommandPathToId = /* @__PURE__ */ new Map();
@@ -3549,59 +3510,60 @@ var init_AppCommandHandler = __esm({
           if (!prepared) return;
           return this.commandRunner.runCommand(prepared, newMessage);
         };
-        this.commandkit.client.on(import_discord11.Events.InteractionCreate, this.onInteraction);
-        this.commandkit.client.on(import_discord11.Events.MessageCreate, this.onMessageCreate);
-        this.commandkit.client.on(import_discord11.Events.MessageUpdate, this.onMessageUpdate);
+        this.commandkit.client.on(import_discord10.Events.InteractionCreate, this.onInteraction);
+        this.commandkit.client.on(import_discord10.Events.MessageCreate, this.onMessageCreate);
+        this.commandkit.client.on(import_discord10.Events.MessageUpdate, this.onMessageUpdate);
       }
-      async prepareCommandRun(source) {
+      async prepareCommandRun(source, cmdName) {
         var _a;
-        let cmdName;
         let parser2;
-        if (source instanceof import_discord11.Message) {
-          if (source.author.bot) return null;
-          const prefix = await this.commandkit.config.getMessageCommandPrefix(source);
-          parser2 = new MessageCommandParser(
-            source,
-            Array.isArray(prefix) ? prefix : [prefix],
-            (command) => {
-              var _a2, _b;
-              const commandId2 = this.commandNameToId.get(command);
-              if (!commandId2) return null;
-              const loadedCommand2 = this.loadedCommands.get(commandId2);
-              if (!loadedCommand2) return null;
-              if (source.guildId && ((_a2 = loadedCommand2.guilds) == null ? void 0 : _a2.length) && !loadedCommand2.guilds.includes(source.guildId)) {
+        if (!cmdName) {
+          if (source instanceof import_discord10.Message) {
+            if (source.author.bot) return null;
+            const prefix = await this.commandkit.config.getMessageCommandPrefix(source);
+            parser2 = new MessageCommandParser(
+              source,
+              Array.isArray(prefix) ? prefix : [prefix],
+              (command) => {
+                var _a2, _b;
+                const commandId2 = this.commandNameToId.get(command);
+                if (!commandId2) return null;
+                const loadedCommand2 = this.loadedCommands.get(commandId2);
+                if (!loadedCommand2) return null;
+                if (source.guildId && ((_a2 = loadedCommand2.guilds) == null ? void 0 : _a2.length) && !loadedCommand2.guilds.includes(source.guildId)) {
+                  return null;
+                }
+                const json = "toJSON" in loadedCommand2.data.command ? loadedCommand2.data.command.toJSON() : loadedCommand2.data.command;
+                return ((_b = json.options) == null ? void 0 : _b.reduce(
+                  (acc, opt) => {
+                    acc[opt.name] = opt.type;
+                    return acc;
+                  },
+                  {}
+                )) ?? {};
+              }
+            );
+            try {
+              const fullCommand = parser2.getFullCommand();
+              const parts = fullCommand.split(" ");
+              cmdName = parts[0];
+            } catch (e) {
+              if (isErrorType(e, CommandKitErrorCodes.InvalidCommandPrefix)) {
                 return null;
               }
-              const json = "toJSON" in loadedCommand2.data.command ? loadedCommand2.data.command.toJSON() : loadedCommand2.data.command;
-              return ((_b = json.options) == null ? void 0 : _b.reduce(
-                (acc, opt) => {
-                  acc[opt.name] = opt.type;
-                  return acc;
-                },
-                {}
-              )) ?? {};
-            }
-          );
-          try {
-            const fullCommand = parser2.getFullCommand();
-            const parts = fullCommand.split(" ");
-            cmdName = parts[0];
-          } catch (e) {
-            if (isErrorType(e, CommandKitErrorCodes.InvalidCommandPrefix)) {
+              Logger.error(e);
               return null;
             }
-            Logger.error(e);
-            return null;
+          } else {
+            if (!source.isCommand()) return null;
+            cmdName = source.commandName;
           }
-        } else {
-          if (!source.isCommand()) return null;
-          cmdName = source.commandName;
         }
         const commandId = this.commandNameToId.get(cmdName);
         if (!commandId) return null;
         const loadedCommand = this.loadedCommands.get(commandId);
         if (!loadedCommand) return null;
-        if (source instanceof import_discord11.CommandInteraction && source.guildId && ((_a = loadedCommand.guilds) == null ? void 0 : _a.length) && !loadedCommand.guilds.includes(source.guildId)) {
+        if (source instanceof import_discord10.CommandInteraction && source.guildId && ((_a = loadedCommand.guilds) == null ? void 0 : _a.length) && !loadedCommand.guilds.includes(source.guildId)) {
           return null;
         }
         const middlewares = [];
@@ -3720,7 +3682,7 @@ var init_AppCommandHandler = __esm({
       async applyLocalizations(command) {
         var _a, _b, _c, _d, _e;
         const localization = this.commandkit.config.localizationStrategy;
-        const validLocales = Object.values(import_discord11.Locale).filter(
+        const validLocales = Object.values(import_discord10.Locale).filter(
           (v) => typeof v === "string"
         );
         const localizationKey = command.name;
@@ -3730,7 +3692,7 @@ var init_AppCommandHandler = __esm({
             locale
           );
           if (!(translation == null ? void 0 : translation.command)) continue;
-          if (command instanceof import_discord11.SlashCommandBuilder) {
+          if (command instanceof import_discord10.SlashCommandBuilder) {
             if (translation.command.name) {
               command.setNameLocalization(locale, translation.command.name);
             }
@@ -3776,7 +3738,7 @@ var init_AppCommandHandler = __esm({
                 });
               }
             }
-          } else if (command instanceof import_discord11.ContextMenuCommandBuilder) {
+          } else if (command instanceof import_discord10.ContextMenuCommandBuilder) {
             if (translation.command.name) {
               command.setNameLocalization(locale, translation.command.name);
             }
@@ -3831,11 +3793,12 @@ var init_AppCommandHandler = __esm({
 });
 
 // src/app/router/CommandsRouter.ts
-var import_node_fs4, import_promises4, import_node_path4, MIDDLEWARE_PATTERN, COMMAND_PATTERN, CATEGORY_PATTERN, _CommandsRouter, CommandsRouter;
+var import_discord11, import_node_fs4, import_promises4, import_node_path4, MIDDLEWARE_PATTERN, COMMAND_PATTERN, CATEGORY_PATTERN, _CommandsRouter, CommandsRouter;
 var init_CommandsRouter = __esm({
   "src/app/router/CommandsRouter.ts"() {
     "use strict";
     init_cjs_shims();
+    import_discord11 = require("discord.js");
     import_node_fs4 = require("fs");
     import_promises4 = require("fs/promises");
     import_node_path4 = require("path");
@@ -3846,8 +3809,8 @@ var init_CommandsRouter = __esm({
       constructor(options) {
         this.options = options;
       }
-      commands = /* @__PURE__ */ new Map();
-      middlewares = /* @__PURE__ */ new Map();
+      commands = new import_discord11.Collection();
+      middlewares = new import_discord11.Collection();
       populate(data) {
         for (const [id, command] of Object.entries(data.commands)) {
           this.commands.set(id, command);
@@ -3961,11 +3924,12 @@ var init_CommandsRouter = __esm({
 });
 
 // src/app/router/EventsRouter.ts
-var import_node_fs5, import_promises5, import_node_path5, _EventsRouter, EventsRouter;
+var import_discord12, import_node_fs5, import_promises5, import_node_path5, _EventsRouter, EventsRouter;
 var init_EventsRouter = __esm({
   "src/app/router/EventsRouter.ts"() {
     "use strict";
     init_cjs_shims();
+    import_discord12 = require("discord.js");
     import_node_fs5 = require("fs");
     import_promises5 = require("fs/promises");
     import_node_path5 = require("path");
@@ -3982,7 +3946,7 @@ var init_EventsRouter = __esm({
         }
       }
       /** Internal storage of parsed events */
-      events = /* @__PURE__ */ new Map();
+      events = new import_discord12.Collection();
       /**
        * Find a parsed event by its name
        * @param event - Name of the event to find
@@ -4033,7 +3997,7 @@ var init_EventsRouter = __esm({
         return Object.fromEntries(this.events);
       }
       /**
-       * Convert the internal events map to a plain object
+       * Convert the internal events Collection to a plain object
        * @returns Events tree as a plain object
        */
       toJSON() {
@@ -4425,7 +4389,7 @@ var init_CommandKitEventsChannel = __esm({
 });
 
 // src/CommandKit.ts
-var import_node_events2, import_discord12, import_node_path8, import_node_fs8, commandkit, _started, _CommandKit_instances, init_fn, initCommands_fn, initEvents_fn, _CommandKit, CommandKit;
+var import_node_events2, import_discord13, import_node_path8, import_node_fs8, commandkit, _started, _CommandKit_instances, init_fn, initCommands_fn, initEvents_fn, _CommandKit, CommandKit;
 var init_CommandKit = __esm({
   "src/CommandKit.ts"() {
     "use strict";
@@ -4436,7 +4400,7 @@ var init_CommandKit = __esm({
     init_MemoryCache();
     init_components();
     init_EventInterceptor();
-    import_discord12 = require("discord.js");
+    import_discord13 = require("discord.js");
     init_DefaultLocalizationStrategy();
     init_utilities();
     import_node_path8 = require("path");
@@ -4473,18 +4437,13 @@ var init_CommandKit = __esm({
             colors_default.red('"client" is required when instantiating CommandKit.')
           );
         }
-        if (options.validationsPath && !options.commandsPath) {
-          throw new Error(
-            colors_default.red('"commandsPath" is required when "validationsPath" is set.')
-          );
-        }
         super();
         this.options = options;
         __privateAdd(this, _CommandKit_instances);
         __privateAdd(this, _started, false);
         __publicField(this, "eventInterceptor");
         __publicField(this, "config", {
-          defaultLocale: import_discord12.Locale.EnglishUS,
+          defaultLocale: import_discord13.Locale.EnglishUS,
           localizationStrategy: new DefaultLocalizationStrategy(this),
           getMessageCommandPrefix: /* @__PURE__ */ __name(() => "!", "getMessageCommandPrefix")
         });
@@ -4494,7 +4453,6 @@ var init_CommandKit = __esm({
         __publicField(this, "eventHandler", new AppEventsHandler(this));
         __publicField(this, "plugins");
         __publicField(this, "events", new CommandKitEventsChannel(this));
-        options.debugCommands ??= process.env.NODE_ENV !== "production";
         if (options.cacheProvider !== null && (!options.cacheProvider || !(options.cacheProvider instanceof CacheProvider))) {
           options.cacheProvider = new MemoryCache();
         }
@@ -4526,12 +4484,20 @@ var init_CommandKit = __esm({
         this.commandHandler.registerCommandHandler();
         this.incrementClientListenersCount();
         if (token !== false && !this.options.client.isReady()) {
-          this.client.once(import_discord12.Events.ClientReady, async () => {
+          this.client.once(import_discord13.Events.ClientReady, async () => {
             await this.commandHandler.registrar.register();
           });
+          await this.plugins.execute((ctx, plugin) => {
+            var _a;
+            return (_a = plugin.onBeforeClientLogin) == null ? void 0 : _a.call(plugin, ctx);
+          });
           await this.options.client.login(
             token ?? process.env.TOKEN ?? process.env.DISCORD_TOKEN
           );
+          await this.plugins.execute((ctx, plugin) => {
+            var _a;
+            return (_a = plugin.onAfterClientLogin) == null ? void 0 : _a.call(plugin, ctx);
+          });
         } else if (this.options.client.isReady()) {
           await this.commandHandler.registrar.register();
         }
@@ -4585,12 +4551,6 @@ var init_CommandKit = __esm({
         const provider = this.options.cacheProvider;
         return provider ?? null;
       }
-      /**
-       * Whether or not to debug the command handler.
-       */
-      isDebuggingCommands() {
-        return this.options.debugCommands || false;
-      }
       /**
        * Get the client attached to this CommandKit instance.
        */
@@ -4609,42 +4569,6 @@ var init_CommandKit = __esm({
       async reloadEvents() {
         await this.eventHandler.reloadEvents();
       }
-      /**
-       * @returns The path to the commands folder which was set when instantiating CommandKit.
-       */
-      get commandsPath() {
-        return this.options.commandsPath;
-      }
-      /**
-       * @returns The path to the events folder which was set when instantiating CommandKit.
-       */
-      get eventsPath() {
-        return this.options.eventsPath;
-      }
-      /**
-       * @returns The path to the validations folder which was set when instantiating CommandKit.
-       */
-      get validationsPath() {
-        return this.options.validationsPath;
-      }
-      /**
-       * @returns An array of all the developer user IDs which was set when instantiating CommandKit.
-       */
-      get devUserIds() {
-        return this.options.devUserIds || [];
-      }
-      /**
-       * @returns An array of all the developer guild IDs which was set when instantiating CommandKit.
-       */
-      get devGuildIds() {
-        return this.options.devGuildIds || [];
-      }
-      /**
-       * @returns An array of all the developer role IDs which was set when instantiating CommandKit.
-       */
-      get devRoleIds() {
-        return this.options.devRoleIds || [];
-      }
       /**
        * Increment the client listeners count.
        */
@@ -4702,6 +4626,9 @@ var init_CommandKit = __esm({
       await __privateMethod(this, _CommandKit_instances, initCommands_fn).call(this);
     }, "#init");
     initCommands_fn = /* @__PURE__ */ __name(async function() {
+      await this.plugins.execute((ctx, plugin) => {
+        return plugin.onBeforeCommandsLoad(ctx);
+      });
       if (this.commandsRouter.isValidPath()) {
         const result = await this.commandsRouter.scan();
         if (COMMANDKIT_IS_DEV) {
@@ -4712,12 +4639,21 @@ var init_CommandKit = __esm({
         }
       }
       await this.commandHandler.loadCommands();
+      await this.plugins.execute((ctx, plugin) => {
+        return plugin.onAfterCommandsLoad(ctx);
+      });
     }, "#initCommands");
     initEvents_fn = /* @__PURE__ */ __name(async function() {
+      await this.plugins.execute((ctx, plugin) => {
+        return plugin.onBeforeEventsLoad(ctx);
+      });
       if (this.eventsRouter.isValidPath()) {
         await this.eventsRouter.scan();
       }
       await this.eventHandler.loadEvents();
+      await this.plugins.execute((ctx, plugin) => {
+        return plugin.onAfterEventsLoad(ctx);
+      });
     }, "#initEvents");
     __name(_CommandKit, "CommandKit");
     __publicField(_CommandKit, "createElement", createElement);
@@ -4738,7 +4674,7 @@ var init_version = __esm({
     "use strict";
     init_cjs_shims();
     version = /* @__MACRO__ $version */
-    "0.1.11-dev.20250328083250";
+    "0.1.11-dev.20250330063035";
   }
 });
 
@@ -5217,7 +5153,7 @@ export default async function on${name[0].toUpperCase() + name.slice(1)}() {
 }
 async function generateLocale(locale, commandName, customPath) {
   const localeNames = Object.fromEntries(
-    Object.entries(import_discord13.Locale).map(([k, v]) => [v, k])
+    Object.entries(import_discord15.Locale).map(([k, v]) => [v, k])
   );
   if (!localeNames[locale]) {
     panic(`Invalid locale: ${locale}`);
@@ -5249,14 +5185,14 @@ async function generateLocale(locale, commandName, customPath) {
     )
   );
 }
-var import_promises7, import_path4, import_discord13, import_fs2, BASE_PATH, COMMANDS_DIR, EVENTS_DIR, LOCALES_DIR, formatPath;
+var import_promises7, import_path4, import_discord15, import_fs2, BASE_PATH, COMMANDS_DIR, EVENTS_DIR, LOCALES_DIR, formatPath;
 var init_generators = __esm({
   "src/cli/generators.ts"() {
     "use strict";
     init_cjs_shims();
     import_promises7 = require("fs/promises");
     import_path4 = require("path");
-    import_discord13 = require("discord.js");
+    import_discord15 = require("discord.js");
     init_common();
     import_fs2 = require("fs");
     init_colors();
@@ -5317,7 +5253,6 @@ __export(index_exports, {
   createLogger: () => createLogger,
   default: () => index_default,
   defineConfig: () => defineConfig,
-  dmOnly: () => dmOnly,
   exitContext: () => exitContext,
   exitMiddleware: () => exitMiddleware,
   fromEsbuildPlugin: () => fromEsbuildPlugin,
@@ -5325,13 +5260,15 @@ __export(index_exports, {
   getConfig: () => getConfig,
   getContext: () => getContext,
   getElement: () => getElement,
-  guildOnly: () => guildOnly,
   invalidate: () => invalidate,
   isCachedFunction: () => isCachedFunction,
   isCommandKitElement: () => isCommandKitElement,
   isCompilerPlugin: () => isCompilerPlugin,
+  isInteractionSource: () => isInteractionSource,
+  isMessageSource: () => isMessageSource,
   isRuntimePlugin: () => isRuntimePlugin,
   makeContextAwareFunction: () => makeContextAwareFunction,
+  provideContext: () => provideContext,
   redirect: () => redirect,
   rethrow: () => rethrow,
   revalidate: () => revalidate,
@@ -5366,6 +5303,18 @@ init_cjs_shims();
 // src/app/index.ts
 init_signals();
 
+// src/app/commands/helpers.ts
+init_cjs_shims();
+var import_discord14 = require("discord.js");
+function isMessageSource(source) {
+  return source instanceof import_discord14.Message;
+}
+__name(isMessageSource, "isMessageSource");
+function isInteractionSource(source) {
+  return !isMessageSource(source);
+}
+__name(isInteractionSource, "isInteractionSource");
+
 // src/index.ts
 init_DefaultLogger();
 
@@ -5484,7 +5433,6 @@ var index_default = CommandKit;
   createElement,
   createLogger,
   defineConfig,
-  dmOnly,
   exitContext,
   exitMiddleware,
   fromEsbuildPlugin,
@@ -5492,13 +5440,15 @@ var index_default = CommandKit;
   getConfig,
   getContext,
   getElement,
-  guildOnly,
   invalidate,
   isCachedFunction,
   isCommandKitElement,
   isCompilerPlugin,
+  isInteractionSource,
+  isMessageSource,
   isRuntimePlugin,
   makeContextAwareFunction,
+  provideContext,
   redirect,
   rethrow,
   revalidate,