@rethunk/mcp-multi-root-git 2.9.1 → 3.1.0

package/AGENTS.md

@@ -18,9 +18,9 @@ IDEs injecting this as context: do not re-link from rules.
 | [`src/server.ts`](src/server.ts) | `FastMCP` + `roots: { enabled: true }`; `readMcpServerVersion()`; `registerRethunkGitTools` |
 | [`src/server/json.ts`](src/server/json.ts) | `jsonRespond()` (minified, no envelope), `spreadWhen`, `spreadDefined` |
 | [`src/server/git.ts`](src/server/git.ts) | `gateGit`, `spawnGitAsync` (optional `{ timeoutMs, signal }`), `asyncPool`, `GIT_SUBPROCESS_PARALLELISM`, `GIT_SUBPROCESS_TIMEOUT_MS`, `gitTopLevel`, `gitRevParseGitDir`, `gitRevParseHead`, `parseGitSubmodulePaths`, `hasGitMetadata`, `gitStatusSnapshotAsync`, `gitStatusShortBranchAsync`, `fetchAheadBehind`, `isSafeGitUpstreamToken` |
-| [`src/server/roots.ts`](src/server/roots.ts) | `requireGitAndRoots`, `requireSingleRepo`, `resolveAbsoluteGitRootsList`, `GitRootPickArgs` — shared tool preludes; session root resolution; optional `absoluteGitRoots` bulk pick |
+| [`src/server/roots.ts`](src/server/roots.ts) | `requireGitAndRoots` (fan-out `root` resolution: string / string[] / `"*"`), `requireSingleRepo` (`workspaceRoot`), `resolveRootPathList`, `RootPickArgs` — shared tool preludes; session root resolution |
 | [`src/server/presets.ts`](src/server/presets.ts) | `PRESET_FILE_PATH`, `loadPresetsFromGitTop`, `presetLoadErrorPayload`, `applyPresetNestedRoots`, `applyPresetParityPairs`; Zod schemas must match [`git-mcp-presets.schema.json`](git-mcp-presets.schema.json) |
-| [`src/server/schemas.ts`](src/server/schemas.ts) | `WorkspacePickSchema`, `MAX_INVENTORY_ROOTS_DEFAULT`, **`MAX_ABSOLUTE_GIT_ROOTS`** (256), optional **`absoluteGitRoots`** on workspace pick |
+| [`src/server/schemas.ts`](src/server/schemas.ts) | `WorkspacePickSchema` (single-repo: `workspaceRoot` + `format`), `RootPickSchema` (fan-out: polymorphic `root` + `format`), `MAX_INVENTORY_ROOTS_DEFAULT`, **`MAX_ROOT_PATHS`** (256) |
 | [`src/server/inventory.ts`](src/server/inventory.ts) | `InventoryEntryJson`, `validateRepoPath`, `makeSkipEntry`, `buildInventorySectionMarkdown`, `collectInventoryEntry` |
 | [`src/server/git-refs.ts`](src/server/git-refs.ts) | `isProtectedBranch`, `isSafeGitRefToken`, `isSafeGitRangeToken`, `isSafeGitAncestorRef`; `getCurrentBranch`, `resolveRef`, `isWorkingTreeClean`, `isFullyMergedInto`, `isContentEquivalentlyMergedInto`, `commitListBetween`; `listWorktrees`, `worktreeForBranch`; `inferRemoteFromUpstream`; `conflictPaths` |
 | [`src/server/tools.ts`](src/server/tools.ts) | `registerRethunkGitTools` — dispatches to `register*` below; `selectToolRegistrars(envValue, registrars)` — pure parse/filter fn for `RETHUNK_GIT_TOOLS` (reads env inside `registerRethunkGitTools`, not at module scope); `TOOL_REGISTRARS` ordered array |
@@ -48,7 +48,7 @@ IDEs injecting this as context: do not re-link from rules.
 ## Changing contracts
 
 - **No banner paragraphs** in shipped docs. Use normal titles + cross-links.
