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

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@rethunk/mcp-multi-root-git",
-  "version": "3.1.0",
+  "version": "4.0.0",
   "description": "MCP stdio server: multi-root git status, inventory, and HEAD parity checks. Generic tools usable by any workspace.",
   "type": "module",
   "private": false,
@@ -44,7 +44,7 @@
     "lint": "biome check .",
     "format": "biome check --write .",
     "typecheck": "tsc --noEmit",
-    "ci": "bun run schema:tools:check && bun run lint && bun run typecheck && bun run test && bun run build"
+    "ci": "bun run schema:tools:check && bun run schema:individual:check && bun run lint && bun run typecheck && set -o pipefail && bun run test:coverage 2>&1 | tee .coverage-ci.txt && bun run coverage:check .coverage-ci.txt 80 && bun run build"
   },
   "keywords": [
     "mcp",
@@ -67,15 +67,15 @@
     "access": "public"
   },
   "dependencies": {
-    "fastmcp": "^4.3.2",
+    "fastmcp": "^4.7.2",
     "zod": "^4.4.3"
   },
   "devDependencies": {
-    "@biomejs/biome": "^2.5.2",
+    "@biomejs/biome": "^2.5.4",
     "@types/bun": "^1.3.14",
-    "@types/node": "^26.1.0",
+    "@types/node": "^26.1.1",
     "rimraf": "^6.1.3",
-    "typescript": "^6.0.3"
+    "typescript": "^7.0.2"
   },
   "overrides": {
     "@hono/node-server": "^1.19.14",

package/schemas/batch_commit.json

@@ -77,7 +77,7 @@
                 }
               ]
             },
-            "description": "Paths to stage, relative to git root. String or `{ path, lines }` for hunk-level staging. Deleted tracked files are staged via `git rm --cached`. Cannot combine `lines` with a deleted file."
+            "description": "Paths to stage, relative to git root. String or `{ path, lines }` for hunk-level staging. Each path is staged individually (`git add` / `git apply --cached` / `git rm --cached`); on mid-entry stage failure, already-staged paths for that entry are unstaged. Deleted tracked files are staged via `git rm --cached`. Cannot combine `lines` with a deleted file. Rejects `.`, the repo root, and directory pathspecs."
           }
         },
         "required": [
@@ -99,7 +99,7 @@
     },
     "dryRun": {
       "default": false,
-      "description": "Stage files and return a preview without writing commits; unstages afterwards. Response is marked DRY RUN.",
+      "description": "Stage files and return a preview without writing commits; restores the index afterwards. Response is marked DRY RUN.",
       "type": "boolean"
     }
   },

package/schemas/git_blame.json

