Merge pull request RooCodeInc#1125 from hannesrudolph/change_order_apply_diff

Improved diff editing use consistency

Author: mrubens

CHANGELOG.md

@@ -479,7 +479,7 @@ Join us at https://www.reddit.com/r/RooCode to share your custom modes and be pa
 ## [2.1.14]
 
 - Fix bug where diffs were not being applied correctly and try Aider's [unified diff prompt](https://github.com/Aider-AI/aider/blob/3995accd0ca71cea90ef76d516837f8c2731b9fe/aider/coders/udiff_prompts.py#L75-L105)
-- If diffs are enabled, automatically reject write_to_file commands that lead to truncated output
+- If diffs are enabled, automatically reject create_file commands that lead to truncated output
 
 ## [2.1.13]
 

src/api/transform/o1-format.ts

@@ -67,13 +67,13 @@ Description: Perform a regex search across files in a specified directory, provi
 </read_file>
 Description: Read the contents of a file at the specified path. Use this when you need to examine the contents of an existing file, for example to analyze code, review text files, or extract information from configuration files. Automatically extracts raw text from PDF and DOCX files. May not be suitable for other types of binary files, as it returns the raw content as a string.
 
-6. write_to_file:
-<write_to_file>
+6. create_file:
+<create_file>
 <path>File path here</path>
 <content>
 Your file content here
 </content>
-</write_to_file>
+</create_file>
 Description: Write content to a file at the specified path. If the file exists, it will be overwritten with the provided content. If the file doesn't exist, it will be created. Always provide the full intended content of the file, without any truncation. This tool will automatically create any directories needed to write the file.
 
 7. ask_followup_question:
@@ -107,7 +107,7 @@ Example 2: Using multiple tools
 
 Let's create two new configuration files for the web application: one for the frontend and one for the backend.
 
-<write_to_file>
+<create_file>
 <path>./frontend-config.json</path>
 <content>
 {
@@ -125,9 +125,9 @@ Let's create two new configuration files for the web application: one for the fr
   "version": "1.0.0"
 }
 </content>
-</write_to_file>
+</create_file>
 
-<write_to_file>
+<create_file>
 <path>./backend-config.yaml</path>
 <content>
 database:
@@ -154,7 +154,7 @@ externalServices:
   emailProvider: sendgrid
   storageProvider: aws-s3
 </content>
-</write_to_file>
+</create_file>
 
 Example 3: Asking a follow-up question
 
@@ -239,7 +239,7 @@ const toolNames = [
 	"list_code_definition_names",
 	"search_files",
 	"read_file",
-	"write_to_file",
+	"create_file",
 	"ask_followup_question",
 	"attempt_completion",
 ]
@@ -331,7 +331,7 @@ function validateToolInput(toolName: string, tool_input: Record<string, string>)
 			return "path" in tool_input
 		case "search_files":
 			return "path" in tool_input && "regex" in tool_input
-		case "write_to_file":
+		case "create_file":
 			return "path" in tool_input && "content" in tool_input
 		case "ask_followup_question":
 			return "question" in tool_input
@@ -349,10 +349,10 @@ function validateToolInput(toolName: string, tool_input: Record<string, string>)
 //   <command>ls -la</command>
 // </execute_command>
 
-// <write_to_file>
+// <create_file>
 //   <path>./example.txt</path>
 //   <content>Hello, World!</content>
-// </write_to_file>`;
+// </create_file>`;
 //
 // const { normalText, toolCalls } = parseAIResponse(aiResponse);
 // console.log(normalText);

src/core/Cline.ts

