Gitwand

Install

Works with Claude Code, Codex, VS Code, Cursor, Windsurf, Claude Desktop. Read the repository before you give any tool access to your data.

npx agentmarket install connector/devlint-gitwand

About

Use cases: version-control

No reviews yet. Installed it? Reviews come from verified installers only. How reviews work

Permissions

What this server can do and what it asks for, from its tool list and install config. Checked Oct 25, 2026.

Tools

5 read · 5 write · 0 delete

Secrets

None asked for

Install scripts

Not scanned yet

Runs as

Node.js package

Tools (10)

Read from the source code; the running server may differ. Descriptions are the server’s own words; hidden characters are shown as [U+…].

• gitwand_apply_resolution

  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.

• gitwand_explain_hunk

  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.

• gitwand_preview_merge

  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 …

• gitwand_resolve_conflicts

  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.

• gitwand_resolve_hunk

  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…

• gitwand_resolve_hunk_llm

  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.

• gitwand_status

  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.

• list_cases

  Read the current state of the Merge Room on this page: every conflict and git error filed so far, which hunks the engine settled, which are still waiting on a human decision, and which the human has already decided. Call this to see what is outstanding before deciding what to do next, or after asking the person to make a call. Takes no arguments.

• parse_git_error

  Explain a git command that failed, and file it into the Merge Room on this page so the person watching sees it. Paste the raw stderr or stdout of the failing command and get back the cause in plain language plus the specific commands that resolve it. Handles merge conflicts, rejected pushes, unrelated histories, detached HEAD, an interrupted merge, rebase or cherry-pick, authentication failures and other common git errors. Read-only: it never runs git and never touches the repository.

• resolve_conflict

  Resolve a file containing git conflict markers, and file it into the Merge Room on this page. Hunks that carry no real decision (identical edits on both sides, pure reordering, whitespace, insertions at different positions, generated files) are resolved deterministically. Hunks where the two branches genuinely disagree are NOT resolved: they queue for the person at the page to pick a side, and this tool cannot make that call. Returns a per-hunk classification with the pattern name, confidence score and reason for each. No model is involved and nothing is guessed. Runs in the browser tab: the f…

Compare and alternatives

Featured in

• Best MCP servers for Git

Signals

Stars

188

Forks

10

Open issues

2

Weekly downloads

111

Last commit

Oct 19, 2026 (8 days ago)

Last release

Oct 19, 2026 (8 days ago)

Last package publish

Oct 19, 2026 (8 days ago)

From GitHub (fetched Oct 24, 2026) and the package registry.

Details

Registry name

io.github.devlint/gitwand

Version

3.12.4

Auth

No auth

Packages

npm @gitwand/mcp

License

MIT

Repository

github.com/devlint/GitWand

First seen

Oct 24, 2026

Last checked

Oct 25, 2026

Source

Official MCP Registrygithub-graphql