@cyanheads/git-mcp-server 2.10.6 → 2.11.1

package/README.md

@@ -7,7 +7,7 @@
 
 <div align="center">
 
-[![Version](https://img.shields.io/badge/Version-2.10.6-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.29.0-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.3-3178C6.svg?style=flat-square)](https://www.typescriptlang.org/) [![Bun](https://img.shields.io/badge/Bun-v1.3.11-blueviolet.svg?style=flat-square)](https://bun.sh/)
+[![Version](https://img.shields.io/badge/Version-2.11.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.29.0-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.3-3178C6.svg?style=flat-square)](https://www.typescriptlang.org/) [![Bun](https://img.shields.io/badge/Bun-v1.3.11-blueviolet.svg?style=flat-square)](https://bun.sh/)
 
 </div>
 

package/dist/index.js

@@ -15284,7 +15284,7 @@ var package_default;
 var init_package = __esm(() => {
   package_default = {
     name: "@cyanheads/git-mcp-server",
-    version: "2.10.6",
+    version: "2.11.1",
     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",
@@ -133068,7 +133068,7 @@ function detectRuntime2() {
   }
   return "node";
 }
-async function spawnWithBun(args, cwd, env, timeout, signal) {
+async function spawnWithBun(args, cwd, env, timeout, signal, allowNonZeroExit = false) {
   const bunApi = globalThis.Bun;
   if (signal?.aborted) {
     throw new Error(`Git command cancelled before execution: git ${args.join(" ")}`);
@@ -133102,15 +133102,15 @@ async function spawnWithBun(args, cwd, env, timeout, signal) {
     proc.stdout.text(),
     proc.stderr.text()
   ]);
-  if (exitCode !== 0) {
+  if (exitCode !== 0 && !allowNonZeroExit) {
     const combinedOutput = `Exit Code: ${exitCode}
 Stderr: ${stderr}
 Stdout: ${stdout}`;
     throw new Error(combinedOutput);
   }
-  return { stdout, stderr };
+  return { stdout, stderr, exitCode };
 }
-async function spawnWithNode(args, cwd, env, timeout, signal) {
+async function spawnWithNode(args, cwd, env, timeout, signal, allowNonZeroExit = false) {
   return new Promise((resolve, reject) => {
     if (signal?.aborted) {
       reject(new Error(`Git command cancelled before execution: ${args.join(" ")}`));
@@ -133158,29 +133158,30 @@ async function spawnWithNode(args, cwd, env, timeout, signal) {
       }
       const stdout = Buffer.concat(stdoutChunks).toString("utf-8");
       const stderr = Buffer.concat(stderrChunks).toString("utf-8");
-      if (exitCode !== 0) {
-        const combinedOutput = `Exit Code: ${exitCode}
+      const code = exitCode ?? 0;
+      if (code !== 0 && !allowNonZeroExit) {
+        const combinedOutput = `Exit Code: ${code}
 Stderr: ${stderr}
 Stdout: ${stdout}`;
         reject(new Error(combinedOutput));
       } else {
-        resolve({ stdout, stderr });
+        resolve({ stdout, stderr, exitCode: code });
       }
     });
   });
 }
-async function spawnGitCommand(args, cwd, env, timeout = 60000, signal) {
+async function spawnGitCommand(args, cwd, env, timeout = 60000, signal, allowNonZeroExit = false) {
   const runtime2 = detectRuntime2();
   if (runtime2 === "bun") {
-    return spawnWithBun(args, cwd, env, timeout, signal);
+    return spawnWithBun(args, cwd, env, timeout, signal, allowNonZeroExit);
   } else {
-    return spawnWithNode(args, cwd, env, timeout, signal);
+    return spawnWithNode(args, cwd, env, timeout, signal, allowNonZeroExit);
   }
 }
 
 // src/services/git/providers/cli/utils/git-executor.ts
 var GIT_COMMAND_TIMEOUT_MS = 60000;
-async function executeGitCommand(args, cwd) {
+async function executeGitCommand(args, cwd, options = {}) {
   try {
     validateGitArgs(args);
     if (!existsSync(cwd)) {
@@ -133189,7 +133190,7 @@ async function executeGitCommand(args, cwd) {
     if (!statSync2(cwd).isDirectory()) {
       throw new McpError(-32600 /* InvalidRequest */, `Working directory is not a directory: ${cwd}`, { cwd });
     }
-    const result = await spawnGitCommand(args, cwd, buildGitEnv(process.env), GIT_COMMAND_TIMEOUT_MS);
+    const result = await spawnGitCommand(args, cwd, buildGitEnv(process.env), GIT_COMMAND_TIMEOUT_MS, undefined, options.allowNonZeroExit);
     return result;
   } catch (error48) {
     throw mapGitError(error48, args[0] || "unknown");
@@ -133307,7 +133308,7 @@ function parseGitStatus(output) {
         }
       }
     } else if (statusType === "u") {
-      const path2 = parts.slice(8).join(" ").trim();
+      const path2 = parts.slice(10).join(" ").trim();
       result.conflictedFiles.push(path2);
     } else if (statusType === "?") {
       const path2 = line.substring(2);
@@ -133558,6 +133559,10 @@ async function executeAdd(options, context, execGit) {
 // src/services/git/providers/cli/operations/staging/reset.ts
 async function executeReset(options, context, execGit) {
   try {
+    const cwd = context.workingDirectory;
+    const ctx = context.requestContext;
+    const previousCommit = await safeRevParse(execGit, cwd, ctx);
+    const dirtyBefore = options.mode === "hard" && !options.paths ? await listDirtyFiles(execGit, cwd, ctx) : [];
     const args = [];
     switch (options.mode) {
       case "soft":
@@ -133576,30 +133581,68 @@ async function executeReset(options, context, execGit) {
         args.push("--keep");
         break;
     }
-    if (options.commit) {
+    if (options.commit)
       args.push(options.commit);
-    }
     if (options.paths && options.paths.length > 0) {
       args.push("--", ...options.paths);
     }
-    const cmd = buildGitCommand({ command: "reset", args });
-    await execGit(cmd, context.workingDirectory, context.requestContext);
-    const hashCmd = buildGitCommand({
-      command: "rev-parse",
-      args: ["HEAD"]
-    });
-    const hashResult = await execGit(hashCmd, context.workingDirectory, context.requestContext);
+    await execGit(buildGitCommand({ command: "reset", args }), cwd, ctx);
+    const currentCommit = await safeRevParse(execGit, cwd, ctx);
+    const affected = new Set;
+    if (options.paths && options.paths.length > 0) {
+      for (const p of options.paths)
+        affected.add(p);
+    } else if (previousCommit && currentCommit && previousCommit !== currentCommit) {
+      const diffResult = await execGit(buildGitCommand({
+        command: "diff",
+        args: ["--name-only", `${previousCommit}..${currentCommit}`]
+      }), cwd, ctx, { allowNonZeroExit: true });
+      for (const line of diffResult.stdout.split(`
+`)) {
+        const trimmed = line.trim();
+        if (trimmed)
+          affected.add(trimmed);
+      }
+    }
+    if (options.mode === "hard") {
+      for (const p of dirtyBefore)
+        affected.add(p);
+    }
     const result = {
       success: true,
       mode: options.mode,
-      commit: hashResult.stdout.trim(),
-      filesReset: options.paths || []
+      commit: currentCommit ?? "",
+      filesReset: [...affected]
     };
+    if (previousCommit && previousCommit !== currentCommit) {
+      result.previousCommit = previousCommit;
+    }
     return result;
   } catch (error48) {
     throw mapGitError(error48, "reset");
   }
 }
+async function safeRevParse(execGit, cwd, ctx) {
+  const result = await execGit(buildGitCommand({ command: "rev-parse", args: ["HEAD"] }), cwd, ctx, { allowNonZeroExit: true });
+  if ((result.exitCode ?? 0) !== 0)
+    return;
+  const hash2 = result.stdout.trim();
+  return hash2 || undefined;
+}
+async function listDirtyFiles(execGit, cwd, ctx) {
+  const result = await execGit(buildGitCommand({
+    command: "status",
+    args: ["--porcelain=v1", "--untracked-files=no"]
+  }), cwd, ctx, { allowNonZeroExit: true });
+  const files = [];
+  for (const line of result.stdout.split(`
+`)) {
+    const path2 = line.slice(3).trim();
+    if (path2)
+      files.push(path2);
+  }
+  return files;
+}
 // src/services/git/providers/cli/operations/commits/commit.ts
 async function executeCommit(options, context, execGit) {
   try {
@@ -134083,8 +134126,21 @@ async function executeCheckout(options, context, execGit) {
     }
     const cmd = buildGitCommand({ command: "checkout", args });
     const result = await execGit(cmd, context.workingDirectory, context.requestContext);
+    const PORCELAIN_LINE = /^([A-Z])\t(.+)$/;
+    const INFO_PREFIXES = [
+      "Switched",
+      "Already",
+      "Your branch",
+      "(use ",
+      "HEAD is now",
+      "Note: ",
+      "Updated "
+    ];
     const filesModified = result.stdout.split(`
-`).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"));
+`).map((line) => line.trim()).filter(Boolean).filter((line) => !INFO_PREFIXES.some((p) => line.startsWith(p))).map((line) => {
+      const match = line.match(PORCELAIN_LINE);
+      return match ? match[2] : line;
+    });
     const checkoutResult = {
       success: true,
       target: options.target,
@@ -134122,7 +134178,7 @@ async function executeMerge(options, context, execGit) {
       args.push(options.branch);
     }
     const cmd = buildGitCommand({ command: "merge", args });
-    const result = await execGit(cmd, context.workingDirectory, context.requestContext);
+    const result = await execGit(cmd, context.workingDirectory, context.requestContext, { allowNonZeroExit: true });
     if (options.abort) {
       return {
         success: true,
@@ -134135,31 +134191,45 @@ async function executeMerge(options, context, execGit) {
       };
     }
     const hasConflicts = result.stdout.includes("CONFLICT") || result.stderr.includes("CONFLICT");
+    const exitCode = result.exitCode ?? 0;
+    if (exitCode !== 0 && !hasConflicts) {
+      throw new Error(`Exit Code: ${exitCode}
+Stderr: ${result.stderr}
+Stdout: ${result.stdout}`);
+    }
     const isFastForward = result.stdout.includes("Fast-forward");
-    const conflictedFiles = result.stdout.split(`
-`).filter((line) => line.includes("CONFLICT")).map((line) => {
-      const match = line.match(/CONFLICT.*?in (.+)$/);
-      return match?.[1] || "";
-    }).filter((f3) => f3);
+    const conflictedFiles = parseConflictedFiles(`${result.stdout}
+${result.stderr}`);
     const mergedFiles = result.stdout.split(`
 `).map((line) => {
       const statMatch = line.match(/^\s(.+?)\s*\|\s*(?:\d+\s*[+-]*|Bin\s)/);
       return statMatch?.[1]?.trim() || "";
     }).filter((f3) => f3);
     const mergeResult = {
-      success: !hasConflicts,
+      success: true,
       strategy: options.strategy || "ort",
       fastForward: isFastForward,
       conflicts: hasConflicts,
       conflictedFiles,
       mergedFiles,
-      message: options.message || result.stdout.trim()
+      message: hasConflicts ? `Merge of '${options.branch}' produced conflicts in ${conflictedFiles.length} file(s). Resolve with git_add + git_commit, or pass abort=true to cancel.` : options.message || result.stdout.trim()
     };
     return mergeResult;
   } catch (error48) {
     throw mapGitError(error48, "merge");
   }
 }
+function parseConflictedFiles(combined) {
+  const seen = new Set;
+  for (const line of combined.split(`
+`)) {
+    const match = line.match(/CONFLICT.*?\sin\s(.+?)\s*$/);
+    if (match?.[1]) {
+      seen.add(match[1].trim());
+    }
+  }
+  return [...seen];
+}
 // src/services/git/providers/cli/operations/branches/rebase.ts
 async function executeRebase(options, context, execGit) {
   try {
@@ -134170,11 +134240,19 @@ async function executeRebase(options, context, execGit) {
         command: "rebase",
         args: ["--continue"]
       });
-      await execGit(continueCmd, context.workingDirectory, context.requestContext);
+      const continueResult = await execGit(continueCmd, context.workingDirectory, context.requestContext, { allowNonZeroExit: true });
+      const continueHasConflicts = continueResult.stdout.includes("CONFLICT") || continueResult.stderr.includes("CONFLICT");
+      const continueExit = continueResult.exitCode ?? 0;
+      if (continueExit !== 0 && !continueHasConflicts) {
+        throw new Error(`Exit Code: ${continueExit}
+Stderr: ${continueResult.stderr}
+Stdout: ${continueResult.stdout}`);
+      }
       return {
         success: true,
-        conflicts: false,
-        conflictedFiles: [],
+        conflicts: continueHasConflicts,
+        conflictedFiles: parseConflictedFiles2(`${continueResult.stdout}
+${continueResult.stderr}`),
         rebasedCommits: 0
       };
     } else if (mode === "abort") {
@@ -134208,13 +134286,16 @@ async function executeRebase(options, context, execGit) {
       }
     }
     const cmd = buildGitCommand({ command: "rebase", args });
-    const result = await execGit(cmd, context.workingDirectory, context.requestContext);
+    const result = await execGit(cmd, context.workingDirectory, context.requestContext, { allowNonZeroExit: true });
     const hasConflicts = result.stdout.includes("CONFLICT") || result.stderr.includes("CONFLICT");
-    const conflictedFiles = result.stdout.split(`
-`).filter((line) => line.includes("CONFLICT")).map((line) => {
-      const match = line.match(/CONFLICT.*?in (.+)$/);
-      return match?.[1] || "";
-    }).filter((f3) => f3);
+    const exitCode = result.exitCode ?? 0;
+    if (exitCode !== 0 && !hasConflicts) {
+      throw new Error(`Exit Code: ${exitCode}
+Stderr: ${result.stderr}
+Stdout: ${result.stdout}`);
+    }
+    const conflictedFiles = parseConflictedFiles2(`${result.stdout}
+${result.stderr}`);
     let rebasedCommits = 0;
     const progressLines = result.stderr.split(`
 `).filter((line) => /Rebasing \(\d+\/\d+\)/.test(line));
@@ -134229,7 +134310,7 @@ async function executeRebase(options, context, execGit) {
 `).filter((line) => line.startsWith("Applying:")).length;
     }
     const rebaseResult = {
-      success: !hasConflicts,
+      success: true,
       conflicts: hasConflicts,
       conflictedFiles,
       rebasedCommits
@@ -134239,6 +134320,17 @@ async function executeRebase(options, context, execGit) {
     throw mapGitError(error48, "rebase");
   }
 }
+function parseConflictedFiles2(combined) {
+  const seen = new Set;
+  for (const line of combined.split(`
+`)) {
+    const match = line.match(/CONFLICT.*?\sin\s(.+?)\s*$/);
+    if (match?.[1]) {
+      seen.add(match[1].trim());
+    }
+  }
+  return [...seen];
+}
 // src/services/git/providers/cli/operations/branches/cherry-pick.ts
 async function executeCherryPick(options, context, execGit) {
   try {
@@ -134267,15 +134359,18 @@ async function executeCherryPick(options, context, execGit) {
       args.push(...options.commits);
     }
     const cmd = buildGitCommand({ command: "cherry-pick", args });
-    const result = await execGit(cmd, context.workingDirectory, context.requestContext);
+    const result = await execGit(cmd, context.workingDirectory, context.requestContext, { allowNonZeroExit: true });
     const hasConflicts = result.stdout.includes("CONFLICT") || result.stderr.includes("CONFLICT");
-    const conflictedFiles = result.stdout.split(`
-`).filter((line) => line.includes("CONFLICT")).map((line) => {
-      const match = line.match(/CONFLICT.*?in (.+)$/);
-      return match?.[1] || "";
-    }).filter((f3) => f3);
+    const exitCode = result.exitCode ?? 0;
+    if (exitCode !== 0 && !hasConflicts) {
+      throw new Error(`Exit Code: ${exitCode}
+Stderr: ${result.stderr}
+Stdout: ${result.stdout}`);
+    }
+    const conflictedFiles = parseConflictedFiles3(`${result.stdout}
+${result.stderr}`);
     const cherryPickResult = {
-      success: !hasConflicts,
+      success: true,
       pickedCommits: options.abort || options.continueOperation ? [] : options.commits,
       conflicts: hasConflicts,
       conflictedFiles
@@ -134285,6 +134380,17 @@ async function executeCherryPick(options, context, execGit) {
     throw mapGitError(error48, "cherry-pick");
   }
 }
+function parseConflictedFiles3(combined) {
+  const seen = new Set;
+  for (const line of combined.split(`
+`)) {
+    const match = line.match(/CONFLICT.*?\sin\s(.+?)\s*$/);
+    if (match?.[1]) {
+      seen.add(match[1].trim());
+    }
+  }
+  return [...seen];
+}
 // src/services/git/providers/cli/operations/remotes/remote.ts
 async function executeRemote(options, context, execGit) {
   try {
@@ -134524,29 +134630,58 @@ async function executePull(options, context, execGit) {
       args.push("--ff-only");
     }
     const cmd = buildGitCommand({ command: "pull", args });
-    const result = await execGit(cmd, context.workingDirectory, context.requestContext);
+    const result = await execGit(cmd, context.workingDirectory, context.requestContext, { allowNonZeroExit: true });
+    const hasConflicts = result.stdout.includes("CONFLICT") || result.stderr.includes("CONFLICT");
+    const exitCode = result.exitCode ?? 0;
+    if (exitCode !== 0 && !hasConflicts) {
+      throw new Error(`Exit Code: ${exitCode}
+Stderr: ${result.stderr}
+Stdout: ${result.stdout}`);
+    }
     let strategy = "merge";
     if (options.rebase) {
       strategy = "rebase";
     } else if (result.stdout.includes("Fast-forward")) {
       strategy = "fast-forward";
     }
-    const hasConflicts = result.stdout.includes("CONFLICT") || result.stderr.includes("CONFLICT");
-    const filesChanged = result.stdout.split(`
-`).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,
+    const conflictedFiles = parseConflictedFiles4(`${result.stdout}
+${result.stderr}`);
+    const filesChanged = parseFilesChanged(result.stdout);
+    return {
+      success: true,
       remote,
       branch: options.branch || "HEAD",
       strategy,
       conflicts: hasConflicts,
+      conflictedFiles,
       filesChanged
     };
-    return pullResult;
   } catch (error48) {
     throw mapGitError(error48, "pull");
   }
 }
+function parseConflictedFiles4(combined) {
+  const seen = new Set;
+  for (const line of combined.split(`
+`)) {
+    const match = line.match(/CONFLICT.*?\sin\s(.+?)\s*$/);
+    if (match?.[1]) {
+      seen.add(match[1].trim());
+    }
+  }
+  return [...seen];
+}
+function parseFilesChanged(stdout) {
+  const files = [];
+  for (const line of stdout.split(`
+`)) {
+    const statMatch = line.match(/^\s(.+?)\s*\|\s*(?:\d+\s*[+-]*|Bin\s)/);
+    if (statMatch?.[1]) {
+      files.push(statMatch[1].trim());
+    }
+  }
+  return files;
+}
 // src/services/git/providers/cli/operations/tags/tag.ts
 async function executeTag(options, context, execGit) {
   try {
@@ -135036,28 +135171,28 @@ class CliGitProvider extends BaseGitProvider {
   }
   async init(options, context) {
     this.logOperationStart("init", context, options);
-    const executor = (args, cwd) => executeGitCommand(args, cwd);
+    const executor = (args, cwd, _ctx, options2) => executeGitCommand(args, cwd, options2);
     const result = await executeInit(options, context, executor);
     this.logOperationSuccess("init", context, { path: result.path });
     return result;
   }
   async clone(options, context) {
     this.logOperationStart("clone", context, options);
-    const executor = (args, cwd) => executeGitCommand(args, cwd);
+    const executor = (args, cwd, _ctx, options2) => executeGitCommand(args, cwd, options2);
     const result = await executeClone(options, context, executor);
     this.logOperationSuccess("clone", context, { path: result.localPath });
     return result;
   }
   async status(options, context) {
     this.logOperationStart("status", context, options);
-    const executor = (args, cwd) => executeGitCommand(args, cwd);
+    const executor = (args, cwd, _ctx, options2) => executeGitCommand(args, cwd, options2);
     const result = await executeStatus(options, context, executor);
     this.logOperationSuccess("status", context, { isClean: result.isClean });
     return result;
   }
   async clean(options, context) {
     this.logOperationStart("clean", context, options);
-    const executor = (args, cwd) => executeGitCommand(args, cwd);
+    const executor = (args, cwd, _ctx, options2) => executeGitCommand(args, cwd, options2);
     const result = await executeClean(options, context, executor);
     this.logOperationSuccess("clean", context, {
       filesRemoved: result.filesRemoved.length
@@ -135066,7 +135201,7 @@ class CliGitProvider extends BaseGitProvider {
   }
   async add(options, context) {
     this.logOperationStart("add", context, options);
-    const executor = (args, cwd) => executeGitCommand(args, cwd);
+    const executor = (args, cwd, _ctx, options2) => executeGitCommand(args, cwd, options2);
     const result = await executeAdd(options, context, executor);
     this.logOperationSuccess("add", context, {
       filesStaged: result.stagedFiles.length
@@ -135075,14 +135210,14 @@ class CliGitProvider extends BaseGitProvider {
   }
   async commit(options, context) {
     this.logOperationStart("commit", context, { message: options.message });
-    const executor = (args, cwd) => executeGitCommand(args, cwd);
+    const executor = (args, cwd, _ctx, options2) => executeGitCommand(args, cwd, options2);
     const result = await executeCommit(options, context, executor);
     this.logOperationSuccess("commit", context, { hash: result.commitHash });
     return result;
   }
   async log(options, context) {
     this.logOperationStart("log", context, options);
-    const executor = (args, cwd) => executeGitCommand(args, cwd);
+    const executor = (args, cwd, _ctx, options2) => executeGitCommand(args, cwd, options2);
     const result = await executeLog(options, context, executor);
     this.logOperationSuccess("log", context, {
       commitCount: result.totalCount
@@ -135091,14 +135226,14 @@ class CliGitProvider extends BaseGitProvider {
   }
   async show(options, context) {
     this.logOperationStart("show", context, options);
-    const executor = (args, cwd) => executeGitCommand(args, cwd);
+    const executor = (args, cwd, _ctx, options2) => executeGitCommand(args, cwd, options2);
     const result = await executeShow(options, context, executor);
     this.logOperationSuccess("show", context, { object: result.object });
     return result;
   }
   async diff(options, context) {
     this.logOperationStart("diff", context, options);
-    const executor = (args, cwd) => executeGitCommand(args, cwd);
+    const executor = (args, cwd, _ctx, options2) => executeGitCommand(args, cwd, options2);
     const result = await executeDiff(options, context, executor);
     this.logOperationSuccess("diff", context, {
       filesChanged: result.filesChanged
@@ -135107,21 +135242,21 @@ class CliGitProvider extends BaseGitProvider {
   }
   async branch(options, context) {
     this.logOperationStart("branch", context, options);
-    const executor = (args, cwd) => executeGitCommand(args, cwd);
+    const executor = (args, cwd, _ctx, options2) => executeGitCommand(args, cwd, options2);
     const result = await executeBranch(options, context, executor);
     this.logOperationSuccess("branch", context, { mode: result.mode });
     return result;
   }
   async checkout(options, context) {
     this.logOperationStart("checkout", context, options);
-    const executor = (args, cwd) => executeGitCommand(args, cwd);
+    const executor = (args, cwd, _ctx, options2) => executeGitCommand(args, cwd, options2);
     const result = await executeCheckout(options, context, executor);
     this.logOperationSuccess("checkout", context, { target: result.target });
     return result;
   }
   async merge(options, context) {
     this.logOperationStart("merge", context, options);
-    const executor = (args, cwd) => executeGitCommand(args, cwd);
+    const executor = (args, cwd, _ctx, options2) => executeGitCommand(args, cwd, options2);
     const result = await executeMerge(options, context, executor);
     this.logOperationSuccess("merge", context, {
       conflicts: result.conflicts
@@ -135130,7 +135265,7 @@ class CliGitProvider extends BaseGitProvider {
   }
   async rebase(options, context) {
     this.logOperationStart("rebase", context, options);
-    const executor = (args, cwd) => executeGitCommand(args, cwd);
+    const executor = (args, cwd, _ctx, options2) => executeGitCommand(args, cwd, options2);
     const result = await executeRebase(options, context, executor);
     this.logOperationSuccess("rebase", context, {
       conflicts: result.conflicts
@@ -135139,7 +135274,7 @@ class CliGitProvider extends BaseGitProvider {
   }
   async cherryPick(options, context) {
     this.logOperationStart("cherryPick", context, options);
-    const executor = (args, cwd) => executeGitCommand(args, cwd);
+    const executor = (args, cwd, _ctx, options2) => executeGitCommand(args, cwd, options2);
     const result = await executeCherryPick(options, context, executor);
     this.logOperationSuccess("cherryPick", context, {
       conflicts: result.conflicts
@@ -135148,21 +135283,21 @@ class CliGitProvider extends BaseGitProvider {
   }
   async remote(options, context) {
     this.logOperationStart("remote", context, options);
-    const executor = (args, cwd) => executeGitCommand(args, cwd);
+    const executor = (args, cwd, _ctx, options2) => executeGitCommand(args, cwd, options2);
     const result = await executeRemote(options, context, executor);
     this.logOperationSuccess("remote", context, { mode: result.mode });
     return result;
   }
   async fetch(options, context) {
     this.logOperationStart("fetch", context, options);
-    const executor = (args, cwd) => executeGitCommand(args, cwd);
+    const executor = (args, cwd, _ctx, options2) => executeGitCommand(args, cwd, options2);
     const result = await executeFetch(options, context, executor);
     this.logOperationSuccess("fetch", context, { remote: result.remote });
     return result;
   }
   async push(options, context) {
     this.logOperationStart("push", context, options);
-    const executor = (args, cwd) => executeGitCommand(args, cwd);
+    const executor = (args, cwd, _ctx, options2) => executeGitCommand(args, cwd, options2);
     const result = await executePush(options, context, executor);
     this.logOperationSuccess("push", context, {
       success: result.success
@@ -135171,7 +135306,7 @@ class CliGitProvider extends BaseGitProvider {
   }
   async pull(options, context) {
     this.logOperationStart("pull", context, options);
-    const executor = (args, cwd) => executeGitCommand(args, cwd);
+    const executor = (args, cwd, _ctx, options2) => executeGitCommand(args, cwd, options2);
     const result = await executePull(options, context, executor);
     this.logOperationSuccess("pull", context, {
       strategy: result.strategy
@@ -135180,21 +135315,21 @@ class CliGitProvider extends BaseGitProvider {
   }
   async tag(options, context) {
     this.logOperationStart("tag", context, options);
-    const executor = (args, cwd) => executeGitCommand(args, cwd);
+    const executor = (args, cwd, _ctx, options2) => executeGitCommand(args, cwd, options2);
     const result = await executeTag(options, context, executor);
     this.logOperationSuccess("tag", context, { mode: result.mode });
     return result;
   }
   async stash(options, context) {
     this.logOperationStart("stash", context, options);
-    const executor = (args, cwd) => executeGitCommand(args, cwd);
+    const executor = (args, cwd, _ctx, options2) => executeGitCommand(args, cwd, options2);
     const result = await executeStash(options, context, executor);
     this.logOperationSuccess("stash", context, { mode: result.mode });
     return result;
   }
   async worktree(options, context) {
     this.logOperationStart("worktree", context, options);
-    const executor = (args, cwd) => executeGitCommand(args, cwd);
+    const executor = (args, cwd, _ctx, options2) => executeGitCommand(args, cwd, options2);
     const result = await executeWorktree(options, context, executor);
     this.logOperationSuccess("worktree", context, { mode: result.mode });
     return result;
@@ -135206,7 +135341,7 @@ class CliGitProvider extends BaseGitProvider {
   }
   async reset(options, context) {
     this.logOperationStart("reset", context, options);
-    const executor = (args, cwd) => executeGitCommand(args, cwd);
+    const executor = (args, cwd, _ctx, options2) => executeGitCommand(args, cwd, options2);
     const result = await executeReset(options, context, executor);
     this.logOperationSuccess("reset", context, { mode: result.mode });
     return result;
@@ -135214,7 +135349,7 @@ class CliGitProvider extends BaseGitProvider {
   async blame(options, context) {
     this.checkCapability("blame");
     this.logOperationStart("blame", context, options);
-    const executor = (args, cwd) => executeGitCommand(args, cwd);
+    const executor = (args, cwd, _ctx, options2) => executeGitCommand(args, cwd, options2);
     const result = await executeBlame(options, context, executor);
     this.logOperationSuccess("blame", context, {
       file: result.file,
@@ -135225,7 +135360,7 @@ class CliGitProvider extends BaseGitProvider {
   async reflog(options, context) {
     this.checkCapability("reflog");
     this.logOperationStart("reflog", context, options);
-    const executor = (args, cwd) => executeGitCommand(args, cwd);
+    const executor = (args, cwd, _ctx, options2) => executeGitCommand(args, cwd, options2);
     const result = await executeReflog(options, context, executor);
     this.logOperationSuccess("reflog", context, {
       entries: result.totalEntries
@@ -145254,7 +145389,7 @@ var AllSchema = exports_external.boolean().default(false).describe("Include all
 var MergeStrategySchema = exports_external.enum(["ort", "recursive", "octopus", "ours", "subtree"]).optional().describe("Merge strategy to use (ort, recursive, octopus, ours, subtree).");
 var PruneSchema = exports_external.boolean().default(false).describe("Prune remote-tracking references that no longer exist on remote.");
 var DepthSchema = exports_external.number().int().min(1).optional().describe("Create a shallow clone with history truncated to N commits.");
-var SignSchema = exports_external.boolean().optional().describe("Sign the commit/tag with GPG.");
+var SignSchema = exports_external.boolean().optional().describe("Sign the commit/tag with GPG/SSH. Omit to use the server's GIT_SIGN_COMMITS default (recommended). Set true to force signing, or false to skip signing even when the default enables it.");
 var NoVerifySchema = exports_external.boolean().default(false).describe("Bypass pre-commit and commit-msg hooks.");
 
 // src/mcp-server/tools/utils/json-response-formatter.ts
@@ -146062,7 +146197,8 @@ function filterGitInitOutput(result, level) {
     return {
       success: result.success,
       path: result.path,
-      initialBranch: result.initialBranch
+      initialBranch: result.initialBranch,
+      isBare: result.isBare
     };
   }
   return result;
@@ -147064,7 +147200,8 @@ function filterGitShowOutput(result, level) {
       success: result.success,
       object: result.object,
       type: result.type,
-      content: result.content
+      content: result.content,
+      metadata: result.metadata
     };
   }
   return result;
@@ -147602,6 +147739,7 @@ var OutputSchema23 = exports_external.object({
   branch: exports_external.string().describe("Branch that was pulled."),
   strategy: exports_external.enum(["merge", "rebase", "fast-forward"]).describe("Integration strategy used."),
   conflicts: exports_external.boolean().describe("Whether pull had conflicts."),
+  conflictedFiles: exports_external.array(exports_external.string()).describe("Files with conflicts that need resolution (empty if conflicts is false)."),
   filesChanged: exports_external.array(exports_external.string()).describe("Files that were changed.")
 });
 async function gitPullLogic(input, { provider, targetPath, appContext }) {
@@ -147629,18 +147767,23 @@ async function gitPullLogic(input, { provider, targetPath, appContext }) {
     branch: result.branch,
     strategy: result.strategy,
     conflicts: result.conflicts,
+    conflictedFiles: result.conflictedFiles,
     filesChanged: result.filesChanged
   };
 }
 function filterGitPullOutput(result, level) {
   if (level === "minimal") {
-    return {
+    const minimal = {
       success: result.success,
       conflicts: result.conflicts,
       remote: result.remote,
       branch: result.branch,
       strategy: result.strategy
     };
+    if (result.conflicts) {
+      minimal.conflictedFiles = result.conflictedFiles;
+    }
+    return minimal;
   }
   return result;
 }
@@ -147868,8 +148011,9 @@ var InputSchema25 = exports_external.object({
 var OutputSchema26 = exports_external.object({
   success: exports_external.boolean().describe("Indicates if the operation was successful."),
   mode: exports_external.string().describe("Reset mode that was used."),
-  target: exports_external.string().describe("Target commit that was reset to."),
-  filesReset: exports_external.array(exports_external.string()).describe("Files that were affected by the reset.")
+  target: exports_external.string().describe("Commit hash HEAD points to after the reset."),
+  previousCommit: exports_external.string().optional().describe("Commit hash HEAD pointed to before the reset (omitted if HEAD did not move)."),
+  filesReset: exports_external.array(exports_external.string()).describe("Files affected by the reset. For path-only resets, the listed paths. For commit-move resets, files that differ between the old and new HEAD. For --hard with no HEAD move, files whose pending working-tree changes were discarded.")
 });
 async function gitResetLogic(input, { provider, targetPath, appContext }) {
   if (input.mode === "hard" || input.mode === "merge" || input.mode === "keep") {
@@ -147896,20 +148040,28 @@ async function gitResetLogic(input, { provider, targetPath, appContext }) {
     requestContext: appContext,
     tenantId: appContext.tenantId || "default-tenant"
   });
-  return {
+  const output = {
     success: result.success,
     mode: result.mode,
     target: result.commit,
     filesReset: result.filesReset
   };
+  if (result.previousCommit !== undefined) {
+    output.previousCommit = result.previousCommit;
+  }
+  return output;
 }
 function filterGitResetOutput(result, level) {
   if (level === "minimal") {
-    return {
+    const minimal = {
       success: result.success,
       mode: result.mode,
       target: result.target
     };
+    if (result.previousCommit !== undefined) {
+      minimal.previousCommit = result.previousCommit;
+    }
+    return minimal;
   }
   return result;
 }

package/package.json

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