@rethunk/mcp-multi-root-git 2.8.1 → 2.9.0

package/AGENTS.md

@@ -23,7 +23,7 @@ IDEs injecting this as context: do not re-link from rules.
 | [`src/server/schemas.ts`](src/server/schemas.ts) | `WorkspacePickSchema`, `MAX_INVENTORY_ROOTS_DEFAULT`, **`MAX_ABSOLUTE_GIT_ROOTS`** (256), optional **`absoluteGitRoots`** on workspace pick |
 | [`src/server/inventory.ts`](src/server/inventory.ts) | `InventoryEntryJson`, `validateRepoPath`, `makeSkipEntry`, `buildInventorySectionMarkdown`, `collectInventoryEntry` |
 | [`src/server/git-refs.ts`](src/server/git-refs.ts) | `isProtectedBranch`, `isSafeGitRefToken`, `isSafeGitRangeToken`, `isSafeGitAncestorRef`; `getCurrentBranch`, `resolveRef`, `isWorkingTreeClean`, `isFullyMergedInto`, `isContentEquivalentlyMergedInto`, `commitListBetween`; `listWorktrees`, `worktreeForBranch`; `inferRemoteFromUpstream`; `conflictPaths` |
-| [`src/server/tools.ts`](src/server/tools.ts) | `registerRethunkGitTools` — dispatches to `register*` below |
+| [`src/server/tools.ts`](src/server/tools.ts) | `registerRethunkGitTools` — dispatches to `register*` below; `selectToolRegistrars(envValue, registrars)` — pure parse/filter fn for `RETHUNK_GIT_TOOLS` (reads env inside `registerRethunkGitTools`, not at module scope); `TOOL_REGISTRARS` ordered array |
 | [`src/server/git-status-tool.ts`](src/server/git-status-tool.ts) | `git_status` |
 | [`src/server/git-inventory-tool.ts`](src/server/git-inventory-tool.ts) | `git_inventory` |
 | [`src/server/git-parity-tool.ts`](src/server/git-parity-tool.ts) | `git_parity` |

package/CHANGELOG.md

