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

package/dist/index.js

@@ -3394,7 +3394,7 @@ function getMcpServerUrl(deployment) {
     return `https://${deployment.domain}/mcp`;
   }
 }
-async function displayDeploymentProgress(api, deployment) {
+async function displayDeploymentProgress(api, deployment, progressOptions) {
   const frames = ["\u280B", "\u2819", "\u2839", "\u2838", "\u283C", "\u2834", "\u2826", "\u2827", "\u2807", "\u280F"];
   let frameIndex = 0;
   let spinnerInterval = null;
@@ -3516,11 +3516,20 @@ async function displayDeploymentProgress(api, deployment) {
         console.log(source_default.red("Error: ") + finalDeployment.error);
         if (finalDeployment.error.includes("No GitHub installations found")) {
           console.log();
-          const retry = await promptGitHubInstallation(api, "not_connected");
+          const retry = await promptGitHubInstallation(
+            api,
+            "not_connected",
+            void 0,
+            { yes: progressOptions?.yes }
+          );
           if (retry) {
             console.log(source_default.cyan("\n\u{1F504} Retrying deployment...\n"));
             const newDeployment = await api.redeployDeployment(deployment.id);
-            await displayDeploymentProgress(api, newDeployment);
+            await displayDeploymentProgress(
+              api,
+              newDeployment,
+              progressOptions
+            );
             return;
           }
         } else if (finalDeployment.error.includes("Authenticated git clone failed")) {
@@ -3537,12 +3546,17 @@ async function displayDeploymentProgress(api, deployment) {
           const retry = await promptGitHubInstallation(
             api,
             "no_access",
-            repoName
+            repoName,
+            { yes: progressOptions?.yes }
           );
           if (retry) {
             console.log(source_default.cyan("\n\u{1F504} Retrying deployment...\n"));
             const newDeployment = await api.redeployDeployment(deployment.id);
-            await displayDeploymentProgress(api, newDeployment);
+            await displayDeploymentProgress(
+              api,
+              newDeployment,
+              progressOptions
+            );
             return;
           }
         }
@@ -3593,7 +3607,52 @@ async function checkRepoAccess(api, owner, repo) {
     return false;
   }
 }
-async function promptGitHubInstallation(api, reason, repoName) {
+var GITHUB_SETUP_POLL_INTERVAL_MS = 2e3;
+var GITHUB_SETUP_POLL_MAX_MS = 12e4;
+async function waitForGitHubSetupAfterBrowser(api, repoName, yes) {
+  if (!yes) {
+    console.log(source_default.gray("Waiting for GitHub configuration..."));
+    await prompt(
+      source_default.white("Press Enter when you've completed the GitHub setup..."),
+      "y"
+    );
+    return;
+  }
+  console.log(
+    source_default.gray(
+      "Waiting for GitHub configuration (polling every 2s, up to 2 min)..."
+    )
+  );
+  const deadline = Date.now() + GITHUB_SETUP_POLL_MAX_MS;
+  while (Date.now() < deadline) {
+    try {
+      const status = await api.getGitHubConnectionStatus();
+      if (!status.is_connected) {
+        await new Promise((r) => setTimeout(r, GITHUB_SETUP_POLL_INTERVAL_MS));
+        continue;
+      }
+      if (repoName) {
+        const parts = repoName.split("/");
+        const owner = parts[0];
+        const repo = parts[1];
+        if (owner && repo && await checkRepoAccess(api, owner, repo)) {
+          return;
+        }
+      } else {
+        return;
+      }
+    } catch {
+    }
+    await new Promise((r) => setTimeout(r, GITHUB_SETUP_POLL_INTERVAL_MS));
+  }
+  console.log(
+    source_default.yellow(
+      "\u26A0\uFE0F  Timed out waiting for GitHub setup. Continuing with verification..."
+    )
+  );
+}
+async function promptGitHubInstallation(api, reason, repoName, opts) {
+  const yes = !!opts?.yes;
   console.log();
   if (reason === "not_connected") {
     console.log(source_default.yellow("\u26A0\uFE0F  GitHub account not connected"));
@@ -3611,7 +3670,7 @@ async function promptGitHubInstallation(api, reason, repoName) {
       )
     );
   }
-  const shouldInstall = await prompt(
+  const shouldInstall = yes ? true : await prompt(
     source_default.white(
       `Would you like to ${reason === "not_connected" ? "connect" : "configure"} GitHub now? (Y/n): `
     ),
@@ -3658,11 +3717,7 @@ Opening browser to ${reason === "not_connected" ? "install" : "configure"} GitHu
       console.log();
     }
     await open_default(installUrl);
-    console.log(source_default.gray("Waiting for GitHub configuration..."));
-    await prompt(
-      source_default.white("Press Enter when you've completed the GitHub setup..."),
-      "y"
-    );
+    await waitForGitHubSetupAfterBrowser(api, repoName, yes);
     console.log(source_default.gray("Verifying GitHub connection..."));
     let verified = false;
     try {
@@ -3719,6 +3774,14 @@ async function deployCommand(options) {
     const cwd = process.cwd();
     if (!await isLoggedIn()) {
       console.log(source_default.red("\u2717 You are not logged in."));
+      if (options.yes) {
+        console.log(
+          source_default.gray(
+            "Run " + source_default.white("npx mcp-use login") + " first. Non-interactive deploy requires an existing session."
+          )
+        );
+        process.exit(1);
+      }
       const shouldLogin = await prompt(
         source_default.white("Would you like to login now? (Y/n): "),
         "y"
@@ -3770,12 +3833,14 @@ async function deployCommand(options) {
           "\u26A0\uFE0F  This doesn't appear to be an MCP server project (no mcp-use or @modelcontextprotocol/sdk dependency found)."
         )
       );
-      const shouldContinue = await prompt(
-        source_default.white("Continue anyway? (y/n): ")
-      );
-      if (!shouldContinue) {
-        console.log(source_default.gray("Deployment cancelled."));
-        process.exit(0);
+      if (!options.yes) {
+        const shouldContinue = await prompt(
+          source_default.white("Continue anyway? (y/n): ")
+        );
+        if (!shouldContinue) {
+          console.log(source_default.gray("Deployment cancelled."));
+          process.exit(0);
+        }
       }
       console.log();
     }
@@ -3819,12 +3884,14 @@ async function deployCommand(options) {
           "Local changes will not be included until you commit and push.\n"
         )
       );
-      const shouldContinue = await prompt(
-        source_default.white("Continue with deployment from GitHub? (y/n): ")
-      );
-      if (!shouldContinue) {
-        console.log(source_default.gray("Deployment cancelled."));
-        process.exit(0);
+      if (!options.yes) {
+        const shouldContinue = await prompt(
+          source_default.white("Continue with deployment from GitHub? (y/n): ")
+        );
+        if (!shouldContinue) {
+          console.log(source_default.gray("Deployment cancelled."));
+          process.exit(0);
+        }
       }
       console.log();
     }
@@ -3846,15 +3913,17 @@ async function deployCommand(options) {
       );
     }
     console.log();
-    const shouldDeploy = await prompt(
-      source_default.white(
-        `Deploy from GitHub repository ${gitInfo.owner}/${gitInfo.repo}? (Y/n): `
-      ),
-      "y"
-    );
-    if (!shouldDeploy) {
-      console.log(source_default.gray("Deployment cancelled."));
-      process.exit(0);
+    if (!options.yes) {
+      const shouldDeploy = await prompt(
+        source_default.white(
+          `Deploy from GitHub repository ${gitInfo.owner}/${gitInfo.repo}? (Y/n): `
+        ),
+        "y"
+      );
+      if (!shouldDeploy) {
+        console.log(source_default.gray("Deployment cancelled."));
+        process.exit(0);
+      }
     }
     const projectName = options.name || await getProjectName(projectDir);
     const runtime = options.runtime || await detectRuntime(projectDir);
@@ -3925,7 +3994,8 @@ async function deployCommand(options) {
         const installed = await promptGitHubInstallation(
           api,
           "not_connected",
-          repoFullName
+          repoFullName,
+          { yes: options.yes }
         );
         if (!installed) {
           console.log(source_default.gray("Deployment cancelled."));
@@ -3960,7 +4030,8 @@ async function deployCommand(options) {
           const configured = await promptGitHubInstallation(
             api,
             "no_access",
-            repoFullName
+            repoFullName,
+            { yes: options.yes }
           );
           if (!configured) {
             console.log(source_default.gray("Deployment cancelled."));
@@ -4048,7 +4119,9 @@ async function deployCommand(options) {
             ...existingLink,
             linkedAt: (/* @__PURE__ */ new Date()).toISOString()
           });
-          await displayDeploymentProgress(api, deployment2);
+          await displayDeploymentProgress(api, deployment2, {
+            yes: options.yes
+          });
           if (options.open && deployment2.domain) {
             console.log();
             console.log(source_default.gray("Opening deployment in browser..."));
@@ -4121,7 +4194,7 @@ async function deployCommand(options) {
     );
     console.log(source_default.gray(`  Future deploys will reuse the same URL
 `));
-    await displayDeploymentProgress(api, deployment);
+    await displayDeploymentProgress(api, deployment, { yes: options.yes });
     if (options.open && deployment.domain) {
       console.log();
       console.log(source_default.gray("Opening deployment in browser..."));
@@ -6854,7 +6927,7 @@ program.command("deploy").description("Deploy MCP server from GitHub to Manufact
 ).option(
   "--org <slug-or-id>",
   "Deploy to a specific organization (by slug or ID)"
-).action(async (options) => {
+).option("-y, --yes", "Skip confirmation prompts").action(async (options) => {
   await deployCommand({
     open: options.open,
     name: options.name,
@@ -6864,7 +6937,8 @@ program.command("deploy").description("Deploy MCP server from GitHub to Manufact
     env: options.env,
     envFile: options.envFile,
     rootDir: options.rootDir,
-    org: options.org
+    org: options.org,
+    yes: options.yes
   });
 });
 program.addCommand(createClientCommand());