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/wrannaman/agentic-engineering/rebase-fixnpx skills add wrannaman/agentic-engineering --skill rebase-fixgit clone --depth 1 https://github.com/wrannaman/agentic-engineeringWrote 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/wrannaman/agentic-engineering/rebase-fix)<a href="https://agentmods.dev/skills/wrannaman/agentic-engineering/rebase-fix"><img src="https://agentmods.dev/badge/skills/wrannaman/agentic-engineering/rebase-fix.svg" alt="Measured on agentmods" 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 | $0.00068 | $0.02913 |
| Opus 5 | $0.00034 | $0.01456 |
| Sonnet 5 | $0.00014 | $0.00583 |
| Haiku 4.5 | $0.00007 | $0.00291 |
Grade A, and why
rebase-fix 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 4d 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 — 293 lines — stays where its author put it; the contents beside it link to each section on GitHub.
Rebase Fix
Resolve merge and rebase conflicts iteratively across an entire stack, continuing the restack until every branch is clean. Works with any stacking client (Charcoal/Graphite, Git Town, native git) or a plain git rebase.
When to Use
- A rebase or restack stopped due to merge conflicts
- The user says "fix rebase", "fix conflicts", "resolve conflicts"
git statusshowsUU(unmerged) files- A stacking client reports a conflict during
gt sr,git town sync, or similar
Process
Step 1: Detect Stack Client, Rebase State, and Stack Shape
Use the git-stacks KB partition as the shared source of truth for git-client detection:
list_kb_documentsfor partitiongit-stacksread_kb_document_by_pathfor/index.md- Run the detection order from
/index.mdin parallel with:
git status
Use git-stacks/index.md to classify charcoal or git-town. If neither dedicated client is detected, classify native-git only when git status shows a rebase, cherry-pick, or unresolved conflicts. Otherwise classify none.
If client != none, read the matching KB client doc before continuing:
charcoal→/charcoal.mdgit-town→/git-town.mdnative-git→/native-git.md
After classification, use this skill-specific command map:
| Condition | Client | Sync Command | Continue Command | Restack Command | Stack Enumerate |
|---|---|---|---|---|---|
Dedicated client is charcoal |
charcoal |
gt repo sync --no-interactive |
gt continue |
gt stack restack --no-interactive |
gt log short |
Dedicated client is git-town |
git-town |
N/A | git town continue |
git town sync |
git town branch |
No dedicated client, but git status shows active rebase/conflicts |
native-git |
N/A | git rebase --continue |
N/A | N/A |
| No dedicated client and no active rebase/conflicts | none |
N/A | N/A | N/A | N/A |
Sync client state before restacking
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.
- 4d ago First seen · 293 lines · 68 tokens per session scan A 202d6ae59bd0
rebase-fix is a skill published in the GitHub repository wrannaman/agentic-engineering (2 stars, last pushed 4mo ago), licensed MIT. It adds 68 tokens to every session and 2,913 once invoked, about $0.0003 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.
brainstorming
You MUST use this before any creative work - creating features, building components, adding functionality, or modifying behavior. Explores user intent, requirements and design before implementation.
auto-perf-optimize
Run agent-driven VS Code performance or memory investigations. Use when asked to launch Code OSS, automate a VS Code scenario, run the Chat memory smoke runner, capture renderer heap snapshots, take workflow screenshots, compare run summaries, or drive a repeatable scenario before heap-snapshot analysis.
chat-perf
Run chat perf benchmarks and memory leak checks against the local dev build or any published VS Code version. Use when investigating chat rendering regressions, validating perf-sensitive changes to chat UI, or checking for memory leaks in the chat response pipeline.
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…