feat: Enhance apply_diff with XML for multi-file/multi-diff operations & batch UI #3342

samhvw8 · 2025-05-08T17:29:48Z

Related GitHub Issue

This pr will fix this issues https://discord.com/channels/1332146336664915968/1367897808249819157

Closes: #2362

Description

Convert to xml tag for all params and support multiple write file

Test Procedure

Type of Change

🐛 Bug Fix: Non-breaking change that fixes an issue.
✨ New Feature: Non-breaking change that adds functionality.
💥 Breaking Change: Fix or feature that would cause existing functionality to not work as expected.
♻️ Refactor: Code change that neither fixes a bug nor adds a feature.
💅 Style: Changes that do not affect the meaning of the code (white-space, formatting, etc.).
📚 Documentation: Updates to documentation files.
⚙️ Build/CI: Changes to the build process or CI configuration.
🧹 Chore: Other changes that don't modify src or test files.

Pre-Submission Checklist

Screenshots / Videos

Documentation Updates

Additional Notes

Important

Enhance apply_diff with XML support for multi-file/multi-diff operations and introduce batch UI for improved user interaction.

Behavior:
- apply_diff function now supports XML for multi-file/multi-diff operations in multiApplyDiffTool.ts.
- Batch UI for multi-file operations added in BatchDiffApproval.tsx.
- Legacy applyDiffTool renamed to applyDiffToolLegacy.
Experiments:
- New experiment MULTI_FILE_APPLY_DIFF added to experiments.ts and related files.
- Dynamic strategy selection based on experiment state in Task.ts and generateSystemPrompt.ts.
Tests:
- Added tests for new multi-file diff functionality in applyDiffTool.experiment.spec.ts and Task.test.ts.
UI:
- Added batch diff approval UI component in BatchDiffApproval.tsx.
- Updated i18n files for new batch operation messages.
Misc:
- Minor refactoring and renaming for clarity and consistency.

^{This description was created by}^{for b7e3202. You can customize this summary. It will automatically update as commits are pushed.}

changeset-bot · 2025-05-08T17:29:52Z

⚠️ No Changeset found

Latest commit: 669ba24

Merging this PR will not cause a version bump for any packages. If these changes should not result in a new version, you're good to go. If these changes should result in a version bump, you need to add a changeset.

This PR includes no changesets

When changesets are added to this PR, you'll see the packages that this PR includes changesets for and the associated semver types

Click here to learn what changesets are, and how to add one.

Click here if you're a maintainer who wants to add a changeset to this PR

src/core/diff/strategies/multi-search-replace.ts

src/core/tools/applyDiffTool.ts

samhvw8 · 2025-05-08T17:48:48Z

example of test

roo_task_may-9-2025_12-45-30-am.md

KJ7LNW · 2025-05-08T21:47:20Z

Neat! Can writes be confirmed individually?

samhvw8 · 2025-05-08T23:36:11Z

Neat! Can writes be confirmed individually?

Yes, it confirm in each file ( i group diff into each file )

KJ7LNW · 2025-05-10T21:13:39Z

This 3342 PR is going to conflict heavily with #3055

any ideas on how to prevent that?

samhvw8 · 2025-05-11T04:21:41Z

This 3342 PR is going to conflict heavily with #3055

any ideas on how to prevent that?

i will try make a branch merge conflict for you

- Introduced a new component `BatchDiffApproval` to handle the approval of batch changes across multiple files. - Integrated the `BatchDiffApproval` component into `ChatRow` to display batch diff requests. - Updated experimental settings to include a toggle for multi-file apply diff functionality. - Enhanced localization files to support new strings related to batch changes in multiple languages. - Updated tests to cover the new multi-file apply diff feature.

src/core/webview/__tests__/ClineProvider.test.ts

…Strategy and MultiFileSearchReplaceDiffStrategy

…sfully in tests

daniel-lxs

LGTM

webview-ui/src/i18n/locales/zh-CN/chat.json

src/core/tools/multiApplyDiffTool.ts

Co-authored-by: ellipsis-dev[bot] <65095814+ellipsis-dev[bot]@users.noreply.github.com>

samhvw8 · 2025-06-13T00:33:00Z

@daniel-lxs Thank You So Much <3 <3

