Merge branch 'main' into release/v0.19.1

Author: mohamedashrraf222

codeflash/code_utils/git_worktree_utils.py

@@ -1,11 +1,13 @@
 from __future__ import annotations
 
 import configparser
+import shutil
+import stat
 import subprocess
 import tempfile
 import time
 from pathlib import Path
-from typing import Optional
+from typing import Any, Callable, Optional
 
 import git
 
@@ -95,10 +97,24 @@ def create_detached_worktree(module_root: Path) -> Optional[Path]:
         return worktree_dir
 
 
+def _handle_remove_readonly(
+    func: Callable[[str], None], path: str, exc_info: tuple[type[BaseException], BaseException, Any]
+) -> None:
+    """Error handler for shutil.rmtree to handle read-only files on Windows."""
+    if isinstance(exc_info[1], PermissionError):
+        Path(path).chmod(stat.S_IWUSR | stat.S_IRUSR | stat.S_IXUSR)
+        func(path)
+    else:
+        raise exc_info[1]
+
+
 def remove_worktree(worktree_dir: Path) -> None:
+    """Remove a git worktree directory."""
+    if not worktree_dir.exists():
+        return
     try:
-        repository = git.Repo(worktree_dir, search_parent_directories=True)
-        repository.git.worktree("remove", "--force", worktree_dir)
+        shutil.rmtree(worktree_dir, onerror=_handle_remove_readonly)
+        logger.debug(f"Removed worktree: {worktree_dir}")
     except Exception:
         logger.exception(f"Failed to remove worktree: {worktree_dir}")