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

package/dist/index.js

@@ -2814,6 +2814,36 @@ async function gitCommand(command, cwd = process.cwd()) {
     return null;
   }
 }
+var GitCommandError = class extends Error {
+  command;
+  stderr;
+  stdout;
+  exitCode;
+  constructor(opts) {
+    const trimmed = opts.stderr.trim() || opts.stdout.trim() || "unknown error";
+    super(`git command failed: \`${opts.command}\`
+${trimmed}`);
+    this.name = "GitCommandError";
+    this.command = opts.command;
+    this.stderr = opts.stderr;
+    this.stdout = opts.stdout;
+    this.exitCode = opts.exitCode;
+  }
+};
+async function gitCommandOrThrow(command, cwd = process.cwd()) {
+  try {
+    const { stdout } = await execAsync(command, { cwd });
+    return stdout.trim();
+  } catch (error) {
+    const e = error;
+    throw new GitCommandError({
+      command,
+      stderr: (e.stderr ?? "").toString(),
+      stdout: (e.stdout ?? "").toString(),
+      exitCode: typeof e.code === "number" ? e.code : null
+    });
+  }
+}
 async function isGitRepo(cwd = process.cwd()) {
   const result = await gitCommand("git rev-parse --is-inside-work-tree", cwd);
   return result === "true";
@@ -2876,19 +2906,24 @@ async function getGitInfo(cwd = process.cwd()) {
     hasUncommittedChanges: uncommittedChanges
   };
 }
+function shellQuote(message) {
+  return `"${message.replace(/\\/g, "\\\\").replace(/"/g, '\\"')}"`;
+}
 async function gitInit(cwd, message = "Initial commit") {
-  await gitCommand("git init", cwd);
-  await gitCommand("git add .", cwd);
-  await gitCommand(`git commit -m "${message}"`, cwd);
+  await gitCommandOrThrow("git init", cwd);
+  await gitCommandOrThrow("git add .", cwd);
+  await gitCommandOrThrow(`git commit -m ${shellQuote(message)}`, cwd);
+  await gitCommandOrThrow("git branch -M main", cwd);
+  await gitCommandOrThrow("git rev-parse HEAD", cwd);
 }
 async function gitAddRemoteAndPush(cwd, cloneUrl, branch = "main") {
-  await gitCommand(`git remote add origin ${cloneUrl}`, cwd);
-  await gitCommand(`git push -u origin ${branch}`, cwd);
+  await gitCommandOrThrow(`git remote add origin ${cloneUrl}`, cwd);
+  await gitCommandOrThrow(`git push -u origin ${branch}`, cwd);
 }
 async function gitCommitAndPush(cwd, message, branch = "main") {
-  await gitCommand("git add .", cwd);
-  await gitCommand(`git commit -m "${message}"`, cwd);
-  await gitCommand(`git push origin ${branch}`, cwd);
+  await gitCommandOrThrow("git add .", cwd);
+  await gitCommandOrThrow(`git commit -m ${shellQuote(message)}`, cwd);
+  await gitCommandOrThrow(`git push origin ${branch}`, cwd);
 }
 function isGitHubUrl(url) {
   try {
@@ -3652,27 +3687,56 @@ async function deployCommand(options) {
         }
       }
       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."
-            )
+      try {
+        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,
+            repoResult.cloneUrl,
+            gitInfo.branch || "main"
           );
+        }
+      } catch (err) {
+        if (err instanceof GitCommandError) {
+          console.log(source_default.red(`
+\u2717 Git step failed: \`${err.command}\``));
+          const stderrTrimmed = (err.stderr || err.stdout).trim();
+          if (stderrTrimmed) {
+            console.log(source_default.gray(stderrTrimmed));
+          }
+          if (/tell me who you are|user\.email|user\.name/i.test(err.stderr)) {
+            console.log(
+              source_default.yellow(
+                `
+  Set your git identity for this project and retry:
+    git -C ${JSON.stringify(cwd)} config user.email "you@example.com"
+    git -C ${JSON.stringify(cwd)} config user.name  "Your Name"`
+              )
+            );
+          } else if (/non-fast-forward|rejected|unrelated histories/i.test(err.stderr)) {
+            console.log(
+              source_default.yellow(
+                "\n  The remote branch already has commits. Either delete the empty GitHub repo and retry, or reconcile manually:\n    git pull --rebase origin main --allow-unrelated-histories\n    git push -u origin main"
+              )
+            );
+          }
           process.exit(1);
         }
-        console.log(source_default.gray("Adding remote and pushing..."));
-        await gitAddRemoteAndPush(
-          cwd,
-          repoResult.cloneUrl,
-          gitInfo.branch || "main"
-        );
+        throw err;
       }
       console.log(source_default.green("\u2713 Code pushed to GitHub\n"));
       gitInfo = await getGitInfo(cwd);