fix(recovery): classify harbor repair cross-workflow jobs

apps/api/src/services/harbor_registry_controlled_recovery_receipt.py

@@ -170,6 +170,12 @@ def validate_harbor_registry_controlled_recovery_receipt(
             "gitea_queue_harbor_110_jobs_stale_or_mismatched": gitea_queue[
                 "harbor_110_repair_jobs_stale_or_mismatched"
             ],
+            "gitea_queue_harbor_110_jobs_cross_workflow_mismatch": gitea_queue[
+                "harbor_110_repair_jobs_cross_workflow_mismatch"
+            ],
+            "gitea_queue_harbor_110_jobs_payload_classifier": gitea_queue[
+                "harbor_110_repair_jobs_payload_classifier"
+            ],
             "gitea_queue_latest_cd_run_status": gitea_queue[
                 "latest_visible_cd_run_status"
             ],
@@ -535,6 +541,9 @@ def _gitea_queue_readback(value: Any) -> dict[str, Any]:
             "harbor_110_repair_waiting": False,
             "harbor_110_repair_blocked": False,
             "harbor_110_repair_jobs_stale_or_mismatched": False,
+            "harbor_110_repair_jobs_cross_workflow_mismatch": False,
+            "harbor_110_repair_jobs_payload_classifier": "",
+            "harbor_110_repair_jobs_expected_names": [],
             "harbor_110_repair_jobs_unexpected_names": [],
             "harbor_110_repair_jobs_labels": [],
             "harbor_110_repair_jobs_runner_names": [],
@@ -558,6 +567,10 @@ def _gitea_queue_readback(value: Any) -> dict[str, Any]:
         rollups.get("harbor_110_repair_jobs_stale_or_mismatched") is True
         or readback.get("harbor_110_repair_jobs_stale_or_mismatched") is True
     )