…s & batch UI (#3342) * feat: add BatchDiffApproval component for multi-file diff application - Introduced a new component `BatchDiffApproval` to handle the approval of batch changes across multiple files. - Integrated the `BatchDiffApproval` component into `ChatRow` to display batch diff requests. - Updated experimental settings to include a toggle for multi-file apply diff functionality. - Enhanced localization files to support new strings related to batch changes in multiple languages. - Updated tests to cover the new multi-file apply diff feature. * revert this * fix: update applyDiff parameter type to accept string or DiffItem * refactor: keep original file name for apply diff tool * revert this * Update src/core/webview/__tests__/ClineProvider.test.ts * revert this * fix: keep the original path if the experiment is disabled * test: add dynamic strategy selection tests for MultiSearchReplaceDiffStrategy and MultiFileSearchReplaceDiffStrategy * fix: mock applyDiffTool module and ensure legacy tool resolves successfully in tests * remove this * ellipsis suggestion Co-authored-by: ellipsis-dev[bot] <65095814+ellipsis-dev[bot]@users.noreply.github.com> * refactor: mirror concurrent file reads --------- Co-authored-by: Daniel Riccio <[email protected]> Co-authored-by: Daniel <[email protected]> Co-authored-by: ellipsis-dev[bot] <65095814+ellipsis-dev[bot]@users.noreply.github.com>

samhvw8 requested review from cte and mrubens as code owners May 8, 2025 17:29

github-project-automation bot added this to Roo Code Roadmap May 8, 2025

github-project-automation bot moved this to New in Roo Code Roadmap May 8, 2025

dosubot bot added size:XXL This PR changes 1000+ lines, ignoring generated files. bug Something isn't working enhancement New feature or request labels May 8, 2025

ellipsis-dev bot reviewed May 8, 2025

View reviewed changes

src/core/diff/strategies/multi-search-replace.ts Outdated Show resolved Hide resolved

src/core/diff/strategies/multi-search-replace.ts Outdated Show resolved Hide resolved

src/core/tools/applyDiffTool.ts Outdated Show resolved Hide resolved

samhvw8 changed the title ~~feat: enhance multi-search-replace~~ feat: enhance multi-search-replace for apply_diff May 8, 2025

samhvw8 force-pushed the feat/xml-apply-diff branch from 9b489b7 to 9daa8c9 Compare May 8, 2025 17:46

samhvw8 force-pushed the feat/xml-apply-diff branch 2 times, most recently from ba38031 to c764126 Compare May 8, 2025 18:13

samhvw8 mentioned this pull request May 9, 2025

feat(read_file): enhance file reading capabilities with multi-file support and improved parameter handling #2886

Merged

samhvw8 force-pushed the feat/xml-apply-diff branch 3 times, most recently from 8a388c7 to f6a64e1 Compare May 10, 2025 10:52

hannesrudolph moved this from New to PR [Pre Approval Review] in Roo Code Roadmap May 10, 2025

samhvw8 force-pushed the feat/xml-apply-diff branch 2 times, most recently from 036aecc to b4638b6 Compare May 12, 2025 12:44

samhvw8 mentioned this pull request May 12, 2025

------- and ======= diff mark erro。 #3488

Closed

samhvw8 force-pushed the feat/xml-apply-diff branch 4 times, most recently from 32c49f7 to 6292539 Compare May 15, 2025 13:28

samhvw8 force-pushed the feat/xml-apply-diff branch from 462f9a0 to 0572b50 Compare June 9, 2025 16:30

samhvw8 force-pushed the feat/xml-apply-diff branch from 0572b50 to 1c5bd66 Compare June 12, 2025 02:46

daniel-lxs added 4 commits June 12, 2025 08:46

revert this

f05c75b

fix: update applyDiff parameter type to accept string or DiffItem

2557d4a

refactor: keep original file name for apply diff tool

e56b922

revert this

f4ca7e7

daniel-lxs reviewed Jun 12, 2025

View reviewed changes

src/core/webview/__tests__/ClineProvider.test.ts Outdated Show resolved Hide resolved

daniel-lxs and others added 5 commits June 12, 2025 08:59

Update src/core/webview/__tests__/ClineProvider.test.ts

bf9edfa

revert this

56050e8

fix: keep the original path if the experiment is disabled

986b3d2

test: add dynamic strategy selection tests for MultiSearchReplaceDiff…

5eb1ebe

…Strategy and MultiFileSearchReplaceDiffStrategy

fix: mock applyDiffTool module and ensure legacy tool resolves succes…

b7e3202

…sfully in tests

daniel-lxs marked this pull request as ready for review June 12, 2025 15:12

daniel-lxs approved these changes Jun 12, 2025

View reviewed changes

dosubot bot added the lgtm This PR has been approved by a maintainer label Jun 12, 2025

ellipsis-dev bot reviewed Jun 12, 2025

View reviewed changes

webview-ui/src/i18n/locales/zh-CN/chat.json Outdated Show resolved Hide resolved

daniel-lxs reviewed Jun 12, 2025

View reviewed changes

src/core/tools/multiApplyDiffTool.ts Outdated Show resolved Hide resolved

daniel-lxs and others added 2 commits June 12, 2025 10:15

remove this

110f1e8

ellipsis suggestion

8905bf2

Co-authored-by: ellipsis-dev[bot] <65095814+ellipsis-dev[bot]@users.noreply.github.com>

daniel-lxs moved this from PR [Draft / In Progress] to PR [Needs Review] in Roo Code Roadmap Jun 12, 2025

hannesrudolph added PR - Needs Review and removed PR - Draft / In Progress labels Jun 12, 2025

refactor: mirror concurrent file reads

b326ea0

mrubens approved these changes Jun 12, 2025

View reviewed changes

mrubens merged commit 7bed944 into RooCodeInc:main Jun 12, 2025
10 checks passed

github-project-automation bot moved this from PR [Pre Approval Review] to Done in Roo Code Roadmap Jun 12, 2025

github-project-automation bot moved this from PR [Needs Review] to Done in Roo Code Roadmap Jun 12, 2025

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Uh oh!

feat: Enhance apply_diff with XML for multi-file/multi-diff operations & batch UI #3342

feat: Enhance apply_diff with XML for multi-file/multi-diff operations & batch UI #3342

Uh oh!

samhvw8 commented May 8, 2025 •

edited by ellipsis-dev bot

Loading

Uh oh!

changeset-bot bot commented May 8, 2025 •

edited

Loading

Uh oh!

Uh oh!

Uh oh!

Uh oh!

samhvw8 commented May 8, 2025

Uh oh!

KJ7LNW commented May 8, 2025

Uh oh!

samhvw8 commented May 8, 2025

Uh oh!

KJ7LNW commented May 10, 2025

Uh oh!

samhvw8 commented May 11, 2025

Uh oh!

Uh oh!

daniel-lxs left a comment •

edited

Loading

Uh oh!

Uh oh!

Uh oh!

Uh oh!

samhvw8 commented Jun 13, 2025

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

6 participants

feat: Enhance apply_diff with XML for multi-file/multi-diff operations & batch UI #3342

feat: Enhance apply_diff with XML for multi-file/multi-diff operations & batch UI #3342

Uh oh!

Conversation

samhvw8 commented May 8, 2025 • edited by ellipsis-dev bot Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Related GitHub Issue

Description

Test Procedure

Type of Change

Pre-Submission Checklist

Screenshots / Videos

Documentation Updates

Additional Notes

Uh oh!

changeset-bot bot commented May 8, 2025 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

⚠️ No Changeset found

Uh oh!

Uh oh!

Uh oh!

Uh oh!

samhvw8 commented May 8, 2025

Uh oh!

KJ7LNW commented May 8, 2025

Uh oh!

samhvw8 commented May 8, 2025

Uh oh!

KJ7LNW commented May 10, 2025

Uh oh!

samhvw8 commented May 11, 2025

Uh oh!

Uh oh!

daniel-lxs left a comment • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Uh oh!

Uh oh!

Uh oh!

samhvw8 commented Jun 13, 2025

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

6 participants

samhvw8 commented May 8, 2025 •

edited by ellipsis-dev bot

Loading

changeset-bot bot commented May 8, 2025 •

edited

Loading

daniel-lxs left a comment •

edited

Loading