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/compozy/kb/git-rebasenpx skills add compozy/kb --skill git-rebasegit clone --depth 1 https://github.com/compozy/kbWhat 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.00033 | $0.00520 |
| Opus 5 | $0.00016 | $0.00260 |
| Sonnet 5 | $0.00007 | $0.00104 |
| Haiku 4.5 | $0.00003 | $0.00052 |
Grade A, and why
git-rebase 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.
How it starts
The opening of the file, as written. The whole thing — 59 lines — stays where its author put it; the contents beside it link to each section on GitHub.
Git Rebase Conflict Resolution
Use this skill when Compozy asks you to resolve conflicts in an integration worktree. The goal is a clean merge result, not a clever shortcut.
Core Rules
- Understand every conflicted hunk before editing it.
- Preserve important behavior from both sides whenever possible.
- Prefer the smallest readable merge that keeps the code idiomatic for the affected language and project.
- Do not delete tests, weaken assertions, suppress lint, swallow errors, or otherwise hide a failing invariant.
- Do not commit. Compozy owns the final squash commit.
- Do not leave conflict markers in any file.
- If a conflict is unsafe or unclear, leave it unresolved so Compozy can abort and roll back honestly.
Required Workflow
- Inspect the conflicted files listed in the prompt.
- For each hunk, identify what the integration branch changed and what the incoming task changed.
- Edit the file so both sides' required behavior is represented.
- Run only language-specific formatting commands that are clearly required for the files you edited and are safe for this repository.
- Stage resolved files with
git add. - Check
git status --porcelain; no unmerged entries may remain. - Report what was resolved and any files that remain unsafe.
Resolution Guidance
- For Go files, keep error wrapping with
fmt.Errorf("context: %w", err). - For Go files, preserve
context.Contextpropagation and cancellation behavior. - Preserve synchronization ownership; do not introduce unmanaged background work.
- Keep tests focused on behavior and invariants, not implementation details.
- When both sides add cases to a table test, combine the cases unless they prove the same invariant twice.
- When both sides alter an interface, update every implementation instead of guessing from the conflicted file alone.
Fail-Honestly Criteria
Stop and leave the conflict unresolved when:
- you cannot tell which side owns the invariant,
- resolving would require deleting behavior from either side without evidence,
- conflict markers remain, or
- a binary/generated file conflict cannot be validated safely.
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 · 59 lines · 33 tokens per session scan A 6eeb7540ca0e
git-rebase is a skill published in the GitHub repository compozy/kb (101 stars, last pushed 12d ago), licensed MIT. It adds 33 tokens to every session and 520 once invoked, about $0.0002 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-30.
Other skills, from other repositories
systematic-debugging
Use when encountering any bug, test failure, or unexpected behavior, before proposing fixes.
next-cache-components-adoption
Turn on Cache Components in a Next.js app and resolve the blocking routes it surfaces. Use when the user wants to enable, adopt, or migrate to Cache Components, flip the cacheComponents flag, work through a flood of blocking-prerender / instant validation errors, run the cache-components-instant-false codemod, or…
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…
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…
next-cache-components-optimizer
Drive a Next.js route to instant navigation by setting up an agentic loop, under Cache Components / PPR, on initial load (hard navigation) and client-side navigation (soft navigation). Encode the goal as a failing @next/playwright instant() e2e and work it to green, one verified route at a time; the shipped test then…