Getting it into your agent
One page per mod, every tool's command on it. A separate URL per tool would split the same page into five that compete with each other.
npx skills add devlint/GitWand --skill gitwand-mcpgit clone --depth 1 https://github.com/devlint/GitWandWrote this? Show the measurements
A badge with what this costs and how it scanned, read live from this page, so it follows the numbers instead of freezing them. Markdown for a README, HTML for a documentation site or a project page.
[](https://agentmods.dev/skills/devlint/gitwand/gitwand-mcp)<a href="https://agentmods.dev/skills/devlint/gitwand/gitwand-mcp"><img src="https://agentmods.dev/badge/skills/devlint/gitwand/gitwand-mcp/github.svg" alt="Measured on agentmods" height="20"></a>Or the 80×15 button, for a site that already has a row of RSS and ATOM ones. Only the verdict fits; the numbers stay here.
<a href="https://agentmods.dev/skills/devlint/gitwand/gitwand-mcp"><img src="https://agentmods.dev/badge/skills/devlint/gitwand/gitwand-mcp.svg" alt="Reviewed on agentmods" width="80" height="20"></a>- NVIDIA SkillSpector warn
SkillSpector: 1 finding, up to medium
These are SkillSpector’s own severities. On a checked sample its high-severity flags on skills were ~96% false positives — a documented command, a public API, a “never do X” rule — so we show them as a caution to read, not a verdict. Why →
- medium MCP Rug Pull · line 8 npx commands without a version suffix (e.g. @1.0.0) create a rug-pull risk if the upstream server is compromised and publishes a malicious update.Fix: Pin the version: npx @scope/[email protected]
What it costs to keep this loaded
Counted locally with the o200k_base tokenizer, which is exact for GPT models; Claude uses its own tokenizer and its counts differ. Treat this as one consistent yardstick across the catalogue rather than a bill. Prices are per million input tokens.
| Model | Per session | Once invoked |
|---|---|---|
| Fable 5.1 | $0.00000 | $0.00574 |
| Opus 5.5 | $0.00000 | $0.00230 |
| Sonnet 5.5 | $0.00000 | $0.00115 |
| Haiku 4.5 | $0.00000 | $0.00057 |
Grade A, and why
gitwand-mcp scanned grade A with 0 findings against 26 rules in 11 categories — prompt injection, anti-refusal, data exfiltration, privilege escalation, supply chain, agent snooping, system-prompt leakage, SSRF and excessive agency — measured 1mo ago.
A static scan of the body, not an audit. Every finding is printed with the line that produced it so you can judge whether it matters here. A mod is markdown that instructs an agent; that is exactly why what it instructs is worth reading.
Nothing flagged
None of the 26 patterns this scan looks for appear in this file: no shell pipes, no recursive deletes, no credential paths, no hidden text, no instruction-override or anti-refusal phrasing, no agent-config snooping. That is not a guarantee, it is the absence of the things that are checkable.
How it starts
The opening of the file, as written. The whole thing — 65 lines — stays where its author put it; the contents beside it link to each section on GitHub.
GitWand MCP Server
Use GitWand's MCP server to automatically resolve Git merge conflicts from any AI agent (Claude, Claude Code, Cursor, Windsurf, etc.).
Install
npx @gitwand/mcp
Or add to your MCP client config (Claude Desktop, Claude Code, etc.):
{
"mcpServers": {
"gitwand": {
"command": "npx",
"args": ["@gitwand/mcp"]
}
}
}
Tools
| Tool | Description |
|---|---|
gitwand_status |
List conflicted files with complexity scores and auto-resolvability percentages |
gitwand_resolve_conflicts |
Auto-resolve trivial conflicts. Returns DecisionTrace + pendingHunks for complex ones |
gitwand_preview_merge |
Dry-run — assess resolvability without modifying files |
gitwand_explain_hunk |
Explain why a specific hunk is complex (full DecisionTrace) |
gitwand_apply_resolution |
Apply a custom resolution you provide to a specific hunk |
Resources
| URI | Description |
|---|---|
gitwand://repo/conflicts |
Live conflict state — files, counts, and auto-resolvability |
gitwand://repo/policy |
Current .gitwandrc config (merge policies, confidence thresholds) |
gitwand://hunk/{file}/{line} |
Raw ours/theirs/base content + confidence for a specific hunk |
Recommended Workflow
gitwand_preview_merge— check what can be auto-resolved vs. needs attentiongitwand_resolve_conflicts— auto-resolve trivial conflicts (writes files)- For each hunk in
pendingHunks:gitwand_explain_hunk— understand why it's complex (DecisionTrace, ours/theirs/base)- Decide on resolution, then
gitwand_apply_resolutionto write it
Merge Policies
Pass policy to gitwand_resolve_conflicts:
prefer-theirs(default) — take the incoming branch's version when safeprefer-ours— favour the current branchprefer-merge— attempt a three-way mergeprefer-safety— only resolve with very high confidencestrict— resolve only non-overlapping / whitespace-only conflicts
What this file has done since we first saw it
Hashed on every crawl. A supply-chain change to an agent config is a question of when, not whether, so the history is kept rather than the latest state alone.
- 1mo ago First seen · 65 lines · 0 tokens per session scan A 103f15461aa8
gitwand-mcp is a skill published in the GitHub repository devlint/GitWand (182 stars, last pushed 2d ago), licensed MIT. It costs nothing until one of its globs matches a file; then it loads 574 tokens. A static security scan graded it A with 0 findings. No closer match exists in the catalogue, so it is treated as the original; first seen 2026-08-30.
Other skills, from other repositories
hunk-launch-video
Produces Hunk videos by driving the real TUI headlessly in a PTY, compositing captioned 1080p frames in Chromium, and encoding with ffmpeg. Use for feature demos, workflow explainers, announcements, launch videos, and full-release roundups.
hunk-release
Prepares, publishes, verifies, and curates Hunk releases. Use for release metadata, benchmarks, tags, publishing, release videos, backports, or recovery.
git-machete
Use whenever invoking the git machete CLI to organize branch chains, compute fork points, run stacked rebases/merges, or manage GitHub/GitLab PR/MR chains - especially in a repo that already has a .git/machete file. Lists which subcommands modify .git/machete, run rebase/merge, run hooks, or read stdin, so the agent…
merge
Absorb one or more feature branches into the base branch. Recommends merge vs rebase per branch. On conflict, aborts that branch + surfaces the file list + stops. Resolution out of scope; routes to the harness-named conflict-resolution agent or the user.
tour
Tour is a local code-walkthrough CLI for AI agents. After finishing a task, the agent leaves line-anchored comments on a pinned git diff (a guided traversal) that a human steps through in a TUI or webapp. Activates when the user asks to "review this branch", "review this PR", "walk me through this diff", "leave…
github-pr-workflow
GitHub PR yaşam döngüsü — branch, commit, aç, CI izle, merge et.