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

package/docs/mcp-tools.md

@@ -15,24 +15,253 @@ MCP clients expose tools as `{serverName}_{toolName}`. With the server registere
 | `git_inventory` | `rethunk-git_git_inventory` | Status + ahead/behind per path; default upstream each repo’s `@{u}`; pass **both** `remote` and `branch` for fixed tracking. `nestedRoots`, `preset`, `presetMerge`, `maxRoots`, `format`, plus workspace pick args (`absoluteGitRoots` cannot combine with `preset`/`nestedRoots`). **Read-only.** |
 | `git_parity` | `rethunk-git_git_parity` | Compare `git rev-parse HEAD` for path pairs. `pairs`, `preset`, `presetMerge`, `format`, plus workspace pick args (`absoluteGitRoots` for sibling clone batches). **Read-only.** |
 | `list_presets` | `rethunk-git_list_presets` | List preset names/counts from `.rethunk/git-mcp-presets.json`; invalid JSON/schema surface as errors. Workspace pick + `format` only (includes `absoluteGitRoots`). **Read-only.** |
-| `git_log` | `rethunk-git_git_log` | Path-filtered, time-windowed `git log` across one or more workspace roots. Returns commit history with author, date, subject, and shortstat. Args: `since`, `paths`, `grep`, `author`, `maxCommits`, `branch`, plus workspace pick args (`absoluteGitRoots` for sibling clones) + `format`. **Read-only.** |
+| `git_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: `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_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); branch deletion uses patch-id equivalence by default so cherry-pick workflows (where SHA differs but diff is identical) clean up correctly. Pass `strictMergedRefEquality: true` for strict `git branch -d` ancestry semantics. Args: `sources`, `onto?`, cleanup flags, `strictMergedRefEquality?` + 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).
 
