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 agentmods add commands/devlint/gitwand/resolvegit clone --depth 1 https://github.com/devlint/GitWandWhat 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 | $0.00000 | $0.00509 |
| Opus 5 | $0.00000 | $0.00254 |
| Sonnet 5 | $0.00000 | $0.00102 |
| Haiku 4.5 | $0.00000 | $0.00051 |
Grade A, and why
resolve 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 yesterday.
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 — 55 lines — stays where its author put it; the contents beside it link to each section on GitHub.
Resolve Git conflicts with GitWand
Use the GitWand CLI to automatically resolve trivial merge conflicts, then handle remaining complex hunks manually.
Workflow
1. Check conflict status
npx gitwand status --json
This returns a JSON report showing each conflicted file, how many conflicts it has, and how many are auto-resolvable.
2. Auto-resolve what GitWand can handle
npx gitwand resolve --json
GitWand resolves conflicts with certain or high confidence automatically (patterns: same_change, one_side_change, delete_no_change, whitespace_only, non_overlapping, value_only_change, generated_file). Files are written in-place.
Use --dry-run to analyze without modifying files.
3. Interpret the JSON output
The resolutions array in each file entry contains:
line: start line of the conflict in the original filetype: the conflict pattern detectedresolved: whether GitWand auto-resolved itexplanation: human-readable reason for the decisionpendingHunks(if present): unresolved hunks withours/theirs/basecontent for manual review
4. Handle remaining conflicts
For hunks with "resolved": false (type complex):
- Read the hunk content from
pendingHunksif available, or open the file - Understand the semantic intent of both sides using the
explanationfield - Write the correct resolution considering both changes
- Stage the resolved file with
git add
5. Verify
npx gitwand status
Confirm all conflicts are resolved, then git commit to complete the merge.
Tips
- GitWand has specialized resolvers for JSON, YAML, Markdown, Vue SFC, CSS, TypeScript imports, and lockfiles (npm/yarn/pnpm). It resolves these at the semantic level, not just line-by-line.
- The
.gitwandrcfile in the repo root can configure merge policies (prefer-ours,prefer-theirs,prefer-safety,prefer-merge,strict) and per-path overrides. - Confidence scoring uses a composite of
typeClassification,dataRisk, andscopeImpact— not just the conflict type.
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.
- yesterday First seen · 55 lines · 0 tokens per session scan A 7bcf67ee1033
resolve is a command published in the GitHub repository devlint/GitWand (167 stars, last pushed 3d ago), licensed MIT. It costs nothing until one of its globs matches a file; then it loads 509 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 commands, from other repositories
revdiff
Review git diff with revdiff TUI, then fix all annotations.
release-mobilewright
Prepare a mobilewright release by updating CHANGELOG.md with the next patch version.
verify-ui
Verify UI changes in the running Graft plugin via Chrome DevTools MCP.
status
Show diffscope's state, target extensions, and why recent turns produced no briefing.
record
Generate boilerplate code to record an agent run with agentdelta.
off
Turn diffscope's automatic change briefing off for this repository (or everywhere with --global).