Fix Windows Python -y init regression

Author: mohamedashrraf222

codeflash/cli_cmds/cmd_init.py

@@ -78,23 +78,22 @@ def init_codeflash(*, skip_confirm: bool = False, skip_api_key: bool = False) ->
         did_add_new_key = False if skip_api_key else prompt_api_key()
         git_remote = "origin"
 
-        if skip_confirm:
-            from codeflash.setup import detect_project, write_config
-
-            detected = detect_project()
-            configured, message = write_config(detected)
-            if configured:
-                click.echo(message)
-                click.echo()
+        should_modify, config = should_modify_pyproject_toml(skip_confirm=skip_confirm)
+        git_remote = config.get("git_remote", "origin") if config else "origin"
+
+        if should_modify:
+            if skip_confirm:
+                from codeflash.setup import detect_project, write_config
+
+                detected = detect_project()
+                configured, message = write_config(detected)
+                if configured:
+                    click.echo(message)
+                    click.echo()
+                else:
+                    click.echo(message)
+                    apologize_and_exit()
             else:
-                click.echo(message)
-                apologize_and_exit()
-        else:
-            should_modify, config = should_modify_pyproject_toml()
-
-            git_remote = config.get("git_remote", "origin") if config else "origin"
-
-            if should_modify:
                 setup_info = collect_setup_info()
                 git_remote = setup_info.git_remote
                 configured = configure_pyproject_toml(setup_info)

codeflash/cli_cmds/init_config.py