@@ -2,6 +2,14 @@
 
 All notable changes to `@rethunk/mcp-multi-root-git` are documented here. Format loosely follows [Keep a Changelog](https://keepachangelog.com); the project uses [Semantic Versioning](https://semver.org).
 
+## [2.9.0] — 2026-06-05
+
+Feature release: `RETHUNK_GIT_TOOLS` allowlist env var. Additive — no JSON format-version bump.
+
+### Added
+
+- **`RETHUNK_GIT_TOOLS`** — comma-separated allowlist of exact tool names. When set to a non-empty value, only the listed tools are registered; unknown names are warned to stderr and ignored. When unset or empty (default), all 23 tools are registered — zero behavioral change for existing consumers. If every name in the list is unrecognized, zero tools are registered and a loud warning is emitted (the restriction is honored literally rather than falling back to all tools). The presets resource (`rethunk-git://presets`) is always registered regardless of this setting. Cuts MCP token cost for agents that only need a small subset of tools. Example: `RETHUNK_GIT_TOOLS=git_status,git_diff_summary,git_diff,git_log,batch_commit,git_push`.
+
 ## [2.8.0] — 2026-05-29
 
 Feature release: three new read-only inspection tools (tool count 20 → 23). Additive — no JSON format-version bump.

package/dist/server/tools.js

@@ -19,32 +19,73 @@ import { registerGitTagTool } from "./git-tag-tool.js";
 import { registerGitWorktreeAddTool, registerGitWorktreeListTool, registerGitWorktreeRemoveTool, } from "./git-worktree-tool.js";
 import { registerListPresetsTool } from "./list-presets-tool.js";
 import { registerPresetsResource } from "./presets-resource.js";
-export function registerRethunkGitTools(server) {
+/**
+ * Ordered registry of all 23 MCP tools. Registration order is preserved for
+ * both full and filtered (RETHUNK_GIT_TOOLS) subsets.
+ */
+const TOOL_REGISTRARS = [
     // Read-only tools
-    registerGitStatusTool(server);
-    registerGitInventoryTool(server);
-    registerGitParityTool(server);
-    registerListPresetsTool(server);
-    registerGitLogTool(server);
-    registerGitDiffSummaryTool(server);
-    registerGitDiffTool(server);
-    registerGitShowTool(server);
-    registerGitWorktreeListTool(server);
-    registerGitStashListTool(server);
-    registerGitFetchTool(server);
-    registerGitBlameTool(server);
-    registerGitBranchListTool(server);
-    registerGitReflogTool(server);
+    { name: "git_status", register: registerGitStatusTool },
+    { name: "git_inventory", register: registerGitInventoryTool },
+    { name: "git_parity", register: registerGitParityTool },
+    { name: "list_presets", register: registerListPresetsTool },
+    { name: "git_log", register: registerGitLogTool },
+    { name: "git_diff_summary", register: registerGitDiffSummaryTool },
+    { name: "git_diff", register: registerGitDiffTool },
+    { name: "git_show", register: registerGitShowTool },
+    { name: "git_worktree_list", register: registerGitWorktreeListTool },
+    { name: "git_stash_list", register: registerGitStashListTool },
+    { name: "git_fetch", register: registerGitFetchTool },
+    { name: "git_blame", register: registerGitBlameTool },
+    { name: "git_branch_list", register: registerGitBranchListTool },
+    { name: "git_reflog", register: registerGitReflogTool },
     // Mutating tools
-    registerBatchCommitTool(server);
-    registerGitPushTool(server);
-    registerGitMergeTool(server);
-    registerGitCherryPickTool(server);
-    registerGitResetSoftTool(server);
-    registerGitTagTool(server);
-    registerGitWorktreeAddTool(server);
-    registerGitWorktreeRemoveTool(server);
-    registerGitStashApplyTool(server);
-    // Resources
+    { name: "batch_commit", register: registerBatchCommitTool },
+    { name: "git_push", register: registerGitPushTool },
+    { name: "git_merge", register: registerGitMergeTool },
+    { name: "git_cherry_pick", register: registerGitCherryPickTool },
+    { name: "git_reset_soft", register: registerGitResetSoftTool },
+    { name: "git_tag", register: registerGitTagTool },
+    { name: "git_worktree_add", register: registerGitWorktreeAddTool },
+    { name: "git_worktree_remove", register: registerGitWorktreeRemoveTool },
+    { name: "git_stash_apply", register: registerGitStashApplyTool },
+];
+/**
+ * Parse the RETHUNK_GIT_TOOLS env var and return the matching subset of
+ * registrars plus any unrecognized token names.
+ *
+ * @param envValue  Raw value of process.env.RETHUNK_GIT_TOOLS (may be undefined).
+ * @param registrars  Full ordered registrar list (injectable for tests).
+ */
+export function selectToolRegistrars(envValue, registrars) {
+    const tokens = (envValue ?? "")
+        .split(",")
+        .map((t) => t.trim())
+        .filter((t) => t.length > 0);
+    // Unset, empty, or whitespace-only → register all tools.
+    if (tokens.length === 0) {
+        return { selected: registrars, unknown: [] };
+    }
+    const knownNames = new Set(registrars.map((r) => r.name));
+    const requested = new Set(tokens);
+    const unknown = tokens.filter((t) => !knownNames.has(t));
+    // Preserve canonical order; deduplicate duplicate tokens automatically.
+    const selected = registrars.filter((r) => requested.has(r.name));
+    return { selected, unknown };
+}
+export function registerRethunkGitTools(server) {
+    const env = process.env.RETHUNK_GIT_TOOLS;
+    const { selected, unknown } = selectToolRegistrars(env, TOOL_REGISTRARS);
+    if (unknown.length > 0) {
+        process.stderr.write(`[rethunk-git] RETHUNK_GIT_TOOLS: unknown tool name(s) ignored: ${unknown.map((n) => JSON.stringify(n)).join(", ")}\n`);
+    }
+    if (selected.length === 0 && (env ?? "").trim().length > 0) {
+        process.stderr.write(`[rethunk-git] RETHUNK_GIT_TOOLS: every listed name was unrecognized — registering NO tools. ` +
+            `Set RETHUNK_GIT_TOOLS to a comma-separated list of valid tool names, or unset it to register all tools.\n`);
+    }
+    for (const { register } of selected) {
+        register(server);
+    }
+    // The presets RESOURCE is always registered, regardless of the tool allowlist.
     registerPresetsResource(server);
 }

package/docs/install.md

@@ -92,6 +92,7 @@ Omit any `cwd` / `workingDirectory` field unless your client requires it for unr
 | Variable | Default | Purpose |
 |----------|---------|---------|
 | `GIT_SUBPROCESS_PARALLELISM` | `4` | Number of parallel git subprocesses for inventory operations and `git_status` submodule rows. Valid range: 1 to 2×CPU count (auto-clamped to prevent runaway spawning). Increase on high-core machines to accelerate large fleet scans; decrease if system resources are constrained. |
+| `RETHUNK_GIT_TOOLS` | _(unset)_ | Comma-separated list of tool names to register. When unset or empty, all 23 tools are registered (default). When set, only the listed tools are exposed — unknown names are warned and ignored. If every name is unknown, **zero** tools are registered and a loud warning is emitted (the restriction is honored literally). The presets resource (`rethunk-git://presets`) is always registered regardless of this setting. Example: `RETHUNK_GIT_TOOLS=git_status,git_diff_summary,git_diff,git_log,batch_commit,git_push`. Full tool-name list: `git_status`, `git_inventory`, `git_parity`, `list_presets`, `git_log`, `git_diff_summary`, `git_diff`, `git_show`, `git_worktree_list`, `git_stash_list`, `git_fetch`, `git_blame`, `git_branch_list`, `git_reflog`, `batch_commit`, `git_push`, `git_merge`, `git_cherry_pick`, `git_reset_soft`, `git_tag`, `git_worktree_add`, `git_worktree_remove`, `git_stash_apply`. |
 
 Set these in the environment where the MCP client launches the server (e.g. in your shell, in the MCP client config as `env`, or in a startup script).
 

package/docs/mcp-tools.md

@@ -1029,6 +1029,7 @@ For deletions, `type` is `"deleted"` and `sha` is an empty string.
 |----------|---------|-------|
 | `GIT_SUBPROCESS_PARALLELISM` | CPU-based | Max concurrent git subprocesses for multi-root fan-out (`git_inventory`, `git_parity`, multi-root `git_log`). |
 | `GIT_SUBPROCESS_TIMEOUT_MS` | `120000` | Per-subprocess timeout in ms; on expiry the child is killed (SIGTERM) and the call resolves as failed. Set `0` (or negative) to disable (unbounded). |
+| `RETHUNK_GIT_TOOLS` | _(unset — all)_ | Comma-separated allowlist of exact tool names. Unset or empty → all 23 tools registered. Non-empty → only the listed tools; unknown names warned to stderr. If every listed name is unknown, zero tools are registered (restriction honored literally). The presets resource is always available. Example: `RETHUNK_GIT_TOOLS=git_status,git_diff_summary,git_diff,git_log,batch_commit,git_push`. |
 
 ## Resource
 

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@rethunk/mcp-multi-root-git",
-  "version": "2.8.1",
+  "version": "2.9.0",
   "description": "MCP stdio server: multi-root git status, inventory, and HEAD parity checks. Generic tools usable by any workspace.",
   "type": "module",
   "private": false,