io.github.devlint/gitwand
NPM · @GITWAND/MCP · SCANNED SEP 20
Auto-resolves Git merge conflicts so agents only touch the complex hunks.
Available components
How this component scores in each security and reliability category. Every signal is checked automatically from public evidence about the published package, including repeated runs of it in an isolated sandbox, and we only credit what we can confirm. How we score → Why this is hard to score →
Supply Chain Security98
- No malware found by supply-chain analysis.Pass
- No known CVEs affecting this package version or its production dependencies.Pass
- No install/post-install scripts declared.Pass
- 31 of 98 dependencies flagged as unhealthy. View diagnostics → Partial
Provenance & Transparency97
- Source repository is publicly reachable at the declared URL. View diagnostics → Pass
- Cryptographically verified build provenance (signed, bound to devlint/GitWand). View diagnostics → Pass
- Clear OSI-approved license (MIT).Pass
- Actively maintained (last published 10 days ago).Pass
- Disclosure check failed: no security disclosure policy was found in the source repository. See how to fix → Fail
Schema Quality & AI Usability80
- 100% of prompts and resources have a non-trivial description (not blank, and not just the item's name).Pass
- AI-judged instruction clarity (excellent).Pass
- Context-footprint check failed: tool/resource definitions use about 1661 tokens (~184/item across 9 items; 7 tools + 2 resources), over budget; trim descriptions and params. See how to fix → Fail
- Usage-examples check failed: none of the tools include examples. See how to fix → Fail
Stability & Change Management100
- No destabilizing schema changes in the last 30 days.Pass
Tool Coverage100
- 100% of tools have a non-trivial description (not blank, and not just the tool's name).Pass
- 100% of tool parameters carry a description.Pass
Tool Safety75
- No prompt-injection markers were found in the server instructions, tool names or descriptions we captured.Pass
- 0 of 1 tool(s) whose name or description implies an irreversible operation declare an MCP destructiveHint annotation; "gitwand_preview_merge" implies "merge" and declares no destructiveHint at all, which the MCP spec reads as destructive by default. See how to fix → Fail
- An AI judge read all 8 captured unit(s) of tool text and found none that tries to manipulate the model reading it.Pass
Capabilities100
- Implements a supported MCP spec version (2025-11-25); the latest is 2026-07-28.Pass
How do I install the io.github.devlint/gitwand MCP server?
io.github.devlint/gitwand runs locally as an npm package, launched with npx -y @gitwand/mcp. Ready-made configuration for Claude, Cursor, VS Code, Codex and 5 more is on this page, copied from each client's own documentation.
npm · @gitwand/mcp
claude mcp add devlint-gitwand -- npx -y @gitwand/mcp
{
"mcpServers": {
"devlint-gitwand": {
"command": "npx",
"args": [
"-y",
"@gitwand/mcp"
]
}
}
} {
"servers": {
"devlint-gitwand": {
"command": "npx",
"args": [
"-y",
"@gitwand/mcp"
]
}
}
} codex mcp add devlint-gitwand -- npx -y @gitwand/mcp
{
"$schema": "https://opencode.ai/config.json",
"mcp": {
"devlint-gitwand": {
"type": "local",
"command": [
"npx",
"-y",
"@gitwand/mcp"
],
"enabled": true
}
}
} openclaw mcp add devlint-gitwand --command npx --arg -y --arg @gitwand/mcp
mcp_servers:
devlint-gitwand:
command: "npx"
args: ["-y", "@gitwand/mcp"] {
"McpServers": {
"devlint-gitwand": {
"Transport": "stdio",
"Command": "npx",
"Arguments": [
"-y",
"@gitwand/mcp"
]
}
}
} assistant mcp add devlint-gitwand -t stdio -c npx -a -y @gitwand/mcp
{
"mcpServers": {
"devlint-gitwand": {
"command": "npx",
"args": [
"-y",
"@gitwand/mcp"
]
}
}
} Every change we have recorded for this component, newest first. Security-relevant changes are always shown. ▲ marks a change for the better, ▼ a change for the worse; unmarked changes are neutral.
- 20 Sept 26 +1
- Stability: 0.97 → pass security
- 19 Sept 26 −1
- Stability: pass → 0.97 functional
- 18 Sept 26 0
- Security disclosure: unverified → fail ▼ functional
- 16 Sept 26 +1
- Stability: 0.97 → pass security
- Security disclosure: fail → unverified ▼ functional
- 14 Sept 26 +1
No change was recorded against any check on this day. Stability & Change Management went from 90 to 93. That category is still filling its 30-day observation window: 27 days of observed history at the previous scan, 28 at this one. The score rises as the window fills, whether or not the server changes.
- 13 Sept 26 −2
- Stability: pass → 0.90 functional
- 12 Sept 26 +1
- Stability: 0.97 → pass security
- Security disclosure: unverified → fail ▼ functional
- 11 Sept 26 −1
- Security disclosure: fail → unverified ▼ functional
- Stability: pass → 0.97 functional
Diagnostic detail from the automated scan of this channel: what the scanner observed at each step, so you can see exactly where a check passed or failed. It is informational only and never changes the trust score.
Captured 20 Sept 2026 · Analysed npm/@gitwand/mcp@3.10.1
Provenance Verified
A signed build attestation was found and verified, binding this exact artifact to the source repository it claims to come from.
| Result | Verified |
|---|---|
| Ecosystem | npm |
| Reason | Verified |
| Discovered via | Registry attestation endpoint |
| Source repo | devlint/GitWand |
| Certificate issuer | https://token.actions.githubusercontent.com |
| Certificate SAN | https://github.com/devlint/GitWand/.github/workflows/publish.yml@refs/tags/v3.10.1 |
| Rekor log index | 2771764610 |
| Predicate type | https://slsa.dev/provenance/v1 |
| Subject digest | sha512:6415e4872f2afb54b22068c9a46cf5abf5b113955369028584b9253c868df0bd84f197b181a00abbf84d38e5fe53c554ce6014e182f3ecc3d07283f8a |
Background: How many MCP packages publish verified provenance →
Dependencies 98 packages
| Packages resolved | 98 |
|---|---|
| Stale | 31 |
| Tree resolution | Complete |
Background: SBOMs and build attestations, explained →
The tools this component advertises to a client, with an estimated token cost for each. Expand a tool to see its parameters and schema. The per-tool counts are indicative and are not scored directly; the schema's total context footprint is one signal in Schema Quality & AI Usability. A tool's description is untrusted text the model reads on every call, which is what makes this list a security surface and not just an inventory: how tool poisoning works →
gitwand_apply_resolution ~132
Apply a custom resolution (provided by the LLM or user) to a specific conflict hunk. Replaces the conflict markers at the given line range with the provided content. Use this for 'complex' hunks that GitWand couldn't auto-resolve.
| Name | Type | Req | Description |
|---|---|---|---|
| content | string | yes | The resolved content to replace the conflict block with. |
| cwd | string | – | Working directory (repo root). Defaults to server cwd. |
| file | string | yes | Path to the conflicted file (relative to cwd). |
| line | number | yes | Start line of the conflict hunk (the <<<<<<< line). |
No output schema declared.
No examples provided.
gitwand_explain_hunk ~92
Explain why a specific conflict hunk was classified as its type. Returns the DecisionTrace with each evaluation step and the ours/theirs/base content for context.
| Name | Type | Req | Description |
|---|---|---|---|
| cwd | string | – | Working directory (repo root). Defaults to server cwd. |
| file | string | yes | Path to the conflicted file (relative to cwd). |
| line | number | yes | Start line of the hunk to explain. |
No output schema declared.
No examples provided.
gitwand_preview_merge ~373
Side-effect-free Conflict Predictor. Simulates a merge, rebase, or cherry-pick and reports how many conflicts GitWand can auto-resolve vs. how many need manual/LLM attention, plus an overall risk level (low/medium/high). Does NOT modify the working tree, index, or HEAD. - operation 'merge' (default): analyzes conflicts already materialized in the working tree (files with conflict markers). - operation 'rebase': simulates rebasing HEAD onto `onto` (3-way against merge-base(HEAD, onto); HEAD's work is replayed on top of `onto`). - operation 'cherry-pick': simulates cherry-picking `commit` onto HEAD (3-way with `commit^` as ancestor, HEAD as ours, `commit` as theirs).
| Name | Type | Req | Description |
|---|---|---|---|
| commit | string | – | Required when operation is 'cherry-pick': the commit to simulate cherry-picking onto HEAD. |
| cwd | string | – | Working directory (repo root). Defaults to server cwd. |
| onto | string | – | Required when operation is 'rebase': the branch/ref to rebase HEAD onto. |
| operation | string | – | Operation to simulate. Default: 'merge'. |
| regenerate | boolean | – | Only applies when operation is 'merge' (the default). If true, report GitWand's regenerate-tier plan (lockfile ecosystem + whether it's currently runnable) for any declined generated file (e.g. packa… |
No output schema declared.
No examples provided.
gitwand_resolve_conflicts ~244
Auto-resolve trivial Git merge conflicts using GitWand's pattern-based engine. Returns resolved files, DecisionTrace for each hunk, and pendingHunks for conflicts that need human/LLM review. Writes resolved files to disk unless dry_run is true.
| Name | Type | Req | Description |
|---|---|---|---|
| cwd | string | – | Working directory (repo root). Defaults to server cwd. |
| dry_run | boolean | – | If true, analyze without writing files. Default: false. |
| files | array | – | Specific files to resolve. If omitted, discovers all conflicted files from git. |
| policy | string | – | Merge policy to use. Default: prefer-theirs. |
| regenerate | boolean | – | If true, report GitWand's regenerate-tier plan (lockfile ecosystem + whether it's currently runnable) for any declined generated file (e.g. package-lock.json), reusing the same file states this call… |
No output schema declared.
No examples provided.
gitwand_resolve_hunk ~320
Ask the connected AI agent (the caller of this MCP server) to propose a resolution for a single Git merge conflict hunk. Returns a fully-formed prompt with the base/ours/theirs versions and asks the agent to reply with a JSON object { "resolution": "<merged code>", "reasoning": "<short explanation>" }. This tool does NOT call any external LLM — the agent that called the tool IS the LLM. Use it when GitWand (desktop/cli) wants to delegate the resolution of a `complex` hunk to the agent driving the session, instead of calling Anthropic/OpenAI directly. Pair the agent's answer with `gitwand_apply_resolution` to write it to disk.
| Name | Type | Req | Description |
|---|---|---|---|
| base | string | yes | Content of the hunk in the merge base (common ancestor). May be empty for hunks with no shared ancestor. |
| context | string | – | Optional surrounding code (a few lines above and below the hunk) so the agent can reason about intent. |
| filePath | string | yes | Path of the file containing the hunk (used by the agent to infer language and apply format-aware reasoning). |
| language | string | – | Optional language hint (e.g. "typescript", "python", "rust"). If omitted, the agent infers it from `filePath`. |
| ours | string | yes | Content of the hunk from the current branch (HEAD / ours side). |
| theirs | string | yes | Content of the hunk from the incoming branch (theirs side). |
No output schema declared.
No examples provided.
gitwand_resolve_hunk_llm ~261
Validate and apply an LLM-proposed resolution for a specific conflict hunk. Reads the hunk at the given file+line, replaces it with the proposed resolution, validates the result (no residual markers, syntax check for JSON/YAML), and writes the file if the validation score meets the threshold. Returns the full audit trail (validation score, accepted/rejected, reason). Workflow: (1) call gitwand_status or gitwand_explain_hunk to see pending complex hunks, (2) propose a resolution, (3) call this tool to validate + apply it.
| Name | Type | Req | Description |
|---|---|---|---|
| cwd | string | – | Working directory (repo root). Defaults to server cwd. |
| dry_run | boolean | – | If true, validate but do NOT write the file. Default: false. |
| file | string | yes | Path to the conflicted file (relative to cwd). |
| line | number | yes | Start line of the conflict hunk (the <<<<<<< line, 1-indexed). |
| min_score | number | – | Minimum validation score (0–100) to accept and write the resolution. Default: 80. |
| resolution | string | yes | LLM-proposed resolution content — the lines that replace the conflict block. |
No output schema declared.
No examples provided.
gitwand_status ~164
List conflicted files in the current Git repo with their complexity and auto-resolvability. Returns a structured JSON report with conflict counts, types, and confidence scores.
| Name | Type | Req | Description |
|---|---|---|---|
| cwd | string | – | Working directory (repo root). Defaults to server cwd. |
| regenerate | boolean | – | If true, report GitWand's regenerate-tier plan (lockfile ecosystem + whether it's currently runnable) for any declined generated file (e.g. package-lock.json), reusing the same file states this call… |
No output schema declared.
No examples provided.
What is the io.github.devlint/gitwand MCP server?
io.github.devlint/gitwand is an MCP server listed in the public MCP registry as io.github.devlint/gitwand. Auto-resolves Git merge conflicts so agents only touch the complex hunks. This page covers its npm package (@gitwand/mcp).
Is the io.github.devlint/gitwand MCP server safe to use?
io.github.devlint/gitwand scores 94 out of 100 on VerifyMCP. We found no known CVEs affecting it as of 20 September 2026. It declares no install or post-install scripts. Its build provenance is signed and verified. That is a record of what we were able to check automatically, not an endorsement. The category breakdown on this page shows every signal behind the number, including the ones we could not confirm.
What tools does the io.github.devlint/gitwand MCP server expose?
io.github.devlint/gitwand exposes 7 tools: gitwand_status, gitwand_resolve_conflicts, gitwand_preview_merge, gitwand_explain_hunk, gitwand_apply_resolution, and 2 more. Their descriptions and schemas cost roughly 1,586 tokens of context every time the server is loaded.
Is the io.github.devlint/gitwand MCP server still maintained?
io.github.devlint/gitwand is still listed as active in the MCP registry. We last reached this channel on 20 September 2026. Those dates come from our own scans of the registry and the channel itself, not from anything the publisher announced.
What licence is the io.github.devlint/gitwand MCP server under?
io.github.devlint/gitwand declares the MIT licence, which is OSI-approved. That covers the source only, and says nothing about the cost of any service it calls.