@mcp-use/cli 3.4.2 → 3.5.0-canary.0

package/dist/index.js

@@ -1451,6 +1451,15 @@ var McpUseAPI = class _McpUseAPI {
     const path12 = encodeURIComponent(idOrSlug);
     return this.request(`/servers/${path12}`);
   }
+  async updateServer(idOrSlug, body) {
+    return this.request(
+      `/servers/${encodeURIComponent(idOrSlug)}`,
+      {
+        method: "PATCH",
+        body: JSON.stringify(body)
+      }
+    );
+  }
   async deleteServer(id) {
     await this.request(
       `/servers/${encodeURIComponent(id)}`,
@@ -1460,9 +1469,10 @@ var McpUseAPI = class _McpUseAPI {
     );
   }
   // ── Env Variables ────────────────────────────────────────────────
-  async listEnvVariables(serverId) {
+  async listEnvVariables(serverId, opts) {
+    const q = opts?.branch ? `?branch=${encodeURIComponent(opts.branch)}` : "";
     return this.request(
-      `/servers/${encodeURIComponent(serverId)}/env-variables`
+      `/servers/${encodeURIComponent(serverId)}/env-variables${q}`
     );
   }
   async createEnvVariable(serverId, body) {
@@ -4882,10 +4892,13 @@ function parseEnvVar(envStr) {
   }
   return { key, value };
 }
-async function syncEnvVarsToServer(api, serverId, envVars) {
+async function syncEnvVarsToServer(api, serverId, envVars, opts) {
   const entries = Object.entries(envVars);
   if (entries.length === 0) return { created: 0, updated: 0 };
-  const existing = await api.listEnvVariables(serverId);
+  const existing = await api.listEnvVariables(
+    serverId,
+    opts?.branch ? { branch: opts.branch } : void 0
+  );
   const byKey = new Map(existing.map((v) => [v.key, v]));
   const results = await Promise.all(
     entries.map(async ([key, value]) => {
@@ -4894,7 +4907,12 @@ async function syncEnvVarsToServer(api, serverId, envVars) {
         await api.updateEnvVariable(serverId, found.id, { value });
         return "updated";
       }
-      await api.createEnvVariable(serverId, { key, value });
+      await api.createEnvVariable(serverId, {
+        key,
+        value,
+        ...opts?.branch ? { branch: opts.branch } : {},
+        ...opts?.environments ? { environments: opts.environments } : {}
+      });
       return "created";
     })
   );
@@ -5342,7 +5360,7 @@ async function deployViaManagedUpload(api, options, ctx) {
     console.log();
   }
   const envVars = await buildEnvVars(options);
-  const branch = "main";
+  const branch = options.branch || "main";
   const projectName = options.name || await getProjectName(projectDir);
   console.log(source_default.gray("Packaging project source..."));
   const tarball = await packProjectTarball(projectDir);
@@ -5373,7 +5391,12 @@ async function deployViaManagedUpload(api, options, ctx) {
   if (serverId) {
     console.log(source_default.gray("Uploading source and redeploying..."));
     if (Object.keys(envVars).length > 0) {
-      await syncEnvVarsToServer(api, serverId, envVars);
+      await syncEnvVarsToServer(
+        api,
+        serverId,
+        envVars,
+        options.branch ? { branch: options.branch } : void 0
+      );
     }
     await api.pushSourceToServer(serverId, {
       tarball,
@@ -5643,7 +5666,7 @@ async function deployCommand(options) {
     }
     let gitInfo = await getGitInfo(cwd);
     let repoFullName;
-    let branch = "main";
+    let branch = options.branch || "main";
     if (!gitInfo.isGitRepo || !gitInfo.remoteUrl) {
       const projectName2 = options.name || await getProjectName(projectDir);
       console.log(source_default.yellow("\u26A0\uFE0F  No GitHub remote found.\n"));
@@ -5820,7 +5843,7 @@ async function deployCommand(options) {
       console.log(source_default.green("\u2713 Code pushed to GitHub\n"));
       gitInfo = await getGitInfo(cwd);
       repoFullName = repoResult.fullName;
-      branch = gitInfo.branch || "main";
+      branch = options.branch || gitInfo.branch || "main";
     } else if (!isGitHubUrl(gitInfo.remoteUrl)) {
       console.log(source_default.red("\u2717 Remote is not a GitHub repository"));
       console.log(source_default.yellow(`   Current remote: ${gitInfo.remoteUrl}
@@ -5831,7 +5854,7 @@ async function deployCommand(options) {
       process.exit(1);
     } else {
       repoFullName = `${gitInfo.owner}/${gitInfo.repo}`;
-      branch = gitInfo.branch || "main";
+      branch = options.branch || gitInfo.branch || "main";
       const ownerLower = gitInfo.owner.toLowerCase();
       const matchingInst = installations.find(
         (i) => i.account_login.toLowerCase() === ownerLower
@@ -5979,7 +6002,12 @@ async function deployCommand(options) {
           console.log(source_default.cyan(`  URL: ${getMcpServerUrl(existingDep)}
 `));
           if (Object.keys(envVars).length > 0) {
-            const synced = await syncEnvVarsToServer(api, serverId, envVars);
+            const synced = await syncEnvVarsToServer(
+              api,
+              serverId,
+              envVars,
+              options.branch ? { branch: options.branch } : void 0
+            );
             console.log(
               source_default.green(
                 `\u2713 Synced ${synced.created + synced.updated} environment variable(s)` + (synced.created || synced.updated ? source_default.gray(
@@ -6027,7 +6055,12 @@ async function deployCommand(options) {
     let deploymentId;
     if (serverId) {
       if (Object.keys(envVars).length > 0) {
-        const synced = await syncEnvVarsToServer(api, serverId, envVars);
+        const synced = await syncEnvVarsToServer(
+          api,
+          serverId,
+          envVars,
+          options.branch ? { branch: options.branch } : void 0
+        );
         console.log(
           source_default.green(
             `\u2713 Synced ${synced.created + synced.updated} environment variable(s)` + (synced.created || synced.updated ? source_default.gray(
@@ -6369,8 +6402,10 @@ async function restartDeploymentCommand(deploymentId, options) {
 \u{1F504} Restarting deployment: ${deployment.name}
 `)
     );
+    const branch = options.branch ?? deployment.gitBranch ?? void 0;
     const newDep = await api.createDeployment({
       serverId: deployment.serverId,
+      ...branch ? { branch } : {},
       trigger: "redeploy"
     });
     console.log(source_default.green("\u2713 Restart initiated: ") + source_default.gray(newDep.id));
@@ -6594,7 +6629,10 @@ function createDeploymentsCommand() {
   );
   deploymentsCommand.command("list").alias("ls").description("List deployments").option("--limit <n>", "Page size (default 30)").option("--skip <n>", "Offset for pagination").option("--sort <field:asc|desc>", "Sort (e.g. createdAt:desc)").action(listDeploymentsCommand);
   deploymentsCommand.command("get").argument("<deployment-id>", "Deployment ID").description("Get deployment details").action(getDeploymentCommand);
-  deploymentsCommand.command("restart").argument("<deployment-id>", "Deployment ID").option("-f, --follow", "Follow build logs").description(
+  deploymentsCommand.command("restart").argument("<deployment-id>", "Deployment ID").option("-f, --follow", "Follow build logs").option(
+    "--branch <name>",
+    "Target branch for the redeploy (default: the deployment's branch)"
+  ).description(
     "Restart a deployment (triggers a new deployment on the same server)"
   ).action(restartDeploymentCommand);
   deploymentsCommand.command("delete").alias("rm").argument("<deployment-id>", "Deployment ID").option("-y, --yes", "Skip confirmation prompt").description("Delete a deployment").action(deleteDeploymentCommand);
@@ -6636,12 +6674,45 @@ function envBadge(env2) {
   if (env2 === "preview") return source_default.yellow("prev");
   return source_default.blue("dev");
 }
+var UUID_RE = /^[0-9a-f]{8}-[0-9a-f]{4}-[0-9a-f]{4}-[0-9a-f]{4}-[0-9a-f]{12}$/i;
+async function resolveVarId(api, server, keyOrId, branch) {
+  if (UUID_RE.test(keyOrId)) return keyOrId;
+  const vars = await api.listEnvVariables(
+    server,
+    branch ? { branch } : void 0
+  );
+  const matches = vars.filter((v) => v.key === keyOrId);
+  const scope = branch ? `branch "${branch}"` : "production";
+  if (matches.length === 0) {
+    console.error(
+      source_default.red(
+        `\u2717 No environment variable with key "${keyOrId}" in ${scope} scope.`
+      )
+    );
+    console.error(
+      source_default.gray(
+        branch ? "Check the key, or omit --branch to target production scope." : "Check the key, or pass --branch <name> if it lives on a branch."
+      )
+    );
+    process.exit(1);
+  }
+  if (matches.length > 1) {
+    console.error(
+      source_default.red(
+        `\u2717 Multiple variables match key "${keyOrId}" in ${scope} scope. Pass the variable id instead.`
+      )
+    );
+    process.exit(1);
+  }
+  return matches[0].id;
+}
 function printEnvVar(v, showValue = false) {
   const envs = v.environments.map(envBadge).join(" ");
   const val = v.sensitive ? source_default.gray("<sensitive>") : showValue ? source_default.cyan(v.value) : source_default.gray("(hidden \u2014 use --show-values to reveal)");
+  const branch = v.branch ? "  " + source_default.magenta(`branch:${v.branch}`) : "";
   console.log(`  ${source_default.white.bold(v.key.padEnd(32))} ${val}`);
   console.log(
-    `    ${source_default.gray("id:")} ${source_default.gray(v.id)}  ${envs}${v.sensitive ? "  " + source_default.yellow("\u{1F512} sensitive") : ""}`
+    `    ${source_default.gray("id:")} ${source_default.gray(v.id)}  ${envs}${branch}${v.sensitive ? "  " + source_default.yellow("\u{1F512} sensitive") : ""}`
   );
 }
 async function requireLogin() {
@@ -6657,16 +6728,26 @@ async function listEnvCommand(options) {
   try {
     await requireLogin();
     const api = await McpUseAPI.create();
-    const vars = await api.listEnvVariables(options.server);
+    const vars = await api.listEnvVariables(
+      options.server,
+      options.branch ? { branch: options.branch } : void 0
+    );
+    const scope = options.branch ? `branch "${options.branch}"` : "production";
     if (vars.length === 0) {
       console.log(
-        source_default.yellow("\nNo environment variables set for this server.\n")
+        source_default.yellow(
+          `
+No environment variables set for this server (${scope} scope).
+`
+        )
       );
       return;
     }
-    console.log(source_default.cyan.bold(`
-Environment Variables (${vars.length})
-`));
+    console.log(
+      source_default.cyan.bold(`
+Environment Variables \u2014 ${scope} (${vars.length})
+`)
+    );
     for (const v of vars) {
       printEnvVar(v, options.showValues);
       console.log();
@@ -6699,6 +6780,7 @@ async function addEnvCommand(assignment, options) {
       key,
       value,
       environments,
+      ...options.branch ? { branch: options.branch } : {},
       sensitive: options.sensitive ?? false
     });
     console.log(
@@ -6712,7 +6794,7 @@ async function addEnvCommand(assignment, options) {
     handleCommandError(error, "Failed to add environment variable");
   }
 }
-async function updateEnvCommand(varId, options) {
+async function updateEnvCommand(keyOrId, options) {
   try {
     await requireLogin();
     if (!options.value && !options.env && options.sensitive === void 0) {
@@ -6728,6 +6810,12 @@ async function updateEnvCommand(varId, options) {
     if (options.env) body.environments = parseEnvironments(options.env);
     if (options.sensitive !== void 0) body.sensitive = options.sensitive;
     const api = await McpUseAPI.create();
+    const varId = await resolveVarId(
+      api,
+      options.server,
+      keyOrId,
+      options.branch
+    );
     const updated = await api.updateEnvVariable(options.server, varId, body);
     console.log(
       source_default.green(`
@@ -6740,13 +6828,19 @@ async function updateEnvCommand(varId, options) {
     handleCommandError(error, "Failed to update environment variable");
   }
 }
-async function removeEnvCommand(varId, options) {
+async function removeEnvCommand(keyOrId, options) {
   try {
     await requireLogin();
     const api = await McpUseAPI.create();
+    const varId = await resolveVarId(
+      api,
+      options.server,
+      keyOrId,
+      options.branch
+    );
     await api.deleteEnvVariable(options.server, varId);
     console.log(source_default.green(`
-\u2713 Environment variable ${varId} removed.
+\u2713 Environment variable ${keyOrId} removed.
 `));
   } catch (error) {
     handleCommandError(error, "Failed to remove environment variable");
@@ -6754,19 +6848,31 @@ async function removeEnvCommand(varId, options) {
 }
 function createEnvCommand() {
   const envCommand = new Command4("env").description("Manage environment variables for a server").showHelpAfterError("(Run `mcp-use env --help` to see available commands)");
-  envCommand.command("list").alias("ls").description("List environment variables for a server").requiredOption("--server <id>", "Server UUID").option("--show-values", "Reveal non-sensitive values in output").action(listEnvCommand);
+  envCommand.command("list").alias("ls").description("List environment variables for a server").requiredOption("--server <id>", "Server UUID").option(
+    "--branch <name>",
+    "Scope to a branch's preview env (omit for production)"
+  ).option("--show-values", "Reveal non-sensitive values in output").action(listEnvCommand);
   envCommand.command("add").argument("<KEY=VALUE>", "Variable assignment, e.g. API_KEY=abc123").description("Add an environment variable to a server").requiredOption("--server <id>", "Server UUID").option(
     "--env <environments>",
     "Comma-separated environments: production,preview,development (default: all)"
+  ).option(
+    "--branch <name>",
+    "Pin the variable to a branch's preview env (omit for production)"
   ).option(
     "--sensitive",
     "Mark the variable as sensitive (value masked in UI)"
   ).action(addEnvCommand);
-  envCommand.command("update").argument("<var-id>", "Environment variable UUID").description("Update an existing environment variable").requiredOption("--server <id>", "Server UUID").option("--value <value>", "New value").option(
+  envCommand.command("update").argument("<key-or-id>", "Environment variable KEY or UUID").description("Update an existing environment variable").requiredOption("--server <id>", "Server UUID").option("--value <value>", "New value").option(
     "--env <environments>",
     "New environments (comma-separated: production,preview,development)"
+  ).option(
+    "--branch <name>",
+    "Branch scope used to resolve a KEY (omit for production)"
   ).option("--sensitive", "Mark as sensitive").option("--no-sensitive", "Unmark as sensitive").action(updateEnvCommand);
-  envCommand.command("remove").alias("rm").argument("<var-id>", "Environment variable UUID").description("Remove an environment variable from a server").requiredOption("--server <id>", "Server UUID").action(removeEnvCommand);
+  envCommand.command("remove").alias("rm").argument("<key-or-id>", "Environment variable KEY or UUID").description("Remove an environment variable from a server").requiredOption("--server <id>", "Server UUID").option(
+    "--branch <name>",
+    "Branch scope used to resolve a KEY (omit for production)"
+  ).action(removeEnvCommand);
   return envCommand;
 }
 
@@ -7014,6 +7120,55 @@ async function getServerCommand(idOrSlug, options) {
     handleCommandError(error, "Failed to get server");
   }
 }
+async function updateServerCommand(idOrSlug, options) {
+  try {
+    if (!await isLoggedIn()) {
+      console.log(source_default.red("\u2717 You are not logged in."));
+      console.log(
+        source_default.gray(
+          "Run " + source_default.white("npx mcp-use login") + " to get started."
+        )
+      );
+      process.exit(1);
+    }
+    const body = {};
+    if (options.name !== void 0) body.name = options.name;
+    if (options.description !== void 0)
+      body.description = options.description;
+    if (options.branch !== void 0) body.productionBranch = options.branch;
+    const config = {};
+    if (options.buildCommand !== void 0) {
+      config.buildCommand = options.buildCommand === "" ? null : options.buildCommand;
+    }
+    if (options.startCommand !== void 0) {
+      config.startCommand = options.startCommand === "" ? null : options.startCommand;
+    }
+    if (Object.keys(config).length > 0) body.config = config;
+    if (Object.keys(body).length === 0) {
+      console.error(
+        source_default.red(
+          "\u2717 Nothing to update. Provide at least one of: --branch, --name, --build-command, --start-command, --description."
+        )
+      );
+      process.exit(1);
+    }
+    const api = await McpUseAPI.create();
+    await applyOrgOption(api, options.org);
+    if (options.org) console.log();
+    const server = await api.updateServer(idOrSlug, body);
+    const label = server.name || server.slug || server.id;
+    console.log(source_default.green.bold(`
+\u2713 Server updated: ${label}`));
+    if (server.connectedRepository) {
+      console.log(
+        source_default.gray("  Prod branch: ") + source_default.cyan(server.connectedRepository.productionBranch)
+      );
+    }
+    console.log();
+  } catch (error) {
+    handleCommandError(error, "Failed to update server");
+  }
+}
 async function deleteServerCommand(serverId, options) {
   try {
     if (!await isLoggedIn()) {
@@ -7073,6 +7228,16 @@ function createServersCommand() {
   );
   serversCommand.command("list").alias("ls").description("List servers for the current organization").option("--org <slug-or-id>", "Target organization (slug, id, or name)").option("--limit <n>", "Page size (default 30)").option("--skip <n>", "Offset for pagination").option("--sort <field:asc|desc>", "Sort (e.g. updatedAt:desc)").action(listServersCommand);
   serversCommand.command("get").argument("<id-or-slug>", "Server UUID or slug").option("--org <slug-or-id>", "Resolve org context before fetch").description("Show server details and recent deployments").action(getServerCommand);
+  serversCommand.command("update").argument("<id-or-slug>", "Server UUID or slug").description("Update server configuration (branch, name, commands, \u2026)").option(
+    "--branch <name>",
+    "New production branch \u2014 controls which branch triggers production deploys"
+  ).option("--name <name>", "Rename the server").option(
+    "--build-command <cmd>",
+    "Override the build command (pass an empty string to clear)"
+  ).option(
+    "--start-command <cmd>",
+    "Override the start command (pass an empty string to clear)"
+  ).option("--description <text>", "Update the server description").option("--org <slug-or-id>", "Target organization").action(updateServerCommand);
   serversCommand.command("delete").alias("rm").argument("<server-id>", "Server UUID (or slug if API accepts it)").option("-y, --yes", "Skip confirmation prompt").option("--org <slug-or-id>", "Target organization").description("Delete a server and all its deployments").action(deleteServerCommand);
   serversCommand.addCommand(createEnvCommand());
   return serversCommand;
@@ -9677,8 +9842,11 @@ program.command("deploy").description("Deploy MCP server from GitHub to Manufact
   "Force creation of new deployment instead of reusing linked deployment"
 ).option(
   "--env <key=value...>",
-  "Environment variables (can be used multiple times)"
+  "Environment variable values as KEY=VALUE (repeatable). Note: this sets values, unlike `servers env --env` which selects environment tags."
 ).option("--env-file <path>", "Path to .env file with environment variables").option(
+  "--branch <name>",
+  "Deploy branch (default: current git branch). Also scopes --env/--env-file sync to that branch's preview env."
+).option(
   "--root-dir <path>",
   "Root directory within repo to deploy from (for monorepos)"
 ).option(
@@ -9702,6 +9870,7 @@ program.command("deploy").description("Deploy MCP server from GitHub to Manufact
     new: options.new,
     env: options.env,
     envFile: options.envFile,
+    branch: options.branch,
     rootDir: options.rootDir,
     org: options.org,
     yes: options.yes,