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 agentmods add commands/robconery/kolea/git-mergegit clone --depth 1 https://github.com/robconery/koleaWhat 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 | $0.00018 | $0.01137 |
| Opus 5 | $0.00009 | $0.00568 |
| Sonnet 5 | $0.00004 | $0.00227 |
| Haiku 4.5 | $0.00002 | $0.00114 |
Grade A, and why
git-merge 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 2d 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.
This is a copy
100% identical to git-merge — 0 lines differ, which has more behind it and is treated as the original. This page carries a canonical link to it rather than competing with it.
How it starts
The opening of the file, as written. The whole thing — 117 lines — stays where its author put it; the contents beside it link to each section on GitHub.
git-merge
Bring a working branch into main. Refuses to do anything destructive
or surprising — every step is checked, then confirmed.
Preflight
- In a git repo?
git rev-parse --is-inside-work-tree. Refuse if not. - Identify branches:
git branch --show-current→ source branch- Default target is
main(ormasterif nomainexists).
- Same-branch guard. If the source branch equals the target, refuse with a clear message — there's nothing to merge.
Working-tree check
git status -s.- If there are uncommitted changes, stop and ask:
- Commit them first (suggest
/git-commit). - Stash them (
git stash push -m "pre-merge stash") — note the stash ref in the report so the user cangit stash popafter. - Discard (only if the user explicitly says so — never the default).
- Commit them first (suggest
- Do not proceed with a dirty tree.
Remote sync check
git remote -v. If no remote:- Skip the remote sync; proceed with a local merge.
- Mention in the report that no remote was found.
- If a remote exists:
git fetch origin --prune- Compare
mainwithorigin/main:git rev-list --left-right --count main...origin/main→ tells us ahead/behind counts.
- If local
mainis behindorigin/main: tell the user, and after the working-tree is clean, fast-forward localmainbefore merging (git switch main && git pull --ff-only). - If local
mainis ahead oforigin/main: warn — that's unpushed work on main. Ask before continuing; offer to push first. - If they have diverged: stop. This is not the time for a
/git-merge— recommend rebasing or pulling with--rebasefirst, and let the user decide.
- Also fetch the source branch's remote tracking ref if it exists,
and warn if
origin/<branch>is ahead of the local branch (someone else pushed).
Confirm before doing anything destructive
Use AskUserQuestion to confirm in one batch:
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.
- 2d ago First seen · 117 lines · 18 tokens per session scan A 0348067079ad
git-merge is a command published in the GitHub repository robconery/kolea (1 stars, last pushed 2d ago), licensed MIT. It adds 18 tokens to every session and 1,137 once invoked, about $0.0001 per session on Opus 5. A static security scan graded it A with 0 findings. It is 100% identical to git-merge, differing in 0 lines, and is treated as a copy.
Other commands, from other repositories
sonicjs-seo-blog
Generate a high-quality, SEO-optimized blog post for SonicJS on the topic: $ARGUMENTS.
generate-tests
Generate unit or integration tests for Go code following project patterns and coverage targets.
create-workflow
Generate an n8n workflow JSON from a natural language description of the automation.
plan
Slice SPEC into stories and an ordered task DAG. Owns STORIES.md + PLAN.md.
document
Reconcile docs with reality — README, ARCHITECTURE prose, MEMORY log. Run anytime.
cabinet
Build a self-contained archive bundle for a single .eml — markdown, retained attachments, and source file in one directory.