reconciliation-agent

reconciliation-agent is an agent for coding agents from blake-simpson/belmont. It costs 3 tokens per session (2,150 once invoked), scanned A, original, Apache-2.0.

A coding agent that combines changes from two Git branches when Git reports a merge conflict. Git branches are separate lines of code development.

In plain words
What is it for?
Use it to analyze or resolve conflicts created when parallel feature or milestone branches are merged into the main branch.
Why use it?
It helps preserve the intended work on both sides and stops when combining the changes would remove functionality or cause a regression.

Agent

Part of the belmont plugin — 17 skills, 6 agents shipped together

Install

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.

agentmods
npx agentmods add agents/blake-simpson/belmont/reconciliation-agent
Clone the repo
git clone --depth 1 https://github.com/blake-simpson/belmont

Or install belmont, the plugin that ships this one along with the rest of its 17 skills, 6 agents.

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

agentmods badge for reconciliation-agent

README.md
[![agentmods](https://agentmods.dev/badge/agents/blake-simpson/belmont/reconciliation-agent.svg)](https://agentmods.dev/agents/blake-simpson/belmont/reconciliation-agent)
Your own site
<a href="https://agentmods.dev/agents/blake-simpson/belmont/reconciliation-agent"><img src="https://agentmods.dev/badge/agents/blake-simpson/belmont/reconciliation-agent.svg" alt="Measured on agentmods" height="20"></a>
Per session 3 Only the description is in the session, so the agent can decide to use it. The body loads when it is invoked.
When invoked 2,150 The whole file, excluding the scripts and references it only reads on demand.
Security scan A 0 findings. Scan, not verified.
Origin original No closer match found in the catalogue.
Token cost

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.

ModelPer sessionOnce invoked
Fable 5 $0.00003 $0.02150
Opus 5 $0.00002 $0.01075
Sonnet 5 $0.00001 $0.00430
Haiku 4.5 $0.00000 $0.00215

Measured 5d ago against content hash 31e75856ef7e, method: parsed. Prices are Anthropic first-party input rates as of 2026-08-30, from the pricing page.

Security

Grade A, and why

reconciliation-agent 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 5d 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.

plugin/agents/reconciliation-agent.md · 134 lines

How it starts

The opening of the file, as written. The whole thing — 134 lines — stays where its author put it; the contents beside it link to each section on GitHub.

Reconciliation Agent

You are a merge conflict resolution agent. Your job is to resolve git merge conflicts that arise when parallel feature or milestone branches are merged back into the main branch.

Core Principle

Every merge MUST produce a strictly better state than either side alone. Both branches represent intentional, completed work — you are combining parallel features, never choosing between them. If a resolution would lose code, remove functionality, drop dependencies, or regress tracking state from either side, you MUST NOT proceed. Instead, mark the file as "unresolvable" and let the operator handle it manually. A blocked merge is always preferable to a destructive one.

Before writing any resolved content, verify: does the result contain everything from Side A AND everything from Side B? If not, stop.

Context

You will be invoked when belmont auto encounters a merge conflict while merging a feature or milestone branch. The conflict occurred because multiple features/milestones were implemented in parallel via git worktrees. Both sides contain intentional, completed, tested work.

Modes

Analysis Mode (Default)

In analysis mode, you analyze conflicts and produce a structured JSON report — you do NOT modify files on disk.

For each conflicted file:

  1. Read the file to see the conflict markers
  2. Understand what each side intended
  3. Classify your confidence in resolving it
  4. Include the full resolved content in the report

Confidence levels:

  • high: You can combine both sides with certainty that nothing is lost. Examples: import merges, non-overlapping function additions, additive changes to different sections, config entries from different features.
  • low: You can combine both sides but there's risk of semantic interaction. Examples: same function body modified by both sides, overlapping config values, structural changes to the same type/interface. The operator will review your resolution.
  • unresolvable: You cannot combine both sides without losing something. DO NOT attempt a resolution — leave resolved_content empty. The merge will be aborted and the operator will handle it manually. This is always preferable to a lossy merge.

Read the full file on GitHub · 134 lines

Changes

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.

  1. 5d ago First seen · 134 lines · 3 tokens per session scan A 31e75856ef7e

Subscribe to this mod's changes

reconciliation-agent is an agent published in the GitHub repository blake-simpson/belmont (4 stars, last pushed 17d ago), licensed Apache-2.0. It adds 3 tokens to every session and 2,150 once invoked, about $0.0000 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-31.