Clean up the way we compute the current diff strategy

[cte]

Context

While working with configuring Roo Code's diff strategy for evals runs I kept getting confused about how we determine the current diff strategy. I kind of expected a single settings key (like diffStrategy) typed as a string literal union (like "unified" | "multi_search_and_replace" | "search_and_replace" | ...).

In reality we have to check multiple flags that are not mutually exclusive and the order in which we check matters.

For now, I consolidated this logic to a single place, but in the future we might want to migrate this setting.

Implementation

Screenshots

before	after

How to Test

Get in Touch

---

Important

Consolidates diff strategy logic into a single function, updates related tests and configurations, and renames experiment IDs for clarity.

• Behavior:
  • Consolidates diff strategy logic into getDiffStrategy() in DiffStrategy.ts.
  • Updates updateDiffStrategy() in Cline.ts to use new logic.
  • Adjusts ClineProvider.ts to use consolidated diff strategy logic.
• Experiments:
  • Renames experiment IDs in experiments.ts to DIFF_STRATEGY_UNIFIED, DIFF_STRATEGY_MULTI_SEARCH_AND_REPLACE, and DIFF_STRATEGY_SEARCH_AND_REPLACE.
  • Updates experiment handling in AdvancedSettings.tsx and system.test.ts.
• Tests:
  • Updates Cline.test.ts to reflect new diff strategy logic.
  • Adjusts system.test.ts to use updated experiment IDs.
• Misc:
  • Adds TODO comment in CustomModesManager.ts about async methods in constructor.

^{This description was created by for 81f80d1. It will automatically update as commits are pushed.}

[changeset-bot]

🦋 Changeset detected

Latest commit: 81f80d1

The changes in this PR will be included in the next version bump.

This PR includes changesets to release 1 package

Name	Type
roo-cline	Patch

Not sure what this means? Click here to learn what changesets are.

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

[mrubens]

I do think we should change this to be a single key and default to multidiff. Maybe now is the time?

[cte]

I do think we should change this to be a single key and default to multidiff. Maybe now is the time?

I can take a crack at it.