upstream-rebase

Files (1)

• SKILL.md

SKILL.md (first lines)

# Upstream Rebase

## Bind The Action

1. Read the active Gate, accepted upstream lock, patch manifest, dependency decisions, and allowed write scope.
2. Record the upstream URL, ref, commit, tree hash, toolchain, patch-base identity, and patch SHA256.
3. Stop if any identity is unknown, the target tree drifted, a prerequisite is unaccepted, or more than one patch is bound.

## Rebase One Patch

1. Preserve the pre-existing worktree state and establish the Gate's rollback point.
2. Run the Gate-approved clean-apply check before changing the target.
3. Apply only the named patch in the accepted order.
4. For each conflict, compare patch intent with current upstream semantics. Preserve upstream behavior when the plugin is inactive and confine adaptations to the plugin's accepted boundary.
5. Record every adapted hunk and unresolved ambiguity. Measure or request a Decision instead of guessing ownership.
6. Run the smallest Gate-required build, tests, inactive-path checks, and patch/rollback checks against the same source and toolchain identity.

## Return Contract

Return:

- upstream and patch identity tuples
- preflight and apply commands with exit codes
- conflict ledger with semantic owner and resolution
- changed paths and preserved upstream behavior
- build, test, inactive-path, and rollback observations
- unresolved blockers and one exact review action

## Forbidden Decisions

- Do not select, refresh, or relock the upstream target.
- Do not reorder patches or invent dependency edges.
- Do not widen plugin scope or absorb unrelated upstream cleanup.
- Do not classify an environment failure as patch success or failure.
- Do not declare Gate or Phase PASS, update `CURRENT_PLAN`, or authorize the next patch.

From linjuhon/codex-personal-skills, MIT.

More from linjuhon/codex-personal-skills