@andrebuzeli/git-mcp 15.8.5 → 15.9.0

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@andrebuzeli/git-mcp",
-  "version": "15.8.5",
+  "version": "15.9.0",
   "private": false,
   "description": "MCP server para Git com operações locais e sincronização paralela GitHub/Gitea",
   "license": "MIT",
@@ -23,6 +23,7 @@
     "@modelcontextprotocol/sdk": "^0.4.0",
     "@octokit/rest": "^20.0.0",
     "ajv": "^8.12.0",
+    "archiver": "^7.0.0",
     "axios": "^1.7.7"
   }
 }

package/src/index.js

@@ -91,17 +91,18 @@ server.setRequestHandler(
   async (req) => {
     const name = req.params?.name || "";
     const args = req.params?.arguments || {};
-    const progressToken = req.params?._meta?.progressToken;
+    // Progress reporting removed to prevent timeouts/unknown token errors on slow networks
+    // const progressToken = req.params?._meta?.progressToken;
+
     const tool = tools.find(t => t.name === name);
     if (!tool) return { content: [{ type: "text", text: `Tool não encontrada: ${name}` }], isError: true };
     try {
-      if (progressToken) {
-        await server.notification({ method: "notifications/progress", params: { progressToken, progress: 0 } });
-      }
+      // if (progressToken) { await server.notification({ method: "notifications/progress", params: { progressToken, progress: 0 } }); }
+
       const result = await tool.handle(args);
-      if (progressToken) {
-        await server.notification({ method: "notifications/progress", params: { progressToken, progress: 100 } });
-      }
+
+      // if (progressToken) { await server.notification({ method: "notifications/progress", params: { progressToken, progress: 100 } }); }
+
       return result;
     } catch (e) {
       return asToolError(e.code || "ERROR", e.message || String(e));

package/src/utils/env.js

@@ -29,7 +29,7 @@ export function loadEnv(envPath = null) {
       // Ignora erros de leitura
     }
   }
-  
+
   return false;
 }
 
@@ -39,24 +39,24 @@ export function loadEnv(envPath = null) {
  */
 function parseEnvFile(content) {
   const lines = content.split("\n");
-  
+
   for (const line of lines) {
     // Ignora linhas vazias e comentários
     const trimmed = line.trim();
     if (!trimmed || trimmed.startsWith("#")) continue;
-    
+
     // Parse KEY=VALUE
     const match = trimmed.match(/^([^=]+)=(.*)$/);
     if (match) {
       const key = match[1].trim();
       let value = match[2].trim();
-      
+
       // Remove aspas ao redor do valor
       if ((value.startsWith('"') && value.endsWith('"')) ||
-          (value.startsWith("'") && value.endsWith("'"))) {
+        (value.startsWith("'") && value.endsWith("'"))) {
         value = value.slice(1, -1);
       }
-      
+
       // Só define se não existir (variáveis de ambiente têm precedência)
       if (!(key in process.env)) {
         process.env[key] = value;
@@ -95,10 +95,10 @@ export const ENV_CONFIG = {
   GITHUB_TOKEN: "Token de autenticação do GitHub",
   GITEA_URL: "URL do servidor Gitea",
   GITEA_TOKEN: "Token de autenticação do Gitea",
-  
+
   // Performance
-  GIT_TIMEOUT_MS: "Timeout para operações Git em ms (default: 60000)",
-  
+  GIT_TIMEOUT_MS: "Timeout para operações Git em ms (default: 120000)",
+
   // Debug
   DEBUG_AGENT_LOG: "Habilita logging de debug"
 };

package/src/utils/gitAdapter.js

@@ -21,8 +21,8 @@ const GIT_CANDIDATES = [
     "git"
 ];
 
-// Timeout configurável via variável de ambiente (default: 60 segundos)
-const GIT_TIMEOUT = parseInt(process.env.GIT_TIMEOUT_MS || "60000", 10);
+// Timeout configurável via variável de ambiente (default: 120 segundos para suportar drives de rede)
+const GIT_TIMEOUT = parseInt(process.env.GIT_TIMEOUT_MS || "120000", 10);
 
 export class GitAdapter {
     constructor(providerManager) {
@@ -68,7 +68,7 @@ export class GitAdapter {
             let stdout = [];
             let stderr = [];
             let killed = false;
-            
+
             // Timeout handler
             const timeoutId = setTimeout(() => {
                 killed = true;
@@ -87,7 +87,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 +109,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,21 +120,43 @@ 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) {
+            if ((msg.includes(".git/index.lock") || (msg.includes("Unable to create") && msg.includes("lock"))) && !options._lockRetried) {
                 const lockPath = path.join(dir, ".git", "index.lock");
+                let shouldDelete = false;
+
                 if (fs.existsSync(lockPath)) {
-                    console.error("[GitAdapter] Auto-fix: removing stale .git/index.lock...");
                     try {
-                        fs.unlinkSync(lockPath);
-                        return await this._exec(dir, args, { ...options, _lockRetried: true });
+                        const stats = fs.statSync(lockPath);
+                        const now = Date.now();
+                        const ageMs = now - stats.mtimeMs;
+                        // Se arquivo tem mais de 5 minutos ou se o erro já persiste (implicado pelo fato de estarmos aqui) -> Deletar
+                        // Para redes lentas, 5 min é seguro.
+                        if (ageMs > 5 * 60 * 1000) {
+                            console.error(`[GitAdapter] Lock file is old (${Math.round(ageMs / 1000)}s), deleting...`);
+                            shouldDelete = true;
+                        } else {
+                            // Se é recente, pode ser um processo ativo. Mas como falhou o comando, assumimos que bloqueou.
+                            // Em execuções agenticas sequenciais, dificilmente tem outro processo legítimo rodando ao mesmo tempo.
+                            console.error(`[GitAdapter] Lock file found. Agentic force cleanup activated.`);
+                            shouldDelete = true;
+                        }
+
+                        if (shouldDelete) {
+                            console.error("[GitAdapter] Auto-fix: removing stale .git/index.lock...");
+                            fs.unlinkSync(lockPath);
+                            // Espera um pouco para o sistema de arquivos (especialmente SMB) registrar
+                            await new Promise(r => setTimeout(r, 1000));
+                            return await this._exec(dir, args, { ...options, _lockRetried: true });
+                        }
                     } catch (unlinkError) {
-                        console.error("[GitAdapter] Failed to remove lock file:", unlinkError.message);
+                        console.error("[GitAdapter] Failed to check/remove lock file:", unlinkError.message);
+                        // Continua para lançar o erro original
                     }
                 }
             }
-            
+
             // 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 +169,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 +204,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 +233,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 +242,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 +252,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 +313,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
         };
     }
@@ -413,19 +435,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 +472,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 +495,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 +511,7 @@ export class GitAdapter {
                         return { remote, success: false, error: retryError.message, triedSetUpstream: true };
                     }
                 }
-                
+
                 return { remote, success: false, error: errorMsg };
             }
         });
@@ -499,17 +521,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 +731,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 +741,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 +863,7 @@ export class GitAdapter {
     }
 
     // ============ GIT LFS SUPPORT ============
-    
+
     /**
      * Verifica se Git LFS está instalado
      */