Merge branch 'cline'

package.json

@@ -2,7 +2,7 @@
 	"name": "cline-unleashed",
 	"displayName": "Cline Unleashed⛓️‍💥 (prev. Claude Dev)",
 	"description": "Autonomous coding agent right in your IDE, capable of creating/editing files, running commands, using the browser, and more with your permission every step of the way.",
-	"version": "3.0.0",
+	"version": "3.0.1",
 	"icon": "assets/icons/icon.png",
 	"galleryBanner": {
 		"color": "#617A91",

src/core/Cline.ts

@@ -1106,11 +1106,26 @@ export class Cline {
 							// Construct newContent from diff
 							let newContent: string
 							if (diff) {
-								newContent = await constructNewFileContent(
-									diff,
-									this.diffViewProvider.originalContent || "",
-									!block.partial,
-								)
+								try {
+									newContent = await constructNewFileContent(
+										diff,
+										this.diffViewProvider.originalContent || "",
+										!block.partial,
+									)
+								} catch (error) {
+									await this.say(
+										"error",
+										`Failed to apply changes to ${relPath}. The model's diff instructions could not be processed correctly. This usually happens when the search patterns don't match the file content exactly.`,
+									)
+									pushToolResult(
+										formatResponse.toolError(
+											`Error writing file: ${JSON.stringify(serializeError(error))}`,
+										),
+									)
+									await this.diffViewProvider.revertChanges()
+									await this.diffViewProvider.reset()
+									break
+								}
 							} else if (content) {
 								newContent = content