Skip to content

Conversation

@mrubens
Copy link
Collaborator

@mrubens mrubens commented Jun 2, 2025

Reverts #4211

Should be able to bring this back now with the test fix included in #4210 (thanks @taylorwilsdon!)


Important

Reintroduces changes to handle user edits and file operations more effectively by updating DiffViewProvider and related tools.

  • Behavior:
    • Reintroduces changes to prevent dumping entire file content on user edit.
    • Updates applyDiffTool, insertContentTool, searchAndReplaceTool, and writeToFileTool to use DiffViewProvider.pushToolWriteResult() for handling user edits and generating XML responses.
  • DiffViewProvider:
    • Adds pushToolWriteResult() to format XML responses for file operations.
    • Stores newProblemsMessage and userEdits for use in response formatting.
    • Updates saveChanges() to track user edits and new problems.
  • Misc:
    • Removes addLineNumbers import from applyDiffTool.ts and writeToFileTool.ts.

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

@mrubens mrubens requested a review from cte as a code owner June 2, 2025 01:55
@dosubot dosubot bot added the size:L This PR changes 100-499 lines, ignoring generated files. label Jun 2, 2025
await task.say("user_feedback_diff", JSON.stringify(say))
}

// Build XML response
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

The new pushToolWriteResult method standardizes XML response generation for file write operations. Consider wrapping the XML builder call in a try/catch block so that any unexpected formatting errors can be caught and logged without crashing the process.

@mrubens mrubens merged commit 0f00982 into main Jun 2, 2025
13 of 14 checks passed
@mrubens mrubens deleted the revert-4211-revert-3654-format-file-write-response branch June 2, 2025 02:05
@github-project-automation github-project-automation bot moved this from New to Done in Roo Code Roadmap Jun 2, 2025
@github-project-automation github-project-automation bot moved this from Triage to Done in Roo Code Roadmap Jun 2, 2025
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

size:L This PR changes 100-499 lines, ignoring generated files.

Projects

Archived in project

Development

Successfully merging this pull request may close these issues.

2 participants