Automatically remove empty directories after file operations

Author: robertpiosik

README.md

@@ -2,7 +2,7 @@
 
 <a href="https://marketplace.visualstudio.com/items?itemName=robertpiosik.gemini-coder" target="_blank"><img src="https://img.shields.io/badge/Install-VS_Code_Marketplace-blue" alt="Get from Visual Studio Code Marketplace" /></a> <a href="https://x.com/CodeWebChat" target="_blank"><img src="https://img.shields.io/badge/Follow_on_X-@CodeWebChat-black" alt="Follow on X" /></a> <a href="https://reddit.com/r/CodeWebChat" target="_blank"><img src="https://img.shields.io/badge/Join_subreddit-r/CodeWebChat-orange" alt="Join subreddit /r/CodeWebChat" /></a> <a href="https://discord.com/invite/KJySXsrSX5" target="_blank"><img src="https://img.shields.io/badge/Chat-Discord-7289da" alt="Join Discord server" /></a>
 
-**A 100% free and open-source tool for AI pair programming.** Its simple, yet highly effecive workflow is designed for unmatched accuracy, speed and cost-efficiency—select context, type instructions and send prompt with a free chatbot or an API provider. When the model finishes, its response is ready for a one-click integration with the codebase.
+**A 100% free and open-source tool for AI pair programming.** Its simple, yet highly effecive workflow is designed for an unmatched accuracy, speed and cost-efficiency—select context, type instructions and send prompt with a free chatbot or an API provider. When the model finishes, its response is ready for a one-click integration with the codebase.
 
 Available in VS Code, Cursor, and other forks.
 

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

@@ -11,6 +11,7 @@ import {
   apply_diff_patch,
   process_diff_patch
 } from '../utils/diff-patch-processor'
+import { remove_directory_if_empty } from '../utils/file-operations'
 
 const execAsync = promisify(exec)
 
@@ -219,6 +220,10 @@ async function process_modified_files(
             message: 'File was empty after patch, removed from disk.',
             data: { file_path }
           })
+          await remove_directory_if_empty(
+            path.dirname(safe_path),
+            workspace_path
+          )
         } catch (error) {
           Logger.error({
             function_name: 'process_modified_files',
@@ -376,6 +381,7 @@ const handle_deleted_file_patch = async (
         message: 'File deleted successfully.',
         data: { file_path }
       })
+      await remove_directory_if_empty(path.dirname(safe_path), workspace_path)
     } else {
       Logger.warn({
         function_name: 'handle_deleted_file_patch',
@@ -442,6 +448,10 @@ const handle_rename_patch = async (
       data: { from: safe_from_path, to: safe_to_path }
     })
 
+    await remove_directory_if_empty(
+      path.dirname(safe_from_path),
+      workspace_path
+    )
     await process_modified_files([to_path], workspace_path)
 
     return { success: true, original_states, used_fallback: false }

packages/vscode/src/commands/apply-chat-response-command/utils/file-operations.ts

@@ -6,6 +6,49 @@ import { Logger } from '../../../utils/logger'
 import { format_document } from './format-document'
 import { OriginalFileState } from '../../../types/common'
 
+export async function remove_directory_if_empty(
+  dir_path: string,
+  workspace_root: string
+) {
+  const normalized_dir = path.normalize(dir_path)
+  const normalized_root = path.normalize(workspace_root)
+
+  if (
+    !normalized_dir ||
+    !normalized_dir.startsWith(normalized_root) ||
+    normalized_dir == normalized_root
+  ) {
+    return
+  }
+
+  try {
+    if (
+      fs.existsSync(normalized_dir) &&
+      fs.lstatSync(normalized_dir).isDirectory()
+    ) {
+      const files = fs.readdirSync(normalized_dir)
+      if (files.length == 0) {
+        fs.rmdirSync(normalized_dir)
+        Logger.log({
+          function_name: 'remove_directory_if_empty',
+          message: 'Removed empty directory',
+          data: { dir_path: normalized_dir }
+        })
+        await remove_directory_if_empty(
+          path.dirname(normalized_dir),
+          workspace_root
+        )
+      }
+    }
+  } catch (error) {
+    Logger.error({
+      function_name: 'remove_directory_if_empty',
+      message: 'Error removing empty directory',
+      data: { error, dir_path: normalized_dir }
+    })
+  }
+}
+
 export async function create_file_if_needed(
   filePath: string,
   content: string,
@@ -202,6 +245,10 @@ export async function undo_files(
               message: 'New file deleted',
               data: safe_path
             })
+            await remove_directory_if_empty(
+              path.dirname(safe_path),
+              workspace_root
+            )
           } catch (err) {
             Logger.error({
               function_name: 'undo_files',

packages/vscode/src/commands/apply-chat-response-command/utils/review-applied-changes.ts

@@ -6,6 +6,7 @@ import { createTwoFilesPatch } from 'diff'
 import { create_safe_path } from '@/utils/path-sanitizer'
 import { ViewProvider } from '@/view/backend/view-provider'
 import { OriginalFileState } from '@/types/common'
+import { remove_directory_if_empty } from './file-operations'
 
 export type CodeReviewDecision =
   | { jump_to: { file_path: string; workspace_name?: string } }
@@ -272,13 +273,27 @@ export const review_applied_changes = async (
 
       if (!file_to_toggle) return
 
+      let workspace_root = default_workspace
+      if (
+        file_to_toggle.reviewable_file.workspace_name &&
+        workspace_map.has(file_to_toggle.reviewable_file.workspace_name)
+      ) {
+        workspace_root = workspace_map.get(
+          file_to_toggle.reviewable_file.workspace_name
+        )!
+      }
+
       if (!is_checked) {
         if (file_to_toggle.reviewable_file.is_new) {
           try {
             if (fs.existsSync(file_to_toggle.sanitized_path)) {
               await vscode.workspace.fs.delete(
                 vscode.Uri.file(file_to_toggle.sanitized_path)
               )
+              await remove_directory_if_empty(
+                path.dirname(file_to_toggle.sanitized_path),
+                workspace_root
+              )
             }
           } catch (e) {}
         } else {
@@ -294,6 +309,10 @@ export const review_applied_changes = async (
               await vscode.workspace.fs.delete(
                 vscode.Uri.file(file_to_toggle.sanitized_path)
               )
+              await remove_directory_if_empty(
+                path.dirname(file_to_toggle.sanitized_path),
+                workspace_root
+              )
             }
           } catch (e) {}
         } else {