@@ -22,7 +22,7 @@
       "description": "Repo-relative path to the file to blame."
     },
     "ref": {
-      "description": "Optional commit-ish (SHA, branch, tag) to blame at.",
+      "description": "Optional commit-ish (SHA, branch, tag) to blame at. Ancestor notation is accepted (e.g. \"HEAD~3\", \"main^2\").",
       "type": "string"
     },
     "startLine": {

package/schemas/git_branch.json

@@ -0,0 +1,54 @@
+{
+  "$schema": "https://json-schema.org/draft/2020-12/schema",
+  "title": "@rethunk/mcp-multi-root-git: git_branch",
+  "description": "Parameter schema for the 'git_branch' MCP tool.",
+  "type": "object",
+  "properties": {
+    "workspaceRoot": {
+      "description": "Repo path. Default: first MCP root / cwd.",
+      "type": "string"
+    },
+    "format": {
+      "default": "markdown",
+      "type": "string",
+      "enum": [
+        "markdown",
+        "json"
+      ]
+    },
+    "action": {
+      "type": "string",
+      "enum": [
+        "create",
+        "delete",
+        "rename"
+      ],
+      "description": "Which branch operation to perform."
+    },
+    "name": {
+      "type": "string",
+      "minLength": 1,
+      "description": "Branch name to create/delete, or the existing branch name for rename."
+    },
+    "from": {
+      "description": "Commit-ish to base a new branch on (create only). Default: HEAD.",
+      "type": "string"
+    },
+    "newName": {
+      "description": "New branch name (required for rename).",
+      "type": "string"
+    },
+    "force": {
+      "default": false,
+      "description": "Force-delete an unmerged branch (`git branch -D`). Delete only; never overrides protected-branch rejection.",
+      "type": "boolean"
+    }
+  },
+  "required": [
+    "format",
+    "action",
+    "name",
+    "force"
+  ],
+  "additionalProperties": false
+}

package/schemas/git_cherry_pick.json

@@ -37,13 +37,22 @@
     },
     "deleteMergedWorktrees": {
       "default": false,
-      "description": "Remove local worktrees on branch-kind sources after success. Protected tails skipped.",
+      "description": "Remove local worktrees on branch-kind sources after success. Protected names and path tails skipped.",
       "type": "boolean"
     },
     "strictMergedRefEquality": {
       "default": false,
       "description": "false (default): delete branch when every commit is content-equivalent on destination (patch-id, normal cherry-pick outcome). true: require strict ref ancestry (`git branch -d` semantics — will refuse after cherry-pick due to SHA mismatch).",
       "type": "boolean"
+    },
+    "onConflict": {
+      "default": "abort",
+      "description": "`abort` (default): on conflict, run `cherry-pick --abort` and roll back the whole range (unchanged behavior). `pause`: on conflict, leave the conflict and native cherry-pick sequencer state in place — commits already applied stay applied — so it can be resolved and resumed via `git_cherry_pick_continue`.",
+      "type": "string",
+      "enum": [
+        "abort",
+        "pause"
+      ]
     }
   },
   "required": [
@@ -51,7 +60,8 @@
     "sources",
     "deleteMergedBranches",
     "deleteMergedWorktrees",
-    "strictMergedRefEquality"
+    "strictMergedRefEquality",
+    "onConflict"
   ],
   "additionalProperties": false
 }

package/schemas/git_cherry_pick_continue.json

@@ -0,0 +1,34 @@
+{
+  "$schema": "https://json-schema.org/draft/2020-12/schema",
+  "title": "@rethunk/mcp-multi-root-git: git_cherry_pick_continue",
+  "description": "Parameter schema for the 'git_cherry_pick_continue' MCP tool.",
+  "type": "object",
+  "properties": {
+    "workspaceRoot": {
+      "description": "Repo path. Default: first MCP root / cwd.",
+      "type": "string"
+    },
+    "format": {
+      "default": "markdown",
+      "type": "string",
+      "enum": [
+        "markdown",
+        "json"
+      ]
+    },
+    "action": {
+      "default": "continue",
+      "description": "\"continue\" (default): resolve conflicts, stage them, then resume the sequencer. \"abort\": roll back to the pre-cherry-pick HEAD.",
+      "type": "string",
+      "enum": [
+        "continue",
+        "abort"
+      ]
+    }
+  },
+  "required": [
+    "format",
+    "action"
+  ],
+  "additionalProperties": false
+}

package/schemas/{git_reflog.json → git_conflicts.json}

