fix(opencode): reject stale patch sources after approval - #47956
Open
gary23w wants to merge 1 commit into
Open
Conversation
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.
Issue for this PR
Fixes #31776. This remains reproducible on
devatd6855b6; the previously cited #31893 closed unmerged and did not changeapply_patch.ts.Type of change
What does this PR do?
If a source file changes while patch approval is pending,
apply_patchcurrently overwrites or deletes the newer content. It now retains the original bytes and rechecks every update/delete/move source after approval, before applying any file changes. A mismatch or missing source rejects the patch with a path and retry guidance.This adapts nl-veil's validate-all-before-mutation principle. Commit remains sequential; this does not add rollback or eliminate races after preflight.
How did you verify your code works?
On Windows with Bun 1.3.14:
packages/opencode:bun test --timeout 30000 test/tool/apply_patch.test.ts test/tool/edit.test.ts test/tool/write.test.ts— 78 passed.bun typecheckpasses; Prettier passes. Changed-file lint has zero errors and four existing warnings.Screenshots / recordings
Not applicable; no UI changes.
Checklist