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 skills/doidor/agentrig/resolve-conflictsnpx skills add doidor/agentrig --skill resolve-conflictsgit clone --depth 1 https://github.com/doidor/agentrigWhat 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.00027 | $0.00318 |
| Opus 5 | $0.00014 | $0.00159 |
| Sonnet 5 | $0.00005 | $0.00064 |
| Haiku 4.5 | $0.00003 | $0.00032 |
Grade A, and why
resolve-conflicts 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.
What it actually says
resolve-conflicts (principles 4, 7)
Rebase the existing PR branch onto the default branch and resolve conflicts. You are repairing, not reviewing — do not bounce the task back without resolving and pushing.
Steps
- Fetch and rebase onto the default branch. Do not merge the default branch into the PR branch unless a human explicitly asks for a merge commit.
- Resolve each conflict keeping the intent of both changes.
- Apply repo-local workflow skills if any match this repo's merge / validation / release flow.
- Verify mergeability — run the smallest test set that covers the touched files, with concise
output (e.g.
-q/--tb=short) to avoid flooding context. - Continue the rebase, then push the existing PR branch.
- Leave the branch rebased onto, and mergeable with, the default branch.
Repair-mode rules
- Do not declare done without resolving and pushing the fix.
- If the conflict cannot be resolved safely, explain the blocker on the PR, then move the task to
parked. Runself-verifybefore handoff.
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 · 29 lines · 27 tokens per session scan A 23cb05044aea
resolve-conflicts is a skill published in the GitHub repository doidor/agentrig (5 stars, last pushed 1mo ago), licensed MIT. It adds 27 tokens to every session and 318 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.
Other skills, from other repositories
systematic-debugging
Use when encountering any bug, test failure, or unexpected behavior, before proposing fixes.
chat-pet-sprite-creation
Use when creating or changing VS Code chat pet sprite art, sprite sheets, state animations, eye treatments, Stable/Insiders variants, or pet transitions under src/vs/workbench/contrib/chat/browser/widget/media/chatPet.
cpu-profile-analysis
Analyze V8/Chrome CPU profiles (.cpuprofile) and DevTools trace files (Trace-.json). Use when: profiling performance, investigating slow functions, comparing code paths, finding bottlenecks, analyzing timeToRequest, understanding call trees from sampling profiler data, analyzing layout/paint/rendering, investigating…
babysit-pr
Babysit a GitHub pull request after creation by continuously polling review comments, CI checks/workflow runs, and mergeability state until the PR is merged/closed or user help is required. Diagnose failures, retry likely flaky failures up to 3 times, auto-fix/push branch-related issues when appropriate, and keep…
imagegen
Generate or edit raster images when the task benefits from AI-created bitmap visuals such as photos, illustrations, textures, sprites, mockups, or transparent-background cutouts. Use when Codex should create a brand-new image, transform an existing image, or derive visual variants from references, and the output…
agent-host-chat-contributions
Build and review cross-cutting agent-host chat behavior through lifecycle contributions. Use when adding turn lifecycle side effects, prompt or context injection, restored-history transformation, protocol-action observation, or when reviewing changes that add code to AgentSideEffects or AgentService.