Add support for handling deleted files in fast replace operations including tab cleanup and directory management

Author: robertpiosik

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

@@ -99,6 +99,59 @@ export const handle_fast_replace = async (
 
       if (!safe_path) continue
 
+      if (file.is_deleted) {
+        // If the file was also renamed (moved then deleted), we need to ensure the source is deleted too.
+        if (file.renamed_from) {
+          const sanitized_rename_path = sanitize_file_name(file.renamed_from)
+          const safe_rename_path = create_safe_path(
+            workspace_root,
+            sanitized_rename_path
+          )
+          if (safe_rename_path && fs.existsSync(safe_rename_path)) {
+            await close_file_tabs(safe_rename_path)
+            await vscode.workspace.fs.delete(vscode.Uri.file(safe_rename_path))
+            await remove_directory_if_empty({
+              dir_path: path.dirname(safe_rename_path),
+              workspace_root
+            })
+          }
+        }
+
+        if (fs.existsSync(safe_path)) {
+          try {
+            const document = await vscode.workspace.openTextDocument(safe_path)
+            const original_content = document.getText()
+
+            await close_file_tabs(safe_path)
+
+            await vscode.workspace.fs.delete(vscode.Uri.file(safe_path))
+            await remove_directory_if_empty({
+              dir_path: path.dirname(safe_path),
+              workspace_root
+            })
+
+            original_states.push({
+              file_path: file.file_path,
+              content: original_content,
+              workspace_name: file.workspace_name,
+              file_state: 'deleted'
+            })
+            Logger.info({
+              function_name: 'handle_fast_replace',
+              message: 'File deleted',
+              data: safe_path
+            })
+          } catch (error) {
+            Logger.error({
+              function_name: 'handle_fast_replace',
+              message: 'Failed to delete file',
+              data: { safe_path, error }
+            })
+          }
+        }
+        continue
+      }
+
       let rename_source_path: string | undefined
       let rename_source_content: string | undefined
 
@@ -131,21 +184,7 @@ export const handle_fast_replace = async (
             new_content = rename_source_content
           }
 
-          const tabs_to_close: vscode.Tab[] = []
-          for (const tab_group of vscode.window.tabGroups.all) {
-            tabs_to_close.push(
-              ...tab_group.tabs.filter((tab) => {
-                const tab_uri = (tab.input as any)?.uri as
-                  | vscode.Uri
-                  | undefined
-                return tab_uri && tab_uri.fsPath === rename_source_path
-              })
-            )
-          }
-
-          if (tabs_to_close.length > 0) {
-            await vscode.window.tabGroups.close(tabs_to_close)
-          }
+          await close_file_tabs(rename_source_path)
 
           await vscode.workspace.fs.delete(vscode.Uri.file(rename_source_path))
           await remove_directory_if_empty({
@@ -310,3 +349,18 @@ export const handle_fast_replace = async (
     return { success: false }
   }
 }
+
+async function close_file_tabs(file_path: string) {
+  const tabs_to_close: vscode.Tab[] = []
+  for (const tab_group of vscode.window.tabGroups.all) {
+    tabs_to_close.push(
+      ...tab_group.tabs.filter((tab) => {
+        const tab_uri = (tab.input as any)?.uri as vscode.Uri | undefined
+        return tab_uri && tab_uri.fsPath === file_path
+      })
+    )
+  }
+  if (tabs_to_close.length > 0) {
+    await vscode.window.tabGroups.close(tabs_to_close)
+  }
+}

packages/vscode/src/commands/apply-chat-response-command/utils/clipboard-parser/clipboard-parser.ts

@@ -11,6 +11,7 @@ export type FileItem = {
   content: string
   workspace_name?: string
   renamed_from?: string
+  is_deleted?: boolean
 }
 
 export type DiffItem = {

packages/vscode/src/commands/apply-chat-response-command/utils/clipboard-parser/parsers/multiple-files-parser/helpers/item-management.ts

@@ -9,6 +9,7 @@ export const create_or_update_file_item = (params: {
   results: (FileItem | TextItem | InlineFileItem)[]
   mode?: 'overwrite' | 'append'
   renamed_from?: string
+  is_deleted?: boolean
 }): void => {
   const {
     file_name,
@@ -17,7 +18,8 @@ export const create_or_update_file_item = (params: {
     file_ref_map,
     results,
     mode = 'overwrite',
-    renamed_from
+    renamed_from,
+    is_deleted
   } = params
 
   if (!file_name) {
@@ -40,13 +42,18 @@ export const create_or_update_file_item = (params: {
     if (renamed_from) {
       existing_file.renamed_from = renamed_from
     }
+
+    if (is_deleted !== undefined) {
+      existing_file.is_deleted = is_deleted
+    }
   } else {
     const new_file: FileItem = {
       type: 'file' as const,
       file_path: file_name,
       content: processed_content,
       workspace_name: workspace_name,
-      renamed_from
+      renamed_from,
+      is_deleted
     }
     file_ref_map.set(file_key, new_file)
     results.push(new_file)

packages/vscode/src/commands/apply-chat-response-command/utils/clipboard-parser/parsers/multiple-files-parser/multiple-files-parser.ts

@@ -279,7 +279,8 @@ export const parse_multiple_files = (params: {
           content: '',
           workspace_name,
           file_ref_map,
-          results
+          results,
+          is_deleted: true
         })
         continue
       }