@andrebuzeli/git-mcp 15.2.0 → 15.2.2

package/package.json

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

package/src/index.js

@@ -26,9 +26,22 @@ import { getResources, readResource } from "./resources/index.js";
 const pm = new ProviderManager();
 const git = new GitAdapter(pm);
 
+// Log de inicialização para stderr (não interfere com stdio do MCP)
+const hasGitHub = !!process.env.GITHUB_TOKEN;
+const hasGitea = !!process.env.GITEA_URL && !!process.env.GITEA_TOKEN;
+if (!hasGitHub && !hasGitea) {
+  console.error("[git-mcp] ⚠️ Nenhum provider configurado. Operações remotas não funcionarão.");
+  console.error("[git-mcp] Configure GITHUB_TOKEN e/ou GITEA_URL + GITEA_TOKEN");
+} else {
+  const providers = [];
+  if (hasGitHub) providers.push("GitHub");
+  if (hasGitea) providers.push("Gitea");
+  console.error(`[git-mcp] ✓ Providers ativos: ${providers.join(", ")}`);
+}
+
 const transport = new StdioServerTransport();
 const server = new Server(
-  { name: "git-mcpv2", version: "15.2.0" },
+  { name: "git-mcpv2", version: "15.2.1" },
   { capabilities: { tools: {}, resources: {} } }
 );
 server.connect(transport);

package/src/tools/git-workflow.js

