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

package/docs/mcp-tools.md

@@ -17,14 +17,20 @@ MCP clients expose tools as `{serverName}_{toolName}`. With the server registere
 | `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.** |
+| `git_diff` | `rethunk-git_git_diff` | Raw diff text for a single repo. Supports unstaged, staged, or `base..head` ranges, optionally scoped to one path. Args: `base?`, `head?`, `path?`, `staged?`, plus single-repo workspace pick + `format`. **Read-only.** |
+| `git_show` | `rethunk-git_git_show` | Inspect one commit or ref. Returns commit message plus diff, or file content at `path` for that ref. Args: `ref`, `path?`, plus single-repo workspace pick + `format`. **Read-only.** |
 | `git_worktree_list` | `rethunk-git_git_worktree_list` | List all worktrees (`git worktree list --porcelain`). Workspace pick + `format`. **Read-only.** |
+| `git_stash_list` | `rethunk-git_git_stash_list` | List `git stash` entries for one repo. Args: single-repo workspace pick + `format`. **Read-only.** |
+| `git_fetch` | `rethunk-git_git_fetch` | Fetch from a remote without modifying the working tree. Updates refs only and reports updated/new refs. Args: `remote?`, `branch?`, `prune?`, `tags?`, plus single-repo workspace pick + `format`. **Mutating — refs only.** |
 | `git_push` | `rethunk-git_git_push` | Push the current branch to its upstream. Optional `remote`, `branch`, `setUpstream` (passes `-u`). Refuses on detached HEAD; never force-pushes. Workspace pick + `format`. **Mutating.** |
+| `git_tag` | `rethunk-git_git_tag` | Create/delete annotated or lightweight tags for one repo. Args: `tag`, `message?`, `ref?`, `delete?`, plus single-repo workspace pick + `format`. **Mutating.** |
 | `git_worktree_add` | `rethunk-git_git_worktree_add` | Create a new linked worktree, creating the branch from `baseRef` if it does not yet exist. Refuses on protected branch names. Args: `path`, `branch`, `baseRef?`, plus workspace pick + `format`. **Mutating.** |
 | `git_worktree_remove` | `rethunk-git_git_worktree_remove` | Remove a registered worktree; refuses to remove the main worktree. Optional `force: true` for dirty trees. Args: `path`, `force?`, plus workspace pick + `format`. **Mutating.** |
 | `git_reset_soft` | `rethunk-git_git_reset_soft` | Soft-reset the current branch to a ref (`HEAD~N`, SHA, branch). Rewound changes land in the staging index; requires a clean working tree. Args: `ref`, plus workspace pick + `format`. **Mutating — not idempotent.** |
-| `batch_commit` | `rethunk-git_batch_commit` | Create multiple sequential git commits in a single call. Each entry stages the listed files then commits with the given message. Stops on first failure. Optional `push: "after"` pushes the current branch to its upstream once every commit lands. Args: `commits` (array of `{message, files}`), `push?`, plus workspace pick args + `format`. **Mutating — not idempotent.** |
+| `batch_commit` | `rethunk-git_batch_commit` | Create multiple sequential git commits in a single call. Each entry stages the listed files or line-ranged file hunks, then commits with the given message. Stops on first failure. Optional `push: "after"` pushes once every commit lands; optional `dryRun: true` previews staged content without writing commits. Args: `commits` (array of `{message, files}`), `push?`, `dryRun?`, plus workspace pick args + `format`. **Mutating — not idempotent.** |
 | `git_merge` | `rethunk-git_git_merge` | Merge one or more source branches into a destination. Default strategy `auto` cascades fast-forward → rebase → merge-commit per source, preferring linear history. Refuses on dirty tree; stops on first conflict with structured path report. Optional `deleteMergedBranches` / `deleteMergedWorktrees` cascade cleanup, always skipping protected names (main/master/dev/develop/stable/trunk/prod/production/release\*/hotfix\*). Args: `sources`, `into?`, `strategy?`, `message?`, cleanup flags + workspace pick + `format`. **Mutating.** |
 | `git_cherry_pick` | `rethunk-git_git_cherry_pick` | Play commits from one or more sources onto a destination. Sources may be SHAs, `A..B` ranges, or branch names (expanded to `onto..<branch>`, oldest-first). Uses `--empty=drop` so patch-equivalent re-applies add nothing. Refuses on dirty tree; stops on first conflict, aborting cleanly. Same cleanup flags as `git_merge` (branch-kind sources only, protected names skipped). Args: `sources`, `onto?`, cleanup flags + workspace pick + `format`. **Mutating.** |
+| `git_stash_apply` | `rethunk-git_git_stash_apply` | Apply or pop a stash entry for one repo. Args: `index?`, `pop?`, plus single-repo workspace pick + `format`. **Mutating.** |
 
 Pass **`format: "json"`** on any tool for structured JSON instead of markdown (default).
 
@@ -32,7 +38,7 @@ 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.
+The package also ships **`tool-parameters.schema.json`**, generated from the registered Zod parameter schemas via `bun run schema:tools`, plus the published **`schemas/`** directory (`schemas/index.json` + one JSON Schema per tool) via `bun run schema:individual`. Connected MCP clients should still prefer live schema discovery from `initialize` / tool listing; the shipped artifacts are for offline inspection, drift checks, and code generation.
 
 ### v2/v3 field omission (consumer contract)
 
@@ -179,12 +185,151 @@ The response contains one **`parity[]`** entry per resolved git toplevel. `absol
 
 ---
 
