@robinmordasiewicz/f5xc-xcsh 2.0.41-2601192002 → 2.0.41-2601192054

package/dist/index.js

@@ -41229,8 +41229,8 @@ var init_logo_renderer = __esm({
 
 // src/branding/index.ts
 function getVersion() {
-  if ("v2.0.41-2601192002") {
-    return "v2.0.41-2601192002";
+  if ("v2.0.41-2601192054") {
+    return "v2.0.41-2601192054";
   }
   if (process.env.XCSH_VERSION) {
     return process.env.XCSH_VERSION;
@@ -150546,91 +150546,6 @@ var init_service = __esm({
 });
 
 // src/domains/login/whoami/formatter.ts
-function formatWhoami(info, options = {}) {
-  if (!info.isAuthenticated) {
-    return ["Enter '/login' to authenticate"];
-  }
-  if (options.json) {
-    return formatWhoamiJson(info);
-  }
-  return formatWhoamiBox(info);
-}
-function formatWhoamiJson(info) {
-  const output = {};
-  if (info.tenant) output.tenant = info.tenant;
-  if (info.username) output.username = info.username;
-  if (info.email) output.email = info.email;
-  output.namespace = info.namespace;
-  output.serverUrl = info.serverUrl;
-  output.isAuthenticated = info.isAuthenticated;
-  return [JSON.stringify(output, null, 2)];
-}
-function getAuthStatusDisplay(info) {
-  if (!info.isAuthenticated) {
-    return "Not authenticated";
-  }
-  if (info.isValidated) {
-    return "\u2713 Authenticated";
-  }
-  if (info.validationError) {
-    return `\u2717 ${info.validationError}`;
-  }
-  return "\u26A0 Token not verified";
-}
-function formatWhoamiBox(info) {
-  const lines = [];
-  const red = colors.red;
-  const reset = colors.reset;
-  const BOX = {
-    topLeft: "\u256D",
-    topRight: "\u256E",
-    bottomLeft: "\u2570",
-    bottomRight: "\u256F",
-    horizontal: "\u2500",
-    vertical: "\u2502"
-  };
-  const contentLines = [];
-  if (info.tenant) {
-    contentLines.push({ label: "Tenant", value: info.tenant });
-  }
-  if (info.email) {
-    contentLines.push({ label: "User", value: info.email });
-  } else if (info.username) {
-    contentLines.push({ label: "User", value: info.username });
-  }
-  contentLines.push({ label: "Namespace", value: info.namespace });
-  contentLines.push({ label: "Server", value: info.serverUrl });
-  contentLines.push({
-    label: "Auth",
-    value: getAuthStatusDisplay(info)
-  });
-  const maxLabelWidth = Math.max(...contentLines.map((c) => c.label.length));
-  const formattedContent = contentLines.map((c) => {
-    const paddedLabel = c.label.padEnd(maxLabelWidth);
-    return `${paddedLabel}:  ${c.value}`;
-  });
-  const headerTitle = "Connection Info";
-  const allTextLines = [...formattedContent, headerTitle];
-  const maxContentWidth = Math.max(...allTextLines.map((l) => l.length));
-  const innerWidth = maxContentWidth + 2;
-  const title = " Connection Info ";
-  const remainingWidth = innerWidth - title.length;
-  const leftDashes = 1;
-  const rightDashes = Math.max(0, remainingWidth - leftDashes);
-  lines.push(
-    `${red}${BOX.topLeft}${BOX.horizontal.repeat(leftDashes)}${reset}${title}${red}${BOX.horizontal.repeat(rightDashes)}${BOX.topRight}${reset}`
-  );
-  for (const text of formattedContent) {
-    const padding = innerWidth - text.length;
-    lines.push(
-      `${red}${BOX.vertical}${reset} ${text}${" ".repeat(Math.max(0, padding - 1))}${red}${BOX.vertical}${reset}`
-    );
-  }
-  lines.push(
-    `${red}${BOX.bottomLeft}${BOX.horizontal.repeat(innerWidth)}${BOX.bottomRight}${reset}`
-  );
-  return lines;
-}
 var init_formatter2 = __esm({
   "src/domains/login/whoami/formatter.ts"() {
     "use strict";
@@ -150658,7 +150573,7 @@ var init_whoami = __esm({
     "use strict";
     init_registry();
     init_service();
-    init_formatter2();
+    init_connection_table();
     init_domain_formatter();
     init_service();
     init_formatter2();
@@ -150682,11 +150597,22 @@ var init_whoami = __esm({
             return successResult(
               formatKeyValueOutput(keyValueData, {
                 ...options,
-                title: "Connection Info"
+                title: "Connection Summary"
               })
             );
           }
-          const output = formatWhoami(info);
+          const connectionInfo = buildConnectionInfo(
+            session.getActiveProfileName() || "(environment)",
+            session.getServerUrl(),
+            session.isAuthenticated(),
+            session.getNamespace(),
+            !session.isOfflineMode(),
+            session.isTokenValidated(),
+            session.getValidationError() || void 0,
+            session.getAuthSource() || void 0,
+            session.getEnvVarsPresent()
+          );
+          const output = formatConnectionTable(connectionInfo);
           return successResult(output);
         } catch (error) {
           return errorResult(
@@ -174386,7 +174312,7 @@ function useGitStatus(options = {}) {
 init_domains();
 init_domains2();
 init_extensions();
-init_whoami();
+init_connection_table();
 init_output();
 
 // src/dependencies/relationships.ts
@@ -176249,9 +176175,8 @@ function executeBuiltin(cmd, session, ctx) {
     };
   }
   if (command === "whoami" || command.startsWith("whoami ")) {
-    const parts = parseInputArgs(command).slice(1);
     const options = {};
-    for (const arg of parts) {
+    for (const arg of cmd.args) {
       const lowerArg = arg.toLowerCase();
       switch (lowerArg) {
         case "--quota":
@@ -176274,20 +176199,41 @@ function executeBuiltin(cmd, session, ctx) {
           break;
       }
     }
-    return getWhoamiInfo(session, options).then((info) => ({
-      output: formatWhoami(info, options),
+    const connectionInfo = buildConnectionInfo(
+      session.getActiveProfileName() || "(environment)",
+      session.getServerUrl(),
+      session.isAuthenticated(),
+      session.getNamespace(),
+      !session.isOfflineMode(),
+      session.isTokenValidated(),
+      session.getValidationError() || void 0,
+      session.getAuthSource() || void 0,
+      session.getEnvVarsPresent()
+    );
+    if (options.json) {
+      const jsonOutput = {
+        profileName: connectionInfo.profileName,
+        tenant: connectionInfo.tenant,
+        apiUrl: connectionInfo.apiUrl,
+        namespace: connectionInfo.namespace,
+        isAuthenticated: connectionInfo.hasToken,
+        isConnected: connectionInfo.isConnected,
+        isValidated: connectionInfo.isValidated,
+        authSource: connectionInfo.authSource
+      };
+      return {
+        output: [JSON.stringify(jsonOutput, null, 2)],
+        shouldExit: false,
+        shouldClear: false,
+        contextChanged: false
+      };
+    }
+    return {
+      output: formatConnectionTable(connectionInfo),
       shouldExit: false,
       shouldClear: false,
       contextChanged: false
-    })).catch((error) => ({
-      output: [
-        `Failed to get whoami info: ${error instanceof Error ? error.message : "Unknown error"}`
-      ],
-      shouldExit: false,
-      shouldClear: false,
-      contextChanged: false,
-      error: "whoami failed"
-    }));
+    };
   }
   if (command === "debug-completion" || command.startsWith("debug-completion ")) {
     const parts = parseInputArgs(command).slice(1);

package/package.json

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