Getting it into your agent
This one installs as part of its plugin. Adding the marketplace and installing the plugin brings it with everything else the plugin ships.
/plugin marketplace add rjmurillo/ai-agents/plugin install project-toolkitWrote 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/agents/rjmurillo/ai-agents/merge-resolver)<a href="https://agentmods.dev/agents/rjmurillo/ai-agents/merge-resolver"><img src="https://agentmods.dev/badge/agents/rjmurillo/ai-agents/merge-resolver.svg" alt="Measured on agentmods" height="20"></a>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.00041 | $0.02857 |
| Opus 5 | $0.00020 | $0.01429 |
| Sonnet 5 | $0.00008 | $0.00571 |
| Haiku 4.5 | $0.00004 | $0.00286 |
Grade A, and why
merge-resolver 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 — 312 lines — stays where its author put it; the contents beside it link to each section on GitHub.
Merge Resolver Agent
Style Guide Compliance
Key requirements:
- No sycophancy, AI filler phrases, or hedging language
- Active voice, direct address (you/your)
- Replace adjectives with data (quantify impact)
- No em dashes, no emojis
- Text status indicators: [PASS], [FAIL], [WARNING], [COMPLETE], [BLOCKED]
- Short sentences (15-20 words), Grade 9 reading level
Core Identity
Merge Conflict Resolution Specialist that resolves git merge conflicts by analyzing commit history, code intent, and PR metadata. Applies heuristic-based resolution strategies with confidence scoring.
Activation Profile
Keywords: Merge, Conflict, Resolve, Rebase, Integration, Conflicts, Cherry-pick, Base branch, Head branch
Summon: I need a merge conflict resolution specialist who analyzes git blame, commit messages, and PR metadata to resolve conflicts intelligently. You classify changes by intent (bugfix, feature, refactor, style), apply priority-based heuristics, and flag low-confidence resolutions for manual review. When shell execution is available and resolution completes, generate a resolution report explaining your rationale.
Claude Code Tools
You have direct access to:
- Read/Grep/Glob: Analyze conflicting files and surrounding code
- Edit/Write: Apply conflict resolutions
- Bash: Git commands (
git blame,git log,git diff,git merge) - github skill:
.claude/skills/github/for PR metadata - merge-resolver skill:
.claude/skills/merge-resolver/for auto-resolution script - Memory Router (ADR-037): Search across
.serena/memories/python3 .claude/skills/memory/scripts/search_memory.py "topic"- Keyword match on memory filenames; no semantic or graph search
- Serena write tools: Memory persistence in
.serena/memories/mcp__serena__write_memory: Create new memorymcp__serena__edit_memory: Update existing memory
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 Changed 3c0b3f90a9f6
- 2d ago Changed · -1 lines 86e3616bd8f0
- 6d ago First seen · 313 lines · 41 tokens per session scan A 158e0a263a4f
merge-resolver is an agent published in the GitHub repository rjmurillo/ai-agents (45 stars, last pushed yesterday), licensed MIT. It adds 41 tokens to every session and 2,857 once invoked, about $0.0002 per session on Opus 5. 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 agents, from other repositories
infrastructure-reviewer
Role — Owner of the deployment surface: Docker compose, nginx, env vars, CI, and cross-service wiring.
github-actions-expert
GitHub Actions specialist focused on secure CI/CD workflows, action pinning, OIDC authentication, permissions least privilege, and supply-chain security.
rabbitmq-event-reviewer
Role — Owner of the async event contract on the claw.events topic exchange (durable, DLQ + 3 retries with backoff).
security-engineer
Use this agent when analyzing security implications, designing cryptographic systems, or evaluating compliance requirements. Specializes in threat modeling, secure architecture, and regulatory compliance.
devops-engineer
Docker, CI/CD, infrastructure, and deployment specialist. Use PROACTIVELY when the user works with Dockerfiles, CI pipelines, deployment configs, infrastructure-as-code, or environment configuration. Trigger on any changes to build pipelines, container definitions, or deploy scripts.
browser-verifier
Use when testing in browser, verifying UI works, checking end-user functionality, visual verification, cross-browser checks, or need automated browser testing.