merge(phase/02): v1.25 P2 contract+stack-IR policies complete

---ci---
project: acdl
phase: 2
milestone: v1.25
status: complete
phase_role: execution
---/ci---

.ciagent/CHECKPOINT.json

@@ -1,24 +1,22 @@
 {
-  "phase": 0,
+  "phase": 1,
   "stage": "complete",
   "milestone": "v1.25",
-  "phase_role": "pre_execution",
+  "phase_role": "execution",
   "attempts": 0,
-  "updated_at": "2026-08-12T16:50:00Z",
+  "updated_at": "2026-08-12T17:00:00Z",
   "project": "acdl",
   "milestone_complete": false,
   "tag_line": "v1.24.x",
-  "tag": "v1.24.0",
-  "next_tag": "v1.24.1",
-  "phases": 6,
-  "execution_phases": 4,
-  "requirements_total": 19,
-  "requirements": ["REQ-291", "REQ-292", "REQ-293", "REQ-294", "REQ-295", "REQ-296", "REQ-297", "REQ-298", "REQ-299", "REQ-300", "REQ-301", "REQ-302", "REQ-303", "REQ-304", "REQ-305", "REQ-306", "REQ-307", "REQ-308", "REQ-309"],
+  "tag": "v1.24.1",
+  "next_tag": "v1.24.2",
   "release": {
     "forge": "gitea",
     "releases_created": true,
-    "release_id": 640,
-    "release_tag": "v1.24.0"
+    "release_ids": {"v1.24.0": 640, "v1.24.1": 641},
+    "phase_release_id": 641
   },
-  "notes": "v1.25 phase 0 (pre-execution) complete. Tag v1.24.0 (gitea release id 640). 19 requirements (REQ-291..309) specified, clarified, researched, ideated, planned, grilled (PROCEED 0.86). 4 execution phases + P5 final. Phase 00 branch deleted. Next: P1 engine-core."
+  "requirements": ["REQ-291", "REQ-292", "REQ-293", "REQ-294", "REQ-308", "REQ-309"],
+  "tests": {"total": 156, "passed": 156, "skipped": 2, "failed": 0},
+  "notes": "v1.25 P1 (engine-core) complete. Tag v1.24.1 (gitea release id 641). 6 requirements (REQ-291..294, 308, 309). 24 new tests + 132 existing = 156 pass, 2 skip-without-kj. Phase 01 branch deleted. Next: P2 contract + stack-IR policies."
 }

adapters/kyverno-json/policies/contract/forbid-unknown-fields.json

@@ -0,0 +1,31 @@
+{
+  "apiVersion": "json.kyverno.io/v1alpha1",
+  "kind": "ValidatingPolicy",
+  "metadata": {
+    "name": "forbid-unknown-fields",
+    "annotations": {
+      "nova.cloudinit.dev/severity": "low",
+      "title.policy.kyverno.io": "Contract has only schema-allowed fields"
+    }
+  },
+  "spec": {
+    "rules": [
+      {
+        "name": "no-unknown-fields",
+        "validate": {
+          "message": "contract may only contain id, name, environment, infrastructure (schema-allowed fields)",
+          "assert": {
+            "all": [
+              {
+                "check": {
+                  "(length(keys(@)) == `4`)": true,
+                  "keys(@)": "(contains(['id','name','environment','infrastructure'], @))"
+                }
+              }
+            ]
+          }
+        }
+      }
+    ]
+  }
+}

adapters/kyverno-json/policies/contract/require-env-in-enum.json

@@ -0,0 +1,30 @@
+{
+  "apiVersion": "json.kyverno.io/v1alpha1",
+  "kind": "ValidatingPolicy",
+  "metadata": {
+    "name": "require-env-in-enum",
+    "annotations": {
+      "nova.cloudinit.dev/severity": "high",
+      "title.policy.kyverno.io": "Contract environment is one of dev/qa/prod/dr"
+    }
+  },
+  "spec": {
+    "rules": [
+      {
+        "name": "env-enum",
+        "validate": {
+          "message": "contract.environment must be one of dev, qa, prod, dr",
+          "assert": {
+            "all": [
+              {
+                "check": {
+                  "environment": "(contains(['dev','qa','prod','dr'], @))"
+                }
+              }
+            ]
+          }
+        }
+      }
+    ]
+  }
+}

adapters/kyverno-json/policies/contract/require-id-pattern.json