-- **JSON format version** (currently `"3"`, exported as `MCP_JSON_FORMAT_VERSION` in `src/server.ts` and surfaced via the FastMCP `instructions` field — discoverable from the MCP `initialize` response): bump on incompatible JSON changes (renamed/nested/omitted fields). Document migration here + [docs/mcp-tools.md](docs/mcp-tools.md). v2 removed the `rethunkGitMcp` envelope; payloads are minified; optional fields omitted when empty/null/false. v3 changes in `git_log`: `sha7` → `sha` (full SHA), `workspace_root` → `workspaceRoot`, `ageRelative` removed, `email` omitted when empty.
+- **JSON format version** (currently `"5"`, exported as `MCP_JSON_FORMAT_VERSION` in `src/server.ts` and surfaced via the FastMCP `instructions` field — discoverable from the MCP `initialize` response): bump on incompatible JSON changes (renamed/nested/omitted fields). Document migration here + [docs/mcp-tools.md](docs/mcp-tools.md). v2 removed the `rethunkGitMcp` envelope; payloads are minified; optional fields omitted when empty/null/false. v3 changes in `git_log`: `sha7` → `sha` (full SHA), `workspace_root` → `workspaceRoot`, `ageRelative` removed, `email` omitted when empty. v4 changes: `git_blame` output run-length grouped (`lines[]` → `groups[]`, commit metadata once per contiguous run, `maxLines` cap with `truncated`/`omittedLines`); `git_diff_summary` per-file `truncated` omitted when false. v5 changes: `batch_commit` successful `results[*]` entries drop the echoed `message`/`files` (the caller already supplied both) — failing entries still carry them for diagnosis.
 - **Preset file:** keep `presets.ts` Zod schemas aligned with [`git-mcp-presets.schema.json`](git-mcp-presets.schema.json).
 - **Public tool surface:** rename/add → update [docs/mcp-tools.md](docs/mcp-tools.md) + [README.md](README.md) (if mentioned), then regenerate the shipped schema artifacts (`tool-parameters.schema.json`, `schemas/index.json`, `schemas/*.json`). Install/client wiring → [docs/install.md](docs/install.md) only.
 
@@ -66,12 +66,10 @@ Rules for LLMs operating in or against this repository.
 
 **End-user Git/MCP preference** (status/log/diff/commits): **`~/.claude/CLAUDE.md`** § **Git & GitHub** — same policy when dogfooding this server from a harness.
 
-**Mutating tools use `workspaceRoot` as trusted operator input** — `git_fetch`, `batch_commit`, `git_push`, `git_merge`, `git_cherry_pick`, `git_reset_soft`, `git_tag`, and `git_stash_apply` operate on roots resolved via `requireGitAndRoots` / `requireSingleRepo`. Pass the target repo as `workspaceRoot` (trusted caller input) or via MCP roots. The `absoluteGitRoots` bulk multi-root parameter is not accepted by mutating tools — passing it is rejected.
+**One routing param per tool** — the five fan-out read tools (`git_status`, `git_inventory`, `git_parity`, `list_presets`, `git_log`) take polymorphic **`root`** (string = one repo, string[] = explicit repo list, `"*"` = every MCP root). Every other tool — including all mutating tools (`git_fetch`, `batch_commit`, `git_push`, `git_merge`, `git_cherry_pick`, `git_reset_soft`, `git_tag`, `git_stash_apply`, worktree add/remove) — takes only **`workspaceRoot`** (trusted operator input) and resolves via `requireSingleRepo`; multi-repo routing params are not accepted on writes.
 
 **`batch_commit` atomic staging — single call per logical change** — Do NOT attempt incremental staging across multiple `batch_commit` calls. Each call is self-contained: it stages all files in all entries, commits them sequentially, and the moment the call completes, all commits have landed. Include all related files (for all related commit entries) in a single `batch_commit` call. A call cannot be resumed or extended by a later call — each is an independent transaction. If entry N fails, entries before N remain committed; entries after N are skipped (not rolled back).
 
-**`absoluteGitRoots` is read-only** — pass it only on read tools (`git_status`, `git_inventory`, `git_parity`, `git_log`, `git_diff_summary`, `list_presets`). Mutating tools reject this parameter.
-
 **Protected branches are enforced by the server** — do not attempt `git_worktree_add` with a branch name matching `main`, `master`, `dev`, `develop`, `stable`, `trunk`, `prod`, `production`, `release*`, or `hotfix*`. The server rejects such calls.
 
 **Never force-push** — `git_push` has no force-push mode by design. `git_merge` with `strategy: "ff-only"` will fail cleanly rather than force.

package/CHANGELOG.md

@@ -2,6 +2,37 @@
 
 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).
 
