@andrebuzeli/git-mcp 15.8.3 → 15.8.4

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@andrebuzeli/git-mcp",
-  "version": "15.8.3",
+  "version": "15.8.4",
   "private": false,
   "description": "MCP server para Git com operações locais e sincronização paralela GitHub/Gitea",
   "license": "MIT",

package/src/providers/providerManager.js

@@ -11,6 +11,8 @@ export class ProviderManager {
     this.github = this.githubToken ? new Octokit({ auth: this.githubToken }) : null;
     this._githubOwner = "";
     this._giteaOwner = "";
+    this._githubEmail = "";
+    this._giteaEmail = "";
     this._ownerFetchedAt = 0;
     this._remoteUrlsCache = new Map(); // Cache para URLs de remotes
     this._cacheExpiry = 10 * 60 * 1000; // 10 minutos
@@ -23,6 +25,7 @@ export class ProviderManager {
     try {
       const me = await this.github.rest.users.getAuthenticated();
       this._githubOwner = me.data.login || "";
+      this._githubEmail = me.data.email || ""; // Capture email
       this._ownerFetchedAt = now;
       return this._githubOwner;
     } catch {
@@ -30,6 +33,11 @@ export class ProviderManager {
     }
   }
 
+  async getGitHubEmail() {
+    if (!this._githubEmail) await this.getGitHubOwner();
+    return this._githubEmail;
+  }
+
   async getGiteaOwner() {
     if (!this.giteaUrl || !this.giteaToken) return "";
     const now = Date.now();
@@ -41,6 +49,7 @@ export class ProviderManager {
       });
       const d = r.data || {};
       this._giteaOwner = d.login || d.username || "";
+      this._giteaEmail = d.email || ""; // Capture email
       this._ownerFetchedAt = now;
       return this._giteaOwner;
     } catch {
@@ -48,6 +57,11 @@ export class ProviderManager {
     }
   }
 
+  async getGiteaEmail() {
+    if (!this._giteaEmail) await this.getGiteaOwner();
+    return this._giteaEmail;
+  }
+
   async getRemoteUrls(repoName) {
     const cacheKey = `urls_${repoName}`;
     const now = Date.now();
@@ -156,16 +170,16 @@ export class ProviderManager {
         let page = 1;
         let hasMore = true;
         while (hasMore && page <= maxPages) {
-          const { data } = await this.github.rest.repos.listForAuthenticatedUser({ 
-            per_page: perPage, 
+          const { data } = await this.github.rest.repos.listForAuthenticatedUser({
+            per_page: perPage,
             page,
-            visibility: "all" 
+            visibility: "all"
           });
-          results.github.push(...data.map(r => ({ 
-            name: r.name, 
-            fullName: r.full_name, 
-            url: r.html_url, 
-            isPrivate: r.private 
+          results.github.push(...data.map(r => ({
+            name: r.name,
+            fullName: r.full_name,
+            url: r.html_url,
+            isPrivate: r.private
           })));
           hasMore = data.length === perPage;
           page++;
@@ -185,11 +199,11 @@ export class ProviderManager {
           const { data } = await axios.get(`${base}/api/v1/user/repos?limit=${perPage}&page=${page}`, {
             headers: { Authorization: `token ${this.giteaToken}` }
           });
-          results.gitea.push(...data.map(r => ({ 
-            name: r.name, 
-            fullName: r.full_name, 
-            url: r.html_url, 
-            isPrivate: r.private 
+          results.gitea.push(...data.map(r => ({
+            name: r.name,
+            fullName: r.full_name,
+            url: r.html_url,
+            isPrivate: r.private
           })));
           hasMore = data.length === perPage;
           page++;

package/src/utils/gitAdapter.js

@@ -61,14 +61,19 @@ export class GitAdapter {
         return new Promise((resolve, reject) => {
             const cp = spawn(cmd, args, {
                 cwd: dir,
-                env: { ...this.gitEnv, ...env },
+                env: {
+                    ...this.gitEnv,
+                    ...env,
+                    GIT_TERMINAL_PROMPT: "0", // Prevent interactive prompts (fixes "No such device or address")
+                    GCM_INTERACTIVE: "never"  // Disable Credential Manager prompts
+                },
                 stdio: 'pipe'
             });
 
             let stdout = [];
             let stderr = [];
             let killed = false;
-            
+
             // Timeout handler
             const timeoutId = setTimeout(() => {
                 killed = true;
@@ -87,7 +92,7 @@ export class GitAdapter {
             cp.on("close", code => {
                 clearTimeout(timeoutId);
                 if (killed) return; // Already rejected by timeout
-                
+
                 const outStr = Buffer.concat(stdout).toString("utf8").trim();
                 const errStr = Buffer.concat(stderr).toString("utf8").trim();
 
@@ -109,7 +114,7 @@ export class GitAdapter {
             return output;
         } catch (e) {
             const msg = e.message || "";
-            
+
             // Auto-fix 1: dubious ownership error (common on network shares)
             if (msg.includes("dubious ownership") && !options._retried) {
                 console.error("[GitAdapter] Auto-fix: dubious ownership, adding safe.directory...");
@@ -120,7 +125,7 @@ export class GitAdapter {
                     console.error("[GitAdapter] Failed to configure safe.directory:", configError.message);
                 }
             }
-            
+
             // Auto-fix 2: Lock file presente (outro processo git pode ter crashado)
             if ((msg.includes(".git/index.lock") || msg.includes("Unable to create") && msg.includes("lock")) && !options._lockRetried) {
                 const lockPath = path.join(dir, ".git", "index.lock");
@@ -134,7 +139,7 @@ export class GitAdapter {
                     }
                 }
             }
-            
+
             // Auto-fix 3: CRLF warnings (just retry with autocrlf config)
             if (msg.includes("CRLF will be replaced") && !options._crlfRetried) {
                 console.error("[GitAdapter] Auto-fix: configuring core.autocrlf...");
@@ -147,7 +152,7 @@ export class GitAdapter {
             }
 
             if (options.ignoreErrors) return "";
-            
+
             // Enhance error message with context
             const cmdStr = `git ${args.join(" ")}`;
             const enhancedError = new Error(`Command failed: ${cmdStr}\n${msg}`);
@@ -182,12 +187,12 @@ export class GitAdapter {
      */
     async checkIntegrity(dir) {
         await this._ensureGitRepo(dir);
-        
+
         try {
             // Verificação rápida de objetos
             const output = await this._exec(dir, ["fsck", "--connectivity-only"], { ignoreErrors: true });
             const hasErrors = output.includes("error") || output.includes("missing") || output.includes("broken");
-            
+
             return {
                 ok: !hasErrors,
                 output: output || "Repository integrity OK",
@@ -211,7 +216,7 @@ export class GitAdapter {
         if (!url || typeof url !== "string") {
             return { valid: false, error: "URL vazia ou inválida" };
         }
-        
+
         // Padrões válidos de URL git
         const patterns = [
             /^https?:\/\/[^\s]+\.git$/i,          // https://github.com/user/repo.git
@@ -220,9 +225,9 @@ export class GitAdapter {
             /^git:\/\/[^\s]+\.git$/i,             // git://github.com/user/repo.git
             /^ssh:\/\/[^\s]+\.git$/i,             // ssh://git@github.com/user/repo.git
         ];
-        
+
         const isValid = patterns.some(p => p.test(url));
-        
+
         if (!isValid) {
             return {
                 valid: false,
@@ -230,7 +235,7 @@ export class GitAdapter {
                 suggestion: "Use: https://github.com/user/repo.git ou git@github.com:user/repo.git"
             };
         }
-        
+
         return { valid: true, url };
     }
 
@@ -291,18 +296,18 @@ export class GitAdapter {
 
         const currentBranch = await this.getCurrentBranch(dir);
         return {
-            modified, 
-            created, 
-            deleted, 
-            renamed: [], 
+            modified,
+            created,
+            deleted,
+            renamed: [],
             notAdded,
             // Aliases para compatibilidade
             not_added: notAdded,
-            staged, 
+            staged,
             conflicted: [],
             currentBranch,
             current: currentBranch, // Alias para compatibilidade
-            isClean: lines.length === 0, 
+            isClean: lines.length === 0,
             files
         };
     }
@@ -330,8 +335,21 @@ export class GitAdapter {
         // Fallback logic
         const ownerGH = await this.pm.getGitHubOwner().catch(() => null);
         const ownerGE = await this.pm.getGiteaOwner().catch(() => null);
+
+        let email = "";
+
+        // Try to fetch real email
+        const emailGH = await this.pm.getGitHubEmail().catch(() => null);
+        const emailGE = await this.pm.getGiteaEmail().catch(() => null);
+
+        if (emailGE) email = emailGE;
+        else if (emailGH) email = emailGH;
+
         const who = ownerGH || ownerGE || "Git User";
-        const email = `${who}@users.noreply`;
+
+        if (!email) {
+            email = `${who}@users.noreply`;
+        }
 
         await this.setConfig(dir, "user.name", who);
         await this.setConfig(dir, "user.email", email);
@@ -340,6 +358,7 @@ export class GitAdapter {
     }
 
     async commit(dir, message) {
+        // Ensure author is set
         await this.getAuthor(dir);
         await this._exec(dir, ["commit", "-m", message]);
         return await this._exec(dir, ["rev-parse", "HEAD"]);
@@ -413,19 +432,19 @@ export class GitAdapter {
         } catch (e) {
             const msg = e.message || "";
             const msgLower = msg.toLowerCase();
-            
+
             // Auto-correção: Se branch não existe no remote, tenta com -u (set-upstream)
-            const branchNotExists = msgLower.includes("has no upstream branch") || 
-                                   msgLower.includes("no upstream branch") ||
-                                   (msgLower.includes("remote branch") && msgLower.includes("does not exist")) ||
-                                   msgLower.includes("ref_not_found") ||
-                                   (msgLower.includes("fatal") && msgLower.includes("current branch") && msgLower.includes("has no upstream"));
-            
+            const branchNotExists = msgLower.includes("has no upstream branch") ||
+                msgLower.includes("no upstream branch") ||
+                (msgLower.includes("remote branch") && msgLower.includes("does not exist")) ||
+                msgLower.includes("ref_not_found") ||
+                (msgLower.includes("fatal") && msgLower.includes("current branch") && msgLower.includes("has no upstream"));
+
             if (branchNotExists && !setUpstream && !force) {
                 console.error(`[GitAdapter] Auto-fix: branch '${branch}' não existe no remote '${remote}', tentando com --set-upstream (-u)...`);
                 return await this.pushOne(dir, remote, branch, force, true);
             }
-            
+
             if (msg.includes("rejected") || msgLower.includes("non-fast-forward")) {
                 throw createError("PUSH_REJECTED", { message: msg, remote, branch });
             }
@@ -450,22 +469,22 @@ export class GitAdapter {
             } catch (error) {
                 const errorMsg = error.message || String(error);
                 const errorMsgLower = errorMsg.toLowerCase();
-                
+
                 // Auto-correção 1: Se repositório não existe, cria automaticamente
-                const repoNotFound = errorMsgLower.includes("repository not found") || 
-                                    errorMsgLower.includes("repo not found") ||
-                                    (errorMsgLower.includes("fatal") && errorMsgLower.includes("repository") && errorMsgLower.includes("not found")) ||
-                                    (errorMsgLower.includes("not found") && (errorMsgLower.includes("remote") || errorMsgLower.includes("404")));
-                
+                const repoNotFound = errorMsgLower.includes("repository not found") ||
+                    errorMsgLower.includes("repo not found") ||
+                    (errorMsgLower.includes("fatal") && errorMsgLower.includes("repository") && errorMsgLower.includes("not found")) ||
+                    (errorMsgLower.includes("not found") && (errorMsgLower.includes("remote") || errorMsgLower.includes("404")));
+
                 if (repoNotFound && !force) {
                     try {
                         console.error(`[GitAdapter] Auto-fix: repositório não existe no remote '${remote}', criando automaticamente...`);
                         const repoName = getRepoNameFromPath(dir);
                         const ensured = await this.pm.ensureRepos({ repoName, createIfMissing: true, isPublic: false });
-                        
+
                         // Atualiza remotes após criar repo
                         await this.ensureRemotes(dir, {});
-                        
+
                         // Tenta push novamente
                         await this.pushOne(dir, remote, branch, force, true); // Usa -u para criar branch também
                         return { remote, success: true, repoCreated: true, setUpstream: true };
@@ -473,13 +492,13 @@ export class GitAdapter {
                         return { remote, success: false, error: `Falhou ao criar repo: ${repoCreateError.message}`, triedCreateRepo: true };
                     }
                 }
-                
+
                 // Auto-correção 2: Se branch não existe no remote, tenta com --set-upstream
-                const branchNotExists = errorMsgLower.includes("has no upstream branch") || 
-                                       errorMsgLower.includes("no upstream branch") ||
-                                       (errorMsgLower.includes("remote branch") && errorMsgLower.includes("does not exist")) ||
-                                       errorMsgLower.includes("ref_not_found");
-                
+                const branchNotExists = errorMsgLower.includes("has no upstream branch") ||
+                    errorMsgLower.includes("no upstream branch") ||
+                    (errorMsgLower.includes("remote branch") && errorMsgLower.includes("does not exist")) ||
+                    errorMsgLower.includes("ref_not_found");
+
                 if (branchNotExists && !force) {
                     try {
                         console.error(`[GitAdapter] Auto-fix: branch '${branch}' não existe no remote '${remote}', tentando com --set-upstream...`);
@@ -489,7 +508,7 @@ export class GitAdapter {
                         return { remote, success: false, error: retryError.message, triedSetUpstream: true };
                     }
                 }
-                
+
                 return { remote, success: false, error: errorMsg };
             }
         });
@@ -499,17 +518,17 @@ export class GitAdapter {
         const failed = results.filter(r => r.status === "rejected" || !r.value.success);
 
         if (successful.length === 0) {
-            throw createError("PUSH_REJECTED", { 
-                message: "Push falhou para todos os remotes", 
-                errors: failed.map(f => f.value?.error || f.reason?.message || "Erro desconhecido") 
+            throw createError("PUSH_REJECTED", {
+                message: "Push falhou para todos os remotes",
+                errors: failed.map(f => f.value?.error || f.reason?.message || "Erro desconhecido")
             });
         }
 
         return {
             pushed: successful.map(s => s.value.remote),
-            failed: failed.map(f => ({ 
-                remote: f.value?.remote || "unknown", 
-                error: f.value?.error || f.reason?.message || "Erro desconhecido" 
+            failed: failed.map(f => ({
+                remote: f.value?.remote || "unknown",
+                error: f.value?.error || f.reason?.message || "Erro desconhecido"
             }))
         };
     }
@@ -709,7 +728,7 @@ export class GitAdapter {
     async resetSoft(dir, ref) { await this._exec(dir, ["reset", "--soft", ref]); }
     async resetMixed(dir, ref) { await this._exec(dir, ["reset", "--mixed", ref]); }
     async resetHard(dir, ref) { await this._exec(dir, ["reset", "--hard", ref]); }
-    
+
     async resetHardClean(dir, ref) {
         await this._exec(dir, ["reset", "--hard", ref]);
         const cleanResult = await this.cleanUntracked(dir);
@@ -719,19 +738,19 @@ export class GitAdapter {
     async getMergeStatus(dir) {
         const mergeHeadPath = path.join(dir, ".git", "MERGE_HEAD");
         const isMerging = fs.existsSync(mergeHeadPath);
-        
+
         if (!isMerging) {
             return { merging: false, message: "Nenhum merge em andamento" };
         }
-        
+
         // Get conflicted files
         try {
             const diff = await this._exec(dir, ["diff", "--name-only", "--diff-filter=U"]);
             const conflicts = diff.split("\n").filter(Boolean);
-            return { 
-                merging: true, 
+            return {
+                merging: true,
                 conflicts,
-                message: conflicts.length > 0 
+                message: conflicts.length > 0
                     ? `Merge em andamento com ${conflicts.length} conflito(s)`
                     : "Merge em andamento sem conflitos"
             };
@@ -841,7 +860,7 @@ export class GitAdapter {
     }
 
     // ============ GIT LFS SUPPORT ============
-    
+
     /**
      * Verifica se Git LFS está instalado
      */