@mutagent/cli 0.1.2 → 0.1.4

package/dist/bin/cli.js

@@ -200,9 +200,9 @@ function serverURLFromOptions(options) {
 var SDK_METADATA = {
   language: "typescript",
   openapiDocVersion: "2.0.0",
-  sdkVersion: "0.2.21",
+  sdkVersion: "0.2.23",
   genVersion: "2.812.2",
-  userAgent: "speakeasy-sdk/typescript 0.2.21 2.812.2 2.0.0 @mutagent/sdk"
+  userAgent: "speakeasy-sdk/typescript 0.2.23 2.812.2 2.0.0 @mutagent/sdk"
 };
 // ../mutagent-sdk/dist/esm/lib/http.js
 var DEFAULT_FETCHER = (input, init) => {
@@ -13812,15 +13812,41 @@ function getSDKClient() {
   }
   return sdkClient;
 }
-function validateApiKey(apiKey, endpoint) {
-  const config2 = loadConfig();
-  const client = new SDKClientWrapper({
-    bearerAuth: apiKey,
-    serverURL: endpoint,
-    workspaceId: config2.defaultWorkspace,
-    organizationId: config2.defaultOrganization
-  });
-  return client.listWorkspaces().then(() => true).catch(() => false);
+async function validateApiKey(apiKey, endpoint) {
+  try {
+    const response = await fetch(`${endpoint}/api/organizations`, {
+      headers: { "x-api-key": apiKey }
+    });
+    return response.ok;
+  } catch {
+    return false;
+  }
+}
+async function fetchOrganizations(apiKey, endpoint) {
+  try {
+    const response = await fetch(`${endpoint}/api/organizations`, {
+      headers: { "x-api-key": apiKey }
+    });
+    if (!response.ok)
+      return [];
+    const data = await response.json();
+    return data.data ?? [];
+  } catch {
+    return [];
+  }
+}
+async function fetchWorkspaces(apiKey, endpoint, orgId) {
+  try {
+    const response = await fetch(`${endpoint}/api/workspaces`, {
+      headers: { "x-api-key": apiKey, "x-organization-id": orgId }
+    });
+    if (!response.ok)
+      return [];
+    const data = await response.json();
+    return data.workspaces ?? [];
+  } catch {
+    return [];
+  }
 }
 
 // src/lib/output.ts
@@ -14111,7 +14137,21 @@ Environment Variables:
         if (!isValid) {
           throw new MutagentError2("INVALID_API_KEY", "Invalid API key or endpoint", "Check your API key and try again");
         }
-        saveCredentials(apiKey, endpoint);
+        const orgs = await fetchOrganizations(apiKey, endpoint);
+        let orgId;
+        let wsId;
+        if (orgs.length >= 1 && orgs[0]) {
+          orgId = orgs[0].id;
+          const workspaces = await fetchWorkspaces(apiKey, endpoint, orgId);
+          const defaultWs = workspaces.find((w) => w.isDefault);
+          wsId = defaultWs?.id ?? workspaces[0]?.id;
+        }
+        saveFullCredentials({
+          apiKey,
+          endpoint,
+          workspaceId: wsId,
+          organizationId: orgId
+        });
         output.success("Authenticated successfully");
         if (!isJson) {
           output.info(`Endpoint: ${endpoint}`);
@@ -14208,8 +14248,55 @@ Environment Variables:
         if (!isValid) {
           throw new MutagentError2("INVALID_API_KEY", "Invalid API key or endpoint", "Check your API key and try again");
         }
-        saveCredentials(apiKey, endpoint);
+        let selectedOrgId;
+        let selectedOrgName;
+        let selectedWsId;
+        let selectedWsName;
+        const orgs = await fetchOrganizations(apiKey, endpoint);
+        if (orgs.length === 1 && orgs[0]) {
+          selectedOrgId = orgs[0].id;
+          selectedOrgName = orgs[0].name;
+        } else if (orgs.length > 1) {
+          const orgAnswer = await inquirer.prompt([{
+            type: "list",
+            name: "orgId",
+            message: "Select organization:",
+            choices: orgs.map((o) => ({ name: o.name, value: o.id }))
+          }]);
+          selectedOrgId = orgAnswer.orgId;
+          selectedOrgName = orgs.find((o) => o.id === selectedOrgId)?.name;
+        }
+        if (selectedOrgId) {
+          const workspaces = await fetchWorkspaces(apiKey, endpoint, selectedOrgId);
+          const defaultWs = workspaces.find((w) => w.isDefault);
+          if (workspaces.length === 1 && workspaces[0]) {
+            selectedWsId = workspaces[0].id;
+            selectedWsName = workspaces[0].name;
+          } else if (defaultWs) {
+            selectedWsId = defaultWs.id;
+            selectedWsName = defaultWs.name;
+          } else if (workspaces.length > 1) {
+            const wsAnswer = await inquirer.prompt([{
+              type: "list",
+              name: "wsId",
+              message: "Select workspace:",
+              choices: workspaces.map((w) => ({ name: w.name + (w.isDefault ? " (default)" : ""), value: w.id }))
+            }]);
+            selectedWsId = wsAnswer.wsId;
+            selectedWsName = workspaces.find((w) => w.id === selectedWsId)?.name;
+          }
+        }
+        saveFullCredentials({
+          apiKey,
+          endpoint,
+          workspaceId: selectedWsId,
+          organizationId: selectedOrgId
+        });
         output.success("Authenticated successfully");
+        if (selectedOrgName)
+          output.info("Organization: " + selectedOrgName);
+        if (selectedWsName)
+          output.info("Workspace: " + selectedWsName);
         output.info("Endpoint: " + endpoint);
       }
     } catch (error) {
@@ -17150,5 +17237,5 @@ program.addCommand(createWorkspacesCommand());
 program.addCommand(createProvidersCommand());
 program.parse();
 
-//# debugId=01C136F9E7A5A54064756E2164756E21
+//# debugId=C70269B58C487D9164756E2164756E21
 //# sourceMappingURL=cli.js.map