@mcp-use/cli 3.0.3-canary.0 → 3.1.0-canary.2

package/dist/index.js

@@ -1569,6 +1569,14 @@ async function pollForDeviceToken(authBaseUrl, deviceCode, intervalSeconds) {
   }
   throw new Error("Login timed out. Please try again.");
 }
+function resolveOrgFromOption(orgs, identifier) {
+  const needle = identifier.trim();
+  if (!needle) return null;
+  const lower = needle.toLowerCase();
+  return orgs.find(
+    (o) => o.slug === needle || o.id === needle || o.name.toLowerCase() === lower
+  ) ?? null;
+}
 async function promptOrgSelection(orgs, defaultOrgId) {
   if (orgs.length === 0) return null;
   if (orgs.length === 1) {
@@ -1615,8 +1623,8 @@ async function loginCommand(options) {
         console.log(source_default.green.bold("\u2713 API key saved."));
         try {
           const api2 = await McpUseAPI.create();
-          const authInfo = await api2.testAuth();
-          console.log(source_default.gray(`  Authenticated as ${authInfo.email}`));
+          const authInfo2 = await api2.testAuth();
+          console.log(source_default.gray(`  Authenticated as ${authInfo2.email}`));
         } catch {
           console.log(
             source_default.gray(
@@ -1668,9 +1676,19 @@ async function loginCommand(options) {
     const keyResp = await api.createApiKeyWithAccessToken(accessToken, "CLI");
     await writeConfig({ apiKey: keyResp.key });
     console.log(source_default.green.bold("\n\u2713 Successfully logged in!"));
+    let authInfo = null;
     try {
       const freshApi = await McpUseAPI.create();
-      const authInfo = await freshApi.testAuth();
+      authInfo = await freshApi.testAuth();
+    } catch {
+      console.log(
+        source_default.gray(
+          `
+  Your API key has been saved to ${source_default.white("~/.mcp-use/config.json")}`
+        )
+      );
+    }
+    if (authInfo) {
       console.log(source_default.cyan.bold("\nCurrent user:\n"));
       console.log(source_default.white("  Email:   ") + source_default.cyan(authInfo.email));
       console.log(source_default.white("  User ID: ") + source_default.gray(authInfo.user_id));
@@ -1682,8 +1700,19 @@ async function loginCommand(options) {
       const orgs = authInfo.orgs ?? [];
       if (orgs.length > 0) {
         let selectedOrg = null;
-        if (orgs.length === 1) {
+        if (options?.org) {
+          selectedOrg = resolveOrgFromOption(orgs, options.org);
+          if (!selectedOrg) {
+            throw new Error(
+              `Organization "${options.org}" not found. Run 'npx mcp-use org list' after logging in to see available organizations.`
+            );
+          }
+        } else if (orgs.length === 1) {
           selectedOrg = orgs[0];
+        } else if (!process.stdin.isTTY) {
+          throw new Error(
+            "Multiple organizations available and no TTY for interactive selection. Re-run with --org <slug|id|name> to pick one non-interactively."
+          );
         } else {
           selectedOrg = await promptOrgSelection(orgs, authInfo.default_org_id);
         }
@@ -1701,13 +1730,6 @@ async function loginCommand(options) {
           );
         }
       }
-    } catch {
-      console.log(
-        source_default.gray(
-          `
-  Your API key has been saved to ${source_default.white("~/.mcp-use/config.json")}`
-        )
-      );
     }
     console.log(
       source_default.gray(
@@ -3555,9 +3577,7 @@ async function deployCommand(options) {
     let resolvedOrgId;
     if (options.org) {
       const authInfo = await api.testAuth();
-      const match = (authInfo.orgs ?? []).find(
-        (o) => o.slug === options.org || o.id === options.org || o.name.toLowerCase() === options.org.toLowerCase()
-      );
+      const match = resolveOrgFromOption(authInfo.orgs ?? [], options.org);
       if (match) {
         api.setOrgId(match.id);
         resolvedOrgId = match.id;
@@ -4190,7 +4210,27 @@ async function listDeploymentsCommand() {
       process.exit(1);
     }
     const api = await McpUseAPI.create();
-    const deployments = await api.listDeployments();
+    const [deployments, authResult] = await Promise.all([
+      api.listDeployments(),
+      api.testAuth()
+    ]);
+    const orgMap = new Map(authResult.orgs.map((o) => [o.id, o.name]));
+    const uniqueServerIds = [
+      ...new Set(
+        deployments.map((d) => d.serverId).filter((id) => id != null)
+      )
+    ];
+    const serverResults = await Promise.allSettled(
+      uniqueServerIds.map((id) => api.getServer(id))
+    );
+    const serverOrgMap = /* @__PURE__ */ new Map();
+    for (let i = 0; i < uniqueServerIds.length; i++) {
+      const result = serverResults[i];
+      if (result.status === "fulfilled") {
+        const orgName = orgMap.get(result.value.organizationId) ?? result.value.organizationId.substring(0, 19);
+        serverOrgMap.set(uniqueServerIds[i], orgName);
+      }
+    }
     const sortedDeployments = [...deployments].sort(
       (a, b) => new Date(b.createdAt).getTime() - new Date(a.createdAt).getTime()
     );
@@ -4210,19 +4250,21 @@ async function listDeploymentsCommand() {
     );
     console.log(
       source_default.white.bold(
-        `${"ID".padEnd(40)} ${"NAME".padEnd(25)} ${"STATUS".padEnd(12)} ${"MCP URL".padEnd(45)} ${"CREATED"}`
+        `${"ID".padEnd(40)} ${"NAME".padEnd(25)} ${"ORG".padEnd(20)} ${"STATUS".padEnd(12)} ${"MCP URL".padEnd(45)} ${"CREATED"}`
       )
     );
-    console.log(source_default.gray("\u2500".repeat(140)));
+    console.log(source_default.gray("\u2500".repeat(155)));
     for (const deployment of sortedDeployments) {
       const id = formatId(deployment.id).padEnd(40);
       const name = deployment.name.substring(0, 24).padEnd(25);
+      const orgName = deployment.serverId ? serverOrgMap.get(deployment.serverId) ?? "-" : "-";
+      const org = orgName.substring(0, 19).padEnd(20);
       const statusColor = getStatusColor(deployment.status);
       const status = statusColor(deployment.status.padEnd(12));
       const mcpUrl = (deployment.mcpUrl || "-").substring(0, 44).padEnd(45);
       const created = formatRelativeTime(deployment.createdAt);
       console.log(
-        `${source_default.gray(id)} ${name} ${status} ${source_default.cyan(mcpUrl)} ${source_default.gray(created)}`
+        `${source_default.gray(id)} ${name} ${source_default.magenta(org)} ${status} ${source_default.cyan(mcpUrl)} ${source_default.gray(created)}`
       );
     }
     console.log();
@@ -4759,9 +4801,7 @@ function pickStr(obj, key) {
 async function applyOrgOption(api, org) {
   if (!org) return;
   const authInfo = await api.testAuth();
-  const match = (authInfo.orgs ?? []).find(
-    (o) => o.slug === org || o.id === org || o.name.toLowerCase() === org.toLowerCase()
-  );
+  const match = resolveOrgFromOption(authInfo.orgs ?? [], org);
   if (!match) {
     console.error(
       source_default.red(
@@ -7180,9 +7220,9 @@ Looked for:
 program.command("login").description("Login to mcp-use cloud").option(
   "--api-key <key>",
   "Login with an API key directly (non-interactive, for CI/CD)"
-).action(async (opts) => {
+).option("--org <slug|id|name>", "Select an organization non-interactively").action(async (opts) => {
   try {
-    await loginCommand({ apiKey: opts.apiKey });
+    await loginCommand({ apiKey: opts.apiKey, org: opts.org });
     process.exit(0);
   } catch (error) {
     console.error(