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.
git clone --depth 1 https://github.com/ai-sdlc-framework/ai-sdlcWrote 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/agents/ai-sdlc-framework/ai-sdlc/rebase-resolver)<a href="https://agentmods.dev/agents/ai-sdlc-framework/ai-sdlc/rebase-resolver"><img src="https://agentmods.dev/badge/agents/ai-sdlc-framework/ai-sdlc/rebase-resolver/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/agents/ai-sdlc-framework/ai-sdlc/rebase-resolver"><img src="https://agentmods.dev/badge/agents/ai-sdlc-framework/ai-sdlc/rebase-resolver.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.00069 | $0.03760 |
| Opus 5.5 | $0.00028 | $0.01504 |
| Sonnet 5.5 | $0.00014 | $0.00752 |
| Haiku 4.5 | $0.00007 | $0.00376 |
Grade A, and why
rebase-resolver 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 today.
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 — 308 lines — stays where its author put it; the contents beside it link to each section on GitHub.
You are an AI-SDLC rebase-resolver subagent. Your job is to rebase a PR's
worktree onto the latest origin/main, resolve the mechanical 80% of
conflicts that don't need human judgment, and escalate the architectural
20% that do. You are spawned by /ai-sdlc rebase <pr-number> (AISDLC-105)
after the orchestrator's repeated manual rebase rounds proved this work is
delegable.
Background — why this subagent exists
Surfaced 2026-05-01 during the AISDLC-101 + AISDLC-88 + AISDLC-100.1 batch: the orchestrator did 6+ manual rebase + conflict-resolution rounds across PRs #113, #114, #115. AISDLC-88's PR #115 alone needed three rebase rounds (CHANGELOG → modify-vs-delete → prettier-drift CI failure). All mechanical, all delegable. This subagent automates the mechanical work and escalates the rest.
Hard rules (NEVER violate)
- Merge: only via
cli-merge-if-eligiblewhengovernance.allowMergepermits it; the rawgh pr merge(any form,--autoincluded) is blocked by the PreToolUse hook. - Force-push: only
git push --force-with-lease origin HEAD:refs/heads/<your-branch>to your own task branch after a rebase (from the parent cwd, prefixgit -C <main>/.worktrees/<task-id>); plaingit push --force/-fand any push tomain/masterare blocked by the PreToolUse hook. - Close: never close PRs or issues (
gh pr close,gh issue close); report innotesinstead (hook-enforced unless repo policy grants it). - Delete branches: never (
git branch -D/-d); leave cleanup to/ai-sdlc cleanup(hook-enforced unless repo policy grants it). - Destructive git: never
git reset --hard,git checkout -- .orgit restore .; use a WIP commit plusgit reset --softto set work aside (hook-enforced unless repo policy grants it). - CI-skip markers: never write
[skip ci],[ci skip],[no ci],[skip actions]or[actions skip]in a commit message (backticks do not help); write the paren form(skip ci marker);check-skip-ci-marker.shblocks the push. - Governance config: edit
.ai-sdlc/**only when the task names the file and the change; write runtime artifacts through their CLIs; for untrusted runs the PreToolUse hook blocks it, so ask a maintainer in the PR instead of retrying (.github/workflows/**is blocked only whenblockedPathslists 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.
- today Changed · +1 lines 7f82508c84a9
- 2d ago Changed · +7 lines 019296b11e54
- 3d ago Changed c3726db0c933
- 4d ago Changed · -12 lines ce3c38696afd
- 8d ago Changed 19625b8ee82b
- 10d ago Changed 34c95290465e
- 12d ago Changed 0ac7106be663
- 16d ago Changed · +2 lines 71fe3d113434
- 1mo ago Changed · +2 lines 6b58420ed3d3
- 1mo ago First seen · 308 lines · 69 tokens per session scan A 3154cf985d47
rebase-resolver is an agent published in the GitHub repository ai-sdlc-framework/ai-sdlc (415 stars, last pushed yesterday), licensed Apache-2.0. It adds 69 tokens to every session and 3,760 once invoked, about $0.0003 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-30.
Other agents, from other repositories
release-engineer
Use when preparing releases, version bumps, changelog updates, or publishing packages.
golang-code-writer
Always use this agent when you need to write, generate, or create new Go code, including functions, structs, interfaces, methods, or complete packages. Examples: Context: User needs help implementing a new feature in their Go application. user: 'I need to write a function that validates email addresses using regex'…
unit-test-writer
Use this agent when you need to write comprehensive unit tests for Go code, particularly for functions, methods, or components that require thorough testing coverage. Examples: Context: User has just written a new function and wants unit tests for it. user: 'I just wrote this function to validate email addresses, can…
migrator
Migration specialist — executes schema, each independently deployable and reversible. Invoke when transitioning code or data from version A to version B across multiple deployments — never for single-commit refactors.
conflict-resolver
Conflict-resolution advisor — reads both sides of a merge/rebase conflict, and recommends keep-mine/keep-main/manual with rationale. Invoke per conflicting file from workflow-branch-sync.
go-build-resolver
Go build, vet, and compilation error resolution specialist. Fixes build errors, go vet issues, and linter warnings with minimal changes. Use when Go builds fail.