@@ -698,7 +698,7 @@ export class Cline {
 			text:
 				`[TASK RESUMPTION] This task was interrupted ${agoText}. It may or may not be complete, so please reassess the task context. Be aware that the project state may have changed since then. The current working directory is now '${cwd.toPosix()}'. If the task has not been completed, retry the last step before interruption and proceed with completing the task.\n\nNote: If you previously attempted a tool use that the user did not provide a result for, you should assume the tool use was not successful and assess whether you should retry. If the last tool was a browser_action, the browser has been closed and you must launch a new browser if needed.${
 					wasRecent
-						? "\n\nIMPORTANT: If the last tool use was a write_to_file that was interrupted, the file was reverted back to its original state before the interrupted edit, and you do NOT need to re-read the file as you already have its up-to-date contents."
+						? "\n\nIMPORTANT: If the last tool use was a create_file that was interrupted, the file was reverted back to its original state before the interrupted edit, and you do NOT need to re-read the file as you already have its up-to-date contents."
 						: ""
 				}` +
 				(responseText
@@ -1102,9 +1102,9 @@ export class Cline {
 							return `[${block.name} for '${block.params.command}']`
 						case "read_file":
 							return `[${block.name} for '${block.params.path}']`
-						case "write_to_file":
+						case "create_file":
 							return `[${block.name} for '${block.params.path}']`
-						case "apply_diff":
+						case "edit_file":
 							return `[${block.name} for '${block.params.path}']`
 						case "search_files":
 							return `[${block.name} for '${block.params.regex}'${
@@ -1256,7 +1256,7 @@ export class Cline {
 						mode ?? defaultModeSlug,
 						customModes ?? [],
 						{
-							apply_diff: this.diffEnabled,
+							edit_file: this.diffEnabled,
 						},
 						block.params,
 					)
@@ -1267,7 +1267,7 @@ export class Cline {
 				}
 
 				switch (block.name) {
-					case "write_to_file": {
+					case "create_file": {
 						const relPath: string | undefined = block.params.path
 						let newContent: string | undefined = block.params.content
 						let predictedLineCount: number | undefined = parseInt(block.params.line_count ?? "0")
@@ -1332,20 +1332,20 @@ export class Cline {
 							} else {
 								if (!relPath) {
 									this.consecutiveMistakeCount++
-									pushToolResult(await this.sayAndCreateMissingParamError("write_to_file", "path"))
+									pushToolResult(await this.sayAndCreateMissingParamError("create_file", "path"))
 									await this.diffViewProvider.reset()
 									break
 								}
 								if (!newContent) {
 									this.consecutiveMistakeCount++
-									pushToolResult(await this.sayAndCreateMissingParamError("write_to_file", "content"))
+									pushToolResult(await this.sayAndCreateMissingParamError("create_file", "content"))
 									await this.diffViewProvider.reset()
 									break
 								}
 								if (!predictedLineCount) {
 									this.consecutiveMistakeCount++
 									pushToolResult(
-										await this.sayAndCreateMissingParamError("write_to_file", "line_count"),
+										await this.sayAndCreateMissingParamError("create_file", "line_count"),
 									)
 									await this.diffViewProvider.reset()
 									break
@@ -1382,7 +1382,7 @@ export class Cline {
 											formatResponse.toolError(
 												`Content appears to be truncated (file has ${
 													newContent.split("\n").length
-												} lines but was predicted to have ${predictedLineCount} lines), and found comments indicating omitted code (e.g., '// rest of code unchanged', '/* previous code */'). Please provide the complete file content without any omissions if possible, or otherwise use the 'apply_diff' tool to apply the diff to the original file.`,
+												} lines but was predicted to have ${predictedLineCount} lines), and found comments indicating omitted code (e.g., '// rest of code unchanged', '/* previous code */'). Please provide the complete file content without any omissions if possible, or otherwise use the 'edit_file' tool to apply the diff to the original file.`,
 											),
 										)
 										break
@@ -1458,7 +1458,7 @@ export class Cline {
 							break
 						}
 					}
