githubnext/chopinPublic

Let's compose rich plans together

Exclude inherited base changes from rebase reviews #425

MergedMaggieAppletonmerged 1 commit intomainfromrefs/pull/425/head
  1. MA

    The [live Worker for #423](https://github.com/githubnext/chopin/actions/runs/37912108684) replayed its commits cleanly, then reported a human blocker because its review diff included 24,874 bytes of changes already merged into main. Those inherited changes exceeded the 10 KB limit and prevented publication before CI repair could start.

    Rebase reviews now compare the proposal with Git's deterministic combination of the captured head and base, matching the approach already used for conflict merges. A clean replay has an empty review; conflict resolutions and additional edits remain in the exact bounded diff. The application still checks replay identities, protected paths, current PR eligibility, head/base drift, and guarded publication. The review limit remains 10 KB.

    Validation: 209 maintenance tests passed, including publication with over 20 KB of inherited protected changes and rejection of the wrong review. `bun run fix`, `bun run ci`, and validated workflow compilation passed. Replaying #423's actual 17 commits in a disposable clone preserved every commit identity and reduced its review from 24,874 bytes to zero.

    After merge, retry #423 so it can publish the replay and proceed to its separate CI repair attempt. The existing browser failures remain; this change removes the erroneous review blocker.

    ![Rebase review excludes inherited base changes while retaining the 10 KB cap and publication guards](https://github.com/user-attachments/assets/3b691178-9cb0-45e7-b76d-b6861e6c58e9)

  2. github-actions[bot]botadded label maintenance:workinglast month on GitHub

  3. <!-- chopin:pr-maintenance:v1 --> **PR maintenance: ready**

    Inspected head: 99d28c6d88afc0b3d9b51cfb60423b948811ad50

    Base head: 7c690cbcfdf23f1e1925f493bd4e10949afcb76d

    [PR readiness runs](https://github.com/githubnext/chopin/actions/workflows/pr-readiness.yml) · [CI run](https://github.com/githubnext/chopin/actions/runs/37916093564) <!-- chopin:pr-maintenance-auth:eyJwYXlsb2FkIjp7InNjaGVtYVZlcnNpb24iOjEsInJlcG9zaXRvcnkiOiJnaXRodWJuZXh0L2Nob3BpbiIsInJldmlzaW9uIjowLCJwcnMiOnsiNDI1Ijp7ImJvZHkiOiI8IS0tIGNob3Bpbjpwci1tYWludGVuYW5jZTp2MSAtLT5cbioqUFIgbWFpbnRlbmFuY2U6IHJlYWR5KipcblxuSW5zcGVjdGVkIGhlYWQ6IDk5ZDI4YzZkODhhZmMwYjNkOWI1MWNmYjYwNDIzYjk0ODgxMWFkNTBcblxuQmFzZSBoZWFkOiA3YzY5MGNiY2ZkZjIzZjFlMTkyNWY0OTNiZDRlMTA5NDlhZmNiNzZkXG5cbltQUiByZWFkaW5lc3MgcnVuc10oaHR0cHM6Ly9naXRodWIuY29tL2dpdGh1Ym5leHQvY2hvcGluL2FjdGlvbnMvd29ya2Zsb3dzL3ByLXJlYWRpbmVzcy55bWwpIMK3IFtDSSBydW5dKGh0dHBzOi8vZ2l0aHViLmNvbS9naXRodWJuZXh0L2Nob3Bpbi9hY3Rpb25zL3J1bnMvMzc5MTYwOTM1NjQpIiwiYmxvY2tlcklkIjpudWxsfX19LCJzaWduYXR1cmUiOiIxOTViMTU2NWE2OThlMGZlNTI0MjA0N2Y1NzBiM2M3Y2VjYTYwMjllZWEwNjRkYWIyY2MxNjdhN2NiMDExYTU3In0= -->

  4. MaggieAppletonhead-ref-force-pushed 99d28c6d88aflast month on GitHub

  5. github-actions[bot]botremoved label maintenance:workinglast month on GitHub

  6. github-actions[bot]botadded label maintenance:readylast month on GitHub

  7. MaggieAppletonmerged 025d98e324f8last month on GitHub

  8. MaggieAppletonclosedlast month on GitHub

  9. MaggieAppletonhead-ref-deletedlast month on GitHub