Skip to content

Conversation

@mrubens
Copy link
Collaborator

@mrubens mrubens commented Mar 5, 2025

Context

As a quick follow to #1234, this adds a dropdown to settings to choose your diff strategy.

Implementation

This reuses the experimental booleans, so a little hacky. I think probably best for now, and if this multi-diff works well maybe we just go to it for everyone and remove the option.

Screenshots

Screenshot 2025-03-05 at 1 00 11 PM


Important

Adds a dropdown in AdvancedSettings.tsx for selecting diff strategies and updates ExperimentalSettings.tsx to exclude certain experiments.

  • Behavior:
    • Adds a dropdown in AdvancedSettings.tsx for selecting diff strategies: standard, unified, and multiBlock.
    • Resets experimental strategies when diffs are disabled.
  • Experimental Settings:
    • Updates ExperimentalSettings.tsx to exclude DIFF_STRATEGY and MULTI_SEARCH_AND_REPLACE from the experimental features list.
  • Misc:
    • Removes ExperimentalFeature related to DIFF_STRATEGY in AdvancedSettings.tsx.

This description was created by Ellipsis for 57cf961. It will automatically update as commits are pushed.

@mrubens mrubens requested a review from cte as a code owner March 5, 2025 18:03
@changeset-bot
Copy link

changeset-bot bot commented Mar 5, 2025

⚠️ No Changeset found

Latest commit: 57cf961

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

@dosubot dosubot bot added the size:M This PR changes 30-99 lines, ignoring generated files. label Mar 5, 2025
@mrubens
Copy link
Collaborator Author

mrubens commented Mar 5, 2025

cc: @qdaxb @KJ7LNW

@dosubot dosubot bot added the enhancement New feature or request label Mar 5, 2025
@mrubens mrubens merged commit e6f4764 into main Mar 5, 2025
11 checks passed
@mrubens mrubens deleted the diff_chooser branch March 5, 2025 18:59
ipattis pushed a commit to ipattis/roo-code that referenced this pull request Mar 15, 2025
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

enhancement New feature or request size:M This PR changes 30-99 lines, ignoring generated files.

Projects

None yet

Development

Successfully merging this pull request may close these issues.

2 participants