Merge branch 'main' into saga_misc_fixes_14nov

Author: Saga4

codeflash/cli_cmds/cmd_init.py

@@ -171,10 +171,23 @@ def ask_run_end_to_end_test(args: Namespace) -> None:
         run_end_to_end_test(args, file_path)
 
 
-def is_valid_pyproject_toml(pyproject_toml_path: Path) -> tuple[bool, dict[str, Any] | None, str]:  # noqa: PLR0911
+def config_found(pyproject_toml_path: Union[str, Path]) -> tuple[bool, str]:
+    pyproject_toml_path = Path(pyproject_toml_path)
+
     if not pyproject_toml_path.exists():
-        return False, None, f"Configuration file not found: {pyproject_toml_path}"
+        return False, f"Configuration file not found: {pyproject_toml_path}"
+
+    if not pyproject_toml_path.is_file():
+        return False, f"Configuration file is not a file: {pyproject_toml_path}"
+
+    if pyproject_toml_path.suffix != ".toml":
+        return False, f"Configuration file is not a .toml file: {pyproject_toml_path}"
+
+    return True, ""
 
+
+def is_valid_pyproject_toml(pyproject_toml_path: Union[str, Path]) -> tuple[bool, dict[str, Any] | None, str]:
+    pyproject_toml_path = Path(pyproject_toml_path)
     try:
         config, _ = parse_config_file(pyproject_toml_path)
     except Exception as e:
@@ -206,6 +219,10 @@ def should_modify_pyproject_toml() -> tuple[bool, dict[str, Any] | None]:
 
     pyproject_toml_path = Path.cwd() / "pyproject.toml"
 
+    found, _ = config_found(pyproject_toml_path)
+    if not found:
+        return True, None
+
     valid, config, _message = is_valid_pyproject_toml(pyproject_toml_path)
     if not valid:
         # needs to be re-configured

codeflash/code_utils/formatter.py

@@ -97,6 +97,9 @@ def is_diff_line(line: str) -> bool:
 
 
 def format_generated_code(generated_test_source: str, formatter_cmds: list[str]) -> str:
+    formatter_name = formatter_cmds[0].lower() if formatter_cmds else "disabled"
+    if formatter_name == "disabled":  # nothing to do if no formatter provided
+        return re.sub(r"\n{2,}", "\n\n", generated_test_source)
     with tempfile.TemporaryDirectory() as test_dir_str:
         # try running formatter, if nothing changes (could be due to formatting failing or no actual formatting needed) return code with 2 or more newlines substituted with 2 newlines
         original_temp = Path(test_dir_str) / "original_temp.py"

codeflash/code_utils/git_worktree_utils.py

@@ -1,5 +1,6 @@
 from __future__ import annotations
 
+import configparser
 import subprocess
 import tempfile
 import time
@@ -18,14 +19,36 @@
 
 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:
+    username = None
+    no_username = False
+    email = None
+    no_email = False
+    with repository.config_reader(config_level="repository") as cr:
+        try:
+            username = cr.get("user", "name")
+        except configparser.NoSectionError:
+            no_username = True
+        try:
+            email = cr.get("user", "email")
+        except configparser.NoSectionError:
+            no_email = True
+    with repository.config_writer(config_level="repository") 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", "bot@codeflash.ai")
 
     repository.git.add(".")
     repository.git.commit("-m", commit_message, "--no-verify")
+    with repository.config_writer(config_level="repository") as cw:
+        if username:
+            cw.set_value("user", "name", username)
+        elif no_username:
+            cw.remove_option("user", "name")
+        if email:
+            cw.set_value("user", "email", email)
+        elif no_email:
+            cw.remove_option("user", "email")
 
 
 def create_detached_worktree(module_root: Path) -> Optional[Path]:

codeflash/discovery/functions_to_optimize.py

@@ -405,7 +405,10 @@ def is_git_repo(file_path: str) -> bool:
 def ignored_submodule_paths(module_root: str) -> list[str]:
     if is_git_repo(module_root):
         git_repo = git.Repo(module_root, search_parent_directories=True)
-        return [Path(git_repo.working_tree_dir, submodule.path).resolve() for submodule in git_repo.submodules]
+        try:
+            return [Path(git_repo.working_tree_dir, submodule.path).resolve() for submodule in git_repo.submodules]
+        except Exception as e:
+            logger.warning(f"Error getting submodule paths: {e}")
     return []
 
 

codeflash/lsp/beta.py

