Automatically reject truncated writes if diffs are enabled

Author: mrubens

CHANGELOG.md

@@ -3,6 +3,7 @@
 ## [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
 
 ## [2.1.13]
 
@@ -51,4 +52,4 @@
 ## [2.1.2]
 
 - Support for auto-approval of write operations and command execution
-- Support for .clinerules custom instructions
+- Support for .clinerules custom instructions

src/core/Cline.ts

@@ -46,7 +46,7 @@ import { formatResponse } from "./prompts/responses"
 import { addCustomInstructions, SYSTEM_PROMPT } from "./prompts/system"
 import { truncateHalfConversation } from "./sliding-window"
 import { ClineProvider, GlobalFileNames } from "./webview/ClineProvider"
-import { showOmissionWarning } from "../integrations/editor/detect-omission"
+import { detectCodeOmission } from "../integrations/editor/detect-omission"
 import { BrowserSession } from "../services/browser/BrowserSession"
 
 const cwd =
@@ -1101,7 +1101,32 @@ export class Cline {
 								await this.diffViewProvider.update(newContent, true)
 								await delay(300) // wait for diff view to update
 								this.diffViewProvider.scrollToFirstDiff()
-								showOmissionWarning(this.diffViewProvider.originalContent || "", newContent)
+
+								// Check for code omissions before proceeding
+								if (detectCodeOmission(this.diffViewProvider.originalContent || "", newContent)) {
+									if (this.diffEnabled) {
+										await this.diffViewProvider.revertChanges()
+										pushToolResult(formatResponse.toolError(
+											"Content appears to be truncated. 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."
+										))
+										break
+									} else {
+										vscode.window
+											.showWarningMessage(
+												"Potential code truncation detected. This happens when the AI reaches its max output limit.",
+												"Follow this guide to fix the issue",
+											)
+											.then((selection) => {
+												if (selection === "Follow this guide to fix the issue") {
+													vscode.env.openExternal(
+														vscode.Uri.parse(
+															"https://github.com/cline/cline/wiki/Troubleshooting-%E2%80%90-Cline-Deleting-Code-with-%22Rest-of-Code-Here%22-Comments",
+														),
+													)
+												}
+											})
+									}
+								}
 
 								const completeMessage = JSON.stringify({
 									...sharedMessageProps,

src/integrations/editor/detect-omission.ts

@@ -1,12 +1,10 @@
-import * as vscode from "vscode"
-
 /**
  * Detects potential AI-generated code omissions in the given file content.
  * @param originalFileContent The original content of the file.
  * @param newFileContent The new content of the file to check.
  * @returns True if a potential omission is detected, false otherwise.
  */
-function detectCodeOmission(originalFileContent: string, newFileContent: string): boolean {
+export function detectCodeOmission(originalFileContent: string, newFileContent: string): boolean {
 	const originalLines = originalFileContent.split("\n")
 	const newLines = newFileContent.split("\n")
 	const omissionKeywords = ["remain", "remains", "unchanged", "rest", "previous", "existing", "..."]
@@ -33,26 +31,3 @@ function detectCodeOmission(originalFileContent: string, newFileContent: string)
 	return false
 }
 
-/**
- * Shows a warning in VSCode if a potential code omission is detected.
- * @param originalFileContent The original content of the file.
- * @param newFileContent The new content of the file to check.
- */
-export function showOmissionWarning(originalFileContent: string, newFileContent: string): void {
-	if (detectCodeOmission(originalFileContent, newFileContent)) {
-		vscode.window
-			.showWarningMessage(
-				"Potential code truncation detected. This happens when the AI reaches its max output limit.",
-				"Follow this guide to fix the issue",
-			)
-			.then((selection) => {
-				if (selection === "Follow this guide to fix the issue") {
-					vscode.env.openExternal(
-						vscode.Uri.parse(
-							"https://github.com/cline/cline/wiki/Troubleshooting-%E2%80%90-Cline-Deleting-Code-with-%22Rest-of-Code-Here%22-Comments",
-						),
-					)
-				}
-			})
-	}
-}

webview-ui/src/components/settings/SettingsView.tsx

@@ -301,7 +301,7 @@ const SettingsView = ({ onDone }: SettingsViewProps) => {
 							marginTop: "5px",
 							color: "var(--vscode-descriptionForeground)",
 						}}>
-						When enabled, Cline will be able to apply diffs to make changes to files.
+						When enabled, Cline will be able to apply diffs to make changes to files and will automatically reject truncated full-file edits.
 					</p>
 				</div>