fix: accept identical diffs as no-op instead of error #7184
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
- Modified multi-search-replace.ts and multi-file-search-replace.ts to treat identical search/replace content as successful no-op operations - Added comprehensive tests for the new behavior - Fixes #7183 where Gemini and other AI providers sometimes generate identical diffs
dosubot
bot
added
size:L
![roomote[bot]](https://avatars.githubusercontent.com/in/1546624?s=60&v=4){kind=small}
| // This is a no-op diff, skip it without error | ||
| // Some AI providers (like Gemini) sometimes generate identical diffs | ||
| // We treat these as successful no-ops rather than errors | ||
| appliedCount++ // Count it as applied since it's intentionally a no-op |
Contributor
Author
There was a problem hiding this comment.
Consider adding telemetry here to track how often identical diffs occur. This data could help us understand AI provider behavior patterns and potentially improve the user experience further.
| // This is a no-op diff, skip it without error | ||
| // Some AI providers (like Gemini) sometimes generate identical diffs | ||
| // We treat these as successful no-ops rather than errors | ||
| appliedCount++ // Count it as applied since it's intentionally a no-op |
Contributor
Author
There was a problem hiding this comment.
Same telemetry suggestion applies here for consistency. Also, could we add debug-level logging when skipping identical diffs? It might help with troubleshooting without affecting production performance.
| // Content should remain unchanged | ||
| expect(result.content).toBe(originalContent) | ||
| } | ||
| }) |
Contributor
Author
There was a problem hiding this comment.
The test coverage is comprehensive, but consider adding an explicit test that verifies the is correctly incremented for no-op diffs. This would ensure we're properly counting them as successful operations rather than just skipping them.
hannesrudolph
added
the
Issue/PR - Triage
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.
Fixes #7183
Summary
This PR modifies the diff application logic to treat identical search and replace content as successful no-op operations instead of throwing errors. This addresses the issue where AI providers like Gemini sometimes generate identical diffs.
Changes
multi-search-replace.tsto skip identical diffs silently and count them as successful no-opsmulti-file-search-replace.tswith the same logic for consistencyidentical-diff.spec.tsTesting
Impact
This change makes Roo Code more tolerant of AI-generated diffs, improving the user experience when working with providers that occasionally produce identical search/replace blocks.
Important
Identical diffs are now treated as no-ops in
multi-search-replace.tsandmulti-file-search-replace.ts, with tests added inidentical-diff.spec.ts.multi-search-replace.tsandmulti-file-search-replace.tsnow treat identical search and replace content as successful no-ops, incrementingappliedCountwithout error.identical-diff.spec.tscover scenarios with identical diffs, including single and multiple diff cases.This description was created by
for 8a86af0. You can customize this summary. It will automatically update as commits are pushed.