-					case "apply_diff": {
+					case "edit_file": {
 						const relPath: string | undefined = block.params.path
 						const diffContent: string | undefined = block.params.diff
 
@@ -1476,12 +1476,12 @@ export class Cline {
 							} else {
 								if (!relPath) {
 									this.consecutiveMistakeCount++
-									pushToolResult(await this.sayAndCreateMissingParamError("apply_diff", "path"))
+									pushToolResult(await this.sayAndCreateMissingParamError("edit_file", "path"))
 									break
 								}
 								if (!diffContent) {
 									this.consecutiveMistakeCount++
-									pushToolResult(await this.sayAndCreateMissingParamError("apply_diff", "diff"))
+									pushToolResult(await this.sayAndCreateMissingParamError("edit_file", "diff"))
 									break
 								}
 
@@ -2194,7 +2194,7 @@ export class Cline {
 											formatResponse.toolResult(
 												`The browser action has been executed. The console logs and screenshot have been captured for your analysis.\n\nConsole logs:\n${
 													browserActionResult.logs || "(No new logs)"
-												}\n\n(REMEMBER: if you need to proceed to using non-\`browser_action\` tools or launch a new browser, you MUST first close this browser. For example, if after analyzing the logs and screenshot you need to edit a file, you must first close the browser before you can use the write_to_file tool.)`,
+												}\n\n(REMEMBER: if you need to proceed to using non-\`browser_action\` tools or launch a new browser, you MUST first close this browser. For example, if after analyzing the logs and screenshot you need to edit a file, you must first close the browser before you can use the create_file tool.)`,
 												browserActionResult.screenshot ? [browserActionResult.screenshot] : [],
 											),
 										)
@@ -2711,7 +2711,7 @@ export class Cline {
 
 		/*
 		Seeing out of bounds is fine, it means that the next too call is being built up and ready to add to assistantMessageContent to present.
-		When you see the UI inactive during this, it means that a tool is breaking without presenting any UI. For example the write_to_file tool was breaking when relpath was undefined, and for invalid relpath it never presented UI.
+		When you see the UI inactive during this, it means that a tool is breaking without presenting any UI. For example the create_file tool was breaking when relpath was undefined, and for invalid relpath it never presented UI.
 		*/
 		this.presentAssistantMessageLocked = false // this needs to be placed here, if not then calling this.presentAssistantMessage below would fail (sometimes) since it's locked
 		// NOTE: when tool is rejected, iterator stream is interrupted and it waits for userMessageContentReady to be true. Future calls to present will skip execution since didRejectTool and iterate until contentIndex is set to message length and it sets userMessageContentReady to true itself (instead of preemptively doing it in iterator)
@@ -3261,10 +3261,10 @@ export class Cline {
 
 		// Add warning if not in code mode
 		if (
-			!isToolAllowedForMode("write_to_file", currentMode, customModes ?? [], {
-				apply_diff: this.diffEnabled,
+			!isToolAllowedForMode("create_file", currentMode, customModes ?? [], {
+				edit_file: this.diffEnabled,
 			}) &&
-			!isToolAllowedForMode("apply_diff", currentMode, customModes ?? [], { apply_diff: this.diffEnabled })
+			!isToolAllowedForMode("edit_file", currentMode, customModes ?? [], { edit_file: this.diffEnabled })
 		) {
 			const currentModeName = getModeBySlug(currentMode, customModes)?.name ?? currentMode
 			const defaultModeName = getModeBySlug(defaultModeSlug, customModes)?.name ?? defaultModeSlug

src/core/__tests__/mode-validator.test.ts

@@ -59,7 +59,7 @@ describe("mode-validator", () => {
 				]
 				// Should allow tools from read and edit groups
 				expect(isToolAllowedForMode("read_file", "custom-mode", customModes)).toBe(true)
-				expect(isToolAllowedForMode("write_to_file", "custom-mode", customModes)).toBe(true)
+				expect(isToolAllowedForMode("create_file", "custom-mode", customModes)).toBe(true)
 				// Should not allow tools from other groups
 				expect(isToolAllowedForMode("execute_command", "custom-mode", customModes)).toBe(false)
 			})
@@ -76,7 +76,7 @@ describe("mode-validator", () => {
 				// Should allow tools from read group
 				expect(isToolAllowedForMode("read_file", codeMode, customModes)).toBe(true)
 				// Should not allow tools from other groups
-				expect(isToolAllowedForMode("write_to_file", codeMode, customModes)).toBe(false)
+				expect(isToolAllowedForMode("create_file", codeMode, customModes)).toBe(false)
 			})
 
 			it("respects tool requirements in custom modes", () => {
@@ -88,39 +88,39 @@ describe("mode-validator", () => {
 						groups: ["edit"] as const,
 					},
 				]
-				const requirements = { apply_diff: false }
+				const requirements = { edit_file: false }
 
 				// Should respect disabled requirement even if tool group is allowed
-				expect(isToolAllowedForMode("apply_diff", "custom-mode", customModes, requirements)).toBe(false)
+				expect(isToolAllowedForMode("edit_file", "custom-mode", customModes, requirements)).toBe(false)
 
 				// Should allow other edit tools
-				expect(isToolAllowedForMode("write_to_file", "custom-mode", customModes, requirements)).toBe(true)
+				expect(isToolAllowedForMode("create_file", "custom-mode", customModes, requirements)).toBe(true)
 			})
 		})
 
 		describe("tool requirements", () => {
 			it("respects tool requirements when provided", () => {
-				const requirements = { apply_diff: false }
-				expect(isToolAllowedForMode("apply_diff", codeMode, [], requirements)).toBe(false)
+				const requirements = { edit_file: false }
+				expect(isToolAllowedForMode("edit_file", codeMode, [], requirements)).toBe(false)
 
-				const enabledRequirements = { apply_diff: true }
-				expect(isToolAllowedForMode("apply_diff", codeMode, [], enabledRequirements)).toBe(true)
+				const enabledRequirements = { edit_file: true }
+				expect(isToolAllowedForMode("edit_file", codeMode, [], enabledRequirements)).toBe(true)
 			})
 
 			it("allows tools when their requirements are not specified", () => {
 				const requirements = { some_other_tool: true }
-				expect(isToolAllowedForMode("apply_diff", codeMode, [], requirements)).toBe(true)
+				expect(isToolAllowedForMode("edit_file", codeMode, [], requirements)).toBe(true)
 			})
 
 			it("handles undefined and empty requirements", () => {
-				expect(isToolAllowedForMode("apply_diff", codeMode, [], undefined)).toBe(true)
-				expect(isToolAllowedForMode("apply_diff", codeMode, [], {})).toBe(true)
+				expect(isToolAllowedForMode("edit_file", codeMode, [], undefined)).toBe(true)
+				expect(isToolAllowedForMode("edit_file", codeMode, [], {})).toBe(true)
 			})
 
 			it("prioritizes requirements over mode configuration", () => {
-				const requirements = { apply_diff: false }
+				const requirements = { edit_file: false }
 				// Even in code mode which allows all tools, disabled requirement should take precedence
-				expect(isToolAllowedForMode("apply_diff", codeMode, [], requirements)).toBe(false)
+				expect(isToolAllowedForMode("edit_file", codeMode, [], requirements)).toBe(false)
 			})
 		})
 	})
@@ -137,19 +137,19 @@ describe("mode-validator", () => {
 		})
 
 		it("throws error when tool requirement is not met", () => {
-			const requirements = { apply_diff: false }
-			expect(() => validateToolUse("apply_diff", codeMode, [], requirements)).toThrow(
-				'Tool "apply_diff" is not allowed in code mode.',
+			const requirements = { edit_file: false }
+			expect(() => validateToolUse("edit_file", codeMode, [], requirements)).toThrow(
+				'Tool "edit_file" is not allowed in code mode.',
 			)
 		})
 
 		it("does not throw when tool requirement is met", () => {
-			const requirements = { apply_diff: true }
-			expect(() => validateToolUse("apply_diff", codeMode, [], requirements)).not.toThrow()
+			const requirements = { edit_file: true }
+			expect(() => validateToolUse("edit_file", codeMode, [], requirements)).not.toThrow()
 		})
 
 		it("handles undefined requirements gracefully", () => {
-			expect(() => validateToolUse("apply_diff", codeMode, [], undefined)).not.toThrow()
+			expect(() => validateToolUse("edit_file", codeMode, [], undefined)).not.toThrow()
 		})
 	})
 })

