Restore apply_diff tool, correctly controlled by diffEnabled.

Author: mcowger

packages/types/src/tool.ts

@@ -33,6 +33,7 @@ export const toolNames = [
 	"fetch_instructions",
 	"codebase_search",
 	// kilocode_change start
+	"search_and_replace",
 	"edit_file",
 	"new_rule",
 	"report_bug",

src/core/prompts/tools/__tests__/filter-tools-for-mode.spec.ts

@@ -118,7 +118,6 @@ describe("filterNativeToolsForMode", () => {
 		// Should include all tools (code mode has all groups)
 		expect(toolNames).toContain("read_file")
 		expect(toolNames).toContain("write_to_file")
-		expect(toolNames).toContain("apply_diff")
 		expect(toolNames).toContain("execute_command")
 		expect(toolNames).toContain("browser_action")
 		expect(toolNames).toContain("ask_followup_question")

src/core/prompts/tools/filter-tools-for-mode.ts

@@ -97,6 +97,18 @@ export function filterNativeToolsForMode(
 		allowedToolNames.delete("run_slash_command")
 	}
 
+	// Conditionally exclude run_slash_command if experiment is not enabled
+	if (!experiments?.runSlashCommand) {
+		allowedToolNames.delete("run_slash_command")
+	}
+
+	// Conditionally exclude apply_diff if disabled in settings
+	if (state?.apiConfiguration?.diffEnabled != true) {
+		allowedToolNames.delete("apply_diff")
+	} else {
+		allowedToolNames.add("search_and_replace")
+	}
+
 	// Conditionally exclude browser_action if disabled in settings
 	if (
 		settings?.browserToolEnabled === false ||

src/core/prompts/tools/native-tools/apply_diff.ts

@@ -1,6 +1,6 @@
 import type OpenAI from "openai"
 
-export const apply_diff_single_file = {
+export const apply_diff = {
 	type: "function",
 	function: {
 		name: "apply_diff",

src/core/prompts/tools/native-tools/index.ts

@@ -16,7 +16,7 @@ import searchFiles from "./search_files"
 import switchMode from "./switch_mode"
 import updateTodoList from "./update_todo_list"
 import writeToFile from "./write_to_file"
-// import { apply_diff_single_file } from "./apply_diff" // kilocode_change
+import { apply_diff } from "./apply_diff" // kilocode_change
 
 import searchAndReplace from "./kilocode/search_and_replace"
 import deleteFile from "./kilocode/delete_file"
@@ -47,6 +47,7 @@ export const nativeTools = [
 	listFiles,
 	newTask,
 	read_file,
+	apply_diff, //kilocode_change
 	runSlashCommand,
 	searchFiles,
 	switchMode,

src/core/prompts/tools/native-tools/kilocode/search_and_replace.ts

@@ -16,7 +16,7 @@ export type SearchAndReplaceParameters = z.infer<typeof SearchAndReplaceParamete
 export default {
 	type: "function",
 	function: {
-		name: "apply_diff",
+		name: "search_and_replace",
 		description: "Replace a specific string in a file with a new string. This is used for making precise edits.",
 		strict: true,
 		parameters: z.toJSONSchema(SearchAndReplaceParametersSchema),

src/core/tools/kilocode/searchAndReplaceTool.ts

@@ -100,7 +100,7 @@ export async function searchAndReplaceTool(
 
 		if (!fileExists) {
 			cline.consecutiveMistakeCount++
-			cline.recordToolError("apply_diff", "file_does_not_exist")
+			cline.recordToolError("search_and_replace", "file_does_not_exist")
 			const formattedError = formatResponse.toolError(
 				`File does not exist at path: ${absolutePath}\nThe specified file could not be found. Please verify the file path and try again.`,
 			)
@@ -118,7 +118,7 @@ export async function searchAndReplaceTool(
 			fileContent = await fs.readFile(absolutePath, "utf-8")
 		} catch (error) {
 			cline.consecutiveMistakeCount++
-			cline.recordToolError("apply_diff", "exception")
+			cline.recordToolError("search_and_replace", "exception")
 			const errorMessage = `Error reading file: ${absolutePath}\nFailed to read the file content: ${
 				error instanceof Error ? error.message : String(error)
 			}\nPlease verify file permissions and try again.`
@@ -138,7 +138,7 @@ export async function searchAndReplaceTool(
 		const matchCount = fileContent.match(searchPattern)?.length ?? 0
 		if (matchCount > 1) {
 			cline.consecutiveMistakeCount++
-			cline.recordToolError("apply_diff", "multiple_matches")
+			cline.recordToolError("search_and_replace", "multiple_matches")
 			pushToolResult(
 				formatResponse.toolError(
 					`Found ${matchCount} matches for replacement text. Please provide more context to make a unique match.`,
@@ -156,7 +156,7 @@ export async function searchAndReplaceTool(
 		const diff = formatResponse.createPrettyPatch(validRelPath, fileContent, newContent)
 		if (!diff) {
 			cline.consecutiveMistakeCount++
-			cline.recordToolError("apply_diff", "no_match")
+			cline.recordToolError("search_and_replace", "no_match")
 			pushToolResult(
 				formatResponse.toolError(
 					`No match found for replacement in '${validRelPath}'. Please check your text and try again.`,
@@ -227,7 +227,7 @@ export async function searchAndReplaceTool(
 		pushToolResult(message)
 
 		// Record successful tool usage and cleanup
-		cline.recordToolUsage("apply_diff")
+		cline.recordToolUsage("search_and_replace")
 		await cline.diffViewProvider.reset()
 
 		// Process any queued messages after file edit completes

src/shared/tools.ts

@@ -253,6 +253,7 @@ export const TOOL_DISPLAY_NAMES: Record<ToolName, string> = {
 	write_to_file: "write files",
 	apply_diff: "apply changes",
 	// kilocode_change start
+	search_and_replace: "search and replace contents in files",
 	edit_file: "edit file",
 	delete_file: "delete files",
 	report_bug: "report bug",
@@ -291,6 +292,7 @@ export const TOOL_GROUPS: Record<ToolGroup, ToolGroupConfig> = {
 	edit: {
 		tools: [
 			"apply_diff",
+			"search_and_replace", // kilocode_change
 			"edit_file", // kilocode_change: Morph fast apply
 			"write_to_file",
 			"delete_file", // kilocode_change