+---
+
+### `git_status` — parameters
+
+| Parameter | Type | Default | Notes |
+|-----------|------|---------|-------|
+| `includeSubmodules` | boolean | `true` | When `true`, reads `.gitmodules` at each git toplevel and runs `git status --short -b` for each checked-out submodule in parallel. Set `false` to skip submodule discovery entirely. |
+| `workspaceRoot` | string | — | Explicit root; highest priority. |
+| `rootIndex` | int | — | Pick one of several MCP roots (0-based). |
+| `allWorkspaceRoots` | boolean | `false` | Fan out across all MCP roots. |
+| `absoluteGitRoots` | string[] | — | Explicit list of absolute paths; replaces normal workspace pick. Max 256. Read-only tools only. |
+| `format` | `"markdown"` \| `"json"` | `"markdown"` | Output format. |
+
+### `git_status` — JSON shape (`format: "json"`)
+
+```json
+{
+  "groups": [{
+    "mcpRoot": "/abs/workspace",
+    "repos": [
+      { "label": ".", "path": "/abs/workspace", "statusText": "## main...origin/main\nM src/foo.ts", "ok": true },
+      { "label": "sub", "path": "/abs/workspace/sub", "statusText": "## main...origin/main", "ok": true }
+    ]
+  }]
+}
+```
+
+One `groups` entry per resolved root. Each `repos` entry has `label` (relative path, `"."` for the root), `path` (absolute), `statusText` (full `git status --short -b` output), and `ok` (`false` when git failed or the submodule is not checked out).
+
+### `git_status` — error codes
+
+Error payloads appear as top-level JSON or inline in individual repo rows (`ok: false`):
+
+| Code / statusText | Context | Meaning |
+|-------------------|---------|---------|
+| `git_not_found` | top-level | `git` binary not on `PATH`. |
+| `not_a_git_repository` | repo row `statusText` | Root is not inside a git repository. |
+| `(submodule path escapes repository — rejected)` | repo row `statusText` | `.gitmodules` path resolves outside the git toplevel (security guard). |
+| `(no .git — submodule not checked out?)` | repo row `statusText` | Submodule directory exists but has no `.git` — not initialized. |
+| `root_index_out_of_range` | top-level | `rootIndex` exceeds the number of MCP file roots. |
+| `absolute_git_roots_exclusive` | top-level | `absoluteGitRoots` combined with `workspaceRoot`, `rootIndex`, or `allWorkspaceRoots: true`. |
+| `invalid_absolute_git_root` | top-level | An `absoluteGitRoots` entry is not a git-recognized directory. |
+| `absolute_git_roots_too_many` | top-level | More than 256 entries in `absoluteGitRoots`. |
+| `absolute_git_roots_empty` | top-level | `absoluteGitRoots` resolved to zero toplevels. |
+
+---
+
+### `git_inventory` — parameters
+
+| Parameter | Type | Default | Notes |
+|-----------|------|---------|-------|
+| `nestedRoots` | string[] | — | Relative paths (from the workspace git toplevel) to treat as independent git repos to inventory. Each must be a valid git work tree; invalid paths produce skip entries rather than errors. Cannot combine with `absoluteGitRoots` or `preset`. |
+| `preset` | string | — | Preset name from `.rethunk/git-mcp-presets.json`. Loads `nestedRoots` from the preset's entry. Cannot combine with `absoluteGitRoots`. |
+| `presetMerge` | boolean | `false` | When `true`, merge inline `nestedRoots` with preset roots instead of replacing. |
+| `remote` | string | — | Fixed remote for ahead/behind tracking. Must be paired with `branch`. |
+| `branch` | string | — | Fixed branch for ahead/behind tracking. Must be paired with `remote`. When both are absent the tool uses each repo's `@{u}` upstream. |
+| `maxRoots` | int | `64` | Max nested roots to process (1–256). Roots beyond the limit are omitted; `nestedRootsTruncated: true` and `nestedRootsOmittedCount` are set on the group. |
+| `workspaceRoot` | string | — | Explicit root; highest priority. |
+| `rootIndex` | int | — | Pick one of several MCP roots (0-based). |
+| `allWorkspaceRoots` | boolean | `false` | Fan out across all MCP roots. |
+| `absoluteGitRoots` | string[] | — | Explicit list; replaces normal workspace pick. Cannot combine with `nestedRoots` or `preset`. |
+| `format` | `"markdown"` \| `"json"` | `"markdown"` | Output format. |
+
+### `git_inventory` — JSON shape (`format: "json"`)
+
+```json
+{
+  "inventories": [{
+    "workspace_root": "/abs/path",
+    "entries": [{
+      "label": ".",
+      "path": "/abs/path",
+      "upstreamMode": "auto",
+      "branchStatus": "## main...origin/main",
+      "headAbbrev": "a1b2c3d",
+      "upstreamRef": "origin/main",
+      "ahead": "2",
+      "behind": "0"
+    }],
+    "nestedRootsTruncated": true,
+    "nestedRootsOmittedCount": 3,
+    "upstream": { "mode": "fixed", "remote": "origin", "branch": "main" }
+  }]
+}
+```
+
+`nestedRootsTruncated` / `nestedRootsOmittedCount` present only when `maxRoots` cut the list. `upstream` object present only when `remote`+`branch` were supplied (fixed mode). `presetSchemaVersion` present only when a preset was loaded. See *v2/v3 field omission* for `entries[*]` optional fields.
+
+### `git_inventory` — error codes
+
+| Code | Meaning |
+|------|---------|
+| `git_not_found` | `git` binary not on `PATH`. |
+| `remote_branch_mismatch` | Only one of `remote` / `branch` was provided; supply both or neither. |
+| `invalid_remote_or_branch` | `remote` or `branch` contains characters outside the safe token set. |
+| `absolute_git_roots_nested_or_preset_conflict` | `absoluteGitRoots` combined with `nestedRoots` or `preset`. |
+| `absolute_git_roots_exclusive` | `absoluteGitRoots` combined with `workspaceRoot`, `rootIndex`, or `allWorkspaceRoots: true`. |
+| `absolute_git_roots_preset_conflict` | `absoluteGitRoots` combined with a `preset` argument. |
+| `invalid_absolute_git_root` | An `absoluteGitRoots` entry is not a git-recognized directory. |
+| `absolute_git_roots_too_many` | More than 256 entries in `absoluteGitRoots`. |
+| `absolute_git_roots_empty` | `absoluteGitRoots` resolved to zero toplevels. |
+| `root_index_out_of_range` | `rootIndex` exceeds the number of MCP file roots. |
+| `preset_not_found` | Named preset does not exist in the preset file. |
+| `invalid_json` | Preset file contains invalid JSON. |
+| `invalid_schema` | Preset file fails schema validation. |
+
+Skip entries (individual repos that could not be inventoried) appear inline in `entries[*]` with `skipReason` rather than as top-level errors.
+
+---
+
+### `git_parity` — parameters
+
+| Parameter | Type | Notes |
+|-----------|------|-------|
+| `pairs` | `{left: string, right: string, label?: string}[]` | Path pairs to compare. `left` and `right` are relative to the workspace git toplevel. `label` is optional display name; defaults to `"left / right"`. At least one pair required (via inline `pairs` or `preset`). |
+| `preset` | string | Preset name from `.rethunk/git-mcp-presets.json`. Loads `parityPairs` from the preset's entry. |
+| `presetMerge` | boolean | Default `false`. When `true`, merge inline `pairs` with preset pairs instead of replacing. |
+| `workspaceRoot` | string | Explicit root; highest priority. |
+| `rootIndex` | int | Pick one of several MCP roots (0-based). |
+| `allWorkspaceRoots` | boolean | `false` | Fan out across all MCP roots. |
+| `absoluteGitRoots` | string[] | Explicit list of absolute paths; replaces normal workspace pick. Useful for checking parity across sibling clones. |
+| `format` | `"markdown"` \| `"json"` | Output format. Default: `"markdown"`. |
+
+### `git_parity` — JSON shape (`format: "json"`)
+
+```json
+{
+  "parity": [{
+    "workspace_root": "/abs/path",
+    "status": "MISMATCH",
+    "pairs": [
+      {
+        "label": "shared",
+        "leftPath": "/abs/path/left",
+        "rightPath": "/abs/path/right",
+        "match": true,
+        "sha": "a1b2c3d4e5f6…"
+      },
+      {
+        "label": "config",
+        "leftPath": "/abs/path/cfg-a",
+        "rightPath": "/abs/path/cfg-b",
+        "match": false,
+        "leftSha": "a1b2c3d…",
+        "rightSha": "f9e8d7c…"
+      }
+    ]
+  }]
+}
+```
+
+`status` is `"OK"` when every pair matches, `"MISMATCH"` when any pair differs or errors. On a match, `sha` carries the common HEAD SHA. On a mismatch, `leftSha` / `rightSha` carry the differing SHAs. On error (path escape or `git rev-parse HEAD` failure), `error` carries a description string and both SHA fields are absent. `presetSchemaVersion` is present when a preset was loaded.
+
+### `git_parity` — error codes
+
+| Code | Meaning |
+|------|---------|
+| `git_not_found` | `git` binary not on `PATH`. |
+| `no_pairs` | Neither inline `pairs` nor a preset with `parityPairs` was supplied. |
+| `absolute_git_roots_exclusive` | `absoluteGitRoots` combined with `workspaceRoot`, `rootIndex`, or `allWorkspaceRoots: true`. |
+| `absolute_git_roots_preset_conflict` | `absoluteGitRoots` combined with a `preset` argument. |
+| `invalid_absolute_git_root` | An `absoluteGitRoots` entry is not a git-recognized directory. |
+| `absolute_git_roots_too_many` | More than 256 entries in `absoluteGitRoots`. |
+| `absolute_git_roots_empty` | `absoluteGitRoots` resolved to zero toplevels. |
+| `root_index_out_of_range` | `rootIndex` exceeds the number of MCP file roots. |
+| `preset_not_found` | Named preset does not exist in the preset file. |
+| `invalid_json` | Preset file contains invalid JSON. |
+| `invalid_schema` | Preset file fails schema validation. |
+
+Path-escape and `rev-parse` failures are reported inline in `pairs[*].error`, not as top-level error codes.
+
+---
+
+### `list_presets` — parameters
+
+| Parameter | Type | Notes |
+|-----------|------|-------|
+| `workspaceRoot` | string | Explicit root; highest priority. |
+| `rootIndex` | int | Pick one of several MCP roots (0-based). |
+| `allWorkspaceRoots` | boolean | Default `false`. Fan out across all MCP roots. |
+| `absoluteGitRoots` | string[] | Explicit list; replaces normal workspace pick. |
+| `format` | `"markdown"` \| `"json"` | Output format. Default: `"markdown"`. |
+
+### `list_presets` — JSON shape (`format: "json"`)
+
+```json
+{
+  "roots": [{
+    "workspaceRoot": "/abs/workspace",
+    "gitTop": "/abs/workspace",
+    "presetFile": "/abs/workspace/.rethunk/git-mcp-presets.json",
+    "fileExists": true,
+    "presetSchemaVersion": "1",
+    "presets": [
+      {
+        "name": "monorepo",
+        "nestedRootsCount": 5,
+        "parityPairsCount": 2,
+        "workspaceRootHint": "/abs/workspace"
+      }
+    ]
+  }]
+}
+```
+
+`gitTop` is `null` when the workspace root is not inside a git repository. `presetSchemaVersion` is omitted when absent. `workspaceRootHint` is omitted when not set. When `fileExists: false` the `presets` array is empty and no `error` is present. When the file exists but fails to load, `error` contains a structured error object and `presets` is empty.
+
+### `list_presets` — error codes
+
+| Code | Meaning |
+|------|---------|
+| `git_not_found` | `git` binary not on `PATH`. |
+| `not_a_git_repository` | Root is not inside a git repository (reported inline in the `roots[*].error` field, not top-level). |
+| `invalid_json` | Preset file is not valid JSON (inline in `roots[*].error`). |
+| `invalid_schema` | Preset file fails schema validation (inline in `roots[*].error`). |
+| `absolute_git_roots_exclusive` | `absoluteGitRoots` combined with `workspaceRoot`, `rootIndex`, or `allWorkspaceRoots: true`. |
+| `invalid_absolute_git_root` | An `absoluteGitRoots` entry is not a git-recognized directory. |
+| `absolute_git_roots_too_many` | More than 256 entries in `absoluteGitRoots`. |
+| `absolute_git_roots_empty` | `absoluteGitRoots` resolved to zero toplevels. |
+| `root_index_out_of_range` | `rootIndex` exceeds the number of MCP file roots. |
+
+---
+
 ## JSON responses
 
 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)
 
