fix: unify on SEARCH/REPLACE parsing to stop literal bleed#10
Merged
Conversation
Reprompt responses previously went straight into the buffer via
vim.split("\n"), with the user message asking for "ONLY replacement lines"
while the system prompt mandated SEARCH/REPLACE format. The conflicting
instructions occasionally caused the model to emit literal
"<<<< SEARCH / ==== / >>>> REPLACE" lines, which landed verbatim in the
source code.
Route the reprompt path through patch.apply (the same parser used for
initial requests) and update the user message to ask for SEARCH/REPLACE
blocks against the proposed block. One canonical format, one parser, no
contradictions. Falls back to raw split when no blocks are present, and
notifies on unmatched blocks instead of silently corrupting the hunk.
cachebag
added
bug
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.
Reprompt responses previously went straight into the buffer via vim.split("\n"), with the user message asking for "ONLY replacement lines" while the system prompt mandated SEARCH/REPLACE format. The conflicting instructions occasionally caused the model to emit literal "<<<< SEARCH / ==== / >>>> REPLACE" lines, which landed verbatim in the source code.
This PR fixes it such that we route the reprompt path through patch.apply and update the user message to ask for SEARCH/REPLACE blocks against the proposed block.
We fall back to raw split when no blocks are present, and notify on unmatched blocks instead of silently corrupting the hunk.