refactor(v2r2c1): delegate completion to reconciliation decisions

active-runtime/app/aios_continuation_executor.py

@@ -25,6 +25,7 @@ from urllib.request import Request, urlopen
 from aios_authority_git_executor import AuthorityGitExecutor
 from aios_continuation_lease import WriterLeaseRequestV2
 from aios_gitops_job_controller import GitOpsJobController, JobState
+from aios_gitops_reconciliation_core import ReconciliationAction, RemoteObservation, decide_reconciliation
 from authorized_task_writer_provisioning import validate_writer_lease_request_v2
 
 
@@ -498,8 +499,10 @@ class ContinuationExecutor:
     def _finish_remote_verification(self, job_id: str, authority_oid: str, new_oid: str) -> dict[str, object]:
         row = self.controller.store.read(job_id)
         branch = row["branch"]
+        request = json.loads(row["request_json"])["binding"]
         git_oid, api_oid, visible = self._observe_remote(branch, new_oid)
-        if not (authority_oid == git_oid == api_oid == new_oid and visible):
+        decision = decide_reconciliation(RemoteObservation("aios/aios", branch, new_oid, authority_oid, git_oid, api_oid, visible, datetime.now(timezone.utc).isoformat(), request.get("expected_branch_oid")))
+        if decision.action is not ReconciliationAction.MARK_REMOTE_VERIFIED:
             return self._remote_pending(job_id, authority_oid, new_oid)
         receipt = {
             "authority_oid": authority_oid,
@@ -507,6 +510,7 @@ class ContinuationExecutor:
             "api_branch_oid": api_oid,
             "commit_visible": True,
             "remote_verified": True,
+            "reconciliation_decision": decision.action.value,
             "force_push": False,
         }
         self.controller.advance(job_id, JobState.REMOTE_VERIFIED, side_effect_state="REMOTE_VERIFIED", receipt=receipt)