npm - @cyanheads/git-mcp-server - Versions diffs - 2.4.5 → 2.4.7 - Mend

@cyanheads/git-mcp-server 2.4.5 → 2.4.7

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.

Files changed (3) hide show

package/README.md CHANGED Viewed

@@ -1,13 +1,13 @@
 <div align="center">
   <h1>@cyanheads/git-mcp-server</h1>
-  <p><b>A secure and scalable Git MCP server giving AI agents powerful version control for local and (soon) serverless environments.</b>
-  <div>27 Tools • 1 Resources • 1 Prompt</div>
+  <p><b>A secure and scalable Git MCP server giving AI agents powerful version control for local and (soon) serverless environments. STDIO & Streamable HTTP</b>
+  <div>27 Tools • 1 Resource • 1 Prompt</div>
   </p>
 </div>
 <div align="center">
-[![Version](https://img.shields.io/badge/Version-2.4.5-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.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/)
 </div>
@@ -26,40 +26,52 @@ This server provides 27 comprehensive Git operations organized into six function
 | **Remote Operations**     | `git_remote`, `git_fetch`, `git_pull`, `git_push`                                                                              | Configure remotes, download updates, synchronize repositories, and publish changes                                    |
 | **Advanced Workflows**    | `git_tag`, `git_stash`, `git_reset`, `git_worktree`, `git_set_working_dir`, `git_clear_working_dir`, `git_wrapup_instructions` | Tag releases, stash changes, reset state, manage worktrees, set/clear session directory, and access workflow guidance |
-## ✨ Features
+## 📦 Resources Overview
-This server is built on the [`mcp-ts-template`](https://github.com/cyanheads/mcp-ts-template) and inherits its rich feature set:
+The server provides resources that offer contextual information about the Git environment:
-- **Declarative Tools**: Define agent capabilities in single, self-contained files. The framework handles registration, validation, and execution.
-- **Robust Error Handling**: A unified `McpError` system ensures consistent, structured error responses.
-- **Pluggable Authentication**: Secure your server with zero-fuss support for `none`, `jwt`, or `oauth` modes.
-- **Abstracted Storage**: Swap storage backends (`in-memory`, `filesystem`, `Supabase`, `Cloudflare KV/R2`) without changing business logic.
-- **Full-Stack Observability**: Deep insights with structured logging (Pino) and optional, auto-instrumented OpenTelemetry for traces and metrics.
-- **Dependency Injection**: Built with `tsyringe` for a clean, decoupled, and testable architecture.
-- **Edge-Ready Architecture**: Built on an edge-compatible framework that runs seamlessly on local machines or Cloudflare Workers. _Note: Current git operations use the CLI provider which requires local git installation. Edge deployment support is planned through the isomorphic-git provider integration._
+| Resource                  | URI                       | Description                                                                                                                                     |
+| :------------------------ | :------------------------ | :---------------------------------------------------------------------------------------------------------------------------------------------- |
+| **Git Working Directory** | `git://working-directory` | Provides the current session working directory for git operations. This is the directory set via `git_set_working_dir` and used as the default. |
-Plus, specialized features for **Git integration**:
+## 🎯 Prompts Overview
-- **Provider-Based Architecture**: Pluggable git provider system with current CLI implementation and planned isomorphic-git provider for edge deployment.
-- **Optimized Git Execution**: Direct git CLI interaction via Bun.spawn for high-performance process management with 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.
-- **Safety Features**: Explicit confirmations for destructive operations like `git clean` and `git reset --hard`.
-- **Commit Signing**: Optional GPG/SSH signing support for verified commits.
+The server provides structured prompt templates that guide AI agents through complex workflows:
+| Prompt          | Description                                                                                                                                | Parameters                                                                 |
+| :-------------- | :----------------------------------------------------------------------------------------------------------------------------------------- | :------------------------------------------------------------------------- |
+| **Git Wrap-up** | A systematic workflow protocol for completing git sessions. Guides agents through reviewing, documenting, committing, and tagging changes. | `changelogPath`, `skipDocumentation`, `createTag`, and `updateAgentFiles`. |
 ## 🚀 Getting Started
+### Runtime Compatibility
+This server works with **both Bun and Node.js runtimes**:
+| Runtime     | Command                                 | Minimum Version | Notes                                    |
+| ----------- | --------------------------------------- | --------------- | ---------------------------------------- |
+| **Bun**     | `bunx @cyanheads/git-mcp-server@latest` | ≥ 1.2.0         | Native Bun runtime (optimal performance) |
+| **Node.js** | `npx @cyanheads/git-mcp-server@latest`  | ≥ 20.0.0        | Via npx/bunx (universal compatibility)   |
+The server automatically detects the runtime and uses the appropriate process spawning method for git operations.
 ### MCP Client Settings/Configuration
-Add the following to your MCP Client configuration file (e.g., `cline_mcp_settings.json`).
+Add the following to your MCP Client configuration file (e.g., `cline_mcp_settings.json`). Clients have different ways to configure servers, so refer to your client's documentation for specifics.
+**Be sure to update environment variables as needed (especially your Git information!)**
+#### Using Bun (bunx)
 ```json
 {
   "mcpServers": {
     "git-mcp-server": {
+      "type": "stdio",
       "command": "bunx",
       "args": ["@cyanheads/git-mcp-server@latest"],
       "env": {
+        "MCP_TRANSPORT_TYPE": "stdio",
         "MCP_LOG_LEVEL": "info",
         "GIT_MCP_BASE_DIR": "~/Developer/",
         "LOGS_DIR": "~/Developer/logs/git-mcp-server/",
@@ -72,11 +84,67 @@ Add the following to your MCP Client configuration file (e.g., `cline_mcp_settin
 }
 ```
+#### Using Node.js (npx)
+```json
+{
+  "mcpServers": {
+    "git-mcp-server": {
+      "type": "stdio",
+      "command": "npx",
+      "args": ["@cyanheads/git-mcp-server@latest"],
+      "env": {
+        "MCP_TRANSPORT_TYPE": "stdio",
+        "MCP_LOG_LEVEL": "info",
+        "GIT_MCP_BASE_DIR": "~/Developer/",
+        "LOGS_DIR": "~/Developer/logs/git-mcp-server/",
+        "GIT_USERNAME": "cyanheads",
+        "GIT_EMAIL": "casey@caseyjhand.com",
+        "GIT_SIGN_COMMITS": "false"
+      }
+    }
+  }
+}
+```
+#### Streamable HTTP Configuration
+```bash
+MCP_TRANSPORT_TYPE=http
+MCP_HTTP_PORT=3015
+```
+## ✨ Server Features
+This server is built on the [`mcp-ts-template`](https://github.com/cyanheads/mcp-ts-template) and inherits its rich feature set:
+- **Declarative Tools**: Define agent capabilities in single, self-contained files. The framework handles registration, validation, and execution.
+- **Robust Error Handling**: A unified `McpError` system ensures consistent, structured error responses.
+- **Pluggable Authentication**: Secure your server with zero-fuss support for `none`, `jwt`, or `oauth` modes.
+- **Abstracted Storage**: Swap storage backends (`in-memory`, `filesystem`, `Supabase`, `Cloudflare KV/R2`) without changing business logic.
+- **Full-Stack Observability**: Deep insights with structured logging (Pino) and optional, auto-instrumented OpenTelemetry for traces and metrics.
+- **Dependency Injection**: Built with `tsyringe` for a clean, decoupled, and testable architecture.
+- **Edge-Ready Architecture**: Built on an edge-compatible framework that runs seamlessly on local machines or Cloudflare Workers. _Note: Current git operations use the CLI provider which requires local git installation. Edge deployment support is planned through the isomorphic-git provider integration._
+Plus, specialized features for **Git integration**:
+- **Cross-Runtime Compatibility**: Works seamlessly with both Bun and Node.js runtimes. Automatically detects the runtime and uses optimal process spawning (Bun.spawn in Bun, child_process.spawn in Node.js).
+- **Provider-Based Architecture**: Pluggable git provider system with current CLI implementation and planned isomorphic-git provider for edge deployment.
+- **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.
+- **Safety Features**: Explicit confirmations for destructive operations like `git clean` and `git reset --hard`.
+- **Commit Signing**: Optional GPG/SSH signing support for verified commits.
+### Development Environment Setup
 ### Prerequisites
-- [Bun v1.2.0](https://bun.sh/) or higher
+- **Either** [Bun v1.2.0+](https://bun.sh/) **OR** [Node.js v20.0.0+](https://nodejs.org/)
 - [Git](https://git-scm.com/) installed and accessible in your system PATH
+> **Note**: Development uses Bun for the best experience, but the published package works with both Bun (`bunx`) and Node.js (`npx`).
 ### Installation
 1. **Clone the repository:**
@@ -93,10 +161,18 @@ cd git-mcp-server
 3. **Install dependencies:**
+**With Bun (recommended for development):**
 ```sh
 bun install
 ```
+**With Node.js:**
+```sh
+npm install
+```
 ## ⚙️ Configuration
 All configuration is centralized and validated at startup in `src/config/index.ts`. Key environment variables in your `.env` file include:
@@ -122,6 +198,24 @@ All configuration is centralized and validated at startup in `src/config/index.t
 ## ▶️ Running the Server
+### For End Users (via Package Manager)
+The easiest way to use the server is via `bunx` or `npx` (no installation required):
+**With Bun:**
+```sh
+bunx @cyanheads/git-mcp-server@latest
+```
+**With Node.js:**
+```sh
+npx @cyanheads/git-mcp-server@latest
+```
+Both commands work identically and are configured through environment variables or your MCP client configuration.
 ### Local Development
 - **Build and run the production version**:
@@ -184,42 +278,6 @@ bun deploy:prod
 | `src/config`                | Environment variable parsing and validation with Zod.                            |
 | `tests/`                    | Unit and integration tests, mirroring the `src/` directory structure.            |
-## 📦 Resources
-The server provides resources that offer contextual information about the Git environment:
-| Resource URI              | Description                                                                                   |
-| :------------------------ | :-------------------------------------------------------------------------------------------- |
-| `git://working-directory` | Returns the currently configured working directory for the session. Shows `NOT_SET` if unset. |
-## 🎯 Prompts
-The server provides structured prompt templates that guide AI agents through complex workflows:
-| Prompt Name  | Description                                                                                                                                        | Parameters                                                            |
-| :----------- | :------------------------------------------------------------------------------------------------------------------------------------------------- | :-------------------------------------------------------------------- |
-| `git_wrapup` | A systematic workflow protocol for completing git sessions. Guides agents through reviewing changes, updating documentation, and creating commits. | `changelogPath`, `skipDocumentation`, `createTag`, `updateAgentFiles` |
-### Using Prompts
-Prompts are MCP primitives that LLM clients can discover and invoke through the protocol. They work together with tools to provide comprehensive workflows:
-**How it works:**
-1. **Prompt** (`git_wrapup`): Provides the workflow template and instructions to the agent
-2. **Tool** (`git_wrapup_instructions`): Retrieves current repository status and user-specific workflow preferences
-The `git_wrapup` prompt creates a structured checklist for completing git sessions:
-- First calls `git_wrapup_instructions` tool to get context and workflow configuration
-- Analyzes repository changes with `git_diff`
-- Updates `CHANGELOG.md` with version entries
-- Reviews and updates documentation
-- Creates atomic, conventional commits
-- Verifies completion with `git_status`
-This dual approach (prompt + tool) ensures agents have both the workflow logic and current repository context to complete tasks effectively.
 ## 📤 Understanding Tool Responses
 This server follows MCP's dual-output architecture for all tools ([MCP Tools Specification](https://modelcontextprotocol.io/specification/2025-06-18/server/tools)):

package/dist/index.js CHANGED Viewed

@@ -4246,9 +4246,9 @@ var package_default;
 var init_package = __esm(() => {
   package_default = {
     name: "@cyanheads/git-mcp-server",
-    version: "2.4.4",
+    version: "2.4.7",
     mcpName: "io.github.cyanheads/git-mcp-server",
-    description: "An MCP (Model Context Protocol) server enabling LLMs and AI agents to interact with Git repositories. Provides tools for comprehensive Git operations including clone, commit, branch, diff, log, status, push, pull, merge, rebase, worktree, tag management, and more, via the MCP standard. STDIO & HTTP.",
+    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",
     files: [
       "dist"
@@ -4275,40 +4275,44 @@ var init_package = __esm(() => {
     },
     homepage: "https://github.com/cyanheads/git-mcp-server#readme",
     scripts: {
-      build: "bun build ./src/index.ts --outdir ./dist --target node",
-      "build:worker": "bun build ./src/worker.ts --outdir ./dist --target bun --no-external",
+      "//--- 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",
       "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:stdio": "MCP_TRANSPORT_TYPE=stdio bun ./dist/index.js",
       "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",
+      "start:stdio": "MCP_TRANSPORT_TYPE=stdio bun ./dist/index.js",
+      "//--- Quality & Maintenance": "",
+      audit: "bun audit",
+      "audit:fix": "bun audit --fix",
       depcheck: "bunx depcheck",
+      format: 'bunx prettier --write "**/*.{ts,js,json,md,html,css}"',
       lint: "bunx eslint .",
       "lint:fix": "bunx eslint . --fix",
-      typecheck: "bunx tsc --noEmit",
-      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",
       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"
+      typecheck: "bunx tsc --noEmit",
+      "//--- Utilities": "",
+      "docs:generate": "bunx typedoc",
+      "fetch-spec": "bun run scripts/fetch-openapi-spec.ts",
+      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"
     },
     resolutions: {
       "@hono/node-server": "1.19.5",
       "chrono-node": "2.9.0",
       dotenv: "17.2.3",
-      hono: "4.9.10",
+      hono: "4.9.12",
       zod: "3.23.8",
       typescript: "5.9.3"
     },
@@ -4321,7 +4325,7 @@ var init_package = __esm(() => {
       "chrono-node": "^2.9.0",
       dotenv: "^17.2.3",
       "fast-xml-parser": "^5.3.0",
-      hono: "^4.9.10",
+      hono: "^4.9.12",
       ignore: "^7.0.5",
       jose: "^6.1.0",
       "js-yaml": "^4.1.0",
@@ -4333,7 +4337,7 @@ var init_package = __esm(() => {
       pino: "^10.0.0",
       "pino-pretty": "^13.1.2",
       "reflect-metadata": "^0.2.2",
-      repomix: "^1.6.1",
+      repomix: "^1.7.0",
       "sanitize-html": "^2.17.0",
       tslib: "^2.8.1",
       tsyringe: "^4.10.0",
@@ -4355,7 +4359,7 @@ var init_package = __esm(() => {
       "@eslint/js": "^9.37.0",
       "@types/bun": "^1.3.0",
       "@types/js-yaml": "^4.0.9",
-      "@types/node": "^24.7.1",
+      "@types/node": "^24.7.2",
       "@types/node-cron": "^3.0.11",
       "@types/papaparse": "^5.3.16",
       "@types/sanitize-html": "^2.16.0",
@@ -4375,23 +4379,14 @@ var init_package = __esm(() => {
       typedoc: "^0.28.14",
       typescript: "^5.9.3",
       "typescript-eslint": "8.46.0",
-      vite: "7.1.7",
+      vite: "7.1.9",
       "vite-tsconfig-paths": "^5.1.4",
       vitest: "^3.2.4"
     },
     keywords: [
-      "typescript",
-      "MCP",
-      "model-context-protocol",
-      "mcp-server",
-      "llm-tools",
-      "git-tools",
-      "LLM",
-      "AI-integration",
-      "server",
-      "git",
-      "version-control",
-      "repository",
+      "ai-agent",
+      "ai-integration",
+      "automation",
       "branch",
       "cherry-pick",
       "clone",
@@ -4399,8 +4394,15 @@ var init_package = __esm(() => {
       "devops",
       "diff",
       "fetch",
+      "git",
+      "git-tools",
+      "llm",
+      "llm-tools",
       "log",
+      "mcp",
+      "mcp-server",
       "merge",
+      "model-context-protocol",
       "pull",
       "push",
       "rebase",
@@ -4409,9 +4411,9 @@ var init_package = __esm(() => {
       "stash",
       "status",
       "tag",
-      "worktree",
-      "ai-agent",
-      "automation"
+      "typescript",
+      "version-control",
+      "worktree"
     ],
     author: "cyanheads <casey@caseyjhand.com> (https://github.com/cyanheads/git-mcp-server#readme)",
     license: "Apache-2.0",
@@ -101618,23 +101620,55 @@ var init_error_handler = __esm(() => {
 });
 // src/utils/internal/runtime.ts
+function detectRuntime() {
+  if (runtimeCaps.isBun) {
+    return "bun";
+  }
+  if (runtimeCaps.isNode) {
+    return "node";
+  }
+  if (runtimeCaps.isWorkerLike) {
+    return "worker";
+  }
+  if (runtimeCaps.isBrowserLike) {
+    return "browser";
+  }
+  return "unknown";
+}
+function getRuntimeDescription() {
+  const runtime = detectRuntime();
+  switch (runtime) {
+    case "bun":
+      return `Bun ${process.versions?.bun || "unknown"}`;
+    case "node":
+      return `Node.js ${process.versions?.node || "unknown"}`;
+    case "worker":
+      return "Cloudflare Workers / Web Worker";
+    case "browser":
+      return "Browser";
+    default:
+      return "Unknown runtime";
+  }
+}
 var safeHas = (key) => {
   try {
     return typeof globalThis[key] !== "undefined";
   } catch {
     return false;
   }
-}, isNode, hasProcess, hasBuffer, hasTextEncoder, hasPerformanceNow, isWorkerLike, isBrowserLike, runtimeCaps;
+}, isBun, isNode, hasProcess, hasBuffer, hasTextEncoder, hasPerformanceNow, isWorkerLike, isBrowserLike, runtimeCaps;
 var init_runtime = __esm(() => {
-  isNode = typeof process !== "undefined" && typeof process.versions?.node === "string";
+  isBun = typeof globalThis.Bun !== "undefined" || typeof process.versions?.bun === "string";
+  isNode = !isBun && typeof process !== "undefined" && typeof process.versions?.node === "string";
   hasProcess = typeof process !== "undefined";
   hasBuffer = typeof Buffer !== "undefined";
   hasTextEncoder = safeHas("TextEncoder");
   hasPerformanceNow = typeof globalThis.performance?.now === "function";
-  isWorkerLike = !isNode && typeof globalThis.WorkerGlobalScope !== "undefined";
-  isBrowserLike = !isNode && !isWorkerLike && safeHas("window");
+  isWorkerLike = !isNode && !isBun && typeof globalThis.WorkerGlobalScope !== "undefined";
+  isBrowserLike = !isNode && !isBun && !isWorkerLike && safeHas("window");
   runtimeCaps = {
     isNode,
+    isBun,
     isWorkerLike,
     isBrowserLike,
     hasProcess,
@@ -135725,10 +135759,12 @@ __export(exports_utils, {
   jsonParser: () => jsonParser,
   initializePerformance_Hrt: () => initializePerformance_Hrt,
   idGenerator: () => idGenerator,
+  getRuntimeDescription: () => getRuntimeDescription,
   getHealthSnapshot: () => getHealthSnapshot,
   generateUUID: () => generateUUID,
   generateRequestContextId: () => generateRequestContextId,
   fetchWithTimeout: () => fetchWithTimeout,
+  detectRuntime: () => detectRuntime,
   degrees: () => import_pdf_lib.degrees,
   dateParser: () => dateParser,
   csvParser: () => csvParser,
@@ -151548,6 +151584,7 @@ async function shutdownOpenTelemetry() {
 var import_reflect_metadata2 = __toESM(require_Reflect(), 1);
 init_utils();
 init_logger();
+init_runtime();
 // src/container/index.ts
 var import_reflect_metadata = __toESM(require_Reflect(), 1);
@@ -151827,32 +151864,98 @@ function isGitNotFoundError(error) {
   return message.includes("git") && (message.includes("not found") || message.includes("enoent") || message.includes("command not found"));
 }
-// src/services/git/providers/cli/utils/git-executor.ts
-var GIT_COMMAND_TIMEOUT_MS = 60000;
-async function executeGitCommand(args, cwd) {
-  try {
-    validateGitArgs(args);
-    const proc = Bun.spawn(["git", ...args], {
+// src/services/git/providers/cli/utils/runtime-adapter.ts
+import { spawn } from "node:child_process";
+function detectRuntime2() {
+  if (typeof globalThis.Bun !== "undefined") {
+    return "bun";
+  }
+  if (process.versions?.bun) {
+    return "bun";
+  }
+  return "node";
+}
+async function spawnWithBun(args, cwd, env, timeout) {
+  const bunApi = globalThis.Bun;
+  const proc = bunApi.spawn(["git", ...args], {
+    cwd,
+    env,
+    stdio: ["ignore", "pipe", "pipe"]
+  });
+  const timeoutPromise = new Promise((_, reject) => {
+    const timeoutId = setTimeout(() => {
+      proc.kill();
+      reject(new Error(`Git command timed out after ${timeout / 1000}s: git ${args.join(" ")}`));
+    }, timeout);
+    proc.exited.finally(() => clearTimeout(timeoutId));
+  });
+  const exitCode = await Promise.race([proc.exited, timeoutPromise]);
+  const [stdout, stderr] = await Promise.all([
+    proc.stdout.text(),
+    proc.stderr.text()
+  ]);
+  if (exitCode !== 0) {
+    const combinedOutput = `Exit Code: ${exitCode}
+Stderr: ${stderr}
+Stdout: ${stdout}`;
+    throw new Error(combinedOutput);
+  }
+  return { stdout, stderr };
+}
+async function spawnWithNode(args, cwd, env, timeout) {
+  return new Promise((resolve, reject) => {
+    const proc = spawn("git", args, {
       cwd,
-      env: buildGitEnv(process.env),
+      env,
       stdio: ["ignore", "pipe", "pipe"]
     });
-    const stdoutPromise = Bun.readableStreamToText(proc.stdout);
-    const stderrPromise = Bun.readableStreamToText(proc.stderr);
-    const timeoutPromise = new Promise((_, reject) => setTimeout(() => {
-      proc.kill();
-      reject(new Error(`Git command timed out after ${GIT_COMMAND_TIMEOUT_MS / 1000}s: ${args.join(" ")}`));
-    }, GIT_COMMAND_TIMEOUT_MS));
-    const exitCode = await Promise.race([proc.exited, timeoutPromise]);
-    const stdout = await stdoutPromise;
-    const stderr = await stderrPromise;
-    if (exitCode !== 0) {
-      const combinedOutput = `Exit Code: ${exitCode}
+    const stdoutChunks = [];
+    const stderrChunks = [];
+    proc.stdout.on("data", (chunk) => {
+      stdoutChunks.push(chunk);
+    });
+    proc.stderr.on("data", (chunk) => {
+      stderrChunks.push(chunk);
+    });
+    const timeoutHandle = setTimeout(() => {
+      proc.kill("SIGTERM");
+      reject(new Error(`Git command timed out after ${timeout / 1000}s: ${args.join(" ")}`));
+    }, timeout);
+    proc.on("error", (error) => {
+      clearTimeout(timeoutHandle);
+      reject(error);
+    });
+    proc.on("close", (exitCode) => {
+      clearTimeout(timeoutHandle);
+      const stdout = Buffer.concat(stdoutChunks).toString("utf-8");
+      const stderr = Buffer.concat(stderrChunks).toString("utf-8");
+      if (exitCode !== 0) {
+        const combinedOutput = `Exit Code: ${exitCode}
 Stderr: ${stderr}
 Stdout: ${stdout}`;
-      throw new Error(combinedOutput);
-    }
-    return { stdout, stderr };
+        reject(new Error(combinedOutput));
+      } else {
+        resolve({ stdout, stderr });
+      }
+    });
+  });
+}
+async function spawnGitCommand(args, cwd, env, timeout = 60000) {
+  const runtime2 = detectRuntime2();
+  if (runtime2 === "bun") {
+    return spawnWithBun(args, cwd, env, timeout);
+  } else {
+    return spawnWithNode(args, cwd, env, timeout);
+  }
+}
+// src/services/git/providers/cli/utils/git-executor.ts
+var GIT_COMMAND_TIMEOUT_MS = 60000;
+async function executeGitCommand(args, cwd) {
+  try {
+    validateGitArgs(args);
+    const result = await spawnGitCommand(args, cwd, buildGitEnv(process.env), GIT_COMMAND_TIMEOUT_MS);
+    return result;
   } catch (error) {
     throw mapGitError(error, args[0] || "unknown");
   }
@@ -152411,6 +152514,14 @@ async function executeBranch(options, context, execGit) {
         ].join(GIT_FIELD_DELIMITER);
         const refPrefix = options.remote ? "refs/remotes" : "refs/heads";
         args.push(`--format=${format}`, refPrefix);
+        if (options.merged !== undefined) {
+          const mergedRef = typeof options.merged === "string" ? options.merged : "HEAD";
+          args.push(`--merged=${mergedRef}`);
+        }
+        if (options.noMerged !== undefined) {
+          const noMergedRef = typeof options.noMerged === "string" ? options.noMerged : "HEAD";
+          args.push(`--no-merged=${noMergedRef}`);
+        }
         const cmd = buildGitCommand({ command: "for-each-ref", args });
         const result = await execGit(cmd, context.workingDirectory, context.requestContext);
         const branches = parseBranchRef(result.stdout);
@@ -165452,7 +165563,7 @@ async function gitWrapupInstructionsLogic(input, { provider, storage, appContext
   let finalInstructions = baseInstructions;
   if (input.updateAgentMetaFiles) {
     finalInstructions += `
-Extra request: review and update if needed the .clinerules and claude.md files if present.`;
+Extra request: review and update if needed the .cline_rules and claude.md files if present.`;
   }
   if (input.createTag) {
     finalInstructions += `
@@ -165520,6 +165631,29 @@ var gitWrapupInstructionsTool = {
 // src/mcp-server/tools/definitions/git-add.tool.ts
 init_lib();
+// src/mcp-server/tools/utils/git-formatters.ts
+function flattenChanges(changes) {
+  const result = {};
+  if (changes.added && changes.added.length > 0) {
+    result.added = changes.added;
+  }
+  if (changes.modified && changes.modified.length > 0) {
+    result.modified = changes.modified;
+  }
+  if (changes.deleted && changes.deleted.length > 0) {
+    result.deleted = changes.deleted;
+  }
+  if (changes.renamed && changes.renamed.length > 0) {
+    result.renamed = changes.renamed;
+  }
+  if (changes.copied && changes.copied.length > 0) {
+    result.copied = changes.copied;
+  }
+  return result;
+}
+// src/mcp-server/tools/definitions/git-add.tool.ts
 var TOOL_NAME10 = "git_add";
 var TOOL_TITLE10 = "Git Add";
 var TOOL_DESCRIPTION10 = "Stage files for commit. Add file contents to the staging area (index) to prepare for the next commit.";
@@ -165559,20 +165693,6 @@ async function gitAddLogic(input, { provider, targetPath, appContext }) {
     requestContext: appContext,
     tenantId: appContext.tenantId || "default-tenant"
   });
-  const flattenChanges = (changes) => {
-    const result2 = {};
-    if (changes.added && changes.added.length > 0)
-      result2.added = changes.added;
-    if (changes.modified && changes.modified.length > 0)
-      result2.modified = changes.modified;
-    if (changes.deleted && changes.deleted.length > 0)
-      result2.deleted = changes.deleted;
-    if (changes.renamed && changes.renamed.length > 0)
-      result2.renamed = changes.renamed;
-    if (changes.copied && changes.copied.length > 0)
-      result2.copied = changes.copied;
-    return result2;
-  };
   return {
     success: result.success,
     stagedFiles: result.stagedFiles,
@@ -165695,20 +165815,6 @@ async function gitCommitLogic(input, { provider, targetPath, appContext }) {
     requestContext: appContext,
     tenantId: appContext.tenantId || "default-tenant"
   });
-  const flattenChanges = (changes) => {
-    const result2 = {};
-    if (changes.added && changes.added.length > 0)
-      result2.added = changes.added;
-    if (changes.modified && changes.modified.length > 0)
-      result2.modified = changes.modified;
-    if (changes.deleted && changes.deleted.length > 0)
-      result2.deleted = changes.deleted;
-    if (changes.renamed && changes.renamed.length > 0)
-      result2.renamed = changes.renamed;
-    if (changes.copied && changes.copied.length > 0)
-      result2.copied = changes.copied;
-    return result2;
-  };
   return {
     success: result.success,
     commitHash: result.commitHash,
@@ -166057,8 +166163,8 @@ var InputSchema15 = z.object({
   force: ForceSchema,
   all: AllSchema.describe("For list operation: show both local and remote branches."),
   remote: z.boolean().default(false).describe("For list operation: show only remote branches."),
-  merged: z.boolean().optional().describe("For list operation: show only branches merged into HEAD."),
-  noMerged: z.boolean().optional().describe("For list operation: show only branches not merged into HEAD.")
+  merged: z.union([z.boolean(), CommitRefSchema]).optional().describe("For list operation: show only branches merged into HEAD (true) or specified commit (string)."),
+  noMerged: z.union([z.boolean(), CommitRefSchema]).optional().describe("For list operation: show only branches not merged into HEAD (true) or specified commit (string).")
 });
 var BranchInfoSchema = z.object({
   name: z.string().describe("Branch name."),
@@ -166093,15 +166199,7 @@ async function gitBranchLogic(input, { provider, targetPath, appContext }) {
       };
     }
   }
-  const {
-    path: _path,
-    operation,
-    name,
-    newName,
-    merged: _merged,
-    noMerged: _noMerged,
-    ...rest
-  } = input;
+  const { path: _path, operation, name, newName, ...rest } = input;
   const branchOptions = {
     mode: operation
   };
@@ -166120,6 +166218,12 @@ async function gitBranchLogic(input, { provider, targetPath, appContext }) {
   if (rest.all !== undefined || rest.remote !== undefined) {
     branchOptions.remote = rest.remote || rest.all;
   }
+  if (rest.merged !== undefined) {
+    branchOptions.merged = rest.merged;
+  }
+  if (rest.noMerged !== undefined) {
+    branchOptions.noMerged = rest.noMerged;
+  }
   const result = await provider.branch(branchOptions, {
     workingDirectory: targetPath,
     requestContext: appContext,
@@ -169269,6 +169373,27 @@ var Hono = class {
   };
 };
+// node_modules/hono/dist/router/reg-exp-router/matcher.js
+var emptyParam = [];
+function match(method, path4) {
+  const matchers = this.buildAllMatchers();
+  const match2 = (method2, path22) => {
+    const matcher = matchers[method2] || matchers[METHOD_NAME_ALL];
+    const staticMatch = matcher[2][path22];
+    if (staticMatch) {
+      return staticMatch;
+    }
+    const match3 = path22.match(matcher[0]);
+    if (!match3) {
+      return [[], emptyParam];
+    }
+    const index = match3.indexOf("", 1);
+    return [matcher[1][index], match3];
+  };
+  this.match = match2;
+  return match2(method, path4);
+}
 // node_modules/hono/dist/router/reg-exp-router/node.js
 var LABEL_REG_EXP_STR = "[^/]+";
 var ONLY_WILDCARD_REG_EXP_STR = ".*";
@@ -169430,7 +169555,6 @@ var Trie = class {
 };
 // node_modules/hono/dist/router/reg-exp-router/router.js
-var emptyParam = [];
 var nullMatcher = [/^$/, [], /* @__PURE__ */ Object.create(null)];
 var wildcardRegExpCache = /* @__PURE__ */ Object.create(null);
 function buildWildcardRegExp(path4) {
@@ -169565,30 +169689,14 @@ var RegExpRouter = class {
       });
     }
   }
-  match(method, path4) {
-    clearWildcardRegExpCache();
-    const matchers = this.#buildAllMatchers();
-    this.match = (method2, path22) => {
-      const matcher = matchers[method2] || matchers[METHOD_NAME_ALL];
-      const staticMatch = matcher[2][path22];
-      if (staticMatch) {
-        return staticMatch;
-      }
-      const match = path22.match(matcher[0]);
-      if (!match) {
-        return [[], emptyParam];
-      }
-      const index = match.indexOf("", 1);
-      return [matcher[1][index], match];
-    };
-    return this.match(method, path4);
-  }
-  #buildAllMatchers() {
+  match = match;
+  buildAllMatchers() {
     const matchers = /* @__PURE__ */ Object.create(null);
     Object.keys(this.#routes).concat(Object.keys(this.#middleware)).forEach((method) => {
       matchers[method] ||= this.#buildMatcher(method);
     });
     this.#middleware = this.#routes = undefined;
+    clearWildcardRegExpCache();
     return matchers;
   }
   #buildMatcher(method) {
@@ -169611,6 +169719,78 @@ var RegExpRouter = class {
   }
 };
+// node_modules/hono/dist/router/reg-exp-router/prepared-router.js
+var PreparedRegExpRouter = class {
+  name = "PreparedRegExpRouter";
+  #matchers;
+  #relocateMap;
+  constructor(matchers, relocateMap) {
+    this.#matchers = matchers;
+    this.#relocateMap = relocateMap;
+  }
+  #addWildcard(method, handlerData) {
+    const matcher = this.#matchers[method];
+    matcher[1].forEach((list) => list && list.push(handlerData));
+    Object.values(matcher[2]).forEach((list) => list[0].push(handlerData));
+  }
+  #addPath(method, path4, handler, indexes, map3) {
+    const matcher = this.#matchers[method];
+    if (!map3) {
+      matcher[2][path4][0].push([handler, {}]);
+    } else {
+      indexes.forEach((index) => {
+        if (typeof index === "number") {
+          matcher[1][index].push([handler, map3]);
+        } else {
+          matcher[2][index || path4][0].push([handler, map3]);
+        }
+      });
+    }
+  }
+  add(method, path4, handler) {
+    if (!this.#matchers[method]) {
+      const all = this.#matchers[METHOD_NAME_ALL];
+      const staticMap = {};
+      for (const key in all[2]) {
+        staticMap[key] = [all[2][key][0].slice(), emptyParam];
+      }
+      this.#matchers[method] = [
+        all[0],
+        all[1].map((list) => Array.isArray(list) ? list.slice() : 0),
+        staticMap
+      ];
+    }
+    if (path4 === "/*" || path4 === "*") {
+      const handlerData = [handler, {}];
+      if (method === METHOD_NAME_ALL) {
+        for (const m in this.#matchers) {
+          this.#addWildcard(m, handlerData);
+        }
+      } else {
+        this.#addWildcard(method, handlerData);
+      }
+      return;
+    }
+    const data = this.#relocateMap[path4];
+    if (!data) {
+      throw new Error(`Path ${path4} is not registered`);
+    }
+    for (const [indexes, map3] of data) {
+      if (method === METHOD_NAME_ALL) {
+        for (const m in this.#matchers) {
+          this.#addPath(m, path4, handler, indexes, map3);
+        }
+      } else {
+        this.#addPath(method, path4, handler, indexes, map3);
+      }
+    }
+  }
+  buildAllMatchers() {
+    return this.#matchers;
+  }
+  match = match;
+};
 // node_modules/hono/dist/router/smart-router/router.js
 var SmartRouter = class {
   name = "SmartRouter";
@@ -172351,6 +172531,13 @@ var start = async () => {
   }
   await logger.initialize(validatedMcpLogLevel);
   logger.info(`Logger initialized. Effective MCP logging level: ${validatedMcpLogLevel}.`, requestContextService.createRequestContext({ operation: "LoggerInit" }));
+  const runtime2 = detectRuntime();
+  const runtimeDesc = getRuntimeDescription();
+  logger.info(`Runtime detected: ${runtimeDesc}`, requestContextService.createRequestContext({
+    operation: "RuntimeDetection",
+    runtime: runtime2,
+    runtimeVersion: runtimeDesc
+  }));
   logger.info(`Storage service initialized with provider: ${config2.storage.providerType}`, requestContextService.createRequestContext({ operation: "StorageInit" }));
   transportManager = container_default.resolve(TransportManagerToken);
   const startupContext = requestContextService.createRequestContext({

package/package.json CHANGED Viewed

@@ -1,8 +1,8 @@
 {
   "name": "@cyanheads/git-mcp-server",
-  "version": "2.4.5",
+  "version": "2.4.7",
   "mcpName": "io.github.cyanheads/git-mcp-server",
-  "description": "An MCP (Model Context Protocol) server enabling LLMs and AI agents to interact with Git repositories. Provides tools for comprehensive Git operations including clone, commit, branch, diff, log, status, push, pull, merge, rebase, worktree, tag management, and more, via the MCP standard. STDIO & HTTP.",
+  "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",
   "files": [
     "dist"
@@ -29,40 +29,44 @@
   },
   "homepage": "https://github.com/cyanheads/git-mcp-server#readme",
   "scripts": {
-    "build": "bun build ./src/index.ts --outdir ./dist --target node",
-    "build:worker": "bun build ./src/worker.ts --outdir ./dist --target bun --no-external",
+    "//--- 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",
     "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:stdio": "MCP_TRANSPORT_TYPE=stdio bun ./dist/index.js",
     "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",
+    "start:stdio": "MCP_TRANSPORT_TYPE=stdio bun ./dist/index.js",
+    "//--- Quality & Maintenance": "",
+    "audit": "bun audit",
+    "audit:fix": "bun audit --fix",
     "depcheck": "bunx depcheck",
+    "format": "bunx prettier --write \"**/*.{ts,js,json,md,html,css}\"",
     "lint": "bunx eslint .",
     "lint:fix": "bunx eslint . --fix",
-    "typecheck": "bunx tsc --noEmit",
-    "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",
     "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"
+    "typecheck": "bunx tsc --noEmit",
+    "//--- Utilities": "",
+    "docs:generate": "bunx typedoc",
+    "fetch-spec": "bun run scripts/fetch-openapi-spec.ts",
+    "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"
   },
   "resolutions": {
     "@hono/node-server": "1.19.5",
     "chrono-node": "2.9.0",
     "dotenv": "17.2.3",
-    "hono": "4.9.10",
+    "hono": "4.9.12",
     "zod": "3.23.8",
     "typescript": "5.9.3"
   },
@@ -75,7 +79,7 @@
     "chrono-node": "^2.9.0",
     "dotenv": "^17.2.3",
     "fast-xml-parser": "^5.3.0",
-    "hono": "^4.9.10",
+    "hono": "^4.9.12",
     "ignore": "^7.0.5",
     "jose": "^6.1.0",
     "js-yaml": "^4.1.0",
@@ -87,7 +91,7 @@
     "pino": "^10.0.0",
     "pino-pretty": "^13.1.2",
     "reflect-metadata": "^0.2.2",
-    "repomix": "^1.6.1",
+    "repomix": "^1.7.0",
     "sanitize-html": "^2.17.0",
     "tslib": "^2.8.1",
     "tsyringe": "^4.10.0",
@@ -109,7 +113,7 @@
     "@eslint/js": "^9.37.0",
     "@types/bun": "^1.3.0",
     "@types/js-yaml": "^4.0.9",
-    "@types/node": "^24.7.1",
+    "@types/node": "^24.7.2",
     "@types/node-cron": "^3.0.11",
     "@types/papaparse": "^5.3.16",
     "@types/sanitize-html": "^2.16.0",
@@ -129,23 +133,14 @@
     "typedoc": "^0.28.14",
     "typescript": "^5.9.3",
     "typescript-eslint": "8.46.0",
-    "vite": "7.1.7",
+    "vite": "7.1.9",
     "vite-tsconfig-paths": "^5.1.4",
     "vitest": "^3.2.4"
   },
   "keywords": [
-    "typescript",
-    "MCP",
-    "model-context-protocol",
-    "mcp-server",
-    "llm-tools",
-    "git-tools",
-    "LLM",
-    "AI-integration",
-    "server",
-    "git",
-    "version-control",
-    "repository",
+    "ai-agent",
+    "ai-integration",
+    "automation",
     "branch",
     "cherry-pick",
     "clone",
@@ -153,8 +148,15 @@
     "devops",
     "diff",
     "fetch",
+    "git",
+    "git-tools",
+    "llm",
+    "llm-tools",
     "log",
+    "mcp",
+    "mcp-server",
     "merge",
+    "model-context-protocol",
     "pull",
     "push",
     "rebase",
@@ -163,9 +165,9 @@
     "stash",
     "status",
     "tag",
-    "worktree",
-    "ai-agent",
-    "automation"
+    "typescript",
+    "version-control",
+    "worktree"
   ],
   "author": "cyanheads <casey@caseyjhand.com> (https://github.com/cyanheads/git-mcp-server#readme)",
   "license": "Apache-2.0",