+## [3.1.0] — 2026-07-04
+
+Token-cost reduction in `batch_commit` output. JSON format version bumped **4 → 5**.
+
+### Changed — breaking
+
+- **`batch_commit` success entries drop echoed `message`/`files`.** Every entry in the JSON `results[]` array repeated the caller's own `message` and full `files[]` from the request, even on success — pure repetition, since the caller already has both. Successful entries now carry only `index`, `ok`, `sha` (or `staged`/`diffStat` in dry-run mode), and `output` when present. Failing entries are unchanged: `message`/`files` stay so the caller can identify the failed commit without cross-referencing the request. `MCP_JSON_FORMAT_VERSION` bumped to `"5"`.
+
+## [3.0.0] — 2026-07-03
+
+Major release: token-cost reduction across the tool surface. Every tool now carries exactly one routing parameter, `git_blame` output is run-length grouped, and integer bounds are explicit. JSON format version bumped **3 → 4**.
+
+### Changed — breaking
+
+- **Routing-param consolidation.** The four overlapping routing params (`workspaceRoot`, `rootIndex`, `allWorkspaceRoots`, `absoluteGitRoots`) are replaced by exactly one param per tool. The five fan-out read tools (`git_status`, `git_inventory`, `git_parity`, `list_presets`, `git_log`) take polymorphic **`root`**: a string (one repo path), a string array (explicit repo list — the old `absoluteGitRoots`), or `"*"` (every MCP root — the old `allWorkspaceRoots`). All other 18 tools take only **`workspaceRoot`** (`git_diff_summary` loses `absoluteGitRoots`). Defaults are unchanged: first MCP root, else `process.cwd()`.
+- **`rootIndex` removed fleet-wide.** It was vestigial (no real consumer); the `root_index_out_of_range` error code is gone with it.
+- **Root-validation error codes renamed.** `invalid_absolute_git_root` → `invalid_root_path`; `absolute_git_roots_empty` / `_too_many` / `_preset_conflict` / `_nested_or_preset_conflict` → `root_list_empty` / `root_list_too_many` / `root_list_preset_conflict` / `root_list_nested_or_preset_conflict`. `absolute_git_roots_exclusive` and `absolute_git_roots_single_repo_only` are removed — with a single routing param those states are unrepresentable.
+- **`git_blame` output v4: run-length grouped.** JSON shape changed from `lines[]` (sha/author/date/summary repeated on every line) to `groups[]` — one entry per contiguous same-commit run carrying `sha`/`author`/`date`/`summary`/`startLine`/`endLine` once, plus `lines: [{ line, content }]`. Markdown output grouped the same way. `MCP_JSON_FORMAT_VERSION` bumped to `"4"`.
+- **`git_diff_summary` per-file `truncated` omitted when false** (was always emitted), matching the format-contract rule that optional fields are absent when empty/null/false.
+
+### Added
+
+- **`git_blame` `maxLines`** (default 2000, max 10000) — caps blamed lines; overflow is signalled with top-level `truncated: true` + `omittedLines`.
+
+### Fixed
+
+- **Unbounded `.int()` params serialized `"maximum":9007199254740991` into tool schemas.** Explicit caps added: `batch_commit` `lines.from`/`lines.to` and `git_blame` `startLine`/`endLine` at 1000000, `git_stash_apply` `index` at 10000.
+
+- **`batch_commit` hunk-level staging (`{ path, lines }`) could corrupt the git index.** `extractOverlappingHunks` joined the selected hunk(s) without a trailing newline; whenever the selection wasn't the *last* hunk in the file's real diff, the written patch file's final line had no newline terminator and `git apply --cached` rejected it with `error: corrupt patch at ...`. Fixed by always terminating the extracted patch with `\n`. Confirmed against a real multi-hunk diff before and after the fix; regression test added (`stages a non-final hunk without corrupting the patch`).
+- **`batch_commit` `dryRun: true` could leave a partially-staged index after a failure.** When a commit entry listed multiple files and an earlier file staged successfully but a later file in the *same* entry failed to stage, the earlier file's staged state was never added to the dry-run cleanup set (tracking only happened after the whole per-file loop completed without failure) — so a failed "dry run" left real, uncommitted staged changes in the index. Fixed by tracking each file for cleanup immediately after it stages, not gated behind the later failure check. Regression test added (`dryRun: true unstages an earlier file when a later file in the same commit fails to stage`).
+
 ## [2.9.1] — 2026-06-11
 
 Patch release: security hardening, schema refresh, and developer-tooling correctness. No JSON-format change.

package/HUMANS.md

@@ -94,14 +94,14 @@ 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.
+Pass a **`root` array** on the fan-out read tools (`git_status`, `git_inventory`, `git_parity`, `list_presets`, `git_log`) 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": [
+  "root": [
     "/usr/local/src/com.github/Rethunk-AI/mcp-multi-root-git",
     "/usr/local/src/com.github/Rethunk-AI/rethunk-github-mcp"
   ]
