@andrebuzeli/git-mcp 6.0.0 → 6.1.1

package/dist/tools/gitBranches.d.ts

@@ -8,6 +8,7 @@ export declare class GitBranchesTool implements Tool {
         branches?: undefined;
         current?: undefined;
         deleted?: undefined;
+        currentBranch?: undefined;
         result?: undefined;
         baseBranch?: undefined;
         compareBranch?: undefined;
@@ -19,6 +20,7 @@ export declare class GitBranchesTool implements Tool {
         success?: undefined;
         branch?: undefined;
         deleted?: undefined;
+        currentBranch?: undefined;
         result?: undefined;
         baseBranch?: undefined;
         compareBranch?: undefined;
@@ -30,6 +32,7 @@ export declare class GitBranchesTool implements Tool {
         current: boolean;
         branches?: undefined;
         deleted?: undefined;
+        currentBranch?: undefined;
         result?: undefined;
         baseBranch?: undefined;
         compareBranch?: undefined;
@@ -38,6 +41,7 @@ export declare class GitBranchesTool implements Tool {
     } | {
         success: boolean;
         deleted: any;
+        currentBranch: string;
         branch?: undefined;
         branches?: undefined;
         current?: undefined;
@@ -53,6 +57,7 @@ export declare class GitBranchesTool implements Tool {
         branches?: undefined;
         current?: undefined;
         deleted?: undefined;
+        currentBranch?: undefined;
         baseBranch?: undefined;
         compareBranch?: undefined;
         commits?: undefined;
@@ -67,6 +72,7 @@ export declare class GitBranchesTool implements Tool {
         branches?: undefined;
         current?: undefined;
         deleted?: undefined;
+        currentBranch?: undefined;
         result?: undefined;
     }>;
 }

package/dist/tools/gitBranches.js

@@ -7,6 +7,7 @@ exports.GitBranchesTool = void 0;
 const simple_git_1 = __importDefault(require("simple-git"));
 const errors_1 = require("../utils/errors");
 const safetyController_1 = require("../utils/safetyController");
+const repoHelpers_1 = require("../utils/repoHelpers");
 class GitBranchesTool {
     constructor() {
         this.name = 'git-branches';
@@ -60,8 +61,17 @@ class GitBranchesTool {
                 const branchName = params.branchName;
                 if (!branchName)
                     throw new errors_1.MCPError('VALIDATION_ERROR', 'branchName is required');
+                // Safety check: prevent deleting the current active branch
+                const currentBranch = (0, repoHelpers_1.getCurrentBranch)(projectPath);
+                if (currentBranch && currentBranch === branchName) {
+                    throw new errors_1.MCPError('SAFETY_ERROR', `Cannot delete the currently active branch '${branchName}'.`, [
+                        'Switch to another branch first using git checkout',
+                        'Example: git checkout master',
+                        'Then retry the delete operation',
+                    ]);
+                }
                 await git.deleteLocalBranch(branchName, params.force);
-                return { success: true, deleted: branchName };
+                return { success: true, deleted: branchName, currentBranch };
             }
             case 'merge': {
                 const branchName = params.branchName;

package/dist/tools/gitSync.d.ts

@@ -6,6 +6,7 @@ export declare class GitSyncTool implements Tool {
         success: boolean;
         remote: any;
         branch: any;
+        automated: boolean;
         message: string;
         status?: undefined;
         remotes?: undefined;
@@ -20,6 +21,7 @@ export declare class GitSyncTool implements Tool {
         remotes: import("simple-git").RemoteWithRefs[];
         remote?: undefined;
         branch?: undefined;
+        automated?: undefined;
         message?: undefined;
     }>;
 }

package/dist/tools/gitSync.js

@@ -6,6 +6,7 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.GitSyncTool = void 0;
 const simple_git_1 = __importDefault(require("simple-git"));
 const errors_1 = require("../utils/errors");
+const repoHelpers_1 = require("../utils/repoHelpers");
 class GitSyncTool {
     constructor() {
         this.name = 'git-sync';
@@ -21,13 +22,20 @@ class GitSyncTool {
         switch (action) {
             case 'sync': {
                 const remote = params.remote || 'origin';
-                const branch = params.branch;
+                // Auto-detect current branch if not provided
+                let branch = params.branch;
+                if (!branch) {
+                    branch = (0, repoHelpers_1.getCurrentBranch)(projectPath);
+                    if (!branch) {
+                        throw new errors_1.MCPError('VALIDATION_ERROR', 'Could not detect current branch. Please provide branch parameter.');
+                    }
+                }
                 if (branch) {
                     await git.checkout(branch);
                 }
                 await git.fetch(remote);
                 await git.pull(remote, branch);
-                return { success: true, remote, branch, message: 'Repository synced' };
+                return { success: true, remote, branch, automated: !params.branch, message: 'Repository synced' };
             }
             case 'status': {
                 const status = await git.status();

package/dist/tools/gitUpload.js

@@ -60,7 +60,14 @@ class GitUploadTool {
         const repoName = params.repoName || (0, repoHelpers_1.getRepoNameFromPath)(projectPath);
         const description = params.description || `Project uploaded via git-upload at ${new Date().toISOString()}`;
         const isPrivate = params.private !== undefined ? params.private : true;
-        const branch = params.branch || 'master';
+        // Auto-detect current branch if not provided
+        let branch = params.branch;
+        if (!branch) {
+            branch = (0, repoHelpers_1.getCurrentBranch)(projectPath);
+            if (!branch) {
+                branch = 'master'; // Ultimate fallback
+            }
+        }
         const git = (0, simple_git_1.default)({ baseDir: projectPath });
         // Resultado com rastreabilidade completa
         const results = {

package/dist/utils/repoHelpers.d.ts

@@ -3,9 +3,19 @@
  */
 /**
  * Extract repository name from project path
- * Normalizes: spaces to hyphens, lowercase, removes special chars
+ * Normalizes: spaces to hyphens, lowercase, keeps alphanumeric and hyphens/underscores
  */
 export declare function getRepoNameFromPath(projectPath: string): string;
+/**
+ * Get current Git branch from project path
+ * Returns empty string if not in a Git repository
+ */
+export declare function getCurrentBranch(projectPath: string): string;
+/**
+ * Get default branch from Git repository (usually 'main' or 'master')
+ * Falls back to 'master' if unable to determine
+ */
+export declare function getDefaultBranch(projectPath: string): string;
 /**
  * Get GitHub owner from environment
  */

package/dist/utils/repoHelpers.js

@@ -4,6 +4,8 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
 };
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.getRepoNameFromPath = getRepoNameFromPath;
+exports.getCurrentBranch = getCurrentBranch;
+exports.getDefaultBranch = getDefaultBranch;
 exports.getGitHubOwner = getGitHubOwner;
 exports.getGiteaOwner = getGiteaOwner;
 exports.getGiteaUrl = getGiteaUrl;
@@ -11,18 +13,68 @@ exports.buildGitHubUrl = buildGitHubUrl;
 exports.buildGiteaUrl = buildGiteaUrl;
 exports.getRepoInfo = getRepoInfo;
 const path_1 = __importDefault(require("path"));
+const child_process_1 = require("child_process");
 /**
  * Helper functions to extract repository information automatically
  */
 /**
  * Extract repository name from project path
- * Normalizes: spaces to hyphens, lowercase, removes special chars
+ * Normalizes: spaces to hyphens, lowercase, keeps alphanumeric and hyphens/underscores
  */
 function getRepoNameFromPath(projectPath) {
     return path_1.default.basename(projectPath)
         .toLowerCase()
         .replace(/\s+/g, '-')
-        .replace(/[^a-z0-9-]/g, '');
+        .replace(/[^a-z0-9-_]/g, '');
+}
+/**
+ * Get current Git branch from project path
+ * Returns empty string if not in a Git repository
+ */
+function getCurrentBranch(projectPath) {
+    try {
+        const branchName = (0, child_process_1.execSync)('git rev-parse --abbrev-ref HEAD', {
+            cwd: projectPath,
+            encoding: 'utf8',
+            stdio: ['pipe', 'pipe', 'ignore'], // Suppress stderr
+        });
+        return branchName.trim();
+    }
+    catch (error) {
+        return '';
+    }
+}
+/**
+ * Get default branch from Git repository (usually 'main' or 'master')
+ * Falls back to 'master' if unable to determine
+ */
+function getDefaultBranch(projectPath) {
+    try {
+        // Try to get default branch from remote
+        const defaultBranch = (0, child_process_1.execSync)('git symbolic-ref refs/remotes/origin/HEAD', {
+            cwd: projectPath,
+            encoding: 'utf8',
+            stdio: ['pipe', 'pipe', 'ignore'],
+        });
+        return defaultBranch.trim().replace('refs/remotes/origin/', '');
+    }
+    catch (error) {
+        // If that fails, try to detect main or master
+        try {
+            const branches = (0, child_process_1.execSync)('git branch -r', {
+                cwd: projectPath,
+                encoding: 'utf8',
+                stdio: ['pipe', 'pipe', 'ignore'],
+            });
+            if (branches.includes('origin/main'))
+                return 'main';
+            if (branches.includes('origin/master'))
+                return 'master';
+        }
+        catch { }
+        // Ultimate fallback
+        return 'master';
+    }
 }
 /**
  * Get GitHub owner from environment

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@andrebuzeli/git-mcp",
-  "version": "6.0.0",
-  "description": "Professional MCP server for Git operations - FULLY AUTONOMOUS: each provider uses own username from env, repo name auto-normalized from projectPath (spaces→hyphens, lowercase, safe chars), zero redundant parameters, automatic dual-provider execution (GitHub + Gitea)",
+  "version": "6.1.1",
+  "description": "Professional MCP server for Git operations - FULLY AUTONOMOUS: auto-detects current branch, default branch, owner from env, repo from path. Zero manual parameters. Intelligent defaults for all operations. Dual-provider execution (GitHub + Gitea)",
   "main": "dist/index.js",
   "types": "dist/index.d.ts",
   "bin": {