@robinmordasiewicz/f5xc-xcsh 2.0.21-2601100619 → 2.0.21-2601122136

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-2601100619") {
-    return "v2.0.21-2601100619";
+  if ("v2.0.21-2601122136") {
+    return "v2.0.21-2601122136";
   }
   if (process.env.XCSH_VERSION) {
     return process.env.XCSH_VERSION;
@@ -50512,15 +50512,33 @@ var DEFAULT_RESOURCE_COLUMNS = [
   { header: "NAME", accessor: "name", minWidth: 10, maxWidth: 40 },
   { header: "LABELS", accessor: "labels", minWidth: 10, maxWidth: 35 }
 ];
+var TOP_LEVEL_RESOURCE_COLUMNS = [
+  { header: "NAME", accessor: "name", minWidth: 10, maxWidth: 30 },
+  {
+    header: "DESCRIPTION",
+    accessor: "description",
+    minWidth: 15,
+    maxWidth: 50
+  },
+  { header: "LABELS", accessor: "labels", minWidth: 10, maxWidth: 35 }
+];
+function isTopLevelResource(items) {
+  if (items.length === 0) return false;
+  return items.every((item) => {
+    const ns = item.namespace;
+    return ns === "" || ns === null || ns === void 0;
+  });
+}
 function formatResourceTable(data, noColor = false) {
   const items = extractItems(data);
   if (items.length === 0) {
     return "";
   }
+  const columns = isTopLevelResource(items) ? TOP_LEVEL_RESOURCE_COLUMNS : DEFAULT_RESOURCE_COLUMNS;
   return formatBeautifulTable(
     items,
     {
-      columns: DEFAULT_RESOURCE_COLUMNS,
+      columns,
       wrapText: true
     },
     noColor
@@ -75942,6 +75960,8 @@ var REPLSession = class {
   _fallbackReason = null;
   // Connection status for graceful offline handling
   _connectionStatus = "unknown";
+  // Track if environment variables are present (for display purposes)
+  _envVarsPresent = false;
   constructor(config = {}) {
     this._namespace = config.namespace ?? this.getDefaultNamespace();
     this._contextPath = new ContextPath();
@@ -75949,6 +75969,7 @@ var REPLSession = class {
     this._profileManager = getProfileManager();
     const envUrl = process.env[`${ENV_PREFIX}_API_URL`];
     const envToken = process.env[`${ENV_PREFIX}_API_TOKEN`];
+    this._envVarsPresent = !!(envUrl || envToken);
     this._serverUrl = config.serverUrl ?? envUrl ?? "";
     this._apiToken = config.apiToken ?? envToken ?? "";
     if (envUrl && envToken) {
@@ -76147,8 +76168,9 @@ var REPLSession = class {
   }
   /**
    * Load the active profile from profile manager
-   * Note: Environment variables take priority over profile settings
-   * If no active profile is set but exactly one profile exists, auto-activate it
+   * Profile credentials ALWAYS take priority when a profile is active.
+   * Environment variables are only used when NO profile is active (fallback for scripts/CI).
+   * If no active profile is set but exactly one profile exists, auto-activate it.
    */
   async loadActiveProfile() {
     try {
@@ -76166,28 +76188,18 @@ var REPLSession = class {
         if (profile) {
           this._activeProfileName = activeName;
           this._activeProfile = profile;
-          const envUrl = process.env[`${ENV_PREFIX}_API_URL`];
-          const envToken = process.env[`${ENV_PREFIX}_API_TOKEN`];
-          const envNamespace = process.env[`${ENV_PREFIX}_NAMESPACE`];
-          let usingProfileUrl = false;
-          let usingProfileToken = false;
-          if (!envUrl && profile.apiUrl) {
+          if (profile.apiUrl) {
             this._serverUrl = profile.apiUrl;
             this._tenant = this.extractTenant(profile.apiUrl);
-            usingProfileUrl = true;
           }
-          if (!envToken && profile.apiToken) {
+          if (profile.apiToken) {
             this._apiToken = profile.apiToken;
-            usingProfileToken = true;
           }
+          const envNamespace = process.env[`${ENV_PREFIX}_NAMESPACE`];
           if (!envNamespace && profile.defaultNamespace) {
             this._namespace = profile.defaultNamespace;
           }
-          if (usingProfileUrl && usingProfileToken) {
-            this._authSource = "profile";
-          } else if (usingProfileUrl || usingProfileToken) {
-            this._authSource = "mixed";
-          }
+          this._authSource = "profile";
           if (this._serverUrl) {
             this._apiClient = new APIClient({
               serverUrl: this._serverUrl,
@@ -76322,6 +76334,13 @@ var REPLSession = class {
   getAuthSource() {
     return this._authSource;
   }
+  /**
+   * Check if environment variables are present
+   * Used for display purposes to show when env vars are being ignored
+   */
+  getEnvVarsPresent() {
+    return this._envVarsPresent;
+  }
   /**
    * Check if a credential fallback was attempted
    */
@@ -76390,6 +76409,7 @@ var REPLSession = class {
   }
   /**
    * Switch to a different profile
+   * Profile credentials always take priority over environment variables.
    */
   async switchProfile(profileName) {
     const profile = await this._profileManager.get(profileName);
@@ -76417,6 +76437,10 @@ var REPLSession = class {
     if (profile.defaultNamespace) {
       this._namespace = profile.defaultNamespace;
     }
+    this._authSource = "profile";
+    const envUrl = process.env[`${ENV_PREFIX}_API_URL`];
+    const envToken = process.env[`${ENV_PREFIX}_API_TOKEN`];
+    this._envVarsPresent = !!(envUrl || envToken);
     if (this._serverUrl) {
       this._apiClient = new APIClient({
         serverUrl: this._serverUrl,
@@ -77924,17 +77948,32 @@ function extractTenantFromUrl(url) {
     return "unknown";
   }
 }
-function getAuthStatusValue(info, colorStatus) {
-  if (!info.hasToken) {
-    return colorStatus("\u2717 No token", false);
+function getAuthSourceDisplay(info) {
+  if (info.authSource === "env") {
+    return "Environment variables";
   }
-  if (info.isValidated) {
-    return colorStatus("\u2713 Authenticated", true);
+  if (info.authSource === "profile") {
+    if (info.envVarsPresent) {
+      return "Profile (env vars ignored)";
+    }
+    return "Profile";
   }
-  if (info.validationError) {
-    return colorStatus(`\u2717 ${info.validationError}`, false);
+  if (info.authSource === "profile-fallback") {
+    return "Profile (fallback)";
+  }
+  if (info.authSource === "mixed") {
+    return "Mixed (env + profile)";
+  }
+  return "Not configured";
+}
+function getStatusValue(info, colorStatus) {
+  if (info.isConnected && info.isValidated) {
+    return colorStatus("\u25CF Connected & Authenticated", true);
+  }
+  if (info.hasToken && !info.isConnected) {
+    return colorStatus("\u25CB Offline (token not verified)", false);
   }
-  return colorStatus("\u26A0 Token not verified", false);
+  return colorStatus("\u25CB Not authenticated", false);
 }
 function formatConnectionTable(info, noColor = false) {
   const useColors = shouldUseColors(void 0, noColor);
@@ -77945,17 +77984,14 @@ function formatConnectionTable(info, noColor = false) {
   const colorBorder = (text) => useColors ? `${borderColor}${text}${colors.reset}` : text;
   const colorStatus = (text, isGood) => useColors ? `${isGood ? successColor : errorColor}${text}${colors.reset}` : text;
   const rows = [
-    { label: "Profile", value: info.profileName },
+    { label: "Login Profile", value: info.profileName },
     { label: "Tenant", value: info.tenant },
     { label: "API URL", value: info.apiUrl },
-    {
-      label: "Auth",
-      value: getAuthStatusValue(info, colorStatus)
-    },
-    { label: "Namespace", value: info.namespace || "default" },
+    { label: "Default Namespace", value: info.namespace || "default" },
+    { label: "Auth Source", value: getAuthSourceDisplay(info) },
     {
       label: "Status",
-      value: info.isConnected ? colorStatus("\u25CF Connected", true) : colorStatus("\u25CB Not connected", false)
+      value: getStatusValue(info, colorStatus)
     }
   ];
   const labelWidth = Math.max(...rows.map((r) => r.label.length));
@@ -77991,7 +78027,7 @@ function formatConnectionTable(info, noColor = false) {
 function stripAnsi2(str) {
   return str.replace(/\x1b\[[0-9;]*m/g, "");
 }
-function buildConnectionInfo(profileName, apiUrl, hasToken, namespace, isConnected, isValidated, validationError) {
+function buildConnectionInfo(profileName, apiUrl, hasToken, namespace, isConnected, isValidated, validationError, authSource, envVarsPresent) {
   const info = {
     profileName,
     tenant: extractTenantFromUrl(apiUrl),
@@ -78006,6 +78042,12 @@ function buildConnectionInfo(profileName, apiUrl, hasToken, namespace, isConnect
   if (validationError) {
     info.validationError = validationError;
   }
+  if (authSource !== void 0) {
+    info.authSource = authSource;
+  }
+  if (envVarsPresent !== void 0) {
+    info.envVarsPresent = envVarsPresent;
+  }
   return info;
 }
 
@@ -78479,7 +78521,9 @@ var createCommand2 = {
       defaultNamespace || session.getNamespace(),
       session.isAuthenticated(),
       session.isTokenValidated(),
-      session.getValidationError() ?? void 0
+      session.getValidationError() ?? void 0,
+      session.getAuthSource(),
+      session.getEnvVarsPresent()
     );
     const tableLines = formatConnectionTable(connectionInfo);
     return successResult(
@@ -78516,7 +78560,9 @@ var useCommand = {
         profile?.defaultNamespace || session.getNamespace(),
         session.isAuthenticated(),
         session.isTokenValidated(),
-        session.getValidationError() ?? void 0
+        session.getValidationError() ?? void 0,
+        session.getAuthSource(),
+        session.getEnvVarsPresent()
       );
       const tableLines = formatConnectionTable(connectionInfo);
       return successResult(
@@ -78765,7 +78811,9 @@ Use 'login profile list' to see available profiles.`
             profile?.defaultNamespace || session.getNamespace(),
             session.isAuthenticated(),
             session.isTokenValidated(),
-            session.getValidationError() ?? void 0
+            session.getValidationError() ?? void 0,
+            session.getAuthSource(),
+            session.getEnvVarsPresent()
           );
           const tableLines = formatConnectionTable(connectionInfo);
           output.push("", ...tableLines);
@@ -84444,6 +84492,37 @@ function useGitStatus(options = {}) {
   return { gitInfo, refresh, lastRefresh };
 }
 
+// src/operations/resolver.ts
+function getOperationDefinition(domain, action, resourceType) {
+  const domainOps = generatedOperations.get(domain);
+  if (!domainOps?.operations) return null;
+  if (resourceType) {
+    const exactMatch = domainOps.operations.find(
+      (op) => op.action === action && op.resourceType === resourceType
+    );
+    if (exactMatch) return exactMatch;
+  }
+  return domainOps.operations.find((op) => op.action === action) ?? null;
+}
+function substitutePathParams(pathTemplate, params) {
+  let path = pathTemplate;
+  if (params.namespace) {
+    path = path.replace(/\{namespace\}/g, params.namespace);
+    path = path.replace(/\{metadata\.namespace\}/g, params.namespace);
+  }
+  if (params.name) {
+    path = path.replace(/\{name\}/g, params.name);
+    path = path.replace(/\{metadata\.name\}/g, params.name);
+  }
+  if (params.site) {
+    path = path.replace(/\{site\}/g, params.site);
+  }
+  return path;
+}
+function hasUnsubstitutedParams(path) {
+  return /\{[^}]+\}/.test(path);
+}
+
 // src/repl/executor.ts
 var WRITE_OPERATIONS = /* @__PURE__ */ new Set([
   "create",
@@ -84855,6 +84934,18 @@ async function handleDirectNavigation(cmd, ctx, session) {
       error: "Unknown domain"
     };
   }
+  if (cmd.targetAction && cmd.args.length > 0) {
+    ctx.reset();
+    ctx.setDomain(cmd.targetDomain);
+    ctx.setAction(cmd.targetAction);
+    const apiCmd = {
+      raw: [cmd.targetDomain, cmd.targetAction, ...cmd.args].join(" "),
+      args: cmd.args,
+      isBuiltin: false,
+      isDirectNavigation: false
+    };
+    return await executeAPICommand(session, ctx, apiCmd);
+  }
   ctx.reset();
   ctx.setDomain(cmd.targetDomain);
   if (cmd.targetAction) {
@@ -85294,8 +85385,35 @@ Suggestion: Use --namespace ${nsValidation.suggestion}` : "";
       contextChanged: false
     };
   }
-  const resourcePath = domainToResourcePath(effectiveResource);
-  let apiPath = `/api/config/namespaces/${effectiveNamespace}/${resourcePath}`;
+  let effectiveResourceType = resourceType;
+  if (!effectiveResourceType && args.length > 0) {
+    effectiveResourceType = args[0]?.toLowerCase();
+  }
+  const operation = getOperationDefinition(
+    canonicalDomain,
+    action,
+    effectiveResourceType
+  );
+  let apiPath;
+  let usedOperationPath = false;
+  if (operation?.path) {
+    const pathParams = {
+      namespace: effectiveNamespace
+    };
+    if (name) {
+      pathParams.name = name;
+    }
+    apiPath = substitutePathParams(operation.path, pathParams);
+    usedOperationPath = true;
+    if (hasUnsubstitutedParams(apiPath)) {
+      const resourcePath = domainToResourcePath(effectiveResource);
+      apiPath = `/api/config/namespaces/${effectiveNamespace}/${resourcePath}`;
+      usedOperationPath = false;
+    }
+  } else {
+    const resourcePath = domainToResourcePath(effectiveResource);
+    apiPath = `/api/config/namespaces/${effectiveNamespace}/${resourcePath}`;
+  }
   try {
     let result;
     switch (action) {
@@ -85316,7 +85434,9 @@ Suggestion: Use --namespace ${nsValidation.suggestion}` : "";
             error: "Usage: get <name>"
           };
         }
-        apiPath += `/${name}`;
+        if (!usedOperationPath) {
+          apiPath += `/${name}`;
+        }
         const response = await client.get(apiPath);
         result = response.data;
         break;
@@ -85333,7 +85453,9 @@ Suggestion: Use --namespace ${nsValidation.suggestion}` : "";
             error: "Usage: delete <name>"
           };
         }
-        apiPath += `/${name}`;
+        if (!usedOperationPath) {
+          apiPath += `/${name}`;
+        }
         await client.delete(apiPath);
         result = { message: `Deleted ${canonicalDomain} '${name}'` };
         break;
@@ -85363,7 +85485,9 @@ Suggestion: Use --namespace ${nsValidation.suggestion}` : "";
             error: "Usage: status <name>"
           };
         }
-        apiPath += `/${name}/status`;
+        if (!usedOperationPath) {
+          apiPath += `/${name}/status`;
+        }
         const response = await client.get(apiPath);
         result = response.data;
         break;
@@ -86302,47 +86426,68 @@ program2.name(CLI_NAME).description("F5 Distributed Cloud Shell - Interactive CL
       profiler.memorySnapshot("pre_banner");
       printProfileReport();
       renderBanner(cliLogoMode, "startup");
-      if (session.isOfflineMode()) {
+      const activeProfile = session.getActiveProfile();
+      const envConfigured = process.env[`${ENV_PREFIX}_API_URL`] && process.env[`${ENV_PREFIX}_API_TOKEN`];
+      if (activeProfile) {
         console.log("");
-        console.log(
-          `${colors.yellow}\u26A0\uFE0F  Offline Mode: API endpoint unreachable${colors.reset}`
+        const connectionInfo = buildConnectionInfo(
+          session.getActiveProfileName() || activeProfile.name || "default",
+          activeProfile.apiUrl || session.getServerUrl() || "",
+          !!activeProfile.apiToken || session.isAuthenticated(),
+          activeProfile.defaultNamespace || session.getNamespace(),
+          session.isAuthenticated() && !session.isOfflineMode(),
+          session.isTokenValidated(),
+          session.getValidationError() ?? void 0,
+          session.getAuthSource(),
+          session.getEnvVarsPresent()
         );
-        console.log(
-          `${colors.dim}  Commands requiring API access will fail. Check network and try again.${colors.reset}`
-        );
-      }
-      if (session.getAuthSource() === "profile-fallback") {
-        const profileName = session.getActiveProfileName();
-        console.log("");
-        console.log(
-          `${colors.blue}Info: Using credentials from profile '${profileName}' (environment variables were invalid)${colors.reset}`
-        );
-      }
-      if (session.isAuthenticated() && !session.isTokenValidated() && session.getValidationError()) {
-        const authSource = session.getAuthSource();
-        const fallbackReason = session.getFallbackReason();
-        console.log("");
-        if (authSource === "env" || authSource === "mixed") {
+        const tableLines = formatConnectionTable(connectionInfo);
+        tableLines.forEach((line) => console.log(line));
+        if (session.isOfflineMode()) {
+          console.log("");
           console.log(
-            `${colors.yellow}Warning: Environment variable credentials are invalid or expired${colors.reset}`
+            `${colors.yellow}\u26A0\uFE0F  Offline Mode: API endpoint unreachable${colors.reset}`
           );
-          if (fallbackReason) {
-            console.log(
-              `${colors.dim}  ${fallbackReason}${colors.reset}`
-            );
-          }
           console.log(
-            `${colors.dim}  Run 'login' to authenticate or update your F5XC_API_TOKEN environment variable${colors.reset}`
+            `${colors.dim}  Commands requiring API access will fail.${colors.reset}`
           );
-        } else {
+        }
+        if (session.getAuthSource() === "profile-fallback") {
+          console.log("");
+          console.log(
+            `${colors.blue}Info: Using credentials from profile '${session.getActiveProfileName()}' (environment variables were invalid)${colors.reset}`
+          );
+        }
+      } else if (envConfigured) {
+        console.log("");
+        const connectionInfo = buildConnectionInfo(
+          "(environment)",
+          process.env[`${ENV_PREFIX}_API_URL`] || "",
+          !!process.env[`${ENV_PREFIX}_API_TOKEN`],
+          session.getNamespace(),
+          session.isAuthenticated() && !session.isOfflineMode(),
+          session.isTokenValidated(),
+          session.getValidationError() ?? void 0,
+          "env",
+          // authSource - using environment variables
+          true
+          // envVarsPresent - by definition, this flow means env vars exist
+        );
+        const tableLines = formatConnectionTable(connectionInfo);
+        tableLines.forEach((line) => console.log(line));
+        if (session.isOfflineMode()) {
+          console.log("");
+          console.log(
+            `${colors.yellow}\u26A0\uFE0F  Offline Mode: API endpoint unreachable${colors.reset}`
+          );
+        }
+        if (!session.isTokenValidated() && session.getValidationError()) {
+          console.log("");
           console.log(
             `${colors.yellow}Warning: ${session.getValidationError()}${colors.reset}`
           );
         }
-      }
-      const profiles = await session.getProfileManager().list();
-      const envConfigured = process.env[`${ENV_PREFIX}_API_URL`] && process.env[`${ENV_PREFIX}_API_TOKEN`];
-      if (profiles.length === 0 && !envConfigured) {
+      } else {
         console.log("");
         console.log(
           `${colors.yellow}No connection profiles found.${colors.reset}`

package/package.json

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