Fix: Restore diff count indicators after apply_diff operations #9306
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
- Add final tool messages with diffStats after successful single file operations - Add final tool messages with diffStats after successful batch operations - Ensures UI updates with change counters (+added -removed) after edits complete - Fixes issue where diff stats were shown during approval but disappeared after completion Fixes #9305
dosubot
bot
added
size:S
Contributor
Author
Review complete. Found 1 issue that needs attention:
Mention @roomote in a comment to request specific changes to this pull request or fix all unresolved issues. |
![roomote[bot]](https://avatars.githubusercontent.com/in/1546624?s=60&v=4){kind=small}
Comment on lines
+700
to
+710
| // Send final tool message with diff stats for batch operations | ||
| const diffContents = diffItems.map((item) => item.content).join("\n\n") | ||
| const unifiedPatchRaw = formatResponse.createPrettyPatch(relPath, beforeContent!, originalContent!) | ||
| const unifiedPatch = sanitizeUnifiedDiff(unifiedPatchRaw) | ||
| const finalMessage = JSON.stringify({ | ||
| ...sharedMessageProps, | ||
| diff: diffContents, | ||
| content: unifiedPatch, | ||
| diffStats: computeDiffStats(unifiedPatch) || undefined, | ||
| } satisfies ClineSayTool) | ||
| await cline.ask("tool", finalMessage, false).catch(() => {}) |
Contributor
Author
There was a problem hiding this comment.
This final message will be sent for EACH file in a batch operation (once per loop iteration), rather than once after all batch files are processed. For a batch of 3 files, this creates 3 separate final messages with individual file stats instead of one consolidated message. The final message should be moved outside the for (const opResult of operationResults) loop (after line 742) to only send once per batch.
Fix it with Roo Code or mention @roomote and request a fix.
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.
This PR attempts to address Issue #9305. Feedback and guidance are welcome.
Problem
After the UI redesign, the change count indicators (e.g., "+3 -2") that appeared during apply_diff operations disappeared after the changes were applied. Users could no longer see how many changes were successfully made.
Solution
diffStatsafter successful single file operationsdiffStatsafter successful batch operationsChanges
src/core/tools/MultiApplyDiffTool.tsto send a finalask("tool", ...)message with computed diff stats after successful apply_diff operationsTesting
Fixes #9305
Important
Restores diff count indicators in the UI after
apply_diffoperations by sending final messages withdiffStats.apply_diffoperations.ask("tool", ...)message withdiffStatsafter successful single and batch file operations inMultiApplyDiffTool.ts.apply_diffoperations.This description was created by
for a728a23. You can customize this summary. It will automatically update as commits are pushed.