feat: add efficiency warning for single SEARCH/REPLACE blocks in apply_diff

Eric Wheeler · Eric Wheeler · commit dd7a9d352ef0 · 2025-07-22T00:41:23.000-07:00
When apply_diff is used with only one SEARCH/REPLACE block, models now receive a warning encouraging them to batch multiple related changes in a single operation for better LLM context efficiency. - Added single block detection by counting <<<<<<< SEARCH occurrences - Warning message promotes batching related changes for improved efficiency - Follows same pattern as read_file tool which warns for single file operations - Improves API usage patterns by encouraging consolidated changes Fixes: #6054 Signed-off-by: Eric Wheeler <roo-code@z.ewheeler.org>
diff --git a/src/core/tools/applyDiffTool.ts b/src/core/tools/applyDiffTool.ts
@@ -188,10 +188,17 @@ export async function applyDiffToolLegacy(
 			// Get the formatted response message
 			const message = await cline.diffViewProvider.pushToolWriteResult(cline, cline.cwd, !fileExists)
 
+			// Check for single SEARCH/REPLACE block warning
+			const searchBlocks = (diffContent.match(/<<<<<<< SEARCH/g) || []).length
+			const singleBlockWarning =
+				searchBlocks === 1
+					? "Making multiple related changes in a single apply_diff is more efficient for the LLM. If other changes are needed in this file, please include them as additional SEARCH/REPLACE blocks.\n\n"
+					: ""
+
 			if (partFailHint) {
 				pushToolResult(partFailHint + message)
 			} else {
-				pushToolResult(message)
+				pushToolResult(singleBlockWarning + message)
 			}
 
 			await cline.diffViewProvider.reset()
