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

package/tool-parameters.schema.json

@@ -15,15 +15,10 @@
               "type": "string"
             },
             {
-              "maxItems": 256,
               "type": "array",
               "items": {
                 "type": "string"
               }
-            },
-            {
-              "type": "string",
-              "const": "*"
             }
           ]
         },
@@ -57,15 +52,10 @@
               "type": "string"
             },
             {
-              "maxItems": 256,
               "type": "array",
               "items": {
                 "type": "string"
               }
-            },
-            {
-              "type": "string",
-              "const": "*"
             }
           ]
         },
@@ -99,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",
@@ -124,15 +133,10 @@
               "type": "string"
             },
             {
-              "maxItems": 256,
               "type": "array",
               "items": {
                 "type": "string"
               }
-            },
-            {
-              "type": "string",
-              "const": "*"
             }
           ]
         },
@@ -191,15 +195,10 @@
               "type": "string"
             },
             {
-              "maxItems": 256,
               "type": "array",
               "items": {
                 "type": "string"
               }
-            },
-            {
-              "type": "string",
-              "const": "*"
             }
           ]
         },
@@ -228,15 +227,10 @@
               "type": "string"
             },
             {
-              "maxItems": 256,
               "type": "array",
               "items": {
                 "type": "string"
               }
-            },
-            {
-              "type": "string",
-              "const": "*"
             }
           ]
         },
@@ -279,11 +273,100 @@
         "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
+    },
+    "git_grep": {
+      "$schema": "https://json-schema.org/draft/2020-12/schema",
+      "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
     },
@@ -357,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": {
@@ -385,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
     },
@@ -412,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.",
@@ -436,29 +527,7 @@
       ],
       "additionalProperties": false
     },
-    "git_worktree_list": {
-      "$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"
-          ]
-        }
-      },
-      "required": [
-        "format"
-      ],
-      "additionalProperties": false
-    },
-    "git_stash_list": {
+    "git_conflicts": {
       "$schema": "https://json-schema.org/draft/2020-12/schema",
       "type": "object",
       "properties": {
@@ -473,54 +542,24 @@
             "markdown",
             "json"
           ]
-        }
-      },
-      "required": [
-        "format"
-      ],
-      "additionalProperties": false
-    },
-    "git_fetch": {
-      "$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"
-          ]
-        },
-        "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
     },
@@ -546,7 +585,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": {
@@ -576,70 +615,6 @@
       ],
       "additionalProperties": false
     },
-    "git_branch_list": {
-      "$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"
-          ]
-        },
-        "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": "Repo path. Default: first MCP root / cwd.",
-          "type": "string"
-        },
-        "format": {
-          "default": "markdown",
-          "type": "string",
-          "enum": [
-            "markdown",
-            "json"
-          ]
-        },
-        "ref": {
-          "default": "HEAD",
-          "description": "Ref whose reflog to show (branch name, HEAD, etc.). Default: HEAD.",
-          "type": "string"
-        },
-        "maxEntries": {
-          "default": 30,
-          "description": "Maximum reflog entries to return (hard cap 200). Default 30.",
-          "type": "integer",
-          "minimum": 1,
-          "maximum": 200
-        }
-      },
-      "required": [
-        "format",
-        "ref",
-        "maxEntries"
-      ],
-      "additionalProperties": false
-    },
     "batch_commit": {
       "$schema": "https://json-schema.org/draft/2020-12/schema",
       "type": "object",
@@ -717,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": [
@@ -739,7 +714,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"
         }
       },
@@ -819,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",
@@ -839,7 +814,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"
         }
       },
@@ -889,13 +864,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": [
@@ -903,7 +887,40 @@
         "sources",
         "deleteMergedBranches",
         "deleteMergedWorktrees",
-        "strictMergedRefEquality"
+        "strictMergedRefEquality",
+        "onConflict"
+      ],
+      "additionalProperties": false
+    },
+    "git_cherry_pick_continue": {
+      "$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"
+          ]
+        },
+        "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
     },
@@ -935,6 +952,51 @@
       ],
       "additionalProperties": false
     },
+    "git_revert": {
+      "$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"
+          ]
+        },
+        "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
+    },
     "git_tag": {
       "$schema": "https://json-schema.org/draft/2020-12/schema",
       "type": "object",
@@ -977,6 +1039,58 @@
       ],
       "additionalProperties": false
     },
+    "git_branch": {
+      "$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"
+          ]
+        },
+        "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
+    },
     "git_worktree_add": {
       "$schema": "https://json-schema.org/draft/2020-12/schema",
       "type": "object",
@@ -996,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",
@@ -1034,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,
@@ -1084,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
     }
   }
 }