@robinmordasiewicz/f5xc-xcsh 1.0.91-2601032317 → 1.0.91-2601040044

package/dist/index.js

@@ -46628,7 +46628,7 @@ import { homedir as homedir2 } from "os";
 // src/config/paths.ts
 import { homedir } from "os";
 import { join } from "path";
-var APP_NAME = "xcsh";
+var APP_NAME = "f5xc";
 function getConfigDir() {
   const xdgConfig = process.env.XDG_CONFIG_HOME;
   if (xdgConfig) {
@@ -47052,8 +47052,8 @@ function getLogoModeFromEnv(envPrefix) {
 var CLI_NAME = "xcsh";
 var CLI_FULL_NAME = "F5 Distributed Cloud Shell";
 function getVersion() {
-  if ("v1.0.91-2601032317") {
-    return "v1.0.91-2601032317";
+  if ("v1.0.91-2601040044") {
+    return "v1.0.91-2601040044";
   }
   if (process.env.XCSH_VERSION) {
     return process.env.XCSH_VERSION;
@@ -143334,10 +143334,30 @@ var DomainRegistry = class {
       const cmdArgs = restArgs.slice(1);
       const cmd2 = subgroup.commands.get(cmdName);
       if (cmd2) {
+        const commandPath = `${domainName} ${firstArg} ${cmdName}`;
+        const validationError = this.validateCommandArgs(
+          cmd2,
+          cmdArgs,
+          subgroup.commands,
+          commandPath
+        );
+        if (validationError) {
+          return validationError;
+        }
         return cmd2.execute(cmdArgs, session);
       }
       for (const [, command] of subgroup.commands) {
         if (command.aliases?.includes(cmdName)) {
+          const commandPath = `${domainName} ${firstArg} ${command.name}`;
+          const validationError = this.validateCommandArgs(
+            command,
+            cmdArgs,
+            subgroup.commands,
+            commandPath
+          );
+          if (validationError) {
+            return validationError;
+          }
           return command.execute(cmdArgs, session);
         }
       }
@@ -143355,10 +143375,30 @@ var DomainRegistry = class {
     }
     const cmd = domain.commands.get(firstArg);
     if (cmd) {
+      const commandPath = `${domainName} ${firstArg}`;
+      const validationError = this.validateCommandArgs(
+        cmd,
+        restArgs,
+        domain.commands,
+        commandPath
+      );
+      if (validationError) {
+        return validationError;
+      }
       return cmd.execute(restArgs, session);
     }
     for (const [, command] of domain.commands) {
       if (command.aliases?.includes(firstArg)) {
+        const commandPath = `${domainName} ${command.name}`;
+        const validationError = this.validateCommandArgs(
+          command,
+          restArgs,
+          domain.commands,
+          commandPath
+        );
+        if (validationError) {
+          return validationError;
+        }
         return command.execute(restArgs, session);
       }
     }
@@ -143460,6 +143500,67 @@ var DomainRegistry = class {
       contextChanged: false
     };
   }
+  /**
+   * Validate command arguments and check for conflicts with sibling commands.
+   * Returns an error result if validation fails, undefined if OK to proceed.
+   */
+  validateCommandArgs(cmd, cmdArgs, siblingCommands, commandPath) {
+    if (cmdArgs.length === 0) {
+      return void 0;
+    }
+    if (cmd.usage && cmd.usage.trim().length > 0) {
+      return void 0;
+    }
+    const firstExtraArg = cmdArgs[0]?.toLowerCase() ?? "";
+    const siblingCmd = siblingCommands.get(firstExtraArg);
+    if (siblingCmd) {
+      const pathParts = commandPath.split(" ");
+      pathParts.pop();
+      const suggestedPath = [...pathParts, ...cmdArgs].join(" ");
+      return {
+        output: [
+          `Error: Cannot combine '${cmd.name}' with '${firstExtraArg}'.`,
+          ``,
+          `Did you mean: ${suggestedPath}`
+        ],
+        shouldExit: false,
+        shouldClear: false,
+        contextChanged: false,
+        error: `Conflicting subcommands: '${cmd.name}' and '${firstExtraArg}'`
+      };
+    }
+    for (const [siblingName, sibling] of siblingCommands) {
+      if (sibling.aliases?.includes(firstExtraArg)) {
+        const pathParts = commandPath.split(" ");
+        pathParts.pop();
+        const suggestedPath = [...pathParts, ...cmdArgs].join(" ");
+        return {
+          output: [
+            `Error: Cannot combine '${cmd.name}' with '${firstExtraArg}' (alias for '${siblingName}').`,
+            ``,
+            `Did you mean: ${suggestedPath}`
+          ],
+          shouldExit: false,
+          shouldClear: false,
+          contextChanged: false,
+          error: `Conflicting subcommands: '${cmd.name}' and '${firstExtraArg}'`
+        };
+      }
+    }
+    return {
+      output: [
+        `Error: Unexpected arguments for '${cmd.name}': ${cmdArgs.join(" ")}`,
+        ``,
+        `Usage: ${commandPath}`,
+        ``,
+        `The '${cmd.name}' command does not accept additional arguments.`
+      ],
+      shouldExit: false,
+      shouldClear: false,
+      contextChanged: false,
+      error: `Unexpected arguments: ${cmdArgs.join(" ")}`
+    };
+  }
 };
 var customDomains = new DomainRegistry();
 function successResult(output, contextChanged = false) {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@robinmordasiewicz/f5xc-xcsh",
-  "version": "1.0.91-2601032317",
+  "version": "1.0.91-2601040044",
   "description": "F5 Distributed Cloud Shell - Interactive CLI for F5 XC",
   "type": "module",
   "bin": {