@cyanheads/git-mcp-server 2.10.4 → 2.10.5

package/README.md

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

@@ -15357,7 +15357,7 @@ var package_default;
 var init_package = __esm(() => {
   package_default = {
     name: "@cyanheads/git-mcp-server",
-    version: "2.10.4",
+    version: "2.10.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",
@@ -136968,6 +136968,9 @@ class BaseGitProvider {
   }
 }
 
+// src/services/git/providers/cli/operations/core/init.ts
+import { mkdir } from "node:fs/promises";
+
 // src/services/git/providers/cli/utils/command-builder.ts
 function buildGitCommand(config3) {
   const parts = [config3.command];
@@ -137567,9 +137570,9 @@ async function executeInit(options, context, execGit) {
     }
     const initialBranch = options.initialBranch || "main";
     args.push(`--initial-branch=${initialBranch}`);
-    args.push(options.path);
+    await mkdir(options.path, { recursive: true }).catch(() => {});
     const cmd = buildGitCommand({ command: "init", args });
-    await execGit(cmd, context.workingDirectory, context.requestContext);
+    await execGit(cmd, options.path, context.requestContext);
     const result = {
       success: true,
       path: options.path,
@@ -138009,8 +138012,10 @@ async function executeDiff(options, context, execGit) {
       });
       const statResult2 = await execGit(statCmd2, context.workingDirectory, context.requestContext);
       const stats2 = parseGitDiffStat(statResult2.stdout);
-      let untrackedStatOutput2 = "";
       let untrackedFileCount2 = 0;
+      let untrackedAdditions2 = 0;
+      let untrackedDeletions2 = 0;
+      let untrackedStatOutput = "";
       if (options.includeUntracked) {
         let untrackedFiles = await getUntrackedFiles(execGit, context);
         if (options.excludePatterns?.length) {
@@ -138019,18 +138024,20 @@ async function executeDiff(options, context, execGit) {
         for (const file2 of untrackedFiles) {
           const result = await execUntrackedDiff(execGit, context, file2, true);
           if (result) {
-            untrackedStatOutput2 += result;
+            const fileStat = parseGitDiffStat(result);
+            untrackedAdditions2 += fileStat.totalAdditions;
+            untrackedDeletions2 += fileStat.totalDeletions;
+            untrackedStatOutput += result;
             untrackedFileCount2++;
           }
         }
       }
-      const untrackedStats2 = untrackedStatOutput2 ? parseGitDiffStat(untrackedStatOutput2) : { totalAdditions: 0, totalDeletions: 0 };
       return {
-        diff: statResult2.stdout + untrackedStatOutput2,
+        diff: statResult2.stdout + untrackedStatOutput,
         filesChanged: stats2.files.length + untrackedFileCount2,
-        insertions: stats2.totalAdditions + untrackedStats2.totalAdditions,
-        deletions: stats2.totalDeletions + untrackedStats2.totalDeletions,
-        binary: statResult2.stdout.includes("Binary files") || untrackedStatOutput2.includes("Binary files"),
+        insertions: stats2.totalAdditions + untrackedAdditions2,
+        deletions: stats2.totalDeletions + untrackedDeletions2,
+        binary: statResult2.stdout.includes("Binary files") || untrackedStatOutput.includes("Binary files"),
         ...excludedFiles && { excludedFiles }
       };
     }
@@ -138039,7 +138046,8 @@ async function executeDiff(options, context, execGit) {
     const diffResult = await execGit(diffCmd, context.workingDirectory, context.requestContext);
     let untrackedDiff = "";
     let untrackedFileCount = 0;
-    let untrackedStatOutput = "";
+    let untrackedAdditions = 0;
+    let untrackedDeletions = 0;
     if (options.includeUntracked) {
       let untrackedFiles = await getUntrackedFiles(execGit, context);
       if (options.excludePatterns?.length) {
@@ -138057,7 +138065,9 @@ async function executeDiff(options, context, execGit) {
           }
           const statResult2 = await execUntrackedDiff(execGit, context, file2, true);
           if (statResult2) {
-            untrackedStatOutput += statResult2;
+            const fileStat = parseGitDiffStat(statResult2);
+            untrackedAdditions += fileStat.totalAdditions;
+            untrackedDeletions += fileStat.totalDeletions;
           }
         }
       }
@@ -138079,13 +138089,12 @@ async function executeDiff(options, context, execGit) {
     });
     const statResult = await execGit(statCmd, context.workingDirectory, context.requestContext);
     const stats = parseGitDiffStat(statResult.stdout);
-    const untrackedStats = untrackedStatOutput ? parseGitDiffStat(untrackedStatOutput) : { totalAdditions: 0, totalDeletions: 0 };
     const hasBinary = combinedDiff.includes("Binary files");
     return {
       diff: combinedDiff,
       filesChanged: stats.files.length + untrackedFileCount,
-      insertions: stats.totalAdditions + untrackedStats.totalAdditions,
-      deletions: stats.totalDeletions + untrackedStats.totalDeletions,
+      insertions: stats.totalAdditions + untrackedAdditions,
+      deletions: stats.totalDeletions + untrackedDeletions,
       binary: hasBinary,
       ...excludedFiles && { excludedFiles }
     };
@@ -138147,11 +138156,11 @@ async function executeBranch(options, context, execGit) {
         ].join(GIT_FIELD_DELIMITER);
         const refPrefixes = options.all ? ["refs/heads", "refs/remotes"] : [options.remote ? "refs/remotes" : "refs/heads"];
         args.push(`--format=${format}`, ...refPrefixes);
-        if (options.merged !== undefined) {
+        if (options.merged !== undefined && options.merged !== false) {
           const mergedRef = typeof options.merged === "string" ? options.merged : "HEAD";
           args.push(`--merged=${mergedRef}`);
         }
-        if (options.noMerged !== undefined) {
+        if (options.noMerged !== undefined && options.noMerged !== false) {
           const noMergedRef = typeof options.noMerged === "string" ? options.noMerged : "HEAD";
           args.push(`--no-merged=${noMergedRef}`);
         }
@@ -138239,7 +138248,7 @@ async function executeCheckout(options, context, execGit) {
     const cmd = buildGitCommand({ command: "checkout", args });
     const result = await execGit(cmd, context.workingDirectory, context.requestContext);
     const filesModified = result.stdout.split(`
-`).filter((line) => line.trim() && !line.startsWith("Switched") && !line.startsWith("Already")).map((line) => line.trim());
+`).map((line) => line.trim()).filter((line) => line && !line.startsWith("Switched") && !line.startsWith("Already") && !line.startsWith("Your branch") && !line.startsWith("(use ") && !line.startsWith("HEAD is now"));
     const checkoutResult = {
       success: true,
       target: options.target,
@@ -138370,9 +138379,19 @@ async function executeRebase(options, context, execGit) {
       const match = line.match(/CONFLICT.*?in (.+)$/);
       return match?.[1] || "";
     }).filter((f3) => f3);
-    const applyingLines = result.stdout.split(`
-`).filter((line) => line.startsWith("Applying:"));
-    const rebasedCommits = applyingLines.length;
+    let rebasedCommits = 0;
+    const progressLines = result.stderr.split(`
+`).filter((line) => /Rebasing \(\d+\/\d+\)/.test(line));
+    if (progressLines.length > 0) {
+      const lastProgress = progressLines.at(-1);
+      const progressMatch = lastProgress.match(/Rebasing \((\d+)\/(\d+)\)/);
+      if (progressMatch) {
+        rebasedCommits = parseInt(progressMatch[2], 10);
+      }
+    } else {
+      rebasedCommits = result.stdout.split(`
+`).filter((line) => line.startsWith("Applying:")).length;
+    }
     const rebaseResult = {
       success: !hasConflicts,
       conflicts: hasConflicts,
@@ -138678,7 +138697,7 @@ async function executePull(options, context, execGit) {
     }
     const hasConflicts = result.stdout.includes("CONFLICT") || result.stderr.includes("CONFLICT");
     const filesChanged = result.stdout.split(`
-`).filter((line) => line.trim() && !line.includes("CONFLICT")).map((line) => line.trim()).filter((f3) => f3);
+`).map((line) => line.trim()).filter((line) => line && !line.includes("CONFLICT") && !line.startsWith("Already up to date") && !line.startsWith("From ") && !line.startsWith("Your branch") && !line.startsWith("(use ") && !line.startsWith("Updating ") && !line.startsWith("Fast-forward") && !line.match(/^\d+ files? changed/));
     const pullResult = {
       success: !hasConflicts,
       remote,
@@ -138702,7 +138721,7 @@ async function executeTag(options, context, execGit) {
           "%(refname:short)",
           "%(if)%(*objectname:short)%(then)%(*objectname:short)%(else)%(objectname:short)%(end)",
           "%(if)%(contents:subject)%(then)%(contents:subject)%(end)",
-          "%(if)%(taggername)%(then)%(taggername) <%(taggeremail)>%(end)",
+          "%(if)%(taggername)%(then)%(taggername) %(taggeremail)%(end)",
           "%(if)%(creatordate:unix)%(then)%(creatordate:unix)%(end)"
         ].join(GIT_FIELD_DELIMITER);
         const refCmd = buildGitCommand({
@@ -138753,10 +138772,14 @@ async function executeTag(options, context, execGit) {
           }
           return createArgs;
         };
-        const createCmd = buildGitCommand({
-          command: "tag",
-          args: buildCreateArgs(shouldSign)
-        });
+        const configOverride = shouldSign ? [] : ["-c", "tag.gpgSign=false"];
+        const createCmd = [
+          ...configOverride,
+          ...buildGitCommand({
+            command: "tag",
+            args: buildCreateArgs(shouldSign)
+          })
+        ];
         try {
           await execGit(createCmd, context.workingDirectory, context.requestContext);
         } catch (error48) {
@@ -138810,7 +138833,8 @@ async function executeStash(options, context, execGit) {
           const parts = line.split("\t");
           const [refPart, tsPart, ...subjectParts] = parts;
           if (refPart && tsPart && subjectParts.length > 0) {
-            const stashIndex = parseInt(refPart, 10);
+            const indexMatch = refPart.match(/\{(\d+)\}/);
+            const stashIndex = indexMatch ? parseInt(indexMatch[1], 10) : index;
             const timestamp = parseInt(tsPart, 10);
             const subject = subjectParts.join("\t");
             const branchMatch = subject.match(/^(?:WIP on|On)\s+([^:]+):\s+(.*)$/);
@@ -149966,12 +149990,13 @@ var TOOL_TITLE3 = "Git Clean";
 var TOOL_DESCRIPTION3 = "Remove untracked files from the working directory. Requires force flag for safety. Use dry-run to preview files that would be removed.";
 var InputSchema3 = exports_external.object({
   path: PathSchema,
-  force: ForceSchema.refine((val) => val === true, {
-    message: "force flag must be set to true to clean untracked files"
-  }),
+  force: ForceSchema,
   dryRun: DryRunSchema,
   directories: exports_external.boolean().default(false).describe("Remove untracked directories in addition to files."),
   ignored: exports_external.boolean().default(false).describe("Remove ignored files as well.")
+}).refine((data) => data.force === true || data.dryRun === true, {
+  message: "force flag must be set to true to clean untracked files (or use dryRun to preview)",
+  path: ["force"]
 });
 var OutputSchema4 = exports_external.object({
   success: exports_external.boolean().describe("Indicates if the operation was successful."),
@@ -150456,7 +150481,7 @@ var InputSchema9 = exports_external.object({
 var OutputSchema10 = exports_external.object({
   success: exports_external.boolean().describe("Indicates if the operation was successful."),
   currentBranch: exports_external.string().nullable().describe("Current branch name."),
-  isClean: exports_external.boolean().describe("True if working directory is clean."),
+  isClean: exports_external.boolean().describe("True if working directory is clean (no staged, unstaged, or untracked changes). When includeUntracked is false, untracked files are excluded from this check."),
   stagedChanges: exports_external.object({
     added: exports_external.array(exports_external.string()).optional().describe("Files added to the index (staged)."),
     modified: exports_external.array(exports_external.string()).optional().describe("Files modified and staged."),
@@ -150730,10 +150755,15 @@ async function gitAddLogic(input, { provider, targetPath, appContext }) {
     requestContext: appContext,
     tenantId: appContext.tenantId || "default-tenant"
   });
+  const stagedFiles = result.stagedFiles.length > 0 ? result.stagedFiles : [
+    ...statusResult.stagedChanges.added || [],
+    ...statusResult.stagedChanges.modified || [],
+    ...statusResult.stagedChanges.deleted || []
+  ];
   return {
     success: result.success,
-    stagedFiles: result.stagedFiles,
-    totalFiles: result.stagedFiles.length,
+    stagedFiles,
+    totalFiles: stagedFiles.length,
     status: {
       current_branch: statusResult.currentBranch,
       staged_changes: flattenChanges(statusResult.stagedChanges),
@@ -151130,7 +151160,7 @@ var TOOL_DESCRIPTION15 = "Show details of a git object (commit, tree, blob, or t
 var InputSchema15 = exports_external.object({
   path: PathSchema,
   object: CommitRefSchema.describe("Git object to show (commit hash, branch, tag, tree, or blob)."),
-  format: exports_external.enum(["raw", "json"]).optional().describe("Output format for the git object."),
+  format: exports_external.enum(["raw"]).optional().describe('Output format for the git object. Use "raw" for unprocessed git output.'),
   stat: exports_external.boolean().default(false).describe("Show diffstat instead of full diff."),
   filePath: exports_external.string().optional().describe("View specific file at a given commit reference. When provided, shows the file content from the specified object.")
 });
@@ -151213,8 +151243,8 @@ var InputSchema16 = exports_external.object({
   force: ForceSchema,
   all: AllSchema.describe("For list operation: show both local and remote branches."),
   remote: exports_external.boolean().default(false).describe("For list operation: show only remote branches."),
-  merged: exports_external.union([exports_external.boolean(), CommitRefSchema]).optional().describe("For list operation: show only branches merged into HEAD (true) or specified commit (string)."),
-  noMerged: exports_external.union([exports_external.boolean(), CommitRefSchema]).optional().describe("For list operation: show only branches not merged into HEAD (true) or specified commit (string).")
+  merged: exports_external.preprocess((val) => val === "true" ? true : val === "false" ? false : val, exports_external.union([exports_external.boolean(), CommitRefSchema])).optional().describe("For list operation: show only branches merged into HEAD (true) or specified commit (string)."),
+  noMerged: exports_external.preprocess((val) => val === "true" ? true : val === "false" ? false : val, exports_external.union([exports_external.boolean(), CommitRefSchema])).optional().describe("For list operation: show only branches not merged into HEAD (true) or specified commit (string).")
 });
 var BranchInfoSchema = exports_external.object({
   name: exports_external.string().describe("Branch name."),

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@cyanheads/git-mcp-server",
-  "version": "2.10.4",
+  "version": "2.10.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",