@@ -0,0 +1,30 @@
+{
+  "apiVersion": "json.kyverno.io/v1alpha1",
+  "kind": "ValidatingPolicy",
+  "metadata": {
+    "name": "require-id-pattern",
+    "annotations": {
+      "nova.cloudinit.dev/severity": "high",
+      "title.policy.kyverno.io": "Contract id matches operational acronym pattern"
+    }
+  },
+  "spec": {
+    "rules": [
+      {
+        "name": "id-pattern",
+        "validate": {
+          "message": "contract.id must match ^[a-z][a-z0-9-]{2,5}$ (3-6 char operational acronym)",
+          "assert": {
+            "all": [
+              {
+                "check": {
+                  "id": "(regex_match('^[a-z][a-z0-9-]{2,5}$', @))"
+                }
+              }
+            ]
+          }
+        }
+      }
+    ]
+  }
+}

adapters/kyverno-json/policies/contract/require-infrastructure-min-1.json

@@ -0,0 +1,30 @@
+{
+  "apiVersion": "json.kyverno.io/v1alpha1",
+  "kind": "ValidatingPolicy",
+  "metadata": {
+    "name": "require-infrastructure-min-1",
+    "annotations": {
+      "nova.cloudinit.dev/severity": "medium",
+      "title.policy.kyverno.io": "Contract declares at least one infrastructure entry"
+    }
+  },
+  "spec": {
+    "rules": [
+      {
+        "name": "infra-min-1",
+        "validate": {
+          "message": "contract.infrastructure must have at least one module entry",
+          "assert": {
+            "all": [
+              {
+                "check": {
+                  "infrastructure": "(length(keys(@)) > `0`)"
+                }
+              }
+            ]
+          }
+        }
+      }
+    ]
+  }
+}

adapters/kyverno-json/policies/stack-ir/forbid-public-ingress.json

@@ -0,0 +1,33 @@
+{
+  "apiVersion": "json.kyverno.io/v1alpha1",
+  "kind": "ValidatingPolicy",
+  "metadata": {
+    "name": "forbid-public-ingress",
+    "annotations": {
+      "nova.cloudinit.dev/severity": "high",
+      "title.policy.kyverno.io": "No resource has public ingress enabled"
+    }
+  },
+  "spec": {
+    "rules": [
+      {
+        "name": "no-public-ingress",
+        "identifier": "id",
+        "validate": {
+          "message": "public_ingress: true is not allowed on any resource (v1.0 demo rule, now declarative)",
+          "assert": {
+            "all": [
+              {
+                "check": {
+                  "~.resources": {
+                    "(inputs.public_ingress || `false`)": false
+                  }
+                }
+              }
+            ]
+          }
+        }
+      }
+    ]
+  }
+}

adapters/kyverno-json/policies/stack-ir/require-encryption-by-default.json

@@ -0,0 +1,57 @@
+{
+  "apiVersion": "json.kyverno.io/v1alpha1",
+  "kind": "ValidatingPolicy",
+  "metadata": {
+    "name": "require-encryption-by-default",
+    "annotations": {
+      "nova.cloudinit.dev/severity": "high",
+      "title.policy.kyverno.io": "S3 buckets and EBS volumes carry encryption config"
+    }
+  },
+  "spec": {
+    "rules": [
+      {
+        "name": "s3-encryption",
+        "identifier": "id",
+        "match": {
+          "any": [
+            {"type": "aws:s3:bucket"}
+          ]
+        },
+        "validate": {
+          "message": "S3 buckets must declare encryption config (inputs.bucket_encryption or inputs.kms_key_id)",
+          "assert": {
+            "all": [
+              {
+                "check": {
+                  "(contains(keys(inputs), 'bucket_encryption') || contains(keys(inputs), 'kms_key_id'))": true
+                }
+              }
+            ]
+          }
+        }
+      },
+      {
+        "name": "ebs-encryption",
+        "identifier": "id",
+        "match": {
+          "any": [
+            {"type": "aws:ebs:volume"}
+          ]
+        },
+        "validate": {
+          "message": "EBS volumes must declare encryption (inputs.encrypted or inputs.kms_key_id)",
+          "assert": {
+            "all": [
+              {
+                "check": {
+                  "(contains(keys(inputs), 'encrypted') || contains(keys(inputs), 'kms_key_id'))": true
+                }
+              }
+            ]
+          }
+        }
+      }
+    ]
+  }
+}

adapters/kyverno-json/policies/stack-ir/require-tagging-standard.json

@@ -0,0 +1,36 @@
+{
+  "apiVersion": "json.kyverno.io/v1alpha1",
+  "kind": "ValidatingPolicy",
+  "metadata": {
+    "name": "require-tagging-standard",
+    "annotations": {
+      "nova.cloudinit.dev/severity": "medium",
+      "title.policy.kyverno.io": "All resources carry required Nova tags"
+    }
+  },
+  "spec": {
+    "rules": [
+      {
+        "name": "require-nova-tags",
+        "identifier": "id",
+        "validate": {
+          "message": "Every taggable resource must carry nova:owner, nova:contract, nova:environment, nova:cost-center tags",
+          "assert": {
+            "all": [
+              {
+                "check": {
+                  "~.resources": {
+                    "(contains(keys(tags || `[]`), 'nova:owner'))": true,
+                    "(contains(keys(tags || `[]`), 'nova:contract'))": true,
+                    "(contains(keys(tags || `[]`), 'nova:environment'))": true,
+                    "(contains(keys(tags || `[]`), 'nova:cost-center'))": true
+                  }
+                }
+              }
+            ]
+          }
+        }
+      }
+    ]
+  }
+}

