codna 0.1.38__tar.gz → 0.1.40__tar.gz

{codna-0.1.38 → codna-0.1.40}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: codna
-Version: 0.1.38
+Version: 0.1.40
 Summary: Local-first repo intelligence and agent fixing for Codna.
 Author: Thyn
 Maintainer: Thyn

{codna-0.1.38 → codna-0.1.40}/codna/__init__.py

@@ -5,4 +5,4 @@ This package is the `codna` CLI. Users never touch "algenta" directly — the en
 is an internal dependency reached over HTTP.
 """
 
-__version__ = "0.1.38"
+__version__ = "0.1.40"

{codna-0.1.38 → codna-0.1.40}/codna/fix_run.py

@@ -227,18 +227,26 @@ def _verify_applied_checkout(applied: dict, test_cmd: str | None):
     from .testrun import discover_failing_tests
 
     checkout = applied.get("local_checkout_path")
-    commit_sha = applied.get("commit_sha")
-    if checkout and commit_sha:
-        try:
-            from .worktree import EphemeralWorktree
-
-            with EphemeralWorktree(checkout, commit_sha, prefix="codna-verify-") as worktree:
-                return discover_failing_tests(worktree.path, test_cmd)
-        except Exception:
-            raise
     return discover_failing_tests(checkout, test_cmd)
 
 
+def _retry_issue_text(original_issue: str | None, verify_issue: str | None, still_failing: list[str]) -> str:
+    """Build the next attempt's issue text from the user request plus live verification output."""
+    sections: list[str] = []
+    if original_issue and original_issue.strip():
+        sections.append("Original issue:\n" + original_issue.strip())
+    if verify_issue and verify_issue.strip():
+        sections.append("Verification after the previous fix is still failing:\n" + verify_issue.strip())
+    elif still_failing:
+        sections.append(
+            "Verification after the previous fix still reports failing tests:\n"
+            + "\n".join(f"- {test_id}" for test_id in still_failing[:12])
+        )
+    else:
+        sections.append("Verification after the previous fix is still failing.")
+    return "\n\n".join(sections)
+
+
 def _apply_once(c, rid, snap, plan, *, open_pr, args, issue, summary):
     from . import cli as _cli
 
@@ -293,6 +301,7 @@ def run_fix(c, args) -> dict:
 
     t0 = time.perf_counter()
     repo = args.repo
+    original_issue = issue
     result: dict = {"repository": repo, "issue": issue, "iterations": [], "applied": None,
                     "verified": None, "remaining_failing_tests": None, "pull_request_url": None}
 
@@ -365,7 +374,7 @@ def run_fix(c, args) -> dict:
         result["verified"] = False
         result["remaining_failing_tests"] = still_failing
         failing = still_failing
-        issue = args.issue or verify_issue or f"{len(still_failing)} test(s) still failing after the previous fix"
+        issue = _retry_issue_text(args.issue or original_issue, verify_issue, still_failing)
         repo = checkout
 
     result["elapsed_s"] = round(time.perf_counter() - t0, 1)

{codna-0.1.38 → codna-0.1.40}/codna.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: codna
-Version: 0.1.38
+Version: 0.1.40
 Summary: Local-first repo intelligence and agent fixing for Codna.
 Author: Thyn
 Maintainer: Thyn

{codna-0.1.38 → codna-0.1.40}/pyproject.toml

@@ -1,6 +1,6 @@
 [project]
 name = "codna"
-version = "0.1.38"
+version = "0.1.40"
 description = "Local-first repo intelligence and agent fixing for Codna."
 readme = "README.md"
 requires-python = ">=3.10"

{codna-0.1.38 → codna-0.1.40}/tests/test_benchmark_suite.py

@@ -92,6 +92,23 @@ def test_run_returns_127_for_missing_executable(tmp_path: Path) -> None:
     assert "No such file" in err
 
 
