merge-supervisor

merge-supervisor is an agent for Claude Code from AvivK5498/The-Claude-Protocol. It costs 15 tokens per session (728 once invoked), scanned A, original, MIT.

An agent for resolving Git merge conflicts by examining the changes from both sides and preserving their intended behavior. Git merge conflicts happen when branches change overlapping parts of files.

In plain words
What is it for?
Use it during an active Git merge to inspect both versions, resolve conflicting files, update task tracking when given a task ID, and explain when the planned resolution appears unsafe.
Why use it?
It helps reconcile competing edits during a merge while checking that the chosen result does not break the project. It follows the current merge state and any guidance already provided by the orchestrator.

Agent for Claude Code

Written for Claude Code: a Claude Code subagent (agents/*.md). Also seen: model in frontmatter.

Good fit Use it during an active Git merge to inspect both versions, resolve conflicting files, update task tracking when given a task ID, and explain when the planned resolution appears unsafe.

Compare 6 agents from other repositories ↓
Install with agentmods
npx agentmods add agents/avivk5498/the-claude-protocol/merge-supervisor
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.

Clone the repo
git clone --depth 1 https://github.com/AvivK5498/The-Claude-Protocol

Made for: Claude Code.

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 merge-supervisor

README.md
[![agentmods](https://agentmods.dev/badge/agents/avivk5498/the-claude-protocol/merge-supervisor/github.svg)](https://agentmods.dev/agents/avivk5498/the-claude-protocol/merge-supervisor)
Your own site
<a href="https://agentmods.dev/agents/avivk5498/the-claude-protocol/merge-supervisor"><img src="https://agentmods.dev/badge/agents/avivk5498/the-claude-protocol/merge-supervisor/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.

agentmods 80×15 button for merge-supervisor

Your own site · 80×15
<a href="https://agentmods.dev/agents/avivk5498/the-claude-protocol/merge-supervisor"><img src="https://agentmods.dev/badge/agents/avivk5498/the-claude-protocol/merge-supervisor.svg" alt="Reviewed on agentmods" width="80" height="20"></a>
Per session 15 Only the description is in the session, so the agent can decide to use it. The body loads when it is invoked.
When invoked 728 The whole file, excluding the scripts and references it only reads on demand.
Security scan A 0 findings. A grade says what 26 rules found in the file — not that it is safe.
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.1 $0.00015 $0.00728
Opus 5 $0.00008 $0.00364
Sonnet 5 $0.00003 $0.00146
Haiku 4.5 $0.00002 $0.00073

Measured 9d ago against content hash 11e53d3e6730, method: parsed. Prices are Anthropic first-party input rates as of 2026-09-09, from the pricing page.

Security

Grade A, and why

merge-supervisor 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 9d 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.

Origin

Copies of this mod

1 near-identical copy found in the catalogue:

templates/agents/merge-supervisor.md · 120 lines

How it starts

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

Merge Supervisor: "Mira"

Identity

  • Name: Mira
  • Role: Merge Supervisor (Conflict Resolution)
  • Specialty: Git merge conflicts, code reconciliation

Phase 0: Start

1. If BEAD_ID provided: `bd update {BEAD_ID} --status in_progress`
2. Verify: `git status` shows merge in progress
3. Both branches readable: can access HEAD and MERGE_HEAD

Phase 0.5: Execute with Confidence

The orchestrator has investigated and provided resolution guidance.

Default behavior: Execute the resolution confidently.

Only deviate if: You find clear evidence during resolution that the guidance is wrong (e.g., would break functionality).

If the orchestrator's approach would break something, explain what you found and propose an alternative.


Protocol

Read the full file on GitHub · 120 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. 9d ago First seen · 120 lines · 15 tokens per session scan A 11e53d3e6730

Subscribe to this mod's changes

merge-supervisor is an agent published in the GitHub repository AvivK5498/The-Claude-Protocol (346 stars, last pushed 7mo ago), licensed MIT. It adds 15 tokens to every session and 728 once invoked, about $0.0001 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.

Related

Other agents, from other repositories

unbloat-remediator

Orchestrate safe bloat remediation - execute deletions, refactorings, consolidations, and archiving with user approval. Creates backups, runs tests, provides rollback.

athola/claude-night-market · 41 tokens

pr-reviewer

STRICT internal pre-PR reviewer — the final gate BEFORE a PR is opened, so CodeRabbit finds fewer bugs. A generalist, diff-scoped critic that runs the repo's REAL tools, traces cross-file blast radius, verifies every finding, and applies React 19 / TS / Tauri 2 + Rust invariant checks. Use right before git push /…

saeedkolivand/ai-job-hunter-app · 119 tokens

drift-auditor

Auditoría de convergencia repo: detecta drift entre docs, config y código. Usar PROACTIVELY tras cambios grandes o al inicio de sprint.

gonzalezpazmonica/savia · 40 tokens

git-investigator

Code archaeology expert. Tracks code history, identifies where issues were introduced, and analyzes root causes.

sd0xdev/sd0x-harness · 23 tokens

state-keeper

Use this agent to run sync reconciliation between fakoli-state's three sources of truth — the SQLite canonical state (.fakoli-state/state.db), the filesystem (packets/, .evidence-buffer/, worktrees), and git (branches, commits, claims). It surfaces drift as structured discrepancy reports — orphan branches (claimed…

fakoli/fakoli-plugins · 465 tokens

git-historian

Use this agent for git archaeology, when the user asks "why does this code exist", "when did this break", "what introduced this behavior", mentions "git blame", "git bisect", "pickaxe", "regression", "who changed this", or "find the commit that". Examples.

sigistry/marketplace · 0 tokens