fix(teardown): recognize content-landed local work - #55
Merged
Merged
Conversation
added 4 commits
July 28, 2026 09:37
Add the conservative zero-context proof for histories that preserve the complete task outcome without preserving ancestry or exact patch identity, and take the branch ref as an argument so the exact-tree proof runs first. When later default-branch edits make that 3-way merge conflict, the fallback accepts only when the task delta cannot still be applied forward and can be applied completely in reverse against the default tree. Dirty and incomplete task content stay refused. Ported from the pure-Kun reconciliation onto the upstream teardown owner.
quinnbot-ai
added a commit
that referenced
this pull request
Aug 10, 2026
* fix(teardown): recognize content-landed local work Add the conservative zero-context proof for histories that preserve the complete task outcome without preserving ancestry or exact patch identity, and take the branch ref as an argument so the exact-tree proof runs first. When later default-branch edits make that 3-way merge conflict, the fallback accepts only when the task delta cannot still be applied forward and can be applied completely in reverse against the default tree. Dirty and incomplete task content stay refused. Ported from the pure-Kun reconciliation onto the upstream teardown owner. * no-mistakes(review): Harden teardown content-landed proof boundaries * no-mistakes(review): Reject relocated teardown content proof hunks * no-mistakes(document): Document hardened teardown content-landed proof --------- Co-authored-by: QuinnBot <quinnbot@proton.me>
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
1 participant
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
Teaches cleanup's landed-work containment to recognize content-landed local work (rebased-then-landed branches), with conservative location-bound reverse matching so incomplete task content remains refused.
Validated end to end by no-mistakes (review incl. three authorized soundness corrections, tests, docs, lint, push green); PR opened manually due to the fork-target token gap.