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

package/dist/index.js

@@ -1508,6 +1508,28 @@ var McpUseAPI = class _McpUseAPI {
   }
 };
 
+// src/utils/errors.ts
+function handleCommandError(error, context) {
+  if (error instanceof ApiUnauthorizedError) {
+    console.error(
+      source_default.red("\n\u2717 Your session has expired or your API key is invalid.")
+    );
+    console.error(
+      source_default.gray(
+        `Run ${source_default.white("npx mcp-use login")} to re-authenticate.
+`
+      )
+    );
+    process.exit(1);
+  }
+  console.error(
+    source_default.red.bold(`
+\u2717 ${context}:`),
+    source_default.red(error instanceof Error ? error.message : "Unknown error")
+  );
+  process.exit(1);
+}
+
 // src/commands/auth.ts
 var DEVICE_CLIENT_ID = "mcp-use-cli";
 var DEVICE_POLL_TIMEOUT = 18e5;
@@ -1636,14 +1658,32 @@ async function loginCommand(options) {
       return;
     }
     if (await isLoggedIn()) {
+      let needsReauth = false;
+      try {
+        await (await McpUseAPI.create()).testAuth();
+      } catch (e) {
+        if (e instanceof ApiUnauthorizedError) {
+          needsReauth = true;
+        }
+      }
+      if (!needsReauth) {
+        if (!options?.silent) {
+          console.log(
+            source_default.yellow(
+              "You are already logged in. Run 'npx mcp-use logout' first if you want to login with a different account."
+            )
+          );
+        }
+        return;
+      }
       if (!options?.silent) {
         console.log(
           source_default.yellow(
-            "You are already logged in. Run 'npx mcp-use logout' first if you want to login with a different account."
+            "\u26A0\uFE0F  Stored credentials are invalid or expired. Re-authenticating..."
           )
         );
       }
-      return;
+      await deleteConfig();
     }
     console.log(source_default.cyan.bold("Logging in to mcp-use cloud...\n"));
     const authBaseUrl = await getAuthBaseUrl();
@@ -1810,21 +1850,7 @@ async function whoamiCommand() {
       }
     }
   } catch (error) {
-    if (error?.status === 401) {
-      console.error(
-        source_default.red("\nYour session has expired or your API key is invalid.")
-      );
-      console.log(
-        source_default.gray(`Run ${source_default.white("mcp-use login")} to re-authenticate.
-`)
-      );
-    } else {
-      console.error(
-        source_default.red.bold("\n\u2717 Failed to get user info:"),
-        source_default.red(error instanceof Error ? error.message : "Unknown error")
-      );
-    }
-    process.exit(1);
+    handleCommandError(error, "Failed to get user info");
   }
 }
 
