Rebase One PR
Start only through
,
, the host skill picker, or an exact
from an active
.
Do not auto-apply to a generic branch
, simple
, or review response.
Own the exact
,
,
, and bounded
for one PR.
Do not perform
,
,
,
, or unrelated feedback implementation.
standalone rebase/publication approval이 필요하면 host별 native structured question surface를 우선 사용합니다 (Claude Code: AskUserQuestion; Codex: request_user_input; Hermes: clarify). unavailable하면 같은 approval packet을 plain chat으로 fallback하고 parent-approved exact route는 다시 묻지 않습니다.
Fresh identity
Local rebase must start in a newly created dedicated worktree. If it cannot be created or proven fresh, return
before mutation.
Fresh-read the following at the start.
- repository and authenticated identity
- open PR number
- head repository/ref/SHA
- base repository/ref/SHA
- local branch/HEAD/worktree
- active Git operation
- review/thread/check state
If identity/ownership is ambiguous or the fork publication boundary cannot be proven safe, return
before mutation.
Fetch the exact remote head and latest base, then freeze the following.
text
old_head
base_sha
full head ref
remote
expected force-with-lease
Require local
, remote PR head
, and a clean worktree.
Rebase and conflict
Rebase onto the exact
.
If a conflict occurs, apply the intent/index/marker/verification contract from
.
Do not choose arbitrarily when semantic ambiguity exists.
After the rebase, verify the following.
- Git operation completed
- worktree/index clean
- is an ancestor of the new HEAD
- intended commit/diff preserved
- relevant tests/checks pass
Do not force-push if no rewrite is needed.
Standalone publication
An explicit standalone invocation automatically authorizes only the local rebase.
Before remote publication, record the exact PR/base/head, old/new SHA,
verification, exact lease/refspec, reply/thread action, and exclusions in
, then reread it.
🔴 CHECKPOINT · 🛑 STOP · Standalone publication boundary
Do not tell the user merely to read the entire ledger. Naturally summarize what changed, what was verified,
and which exact publication will be performed, then obtain one current-turn approval.
STOP immediately before the remote write if repository/identity/open state/base/head/refspec/lease cannot be rechecked
or if any material drift invalidates the approval.
Only exact
--force-with-lease=<full-head-ref>:<old_head>
is allowed for publication.
Plain
is prohibited.
Execution under Sweep
If an active
has already approved the exact repository/PR/base/head and rebase route, do not repeat the publication question.
The Sweep handoff must include a newly created dedicated worktree path. If it is missing or not fresh, return
before mutation. Run the child from that worktree; never switch the parent
or
checkout to the PR branch.
A Sweep child must not create
or
.
Return only the following compact evidence to the parent.
- repository/PR
- consumed /
- verified
- tests/checks
- exact lease/refspec
- remaining conflict/finding
- status
Recheck the exact PR/base/head immediately before child execution.
If the head/base changed materially after parent approval, return only that PR to the parent as
.
After publication
Verify that the remote PR head is
.
Reply to or resolve only review threads actually satisfied by the rebase.
Fresh-read every thread/review/check and do not hide unresolved findings as complete.
If needed, re-request review from an existing human reviewer, excluding the author, authenticated user, bots, and still-valid approvers.
End generated GitHub comments with
.
Status
| 상태 | 의미 |
|---|
| exact rebase와 필요한 publication이 fresh evidence로 확인됨 |
| standalone publication 승인을 기다림 |
| identity, authority, semantic conflict, freshness가 안전하게 닫히지 않음 |
| 필요한 Git/GitHub evidence를 읽을 수 없음 |
| 일부 local/remote operation이 실패했고 적용 상태를 정확히 보고해야 함 |
Do not claim success for any reply/resolve/review/check state that was not observed.