@@ -1,7 +1,7 @@
 {
   "$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.",
+  "title": "@rethunk/mcp-multi-root-git: git_conflicts",
+  "description": "Parameter schema for the 'git_conflicts' MCP tool.",
   "type": "object",
   "properties": {
     "workspaceRoot": {
@@ -16,23 +16,23 @@
         "json"
       ]
     },
-    "ref": {
-      "default": "HEAD",
-      "description": "Ref whose reflog to show (branch name, HEAD, etc.). Default: HEAD.",
-      "type": "string"
+    "withHunks": {
+      "default": true,
+      "description": "Parse conflict-marker hunks per file. Set false for just the path list.",
+      "type": "boolean"
     },
-    "maxEntries": {
-      "default": 30,
-      "description": "Maximum reflog entries to return (hard cap 200). Default 30.",
+    "maxLinesPerFile": {
+      "default": 200,
+      "description": "Cap on lines scanned per file before marking `truncated: true`.",
       "type": "integer",
       "minimum": 1,
-      "maximum": 200
+      "maximum": 2000
     }
   },
   "required": [
     "format",
-    "ref",
-    "maxEntries"
+    "withHunks",
+    "maxLinesPerFile"
   ],
   "additionalProperties": false
 }

package/schemas/git_diff.json

@@ -17,11 +17,11 @@
       ]
     },
     "base": {
-      "description": "Base ref (e.g. \"main\", \"HEAD~3\"). Omit for unstaged changes.",
+      "description": "Base ref (e.g. \"main\"). Ancestor notation is accepted (e.g. \"HEAD~3\", \"main^2\"). Omit for unstaged changes.",
       "type": "string"
     },
     "head": {
-      "description": "Head ref (e.g. \"feature-branch\"). Defaults to HEAD. Used only when `base` is set.",
+      "description": "Head ref (e.g. \"feature-branch\"). Ancestor notation is accepted (e.g. \"HEAD~3\", \"main^2\"). Defaults to HEAD. Used only when `base` is set.",
       "type": "string"
     },
     "path": {
@@ -45,11 +45,19 @@
       "type": "integer",
       "minimum": 0,
       "maximum": 100
+    },
+    "maxBytes": {
+      "default": 512000,
+      "description": "Max UTF-8 bytes of diff text to return (default 512000). Oversized output is truncated with truncated:true.",
+      "type": "integer",
+      "minimum": 1024,
+      "maximum": 10000000
     }
   },
   "required": [
     "format",
-    "staged"
+    "staged",
+    "maxBytes"
   ],
   "additionalProperties": false
 }

package/schemas/git_grep.json

@@ -0,0 +1,85 @@
+{
+  "$schema": "https://json-schema.org/draft/2020-12/schema",
+  "title": "@rethunk/mcp-multi-root-git: git_grep",
+  "description": "Parameter schema for the 'git_grep' MCP tool.",
+  "type": "object",
+  "properties": {
+    "root": {
+      "description": "Repo path, array of paths, or \"*\" for all MCP roots.",
+      "anyOf": [
+        {
+          "type": "string"
+        },
+        {
+          "type": "array",
+          "items": {
+            "type": "string"
+          }
+        }
+      ]
+    },
+    "format": {
+      "default": "markdown",
+      "type": "string",
+      "enum": [
+        "markdown",
+        "json"
+      ]
+    },
+    "pickaxe": {
+      "type": "object",
+      "properties": {
+        "mode": {
+          "type": "string",
+          "enum": [
+            "S",
+            "G"
+          ],
+          "description": "`S` = pickaxe string (`git log -S`); `G` = pickaxe regex (`git log -G`)."
+        },
+        "term": {
+          "type": "string",
+          "minLength": 1,
+          "maxLength": 500,
+          "description": "Search term / regex for pickaxe history."
+        }
+      },
+      "required": [
+        "mode",
+        "term"
+      ],
+      "additionalProperties": false,
+      "description": "Pickaxe history search. Returns `commits[]` (sha + subject) per root."
+    },
+    "ref": {
+      "description": "Commit/branch/tag to use as the history tip. Must be a safe ref token.",
+      "type": "string"
+    },
+    "paths": {
+      "description": "Limit history to these paths (must resolve within the repo root).",
+      "type": "array",
+      "items": {
+        "type": "string"
+      }
+    },
+    "ignoreCase": {
+      "default": false,
+      "description": "Case-insensitive match (`-i`; affects `G` mode regexes).",
+      "type": "boolean"
+    },
+    "maxMatches": {
+      "default": 200,
+      "description": "Max commits per root (hard cap 1000, default 200).",
+      "type": "integer",
+      "minimum": 1,
+      "maximum": 1000
+    }
+  },
+  "required": [
+    "format",
+    "pickaxe",
+    "ignoreCase",
+    "maxMatches"
+  ],
+  "additionalProperties": false
+}

