securewithtrace 0.17.0 → 0.18.0

package/README.md

@@ -73,6 +73,7 @@ tracecli auth logout
 ```bash
 tracecli org list
 tracecli org current
+tracecli org switch
 tracecli org switch <organization-id-or-slug>
 ```
 

package/dist/index.js

@@ -3352,6 +3352,9 @@ var {
   Help
 } = import_index.default;
 
+// src/auth/commands.ts
+import { createInterface } from "readline/promises";
+
 // ../../node_modules/.bun/@ts-rest+core@3.53.0-rc.1+f9199aabcde8d6a0/node_modules/@ts-rest/core/index.esm.mjs
 var util;
 (function(util2) {
@@ -25253,6 +25256,65 @@ Use an organization ID or exact slug.`
     error: `Organization '${input}' not found. Run \`tracecli org list\` to see available organizations.`
   };
 }
+function resolveOrganizationSelectionInput(organizations, input) {
+  const trimmedInput = input.trim();
+  if (trimmedInput.length === 0) {
+    return { error: "Organization selection cannot be empty." };
+  }
+  if (/^\d+$/.test(trimmedInput)) {
+    const byNumericId = organizations.find(
+      (organization) => normalizeForComparison(organization.organizationId) === normalizeForComparison(trimmedInput)
+    );
+    if (byNumericId) {
+      return { organization: byNumericId };
+    }
+    const selectedIndex = Number.parseInt(trimmedInput, 10);
+    if (selectedIndex < 1 || selectedIndex > organizations.length) {
+      return {
+        error: `Selection '${trimmedInput}' is out of range. Enter a number between 1 and ${organizations.length}.`
+      };
+    }
+    const selectedOrganization = organizations[selectedIndex - 1];
+    if (!selectedOrganization) {
+      return {
+        error: "Failed to resolve organization selection. Please try again with an organization ID or slug."
+      };
+    }
+    return { organization: selectedOrganization };
+  }
+  return findOrganizationByInput(organizations, trimmedInput);
+}
+async function promptForOrganizationSelection(organizations, activeOrganizationId) {
+  console.log("Select an organization:");
+  for (const [index, organization] of organizations.entries()) {
+    const marker = organization.organizationId === activeOrganizationId ? "*" : " ";
+    console.log(
+      `${marker} ${index + 1}) ${sanitizeForOutput(organization.name)} (${sanitizeForOutput(organization.slug)}) - ${organization.organizationId}`
+    );
+  }
+  console.log("");
+  const readline = createInterface({
+    input: process.stdin,
+    output: process.stdout
+  });
+  try {
+    while (true) {
+      const input = await readline.question(
+        "Enter number, organization ID, slug, or name (press Enter to cancel): "
+      );
+      if (input.trim().length === 0) {
+        return null;
+      }
+      const selection = resolveOrganizationSelectionInput(organizations, input);
+      if ("organization" in selection) {
+        return selection.organization;
+      }
+      console.error(selection.error);
+    }
+  } finally {
+    readline.close();
+  }
+}
 async function refreshAfterOrganizationSwitch(workosOrganizationId, refreshForOrganization = (organizationId) => refreshStoredAccessTokenForOrganization(organizationId)) {
   if (!workosOrganizationId || workosOrganizationId.trim().length === 0) {
     return false;
@@ -25260,7 +25322,13 @@ async function refreshAfterOrganizationSwitch(workosOrganizationId, refreshForOr
   return refreshForOrganization(workosOrganizationId);
 }
 function createLoginCommand() {
-  return new Command("login").description("Authenticate with Trace").action(async () => {
+  return new Command("login").description("Authenticate with Trace").addHelpText(
+    "after",
+    `
+Examples:
+  tracecli auth login
+  tracecli auth logout && tracecli auth login  # re-authenticate`
+  ).action(async () => {
     const existingToken = readToken();
     if (existingToken) {
       console.log("You are already logged in. Run `trace auth logout` first to re-authenticate.");
@@ -25294,7 +25362,12 @@ Authenticated as ${displayName} (${tokenResponse.user.email})`);
   });
 }
 function createLogoutCommand() {
-  return new Command("logout").description("Log out of Trace").action(() => {
+  return new Command("logout").description("Log out of Trace").addHelpText(
+    "after",
+    `
+Examples:
+  tracecli auth logout`
+  ).action(() => {
     const removed = removeToken();
     if (removed) {
       console.log("Logged out successfully. Local session data removed from ~/.trace/");
@@ -25303,66 +25376,96 @@ function createLogoutCommand() {
     }
   });
 }
+function buildAuthStatusInfo(token, refreshToken, selectedOrganizationId) {
+  if (!token) {
+    return { loggedIn: false, expired: false, hasRefreshToken: refreshToken !== null };
+  }
+  const base = {
+    loggedIn: true,
+    expired: false,
+    hasRefreshToken: refreshToken !== null,
+    ...selectedOrganizationId ? { activeOrg: selectedOrganizationId } : {}
+  };
+  try {
+    const parts = token.split(".");
+    const payload = parts[1];
+    if (!payload) {
+      return base;
+    }
+    const decoded = JSON.parse(Buffer.from(payload, "base64url").toString("utf-8"));
+    const expiry = decoded.exp ? new Date(decoded.exp * 1e3) : null;
+    const isExpired = expiry ? expiry < /* @__PURE__ */ new Date() : false;
+    return {
+      ...base,
+      ...decoded.sub ? { userId: decoded.sub } : {},
+      ...decoded.org_id ? { orgId: decoded.org_id } : {},
+      ...expiry ? { expires: expiry.toISOString() } : {},
+      expired: isExpired
+    };
+  } catch {
+    return base;
+  }
+}
 function createStatusCommand() {
-  return new Command("status").description("Show current authentication status").action(() => {
+  return new Command("status").description("Show current authentication status").option("-o, --output <format>", "Output format: table (default), json, tsv").addHelpText(
+    "after",
+    `
+Examples:
+  tracecli auth status
+  tracecli auth status --output json
+  tracecli auth status --output tsv`
+  ).action((options) => {
     const token = readToken();
     const refreshToken = readRefreshToken();
     const selectedOrganizationId = readSelectedOrganizationId();
-    if (token) {
-      try {
-        const parts = token.split(".");
-        const payload = parts[1];
-        if (payload) {
-          const decoded = JSON.parse(Buffer.from(payload, "base64url").toString("utf-8"));
-          const expiry = decoded.exp ? new Date(decoded.exp * 1e3) : null;
-          const isExpired = expiry ? expiry < /* @__PURE__ */ new Date() : false;
-          console.log("Logged in to Trace");
-          if (decoded.sub) {
-            console.log(`  User ID: ${decoded.sub}`);
-          }
-          if (decoded.org_id) {
-            console.log(`  Org ID:  ${decoded.org_id}`);
-          }
-          if (selectedOrganizationId) {
-            console.log(`  Active Org (CLI): ${selectedOrganizationId}`);
-          }
-          if (expiry) {
-            console.log(`  Expires: ${expiry.toISOString()}${isExpired ? " (EXPIRED)" : ""}`);
-          }
-          console.log(
-            `  Refresh: ${refreshToken ? "Available (auto-refresh enabled)" : "Not available"}`
-          );
-          if (isExpired) {
-            if (refreshToken) {
-              console.log(
-                "\nYour access token is expired, but a refresh token is available and will be used automatically."
-              );
-            } else {
-              console.log(
-                "\nYour token has expired. Run `trace auth login` after logging out to re-authenticate."
-              );
-            }
-          }
-        } else {
-          console.log("Logged in to Trace (access token stored at ~/.trace/token)");
-          if (selectedOrganizationId) {
-            console.log(`  Active Org (CLI): ${selectedOrganizationId}`);
-          }
-          console.log(
-            `  Refresh: ${refreshToken ? "Available (auto-refresh enabled)" : "Not available"}`
-          );
-        }
-      } catch {
-        console.log("Logged in to Trace (access token stored at ~/.trace/token)");
-        if (selectedOrganizationId) {
-          console.log(`  Active Org (CLI): ${selectedOrganizationId}`);
-        }
+    const info = buildAuthStatusInfo(token, refreshToken, selectedOrganizationId);
+    if (options.output === "json") {
+      console.log(JSON.stringify(info, null, 2));
+      return;
+    }
+    if (options.output === "tsv") {
+      console.log(
+        [
+          String(info.loggedIn),
+          String(info.expired),
+          String(info.hasRefreshToken),
+          info.userId ?? "",
+          info.orgId ?? "",
+          info.activeOrg ?? ""
+        ].join("	")
+      );
+      return;
+    }
+    if (!info.loggedIn) {
+      console.log("Not logged in. Run `tracecli auth login` to authenticate.");
+      return;
+    }
+    console.log("Logged in to Trace");
+    if (info.userId) {
+      console.log(`  User ID: ${info.userId}`);
+    }
+    if (info.orgId) {
+      console.log(`  Org ID:  ${info.orgId}`);
+    }
+    if (info.activeOrg) {
+      console.log(`  Active Org (CLI): ${info.activeOrg}`);
+    }
+    if (info.expires) {
+      console.log(`  Expires: ${info.expires}${info.expired ? " (EXPIRED)" : ""}`);
+    }
+    console.log(
+      `  Refresh: ${info.hasRefreshToken ? "Available (auto-refresh enabled)" : "Not available"}`
+    );
+    if (info.expired) {
+      if (info.hasRefreshToken) {
+        console.log(
+          "\nYour access token is expired, but a refresh token is available and will be used automatically."
+        );
+      } else {
         console.log(
-          `  Refresh: ${refreshToken ? "Available (auto-refresh enabled)" : "Not available"}`
+          "\nYour token has expired. Run `tracecli auth login` after logging out to re-authenticate."
         );
       }
-    } else {
-      console.log("Not logged in. Run `trace auth login` to authenticate.");
     }
   });
 }
@@ -25459,27 +25562,57 @@ Examples:
   });
 }
 function createOrgSwitchCommand() {
-  return new Command("switch").description("Switch the active organization for subsequent CLI commands").argument("<organization>", "Organization ID, slug, or name").action(async (organization) => {
-    const organizationContext = await fetchOrganizationContext();
-    const match = findOrganizationByInput(organizationContext.organizations, organization);
-    if ("error" in match) {
-      console.error(match.error);
+  return new Command("switch").description("Switch the active organization for subsequent CLI commands").argument("[organization]", "Organization ID, slug, name, or menu selection index").addHelpText(
+    "after",
+    `
+Examples:
+  tracecli org switch
+  tracecli org switch engineering
+  tracecli org switch org_01KJTJFFG497Z1C54Z07AP6NA3`
+  ).action(async (organization) => {
+    const normalizedOrganizationInput = organization?.trim() ?? "";
+    if (normalizedOrganizationInput.length === 0 && (!process.stdin.isTTY || !process.stdout.isTTY)) {
+      console.error(
+        "Missing required argument 'organization'. Run `tracecli org switch <organization>` in non-interactive environments."
+      );
       process.exit(1);
     }
-    if (!isSafeOrganizationId(match.organization.organizationId)) {
+    const organizationContext = await fetchOrganizationContext();
+    let selectedOrganization = null;
+    if (normalizedOrganizationInput.length > 0) {
+      const selection = resolveOrganizationSelectionInput(
+        organizationContext.organizations,
+        normalizedOrganizationInput
+      );
+      if ("error" in selection) {
+        console.error(selection.error);
+        process.exit(1);
+      }
+      selectedOrganization = selection.organization;
+    } else {
+      selectedOrganization = await promptForOrganizationSelection(
+        organizationContext.organizations,
+        organizationContext.activeOrganization.organizationId
+      );
+      if (!selectedOrganization) {
+        console.error("Organization switch cancelled.");
+        process.exit(1);
+      }
+    }
+    if (!isSafeOrganizationId(selectedOrganization.organizationId)) {
       console.error(
-        `Cannot switch to organization '${match.organization.organizationId}': invalid organization ID format.`
+        `Cannot switch to organization '${selectedOrganization.organizationId}': invalid organization ID format.`
       );
       process.exit(1);
     }
-    writeSelectedOrganizationId(match.organization.organizationId);
+    writeSelectedOrganizationId(selectedOrganization.organizationId);
     const refreshed = await refreshAfterOrganizationSwitch(
-      match.organization.workosOrganizationId
+      selectedOrganization.workosOrganizationId
     );
     console.log(
-      `Active organization set to ${sanitizeForOutput(match.organization.name)} (${sanitizeForOutput(match.organization.slug)})`
+      `Active organization set to ${sanitizeForOutput(selectedOrganization.name)} (${sanitizeForOutput(selectedOrganization.slug)})`
     );
-    console.log(`  Org ID: ${match.organization.organizationId}`);
+    console.log(`  Org ID: ${selectedOrganization.organizationId}`);
     if (!refreshed) {
       console.warn(
         "Token refresh for the selected organization was not completed. If repository commands fail, run `tracecli auth login` again."
@@ -26398,6 +26531,7 @@ function parseListLimit(value) {
   return n;
 }
 function printRepositoriesTsv(repositories) {
+  console.log("repositoryUrl	platform	status	defaultBranch	language");
   for (const repo of repositories) {
     console.log(
       [
@@ -26463,6 +26597,10 @@ async function runRepositoryListCommand(options) {
       params: { organizationId }
     })
   );
+  if (result.status === 401) {
+    console.error("Authentication failed. Run `tracecli auth login` to re-authenticate.");
+    process.exit(1);
+  }
   if (result.status !== 200) {
     console.error(`Failed to list repositories (status ${result.status}).`);
     process.exit(1);
@@ -26515,6 +26653,10 @@ async function runDependencyFilter(organizationId, options) {
       }
     })
   );
+  if (result.status === 401) {
+    console.error("Authentication failed. Run `tracecli auth login` to re-authenticate.");
+    process.exit(1);
+  }
   if (result.status !== 200) {
     console.error(`Failed to search dependencies (status ${result.status}).`);
     process.exit(1);
@@ -26643,7 +26785,14 @@ async function fetchCloneToken(repoUrl) {
   }
 }
 function createCloneCommand() {
-  return new Command("clone").description("Clone a repository").argument("<repository>", "Repository URL or owner/repo shorthand").argument("[directory]", "Directory to clone into").option("--branch <branch>", "Branch to clone").option("--depth <depth>", "Shallow clone depth", parseCloneDepth).action(
+  return new Command("clone").description("Clone a repository").argument("<repository>", "Repository URL or owner/repo shorthand").argument("[directory]", "Directory to clone into").option("--branch <branch>", "Branch to clone").option("--depth <depth>", "Shallow clone depth", parseCloneDepth).addHelpText(
+    "after",
+    `
+Examples:
+  tracecli repo clone securewithtrace/trace
+  tracecli repo clone securewithtrace/trace trace-src
+  tracecli repo clone https://github.com/owner/repo --branch main --depth 1`
+  ).action(
     async (repository, directory, options) => {
       const cloneUrl = resolveRepoUrl(repository);
       const targetDir = directory ?? extractRepoName(repository);

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "securewithtrace",
-  "version": "0.17.0",
+  "version": "0.18.0",
   "description": "Official Trace CLI for vulnerability intelligence in your terminal",
   "type": "module",
   "bin": {