codna 0.1.16__tar.gz → 0.1.18__tar.gz

{codna-0.1.16 → codna-0.1.18}/PKG-INFO

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

{codna-0.1.16 → codna-0.1.18}/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.16"
+__version__ = "0.1.18"

{codna-0.1.16 → codna-0.1.18}/codna/config_file.py

@@ -8,7 +8,9 @@ the file may be JSON (the same tolerant pattern as manifest loading).
 Mapping to real controls:
   - ``model.provider`` + ``model.key`` → the provider's ``*_API_KEY`` env (via ``keystore.PROVIDER_ALIASES``),
     which ``runtime.local_stack`` forwards to the fixing engine. ``key: env:NAME`` reads ``$NAME`` (e.g.
-    ``env:CODNA_MODEL_KEY``); a literal value is used as-is.
+    ``env:CODNA_MODEL_KEY``); a literal value is used as-is. The same provider is also written to
+    ``CODNA_AGENT_PROVIDER`` so the packaged local Cline SDK sidecar does not silently default to another
+    provider.
   - ``privacy.egress: fail-closed`` → sets ``CODNA_REQUIRE_EGRESS_DENY=1`` (the real enforcement is the
     sandbox network-deny policy + the PR manifest gate; there is no global egress env otherwise).
   - ``privacy.redact_secrets`` → accept-and-warn: ``true`` is the posture; ``false`` is *ignored with a
@@ -96,6 +98,7 @@ def apply_config(path: str, *, include_model: bool = True) -> None:
         if key:
             # Explicit config is authoritative — the user wrote codna.yaml deliberately.
             os.environ[target] = str(key)
+        os.environ["CODNA_AGENT_PROVIDER"] = provider
 
     privacy = data.get("privacy") or {}
     egress = str(privacy.get("egress", "")).strip().lower()

{codna-0.1.16 → codna-0.1.18}/codna/packaged_repository_advanced.py

@@ -226,8 +226,10 @@ class PackagedRepositoryAdvanced:
                 {"repository_id": repository_id, "mode": mode},
             )
         repo_root = _repo_root(plan)
