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

package/tool-parameters.schema.json

@@ -8,28 +8,19 @@
       "$schema": "https://json-schema.org/draft/2020-12/schema",
       "type": "object",
       "properties": {
-        "workspaceRoot": {
-          "description": "Highest-priority root override.",
-          "type": "string"
-        },
-        "rootIndex": {
-          "description": "0-based index into MCP roots; ignored if workspaceRoot set.",
-          "type": "integer",
-          "minimum": 0,
-          "maximum": 9007199254740991
-        },
-        "allWorkspaceRoots": {
-          "default": false,
-          "description": "Fan out across all MCP roots.",
-          "type": "boolean"
-        },
-        "absoluteGitRoots": {
-          "description": "Absolute paths to git repo roots; use for sibling clones under a non-git parent.",
-          "maxItems": 256,
-          "type": "array",
-          "items": {
-            "type": "string"
-          }
+        "root": {
+          "description": "Repo path, array of paths, or \"*\" for all MCP roots.",
+          "anyOf": [
+            {
+              "type": "string"
+            },
+            {
+              "type": "array",
+              "items": {
+                "type": "string"
+              }
+            }
+          ]
         },
         "format": {
           "default": "markdown",
@@ -45,7 +36,6 @@
         }
       },
       "required": [
-        "allWorkspaceRoots",
         "format",
         "includeSubmodules"
       ],
@@ -55,28 +45,19 @@
       "$schema": "https://json-schema.org/draft/2020-12/schema",
       "type": "object",
       "properties": {
-        "workspaceRoot": {
-          "description": "Highest-priority root override.",
-          "type": "string"
-        },
-        "rootIndex": {
-          "description": "0-based index into MCP roots; ignored if workspaceRoot set.",
-          "type": "integer",
-          "minimum": 0,
-          "maximum": 9007199254740991
-        },
-        "allWorkspaceRoots": {
-          "default": false,
-          "description": "Fan out across all MCP roots.",
-          "type": "boolean"
-        },
-        "absoluteGitRoots": {
-          "description": "Absolute paths to git repo roots; use for sibling clones under a non-git parent.",
-          "maxItems": 256,
-          "type": "array",
-          "items": {
-            "type": "string"
-          }
+        "root": {
+          "description": "Repo path, array of paths, or \"*\" for all MCP roots.",
+          "anyOf": [
+            {
+              "type": "string"
+            },
+            {
+              "type": "array",
+              "items": {
+                "type": "string"
+              }
+            }
+          ]
         },
         "format": {
           "default": "markdown",
@@ -108,6 +89,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",
@@ -116,7 +116,6 @@
         }
       },
       "required": [
-        "allWorkspaceRoots",
         "format",
         "presetMerge",
         "maxRoots"
@@ -127,28 +126,19 @@
       "$schema": "https://json-schema.org/draft/2020-12/schema",
       "type": "object",
       "properties": {
-        "workspaceRoot": {
-          "description": "Highest-priority root override.",
-          "type": "string"
-        },
-        "rootIndex": {
-          "description": "0-based index into MCP roots; ignored if workspaceRoot set.",
-          "type": "integer",
-          "minimum": 0,
-          "maximum": 9007199254740991
-        },
-        "allWorkspaceRoots": {
-          "default": false,
-          "description": "Fan out across all MCP roots.",
-          "type": "boolean"
-        },
-        "absoluteGitRoots": {
-          "description": "Absolute paths to git repo roots; use for sibling clones under a non-git parent.",
-          "maxItems": 256,
-          "type": "array",
-          "items": {
-            "type": "string"
-          }
+        "root": {
+          "description": "Repo path, array of paths, or \"*\" for all MCP roots.",
+          "anyOf": [
+            {
+              "type": "string"
+            },
+            {
+              "type": "array",
+              "items": {
+                "type": "string"
+              }
+            }
+          ]
         },
         "format": {
           "default": "markdown",
@@ -189,7 +179,6 @@
         }
       },
       "required": [
-        "allWorkspaceRoots",
         "format",
         "presetMerge"
       ],
@@ -199,28 +188,19 @@
       "$schema": "https://json-schema.org/draft/2020-12/schema",
       "type": "object",
       "properties": {
-        "workspaceRoot": {
-          "description": "Highest-priority root override.",
-          "type": "string"
-        },
-        "rootIndex": {
-          "description": "0-based index into MCP roots; ignored if workspaceRoot set.",
-          "type": "integer",
-          "minimum": 0,
-          "maximum": 9007199254740991
-        },
-        "allWorkspaceRoots": {
-          "default": false,
-          "description": "Fan out across all MCP roots.",
-          "type": "boolean"
-        },
-        "absoluteGitRoots": {
-          "description": "Absolute paths to git repo roots; use for sibling clones under a non-git parent.",
-          "maxItems": 256,
-          "type": "array",
-          "items": {
-            "type": "string"
-          }
+        "root": {
+          "description": "Repo path, array of paths, or \"*\" for all MCP roots.",
+          "anyOf": [
+            {
+              "type": "string"
+            },
+            {
+              "type": "array",
+              "items": {
+                "type": "string"
+              }
+            }
+          ]
         },
         "format": {
           "default": "markdown",
@@ -232,7 +212,6 @@
         }
       },
       "required": [
-        "allWorkspaceRoots",
         "format"
       ],
       "additionalProperties": false
@@ -241,28 +220,19 @@
       "$schema": "https://json-schema.org/draft/2020-12/schema",
       "type": "object",
       "properties": {
-        "workspaceRoot": {
-          "description": "Highest-priority root override.",
-          "type": "string"
-        },
-        "rootIndex": {
-          "description": "0-based index into MCP roots; ignored if workspaceRoot set.",
-          "type": "integer",
-          "minimum": 0,
-          "maximum": 9007199254740991
-        },
-        "allWorkspaceRoots": {
-          "default": false,
-          "description": "Fan out across all MCP roots.",
-          "type": "boolean"
-        },
-        "absoluteGitRoots": {
-          "description": "Absolute paths to git repo roots; use for sibling clones under a non-git parent.",
-          "maxItems": 256,
-          "type": "array",
-          "items": {
-            "type": "string"
-          }
+        "root": {
+          "description": "Repo path, array of paths, or \"*\" for all MCP roots.",
+          "anyOf": [
+            {
+              "type": "string"
+            },
+            {
+              "type": "array",
+              "items": {
+                "type": "string"
+              }
+            }
+          ]
         },
         "format": {
           "default": "markdown",
@@ -303,37 +273,111 @@
         "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": [
-        "allWorkspaceRoots",
         "format",
-        "maxCommits"
+        "maxCommits",
+        "follow"
       ],
       "additionalProperties": false
     },
-    "git_diff_summary": {
+    "git_grep": {
       "$schema": "https://json-schema.org/draft/2020-12/schema",
       "type": "object",
       "properties": {
-        "workspaceRoot": {
-          "description": "Highest-priority root override.",
-          "type": "string"
+        "root": {
+          "description": "Repo path, array of paths, or \"*\" for all MCP roots.",
+          "anyOf": [
+            {
+              "type": "string"
+            },
+            {
+              "type": "array",
+              "items": {
+                "type": "string"
+              }
+            }
+          ]
         },
-        "rootIndex": {
-          "description": "0-based index into MCP roots; ignored if workspaceRoot set.",
-          "type": "integer",
-          "minimum": 0,
-          "maximum": 9007199254740991
+        "format": {
+          "default": "markdown",
+          "type": "string",
+          "enum": [
+            "markdown",
+            "json"
+          ]
         },
-        "absoluteGitRoots": {
-          "description": "Absolute paths to git repo roots; use for sibling clones under a non-git parent.",
-          "maxItems": 256,
+        "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
+    },
+    "git_diff_summary": {
+      "$schema": "https://json-schema.org/draft/2020-12/schema",
+      "type": "object",
+      "properties": {
+        "workspaceRoot": {
+          "description": "Repo path. Default: first MCP root / cwd.",
+          "type": "string"
+        },
         "format": {
           "default": "markdown",
           "type": "string",
@@ -384,15 +428,9 @@
       "type": "object",
       "properties": {
         "workspaceRoot": {
-          "description": "Highest-priority root override.",
+          "description": "Repo path. Default: first MCP root / cwd.",
           "type": "string"
         },
-        "rootIndex": {
-          "description": "0-based index into MCP roots; ignored if workspaceRoot set.",
-          "type": "integer",
-          "minimum": 0,
-          "maximum": 9007199254740991
-        },
         "format": {
           "default": "markdown",
           "type": "string",
@@ -402,11 +440,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": {
@@ -430,11 +468,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
     },
@@ -443,15 +489,9 @@
       "type": "object",
       "properties": {
         "workspaceRoot": {
-          "description": "Highest-priority root override.",
+          "description": "Repo path. Default: first MCP root / cwd.",
           "type": "string"
         },
-        "rootIndex": {
-          "description": "0-based index into MCP roots; ignored if workspaceRoot set.",
-          "type": "integer",
-          "minimum": 0,
-          "maximum": 9007199254740991
-        },
         "format": {
           "default": "markdown",
           "type": "string",
@@ -463,7 +503,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.",
@@ -487,76 +527,14 @@
       ],
       "additionalProperties": false
     },
-    "git_worktree_list": {
-      "$schema": "https://json-schema.org/draft/2020-12/schema",
-      "type": "object",
-      "properties": {
-        "workspaceRoot": {
-          "description": "Highest-priority root override.",
-          "type": "string"
-        },
-        "rootIndex": {
-          "description": "0-based index into MCP roots; ignored if workspaceRoot set.",
-          "type": "integer",
-          "minimum": 0,
-          "maximum": 9007199254740991
-        },
-        "format": {
-          "default": "markdown",
-          "type": "string",
-          "enum": [
-            "markdown",
-            "json"
-          ]
-        }
-      },
-      "required": [
-        "format"
-      ],
-      "additionalProperties": false
-    },
-    "git_stash_list": {
+    "git_conflicts": {
       "$schema": "https://json-schema.org/draft/2020-12/schema",
       "type": "object",
       "properties": {
         "workspaceRoot": {
-          "description": "Highest-priority root override.",
+          "description": "Repo path. Default: first MCP root / cwd.",
           "type": "string"
         },
-        "rootIndex": {
-          "description": "0-based index into MCP roots; ignored if workspaceRoot set.",
-          "type": "integer",
-          "minimum": 0,
-          "maximum": 9007199254740991
-        },
-        "format": {
-          "default": "markdown",
-          "type": "string",
-          "enum": [
-            "markdown",
-            "json"
-          ]
-        }
-      },
-      "required": [
-        "format"
-      ],
-      "additionalProperties": false
-    },
-    "git_fetch": {
-      "$schema": "https://json-schema.org/draft/2020-12/schema",
-      "type": "object",
-      "properties": {
-        "workspaceRoot": {
-          "description": "Highest-priority root override.",
-          "type": "string"
-        },
-        "rootIndex": {
-          "description": "0-based index into MCP roots; ignored if workspaceRoot set.",
-          "type": "integer",
-          "minimum": 0,
-          "maximum": 9007199254740991
-        },
         "format": {
           "default": "markdown",
           "type": "string",
@@ -565,31 +543,23 @@
             "json"
           ]
         },
-        "remote": {
-          "default": "origin",
-          "description": "Remote to fetch from (default: origin).",
-          "type": "string"
-        },
-        "branch": {
-          "description": "If specified: fetch only this branch (e.g. 'main').",
-          "type": "string"
-        },
-        "prune": {
-          "default": false,
-          "description": "Pass --prune to remove deleted remote branches (default: false).",
+        "withHunks": {
+          "default": true,
+          "description": "Parse conflict-marker hunks per file. Set false for just the path list.",
           "type": "boolean"
         },
-        "tags": {
-          "default": false,
-          "description": "Pass --tags to also fetch all tags (default: false).",
-          "type": "boolean"
+        "maxLinesPerFile": {
+          "default": 200,
+          "description": "Cap on lines scanned per file before marking `truncated: true`.",
+          "type": "integer",
+          "minimum": 1,
+          "maximum": 2000
         }
       },
       "required": [
         "format",
-        "remote",
-        "prune",
-        "tags"
+        "withHunks",
+        "maxLinesPerFile"
       ],
       "additionalProperties": false
     },
@@ -598,15 +568,9 @@
       "type": "object",
       "properties": {
         "workspaceRoot": {
-          "description": "Highest-priority root override.",
+          "description": "Repo path. Default: first MCP root / cwd.",
           "type": "string"
         },
-        "rootIndex": {
-          "description": "0-based index into MCP roots; ignored if workspaceRoot set.",
-          "type": "integer",
-          "minimum": 0,
-          "maximum": 9007199254740991
-        },
         "format": {
           "default": "markdown",
           "type": "string",
@@ -621,101 +585,33 @@
           "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": {
           "description": "First line of the range to blame (1-based). Requires endLine.",
           "type": "integer",
           "minimum": 1,
-          "maximum": 9007199254740991
+          "maximum": 1000000
         },
         "endLine": {
           "description": "Last line of the range to blame (1-based, inclusive). Requires startLine.",
           "type": "integer",
           "minimum": 1,
-          "maximum": 9007199254740991
-        }
-      },
-      "required": [
-        "format",
-        "path"
-      ],
-      "additionalProperties": false
-    },
-    "git_branch_list": {
-      "$schema": "https://json-schema.org/draft/2020-12/schema",
-      "type": "object",
-      "properties": {
-        "workspaceRoot": {
-          "description": "Highest-priority root override.",
-          "type": "string"
-        },
-        "rootIndex": {
-          "description": "0-based index into MCP roots; ignored if workspaceRoot set.",
-          "type": "integer",
-          "minimum": 0,
-          "maximum": 9007199254740991
-        },
-        "format": {
-          "default": "markdown",
-          "type": "string",
-          "enum": [
-            "markdown",
-            "json"
-          ]
-        },
-        "includeRemotes": {
-          "default": false,
-          "description": "Include remote-tracking branches from refs/remotes (symbolic origin/HEAD excluded).",
-          "type": "boolean"
-        }
-      },
-      "required": [
-        "format",
-        "includeRemotes"
-      ],
-      "additionalProperties": false
-    },
-    "git_reflog": {
-      "$schema": "https://json-schema.org/draft/2020-12/schema",
-      "type": "object",
-      "properties": {
-        "workspaceRoot": {
-          "description": "Highest-priority root override.",
-          "type": "string"
+          "maximum": 1000000
         },
-        "rootIndex": {
-          "description": "0-based index into MCP roots; ignored if workspaceRoot set.",
-          "type": "integer",
-          "minimum": 0,
-          "maximum": 9007199254740991
-        },
-        "format": {
-          "default": "markdown",
-          "type": "string",
-          "enum": [
-            "markdown",
-            "json"
-          ]
-        },
-        "ref": {
-          "default": "HEAD",
-          "description": "Ref whose reflog to show (branch name, HEAD, etc.). Default: HEAD.",
-          "type": "string"
-        },
-        "maxEntries": {
-          "default": 30,
-          "description": "Maximum reflog entries to return (hard cap 200). Default 30.",
+        "maxLines": {
+          "default": 2000,
+          "description": "Max blamed lines to return. Default: 2000.",
           "type": "integer",
           "minimum": 1,
-          "maximum": 200
+          "maximum": 10000
         }
       },
       "required": [
         "format",
-        "ref",
-        "maxEntries"
+        "path",
+        "maxLines"
       ],
       "additionalProperties": false
     },
@@ -724,20 +620,9 @@
       "type": "object",
       "properties": {
         "workspaceRoot": {
-          "description": "Highest-priority root override.",
+          "description": "Repo path. Default: first MCP root / cwd.",
           "type": "string"
         },
-        "rootIndex": {
-          "description": "0-based index into MCP roots; ignored if workspaceRoot set.",
-          "type": "integer",
-          "minimum": 0,
-          "maximum": 9007199254740991
-        },
-        "allWorkspaceRoots": {
-          "default": false,
-          "description": "Fan out across all MCP roots.",
-          "type": "boolean"
-        },
         "format": {
           "default": "markdown",
           "type": "string",
@@ -781,13 +666,13 @@
                             "from": {
                               "type": "integer",
                               "minimum": 1,
-                              "maximum": 9007199254740991,
+                              "maximum": 1000000,
                               "description": "Start line number (1-indexed)."
                             },
                             "to": {
                               "type": "integer",
                               "minimum": 1,
-                              "maximum": 9007199254740991,
+                              "maximum": 1000000,
                               "description": "End line number (1-indexed, inclusive)."
                             }
                           },
@@ -807,7 +692,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": [
@@ -829,12 +714,11 @@
         },
         "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"
         }
       },
       "required": [
-        "allWorkspaceRoots",
         "format",
         "commits",
         "push",
@@ -847,20 +731,9 @@
       "type": "object",
       "properties": {
         "workspaceRoot": {
-          "description": "Highest-priority root override.",
+          "description": "Repo path. Default: first MCP root / cwd.",
           "type": "string"
         },
-        "rootIndex": {
-          "description": "0-based index into MCP roots; ignored if workspaceRoot set.",
-          "type": "integer",
-          "minimum": 0,
-          "maximum": 9007199254740991
-        },
-        "allWorkspaceRoots": {
-          "default": false,
-          "description": "Fan out across all MCP roots.",
-          "type": "boolean"
-        },
         "format": {
           "default": "markdown",
           "type": "string",
@@ -884,7 +757,6 @@
         }
       },
       "required": [
-        "allWorkspaceRoots",
         "format",
         "setUpstream"
       ],
@@ -895,20 +767,9 @@
       "type": "object",
       "properties": {
         "workspaceRoot": {
-          "description": "Highest-priority root override.",
+          "description": "Repo path. Default: first MCP root / cwd.",
           "type": "string"
         },
-        "rootIndex": {
-          "description": "0-based index into MCP roots; ignored if workspaceRoot set.",
-          "type": "integer",
-          "minimum": 0,
-          "maximum": 9007199254740991
-        },
-        "allWorkspaceRoots": {
-          "default": false,
-          "description": "Fan out across all MCP roots.",
-          "type": "boolean"
-        },
         "format": {
           "default": "markdown",
           "type": "string",
@@ -933,7 +794,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",
@@ -953,12 +814,11 @@
         },
         "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"
         }
       },
       "required": [
-        "allWorkspaceRoots",
         "format",
         "sources",
         "strategy",
@@ -972,20 +832,9 @@
       "type": "object",
       "properties": {
         "workspaceRoot": {
-          "description": "Highest-priority root override.",
+          "description": "Repo path. Default: first MCP root / cwd.",
           "type": "string"
         },
-        "rootIndex": {
-          "description": "0-based index into MCP roots; ignored if workspaceRoot set.",
-          "type": "integer",
-          "minimum": 0,
-          "maximum": 9007199254740991
-        },
-        "allWorkspaceRoots": {
-          "default": false,
-          "description": "Fan out across all MCP roots.",
-          "type": "boolean"
-        },
         "format": {
           "default": "markdown",
           "type": "string",
@@ -1015,43 +864,73 @@
         },
         "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": [
-        "allWorkspaceRoots",
         "format",
         "sources",
         "deleteMergedBranches",
         "deleteMergedWorktrees",
-        "strictMergedRefEquality"
+        "strictMergedRefEquality",
+        "onConflict"
       ],
       "additionalProperties": false
     },
-    "git_reset_soft": {
+    "git_cherry_pick_continue": {
       "$schema": "https://json-schema.org/draft/2020-12/schema",
       "type": "object",
       "properties": {
         "workspaceRoot": {
-          "description": "Highest-priority root override.",
+          "description": "Repo path. Default: first MCP root / cwd.",
           "type": "string"
         },
-        "rootIndex": {
-          "description": "0-based index into MCP roots; ignored if workspaceRoot set.",
-          "type": "integer",
-          "minimum": 0,
-          "maximum": 9007199254740991
+        "format": {
+          "default": "markdown",
+          "type": "string",
+          "enum": [
+            "markdown",
+            "json"
+          ]
         },
-        "allWorkspaceRoots": {
-          "default": false,
-          "description": "Fan out across all MCP roots.",
-          "type": "boolean"
+        "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
+    },
+    "git_reset_soft": {
+      "$schema": "https://json-schema.org/draft/2020-12/schema",
+      "type": "object",
+      "properties": {
+        "workspaceRoot": {
+          "description": "Repo path. Default: first MCP root / cwd.",
+          "type": "string"
         },
         "format": {
           "default": "markdown",
@@ -1068,25 +947,63 @@
         }
       },
       "required": [
-        "allWorkspaceRoots",
         "format",
         "ref"
       ],
       "additionalProperties": false
     },
-    "git_tag": {
+    "git_revert": {
       "$schema": "https://json-schema.org/draft/2020-12/schema",
       "type": "object",
       "properties": {
         "workspaceRoot": {
-          "description": "Highest-priority root override.",
+          "description": "Repo path. Default: first MCP root / cwd.",
           "type": "string"
         },
-        "rootIndex": {
-          "description": "0-based index into MCP roots; ignored if workspaceRoot set.",
+        "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": 0,
+          "minimum": 1,
           "maximum": 9007199254740991
+        }
+      },
+      "required": [
+        "format",
+        "sources",
+        "noCommit"
+      ],
+      "additionalProperties": false
+    },
+    "git_tag": {
+      "$schema": "https://json-schema.org/draft/2020-12/schema",
+      "type": "object",
+      "properties": {
+        "workspaceRoot": {
+          "description": "Repo path. Default: first MCP root / cwd.",
+          "type": "string"
         },
         "format": {
           "default": "markdown",
@@ -1122,24 +1039,65 @@
       ],
       "additionalProperties": false
     },
-    "git_worktree_add": {
+    "git_branch": {
       "$schema": "https://json-schema.org/draft/2020-12/schema",
       "type": "object",
       "properties": {
         "workspaceRoot": {
-          "description": "Highest-priority root override.",
+          "description": "Repo path. Default: first MCP root / cwd.",
           "type": "string"
         },
-        "rootIndex": {
-          "description": "0-based index into MCP roots; ignored if workspaceRoot set.",
-          "type": "integer",
-          "minimum": 0,
-          "maximum": 9007199254740991
+        "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"
         },
-        "allWorkspaceRoots": {
+        "newName": {
+          "description": "New branch name (required for rename).",
+          "type": "string"
+        },
+        "force": {
           "default": false,
-          "description": "Fan out across all MCP roots.",
+          "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
+    },
+    "git_worktree_add": {
+      "$schema": "https://json-schema.org/draft/2020-12/schema",
+      "type": "object",
+      "properties": {
+        "workspaceRoot": {
+          "description": "Repo path. Default: first MCP root / cwd.",
+          "type": "string"
         },
         "format": {
           "default": "markdown",
@@ -1152,7 +1110,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",
@@ -1165,7 +1123,6 @@
         }
       },
       "required": [
-        "allWorkspaceRoots",
         "format",
         "path",
         "branch"
@@ -1177,20 +1134,9 @@
       "type": "object",
       "properties": {
         "workspaceRoot": {
-          "description": "Highest-priority root override.",
+          "description": "Repo path. Default: first MCP root / cwd.",
           "type": "string"
         },
-        "rootIndex": {
-          "description": "0-based index into MCP roots; ignored if workspaceRoot set.",
-          "type": "integer",
-          "minimum": 0,
-          "maximum": 9007199254740991
-        },
-        "allWorkspaceRoots": {
-          "default": false,
-          "description": "Fan out across all MCP roots.",
-          "type": "boolean"
-        },
         "format": {
           "default": "markdown",
           "type": "string",
@@ -1202,7 +1148,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,
@@ -1211,7 +1157,6 @@
         }
       },
       "required": [
-        "allWorkspaceRoots",
         "format",
         "path",
         "force"
@@ -1223,15 +1168,9 @@
       "type": "object",
       "properties": {
         "workspaceRoot": {
-          "description": "Highest-priority root override.",
+          "description": "Repo path. Default: first MCP root / cwd.",
           "type": "string"
         },
-        "rootIndex": {
-          "description": "0-based index into MCP roots; ignored if workspaceRoot set.",
-          "type": "integer",
-          "minimum": 0,
-          "maximum": 9007199254740991
-        },
         "format": {
           "default": "markdown",
           "type": "string",
@@ -1245,7 +1184,7 @@
           "description": "Stash index (defaults to 0 for stash@{0}).",
           "type": "integer",
           "minimum": 0,
-          "maximum": 9007199254740991
+          "maximum": 10000
         },
         "pop": {
           "default": false,
@@ -1259,6 +1198,51 @@
         "pop"
       ],
       "additionalProperties": false
+    },
+    "git_stash_push": {
+      "$schema": "https://json-schema.org/draft/2020-12/schema",
+      "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
     }
   }
 }