chore: remove MULTI_FILE_APPLY_DIFF experiment (#10925)

* chore: remove MULTI_FILE_APPLY_DIFF experiment

Remove the 'Enable concurrent file edits' experimental feature that
allowed editing multiple files in a single apply_diff call.

- Remove multiFileApplyDiff from experiment types and config
- Delete MultiFileSearchReplaceDiffStrategy class and tests
- Delete MultiApplyDiffTool wrapper and tests
- Remove experiment-specific code paths in Task.ts, generateSystemPrompt.ts, and presentAssistantMessage.ts
- Remove special handling in ExperimentalSettings.tsx
- Remove translations from all 18 locale files

The existing MultiSearchReplaceDiffStrategy continues to handle
multiple SEARCH/REPLACE blocks within a single file.

* fix: remove unused EXPERIMENT_IDS/experiments import from Task.ts

Addresses review feedback: removes the unused imports from
src/core/task/Task.ts that were left over after removing the
MULTI_FILE_APPLY_DIFF experiment routing code.

packages/types/src/experiment.ts

@@ -7,7 +7,7 @@ import type { Keys, Equals, AssertEqual } from "./type-fu.js"
  */
 
 export const experimentIds = [
-	"multiFileApplyDiff",
+	"powerSteering",
 	"preventFocusDisruption",
 	"imageGeneration",
 	"runSlashCommand",
@@ -24,7 +24,7 @@ export type ExperimentId = z.infer<typeof experimentIdsSchema>
  */
 
 export const experimentsSchema = z.object({
-	multiFileApplyDiff: z.boolean().optional(),
+	powerSteering: z.boolean().optional(),
 	preventFocusDisruption: z.boolean().optional(),
 	imageGeneration: z.boolean().optional(),
 	runSlashCommand: z.boolean().optional(),

src/core/assistant-message/presentAssistantMessage.ts

@@ -10,7 +10,6 @@ import { t } from "../../i18n"
 
 import { defaultModeSlug, getModeBySlug } from "../../shared/modes"
 import type { ToolParamName, ToolResponse, ToolUse, McpToolUse } from "../../shared/tools"
-import { experiments, EXPERIMENT_IDS } from "../../shared/experiments"
 
 import { AskIgnoredError } from "../task/AskIgnoredError"
 import { Task } from "../task/Task"
@@ -19,7 +18,6 @@ import { fetchInstructionsTool } from "../tools/FetchInstructionsTool"
 import { listFilesTool } from "../tools/ListFilesTool"
 import { readFileTool } from "../tools/ReadFileTool"
 import { writeToFileTool } from "../tools/WriteToFileTool"
-import { applyDiffTool } from "../tools/MultiApplyDiffTool"
 import { searchAndReplaceTool } from "../tools/SearchAndReplaceTool"
 import { searchReplaceTool } from "../tools/SearchReplaceTool"
 import { editFileTool } from "../tools/EditFileTool"
@@ -743,32 +741,14 @@ export async function presentAssistantMessage(cline: Task) {
 						pushToolResult,
 					})
 					break
-				case "apply_diff": {
+				case "apply_diff":
 					await checkpointSaveAndMark(cline)
-
-					// Get the provider and state to check experiment settings
-					const provider = cline.providerRef.deref()
-					let isMultiFileApplyDiffEnabled = false
-
-					if (provider) {
-						const state = await provider.getState()
-						isMultiFileApplyDiffEnabled = experiments.isEnabled(
-							state.experiments ?? {},
-							EXPERIMENT_IDS.MULTI_FILE_APPLY_DIFF,
-						)
-					}
-
-					if (isMultiFileApplyDiffEnabled) {
-						await applyDiffTool(cline, block, askApproval, handleError, pushToolResult)
-					} else {
-						await applyDiffToolClass.handle(cline, block as ToolUse<"apply_diff">, {
-							askApproval,
-							handleError,
-							pushToolResult,
-						})
-					}
+					await applyDiffToolClass.handle(cline, block as ToolUse<"apply_diff">, {
+						askApproval,
+						handleError,
+						pushToolResult,
+					})
 					break
-				}
 				case "search_and_replace":
 					await checkpointSaveAndMark(cline)
 					await searchAndReplaceTool.handle(cline, block as ToolUse<"search_and_replace">, {

src/core/diff/strategies/__tests__/multi-file-search-replace-8char.spec.ts

@@ -1,189 +0,0 @@
-import { describe, it, expect } from "vitest"
-import { MultiFileSearchReplaceDiffStrategy } from "../multi-file-search-replace"
-
-describe("MultiFileSearchReplaceDiffStrategy - 8-character marker support", () => {
-	it("should handle 8 '<' characters in SEARCH marker (PR #9456 use case)", async () => {
-		const strategy = new MultiFileSearchReplaceDiffStrategy()
-		const originalContent = "line 1\nline 2\nline 3"
-
-		const diff = `<<<<<<<< SEARCH
-:start_line:1
--------
-line 1
-=======
-modified line 1
->>>>>>>> REPLACE`
-
-		const result = await strategy.applyDiff(originalContent, diff)
-
-		expect(result.success).toBe(true)
-		if (result.success) {
-			expect(result.content).toBe("modified line 1\nline 2\nline 3")
-		}
-	})
-
-	it("should handle 7 '<' characters in SEARCH marker (standard)", async () => {
-		const strategy = new MultiFileSearchReplaceDiffStrategy()
-		const originalContent = "line 1\nline 2\nline 3"
-
-		const diff = `<<<<<<< SEARCH
-:start_line:1
--------
-line 1
-=======
-modified line 1
->>>>>>> REPLACE`
-
-		const result = await strategy.applyDiff(originalContent, diff)
-
-		expect(result.success).toBe(true)
-		if (result.success) {
-			expect(result.content).toBe("modified line 1\nline 2\nline 3")
-		}
-	})
-
-	it("should handle 8 '>' characters in REPLACE marker", async () => {
-		const strategy = new MultiFileSearchReplaceDiffStrategy()
-		const originalContent = "line 1\nline 2\nline 3"
-
-		const diff = `<<<<<<< SEARCH
-:start_line:2
--------
-line 2
-=======
-modified line 2
->>>>>>>> REPLACE`
-
-		const result = await strategy.applyDiff(originalContent, diff)
-
-		expect(result.success).toBe(true)
-		if (result.success) {
-			expect(result.content).toBe("line 1\nmodified line 2\nline 3")
-		}
-	})
-
-	it("should handle optional '<' at end of REPLACE marker", async () => {
-		const strategy = new MultiFileSearchReplaceDiffStrategy()
-		const originalContent = "line 1\nline 2\nline 3"
-
-		const diff = `<<<<<<< SEARCH
-:start_line:3
--------
-line 3
-=======
-modified line 3
->>>>>>> REPLACE<`
-
-		const result = await strategy.applyDiff(originalContent, diff)
-
-		expect(result.success).toBe(true)
-		if (result.success) {
-			expect(result.content).toBe("line 1\nline 2\nmodified line 3")
-		}
-	})
-
-	it("should handle mixed 7 and 8 character markers in same diff", async () => {
-		const strategy = new MultiFileSearchReplaceDiffStrategy()
-		const originalContent = "line 1\nline 2\nline 3"
-
-		const diff = `<<<<<<<< SEARCH
-:start_line:1
--------
-line 1
-=======
-modified line 1
->>>>>>> REPLACE
-
-<<<<<<< SEARCH
-:start_line:3
--------
-line 3
-=======
-modified line 3
->>>>>>>> REPLACE`
-
-		const result = await strategy.applyDiff(originalContent, diff)
-
-		expect(result.success).toBe(true)
-		if (result.success) {
-			expect(result.content).toBe("modified line 1\nline 2\nmodified line 3")
-		}
-	})
-
-	it("should reject markers with too many characters (9+)", async () => {
-		const strategy = new MultiFileSearchReplaceDiffStrategy()
-		const originalContent = "line 1\nline 2\nline 3"
-
-		const diff = `<<<<<<<<< SEARCH
-:start_line:1
--------
-line 1
-=======
-modified line 1
->>>>>>> REPLACE`
-
-		const result = await strategy.applyDiff(originalContent, diff)
-
-		expect(result.success).toBe(false)
-		if (!result.success) {
-			expect(result.error).toContain("Diff block is malformed")
-		}
-	})
-
-	it("should reject markers with too few characters (6-)", async () => {
-		const strategy = new MultiFileSearchReplaceDiffStrategy()
-		const originalContent = "line 1\nline 2\nline 3"
-
-		const diff = `<<<<<< SEARCH
-:start_line:1
--------
-line 1
-=======
-modified line 1
->>>>>>> REPLACE`
-
-		const result = await strategy.applyDiff(originalContent, diff)
-
-		expect(result.success).toBe(false)
-		if (!result.success) {
-			expect(result.error).toContain("Diff block is malformed")
-		}
-	})
-
-	it("should handle validation with 8 character markers", () => {
-		const strategy = new MultiFileSearchReplaceDiffStrategy()
-
-		const diff = `<<<<<<<< SEARCH
-:start_line:1
--------
-content
-=======
-new content
->>>>>>>> REPLACE`
-
-		const result = strategy["validateMarkerSequencing"](diff)
-
-		expect(result.success).toBe(true)
-	})
-
-	it("should detect merge conflict with 8 character prefix", () => {
-		const strategy = new MultiFileSearchReplaceDiffStrategy()
-
-		const diff = `<<<<<<<< SEARCH
-:start_line:1
--------
-content
-<<<<<<<< HEAD
-conflict content
-=======
-new content
->>>>>>>> REPLACE`
-
-		const result = strategy["validateMarkerSequencing"](diff)
-
-		expect(result.success).toBe(false)
-		if (!result.success) {
-			expect(result.error).toContain("merge conflict")
-		}
-	})
-})

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

@@ -1,740 +0,0 @@
-import { distance } from "fastest-levenshtein"
-import { ToolProgressStatus } from "@roo-code/types"
-
-import { addLineNumbers, everyLineHasLineNumbers, stripLineNumbers } from "../../../integrations/misc/extract-text"
-import { ToolUse, DiffStrategy, DiffResult } from "../../../shared/tools"
-import { normalizeString } from "../../../utils/text-normalization"
-
-const BUFFER_LINES = 40 // Number of extra context lines to show before and after matches
-
-function getSimilarity(original: string, search: string): number {
-	// Empty searches are no longer supported
-	if (search === "") {
-		return 0
-	}
-
-	// Use the normalizeString utility to handle smart quotes and other special characters
-	const normalizedOriginal = normalizeString(original)
-	const normalizedSearch = normalizeString(search)
-
-	if (normalizedOriginal === normalizedSearch) {
-		return 1
-	}
-
-	// Calculate Levenshtein distance using fastest-levenshtein's distance function
-	const dist = distance(normalizedOriginal, normalizedSearch)
-
-	// Calculate similarity ratio (0 to 1, where 1 is an exact match)
-	const maxLength = Math.max(normalizedOriginal.length, normalizedSearch.length)
-	return 1 - dist / maxLength
-}
-
-/**
- * Performs a "middle-out" search of `lines` (between [startIndex, endIndex]) to find
- * the slice that is most similar to `searchChunk`. Returns the best score, index, and matched text.
- */
-function fuzzySearch(lines: string[], searchChunk: string, startIndex: number, endIndex: number) {
-	let bestScore = 0
-	let bestMatchIndex = -1
-	let bestMatchContent = ""
-
-	const searchLen = searchChunk.split(/\r?\n/).length
-
-	// Middle-out from the midpoint
-	const midPoint = Math.floor((startIndex + endIndex) / 2)
-	let leftIndex = midPoint
-	let rightIndex = midPoint + 1
-
-	while (leftIndex >= startIndex || rightIndex <= endIndex - searchLen) {
-		if (leftIndex >= startIndex) {
-			const originalChunk = lines.slice(leftIndex, leftIndex + searchLen).join("\n")
-			const similarity = getSimilarity(originalChunk, searchChunk)
-
-			if (similarity > bestScore) {
-				bestScore = similarity
-				bestMatchIndex = leftIndex
-				bestMatchContent = originalChunk
-			}
-			leftIndex--
-		}
-
-		if (rightIndex <= endIndex - searchLen) {
-			const originalChunk = lines.slice(rightIndex, rightIndex + searchLen).join("\n")
-			const similarity = getSimilarity(originalChunk, searchChunk)
-
-			if (similarity > bestScore) {
-				bestScore = similarity
-				bestMatchIndex = rightIndex
-				bestMatchContent = originalChunk
-			}
-			rightIndex++
-		}
-	}
-
-	return { bestScore, bestMatchIndex, bestMatchContent }
-}
-
-export class MultiFileSearchReplaceDiffStrategy implements DiffStrategy {
-	private fuzzyThreshold: number
-	private bufferLines: number
-
-	getName(): string {
-		return "MultiFileSearchReplace"
-	}
-
-	constructor(fuzzyThreshold?: number, bufferLines?: number) {
-		// Use provided threshold or default to exact matching (1.0)
-		// Note: fuzzyThreshold is inverted in UI (0% = 1.0, 10% = 0.9)
-		// so we use it directly here
-		this.fuzzyThreshold = fuzzyThreshold ?? 1.0
-		this.bufferLines = bufferLines ?? BUFFER_LINES
-	}
-
-	getToolDescription(args: { cwd: string; toolOptions?: { [key: string]: string } }): string {
-		return `## apply_diff
-
-Description: Request to apply PRECISE, TARGETED modifications to one or more files by searching for specific sections of content and replacing them. This tool is for SURGICAL EDITS ONLY - specific changes to existing code. This tool supports both single-file and multi-file operations, allowing you to make changes across multiple files in a single request.
-
-**IMPORTANT: You MUST use multiple files in a single operation whenever possible to maximize efficiency and minimize back-and-forth.**
-
-You can perform multiple distinct search and replace operations within a single \`apply_diff\` call by providing multiple SEARCH/REPLACE blocks in the \`diff\` parameter. This is the preferred way to make several targeted changes efficiently.
-
-The SEARCH section must exactly match existing content including whitespace and indentation.
-If you're not confident in the exact content to search for, use the read_file tool first to get the exact content.
-When applying the diffs, be extra careful to remember to change any closing brackets or other syntax that may be affected by the diff farther down in the file.
-ALWAYS make as many changes in a single 'apply_diff' request as possible using multiple SEARCH/REPLACE blocks
-
-Parameters:
-- args: Contains one or more file elements, where each file contains:
-  - path: (required) The path of the file to modify (relative to the current workspace directory ${args.cwd})
-  - diff: (required) One or more diff elements containing:
-    - content: (required) The search/replace block defining the changes.
-    - start_line: (required) The line number of original content where the search block starts.
-
-Diff format:
-\`\`\`
-<<<<<<< SEARCH
-:start_line: (required) The line number of original content where the search block starts.
--------
-[exact content to find including whitespace]
-=======
-[new content to replace with]
->>>>>>> REPLACE
-\`\`\`
-
-Example:
-
-Original file:
-\`\`\`
-1 | def calculate_total(items):
-2 |     total = 0
-3 |     for item in items:
-4 |         total += item
-5 |     return total
-\`\`\`
-
-Search/Replace content:
-<apply_diff>
-<args>
-<file>
-  <path>eg.file.py</path>
-  <diff>
-    <content><![CDATA[
-<<<<<<< SEARCH
-def calculate_total(items):
-    total = 0
-    for item in items:
-        total += item
-    return total
-=======
-def calculate_total(items):
-    """Calculate total with 10% markup"""
-    return sum(item * 1.1 for item in items)
->>>>>>> REPLACE
-]]></content>
-  </diff>
-</file>
-</args>
-</apply_diff>
-
-Search/Replace content with multi edits across multiple files:
-<apply_diff>
-<args>
-<file>
-  <path>eg.file.py</path>
-  <diff>
-    <content><![CDATA[
-<<<<<<< SEARCH
-def calculate_total(items):
-    sum = 0
-=======
-def calculate_sum(items):
-    sum = 0
->>>>>>> REPLACE
-]]></content>
-  </diff>
-  <diff>
-    <content><![CDATA[
-<<<<<<< SEARCH
-        total += item
-    return total
-=======
-        sum += item
-    return sum 
->>>>>>> REPLACE
-]]></content>
-  </diff>
-</file>
-<file>
-  <path>eg.file2.py</path>
-  <diff>
-    <content><![CDATA[
-<<<<<<< SEARCH
-def greet(name):
-    return "Hello " + name
-=======
-def greet(name):
-    return f"Hello {name}!"
->>>>>>> REPLACE
-]]></content>
-  </diff>
-</file>
-</args>
-</apply_diff>
-
-Usage:
-<apply_diff>
-<args>
-<file>
-  <path>File path here</path>
-  <diff>
-    <content>
-Your search/replace content here
-You can use multi search/replace block in one diff block, but make sure to include the line numbers for each block.
-Only use a single line of '=======' between search and replacement content, because multiple '=======' will corrupt the file.
-    </content>
-    <start_line>1</start_line>
-  </diff>
-</file>
-<file>
-  <path>Another file path</path>
-  <diff>
-    <content>
-Another search/replace content here
-You can apply changes to multiple files in a single request.
-Each file requires its own path, start_line, and diff elements.
-    </content>
-    <start_line>5</start_line>
-  </diff>
-</file>
-</args>
-</apply_diff>`
-	}
-
-	private unescapeMarkers(content: string): string {
-		return content
-			.replace(/^\\<<<<<<</gm, "<<<<<<<")
-			.replace(/^\\=======/gm, "=======")
-			.replace(/^\\>>>>>>>/gm, ">>>>>>>")
-			.replace(/^\\-------/gm, "-------")
-			.replace(/^\\:end_line:/gm, ":end_line:")
-			.replace(/^\\:start_line:/gm, ":start_line:")
-	}
-
-	private validateMarkerSequencing(diffContent: string): { success: boolean; error?: string } {
-		enum State {
-			START,
-			AFTER_SEARCH,
-			AFTER_SEPARATOR,
-		}
-
-		const state = { current: State.START, line: 0 }
-
-		// Pattern allows optional extra '<' or '>' for SEARCH to handle AI-generated diffs
-		// (e.g., Sonnet 4 sometimes adds extra markers)
-		// Using explicit alternation instead of quantifiers to avoid regex backtracking
-		const SEARCH_PATTERN = /^(?:<<<<<<< |<<<<<<<< )SEARCH>?$/
-		const SEARCH = "<<<<<<< SEARCH" // Simplified for display
-		const SEP = "======="
-		// Pattern allows optional extra '>' or '<' for REPLACE
-		const REPLACE_PATTERN = /^(?:>>>>>>> |>>>>>>>> )REPLACE<?$/
-		const REPLACE = ">>>>>>> REPLACE" // Simplified for display
-		const SEARCH_PREFIX_PATTERN = /^(?:<<<<<<< |<<<<<<<< )/
-		const REPLACE_PREFIX_PATTERN = /^(?:>>>>>>> |>>>>>>>> )/
-
-		const reportMergeConflictError = (found: string, _expected: string) => ({
-			success: false,
-			error:
-				`ERROR: Special marker '${found}' found in your diff content at line ${state.line}:\n` +
-				"\n" +
-				`When removing merge conflict markers like '${found}' from files, you MUST escape them\n` +
-				"in your SEARCH section by prepending a backslash (\\) at the beginning of the line:\n" +
-				"\n" +
-				"CORRECT FORMAT:\n\n" +
-				"<<<<<<< SEARCH\n" +
-				"content before\n" +
-				`\\${found} <-- Note the backslash here in this example\n` +
-				"content after\n" +
-				"=======\n" +
-				"replacement content\n" +
-				">>>>>>> REPLACE\n" +
-				"\n" +
-				"Without escaping, the system confuses your content with diff syntax markers.\n" +
-				"You may use multiple diff blocks in a single diff request, but ANY of ONLY the following separators that occur within SEARCH or REPLACE content must be escaped, as follows:\n" +
-				`\\${SEARCH}\n` +
-				`\\${SEP}\n` +
-				`\\${REPLACE}\n`,
-		})
-
-		const reportInvalidDiffError = (found: string, expected: string) => ({
-			success: false,
-			error:
-				`ERROR: Diff block is malformed: marker '${found}' found in your diff content at line ${state.line}. Expected: ${expected}\n` +
-				"\n" +
-				"CORRECT FORMAT:\n\n" +
-				"<<<<<<< SEARCH\n" +
-				":start_line: (required) The line number of original content where the search block starts.\n" +
-				"-------\n" +
-				"[exact content to find including whitespace]\n" +
-				"=======\n" +
-				"[new content to replace with]\n" +
-				">>>>>>> REPLACE\n",
-		})
-
-		const reportLineMarkerInReplaceError = (marker: string) => ({
-			success: false,
-			error:
-				`ERROR: Invalid line marker '${marker}' found in REPLACE section at line ${state.line}\n` +
-				"\n" +
-				"Line markers (:start_line: and :end_line:) are only allowed in SEARCH sections.\n" +
-				"\n" +
-				"CORRECT FORMAT:\n" +
-				"<<<<<<< SEARCH\n" +
-				":start_line:5\n" +
-				"content to find\n" +
-				"=======\n" +
-				"replacement content\n" +
-				">>>>>>> REPLACE\n" +
-				"\n" +
-				"INCORRECT FORMAT:\n" +
-				"<<<<<<< SEARCH\n" +
-				"content to find\n" +
-				"=======\n" +
-				":start_line:5 <-- Invalid location\n" +
-				"replacement content\n" +
-				">>>>>>> REPLACE\n",
-		})
-
-		const lines = diffContent.split("\n")
-		const searchCount = lines.filter((l) => SEARCH_PATTERN.test(l.trim())).length
-		const sepCount = lines.filter((l) => l.trim() === SEP).length
-		const replaceCount = lines.filter((l) => REPLACE_PATTERN.test(l.trim())).length
-
-		const likelyBadStructure = searchCount !== replaceCount || sepCount < searchCount
-
-		for (const line of diffContent.split("\n")) {
-			state.line++
-			const marker = line.trim()
-
-			// Check for line markers in REPLACE sections (but allow escaped ones)
-			if (state.current === State.AFTER_SEPARATOR) {
-				if (marker.startsWith(":start_line:") && !line.trim().startsWith("\\:start_line:")) {
-					return reportLineMarkerInReplaceError(":start_line:")
-				}
-				if (marker.startsWith(":end_line:") && !line.trim().startsWith("\\:end_line:")) {
-					return reportLineMarkerInReplaceError(":end_line:")
-				}
-			}
-
-			switch (state.current) {
-				case State.START:
-					if (marker === SEP)
-						return likelyBadStructure
-							? reportInvalidDiffError(SEP, SEARCH)
-							: reportMergeConflictError(SEP, SEARCH)
-					if (REPLACE_PATTERN.test(marker)) return reportInvalidDiffError(REPLACE, SEARCH)
-					if (REPLACE_PREFIX_PATTERN.test(marker)) return reportMergeConflictError(marker, SEARCH)
-					if (SEARCH_PATTERN.test(marker)) state.current = State.AFTER_SEARCH
-					else if (SEARCH_PREFIX_PATTERN.test(marker)) return reportMergeConflictError(marker, SEARCH)
-					break
-
-				case State.AFTER_SEARCH:
-					if (SEARCH_PATTERN.test(marker)) return reportInvalidDiffError(SEARCH, SEP)
-					if (SEARCH_PREFIX_PATTERN.test(marker)) return reportMergeConflictError(marker, SEARCH)
-					if (REPLACE_PATTERN.test(marker)) return reportInvalidDiffError(REPLACE, SEP)
-					if (REPLACE_PREFIX_PATTERN.test(marker)) return reportMergeConflictError(marker, SEARCH)
-					if (marker === SEP) state.current = State.AFTER_SEPARATOR
-					break
-
-				case State.AFTER_SEPARATOR:
-					if (SEARCH_PATTERN.test(marker)) return reportInvalidDiffError(SEARCH, REPLACE)
-					if (SEARCH_PREFIX_PATTERN.test(marker)) return reportMergeConflictError(marker, REPLACE)
-					if (marker === SEP)
-						return likelyBadStructure
-							? reportInvalidDiffError(SEP, REPLACE)
-							: reportMergeConflictError(SEP, REPLACE)
-					if (REPLACE_PATTERN.test(marker)) state.current = State.START
-					else if (REPLACE_PREFIX_PATTERN.test(marker)) return reportMergeConflictError(marker, REPLACE)
-					break
-			}
-		}
-
-		return state.current === State.START
-			? { success: true }
-			: {
-					success: false,
-					error: `ERROR: Unexpected end of sequence: Expected '${
-						state.current === State.AFTER_SEARCH ? "=======" : ">>>>>>> REPLACE"
-					}' was not found.`,
-				}
-	}
-
-	async applyDiff(
-		originalContent: string,
-		diffContent: string | Array<{ content: string; startLine?: number }>,
-		_paramStartLine?: number,
-		_paramEndLine?: number,
-	): Promise<DiffResult> {
-		// Handle array-based input for multi-file support
-		if (Array.isArray(diffContent)) {
-			// Process each diff item separately and combine results
-			let resultContent = originalContent
-			const allFailParts: DiffResult[] = []
-			let successCount = 0
-
-			for (const diffItem of diffContent) {
-				const singleResult = await this.applySingleDiff(resultContent, diffItem.content, diffItem.startLine)
-
-				if (singleResult.success && singleResult.content) {
-					resultContent = singleResult.content
-					successCount++
-				} else {
-					// If singleResult has failParts, push those directly to avoid nesting
-					if (singleResult.failParts && singleResult.failParts.length > 0) {
-						allFailParts.push(...singleResult.failParts)
-					} else {
-						// Otherwise push the single result itself
-						allFailParts.push(singleResult)
-					}
-				}
-			}
-
-			if (successCount === 0) {
-				return {
-					success: false,
-					error: "Failed to apply any diffs",
-					failParts: allFailParts,
-				}
-			}
-
-			return {
-				success: true,
-				content: resultContent,
-				failParts: allFailParts.length > 0 ? allFailParts : undefined,
-			}
-		}
-
-		// Handle string-based input (legacy)
-		return this.applySingleDiff(originalContent, diffContent, _paramStartLine)
-	}
-
-	private async applySingleDiff(
-		originalContent: string,
-		diffContent: string,
-		_paramStartLine?: number,
-	): Promise<DiffResult> {
-		const validseq = this.validateMarkerSequencing(diffContent)
-		if (!validseq.success) {
-			return {
-				success: false,
-				error: validseq.error!,
-			}
-		}
-
-		/* Regex parts:
-		1. (?:^|\n)   Ensures the first marker starts at the beginning of the file or right after a newline.
-		2. (?<!\\)(?:<<<<<<< |<<<<<<<< )SEARCH>?\s*\n   Matches "<<<<<<< SEARCH" or "<<<<<<< SEARCH>" or "<<<<<<<< SEARCH" (7 or 8 '<' chars) (ignoring any trailing spaces) – the negative lookbehind makes sure it isn't escaped. Uses explicit alternation to avoid backtracking.
-		3. ((?:\:start_line:\s*(\d+)\s*\n))?   Optionally matches a ":start_line:" line. The outer capturing group is group 1 and the inner (\d+) is group 2.
-		4. ((?:\:end_line:\s*(\d+)\s*\n))?   Optionally matches a ":end_line:" line. Group 3 is the whole match and group 4 is the digits.
-		5. ((?<!\\)-------\s*\n)?   Optionally matches the "-------" marker line (group 5).
-		6. ([\s\S]*?)(?:\n)?   Non‐greedy match for the "search content" (group 6) up to the next marker.
-		7. (?:(?<=\n)(?<!\\)=======\s*\n)   Matches the "=======" marker on its own line.
-		8. ([\s\S]*?)(?:\n)?   Non‐greedy match for the "replace content" (group 7).
-		9. (?:(?<=\n)(?<!\\)(?:>>>>>>> |>>>>>>>> )REPLACE<?)(?=\n|$)   Matches ">>>>>>> REPLACE" or ">>>>>>> REPLACE<" or ">>>>>>>> REPLACE" (7 or 8 '>' chars) on its own line (and requires a following newline or the end of file). Uses explicit alternation to avoid backtracking.
-		*/
-		let matches = [
-			...diffContent.matchAll(
-				/(?:^|\n)(?<!\\)(?:<<<<<<< |<<<<<<<< )SEARCH>?\s*\n((?:\:start_line:\s*(\d+)\s*\n))?((?:\:end_line:\s*(\d+)\s*\n))?((?<!\\)-------\s*\n)?([\s\S]*?)(?:\n)?(?:(?<=\n)(?<!\\)=======\s*\n)([\s\S]*?)(?:\n)?(?:(?<=\n)(?<!\\)(?:>>>>>>> |>>>>>>>> )REPLACE<?)(?=\n|$)/g,
-			),
-		]
-
-		if (matches.length === 0) {
-			return {
-				success: false,
-				error: `Invalid diff format - missing required sections\n\nDebug Info:\n- Expected Format: <<<<<<< SEARCH\\n:start_line: start line\\n-------\\n[search content]\\n=======\\n[replace content]\\n>>>>>>> REPLACE\n- Tip: Make sure to include start_line/SEARCH/=======/REPLACE sections with correct markers on new lines`,
-			}
-		}
-
-		// Detect line ending from original content
-		const lineEnding = originalContent.includes("\r\n") ? "\r\n" : "\n"
-		let resultLines = originalContent.split(/\r?\n/)
-		let delta = 0
-		let diffResults: DiffResult[] = []
-		let appliedCount = 0
-
-		const replacements = matches
-			.map((match) => ({
-				startLine: _paramStartLine ?? Number(match[2] ?? 0),
-				searchContent: match[6],
-				replaceContent: match[7],
-			}))
-			.sort((a, b) => a.startLine - b.startLine)
-
-		for (const replacement of replacements) {
-			let { searchContent, replaceContent } = replacement
-			let startLine = replacement.startLine + (replacement.startLine === 0 ? 0 : delta)
-
-			// First unescape any escaped markers in the content
-			searchContent = this.unescapeMarkers(searchContent)
-			replaceContent = this.unescapeMarkers(replaceContent)
-
-			// Strip line numbers from search and replace content if every line starts with a line number
-			const hasAllLineNumbers =
-				(everyLineHasLineNumbers(searchContent) && everyLineHasLineNumbers(replaceContent)) ||
-				(everyLineHasLineNumbers(searchContent) && replaceContent.trim() === "")
-
-			if (hasAllLineNumbers && startLine === 0) {
-				startLine = parseInt(searchContent.split("\n")[0].split("|")[0])
-			}
-
-			if (hasAllLineNumbers) {
-				searchContent = stripLineNumbers(searchContent)
-				replaceContent = stripLineNumbers(replaceContent)
-			}
-
-			// Validate that search and replace content are not identical
-			if (searchContent === replaceContent) {
-				diffResults.push({
-					success: false,
-					error:
-						`Search and replace content are identical - no changes would be made\n\n` +
-						`Debug Info:\n` +
-						`- Search and replace must be different to make changes\n` +
-						`- Use read_file to verify the content you want to change`,
-				})
-				continue
-			}
-
-			// Split content into lines, handling both \n and \r\n
-			let searchLines = searchContent === "" ? [] : searchContent.split(/\r?\n/)
-			let replaceLines = replaceContent === "" ? [] : replaceContent.split(/\r?\n/)
-
-			// Validate that search content is not empty
-			if (searchLines.length === 0) {
-				diffResults.push({
-					success: false,
-					error: `Empty search content is not allowed\n\nDebug Info:\n- Search content cannot be empty\n- For insertions, provide a specific line using :start_line: and include content to search for\n- For example, match a single line to insert before/after it`,
-				})
-				continue
-			}
-
-			let endLine = replacement.startLine + searchLines.length - 1
-
-			// Initialize search variables
-			let matchIndex = -1
-			let bestMatchScore = 0
-			let bestMatchContent = ""
-			let searchChunk = searchLines.join("\n")
-
-			// Determine search bounds
-			let searchStartIndex = 0
-			let searchEndIndex = resultLines.length
-
-			// Validate and handle line range if provided
-			if (startLine) {
-				// Convert to 0-based index
-				const exactStartIndex = startLine - 1
-				const searchLen = searchLines.length
-				const exactEndIndex = exactStartIndex + searchLen - 1
-
-				// Try exact match first
-				const originalChunk = resultLines.slice(exactStartIndex, exactEndIndex + 1).join("\n")
-				const similarity = getSimilarity(originalChunk, searchChunk)
-
-				if (similarity >= this.fuzzyThreshold) {
-					matchIndex = exactStartIndex
-					bestMatchScore = similarity
-					bestMatchContent = originalChunk
-				} else {
-					// Set bounds for buffered search
-					searchStartIndex = Math.max(0, startLine - (this.bufferLines + 1))
-					searchEndIndex = Math.min(resultLines.length, startLine + searchLines.length + this.bufferLines)
-				}
-			}
-
-			// If no match found yet, try middle-out search within bounds
-			if (matchIndex === -1) {
-				const {
-					bestScore,
-					bestMatchIndex,
-					bestMatchContent: midContent,
-				} = fuzzySearch(resultLines, searchChunk, searchStartIndex, searchEndIndex)
-
-				matchIndex = bestMatchIndex
-				bestMatchScore = bestScore
-				bestMatchContent = midContent
-			}
-
-			// Try aggressive line number stripping as a fallback if regular matching fails
-			if (matchIndex === -1 || bestMatchScore < this.fuzzyThreshold) {
-				// Strip both search and replace content once (simultaneously)
-				const aggressiveSearchContent = stripLineNumbers(searchContent, true)
-				const aggressiveReplaceContent = stripLineNumbers(replaceContent, true)
-				const aggressiveSearchLines = aggressiveSearchContent ? aggressiveSearchContent.split(/\r?\n/) : []
-				const aggressiveSearchChunk = aggressiveSearchLines.join("\n")
-
-				// Try middle-out search again with aggressive stripped content (respecting the same search bounds)
-				const {
-					bestScore,
-					bestMatchIndex,
-					bestMatchContent: aggContent,
-				} = fuzzySearch(resultLines, aggressiveSearchChunk, searchStartIndex, searchEndIndex)
-
-				if (bestMatchIndex !== -1 && bestScore >= this.fuzzyThreshold) {
-					matchIndex = bestMatchIndex
-					bestMatchScore = bestScore
-					bestMatchContent = aggContent
-
-					// Replace the original search/replace with their stripped versions
-					searchContent = aggressiveSearchContent
-					replaceContent = aggressiveReplaceContent
-					searchLines = aggressiveSearchLines
-					replaceLines = replaceContent ? replaceContent.split(/\r?\n/) : []
-				} else {
-					// No match found with either method
-					const originalContentSection =
-						startLine !== undefined && endLine !== undefined
-							? `\n\nOriginal Content:\n${addLineNumbers(
-									resultLines
-										.slice(
-											Math.max(0, startLine - 1 - this.bufferLines),
-											Math.min(resultLines.length, endLine + this.bufferLines),
-										)
-										.join("\n"),
-									Math.max(1, startLine - this.bufferLines),
-								)}`
-							: `\n\nOriginal Content:\n${addLineNumbers(resultLines.join("\n"))}`
-
-					const bestMatchSection = bestMatchContent
-						? `\n\nBest Match Found:\n${addLineNumbers(bestMatchContent, matchIndex + 1)}`
-						: `\n\nBest Match Found:\n(no match)`
-
-					const lineRange = startLine ? ` at line: ${startLine}` : ""
-
-					diffResults.push({
-						success: false,
-						error: `No sufficiently similar match found${lineRange} (${Math.floor(
-							bestMatchScore * 100,
-						)}% similar, needs ${Math.floor(
-							this.fuzzyThreshold * 100,
-						)}%)\n\nDebug Info:\n- Similarity Score: ${Math.floor(
-							bestMatchScore * 100,
-						)}%\n- Required Threshold: ${Math.floor(this.fuzzyThreshold * 100)}%\n- Search Range: ${
-							startLine ? `starting at line ${startLine}` : "start to end"
-						}\n- Tried both standard and aggressive line number stripping\n- Tip: Use the read_file tool to get the latest content of the file before attempting to use the apply_diff tool again, as the file content may have changed\n\nSearch Content:\n${searchChunk}${bestMatchSection}${originalContentSection}`,
-					})
-					continue
-				}
-			}
-
-			// Get the matched lines from the original content
-			const matchedLines = resultLines.slice(matchIndex, matchIndex + searchLines.length)
-
-			// Get the exact indentation (preserving tabs/spaces) of each line
-			const originalIndents = matchedLines.map((line) => {
-				const match = line.match(/^[\t ]*/)
-				return match ? match[0] : ""
-			})
-
-			// Get the exact indentation of each line in the search block
-			const searchIndents = searchLines.map((line) => {
-				const match = line.match(/^[\t ]*/)
-				return match ? match[0] : ""
-			})
-
-			// Apply the replacement while preserving exact indentation
-			const indentedReplaceLines = replaceLines.map((line) => {
-				// Get the matched line's exact indentation
-				const matchedIndent = originalIndents[0] || ""
-
-				// Get the current line's indentation relative to the search content
-				const currentIndentMatch = line.match(/^[\t ]*/)
-				const currentIndent = currentIndentMatch ? currentIndentMatch[0] : ""
-				const searchBaseIndent = searchIndents[0] || ""
-
-				// Calculate the relative indentation level
-				const searchBaseLevel = searchBaseIndent.length
-				const currentLevel = currentIndent.length
-				const relativeLevel = currentLevel - searchBaseLevel
-
-				// If relative level is negative, remove indentation from matched indent
-				// If positive, add to matched indent
-				const finalIndent =
-					relativeLevel < 0
-						? matchedIndent.slice(0, Math.max(0, matchedIndent.length + relativeLevel))
-						: matchedIndent + currentIndent.slice(searchBaseLevel)
-
-				return finalIndent + line.trim()
-			})
-
-			// Construct the final content
-			const beforeMatch = resultLines.slice(0, matchIndex)
-			const afterMatch = resultLines.slice(matchIndex + searchLines.length)
-			resultLines = [...beforeMatch, ...indentedReplaceLines, ...afterMatch]
-
-			delta = delta - matchedLines.length + replaceLines.length
-			appliedCount++
-		}
-
-		const finalContent = resultLines.join(lineEnding)
-
-		if (appliedCount === 0) {
-			return {
-				success: false,
-				failParts: diffResults,
-			}
-		}
-
-		return {
-			success: true,
-			content: finalContent,
-			failParts: diffResults,
-		}
-	}
-
-	getProgressStatus(toolUse: ToolUse, result?: DiffResult): ToolProgressStatus {
-		const diffContent = toolUse.params.diff
-		if (diffContent) {
-			const icon = "diff-multiple"
-
-			if (toolUse.partial) {
-				if (Math.floor(diffContent.length / 10) % 10 === 0) {
-					const searchBlockCount = (diffContent.match(/SEARCH/g) || []).length
-					return { icon, text: `${searchBlockCount}` }
-				}
-			} else if (result) {
-				const searchBlockCount = (diffContent.match(/SEARCH/g) || []).length
-				if (result.failParts?.length) {
-					return {
-						icon,
-						text: `${searchBlockCount - result.failParts.length}/${searchBlockCount}`,
-					}
-				} else {
-					return { icon, text: `${searchBlockCount}` }
-				}
-			}
-		}
-
-		return {}
-	}
-}

src/core/task/Task.ts

@@ -70,7 +70,6 @@ import { getApiMetrics, hasTokenUsageChanged, hasToolUsageChanged } from "../../
 import { ClineAskResponse } from "../../shared/WebviewMessage"
 import { defaultModeSlug, getModeBySlug, getGroupName } from "../../shared/modes"
 import { DiffStrategy, type ToolUse, type ToolParamName, toolParamNames } from "../../shared/tools"
-import { EXPERIMENT_IDS, experiments } from "../../shared/experiments"
 import { getModelMaxOutputTokens } from "../../shared/api"
 
 // services
@@ -107,7 +106,6 @@ import { NativeToolCallParser } from "../assistant-message/NativeToolCallParser"
 import { manageContext, willManageContext } from "../context-management"
 import { ClineProvider } from "../webview/ClineProvider"
 import { MultiSearchReplaceDiffStrategy } from "../diff/strategies/multi-search-replace"
-import { MultiFileSearchReplaceDiffStrategy } from "../diff/strategies/multi-file-search-replace"
 import {
 	type ApiMessage,
 	readApiMessages,
@@ -548,21 +546,9 @@ export class Task extends EventEmitter<TaskEvents> implements TaskLike {
 		// Listen for provider profile changes to update parser state
 		this.setupProviderProfileChangeListener(provider)
 
-		// Always set up diff strategy - default to old strategy, will be updated if experiment is enabled.
+		// Set up diff strategy
 		this.diffStrategy = new MultiSearchReplaceDiffStrategy()
 
-		// Check experiment asynchronously and update strategy if needed.
-		provider.getState().then((state) => {
-			const isMultiFileApplyDiffEnabled = experiments.isEnabled(
-				state.experiments ?? {},
-				EXPERIMENT_IDS.MULTI_FILE_APPLY_DIFF,
-			)
-
-			if (isMultiFileApplyDiffEnabled) {
-				this.diffStrategy = new MultiFileSearchReplaceDiffStrategy()
-			}
-		})
-
 		this.toolRepetitionDetector = new ToolRepetitionDetector(this.consecutiveMistakeLimit)
 
 		// Initialize todo list if provided

src/core/task/__tests__/Task.spec.ts

@@ -15,8 +15,6 @@ import { ApiStreamChunk } from "../../../api/transform/stream"
 import { ContextProxy } from "../../config/ContextProxy"
 import { processUserContentMentions } from "../../mentions/processUserContentMentions"
 import { MultiSearchReplaceDiffStrategy } from "../../diff/strategies/multi-search-replace"
-import { MultiFileSearchReplaceDiffStrategy } from "../../diff/strategies/multi-file-search-replace"
-import { EXPERIMENT_IDS } from "../../../shared/experiments"
 
 // Mock delay before any imports that might use it
 vi.mock("delay", () => ({
@@ -1330,11 +1328,7 @@ describe("Cline", () => {
 			})
 
 			it("should use MultiSearchReplaceDiffStrategy by default", async () => {
-				mockProvider.getState.mockResolvedValue({
-					experiments: {
-						[EXPERIMENT_IDS.MULTI_FILE_APPLY_DIFF]: false,
-					},
-				})
+				mockProvider.getState.mockResolvedValue({})
 
 				const task = new Task({
 					provider: mockProvider,
@@ -1343,36 +1337,11 @@ describe("Cline", () => {
 					startTask: false,
 				})
 
-				// Initially should be MultiSearchReplaceDiffStrategy
+				// Should be MultiSearchReplaceDiffStrategy
 				expect(task.diffStrategy).toBeInstanceOf(MultiSearchReplaceDiffStrategy)
 				expect(task.diffStrategy?.getName()).toBe("MultiSearchReplace")
 			})
 
-			it("should switch to MultiFileSearchReplaceDiffStrategy when experiment is enabled", async () => {
-				mockProvider.getState.mockResolvedValue({
-					experiments: {
-						[EXPERIMENT_IDS.MULTI_FILE_APPLY_DIFF]: true,
-					},
-				})
-
-				const task = new Task({
-					provider: mockProvider,
-					apiConfiguration: mockApiConfig,
-					task: "test task",
-					startTask: false,
-				})
-
-				// Initially should be MultiSearchReplaceDiffStrategy
-				expect(task.diffStrategy).toBeInstanceOf(MultiSearchReplaceDiffStrategy)
-
-				// Wait for async strategy update
-				await new Promise((resolve) => setTimeout(resolve, 10))
-
-				// Should have switched to MultiFileSearchReplaceDiffStrategy
-				expect(task.diffStrategy).toBeInstanceOf(MultiFileSearchReplaceDiffStrategy)
-				expect(task.diffStrategy?.getName()).toBe("MultiFileSearchReplace")
-			})
-
 			it("should keep MultiSearchReplaceDiffStrategy when experiments are undefined", async () => {
 				mockProvider.getState.mockResolvedValue({})
 

src/core/tools/MultiApplyDiffTool.ts

@@ -1,17 +0,0 @@
-import { Task } from "../task/Task"
-import { ToolUse, AskApproval, HandleError, PushToolResult } from "../../shared/tools"
-import { applyDiffTool as applyDiffToolClass } from "./ApplyDiffTool"
-
-export async function applyDiffTool(
-	cline: Task,
-	block: ToolUse,
-	askApproval: AskApproval,
-	handleError: HandleError,
-	pushToolResult: PushToolResult,
-) {
-	return applyDiffToolClass.handle(cline, block as ToolUse<"apply_diff">, {
-		askApproval,
-		handleError,
-		pushToolResult,
-	})
-}

src/core/tools/__tests__/applyDiffTool.experiment.spec.ts

@@ -1,140 +0,0 @@
-import { EXPERIMENT_IDS } from "../../../shared/experiments"
-
-// Mock vscode
-vi.mock("vscode", () => ({
-	workspace: {
-		getConfiguration: vi.fn(),
-	},
-}))
-
-// Mock the ApplyDiffTool module
-vi.mock("../ApplyDiffTool", () => ({
-	applyDiffTool: {
-		handle: vi.fn(),
-	},
-}))
-
-// Import after mocking to get the mocked version
-import { applyDiffTool as multiApplyDiffTool } from "../MultiApplyDiffTool"
-import { applyDiffTool as applyDiffToolClass } from "../ApplyDiffTool"
-
-describe("applyDiffTool experiment routing", () => {
-	let mockCline: any
-	let mockBlock: any
-	let mockAskApproval: any
-	let mockHandleError: any
-	let mockPushToolResult: any
-	let mockProvider: any
-
-	beforeEach(async () => {
-		vi.clearAllMocks()
-
-		// Reset vscode mock to default behavior
-		const vscode = await import("vscode")
-		vi.mocked(vscode.workspace.getConfiguration).mockReturnValue({
-			get: vi.fn().mockReturnValue(undefined),
-		} as any)
-
-		mockProvider = {
-			getState: vi.fn(),
-		}
-
-		mockCline = {
-			providerRef: {
-				deref: vi.fn().mockReturnValue(mockProvider),
-			},
-			cwd: "/test",
-			diffStrategy: {
-				applyDiff: vi.fn(),
-				getProgressStatus: vi.fn(),
-			},
-			diffViewProvider: {
-				reset: vi.fn(),
-			},
-			apiConfiguration: {
-				apiProvider: "anthropic",
-			},
-			api: {
-				getModel: vi.fn().mockReturnValue({
-					id: "test-model",
-					info: {
-						maxTokens: 4096,
-						contextWindow: 128000,
-						supportsPromptCache: false,
-					},
-				}),
-			},
-			processQueuedMessages: vi.fn(),
-		} as any
-
-		mockBlock = {
-			params: {
-				path: "test.ts",
-				diff: "test diff",
-			},
-			partial: false,
-		}
-
-		mockAskApproval = vi.fn()
-		mockHandleError = vi.fn()
-		mockPushToolResult = vi.fn()
-	})
-
-	it("should always use class-based tool with native protocol", async () => {
-		mockProvider.getState.mockResolvedValue({
-			experiments: {
-				[EXPERIMENT_IDS.MULTI_FILE_APPLY_DIFF]: false,
-			},
-		})
-
-		// Mock the class-based tool to resolve successfully
-		;(applyDiffToolClass.handle as any).mockResolvedValue(undefined)
-
-		await multiApplyDiffTool(mockCline, mockBlock, mockAskApproval, mockHandleError, mockPushToolResult)
-
-		// MultiApplyDiffTool always delegates to the class-based tool.
-		expect(applyDiffToolClass.handle).toHaveBeenCalledWith(mockCline, mockBlock, {
-			askApproval: mockAskApproval,
-			handleError: mockHandleError,
-			pushToolResult: mockPushToolResult,
-		})
-	})
-
-	it("should use class-based tool when experiments are not defined", async () => {
-		mockProvider.getState.mockResolvedValue({})
-
-		// Mock the class-based tool to resolve successfully
-		;(applyDiffToolClass.handle as any).mockResolvedValue(undefined)
-
-		await multiApplyDiffTool(mockCline, mockBlock, mockAskApproval, mockHandleError, mockPushToolResult)
-
-		// MultiApplyDiffTool always delegates to the class-based tool.
-		expect(applyDiffToolClass.handle).toHaveBeenCalledWith(mockCline, mockBlock, {
-			askApproval: mockAskApproval,
-			handleError: mockHandleError,
-			pushToolResult: mockPushToolResult,
-		})
-	})
-
-	it("should use class-based tool when MULTI_FILE_APPLY_DIFF experiment is enabled", async () => {
-		mockProvider.getState.mockResolvedValue({
-			experiments: {
-				[EXPERIMENT_IDS.MULTI_FILE_APPLY_DIFF]: true,
-			},
-		})
-
-		// Mock the class-based tool to resolve successfully
-		;(applyDiffToolClass.handle as any).mockResolvedValue(undefined)
-
-		await multiApplyDiffTool(mockCline, mockBlock, mockAskApproval, mockHandleError, mockPushToolResult)
-
-		// MultiApplyDiffTool always delegates to the class-based tool.
-		expect(applyDiffToolClass.handle).toHaveBeenCalledWith(mockCline, mockBlock, {
-			askApproval: mockAskApproval,
-			handleError: mockHandleError,
-			pushToolResult: mockPushToolResult,
-		})
-	})
-
-	// MultiApplyDiffTool always delegates to the class-based tool.
-})

src/core/tools/__tests__/multiApplyDiffTool.spec.ts

@@ -1,288 +0,0 @@
-import { applyDiffTool } from "../MultiApplyDiffTool"
-import { applyDiffTool as applyDiffToolClass } from "../ApplyDiffTool"
-import { EXPERIMENT_IDS } from "../../../shared/experiments"
-import * as fs from "fs/promises"
-import * as fileUtils from "../../../utils/fs"
-import * as pathUtils from "../../../utils/path"
-
-// Mock dependencies
-vi.mock("fs/promises")
-vi.mock("../../../utils/fs")
-vi.mock("../../../utils/path")
-
-// Mock the ApplyDiffTool class-based tool that MultiApplyDiffTool delegates to for native protocol
-vi.mock("../ApplyDiffTool", () => ({
-	applyDiffTool: {
-		handle: vi.fn().mockResolvedValue(undefined),
-	},
-}))
-
-// Mock TelemetryService
-vi.mock("@roo-code/telemetry", () => ({
-	TelemetryService: {
-		get instance() {
-			return {
-				trackEvent: vi.fn(),
-				trackError: vi.fn(),
-				captureDiffApplicationError: vi.fn(),
-			}
-		},
-	},
-}))
-
-describe("multiApplyDiffTool", () => {
-	let mockCline: any
-	let mockBlock: any
-	let mockAskApproval: any
-	let mockHandleError: any
-	let mockPushToolResult: any
-	let mockRemoveClosingTag: any
-	let mockProvider: any
-
-	beforeEach(() => {
-		vi.clearAllMocks()
-
-		mockProvider = {
-			getState: vi.fn().mockResolvedValue({
-				experiments: {
-					[EXPERIMENT_IDS.MULTI_FILE_APPLY_DIFF]: true,
-				},
-				diagnosticsEnabled: true,
-				writeDelayMs: 0,
-			}),
-		}
-
-		mockCline = {
-			providerRef: {
-				deref: vi.fn().mockReturnValue(mockProvider),
-			},
-			cwd: "/test",
-			taskId: "test-task",
-			consecutiveMistakeCount: 0,
-			consecutiveMistakeCountForApplyDiff: new Map(),
-			recordToolError: vi.fn(),
-			say: vi.fn().mockResolvedValue(undefined),
-			sayAndCreateMissingParamError: vi.fn().mockResolvedValue("Missing parameter error"),
-			ask: vi.fn().mockResolvedValue({ response: "yesButtonClicked", text: "", images: [] }),
-			diffStrategy: {
-				applyDiff: vi.fn().mockResolvedValue({
-					success: true,
-					content: "modified content",
-				}),
-				getProgressStatus: vi.fn(),
-			},
-			diffViewProvider: {
-				reset: vi.fn().mockResolvedValue(undefined),
-				editType: undefined,
-				originalContent: undefined,
-				open: vi.fn().mockResolvedValue(undefined),
-				update: vi.fn().mockResolvedValue(undefined),
-				scrollToFirstDiff: vi.fn(),
-				saveDirectly: vi.fn().mockResolvedValue(undefined),
-				saveChanges: vi.fn().mockResolvedValue(undefined),
-				pushToolWriteResult: vi.fn().mockResolvedValue("File modified successfully"),
-			},
-			apiConfiguration: {
-				apiProvider: "anthropic",
-			},
-			api: {
-				getModel: vi.fn().mockReturnValue({
-					id: "test-model",
-					info: {
-						maxTokens: 4096,
-						contextWindow: 128000,
-						supportsPromptCache: false,
-					},
-				}),
-			},
-			rooIgnoreController: {
-				validateAccess: vi.fn().mockReturnValue(true),
-			},
-			rooProtectedController: {
-				isWriteProtected: vi.fn().mockReturnValue(false),
-			},
-			fileContextTracker: {
-				trackFileContext: vi.fn().mockResolvedValue(undefined),
-			},
-			didEditFile: false,
-			processQueuedMessages: vi.fn(),
-		} as any
-
-		mockAskApproval = vi.fn().mockResolvedValue(true)
-		mockHandleError = vi.fn()
-		mockPushToolResult = vi.fn()
-		mockRemoveClosingTag = vi.fn((tag, value) => value)
-
-		// Mock file system operations
-		;(fileUtils.fileExistsAtPath as any).mockResolvedValue(true)
-		;(fs.readFile as any).mockResolvedValue("original content")
-		;(pathUtils.getReadablePath as any).mockImplementation((cwd: string, path: string) => path)
-	})
-
-	describe("Native protocol delegation", () => {
-		it("delegates to the class-based tool for native protocol", async () => {
-			mockBlock = {
-				type: "tool_use",
-				name: "apply_diff",
-				params: {
-					args: `<file>
-						<path>test.ts</path>
-						<diff>
-							<content>valid string content</content>
-						</diff>
-					</file>`,
-				},
-				partial: false,
-			}
-
-			await applyDiffTool(mockCline, mockBlock, mockAskApproval, mockHandleError, mockPushToolResult)
-
-			expect(applyDiffToolClass.handle).toHaveBeenCalledWith(mockCline, mockBlock, {
-				askApproval: mockAskApproval,
-				handleError: mockHandleError,
-				pushToolResult: mockPushToolResult,
-			})
-		})
-
-		it("should delegate to applyDiffToolClass.handle for legacy path/diff params", async () => {
-			mockBlock = {
-				params: {
-					path: "test.ts",
-					diff: "<<<<<<< SEARCH\nold\n=======\nnew\n>>>>>>> REPLACE",
-				},
-				partial: false,
-			}
-
-			await applyDiffTool(mockCline, mockBlock, mockAskApproval, mockHandleError, mockPushToolResult)
-
-			// Should delegate to the class-based tool
-			expect(applyDiffToolClass.handle).toHaveBeenCalledWith(mockCline, mockBlock, {
-				askApproval: mockAskApproval,
-				handleError: mockHandleError,
-				pushToolResult: mockPushToolResult,
-			})
-		})
-
-		it("should handle undefined diff content by delegating to class-based tool", async () => {
-			mockBlock = {
-				params: {
-					path: "test.ts",
-					diff: undefined,
-				},
-				partial: false,
-			}
-
-			await applyDiffTool(mockCline, mockBlock, mockAskApproval, mockHandleError, mockPushToolResult)
-
-			// Should delegate to the class-based tool (which will handle the error)
-			expect(applyDiffToolClass.handle).toHaveBeenCalled()
-		})
-
-		it("should handle null diff content by delegating to class-based tool", async () => {
-			mockBlock = {
-				params: {
-					args: `<file>
-						<path>test.ts</path>
-						<diff>
-							<content></content>
-						</diff>
-					</file>`,
-				},
-				partial: false,
-			}
-
-			await applyDiffTool(mockCline, mockBlock, mockAskApproval, mockHandleError, mockPushToolResult)
-
-			// Should delegate to the class-based tool
-			expect(applyDiffToolClass.handle).toHaveBeenCalled()
-		})
-
-		it("should delegate multiple SEARCH blocks to class-based tool", async () => {
-			const diffContent = `<<<<<<< SEARCH
-old content
-=======
-new content
->>>>>>> REPLACE
-
-<<<<<<< SEARCH
-another old content
-=======
-another new content
->>>>>>> REPLACE`
-
-			mockBlock = {
-				params: {
-					path: "test.ts",
-					diff: diffContent,
-				},
-				partial: false,
-			}
-
-			await applyDiffTool(mockCline, mockBlock, mockAskApproval, mockHandleError, mockPushToolResult)
-
-			// Should delegate to the class-based tool
-			expect(applyDiffToolClass.handle).toHaveBeenCalled()
-		})
-
-		it("should delegate single SEARCH block to class-based tool", async () => {
-			const diffContent = `<<<<<<< SEARCH
-old content
-=======
-new content
->>>>>>> REPLACE`
-
-			mockBlock = {
-				params: {
-					path: "test.ts",
-					diff: diffContent,
-				},
-				partial: false,
-			}
-
-			await applyDiffTool(mockCline, mockBlock, mockAskApproval, mockHandleError, mockPushToolResult)
-
-			// Should delegate to the class-based tool
-			expect(applyDiffToolClass.handle).toHaveBeenCalled()
-		})
-	})
-
-	describe("Edge cases for diff content", () => {
-		it("should handle empty diff by delegating to class-based tool", async () => {
-			mockBlock = {
-				params: {
-					args: `<file>
-						<path>test.ts</path>
-						<diff></diff>
-					</file>`,
-				},
-				partial: false,
-			}
-
-			await applyDiffTool(mockCline, mockBlock, mockAskApproval, mockHandleError, mockPushToolResult)
-
-			// Should delegate to the class-based tool
-			expect(applyDiffToolClass.handle).toHaveBeenCalled()
-			expect(mockHandleError).not.toHaveBeenCalled()
-		})
-
-		it("should handle mixed content types by delegating to class-based tool", async () => {
-			mockBlock = {
-				params: {
-					args: `<file>
-						<path>test.ts</path>
-						<diff>
-							<content>valid string content</content>
-						</diff>
-					</file>`,
-				},
-				partial: false,
-			}
-
-			await applyDiffTool(mockCline, mockBlock, mockAskApproval, mockHandleError, mockPushToolResult)
-
-			// Should delegate to the class-based tool
-			expect(applyDiffToolClass.handle).toHaveBeenCalled()
-			expect(mockHandleError).not.toHaveBeenCalled()
-		})
-	})
-})

src/core/webview/generateSystemPrompt.ts

@@ -2,11 +2,9 @@ import * as vscode from "vscode"
 import { WebviewMessage } from "../../shared/WebviewMessage"
 import { defaultModeSlug, getModeBySlug, getGroupName } from "../../shared/modes"
 import { buildApiHandler } from "../../api"
-import { experiments as experimentsModule, EXPERIMENT_IDS } from "../../shared/experiments"
 
 import { SYSTEM_PROMPT } from "../prompts/system"
 import { MultiSearchReplaceDiffStrategy } from "../diff/strategies/multi-search-replace"
-import { MultiFileSearchReplaceDiffStrategy } from "../diff/strategies/multi-file-search-replace"
 import { Package } from "../../shared/package"
 
 import { ClineProvider } from "./ClineProvider"
@@ -27,15 +25,7 @@ export const generateSystemPrompt = async (provider: ClineProvider, message: Web
 		enableSubfolderRules,
 	} = await provider.getState()
 
-	// Check experiment to determine which diff strategy to use
-	const isMultiFileApplyDiffEnabled = experimentsModule.isEnabled(
-		experiments ?? {},
-		EXPERIMENT_IDS.MULTI_FILE_APPLY_DIFF,
-	)
-
-	const diffStrategy = isMultiFileApplyDiffEnabled
-		? new MultiFileSearchReplaceDiffStrategy()
-		: new MultiSearchReplaceDiffStrategy()
+	const diffStrategy = new MultiSearchReplaceDiffStrategy()
 
 	const cwd = provider.cwd
 

src/shared/__tests__/experiments.spec.ts

@@ -5,50 +5,50 @@ import type { ExperimentId } from "@roo-code/types"
 import { EXPERIMENT_IDS, experimentConfigsMap, experiments as Experiments } from "../experiments"
 
 describe("experiments", () => {
-	describe("MULTI_FILE_APPLY_DIFF", () => {
+	describe("POWER_STEERING", () => {
 		it("is configured correctly", () => {
-			expect(EXPERIMENT_IDS.MULTI_FILE_APPLY_DIFF).toBe("multiFileApplyDiff")
-			expect(experimentConfigsMap.MULTI_FILE_APPLY_DIFF).toMatchObject({
+			expect(EXPERIMENT_IDS.POWER_STEERING).toBe("powerSteering")
+			expect(experimentConfigsMap.POWER_STEERING).toMatchObject({
 				enabled: false,
 			})
 		})
 	})
 
 	describe("isEnabled", () => {
-		it("returns false when MULTI_FILE_APPLY_DIFF experiment is not enabled", () => {
+		it("returns false when POWER_STEERING experiment is not enabled", () => {
 			const experiments: Record<ExperimentId, boolean> = {
-				multiFileApplyDiff: false,
+				powerSteering: false,
 				preventFocusDisruption: false,
 				imageGeneration: false,
 				runSlashCommand: false,
 				multipleNativeToolCalls: false,
 				customTools: false,
 			}
-			expect(Experiments.isEnabled(experiments, EXPERIMENT_IDS.MULTI_FILE_APPLY_DIFF)).toBe(false)
+			expect(Experiments.isEnabled(experiments, EXPERIMENT_IDS.POWER_STEERING)).toBe(false)
 		})
 
-		it("returns true when experiment MULTI_FILE_APPLY_DIFF is enabled", () => {
+		it("returns true when experiment POWER_STEERING is enabled", () => {
 			const experiments: Record<ExperimentId, boolean> = {
-				multiFileApplyDiff: true,
+				powerSteering: true,
 				preventFocusDisruption: false,
 				imageGeneration: false,
 				runSlashCommand: false,
 				multipleNativeToolCalls: false,
 				customTools: false,
 			}
-			expect(Experiments.isEnabled(experiments, EXPERIMENT_IDS.MULTI_FILE_APPLY_DIFF)).toBe(true)
+			expect(Experiments.isEnabled(experiments, EXPERIMENT_IDS.POWER_STEERING)).toBe(true)
 		})
 
 		it("returns false when experiment is not present", () => {
 			const experiments: Record<ExperimentId, boolean> = {
-				multiFileApplyDiff: false,
+				powerSteering: false,
 				preventFocusDisruption: false,
 				imageGeneration: false,
 				runSlashCommand: false,
 				multipleNativeToolCalls: false,
 				customTools: false,
 			}
-			expect(Experiments.isEnabled(experiments, EXPERIMENT_IDS.MULTI_FILE_APPLY_DIFF)).toBe(false)
+			expect(Experiments.isEnabled(experiments, EXPERIMENT_IDS.POWER_STEERING)).toBe(false)
 		})
 	})
 })

src/shared/__tests__/modes.spec.ts

@@ -247,9 +247,8 @@ describe("isToolAllowedForMode", () => {
 			expect(isToolAllowedForMode("use_mcp_tool", "architect", [])).toBe(true)
 		})
 
-		it("applies restrictions to apply_diff with concurrent file edits (MULTI_FILE_APPLY_DIFF experiment)", () => {
+		it("applies restrictions to apply_diff", () => {
 			// Native-only: file restrictions for apply_diff are enforced against the top-level `path`.
-			// (Legacy XML args parsing has been removed.)
 
 			// Should allow markdown files in architect mode
 			expect(

src/shared/experiments.ts

@@ -1,7 +1,7 @@
 import type { AssertEqual, Equals, Keys, Values, ExperimentId, Experiments } from "@roo-code/types"
 
 export const EXPERIMENT_IDS = {
-	MULTI_FILE_APPLY_DIFF: "multiFileApplyDiff",
+	POWER_STEERING: "powerSteering",
 	PREVENT_FOCUS_DISRUPTION: "preventFocusDisruption",
 	IMAGE_GENERATION: "imageGeneration",
 	RUN_SLASH_COMMAND: "runSlashCommand",
@@ -18,7 +18,7 @@ interface ExperimentConfig {
 }
 
 export const experimentConfigsMap: Record<ExperimentKey, ExperimentConfig> = {
-	MULTI_FILE_APPLY_DIFF: { enabled: false },
+	POWER_STEERING: { enabled: false },
 	PREVENT_FOCUS_DISRUPTION: { enabled: false },
 	IMAGE_GENERATION: { enabled: false },
 	RUN_SLASH_COMMAND: { enabled: false },

webview-ui/src/components/settings/ExperimentalSettings.tsx

@@ -58,23 +58,6 @@ export const ExperimentalSettings = ({
 						const experimentKey = config[0]
 						const label = t(`settings:experimental.${experimentKey}.name`)
 
-						if (config[0] === "MULTI_FILE_APPLY_DIFF") {
-							return (
-								<SearchableSetting
-									key={config[0]}
-									settingId={`experimental-${config[0].toLowerCase()}`}
-									section="experimental"
-									label={label}>
-									<ExperimentalFeature
-										experimentKey={config[0]}
-										enabled={experiments[EXPERIMENT_IDS.MULTI_FILE_APPLY_DIFF] ?? false}
-										onChange={(enabled) =>
-											setExperimentEnabled(EXPERIMENT_IDS.MULTI_FILE_APPLY_DIFF, enabled)
-										}
-									/>
-								</SearchableSetting>
-							)
-						}
 						if (
 							config[0] === "IMAGE_GENERATION" &&
 							setImageGenerationProvider &&

webview-ui/src/context/__tests__/ExtensionStateContext.spec.tsx

@@ -233,7 +233,10 @@ describe("mergeExtensionState", () => {
 			...baseState,
 			apiConfiguration: { modelMaxThinkingTokens: 456, modelTemperature: 0.3 },
 			experiments: {
-				multiFileApplyDiff: true,
+				powerSteering: true,
+				marketplace: false,
+				disableCompletionCommand: false,
+				concurrentFileReads: true,
 				preventFocusDisruption: false,
 				imageGeneration: false,
 				runSlashCommand: false,
@@ -251,7 +254,10 @@ describe("mergeExtensionState", () => {
 		})
 
 		expect(result.experiments).toEqual({
-			multiFileApplyDiff: true,
+			powerSteering: true,
+			marketplace: false,
+			disableCompletionCommand: false,
+			concurrentFileReads: true,
 			preventFocusDisruption: false,
 			imageGeneration: false,
 			runSlashCommand: false,

webview-ui/src/i18n/locales/ca/settings.json

@@ -811,10 +811,6 @@
 			"name": "Habilitar Marketplace",
 			"description": "Quan està habilitat, pots instal·lar MCP i modes personalitzats del Marketplace."
 		},
-		"MULTI_FILE_APPLY_DIFF": {
-			"name": "Habilita edicions de fitxers concurrents",
-			"description": "Quan està activat, Roo pot editar múltiples fitxers en una sola petició. Quan està desactivat, Roo ha d'editar fitxers d'un en un. Desactivar això pot ajudar quan es treballa amb models menys capaços o quan vols més control sobre les modificacions de fitxers."
-		},
 		"PREVENT_FOCUS_DISRUPTION": {
 			"name": "Edició en segon pla",
 			"description": "Quan s'activa, evita la interrupció del focus de l'editor. Les edicions de fitxers es produeixen en segon pla sense obrir la vista diff o robar el focus. Pots continuar treballant sense interrupcions mentre Roo fa canvis. Els fitxers poden obrir-se sense focus per capturar diagnòstics o romandre completament tancats."

webview-ui/src/i18n/locales/de/settings.json

@@ -811,10 +811,6 @@
 			"name": "Marktplatz aktivieren",
 			"description": "Wenn aktiviert, können Sie MCPs und benutzerdefinierte Modi aus dem Marketplace installieren."
 		},
-		"MULTI_FILE_APPLY_DIFF": {
-			"name": "Gleichzeitige Dateibearbeitungen aktivieren",
-			"description": "Wenn aktiviert, kann Roo mehrere Dateien in einer einzigen Anfrage bearbeiten. Wenn deaktiviert, muss Roo Dateien einzeln bearbeiten. Das Deaktivieren kann hilfreich sein, wenn mit weniger fähigen Modellen gearbeitet wird oder wenn du mehr Kontrolle über Dateiänderungen haben möchtest."
-		},
 		"PREVENT_FOCUS_DISRUPTION": {
 			"name": "Hintergrundbearbeitung",
 			"description": "Verhindert Editor-Fokus-Störungen wenn aktiviert. Dateibearbeitungen erfolgen im Hintergrund ohne Öffnung von Diff-Ansichten oder Fokus-Diebstahl. Du kannst ungestört weiterarbeiten, während Roo Änderungen vornimmt. Dateien können ohne Fokus geöffnet werden, um Diagnosen zu erfassen oder vollständig geschlossen bleiben."

webview-ui/src/i18n/locales/en/settings.json

@@ -820,10 +820,6 @@
 			"name": "Enable Marketplace",
 			"description": "When enabled, you can install MCPs and custom modes from the Marketplace."
 		},
-		"MULTI_FILE_APPLY_DIFF": {
-			"name": "Enable concurrent file edits",
-			"description": "When enabled, Roo can edit multiple files in a single request. When disabled, Roo must edit files one at a time. Disabling this can help when working with less capable models or when you want more control over file modifications."
-		},
 		"PREVENT_FOCUS_DISRUPTION": {
 			"name": "Background editing",
 			"description": "Prevent editor focus disruption when enabled. File edits happen in the background without opening diff views or stealing focus. You can continue working uninterrupted while Roo makes changes. Files can be opened without focus to capture diagnostics or kept closed entirely."

webview-ui/src/i18n/locales/es/settings.json

@@ -811,10 +811,6 @@
 			"name": "Habilitar Marketplace",
 			"description": "Cuando está habilitado, puedes instalar MCP y modos personalizados del Marketplace."
 		},
-		"MULTI_FILE_APPLY_DIFF": {
-			"name": "Habilitar ediciones de archivos concurrentes",
-			"description": "Cuando está habilitado, Roo puede editar múltiples archivos en una sola solicitud. Cuando está deshabilitado, Roo debe editar archivos de uno en uno. Deshabilitar esto puede ayudar cuando trabajas con modelos menos capaces o cuando quieres más control sobre las modificaciones de archivos."
-		},
 		"PREVENT_FOCUS_DISRUPTION": {
 			"name": "Edición en segundo plano",
 			"description": "Previene la interrupción del foco del editor cuando está habilitado. Las ediciones de archivos ocurren en segundo plano sin abrir vistas de diferencias o robar el foco. Puedes continuar trabajando sin interrupciones mientras Roo realiza cambios. Los archivos pueden abrirse sin foco para capturar diagnósticos o mantenerse completamente cerrados."

webview-ui/src/i18n/locales/fr/settings.json

@@ -811,10 +811,6 @@
 			"name": "Activer le Marketplace",
 			"description": "Lorsque cette option est activée, tu peux installer des MCP et des modes personnalisés depuis le Marketplace."
 		},
-		"MULTI_FILE_APPLY_DIFF": {
-			"name": "Activer les éditions de fichiers concurrentes",
-			"description": "Lorsque cette option est activée, Roo peut éditer plusieurs fichiers en une seule requête. Lorsqu'elle est désactivée, Roo doit éditer les fichiers un par un. Désactiver cette option peut aider lorsque tu travailles avec des modèles moins capables ou lorsque tu veux plus de contrôle sur les modifications de fichiers."
-		},
 		"PREVENT_FOCUS_DISRUPTION": {
 			"name": "Édition en arrière-plan",
 			"description": "Empêche la perturbation du focus de l'éditeur lorsqu'activé. Les modifications de fichiers se font en arrière-plan sans ouvrir de vues de différences ou voler le focus. Vous pouvez continuer à travailler sans interruption pendant que Roo effectue des changements. Les fichiers peuvent être ouverts sans focus pour capturer les diagnostics ou rester complètement fermés."

webview-ui/src/i18n/locales/hi/settings.json

@@ -812,10 +812,6 @@
 			"name": "Marketplace सक्षम करें",
 			"description": "जब सक्षम होता है, तो आप Marketplace से MCP और कस्टम मोड इंस्टॉल कर सकते हैं।"
 		},
-		"MULTI_FILE_APPLY_DIFF": {
-			"name": "समानांतर फ़ाइल संपादन सक्षम करें",
-			"description": "जब सक्षम किया जाता है, तो Roo एक ही अनुरोध में कई फ़ाइलों को संपादित कर सकता है। जब अक्षम किया जाता है, तो Roo को एक समय में एक फ़ाइल संपादित करनी होगी। इसे अक्षम करना तब मदद कर सकता है जब आप कम सक्षम मॉडल के साथ काम कर रहे हों या जब आप फ़ाइल संशोधनों पर अधिक नियंत्रण चाहते हों।"
-		},
 		"PREVENT_FOCUS_DISRUPTION": {
 			"name": "बैकग्राउंड संपादन",
 			"description": "सक्षम होने पर एडिटर फोकस व्यवधान को रोकता है। फ़ाइल संपादन diff व्यू खोले बिना या फोकस चुराए बिना बैकग्राउंड में होता है। आप Roo के बदलाव करते समय बिना किसी बाधा के काम जारी रख सकते हैं। फ़ाइलें डायग्नोस्टिक्स कैप्चर करने के लिए बिना फोकस के खुल सकती हैं या पूरी तरह बंद रह सकती हैं।"

webview-ui/src/i18n/locales/id/settings.json

@@ -841,10 +841,6 @@
 			"name": "Aktifkan Marketplace",
 			"description": "Ketika diaktifkan, kamu dapat menginstal MCP dan mode kustom dari Marketplace."
 		},
-		"MULTI_FILE_APPLY_DIFF": {
-			"name": "Aktifkan edit file bersamaan",
-			"description": "Ketika diaktifkan, Roo dapat mengedit beberapa file dalam satu permintaan. Ketika dinonaktifkan, Roo harus mengedit file satu per satu. Menonaktifkan ini dapat membantu saat bekerja dengan model yang kurang mampu atau ketika kamu ingin kontrol lebih terhadap modifikasi file."
-		},
 		"PREVENT_FOCUS_DISRUPTION": {
 			"name": "Pengeditan Latar Belakang",
 			"description": "Ketika diaktifkan, mencegah gangguan fokus editor. Pengeditan file terjadi di latar belakang tanpa membuka tampilan diff atau mencuri fokus. Anda dapat terus bekerja tanpa gangguan saat Roo melakukan perubahan. File mungkin dibuka tanpa fokus untuk menangkap diagnostik atau tetap tertutup sepenuhnya."

webview-ui/src/i18n/locales/it/settings.json

@@ -812,10 +812,6 @@
 			"name": "Abilita Marketplace",
 			"description": "Quando abilitato, puoi installare MCP e modalità personalizzate dal Marketplace."
 		},
-		"MULTI_FILE_APPLY_DIFF": {
-			"name": "Abilita modifiche di file concorrenti",
-			"description": "Quando abilitato, Roo può modificare più file in una singola richiesta. Quando disabilitato, Roo deve modificare i file uno alla volta. Disabilitare questa opzione può aiutare quando lavori con modelli meno capaci o quando vuoi più controllo sulle modifiche dei file."
-		},
 		"PREVENT_FOCUS_DISRUPTION": {
 			"name": "Modifica in background",
 			"description": "Previene l'interruzione del focus dell'editor quando abilitato. Le modifiche ai file avvengono in background senza aprire viste di differenze o rubare il focus. Puoi continuare a lavorare senza interruzioni mentre Roo effettua modifiche. I file possono essere aperti senza focus per catturare diagnostiche o rimanere completamente chiusi."

webview-ui/src/i18n/locales/ja/settings.json

@@ -812,10 +812,6 @@
 			"name": "Marketplaceを有効にする",
 			"description": "有効にすると、MarketplaceからMCPとカスタムモードをインストールできます。"
 		},
-		"MULTI_FILE_APPLY_DIFF": {
-			"name": "同時ファイル編集を有効にする",
-			"description": "有効にすると、Rooは単一のリクエストで複数のファイルを編集できます。無効にすると、Rooはファイルを一つずつ編集する必要があります。これを無効にすることで、能力の低いモデルで作業する場合や、ファイル変更をより細かく制御したい場合に役立ちます。"
-		},
 		"PREVENT_FOCUS_DISRUPTION": {
 			"name": "バックグラウンド編集",
 			"description": "有効にすると、エディターのフォーカス中断を防ぎます。ファイル編集は差分ビューを開いたりフォーカスを奪ったりすることなく、バックグラウンドで行われます。Rooが変更を行っている間も中断されることなく作業を続けることができます。ファイルは診断をキャプチャするためにフォーカスなしで開くか、完全に閉じたままにできます。"

webview-ui/src/i18n/locales/ko/settings.json

@@ -812,10 +812,6 @@
 			"name": "Marketplace 활성화",
 			"description": "활성화하면 Marketplace에서 MCP와 사용자 정의 모드를 설치할 수 있습니다."
 		},
-		"MULTI_FILE_APPLY_DIFF": {
-			"name": "동시 파일 편집 활성화",
-			"description": "활성화하면 Roo가 단일 요청으로 여러 파일을 편집할 수 있습니다. 비활성화하면 Roo는 파일을 하나씩 편집해야 합니다. 이 기능을 비활성화하면 덜 강력한 모델로 작업하거나 파일 수정에 대한 더 많은 제어가 필요할 때 도움이 됩니다."
-		},
 		"PREVENT_FOCUS_DISRUPTION": {
 			"name": "백그라운드 편집",
 			"description": "활성화하면 편집기 포커스 방해를 방지합니다. 파일 편집이 diff 뷰를 열거나 포커스를 빼앗지 않고 백그라운드에서 수행됩니다. Roo가 변경사항을 적용하는 동안 방해받지 않고 계속 작업할 수 있습니다. 파일은 진단을 캡처하기 위해 포커스 없이 열거나 완전히 닫힌 상태로 유지할 수 있습니다."

webview-ui/src/i18n/locales/nl/settings.json

@@ -812,10 +812,6 @@
 			"name": "Marketplace inschakelen",
 			"description": "Wanneer ingeschakeld kun je MCP's en aangepaste modi uit de Marketplace installeren."
 		},
-		"MULTI_FILE_APPLY_DIFF": {
-			"name": "Gelijktijdige bestandsbewerkingen inschakelen",
-			"description": "Wanneer ingeschakeld, kan Roo meerdere bestanden in één verzoek bewerken. Wanneer uitgeschakeld, moet Roo bestanden één voor één bewerken. Het uitschakelen hiervan kan helpen wanneer je werkt met minder capabele modellen of wanneer je meer controle wilt over bestandswijzigingen."
-		},
 		"PREVENT_FOCUS_DISRUPTION": {
 			"name": "Achtergrondbewerking",
 			"description": "Voorkomt editor focus verstoring wanneer ingeschakeld. Bestandsbewerkingen gebeuren op de achtergrond zonder diff-weergaven te openen of focus te stelen. Je kunt ononderbroken doorwerken terwijl Roo wijzigingen aanbrengt. Bestanden kunnen zonder focus worden geopend om diagnostiek vast te leggen of volledig gesloten blijven."

webview-ui/src/i18n/locales/pl/settings.json

@@ -812,10 +812,6 @@
 			"name": "Włącz Marketplace",
 			"description": "Gdy włączone, możesz instalować MCP i niestandardowe tryby z Marketplace."
 		},
-		"MULTI_FILE_APPLY_DIFF": {
-			"name": "Włącz równoczesne edycje plików",
-			"description": "Gdy włączone, Roo może edytować wiele plików w jednym żądaniu. Gdy wyłączone, Roo musi edytować pliki jeden po drugim. Wyłączenie tego może pomóc podczas pracy z mniej zdolnymi modelami lub gdy chcesz mieć większą kontrolę nad modyfikacjami plików."
-		},
 		"PREVENT_FOCUS_DISRUPTION": {
 			"name": "Edycja w tle",
 			"description": "Zapobiega zakłócaniu fokusa edytora gdy włączone. Edycje plików odbywają się w tle bez otwierania widoków różnic lub kradzieży fokusa. Możesz kontynuować pracę bez przeszkód podczas gdy Roo wprowadza zmiany. Pliki mogą być otwierane bez fokusa aby przechwycić diagnostykę lub pozostać całkowicie zamknięte."

webview-ui/src/i18n/locales/pt-BR/settings.json

@@ -812,10 +812,6 @@
 			"name": "Ativar Marketplace",
 			"description": "Quando ativado, você pode instalar MCPs e modos personalizados do Marketplace."
 		},
-		"MULTI_FILE_APPLY_DIFF": {
-			"name": "Habilitar edições de arquivos concorrentes",
-			"description": "Quando habilitado, o Roo pode editar múltiplos arquivos em uma única solicitação. Quando desabilitado, o Roo deve editar arquivos um de cada vez. Desabilitar isso pode ajudar ao trabalhar com modelos menos capazes ou quando você quer mais controle sobre modificações de arquivos."
-		},
 		"PREVENT_FOCUS_DISRUPTION": {
 			"name": "Edição em segundo plano",
 			"description": "Previne a interrupção do foco do editor quando habilitado. As edições de arquivos acontecem em segundo plano sem abrir visualizações de diferenças ou roubar o foco. Você pode continuar trabalhando sem interrupções enquanto o Roo faz alterações. Os arquivos podem ser abertos sem foco para capturar diagnósticos ou permanecer completamente fechados."

webview-ui/src/i18n/locales/ru/settings.json

@@ -812,10 +812,6 @@
 			"name": "Включить Marketplace",
 			"description": "Когда включено, вы можете устанавливать MCP и пользовательские режимы из Marketplace."
 		},
-		"MULTI_FILE_APPLY_DIFF": {
-			"name": "Включить одновременное редактирование файлов",
-			"description": "Когда включено, Roo может редактировать несколько файлов в одном запросе. Когда отключено, Roo должен редактировать файлы по одному. Отключение этой функции может помочь при работе с менее способными моделями или когда вы хотите больше контроля над изменениями файлов."
-		},
 		"PREVENT_FOCUS_DISRUPTION": {
 			"name": "Фоновое редактирование",
 			"description": "Предотвращает нарушение фокуса редактора при включении. Редактирование файлов происходит в фоновом режиме без открытия представлений различий или кражи фокуса. Вы можете продолжать работать без перерывов, пока Roo вносит изменения. Файлы могут открываться без фокуса для захвата диагностики или оставаться полностью закрытыми."

webview-ui/src/i18n/locales/tr/settings.json

@@ -812,10 +812,6 @@
 			"name": "Marketplace'i Etkinleştir",
 			"description": "Etkinleştirildiğinde, Marketplace'ten MCP'leri ve özel modları yükleyebilirsiniz."
 		},
-		"MULTI_FILE_APPLY_DIFF": {
-			"name": "Eşzamanlı dosya düzenlemelerini etkinleştir",
-			"description": "Etkinleştirildiğinde, Roo tek bir istekte birden fazla dosyayı düzenleyebilir. Devre dışı bırakıldığında, Roo dosyaları tek tek düzenlemek zorundadır. Bunu devre dışı bırakmak, daha az yetenekli modellerle çalışırken veya dosya değişiklikleri üzerinde daha fazla kontrol istediğinde yardımcı olabilir."
-		},
 		"PREVENT_FOCUS_DISRUPTION": {
 			"name": "Arka plan düzenleme",
 			"description": "Etkinleştirildiğinde editör odak kesintisini önler. Dosya düzenlemeleri diff görünümlerini açmadan veya odağı çalmadan arka planda gerçekleşir. Roo değişiklikler yaparken kesintisiz çalışmaya devam edebilirsiniz. Dosyalar tanılamayı yakalamak için odaksız açılabilir veya tamamen kapalı kalabilir."

webview-ui/src/i18n/locales/vi/settings.json

@@ -812,10 +812,6 @@
 			"name": "Bật Marketplace",
 			"description": "Khi được bật, bạn có thể cài đặt MCP và chế độ tùy chỉnh từ Marketplace."
 		},
-		"MULTI_FILE_APPLY_DIFF": {
-			"name": "Bật chỉnh sửa tệp đồng thời",
-			"description": "Khi được bật, Roo có thể chỉnh sửa nhiều tệp trong một yêu cầu duy nhất. Khi bị tắt, Roo phải chỉnh sửa từng tệp một. Tắt tính năng này có thể hữu ích khi làm việc với các mô hình kém khả năng hơn hoặc khi bạn muốn kiểm soát nhiều hơn đối với các thay đổi tệp."
-		},
 		"PREVENT_FOCUS_DISRUPTION": {
 			"name": "Chỉnh sửa nền",
 			"description": "Khi được bật, ngăn chặn gián đoạn tiêu điểm trình soạn thảo. Việc chỉnh sửa tệp diễn ra ở nền mà không mở chế độ xem diff hoặc chiếm tiêu điểm. Bạn có thể tiếp tục làm việc không bị gián đoạn trong khi Roo thực hiện thay đổi. Các tệp có thể được mở mà không có tiêu điểm để thu thập chẩn đoán hoặc giữ hoàn toàn đóng."

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

@@ -812,10 +812,6 @@
 			"name": "启用 Marketplace",
 			"description": "启用后，你可以从 Marketplace 安装 MCP 和自定义模式。"
 		},
-		"MULTI_FILE_APPLY_DIFF": {
-			"name": "启用并发文件编辑",
-			"description": "启用后 Roo 可在单个请求中编辑多个文件。禁用后 Roo 必须逐个编辑文件。禁用此功能有助于使用能力较弱的模型或需要更精确控制文件修改时。"
-		},
 		"PREVENT_FOCUS_DISRUPTION": {
 			"name": "后台编辑",
 			"description": "启用后防止编辑器焦点干扰。文件编辑在后台进行，不会打开差异视图或抢夺焦点。你可以在 Roo 进行更改时继续不受干扰地工作。文件可以在不获取焦点的情况下打开以捕获诊断信息，或保持完全关闭状态。"

webview-ui/src/i18n/locales/zh-TW/settings.json

@@ -812,10 +812,6 @@
 			"name": "啟用 Marketplace",
 			"description": "啟用後，您可以從 Marketplace 安裝 MCP 和自訂模式。"
 		},
-		"MULTI_FILE_APPLY_DIFF": {
-			"name": "啟用並行檔案編輯",
-			"description": "啟用後 Roo 可在單個請求中編輯多個檔案。停用後 Roo 必須逐個編輯檔案。停用此功能有助於使用能力較弱的模型或需要更精確控制檔案修改時。"
-		},
 		"PREVENT_FOCUS_DISRUPTION": {
 			"name": "背景編輯",
 			"description": "啟用後可防止編輯器焦點中斷。檔案編輯會在背景進行，不會開啟 diff 檢視或搶奪焦點。您可以在 Roo 進行變更時繼續不受干擾地工作。檔案可能會在不獲得焦點的情況下開啟以捕獲診斷，或保持完全關閉。"