@mcp-use/cli 3.0.1-canary.0 → 3.0.1-canary.2

package/dist/index.js

@@ -1194,6 +1194,14 @@ async function getAuthBaseUrl() {
 }
 
 // src/utils/api.ts
+var GitHubAuthRequiredError = class extends Error {
+  authorizeUrl;
+  constructor(message, authorizeUrl) {
+    super(message);
+    this.name = "GitHubAuthRequiredError";
+    this.authorizeUrl = authorizeUrl;
+  }
+};
 var McpUseAPI = class _McpUseAPI {
   baseUrl;
   apiKey;
@@ -1242,8 +1250,19 @@ var McpUseAPI = class _McpUseAPI {
         throw err;
       }
       if (!response.ok) {
-        const error = await response.text();
-        throw new Error(`API request failed: ${response.status} ${error}`);
+        const errorText = await response.text();
+        try {
+          const parsed = JSON.parse(errorText);
+          if (parsed.code === "GITHUB_AUTH_REQUIRED" && parsed.authorizeUrl) {
+            throw new GitHubAuthRequiredError(
+              parsed.error || "GitHub authorization required",
+              parsed.authorizeUrl
+            );
+          }
+        } catch (e) {
+          if (e instanceof GitHubAuthRequiredError) throw e;
+        }
+        throw new Error(`API request failed: ${response.status} ${errorText}`);
       }
       return response.json();
     } catch (error) {
@@ -1440,6 +1459,20 @@ var McpUseAPI = class _McpUseAPI {
       })
     });
   }
+  async getGitHubOAuthUrl() {
+    return this.request(
+      "/github/oauth/authorize"
+    );
+  }
+  async exchangeGitHubOAuthToken(code) {
+    return this.request(
+      "/github/oauth/token",
+      {
+        method: "POST",
+        body: JSON.stringify({ code })
+      }
+    );
+  }
 };
 
 // src/commands/auth.ts
@@ -3467,10 +3500,9 @@ async function deployCommand(options) {
       console.log(source_default.red("\u2717 No GitHub installations found."));
       process.exit(1);
     }
-    const defaultInstallation = installations.find((i) => i.account_type === "Organization") ?? installations[0];
-    const installationDbId = defaultInstallation.id;
-    const githubInstallationId = defaultInstallation.installation_id;
     console.log(source_default.green("\u2713 GitHub connected\n"));
