Patch failed: pass error as tool result, not log to user

Author: jahooma

npm-app/src/tool-handlers.ts

@@ -41,7 +41,7 @@ export const handleUpdateFile: ToolHandler<{
   const lines = fileChange.content.split('\n')
 
   await waitForPreviousCheckpoint()
-  const { created, modified, ignored, invalid } = applyChanges(projectPath, [
+  const { created, modified, ignored, invalid, patchFailed } = applyChanges(projectPath, [
     fileChange,
   ])
   DiffManager.addChange(fileChange)
@@ -78,6 +78,11 @@ export const handleUpdateFile: ToolHandler<{
       `Failed to write to ${file}; file is ignored by .gitignore or .codebuffignore`,
     )
   }
+  for (const file of patchFailed) {
+    result.push(
+      `Failed to write to ${file}; the patch failed to apply`,
+    )
+  }
   for (const file of invalid) {
     result.push(
       `Failed to write to ${file}; file path caused an error or file could not be written`,

npm-app/src/utils/changes.ts

@@ -12,6 +12,7 @@ export function applyChanges(projectRoot: string, changes: FileChanges) {
   const modified: string[] = []
   const ignored: string[] = []
   const invalid: string[] = []
+  const patchFailed: string[] = []
 
   for (const change of changes) {
     const { path: filePath, content, type } = change
@@ -40,7 +41,8 @@ export function applyChanges(projectRoot: string, changes: FileChanges) {
         const oldContent = fs.readFileSync(fullPath, 'utf-8')
         const newContent = applyPatch(oldContent, content)
         if (newContent === false) {
-          throw new Error(`Patch failed to apply to ${filePath}: ${content}`)
+          patchFailed.push(filePath)
+          continue
         }
         fs.writeFileSync(fullPath, newContent)
       }
@@ -59,5 +61,5 @@ export function applyChanges(projectRoot: string, changes: FileChanges) {
     }
   }
 
-  return { created, modified, ignored, invalid }
+  return { created, modified, ignored, patchFailed, invalid }
 }

sdk/src/tools/change-file.ts

@@ -19,7 +19,7 @@ export function changeFile(
   const fileChange = FileChangeSchema.parse(parameters)
   const lines = fileChange.content.split('\n')
 
-  const { created, modified, invalid } = applyChanges(cwd, [fileChange])
+  const { created, modified, invalid, patchFailed } = applyChanges(cwd, [fileChange])
 
   const results: string[] = []
 
@@ -35,6 +35,12 @@ export function changeFile(
     )
   }
 
+  for (const file of patchFailed) {
+    results.push(
+      `Failed to write to ${file}; the patch failed to apply`,
+    )
+  }
+
   for (const file of invalid) {
     results.push(
       `Failed to write to ${file}; file path caused an error or file could not be written`,
@@ -54,6 +60,7 @@ function applyChanges(
 ) {
   const created: string[] = []
   const modified: string[] = []
+  const patchFailed: string[] = []
   const invalid: string[] = []
 
   for (const change of changes) {
@@ -72,7 +79,8 @@ function applyChanges(
         const oldContent = fs.readFileSync(fullPath, 'utf-8')
         const newContent = applyPatch(oldContent, content)
         if (newContent === false) {
-          throw new Error(`Patch failed to apply to ${filePath}: ${content}`)
+          patchFailed.push(filePath)
+          continue
         }
         fs.writeFileSync(fullPath, newContent)
       }
@@ -88,5 +96,5 @@ function applyChanges(
     }
   }
 
-  return { created, modified, invalid }
+  return { created, modified, invalid, patchFailed }
 }