@@ -113,7 +113,7 @@ Example `git_parity` batch using the same pair in each sibling clone:
 ```json
 {
   "format": "json",
-  "absoluteGitRoots": [
+  "root": [
     "/usr/local/src/com.github/Rethunk-AI/mcp-multi-root-git",
     "/usr/local/src/com.github/Rethunk-AI/rethunk-github-mcp"
   ],
@@ -121,7 +121,7 @@ Example `git_parity` batch using the same pair in each sibling clone:
 }
 ```
 
-`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)**.
+Multi-repo routing is read-only by design. Mutating tools such as **`batch_commit`**, **`git_push`**, **`git_merge`**, and **`git_cherry_pick`** accept only `workspaceRoot`; use it or MCP roots for writes. Full parameter rules and error codes live in **[docs/mcp-tools.md](docs/mcp-tools.md#root-resolution)**.
 
 ## Prerequisites
 

package/dist/server/batch-commit-tool.js

@@ -13,8 +13,13 @@ const FileEntrySchema = z.union([
         path: z.string().min(1).describe("File path relative to git root."),
         lines: z
             .object({
-            from: z.number().int().min(1).describe("Start line number (1-indexed)."),
-            to: z.number().int().min(1).describe("End line number (1-indexed, inclusive)."),
+            from: z.number().int().min(1).max(1000000).describe("Start line number (1-indexed)."),
+            to: z
+                .number()
+                .int()
+                .min(1)
+                .max(1000000)
+                .describe("End line number (1-indexed, inclusive)."),
         })
             .describe("Line range to stage. Only hunks overlapping [from, to] are staged."),
     }),
@@ -119,7 +124,10 @@ function extractOverlappingHunks(diffContent, fromLine, toLine) {
             i++;
         }
     }
-    return result.length > fileHeaderLines.length ? result.join("\n") : null;
+    // Trailing newline is required: when the selected hunk(s) aren't the last hunk in the
+    // real diff, the last copied line is a content line that had a newline after it in the
+    // original diff output. Dropping it produces a patch `git apply` rejects as corrupt.
+    return result.length > fileHeaderLines.length ? `${result.join("\n")}\n` : null;
 }
 /**
  * Stages a file with optional line range. If lines are provided, only hunks
@@ -225,7 +233,7 @@ export function registerBatchCommitTool(server) {
             destructiveHint: false,
             idempotentHint: false,
         },
-        parameters: WorkspacePickSchema.omit({ absoluteGitRoots: true }).extend({
+        parameters: WorkspacePickSchema.extend({
             commits: z
                 .array(CommitEntrySchema)
                 .min(1)
@@ -299,6 +307,14 @@ export function registerBatchCommitTool(server) {
                         stagingError = stageResult.error || "Unknown error";
                         break;
                     }
+                    // Track for dry-run cleanup as soon as a file stages successfully — a later
+                    // file in this same commit entry may still fail, and anything already staged
+                    // must still be unstaged so a failed dry run never leaves index state behind.
+                    // Excludes paths that were already staged before this call (so pre-existing
+                    // staged state survives).
+                    if (args.dryRun && !preStagedPaths.has(fileEntry.path)) {
+                        stagedFilesForCleanup.add(fileEntry.path);
+                    }
                 }
                 if (stagingFailed) {
                     results.push({
@@ -312,15 +328,6 @@ export function registerBatchCommitTool(server) {
                     });
                     break;
                 }
-                // Track staged files for cleanup in dry-run, excluding paths that were
-                // already staged before this call (so pre-existing staged state survives).
-                if (args.dryRun) {
-                    for (const path of filePaths) {
-                        if (!preStagedPaths.has(path)) {
-                            stagedFilesForCleanup.add(path);
-                        }
-                    }
-                }
                 // --- Dry-run mode: collect preview and unstage ---
                 if (args.dryRun) {
                     // Get diff stat for this staged entry
@@ -381,8 +388,10 @@ export function registerBatchCommitTool(server) {
                         index: r.index,
                         ok: r.ok,
                         ...spreadDefined("sha", r.sha),
-                        message: r.message,
-                        files: r.files,
+                        // message/files are the caller's own request echoed back — only worth
+                        // repeating on failure, where the caller needs them to diagnose without
+                        // cross-referencing the request.
+                        ...spreadWhen(!r.ok, { message: r.message, files: r.files }),
                         ...spreadDefined("staged", r.staged),
                         ...spreadDefined("diffStat", r.diffStat),
                         ...spreadDefined("error", r.error),

package/dist/server/error-codes.js

@@ -14,15 +14,12 @@ export const ERROR_CODES = {
     // Repository resolution
     NOT_A_GIT_REPOSITORY: "not_a_git_repository",
     NO_WORKSPACE_ROOT: "no_workspace_root",
-    ROOT_INDEX_OUT_OF_RANGE: "root_index_out_of_range",
-    // absoluteGitRoots validation
-    ABSOLUTE_GIT_ROOTS_EMPTY: "absolute_git_roots_empty",
-    ABSOLUTE_GIT_ROOTS_EXCLUSIVE: "absolute_git_roots_exclusive",
-    ABSOLUTE_GIT_ROOTS_NESTED_OR_PRESET_CONFLICT: "absolute_git_roots_nested_or_preset_conflict",
-    ABSOLUTE_GIT_ROOTS_PRESET_CONFLICT: "absolute_git_roots_preset_conflict",
-    ABSOLUTE_GIT_ROOTS_SINGLE_REPO_ONLY: "absolute_git_roots_single_repo_only",
-    ABSOLUTE_GIT_ROOTS_TOO_MANY: "absolute_git_roots_too_many",
-    INVALID_ABSOLUTE_GIT_ROOT: "invalid_absolute_git_root",
+    // `root` array validation
+    INVALID_ROOT_PATH: "invalid_root_path",
+    ROOT_LIST_EMPTY: "root_list_empty",
+    ROOT_LIST_NESTED_OR_PRESET_CONFLICT: "root_list_nested_or_preset_conflict",
+    ROOT_LIST_PRESET_CONFLICT: "root_list_preset_conflict",
+    ROOT_LIST_TOO_MANY: "root_list_too_many",
     // Presets
     PRESET_FILE_INVALID: "preset_file_invalid",
     PRESET_NOT_FOUND: "preset_not_found",

package/dist/server/git-blame-tool.js

@@ -3,7 +3,7 @@ import { assertRelativePathUnderTop, resolvePathForRepo } from "../repo-paths.js
 import { ERROR_CODES } from "./error-codes.js";
 import { spawnGitAsync } from "./git.js";
 import { isSafeGitRefToken } from "./git-refs.js";
-import { jsonRespond, spreadDefined } from "./json.js";
+import { jsonRespond, spreadDefined, spreadWhen } from "./json.js";
 import { requireSingleRepo } from "./roots.js";
 import { WorkspacePickSchema } from "./schemas.js";
 /**
@@ -125,17 +125,50 @@ function parsePorcelain(output) {
     return result;
 }
 // ---------------------------------------------------------------------------
+// Run-length grouping
+// ---------------------------------------------------------------------------
+/**
+ * Collapse per-line blame records into one group per contiguous same-commit
+ * run, so commit metadata (sha/author/date/summary) is emitted once per run
+ * instead of once per line.
+ */
+function groupBlameLines(lines) {
+    const groups = [];
+    let current;
+    for (const l of lines) {
+        if (current && current.sha === l.sha && current.endLine === l.line - 1) {
+            current.endLine = l.line;
+            current.lines.push({ line: l.line, content: l.content });
+            continue;
+        }
+        current = {
+            sha: l.sha,
+            author: l.author,
+            date: l.date,
+            summary: l.summary,
+            startLine: l.line,
+            endLine: l.line,
+            lines: [{ line: l.line, content: l.content }],
+        };
+        groups.push(current);
+    }
+    return groups;
+}
+// ---------------------------------------------------------------------------
 // Markdown rendering
 // ---------------------------------------------------------------------------
 function renderBlameMarkdown(result) {
     const header = result.ref !== undefined
         ? `# git blame ${result.ref} -- ${result.path}`
         : `# git blame ${result.path}`;
