Gitwand MCP Server
A fast, native Git client with built-in smart conflict resolution Desktop Conflict engine CLI MCP Server Architecture Roadmap Code signing. Its 7 documented tools cover gitwand, resolve, hunk. It runs locally over stdio via the published package.
People connecting web framework tools to Claude, Cursor, VS Code, or another MCP client. The project is written in TypeScript.
VERIFIED ACTIVE
LAST COMMIT 2026-08-24 · ★ 166 · #4 OF 48 MAINTAINED WEB FRAMEWORK · VERIFIED 2026-08-25
MIT · TypeScript servers · how we verify → /methodology
01 · Install Gitwand
before you install - you'll need
Set WEBKIT_DISABLE_COMPOSITING_MODE before connecting.
Claude Code
claude mcp add devlint-gitwand -- npx -y @gitwand/mcp Claude Desktop / Cursor / VS Code - add to config
{
"mcpServers": {
"devlint-gitwand": {
"command": "npx",
"args": [
"-y",
"@gitwand/mcp"
]
}
}
} Same JSON for Cursor. For VS Code, rename the top-level key from `mcpServers` to `servers`.
Using another client? Same JSON, different key
Claude Desktop · mcpServers
Cursor · mcpServers
VS Code · servers
Windsurf · mcpServers
Zed · context_servers
Cline · mcpServers
Roo Code · mcpServers
Continue · mcpServers
LibreChat · mcpServers
Gemini CLI · mcpServers
Codex CLI · mcp_servers
Full setup guides: every client.
02 · Evidence
Security posture
What to check before giving this server access to your agent - from the registry, GitHub, and our own probes. We don't score safety; we show what's verifiable.
runs as local process (stdio) - runs on your machine with your user's permissions
license MIT - declared in the repository
npm package @gitwand/mcp - the @gitwand scope differs from the repo owner (devlint); confirm it's the project's official package
registry namespace io.github.devlint is GitHub-verified and matches the repo owner
03 · What Gitwand can do
Prose above is summarized from the project's README and registry record - no invented capabilities.
What you can build
With this server connected, an agent can list conflicted files with their complexity and auto-resolvability, ask the connected agent to propose a resolution for one pending hunk (ours/theirs/base + trace returned), and validate an LLM-proposed resolution through the post-merge gate, then apply it to disk.
The 7 tools it gives your agent
Extracted from the project's README - what gitwand lets an agent do.
- gitwand_status
- - List conflicted files with their complexity and auto-resolvability
- gitwand_resolve_conflicts
- - Auto-resolve trivial conflicts, return DecisionTrace + pendingHunks
- gitwand_preview_merge
- - Dry-run resolution - stats and risk assessment without writing files
- gitwand_explain_hunk
- - Explain why a specific hunk was classified its type (full trace + context)
- gitwand_apply_resolution
- - Apply a custom (LLM-provided) resolution to a specific complex hunk
- gitwand_resolve_hunk
- - Ask the connected agent to propose a resolution for one pending hunk (ours/theirs/base + trace returned)
- gitwand_resolve_hunk_llm
- - Validate an LLM-proposed resolution through the post-merge gate, then apply it to disk
Latest releases
v3.7.2 · 2026-08-24
GitWand v3.7.2 · Download · | Platform | File | · |----------|------| · | macOS (Apple Silicon + Intel) | .dmg | · | Linux | .deb · .AppImage | · | Windows | .msi · .exe | · See the changelog for details.
v3.7.1 · 2026-08-21
GitWand v3.7.1 · Download · | Platform | File | · |----------|------| · | macOS (Apple Silicon + Intel) | .dmg | · | Linux | .deb · .AppImage | · | Windows | .msi · .exe | · See the changelog for details.
v3.7.0 · 2026-08-19
GitWand v3.7.0 · Download · | Platform | File | · |----------|------| · | macOS (Apple Silicon + Intel) | .dmg | · | Linux | .deb · .AppImage | · | Windows | .msi · .exe | · See the changelog for details.
04 · Who maintains Gitwand
gitwand is maintained by devlint. It's the only MCP server we track from this author; the repo dates to Apr 2026.
05 · Facts
- repository
- github.com/devlint/gitwand
- category
- web framework - ranked #4 of 48 actively-maintained web framework servers as of 2026-08-25.
- release cadence
- 10+ releases in the last 90 days (latest 2026-08-24)
- registry
- io.github.devlint/gitwand (active, first published 2026-04-20 · 45 versions)
- packages
- npm:@gitwand/mcp
06 · Gitwand FAQ
Is Gitwand still maintained?
Yes - as of 2026-08-25, its last commit was 2026-08-24 and it shipped 10+ releases in the last 90 days. We re-verify nightly.
What can Gitwand do?
With this server connected, an agent can list conflicted files with their complexity and auto-resolvability, ask the connected agent to propose a resolution for one pending hunk (ours/theirs/base + trace returned), and validate an LLM-proposed resolution through the post-merge gate, then apply it to disk.
How do I install Gitwand?
Run `npx -y @gitwand/mcp`. The README documents one environment variable (WEBKIT_DISABLE_COMPOSITING_MODE) to set first. Set WEBKIT_DISABLE_COMPOSITING_MODE before connecting. You can also paste the ready-made client config above.
Does Gitwand run locally?
Yes - it's a stdio server: it runs on your machine (via npx) with your user's permissions. Your data stays local unless the server itself calls external APIs.
07 · Alternatives to Gitwand
Alternatives to Gitwand
Maintained web framework servers if Gitwand isn't the fit.
- Tolgee Your app's translations in Tolgee: search keys, create translations, trigger machine translation ★ 4,081 · 2026-08-24
- Semiotic Verified React chart generation: select, validate, repair, render, and inspect charts through MCP. ★ 2,691 · 2026-08-24
- Medplum MCP Server Securely access and manage FHIR healthcare data stored in Medplum. ★ 2,627 · 2026-08-25
- Webcomponents React MCP Server MCP server for UI5 Web Components for React - Developer documentation and API assistance ★ 539 · 2026-08-24
- OpenVibeCoding Read-only MCP Read-only MCP for OpenVibeCoding runs, workflows, proof, queue, replay, and incident reads. ★ 206 · 2026-07-15
- Geo Lens Read-only access to a self-hosted GeoLens spatial catalog: datasets, features, maps, sandboxed SQL. ★ 202 · 2026-08-24
More web framework MCP servers · Source Library · Qrcodly · Aspicio · Inbed
More TypeScript MCP servers · DERO MCP Server · Oorep MCP · Dgmo MCP · RPG Maker MV Ultimate MCP · Dep Diff MCP · see all