@robinmordasiewicz/f5xc-xcsh 1.0.82-2601011720 → 1.0.82-2601012039

package/dist/index.js

@@ -45392,8 +45392,8 @@ function getLogoModeFromEnv(envPrefix) {
 var CLI_NAME = "xcsh";
 var CLI_FULL_NAME = "F5 Distributed Cloud Shell";
 function getVersion() {
-  if ("v1.0.82-2601011720") {
-    return "v1.0.82-2601011720";
+  if ("v1.0.82-2601012039") {
+    return "v1.0.82-2601012039";
   }
   if (process.env.XCSH_VERSION) {
     return process.env.XCSH_VERSION;
@@ -46655,6 +46655,120 @@ function formatAPIError(statusCode, body, operation) {
   return lines.join("\n");
 }
 
+// src/output/domain-formatter.ts
+function parseDomainOutputFlags(args, sessionFormat = "table") {
+  const { format: parsedFormat, remainingArgs } = parseOutputFlag(args);
+  let noColor = false;
+  const finalArgs = [];
+  for (const arg of remainingArgs) {
+    if (arg === "--no-color") {
+      noColor = true;
+    } else {
+      finalArgs.push(arg);
+    }
+  }
+  const effectiveNoColor = noColor || !shouldUseColors();
+  return {
+    options: {
+      format: parsedFormat ?? sessionFormat,
+      noColor: effectiveNoColor
+    },
+    remainingArgs: finalArgs
+  };
+}
+function formatDomainOutput(data, options) {
+  const { format, noColor } = options;
+  if (format === "none") {
+    return [];
+  }
+  const formatted = formatOutput(data, format, noColor);
+  if (formatted === "") {
+    return [];
+  }
+  return formatted.split("\n");
+}
+function formatKeyValueOutput(data, options) {
+  const { format, noColor, title } = options;
+  if (format === "none") {
+    return [];
+  }
+  if (format === "json") {
+    return formatJSON(data).split("\n");
+  }
+  if (format === "yaml") {
+    return formatYAML(data).split("\n");
+  }
+  if (format === "tsv") {
+    const lines = [];
+    for (const [key, value] of Object.entries(data)) {
+      if (value !== null && value !== void 0) {
+        lines.push(`${key}	${String(value)}`);
+      }
+    }
+    return lines;
+  }
+  const boxData = [];
+  for (const [key, value] of Object.entries(data)) {
+    if (value !== null && value !== void 0) {
+      const label = formatLabel(key);
+      boxData.push({ label, value: String(value) });
+    }
+  }
+  if (boxData.length === 0) {
+    return [];
+  }
+  const boxOutput = formatKeyValueBox(boxData, title ?? "Info", noColor);
+  return boxOutput.split("\n");
+}
+function formatListOutput(data, options) {
+  const { format, noColor } = options;
+  if (format === "none") {
+    return [];
+  }
+  if (format === "json") {
+    return formatJSON(data).split("\n");
+  }
+  if (format === "yaml") {
+    return formatYAML(data).split("\n");
+  }
+  if (format === "tsv") {
+    if (data.length === 0) {
+      return [];
+    }
+    const firstItem = data[0];
+    if (typeof firstItem !== "object" || firstItem === null) {
+      return data.map((item) => String(item));
+    }
+    const keys = Object.keys(firstItem);
+    const lines = [];
+    for (const item of data) {
+      if (typeof item === "object" && item !== null) {
+        const record = item;
+        const values = keys.map((k) => {
+          const val = record[k];
+          if (val === null || val === void 0) return "";
+          if (typeof val === "object") return JSON.stringify(val);
+          return String(val);
+        });
+        lines.push(values.join("	"));
+      }
+    }
+    return lines;
+  }
+  const tableOutput = formatResourceTable(data, noColor);
+  if (tableOutput === "") {
+    return [];
+  }
+  return tableOutput.split("\n");
+}
+function formatLabel(key) {
+  if (key.includes("_")) {
+    return key.split("_").map((word) => word.charAt(0).toUpperCase() + word.slice(1)).join(" ");
+  }
+  const withSpaces = key.replace(/([A-Z])/g, " $1");
+  return withSpaces.charAt(0).toUpperCase() + withSpaces.slice(1);
+}
+
 // src/config/envvars.ts
 var EnvVarRegistry = [
   {
@@ -47937,6 +48051,9 @@ var REPLSession = class {
   _validationError = null;
   // Authentication source tracking
   _authSource = "none";
+  // Fallback tracking for improved error messages
+  _fallbackAttempted = false;
+  _fallbackReason = null;
   constructor(config = {}) {
     this._namespace = config.namespace ?? this.getDefaultNamespace();
     this._contextPath = new ContextPath();
@@ -47994,36 +48111,57 @@ var REPLSession = class {
         validationError: this._validationError,
         authSource: this._authSource
       });
-      if (!result.valid && (this._authSource === "env" || this._authSource === "mixed") && this._activeProfile?.apiToken && this._activeProfile.apiToken !== this._apiToken) {
-        debugProtocol.auth("token_fallback_attempt", {
-          fromSource: this._authSource,
-          hasProfileToken: true,
-          profileName: this._activeProfileName
-        });
-        this._apiToken = this._activeProfile.apiToken;
-        if (this._authSource === "mixed" && !process.env[`${ENV_PREFIX}_API_URL`] && this._activeProfile.apiUrl) {
-          this._serverUrl = this._activeProfile.apiUrl;
-          this._tenant = this.extractTenant(
-            this._activeProfile.apiUrl
-          );
-        }
-        this._apiClient = new APIClient({
-          serverUrl: this._serverUrl,
-          apiToken: this._apiToken,
-          debug: this._debug
-        });
-        const fallbackResult = await this._apiClient.validateToken();
-        if (fallbackResult.valid) {
-          this._tokenValidated = true;
-          this._validationError = null;
-          this._authSource = "profile-fallback";
-          debugProtocol.auth("token_fallback_success", {
-            authSource: this._authSource,
+      if (!result.valid && (this._authSource === "env" || this._authSource === "mixed")) {
+        if (this._activeProfile?.apiToken && this._activeProfile.apiToken !== this._apiToken) {
+          this._fallbackAttempted = true;
+          debugProtocol.auth("token_fallback_attempt", {
+            fromSource: this._authSource,
+            hasProfileToken: true,
             profileName: this._activeProfileName
           });
-        } else {
-          debugProtocol.auth("token_fallback_failed", {
-            error: fallbackResult.error,
+          this._apiToken = this._activeProfile.apiToken;
+          if (this._authSource === "mixed" && !process.env[`${ENV_PREFIX}_API_URL`] && this._activeProfile.apiUrl) {
+            this._serverUrl = this._activeProfile.apiUrl;
+            this._tenant = this.extractTenant(
+              this._activeProfile.apiUrl
+            );
+          }
+          this._apiClient = new APIClient({
+            serverUrl: this._serverUrl,
+            apiToken: this._apiToken,
+            debug: this._debug
+          });
+          const fallbackResult = await this._apiClient.validateToken();
+          if (fallbackResult.valid) {
+            this._tokenValidated = true;
+            this._validationError = null;
+            this._authSource = "profile-fallback";
+            this._fallbackReason = null;
+            debugProtocol.auth("token_fallback_success", {
+              authSource: this._authSource,
+              profileName: this._activeProfileName
+            });
+          } else {
+            this._fallbackReason = `Profile '${this._activeProfileName}' credentials are also invalid`;
+            debugProtocol.auth("token_fallback_failed", {
+              error: fallbackResult.error,
+              profileName: this._activeProfileName
+            });
+          }
+        } else if (this._activeProfile?.apiToken && this._activeProfile.apiToken === this._apiToken) {
+          this._fallbackReason = `Profile '${this._activeProfileName}' has the same credentials - please update`;
+          debugProtocol.auth("token_fallback_skipped", {
+            reason: "same_token",
+            profileName: this._activeProfileName
+          });
+        } else if (!this._activeProfile?.apiToken) {
+          if (this._activeProfileName) {
+            this._fallbackReason = `Profile '${this._activeProfileName}' has no saved credentials`;
+          } else {
+            this._fallbackReason = "No saved profiles available for fallback";
+          }
+          debugProtocol.auth("token_fallback_skipped", {
+            reason: "no_profile_token",
             profileName: this._activeProfileName
           });
         }
@@ -48223,6 +48361,18 @@ var REPLSession = class {
   getAuthSource() {
     return this._authSource;
   }
+  /**
+   * Check if a credential fallback was attempted
+   */
+  getFallbackAttempted() {
+    return this._fallbackAttempted;
+  }
+  /**
+   * Get the reason why fallback failed or was skipped (for user messaging)
+   */
+  getFallbackReason() {
+    return this._fallbackReason;
+  }
   /**
    * Get the API client
    */
@@ -48280,6 +48430,8 @@ var REPLSession = class {
     this.clearNamespaceCache();
     this._tokenValidated = false;
     this._validationError = null;
+    this._fallbackAttempted = false;
+    this._fallbackReason = null;
     this._activeProfileName = profileName;
     this._activeProfile = profile;
     if (profile.apiUrl) {
@@ -48841,120 +48993,6 @@ function useHistory(options) {
 // src/repl/hooks/useCompletion.ts
 var import_react27 = __toESM(require_react(), 1);
 
-// src/output/domain-formatter.ts
-function parseDomainOutputFlags(args, sessionFormat = "table") {
-  const { format: parsedFormat, remainingArgs } = parseOutputFlag(args);
-  let noColor = false;
-  const finalArgs = [];
-  for (const arg of remainingArgs) {
-    if (arg === "--no-color") {
-      noColor = true;
-    } else {
-      finalArgs.push(arg);
-    }
-  }
-  const effectiveNoColor = noColor || !shouldUseColors();
-  return {
-    options: {
-      format: parsedFormat ?? sessionFormat,
-      noColor: effectiveNoColor
-    },
-    remainingArgs: finalArgs
-  };
-}
-function formatDomainOutput(data, options) {
-  const { format, noColor } = options;
-  if (format === "none") {
-    return [];
-  }
-  const formatted = formatOutput(data, format, noColor);
-  if (formatted === "") {
-    return [];
-  }
-  return formatted.split("\n");
-}
-function formatKeyValueOutput(data, options) {
-  const { format, noColor, title } = options;
-  if (format === "none") {
-    return [];
-  }
-  if (format === "json") {
-    return formatJSON(data).split("\n");
-  }
-  if (format === "yaml") {
-    return formatYAML(data).split("\n");
-  }
-  if (format === "tsv") {
-    const lines = [];
-    for (const [key, value] of Object.entries(data)) {
-      if (value !== null && value !== void 0) {
-        lines.push(`${key}	${String(value)}`);
-      }
-    }
-    return lines;
-  }
-  const boxData = [];
-  for (const [key, value] of Object.entries(data)) {
-    if (value !== null && value !== void 0) {
-      const label = formatLabel(key);
-      boxData.push({ label, value: String(value) });
-    }
-  }
-  if (boxData.length === 0) {
-    return [];
-  }
-  const boxOutput = formatKeyValueBox(boxData, title ?? "Info", noColor);
-  return boxOutput.split("\n");
-}
-function formatListOutput(data, options) {
-  const { format, noColor } = options;
-  if (format === "none") {
-    return [];
-  }
-  if (format === "json") {
-    return formatJSON(data).split("\n");
-  }
-  if (format === "yaml") {
-    return formatYAML(data).split("\n");
-  }
-  if (format === "tsv") {
-    if (data.length === 0) {
-      return [];
-    }
-    const firstItem = data[0];
-    if (typeof firstItem !== "object" || firstItem === null) {
-      return data.map((item) => String(item));
-    }
-    const keys = Object.keys(firstItem);
-    const lines = [];
-    for (const item of data) {
-      if (typeof item === "object" && item !== null) {
-        const record = item;
-        const values = keys.map((k) => {
-          const val = record[k];
-          if (val === null || val === void 0) return "";
-          if (typeof val === "object") return JSON.stringify(val);
-          return String(val);
-        });
-        lines.push(values.join("	"));
-      }
-    }
-    return lines;
-  }
-  const tableOutput = formatResourceTable(data, noColor);
-  if (tableOutput === "") {
-    return [];
-  }
-  return tableOutput.split("\n");
-}
-function formatLabel(key) {
-  if (key.includes("_")) {
-    return key.split("_").map((word) => word.charAt(0).toUpperCase() + word.slice(1)).join(" ");
-  }
-  const withSpaces = key.replace(/([A-Z])/g, " $1");
-  return withSpaces.charAt(0).toUpperCase() + withSpaces.slice(1);
-}
-
 // src/domains/login/profile/list.ts
 var listCommand = {
   name: "list",
@@ -53520,9 +53558,12 @@ async function executeAPICommand(session, ctx, cmd) {
       }
     }
     const effectiveFormat = outputFormat ?? session.getOutputFormat();
-    const formatted = formatOutput(result, effectiveFormat, noColor);
+    const formatted = formatDomainOutput(result, {
+      format: effectiveFormat,
+      noColor: noColor ?? false
+    });
     return {
-      output: formatted ? [formatted] : ["(no output)"],
+      output: formatted.length > 0 ? formatted : ["(no output)"],
       shouldExit: false,
       shouldClear: false,
       contextChanged: false
@@ -54376,12 +54417,35 @@ program2.name(CLI_NAME).description("F5 Distributed Cloud Shell - Interactive CL
       emitSessionState(session);
       process.stdout.write("\r\x1B[K");
       renderBanner(cliLogoMode, "startup");
-      if (session.isAuthenticated() && !session.isTokenValidated() && session.getValidationError()) {
+      if (session.getAuthSource() === "profile-fallback") {
+        const profileName = session.getActiveProfileName();
         console.log("");
         console.log(
-          `${colors.yellow}Warning: ${session.getValidationError()}${colors.reset}`
+          `${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") {
+          console.log(
+            `${colors.yellow}Warning: Environment variable credentials are invalid or expired${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}`
+          );
+        } else {
+          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) {
@@ -54424,11 +54488,33 @@ async function executeNonInteractive(args) {
     command: args.join(" ")
   });
   emitSessionState(session);
-  if (session.isAuthenticated() && !session.isTokenValidated() && session.getValidationError()) {
+  if (session.getAuthSource() === "profile-fallback") {
+    const profileName = session.getActiveProfileName();
     console.error(
-      `${colors.yellow}Warning: ${session.getValidationError()}${colors.reset}`
+      `${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();
+    if (authSource === "env" || authSource === "mixed") {
+      console.error(
+        `${colors.yellow}Warning: Environment variable credentials are invalid or expired${colors.reset}`
+      );
+      if (fallbackReason) {
+        console.error(
+          `${colors.dim}  ${fallbackReason}${colors.reset}`
+        );
+      }
+      console.error(
+        `${colors.dim}  Run 'login' to authenticate or update your F5XC_API_TOKEN environment variable${colors.reset}`
+      );
+    } else {
+      console.error(
+        `${colors.yellow}Warning: ${session.getValidationError()}${colors.reset}`
+      );
+    }
+  }
   const command = args.join(" ");
   const result = await executeCommand(command, session);
   result.output.forEach((line) => {

package/package.json

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