Merge branch 'main' into update-docs

Author: misrasaurabh1

.github/workflows/e2e-topological-sort.yaml

@@ -1,4 +1,4 @@
-name: E2E - Topological Sort
+name: E2E - Topological Sort (Worktree)
 
 on:
   pull_request:
@@ -8,7 +8,7 @@ on:
   workflow_dispatch:
 
 jobs:
-  topological-sort-optimization:
+  topological-sort-worktree-optimization:
     # Dynamically determine if environment is needed only when workflow files change and contributor is external
     environment: ${{ (github.event_name == 'workflow_dispatch' || (contains(toJSON(github.event.pull_request.files.*.filename), '.github/workflows/') && github.event.pull_request.user.login != 'misrasaurabh1' && github.event.pull_request.user.login != 'KRRT7')) && 'external-trusted-contributors' || '' }}
     runs-on: ubuntu-latest
@@ -90,4 +90,4 @@ jobs:
       - name: Run Codeflash to optimize code
         id: optimize_code
         run: |
-          uv run python tests/scripts/end_to_end_test_topological_sort.py
+          uv run python tests/scripts/end_to_end_test_topological_sort_worktree.py

codeflash/cli_cmds/cmd_init.py

@@ -155,20 +155,30 @@ def ask_run_end_to_end_test(args: Namespace) -> None:
         run_end_to_end_test(args, bubble_sort_path, bubble_sort_test_path)
 
 
-def is_valid_pyproject_toml(pyproject_toml_path: Path) -> dict[str, Any] | None:
+def is_valid_pyproject_toml(pyproject_toml_path: Path) -> tuple[dict[str, Any] | None, str]:  # noqa: PLR0911
     if not pyproject_toml_path.exists():
-        return None
+        return None, f"Configuration file not found: {pyproject_toml_path}"
+
     try:
         config, _ = parse_config_file(pyproject_toml_path)
-    except Exception:
-        return None
+    except Exception as e:
+        return None, f"Failed to parse configuration: {e}"
+
+    module_root = config.get("module_root")
+    if not module_root:
+        return None, "Missing required field: 'module_root'"
+
+    if not Path(module_root).is_dir():
+        return None, f"Invalid 'module_root': directory does not exist at {module_root}"
+
+    tests_root = config.get("tests_root")
+    if not tests_root:
+        return None, "Missing required field: 'tests_root'"
 
-    if "module_root" not in config or config["module_root"] is None or not Path(config["module_root"]).is_dir():
-        return None
-    if "tests_root" not in config or config["tests_root"] is None or not Path(config["tests_root"]).is_dir():
-        return None
+    if not Path(tests_root).is_dir():
+        return None, f"Invalid 'tests_root': directory does not exist at {tests_root}"
 
-    return config
+    return config, ""
 
 
 def should_modify_pyproject_toml() -> tuple[bool, dict[str, Any] | None]:
@@ -180,7 +190,7 @@ def should_modify_pyproject_toml() -> tuple[bool, dict[str, Any] | None]:
 
     pyproject_toml_path = Path.cwd() / "pyproject.toml"
 
-    config = is_valid_pyproject_toml(pyproject_toml_path)
+    config, _message = is_valid_pyproject_toml(pyproject_toml_path)
     if config is None:
         return True, None
 
@@ -631,7 +641,7 @@ def check_for_toml_or_setup_file() -> str | None:
 
 def install_github_actions(override_formatter_check: bool = False) -> None:  # noqa: FBT001, FBT002
     try:
-        config, config_file_path = parse_config_file(override_formatter_check=override_formatter_check)
+        config, _config_file_path = parse_config_file(override_formatter_check=override_formatter_check)
 
         ph("cli-github-actions-install-started")
         try:

codeflash/code_utils/git_worktree_utils.py

@@ -34,6 +34,12 @@ def get_git_project_id() -> str:
 
 def create_worktree_snapshot_commit(worktree_dir: Path, commit_message: str) -> None:
     repository = git.Repo(worktree_dir, search_parent_directories=True)
+    with repository.config_writer() as cw:
+        if not cw.has_option("user", "name"):
+            cw.set_value("user", "name", "Codeflash Bot")
+        if not cw.has_option("user", "email"):
+            cw.set_value("user", "email", "[email protected]")
+
     repository.git.add(".")
     repository.git.commit("-m", commit_message, "--no-verify")
 