+### `git_diff` — parameters
+
+| Parameter | Type | Default | Notes |
+|-----------|------|---------|-------|
+| `base` | string | — | Base ref for a revision diff. When omitted with no `staged`, the tool shows unstaged changes. |
+| `head` | string | `HEAD` | Head ref for a revision diff. Used only when `base` is provided. |
+| `path` | string | — | Optional single file path to scope the diff. |
+| `staged` | boolean | `false` | When `true`, runs `git diff --staged`. Ignored when `base` is provided. |
+| `workspaceRoot`, `rootIndex`, `format` | — | Standard single-repo workspace pick + output format. |
+
+### `git_diff` — JSON shape (`format: "json"`)
+
+```json
+{
+  "range": "HEAD~1..HEAD (src/server.ts)",
+  "diff": "diff --git a/src/server.ts b/src/server.ts\n..."
+}
+```
+
+### `git_diff` — error codes
+
+| Code | Meaning |
+|------|---------|
+| `unsafe_range_token` | `base` or `head` contains characters outside the argv-safe subset. |
+| `git_diff_failed` | `git diff` exited non-zero. |
+| `not_a_git_repository` | The resolved workspace root is not inside a git repository. |
+
+---
+
+### `git_show` — parameters
+
+| Parameter | Type | Notes |
+|-----------|------|-------|
+| `ref` | string | Commit, branch, tag, or other git rev-spec to inspect. |
+| `path` | string | Optional single path. When provided, the response shows that path's content at `ref` instead of the full commit diff. |
+| `workspaceRoot`, `rootIndex`, `format` | — | Standard single-repo workspace pick + output format. |
+
+### `git_show` — JSON shape (`format: "json"`)
+
+```json
+{
+  "ref": "HEAD",
+  "message": "feat: add tool",
+  "path": "src/server.ts",
+  "diff": "diff --git a/src/server.ts b/src/server.ts\n..."
+}
+```
+
+`path` is omitted when not requested. `diff` is omitted when `git show` returns only a commit message.
+
+### `git_show` — error codes
+
+| Code | Meaning |
+|------|---------|
+| `git_show_failed` | `git show` exited non-zero (e.g. unknown ref). |
+| `not_a_git_repository` | The resolved workspace root is not inside a git repository. |
+
+---
+
+### `git_stash_list` — parameters
+
+| Parameter | Type | Notes |
+|-----------|------|-------|
+| `workspaceRoot`, `rootIndex`, `format` | — | Standard single-repo workspace pick + output format. |
+
+### `git_stash_list` — JSON shape (`format: "json"`)
+
+```json
+{
+  "stashes": [
+    { "index": 0, "message": "WIP on main: abc1234 feat: add tool", "sha": "abc1234" }
+  ]
+}
+```
+
+### `git_stash_list` — error codes
+
+| Code | Meaning |
+|------|---------|
+| `stash_list_failed` | `git stash list` failed unexpectedly. |
+| `not_a_git_repository` | The resolved workspace root is not inside a git repository. |
+
+---
+
+### `git_fetch` — parameters
+
+| Parameter | Type | Default | Notes |
+|-----------|------|---------|-------|
+| `remote` | string | `"origin"` | Remote to fetch from. |
+| `branch` | string | — | Optional branch/ref to fetch from that remote. |
+| `prune` | boolean | `false` | Pass `--prune` to remove deleted remote-tracking refs. |
+| `tags` | boolean | `false` | Pass `--tags` to also fetch all tags. |
+| `workspaceRoot`, `rootIndex`, `format` | — | Standard single-repo workspace pick + output format. |
+
+### `git_fetch` — JSON shape (`format: "json"`)
+
+```json
+{
+  "ok": true,
+  "remote": "origin",
+  "updatedRefs": ["abc1234..def5678  main       -> origin/main"],
+  "newRefs": ["[new tag]        v2.0.0     -> v2.0.0"],
+  "output": "From origin\n..."
+}
+```
+
+Fetch failures are reported as `ok: false` with the captured git output in `output`.
+
+### `git_fetch` — error codes
+
+| Code | Meaning |
+|------|---------|
+| `not_a_git_repository` | The resolved workspace root is not inside a git repository. |
+
+---
+
+### `batch_commit` — atomic staging semantics
+
+**Critical for AI agents:** Each call to `batch_commit` is **self-contained and atomic per-commit entry**.
+
+- **All files in a single entry are staged together.** When you list `files: ["src/foo.ts", "src/bar.ts"]` in one commit entry, both are staged atomically as a unit with a single `git add` before the commit is created.
+- **Each commit entry is processed sequentially within the call.** The tool stages files, commits, then moves to the next entry. All entries within a single `batch_commit` call happen in one atomic MCP transaction.
+- **A single `batch_commit` call cannot be split across multiple MCP calls.** Do NOT attempt incremental staging like "call 1 with file A, then call 2 with file B hoping they stage together." Each call is independent — call 1's commit lands immediately; call 2's changes are a separate transaction.
+- **Failed entry stops the batch.** If staging or commit fails on entry N, the tool aborts and skips remaining entries. However, **entries that succeeded before the failure remain committed** — they are not rolled back.
+- **Include all files for a logical change in a single `batch_commit` call.** Group related files in each commit entry, list them all in the `files` array, and include all necessary entries in the `commits` array.
+
+Example: to commit two related changes atomically, pass both entries in one call:
+```json
+{
+  "commits": [
+    { "message": "feat: add foo module", "files": ["src/foo.ts", "tests/foo.test.ts"] },
+    { "message": "feat: integrate foo into bar", "files": ["src/bar.ts", "docs/foo.md"] }
+  ]
+}
+```
+
+Do NOT do this: make two separate calls hoping to stage files incrementally. That breaks the contract.
+
 ### `batch_commit` — parameters
 
 | Parameter | Type | Notes |
 |-----------|------|-------|
