rebase-resolver

An agent that updates a pull-request branch with the latest `main` branch and resolves routine merge conflicts. A rebase replays the branch's changes on top of newer work; an architectural conflict is one that needs a human design decision.

In plain words
What is it for?
For rebasing pull requests, fixing routine test or formatting conflicts, verifying the result, safely updating the remote branch, and escalating architectural conflicts.
Why use it?
It handles repetitive rebase work while protecting against overwriting someone else's newer remote changes, and sends difficult conflicts to a person.

Agent

Part of the ai-sdlc plugin — 1 skill, 16 commands, 9 agents shipped together

Install

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.

agentmods
npx agentmods add agents/ai-sdlc-framework/ai-sdlc/rebase-resolver
Clone the repo
git clone --depth 1 https://github.com/ai-sdlc-framework/ai-sdlc

Or install ai-sdlc, the plugin that ships this one along with the rest of its 1 skill, 16 commands, 9 agents.

Per session 69 Only the description is in the session, so the agent can decide to use it. The body loads when it is invoked.
When invoked 3,445 The whole file, excluding the scripts and references it only reads on demand.
Security scan A 0 findings. Scan, not verified.
Origin original No closer match found in the catalogue.
Token cost

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.

ModelPer sessionOnce invoked
Fable 5 $0.00069 $0.03445
Opus 5 $0.00034 $0.01723
Sonnet 5 $0.00014 $0.00689
Haiku 4.5 $0.00007 $0.00345

Measured 3d ago against content hash 3154cf985d47, method: parsed. Prices are Anthropic first-party input rates as of 2026-08-30, from the pricing page.

Security

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 3d 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.

ai-sdlc-plugin/agents/rebase-resolver.md · 308 lines

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)

  1. Never merge a PR. No gh pr merge.
  2. Force-push uses --force-with-lease ONLY. Plain git push --force / -f is forbidden — --force-with-lease refuses if the remote moved under us, which preserves a co-pusher's work.
  3. Never push to main or master. Refuse early in the run if the current branch resolves to either name. The agent-role.yaml block list already forbids git push --force*; this is the same rule extended to --force-with-lease because the harm model is identical at the branch tip we never own.
  4. Never close PRs or issues. No gh pr close, gh issue close.
  5. Never delete branches. No git branch -D / -d.
  6. Never edit .ai-sdlc/** or .github/workflows/**. PreToolUse hook blocks anyway, but you must not even try.
  7. Never run destructive git operations outside the rebase flow itself. No git reset --hard <ref>, no git checkout -- ., no git restore . on the working tree. git rebase --abort is allowed (it restores the pre-rebase HEAD cleanly).
  8. Never write GitHub Actions CI-skip magic tokens. The five literal substrings ([skip ci], [ci skip], [no ci], [skip actions], [actions skip]) silently disable workflows. Do not introduce them into commit messages during conflict resolution. (AISDLC-88.)

Read the full file on GitHub · 308 lines

Changes

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.

  1. 3d ago First seen · 308 lines · 69 tokens per session scan A 3154cf985d47

Subscribe to this mod's changes

rebase-resolver is an agent published in the GitHub repository ai-sdlc-framework/ai-sdlc (92 stars, last pushed 9d ago), licensed Apache-2.0. It adds 69 tokens to every session and 3,445 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-30.

Related

Other agents, from other repositories

kg-assistant

General-purpose KG-aware assistant for any Semantica task. Knows all module APIs, exact method signatures, node-type conventions, and current graph schema. Use for broad questions, multi-module workflows, code review, or any task spanning multiple Semantica modules.

semantica-agi/semantica · 57 tokens

designer

Visual designer, UX/UI agent, and Open Design handoff producer.

jcarlosrodicio/opencode-agent-orchestration-kit · 14 tokens

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…

stacklok/toolhive-registry-server · 228 tokens

gemini-expression

DISCLAIMER: This document is managed exclusively by Gemini. The repository admin (AndrewAltimit) does not manage this file and is not allowed to directly edit it. Any updates must come from Gemini through code review sessions or collaborative agent interactions.

AndrewAltimit/template-repo · 0 tokens

claude-auth

The AI agents (issue monitor and PR review monitor) run directly on the host machine instead of in Docker containers. This is a deliberate design choice due to Claude CLI authentication limitations.

AndrewAltimit/template-repo · 0 tokens

auto-review

The Auto Review pipeline allows AI agents to analyze and comment on GitHub issues and pull requests without making any code changes.

AndrewAltimit/template-repo · 0 tokens