@rethunk/mcp-multi-root-git 2.6.0 → 2.8.0

package/dist/server/presets.js

@@ -1,6 +1,7 @@
 import { existsSync, readFileSync } from "node:fs";
 import { join } from "node:path";
 import { z } from "zod";
+import { ERROR_CODES } from "./error-codes.js";
 /**
  * Schema for `.rethunk/git-mcp-presets.json` at the workspace root.
  * Each named entry defines roots for `git_inventory` and/or pairs for `git_parity`.
@@ -85,16 +86,21 @@ export function presetLoadErrorPayload(gitTop, fail) {
     const presetFile = join(gitTop, PRESET_FILE_PATH);
     if (fail.reason === "invalid_json") {
         return {
-            error: "preset_file_invalid",
+            error: ERROR_CODES.PRESET_FILE_INVALID,
             kind: "invalid_json",
             presetFile,
             message: fail.message,
         };
     }
     if (fail.reason === "schema") {
-        return { error: "preset_file_invalid", kind: "schema", presetFile, issues: fail.issues };
+        return {
+            error: ERROR_CODES.PRESET_FILE_INVALID,
+            kind: "schema",
+            presetFile,
+            issues: fail.issues,
+        };
     }
-    return { error: "preset_file_invalid", presetFile };
+    return { error: ERROR_CODES.PRESET_FILE_INVALID, presetFile };
 }
 function getPresetEntry(gitTop, presetName) {
     const loaded = loadPresetsFromGitTop(gitTop);
@@ -103,7 +109,7 @@ function getPresetEntry(gitTop, presetName) {
             return {
                 ok: false,
                 error: {
-                    error: "preset_not_found",
+                    error: ERROR_CODES.PRESET_NOT_FOUND,
                     preset: presetName,
                     presetFile: join(gitTop, PRESET_FILE_PATH),
                 },
@@ -116,7 +122,7 @@ function getPresetEntry(gitTop, presetName) {
         return {
             ok: false,
             error: {
-                error: "preset_not_found",
+                error: ERROR_CODES.PRESET_NOT_FOUND,
                 preset: presetName,
                 presetFile: join(gitTop, PRESET_FILE_PATH),
             },

package/dist/server/roots.js

@@ -1,5 +1,6 @@
 import { basename, resolve } from "node:path";
 import { fileURLToPath } from "node:url";
+import { ERROR_CODES } from "./error-codes.js";
 import { gateGit, gitTopLevel } from "./git.js";
 import { loadPresetsFromGitTop, presetLoadErrorPayload } from "./presets.js";
 import { MAX_ABSOLUTE_GIT_ROOTS } from "./schemas.js";
@@ -61,7 +62,7 @@ export function resolveAbsoluteGitRootsList(raw) {
         return {
             ok: false,
             error: {
-                error: "absolute_git_roots_too_many",
+                error: ERROR_CODES.ABSOLUTE_GIT_ROOTS_TOO_MANY,
                 max: MAX_ABSOLUTE_GIT_ROOTS,
                 count: raw.length,
             },
@@ -72,12 +73,12 @@ export function resolveAbsoluteGitRootsList(raw) {
     for (const item of raw) {
         const trimmed = item.trim();
         if (trimmed.length === 0) {
-            return { ok: false, error: { error: "invalid_absolute_git_root", path: item } };
+            return { ok: false, error: { error: ERROR_CODES.INVALID_ABSOLUTE_GIT_ROOT, path: item } };
         }
         const abs = resolve(trimmed);
         const top = gitTopLevel(abs);
         if (!top) {
-            return { ok: false, error: { error: "invalid_absolute_git_root", path: abs } };
+            return { ok: false, error: { error: ERROR_CODES.INVALID_ABSOLUTE_GIT_ROOT, path: abs } };
         }
         if (seen.has(top))
             continue;
@@ -85,7 +86,7 @@ export function resolveAbsoluteGitRootsList(raw) {
         tops.push(top);
     }
     if (tops.length === 0) {
-        return { ok: false, error: { error: "absolute_git_roots_empty" } };
+        return { ok: false, error: { error: ERROR_CODES.ABSOLUTE_GIT_ROOTS_EMPTY } };
     }
     return { ok: true, roots: tops };
 }
@@ -104,7 +105,7 @@ function resolveWorkspaceRoots(server, args) {
             return {
                 ok: false,
                 error: {
-                    error: "root_index_out_of_range",
+                    error: ERROR_CODES.ROOT_INDEX_OUT_OF_RANGE,
                     rootIndex: args.rootIndex,
                     rootCount: fileRoots.length,
                 },
@@ -163,10 +164,10 @@ export function requireGitAndRoots(server, args, presetName) {
     const abs = args.absoluteGitRoots;
     if (abs != null && abs.length > 0) {
         if (presetName) {
-            return { ok: false, error: { error: "absolute_git_roots_preset_conflict" } };
+            return { ok: false, error: { error: ERROR_CODES.ABSOLUTE_GIT_ROOTS_PRESET_CONFLICT } };
         }
         if (hasExclusiveWorkspacePick(args)) {
-            return { ok: false, error: { error: "absolute_git_roots_exclusive" } };
+            return { ok: false, error: { error: ERROR_CODES.ABSOLUTE_GIT_ROOTS_EXCLUSIVE } };
         }
         return resolveAbsoluteGitRootsList(abs);
     }
@@ -191,16 +192,16 @@ export function requireSingleRepo(server, args, presetName = undefined) {
         return {
             ok: false,
             error: {
-                error: "absolute_git_roots_single_repo_only",
+                error: ERROR_CODES.ABSOLUTE_GIT_ROOTS_SINGLE_REPO_ONLY,
                 rootCount: pre.roots.length,
             },
         };
     }
     const rootInput = pre.roots[0];
     if (!rootInput)
-        return { ok: false, error: { error: "no_workspace_root" } };
+        return { ok: false, error: { error: ERROR_CODES.NO_WORKSPACE_ROOT } };
     const top = gitTopLevel(rootInput);
     if (!top)
-        return { ok: false, error: { error: "not_a_git_repository", path: rootInput } };
+        return { ok: false, error: { error: ERROR_CODES.NOT_A_GIT_REPOSITORY, path: rootInput } };
     return { ok: true, gitTop: top };
 }

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

@@ -1,5 +1,7 @@
 import { z } from "zod";
 import { registerBatchCommitTool } from "./batch-commit-tool.js";
+import { registerGitBlameTool } from "./git-blame-tool.js";
+import { registerGitBranchListTool } from "./git-branch-list-tool.js";
 import { registerGitCherryPickTool } from "./git-cherry-pick-tool.js";
 import { registerGitDiffSummaryTool } from "./git-diff-summary-tool.js";
 import { registerGitDiffTool } from "./git-diff-tool.js";
@@ -9,6 +11,7 @@ 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 { registerGitReflogTool } from "./git-reflog-tool.js";
 import { registerGitResetSoftTool } from "./git-reset-soft-tool.js";
 import { registerGitShowTool } from "./git-show-tool.js";
 import { registerGitStashApplyTool, registerGitStashListTool } from "./git-stash-tool.js";
@@ -29,6 +32,9 @@ export const READ_ONLY_SINGLE_REPO_TOOLS = [
     "git_show",
     "git_worktree_list",
     "git_stash_list",
+    "git_blame",
+    "git_branch_list",
+    "git_reflog",
 ];
 export const MUTATING_TOOLS = [
     "git_fetch",
@@ -71,6 +77,9 @@ export function captureToolParameterSchemas() {
         registerGitWorktreeListTool(server);
         registerGitStashListTool(server);
         registerGitFetchTool(server);
+        registerGitBlameTool(server);
+        registerGitBranchListTool(server);
+        registerGitReflogTool(server);
         registerBatchCommitTool(server);
         registerGitPushTool(server);
         registerGitMergeTool(server);

package/dist/server/tools.js

@@ -1,4 +1,6 @@
 import { registerBatchCommitTool } from "./batch-commit-tool.js";
+import { registerGitBlameTool } from "./git-blame-tool.js";
+import { registerGitBranchListTool } from "./git-branch-list-tool.js";
 import { registerGitCherryPickTool } from "./git-cherry-pick-tool.js";
 import { registerGitDiffSummaryTool } from "./git-diff-summary-tool.js";
 import { registerGitDiffTool } from "./git-diff-tool.js";
@@ -8,6 +10,7 @@ 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 { registerGitReflogTool } from "./git-reflog-tool.js";
 import { registerGitResetSoftTool } from "./git-reset-soft-tool.js";
 import { registerGitShowTool } from "./git-show-tool.js";
 import { registerGitStashApplyTool, registerGitStashListTool } from "./git-stash-tool.js";
@@ -29,6 +32,9 @@ export function registerRethunkGitTools(server) {
     registerGitWorktreeListTool(server);
     registerGitStashListTool(server);
     registerGitFetchTool(server);
+    registerGitBlameTool(server);
+    registerGitBranchListTool(server);
+    registerGitReflogTool(server);
     // Mutating tools
     registerBatchCommitTool(server);
     registerGitPushTool(server);

package/docs/mcp-tools.md

@@ -17,11 +17,14 @@ 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` (`markdown`/`json`/`oneline`). **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: `workspaceRoot`, `rootIndex`, `format`, `base?`, `head?`, `path?`, `staged?`. No `absoluteGitRoots` or `allWorkspaceRoots`. **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_diff` | `rethunk-git_git_diff` | Raw diff text for a single repo. Supports unstaged, staged, or `base..head` ranges, scoped to one or more paths with configurable context width. Args: `workspaceRoot`, `rootIndex`, `format`, `base?`, `head?`, `path?`, `paths?`, `unified?`, `staged?`. No `absoluteGitRoots` or `allWorkspaceRoots`. **Read-only.** |
+| `git_show` | `rethunk-git_git_show` | Inspect one commit or ref. Returns commit message plus diff (or `--stat` diffstat), or file content at `path` for that ref. Args: `ref`, `path?`, `paths?`, `stat?`, 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_blame` | `rethunk-git_git_blame` | Line-by-line authorship for a file: commit SHA, author, date, summary per line. Args: `path` (required), `ref?`, `startLine?`, `endLine?`, plus single-repo workspace pick + `format`. **Read-only.** |
+| `git_branch_list` | `rethunk-git_git_branch_list` | List local branches (sha, current marker, upstream); optional `includeRemotes` adds remote-tracking branches. Args: `includeRemotes?`, plus single-repo workspace pick + `format`. **Read-only.** |
+| `git_reflog` | `rethunk-git_git_reflog` | Show the reflog for a ref (default `HEAD`) — recent HEAD movements with selector, SHA, and message. Args: `ref?`, `maxEntries?`, plus 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, plus structured `updated`/`created`/`pruned` deltas on git ≥ 2.41. 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.** |
@@ -415,7 +418,9 @@ The response contains one **`parity[]`** entry per resolved git toplevel. `absol
 |-----------|------|---------|-------|
 | `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. |
+| `path` | string | — | Optional single file path to scope the diff. Confined to the repo (`path_escapes_repo` on escape). |
+| `paths` | string[] | — | Multiple file paths to scope the diff; unioned with `path` (deduped). Each confined to the repo. |
+| `unified` | integer | — | Context lines around each change (passed as `-U<n>`, 0–100). Omit for git's default (3). |
 | `staged` | boolean | `false` | When `true`, runs `git diff --staged`. Ignored when `base` is provided. |
 | `workspaceRoot` | string | — | Explicit root; highest priority. |
 | `rootIndex` | int | — | Pick one of several MCP roots (0-based). |
@@ -437,6 +442,7 @@ The response contains one **`parity[]`** entry per resolved git toplevel. `absol
 | Code | Meaning |
 |------|---------|
 | `unsafe_range_token` | `base` or `head` contains characters outside the argv-safe subset. |
+| `path_escapes_repo` | A `path` / `paths` entry resolves outside the git toplevel. |
 | `git_diff_failed` | `git diff` exited non-zero. |
 | `not_a_git_repository` | The resolved workspace root is not inside a git repository. |
 
@@ -448,6 +454,8 @@ The response contains one **`parity[]`** entry per resolved git toplevel. `absol
 |-----------|------|-------|
 | `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. |
+| `stat` | boolean | When `true`, runs `git show --stat` — commit message plus per-file diffstat, no full patch (`statOutput` in JSON). |
+| `paths` | string[] | Filter the shown patch/stat to these repo-relative paths; unioned with `path`. Each confined to the repo. |
 | `workspaceRoot`, `rootIndex`, `format` | — | Standard single-repo workspace pick + output format. |
 
 ### `git_show` — JSON shape (`format: "json"`)
@@ -461,7 +469,7 @@ The response contains one **`parity[]`** entry per resolved git toplevel. `absol
 }
 ```
 
-`path` is omitted when not requested. `diff` is omitted when `git show` returns only a commit message.
+`path` is omitted when not requested; `paths` is present when multiple paths were given. `diff` is omitted when `git show` returns only a commit message. With `stat: true`, `stat` is `true` and `statOutput` carries the diffstat instead of a full `diff`.
 
 ### `git_show` — error codes
 
@@ -517,11 +525,14 @@ The response contains one **`parity[]`** entry per resolved git toplevel. `absol
   "remote": "origin",
   "updatedRefs": ["abc1234..def5678  main       -> origin/main"],
   "newRefs": ["[new tag]        v2.0.0     -> v2.0.0"],
+  "updated": [{ "ref": "refs/remotes/origin/main", "oldSha": "abc1234…", "newSha": "def5678…", "flag": " " }],
+  "created": [{ "ref": "refs/tags/v2.0.0", "newSha": "0a1b2c3…", "flag": "*" }],
+  "pruned": [{ "ref": "refs/remotes/origin/old" }],
   "output": "From origin\n..."
 }
 ```
 
-Fetch failures are reported as `ok: false` with the captured git output in `output`.
+`updated` / `created` / `pruned` are structured ref deltas parsed from `git fetch --porcelain` (git ≥ 2.41), each omitted when empty. On older git the `--porcelain` option is detected as unsupported and the tool falls back to a plain fetch, omitting the structured arrays; the `updatedRefs` / `newRefs` string fields are always present for back-compat. Fetch failures are reported as `ok: false` with the captured git output in `output`.
 
 ### `git_fetch` — error codes
 
@@ -533,6 +544,101 @@ Fetch failures are reported as `ok: false` with the captured git output in `outp
 
 ---
 
+### `git_blame` — parameters
+
+| Parameter | Type | Default | Notes |
+|-----------|------|---------|-------|
+| `path` | string | — | **Required.** Repo-relative file to annotate. Confined to the repo (`path_escapes_repo` on escape). |
+| `ref` | string | working tree | Commit-ish to blame at. Validated as a safe ref token. |
+| `startLine` | int | — | Start of a line range (`-L`). Requires `endLine`. |
+| `endLine` | int | — | End of the line range, inclusive. Requires `startLine`. |
+| `workspaceRoot`, `rootIndex`, `format` | — | Standard single-repo workspace pick + output format. |
+
+### `git_blame` — JSON shape (`format: "json"`)
+
+```json
+{
+  "ref": "HEAD",
+  "path": "src/server.ts",
+  "lines": [
+    { "line": 1, "sha": "a1b2c3d4…", "author": "Damon Blais", "date": "2026-04-12T18:32:01-07:00", "summary": "feat: add tool", "content": "import { FastMCP } from \"fastmcp\";" }
+  ]
+}
+```
+
+`ref` is omitted when blaming the working tree.
+
+### `git_blame` — error codes
+
+| Code | Meaning |
+|------|---------|
+| `path_escapes_repo` | `path` resolves outside the git toplevel. |
+| `unsafe_ref_token` | `ref` contains characters outside the argv-safe subset. |
+| `invalid_line_range` | Only one of `startLine`/`endLine` was given, or `startLine > endLine`. |
+| `git_blame_failed` | `git blame` exited non-zero (unknown path/ref). `detail` carries stderr. |
+| `not_a_git_repository` | The resolved workspace root is not inside a git repository. |
+
+---
+
+### `git_branch_list` — parameters
+
+| Parameter | Type | Default | Notes |
+|-----------|------|---------|-------|
+| `includeRemotes` | boolean | `false` | Also list remote-tracking branches (`refs/remotes`); symbolic `origin/HEAD` is skipped. |
+| `workspaceRoot`, `rootIndex`, `format` | — | Standard single-repo workspace pick + output format. |
+
+### `git_branch_list` — JSON shape (`format: "json"`)
+
+```json
+{
+  "branches": [
+    { "name": "main", "sha": "a1b2c3d4…", "current": true, "upstream": "origin/main" },
+    { "name": "feature/x", "sha": "b2c3d4e5…", "current": false }
+  ],
+  "remotes": [{ "name": "origin/main", "sha": "a1b2c3d4…" }]
+}
+```
+
+`upstream` is omitted when a branch has no upstream. `remotes` is present only when `includeRemotes: true`.
+
+### `git_branch_list` — error codes
+
+| Code | Meaning |
+|------|---------|
+| `branch_list_failed` | `git for-each-ref` exited non-zero. `detail` carries stderr. |
+| `not_a_git_repository` | The resolved workspace root is not inside a git repository. |
+
+---
+
+### `git_reflog` — parameters
+
+| Parameter | Type | Default | Notes |
+|-----------|------|---------|-------|
+| `ref` | string | `HEAD` | Ref whose reflog to show. Validated as a safe ref token. |
+| `maxEntries` | int | `30` | Max entries to return (1–200). |
+| `workspaceRoot`, `rootIndex`, `format` | — | Standard single-repo workspace pick + output format. |
+
+### `git_reflog` — JSON shape (`format: "json"`)
+
+```json
+{
+  "ref": "HEAD",
+  "entries": [
+    { "sha": "a1b2c3d4…", "selector": "HEAD@{0}", "message": "commit: feat: add tool" }
+  ]
+}
+```
+
+### `git_reflog` — error codes
+
+| Code | Meaning |
+|------|---------|
+| `unsafe_ref_token` | `ref` contains characters outside the argv-safe subset. |
+| `reflog_failed` | `git reflog show` exited non-zero. `detail` carries stderr. |
+| `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**.
@@ -917,6 +1023,13 @@ For deletions, `type` is `"deleted"` and `sha` is an empty string.
 
 ---
 
+## Environment
+
+| Variable | Default | Notes |
+|----------|---------|-------|
+| `GIT_SUBPROCESS_PARALLELISM` | CPU-based | Max concurrent git subprocesses for multi-root fan-out (`git_inventory`, `git_parity`, multi-root `git_log`). |
+| `GIT_SUBPROCESS_TIMEOUT_MS` | `120000` | Per-subprocess timeout in ms; on expiry the child is killed (SIGTERM) and the call resolves as failed. Set `0` (or negative) to disable (unbounded). |
+
 ## Resource
 
 | URI | Purpose |

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@rethunk/mcp-multi-root-git",
-  "version": "2.6.0",
+  "version": "2.8.0",
   "description": "MCP stdio server: multi-root git status, inventory, and HEAD parity checks. Generic tools usable by any workspace.",
   "type": "module",
   "private": false,
@@ -69,7 +69,7 @@
     "zod": "^4.4.3"
   },
   "devDependencies": {
-    "@biomejs/biome": "^2.4.15",
+    "@biomejs/biome": "^2.4.16",
     "@types/node": "^25.9.1",
     "rimraf": "^6.1.3",
     "typescript": "^6.0.3"

package/schemas/git_blame.json

@@ -0,0 +1,52 @@
+{
+  "$schema": "https://json-schema.org/draft/2020-12/schema",
+  "title": "@rethunk/mcp-multi-root-git: git_blame",
+  "description": "Parameter schema for the 'git_blame' 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
+    },
+    "format": {
+      "default": "markdown",
+      "type": "string",
+      "enum": [
+        "markdown",
+        "json"
+      ]
+    },
+    "path": {
+      "type": "string",
+      "minLength": 1,
+      "description": "Repo-relative path to the file to blame."
+    },
+    "ref": {
+      "description": "Optional commit-ish (SHA, branch, tag) to blame at.",
+      "type": "string"
+    },
+    "startLine": {
+      "description": "First line of the range to blame (1-based). Requires endLine.",
+      "type": "integer",
+      "minimum": 1,
+      "maximum": 9007199254740991
+    },
+    "endLine": {
+      "description": "Last line of the range to blame (1-based, inclusive). Requires startLine.",
+      "type": "integer",
+      "minimum": 1,
+      "maximum": 9007199254740991
+    }
+  },
+  "required": [
+    "format",
+    "path"
+  ],
+  "additionalProperties": false
+}

package/schemas/git_branch_list.json

@@ -0,0 +1,36 @@
+{
+  "$schema": "https://json-schema.org/draft/2020-12/schema",
+  "title": "@rethunk/mcp-multi-root-git: git_branch_list",
+  "description": "Parameter schema for the 'git_branch_list' 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
+    },
+    "format": {
+      "default": "markdown",
+      "type": "string",
+      "enum": [
+        "markdown",
+        "json"
+      ]
+    },
+    "includeRemotes": {
+      "default": false,
+      "description": "When true, also return remote-tracking branches from refs/remotes (excluding symbolic origin/HEAD).",
+      "type": "boolean"
+    }
+  },
+  "required": [
+    "format",
+    "includeRemotes"
+  ],
+  "additionalProperties": false
+}

package/schemas/git_diff.json

@@ -31,13 +31,26 @@
       "type": "string"
     },
     "path": {
-      "description": "Scope diff to a single file path (e.g. \"src/main.ts\").",
+      "description": "Scope diff to a single file path (e.g. \"src/main.ts\"). For multiple files, prefer `paths`. If both `path` and `paths` are given, they are unioned.",
       "type": "string"
     },
+    "paths": {
+      "description": "Scope diff to multiple file paths (e.g. [\"src/a.ts\", \"src/b.ts\"]). Each path is validated and must lie within the repository root. If both `path` and `paths` are given, they are unioned.",
+      "type": "array",
+      "items": {
+        "type": "string"
+      }
+    },
     "staged": {
       "default": false,
       "description": "If true, show staged changes (git diff --staged). Ignored if `base` is provided.",
       "type": "boolean"
+    },
+    "unified": {
+      "description": "Number of context lines to show around each change (passed as -U<n> to git diff). Defaults to git's built-in default (3). Use 0 for no context.",
+      "type": "integer",
+      "minimum": 0,
+      "maximum": 100
     }
   },
   "required": [

package/schemas/git_reflog.json

@@ -0,0 +1,44 @@
+{
+  "$schema": "https://json-schema.org/draft/2020-12/schema",
+  "title": "@rethunk/mcp-multi-root-git: git_reflog",
+  "description": "Parameter schema for the 'git_reflog' 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
+    },
+    "format": {
+      "default": "markdown",
+      "type": "string",
+      "enum": [
+        "markdown",
+        "json"
+      ]
+    },
+    "ref": {
+      "default": "HEAD",
+      "description": "Ref whose reflog to show (branch name, HEAD, etc.). Default: HEAD.",
+      "type": "string"
+    },
+    "maxEntries": {
+      "default": 30,
+      "description": "Maximum reflog entries to return (hard cap 200). Default 30.",
+      "type": "integer",
+      "minimum": 1,
+      "maximum": 200
+    }
+  },
+  "required": [
+    "format",
+    "ref",
+    "maxEntries"
+  ],
+  "additionalProperties": false
+}

package/schemas/git_show.json

@@ -28,8 +28,19 @@
       "description": "Commit reference (SHA, branch, tag, or any git rev-spec)."
     },
     "path": {
-      "description": "Optional file path to inspect at the ref. If provided, shows that path's content at the ref instead of the diff.",
+      "description": "Optional single file path to inspect at the ref. Merged with `paths` when both are provided.",
       "type": "string"
+    },
+    "paths": {
+      "description": "Optional list of file paths to filter the shown diff/stat. Merged with `path` when both are provided.",
+      "type": "array",
+      "items": {
+        "type": "string"
+      }
+    },
+    "stat": {
+      "description": "When true, show --stat diffstat (files changed summary) instead of the full patch.",
+      "type": "boolean"
     }
   },
   "required": [

package/schemas/index.json

@@ -54,6 +54,21 @@
       "file": "git_stash_list.json",
       "description": "Parameter schema for the 'git_stash_list' MCP tool."
     },
+    {
+      "name": "git_blame",
+      "file": "git_blame.json",
+      "description": "Parameter schema for the 'git_blame' MCP tool."
+    },
+    {
+      "name": "git_branch_list",
+      "file": "git_branch_list.json",
+      "description": "Parameter schema for the 'git_branch_list' MCP tool."
+    },
+    {
+      "name": "git_reflog",
+      "file": "git_reflog.json",
+      "description": "Parameter schema for the 'git_reflog' MCP tool."
+    },
     {
       "name": "git_fetch",
       "file": "git_fetch.json",