-| `commits` | `{message: string, files: string[]}[]` | Commits to create in order. 1–50 entries. Each `files` entry is a path relative to the git root; all must stay within the git toplevel. |
+| `commits` | `{message: string, files: (string \| {path: string, lines: {from: number, to: number}})[]}[]` | Commits to create in order. 1–50 entries. Each `files` entry is either a path relative to the git root or a `{path, lines}` object for hunk-level staging. All paths must stay within the git toplevel. |
 | `push` | `"never"` \| `"after"` | Default `"never"`. `"after"` pushes the current branch to its upstream **once all commits succeed**. Never auto-sets upstream — branches without an upstream fail with `push_no_upstream`. Commits are **not** rolled back on push failure. Enum reserved for future modes such as `"force-with-lease"`. |
+| `dryRun` | boolean | Default `false`. When `true`, stages each entry, reports what would be committed (`staged`, `diffStat`), then unstages everything without writing commits. |
 | `workspaceRoot` | string | Explicit root; highest priority. |
 | `rootIndex` | int | Pick one of several MCP roots (0-based). |
 | `format` | `"markdown"` \| `"json"` | Output format. Default: `"markdown"`. |
@@ -219,6 +364,8 @@ The response contains one **`parity[]`** entry per resolved git toplevel. `absol
 
 On first failure `ok` is `false`, `committed` reflects only the entries that succeeded before the error, and the failing entry includes `error` and `detail` fields. Remaining entries are skipped and not included in `results`.
 
+When `dryRun: true`, the top-level response includes `dryRun: true`; successful `results[*]` entries omit `sha` and instead include `staged` and `diffStat`.
+
 The `push` object is present only when `push: "after"` was requested **and** every commit landed. On push failure the top-level `ok` stays `true` (the commits themselves succeeded) while `push.ok` is `false` and `push.error` carries the code.
 
 ### `batch_commit` — error codes (per-result `error` field)
@@ -399,6 +546,39 @@ For already-committed work, call **`git_push`** directly instead of creating an
 
 ---
 
+### `git_tag` — parameters
+
+| Parameter | Type | Default | Notes |
+|-----------|------|---------|-------|
+| `tag` | string | — | Tag name to create or delete. |
+| `message` | string | — | When provided, creates an annotated tag; otherwise creates a lightweight tag. |
+| `ref` | string | `HEAD` | Commit/ref to tag. Ignored when `delete: true`. |
+| `delete` | boolean | `false` | Delete the named tag instead of creating it. |
+| `workspaceRoot`, `rootIndex`, `format` | — | Standard single-repo workspace pick + output format. |
+
+### `git_tag` — JSON shape (`format: "json"`)
+
+```json
+{ "tag": "v2.3.5", "type": "annotated", "sha": "a1b2c3d4e5f6..." }
+```
+
+For deletions, `type` is `"deleted"` and `sha` is an empty string.
+
+### `git_tag` — error codes
+
+| Code | Meaning |
+|------|---------|
+| `tag_empty` | `tag` trimmed to an empty string. |
+| `tag_unsafe` | `tag` contains disallowed characters. |
+| `ref_unsafe` | `ref` contains disallowed characters. |
+| `ref_not_found` | `ref` did not resolve to a commit. |
+| `tag_create_failed` | `git tag` failed while creating the tag. |
+| `tag_delete_failed` | `git tag -d` failed. |
+| `tag_verification_failed` | The tag could not be read back after creation. |
+| `not_a_git_repository` | The resolved workspace root is not inside a git repository. |
+
+---
+
 ### `git_reset_soft` — parameters
 
 | Parameter | Type | Notes |
@@ -424,6 +604,35 @@ For already-committed work, call **`git_push`** directly instead of creating an
 
 ---
 
+### `git_stash_apply` — parameters
+
+| Parameter | Type | Default | Notes |
+|-----------|------|---------|-------|
+| `index` | int | `0` | Stash index to apply/pop (`stash@{index}`). |
+| `pop` | boolean | `false` | When `true`, runs `git stash pop` instead of `git stash apply`. |
+| `workspaceRoot`, `rootIndex`, `format` | — | Standard single-repo workspace pick + output format. |
+
+### `git_stash_apply` — JSON shape (`format: "json"`)
+
+```json
+{
+  "applied": true,
+  "stashIndex": 0,
+  "popped": false,
+  "output": "On branch main\nChanges not staged for commit:\n..."
+}
+```
+
+`output` is omitted when git produced no stdout/stderr text.
+
+### `git_stash_apply` — error codes
+
+| Code | Meaning |
+|------|---------|
+| `not_a_git_repository` | The resolved workspace root is not inside a git repository. |
+
+---
+
 ### `git_worktree_list` — JSON shape (`format: "json"`)
 
 ```json
