securewithtrace 0.17.1 → 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;
@@ -25500,33 +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").addHelpText(
+  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 organizationContext = await fetchOrganizationContext();
-    const match = findOrganizationByInput(organizationContext.organizations, organization);
-    if ("error" in match) {
-      console.error(match.error);
+    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."

package/package.json

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