@rethunk/mcp-multi-root-git 2.3.3 → 2.3.4

package/AGENTS.md

@@ -36,6 +36,7 @@ IDEs injecting this as context: do not re-link from rules.
 | [`src/server/git-cherry-pick-tool.ts`](src/server/git-cherry-pick-tool.ts) | `git_cherry_pick` — mutating |
 | [`src/server/git-reset-soft-tool.ts`](src/server/git-reset-soft-tool.ts) | `git_reset_soft` — soft-reset; mutating |
 | [`src/server/presets-resource.ts`](src/server/presets-resource.ts) | `rethunk-git://presets` resource |
+| [`src/server/tool-parameter-schemas.ts`](src/server/tool-parameter-schemas.ts) | `buildToolParameterSchemaDocument`, `captureToolParameterSchemas`; backs `tool-parameters.schema.json` |
 | [`src/repo-paths.ts`](src/repo-paths.ts) | `resolvePathForRepo`, `assertRelativePathUnderTop`, `isStrictlyUnderGitTop` |
 
 ## Changing contracts
@@ -47,7 +48,7 @@ IDEs injecting this as context: do not re-link from rules.
 
 ## Validate + CI
 
-Local: `bun run build` | `bun run check` | `bun run test`. CI ([`ci.yml`](.github/workflows/ci.yml)) runs same on PRs + `main` after `bun install --frozen-lockfile`, uploads prerelease `npm pack` artifact. Tag `v*.*.*` matching `package.json` version → [`release.yml`](.github/workflows/release.yml) publishes to GitHub Packages as `@rethunk-ai/mcp-multi-root-git` + cuts GitHub Release. npmjs publish is manual (see [HUMANS.md](HUMANS.md)).
+Local: `bun run build` | `bun run check` | `bun run schema:tools:check` | `bun run test`. CI ([`ci.yml`](.github/workflows/ci.yml)) runs same on PRs + `main` after `bun install --frozen-lockfile`, then `bun run test:coverage` + `bun run coverage:check`, and uploads prerelease `npm pack` artifact. Tag `v*.*.*` matching `package.json` version → [`release.yml`](.github/workflows/release.yml) publishes to GitHub Packages as `@rethunk-ai/mcp-multi-root-git` + cuts GitHub Release. npmjs publish is manual (see [HUMANS.md](HUMANS.md)).
 
 Optional [`.githooks/`](.githooks): `bun run setup-hooks` once per clone. pre-commit=`check`; pre-push=frozen install + build + check + test.
 

package/CHANGELOG.md

