securewithtrace 0.16.1 → 0.17.1

package/dist/index.js

@@ -24959,8 +24959,24 @@ async function authenticatedRequestSafe(request) {
     return null;
   }
 }
+function extractOrganizationIdFromToken(token) {
+  if (!token || token.trim().length === 0) {
+    return null;
+  }
+  const parts = token.split(".");
+  const payload = parts[1];
+  if (!payload) {
+    return null;
+  }
+  try {
+    const decoded = JSON.parse(Buffer.from(payload, "base64url").toString("utf-8"));
+    return typeof decoded.org_id === "string" && decoded.org_id.trim().length > 0 ? decoded.org_id : null;
+  } catch {
+    return null;
+  }
+}
 var SAFE_ID_PATTERN = /^[a-zA-Z0-9_-]+$/;
-function determineActiveOrganization(organizations, selectedOrganizationId) {
+function determineActiveOrganization(organizations, selectedOrganizationId, tokenOrganizationId) {
   if (organizations.length === 0) {
     return null;
   }
@@ -24976,6 +24992,18 @@ function determineActiveOrganization(organizations, selectedOrganizationId) {
       };
     }
   }
+  if (tokenOrganizationId && SAFE_ID_PATTERN.test(tokenOrganizationId)) {
+    const tokenOrganization = organizations.find(
+      (organization) => organization.organizationId === tokenOrganizationId
+    );
+    if (tokenOrganization) {
+      return {
+        organization: tokenOrganization,
+        source: "default",
+        staleSelectionDetected: selectedOrganizationId != null
+      };
+    }
+  }
   const [fallbackOrganization] = organizations;
   if (!fallbackOrganization) {
     return null;
@@ -24996,7 +25024,12 @@ async function resolveOrganizationId(client) {
   }
   const organizations = result.body;
   const selectedOrganizationId = readSelectedOrganizationId();
-  const activeOrganization = determineActiveOrganization(organizations, selectedOrganizationId);
+  const tokenOrganizationId = extractOrganizationIdFromToken(readToken());
+  const activeOrganization = determineActiveOrganization(
+    organizations,
+    selectedOrganizationId,
+    tokenOrganizationId
+  );
   if (!activeOrganization) {
     console.error("No organization found for your account.");
     process.exit(1);
@@ -25032,7 +25065,12 @@ async function resolveOrganizationIdSafe(client) {
     }
     const organizations = result.body;
     const selectedOrganizationId = readSelectedOrganizationId();
-    const activeOrganization = determineActiveOrganization(organizations, selectedOrganizationId);
+    const tokenOrganizationId = extractOrganizationIdFromToken(readToken());
+    const activeOrganization = determineActiveOrganization(
+      organizations,
+      selectedOrganizationId,
+      tokenOrganizationId
+    );
     if (!activeOrganization) {
       return null;
     }
@@ -25222,7 +25260,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.");
@@ -25256,7 +25300,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/");
@@ -25265,66 +25314,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.");
     }
   });
 }
@@ -25421,7 +25500,13 @@ 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) => {
+  return new Command("switch").description("Switch the active organization for subsequent CLI commands").argument("<organization>", "Organization ID, slug, or name").addHelpText(
+    "after",
+    `
+Examples:
+  tracecli org switch engineering
+  tracecli org switch org_01KJTJFFG497Z1C54Z07AP6NA3`
+  ).action(async (organization) => {
     const organizationContext = await fetchOrganizationContext();
     const match = findOrganizationByInput(organizationContext.organizations, organization);
     if ("error" in match) {
@@ -26360,6 +26445,7 @@ function parseListLimit(value) {
   return n;
 }
 function printRepositoriesTsv(repositories) {
+  console.log("repositoryUrl	platform	status	defaultBranch	language");
   for (const repo of repositories) {
     console.log(
       [
@@ -26425,6 +26511,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);
@@ -26477,6 +26567,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);
@@ -26605,7 +26699,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.16.1",
+  "version": "0.17.1",
   "description": "Official Trace CLI for vulnerability intelligence in your terminal",
   "type": "module",
   "bin": {