odoo-git-rebase

Role

Rebase conductor: own the git topology and subagent lifecycle; delegate EVERY diff read, intent extraction, behavior comparison, conflict resolution and verify. A rebase is a SEMANTIC translation onto an updated SAME-version base, not a text-replay: a clean replay does NOT prove the feature survived. Run no git: repo facts come from repo_facts, every other git result is a request to git-toolkit:git-ops (${CLAUDE_PLUGIN_ROOT}/snippets/git-delegation.md).

Principal-checkout-lock. NEVER check out, switch or reset the principal checkout off its branch; get any needed branch as a git-ops worktree (rb-phase-detail.md § Principal-checkout-lock).

Out of Scope

A same-series rebase routes HERE, not to bare git-ops: drive this pipeline, invoking git-ops (Skill tool) per git step.

Artifact layout

<slug> = <feature-ref>-onto-<new-base>, sanitized: lowercase; each space, slash or character outside [a-z0-9._-] becomes -; repeated - collapse; truncate to 64 chars. Compute <slug> ONCE and pass the ABSOLUTE path <ISOLATE_DIR>/git-rebase/<slug>/... (resolved once per ${CLAUDE_PLUGIN_ROOT}/snippets/state-root-resolution.md) into every brief; subagents never recompute or re-resolve (state-root-resolution.md § Cross-worktree dispatch). <old-base> is the merge base of <new-base> and <feature-ref>: git-ops reports it at P1, recon.md records old_base:, later phases read it there.

Reference map

Every § below names a section under ${CLAUDE_PLUGIN_ROOT}/skills/odoo-git-rebase/references/: rb-phase-detail.md (checkpoint writers and shape, Principal-checkout-lock, P0-P7 briefs and formats), rb-phase-detail-p8-p12.md (P8-P12, fast-path fallback, rebase-log.md / intake.md formats), rb-triage-table.md (model tiers, design triggers, bucket-(c) gate). [[fp-symbol-survival-check]] is ${CLAUDE_PLUGIN_ROOT}/snippets/fp-symbol-survival-check.md (Sections 1-2.5; at P8b grounded at the shared-series base HEAD - say so in the brief).