reconcile

reconcile is a skill for Claude Code, Codex from conorbronsdon/agent-skills. It costs 29 tokens per session (909 once invoked), scanned A, original, MIT.

A read-only check for inconsistencies between parallel coding sessions. It examines project state, recent commits, branches, and file overlaps after multiple sessions have worked at once.

In plain words
What is it for?
Use it after parallel work, merges, or crashes to find session-related conflicts and receive proposed fixes.
Why use it?
It helps reveal unmerged work, conflicting changes, or drift between worktrees before those problems cause confusion.

Skill for Claude CodeCodex

Written for no agent in particular: nothing here depends on one. Also seen: mentions Claude Code.

Good fit Use it after parallel work, merges, or crashes to find session-related conflicts and receive proposed fixes.

Compare 6 skills from other repositories ↓
Install with agentmods
npx agentmods add skills/conorbronsdon/agent-skills/reconcile
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.

Any agent
npx skills add conorbronsdon/agent-skills --skill reconcile
Clone the repo
git clone --depth 1 https://github.com/conorbronsdon/agent-skills

Made for: Claude Code, Codex.

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 reconcile

README.md
[![agentmods](https://agentmods.dev/badge/skills/conorbronsdon/agent-skills/reconcile/github.svg)](https://agentmods.dev/skills/conorbronsdon/agent-skills/reconcile)
Your own site
<a href="https://agentmods.dev/skills/conorbronsdon/agent-skills/reconcile"><img src="https://agentmods.dev/badge/skills/conorbronsdon/agent-skills/reconcile/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 reconcile

Your own site · 80×15
<a href="https://agentmods.dev/skills/conorbronsdon/agent-skills/reconcile"><img src="https://agentmods.dev/badge/skills/conorbronsdon/agent-skills/reconcile.svg" alt="Reviewed on agentmods" width="80" height="20"></a>
Per session 29 Skills are progressive disclosure: only the name and description are preloaded; the body loads when the skill is used.
When invoked 909 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.00029 $0.00909
Opus 5 $0.00015 $0.00454
Sonnet 5 $0.00006 $0.00182
Haiku 4.5 $0.00003 $0.00091

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

Security

Grade A, and why

reconcile 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 10d 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.

reconcile/SKILL.md · 108 lines

How it starts

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

/reconcile — Multi-Session Drift Check

When running multiple Claude Code sessions in parallel (especially with worktrees), files can drift out of sync. This skill scans for inconsistencies and proposes fixes.

Invocation: deliberately model-invocable — the scan is read-only and auto-triggering when drift smells is the point. Anything that changes files is proposed, never applied.

When to Use

  • After merging worktree branches back to the default branch
  • When something "feels off" after parallel work
  • After a crash where multiple sessions were open
  • As a periodic sanity check during heavy parallel workflows

Instructions

0. Detect the default branch

git rev-parse --git-dir >/dev/null 2>&1 || { echo "not a git repository — nothing to reconcile"; exit 0; }
DEFAULT=$(git symbolic-ref --short refs/remotes/origin/HEAD 2>/dev/null | sed 's|^origin/||')
DEFAULT=${DEFAULT:-main}   # no remote configured — fall back and say so in the report

1. Scan recent commit history across all branches

git log --all --oneline --since="24 hours ago" --graph

Look for:

  • Multiple branches touching the same files
  • Commits on branches that haven't been merged
  • Conflicting changes (same file modified differently on different branches)

2. Check for file-level conflicts

For each file modified on multiple branches, diff the versions:

git diff "$DEFAULT"..<branch> -- <file>

Flag files where:

  • Both branches modified the same lines (merge conflict risk)
  • One branch deleted what another modified
  • Timestamps or "Last Updated" fields diverged

3. Check state file consistency

If your project uses state files (TODO lists, priority files, decision logs, session logs), check:

  • Duplicate entries: Same task or decision logged twice from different sessions
  • Contradictory state: One session marked something complete, another added it as in-progress
  • Timestamp drift: "Last Updated" dates that don't match the most recent actual edit
  • Orphaned references: Files or sections referencing things that were removed in another session

Read the full file on GitHub · 108 lines

Files

What ships with it

1 file beside SKILL.md in the same directory: the scripts, references and assets a skill reads on demand. Not counted in the per-session cost; read them before you install if any of them is executable.

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. 10d ago First seen · 108 lines · 29 tokens per session scan A 5fc3777a9a6c

Subscribe to this mod's changes

reconcile is a skill published in the GitHub repository conorbronsdon/agent-skills (10 stars, last pushed 1mo ago), licensed MIT. It adds 29 tokens to every session and 909 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-31.

Related

Other skills, from other repositories

docs-release-notes

Use when a change needs a user-visible release-note, changelog, or changeset entry — "add a release note", "add a changeset for this", "what goes in the changelog?", "write up what shipped", "note this for the next release" — or when finalizing a branch whose customer-visible features, bug fixes, or UI changes should…

The01Geek/prflow · 106 tokens

retrospective-audit

Stage B of /prflow:retrospective-weekly: given a most-recent-first subset of one recurring pattern's occurrence-PR context bundles (bounded by auditbundlecap), re-derive the root cause and return one JSON object carrying a ranked findings array (one to three sub-patterns) — no edits, no worktree. Invoked as a subagent…

The01Geek/prflow · 91 tokens

github-issue-solve

Solve a GitHub issue by collecting context, implementing a fix, and opening or updating a pull request.

holon-run/holon · 27 tokens

debug-systematic

Systematic 4-phase debugging methodology for complex, intermittent, or mysterious issues. Use when investigating bugs, race conditions, or unexplained failures.

travisjneuman/.claude · 33 tokens

skillnote-doctor

A diagnostic tool for OpenClaw agents -- checks skill registry connectivity, AGENTS.md setup, config file validity, and installed skill health. Use when your setup seems broken, skills aren't loading, or you want to audit your agent's configuration.

luna-prompts/skillnote · 54 tokens

campaign-commit

Choose the correct commit command in a camp, also called a campaign. Use when you are about to commit and need to select camp commit, camp p commit, fest commit, or intentional root pointer sync via camp refs-sync.

Obedience-Corp/festival · 53 tokens