Publish curated Unraid-AppOps-Gateway source from ad0a390e431166c3198a2ac3bec010c2b44f2dea

backend/app/services/mcp_hub_deployment_reconciliation.py

@@ -10,6 +10,7 @@ from ..core.redaction import redact_message
 _CONTROLLER = "gitea-deploy-control"
 _REPOSITORY = "jens/itworx_mcp_hub"
 _COMPOSE_PROJECT = "itworx-mcp-hub"
+_TOPOLOGY_CONTRACT = "itworx.mcp-hub-topology/17-v1"
 
 # One-time fail-closed re-attestation for the existing MCP Hub runtime. The
 # script never builds, restarts, recreates, stops or deploys a container. It
@@ -28,11 +29,12 @@ import sys
 import time
 
 repository, expected_compose_project = sys.argv[1:3]
-registry_path = Path("/opt/gitea-deploy/projects.json")
-host_registry_path = Path("/mnt/cache/appdata/gitea-deploy-runners/controller/projects.json")
+registry_path = Path("/controller-config/projects.json")
+host_registry_path = Path("/controller-hub-releases/controller-config/projects.json")
 state_root = Path("/mnt/cache/appdata/gitea-deploy-runners/state")
 global_lock_path = Path("/mnt/cache/appdata/gitea-deploy-runners/deploy.lock")
 owned_image_source = "https://gitea.example.com/jens/itworx-mcp-hub"
+topology_contract = "itworx.mcp-hub-topology/17-v1"
 
 if repository != "jens/itworx_mcp_hub" or expected_compose_project != "itworx-mcp-hub":
     raise SystemExit(40)
@@ -69,6 +71,10 @@ expected_fixed = {
     "itworx-mcp-hub-web-1",
     "itworx-mcp-hub-worker-1",
 }
+expected_runtime = expected_fixed | {
+    "itworx-mcp-hub-connector-ingestion-1",
+    "itworx-mcp-hub-ingestion-clamd-1",
+}
 if (
     project.get("branch") != "main"
     or project.get("slug") != expected_compose_project
@@ -77,6 +83,7 @@ if (
     or set(expected_containers) != expected_fixed
 ):
     raise SystemExit(23)
+expected_containers = sorted(expected_runtime)
 
 state_path = state_root / f"{expected_compose_project}.json"
 project_lock_path = state_root / "locks" / f"{expected_compose_project}.lock"
@@ -310,12 +317,33 @@ with project_lock:
         receipt = state.get("live_receipt")
         recorded_artifacts = state.get("live_artifacts")
 
+        registered_live_containers = (
+            recorded_artifacts.get("containers")
+            if isinstance(recorded_artifacts, dict)
+            else None
+        )
+        if isinstance(registered_live_containers, dict) and set(registered_live_containers) == expected_fixed:
+            print("mcp-hub-topology-migration-required", flush=True)
+            raise SystemExit(56)
+
         already_reconciled = (
-            state.get("live_legacy_provenance") is True
-            and recorded_status == "success"
+            recorded_status == "success"
             and recorded_live_status == "healthy"
             and re.fullmatch(r"[0-9a-f]{40}", recorded_live) is not None
             and isinstance(recorded_artifacts, dict)
+            and state.get("compose_project") == expected_compose_project
+            and isinstance(registered_live_containers, dict)
+            and set(registered_live_containers) == expected_runtime
+            and recorded_artifacts.get("topology_contract") == topology_contract
+            and (
+                state.get("live_legacy_provenance") is True
+                or (
+                    isinstance(receipt, dict)
+                    and receipt.get("schema") == "gitea-deploy-receipt.v1"
+                    and receipt.get("repository") == repository
+                    and receipt.get("revision") == recorded_live
+                )
+            )
         )
         if not already_reconciled and (
             recorded_status != "failed"
@@ -513,7 +541,11 @@ with project_lock:
         if not drift_found:
             raise SystemExit(52)
 
-        artifacts = {"containers": container_artifacts, "compose_sha256": ""}
+        artifacts = {
+            "containers": container_artifacts,
+            "compose_sha256": "",
+            "topology_contract": topology_contract,
+        }
         now = int(time.time())
         payload = {
             "schema_version": 3,
@@ -678,8 +710,16 @@ class McpHubDeploymentReconciliation:
             53: "reconciled MCP Hub deployment state could not be written durably",
             54: "reconciled MCP Hub deployment state did not verify after write",
             55: "unknown MCP Hub live status was not produced by a proven recoverable snapshot-stage failure",
+            56: "MCP Hub 15-to-17 topology migration requires its guarded protected-main deployment",
         }
         if exit_code != 0:
+            if exit_code == 56:
+                return {
+                    "status": "topology_migration_required",
+                    "repository": _REPOSITORY,
+                    "composeProject": _COMPOSE_PROJECT,
+                    "reason": reasons[exit_code],
+                }
             return {
                 "status": "validation_failed",
                 "reason": reasons.get(exit_code, "MCP Hub deployment reconciliation failed closed"),