@@ -68,7 +297,7 @@ To keep responses compact, **optional fields are omitted when they would be empt
 | `workspaceRoot` | string | — | Explicit root; highest priority. |
 | `rootIndex` | int | — | Pick one of several MCP roots (0-based). |
 | `allWorkspaceRoots` | boolean | `false` | Fan out across all MCP roots. |
-| `format` | `"markdown"` \| `"json"` | `"markdown"` | Output format. |
+| `format` | `"markdown"` \| `"json"` \| `"oneline"` | `"markdown"` | Output format. `oneline` returns `<sha7> <subject>` per line with no headers (single root) or `### repo (branch)` separators per group (multi-root). Lowest-token option for post-commit verification. |
 
 ### `git_log` — JSON shape (`format: "json"`)
 
@@ -179,12 +408,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) a path relative to the git root, staged with `git add`; (b) a `{path, lines: {from, to}}` object for hunk-level staging — only unified-diff hunks overlapping the given 1-indexed line range are staged; or (c) a path to a **deleted tracked file** (missing on disk but tracked in HEAD), which is staged as a removal via `git rm --cached` — combining `{path, lines}` with a deleted file is an error. 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 +587,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)
@@ -226,7 +596,7 @@ The `push` object is present only when `push: "after"` was requested **and** eve
 | Code | Meaning |
 |------|---------|
 | `path_escapes_repository` | One of the listed file paths resolves outside the git toplevel. |