-        branch = self._apply_local_branch(repo_root, plan_id, patch_diff)
-        apply_id = "apply_" + _sha256_text(f"{repository_id}|{plan_id}|{simulation_id}|{branch}")[:24]
+        applied = self._apply_local_branch(repo_root, plan_id, patch_diff)
+        apply_id = "apply_" + _sha256_text(
+            f"{repository_id}|{plan_id}|{simulation_id}|{applied['branch_name']}|{applied['commit_sha']}"
+        )[:24]
         payload = {
             "schema_version": SCHEMA_VERSION,
             "backend_mode": BACKEND_MODE,
@@ -237,7 +239,8 @@ class PackagedRepositoryAdvanced:
             "apply_result_id": apply_id,
             "mode": mode,
             "status": "applied",
-            "branch_name": branch,
+            "branch_name": applied["branch_name"],
+            "commit_sha": applied["commit_sha"],
             "local_checkout_path": str(repo_root),
             "changed_files": plan.get("changed_files") or [],
             "created_at": _utc_now(),
@@ -322,7 +325,7 @@ class PackagedRepositoryAdvanced:
         _atomic_write_json(self._apply_dir / f"{apply_id}.json", payload)
         return payload
 
-    def _apply_local_branch(self, repo_root: Path, plan_id: str, patch_diff: str) -> str:
+    def _apply_local_branch(self, repo_root: Path, plan_id: str, patch_diff: str) -> dict[str, str]:
         _require_git_repo(repo_root)
         blockers = _apply_blockers(repo_root, patch_diff)
         if blockers:
@@ -338,9 +341,11 @@ class PackagedRepositoryAdvanced:
         try:
             _run_git(repo_root, ["apply", "--check", str(patch_path)])
             _run_git(repo_root, ["apply", str(patch_path)])
+            _commit_applied_patch(repo_root, plan_id, _changed_files_from_patch(patch_diff))
         finally:
             patch_path.unlink(missing_ok=True)
-        return branch
+        commit_sha = _run_git(repo_root, ["rev-parse", "HEAD"]).stdout.strip()
+        return {"branch_name": branch, "commit_sha": commit_sha}
 
     def _validate_repository(
         self,
@@ -576,6 +581,37 @@ def _apply_blockers(repo_root: Path, patch_diff: str) -> dict[str, Any]:
     return {}
 
 
+def _commit_applied_patch(repo_root: Path, plan_id: str, changed_files: list[str]) -> None:
+    if not changed_files:
+        raise PackagedRepositoryAdvancedError(
+            "repository_apply_empty_patch",
+            "local_branch apply requires a patch with at least one changed file.",
+            {"repo_root": str(repo_root), "decision_plan_id": plan_id},
+        )
+    _run_git(repo_root, ["add", "--", *changed_files])
+    staged = _run_git(repo_root, ["diff", "--cached", "--name-only", "-z"])
+    staged_files = [entry for entry in staged.stdout.split("\0") if entry]
+    if not staged_files:
+        raise PackagedRepositoryAdvancedError(
+            "repository_apply_empty_patch",
+            "The packaged local patch applied without staged changes.",
+            {"repo_root": str(repo_root), "decision_plan_id": plan_id, "changed_files": changed_files},
+        )
+    _run_git(
+        repo_root,
+        [
+            "-c",
+            "user.name=Codna",
+            "-c",
+            "user.email=codna@example.invalid",
+            "commit",
+            "--no-gpg-sign",
+            "-m",
+            f"codna: apply {plan_id}",
+        ],
+    )
+
+
 def _git_status(repo_root: Path, *, include_untracked: bool) -> list[str]:
     untracked = "all" if include_untracked else "no"
     result = _run_git(repo_root, ["status", "--porcelain=v1", "-z", f"--untracked-files={untracked}"])

{codna-0.1.16 → codna-0.1.18}/codna.egg-info/PKG-INFO

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

{codna-0.1.16 → codna-0.1.18}/pyproject.toml

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

{codna-0.1.16 → codna-0.1.18}/tests/test_config_file.py

@@ -43,10 +43,12 @@ def test_explicit_missing_config_raises(tmp_path):
 
 def test_model_env_ref_sets_provider_env(tmp_path, monkeypatch):
     monkeypatch.delenv("OPENAI_API_KEY", raising=False)
+    monkeypatch.delenv("CODNA_AGENT_PROVIDER", raising=False)
     monkeypatch.setenv("CODNA_MODEL_KEY", "sk-openai-xyz")
     p = _write(tmp_path, "codna.yaml", "model:\n  provider: openai\n  key: env:CODNA_MODEL_KEY\n")
     config_file.apply_config(str(p))
     assert os.environ["OPENAI_API_KEY"] == "sk-openai-xyz"
+    assert os.environ["CODNA_AGENT_PROVIDER"] == "openai"
 
 
 def test_unresolved_env_ref_fails_closed(tmp_path, monkeypatch):
@@ -69,6 +71,7 @@ def test_privacy_only_config_skips_unresolved_model_key(tmp_path, monkeypatch):
     config_file.apply_config(str(p), include_model=False)
 
     assert "OPENAI_API_KEY" not in os.environ
+    assert "CODNA_AGENT_PROVIDER" not in os.environ
     assert os.environ["CODNA_REQUIRE_EGRESS_DENY"] == "1"
 
 

{codna-0.1.16 → codna-0.1.18}/tests/test_local_client.py

@@ -1,11 +1,8 @@
 from __future__ import annotations
 
 import os
-import signal
 import subprocess
 import sys
-import threading
-import time
 from pathlib import Path
 from types import ModuleType, SimpleNamespace
 
@@ -14,9 +11,7 @@ import pytest
 
 from codna.local_client import LocalCodnaRuntimeClient
 from codna.packaged_repository_advanced import PackagedAgentRunResult, PackagedRepositoryAdvancedError
-from codna.runtime.config import ConfigValue
 import codna.local_client as local_client_module
-import codna.local_mojo_daemon as mojo_daemon_module
 import codna.local_mojo_pool as mojo_pool_module
 import codna.packaged_agent_runner as packaged_agent_runner_module
 
@@ -471,8 +466,95 @@ def test_packaged_local_branch_allows_unrelated_untracked_files(tmp_path, monkey
 
     assert result["status"] == "applied"
     assert result["branch_name"].startswith("codna/")
+    assert result["commit_sha"] == _git(repo, "rev-parse", "HEAD").strip()
     assert (repo / "app.ts").read_text(encoding="utf-8") == "export function price() { return 2 }\n"
     assert (repo / "__pycache__" / "app.cpython-313.pyc").exists()
+    assert _git(repo, "status", "--porcelain=v1", "--untracked-files=no") == ""
+
+
+def test_packaged_local_branch_commits_each_iteration_for_refix(tmp_path, monkeypatch) -> None:
+    repo = tmp_path / "repo"
+    repo.mkdir()
+    (repo / "app.ts").write_text("export function price() { return 1 }\n", encoding="utf-8")
+    (repo / "AGENTS.md").write_text("- Keep fixes minimal.\n", encoding="utf-8")
+    _git(repo, "init", "-b", "main")
+    _git(repo, "add", "app.ts", "AGENTS.md")
+    _git(repo, "-c", "user.email=a@example.com", "-c", "user.name=Tester", "commit", "-m", "initial")
+    monkeypatch.delenv("ALGENTA_ENGINE_DIR", raising=False)
+    monkeypatch.setenv("CODNA_RUNTIME_ROOT", str(tmp_path / ".codna"))
+    monkeypatch.setattr(local_client_module, "_import_repository_modules", _raise_missing_apps_backend)
+    patches = iter([
+        (
+            "diff --git a/AGENTS.md b/AGENTS.md\n"
+            "--- a/AGENTS.md\n"
+            "+++ b/AGENTS.md\n"
+            "@@ -1 +1,2 @@\n"
+            " - Keep fixes minimal.\n"
+            "+- Mention the price bug.\n"
+        ),
+        (
+            "diff --git a/app.ts b/app.ts\n"
+            "--- a/app.ts\n"
+            "+++ b/app.ts\n"
+            "@@ -1 +1 @@\n"
+            "-export function price() { return 1 }\n"
+            "+export function price() { return 2 }\n"
+        ),
+    ])
+
+    def fake_run(_runner, _request):
+        return PackagedAgentRunResult(
+            status="succeeded",
+            terminal_state="succeeded",
+            agent_run_id="run-1",
+            session_id="session-1",
+            text="Generated a patch.",
+            files_changed=[],
+            telemetry={"tokens_in_uncached": 12, "tokens_out": 5, "total_cost": 0.01},
+            artifacts={},
+            runtime={"kind": "cline", "is_stub": False},
+            patch_diff=next(patches),
+        )
+
+    monkeypatch.setattr(local_client_module.SidecarPackagedAgentRunner, "run", fake_run)
+    client = LocalCodnaRuntimeClient()
+    connector = client.create_connector(name="repo", connector_type="local_repo", config={"path": str(repo)})
+
+    applied = []
+    for issue in ("document price bug", "fix price bug"):
+        snapshot = client.create_repository_snapshot(connector["id"], {})
+        triage = client.triage_repository(
+            connector["id"],
+            {"snapshot_id": snapshot["snapshot_id"], "signals": {"issue_text": issue}},
+        )
+        plan = client.create_repository_decision_plan(
+            connector["id"],
+            {
+                "snapshot_id": snapshot["snapshot_id"],
+                "workspace_evidence_bundle_ref": triage["workspace_evidence_bundle_ref"],
+                "signals": {"issue_text": issue},
+            },
+        )
+        simulation = client.simulate_repository(
+            connector["id"],
+            {"snapshot_id": snapshot["snapshot_id"], "decision_plan_id": plan["decision_plan_id"]},
+        )
+        applied.append(client.apply_repository(
+            connector["id"],
+            {
+                "mode": "local_branch",
+                "write_permission": True,
+                "decision_plan_id": plan["decision_plan_id"],
+                "simulation_id": simulation["validated_inputs"]["simulation_id"],
+            },
+        ))
+
+    assert [applied[1]["commit_sha"], applied[0]["commit_sha"]] == (
+        _git(repo, "rev-list", "--max-count=2", "HEAD").splitlines()
+    )
+    assert (repo / "app.ts").read_text(encoding="utf-8") == "export function price() { return 2 }\n"
+    assert "Mention the price bug" in (repo / "AGENTS.md").read_text(encoding="utf-8")
+    assert _git(repo, "status", "--porcelain=v1", "--untracked-files=no") == ""
 
 
 def test_packaged_local_branch_rejects_conflicting_untracked_target(tmp_path, monkeypatch) -> None:

{codna-0.1.16 → codna-0.1.18}/tests/test_packaging.py

@@ -305,8 +305,13 @@ def test_native_runtime_build_has_wheel_tag_guard():
 def test_github_action_preserves_codna_failure_status_without_forcing_remote_engine():
     action = (ROOT / "action.yml").read_text(encoding="utf-8")
     assert 'default: ""' in action
-    assert 'package_path="codna"' in action
-    assert 'package_path="$GITHUB_ACTION_PATH/cli"' in action
+    assert "if: ${{ env.CODNA_ACTION_INSTALL_FROM_SOURCE == '1' }}" in action
+    assert "resolve_package_path()" in action
+    assert "CODNA_ACTION_INSTALL_SPEC" in action
+    assert "CODNA_ACTION_INSTALL_FROM_SOURCE" in action
+    assert "Could not determine Codna package version from cli/pyproject.toml" in action
+    assert "printf 'codna==%s\\n' \"$version\"" in action
+    assert 'printf \'%s\\n\' "$GITHUB_ACTION_PATH/cli"' in action
     assert 'pipx install --force "$package_path"' in action
     assert "python_supports_codna()" in action
     assert "python_is_virtualenv()" in action
@@ -318,6 +323,10 @@ def test_github_action_preserves_codna_failure_status_without_forcing_remote_eng
     assert action.index('if [ -n "${PYTHON:-}" ] && python_is_virtualenv "$PYTHON_BIN"; then') < action.index(
         'elif command -v pipx >/dev/null 2>&1; then'
     )
+    assert (
+        'if [ "${CODNA_ACTION_INSTALL_FROM_SOURCE:-}" = "1" ] && [ -n "${GITHUB_ACTION_PATH:-}" ] '
+        '&& [ -d "$GITHUB_ACTION_PATH/agent-core/vendor/cline" ]; then'
+    ) in action
     assert "bun install --frozen-lockfile" in action
     assert "bun run build:sdk" in action
     assert "bash algenta/postbuild.sh" in action