Merge branch 'main' into optimize-tracer-replay

Author: KRRT7

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}")
 

codeflash/lsp/helpers.py

@@ -1,14 +1,16 @@
 import os
 import re
 from functools import lru_cache
+from pathlib import Path
 
 from rich.tree import Tree
 
 from codeflash.models.test_type import TestType
 
 _double_quote_pat = re.compile(r'"(.*?)"')
 _single_quote_pat = re.compile(r"'(.*?)'")
-worktree_path_regex = re.compile(r'\/[^"]*worktrees\/[^"]\S*')
+# Match worktree paths on both Unix (/path/to/worktrees/...) and Windows (C:\path\to\worktrees\... or C:/path/to/worktrees/...)
+worktree_path_regex = re.compile(r'[^"]*worktrees[\\/][^"]\S*')
 
 
 @lru_cache(maxsize=1)
@@ -47,7 +49,8 @@ def report_to_markdown_table(report: dict[TestType, dict[str, int]], title: str)
 def simplify_worktree_paths(msg: str, highlight: bool = True) -> str:  # noqa: FBT001, FBT002
     path_in_msg = worktree_path_regex.search(msg)
     if path_in_msg:
-        last_part_of_path = path_in_msg.group(0).split("/")[-1]
+        # Use Path.name to handle both Unix and Windows path separators
+        last_part_of_path = Path(path_in_msg.group(0)).name
         if highlight:
             last_part_of_path = f"`{last_part_of_path}`"
         return msg.replace(path_in_msg.group(0), last_part_of_path)

codeflash/version.py

@@ -1,2 +1,2 @@
 # These version placeholders will be replaced by uv-dynamic-versioning during build.
-__version__ = "0.19.0"
+__version__ = "0.19.1"