src/core/assistant-message/index.ts

@@ -11,8 +11,8 @@ export interface TextContent {
 export const toolUseNames = [
 	"execute_command",
 	"read_file",
-	"write_to_file",
-	"apply_diff",
+	"create_file",
+	"edit_file",
 	"insert_content",
 	"search_and_replace",
 	"search_files",
@@ -80,7 +80,7 @@ export interface ReadFileToolUse extends ToolUse {
 }
 
 export interface WriteToFileToolUse extends ToolUse {
-	name: "write_to_file"
+	name: "create_file"
 	params: Partial<Pick<Record<ToolParamName, string>, "path" | "content" | "line_count">>
 }
 

src/core/assistant-message/parse-assistant-message.ts

@@ -61,9 +61,9 @@ export function parseAssistantMessage(assistantMessage: string) {
 
 				// there's no current param, and not starting a new param
 
-				// special case for write_to_file where file contents could contain the closing tag, in which case the param would have closed and we end up with the rest of the file contents here. To work around this, we get the string between the starting content tag and the LAST content tag.
+				// special case for create_file where file contents could contain the closing tag, in which case the param would have closed and we end up with the rest of the file contents here. To work around this, we get the string between the starting content tag and the LAST content tag.
 				const contentParamName: ToolParamName = "content"
-				if (currentToolUse.name === "write_to_file" && accumulator.endsWith(`</${contentParamName}>`)) {
+				if (currentToolUse.name === "create_file" && accumulator.endsWith(`</${contentParamName}>`)) {
 					const toolContent = accumulator.slice(currentToolUseStartIndex)
 					const contentStartTag = `<${contentParamName}>`
 					const contentEndTag = `</${contentParamName}>`

src/core/diff/strategies/__tests__/new-unified.test.ts

@@ -29,7 +29,7 @@ describe("main", () => {
 			const cwd = "/test/path"
 			const description = strategy.getToolDescription({ cwd })
 
-			expect(description).toContain("apply_diff Tool - Generate Precise Code Changes")
+			expect(description).toContain("edit_file Tool - Generate Precise Code Changes")
 			expect(description).toContain(cwd)
 			expect(description).toContain("Step-by-Step Instructions")
 			expect(description).toContain("Requirements")

src/core/diff/strategies/__tests__/search-replace.test.ts

@@ -1544,8 +1544,8 @@ function two() {
 			expect(description).toContain("<<<<<<< SEARCH")
 			expect(description).toContain("=======")
 			expect(description).toContain(">>>>>>> REPLACE")
-			expect(description).toContain("<apply_diff>")
-			expect(description).toContain("</apply_diff>")
+			expect(description).toContain("<edit_file>")
+			expect(description).toContain("</edit_file>")
 		})
 
 		it("should document start_line and end_line parameters", async () => {

src/core/diff/strategies/__tests__/unified.test.ts

@@ -12,7 +12,7 @@ describe("UnifiedDiffStrategy", () => {
 			const cwd = "/test/path"
 			const description = strategy.getToolDescription({ cwd })
 
-			expect(description).toContain("apply_diff")
+			expect(description).toContain("edit_file")
 			expect(description).toContain(cwd)
 			expect(description).toContain("Parameters:")
 			expect(description).toContain("Format Requirements:")

src/core/diff/strategies/new-unified/index.ts

@@ -108,7 +108,7 @@ export class NewUnifiedDiffStrategy implements DiffStrategy {
 	}
 
 	getToolDescription(args: { cwd: string; toolOptions?: { [key: string]: string } }): string {
-		return `# apply_diff Tool - Generate Precise Code Changes
+		return `# edit_file Tool - Generate Precise Code Changes
 
 Generate a unified diff that can be cleanly applied to modify code files.
 
@@ -168,12 +168,12 @@ Parameters:
 - diff: (required) Unified diff content in unified format to apply to the file.
 
 Usage:
-<apply_diff>
+<edit_file>
 <path>path/to/file.ext</path>
 <diff>
 Your diff here
 </diff>
-</apply_diff>`
+</edit_file>`
 	}
 
 	// Helper function to split a hunk into smaller hunks based on contiguous changes