@@ -142,7 +142,7 @@ def is_valid_pyproject_toml(pyproject_toml_path: Union[str, Path]) -> tuple[bool
     return True, config, ""
 
 
-def should_modify_pyproject_toml() -> tuple[bool, dict[str, Any] | None]:
+def should_modify_pyproject_toml(*, skip_confirm: bool = False) -> tuple[bool, dict[str, Any] | None]:
     """Check if the current directory contains a valid pyproject.toml file with codeflash config.
 
     If it does, ask the user if they want to re-configure it.
@@ -160,6 +160,9 @@ def should_modify_pyproject_toml() -> tuple[bool, dict[str, Any] | None]:
         # needs to be re-configured
         return True, None
 
+    if skip_confirm:
+        return False, config
+
     return Confirm.ask(
         "✅ A valid Codeflash config already exists in this project. Do you want to re-configure it?",
         default=False,

codeflash/setup/config_writer.py

@@ -83,7 +83,7 @@ def _write_pyproject_toml(project_root: Path, config: CodeflashConfig) -> tuple[
         doc["tool"]["codeflash"] = codeflash_table
 
         # Write back
-        with pyproject_path.open("w", encoding="utf8") as f:
+        with pyproject_path.open("w", encoding="utf8", newline="") as f:
             f.write(tomlkit.dumps(doc))
 
         return True, f"Config saved to {pyproject_path}"
@@ -207,7 +207,7 @@ def _remove_from_pyproject(project_root: Path) -> tuple[bool, str]:
         if "tool" in doc and "codeflash" in doc["tool"]:
             del doc["tool"]["codeflash"]
 
-            with pyproject_path.open("w", encoding="utf8") as f:
+            with pyproject_path.open("w", encoding="utf8", newline="") as f:
                 f.write(tomlkit.dumps(doc))
 
             return True, "Removed [tool.codeflash] section from pyproject.toml"

tests/test_init_yes.py

@@ -1,8 +1,14 @@
 from __future__ import annotations
 
 from argparse import Namespace
-from unittest.mock import Mock
+from pathlib import Path
+from unittest.mock import Mock, patch
 
+import pytest
+
+from codeflash.cli_cmds.cmd_init import init_codeflash
+from codeflash.cli_cmds.init_config import should_modify_pyproject_toml
+from codeflash.cli_cmds.init_javascript import ProjectLanguage
 from codeflash.main import main
 
 
@@ -39,3 +45,62 @@ def test_main_passes_yes_to_init_actions(monkeypatch) -> None:
     main()
 
     install_github_actions.assert_called_once_with(skip_confirm=True)
+
+
+def test_should_modify_pyproject_toml_skip_confirm_skips_reconfigure_prompt(
+    tmp_path: Path, monkeypatch: pytest.MonkeyPatch
+) -> None:
+    monkeypatch.chdir(tmp_path)
+    (tmp_path / "src").mkdir()
+    (tmp_path / "tests").mkdir()
+    (tmp_path / "pyproject.toml").write_text(
+        '[tool.codeflash]\nmodule-root = "src"\ntests-root = "tests"\ngit-remote = "upstream"\n',
+        encoding="utf-8",
+    )
+
+    with patch("rich.prompt.Confirm.ask", side_effect=AssertionError("Confirm.ask should not be called")):
+        should_modify, config = should_modify_pyproject_toml(skip_confirm=True)
+
+    assert should_modify is False
+    assert config is not None
+    assert config["git_remote"] == "upstream"
+
+
+def test_init_codeflash_skip_confirm_reuses_existing_python_config(
+    tmp_path: Path, monkeypatch: pytest.MonkeyPatch
+) -> None:
+    monkeypatch.chdir(tmp_path)
+    (tmp_path / "src").mkdir()
+    (tmp_path / "tests").mkdir()
+    (tmp_path / "pyproject.toml").write_text(
+        '[tool.codeflash]\nmodule-root = "src"\ntests-root = "tests"\ngit-remote = "upstream"\n',
+        encoding="utf-8",
+    )
+
+    install_github_app = Mock()
+    install_github_actions = Mock()
+    install_vscode_extension = Mock()
+    detect_project = Mock(side_effect=AssertionError("detect_project should not be called"))
+    write_config = Mock(side_effect=AssertionError("write_config should not be called"))
+    exit_mock = Mock(side_effect=SystemExit(0))
+
+    monkeypatch.setattr("codeflash.cli_cmds.cmd_init.detect_project_language", Mock(return_value=ProjectLanguage.PYTHON))
+    monkeypatch.setattr("codeflash.cli_cmds.cmd_init.install_github_app", install_github_app)
+    monkeypatch.setattr("codeflash.cli_cmds.cmd_init.install_github_actions", install_github_actions)
+    monkeypatch.setattr("codeflash.cli_cmds.cmd_init.install_vscode_extension", install_vscode_extension)
+    monkeypatch.setattr("codeflash.cli_cmds.cmd_init.console.print", Mock())
+    monkeypatch.setattr("codeflash.cli_cmds.cmd_init.ph", Mock())
+    monkeypatch.setattr("codeflash.cli_cmds.cmd_init.sys.exit", exit_mock)
+    monkeypatch.setattr("codeflash.setup.detect_project", detect_project)
+    monkeypatch.setattr("codeflash.setup.write_config", write_config)
+
+    with pytest.raises(SystemExit) as exc_info:
+        init_codeflash(skip_confirm=True, skip_api_key=True)
+
+    assert exc_info.value.code == 0
+    install_github_app.assert_called_once_with("upstream")
+    install_github_actions.assert_called_once_with(override_formatter_check=True, skip_confirm=True)
+    install_vscode_extension.assert_called_once()
+    detect_project.assert_not_called()
+    write_config.assert_not_called()
+    exit_mock.assert_called_once_with(0)

tests/test_setup/test_config.py

@@ -208,6 +208,27 @@ def test_updates_existing_codeflash_section(self, tmp_path):
         assert data["tool"]["codeflash"]["module-root"] == "new"
         assert data["tool"]["codeflash"]["tests-root"] == "new_tests"
 
+    def test_preserves_crlf_newlines_for_existing_pyproject(self, tmp_path):
+        """Should not introduce doubled carriage returns when preserving CRLF files."""
+        pyproject_path = tmp_path / "pyproject.toml"
+        pyproject_path.write_bytes(b'[project]\r\nname = "myapp"\r\n\r\n[tool.ruff]\r\nline-length = 120\r\n')
+
+        config = CodeflashConfig(language="python", module_root="src")
+
+        success, message = _write_pyproject_toml(tmp_path, config)
+
+        assert success is True
+        assert message == f"Config saved to {pyproject_path}"
+
+        content = pyproject_path.read_bytes()
+        assert b"\r\r\n" not in content
+        assert b"\r\n" in content
+
+        data = tomlkit.parse(content)
+        assert data["project"]["name"] == "myapp"
+        assert data["tool"]["ruff"]["line-length"] == 120
+        assert data["tool"]["codeflash"]["module-root"] == "src"
+
 
 class TestWritePackageJson:
     """Tests for writing to package.json."""