+def test_ensure_codna_runtime_uses_published_doctor_contract(monkeypatch: pytest.MonkeyPatch) -> None:
+    calls = []
+
+    def fake_run(cmd, *, timeout):
+        calls.append((cmd, timeout))
+        return 0, "Codna runtime: healthy", "", 0.2
+
+    monkeypatch.delenv("CODNA_ENGINE_URL", raising=False)
+    monkeypatch.delenv("ALGENTA_ENGINE_URL", raising=False)
+    monkeypatch.delenv("ALGENTA_BASE_URL", raising=False)
+    monkeypatch.setattr(bench, "CODNA", "codna")
+    monkeypatch.setattr(bench, "_run", fake_run)
+
+    assert bench._ensure_codna_runtime() is None
+    assert calls == [(["codna", "doctor", "--start-stack"], 120)]
+
+
 def test_codna_fix_reports_planner_token_split(monkeypatch: pytest.MonkeyPatch) -> None:
     payload = {
         "runtime_model": "claude-sonnet-4-6",

{codna-0.1.38 → codna-0.1.40}/tests/test_fix_run.py

@@ -274,6 +274,47 @@ def test_verify_refixes_until_green(monkeypatch):
     assert len(result["iterations"]) == 2  # took a re-fix
 
 
+def test_retry_preserves_verification_output_with_explicit_issue(monkeypatch):
+    """Regression: an explicit --issue must not hide traceback evidence on retry."""
+    captured: list[dict] = []
+
+    def fake_plan_once(_client, **kwargs):
+        captured.append(dict(kwargs))
+        return "rid", {"snapshot_id": "s"}, _plan(root=f"attempt-{len(captured)}")
+
+    verify = iter([
+        (
+            "tests are failing (no per-test JUnit ids were produced):\n"
+            "src/itsdangerous/encoding.py:34: binascii.Error: Incorrect padding",
+            [],
+        ),
+        _GREEN,
+    ])
+    monkeypatch.setattr(fix_run, "resolve_issue", lambda args, github_token=None: (args.issue, []))
+    monkeypatch.setattr(fix_run, "_plan_once", fake_plan_once)
+    monkeypatch.setattr(fix_run, "_apply_once", _apply)
+    monkeypatch.setattr(fix_run, "_verify_applied_checkout", lambda applied, test_cmd=None: next(verify))
+    monkeypatch.setattr("os.path.isdir", lambda p: True)
+
+    result = fix_run.run_fix(
+        object(),
+        _Args(
+            apply=True,
+            tests=True,
+            issue="base64_decode fails for stripped URL-safe padding",
+            max_iterations=2,
+        ),
+    )
+
+    assert result["verified"] is True
+    assert len(captured) == 2
+    retry_issue = captured[1]["issue"]
+    assert "Original issue:" in retry_issue
+    assert "base64_decode fails for stripped URL-safe padding" in retry_issue
+    assert "Verification after the previous fix is still failing:" in retry_issue
+    assert "src/itsdangerous/encoding.py:34" in retry_issue
+
+
 def test_usage_totals_sum_multiple_fix_iterations(monkeypatch):
     plans = iter([
         _plan(usage={"input_tokens": 100, "output_tokens": 10, "cache_read_tokens": 5, "cost_usd": 0.01}, model="m1"),
@@ -369,7 +410,12 @@ def test_apply_codna_error_keeps_patch_ref_hint(monkeypatch):
     assert "apply failed:" in msg and "patch://abc" in msg  # framing + recovery hint preserved
 
 
-def test_verify_uses_temp_worktree_when_commit_sha_available(monkeypatch, tmp_path):
+def test_verify_uses_applied_checkout_when_commit_sha_available(monkeypatch, tmp_path):
+    """Regression: clean git worktrees omit untracked dependency caches such as node_modules.
+
+    A local --apply fix should be verified in the checkout the user will continue using, not in
+    a detached worktree that can fail only because install artifacts are untracked.
+    """
     monkeypatch.setattr(fix_run, "_plan_once", lambda c, **k: ("rid", {"snapshot_id": "s"}, _plan()))
     checkout = tmp_path / "repo"
     checkout.mkdir()
@@ -386,29 +432,16 @@ def test_verify_uses_temp_worktree_when_commit_sha_available(monkeypatch, tmp_pa
     monkeypatch.setattr("os.path.isdir", lambda p: True)
     seen = []
 
-    class _FakeWorktree:
-        def __init__(self, repo_dir, commit, prefix=""):
-            assert repo_dir == str(checkout)
-            assert commit == "a" * 40
-            self.path = "/tmp/codna-verify-worktree"
-
-        def __enter__(self):
-            return self
-
-        def __exit__(self, *exc):
-            return None
-
     def fake_discover(repo, cmd=None):
         seen.append(repo)
         return _FAIL if len(seen) == 1 else _GREEN
 
-    monkeypatch.setattr("codna.worktree.EphemeralWorktree", _FakeWorktree)
     monkeypatch.setattr("codna.testrun.discover_failing_tests", fake_discover)
 
     result = fix_run.run_fix(object(), _Args(apply=True, tests=True))
 
     assert result["verified"] is True
-    assert seen == ["/repo", "/tmp/codna-verify-worktree"]
+    assert seen == ["/repo", str(checkout)]
 
 
 def test_cleanup_generated_apply_artifacts_removes_new_untracked_patch_file(tmp_path):