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

package/schemas/git_merge.json

@@ -5,20 +5,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",
@@ -43,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",
@@ -63,12 +52,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",

package/schemas/git_parity.json

@@ -4,28 +4,19 @@
   "description": "Parameter schema for the 'git_parity' MCP tool.",
   "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",
@@ -66,7 +57,6 @@
     }
   },
   "required": [
-    "allWorkspaceRoots",
     "format",
     "presetMerge"
   ],

package/schemas/git_push.json

@@ -5,20 +5,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",
@@ -42,7 +31,6 @@
     }
   },
   "required": [
-    "allWorkspaceRoots",
     "format",
     "setUpstream"
   ],

package/schemas/git_reset_soft.json

@@ -5,20 +5,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",
@@ -34,7 +23,6 @@
     }
   },
   "required": [
-    "allWorkspaceRoots",
     "format",
     "ref"
   ],

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

@@ -5,15 +5,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",
@@ -25,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_apply.json

@@ -5,15 +5,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",
@@ -27,7 +21,7 @@
       "description": "Stash index (defaults to 0 for stash@{0}).",
       "type": "integer",
       "minimum": 0,
-      "maximum": 9007199254740991
+      "maximum": 10000
     },
     "pop": {
       "default": false,

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

@@ -4,28 +4,19 @@
   "description": "Parameter schema for the 'git_status' MCP tool.",
   "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",
@@ -41,7 +32,6 @@
     }
   },
   "required": [
-    "allWorkspaceRoots",
     "format",
     "includeSubmodules"
   ],

package/schemas/git_tag.json

@@ -5,15 +5,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",

package/schemas/git_worktree_add.json

@@ -5,20 +5,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",
@@ -30,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",
@@ -43,7 +32,6 @@
     }
   },
   "required": [
-    "allWorkspaceRoots",
     "format",
     "path",
     "branch"

package/schemas/git_worktree_remove.json

@@ -5,20 +5,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",
@@ -30,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,
@@ -39,7 +28,6 @@
     }
   },
   "required": [
-    "allWorkspaceRoots",
     "format",
     "path",
     "force"

package/schemas/index.json

@@ -29,6 +29,11 @@
       "file": "git_log.json",
       "description": "Parameter schema for the 'git_log' MCP tool."
     },
+    {
+      "name": "git_grep",
+      "file": "git_grep.json",
+      "description": "Parameter schema for the 'git_grep' MCP tool."
+    },
     {
       "name": "git_diff_summary",
       "file": "git_diff_summary.json",
@@ -45,35 +50,15 @@
       "description": "Parameter schema for the 'git_show' MCP tool."
     },
     {
-      "name": "git_worktree_list",
-      "file": "git_worktree_list.json",
-      "description": "Parameter schema for the 'git_worktree_list' MCP tool."
-    },
-    {
-      "name": "git_stash_list",
-      "file": "git_stash_list.json",
-      "description": "Parameter schema for the 'git_stash_list' MCP tool."
+      "name": "git_conflicts",
+      "file": "git_conflicts.json",
+      "description": "Parameter schema for the 'git_conflicts' MCP tool."
     },
     {
       "name": "git_blame",
       "file": "git_blame.json",
       "description": "Parameter schema for the 'git_blame' MCP tool."
     },
-    {
-      "name": "git_branch_list",
-      "file": "git_branch_list.json",
-      "description": "Parameter schema for the 'git_branch_list' MCP tool."
-    },
-    {
-      "name": "git_reflog",
-      "file": "git_reflog.json",
-      "description": "Parameter schema for the 'git_reflog' MCP tool."
-    },
-    {
-      "name": "git_fetch",
-      "file": "git_fetch.json",
-      "description": "Parameter schema for the 'git_fetch' MCP tool."
-    },
     {
       "name": "batch_commit",
       "file": "batch_commit.json",
@@ -94,16 +79,31 @@
       "file": "git_cherry_pick.json",
       "description": "Parameter schema for the 'git_cherry_pick' MCP tool."
     },
+    {
+      "name": "git_cherry_pick_continue",
+      "file": "git_cherry_pick_continue.json",
+      "description": "Parameter schema for the 'git_cherry_pick_continue' MCP tool."
+    },
     {
       "name": "git_reset_soft",
       "file": "git_reset_soft.json",
       "description": "Parameter schema for the 'git_reset_soft' MCP tool."
     },
+    {
+      "name": "git_revert",
+      "file": "git_revert.json",
+      "description": "Parameter schema for the 'git_revert' MCP tool."
+    },
     {
       "name": "git_tag",
       "file": "git_tag.json",
       "description": "Parameter schema for the 'git_tag' MCP tool."
     },
+    {
+      "name": "git_branch",
+      "file": "git_branch.json",
+      "description": "Parameter schema for the 'git_branch' MCP tool."
+    },
     {
       "name": "git_worktree_add",
       "file": "git_worktree_add.json",
@@ -118,6 +118,11 @@
       "name": "git_stash_apply",
       "file": "git_stash_apply.json",
       "description": "Parameter schema for the 'git_stash_apply' MCP tool."
+    },
+    {
+      "name": "git_stash_push",
+      "file": "git_stash_push.json",
+      "description": "Parameter schema for the 'git_stash_push' MCP tool."
     }
   ]
 }

package/schemas/list_presets.json

@@ -4,28 +4,19 @@
   "description": "Parameter schema for the 'list_presets' MCP tool.",
   "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",
@@ -37,7 +28,6 @@
     }
   },
   "required": [
-    "allWorkspaceRoots",
     "format"
   ],
   "additionalProperties": false