@@ -515,7 +724,7 @@ Order applied when resolving which directory(ies) tools run against:
 2. **`rootIndex`** (0-based) — one `file://` MCP root when several exist.
 3. **`allWorkspaceRoots`: true** — every `file://` root; markdown output emits one `# {tool}` header with per-root subsections (`git_inventory` uses `### {gitTop}`; `git_status` uses `### MCP root: ...`), or combined JSON.
 4. **`preset`** set and multiple roots — first root whose git toplevel defines that preset (respecting **`workspaceRootHint`** on the preset entry when present).
-5. Otherwise the first `file://` root from MCP **`initialize`** / **`roots/list_changed`**.
+5. Otherwise the first `file://` root reported by the MCP client through **`roots/list`**.
 6. **`process.cwd()`** if no file roots (e.g. CI with explicit `workspaceRoot`).
 
-Roots come from the MCP session (**`FastMCP` with `roots: { enabled: true }`** in code); there is no fixed `cwd` in server config.
+Roots come from active MCP sessions (**`FastMCP` with `roots: { enabled: true }`** in code); there is no fixed `cwd` in server config. This is what allows one globally installed server to follow the workspace opened in VS Code, Claude Code, Cursor, or any other roots-capable MCP client.

package/package.json

@@ -1,10 +1,10 @@
 {
   "name": "@rethunk/mcp-multi-root-git",
-  "version": "2.3.4",
+  "version": "2.4.0",
   "description": "MCP stdio server: multi-root git status, inventory, and HEAD parity checks. Generic tools usable by any workspace.",
   "type": "module",
   "private": false,
-  "packageManager": "bun@1.3.11",
+  "packageManager": "bun@1.3.13",
   "engines": {
     "node": ">=22.0.0"
   },
@@ -12,6 +12,7 @@
     "dist",
     "git-mcp-presets.schema.json",
     "tool-parameters.schema.json",
+    "schemas",
     "docs/install.md",
     "docs/mcp-tools.md",
     "AGENTS.md",
@@ -35,10 +36,11 @@
     "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",
+    "schema:individual": "bun scripts/generate-individual-schemas.ts",
     "publish:preflight": "bun scripts/publish-preflight.ts",
     "test": "bun test src/",
     "test:coverage": "bun test src/ --coverage",
-    "prepublishOnly": "bun run schema:tools:check && bun run build && bun run check && bun run test",
+    "prepublishOnly": "bun run schema:tools:check && bun run schema:individual && bun run build && bun run check && bun run test",
     "setup-hooks": "git config core.hooksPath .githooks"
   },
   "keywords": [
@@ -63,10 +65,10 @@
   },
   "dependencies": {
     "fastmcp": "^4.0.1",
-    "zod": "^4.3.6"
+    "zod": "^4.4.3"
   },
   "devDependencies": {
-    "@biomejs/biome": "^2.4.13",
+    "@biomejs/biome": "^2.4.14",
     "@types/node": "^25.6.0",
     "rimraf": "^6.1.3",
     "typescript": "^6.0.3"

package/schemas/batch_commit.json

@@ -0,0 +1,125 @@
+{
+  "$schema": "https://json-schema.org/draft/2020-12/schema",
+  "title": "@rethunk/mcp-multi-root-git: batch_commit",
+  "description": "Parameter schema for the 'batch_commit' MCP tool.",
+  "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": {
+              "anyOf": [
+                {
+                  "type": "string",
+                  "minLength": 1
+                },
+                {
+                  "type": "object",
+                  "properties": {
+                    "path": {
+                      "type": "string",
+                      "minLength": 1,
+                      "description": "File path relative to git root."
+                    },
+                    "lines": {
+                      "type": "object",
+                      "properties": {
+                        "from": {
+                          "type": "integer",
+                          "minimum": 1,
+                          "maximum": 9007199254740991,
+                          "description": "Start line number (1-indexed)."
+                        },
+                        "to": {
+                          "type": "integer",
+                          "minimum": 1,
+                          "maximum": 9007199254740991,
+                          "description": "End line number (1-indexed, inclusive)."
+                        }
+                      },
+                      "required": [
+                        "from",
+                        "to"
+                      ],
+                      "additionalProperties": false,
+                      "description": "Line range to stage. Only hunks overlapping [from, to] are staged."
+                    }
+                  },
+                  "required": [
+                    "path",
+                    "lines"
+                  ],
+                  "additionalProperties": false
+                }
+              ]
+            },
+            "description": "Paths to stage, relative to the git root. Each can be a string path or { path, lines } for hunk-level staging."
+          }
+        },
+        "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"
+      ]
+    },
+    "dryRun": {
+      "default": false,
+      "description": "When true, stage files, collect preview (files staged, commit messages), return preview response without writing commits. Unstages any files that were staged for the preview. Response indicates DRY RUN mode.",
+      "type": "boolean"
+    }
+  },
+  "required": [
+    "allWorkspaceRoots",
+    "format",
+    "commits",
+    "push",
+    "dryRun"
+  ],
+  "additionalProperties": false
+}