codeflash/lsp/beta.py

@@ -6,7 +6,6 @@
 from pathlib import Path
 from typing import TYPE_CHECKING, Optional
 
-import git
 from pygls import uris
 
 from codeflash.api.cfapi import get_codeflash_api_key, get_user_id
@@ -155,11 +154,13 @@ def _find_pyproject_toml(workspace_path: str) -> tuple[Path | None, bool]:
 
 # should be called the first thing to initialize and validate the project
 @server.feature("initProject")
-def init_project(server: CodeflashLanguageServer, params: ValidateProjectParams) -> dict[str, str]:  # noqa: PLR0911
+def init_project(server: CodeflashLanguageServer, params: ValidateProjectParams) -> dict[str, str]:
     from codeflash.cli_cmds.cmd_init import is_valid_pyproject_toml
 
-    pyproject_toml_path: Path | None = getattr(params, "config_file", None) or getattr(server.args, "config_file", None)
+    # Always process args in the init project, the extension can call
+    server.args_processed_before = False
 
+    pyproject_toml_path: Path | None = getattr(params, "config_file", None) or getattr(server.args, "config_file", None)
     if pyproject_toml_path is not None:
         # if there is a config file provided use it
         server.prepare_optimizer_arguments(pyproject_toml_path)
@@ -190,20 +191,12 @@ def init_project(server: CodeflashLanguageServer, params: ValidateProjectParams)
         }
 
     server.show_message_log("Validating project...", "Info")
-    config = is_valid_pyproject_toml(pyproject_toml_path)
+    config, reason = is_valid_pyproject_toml(pyproject_toml_path)
     if config is None:
         server.show_message_log("pyproject.toml is not valid", "Error")
-        return {"status": "error", "message": "not valid", "pyprojectPath": pyproject_toml_path}
+        return {"status": "error", "message": f"reason: {reason}", "pyprojectPath": pyproject_toml_path}
 
     args = process_args(server)
-    repo = git.Repo(args.module_root, search_parent_directories=True)
-    if repo.bare:
-        return {"status": "error", "message": "Repository is in bare state"}
-
-    try:
-        _ = repo.head.commit
-    except Exception:
-        return {"status": "error", "message": "Repository has no commits (unborn HEAD)"}
 
     return {"status": "success", "moduleRoot": args.module_root, "pyprojectPath": pyproject_toml_path, "root": root}
 

tests/scripts/end_to_end_test_topological_sort.py

@@ -0,0 +1,28 @@
+import os
+import pathlib
+
+from end_to_end_test_utilities import CoverageExpectation, TestConfig, run_codeflash_command, run_with_retries
+
+
+def run_test(expected_improvement_pct: int) -> bool:
+    config = TestConfig(
+        file_path="topological_sort.py",
+        function_name="Graph.topologicalSort",
+        test_framework="pytest",
+        min_improvement_x=0.05,
+        use_worktree=True,
+        coverage_expectations=[
+            CoverageExpectation(
+                function_name="Graph.topologicalSort",
+                expected_coverage=100.0,
+                expected_lines=[25, 26, 27, 28, 29, 30, 31],
+            )
+        ],
+    )
+    cwd = (pathlib.Path(__file__).parent.parent.parent / "code_to_optimize").resolve()
+    return_var = run_codeflash_command(cwd, config, expected_improvement_pct)
+    return return_var
+
+
+if __name__ == "__main__":
+    exit(run_with_retries(run_test, int(os.getenv("EXPECTED_IMPROVEMENT_PCT", 5))))

tests/scripts/end_to_end_test_topological_sort_worktree.py

@@ -28,6 +28,7 @@ class TestConfig:
     coverage_expectations: list[CoverageExpectation] = field(default_factory=list)
     benchmarks_root: Optional[pathlib.Path] = None
     enable_async: bool = False
+    use_worktree: bool = False
 
 
 def clear_directory(directory_path: str | pathlib.Path) -> None:
@@ -137,6 +138,8 @@ def build_command(
         base_command.extend(["--benchmark", "--benchmarks-root", str(benchmarks_root)])
     if config.enable_async:
         base_command.append("--async")
+    if config.use_worktree:
+        base_command.append("--worktree")
     return base_command