Skip to content
verify mcp Beta VerifyMCP is currently in beta. If you notice any issues, email [email protected] and we’ll put it right.

io.github.devlint/gitwand

NPM · @GITWAND/MCP · SCANNED AUG 3

Auto-resolves Git merge conflicts so agents only touch the complex hunks.

Available components

npm · @gitwand/mcp 77
+25 this week 77 Trust /100
Trust breakdown (6 categories)

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 →

Supply Chain Security87
  • No malware found by supply-chain analysis.Pass
  • Only part of the dependency tree could be resolved (97 of 101), so this covers what we could see, not the whole tree.Partial
  • No install/post-install scripts declared.Pass
  • Only part of the dependency tree could be resolved (97 of 101), so this covers what we could see, not the whole tree. 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 13 days ago).Pass
  • Disclosure check failed: no security disclosure policy was found in the source repository. See how to fix → Fail
Schema Quality & AI Usability83
  • 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 1334 tokens (~148/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 Management0
  • Stability not yet verified: not enough scan history yet (needs a 30-day window).Unverified
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
Capabilities100
  • Implements a supported MCP spec version (2025-11-25); the latest is 2026-07-28.Pass

Unverified: 1 category

A category scored 0 because we could not verify it: a data source with nothing on this package, evidence we could not reach, or a check we could not run. We only credit what we can confirm.

Install

Add this component to your MCP client. Where a client-specific snippet is available, pick your client below and copy it straight into your config; otherwise use the connection detail shown.

npm · @gitwand/mcp

# add to Claude Code
claude mcp add devlint-gitwand -- npx -y @gitwand/mcp
# add to Codex CLI
codex mcp add devlint-gitwand -- npx -y @gitwand/mcp
// opencode.json
{
  "$schema": "https://opencode.ai/config.json",
  "mcp": {
    "devlint-gitwand": {
      "type": "local",
      "command": [
        "npx",
        "-y",
        "@gitwand/mcp"
      ],
      "enabled": true
    }
  }
}
# add to OpenClaw
openclaw mcp add devlint-gitwand --command npx --arg -y --arg @gitwand/mcp
# ~/.hermes/config.yaml
mcp_servers:
  devlint-gitwand:
    command: "npx"
    args: ["-y", "@gitwand/mcp"]
// mcp.json
{
  "mcpServers": {
    "devlint-gitwand": {
      "command": "npx",
      "args": [
        "-y",
        "@gitwand/mcp"
      ]
    }
  }
}
Changelog

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.

  • 3 Aug 26 +57
    • Install scripts: unverified → pass ▲ security
    • Provenance: unverified → pass ▲ security
    • Known CVEs: unverified → partial ▲ security
    • Stability: Stability not yet verified: not enough scan history yet (needs a 30-day window). security
    • The attested source repository moved: devlint/GitWand security
    • Security disclosure: unverified → fail ▼ functional
    • Tool coverage: unverified → 100 ▲ functional
    • License: unverified → pass ▲ functional
    • Schema quality: unverified → 100 ▲ functional
    • Dependency health: unverified → partial ▲ functional
    • Maintenance: unverified → pass ▲ functional
    • MCP protocol: unverified → pass ▲ functional
    • Schema quality: unverified → excellent ▲ functional
    • Licence: MIT functional
  • 2 Aug 26 −1
    • Security disclosure: fail → unverified ▼ functional
    • Dependency health: partial → unverified ▼ functional
  • 1 Aug 26 −13
    • We updated how we score, so this day's move reflects our rubric, not a change to the server See what changed → functional
  • 31 Jul 26 −18
    • Malware scan: pass → unverified ▼ security
  • 27 Jul 26 52

    First indexed and scored.

Diagnostics

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 3 Aug 2026 · Analysed npm/@gitwand/[email protected]

Provenance verified

Ecosystem: npm · Outcome: verified

Reason: verified

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.6.0
Rekor log index:
2205285900
Predicate type:
https://slsa.dev/provenance/v1
Subject digest:
sha512:07b66b5b9b8a0e226f5f89b5d18ad1a699364a527eb98c83b323348e24dd0b796c44cd449c2978163c975eae0ec4b6c1b5deb3b02a1ab4b5e7e904155
Discovery method:
attestation_endpoint
Dependencies 97 packages

97 packages in the resolved dependency tree · 96 deprecated · 29 stale.

The dependency tree was only partially resolved, so these counts may be incomplete.

MCP tools — 7 exposed · ~1,259 tokens

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.

Tool Tokens
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.

NameTypeReqDescription
contentstringyesThe resolved content to replace the conflict block with.
cwdstring—Working directory (repo root). Defaults to server cwd.
filestringyesPath to the conflicted file (relative to cwd).
linenumberyesStart 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.

NameTypeReqDescription
cwdstring—Working directory (repo root). Defaults to server cwd.
filestringyesPath to the conflicted file (relative to cwd).
linenumberyesStart line of the hunk to explain.

No output schema declared.

No examples provided.

gitwand_preview_merge ~256

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).

NameTypeReqDescription
commitstring—Required when operation is 'cherry-pick': the commit to simulate cherry-picking onto HEAD.
cwdstring—Working directory (repo root). Defaults to server cwd.
ontostring—Required when operation is 'rebase': the branch/ref to rebase HEAD onto.
operationstring—Operation to simulate. Default: 'merge'.

No output schema declared.

No examples provided.

gitwand_resolve_conflicts ~139

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.

NameTypeReqDescription
cwdstring—Working directory (repo root). Defaults to server cwd.
dry_runboolean—If true, analyze without writing files. Default: false.
filesarray—Specific files to resolve. If omitted, discovers all conflicted files from git.
policystring—Merge policy to use. Default: prefer-theirs.

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.

NameTypeReqDescription
basestringyesContent of the hunk in the merge base (common ancestor). May be empty for hunks with no shared ancestor.
contextstring—Optional surrounding code (a few lines above and below the hunk) so the agent can reason about intent.
filePathstringyesPath of the file containing the hunk (used by the agent to infer language and apply format-aware reasoning).
languagestring—Optional language hint (e.g. "typescript", "python", "rust"). If omitted, the agent infers it from `filePath`.
oursstringyesContent of the hunk from the current branch (HEAD / ours side).
theirsstringyesContent 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.

NameTypeReqDescription
cwdstring—Working directory (repo root). Defaults to server cwd.
dry_runboolean—If true, validate but do NOT write the file. Default: false.
filestringyesPath to the conflicted file (relative to cwd).
linenumberyesStart line of the conflict hunk (the <<<<<<< line, 1-indexed).
min_scorenumber—Minimum validation score (0–100) to accept and write the resolution. Default: 80.
resolutionstringyesLLM-proposed resolution content — the lines that replace the conflict block.

No output schema declared.

No examples provided.

gitwand_status ~59

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.

NameTypeReqDescription
cwdstring—Working directory (repo root). Defaults to server cwd.

No output schema declared.

No examples provided.