@cyanheads/git-mcp-server 2.6.3 → 2.6.5

package/README.md

@@ -7,7 +7,7 @@
 
 <div align="center">
 
-[![Version](https://img.shields.io/badge/Version-2.6.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.24.3-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.6.5-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.24.3-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

@@ -14356,7 +14356,7 @@ var package_default;
 var init_package = __esm(() => {
   package_default = {
     name: "@cyanheads/git-mcp-server",
-    version: "2.6.2",
+    version: "2.6.5",
     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",
@@ -14423,8 +14423,8 @@ var init_package = __esm(() => {
       typescript: "5.9.3"
     },
     devDependencies: {
-      "@cloudflare/workers-types": "^4.20251212.0",
-      "@eslint/js": "^9.39.1",
+      "@cloudflare/workers-types": "^4.20251213.0",
+      "@eslint/js": "^9.39.2",
       "@hono/mcp": "^0.2.2",
       "@hono/node-server": "^1.19.7",
       "@modelcontextprotocol/sdk": "^1.24.3",
@@ -14453,10 +14453,10 @@ var init_package = __esm(() => {
       axios: "^1.13.2",
       "bun-types": "^1.3.4",
       "chrono-node": "^2.9.0",
-      clipboardy: "^5.0.1",
+      clipboardy: "^5.0.2",
       depcheck: "^1.4.7",
       dotenv: "^17.2.3",
-      eslint: "^9.39.1",
+      eslint: "^9.39.2",
       execa: "^9.6.1",
       "fast-xml-parser": "^5.3.3",
       globals: "^16.5.0",
@@ -14473,7 +14473,7 @@ var init_package = __esm(() => {
       "pdf-lib": "^1.17.1",
       prettier: "^3.7.4",
       "reflect-metadata": "^0.2.2",
-      repomix: "^1.10.0",
+      repomix: "^1.10.1",
       "sanitize-html": "^2.17.0",
       tslib: "^2.8.1",
       tsyringe: "^4.10.0",
@@ -169038,14 +169038,18 @@ async function executeCommit(options, context, execGit) {
   }
 }
 // src/services/git/providers/cli/operations/commits/log.ts
+var COMMIT_START_MARKER = "<<<COMMIT_START>>>";
+var COMMIT_END_MARKER = "<<<COMMIT_END>>>";
 async function executeLog(options, context, execGit) {
   try {
-    const args = [
-      `--format=%H${GIT_FIELD_DELIMITER}%h${GIT_FIELD_DELIMITER}%an${GIT_FIELD_DELIMITER}%ae${GIT_FIELD_DELIMITER}%at${GIT_FIELD_DELIMITER}%s${GIT_FIELD_DELIMITER}%b${GIT_FIELD_DELIMITER}%P${GIT_RECORD_DELIMITER}`
-    ];
+    const formatStr = `${COMMIT_START_MARKER}%H${GIT_FIELD_DELIMITER}%h${GIT_FIELD_DELIMITER}%an${GIT_FIELD_DELIMITER}%ae${GIT_FIELD_DELIMITER}%at${GIT_FIELD_DELIMITER}%s${GIT_FIELD_DELIMITER}%b${GIT_FIELD_DELIMITER}%P${COMMIT_END_MARKER}`;
+    const args = [`--format=${formatStr}`];
     if (options.maxCount) {
       args.push(`-n${options.maxCount}`);
     }
+    if (options.skip) {
+      args.push(`--skip=${options.skip}`);
+    }
     if (options.since) {
       args.push(`--since=${options.since}`);
     }
@@ -169058,6 +169062,12 @@ async function executeLog(options, context, execGit) {
     if (options.grep) {
       args.push(`--grep=${options.grep}`);
     }
+    if (options.stat) {
+      args.push("--stat");
+    }
+    if (options.patch) {
+      args.push("-p");
+    }
     if (options.branch) {
       args.push(options.branch);
     }
@@ -169066,8 +169076,15 @@ async function executeLog(options, context, execGit) {
     }
     const cmd = buildGitCommand({ command: "log", args });
     const gitOutput = await execGit(cmd, context.workingDirectory, context.requestContext);
-    const commits = gitOutput.stdout.split(GIT_RECORD_DELIMITER).filter((r) => r.trim()).map((record3) => {
-      const fields = record3.trim().split(GIT_FIELD_DELIMITER);
+    const commits = [];
+    const sections = gitOutput.stdout.split(COMMIT_START_MARKER).filter((s) => s.trim());
+    for (const section of sections) {
+      const endIdx = section.indexOf(COMMIT_END_MARKER);
+      if (endIdx === -1)
+        continue;
+      const formatPart = section.substring(0, endIdx);
+      const extraPart = section.substring(endIdx + COMMIT_END_MARKER.length).trim();
+      const fields = formatPart.split(GIT_FIELD_DELIMITER);
       const commit = {
         hash: fields[0] || "",
         shortHash: fields[1] || "",
@@ -169080,13 +169097,28 @@ async function executeLog(options, context, execGit) {
       if (fields[6]) {
         commit.body = fields[6];
       }
-      return commit;
-    });
-    const result = {
+      if (extraPart) {
+        if (options.stat && options.patch) {
+          const diffStart = extraPart.indexOf(`
+diff --git`);
+          if (diffStart !== -1) {
+            commit.stat = extraPart.substring(0, diffStart).trim();
+            commit.patch = extraPart.substring(diffStart + 1).trim();
+          } else {
+            commit.stat = extraPart;
+          }
+        } else if (options.patch) {
+          commit.patch = extraPart;
+        } else if (options.stat) {
+          commit.stat = extraPart;
+        }
+      }
+      commits.push(commit);
+    }
+    return {
       commits,
       totalCount: commits.length
     };
-    return result;
   } catch (error46) {
     throw mapGitError(error46, "log");
   }
@@ -169129,6 +169161,12 @@ async function executeDiff(options, context, execGit) {
     if (options.staged) {
       args.push("--cached");
     }
+    if (options.nameOnly) {
+      args.push("--name-only");
+    }
+    if (options.unified !== undefined) {
+      args.push(`--unified=${options.unified}`);
+    }
     if (options.commit1) {
       args.push(options.commit1);
     }
@@ -169138,26 +169176,82 @@ async function executeDiff(options, context, execGit) {
     if (options.path) {
       args.push("--", options.path);
     }
-    if (options.unified) {
-      args.push(`--unified=${options.unified}`);
+    if (options.stat) {
+      const statCmd2 = buildGitCommand({
+        command: "diff",
+        args: [...args.filter((a) => a !== "--name-only"), "--stat"]
+      });
+      const statResult2 = await execGit(statCmd2, context.workingDirectory, context.requestContext);
+      const stats2 = parseGitDiffStat(statResult2.stdout);
+      return {
+        diff: statResult2.stdout,
+        filesChanged: stats2.files.length,
+        insertions: stats2.totalAdditions,
+        deletions: stats2.totalDeletions,
+        binary: statResult2.stdout.includes("Binary files")
+      };
     }
-    const diffCmd = buildGitCommand({ command: "diff", args: [...args] });
+    const diffCmd = buildGitCommand({ command: "diff", args });
     const diffResult = await execGit(diffCmd, context.workingDirectory, context.requestContext);
+    let untrackedDiff = "";
+    let untrackedFileCount = 0;
+    if (options.includeUntracked) {
+      const lsFilesCmd = buildGitCommand({
+        command: "ls-files",
+        args: ["--others", "--exclude-standard"]
+      });
+      const lsFilesResult = await execGit(lsFilesCmd, context.workingDirectory, context.requestContext);
+      const untrackedFiles = lsFilesResult.stdout.split(`
+`).filter((f) => f.trim());
+      untrackedFileCount = untrackedFiles.length;
+      for (const file2 of untrackedFiles) {
+        if (options.nameOnly) {
+          untrackedDiff += `${file2}
+`;
+        } else {
+          try {
+            const untrackedCmd = buildGitCommand({
+              command: "diff",
+              args: ["--no-index", "/dev/null", file2]
+            });
+            const result = await execGit(untrackedCmd, context.workingDirectory, context.requestContext);
+            untrackedDiff += result.stdout;
+          } catch (err) {
+            if (err instanceof Error) {
+              const stdoutMatch = err.message.match(/\nStdout: ([\s\S]*)$/);
+              if (stdoutMatch?.[1]) {
+                untrackedDiff += stdoutMatch[1];
+              }
+            }
+          }
+        }
+      }
+    }
+    const combinedDiff = diffResult.stdout + untrackedDiff;
+    if (options.nameOnly) {
+      const files = combinedDiff.split(`
+`).filter((line) => line.trim());
+      return {
+        diff: combinedDiff,
+        filesChanged: files.length,
+        binary: false
+      };
+    }
+    const baseArgs = args.filter((a) => a !== "--name-only");
     const statCmd = buildGitCommand({
       command: "diff",
-      args: [...args, "--stat"]
+      args: [...baseArgs, "--stat"]
     });
     const statResult = await execGit(statCmd, context.workingDirectory, context.requestContext);
     const stats = parseGitDiffStat(statResult.stdout);
-    const hasBinary = diffResult.stdout.includes("Binary files");
-    const result = {
-      diff: diffResult.stdout,
-      filesChanged: stats.files.length,
+    const hasBinary = combinedDiff.includes("Binary files");
+    return {
+      diff: combinedDiff,
+      filesChanged: stats.files.length + untrackedFileCount,
       insertions: stats.totalAdditions,
       deletions: stats.totalDeletions,
       binary: hasBinary
     };
-    return result;
   } catch (error46) {
     throw mapGitError(error46, "diff");
   }
@@ -169254,6 +169348,9 @@ async function executeCheckout(options, context, execGit) {
     const args = [];
     if (options.createBranch) {
       args.push("-b", options.target);
+      if (options.track) {
+        args.push("--track");
+      }
     } else {
       args.push(options.target);
     }
@@ -187875,23 +187972,16 @@ var OutputSchema13 = exports_external.object({
   deletions: exports_external.number().int().optional().describe("Total number of line deletions.")
 });
 async function gitDiffLogic(input, { provider, targetPath, appContext }) {
-  const diffOptions = {
+  const result = await provider.diff({
+    ...input.target && { commit2: input.target },
+    ...input.source && { commit1: input.source },
+    ...input.paths?.length && { path: input.paths.join(" ") },
     staged: input.staged,
     includeUntracked: input.includeUntracked,
     nameOnly: input.nameOnly,
     stat: input.stat,
-    contextLines: input.contextLines
-  };
-  if (input.target !== undefined) {
-    diffOptions.target = input.target;
-  }
-  if (input.source !== undefined) {
-    diffOptions.source = input.source;
-  }
-  if (input.paths !== undefined) {
-    diffOptions.paths = input.paths;
-  }
-  const result = await provider.diff(diffOptions, {
+    unified: input.contextLines
+  }, {
     workingDirectory: targetPath,
     requestContext: appContext,
     tenantId: appContext.tenantId || "default-tenant"
@@ -187958,7 +188048,9 @@ var CommitSchema = exports_external.object({
   subject: exports_external.string().describe("First line of the commit message."),
   body: exports_external.string().optional().describe("Commit message body (if present)."),
   parents: exports_external.array(exports_external.string()).describe("Parent commit hashes."),
-  refs: exports_external.array(exports_external.string()).optional().describe("References (branches, tags) pointing to this commit.")
+  refs: exports_external.array(exports_external.string()).optional().describe("References (branches, tags) pointing to this commit."),
+  stat: exports_external.string().optional().describe("File change statistics (when stat option is used)."),
+  patch: exports_external.string().optional().describe("Full diff patch (when patch option is used).")
 });
 var OutputSchema14 = exports_external.object({
   success: exports_external.boolean().describe("Indicates if the operation was successful."),
@@ -187966,44 +188058,20 @@ var OutputSchema14 = exports_external.object({
   totalCount: exports_external.number().int().describe("Total number of commits returned (may be limited by maxCount).")
 });
 async function gitLogLogic(input, { provider, targetPath, appContext }) {
-  const logOptions = {};
-  if (input.maxCount !== undefined) {
-    logOptions.maxCount = input.maxCount;
-  }
-  if (input.skip !== undefined) {
-    logOptions.skip = input.skip;
-  }
-  if (input.since !== undefined) {
-    logOptions.since = input.since;
-  }
-  if (input.until !== undefined) {
-    logOptions.until = input.until;
-  }
-  if (input.author !== undefined) {
-    logOptions.author = input.author;
-  }
-  if (input.grep !== undefined) {
-    logOptions.grep = input.grep;
-  }
-  if (input.branch !== undefined) {
-    logOptions.branch = input.branch;
-  }
-  if (input.filePath !== undefined) {
-    logOptions.filePath = input.filePath;
-  }
-  if (input.oneline !== undefined) {
-    logOptions.oneline = input.oneline;
-  }
-  if (input.stat !== undefined) {
-    logOptions.stat = input.stat;
-  }
-  if (input.patch !== undefined) {
-    logOptions.patch = input.patch;
-  }
-  if (input.showSignature !== undefined) {
-    logOptions.showSignature = input.showSignature;
-  }
-  const result = await provider.log(logOptions, {
+  const result = await provider.log({
+    ...input.maxCount && { maxCount: input.maxCount },
+    ...input.skip && { skip: input.skip },
+    ...input.since && { since: input.since },
+    ...input.until && { until: input.until },
+    ...input.author && { author: input.author },
+    ...input.grep && { grep: input.grep },
+    ...input.branch && { branch: input.branch },
+    ...input.filePath && { path: input.filePath },
+    ...input.showSignature && { showSignature: input.showSignature },
+    ...input.oneline && { oneline: input.oneline },
+    ...input.stat && { stat: input.stat },
+    ...input.patch && { patch: input.patch }
+  }, {
     workingDirectory: targetPath,
     requestContext: appContext,
     tenantId: appContext.tenantId || "default-tenant"

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@cyanheads/git-mcp-server",
-  "version": "2.6.3",
+  "version": "2.6.5",
   "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",
@@ -67,8 +67,8 @@
     "typescript": "5.9.3"
   },
   "devDependencies": {
-    "@cloudflare/workers-types": "^4.20251212.0",
-    "@eslint/js": "^9.39.1",
+    "@cloudflare/workers-types": "^4.20251213.0",
+    "@eslint/js": "^9.39.2",
     "@hono/mcp": "^0.2.2",
     "@hono/node-server": "^1.19.7",
     "@modelcontextprotocol/sdk": "^1.24.3",
@@ -97,10 +97,10 @@
     "axios": "^1.13.2",
     "bun-types": "^1.3.4",
     "chrono-node": "^2.9.0",
-    "clipboardy": "^5.0.1",
+    "clipboardy": "^5.0.2",
     "depcheck": "^1.4.7",
     "dotenv": "^17.2.3",
-    "eslint": "^9.39.1",
+    "eslint": "^9.39.2",
     "execa": "^9.6.1",
     "fast-xml-parser": "^5.3.3",
     "globals": "^16.5.0",
@@ -117,7 +117,7 @@
     "pdf-lib": "^1.17.1",
     "prettier": "^3.7.4",
     "reflect-metadata": "^0.2.2",
-    "repomix": "^1.10.0",
+    "repomix": "^1.10.1",
     "sanitize-html": "^2.17.0",
     "tslib": "^2.8.1",
     "tsyringe": "^4.10.0",