@@ -3575,12 +3601,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 +3650,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 +3663,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 +4061,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);
@@ -4269,11 +4319,7 @@ async function listDeploymentsCommand() {
     }
     console.log();
   } catch (error) {
-    console.error(
-      source_default.red.bold("\n\u2717 Failed to list deployments:"),
-      source_default.red(error instanceof Error ? error.message : "Unknown error")
-    );
-    process.exit(1);
+    handleCommandError(error, "Failed to list deployments");
   }
 }
 async function getDeploymentCommand(deploymentId) {
@@ -4335,11 +4381,7 @@ async function getDeploymentCommand(deploymentId) {
     }
     console.log();
   } catch (error) {
-    console.error(
-      source_default.red.bold("\n\u2717 Failed to get deployment:"),
-      source_default.red(error instanceof Error ? error.message : "Unknown error")
-    );
-    process.exit(1);
+    handleCommandError(error, "Failed to get deployment");
   }
 }
 async function restartDeploymentCommand(deploymentId, options) {
@@ -4410,11 +4452,7 @@ async function restartDeploymentCommand(deploymentId, options) {
     }
     console.log();
   } catch (error) {
-    console.error(
-      source_default.red.bold("\n\u2717 Failed to restart deployment:"),
-      source_default.red(error instanceof Error ? error.message : "Unknown error")
-    );
-    process.exit(1);
+    handleCommandError(error, "Failed to restart deployment");
   }
 }
 async function deleteDeploymentCommand(deploymentId, options) {
@@ -4457,11 +4495,7 @@ async function deleteDeploymentCommand(deploymentId, options) {
 `)
     );
   } catch (error) {
-    console.error(
-      source_default.red.bold("\n\u2717 Failed to delete deployment:"),
-      source_default.red(error instanceof Error ? error.message : "Unknown error")
-    );
-    process.exit(1);
+    handleCommandError(error, "Failed to delete deployment");
   }
 }
 async function logsCommand(deploymentId, options) {
@@ -4550,11 +4584,7 @@ async function logsCommand(deploymentId, options) {
     }
     console.log();
   } catch (error) {
-    console.error(
-      source_default.red.bold("\n\u2717 Failed to get logs:"),
-      source_default.red(error instanceof Error ? error.message : "Unknown error")
-    );
-    process.exit(1);
+    handleCommandError(error, "Failed to get logs");
   }
 }
 async function stopDeploymentCommand(deploymentId) {
@@ -4574,11 +4604,7 @@ async function stopDeploymentCommand(deploymentId) {
 \u2713 Deployment stopped
 `));
   } catch (error) {
-    console.error(
-      source_default.red.bold("\n\u2717 Failed to stop deployment:"),
-      source_default.red(error instanceof Error ? error.message : "Unknown error")
-    );
-    process.exit(1);
+    handleCommandError(error, "Failed to stop deployment");
   }
 }
 async function startDeploymentCommand(deploymentId) {
@@ -4598,11 +4624,7 @@ async function startDeploymentCommand(deploymentId) {
       )
     );
   } catch (error) {
-    console.error(
-      source_default.red.bold("\n\u2717 Failed to start deployment:"),
-      source_default.red(error instanceof Error ? error.message : "Unknown error")
-    );
-    process.exit(1);
+    handleCommandError(error, "Failed to start deployment");
   }
 }
 function createDeploymentsCommand() {
@@ -4671,87 +4693,103 @@ async function requireLogin() {
   }
 }
 async function listEnvCommand(options) {
-  await requireLogin();
-  const api = await McpUseAPI.create();
-  const vars = await api.listEnvVariables(options.server);
-  if (vars.length === 0) {
-    console.log(
-      source_default.yellow("\nNo environment variables set for this server.\n")
-    );
-    return;
-  }
-  console.log(source_default.cyan.bold(`
+  try {
+    await requireLogin();
+    const api = await McpUseAPI.create();
+    const vars = await api.listEnvVariables(options.server);
+    if (vars.length === 0) {
+      console.log(
+        source_default.yellow("\nNo environment variables set for this server.\n")
+      );
+      return;
+    }
+    console.log(source_default.cyan.bold(`
 Environment Variables (${vars.length})
 `));
-  for (const v of vars) {
-    printEnvVar(v, options.showValues);
-    console.log();
+    for (const v of vars) {
+      printEnvVar(v, options.showValues);
+      console.log();
+    }
+  } catch (error) {
+    handleCommandError(error, "Failed to list environment variables");
   }
 }
 async function addEnvCommand(assignment, options) {
-  await requireLogin();
-  const eqIdx = assignment.indexOf("=");
-  if (eqIdx === -1) {
-    console.error(
-      source_default.red(
-        "\u2717 Expected KEY=VALUE format, e.g. mcp-use servers env add API_KEY=abc123"
-      )
-    );
-    process.exit(1);
-  }
-  const key = assignment.substring(0, eqIdx).trim();
-  const value = assignment.substring(eqIdx + 1);
-  if (!key) {
-    console.error(source_default.red("\u2717 Key must not be empty."));
-    process.exit(1);
-  }
-  const environments = options.env ? parseEnvironments(options.env) : ALL_ENVS;
-  const api = await McpUseAPI.create();
-  const created = await api.createEnvVariable(options.server, {
-    key,
-    value,
-    environments,
-    sensitive: options.sensitive ?? false
-  });
-  console.log(
-    source_default.green(`
+  try {
+    await requireLogin();
+    const eqIdx = assignment.indexOf("=");
+    if (eqIdx === -1) {
+      console.error(
+        source_default.red(
+          "\u2717 Expected KEY=VALUE format, e.g. mcp-use servers env add API_KEY=abc123"
+        )
+      );
+      process.exit(1);
+    }
+    const key = assignment.substring(0, eqIdx).trim();
+    const value = assignment.substring(eqIdx + 1);
+    if (!key) {
+      console.error(source_default.red("\u2717 Key must not be empty."));
+      process.exit(1);
+    }
+    const environments = options.env ? parseEnvironments(options.env) : ALL_ENVS;
+    const api = await McpUseAPI.create();
+    const created = await api.createEnvVariable(options.server, {
+      key,
+      value,
+      environments,
+      sensitive: options.sensitive ?? false
+    });
+    console.log(
+      source_default.green(`
 \u2713 Environment variable "${created.key}" added.
 `)
-  );
-  printEnvVar(created, true);
-  console.log();
-}
-async function updateEnvCommand(varId, options) {
-  await requireLogin();
-  if (!options.value && !options.env && options.sensitive === void 0) {
-    console.error(
-      source_default.red(
-        "\u2717 Nothing to update. Provide at least one of --value, --env, --sensitive."
-      )
     );
-    process.exit(1);
+    printEnvVar(created, true);
+    console.log();
+  } catch (error) {
+    handleCommandError(error, "Failed to add environment variable");
   }
-  const body = {};
-  if (options.value !== void 0) body.value = options.value;
-  if (options.env) body.environments = parseEnvironments(options.env);
-  if (options.sensitive !== void 0) body.sensitive = options.sensitive;
-  const api = await McpUseAPI.create();
-  const updated = await api.updateEnvVariable(options.server, varId, body);
-  console.log(
-    source_default.green(`
+}
+async function updateEnvCommand(varId, options) {
+  try {
+    await requireLogin();
+    if (!options.value && !options.env && options.sensitive === void 0) {
+      console.error(
+        source_default.red(
+          "\u2717 Nothing to update. Provide at least one of --value, --env, --sensitive."
+        )
+      );
+      process.exit(1);
+    }
+    const body = {};
+    if (options.value !== void 0) body.value = options.value;
+    if (options.env) body.environments = parseEnvironments(options.env);
+    if (options.sensitive !== void 0) body.sensitive = options.sensitive;
+    const api = await McpUseAPI.create();
+    const updated = await api.updateEnvVariable(options.server, varId, body);
+    console.log(
+      source_default.green(`
 \u2713 Environment variable "${updated.key}" updated.
 `)
-  );
-  printEnvVar(updated, !!options.value);
-  console.log();
+    );
+    printEnvVar(updated, !!options.value);
+    console.log();
+  } catch (error) {
+    handleCommandError(error, "Failed to update environment variable");
+  }
 }
 async function removeEnvCommand(varId, options) {
-  await requireLogin();
-  const api = await McpUseAPI.create();
-  await api.deleteEnvVariable(options.server, varId);
-  console.log(source_default.green(`
+  try {
+    await requireLogin();
+    const api = await McpUseAPI.create();
+    await api.deleteEnvVariable(options.server, varId);
+    console.log(source_default.green(`
 \u2713 Environment variable ${varId} removed.
 `));
+  } catch (error) {
+    handleCommandError(error, "Failed to remove environment variable");
+  }
 }
 function createEnvCommand() {
   const envCommand = new Command3("env").description(
@@ -4881,11 +4919,7 @@ async function listServersCommand(options) {
     }
     console.log();
   } catch (error) {
-    console.error(
-      source_default.red.bold("\n\u2717 Failed to list servers:"),
-      source_default.red(error instanceof Error ? error.message : "Unknown error")
-    );
-    process.exit(1);
+    handleCommandError(error, "Failed to list servers");
   }
 }
 async function getServerCommand(idOrSlug, options) {
@@ -4985,11 +5019,7 @@ async function getServerCommand(idOrSlug, options) {
     }
     console.log();
   } catch (error) {
-    console.error(
-      source_default.red.bold("\n\u2717 Failed to get server:"),
-      source_default.red(error instanceof Error ? error.message : "Unknown error")
-    );
-    process.exit(1);
+    handleCommandError(error, "Failed to get server");
   }
 }
 async function deleteServerCommand(serverId, options) {
@@ -5042,11 +5072,7 @@ async function deleteServerCommand(serverId, options) {
       )
     );
   } catch (error) {
-    console.error(
-      source_default.red.bold("\n\u2717 Failed to delete server:"),
-      source_default.red(error instanceof Error ? error.message : "Unknown error")
-    );
-    process.exit(1);
+    handleCommandError(error, "Failed to delete server");
   }
 }
 function createServersCommand() {
@@ -5098,11 +5124,7 @@ async function orgListCommand() {
       );
     }
   } 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);
+    handleCommandError(error, "Failed to list organizations");
   }
 }
 async function orgSwitchCommand() {
@@ -5147,11 +5169,7 @@ async function orgSwitchCommand() {
       source_default.green.bold("\n\u2713 Switched to ") + source_default.cyan.bold(selected.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);
+    handleCommandError(error, "Failed to switch organization");
   }
 }
 async function orgCurrentCommand() {
@@ -5171,11 +5189,7 @@ async function orgCurrentCommand() {
       source_default.cyan.bold("\u{1F3E2} Active organization: ") + source_default.white(config.orgName || config.orgId) + 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);
+    handleCommandError(error, "Failed to get organization");
   }
 }