From 8edc8068693f741ffb34055a78fa56c21136d5dc Mon Sep 17 00:00:00 2001 From: Alajmah <55954113+Alajmah@users.noreply.github.com> Date: Tue, 9 Jun 2026 03:36:18 +0300 Subject: [PATCH 1/5] Add patch target restore helper --- src/sovereign_cortex/patch_restore.py | 48 +++++++++++++++++++++++++++ 1 file changed, 48 insertions(+) create mode 100644 src/sovereign_cortex/patch_restore.py diff --git a/src/sovereign_cortex/patch_restore.py b/src/sovereign_cortex/patch_restore.py new file mode 100644 index 0000000..a5cf970 --- /dev/null +++ b/src/sovereign_cortex/patch_restore.py @@ -0,0 +1,48 @@ +from __future__ import annotations + +from contextlib import contextmanager +from dataclasses import dataclass +from pathlib import Path +from typing import Iterator + +from .events import ProposedPatch + + +@dataclass(frozen=True) +class PatchTargetSnapshot: + path: Path + existed: bool + content: str | None + + +@contextmanager +def restore_patch_target_on_error(vault_root: Path, patch: ProposedPatch) -> Iterator[None]: + snapshot = _snapshot_patch_target(vault_root, patch) + try: + yield + except Exception: + _restore_patch_target(snapshot) + raise + + +def _snapshot_patch_target(vault_root: Path, patch: ProposedPatch) -> PatchTargetSnapshot: + path = _resolve(vault_root, patch.relative_path) + existed = path.exists() + content = path.read_text(encoding="utf-8") if existed else None + return PatchTargetSnapshot(path=path, existed=existed, content=content) + + +def _restore_patch_target(snapshot: PatchTargetSnapshot) -> None: + if snapshot.existed: + snapshot.path.parent.mkdir(parents=True, exist_ok=True) + snapshot.path.write_text(snapshot.content or "", encoding="utf-8") + elif snapshot.path.exists(): + snapshot.path.unlink() + + +def _resolve(vault_root: Path, relative_path: str) -> Path: + path = (vault_root / relative_path).resolve() + root = vault_root.resolve() + if root not in path.parents and path != root: + raise ValueError(f"Patch path escapes the workspace: {relative_path}") + return path From a231b69e32560580b7bd3e829a0dd413fb5f01e0 Mon Sep 17 00:00:00 2001 From: Alajmah <55954113+Alajmah@users.noreply.github.com> Date: Tue, 9 Jun 2026 03:36:38 +0300 Subject: [PATCH 2/5] Restore approval patch target on audit error --- src/sovereign_cortex/approvals.py | 14 ++++++++------ 1 file changed, 8 insertions(+), 6 deletions(-) diff --git a/src/sovereign_cortex/approvals.py b/src/sovereign_cortex/approvals.py index 6016069..83882e4 100644 --- a/src/sovereign_cortex/approvals.py +++ b/src/sovereign_cortex/approvals.py @@ -10,6 +10,7 @@ from .events import PatchOperation, ProposedPatch from .git_audit import GitAudit +from .patch_restore import restore_patch_target_on_error from .policy import PolicyDecision from .vault import Vault from .workspace import WorkspaceRegistry @@ -114,13 +115,14 @@ def approve(self, approval_id: str) -> ApprovalRequest: workspace = registry.get(request.workspace) vault = Vault(workspace.vault_root) self._ensure_patch_is_current(request, workspace.vault_root) - vault.apply_patch(request.patch) - git = GitAudit(self.repo_root) - commit_hash = git.commit_paths( - [f"vault/{request.workspace}/{request.patch.relative_path}"], - f"Approve Cortex patch: {request.patch.summary}", - ) + with restore_patch_target_on_error(workspace.vault_root, request.patch): + vault.apply_patch(request.patch) + git = GitAudit(self.repo_root) + commit_hash = git.commit_paths( + [f"vault/{request.workspace}/{request.patch.relative_path}"], + f"Approve Cortex patch: {request.patch.summary}", + ) updated = request.model_copy( update={ From 84fb7dc5ff0c1ecd239366ba2c5840d0e703d99e Mon Sep 17 00:00:00 2001 From: Alajmah <55954113+Alajmah@users.noreply.github.com> Date: Tue, 9 Jun 2026 03:37:17 +0300 Subject: [PATCH 3/5] Restore auto-approved patch target on audit error --- src/sovereign_cortex/orchestrator.py | 28 +++++++++++++++------------- 1 file changed, 15 insertions(+), 13 deletions(-) diff --git a/src/sovereign_cortex/orchestrator.py b/src/sovereign_cortex/orchestrator.py index c234727..10e0df3 100644 --- a/src/sovereign_cortex/orchestrator.py +++ b/src/sovereign_cortex/orchestrator.py @@ -14,6 +14,7 @@ TaskResult, ) from .git_audit import GitAudit +from .patch_restore import restore_patch_target_on_error from .policy import PolicyEngine from .vault import Vault, render_markdown from .workspace import WorkspaceRegistry @@ -159,21 +160,22 @@ def handle_command( patches=[patch], ) - vault.apply_patch(patch) - events.append( - self._event( - EventType.PATCH_APPLIED, - "agent/orchestrator", - "vault/demo-project", - {"relative_path": patch.relative_path}, - correlation_id=command_event.correlation_id, + with restore_patch_target_on_error(workspace.vault_root, patch): + vault.apply_patch(patch) + events.append( + self._event( + EventType.PATCH_APPLIED, + "agent/orchestrator", + "vault/demo-project", + {"relative_path": patch.relative_path}, + correlation_id=command_event.correlation_id, + ) ) - ) - commit_hash = self.git.commit_paths( - [f"vault/{self.workspace_name}/{patch.relative_path}"], - f"Apply Cortex patch: {patch.summary}", - ) + commit_hash = self.git.commit_paths( + [f"vault/{self.workspace_name}/{patch.relative_path}"], + f"Apply Cortex patch: {patch.summary}", + ) events.append( self._event( EventType.AUDIT_COMMITTED, From 3a82cc21fd5376ab315322eeabc0dbc9c9e8cff1 Mon Sep 17 00:00:00 2001 From: Alajmah <55954113+Alajmah@users.noreply.github.com> Date: Tue, 9 Jun 2026 03:37:47 +0300 Subject: [PATCH 4/5] Add approval audit safety regression tests --- tests/test_approvals.py | 49 +++++++++++++++++++++++++++++++++++++++++ 1 file changed, 49 insertions(+) diff --git a/tests/test_approvals.py b/tests/test_approvals.py index a24fc29..54b487a 100644 --- a/tests/test_approvals.py +++ b/tests/test_approvals.py @@ -22,6 +22,10 @@ def _rewrite_request(path: Path, request) -> None: path.write_text(request.model_dump_json(indent=2) + "\n", encoding="utf-8") +def _raise_commit_error(self, paths, message): + raise RuntimeError("commit unavailable") + + def test_orchestrator_saves_pending_approval(tmp_path): repo_root = _copy_repo(tmp_path) result = LocalOrchestrator(repo_root).handle_command( @@ -74,6 +78,51 @@ def test_approval_approve_applies_patch_and_moves_request(tmp_path): assert "Cortex Notes" in task_text +def test_approval_keeps_updated_file_current_when_commit_is_unavailable(tmp_path, monkeypatch): + repo_root = _copy_repo(tmp_path) + result = LocalOrchestrator(repo_root).handle_command( + "Move the website launch task to next Friday and explain the dependency impact", + auto_approve=False, + ) + task_path = repo_root / "vault" / "demo-project" / "tasks" / "launch-website.md" + before = task_path.read_text(encoding="utf-8") + monkeypatch.setattr("sovereign_cortex.approvals.GitAudit.commit_paths", _raise_commit_error) + + with pytest.raises(RuntimeError, match="commit unavailable"): + ApprovalStore(repo_root).approve(result.approval_id) + + assert task_path.read_text(encoding="utf-8") == before + assert (repo_root / "approval_requests" / "pending" / f"{result.approval_id}.json").exists() + assert not (repo_root / "approval_requests" / "approved" / f"{result.approval_id}.json").exists() + + +def test_approval_removes_created_file_when_commit_is_unavailable(tmp_path, monkeypatch): + repo_root = _copy_repo(tmp_path) + target = repo_root / "vault" / "demo-project" / "tasks" / "new-audit-task.md" + store = ApprovalStore(repo_root) + request = store.create( + workspace="demo-project", + command_text="Create a new audit task", + correlation_id="test-correlation", + patch=ProposedPatch( + operation=PatchOperation.CREATE_FILE, + relative_path="tasks/new-audit-task.md", + before=None, + after="---\nid: new-audit-task\ntitle: New Audit Task\n---\n# New Audit Task\n", + summary="Create new audit task.", + ), + policy_decision=PolicyDecision(allowed=True, approval_required=True, reason="ok"), + ) + monkeypatch.setattr("sovereign_cortex.approvals.GitAudit.commit_paths", _raise_commit_error) + + with pytest.raises(RuntimeError, match="commit unavailable"): + store.approve(request.approval_id) + + assert not target.exists() + assert (repo_root / "approval_requests" / "pending" / f"{request.approval_id}.json").exists() + assert not (repo_root / "approval_requests" / "approved" / f"{request.approval_id}.json").exists() + + def test_approval_rejects_stale_update_and_keeps_request_pending(tmp_path): repo_root = _copy_repo(tmp_path) result = LocalOrchestrator(repo_root).handle_command( From e4ef4ea814abb76e06f713d95de3c853bd5a8b1f Mon Sep 17 00:00:00 2001 From: Alajmah <55954113+Alajmah@users.noreply.github.com> Date: Tue, 9 Jun 2026 03:38:00 +0300 Subject: [PATCH 5/5] Add auto approve audit safety regression test --- tests/test_orchestrator.py | 26 ++++++++++++++++++++++++++ 1 file changed, 26 insertions(+) diff --git a/tests/test_orchestrator.py b/tests/test_orchestrator.py index 030a4b0..506f4cd 100644 --- a/tests/test_orchestrator.py +++ b/tests/test_orchestrator.py @@ -1,8 +1,23 @@ +import shutil from pathlib import Path +import pytest + from sovereign_cortex.orchestrator import LocalOrchestrator +def _copy_repo(tmp_path: Path) -> Path: + source = Path(__file__).resolve().parents[1] + target = tmp_path / "repo" + ignore = shutil.ignore_patterns(".git", ".pytest_cache", "__pycache__", "approval_requests") + shutil.copytree(source, target, ignore=ignore) + return target + + +def _raise_commit_error(self, paths, message): + raise RuntimeError("commit unavailable") + + def test_orchestrator_proposes_launch_patch(): repo_root = Path(__file__).resolve().parents[1] result = LocalOrchestrator(repo_root).handle_command( @@ -13,3 +28,14 @@ def test_orchestrator_proposes_launch_patch(): assert result.patches assert result.approval_id assert "Launch Website" in result.patches[0].after + + +def test_auto_approve_removes_created_file_when_commit_is_unavailable(tmp_path, monkeypatch): + repo_root = _copy_repo(tmp_path) + target = repo_root / "vault" / "demo-project" / "tasks" / "audit-check.md" + monkeypatch.setattr("sovereign_cortex.orchestrator.GitAudit.commit_paths", _raise_commit_error) + + with pytest.raises(RuntimeError, match="commit unavailable"): + LocalOrchestrator(repo_root).handle_command("Create task Audit Check", auto_approve=True) + + assert not target.exists()