@robinmordasiewicz/f5xc-xcsh 2.0.21-2601130605 → 2.0.21-2601131436

package/dist/index.js

@@ -49215,8 +49215,8 @@ function getLogoModeFromEnv(envPrefix) {
 var CLI_NAME = "xcsh";
 var CLI_FULL_NAME = "F5 Distributed Cloud Shell";
 function getVersion() {
-  if ("v2.0.21-2601130605") {
-    return "v2.0.21-2601130605";
+  if ("v2.0.21-2601131436") {
+    return "v2.0.21-2601131436";
   }
   if (process.env.XCSH_VERSION) {
     return process.env.XCSH_VERSION;
@@ -83975,7 +83975,7 @@ var Completer = class {
         resourceCtx.domain
       );
       if (resourceTypes.length > 0) {
-        if (parsed.currentWord && !parsed.currentWord.startsWith("-")) {
+        if (parsed.currentWord && !parsed.currentWord.startsWith("-") && parsed.currentWord.toLowerCase() !== resourceCtx.action) {
           const filtered = this.filterSuggestions(
             resourceTypes,
             parsed.currentWord
@@ -83983,7 +83983,7 @@ var Completer = class {
           if (filtered.length > 0) {
             return filtered;
           }
-        } else if (!parsed.currentWord) {
+        } else if (!parsed.currentWord || parsed.currentWord.toLowerCase() === resourceCtx.action) {
           return [
             ...resourceTypes,
             ...this.getActionFlagSuggestions(resourceCtx.action)
@@ -83996,10 +83996,21 @@ var Completer = class {
       const firstArg2 = parsed.args[0];
       if (parsed.args.length > 0 && firstArg2 && !isStillTypingDomain) {
         const targetDomain = firstArg2.toLowerCase();
-        if (completionRegistry.has(targetDomain)) {
-          const domainNode = completionRegistry.get(targetDomain);
-          if (domainNode?.source === "api") {
-            suggestions = this.getActionSuggestions();
+        const domainNode = completionRegistry.get(targetDomain);
+        const apiDomainInfo = getDomainInfo(targetDomain);
+        if (domainNode || apiDomainInfo) {
+          const isApiDomain = domainNode?.source === "api" || apiDomainInfo !== null;
+          if (isApiDomain) {
+            const hasAction = parsed.args.length > 1 && RESOURCE_ACTIONS.has(
+              parsed.args[1]?.toLowerCase() ?? ""
+            );
+            if (!hasAction) {
+              suggestions = this.getActionSuggestions();
+            } else {
+              suggestions = this.getActionFlagSuggestions(
+                parsed.args[1]?.toLowerCase()
+              );
+            }
           } else {
             suggestions = completionRegistry.getChildSuggestions(
               targetDomain,
@@ -84325,11 +84336,22 @@ var Completer = class {
       return ctx;
     }
     const navCtx = this.session.getContextPath();
-    ctx.domain = navCtx.domain || null;
-    if (parsed.args.length > 0) {
+    let argOffset = 0;
+    if (navCtx.domain) {
+      ctx.domain = navCtx.domain;
+      argOffset = 0;
+    } else if (parsed.args.length > 0) {
       const firstArg = parsed.args[0]?.toLowerCase() ?? "";
-      if (RESOURCE_ACTIONS.has(firstArg)) {
-        ctx.action = firstArg;
+      const domainInfo = getDomainInfo(firstArg);
+      if (domainInfo) {
+        ctx.domain = firstArg;
+        argOffset = 1;
+      }
+    }
+    if (parsed.args.length > argOffset) {
+      const actionArg = parsed.args[argOffset]?.toLowerCase() ?? "";
+      if (RESOURCE_ACTIONS.has(actionArg)) {
+        ctx.action = actionArg;
       }
     }
     if (ctx.domain && ctx.action && RESOURCE_ACTIONS.has(ctx.action)) {
@@ -84337,7 +84359,7 @@ var Completer = class {
       const resourceNames = new Set(
         domainInfo?.primaryResources?.map((r) => r.name) ?? []
       );
-      for (let i = 1; i < parsed.args.length; i++) {
+      for (let i = argOffset + 1; i < parsed.args.length; i++) {
         const arg = parsed.args[i]?.toLowerCase() ?? "";
         if (resourceNames.has(arg)) {
           const isLastArg = i === parsed.args.length - 1;
@@ -84503,6 +84525,7 @@ var Completer = class {
         if (resourceType && namespace) {
           return this.completeResourceName(
             resourceType,
+            // Will be pluralized for API path (e.g., 'http_loadbalancer' → 'http_loadbalancers')
             resourceType,
             valuePartial,
             namespace
@@ -84561,11 +84584,12 @@ var Completer = class {
     }));
   }
   /**
-   * Convert domain name to API resource path
+   * Convert resource type to API resource path
+   * F5 XC API paths keep underscores and use plural form
+   * Example: http_loadbalancer → http_loadbalancers
    */
-  domainToResourcePath(domain) {
-    const resourceName = domain.replace(/_/g, "-");
-    return resourceName.endsWith("s") ? resourceName : `${resourceName}s`;
+  domainToResourcePath(resourceType) {
+    return resourceType.endsWith("s") ? resourceType : `${resourceType}s`;
   }
   /**
    * Complete resource names with caching

package/package.json

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