Merge remote-tracking branch 'origin/main' into feat/improve-insert-block-content

Author: mrubens

evals/packages/types/src/roo-code-defaults.ts

@@ -56,7 +56,6 @@ export const rooCodeDefaults: RooCodeSettings = {
 	diffEnabled: true,
 	fuzzyMatchThreshold: 1.0,
 	experiments: {
-		search_and_replace: false,
 		powerSteering: false,
 	},
 

evals/packages/types/src/roo-code.ts

@@ -271,7 +271,7 @@ export type CustomSupportPrompts = z.infer<typeof customSupportPromptsSchema>
  * ExperimentId
  */
 
-export const experimentIds = ["search_and_replace", "powerSteering"] as const
+export const experimentIds = ["powerSteering"] as const
 
 export const experimentIdsSchema = z.enum(experimentIds)
 
@@ -282,7 +282,6 @@ export type ExperimentId = z.infer<typeof experimentIdsSchema>
  */
 
 const experimentsSchema = z.object({
-	search_and_replace: z.boolean(),
 	powerSteering: z.boolean(),
 })
 

src/core/prompts/__tests__/__snapshots__/system.test.ts.snap

@@ -170,9 +170,7 @@ describe("SYSTEM_PROMPT", () => {
 
 	beforeEach(() => {
 		// Reset experiments before each test to ensure they're disabled by default
-		experiments = {
-			[EXPERIMENT_IDS.SEARCH_AND_REPLACE]: false,
-		}
+		experiments = {}
 	})
 
 	beforeEach(() => {
@@ -477,163 +475,6 @@ describe("SYSTEM_PROMPT", () => {
 		expect(prompt.indexOf(modes[0].roleDefinition)).toBeLessThan(prompt.indexOf("TOOL USE"))
 	})
 
-	describe("experimental tools", () => {
-		it("should disable experimental tools by default", async () => {
-			// Set experiments to explicitly disable experimental tools
-			const experimentsConfig = {
-				[EXPERIMENT_IDS.SEARCH_AND_REPLACE]: false,
-			}
-
-			// Reset experiments
-			experiments = experimentsConfig
-
-			const prompt = await SYSTEM_PROMPT(
-				mockContext,
-				"/test/path",
-				false, // supportsComputerUse
-				undefined, // mcpHub
-				undefined, // diffStrategy
-				undefined, // browserViewportSize
-				defaultModeSlug, // mode
-				undefined, // customModePrompts
-				undefined, // customModes
-				undefined, // globalCustomInstructions
-				undefined, // diffEnabled
-				experimentsConfig, // Explicitly disable experimental tools
-				true, // enableMcpServerCreation
-			)
-
-			// Check that experimental tool sections are not included
-			const toolSections = prompt.split("\n## ").slice(1)
-			const toolNames = toolSections.map((section) => section.split("\n")[0].trim())
-			expect(toolNames).not.toContain("search_and_replace")
-			expect(prompt).toMatchSnapshot()
-		})
-
-		it("should enable experimental tools when explicitly enabled", async () => {
-			// Set experiments for testing experimental features
-			const experimentsEnabled = {
-				[EXPERIMENT_IDS.SEARCH_AND_REPLACE]: true,
-			}
-
-			// Reset default experiments
-			experiments = undefined
-
-			const prompt = await SYSTEM_PROMPT(
-				mockContext,
-				"/test/path",
-				false, // supportsComputerUse
-				undefined, // mcpHub
-				undefined, // diffStrategy
-				undefined, // browserViewportSize
-				defaultModeSlug, // mode
-				undefined, // customModePrompts
-				undefined, // customModes
-				undefined, // globalCustomInstructions
-				undefined, // diffEnabled
-				experimentsEnabled, // Use the enabled experiments
-				true, // enableMcpServerCreation
-			)
-
-			// Get all tool sections
-			const toolSections = prompt.split("## ").slice(1) // Split by section headers and remove first non-tool part
-			const toolNames = toolSections.map((section) => section.split("\n")[0].trim())
-
-			// Verify experimental tools are included in the prompt when enabled
-			expect(toolNames).toContain("search_and_replace")
-			expect(prompt).toMatchSnapshot()
-		})
-
-		it("should selectively enable experimental tools", async () => {
-			// Set experiments for testing selective enabling
-			const experimentsSelective = {
-				[EXPERIMENT_IDS.SEARCH_AND_REPLACE]: true,
-			}
-
-			// Reset default experiments
-			experiments = undefined
-
-			const prompt = await SYSTEM_PROMPT(
-				mockContext,
-				"/test/path",
-				false, // supportsComputerUse
-				undefined, // mcpHub
-				undefined, // diffStrategy
-				undefined, // browserViewportSize
-				defaultModeSlug, // mode
-				undefined, // customModePrompts
-				undefined, // customModes
-				undefined, // globalCustomInstructions
-				undefined, // diffEnabled
-				experimentsSelective, // Use the selective experiments
-				true, // enableMcpServerCreation
-			)
-
-			// Get all tool sections
-			const toolSections = prompt.split("## ").slice(1) // Split by section headers and remove first non-tool part
-			const toolNames = toolSections.map((section) => section.split("\n")[0].trim())
-
-			// Verify only enabled experimental tools are included
-			expect(toolNames).toContain("search_and_replace")
-			expect(prompt).toMatchSnapshot()
-		})
-
-		it("should list all available editing tools in base instruction", async () => {
-			const experiments = {
-				[EXPERIMENT_IDS.SEARCH_AND_REPLACE]: true,
-			}
-
-			const prompt = await SYSTEM_PROMPT(
-				mockContext,
-				"/test/path",
-				false,
-				undefined,
-				new MultiSearchReplaceDiffStrategy(),
-				undefined,
-				defaultModeSlug,
-				undefined,
-				undefined,
-				undefined,
-				true, // diffEnabled
-				experiments, // experiments
-				true, // enableMcpServerCreation
-			)
-
-			// Verify base instruction lists all available tools
-			expect(prompt).toContain("apply_diff (for replacing lines in existing files)")
-			expect(prompt).toContain("write_to_file (for creating new files or complete file rewrites)")
-			expect(prompt).toContain("insert_content (for adding lines to existing files)")
-			expect(prompt).toContain("search_and_replace (for finding and replacing individual pieces of text)")
-		})
-		it("should provide detailed instructions for each enabled tool", async () => {
-			const experiments = {
-				[EXPERIMENT_IDS.SEARCH_AND_REPLACE]: true,
-			}
-
-			const prompt = await SYSTEM_PROMPT(
-				mockContext,
-				"/test/path",
-				false,
-				undefined,
-				new MultiSearchReplaceDiffStrategy(),
-				undefined,
-				defaultModeSlug,
-				undefined,
-				undefined,
-				undefined,
-				true, // diffEnabled
-				experiments,
-				true, // enableMcpServerCreation
-			)
-
-			// Verify detailed instructions for each tool
-			expect(prompt).toContain(
-				"You should always prefer using other editing tools over write_to_file when making changes to existing files since write_to_file is much slower and cannot handle large files.",
-			)
-			expect(prompt).toContain("The search_and_replace tool finds and replaces text or regex in files")
-		})
-	})
-
 	afterAll(() => {
 		jest.restoreAllMocks()
 	})

src/core/prompts/__tests__/system.test.ts

@@ -15,12 +15,8 @@ function getEditingInstructions(diffStrategy?: DiffStrategy, experiments?: Recor
 	}
 
 	availableTools.push("append_to_file (for appending content to the end of files)")
-
 	availableTools.push("insert_content (for adding lines to existing files)")
-
-	if (experiments?.["search_and_replace"]) {
-		availableTools.push("search_and_replace (for finding and replacing individual pieces of text)")
-	}
+	availableTools.push("search_and_replace (for finding and replacing individual pieces of text)")
 
 	// Base editing instruction mentioning all available tools
 	if (availableTools.length > 1) {
@@ -35,11 +31,9 @@ function getEditingInstructions(diffStrategy?: DiffStrategy, experiments?: Recor
 		"- The insert_content tool adds lines of text to files at a specific line number, such as adding a new function to a JavaScript file or inserting a new route in a Python file. Use line number 0 to append at the end of the file, or any positive number to insert before that line.",
 	)
 
-	if (experiments?.["search_and_replace"]) {
-		instructions.push(
-			"- The search_and_replace tool finds and replaces text or regex in files. This tool allows you to search for a specific regex pattern or text and replace it with another value. Be cautious when using this tool to ensure you are replacing the correct text. It can support multiple operations at once.",
-		)
-	}
+	instructions.push(
+		"- The search_and_replace tool finds and replaces text or regex in files. This tool allows you to search for a specific regex pattern or text and replace it with another value. Be cautious when using this tool to ensure you are replacing the correct text. It can support multiple operations at once.",
+	)
 
 	if (availableTools.length > 1) {
 		instructions.push(

src/core/prompts/sections/rules.ts

@@ -2,51 +2,38 @@ import { ToolArgs } from "./types"
 
 export function getSearchAndReplaceDescription(args: ToolArgs): string {
 	return `## search_and_replace
-Description: Request to perform search and replace operations on a file. Each operation can specify a search pattern (string or regex) and replacement text, with optional line range restrictions and regex flags. Shows a diff preview before applying changes.
-Parameters:
-- path: (required) The path of the file to modify (relative to the current workspace directory ${args.cwd.toPosix()})
-- operations: (required) A JSON array of search/replace operations. Each operation is an object with:
-    * search: (required) The text or pattern to search for
-    * replace: (required) The text to replace matches with. If multiple lines need to be replaced, use "\n" for newlines
-    * start_line: (optional) Starting line number for restricted replacement
-    * end_line: (optional) Ending line number for restricted replacement
-    * use_regex: (optional) Whether to treat search as a regex pattern
-    * ignore_case: (optional) Whether to ignore case when matching
-    * regex_flags: (optional) Additional regex flags when use_regex is true
-Usage:
-<search_and_replace>
-<path>File path here</path>
-<operations>[
-  {
-    "search": "text to find",
-    "replace": "replacement text",
-    "start_line": 1,
-    "end_line": 10
-  }
-]</operations>
-</search_and_replace>
-Example: Replace "foo" with "bar" in lines 1-10 of example.ts
+Description: Request to perform a search and replace operation on a file. Supports both literal text and regex patterns. Shows a diff preview before applying changes.
+
+Required Parameters:
+- path: The path of the file to modify (relative to the current workspace directory ${args.cwd.toPosix()})
+- search: The text or pattern to search for
+- replace: The text to replace matches with
+
+Optional Parameters:
+- start_line: Starting line number for restricted replacement (1-based)
+- end_line: Ending line number for restricted replacement (1-based)
+- use_regex: Set to "true" to treat search as a regex pattern (default: false)
+- ignore_case: Set to "true" to ignore case when matching (default: false)
+
+Notes:
+- When use_regex is true, the search parameter is treated as a regular expression pattern
+- When ignore_case is true, the search is case-insensitive regardless of regex mode
+
+Examples:
+
+1. Simple text replacement:
 <search_and_replace>
 <path>example.ts</path>
-<operations>[
-  {
-    "search": "foo",
-    "replace": "bar",
-    "start_line": 1,
-    "end_line": 10
-  }
-]</operations>
+<search>oldText</search>
+<replace>newText</replace>
 </search_and_replace>
-Example: Replace all occurrences of "old" with "new" using regex
+
+2. Case-insensitive regex pattern:
 <search_and_replace>
 <path>example.ts</path>
-<operations>[
-  {
-    "search": "old\\w+",
-    "replace": "new$&",
-    "use_regex": true,
-    "ignore_case": true
-  }
-]</operations>
+<search>old\w+</search>
+<replace>new$&</replace>
+<use_regex>true</use_regex>
+<ignore_case>true</ignore_case>
 </search_and_replace>`
 }