Guarantee patch application reliability by explicitly syncing the temporary patch file to disk before invoking git apply

Author: robertpiosik

packages/vscode/src/commands/apply-chat-response-command/handlers/diff-handler.ts

@@ -146,7 +146,6 @@ export const store_original_file_states = async (
   return original_states
 }
 
-// Helper function to extract content from patch for preview
 export const extract_content_from_patch = (
   patch_content: string,
   original_content: string
@@ -166,7 +165,6 @@ export const extract_content_from_patch = (
   }
 }
 
-// Ensures all target files are closed before applying patches
 async function close_files_in_all_editor_groups(
   file_paths: string[],
   workspace_path: string
@@ -209,7 +207,6 @@ async function close_files_in_all_editor_groups(
   return [...new Map(closed_files.map((item) => [item.fsPath, item])).values()]
 }
 
-// Reopens files that were closed before patch application
 async function reopen_closed_files(closed_files: vscode.Uri[]): Promise<void> {
   for (const uri of closed_files) {
     try {
@@ -225,7 +222,6 @@ async function reopen_closed_files(closed_files: vscode.Uri[]): Promise<void> {
   }
 }
 
-// Opens, formats, and saves a list of files.
 async function process_modified_files(
   file_paths: string[],
   workspace_path: string
@@ -464,11 +460,15 @@ export const apply_git_patch = async (
       workspace_path
     )
 
-    await vscode.workspace.fs.writeFile(
-      vscode.Uri.file(temp_file),
-      Buffer.from(patch_content)
-    )
-    await new Promise((r) => setTimeout(r, 100))
+    // Write patch file and ensure it's synced to disk before git apply reads it
+    const patch_buffer = Buffer.from(patch_content)
+    const fd = await fs.promises.open(temp_file, 'w')
+    try {
+      await fd.write(patch_buffer)
+      await fd.sync() // Ensure data is flushed to disk
+    } finally {
+      await fd.close()
+    }
 
     let last_error: any = null
     let success = false
@@ -547,7 +547,6 @@ export const apply_git_patch = async (
       }
     }
 
-    // Cleanup and return
     if (success) {
       await process_modified_files(file_paths, workspace_path)
       await reopen_closed_files(closed_files)

packages/vscode/src/commands/apply-chat-response-command/response-processor.ts

@@ -153,8 +153,6 @@ export const process_chat_response = async (
     ]
   }
 
-  console.log('xxx', clipboard_items)
-
   if (clipboard_items.some((item) => item.type == 'diff')) {
     const patches = clipboard_items.filter(
       (item): item is DiffItem => item.type == 'diff'