core/contract_resolver.py

@@ -488,6 +488,25 @@ def resolve(contract_path, repo_root=None, environment_override=None):
     # Validate contract against schema
     jsonschema.validate(contract, contract_schema)
 
+    # v1.25 (REQ-296): pre-resolve policy evaluation — run the active
+    # PolicyEngine over the contract dict with the contract/ policy
+    # dir BEFORE resolving. Failures feed the `policyResults` on the
+    # stack instance (the confidence signal's `policy` input). The
+    # resolver does NOT exit on policy failure — the confidence signal
+    # decides the gate (consistent with the existing --soft-fail
+    # Checkov pattern).
+    contract_pcrs: list = []
+    try:
+        from core.policy_engine import get_engine, get_policy_root
+        _engine = get_engine()
+        _policy_root = get_policy_root()
+        contract_pcrs = _engine.evaluate(
+            contract, _policy_root / "contract", contract.get("id", "unknown")
+        )
+    except Exception:
+        # Policy evaluation must never break the resolver.
+        contract_pcrs = []
+
     # Interpolation (D-081): expand ${env.<field>} + ${contract.<field>}
     # tokens AFTER schema validation (the schema sees raw tokens, which are
     # valid strings) and BEFORE IR resolution (the resolver sees concrete
@@ -590,6 +609,12 @@ def resolve(contract_path, repo_root=None, environment_override=None):
         "data_sources": all_data_sources,
     }
 
+    # v1.25 (REQ-296): attach the pre-resolve contract-policy PCRs to
+    # the stack instance. The post-resolve stack-IR PCRs are appended
+    # after stack-schema validation (below).
+    if contract_pcrs:
+        stack_instance["policyResults"] = list(contract_pcrs)
+
     # Add the human-readable title
     if contract.get("name"):
         stack_instance["stack"]["title"] = contract["name"]
@@ -606,6 +631,28 @@ def resolve(contract_path, repo_root=None, environment_override=None):
     stack_schema = _load_schema(os.path.join(repo_root, "schemas", "stack.schema.json"))
     jsonschema.validate(stack_instance, stack_schema)
 
+    # v1.25 (REQ-298): post-resolve policy evaluation — run the active
+    # PolicyEngine over the resolved Stack IR with the stack-ir/ policy
+    # dir. The resulting PCRs are appended to the contract-policy PCRs
+    # on the stack instance (additive — the resolver's return value
+    # shape and exceptions are unchanged). The confidence signal
+    # consumes the merged list as its `policy` input.
+    try:
+        from core.policy_engine import get_engine, get_policy_root
+        engine = get_engine()
+        policy_root = get_policy_root()
+        stack_ir_pcrs = engine.evaluate(
+            stack_instance, policy_root / "stack-ir", contract.get("id", "unknown")
+        )
+        stack_instance.setdefault("policyResults", []).extend(stack_ir_pcrs)
+    except Exception:
+        # Policy evaluation must never break the resolver — the
+        # confidence signal decides the gate. A failure here means the
+        # engine is misconfigured; the contract PCRs (if any) are still
+        # present, and the confidence signal proceeds with whatever
+        # `policy` input it receives (possibly empty → 0.5 neutral).
+        pass
+
     return stack_instance
 
 

tests/fixtures/stack_ir/failing.json

@@ -0,0 +1,34 @@
+{
+  "version": "1.0.0",
+  "stack": {
+    "name": "bad",
+    "title": "failing stack",
+    "kind": "l1",
+    "depth": 1,
+    "environment": "dev"
+  },
+  "resources": [
+    {
+      "id": "bucket",
+      "type": "aws:s3:bucket",
+      "module": "s3@1.0.0",
+      "inputs": {
+        "bucket_name": "acdl-dev-bad-bucket",
+        "region": "us-east-1",
+        "tags": {
+          "nova:owner": "team-a"
+        }
+      }
+    },
+    {
+      "id": "service",
+      "type": "aws:ecs:service",
+      "module": "microservice@1.0.0",
+      "inputs": {
+        "image": "nginx:latest",
+        "port": 80,
+        "public_ingress": true
+      }
+    }
+  ]
+}

tests/fixtures/stack_ir/passing.json

