fix: reduce redundant context in apply_diff error messages #5797
+2
−28
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.
This PR addresses issue #5795 by reducing redundant and verbose context in apply_diff error messages.
Changes Made
Problem Solved
When apply_diff fails to find a match, it previously returned an excessively verbose error message that included:
This created unnecessary noise in conversation history and wasted valuable context window space.
Solution
The error message now only includes the most relevant information for debugging:
Testing
The model already has the search content it just sent, so repeating it provides no value. The large original content section forced the model to re-process irrelevant code. The "Best Match" section is the key piece of information that helps the model understand exactly what diverged and correct its next attempt.
Fixes #5795
Important
Reduces verbosity in
apply_diff
error messages by removing redundant sections and retaining essential debugging information inmulti-file-search-replace.ts
andmulti-search-replace.ts
.multi-file-search-replace.ts
andmulti-search-replace.ts
.read_file
.multi-file-search-replace.ts
: Adjusted error message construction inapplyDiff()
.multi-search-replace.ts
: Adjusted error message construction inapplyDiff()
.This description was created by
for f3d0f4e. You can customize this summary. It will automatically update as commits are pushed.