+    let installationDbId;
+    let githubInstallationId;
     const projectDir = options.rootDir ? path5.resolve(cwd, options.rootDir) : cwd;
     if (options.rootDir) {
       try {
@@ -3554,43 +3586,8 @@ async function deployCommand(options) {
         }
       }
       const repoInstallation = installations[selectedIdx];
-      if (repoInstallation.account_type !== "Organization") {
-        console.log(
-          source_default.yellow(
-            "\n\u26A0\uFE0F  GitHub Apps cannot create repos on personal accounts.\n"
-          )
-        );
-        console.log(
-          source_default.white("To deploy from ") + source_default.cyan(repoInstallation.account_login) + source_default.white(", create a repository manually:\n")
-        );
-        console.log(
-          source_default.cyan("  1. ") + source_default.white("Go to ") + source_default.cyan("https://github.com/new")
-        );
-        console.log(
-          source_default.cyan("  2. ") + source_default.white("Create a repository (any name, can be private)")
-        );
-        console.log(source_default.cyan("  3. ") + source_default.white("Add it as a remote:"));
-        console.log(source_default.gray("     git init && git remote add origin <url>"));
-        console.log(source_default.cyan("  4. ") + source_default.white("Push your code:"));
-        console.log(
-          source_default.gray(
-            "     git add . && git commit -m 'Initial commit' && git push -u origin main"
-          )
-        );
-        console.log(
-          source_default.cyan("  5. ") + source_default.white("Grant the GitHub App access to the repo:")
-        );
-        const appName = await api.getGitHubAppName();
-        console.log(
-          source_default.gray(
-            `     https://github.com/apps/${appName}/installations/new`
-          )
-        );
-        console.log(
-          source_default.cyan("  6. ") + source_default.white("Run ") + source_default.cyan("mcp-use deploy") + source_default.white(" again\n")
-        );
-        process.exit(0);
-      }
+      installationDbId = repoInstallation.id;
+      githubInstallationId = repoInstallation.installation_id;
       const repoName = options.yes ? projectName2 : await promptText(source_default.gray("Repository name:"), projectName2);
       await ensureGitignore(cwd);
       console.log(
@@ -3598,19 +3595,78 @@ async function deployCommand(options) {
           `Creating repository on ${repoInstallation.account_login}...`
         )
       );
-      const repoResult = await api.createGitHubRepo({
-        installationId: repoInstallation.installation_id,
-        name: repoName,
-        private: true,
-        org: repoInstallation.account_login
-      });
+      let repoResult;
+      try {
+        repoResult = await api.createGitHubRepo({
+          installationId: repoInstallation.installation_id,
+          name: repoName,
+          private: true,
+          org: repoInstallation.account_login
+        });
+      } catch (err) {
+        if (err instanceof GitHubAuthRequiredError) {
+          console.log(
+            source_default.yellow(
+              `
+  Personal accounts require a one-time GitHub authorization.
+`
+            )
+          );
+          try {
+            await open_default(err.authorizeUrl);
+            console.log(
+              source_default.gray("  Browser opened. Authorize and return here.\n")
+            );
+          } catch {
+            console.log(
+              source_default.gray(
+                `  Open this URL in your browser:
+  ${err.authorizeUrl}
+`
+              )
+            );
+          }
+          const readline = await import("readline");
+          await new Promise((resolve2) => {
+            const rl = readline.createInterface({
+              input: process.stdin,
+              output: process.stdout
+            });
+            rl.question(
+              source_default.gray("  Press Enter after authorizing..."),
+              () => {
+                rl.close();
+                resolve2();
+              }
+            );
+          });
+          console.log(source_default.gray("Retrying repository creation..."));
+          repoResult = await api.createGitHubRepo({
+            installationId: repoInstallation.installation_id,
+            name: repoName,
+            private: true,
+            org: repoInstallation.account_login
+          });
+        } else {
+          throw err;
+        }
+      }
       console.log(source_default.green(`\u2713 Created ${source_default.cyan(repoResult.fullName)}`));
       if (!gitInfo.isGitRepo) {
+        await ensureGitignore(cwd);
         console.log(source_default.gray("Initializing git..."));
         await gitInit(cwd, "Initial commit");
         console.log(source_default.gray("Pushing to GitHub..."));
         await gitAddRemoteAndPush(cwd, repoResult.cloneUrl, "main");
       } else {
+        if (await hasUncommittedChanges(cwd)) {
+          console.log(
+            source_default.red(
+              "\u2717 You have uncommitted changes. Commit and push before deploying."
+            )
+          );
+          process.exit(1);
+        }
         console.log(source_default.gray("Adding remote and pushing..."));
         await gitAddRemoteAndPush(
           cwd,
@@ -3633,22 +3689,34 @@ async function deployCommand(options) {
     } else {
       repoFullName = `${gitInfo.owner}/${gitInfo.repo}`;
       branch = gitInfo.branch || "main";
+      const ownerLower = gitInfo.owner.toLowerCase();
+      const matchingInst = installations.find(
+        (i) => i.account_login.toLowerCase() === ownerLower
+      ) ?? installations.find((i) => i.account_type === "Organization") ?? installations[0];
+      installationDbId = matchingInst.id;
+      githubInstallationId = matchingInst.installation_id;
       if (gitInfo.hasUncommittedChanges) {
-        console.log(source_default.yellow("\u26A0\uFE0F  You have uncommitted changes.\n"));
-        if (!options.yes) {
-          const shouldCommit = await prompt(
-            source_default.white("Commit and push changes before deploying? (Y/n): "),
-            "y"
+        if (options.yes) {
+          console.log(
+            source_default.red(
+              "\u2717 You have uncommitted changes. Commit and push before deploying."
+            )
           );
-          if (shouldCommit) {
-            await ensureGitignore(cwd);
-            console.log(source_default.gray("Committing and pushing..."));
-            await gitCommitAndPush(cwd, "Deploy changes", branch);
-            gitInfo = await getGitInfo(cwd);
-            console.log(source_default.green("\u2713 Changes pushed\n"));
-          } else {
-            console.log(source_default.gray("Deploying from last pushed commit.\n"));
-          }
+          process.exit(1);
+        }
+        console.log(source_default.yellow("\u26A0\uFE0F  You have uncommitted changes.\n"));
+        const shouldCommit = await prompt(
+          source_default.white("Commit and push changes before deploying? (Y/n): "),
+          "y"
+        );
+        if (shouldCommit) {
+          await ensureGitignore(cwd);
+          console.log(source_default.gray("Committing and pushing..."));
+          await gitCommitAndPush(cwd, "Deploy changes", branch);
+          gitInfo = await getGitInfo(cwd);
+          console.log(source_default.green("\u2713 Changes pushed\n"));
+        } else {
+          console.log(source_default.gray("Deploying from last pushed commit.\n"));
         }
       }
       console.log(source_default.gray("Checking repository access..."));
@@ -3808,6 +3876,14 @@ async function deployCommand(options) {
     }
     if (!serverId) {
       const orgId = await api.resolveOrganizationId();
+      if (!installationDbId) {
+        console.log(
+          source_default.red(
+            "\u2717 Could not determine GitHub installation for this repository."
+          )
+        );
+        process.exit(1);
+      }
       console.log(source_default.gray("Creating server and deployment..."));
       const serverResult = await api.createServer({
         type: "github",