@cyanheads/git-mcp-server 2.4.7 → 2.4.9

package/README.md

@@ -7,7 +7,7 @@
 
 <div align="center">
 
-[![Version](https://img.shields.io/badge/Version-2.4.7-blue.svg?style=flat-square)](./CHANGELOG.md) [![MCP Spec](https://img.shields.io/badge/MCP%20Spec-2025--06--18-8A2BE2.svg?style=flat-square)](https://github.com/modelcontextprotocol/modelcontextprotocol/blob/main/docs/specification/2025-06-18/changelog.mdx) [![MCP SDK](https://img.shields.io/badge/MCP%20SDK-^1.20.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-^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.4.9-blue.svg?style=flat-square)](./CHANGELOG.md) [![MCP Spec](https://img.shields.io/badge/MCP%20Spec-2025--06--18-8A2BE2.svg?style=flat-square)](https://github.com/modelcontextprotocol/modelcontextprotocol/blob/main/docs/specification/2025-06-18/changelog.mdx) [![MCP SDK](https://img.shields.io/badge/MCP%20SDK-^1.20.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-^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>
 
@@ -73,7 +73,7 @@ Add the following to your MCP Client configuration file (e.g., `cline_mcp_settin
       "env": {
         "MCP_TRANSPORT_TYPE": "stdio",
         "MCP_LOG_LEVEL": "info",
-        "GIT_MCP_BASE_DIR": "~/Developer/",
+        "GIT_BASE_DIR": "~/Developer/",
         "LOGS_DIR": "~/Developer/logs/git-mcp-server/",
         "GIT_USERNAME": "cyanheads",
         "GIT_EMAIL": "casey@caseyjhand.com",
@@ -96,7 +96,7 @@ Add the following to your MCP Client configuration file (e.g., `cline_mcp_settin
       "env": {
         "MCP_TRANSPORT_TYPE": "stdio",
         "MCP_LOG_LEVEL": "info",
-        "GIT_MCP_BASE_DIR": "~/Developer/",
+        "GIT_BASE_DIR": "~/Developer/",
         "LOGS_DIR": "~/Developer/logs/git-mcp-server/",
         "GIT_USERNAME": "cyanheads",
         "GIT_EMAIL": "casey@caseyjhand.com",
@@ -133,8 +133,9 @@ Plus, specialized features for **Git integration**:
 - **Optimized Git Execution**: Direct git CLI interaction with cross-runtime support for high-performance process management, streaming I/O, and timeout handling (current CLI provider).
 - **Comprehensive Coverage**: 27 tools covering all essential Git operations from init to push.
 - **Working Directory Management**: Session-specific directory context for multi-repo workflows.
+- **Configurable Git Identity**: Override author/committer information via environment variables with automatic fallback to global git config.
 - **Safety Features**: Explicit confirmations for destructive operations like `git clean` and `git reset --hard`.
-- **Commit Signing**: Optional GPG/SSH signing support for verified commits.
+- **Commit Signing**: Optional GPG/SSH signing support for all commit-creating operations (commits, merges, rebases, cherry-picks, and tags).
 
 ### Development Environment Setup
 
@@ -190,7 +191,9 @@ All configuration is centralized and validated at startup in `src/config/index.t
 | `STORAGE_PROVIDER_TYPE`        | Storage backend: `in-memory`, `filesystem`, `supabase`, `cloudflare-kv`, `r2`.                                                                            | `in-memory` |
 | `OTEL_ENABLED`                 | Set to `true` to enable OpenTelemetry.                                                                                                                    | `false`     |
 | `MCP_LOG_LEVEL`                | The minimum level for logging (`debug`, `info`, `warn`, `error`).                                                                                         | `info`      |
-| `GIT_SIGN_COMMITS`             | Set to `"true"` to enable GPG/SSH signing for commits. Requires server-side Git configuration.                                                            | `false`     |
+| `GIT_SIGN_COMMITS`             | Set to `"true"` to enable GPG/SSH signing for all commits, merges, rebases, cherry-picks, and tags. Requires GPG/SSH configuration.                       | `false`     |
+| `GIT_AUTHOR_NAME`              | Git author name. Aliases: `GIT_USERNAME`, `GIT_USER`. Falls back to global git config if not set.                                                         | `(none)`    |
+| `GIT_AUTHOR_EMAIL`             | Git author email. Aliases: `GIT_EMAIL`, `GIT_USER_EMAIL`. Falls back to global git config if not set.                                                     | `(none)`    |
 | `GIT_BASE_DIR`                 | Optional absolute path to restrict all git operations to a specific directory tree. Provides security sandboxing for multi-tenant or shared environments. | `(none)`    |
 | `GIT_WRAPUP_INSTRUCTIONS_PATH` | Optional path to custom markdown file with Git workflow instructions.                                                                                     | `(none)`    |
 | `MCP_AUTH_SECRET_KEY`          | **Required for `jwt` auth.** A 32+ character secret key.                                                                                                  | `(none)`    |

package/dist/index.js

@@ -4,6 +4,7 @@ var __create = Object.create;
 var __getProtoOf = Object.getPrototypeOf;
 var __defProp = Object.defineProperty;
 var __getOwnPropNames = Object.getOwnPropertyNames;
+var __getOwnPropDesc = Object.getOwnPropertyDescriptor;
 var __hasOwnProp = Object.prototype.hasOwnProperty;
 var __toESM = (mod2, isNodeMode, target) => {
   target = mod2 != null ? __create(__getProtoOf(mod2)) : {};
@@ -16,6 +17,20 @@ var __toESM = (mod2, isNodeMode, target) => {
       });
   return to;
 };
+var __moduleCache = /* @__PURE__ */ new WeakMap;
+var __toCommonJS = (from) => {
+  var entry = __moduleCache.get(from), desc;
+  if (entry)
+    return entry;
+  entry = __defProp({}, "__esModule", { value: true });
+  if (from && typeof from === "object" || typeof from === "function")
+    __getOwnPropNames(from).map((key) => !__hasOwnProp.call(entry, key) && __defProp(entry, key, {
+      get: () => from[key],
+      enumerable: !(desc = __getOwnPropDesc(from, key)) || desc.enumerable
+    }));
+  __moduleCache.set(from, entry);
+  return entry;
+};
 var __commonJS = (cb, mod2) => () => (mod2 || cb((mod2 = { exports: {} }).exports, mod2), mod2.exports);
 var __export = (target, all) => {
   for (var name in all)
@@ -4246,7 +4261,7 @@ var package_default;
 var init_package = __esm(() => {
   package_default = {
     name: "@cyanheads/git-mcp-server",
-    version: "2.4.7",
+    version: "2.4.9",
     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",
@@ -4275,38 +4290,34 @@ var init_package = __esm(() => {
     },
     homepage: "https://github.com/cyanheads/git-mcp-server#readme",
     scripts: {
-      "//--- Development": "",
-      dev: "bun --watch src/index.ts",
-      "dev:http": "MCP_LOG_LEVEL=debug MCP_TRANSPORT_TYPE=http bun --watch src/index.ts",
-      "dev:stdio": "MCP_LOG_LEVEL=debug MCP_TRANSPORT_TYPE=stdio bun --watch src/index.ts",
-      devcheck: "bun run scripts/devcheck.ts",
-      devdocs: "bun run scripts/devdocs.ts",
-      "//--- Build & Deploy": "",
-      build: "rm -rf dist && bun build ./src/index.ts --outdir ./dist --target node",
-      "build:worker": "rm -rf dist && bun build ./src/worker.ts --outdir ./dist --target bun --no-external",
+      build: "bun build ./src/index.ts --outdir ./dist --target node",
+      "build:worker": "bun build ./src/worker.ts --outdir ./dist --target bun --no-external",
       "deploy:dev": "MCP_TRANSPORT_TYPE=http bunx wrangler dev",
       "deploy:prod": "MCP_TRANSPORT_TYPE=http bunx wrangler deploy",
-      "//--- Start": "",
       start: "bun ./dist/index.js",
-      "start:http": "MCP_TRANSPORT_TYPE=http bun ./dist/index.js",
       "start:stdio": "MCP_TRANSPORT_TYPE=stdio bun ./dist/index.js",
-      "//--- Quality & Maintenance": "",
-      audit: "bun audit",
-      "audit:fix": "bun audit --fix",
+      "start:http": "MCP_TRANSPORT_TYPE=http bun ./dist/index.js",
+      dev: "bun --watch src/index.ts",
+      "dev:stdio": "MCP_LOG_LEVEL=debug MCP_TRANSPORT_TYPE=stdio bun --watch src/index.ts",
+      "dev:http": "MCP_LOG_LEVEL=debug MCP_TRANSPORT_TYPE=http bun --watch src/index.ts",
+      devdocs: "bun run scripts/devdocs.ts",
+      devcheck: "bun run scripts/devcheck.ts",
+      rebuild: "bun run scripts/clean.ts && bun run build",
+      "docs:generate": "bunx typedoc",
       depcheck: "bunx depcheck",
-      format: 'bunx prettier --write "**/*.{ts,js,json,md,html,css}"',
       lint: "bunx eslint .",
       "lint:fix": "bunx eslint . --fix",
-      prepare: "bunx husky",
-      test: "bun test --config vitest.config.ts",
-      "test:coverage": "bun test --coverage",
       typecheck: "bunx tsc --noEmit",
-      "//--- Utilities": "",
-      "docs:generate": "bunx typedoc",
+      tree: "bun run scripts/tree.ts",
       "fetch-spec": "bun run scripts/fetch-openapi-spec.ts",
+      format: 'bunx prettier --write "**/*.{ts,js,json,md,html,css}"',
+      prepare: "bunx husky",
       inspector: "bunx mcp-inspector --config mcp.json --server git-mcp-server",
-      "publish-mcp": "bun scripts/validate-mcp-publish-schema.ts",
-      tree: "bun run scripts/tree.ts"
+      test: "bun test --config vitest.config.ts",
+      "test:coverage": "bun test --coverage",
+      audit: "bun audit",
+      "audit:fix": "bun audit --fix",
+      "publish-mcp": "bun scripts/validate-mcp-publish-schema.ts"
     },
     resolutions: {
       "@hono/node-server": "1.19.5",
@@ -4578,6 +4589,10 @@ var import_dotenv, packageManifest, hasFileSystemAccess, emptyStringAsUndefined
     git: {
       provider: env.GIT_PROVIDER,
       signCommits: env.GIT_SIGN_COMMITS,
+      authorName: env.GIT_AUTHOR_NAME || env.GIT_USERNAME || env.GIT_USER || undefined,
+      authorEmail: env.GIT_AUTHOR_EMAIL || env.GIT_EMAIL || env.GIT_USER_EMAIL || undefined,
+      committerName: env.GIT_COMMITTER_NAME || env.GIT_USERNAME || env.GIT_USER || undefined,
+      committerEmail: env.GIT_COMMITTER_EMAIL || env.GIT_EMAIL || env.GIT_USER_EMAIL || undefined,
       wrapupInstructionsPath: env.GIT_WRAPUP_INSTRUCTIONS_PATH,
       baseDir: env.GIT_BASE_DIR,
       maxCommandTimeoutMs: env.GIT_MAX_COMMAND_TIMEOUT_MS,
@@ -4757,6 +4772,10 @@ var init_config = __esm(() => {
     git: z.object({
       provider: z.preprocess(emptyStringAsUndefined, z.enum(["auto", "cli", "isomorphic"]).default("auto")),
       signCommits: z.coerce.boolean().default(false),
+      authorName: z.string().optional(),
+      authorEmail: z.string().email().optional(),
+      committerName: z.string().optional(),
+      committerEmail: z.string().email().optional(),
       wrapupInstructionsPath: z.preprocess(expandTildePath, z.string().optional()),
       baseDir: z.preprocess((val) => expandTildePath(emptyStringAsUndefined(val)), z.string().refine((path) => !path || path.startsWith("/"), {
         message: 'GIT_BASE_DIR must be an absolute path starting with "/" (tilde expansion is supported)'
@@ -13788,7 +13807,7 @@ var require_propwrap = __commonJS((exports) => {
   Object.defineProperty(exports, "__esModule", { value: true });
   exports.propwrap = undefined;
   var __defProp2 = Object.defineProperty;
-  var __getOwnPropDesc = Object.getOwnPropertyDescriptor;
+  var __getOwnPropDesc2 = Object.getOwnPropertyDescriptor;
   var __hasOwnProp2 = Object.prototype.hasOwnProperty;
   var __getOwnPropNames2 = Object.getOwnPropertyNames;
   var __copyProps = (to, from, except, desc) => {
@@ -13797,7 +13816,7 @@ var require_propwrap = __commonJS((exports) => {
         if (!__hasOwnProp2.call(to, key) && key !== except) {
           __defProp2(to, key, {
             get: () => from[key],
-            enumerable: !(desc = __getOwnPropDesc(from, key)) || desc.enumerable
+            enumerable: !(desc = __getOwnPropDesc2(from, key)) || desc.enumerable
           });
         }
       }
@@ -13832,7 +13851,7 @@ var require_propwrap = __commonJS((exports) => {
       } else {
         val = namespaces[i + 1];
       }
-      const desc = __getOwnPropDesc(namespace, key);
+      const desc = __getOwnPropDesc2(namespace, key);
       const wrappedNamespace = __defProp2({}, key, {
         value: val,
         enumerable: !desc || desc.enumerable
@@ -151667,6 +151686,14 @@ function buildGitCommand(config2) {
   }
   return parts;
 }
+function loadConfig() {
+  try {
+    const configModule = (init_config(), __toCommonJS(exports_config));
+    return configModule.config;
+  } catch {
+    return null;
+  }
+}
 function buildGitEnv(additionalEnv) {
   const env = { ...process.env };
   Object.assign(env, {
@@ -151674,6 +151701,21 @@ function buildGitEnv(additionalEnv) {
     LANG: "en_US.UTF-8",
     LC_ALL: "en_US.UTF-8"
   });
+  const config2 = loadConfig();
+  if (config2?.git) {
+    if (config2.git.authorName) {
+      env.GIT_AUTHOR_NAME = config2.git.authorName;
+    }
+    if (config2.git.authorEmail) {
+      env.GIT_AUTHOR_EMAIL = config2.git.authorEmail;
+    }
+    if (config2.git.committerName) {
+      env.GIT_COMMITTER_NAME = config2.git.committerName;
+    }
+    if (config2.git.committerEmail) {
+      env.GIT_COMMITTER_EMAIL = config2.git.committerEmail;
+    }
+  }
   if (additionalEnv) {
     Object.assign(env, additionalEnv);
   }
@@ -151736,6 +151778,20 @@ function validateGitArgs(args) {
   }
 }
 
+// src/services/git/providers/cli/utils/config-helper.ts
+function loadConfig2() {
+  try {
+    const configModule = (init_config(), __toCommonJS(exports_config));
+    return configModule.config;
+  } catch {
+    return null;
+  }
+}
+function shouldSignCommits() {
+  const config2 = loadConfig2();
+  return config2?.git?.signCommits ?? false;
+}
+
 // src/services/git/providers/cli/utils/error-mapper.ts
 init_errors();
 var ERROR_PATTERNS = [
@@ -152331,7 +152387,8 @@ async function executeCommit(options, context, execGit) {
     if (options.noVerify) {
       args.push("--no-verify");
     }
-    if (options.sign) {
+    const shouldSign = options.sign ?? shouldSignCommits();
+    if (shouldSign) {
       args.push("--gpg-sign");
     }
     if (options.author) {
@@ -152631,6 +152688,10 @@ async function executeMerge(options, context, execGit) {
     if (options.message) {
       args.push("-m", options.message);
     }
+    const shouldSign = options.sign ?? shouldSignCommits();
+    if (shouldSign) {
+      args.push("-S");
+    }
     const cmd = buildGitCommand({ command: "merge", args });
     const result = await execGit(cmd, context.workingDirectory, context.requestContext);
     const hasConflicts = result.stdout.includes("CONFLICT") || result.stderr.includes("CONFLICT");
@@ -152710,6 +152771,10 @@ async function executeRebase(options, context, execGit) {
       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);
@@ -152745,6 +152810,10 @@ async function executeCherryPick(options, context, execGit) {
       if (options.noCommit) {
         args.push("--no-commit");
       }
+      const shouldSign = options.sign ?? shouldSignCommits();
+      if (shouldSign) {
+        args.push("--gpg-sign");
+      }
     }
     const cmd = buildGitCommand({ command: "cherry-pick", args });
     const result = await execGit(cmd, context.workingDirectory, context.requestContext);
@@ -153045,7 +153114,11 @@ async function executeTag(options, context, execGit) {
           throw new Error("Tag name is required for create operation");
         }
         args.push(options.tagName);
-        if (options.message && options.annotated) {
+        const shouldSign = options.sign ?? shouldSignCommits();
+        if (shouldSign) {
+          const message = options.message || `Tag ${options.tagName}`;
+          args.push("-s", "-m", message);
+        } else if (options.message && options.annotated) {
           args.push("-a", "-m", options.message);
         }
         if (options.commit) {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@cyanheads/git-mcp-server",
-  "version": "2.4.7",
+  "version": "2.4.9",
   "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",
@@ -29,38 +29,34 @@
   },
   "homepage": "https://github.com/cyanheads/git-mcp-server#readme",
   "scripts": {
-    "//--- Development": "",
-    "dev": "bun --watch src/index.ts",
-    "dev:http": "MCP_LOG_LEVEL=debug MCP_TRANSPORT_TYPE=http bun --watch src/index.ts",
-    "dev:stdio": "MCP_LOG_LEVEL=debug MCP_TRANSPORT_TYPE=stdio bun --watch src/index.ts",
-    "devcheck": "bun run scripts/devcheck.ts",
-    "devdocs": "bun run scripts/devdocs.ts",
-    "//--- Build & Deploy": "",
-    "build": "rm -rf dist && bun build ./src/index.ts --outdir ./dist --target node",
-    "build:worker": "rm -rf dist && bun build ./src/worker.ts --outdir ./dist --target bun --no-external",
+    "build": "bun build ./src/index.ts --outdir ./dist --target node",
+    "build:worker": "bun build ./src/worker.ts --outdir ./dist --target bun --no-external",
     "deploy:dev": "MCP_TRANSPORT_TYPE=http bunx wrangler dev",
     "deploy:prod": "MCP_TRANSPORT_TYPE=http bunx wrangler deploy",
-    "//--- Start": "",
     "start": "bun ./dist/index.js",
-    "start:http": "MCP_TRANSPORT_TYPE=http bun ./dist/index.js",
     "start:stdio": "MCP_TRANSPORT_TYPE=stdio bun ./dist/index.js",
-    "//--- Quality & Maintenance": "",
-    "audit": "bun audit",
-    "audit:fix": "bun audit --fix",
+    "start:http": "MCP_TRANSPORT_TYPE=http bun ./dist/index.js",
+    "dev": "bun --watch src/index.ts",
+    "dev:stdio": "MCP_LOG_LEVEL=debug MCP_TRANSPORT_TYPE=stdio bun --watch src/index.ts",
+    "dev:http": "MCP_LOG_LEVEL=debug MCP_TRANSPORT_TYPE=http bun --watch src/index.ts",
+    "devdocs": "bun run scripts/devdocs.ts",
+    "devcheck": "bun run scripts/devcheck.ts",
+    "rebuild": "bun run scripts/clean.ts && bun run build",
+    "docs:generate": "bunx typedoc",
     "depcheck": "bunx depcheck",
-    "format": "bunx prettier --write \"**/*.{ts,js,json,md,html,css}\"",
     "lint": "bunx eslint .",
     "lint:fix": "bunx eslint . --fix",
-    "prepare": "bunx husky",
-    "test": "bun test --config vitest.config.ts",
-    "test:coverage": "bun test --coverage",
     "typecheck": "bunx tsc --noEmit",
-    "//--- Utilities": "",
-    "docs:generate": "bunx typedoc",
+    "tree": "bun run scripts/tree.ts",
     "fetch-spec": "bun run scripts/fetch-openapi-spec.ts",
+    "format": "bunx prettier --write \"**/*.{ts,js,json,md,html,css}\"",
+    "prepare": "bunx husky",
     "inspector": "bunx mcp-inspector --config mcp.json --server git-mcp-server",
-    "publish-mcp": "bun scripts/validate-mcp-publish-schema.ts",
-    "tree": "bun run scripts/tree.ts"
+    "test": "bun test --config vitest.config.ts",
+    "test:coverage": "bun test --coverage",
+    "audit": "bun audit",
+    "audit:fix": "bun audit --fix",
+    "publish-mcp": "bun scripts/validate-mcp-publish-schema.ts"
   },
   "resolutions": {
     "@hono/node-server": "1.19.5",