fix: fail closed on divergent human same-source unify - #52
Merged
Conversation
This was referenced Sep 3, 2026
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
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.
First KISS Prevention slice for #46 after Recovery convergence in #51.
What changes
unifynow checks the already-captured current TM before-image.human + reviewed + formalrow with a translation different from the proposed unified value, the entire unify request is rejected before any TM write.unifyand the server-derived one-click plurality/majority bulk path because both converge on the samecommit(..., action="unify")call.commitremains unchanged.KISS boundaries
Deliberately not added in this slice:
intentional_variantpersistence yet;The safe operator behavior for now is simple: when a divergent human finalization exists, bulk consolidation is no longer a convenience action; review that context explicitly.
Regression coverage
Refs #46