+    jobs_cross_workflow = bool(
+        rollups.get("harbor_110_repair_jobs_cross_workflow_mismatch") is True
+        or readback.get("harbor_110_repair_jobs_cross_workflow_mismatch") is True
+    )
     waiting = bool(
         rollups.get("harbor_110_repair_waiting") is True
         or readback.get("latest_visible_harbor_110_repair_waiting") is True
@@ -598,6 +611,7 @@ def _gitea_queue_readback(value: Any) -> dict[str, Any]:
     blockers = _gitea_queue_blockers(
         no_matching_runner=bool(no_matching_label),
         jobs_stale=jobs_stale,
+        jobs_cross_workflow=jobs_cross_workflow,
         current_cd_harbor_retrying=current_cd_harbor_retrying,
         blocked=blocked,
         boundary_violation=boundary_violation,
@@ -629,6 +643,15 @@ def _gitea_queue_readback(value: Any) -> dict[str, Any]:
         "harbor_110_repair_waiting": waiting,
         "harbor_110_repair_blocked": blocked,
         "harbor_110_repair_jobs_stale_or_mismatched": jobs_stale,
+        "harbor_110_repair_jobs_cross_workflow_mismatch": jobs_cross_workflow,
+        "harbor_110_repair_jobs_payload_classifier": str(
+            rollups.get("harbor_110_repair_jobs_payload_classifier")
+            or readback.get("harbor_110_repair_jobs_payload_classifier")
+            or ""
+        ),
+        "harbor_110_repair_jobs_expected_names": _strings(
+            readback.get("harbor_110_repair_jobs_expected_names")
+        ),
         "harbor_110_repair_jobs_unexpected_names": _strings(
             readback.get("harbor_110_repair_jobs_unexpected_names")
         ),
@@ -651,6 +674,7 @@ def _gitea_queue_blockers(
     *,
     no_matching_runner: bool,
     jobs_stale: bool,
+    jobs_cross_workflow: bool,
     current_cd_harbor_retrying: bool,
     blocked: bool,
     boundary_violation: bool,
@@ -662,6 +686,8 @@ def _gitea_queue_blockers(
         blockers.append("gitea_queue_harbor_110_repair_no_matching_runner")
     elif blocked:
         blockers.append("gitea_queue_harbor_110_repair_blocked")
+    if jobs_cross_workflow:
+        blockers.append("gitea_queue_harbor_110_repair_jobs_cross_workflow_mismatch")
     if jobs_stale:
         blockers.append("gitea_queue_harbor_110_repair_jobs_stale_or_mismatched")
     if boundary_violation:

apps/api/tests/test_harbor_registry_controlled_recovery_receipt.py

@@ -225,6 +225,42 @@ def test_harbor_recovery_receipt_surfaces_gitea_queue_blockers() -> None:
     }
 
 
+def test_harbor_recovery_receipt_surfaces_cross_workflow_queue_payload() -> None:
+    payload = validate_harbor_registry_controlled_recovery_receipt(
+        {
+            "watchdog_check_output": _watchdog_check_output(
+                ready=True,
+                status=401,
+            ),
+            "public_registry_v2_http_status": 401,
+            "internal_registry_v2_http_status": 401,
+            "gitea_actions_queue_readback": _gitea_queue_cross_workflow_jobs(),
+        }
+    )
+
+    assert "gitea_queue_harbor_110_repair_jobs_cross_workflow_mismatch" in payload[
+        "active_blockers"
+    ]
+    assert "gitea_queue_harbor_110_repair_jobs_stale_or_mismatched" in payload[
+        "active_blockers"
+    ]
+    queue = payload["readback"]["gitea_actions_queue"]
+    assert queue["harbor_110_repair_jobs_cross_workflow_mismatch"] is True
+    assert queue["harbor_110_repair_jobs_payload_classifier"] == (
+        "cd_workflow_jobs_returned_for_harbor_110_repair_run"
+    )
+    assert queue["harbor_110_repair_jobs_expected_names"] == [
+        "harbor-110-local-repair",
+        "workflow-shape",
+    ]
+    assert payload["rollups"][
+        "gitea_queue_harbor_110_jobs_cross_workflow_mismatch"
+    ] is True
+    assert payload["rollups"]["gitea_queue_harbor_110_jobs_payload_classifier"] == (
+        "cd_workflow_jobs_returned_for_harbor_110_repair_run"
+    )
+
+
 def test_harbor_recovery_receipt_waits_for_deploy_marker_readback() -> None:
     payload = validate_harbor_registry_controlled_recovery_receipt(
         {
@@ -464,6 +500,37 @@ def _gitea_queue_no_matching_runner() -> dict:
     }
 
 
+def _gitea_queue_cross_workflow_jobs() -> dict:
+    payload = _gitea_queue_no_matching_runner()
+    payload["readback"].update(
+        {
+            "harbor_110_repair_jobs_cross_workflow_mismatch": True,
+            "harbor_110_repair_jobs_payload_classifier": (
+                "cd_workflow_jobs_returned_for_harbor_110_repair_run"
+            ),
+            "harbor_110_repair_jobs_expected_names": [
+                "harbor-110-local-repair",
+                "workflow-shape",
+            ],
+            "harbor_110_repair_jobs_unexpected_names": [
+                "build-and-deploy",
+                "post-deploy-checks",
+                "tests",
+            ],
+            "harbor_110_repair_jobs_labels": ["awoooi-host"],
+        }
+    )
+    payload["rollups"].update(
+        {
+            "harbor_110_repair_jobs_cross_workflow_mismatch": True,
+            "harbor_110_repair_jobs_payload_classifier": (
+                "cd_workflow_jobs_returned_for_harbor_110_repair_run"
+            ),
+        }
+    )
+    return payload
+
+
 def _deploy_marker_verified() -> dict:
     return {
         "schema_version": "awoooi_production_deploy_readback_blocker_v1",