securewithtrace 0.16.1 → 0.17.0

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;
     }

package/package.json

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