Enhance file patch application and rename handling by propagating workspace context and improving path resolution

Author: robertpiosik

apps/editor/src/commands/apply-chat-response-command/apply-chat-response-command.ts

@@ -91,10 +91,12 @@ export const apply_chat_response_command = (params: {
 
       const is_single_root_folder_workspace =
         (vscode.workspace.workspaceFolders?.length ?? 0) <= 1
+
       const clipboard_items = parse_response({
         response: chat_response,
         is_single_root_folder_workspace
       })
+
       if (resolve_fn) {
         const history = params.panel_provider.response_history
 

apps/editor/src/commands/apply-chat-response-command/handlers/diff-handler.ts

@@ -7,6 +7,7 @@ import { OriginalFileState } from '../types/original-file-state'
 import { create_safe_path } from '@/utils/path-sanitizer'
 import { apply_diff } from '../utils/edit-formats/diffs'
 import { remove_directory_if_empty } from '../utils/file-operations'
+import { DiffItem } from '../utils/clipboard-parser'
 
 export const sanitize_patch_content = (
   patch_content: string,
@@ -130,20 +131,28 @@ const parse_patch_header = (
 }
 
 export const extract_file_paths_from_patch = (
-  patch_content: string
+  patch_content: string,
+  fallback_patch?: DiffItem
 ): string[] => {
   const { from_path, to_path } = parse_patch_header(patch_content)
   const paths = new Set<string>()
   if (from_path) paths.add(from_path)
   if (to_path) paths.add(to_path)
+
+  if (paths.size === 0 && fallback_patch) {
+    if (fallback_patch.file_path) paths.add(fallback_patch.file_path)
+    if (fallback_patch.new_file_path) paths.add(fallback_patch.new_file_path)
+  }
   return Array.from(paths)
 }
 
 export const store_original_file_states = async (
   patch_content: string,
-  workspace_path: string
+  workspace_path: string,
+  workspace_name?: string,
+  fallback_patch?: DiffItem
 ): Promise<OriginalFileState[]> => {
-  const file_paths = extract_file_paths_from_patch(patch_content)
+  const file_paths = extract_file_paths_from_patch(patch_content, fallback_patch)
   const original_states: OriginalFileState[] = []
 
   for (const file_path of file_paths) {
@@ -164,7 +173,7 @@ export const store_original_file_states = async (
         original_states.push({
           file_path,
           content,
-          workspace_name: path.basename(workspace_path)
+          workspace_name
         })
       } catch (error) {
         Logger.error({
@@ -178,7 +187,7 @@ export const store_original_file_states = async (
         file_path,
         content: '',
         file_state: 'new',
-        workspace_name: path.basename(workspace_path)
+        workspace_name
       })
     }
   }
@@ -292,13 +301,15 @@ const process_modified_files = async (
 
 const handle_new_file_patch = async (
   patch_content: string,
-  workspace_path: string
+  workspace_path: string,
+  workspace_name?: string,
+  fallback_patch?: DiffItem
 ): Promise<{
   success: boolean
   original_states?: OriginalFileState[]
   diff_application_method?: 'recount' | 'search_and_replace'
 }> => {
-  const file_paths = extract_file_paths_from_patch(patch_content)
+  const file_paths = extract_file_paths_from_patch(patch_content, fallback_patch)
   if (file_paths.length != 1) {
     Logger.error({
       function_name: 'handle_new_file_patch',
@@ -323,7 +334,9 @@ const handle_new_file_patch = async (
   // `store_original_file_states` will correctly identify this as a new file.
   const original_states = await store_original_file_states(
     patch_content,
-    workspace_path
+    workspace_path,
+    workspace_name,
+    fallback_patch
   )
 
   try {
@@ -364,13 +377,15 @@ const handle_new_file_patch = async (
 
 const handle_deleted_file_patch = async (
   patch_content: string,
-  workspace_path: string
+  workspace_path: string,
+  workspace_name?: string,
+  fallback_patch?: DiffItem
 ): Promise<{
   success: boolean
   original_states?: OriginalFileState[]
   diff_application_method?: 'recount' | 'search_and_replace'
 }> => {
-  const file_paths = extract_file_paths_from_patch(patch_content)
+  const file_paths = extract_file_paths_from_patch(patch_content, fallback_patch)
   if (file_paths.length != 1) {
     Logger.error({
       function_name: 'handle_deleted_file_patch',
@@ -395,7 +410,9 @@ const handle_deleted_file_patch = async (
 
   const original_states = await store_original_file_states(
     patch_content,
-    workspace_path
+    workspace_path,
+    workspace_name,
+    fallback_patch
   )
 
   try {
@@ -480,7 +497,9 @@ const process_diff = async (params: {
 
 export const apply_git_patch = async (
   patch_content: string,
-  workspace_path: string
+  workspace_path: string,
+  workspace_name?: string,
+  patch?: DiffItem
 ): Promise<{
   success: boolean
   original_states?: OriginalFileState[]
@@ -489,21 +508,23 @@ export const apply_git_patch = async (
   const patch_info = parse_patch_header(patch_content, workspace_path)
 
   if (patch_info.is_new) {
-    return handle_new_file_patch(patch_content, workspace_path)
+    return handle_new_file_patch(patch_content, workspace_path, workspace_name, patch)
   }
 
   if (patch_info.is_deleted) {
-    return handle_deleted_file_patch(patch_content, workspace_path)
+    return handle_deleted_file_patch(patch_content, workspace_path, workspace_name, patch)
   }
 
   let closed_files: vscode.Uri[] = []
   let original_states: OriginalFileState[] | undefined
 
   try {
-    const file_paths = extract_file_paths_from_patch(patch_content)
+    const file_paths = extract_file_paths_from_patch(patch_content, patch)
     original_states = await store_original_file_states(
       patch_content,
-      workspace_path
+      workspace_path,
+      workspace_name,
+      patch
     )
 
     closed_files = await close_files_in_all_editor_groups(
@@ -557,6 +578,9 @@ export const apply_git_patch = async (
         data: { error: last_error }
       })
       try {
+        if (file_paths.length == 0) {
+          throw new Error('No file paths could be extracted from patch')
+        }
         const file_path_safe = create_safe_path(workspace_path, file_paths[0])
         if (file_path_safe == null) throw new Error('File path is null')
 

apps/editor/src/commands/apply-chat-response-command/response-processor.ts

@@ -277,13 +277,13 @@ export const process_chat_response = async (params: {
         const key = `${patch.workspace_name || ''}:${patch.file_path}`
         rename_map.set(key, {
           new_path: patch.new_file_path,
-          new_workspace: patch.new_workspace_name
+            new_workspace: patch.new_workspace_name || patch.workspace_name
         })
       }
     })
 
-    const set_new_paths_in_original_states = (states: OriginalFileState[]) => {
-      if (!rename_map.size) return
+    const set_new_paths_in_original_states = (states: OriginalFileState[]): OriginalFileState[] => {
+      if (!rename_map.size) return states
       states.forEach((state) => {
         const key = `${state.workspace_name || ''}:${state.file_path}`
         if (rename_map.has(key)) {
@@ -292,6 +292,21 @@ export const process_chat_response = async (params: {
           state.new_workspace_name = rename_info.new_workspace
         }
       })
+
+      const target_paths = new Set<string>()
+      rename_map.forEach((val) => {
+        target_paths.add(`${val.new_workspace || ''}:${val.new_path}`)
+      })
+
+      return states.filter((state) => {
+        if (state.file_state == 'new') {
+          const key = `${state.workspace_name || ''}:${state.file_path}`
+          if (target_paths.has(key)) {
+            return false
+          }
+        }
+        return true
+      })
     }
 
     const workspace_map = new Map<string, string>()
@@ -324,7 +339,7 @@ export const process_chat_response = async (params: {
         patch.content,
         patch.workspace_name
       )
-      const result = await apply_git_patch(sanitized_patch_content, workspace_path)
+      const result = await apply_git_patch(sanitized_patch_content, workspace_path, patch.workspace_name, patch)
 
       if (result.success) {
         if (result.diff_application_method && result.original_states) {
@@ -360,7 +375,7 @@ export const process_chat_response = async (params: {
     }
 
     if (all_original_states.length > 0) {
-      set_new_paths_in_original_states(all_original_states)
+      all_original_states = set_new_paths_in_original_states(all_original_states)
       await apply_file_relocations(all_original_states)
       update_undo_button_state({
         context: params.context,

apps/editor/src/commands/apply-chat-response-command/utils/file-operations.ts

@@ -333,12 +333,25 @@ export const apply_file_relocations = async (
         new_workspace_root = workspace_map.get(state.new_workspace_name)!
       }
 
-      const success = await relocate_file({
-        old_path: state.file_path,
-        new_path: state.new_file_path,
-        old_workspace_root: workspace_root,
-        new_workspace_root: new_workspace_root
-      })
+      const old_safe_path = create_safe_path(workspace_root, state.file_path)
+      const new_safe_path = create_safe_path(new_workspace_root, state.new_file_path)
+
+      if (!old_safe_path || !new_safe_path) continue
+
+      const old_exists = await uri_exists(vscode.Uri.file(old_safe_path))
+      const new_exists = await uri_exists(vscode.Uri.file(new_safe_path))
+
+      let success = false
+      if (old_exists) {
+        success = await relocate_file({
+          old_path: state.file_path,
+          new_path: state.new_file_path,
+          old_workspace_root: workspace_root,
+          new_workspace_root: new_workspace_root
+        })
+      } else if (new_exists) {
+        success = true
+      }
 
       if (success) {
         state.file_path_to_restore = state.file_path