@@ -2,6 +2,24 @@
 
 All notable changes to `@rethunk/mcp-multi-root-git` are documented here. Format loosely follows [Keep a Changelog](https://keepachangelog.com); the project uses [Semantic Versioning](https://semver.org).
 
+## [2.3.4] — 2026-04-26
+
+Publication-prep patch for the `absoluteGitRoots` line.
+
+### Added
+
+- **`tool-parameters.schema.json`** — generated JSON Schema snapshot for every registered tool parameter surface, plus `bun run schema:tools` / `bun run schema:tools:check`.
+- **`git_parity` absolute-root regression coverage** — sibling clone batches are now covered directly.
+
+### Fixed
+
+- **CI coverage gate** now checks `% Lines` from Bun's coverage table instead of accidentally reading `% Funcs`.
+
+### Documentation
+
+- **`HUMANS.md`** — added sibling-clone `absoluteGitRoots` examples for `git_status` and `git_parity`.
+- **`docs/mcp-tools.md`** — clarified direct `git_push` use for already-committed work and `git_parity` sibling-clone batches.
+
 ## [2.3.3] — 2026-04-21
 
 ### Added

package/HUMANS.md

@@ -53,6 +53,22 @@ With **multiple MCP file roots**, the server picks a root whose git toplevel def
 
 If you installed from **GitHub Packages**, use **`./node_modules/@rethunk-ai/mcp-multi-root-git/git-mcp-presets.schema.json`** in **`$schema`** instead (see [docs/install.md](docs/install.md#github-packages)).
 
+## Tool parameter schema artifact
+
+The package ships **`tool-parameters.schema.json`**, a generated JSON Schema snapshot of every registered tool's parameter schema. Maintainers regenerate it with:
+
+```bash
+bun run schema:tools
+```
+
+CI and `prepublishOnly` use:
+
+```bash
+bun run schema:tools:check
+```
+
+This artifact is for inspection, drift checks, and clients that want an offline schema snapshot. Runtime MCP schema discovery remains the source of truth for connected clients.
+
 **Layouts:**
 
 1. **Wrapped (recommended):** `{ "schemaVersion": "1", "presets": { "<name>": { ... } } }`.
@@ -74,6 +90,37 @@ Invalid JSON or schema errors return **`preset_file_invalid`** (not a silent emp
 
 Relative preset paths must stay inside the git toplevel; escapes are rejected.
 
+## Sibling clone batches
+
+Use **`absoluteGitRoots`** when you want one read-only call to inspect independent sibling clones that are not all exposed as MCP workspace roots. This is most useful from agent workflows rooted at a parent directory or when an MCP client exposes only one repo root.
+
+Example `git_status` batch:
+
+```json
+{
+  "format": "json",
+  "absoluteGitRoots": [
+    "/usr/local/src/com.github/Rethunk-AI/mcp-multi-root-git",
+    "/usr/local/src/com.github/Rethunk-AI/rethunk-github-mcp"
+  ]
+}
+```
+
+Example `git_parity` batch using the same pair in each sibling clone:
+
+```json
+{
+  "format": "json",
+  "absoluteGitRoots": [
+    "/usr/local/src/com.github/Rethunk-AI/mcp-multi-root-git",
+    "/usr/local/src/com.github/Rethunk-AI/rethunk-github-mcp"
+  ],
+  "pairs": [{ "left": "packages/shared", "right": "apps/web/shared", "label": "shared" }]
+}
+```
+
+`absoluteGitRoots` is read-only by design. Mutating tools such as **`batch_commit`**, **`git_push`**, **`git_merge`**, and **`git_cherry_pick`** omit it from their schema; use `workspaceRoot` or MCP roots for writes. Full parameter rules and error codes live in **[docs/mcp-tools.md](docs/mcp-tools.md#absoluteGitRoots-sibling-clones)**.
+
 ## `git_not_found`
 
 If **`git`** is missing or not runnable, tools and the presets resource respond with **`git_not_found`**. Prerequisites and `PATH`: **[docs/install.md](docs/install.md)**.
@@ -97,6 +144,14 @@ Tag pushes run [`.github/workflows/release.yml`](.github/workflows/release.yml):
 
 Prerequisite: push a **semver git tag** `vX.Y.Z` that **exactly matches** `version` in `package.json` (e.g. `v1.2.3` and `"version": "1.2.3"`).
 
+Before tagging, run the clean-tree preflight from the release commit:
+
+```bash
+bun run publish:preflight
+```
+
+It verifies the `package.json` version has a matching `CHANGELOG.md` section, generated tool schemas are current, build/check/coverage pass, and `npm pack --dry-run` includes the expected package files.
+
 ### npmjs (manual) — maintainers only
 
 npmjs no longer fits an unattended CI publish flow for this org; **do not** rely on automation to [npmjs](https://www.npmjs.com/package/@rethunk/mcp-multi-root-git). To publish the **same** package name consumers already use (**`@rethunk/mcp-multi-root-git`**):

package/dist/server/coverage.js

@@ -0,0 +1,22 @@
+export function parseAllFilesLineCoverage(output) {
+    const rows = output
+        .split(/\r?\n/)
+        .map((line) => line.trim())
+        .filter((line) => line.includes("|"));
+    const header = rows.find((line) => /^File\s*\|/i.test(line));
+    if (!header)
+        return null;
+    const columns = header.split("|").map((column) => column.trim().toLowerCase());
+    const lineIndex = columns.indexOf("% lines");
+    if (lineIndex === -1)
+        return null;
+    const allFiles = rows.find((line) => /^All files\s*\|/i.test(line));
+    if (!allFiles)
+        return null;
+    const cells = allFiles.split("|").map((cell) => cell.trim());
+    const raw = cells[lineIndex];
+    if (!raw)
+        return null;
+    const value = Number.parseFloat(raw);
+    return Number.isFinite(value) ? value : null;
+}

package/dist/server/test-harness.js

@@ -62,7 +62,10 @@ function makeFakeServer() {
     const server = {
         sessions: [],
         addTool(tool) {
-            tools.push({ name: tool.name, execute: tool.execute });
+            tools.push({ name: tool.name, parameters: tool.parameters, execute: tool.execute });
+        },
+        addResource() {
+            // Resource tests do not need transport behavior; tool-surface tests only need registration to complete.
         },
     };
     return { server, tools };
@@ -89,3 +92,8 @@ export function captureTool(register, toolName) {
         return JSON.stringify(result);
     };
 }
+export function captureToolDefinitions(register) {
+    const { server, tools } = makeFakeServer();
+    register(server);
+    return tools;
+}

package/dist/server/tool-parameter-schemas.js

@@ -0,0 +1,74 @@
+import { z } from "zod";
+import { registerBatchCommitTool } from "./batch-commit-tool.js";
+import { registerGitCherryPickTool } from "./git-cherry-pick-tool.js";
+import { registerGitDiffSummaryTool } from "./git-diff-summary-tool.js";
+import { registerGitInventoryTool } from "./git-inventory-tool.js";
+import { registerGitLogTool } from "./git-log-tool.js";
+import { registerGitMergeTool } from "./git-merge-tool.js";
+import { registerGitParityTool } from "./git-parity-tool.js";
+import { registerGitPushTool } from "./git-push-tool.js";
+import { registerGitResetSoftTool } from "./git-reset-soft-tool.js";
+import { registerGitStatusTool } from "./git-status-tool.js";
+import { registerGitWorktreeAddTool, registerGitWorktreeListTool, registerGitWorktreeRemoveTool, } from "./git-worktree-tool.js";
+import { registerListPresetsTool } from "./list-presets-tool.js";
+export const READ_ONLY_ABSOLUTE_ROOT_TOOLS = [
+    "git_status",
+    "git_inventory",
+    "git_parity",
+    "list_presets",
+    "git_log",
+    "git_diff_summary",
+];
+export const MUTATING_TOOLS = [
+    "batch_commit",
+    "git_push",
+    "git_merge",
+    "git_cherry_pick",
+    "git_reset_soft",
+    "git_worktree_add",
+    "git_worktree_remove",
+];
+export const ALL_PARAMETER_SCHEMA_TOOLS = [
+    ...READ_ONLY_ABSOLUTE_ROOT_TOOLS,
+    "git_worktree_list",
+    ...MUTATING_TOOLS,
+];
+function captureParameterTools(register) {
+    const tools = [];
+    const server = {
+        sessions: [],
+        addTool(tool) {
+            tools.push({ name: tool.name, parameters: tool.parameters });
+        },
+    };
+    register(server);
+    return tools;
+}
+export function captureToolParameterSchemas() {
+    const tools = captureParameterTools((server) => {
+        registerGitStatusTool(server);
+        registerGitInventoryTool(server);
+        registerGitParityTool(server);
+        registerListPresetsTool(server);
+        registerGitLogTool(server);
+        registerGitDiffSummaryTool(server);
+        registerGitWorktreeListTool(server);
+        registerBatchCommitTool(server);
+        registerGitPushTool(server);
+        registerGitMergeTool(server);
+        registerGitCherryPickTool(server);
+        registerGitResetSoftTool(server);
+        registerGitWorktreeAddTool(server);
+        registerGitWorktreeRemoveTool(server);
+    });
+    return Object.fromEntries(tools.map((tool) => [tool.name, z.toJSONSchema(tool.parameters)]));
+}
+export function buildToolParameterSchemaDocument() {
+    return {
+        $schema: "https://json-schema.org/draft/2020-12/schema",
+        title: "@rethunk/mcp-multi-root-git tool parameter schemas",
+        description: "JSON Schema snapshots generated from registered FastMCP tool parameter schemas.",
+        generatedBy: "scripts/generate-tool-parameters-schema.ts",
+        tools: captureToolParameterSchemas(),
+    };
+}

package/docs/mcp-tools.md

@@ -13,7 +13,7 @@ MCP clients expose tools as `{serverName}_{toolName}`. With the server registere
 |----------|-----------------------------------|---------|
 | `git_status` | `rethunk-git_git_status` | `git status --short -b` per MCP root and optional submodules (`includeSubmodules`); parallel submodule status. Args include `absoluteGitRoots`, `allWorkspaceRoots`, `rootIndex`, `workspaceRoot`, `format`. **Read-only.** |
 | `git_inventory` | `rethunk-git_git_inventory` | Status + ahead/behind per path; default upstream each repo’s `@{u}`; pass **both** `remote` and `branch` for fixed tracking. `nestedRoots`, `preset`, `presetMerge`, `maxRoots`, `format`, plus workspace pick args (`absoluteGitRoots` cannot combine with `preset`/`nestedRoots`). **Read-only.** |
-| `git_parity` | `rethunk-git_git_parity` | Compare `git rev-parse HEAD` for path pairs. `pairs`, `preset`, `presetMerge`, `format`, plus workspace pick args. **Read-only.** |
+| `git_parity` | `rethunk-git_git_parity` | Compare `git rev-parse HEAD` for path pairs. `pairs`, `preset`, `presetMerge`, `format`, plus workspace pick args (`absoluteGitRoots` for sibling clone batches). **Read-only.** |
 | `list_presets` | `rethunk-git_list_presets` | List preset names/counts from `.rethunk/git-mcp-presets.json`; invalid JSON/schema surface as errors. Workspace pick + `format` only (includes `absoluteGitRoots`). **Read-only.** |
 | `git_log` | `rethunk-git_git_log` | Path-filtered, time-windowed `git log` across one or more workspace roots. Returns commit history with author, date, subject, and shortstat. Args: `since`, `paths`, `grep`, `author`, `maxCommits`, `branch`, plus workspace pick args (`absoluteGitRoots` for sibling clones) + `format`. **Read-only.** |
 | `git_diff_summary` | `rethunk-git_git_diff_summary` | Structured, token-efficient diff viewer. Returns per-file diffs with additions/deletions counts, truncated to configurable line limits, with lock files/dist/vendor excluded by default. Args: `range`, `fileFilter`, `maxLinesPerFile`, `maxFiles`, `excludePatterns`, plus workspace pick args (optional single-entry `absoluteGitRoots`) + `format`. **Read-only.** |
@@ -32,6 +32,8 @@ Pass **`format: "json"`** on any tool for structured JSON instead of markdown (d
 
 Tool JSON bodies are minified and contain only the payload — no `rethunkGitMcp` envelope. Current `MCP_JSON_FORMAT_VERSION` is **`"3"`**; server + format version are discoverable via MCP `initialize`. Payload keys (`groups`, `inventories`, `parity`, `roots`) are stable within a given format version. Preset-related responses may include **`presetSchemaVersion`**.
 
+The package also ships **`tool-parameters.schema.json`**, generated from the registered Zod parameter schemas via `bun run schema:tools`. Connected MCP clients should still prefer live schema discovery from `initialize` / tool listing; the artifact is for offline inspection and drift checks.
+
 ### v2/v3 field omission (consumer contract)
 
 To keep responses compact, **optional fields are omitted when they would be empty, `null`, or `false`** — they are not emitted as `null`. Consumers must test for *presence*, not compare to `null`.
@@ -113,6 +115,23 @@ v2 field-omission rules still apply: `filesChanged`, `insertions`, `deletions` o
 | `absolute_git_roots_empty` | `absoluteGitRoots` produced zero git toplevels after resolution. |
 | `absolute_git_roots_single_repo_only` | A single-repo tool received `absoluteGitRoots` resolving to more than one distinct git toplevel. |
 
+### `git_parity` — `absoluteGitRoots` example
+
+Use **`absoluteGitRoots`** when the same parity pair should be checked across sibling clones that are not all MCP workspace roots:
+
+```json
+{
+  "format": "json",
+  "absoluteGitRoots": [
+    "/usr/local/src/com.github/Rethunk-AI/mcp-multi-root-git",
+    "/usr/local/src/com.github/Rethunk-AI/rethunk-github-mcp"
+  ],
+  "pairs": [{ "left": "packages/shared", "right": "apps/web/shared", "label": "shared" }]
+}
+```
+
+The response contains one **`parity[]`** entry per resolved git toplevel. `absoluteGitRoots` cannot be combined with `preset`; pass inline `pairs` for sibling-clone batches.
+
 ### `git_diff_summary` — parameters
 
 | Parameter | Type | Default | Notes |
@@ -352,6 +371,8 @@ Repo state is cleaned (`git cherry-pick --abort`) before returning — no partia
 
 ### `git_push` — parameters
 
+For already-committed work, call **`git_push`** directly instead of creating an empty commit or falling back to shell. Continue to prefer **`batch_commit`** with **`push: "after"`** when commits and push happen in the same MCP call.
+
 | Parameter | Type | Notes |
 |-----------|------|-------|
 | `remote` | string | Remote to push to. Defaults to the remote inferred from the upstream tracking ref, or `origin` when `setUpstream` is true. |

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@rethunk/mcp-multi-root-git",
-  "version": "2.3.3",
+  "version": "2.3.4",
   "description": "MCP stdio server: multi-root git status, inventory, and HEAD parity checks. Generic tools usable by any workspace.",
   "type": "module",
   "private": false,
@@ -11,6 +11,7 @@
   "files": [
     "dist",
     "git-mcp-presets.schema.json",
+    "tool-parameters.schema.json",
     "docs/install.md",
     "docs/mcp-tools.md",
     "AGENTS.md",
@@ -31,9 +32,13 @@
     "build": "rimraf dist && tsc",
     "check": "biome check .",
     "check:fix": "biome check --write .",
+    "coverage:check": "bun scripts/check-coverage.ts",
+    "schema:tools": "bun scripts/generate-tool-parameters-schema.ts",
+    "schema:tools:check": "bun scripts/generate-tool-parameters-schema.ts --check",
+    "publish:preflight": "bun scripts/publish-preflight.ts",
     "test": "bun test src/",
     "test:coverage": "bun test src/ --coverage",
-    "prepublishOnly": "bun run build && bun run check && bun run test",
+    "prepublishOnly": "bun run schema:tools:check && bun run build && bun run check && bun run test",
     "setup-hooks": "git config core.hooksPath .githooks"
   },
   "keywords": [
@@ -57,13 +62,13 @@
     "access": "public"
   },
   "dependencies": {
-    "fastmcp": "^3.35.0",
+    "fastmcp": "^4.0.1",
     "zod": "^4.3.6"
   },
   "devDependencies": {
-    "@biomejs/biome": "^2.4.11",
-    "@types/node": "^22.19.17",
+    "@biomejs/biome": "^2.4.13",
+    "@types/node": "^25.6.0",
     "rimraf": "^6.1.3",
-    "typescript": "^6.0.2"
+    "typescript": "^6.0.3"
   }
 }

package/tool-parameters.schema.json

@@ -0,0 +1,812 @@
+{
+  "$schema": "https://json-schema.org/draft/2020-12/schema",
+  "title": "@rethunk/mcp-multi-root-git tool parameter schemas",
+  "description": "JSON Schema snapshots generated from registered FastMCP tool parameter schemas.",
+  "generatedBy": "scripts/generate-tool-parameters-schema.ts",
+  "tools": {
+    "git_status": {
+      "$schema": "https://json-schema.org/draft/2020-12/schema",
+      "type": "object",
+      "properties": {
+        "workspaceRoot": {
+          "description": "Highest-priority override.",
+          "type": "string"
+        },
+        "rootIndex": {
+          "description": "0-based index into the MCP file roots list; ignored when workspaceRoot is set.",
+          "type": "integer",
+          "minimum": 0,
+          "maximum": 9007199254740991
+        },
+        "allWorkspaceRoots": {
+          "default": false,
+          "description": "Fan out across all MCP file roots.",
+          "type": "boolean"
+        },
+        "absoluteGitRoots": {
+          "description": "Absolute paths to git repo roots. Use for many sibling clones under a non-git parent directory.",
+          "maxItems": 256,
+          "type": "array",
+          "items": {
+            "type": "string"
+          }
+        },
+        "format": {
+          "default": "markdown",
+          "type": "string",
+          "enum": [
+            "markdown",
+            "json"
+          ]
+        },
+        "includeSubmodules": {
+          "default": true,
+          "type": "boolean"
+        }
+      },
+      "required": [
+        "allWorkspaceRoots",
+        "format",
+        "includeSubmodules"
+      ],
+      "additionalProperties": false
+    },
+    "git_inventory": {
+      "$schema": "https://json-schema.org/draft/2020-12/schema",
+      "type": "object",
+      "properties": {
+        "workspaceRoot": {
+          "description": "Highest-priority override.",
+          "type": "string"
+        },
+        "rootIndex": {
+          "description": "0-based index into the MCP file roots list; ignored when workspaceRoot is set.",
+          "type": "integer",
+          "minimum": 0,
+          "maximum": 9007199254740991
+        },
+        "allWorkspaceRoots": {
+          "default": false,
+          "description": "Fan out across all MCP file roots.",
+          "type": "boolean"
+        },
+        "absoluteGitRoots": {
+          "description": "Absolute paths to git repo roots. Use for many sibling clones under a non-git parent directory.",
+          "maxItems": 256,
+          "type": "array",
+          "items": {
+            "type": "string"
+          }
+        },
+        "format": {
+          "default": "markdown",
+          "type": "string",
+          "enum": [
+            "markdown",
+            "json"
+          ]
+        },
+        "nestedRoots": {
+          "type": "array",
+          "items": {
+            "type": "string"
+          }
+        },
+        "preset": {
+          "type": "string"
+        },
+        "presetMerge": {
+          "default": false,
+          "description": "Merge with preset instead of replacing.",
+          "type": "boolean"
+        },
+        "remote": {
+          "description": "Pair with `branch`.",
+          "type": "string"
+        },
+        "branch": {
+          "description": "Pair with `remote`.",
+          "type": "string"
+        },
+        "maxRoots": {
+          "default": 64,
+          "type": "integer",
+          "minimum": 1,
+          "maximum": 256
+        }
+      },
+      "required": [
+        "allWorkspaceRoots",
+        "format",
+        "presetMerge",
+        "maxRoots"
+      ],
+      "additionalProperties": false
+    },
+    "git_parity": {
+      "$schema": "https://json-schema.org/draft/2020-12/schema",
+      "type": "object",
+      "properties": {
+        "workspaceRoot": {
+          "description": "Highest-priority override.",
+          "type": "string"
+        },
+        "rootIndex": {
+          "description": "0-based index into the MCP file roots list; ignored when workspaceRoot is set.",
+          "type": "integer",
+          "minimum": 0,
+          "maximum": 9007199254740991
+        },
+        "allWorkspaceRoots": {
+          "default": false,
+          "description": "Fan out across all MCP file roots.",
+          "type": "boolean"
+        },
+        "absoluteGitRoots": {
+          "description": "Absolute paths to git repo roots. Use for many sibling clones under a non-git parent directory.",
+          "maxItems": 256,
+          "type": "array",
+          "items": {
+            "type": "string"
+          }
+        },
+        "format": {
+          "default": "markdown",
+          "type": "string",
+          "enum": [
+            "markdown",
+            "json"
+          ]
+        },
+        "pairs": {
+          "type": "array",
+          "items": {
+            "type": "object",
+            "properties": {
+              "left": {
+                "type": "string"
+              },
+              "right": {
+                "type": "string"
+              },
+              "label": {
+                "type": "string"
+              }
+            },
+            "required": [
+              "left",
+              "right"
+            ],
+            "additionalProperties": false
+          }
+        },
+        "preset": {
+          "type": "string"
+        },
+        "presetMerge": {
+          "default": false,
+          "type": "boolean"
+        }
+      },
+      "required": [
+        "allWorkspaceRoots",
+        "format",
+        "presetMerge"
+      ],
+      "additionalProperties": false
+    },
+    "list_presets": {
+      "$schema": "https://json-schema.org/draft/2020-12/schema",
+      "type": "object",
+      "properties": {
+        "workspaceRoot": {
+          "description": "Highest-priority override.",
+          "type": "string"
+        },
+        "rootIndex": {
+          "description": "0-based index into the MCP file roots list; ignored when workspaceRoot is set.",
+          "type": "integer",
+          "minimum": 0,
+          "maximum": 9007199254740991
+        },
+        "allWorkspaceRoots": {
+          "default": false,
+          "description": "Fan out across all MCP file roots.",
+          "type": "boolean"
+        },
+        "absoluteGitRoots": {
+          "description": "Absolute paths to git repo roots. Use for many sibling clones under a non-git parent directory.",
+          "maxItems": 256,
+          "type": "array",
+          "items": {
+            "type": "string"
+          }
+        },
+        "format": {
+          "default": "markdown",
+          "type": "string",
+          "enum": [
+            "markdown",
+            "json"
+          ]
+        }
+      },
+      "required": [
+        "allWorkspaceRoots",
+        "format"
+      ],
+      "additionalProperties": false
+    },
+    "git_log": {
+      "$schema": "https://json-schema.org/draft/2020-12/schema",
+      "type": "object",
+      "properties": {
+        "workspaceRoot": {
+          "description": "Highest-priority override.",
+          "type": "string"
+        },
+        "rootIndex": {
+          "description": "0-based index into the MCP file roots list; ignored when workspaceRoot is set.",
+          "type": "integer",
+          "minimum": 0,
+          "maximum": 9007199254740991
+        },
+        "allWorkspaceRoots": {
+          "default": false,
+          "description": "Fan out across all MCP file roots.",
+          "type": "boolean"
+        },
+        "absoluteGitRoots": {
+          "description": "Absolute paths to git repo roots. Use for many sibling clones under a non-git parent directory.",
+          "maxItems": 256,
+          "type": "array",
+          "items": {
+            "type": "string"
+          }
+        },
+        "format": {
+          "default": "markdown",
+          "type": "string",
+          "enum": [
+            "markdown",
+            "json"
+          ]
+        },
+        "since": {
+          "description": "Passed to `git log --since=`. Accepts ISO timestamps or git relative forms like `48.hours` or `2.weeks.ago`. Default: `7.days`.",
+          "type": "string"
+        },
+        "paths": {
+          "description": "Limit to commits touching these paths (passed as `-- <paths>`).",
+          "type": "array",
+          "items": {
+            "type": "string"
+          }
+        },
+        "grep": {
+          "description": "Filter commits whose message matches this regex (git `--grep`, case-insensitive).",
+          "type": "string"
+        },
+        "author": {
+          "description": "Filter by author name or email (passed as `--author=`).",
+          "type": "string"
+        },
+        "maxCommits": {
+          "default": 50,
+          "description": "Maximum commits to return per root (hard cap 500). Default 50.",
+          "type": "integer",
+          "minimum": 1,
+          "maximum": 500
+        },
+        "branch": {
+          "description": "Ref/branch to log from. Default: HEAD.",
+          "type": "string"
+        }
+      },
+      "required": [
+        "allWorkspaceRoots",
+        "format",
+        "maxCommits"
+      ],
+      "additionalProperties": false
+    },
+    "git_diff_summary": {
+      "$schema": "https://json-schema.org/draft/2020-12/schema",
+      "type": "object",
+      "properties": {
+        "workspaceRoot": {
+          "description": "Highest-priority override.",
+          "type": "string"
+        },
+        "rootIndex": {
+          "description": "0-based index into the MCP file roots list; ignored when workspaceRoot is set.",
+          "type": "integer",
+          "minimum": 0,
+          "maximum": 9007199254740991
+        },
+        "allWorkspaceRoots": {
+          "default": false,
+          "description": "Fan out across all MCP file roots.",
+          "type": "boolean"
+        },
+        "absoluteGitRoots": {
+          "description": "Absolute paths to git repo roots. Use for many sibling clones under a non-git parent directory.",
+          "maxItems": 256,
+          "type": "array",
+          "items": {
+            "type": "string"
+          }
+        },
+        "format": {
+          "default": "markdown",
+          "type": "string",
+          "enum": [
+            "markdown",
+            "json"
+          ]
+        },
+        "range": {
+          "description": "Diff range. Examples: \"staged\", \"HEAD~3..HEAD\", \"main...feature\". Default: unstaged changes.",
+          "type": "string"
+        },
+        "fileFilter": {
+          "description": "Glob pattern to restrict output to matching files, e.g. \"*.ts\", \"src/**\".",
+          "type": "string"
+        },
+        "maxLinesPerFile": {
+          "default": 50,
+          "description": "Max diff lines to include per file. Default: 50.",
+          "type": "integer",
+          "minimum": 1,
+          "maximum": 2000
+        },
+        "maxFiles": {
+          "default": 30,
+          "description": "Max files to include in output. Default: 30.",
+          "type": "integer",
+          "minimum": 1,
+          "maximum": 500
+        },
+        "excludePatterns": {
+          "description": "Glob patterns to exclude. Defaults to common noise: lock files, dist, vendor, etc.",
+          "type": "array",
+          "items": {
+            "type": "string"
+          }
+        }
+      },
+      "required": [
+        "allWorkspaceRoots",
+        "format",
+        "maxLinesPerFile",
+        "maxFiles"
+      ],
+      "additionalProperties": false
+    },
+    "git_worktree_list": {
+      "$schema": "https://json-schema.org/draft/2020-12/schema",
+      "type": "object",
+      "properties": {
+        "workspaceRoot": {
+          "description": "Highest-priority override.",
+          "type": "string"
+        },
+        "rootIndex": {
+          "description": "0-based index into the MCP file roots list; ignored when workspaceRoot is set.",
+          "type": "integer",
+          "minimum": 0,
+          "maximum": 9007199254740991
+        },
+        "format": {
+          "default": "markdown",
+          "type": "string",
+          "enum": [
+            "markdown",
+            "json"
+          ]
+        }
+      },
+      "required": [
+        "format"
+      ],
+      "additionalProperties": false
+    },
+    "batch_commit": {
+      "$schema": "https://json-schema.org/draft/2020-12/schema",
+      "type": "object",
+      "properties": {
+        "workspaceRoot": {
+          "description": "Highest-priority override.",
+          "type": "string"
+        },
+        "rootIndex": {
+          "description": "0-based index into the MCP file roots list; ignored when workspaceRoot is set.",
+          "type": "integer",
+          "minimum": 0,
+          "maximum": 9007199254740991
+        },
+        "allWorkspaceRoots": {
+          "default": false,
+          "description": "Fan out across all MCP file roots.",
+          "type": "boolean"
+        },
+        "format": {
+          "default": "markdown",
+          "type": "string",
+          "enum": [
+            "markdown",
+            "json"
+          ]
+        },
+        "commits": {
+          "minItems": 1,
+          "maxItems": 50,
+          "type": "array",
+          "items": {
+            "type": "object",
+            "properties": {
+              "message": {
+                "type": "string",
+                "minLength": 1,
+                "description": "Commit message."
+              },
+              "files": {
+                "minItems": 1,
+                "type": "array",
+                "items": {
+                  "type": "string",
+                  "minLength": 1
+                },
+                "description": "Paths to stage, relative to the git root."
+              }
+            },
+            "required": [
+              "message",
+              "files"
+            ],
+            "additionalProperties": false
+          },
+          "description": "Commits to create, applied in order."
+        },
+        "push": {
+          "default": "never",
+          "description": "`never` (default): no push. `after`: push the current branch to its upstream once all commits succeed; fails with `push_no_upstream` if the branch has no upstream (commits are NOT rolled back). Enum reserved for future modes such as `force-with-lease`.",
+          "type": "string",
+          "enum": [
+            "never",
+            "after"
+          ]
+        }
+      },
+      "required": [
+        "allWorkspaceRoots",
+        "format",
+        "commits",
+        "push"
+      ],
+      "additionalProperties": false
+    },
+    "git_push": {
+      "$schema": "https://json-schema.org/draft/2020-12/schema",
+      "type": "object",
+      "properties": {
+        "workspaceRoot": {
+          "description": "Highest-priority override.",
+          "type": "string"
+        },
+        "rootIndex": {
+          "description": "0-based index into the MCP file roots list; ignored when workspaceRoot is set.",
+          "type": "integer",
+          "minimum": 0,
+          "maximum": 9007199254740991
+        },
+        "allWorkspaceRoots": {
+          "default": false,
+          "description": "Fan out across all MCP file roots.",
+          "type": "boolean"
+        },
+        "format": {
+          "default": "markdown",
+          "type": "string",
+          "enum": [
+            "markdown",
+            "json"
+          ]
+        },
+        "remote": {
+          "description": "Remote to push to. Defaults to the remote inferred from the current upstream tracking ref, or `origin` when `setUpstream` is true.",
+          "type": "string"
+        },
+        "branch": {
+          "description": "Branch to push. Defaults to the currently checked-out branch. Rejected when HEAD is detached.",
+          "type": "string"
+        },
+        "setUpstream": {
+          "default": false,
+          "description": "Set the upstream tracking reference (`git push -u`). Use when the branch has not been pushed yet. Remote defaults to `origin`.",
+          "type": "boolean"
+        }
+      },
+      "required": [
+        "allWorkspaceRoots",
+        "format",
+        "setUpstream"
+      ],
+      "additionalProperties": false
+    },
+    "git_merge": {
+      "$schema": "https://json-schema.org/draft/2020-12/schema",
+      "type": "object",
+      "properties": {
+        "workspaceRoot": {
+          "description": "Highest-priority override.",
+          "type": "string"
+        },
+        "rootIndex": {
+          "description": "0-based index into the MCP file roots list; ignored when workspaceRoot is set.",
+          "type": "integer",
+          "minimum": 0,
+          "maximum": 9007199254740991
+        },
+        "allWorkspaceRoots": {
+          "default": false,
+          "description": "Fan out across all MCP file roots.",
+          "type": "boolean"
+        },
+        "format": {
+          "default": "markdown",
+          "type": "string",
+          "enum": [
+            "markdown",
+            "json"
+          ]
+        },
+        "sources": {
+          "minItems": 1,
+          "maxItems": 20,
+          "type": "array",
+          "items": {
+            "type": "string",
+            "minLength": 1
+          },
+          "description": "Branches to merge into the destination, in order."
+        },
+        "into": {
+          "description": "Destination branch. Defaults to the currently checked-out branch.",
+          "type": "string"
+        },
+        "strategy": {
+          "default": "auto",
+          "description": "`auto` (default): cascade fast-forward → rebase → merge-commit per source. `ff-only`: only fast-forward, fail if diverged. `rebase`: rebase source onto destination, then fast-forward (no merge-commit fallback). `merge`: always create a merge commit (no fast-forward).",
+          "type": "string",
+          "enum": [
+            "auto",
+            "ff-only",
+            "rebase",
+            "merge"
+          ]
+        },
+        "message": {
+          "description": "Merge commit message (used only when a merge commit is created).",
+          "type": "string"
+        },
+        "deleteMergedBranches": {
+          "default": false,
+          "description": "After all sources merge cleanly, delete each source branch locally (`git branch -d`). Protected names always skipped. Never affects remote branches.",
+          "type": "boolean"
+        },
+        "deleteMergedWorktrees": {
+          "default": false,
+          "description": "After all sources merge cleanly, remove any local worktree currently checked out on a source branch (`git worktree remove`). Protected tails always skipped.",
+          "type": "boolean"
+        }
+      },
+      "required": [
+        "allWorkspaceRoots",
+        "format",
+        "sources",
+        "strategy",
+        "deleteMergedBranches",
+        "deleteMergedWorktrees"
+      ],
+      "additionalProperties": false
+    },
+    "git_cherry_pick": {
+      "$schema": "https://json-schema.org/draft/2020-12/schema",
+      "type": "object",
+      "properties": {
+        "workspaceRoot": {
+          "description": "Highest-priority override.",
+          "type": "string"
+        },
+        "rootIndex": {
+          "description": "0-based index into the MCP file roots list; ignored when workspaceRoot is set.",
+          "type": "integer",
+          "minimum": 0,
+          "maximum": 9007199254740991
+        },
+        "allWorkspaceRoots": {
+          "default": false,
+          "description": "Fan out across all MCP file roots.",
+          "type": "boolean"
+        },
+        "format": {
+          "default": "markdown",
+          "type": "string",
+          "enum": [
+            "markdown",
+            "json"
+          ]
+        },
+        "sources": {
+          "minItems": 1,
+          "maxItems": 50,
+          "type": "array",
+          "items": {
+            "type": "string",
+            "minLength": 1
+          },
+          "description": "Sources to cherry-pick: SHA, `A..B` range, or branch name. Branch sources resolve to `onto..<branch>` (only commits missing from destination)."
+        },
+        "onto": {
+          "description": "Destination branch. Defaults to the currently checked-out branch.",
+          "type": "string"
+        },
+        "deleteMergedBranches": {
+          "default": false,
+          "description": "After all commits apply, delete each branch-kind source locally (`git branch -d`) when it is fully merged into the destination. Protected names always skipped; never touches remote refs.",
+          "type": "boolean"
+        },
+        "deleteMergedWorktrees": {
+          "default": false,
+          "description": "After success, remove any local worktree attached to a branch-kind source (`git worktree remove`). Protected tails always skipped.",
+          "type": "boolean"
+        }
+      },
+      "required": [
+        "allWorkspaceRoots",
+        "format",
+        "sources",
+        "deleteMergedBranches",
+        "deleteMergedWorktrees"
+      ],
+      "additionalProperties": false
+    },
+    "git_reset_soft": {
+      "$schema": "https://json-schema.org/draft/2020-12/schema",
+      "type": "object",
+      "properties": {
+        "workspaceRoot": {
+          "description": "Highest-priority override.",
+          "type": "string"
+        },
+        "rootIndex": {
+          "description": "0-based index into the MCP file roots list; ignored when workspaceRoot is set.",
+          "type": "integer",
+          "minimum": 0,
+          "maximum": 9007199254740991
+        },
+        "allWorkspaceRoots": {
+          "default": false,
+          "description": "Fan out across all MCP file roots.",
+          "type": "boolean"
+        },
+        "format": {
+          "default": "markdown",
+          "type": "string",
+          "enum": [
+            "markdown",
+            "json"
+          ]
+        },
+        "ref": {
+          "type": "string",
+          "minLength": 1,
+          "description": "Commit to reset to. Accepts ancestor notation (`HEAD~1`, `HEAD~3`), branch names, or full SHAs."
+        }
+      },
+      "required": [
+        "allWorkspaceRoots",
+        "format",
+        "ref"
+      ],
+      "additionalProperties": false
+    },
+    "git_worktree_add": {
+      "$schema": "https://json-schema.org/draft/2020-12/schema",
+      "type": "object",
+      "properties": {
+        "workspaceRoot": {
+          "description": "Highest-priority override.",
+          "type": "string"
+        },
+        "rootIndex": {
+          "description": "0-based index into the MCP file roots list; ignored when workspaceRoot is set.",
+          "type": "integer",
+          "minimum": 0,
+          "maximum": 9007199254740991
+        },
+        "allWorkspaceRoots": {
+          "default": false,
+          "description": "Fan out across all MCP file roots.",
+          "type": "boolean"
+        },
+        "format": {
+          "default": "markdown",
+          "type": "string",
+          "enum": [
+            "markdown",
+            "json"
+          ]
+        },
+        "path": {
+          "type": "string",
+          "minLength": 1,
+          "description": "Filesystem path for the new worktree. Relative paths are resolved from the git toplevel."
+        },
+        "branch": {
+          "type": "string",
+          "minLength": 1,
+          "description": "Branch to check out in the new worktree. Created from `baseRef` if absent."
+        },
+        "baseRef": {
+          "description": "Commit-ish to base the new branch on when it does not yet exist. Default: HEAD.",
+          "type": "string"
+        }
+      },
+      "required": [
+        "allWorkspaceRoots",
+        "format",
+        "path",
+        "branch"
+      ],
+      "additionalProperties": false
+    },
+    "git_worktree_remove": {
+      "$schema": "https://json-schema.org/draft/2020-12/schema",
+      "type": "object",
+      "properties": {
+        "workspaceRoot": {
+          "description": "Highest-priority override.",
+          "type": "string"
+        },
+        "rootIndex": {
+          "description": "0-based index into the MCP file roots list; ignored when workspaceRoot is set.",
+          "type": "integer",
+          "minimum": 0,
+          "maximum": 9007199254740991
+        },
+        "allWorkspaceRoots": {
+          "default": false,
+          "description": "Fan out across all MCP file roots.",
+          "type": "boolean"
+        },
+        "format": {
+          "default": "markdown",
+          "type": "string",
+          "enum": [
+            "markdown",
+            "json"
+          ]
+        },
+        "path": {
+          "type": "string",
+          "minLength": 1,
+          "description": "Path of the worktree to remove. Must not be the main worktree."
+        },
+        "force": {
+          "default": false,
+          "description": "Pass `--force` to allow removal of worktrees with uncommitted changes.",
+          "type": "boolean"
+        }
+      },
+      "required": [
+        "allWorkspaceRoots",
+        "format",
+        "path",
+        "force"
+      ],
+      "additionalProperties": false
+    }
+  }
+}