package/schemas/git_inventory.json

@@ -11,15 +11,10 @@
           "type": "string"
         },
         {
-          "maxItems": 256,
           "type": "array",
           "items": {
             "type": "string"
           }
-        },
-        {
-          "type": "string",
-          "const": "*"
         }
       ]
     },
@@ -53,6 +48,25 @@
       "description": "Pair with `remote`.",
       "type": "string"
     },
+    "compareRefs": {
+      "description": "Ahead/behind between two local refs (e.g. main vs a feature branch), independent of upstream tracking.",
+      "type": "object",
+      "properties": {
+        "left": {
+          "type": "string",
+          "description": "Base ref (ahead = commits in right not in left)."
+        },
+        "right": {
+          "type": "string",
+          "description": "Other ref (behind = commits in left not in right)."
+        }
+      },
+      "required": [
+        "left",
+        "right"
+      ],
+      "additionalProperties": false
+    },
     "maxRoots": {
       "default": 64,
       "type": "integer",

package/schemas/git_log.json

@@ -11,15 +11,10 @@
           "type": "string"
         },
         {
-          "maxItems": 256,
           "type": "array",
           "items": {
             "type": "string"
           }
-        },
-        {
-          "type": "string",
-          "const": "*"
         }
       ]
     },
@@ -62,11 +57,17 @@
     "branch": {
       "description": "Ref/branch to log from. Default: HEAD.",
       "type": "string"
+    },
+    "follow": {
+      "default": false,
+      "description": "Pass `git log --follow` for rename-aware history. Requires exactly one entry in `paths`.",
+      "type": "boolean"
     }
   },
   "required": [
     "format",
-    "maxCommits"
+    "maxCommits",
+    "follow"
   ],
   "additionalProperties": false
 }

package/schemas/git_merge.json

@@ -32,7 +32,7 @@
     },
     "strategy": {
       "default": "auto",
-      "description": "`auto` (default): cascade fast-forward → rebase → merge-commit per source. `ff-only`: only fast-forward, fail if diverged. `rebase`: rebase source onto destination, then fast-forward (no merge-commit fallback). `merge`: always create a merge commit (no fast-forward).",
+      "description": "`auto` (default): cascade fast-forward → rebase → merge-commit per source. `ff-only`: only fast-forward, fail if diverged. `rebase`: rebase source onto destination, then fast-forward (no merge-commit fallback). `merge`: always create a merge commit (no fast-forward). Note: `auto`/`rebase` rewrite the source branch tip in place when rebasing (new SHAs).",
       "type": "string",
       "enum": [
         "auto",
@@ -52,7 +52,7 @@
     },
     "deleteMergedWorktrees": {
       "default": false,
-      "description": "Remove local worktrees on source branches after clean merge (`git worktree remove`). Protected tails skipped.",
+      "description": "Remove local worktrees on source branches after clean merge (`git worktree remove`). Protected source names and path tails skipped.",
       "type": "boolean"
     }
   },

package/schemas/git_parity.json

@@ -11,15 +11,10 @@
           "type": "string"
         },
         {
-          "maxItems": 256,
           "type": "array",
           "items": {
             "type": "string"
           }
-        },
-        {
-          "type": "string",
-          "const": "*"
         }
       ]
     },

package/schemas/git_revert.json