package/schemas/git_cherry_pick.json

@@ -0,0 +1,63 @@
+{
+  "$schema": "https://json-schema.org/draft/2020-12/schema",
+  "title": "@rethunk/mcp-multi-root-git: git_cherry_pick",
+  "description": "Parameter schema for the 'git_cherry_pick' MCP tool.",
+  "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
+}

package/schemas/git_diff.json

@@ -0,0 +1,62 @@
+{
+  "$schema": "https://json-schema.org/draft/2020-12/schema",
+  "title": "@rethunk/mcp-multi-root-git: git_diff",
+  "description": "Parameter schema for the 'git_diff' MCP tool.",
+  "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"
+      ]
+    },
+    "base": {
+      "description": "Base ref (e.g. \"main\", \"HEAD~3\"). Required for range diffs. If omitted and `staged: false`, shows unstaged changes.",
+      "type": "string"
+    },
+    "head": {
+      "description": "Head ref (e.g. \"feature-branch\"). If omitted, defaults to HEAD. Only used if `base` is provided.",
+      "type": "string"
+    },
+    "path": {
+      "description": "Scope diff to a single file path (e.g. \"src/main.ts\").",
+      "type": "string"
+    },
+    "staged": {
+      "default": false,
+      "description": "If true, show staged changes (git diff --staged). Ignored if `base` is provided.",
+      "type": "boolean"
+    }
+  },
+  "required": [
+    "allWorkspaceRoots",
+    "format",
+    "staged"
+  ],
+  "additionalProperties": false
+}

package/schemas/git_diff_summary.json

@@ -0,0 +1,75 @@
+{
+  "$schema": "https://json-schema.org/draft/2020-12/schema",
+  "title": "@rethunk/mcp-multi-root-git: git_diff_summary",
+  "description": "Parameter schema for the 'git_diff_summary' MCP tool.",
+  "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
+}