@@ -71,7 +71,14 @@ QUANDO USAR CADA ACTION:
     }
     const { projectPath, action } = args;
     try {
+      // #region agent log
+      fetch('http://127.0.0.1:8243/ingest/a7114eec-653b-43b0-9f09-7073baee17bf',{method:'POST',headers:{'Content-Type':'application/json'},body:JSON.stringify({sessionId:'debug-session',runId:'run1',hypothesisId:'H1',location:'git-workflow.js:handle-entry',message:'handle start',data:{action,projectPath},timestamp:Date.now()})}).catch(()=>{});
+      // #endregion
+
       validateProjectPath(projectPath);
+      // #region agent log
+      fetch('http://127.0.0.1:8243/ingest/a7114eec-653b-43b0-9f09-7073baee17bf',{method:'POST',headers:{'Content-Type':'application/json'},body:JSON.stringify({sessionId:'debug-session',runId:'run1',hypothesisId:'H1',location:'git-workflow.js:handle-validated',message:'projectPath validated',data:{action},timestamp:Date.now()})}).catch(()=>{});
+      // #endregion
       if (action === "init") {
         await git.init(projectPath);
         
@@ -96,6 +103,9 @@ QUANDO USAR CADA ACTION:
       }
       if (action === "status") {
         const st = await git.status(projectPath);
+        // #region agent log
+        fetch('http://127.0.0.1:8243/ingest/a7114eec-653b-43b0-9f09-7073baee17bf',{method:'POST',headers:{'Content-Type':'application/json'},body:JSON.stringify({sessionId:'debug-session',runId:'run1',hypothesisId:'H2',location:'git-workflow.js:status',message:'status result',data:{modified:st.modified.length,created:st.created.length,deleted:st.deleted.length,notAdded:st.not_added.length,isClean:st.isClean},timestamp:Date.now()})}).catch(()=>{});
+        // #endregion
         return asToolResult(st);
       }
       if (action === "add") {
@@ -113,6 +123,9 @@ QUANDO USAR CADA ACTION:
           return asToolError("MISSING_PARAMETER", "message é obrigatório para commit", { parameter: "message" });
         }
         const sha = await git.commit(projectPath, args.message);
+        // #region agent log
+        fetch('http://127.0.0.1:8243/ingest/a7114eec-653b-43b0-9f09-7073baee17bf',{method:'POST',headers:{'Content-Type':'application/json'},body:JSON.stringify({sessionId:'debug-session',runId:'run1',hypothesisId:'H3',location:'git-workflow.js:commit',message:'commit created',data:{sha,message:args.message},timestamp:Date.now()})}).catch(()=>{});
+        // #endregion
         return asToolResult({ success: true, sha, message: args.message, nextStep: "Use action='push' para enviar ao GitHub/Gitea" });
       }
       if (action === "clean") {

package/src/utils/gitAdapter.js

@@ -187,7 +187,7 @@ export class GitAdapter {
     if (errors.length === targets.length) {
       throw createError("PUSH_REJECTED", { 
         message: "Push falhou para todos os remotes",
-        errors: errors.map(e => e.reason?.message || String(e.reason))
+        errors: errors.map(e => e.reason?.data?.originalError || e.reason?.message || String(e.reason))
       });
     }
     return { 
@@ -334,9 +334,28 @@ export class GitAdapter {
   async saveStash(dir, message = "WIP", includeUntracked = false) {
     const st = await this.status(dir);
     
-    // Verifica se há arquivos para stash
-    const filesToSave = [...st.not_added, ...st.modified, ...st.created];
-    if (filesToSave.length === 0 && !includeUntracked) {
+    const filesToSave = [];
+    
+    // 1. Staged files (modified, created)
+    filesToSave.push(...st.modified, ...st.created);
+    
+    // 2. Unstaged files (from not_added)
+    for (const file of st.not_added) {
+        const info = st.files.find(f => f.path === file);
+        if (!info) continue;
+        
+        if (info.working_dir === "new") {
+            // Untracked
+            if (includeUntracked) filesToSave.push(file);
+        } else {
+            // Unstaged modified/deleted
+            filesToSave.push(file);
+        }
+    }
+    
+    const uniqueFiles = [...new Set(filesToSave)];
+    
+    if (uniqueFiles.length === 0) {
       throw createError("NOTHING_TO_STASH", { 
         message: "Working tree limpa, nada para stash",
         status: st
@@ -346,7 +365,7 @@ export class GitAdapter {
     // Salva arquivos modificados/adicionados
     const stashData = { message, timestamp: Date.now(), files: {} };
     
-    for (const file of filesToSave) {
+    for (const file of uniqueFiles) {
       const fullPath = path.join(dir, file);
       if (fs.existsSync(fullPath)) {
         // Lê como buffer para suportar binários
@@ -364,7 +383,7 @@ export class GitAdapter {
     fs.writeFileSync(this._getStashFile(dir), JSON.stringify(stashes, null, 2));
     
     // Remove arquivos stashados do working directory
-    for (const file of filesToSave) {
+    for (const file of uniqueFiles) {
       const fullPath = path.join(dir, file);
       if (fs.existsSync(fullPath)) {
         fs.unlinkSync(fullPath);
@@ -645,7 +664,7 @@ export class GitAdapter {
         message: `Não foi possível resolver ${ref}`,
         requestedSteps: steps,
         availableCommits: commits.length,
-        suggestion: `Histórico tem apenas ${commits.length} commits. Use HEAD~${commits.length - 1} no máximo.`
+        suggestion: `Histórico tem apenas ${commits.length} commits. Use HEAD~${Math.max(0, commits.length - 1)} no máximo.`
       });
     }
     // Refs normais
@@ -675,9 +694,9 @@ export class GitAdapter {
   }
 
   async resetMixed(dir, ref) {
-    await this.resetSoft(dir, ref);
-    // Reset index to match ref
     const oid = await this._resolveRef(dir, ref);
+    await this.resetSoft(dir, oid);
+    // Reset index to match ref
     await git.checkout({ fs, dir, ref: oid, noUpdateHead: true });
   }
 
@@ -739,13 +758,18 @@ export class GitAdapter {
       
       // Check if fast-forward is possible
       if (bases[0] === ourOid) {
+        const currentBranch = await this.getCurrentBranch(dir);
+        
         // Fast-forward merge
         await git.checkout({ fs, dir, ref: theirOid, force: true });
-        const currentBranch = await this.getCurrentBranch(dir);
-        if (currentBranch !== "HEAD") {
+        
+        if (currentBranch && currentBranch !== "HEAD") {
           const branchPath = path.join(dir, ".git", "refs", "heads", currentBranch);
           fs.mkdirSync(path.dirname(branchPath), { recursive: true });
           fs.writeFileSync(branchPath, theirOid + "\n");
+          
+          // Re-checkout the branch to attach HEAD back to it
+          await git.checkout({ fs, dir, ref: currentBranch, force: true });
         }
         return { fastForward: true, sha: theirOid };
       }
@@ -761,11 +785,31 @@ export class GitAdapter {
         message: message || `Merge branch '${branch}'`
       }).catch(async (e) => {
         // Check for conflicts
-        if (e.message?.includes("conflict")) {
+        if (e.message?.includes("conflict") || e.code === "MergeConflictError") {
+          // Manually create MERGE_HEAD to allow aborting
+          try {
+            fs.writeFileSync(path.join(dir, ".git", "MERGE_HEAD"), theirOid + "\n");
+          } catch {}
+
+          let conflictFiles = [];
+          // Try to get files from error data
+          if (e.data && e.data.filepaths) {
+             if (Array.isArray(e.data.filepaths)) {
+                 conflictFiles = e.data.filepaths;
+             } else {
+                 conflictFiles = Object.keys(e.data.filepaths);
+             }
+          }
+          
+          // Fallback to status matrix
+          if (conflictFiles.length === 0) {
+             conflictFiles = await this._detectConflicts(dir);
+          }
+
           return { 
             conflicts: true, 
-            message: e.message,
-            files: await this._detectConflicts(dir)
+            message: e.message || "Merge conflict detected",
+            files: conflictFiles
           };
         }
         throw e;
@@ -800,8 +844,8 @@ export class GitAdapter {
     const conflicts = [];
     for (const row of matrix) {
       const [file, head, workdir, stage] = row;
-      // Conflito: diferentes estados
-      if (head !== workdir || workdir !== stage) {
+      // Stage 3 indicates a merge conflict in isomorphic-git
+      if (stage === 3) {
         conflicts.push(file);
       }
     }
@@ -1045,7 +1089,17 @@ export class GitAdapter {
     if (branch) cloneOptions.ref = branch;
     if (depth) cloneOptions.depth = depth;
     
-    await withRetry(() => git.clone(cloneOptions));
+    const wasEmpty = !fs.existsSync(dir) || fs.readdirSync(dir).length === 0;
+    
+    await withRetry(async () => {
+      // Se o diretório estava vazio originalmente e agora tem .git, é de uma tentativa falha anterior
+      if (wasEmpty && fs.existsSync(path.join(dir, ".git"))) {
+        try {
+            fs.rmSync(path.join(dir, ".git"), { recursive: true, force: true });
+        } catch {}
+      }
+      return git.clone(cloneOptions);
+    });
     
     const currentBranch = await this.getCurrentBranch(dir);
     const remotes = await this.listRemotes(dir);