Skip to content

Conversation

@daniel-lxs
Copy link
Member

@daniel-lxs daniel-lxs commented Jun 13, 2025

This PR fixes several issues with multi-file diff error handling:

  • Fixed nested array structure: Resolved issue where failed diff parts were creating nested arrays, causing error handling to malfunction
  • Consolidated error reporting: All diff errors are now collected and reported in a single message instead of multiple separate calls
  • Fixed infinite spinner: Single file diff failures now properly update the UI to stop the loading spinner

Resolves #4664


Important

Fixes error handling and UI feedback for multi-file diffs, addressing nested arrays, consolidated error reporting, and UI spinner issues.

  • Error Handling:
    • Fix nested array issue in applyDiff() in multi-file-search-replace.ts by flattening failParts.
    • Consolidate error reporting in applyDiffTool() in multiApplyDiffTool.ts by collecting all errors in allDiffErrors.
  • UI Feedback:
    • Resolve infinite spinner issue in applyDiffTool() in multiApplyDiffTool.ts by sending a complete message for single file operations.
  • Misc:
    • Remove unnecessary line in multiApplyDiffTool.ts for cleaner code.

This description was created by Ellipsis for f8bd001. You can customize this summary. It will automatically update as commits are pushed.

- Fix nested array issue in multi-file-search-replace strategy
- Consolidate diff error reporting to single message
- Fix infinite spinner on single file diff failures
@daniel-lxs daniel-lxs requested review from cte, jr and mrubens as code owners June 13, 2025 23:57
@dosubot dosubot bot added size:S This PR changes 10-29 lines, ignoring generated files. bug Something isn't working UI/UX UI/UX related or focused labels Jun 13, 2025
@hannesrudolph hannesrudolph added the Issue/PR - Triage New issue. Needs quick review to confirm validity and assign labels. label Jun 14, 2025
@daniel-lxs daniel-lxs moved this from Triage to PR [Needs Review] in Roo Code Roadmap Jun 14, 2025
@dosubot dosubot bot added the lgtm This PR has been approved by a maintainer label Jun 14, 2025
@mrubens mrubens merged commit feb2fa8 into main Jun 14, 2025
27 checks passed
@github-project-automation github-project-automation bot moved this from PR [Needs Review] to Done in Roo Code Roadmap Jun 14, 2025
@github-project-automation github-project-automation bot moved this from New to Done in Roo Code Roadmap Jun 14, 2025
@mrubens mrubens deleted the fix/multi-file-diff-error-handling branch June 14, 2025 00:09
cte pushed a commit that referenced this pull request Jun 24, 2025
fix: improve multi-file diff error handling and UI feedback

- Fix nested array issue in multi-file-search-replace strategy
- Consolidate diff error reporting to single message
- Fix infinite spinner on single file diff failures
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

bug Something isn't working Issue/PR - Triage New issue. Needs quick review to confirm validity and assign labels. lgtm This PR has been approved by a maintainer size:S This PR changes 10-29 lines, ignoring generated files. UI/UX UI/UX related or focused

Projects

Archived in project

Development

Successfully merging this pull request may close these issues.

Bug: apply_diff tool returns 'undefined' error message on failure and hangs

4 participants