You signed in with another tab or window. Reload to refresh your session.You signed out in another tab or window. Reload to refresh your session.You switched accounts on another tab or window. Reload to refresh your session.Dismiss alert
{{ message }}
Repository navigation
Commit 7f8dad0
Browse filesBrowse the repository at this point in the historyBrowse files
authored and
rsi-pr-agent
committed
fix(fork-sync): a sync refuses a tip that lost fork hook lines (#1891)
## Problem
A rebase can drop a fork hook's marked lines while typecheck and tests stay green.
The 3748 proof tip lost lines in 36 hook keys; 25 vanished entirely.
Nothing in `fork:sync` or `fork:ci` noticed.
## Change
- **New `hooks` step:** after carry, before check or CI
- **Count:** `fork-hook:` marker lines per key in `apps` and `packages`
- **Refuses:** any key with fewer lines on the tip than the trunk
- **Retire:** `Fork-Hook-Retired: domain/name` trailer on a tip commit
- **Both paths:** session and land run refuse alike
- **Skill and docs:** new row, tip-work rule, step table
## Scope and approval
Found by the fork-sync proof run for #1886.
The human chose a hard gate on lost hooks.
It lives in `fork:sync`, not `fork:ci`: only a sync has a trunk to compare against.
Refs #1886
## Verification
- `fork-sync.test.ts`: names a hook with fewer lines; a retirement trailer clears it (80/80)
- `vp run fork:ci` → exit 0
Claude Opus 5.5 via Claude Code.
## Fork trailers
Fork-Domain: fork-meta
Fork-Tier: bugfix
Fork-Upstreamable: no
Co-authored-by: donjor <[email protected]>
Copy file name to clipboardExpand all lines: docs/fork/operations/fork-sync.md
+3Lines changed: 3 additions & 0 deletions
Display the source diff
Display the rich diff
Original file line number
Diff line number
Diff line change
@@ -21,13 +21,16 @@ Without a named tag it targets a valid [marker](#resolution-marker)'s tag the tr
21
21
It folds each `fixup! <subject>` landing into the one fork commit it names, a squash landing's trailing ` (#N)` included, and refuses a fixup naming none or several.
22
22
It rewords only an owner that absorbs a squash-landed fixup: the fixup's PR link joins its `Squashes:` list, rendered the way fork:fold renders one.
23
23
The rebase refuses a rebased tip that dropped any PR link, except from a commit the target carries: patch-for-patch, or superseded with every path it touched identical to the target.
24
+
Typecheck and tests miss a dropped hook, so the `hooks` step counts marked lines per key; a tip commit's `Fork-Hook-Retired: domain/name` trailer retires a hook the target made obsolete.
0 commit comments