-| `stage_failed` | `git add` failed (e.g. untracked path or permission error). |
+| `stage_failed` | Staging failed. `git add` error for modified/new files; `git rm --cached` error for deleted files (e.g. path never tracked in HEAD); `{path, lines}` on a deleted file. |
 | `commit_failed` | `git commit` failed (e.g. nothing staged, hooks rejected). |
 | `not_a_git_repository` | The resolved workspace root is not inside a git repository. |
 
@@ -310,8 +680,9 @@ On conflict: top-level `ok` is `false`, the conflicting entry has `ok: false` wi
 |-----------|------|-------|
 | `sources` | `string[]` | Source specs. 1–50 entries. Each entry is one of: a full/short SHA, an `A..B` / `A...B` range, or a branch name. Branch names expand to `onto..<branch>` (oldest-first). |
 | `onto` | string | Destination branch. Defaults to the currently checked-out branch. Rejected when HEAD is detached. |
-| `deleteMergedBranches` | boolean | Default `false`. After all commits apply, delete each **branch-kind** source locally (`git branch -d`) when it is fully merged into the destination by SHA-reachability (not patch-equivalence). Protected names always skipped; never touches remote refs. |
+| `deleteMergedBranches` | boolean | Default `false`. After all commits apply, delete each **branch-kind** source locally. Deletion uses **patch-id equivalence** by default — correct for cherry-pick workflows where SHA differs but diff is identical. Protected names always skipped; never touches remote refs. |
 | `deleteMergedWorktrees` | boolean | Default `false`. After success, remove any local worktree attached to a branch-kind source (`git worktree remove`). Protected tails always skipped. |
+| `strictMergedRefEquality` | boolean | Default `false`. When `true`, branch deletion uses strict SHA-reachability (`git branch -d` ancestry semantics) instead of patch-id equivalence. Use when you need git's exact ancestry guarantee rather than content equivalence. |
 | `workspaceRoot`, `rootIndex`, `format` | — | Standard workspace pick + output format. |
 
 ### `git_cherry_pick` — JSON shape (`format: "json"`)
@@ -399,6 +770,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 +828,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 +948,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.5.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,12 +65,22 @@
   },
   "dependencies": {
     "fastmcp": "^4.0.1",
-    "zod": "^4.3.6"
+    "zod": "^4.4.3"
   },
   "devDependencies": {
-    "@biomejs/biome": "^2.4.13",
-    "@types/node": "^25.6.0",
+    "@biomejs/biome": "^2.4.15",
+    "@types/node": "^25.8.0",
     "rimraf": "^6.1.3",
     "typescript": "^6.0.3"
+  },
+  "overrides": {
+    "@hono/node-server": "^1.19.14",
+    "hono": "^4.12.18",
+    "fast-uri": "^3.1.2",
+    "postcss": "^8.5.10",
+    "vite": "^7.3.2",
+    "ip-address": "^10.1.1",
+    "axios": "^1.15.2",
+    "follow-redirects": "^1.15.12"
   }
 }