From 2f72f615abf846e6e752519f1f96fe87da8e1d3e Mon Sep 17 00:00:00 2001 From: Hannes Rudolph Date: Thu, 25 Sep 2025 11:37:57 -0600 Subject: [PATCH 1/2] Correct tool use suggestion to improve model adherence to suggestion --- src/core/tools/multiApplyDiffTool.ts | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/core/tools/multiApplyDiffTool.ts b/src/core/tools/multiApplyDiffTool.ts index d0fe65575034..457e5c1c2d0b 100644 --- a/src/core/tools/multiApplyDiffTool.ts +++ b/src/core/tools/multiApplyDiffTool.ts @@ -463,7 +463,7 @@ Error: ${failPart.error} Suggested fixes: 1. Verify the search content exactly matches the file content (including whitespace and case) 2. Check for correct indentation and line endings -3. Use to see the current file content +3. Use the read_file tool to verify the current file content 4. Consider breaking complex changes into smaller diffs 5. Ensure start_line parameter matches the actual content location ${errorDetails ? `\nDetailed error information:\n${errorDetails}\n` : ""} @@ -476,7 +476,7 @@ Unable to apply diffs to file: ${absolutePath} Error: ${diffResult.error} Recovery suggestions: -1. Use to examine the current file content +1. Use the read_file tool to verify the current file content 2. Verify the diff format matches the expected search/replace pattern 3. Check that the search content exactly matches what's in the file 4. Consider using line numbers with start_line parameter From 7b5fbbddb60417dd9c538739b0d5d328a09aed18 Mon Sep 17 00:00:00 2001 From: Hannes Rudolph Date: Thu, 25 Sep 2025 11:42:30 -0600 Subject: [PATCH 2/2] tweak --- src/core/tools/multiApplyDiffTool.ts | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/core/tools/multiApplyDiffTool.ts b/src/core/tools/multiApplyDiffTool.ts index 457e5c1c2d0b..a30778c5af0d 100644 --- a/src/core/tools/multiApplyDiffTool.ts +++ b/src/core/tools/multiApplyDiffTool.ts @@ -463,7 +463,7 @@ Error: ${failPart.error} Suggested fixes: 1. Verify the search content exactly matches the file content (including whitespace and case) 2. Check for correct indentation and line endings -3. Use the read_file tool to verify the current file content +3. Use the read_file tool to verify the file's current contents 4. Consider breaking complex changes into smaller diffs 5. Ensure start_line parameter matches the actual content location ${errorDetails ? `\nDetailed error information:\n${errorDetails}\n` : ""} @@ -476,7 +476,7 @@ Unable to apply diffs to file: ${absolutePath} Error: ${diffResult.error} Recovery suggestions: -1. Use the read_file tool to verify the current file content +1. Use the read_file tool to verify the file's current contents 2. Verify the diff format matches the expected search/replace pattern 3. Check that the search content exactly matches what's in the file 4. Consider using line numbers with start_line parameter