@@ -14,6 +14,7 @@
 from codeflash.cli_cmds.cmd_init import (
     CommonSections,
     VsCodeSetupInfo,
+    config_found,
     configure_pyproject_toml,
     create_empty_pyproject_toml,
     create_find_common_tags_file,
@@ -291,6 +292,10 @@ def init_project(params: ValidateProjectParams) -> dict[str, str]:
             "root": root,
         }
 
+    found, message = config_found(pyproject_toml_path)
+    if not found:
+        return {"status": "error", "message": message}
+
     valid, config, reason = is_valid_pyproject_toml(pyproject_toml_path)
     if not valid:
         return {

codeflash/tracing/tracing_utils.py

@@ -38,7 +38,10 @@ def ignored_submodule_paths(module_root: str) -> list[Path]:
     if is_git_repo(module_root):
         git_repo = git.Repo(module_root, search_parent_directories=True)
         working_tree_dir = cast("Path", git_repo.working_tree_dir)
-        return [Path(working_tree_dir, submodule.path).resolve() for submodule in git_repo.submodules]
+        try:
+            return [Path(working_tree_dir, submodule.path).resolve() for submodule in git_repo.submodules]
+        except Exception as e:
+            print(f"Failed to get submodule paths {e!s}")  # no logger since used in the tracer
     return []
 
 

codeflash/version.py

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

docs/docs.json

@@ -23,11 +23,17 @@
             "pages": ["index"]
           },
           {
-
             "group": "🚀 Quickstart",
             "pages": [
               "getting-started/local-installation"
-            ]          },
+            ]
+          },
+          {
+            "group": "🛠 IDE Extensions",
+            "pages": [
+              "editor-plugins/vscode"
+            ]
+          },
           {
             "group": "⚡ Optimizing with Codeflash",
             "pages": [

docs/editor-plugins/vscode.mdx

@@ -0,0 +1,48 @@
+# VS Code Extension & VSIX Installation
+
+Bring Codeflash directly into your editor with the Visual Studio Code extension. The extension surfaces optimization suggestions inline, and keeps the CLI workflow close at hand with more visual experience in editor.
+
+## Requirements
+
+- VS Code 1.94.0 or later (Code, VS Code Desktop, Cursor, Windsurf and other VS Code–compatible editors supported)
+- Python 3.9+
+- Git repository initialized for your project
+- Codeflash CLI installed and initialized with `codeflash init` (Extension will also walkthrough with interactive onboarding)
+
+## Install from the Marketplace
+
+1. Open VS Code and head to the Extensions panel.
+2. Search for **“Codeflash”** or open the listing directly:<br />
+   [Install from VS Code Marketplace →](https://marketplace.visualstudio.com/items?itemName=codeflash.codeflash)
+3. Click **Install** and reload VS Code when prompted.
+
+That’s it! As soon as you open a Python file inside a project that has already run `codeflash init`, the extension analyses the codebase and starts surfacing optimization opportunities.
+
+## Install via VSIX (Cursor, offline, or air‑gapped environments)
+
+Some environments—Cursor, Windows without Marketplace access, or air-gapped machines—require installing from a VSIX package.
+
+1. Download the latest VSIX build from Open VSX:<br />
+   [Download VSIX →](https://open-vsx.org/extension/codeflash/codeflash)
+2. In VS Code, run the command palette (`Cmd/Ctrl + Shift + P`) and select **Extensions: Install from VSIX…**
+3. Choose the downloaded `codeflash-*.vsix` file and restart the editor.
+
+## Initial Setup Checklist
+- The complete Setup flow is within extension to initialize codeflash LSP server
+
+## Everyday Workflow
+
+- **Inline suggestions:** Optimizable functions display a “optimize” hint above the function definition. And once optimized they will show a comment where you can click it to preview and apply improvements.
+- **Sidebar overview:** Use the Codeflash panel to review queued, inprogress, and completed optimizations.
+- **Targeted runs:** Trigger “Optimize Changed Functions” from the extension to focus on recent uncommited edits.
+- **Pair with CLI:** For batch workflows (`codeflash --all`), you can still run the CLI. The extension will pick up the results when you return to the editor.
+
+## Troubleshooting
+
+| Issue | Quick Fix |
+| ----- | --------- |
+| Using Cursor / custom VS Code build | Install via VSIX and restart the editor. |
+| Still stuck? | Reach out on [Discord](https://www.codeflash.ai/discord) or file an issue on [GitHub](https://github.com/codeflash-ai/codeflash/issues). |
+
+With the extension in place, you can review, accept, or iterate on optimizations without leaving your editor—perfect for maintaining focus while keeping performance top of mind.
+