@@ -0,0 +1,47 @@
+{
+  "$schema": "https://json-schema.org/draft/2020-12/schema",
+  "title": "@rethunk/mcp-multi-root-git: git_revert",
+  "description": "Parameter schema for the 'git_revert' MCP tool.",
+  "type": "object",
+  "properties": {
+    "workspaceRoot": {
+      "description": "Repo path. Default: first MCP root / cwd.",
+      "type": "string"
+    },
+    "format": {
+      "default": "markdown",
+      "type": "string",
+      "enum": [
+        "markdown",
+        "json"
+      ]
+    },
+    "sources": {
+      "minItems": 1,
+      "maxItems": 20,
+      "type": "array",
+      "items": {
+        "type": "string",
+        "minLength": 1
+      },
+      "description": "Commits to revert, applied in order: SHA, branch/tag name, or ancestor notation (`HEAD~1`)."
+    },
+    "noCommit": {
+      "default": false,
+      "description": "Pass `--no-commit`: apply the revert(s) to the index/working tree without committing (changes are left staged instead).",
+      "type": "boolean"
+    },
+    "mainline": {
+      "description": "Parent number (`-m N`) to diff against — required when reverting a merge commit.",
+      "type": "integer",
+      "minimum": 1,
+      "maximum": 9007199254740991
+    }
+  },
+  "required": [
+    "format",
+    "sources",
+    "noCommit"
+  ],
+  "additionalProperties": false
+}

package/schemas/git_show.json

@@ -19,7 +19,7 @@
     "ref": {
       "type": "string",
       "minLength": 1,
-      "description": "Commit reference (SHA, branch, tag, or any git rev-spec)."
+      "description": "Commit reference (SHA, branch, tag, or ancestor notation like \"HEAD~3\", \"main^2\")."
     },
     "path": {
       "description": "Optional single file path to inspect at the ref. Merged with `paths` when both are provided.",

package/schemas/git_stash_push.json

@@ -0,0 +1,47 @@
+{
+  "$schema": "https://json-schema.org/draft/2020-12/schema",
+  "title": "@rethunk/mcp-multi-root-git: git_stash_push",
+  "description": "Parameter schema for the 'git_stash_push' MCP tool.",
+  "type": "object",
+  "properties": {
+    "workspaceRoot": {
+      "description": "Repo path. Default: first MCP root / cwd.",
+      "type": "string"
+    },
+    "format": {
+      "default": "markdown",
+      "type": "string",
+      "enum": [
+        "markdown",
+        "json"
+      ]
+    },
+    "message": {
+      "description": "Stash subject message (`git stash push -m <message>`).",
+      "type": "string"
+    },
+    "includeUntracked": {
+      "default": false,
+      "description": "Include untracked files in the stash (`git stash push -u`).",
+      "type": "boolean"
+    },
+    "keepIndex": {
+      "default": false,
+      "description": "Keep staged changes in the index after stashing (`git stash push --keep-index`).",
+      "type": "boolean"
+    },
+    "paths": {
+      "description": "Scope the stash to specific paths, relative to git root (must resolve within repo root).",
+      "type": "array",
+      "items": {
+        "type": "string"
+      }
+    }
+  },
+  "required": [
+    "format",
+    "includeUntracked",
+    "keepIndex"
+  ],
+  "additionalProperties": false
+}

package/schemas/git_status.json

@@ -11,15 +11,10 @@
           "type": "string"
         },
         {
-          "maxItems": 256,
           "type": "array",
           "items": {
             "type": "string"
           }
-        },
-        {
-          "type": "string",
-          "const": "*"
         }
       ]
     },

package/schemas/git_worktree_add.json

@@ -19,7 +19,7 @@
     "path": {
       "type": "string",
       "minLength": 1,
-      "description": "Filesystem path for the new worktree (relative paths resolved from git toplevel)."
+      "description": "Filesystem path for the new worktree (relative paths resolved from git toplevel). Sibling directories outside the repo toplevel are allowed; leading `-` and NUL are rejected."
     },
     "branch": {
       "type": "string",

package/schemas/git_worktree_remove.json

@@ -19,7 +19,7 @@
     "path": {
       "type": "string",
       "minLength": 1,
-      "description": "Path of the worktree to remove. Must not be the main worktree."
+      "description": "Path of the worktree to remove. Must not be the main worktree. Sibling paths outside the repo toplevel are allowed; leading `-` and NUL are rejected."
     },
     "force": {
       "default": false,