-    const rows = result.lines.map((l) => {
-        const sha7 = l.sha.slice(0, 7);
-        return `${sha7} (${l.author} ${l.date}) ${l.content}`;
-    });
-    return [`${header}`, "", "```", ...rows, "```"].join("\n");
+    const out = [header];
+    for (const g of result.groups) {
+        out.push("", `## ${g.sha.slice(0, 7)} ${g.author} ${g.date} — ${g.summary} (lines ${g.startLine}–${g.endLine})`, "```", ...g.lines.map((l) => `${l.line}: ${l.content}`), "```");
+    }
+    if (result.truncated) {
+        out.push("", `_(truncated — ${result.omittedLines} more line(s) not shown; raise maxLines)_`);
+    }
+    return out.join("\n");
 }
 // ---------------------------------------------------------------------------
 // Tool registration
@@ -143,31 +176,35 @@ function renderBlameMarkdown(result) {
 export function registerGitBlameTool(server) {
     server.addTool({
         name: "git_blame",
-        description: "Annotate each line of a file with the commit SHA, author, date, and summary that last modified it. Optionally restrict to a commit-ish ref and/or a line range.",
+        description: "File authorship, grouped into contiguous same-commit line runs (sha, author, date, summary once per run). Optionally restrict to a commit-ish ref and/or a line range.",
         annotations: {
             readOnlyHint: true,
         },
-        parameters: WorkspacePickSchema.omit({ absoluteGitRoots: true, allWorkspaceRoots: true })
-            .pick({
-            workspaceRoot: true,
-            rootIndex: true,
-            format: true,
-        })
-            .extend({
+        parameters: WorkspacePickSchema.extend({
             path: z.string().min(1).describe("Repo-relative path to the file to blame."),
             ref: z.string().optional().describe("Optional commit-ish (SHA, branch, tag) to blame at."),
             startLine: z
                 .number()
                 .int()
                 .min(1)
+                .max(1000000)
                 .optional()
                 .describe("First line of the range to blame (1-based). Requires endLine."),
             endLine: z
                 .number()
                 .int()
                 .min(1)
+                .max(1000000)
                 .optional()
                 .describe("Last line of the range to blame (1-based, inclusive). Requires startLine."),
+            maxLines: z
+                .number()
+                .int()
+                .min(1)
+                .max(10000)
+                .optional()
+                .default(2000)
+                .describe("Max blamed lines to return. Default: 2000."),
         }),
         execute: async (args) => {
             const pre = requireSingleRepo(server, args);
@@ -212,11 +249,18 @@ export function registerGitBlameTool(server) {
                     detail: (r.stderr || r.stdout).trim(),
                 });
             }
-            const blameLines = parsePorcelain(r.stdout);
+            const allLines = parsePorcelain(r.stdout);
+            const maxLines = args.maxLines ?? 2000;
+            const truncated = allLines.length > maxLines;
+            const blameLines = truncated ? allLines.slice(0, maxLines) : allLines;
             const blameJson = {
                 ...spreadDefined("ref", args.ref),
                 path: args.path,
-                lines: blameLines,
+                groups: groupBlameLines(blameLines),
+                ...spreadWhen(truncated, {
+                    truncated: true,
+                    omittedLines: allLines.length - maxLines,
+                }),
             };
             if (args.format === "json") {
                 return jsonRespond(blameJson);

package/dist/server/git-branch-list-tool.js

@@ -104,13 +104,7 @@ export function registerGitBranchListTool(server) {
         annotations: {
             readOnlyHint: true,
         },
-        parameters: WorkspacePickSchema.omit({ absoluteGitRoots: true, allWorkspaceRoots: true })
-            .pick({
-            workspaceRoot: true,
-            rootIndex: true,
-            format: true,
-        })
-            .extend({
+        parameters: WorkspacePickSchema.extend({
             includeRemotes: z
                 .boolean()
                 .optional()

package/dist/server/git-cherry-pick-tool.js

@@ -104,7 +104,7 @@ export function registerGitCherryPickTool(server) {
             destructiveHint: false,
             idempotentHint: false,
         },
-        parameters: WorkspacePickSchema.omit({ absoluteGitRoots: true }).extend({
+        parameters: WorkspacePickSchema.extend({
             sources: z
                 .array(z.string().min(1))
                 .min(1)

package/dist/server/git-diff-summary-tool.js

@@ -29,7 +29,7 @@ const DEFAULT_EXCLUDE_PATTERNS = [
  * Format per line: "<additions>\t<deletions>\t<path>"
  * Binary files emit "-\t-\t<path>" and are recorded as 0/0.
  */
-function parseNumstatOutput(numstat) {
+export function parseNumstatOutput(numstat) {
     const result = new Map();
     for (const line of numstat.split("\n")) {
         const parts = line.split("\t");
@@ -184,7 +184,7 @@ export function registerGitDiffSummaryTool(server) {
         annotations: {
             readOnlyHint: true,
         },
-        parameters: WorkspacePickSchema.omit({ allWorkspaceRoots: true }).extend({
+        parameters: WorkspacePickSchema.extend({
             range: z
                 .string()
                 .optional()
@@ -282,7 +282,7 @@ export function registerGitDiffSummaryTool(server) {
                     additions: stat.additions,
                     deletions: stat.deletions,
                     ...spreadDefined("oldPath", oldPath),
-                    truncated,
+                    ...spreadWhen(truncated, { truncated: true }),
                     diff: diffText,
                 });
             }

package/dist/server/git-diff-tool.js

@@ -66,10 +66,7 @@ export function registerGitDiffTool(server) {
         annotations: {
             readOnlyHint: true,
         },
-        parameters: WorkspacePickSchema.omit({
-            absoluteGitRoots: true,
-            allWorkspaceRoots: true,
-        }).extend({
+        parameters: WorkspacePickSchema.extend({
             base: z
                 .string()
                 .optional()

package/dist/server/git-fetch-tool.js

@@ -12,7 +12,7 @@ import { WorkspacePickSchema } from "./schemas.js";
  * Lines containing "[new" indicate new refs (new branch, new tag, new ref).
  * Lines with " -> " but not containing "[new" indicate updated refs.
  */
-function parseGitFetchOutput(output) {
+export function parseGitFetchOutput(output) {
     const lines = output.split("\n");
     const updatedRefs = [];
     const newRefs = [];
@@ -97,22 +97,13 @@ export function registerGitFetchTool(server) {
         annotations: {
             readOnlyHint: false, // Fetch modifies refs but not working tree; not strictly read-only but safe
         },
-        parameters: WorkspacePickSchema.omit({ absoluteGitRoots: true, allWorkspaceRoots: true })
-            .pick({
-            workspaceRoot: true,
-            rootIndex: true,
-            format: true,
-        })
-            .extend({
+        parameters: WorkspacePickSchema.extend({
             remote: z
                 .string()
                 .optional()
                 .default("origin")
                 .describe("Remote to fetch from (default: origin)."),
-            branch: z
-                .string()
-                .optional()
-                .describe("If specified: fetch only this branch (e.g. 'main')."),
+            branch: z.string().optional().describe("If specified: fetch only this branch (e.g. 'main')."),
             prune: z
                 .boolean()
                 .optional()

package/dist/server/git-inventory-tool.js

@@ -5,7 +5,7 @@ import { buildInventorySectionMarkdown, collectInventoryEntry, makeSkipEntry, va
 import { jsonRespond, spreadDefined, spreadWhen } from "./json.js";
 import { applyPresetNestedRoots } from "./presets.js";
 import { requireGitAndRoots } from "./roots.js";
-import { MAX_INVENTORY_ROOTS_DEFAULT, WorkspacePickSchema } from "./schemas.js";
+import { MAX_INVENTORY_ROOTS_DEFAULT, RootPickSchema } from "./schemas.js";
 export function registerGitInventoryTool(server) {
     server.addTool({
         name: "git_inventory",
@@ -13,7 +13,7 @@ export function registerGitInventoryTool(server) {
         annotations: {
             readOnlyHint: true,
         },
-        parameters: WorkspacePickSchema.extend({
+        parameters: RootPickSchema.extend({
             nestedRoots: z.array(z.string()).optional(),
             preset: z.string().optional(),
             presetMerge: z
@@ -26,9 +26,9 @@ export function registerGitInventoryTool(server) {
             maxRoots: z.number().int().min(1).max(256).optional().default(MAX_INVENTORY_ROOTS_DEFAULT),
         }),
         execute: async (args) => {
-            if (args.absoluteGitRoots != null && args.absoluteGitRoots.length > 0) {
+            if (Array.isArray(args.root)) {
                 if (args.preset || (args.nestedRoots?.length ?? 0) > 0) {
-                    return jsonRespond({ error: ERROR_CODES.ABSOLUTE_GIT_ROOTS_NESTED_OR_PRESET_CONFLICT });
+                    return jsonRespond({ error: ERROR_CODES.ROOT_LIST_NESTED_OR_PRESET_CONFLICT });
                 }
             }
             const pre = requireGitAndRoots(server, args, args.preset);

package/dist/server/git-log-tool.js

@@ -5,7 +5,7 @@ import { asyncPool, GIT_SUBPROCESS_PARALLELISM, gitTopLevel, spawnGitAsync } fro
 import { isSafeGitAncestorRef } from "./git-refs.js";
 import { jsonRespond, spreadDefined, spreadWhen } from "./json.js";
 import { requireGitAndRoots } from "./roots.js";
-import { WorkspacePickSchema } from "./schemas.js";
+import { RootPickSchema } from "./schemas.js";
 // ---------------------------------------------------------------------------
 // Constants
 // ---------------------------------------------------------------------------
@@ -180,7 +180,7 @@ export function registerGitLogTool(server) {
         annotations: {
             readOnlyHint: true,
         },
-        parameters: WorkspacePickSchema.extend({
+        parameters: RootPickSchema.extend({
             format: z
                 .enum(["markdown", "json", "oneline"])
                 .optional()

package/dist/server/git-merge-tool.js

@@ -216,7 +216,7 @@ export function registerGitMergeTool(server) {
             destructiveHint: false,
             idempotentHint: false,
         },
-        parameters: WorkspacePickSchema.omit({ absoluteGitRoots: true }).extend({
+        parameters: WorkspacePickSchema.extend({
             sources: z
                 .array(z.string().min(1))
                 .min(1)

package/dist/server/git-parity-tool.js

@@ -5,7 +5,7 @@ import { validateRepoPath } from "./inventory.js";
 import { jsonRespond, spreadDefined } from "./json.js";
 import { applyPresetParityPairs } from "./presets.js";
 import { requireGitAndRoots } from "./roots.js";
-import { WorkspacePickSchema } from "./schemas.js";
+import { RootPickSchema } from "./schemas.js";
 export function registerGitParityTool(server) {
     server.addTool({
         name: "git_parity",
@@ -13,7 +13,7 @@ export function registerGitParityTool(server) {
         annotations: {
             readOnlyHint: true,
         },
-        parameters: WorkspacePickSchema.extend({
+        parameters: RootPickSchema.extend({
             pairs: z
                 .array(z.object({
                 left: z.string(),

package/dist/server/git-push-tool.js

@@ -16,7 +16,7 @@ export function registerGitPushTool(server) {
             destructiveHint: false,
             idempotentHint: false,
         },
-        parameters: WorkspacePickSchema.omit({ absoluteGitRoots: true }).extend({
+        parameters: WorkspacePickSchema.extend({
             remote: z
                 .string()
                 .optional()

package/dist/server/git-reflog-tool.js

@@ -82,13 +82,7 @@ export function registerGitReflogTool(server) {
         annotations: {
             readOnlyHint: true,
         },
-        parameters: WorkspacePickSchema.omit({ absoluteGitRoots: true, allWorkspaceRoots: true })
-            .pick({
-            workspaceRoot: true,
-            rootIndex: true,
-            format: true,
-        })
-            .extend({
+        parameters: WorkspacePickSchema.extend({
             ref: z
                 .string()
                 .optional()

package/dist/server/git-reset-soft-tool.js

@@ -15,7 +15,7 @@ export function registerGitResetSoftTool(server) {
             destructiveHint: false,
             idempotentHint: false,
         },
-        parameters: WorkspacePickSchema.omit({ absoluteGitRoots: true }).extend({
+        parameters: WorkspacePickSchema.extend({
             ref: z
                 .string()
                 .min(1)

package/dist/server/git-show-tool.js

@@ -156,17 +156,8 @@ export function registerGitShowTool(server) {
         annotations: {
             readOnlyHint: true,
         },
-        parameters: WorkspacePickSchema.omit({ absoluteGitRoots: true, allWorkspaceRoots: true })
-            .pick({
-            workspaceRoot: true,
-            rootIndex: true,
-            format: true,
-        })
-            .extend({
-            ref: z
-                .string()
-                .min(1)
-                .describe("Commit reference (SHA, branch, tag, or any git rev-spec)."),
+        parameters: WorkspacePickSchema.extend({
+            ref: z.string().min(1).describe("Commit reference (SHA, branch, tag, or any git rev-spec)."),
             path: z
                 .string()
                 .optional()

package/dist/server/git-stash-tool.js

@@ -14,11 +14,7 @@ export function registerGitStashListTool(server) {
         annotations: {
             readOnlyHint: true,
         },
-        parameters: WorkspacePickSchema.omit({ absoluteGitRoots: true, allWorkspaceRoots: true }).pick({
-            workspaceRoot: true,
-            rootIndex: true,
-            format: true,
-        }),
+        parameters: WorkspacePickSchema,
         execute: async (args) => {
             const pre = requireSingleRepo(server, args);
             if (!pre.ok)
@@ -83,17 +79,12 @@ export function registerGitStashApplyTool(server) {
             destructiveHint: false,
             idempotentHint: false,
         },
-        parameters: WorkspacePickSchema.omit({ absoluteGitRoots: true, allWorkspaceRoots: true })
-            .pick({
-            workspaceRoot: true,
-            rootIndex: true,
-            format: true,
-        })
-            .extend({
+        parameters: WorkspacePickSchema.extend({
             index: z
                 .number()
                 .int()
                 .min(0)
+                .max(10000)
                 .optional()
                 .default(0)
                 .describe("Stash index (defaults to 0 for stash@{0})."),