@mcp-use/cli 3.1.0-canary.3 → 3.1.0-canary.4

package/dist/index.js

@@ -3575,12 +3575,16 @@ async function deployCommand(options) {
     }
     let api = await McpUseAPI.create();
     let resolvedOrgId;
+    let resolvedOrgName;
+    let resolvedOrgSlug;
     if (options.org) {
       const authInfo = await api.testAuth();
       const match = resolveOrgFromOption(authInfo.orgs ?? [], options.org);
       if (match) {
         api.setOrgId(match.id);
         resolvedOrgId = match.id;
+        resolvedOrgName = match.name;
+        resolvedOrgSlug = match.slug ?? void 0;
         const slug = match.slug ? source_default.gray(` (${match.slug})`) : "";
         console.log(
           source_default.gray("Organization: ") + source_default.cyan(match.name) + slug
@@ -3620,6 +3624,8 @@ async function deployCommand(options) {
         }
         api.setOrgId(selectedOrg.id);
         resolvedOrgId = selectedOrg.id;
+        resolvedOrgName = selectedOrg.name;
+        resolvedOrgSlug = selectedOrg.slug ?? void 0;
         await writeConfig({
           ...config,
           orgId: selectedOrg.id,
@@ -3631,6 +3637,8 @@ async function deployCommand(options) {
         );
       } else {
         resolvedOrgId = config.orgId;
+        resolvedOrgName = config.orgName;
+        resolvedOrgSlug = config.orgSlug;
         api.setOrgId(config.orgId);
         if (config.orgName) {
           const slug = config.orgSlug ? source_default.gray(` (${config.orgSlug})`) : "";
@@ -4027,6 +4035,22 @@ async function deployCommand(options) {
     }
     const existingLink = !options.new ? await getProjectLink(cwd) : null;
     let serverId = existingLink?.serverId;
+    if (serverId && resolvedOrgId) {
+      try {
+        const linkedServer = await api.getServer(serverId);
+        if (linkedServer.organizationId !== resolvedOrgId) {
+          const target = resolvedOrgName ? `${resolvedOrgName}${resolvedOrgSlug ? ` (${resolvedOrgSlug})` : ""}` : resolvedOrgId;
+          console.log(
+            source_default.yellow(
+              `\u26A0\uFE0F  Linked server belongs to a different organization. Creating a new server in ${target}...
+`
+            )
+          );
+          serverId = void 0;
+        }
+      } catch {
+      }
+    }
     if (existingLink && serverId) {
       try {
         const existingDep = await api.getDeployment(existingLink.deploymentId);