@robinmordasiewicz/f5xc-xcsh 1.0.82-2512312131 → 1.0.82-2512312318

package/dist/index.js

@@ -45354,8 +45354,8 @@ function getLogoModeFromEnv(envPrefix) {
 var CLI_NAME = "xcsh";
 var CLI_FULL_NAME = "F5 Distributed Cloud Shell";
 function getVersion() {
-  if ("v1.0.82-2512312131") {
-    return "v1.0.82-2512312131";
+  if ("v1.0.82-2512312318") {
+    return "v1.0.82-2512312318";
   }
   if (process.env.XCSH_VERSION) {
     return process.env.XCSH_VERSION;
@@ -46618,7 +46618,7 @@ function wrapText3(text, width, indent) {
 function formatRootHelp() {
   return [
     "",
-    colorBoldWhite(`${CLI_NAME} - ${CLI_FULL_NAME} v${CLI_VERSION}`),
+    colorBoldWhite(`${CLI_NAME} - ${CLI_FULL_NAME} ${CLI_VERSION}`),
     "",
     "DESCRIPTION",
     ...wrapText3(CLI_DESCRIPTION_LONG, 80, 2),
@@ -47820,13 +47820,22 @@ var REPLSession = class {
   // Token validation state
   _tokenValidated = false;
   _validationError = null;
+  // Authentication source tracking
+  _authSource = "none";
   constructor(config = {}) {
     this._namespace = config.namespace ?? this.getDefaultNamespace();
     this._contextPath = new ContextPath();
     this._validator = new ContextValidator();
     this._profileManager = getProfileManager();
-    this._serverUrl = config.serverUrl ?? process.env[`${ENV_PREFIX}_API_URL`] ?? "";
-    this._apiToken = config.apiToken ?? process.env[`${ENV_PREFIX}_API_TOKEN`] ?? "";
+    const envUrl = process.env[`${ENV_PREFIX}_API_URL`];
+    const envToken = process.env[`${ENV_PREFIX}_API_TOKEN`];
+    this._serverUrl = config.serverUrl ?? envUrl ?? "";
+    this._apiToken = config.apiToken ?? envToken ?? "";
+    if (envUrl && envToken) {
+      this._authSource = "env";
+    } else if (envUrl || envToken) {
+      this._authSource = "mixed";
+    }
     this._outputFormat = config.outputFormat ?? getOutputFormatFromEnv() ?? "table";
     this._debug = config.debug ?? process.env[`${ENV_PREFIX}_DEBUG`] === "true";
     if (this._serverUrl) {
@@ -47857,7 +47866,8 @@ var REPLSession = class {
     if (this._apiClient?.isAuthenticated()) {
       debugProtocol.auth("token_validation_start", {
         serverUrl: this._serverUrl,
-        hasApiClient: true
+        hasApiClient: true,
+        authSource: this._authSource
       });
       const result = await this._apiClient.validateToken();
       this._tokenValidated = result.valid;
@@ -47866,9 +47876,44 @@ var REPLSession = class {
         valid: result.valid,
         error: result.error,
         tokenValidated: this._tokenValidated,
-        validationError: this._validationError
+        validationError: this._validationError,
+        authSource: this._authSource
       });
-      if (result.valid) {
+      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,
+            profileName: this._activeProfileName
+          });
+        } else {
+          debugProtocol.auth("token_fallback_failed", {
+            error: fallbackResult.error,
+            profileName: this._activeProfileName
+          });
+        }
+      }
+      if (this._tokenValidated) {
         await this.fetchUserInfo();
       }
     }
@@ -47910,16 +47955,25 @@ var REPLSession = class {
           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) {
             this._serverUrl = profile.apiUrl;
             this._tenant = this.extractTenant(profile.apiUrl);
+            usingProfileUrl = true;
           }
           if (!envToken && profile.apiToken) {
             this._apiToken = profile.apiToken;
+            usingProfileToken = true;
           }
           if (!envNamespace && profile.defaultNamespace) {
             this._namespace = profile.defaultNamespace;
           }
+          if (usingProfileUrl && usingProfileToken) {
+            this._authSource = "profile";
+          } else if (usingProfileUrl || usingProfileToken) {
+            this._authSource = "mixed";
+          }
           if (this._serverUrl) {
             this._apiClient = new APIClient({
               serverUrl: this._serverUrl,
@@ -48047,6 +48101,13 @@ var REPLSession = class {
   getValidationError() {
     return this._validationError;
   }
+  /**
+   * Get the authentication source
+   * Indicates where credentials were obtained from
+   */
+  getAuthSource() {
+    return this._authSource;
+  }
   /**
    * Get the API client
    */
@@ -49383,7 +49444,7 @@ function printImageBanner(imageSeq, imageHeight, imageWidth) {
   const TEXT_COL_WIDTH = INNER_WIDTH - IMAGE_COL_WIDTH;
   const HELP_LINES = wrapText4(CLI_DESCRIPTION_MEDIUM, TEXT_COL_WIDTH - 2);
   const helpStartRow = Math.floor((imageHeight - HELP_LINES.length) / 2);
-  const title = ` ${CLI_FULL_NAME} v${CLI_VERSION} `;
+  const title = ` ${CLI_FULL_NAME} ${CLI_VERSION} `;
   const leftDashes = 3;
   const rightDashes = TOTAL_WIDTH - 1 - leftDashes - title.length - 1;
   process.stdout.write("\n");
@@ -49434,7 +49495,7 @@ function printAsciiBanner() {
   const helpColumnWidth = INNER_WIDTH - logoWidth - 1;
   const HELP_LINES = wrapText4(CLI_DESCRIPTION_MEDIUM, helpColumnWidth - 2);
   const HELP_START_ROW = 8;
-  const title = ` ${CLI_FULL_NAME} v${CLI_VERSION} `;
+  const title = ` ${CLI_FULL_NAME} ${CLI_VERSION} `;
   const leftDashes = 3;
   const rightDashes = TOTAL_WIDTH - 1 - leftDashes - title.length - 1;
   const output = [];
@@ -49480,7 +49541,7 @@ function getBannerLines(logoMode, useImage) {
   const TOTAL_WIDTH = Math.max(80, logoWidth + 4);
   const INNER_WIDTH = TOTAL_WIDTH - 2;
   const helpColumnWidth = INNER_WIDTH - logoWidth - 1;
-  const title = ` ${CLI_FULL_NAME} v${CLI_VERSION} `;
+  const title = ` ${CLI_FULL_NAME} ${CLI_VERSION} `;
   const leftDashes = 3;
   const rightDashes = TOTAL_WIDTH - 1 - leftDashes - title.length - 1;
   const output = [];
@@ -53689,6 +53750,12 @@ var HeadlessController = class {
       "session_initialized",
       this.getSessionState()
     );
+    if (this.session.isAuthenticated() && !this.session.isTokenValidated() && this.session.getValidationError()) {
+      this.emitEvent("warning", {
+        message: this.session.getValidationError(),
+        type: "token_validation"
+      });
+    }
   }
   /**
    * Get current session state for output
@@ -53698,6 +53765,7 @@ var HeadlessController = class {
     return {
       authenticated: this.session.isAuthenticated(),
       tokenValidated: this.session.isTokenValidated(),
+      authSource: this.session.getAuthSource(),
       namespace: this.session.getNamespace(),
       serverUrl: this.session.getServerUrl(),
       activeProfile: this.session.getActiveProfileName(),

package/package.json

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