@@ -0,0 +1,43 @@
+{
+  "version": "1.0.0",
+  "stack": {
+    "name": "msvc",
+    "title": "microservice",
+    "kind": "l1",
+    "depth": 1,
+    "environment": "dev"
+  },
+  "resources": [
+    {
+      "id": "bucket",
+      "type": "aws:s3:bucket",
+      "module": "s3@1.0.0",
+      "inputs": {
+        "bucket_name": "acdl-dev-msvc-bucket",
+        "region": "us-east-1",
+        "bucket_encryption": {"rule": {"apply_server_side_encryption_by_default": {"sse_algorithm": "AES256"}}},
+        "tags": {
+          "nova:owner": "team-a",
+          "nova:contract": "msvc",
+          "nova:environment": "dev",
+          "nova:cost-center": "cc-1"
+        }
+      }
+    },
+    {
+      "id": "service",
+      "type": "aws:ecs:service",
+      "module": "microservice@1.0.0",
+      "inputs": {
+        "image": "nginx:latest",
+        "port": 80,
+        "tags": {
+          "nova:owner": "team-a",
+          "nova:contract": "msvc",
+          "nova:environment": "dev",
+          "nova:cost-center": "cc-1"
+        }
+      }
+    }
+  ]
+}

tests/test_stack_ir_policies.py

@@ -0,0 +1,86 @@
+"""Tests for stack-IR kyverno-json policies (REQ-299, v1.25).
+
+Tests the 3 policies in adapters/kyverno-json/policies/stack-ir/:
+require-tagging-standard, forbid-public-ingress, require-encryption-by-
+default. Uses the passing + failing fixtures. Skips when kj is absent.
+"""
+
+import json
+import os
+import sys
+from pathlib import Path
+
+import pytest
+
+sys.path.insert(0, str(Path(__file__).resolve().parent.parent))
+
+import importlib.util
+_ENGINE_PATH = Path(__file__).resolve().parent.parent / "adapters" / "kyverno-json" / "kyverno_json_engine.py"
+_spec = importlib.util.spec_from_file_location("kyverno_json_engine", _ENGINE_PATH)
+_mod = importlib.util.module_from_spec(_spec)
+_spec.loader.exec_module(_mod)
+KyvernoJsonEngine = _mod.KyvernoJsonEngine
+
+POLICY_DIR = Path(__file__).resolve().parent.parent / "adapters" / "kyverno-json" / "policies" / "stack-ir"
+FIXTURES = Path(__file__).resolve().parent / "fixtures" / "stack_ir"
+
+
+def _kj_installed() -> bool:
+    return _mod._which_kj() is not None
+
+
+@pytest.fixture(autouse=True)
+def _require_kj():
+    if not _kj_installed():
+        pytest.skip("kj not installed (scripts/install-kyverno-json.sh)")
+
+
+def _load(name):
+    with open(FIXTURES / name, "r", encoding="utf-8") as fh:
+        return json.load(fh)
+
+
+class TestPassingFixture:
+    def test_passing_fixture_all_pass(self):
+        eng = KyvernoJsonEngine()
+        out = eng.evaluate(_load("passing.json"), POLICY_DIR, "cid-pass")
+        assert isinstance(out, list)
+        assert len(out) >= 1
+        # No fail results on the passing fixture.
+        fails = [p for p in out if p["result"] == "fail"]
+        assert fails == [], f"expected no fails on passing fixture, got: {fails}"
+
+
+class TestFailingFixture:
+    def test_failing_fixture_has_fails(self):
+        eng = KyvernoJsonEngine()
+        out = eng.evaluate(_load("failing.json"), POLICY_DIR, "cid-fail")
+        fails = [p for p in out if p["result"] == "fail"]
+        assert len(fails) >= 1, "expected at least one fail on the failing fixture"
+
+
+class TestPolicyFilesExist:
+    def test_three_policies_present(self):
+        files = sorted(os.listdir(POLICY_DIR))
+        assert "require-tagging-standard.json" in files
+        assert "forbid-public-ingress.json" in files
+        assert "require-encryption-by-default.json" in files
+
+
+class TestPolicyValidity:
+    def test_policies_are_valid_json(self):
+        for f in os.listdir(POLICY_DIR):
+            if f.endswith(".json"):
+                with open(POLICY_DIR / f, "r", encoding="utf-8") as fh:
+                    data = json.load(fh)
+                assert data["apiVersion"] == "json.kyverno.io/v1alpha1"
+                assert data["kind"] == "ValidatingPolicy"
+                assert "nova.cloudinit.dev/severity" in data["metadata"]["annotations"]
+
+    def test_policy_names_match_filenames(self):
+        for f in os.listdir(POLICY_DIR):
+            if f.endswith(".json"):
+                with open(POLICY_DIR / f, "r", encoding="utf-8") as fh:
+                    data = json.load(fh)
+                expected = f.rsplit(".", 1)[0]
+                assert data["metadata"]["name"] == expected