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 skills add hams-ollo/zen-agent-skills --skill reconcile-worktreesgit clone --depth 1 https://github.com/hams-ollo/zen-agent-skillsWrote 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/skills/hams-ollo/zen-agent-skills/reconcile-worktrees)<a href="https://agentmods.dev/skills/hams-ollo/zen-agent-skills/reconcile-worktrees"><img src="https://agentmods.dev/badge/skills/hams-ollo/zen-agent-skills/reconcile-worktrees/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.
<a href="https://agentmods.dev/skills/hams-ollo/zen-agent-skills/reconcile-worktrees"><img src="https://agentmods.dev/badge/skills/hams-ollo/zen-agent-skills/reconcile-worktrees.svg" alt="Reviewed on agentmods" width="80" 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.00124 | $0.03821 |
| Opus 5.5 | $0.00050 | $0.01528 |
| Sonnet 5.5 | $0.00025 | $0.00764 |
| Haiku 4.5 | $0.00012 | $0.00382 |
Grade A, and why
reconcile-worktrees 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 7d 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.
How it starts
The opening of the file, as written. The whole thing — 266 lines — stays where its author put it; the contents beside it link to each section on GitHub.
reconcile-worktrees
Bring the verified contents of one or more isolated git worktrees into the main working tree as a clean, reviewable diff, without silently overwriting anything, without committing on the user's behalf, and without trusting that "no conflicts reported" means "safe".
This is the landing step of the kit spine: new-task authors the task
files, fix-batch dispatches them to isolated worktree agents, and this
skill consolidates the results. It assumes each worktree has already been through its own
verification pass via verifier-agent (fix-batch's Step 6 is what
runs it against every worktree in a batch). This skill is about combining already-trusted changes,
not about trusting them in the first place. If a worktree has not been independently verified yet,
run verifier-agent against it first. The same holds for the report
the worktree arrived with: it meets fix-batch's delegate report contract, or the worktree does not
land. Step 1 is where that is checked.
Landing the diff is where this skill stops, and it is not where the spine stops. A batch that has
just been consolidated is the single change most likely to have invalidated the reader-facing
documents, and nothing above notices, so doc-sync runs next, over the combined result rather than
over any one worktree. Offer it as the natural next step when you report in Step 7, and say so even
when the diff looks purely internal, since that judgment is what doc-sync exists to make.
Why this exists
Reconciling several worktrees by hand after a batch of parallel agent fixes turned out to be its
own source of risk, separate from whatever the agents themselves did wrong. In the 2026-07-07
incident that motivated the fix-batch skill: task-file bookkeeping split three incompatible ways
across worktrees because some agents wrote directly to the main checkout and others did not; a
binary asset showed an identical phantom diff in every worktree due to an unmigrated git-lfs rule,
which would have silently corrupted the file if any worktree's changes were committed with a
blanket git add -A; and two worktrees both touched the same file in different, non-overlapping
regions, which is safe to combine but only if you actually check that before assuming it.
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.
- 7d ago Changed · +3 lines · -37 tokens per session 384e2295e20a
- 1mo ago Changed · +7 lines bbd26aa19de8
- 2mo ago First seen · 256 lines · 161 tokens per session scan A 12c5a6bfc7d4
reconcile-worktrees is a skill published in the GitHub repository hams-ollo/zen-agent-skills (2 stars, last pushed 7d ago), licensed MIT. It adds 124 tokens to every session and 3,821 once invoked, about $0.0005 per session on Opus 5.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.
Other skills, from other repositories
archive
Use when explicitly invoked to close out a change whose branch has already merged: confirm the merge from git alone, then move the change folder under changes/archive/ with its ship date. Trigger on '/sw:archive', '$sw:archive', 'archive this change', or a request to close out a merged change.
ship
Use when explicitly invoked to run the whole change ladder without stopping — ticket, plan, implementation, quality gate, runtime verification, review to lgtm — deciding every open question autonomously and recording each decision in proposal.md. Trigger on '/sw:ship', '$sw:ship', or a request to take something from…
gsd-quick
Execute a quick task with GSD guarantees (atomic commits, state tracking) but skip optional agents.
gsd-quick-batch
Batch several /skill:gsd-quick-shaped tasks together — planned, dispatched, and merged as one run.
gsd-workspace
Manage GSD workspaces — create, list, or remove isolated workspace environments.
gsd-inbox
Triage and review open GitHub issues and PRs against project templates and contribution guidelines.