@mcp-use/cli 2.20.1-canary.3 → 2.21.0-canary.4

package/dist/index.js

@@ -1180,6 +1180,10 @@ async function isLoggedIn() {
   const apiKey = await getApiKey();
   return !!apiKey;
 }
+async function getProfileId() {
+  const config = await readConfig();
+  return config.profileId || null;
+}
 async function getWebUrl() {
   return DEFAULT_WEB_URL;
 }
@@ -1188,9 +1192,11 @@ async function getWebUrl() {
 var McpUseAPI = class _McpUseAPI {
   baseUrl;
   apiKey;
-  constructor(baseUrl, apiKey) {
+  profileId;
+  constructor(baseUrl, apiKey, profileId) {
     this.baseUrl = baseUrl || "";
     this.apiKey = apiKey;
+    this.profileId = profileId;
   }
   /**
    * Initialize API client with config
@@ -1198,7 +1204,14 @@ var McpUseAPI = class _McpUseAPI {
   static async create() {
     const baseUrl = await getApiUrl();
     const apiKey = await getApiKey();
-    return new _McpUseAPI(baseUrl, apiKey ?? void 0);
+    const profileId = await getProfileId();
+    return new _McpUseAPI(baseUrl, apiKey ?? void 0, profileId ?? void 0);
+  }
+  /**
+   * Override the profile ID for this API client instance (e.g. from --org flag)
+   */
+  setProfileId(profileId) {
+    this.profileId = profileId;
   }
   /**
    * Make authenticated request
@@ -1212,6 +1225,9 @@ var McpUseAPI = class _McpUseAPI {
     if (this.apiKey) {
       headers["x-api-key"] = this.apiKey;
     }
+    if (this.profileId) {
+      headers["x-profile-id"] = this.profileId;
+    }
     const timeout = options.timeout || 3e4;
     const controller = new AbortController();
     const timeoutId = setTimeout(() => controller.abort(), timeout);
@@ -1262,6 +1278,14 @@ var McpUseAPI = class _McpUseAPI {
   async testAuth() {
     return this.request("/test-auth");
   }
+  /**
+   * Set the user's default profile (organization) on the server
+   */
+  async setDefaultProfile(profileId) {
+    await this.request(`/profiles/${profileId}/set-default`, {
+      method: "POST"
+    });
+  }
   /**
    * Create deployment
    */
@@ -1286,6 +1310,9 @@ var McpUseAPI = class _McpUseAPI {
     if (this.apiKey) {
       headers["x-api-key"] = this.apiKey;
     }
+    if (this.profileId) {
+      headers["x-profile-id"] = this.profileId;
+    }
     const response = await fetch(url, { headers });
     if (!response.ok) {
       throw new Error(`Failed to stream logs: ${response.status}`);
@@ -1367,6 +1394,9 @@ var McpUseAPI = class _McpUseAPI {
     if (this.apiKey) {
       headers["x-api-key"] = this.apiKey;
     }
+    if (this.profileId) {
+      headers["x-profile-id"] = this.profileId;
+    }
     const response = await fetch(url, {
       method: "POST",
       headers,
@@ -1428,6 +1458,7 @@ var McpUseAPI = class _McpUseAPI {
       formData.append("source_file", blob, basename(filePath));
       const headers = {};
       if (this.apiKey) headers["x-api-key"] = this.apiKey;
+      if (this.profileId) headers["x-profile-id"] = this.profileId;
       const response = await fetch(
         `${this.baseUrl}/deployments/${deploymentId}/redeploy`,
         {
@@ -1762,6 +1793,45 @@ async function startCallbackServer(port, expectedState) {
     server.on("error", reject);
   });
 }
+async function promptOrgSelection(profiles, defaultProfileId) {
+  if (profiles.length === 0) return null;
+  if (profiles.length === 1) {
+    return profiles[0];
+  }
+  console.log(source_default.cyan.bold("\n\u{1F3E2} Select an organization:\n"));
+  for (let i = 0; i < profiles.length; i++) {
+    const p = profiles[i];
+    const marker = p.id === defaultProfileId ? source_default.green(" (current)") : "";
+    const slug = p.slug ? source_default.gray(` (${p.slug})`) : "";
+    console.log(
+      `  ${source_default.white(`${i + 1}.`)} ${p.profile_name}${slug}${marker}`
+    );
+  }
+  const readline = await import("readline");
+  const rl = readline.createInterface({
+    input: process.stdin,
+    output: process.stdout
+  });
+  return new Promise((resolve2) => {
+    const defaultIdx = defaultProfileId ? profiles.findIndex((p) => p.id === defaultProfileId) : 0;
+    const defaultDisplay = defaultIdx >= 0 ? defaultIdx + 1 : 1;
+    rl.question(
+      source_default.gray(`
+Enter number [${defaultDisplay}]: `),
+      (answer) => {
+        rl.close();
+        const trimmed = answer.trim();
+        const idx = trimmed === "" ? defaultIdx : parseInt(trimmed, 10) - 1;
+        if (idx >= 0 && idx < profiles.length) {
+          resolve2(profiles[idx]);
+        } else {
+          console.log(source_default.yellow("Invalid selection, using default."));
+          resolve2(profiles[defaultIdx >= 0 ? defaultIdx : 0]);
+        }
+      }
+    );
+  });
+}
 async function loginCommand(options) {
   try {
     if (await isLoggedIn()) {
@@ -1823,6 +1893,31 @@ async function loginCommand(options) {
         const masked = apiKey.substring(0, 6) + "...";
         console.log(source_default.white("API Key: ") + source_default.gray(masked));
       }
+      const profiles = authInfo.profiles ?? [];
+      if (profiles.length > 0) {
+        let selectedProfile = null;
+        if (profiles.length === 1) {
+          selectedProfile = profiles[0];
+        } else {
+          selectedProfile = await promptOrgSelection(
+            profiles,
+            authInfo.default_profile_id
+          );
+        }
+        if (selectedProfile) {
+          const config = await readConfig();
+          await writeConfig({
+            ...config,
+            profileId: selectedProfile.id,
+            profileName: selectedProfile.profile_name,
+            profileSlug: selectedProfile.slug ?? void 0
+          });
+          const slug = selectedProfile.slug ? source_default.gray(` (${selectedProfile.slug})`) : "";
+          console.log(
+            source_default.white("Org:     ") + source_default.cyan(selectedProfile.profile_name) + slug
+          );
+        }
+      }
     } catch (error) {
       console.log(
         source_default.gray(
@@ -1888,6 +1983,27 @@ async function whoamiCommand() {
       const masked = apiKey.substring(0, 6) + "...";
       console.log(source_default.white("API Key: ") + source_default.gray(masked));
     }
+    const config = await readConfig();
+    const profiles = authInfo.profiles ?? [];
+    if (profiles.length > 0) {
+      const activeProfile = profiles.find(
+        (p) => p.id === (config.profileId || authInfo.default_profile_id)
+      );
+      if (activeProfile) {
+        const slug = activeProfile.slug ? source_default.gray(` (${activeProfile.slug})`) : "";
+        console.log(
+          source_default.white("Org:     ") + source_default.cyan(activeProfile.profile_name) + slug
+        );
+      }
+      if (profiles.length > 1) {
+        console.log(
+          source_default.gray(
+            `
+  ${profiles.length} organizations available. Use ` + source_default.white("npx mcp-use org list") + " to see all."
+          )
+        );
+      }
+    }
   } catch (error) {
     console.error(
       source_default.red.bold("\n\u2717 Failed to get user info:"),
@@ -3364,10 +3480,15 @@ async function displayDeploymentProgress(api, deployment) {
       const mcpServerUrl = getMcpServerUrl(finalDeployment);
       let dashboardUrl = null;
       const webUrl = (await getWebUrl()).replace(/\/$/, "");
-      if (finalDeployment.serverSlug) {
-        dashboardUrl = `${webUrl}/cloud/servers/${finalDeployment.serverSlug}`;
-      } else if (finalDeployment.serverId) {
-        dashboardUrl = `${webUrl}/cloud/servers/${finalDeployment.serverId}`;
+      const config = await readConfig();
+      const orgSlug = config.profileSlug;
+      const serverRef = finalDeployment.serverSlug || finalDeployment.serverId;
+      if (serverRef) {
+        if (orgSlug) {
+          dashboardUrl = `${webUrl}/cloud/${orgSlug}/servers/${serverRef}`;
+        } else {
+          dashboardUrl = `${webUrl}/cloud/servers/${serverRef}`;
+        }
       }
       const inspectorUrl = `https://inspector.manufact.com/inspector?autoConnect=${encodeURIComponent(
         mcpServerUrl
@@ -3767,6 +3888,34 @@ async function deployCommand(options) {
     }
     console.log();
     const api = await McpUseAPI.create();
+    if (options.org) {
+      try {
+        const authInfo = await api.testAuth();
+        const match = (authInfo.profiles ?? []).find(
+          (p) => p.slug === options.org || p.id === options.org || p.profile_name.toLowerCase() === options.org.toLowerCase()
+        );
+        if (match) {
+          api.setProfileId(match.id);
+          const slug = match.slug ? source_default.gray(` (${match.slug})`) : "";
+          console.log(
+            source_default.gray("Organization: ") + source_default.cyan(match.profile_name) + slug
+          );
+        } else {
+          console.error(
+            source_default.red(
+              `\u2717 Organization "${options.org}" not found. Run ${source_default.white("npx mcp-use org list")} to see available organizations.`
+            )
+          );
+          process.exit(1);
+        }
+      } catch (error) {
+        console.error(
+          source_default.red("\u2717 Failed to resolve organization:"),
+          source_default.red(error instanceof Error ? error.message : "Unknown error")
+        );
+        process.exit(1);
+      }
+    }
     let githubVerified = false;
     try {
       console.log(source_default.gray(`[DEBUG] API URL: ${api.baseUrl}`));
@@ -3943,6 +4092,18 @@ async function deployCommand(options) {
       healthCheckPath: "/healthz",
       serverId
     };
+    if (!options.org) {
+      try {
+        const config = await readConfig();
+        if (config.profileName) {
+          const slug = config.profileSlug ? source_default.gray(` (${config.profileSlug})`) : "";
+          console.log(
+            source_default.gray("Organization: ") + source_default.cyan(config.profileName) + slug
+          );
+        }
+      } catch {
+      }
+    }
     console.log(source_default.gray("Creating deployment..."));
     const deployment = await api.createDeployment(deploymentRequest);
     console.log(
@@ -4502,6 +4663,125 @@ function createDeploymentsCommand() {
   return deploymentsCommand;
 }
 
+// src/commands/org.ts
+async function ensureLoggedIn() {
+  if (!await isLoggedIn()) {
+    console.log(source_default.yellow("\u26A0\uFE0F  You are not logged in."));
+    console.log(
+      source_default.gray("Run " + source_default.white("npx mcp-use login") + " to get started.")
+    );
+    return false;
+  }
+  return true;
+}
+async function orgListCommand() {
+  try {
+    if (!await ensureLoggedIn()) return;
+    const api = await McpUseAPI.create();
+    const authInfo = await api.testAuth();
+    const config = await readConfig();
+    const profiles = authInfo.profiles ?? [];
+    const activeId = config.profileId || authInfo.default_profile_id;
+    if (profiles.length === 0) {
+      console.log(source_default.yellow("No organizations found."));
+      return;
+    }
+    console.log(source_default.cyan.bold("\u{1F3E2} Your organizations:\n"));
+    for (const p of profiles) {
+      const isActive = p.id === activeId;
+      const marker = isActive ? source_default.green(" \u2190 active") : "";
+      const slug = p.slug ? source_default.gray(` (${p.slug})`) : "";
+      const role = source_default.gray(` [${p.role}]`);
+      const name = isActive ? source_default.cyan.bold(p.profile_name) : source_default.white(p.profile_name);
+      console.log(`  ${name}${slug}${role}${marker}`);
+    }
+    if (profiles.length > 1) {
+      console.log(
+        source_default.gray("\nSwitch with " + source_default.white("npx mcp-use org switch"))
+      );
+    }
+  } catch (error) {
+    console.error(
+      source_default.red.bold("\n\u2717 Failed to list organizations:"),
+      source_default.red(error instanceof Error ? error.message : "Unknown error")
+    );
+    process.exit(1);
+  }
+}
+async function orgSwitchCommand() {
+  try {
+    if (!await ensureLoggedIn()) return;
+    const api = await McpUseAPI.create();
+    const authInfo = await api.testAuth();
+    const config = await readConfig();
+    const profiles = authInfo.profiles ?? [];
+    if (profiles.length === 0) {
+      console.log(source_default.yellow("No organizations found."));
+      return;
+    }
+    if (profiles.length === 1) {
+      const p = profiles[0];
+      const slug2 = p.slug ? source_default.gray(` (${p.slug})`) : "";
+      console.log(
+        source_default.yellow(
+          `You only have one organization: ${source_default.cyan(p.profile_name)}${slug2}`
+        )
+      );
+      return;
+    }
+    const activeId = config.profileId || authInfo.default_profile_id;
+    const selected = await promptOrgSelection(profiles, activeId);
+    if (!selected) {
+      console.log(source_default.yellow("No organization selected."));
+      return;
+    }
+    await writeConfig({
+      ...config,
+      profileId: selected.id,
+      profileName: selected.profile_name,
+      profileSlug: selected.slug ?? void 0
+    });
+    try {
+      await api.setDefaultProfile(selected.id);
+    } catch {
+    }
+    const slug = selected.slug ? source_default.gray(` (${selected.slug})`) : "";
+    console.log(
+      source_default.green.bold("\n\u2713 Switched to ") + source_default.cyan.bold(selected.profile_name) + slug
+    );
+  } catch (error) {
+    console.error(
+      source_default.red.bold("\n\u2717 Failed to switch organization:"),
+      source_default.red(error instanceof Error ? error.message : "Unknown error")
+    );
+    process.exit(1);
+  }
+}
+async function orgCurrentCommand() {
+  try {
+    if (!await ensureLoggedIn()) return;
+    const config = await readConfig();
+    if (!config.profileId) {
+      console.log(
+        source_default.yellow(
+          "No organization selected. Run " + source_default.white("npx mcp-use org switch") + " to pick one."
+        )
+      );
+      return;
+    }
+    const slug = config.profileSlug ? source_default.gray(` (${config.profileSlug})`) : "";
+    console.log(
+      source_default.cyan.bold("\u{1F3E2} Active organization: ") + source_default.white(config.profileName || config.profileId) + slug
+    );
+  } catch (error) {
+    console.error(
+      source_default.red.bold("\n\u2717 Failed to get organization:"),
+      source_default.red(error instanceof Error ? error.message : "Unknown error")
+    );
+    process.exit(1);
+  }
+}
+
 // src/commands/skills.ts
 import { Command as Command3 } from "commander";
 import { cpSync, existsSync as existsSync2, mkdtempSync, readdirSync, rmSync } from "fs";
@@ -6552,6 +6832,16 @@ program.command("logout").description("Logout from Manufact cloud").action(async
 program.command("whoami").description("Show current user information").action(async () => {
   await whoamiCommand();
 });
+var orgCommand = program.command("org").description("Manage organizations");
+orgCommand.command("list").description("List your organizations").action(async () => {
+  await orgListCommand();
+});
+orgCommand.command("switch").description("Switch the active organization").action(async () => {
+  await orgSwitchCommand();
+});
+orgCommand.command("current").description("Show the currently active organization").action(async () => {
+  await orgCurrentCommand();
+});
 program.command("deploy").description("Deploy MCP server from GitHub to Manufact cloud").option("--open", "Open deployment in browser after successful deploy").option("--name <name>", "Custom deployment name").option("--port <port>", "Server port", "3000").option("--runtime <runtime>", "Runtime (node or python)").option(
   "--new",
   "Force creation of new deployment instead of reusing linked deployment"
@@ -6561,6 +6851,9 @@ program.command("deploy").description("Deploy MCP server from GitHub to Manufact
 ).option("--env-file <path>", "Path to .env file with environment variables").option(
   "--root-dir <path>",
   "Root directory within repo to deploy from (for monorepos)"
+).option(
+  "--org <slug-or-id>",
+  "Deploy to a specific organization (by slug or ID)"
 ).action(async (options) => {
   await deployCommand({
     open: options.open,
@@ -6570,7 +6863,8 @@ program.command("deploy").description("Deploy MCP server from GitHub to Manufact
     new: options.new,
     env: options.env,
     envFile: options.envFile,
-    rootDir: options.rootDir
+    rootDir: options.rootDir,
+    org: options.org
   });
 });
 program.addCommand(createClientCommand());