@cyanheads/git-mcp-server 2.9.1 → 2.9.2

package/README.md

@@ -7,7 +7,7 @@
 
 <div align="center">
 
-[![Version](https://img.shields.io/badge/Version-2.9.1-blue.svg?style=flat-square)](./CHANGELOG.md) [![MCP Spec](https://img.shields.io/badge/MCP%20Spec-2025--11--25-8A2BE2.svg?style=flat-square)](https://github.com/modelcontextprotocol/modelcontextprotocol/blob/main/docs/specification/2025-11-25/changelog.mdx) [![MCP SDK](https://img.shields.io/badge/MCP%20SDK-^1.27.1-green.svg?style=flat-square)](https://modelcontextprotocol.io/) [![License](https://img.shields.io/badge/License-Apache%202.0-orange.svg?style=flat-square)](./LICENSE) [![Status](https://img.shields.io/badge/Status-Stable-brightgreen.svg?style=flat-square)](https://github.com/cyanheads/git-mcp-server/issues) [![TypeScript](https://img.shields.io/badge/TypeScript-^5.9.3-3178C6.svg?style=flat-square)](https://www.typescriptlang.org/) [![Bun](https://img.shields.io/badge/Bun-v1.2.21-blueviolet.svg?style=flat-square)](https://bun.sh/)
+[![Version](https://img.shields.io/badge/Version-2.9.2-blue.svg?style=flat-square)](./CHANGELOG.md) [![MCP Spec](https://img.shields.io/badge/MCP%20Spec-2025--11--25-8A2BE2.svg?style=flat-square)](https://github.com/modelcontextprotocol/modelcontextprotocol/blob/main/docs/specification/2025-11-25/changelog.mdx) [![MCP SDK](https://img.shields.io/badge/MCP%20SDK-^1.27.1-green.svg?style=flat-square)](https://modelcontextprotocol.io/) [![License](https://img.shields.io/badge/License-Apache%202.0-orange.svg?style=flat-square)](./LICENSE) [![Status](https://img.shields.io/badge/Status-Stable-brightgreen.svg?style=flat-square)](https://github.com/cyanheads/git-mcp-server/issues) [![TypeScript](https://img.shields.io/badge/TypeScript-^5.9.3-3178C6.svg?style=flat-square)](https://www.typescriptlang.org/) [![Bun](https://img.shields.io/badge/Bun-v1.2.21-blueviolet.svg?style=flat-square)](https://bun.sh/)
 
 </div>
 

package/dist/index.js

@@ -15335,7 +15335,7 @@ var package_default;
 var init_package = __esm(() => {
   package_default = {
     name: "@cyanheads/git-mcp-server",
-    version: "2.9.0",
+    version: "2.9.2",
     mcpName: "io.github.cyanheads/git-mcp-server",
     description: "A secure and scalable Git MCP server enabling AI agents to perform comprehensive Git version control operations via STDIO and Streamable HTTP.",
     main: "dist/index.js",
@@ -179321,20 +179321,24 @@ async function executeClone(options, context, execGit) {
     const cmd = buildGitCommand({ command: "clone", args });
     await execGit(cmd, cloneCwd, context.requestContext);
     let commitHash;
+    let actualBranch = options.branch || "main";
     try {
-      const revParseCmd = buildGitCommand({
-        command: "rev-parse",
-        args: ["HEAD"]
-      });
-      const revParseResult = await execGit(revParseCmd, resolvedLocalPath, context.requestContext);
+      const [revParseResult, branchResult] = await Promise.all([
+        execGit(buildGitCommand({ command: "rev-parse", args: ["HEAD"] }), resolvedLocalPath, context.requestContext),
+        execGit(buildGitCommand({
+          command: "rev-parse",
+          args: ["--abbrev-ref", "HEAD"]
+        }), resolvedLocalPath, context.requestContext)
+      ]);
       commitHash = revParseResult.stdout.trim() || undefined;
+      actualBranch = branchResult.stdout.trim() || actualBranch;
     } catch {}
     const result = {
       success: true,
-      localPath: options.localPath,
+      localPath: resolvedLocalPath,
       remoteUrl: options.remoteUrl,
-      branch: options.branch || "main",
-      commitHash
+      branch: actualBranch,
+      ...commitHash && { commitHash }
     };
     return result;
   } catch (error48) {
@@ -179645,7 +179649,11 @@ async function executeShow(options, context, execGit) {
     if (options.format === "raw") {
       args.push("--format=raw");
     }
-    args.push(options.object);
+    if (options.filePath) {
+      args.push(`${options.object}:${options.filePath}`);
+    } else {
+      args.push(options.object);
+    }
     const typeCmd = buildGitCommand({
       command: "cat-file",
       args: ["-t", options.object]
@@ -179960,7 +179968,7 @@ async function executeMerge(options, context, execGit) {
     }).filter((f3) => f3);
     const mergedFiles = result.stdout.split(`
 `).map((line) => {
-      const statMatch = line.match(/^\s*(.+?)\s*\|\s*\d+/);
+      const statMatch = line.match(/^\s(.+?)\s*\|\s*(?:\d+\s*[+-]*|Bin\s)/);
       return statMatch?.[1]?.trim() || "";
     }).filter((f3) => f3);
     const mergeResult = {
@@ -180002,6 +180010,16 @@ async function executeRebase(options, context, execGit) {
       if (!options.upstream) {
         throw new Error("upstream is required for start mode");
       }
+      if (options.interactive) {
+        args.push("--interactive");
+      }
+      if (options.preserve) {
+        args.push("--preserve-merges");
+      }
+      const shouldSign = options.sign ?? shouldSignCommits();
+      if (shouldSign) {
+        args.push("--gpg-sign");
+      }
       if (options.onto) {
         args.push("--onto", options.onto, options.upstream);
         if (options.branch) {
@@ -180013,16 +180031,6 @@ async function executeRebase(options, context, execGit) {
           args.push(options.branch);
         }
       }
-      if (options.interactive) {
-        args.push("--interactive");
-      }
-      if (options.preserve) {
-        args.push("--preserve-merges");
-      }
-      const shouldSign = options.sign ?? shouldSignCommits();
-      if (shouldSign) {
-        args.push("--gpg-sign");
-      }
     }
     const cmd = buildGitCommand({ command: "rebase", args });
     const result = await execGit(cmd, context.workingDirectory, context.requestContext);
@@ -180226,7 +180234,7 @@ async function executeFetch(options, context, execGit) {
       if (newRefMatch?.[1]) {
         fetchedRefs.push(newRefMatch[1]);
       } else {
-        const updatedRefMatch = line.match(/[a-f0-9]+\.\.[a-f0-9]+\s+\S+\s+->\s+(\S+)/);
+        const updatedRefMatch = line.match(/\+?\s*[a-f0-9]+\.{2,3}[a-f0-9]+\s+\S+\s+->\s+(\S+)/);
         if (updatedRefMatch?.[1]) {
           fetchedRefs.push(updatedRefMatch[1]);
         }
@@ -180253,6 +180261,9 @@ async function executePush(options, context, execGit) {
     const args = [];
     const remote = options.remote || "origin";
     if (options.delete) {
+      if (!options.branch && !options.remoteBranch) {
+        throw new Error("A branch or remote branch name is required for delete operations.");
+      }
       args.push("--delete");
     }
     args.push(remote);
@@ -180461,21 +180472,24 @@ async function executeStash(options, context, execGit) {
     const args = [options.mode];
     switch (options.mode) {
       case "list": {
+        args.push("--format=%gd\t%ct\t%gs");
         const cmd = buildGitCommand({ command: "stash", args });
         const result = await execGit(cmd, context.workingDirectory, context.requestContext);
         const stashes = result.stdout.split(`
 `).filter((line) => line.trim()).map((line, index) => {
-          const match = line.match(/^(stash@\{(\d+)\}):\s+(.+)$/);
-          if (match) {
-            const stashIndex = parseInt(match[2], 10);
-            const rest = match[3];
-            const branchMatch = rest.match(/^(?:WIP on|On)\s+([^:]+):\s+(.*)$/);
+          const parts = line.split("\t");
+          const [refPart, tsPart, ...subjectParts] = parts;
+          if (refPart && tsPart && subjectParts.length > 0) {
+            const stashIndex = parseInt(refPart, 10);
+            const timestamp2 = parseInt(tsPart, 10);
+            const subject = subjectParts.join("\t");
+            const branchMatch = subject.match(/^(?:WIP on|On)\s+([^:]+):\s+(.*)$/);
             return {
-              ref: match[1],
+              ref: `stash@{${stashIndex}}`,
               index: stashIndex,
               branch: branchMatch?.[1] ?? "",
-              description: branchMatch?.[2] ?? rest,
-              timestamp: 0
+              description: branchMatch?.[2] ?? subject,
+              timestamp: timestamp2
             };
           }
           return {
@@ -180703,6 +180717,8 @@ async function executeBlame(options, context, execGit) {
     }
     if (options.startLine && options.endLine) {
       args.push(`-L${options.startLine},${options.endLine}`);
+    } else if (options.startLine) {
+      args.push(`-L${options.startLine},`);
     }
     args.push("--", options.file);
     const cmd = buildGitCommand({ command: "blame", args });
@@ -198650,10 +198666,13 @@ var TOOL_TITLE11 = "Git Add";
 var TOOL_DESCRIPTION11 = "Stage files for commit. Add file contents to the staging area (index) to prepare for the next commit.";
 var InputSchema11 = exports_external.object({
   path: PathSchema,
-  files: exports_external.array(exports_external.string()).min(1).describe('Array of file paths to stage (relative to repository root). Use ["."] to stage all changes.'),
+  files: exports_external.array(exports_external.string()).default([]).describe('Array of file paths to stage (relative to repository root). Use ["."] to stage all changes. Can be omitted when all or update is true.'),
   update: exports_external.boolean().default(false).describe("Stage only modified and deleted files (skip untracked files)."),
   all: AllSchema,
   force: exports_external.boolean().default(false).describe("Allow adding otherwise ignored files.")
+}).refine((data) => data.all || data.update || data.files.length > 0, {
+  message: "Either files must be provided, or all/update must be true.",
+  path: ["files"]
 });
 var OutputSchema12 = exports_external.object({
   success: exports_external.boolean().describe("Indicates if the operation was successful."),
@@ -199891,7 +199910,7 @@ var gitRemoteTool = {
   inputSchema: InputSchema24,
   outputSchema: OutputSchema25,
   annotations: { readOnlyHint: false },
-  logic: withToolAuth(["tool:git:write"], createToolHandler(gitRemoteLogic)),
+  logic: withToolAuth(["tool:git:read"], createToolHandler(gitRemoteLogic)),
   responseFormatter: responseFormatter24
 };
 
@@ -199905,7 +199924,7 @@ var InputSchema25 = exports_external.object({
   mode: exports_external.enum(["soft", "mixed", "hard", "merge", "keep"]).default("mixed").describe("Reset mode: soft (keep changes staged), mixed (unstage changes), hard (discard all changes), merge (reset and merge), keep (reset but keep local changes)."),
   target: CommitRefSchema.optional().describe("Target commit to reset to (default: HEAD)."),
   paths: exports_external.array(exports_external.string()).optional().describe("Specific file paths to reset (leaves HEAD unchanged)."),
-  confirmed: exports_external.boolean().default(false).describe("Explicit confirmation required for hard reset on protected branches (main, master, production, etc.).")
+  confirmed: exports_external.boolean().default(false).describe("Explicit confirmation required for hard, merge, and keep reset modes on protected branches (main, master, production, etc.).")
 });
 var OutputSchema26 = exports_external.object({
   success: exports_external.boolean().describe("Indicates if the operation was successful."),

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@cyanheads/git-mcp-server",
-  "version": "2.9.1",
+  "version": "2.9.2",
   "mcpName": "io.github.cyanheads/git-mcp-server",
   "description": "A secure and scalable Git MCP server enabling AI agents to perform comprehensive Git version control operations via STDIO and Streamable HTTP.",
   "main": "dist/index.js",