npm - @mitre/hdf-schema - Versions diffs - 3.4.4 → 3.5.1 - Mend

@mitre/hdf-schema 3.4.4 → 3.5.1

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.

Files changed (18) hide show

package/README.md +15 -2
package/dist/go/hdf.go +535 -271
package/dist/helpers.d.ts +56 -1
package/dist/helpers.js +98 -38
package/dist/index.d.ts +2 -0
package/dist/index.js +28 -26
package/dist/schemas/hdf-amendments.schema.json +235 -48
package/dist/schemas/hdf-baseline.schema.json +240 -53
package/dist/schemas/hdf-comparison.schema.json +1948 -1504
package/dist/schemas/hdf-evidence-package.schema.json +242 -48
package/dist/schemas/hdf-plan.schema.json +692 -498
package/dist/schemas/hdf-requirement-change-event.schema.json +5290 -0
package/dist/schemas/hdf-results.schema.json +1650 -1215
package/dist/schemas/hdf-system.schema.json +262 -68
package/dist/ts/hdf.d.ts +420 -73
package/dist/ts/hdf.js +65 -30
package/dist/ts/hdf.ts +428 -77
package/package.json +2 -2

package/dist/schemas/hdf-plan.schema.json CHANGED Viewed

@@ -1,6 +1,6 @@
 {
   "$schema": "https://json-schema.org/draft/2020-12/schema",
-  "$id": "https://mitre.github.io/hdf-libs/schemas/hdf-plan/v3.4.0",
+  "$id": "https://mitre.github.io/hdf-libs/schemas/hdf-plan/v3.5.0",
   "title": "HDF Plan",
   "description": "Defines an assessment plan — what baselines to run against which targets, with resolved inputs and scheduling. Maps to OSCAL Assessment Plan.",
   "type": "object",
@@ -10,6 +10,13 @@
     "assessments"
   ],
   "properties": {
+    "externalReferences": {
+      "type": "array",
+      "items": {
+        "$ref": "https://mitre.github.io/hdf-libs/schemas/primitives/common/v3.5.0#/$defs/External_Reference"
+      },
+      "description": "Optional references to external artifacts relevant to this assessment plan (CTI/STIX, advisories, methodology docs, or any URI-addressable artifact). Inert context; see External_Reference."
+    },
     "planId": {
       "type": "string",
       "format": "uuid",
@@ -20,7 +27,7 @@
       "description": "Human-readable plan name. Example: 'Portal Monthly Assessment'."
     },
     "type": {
-      "$ref": "https://mitre.github.io/hdf-libs/schemas/primitives/plan/v3.4.0#/$defs/Plan_Type",
+      "$ref": "https://mitre.github.io/hdf-libs/schemas/primitives/plan/v3.5.0#/$defs/Plan_Type",
       "description": "The type of assessment plan."
     },
     "description": {
@@ -36,12 +43,12 @@
       "type": "array",
       "minItems": 1,
       "items": {
-        "$ref": "https://mitre.github.io/hdf-libs/schemas/primitives/plan/v3.4.0#/$defs/Assessment"
+        "$ref": "https://mitre.github.io/hdf-libs/schemas/primitives/plan/v3.5.0#/$defs/Assessment"
       },
       "description": "The assessments to perform. Each assessment pairs a baseline with targets and resolved inputs."
     },
     "schedule": {
-      "$ref": "https://mitre.github.io/hdf-libs/schemas/primitives/plan/v3.4.0#/$defs/Schedule",
+      "$ref": "https://mitre.github.io/hdf-libs/schemas/primitives/plan/v3.5.0#/$defs/Schedule",
       "description": "Optional scheduling configuration for recurring assessments."
     },
     "labels": {
@@ -52,7 +59,7 @@
       "description": "Optional key-value labels for grouping and querying plans."
     },
     "integrity": {
-      "$ref": "https://mitre.github.io/hdf-libs/schemas/primitives/extensions/v3.4.0#/$defs/Integrity",
+      "$ref": "https://mitre.github.io/hdf-libs/schemas/primitives/extensions/v3.5.0#/$defs/Integrity",
       "description": "Cryptographic integrity information for verifying this plan document has not been tampered with."
     },
     "version": {
@@ -60,7 +67,7 @@
       "description": "Version of this plan document."
     },
     "generator": {
-      "$ref": "https://mitre.github.io/hdf-libs/schemas/primitives/extensions/v3.4.0#/$defs/Generator",
+      "$ref": "https://mitre.github.io/hdf-libs/schemas/primitives/extensions/v3.5.0#/$defs/Generator",
       "description": "Information about the tool that generated this plan."
     }
   },
@@ -94,353 +101,214 @@
     }
   ],
   "$defs": {
-    "https://mitre.github.io/hdf-libs/schemas/primitives/plan/v3.4.0": {
+    "https://mitre.github.io/hdf-libs/schemas/primitives/common/v3.5.0": {
       "$schema": "https://json-schema.org/draft/2020-12/schema",
-      "$id": "https://mitre.github.io/hdf-libs/schemas/primitives/plan/v3.4.0",
-      "title": "HDF Plan Primitives",
-      "description": "Types for defining assessment plans — what to scan, how to configure it, and when to run.",
+      "$id": "https://mitre.github.io/hdf-libs/schemas/primitives/common/v3.5.0",
+      "title": "HDF Common Primitives",
+      "description": "Shared building blocks used by hdf-results and hdf-baseline schemas.",
       "$defs": {
-        "Plan_Type": {
-          "type": "string",
-          "enum": [
-            "automated",
-            "manual",
-            "hybrid"
-          ],
-          "description": "The type of assessment. 'automated' for scanner-driven, 'manual' for human-performed, 'hybrid' for both.",
-          "title": "Plan Type"
-        },
-        "Runner_Config": {
+        "External_Reference": {
           "type": "object",
-          "unevaluatedProperties": false,
-          "properties": {
-            "name": {
-              "type": "string",
-              "description": "Name of the assessment runner. Example: 'cinc-auditor', 'inspec', 'openscap'."
+          "title": "External Reference",
+          "description": "A generalized reference to any external artifact by identity and/or location, modeled on the STIX 2.1 `external_references` common property. Purpose-agnostic: cite a CVE, an ATT&CK technique, a STIX bundle/object, a BOM, a runbook, or any vendor artifact — including kinds with no dedicated HDF reference category. `sourceName` names the system; `externalId` cites by id within that system; `href` locates it. `sourceName` + `externalId` is equivalently a URN (`urn:<sourceName>:<externalId>`, RFC 8141), so the by-identity and by-location forms stay interconvertible. A reference is inert context: it overrides nothing, so it carries only lightweight optional `addedBy`/`addedAt` attribution, never override machinery.",
+          "required": [
+            "sourceName"
+          ],
+          "anyOf": [
+            {
+              "required": [
+                "externalId"
+              ]
             },
-            "version": {
-              "type": "string",
-              "description": "Version of the runner."
+            {
+              "required": [
+                "href"
+              ]
+            },
+            {
+              "required": [
+                "description"
+              ]
             }
-          },
-          "description": "Configuration for the assessment runner/scanner.",
-          "title": "Runner Config"
-        },
-        "Assessment": {
-          "type": "object",
-          "unevaluatedProperties": false,
-          "required": [
-            "baselineRef"
           ],
           "properties": {
-            "baselineRef": {
+            "sourceName": {
+              "type": "string",
+              "minLength": 1,
+              "description": "Name of the external system/source being referenced (e.g., 'cve', 'mitre-att&ck', 'stix', 'taxii', or any vendor label). Open string — not a closed enum. Use the `x-` prefix convention for custom/experimental sources, mirroring `bomType`."
+            },
+            "externalId": {
+              "type": "string",
+              "description": "Identifier of the artifact within `sourceName` (e.g., 'CVE-2021-44228' for source 'cve', 'T1059' for 'mitre-att&ck'). Cite by id without needing a URL. Together with `sourceName` this is a URN."
+            },
+            "href": {
               "type": "string",
               "format": "uri-reference",
-              "description": "Reference to the baseline to evaluate. May be a baseline name (e.g. 'RHEL9-STIG'), a relative path to an HDF Baseline document (e.g. 'rhel9-stig.hdf-baseline.json'), or an absolute URI."
+              "description": "Location of the artifact. `uri-reference` (not `uri`) so a bare internal `#fragment`/`#uuid` reference is expressible alongside absolute URLs. `checksum`/`mediaType` apply only to a retrievable `href`."
             },
-            "componentRef": {
+            "description": {
               "type": "string",
-              "format": "uuid",
-              "description": "componentId of the system component this assessment targets. Use for direct component binding. Alternative to targetSelector."
+              "description": "Human-readable description of what is referenced. Satisfies the at-least-one rule on its own when neither id nor href is available."
             },
-            "targetSelector": {
-              "$ref": "https://mitre.github.io/hdf-libs/schemas/primitives/system/v3.4.0#/$defs/Target_Selector",
-              "description": "Label selector to match targets for this assessment. Overrides the system component's targetSelector if provided."
+            "rel": {
+              "type": "string",
+              "description": "Open relationship token describing how this reference relates to the referencing object. Deliberately open (cf. OSCAL `rel` allow-other, RFC 8288 extension relations). Documented starter vocabulary: 'reference' (generic), 'definition' (defines the concept), 'evidence' (supporting evidence), 'investigate' (a live pivot to investigate), 'canonical' (the authoritative source)."
             },
-            "inputs": {
-              "type": "object",
-              "additionalProperties": true,
-              "description": "Resolved input values for this assessment. Keys are input names, values are the final resolved values (after baseline defaults + system overrides)."
+            "mediaType": {
+              "type": "string",
+              "description": "IANA media type of the referenced artifact when retrievable (RFC 6838), e.g., 'application/json'. Meaningful only with `href`."
             },
-            "runner": {
-              "$ref": "#/$defs/Runner_Config",
-              "description": "Runner/scanner configuration for this assessment."
+            "checksum": {
+              "$ref": "#/$defs/Checksum",
+              "description": "Integrity hash of the referenced artifact. Reuses the HDF `Checksum` primitive (not STIX `hashes`). Meaningful only with a retrievable `href`."
             },
-            "description": {
+            "addedBy": {
+              "$ref": "#/$defs/Identity",
+              "description": "Who attached this reference. Lightweight, flat attribution — a reference overrides nothing, so it has no chaining/superseding/disposition."
+            },
+            "addedAt": {
               "type": "string",
-              "description": "Description of this assessment's purpose."
+              "format": "date-time",
+              "description": "When this reference was attached (RFC 3339 / trimmed-UTC per HDF timestamp convention)."
+            },
+            "kind": {
+              "type": "string",
+              "minLength": 1,
+              "description": "Open token classifying the referenced/embedded payload, turning a bare reference into an enrichment envelope. Deliberately open (like `sourceName`/`rel`), not a closed enum. Documented starter vocabulary: 'threat-intel' (STIX/CTI object), 'annotation' (human triage note), 'exploitation' (EPSS/KEV signal carried as context), 'advisory' (vendor/security advisory). Use the `x-` prefix for custom kinds."
+            },
+            "document": {
+              "type": "object",
+              "additionalProperties": true,
+              "description": "Optional lossless embedded copy of the referenced artifact — the raw STIX object, EPSS record, advisory, or annotation payload — preserved verbatim. Composes with `href`/`externalId` (which point at the artifact) and `checksum` (which ties the copy to the source): a single entry can both point and embed. HDF stays payload-agnostic — the content is carried untouched, never normalized into HDF fields — so this does not duplicate the source ontology (e.g. STIX rides here unchanged)."
             }
           },
+          "unevaluatedProperties": false,
           "examples": [
             {
-              "baselineRef": "RHEL9-STIG",
-              "targetSelector": {
-                "labels.component": "WebTier"
+              "$comment": "By-identity: cite a CVE by its id in the 'cve' system without a URL — equivalently urn:cve:CVE-2021-44228.",
+              "sourceName": "cve",
+              "externalId": "CVE-2021-44228",
+              "rel": "definition"
+            },
+            {
+              "$comment": "By-identity AND by-locator together (anyOf, not oneOf) — an ATT&CK technique cited by id with its canonical URL.",
+              "sourceName": "mitre-att&ck",
+              "externalId": "T1059",
+              "href": "https://attack.mitre.org/techniques/T1059/",
+              "rel": "canonical"
+            },
+            {
+              "$comment": "By-locator to a retrievable STIX bundle, with integrity hash, media type, and attribution.",
+              "sourceName": "stix",
+              "href": "https://cti.example.org/bundles/log4shell.json",
+              "rel": "investigate",
+              "mediaType": "application/json",
+              "checksum": {
+                "algorithm": "sha256",
+                "value": "e3b0c44298fc1c149afbf4c8996fb92427ae41e4649b934ca495991b7852b855"
               },
-              "inputs": {
-                "max_concurrent_sessions": 5,
-                "password_min_length": 15
+              "addedBy": {
+                "type": "email",
+                "identifier": "analyst@agency.gov"
               },
-              "runner": {
-                "name": "cinc-auditor",
-                "version": "6.8.1"
+              "addedAt": "2026-07-26T00:00:00Z"
+            },
+            {
+              "$comment": "Enrichment envelope: a STIX threat-intel object embedded losslessly in `document` and classified via `kind`, cited by id and pointed at by href — the pointer and the embedded copy compose. The payload rides verbatim; HDF does not normalize STIX fields.",
+              "sourceName": "stix",
+              "externalId": "vulnerability--f7c1b8e0-1234-4a2b-9c3d-000000000001",
+              "href": "https://cti.example.org/bundles/log4shell.json#vulnerability--f7c1b8e0-1234-4a2b-9c3d-000000000001",
+              "rel": "investigate",
+              "kind": "threat-intel",
+              "document": {
+                "type": "vulnerability",
+                "spec_version": "2.1",
+                "id": "vulnerability--f7c1b8e0-1234-4a2b-9c3d-000000000001",
+                "name": "CVE-2021-44228",
+                "external_references": [
+                  {
+                    "source_name": "cve",
+                    "external_id": "CVE-2021-44228"
+                  }
+                ]
               }
             }
+          ]
+        },
+        "Hash_Algorithm": {
+          "type": "string",
+          "enum": [
+            "sha256",
+            "sha384",
+            "sha512",
+            "blake3"
           ],
-          "description": "A single assessment within a plan — defines which baseline to run against which targets with what configuration.",
-          "title": "Assessment"
+          "description": "Supported cryptographic hash algorithms for checksums and integrity verification. blake3 covers container-image and other artifact digests that use it.",
+          "title": "Hash Algorithm"
         },
-        "Schedule": {
+        "Requirement_Group": {
           "type": "object",
           "unevaluatedProperties": false,
+          "required": [
+            "id",
+            "requirements"
+          ],
           "properties": {
-            "cron": {
-              "type": "string",
-              "description": "Cron expression for recurring assessments. Example: '0 2 1 * *' (2 AM on the 1st of each month)."
-            },
-            "startDate": {
+            "id": {
               "type": "string",
-              "format": "date-time",
-              "description": "Earliest date to begin assessments. ISO 8601 format."
+              "description": "The unique identifier for the group. Example: the relative path to the file specifying the requirements."
             },
-            "endDate": {
+            "title": {
               "type": "string",
-              "format": "date-time",
-              "description": "Date after which assessments should no longer run. ISO 8601 format."
-            },
-            "notifyOnRegression": {
-              "type": "array",
-              "items": {
-                "type": "string"
-              },
-              "description": "Email addresses or notification endpoints to alert when regressions are detected."
+              "description": "The title of the group - should be human readable."
             },
-            "notifyOnCompletion": {
+            "requirements": {
               "type": "array",
               "items": {
                 "type": "string"
               },
-              "description": "Email addresses or notification endpoints to alert when assessments complete."
+              "description": "The set of requirements as specified by their ids in this group. Example: 'SV-238196'."
             }
           },
-          "examples": [
-            {
-              "cron": "0 2 1 * *",
-              "notifyOnRegression": [
-                "security-team@agency.gov"
-              ]
-            }
-          ],
-          "description": "Scheduling configuration for recurring assessments.",
-          "title": "Schedule"
-        }
-      }
-    },
-    "https://mitre.github.io/hdf-libs/schemas/primitives/system/v3.4.0": {
-      "$schema": "https://json-schema.org/draft/2020-12/schema",
-      "$id": "https://mitre.github.io/hdf-libs/schemas/primitives/system/v3.4.0",
-      "title": "HDF System Primitives",
-      "description": "Types for describing system architecture, authorization boundaries, and components.",
-      "$defs": {
-        "Authorization_Status": {
-          "type": "string",
-          "enum": [
-            "authorized",
-            "denied",
-            "pendingAuthorization",
-            "conditionallyAuthorized",
-            "notYetRequested",
-            "revoked"
-          ],
-          "description": "Authorization to Operate (ATO) status for the system.",
-          "title": "Authorization Status"
-        },
-        "Categorization_Level": {
-          "type": "string",
-          "enum": [
-            "low",
-            "moderate",
-            "high"
-          ],
-          "description": "FIPS 199 security categorization level (impact level).",
-          "title": "Categorization Level"
+          "description": "Describes a group of requirements, such as those defined in a single file.",
+          "title": "Requirement Group"
         },
-        "Input_Override": {
+        "Dependency": {
           "type": "object",
           "unevaluatedProperties": false,
-          "required": [
-            "inputName",
-            "value"
-          ],
+          "required": [],
           "properties": {
-            "baselineRef": {
+            "name": {
               "type": "string",
-              "description": "Name of the baseline this override applies to. If omitted, applies to all baselines that define this input."
+              "description": "The name or assigned alias."
             },
-            "inputName": {
+            "url": {
               "type": "string",
-              "description": "Name of the input being overridden. Must match an Input.name in the referenced baseline."
+              "format": "uri-reference",
+              "description": "The address of the dependency."
             },
-            "value": {
-              "description": "The overridden value. Should match the type of the original input."
+            "branch": {
+              "type": "string",
+              "description": "The branch name for a git repo."
             },
-            "justification": {
+            "path": {
               "type": "string",
-              "description": "Rationale for why this override is needed."
+              "description": "The relative path if the dependency is locally available."
             },
-            "approvedBy": {
-              "$ref": "https://mitre.github.io/hdf-libs/schemas/primitives/common/v3.4.0#/$defs/Identity",
-              "description": "Identity of the person or system that approved this override."
-            }
-          },
-          "description": "An override of a baseline input value for a specific component. Enables system-specific tailoring of baseline parameters.",
-          "title": "Input Override"
-        },
-        "Target_Selector": {
-          "type": "object",
-          "additionalProperties": {
-            "type": "string"
-          },
-          "description": "A label selector that matches targets by label key-value pairs. All specified labels must match (AND logic). Example: { \"labels.component\": \"WebTier\" } matches targets with labels.component = \"WebTier\".",
-          "title": "Target Selector"
-        },
-        "Control_Designation": {
-          "type": "object",
-          "unevaluatedProperties": false,
-          "required": [
-            "controlId",
-            "designation",
-            "description"
-          ],
-          "properties": {
-            "controlId": {
+            "statusMessage": {
               "type": "string",
-              "description": "The control identifier (e.g., 'SC-7', 'AC-2 (1)'). Must match a NIST tag in a baseline requirement's tags."
+              "description": "The reason for the status if it is 'failed' or 'skipped'."
             },
-            "designation": {
+            "status": {
               "type": "string",
-              "title": "Designation",
-              "enum": [
-                "common",
-                "system-specific",
-                "hybrid"
-              ],
-              "description": "NIST SP 800-53 control designation. 'common': fully provided by another component or system. 'system-specific': implemented by the inheriting component(s) only. 'hybrid': shared responsibility between provider and inheritor."
+              "description": "The status. Should be: 'loaded', 'failed', or 'skipped'."
             },
-            "providedBy": {
+            "git": {
               "type": "string",
-              "format": "uuid",
-              "description": "componentId of a local component that provides this control. Omit when the provider is an external system."
+              "format": "uri",
+              "description": "The location of the git repo. Example: 'https://github.com/my-org/ubuntu-22.04-stig-baseline.git'."
             },
-            "systemRef": {
-              "type": "string",
-              "format": "uri-reference",
-              "description": "Reference to another hdf-system document whose component provides this control. Use when the provider is in a different system. Omit when the provider is local."
-            },
-            "inheritedBy": {
-              "type": "array",
-              "items": {
-                "type": "string",
-                "format": "uuid"
-              },
-              "description": "componentIds that inherit this control. If omitted, all components in the system inherit it."
-            },
-            "description": {
-              "type": "string",
-              "description": "Justification for this designation — who provides the control, why it's inherited, and any relevant authorization references."
-            }
-          },
-          "examples": [
-            {
-              "controlId": "IA-2",
-              "designation": "common",
-              "providedBy": "aaaaaaaa-bbbb-cccc-dddd-eeeeeeeeeeee",
-              "inheritedBy": [
-                "11111111-2222-3333-4444-555555555555"
-              ],
-              "description": "User identification and authentication provided by Keycloak SSO via SAML 2.0."
-            },
-            {
-              "controlId": "PE-2",
-              "designation": "common",
-              "description": "Physical access authorizations provided by AWS GovCloud per FedRAMP High authorization."
-            }
-          ],
-          "description": "Declares a control's designation within a system — whether it is common (provided by another component or system), system-specific (implemented locally), or hybrid (shared responsibility). Maps to NIST SP 800-53 Appendix C control designations and OSCAL SSP by-component provided/inherited semantics.",
-          "title": "Control Designation"
-        }
-      }
-    },
-    "https://mitre.github.io/hdf-libs/schemas/primitives/common/v3.4.0": {
-      "$schema": "https://json-schema.org/draft/2020-12/schema",
-      "$id": "https://mitre.github.io/hdf-libs/schemas/primitives/common/v3.4.0",
-      "title": "HDF Common Primitives",
-      "description": "Shared building blocks used by hdf-results and hdf-baseline schemas.",
-      "$defs": {
-        "Hash_Algorithm": {
-          "type": "string",
-          "enum": [
-            "sha256",
-            "sha384",
-            "sha512",
-            "blake3"
-          ],
-          "description": "Supported cryptographic hash algorithms for checksums and integrity verification. blake3 covers container-image and other artifact digests that use it.",
-          "title": "Hash Algorithm"
-        },
-        "Requirement_Group": {
-          "type": "object",
-          "unevaluatedProperties": false,
-          "required": [
-            "id",
-            "requirements"
-          ],
-          "properties": {
-            "id": {
-              "type": "string",
-              "description": "The unique identifier for the group. Example: the relative path to the file specifying the requirements."
-            },
-            "title": {
-              "type": "string",
-              "description": "The title of the group - should be human readable."
-            },
-            "requirements": {
-              "type": "array",
-              "items": {
-                "type": "string"
-              },
-              "description": "The set of requirements as specified by their ids in this group. Example: 'SV-238196'."
-            }
-          },
-          "description": "Describes a group of requirements, such as those defined in a single file.",
-          "title": "Requirement Group"
-        },
-        "Dependency": {
-          "type": "object",
-          "unevaluatedProperties": false,
-          "required": [],
-          "properties": {
-            "name": {
-              "type": "string",
-              "description": "The name or assigned alias."
-            },
-            "url": {
-              "type": "string",
-              "format": "uri-reference",
-              "description": "The address of the dependency."
-            },
-            "branch": {
-              "type": "string",
-              "description": "The branch name for a git repo."
-            },
-            "path": {
-              "type": "string",
-              "description": "The relative path if the dependency is locally available."
-            },
-            "statusMessage": {
-              "type": "string",
-              "description": "The reason for the status if it is 'failed' or 'skipped'."
-            },
-            "status": {
-              "type": "string",
-              "description": "The status. Should be: 'loaded', 'failed', or 'skipped'."
-            },
-            "git": {
-              "type": "string",
-              "format": "uri",
-              "description": "The location of the git repo. Example: 'https://github.com/my-org/ubuntu-22.04-stig-baseline.git'."
-            },
-            "supermarket": {
+            "supermarket": {
               "type": "string",
               "description": "The 'user/profilename' attribute for a Supermarket server."
             },
@@ -990,6 +858,13 @@
         "Baseline_Metadata": {
           "type": "object",
           "properties": {
+            "externalReferences": {
+              "type": "array",
+              "items": {
+                "$ref": "#/$defs/External_Reference"
+              },
+              "description": "Optional references to external artifacts relevant to this baseline (CTI/STIX, advisories, source catalogs, or any URI-addressable artifact). Travels with the baseline definition. Inert context; see External_Reference."
+            },
             "name": {
               "type": "string",
               "description": "The name - must be unique."
@@ -1067,6 +942,13 @@
         "Requirement_Core": {
           "type": "object",
           "properties": {
+            "externalReferences": {
+              "type": "array",
+              "items": {
+                "$ref": "#/$defs/External_Reference"
+              },
+              "description": "Optional references to external artifacts relevant to this requirement (CTI/STIX correlation, advisories, control/definition sources, or any URI-addressable artifact). Applies to both baseline requirement definitions and evaluated requirements. Inert context; see External_Reference."
+            },
             "id": {
               "type": "string",
               "description": "The requirement identifier. Example: 'SV-238196'."
@@ -1104,195 +986,462 @@
               "maximum": 1,
               "description": "The impactfulness or severity (0.0 to 1.0)."
             },
-            "refs": {
-              "type": "array",
-              "items": {
-                "$ref": "#/$defs/Reference"
-              },
-              "description": "The set of references to external documents."
+            "refs": {
+              "type": "array",
+              "items": {
+                "$ref": "#/$defs/Reference"
+              },
+              "description": "The set of references to external documents."
+            },
+            "tags": {
+              "type": "object",
+              "additionalProperties": true,
+              "description": "A set of tags - usually metadata like CCI, STIG ID, severity."
+            },
+            "code": {
+              "type": "string",
+              "description": "The raw source code of the requirement. Set to null for manual-only requirements or requirements not yet implemented; use verificationMethod to disambiguate manual-by-design from manual-pending-automation. Note that if this is an overlay, it does not include the underlying source code."
+            },
+            "sourceLocation": {
+              "$ref": "#/$defs/Source_Location",
+              "description": "The explicit location of the requirement within the source code."
+            },
+            "controlType": {
+              "type": "string",
+              "title": "Control Type",
+              "enum": [
+                "policy",
+                "procedure",
+                "technical",
+                "management",
+                "operational"
+              ],
+              "description": "Classification of the control's nature, aligning with NIST SP 800-53 / SP 800-53A categories. 'policy' = an authored governance statement; 'procedure' = a documented process; 'technical' = an enforced technical configuration; 'management' = a programmatic/management activity; 'operational' = a recurring operational activity (e.g. AT, IR, MA families). Optional: when omitted, consumers may infer heuristically from family/id but should not assume a default."
+            },
+            "verificationMethod": {
+              "$ref": "#/$defs/Verification_Method_Enum",
+              "description": "How this requirement is intended to be verified. Disambiguates the two cases that null 'code' overloads: 'manual-by-design' (the requirement is statement-form and not amenable to automation, e.g. FedRAMP 20x KSIs); 'manual-pending-automation' (automation could exist but does not yet, e.g. a STIG rule lacking a fix). 'automated' = a check exists and runs without operator action; 'hybrid' = part automated, part manual. Optional: when omitted, consumers should not infer a default."
+            },
+            "applicability": {
+              "type": "string",
+              "title": "Applicability",
+              "enum": [
+                "required",
+                "optional",
+                "advisory"
+              ],
+              "description": "Whether the requirement is mandatory within its baseline. Distinct from severity (risk weight) and status (lifecycle state). Maps cleanly onto: FedRAMP rev5 OSCAL 'CORE' prop, FedRAMP 20x inline 'Optional:' markers, CMMC sublevel rows, and CIS Implementation Group memberships (IG1/IG2/IG3 may carry richer semantics; layer those onto props[]/tags{}). Optional: when omitted, consumers should treat the requirement as 'required' by convention."
+            }
+          },
+          "examples": [
+            {
+              "$comment": "v3.1.x-style requirement: classification fields omitted. Consumers must continue to handle this shape under v3.5.0 (backward compatibility).",
+              "id": "SV-238196",
+              "title": "The Ubuntu operating system must enforce password complexity",
+              "impact": 0.5,
+              "tags": {
+                "nist": [
+                  "IA-5"
+                ],
+                "severity": "medium",
+                "cci": [
+                  "CCI-000192"
+                ]
+              },
+              "refs": [
+                {
+                  "url": "https://public.cyber.mil/stigs/"
+                }
+              ],
+              "descriptions": [
+                {
+                  "label": "default",
+                  "data": "Use of a complex password helps to increase the time and resources required to compromise the password."
+                },
+                {
+                  "label": "check",
+                  "data": "Verify the value of 'minlen' in /etc/security/pwquality.conf."
+                }
+              ]
+            },
+            {
+              "$comment": "v3.2 example populating all three classification fields. controlType=technical because AC-3 is enforced via configuration, not policy text. verificationMethod=automated because a check exists. applicability=required because this is a CORE control in the source baseline.",
+              "id": "AC-3",
+              "title": "Access Enforcement",
+              "impact": 0.7,
+              "tags": {
+                "nist": [
+                  "AC-3"
+                ],
+                "severity": "high"
+              },
+              "descriptions": [
+                {
+                  "label": "default",
+                  "data": "The information system enforces approved authorizations for logical access to information and system resources."
+                }
+              ],
+              "code": "control 'AC-3' do; impact 0.7; end",
+              "controlType": "technical",
+              "verificationMethod": "automated",
+              "applicability": "required"
+            },
+            {
+              "$comment": "v3.2 example for a manual-by-design requirement. FedRAMP 20x KSIs are statement-form: code is omitted (not null) and verificationMethod=manual-by-design distinguishes this from 'automation could exist but doesn't yet'. controlType=policy because this is an authored governance statement.",
+              "id": "KSI-CNA-01",
+              "title": "Cyber Security Plan documents the system",
+              "impact": 0.5,
+              "tags": {
+                "ksi": [
+                  "KSI-CNA"
+                ]
+              },
+              "descriptions": [
+                {
+                  "label": "default",
+                  "data": "The Cyber Security Plan documents the system, its boundary, and its components."
+                }
+              ],
+              "controlType": "policy",
+              "verificationMethod": "manual-by-design",
+              "applicability": "required"
+            },
+            {
+              "$comment": "v3.2 example for a STIG rule lacking a <fix>. Differs from manual-by-design: automation should exist, just not yet. applicability=advisory used here because the source format flagged it as recommended-but-not-mandatory; CIS-style IG memberships and FedRAMP 'Optional:' markers map onto applicability=optional or advisory similarly.",
+              "id": "SV-999999",
+              "title": "Example STIG rule pending automation",
+              "impact": 0.3,
+              "tags": {
+                "stig_id": "SV-999999"
+              },
+              "descriptions": [
+                {
+                  "label": "default",
+                  "data": "Example requirement that is intended to be automated but currently lacks a fix block."
+                },
+                {
+                  "label": "check",
+                  "data": "Manual review of system configuration is required."
+                }
+              ],
+              "verificationMethod": "manual-pending-automation",
+              "applicability": "advisory"
+            }
+          ],
+          "description": "Core requirement fields shared between baseline requirements and evaluated requirements. Contains the fundamental requirement definition without assessment results.",
+          "title": "Requirement Core"
+        },
+        "Verification_Method_Enum": {
+          "type": "string",
+          "enum": [
+            "automated",
+            "manual-by-design",
+            "manual-pending-automation",
+            "hybrid"
+          ],
+          "description": "How a requirement is intended to be verified. Disambiguates the two cases that null 'code' overloads: 'manual-by-design' (the requirement is statement-form and not amenable to automation, e.g. FedRAMP 20x KSIs); 'manual-pending-automation' (automation could exist but does not yet, e.g. a STIG rule lacking a fix). 'automated' = a check exists and runs without operator action; 'hybrid' = part automated, part manual. Named '_Enum' to disambiguate from the unrelated Verification_Method DID-context struct.",
+          "title": "Verification Method Enum"
+        },
+        "Severity": {
+          "type": "string",
+          "enum": [
+            "critical",
+            "high",
+            "medium",
+            "low",
+            "informational"
+          ],
+          "description": "Severity rating for a requirement. Typically derived from the numeric impact score.",
+          "title": "Severity"
+        },
+        "Cloud_Provider": {
+          "type": [
+            "string",
+            "null"
+          ],
+          "enum": [
+            "aws",
+            "azure",
+            "gcp",
+            "oci",
+            "other",
+            null
+          ],
+          "description": "Cloud service provider identifier.",
+          "title": "Cloud Provider"
+        }
+      }
+    },
+    "https://mitre.github.io/hdf-libs/schemas/primitives/plan/v3.5.0": {
+      "$schema": "https://json-schema.org/draft/2020-12/schema",
+      "$id": "https://mitre.github.io/hdf-libs/schemas/primitives/plan/v3.5.0",
+      "title": "HDF Plan Primitives",
+      "description": "Types for defining assessment plans — what to scan, how to configure it, and when to run.",
+      "$defs": {
+        "Plan_Type": {
+          "type": "string",
+          "enum": [
+            "automated",
+            "manual",
+            "hybrid"
+          ],
+          "description": "The type of assessment. 'automated' for scanner-driven, 'manual' for human-performed, 'hybrid' for both.",
+          "title": "Plan Type"
+        },
+        "Runner_Config": {
+          "type": "object",
+          "unevaluatedProperties": false,
+          "properties": {
+            "name": {
+              "type": "string",
+              "description": "Name of the assessment runner. Example: 'cinc-auditor', 'inspec', 'openscap'."
+            },
+            "version": {
+              "type": "string",
+              "description": "Version of the runner."
+            }
+          },
+          "description": "Configuration for the assessment runner/scanner.",
+          "title": "Runner Config"
+        },
+        "Assessment": {
+          "type": "object",
+          "unevaluatedProperties": false,
+          "required": [
+            "baselineRef"
+          ],
+          "properties": {
+            "baselineRef": {
+              "type": "string",
+              "format": "uri-reference",
+              "description": "Reference to the baseline to evaluate. May be a baseline name (e.g. 'RHEL9-STIG'), a relative path to an HDF Baseline document (e.g. 'rhel9-stig.hdf-baseline.json'), or an absolute URI."
+            },
+            "componentRef": {
+              "type": "string",
+              "format": "uuid",
+              "description": "componentId of the system component this assessment targets. Use for direct component binding. Alternative to targetSelector."
+            },
+            "targetSelector": {
+              "$ref": "https://mitre.github.io/hdf-libs/schemas/primitives/system/v3.5.0#/$defs/Target_Selector",
+              "description": "Label selector to match targets for this assessment. Overrides the system component's targetSelector if provided."
+            },
+            "inputs": {
+              "type": "object",
+              "additionalProperties": true,
+              "description": "Resolved input values for this assessment. Keys are input names, values are the final resolved values (after baseline defaults + system overrides)."
+            },
+            "runner": {
+              "$ref": "#/$defs/Runner_Config",
+              "description": "Runner/scanner configuration for this assessment."
+            },
+            "description": {
+              "type": "string",
+              "description": "Description of this assessment's purpose."
+            }
+          },
+          "examples": [
+            {
+              "baselineRef": "RHEL9-STIG",
+              "targetSelector": {
+                "labels.component": "WebTier"
+              },
+              "inputs": {
+                "max_concurrent_sessions": 5,
+                "password_min_length": 15
+              },
+              "runner": {
+                "name": "cinc-auditor",
+                "version": "6.8.1"
+              }
+            }
+          ],
+          "description": "A single assessment within a plan — defines which baseline to run against which targets with what configuration.",
+          "title": "Assessment"
+        },
+        "Schedule": {
+          "type": "object",
+          "unevaluatedProperties": false,
+          "properties": {
+            "cron": {
+              "type": "string",
+              "description": "Cron expression for recurring assessments. Example: '0 2 1 * *' (2 AM on the 1st of each month)."
+            },
+            "startDate": {
+              "type": "string",
+              "format": "date-time",
+              "description": "Earliest date to begin assessments. ISO 8601 format."
+            },
+            "endDate": {
+              "type": "string",
+              "format": "date-time",
+              "description": "Date after which assessments should no longer run. ISO 8601 format."
+            },
+            "notifyOnRegression": {
+              "type": "array",
+              "items": {
+                "type": "string"
+              },
+              "description": "Email addresses or notification endpoints to alert when regressions are detected."
+            },
+            "notifyOnCompletion": {
+              "type": "array",
+              "items": {
+                "type": "string"
+              },
+              "description": "Email addresses or notification endpoints to alert when assessments complete."
+            }
+          },
+          "examples": [
+            {
+              "cron": "0 2 1 * *",
+              "notifyOnRegression": [
+                "security-team@agency.gov"
+              ]
+            }
+          ],
+          "description": "Scheduling configuration for recurring assessments.",
+          "title": "Schedule"
+        }
+      }
+    },
+    "https://mitre.github.io/hdf-libs/schemas/primitives/system/v3.5.0": {
+      "$schema": "https://json-schema.org/draft/2020-12/schema",
+      "$id": "https://mitre.github.io/hdf-libs/schemas/primitives/system/v3.5.0",
+      "title": "HDF System Primitives",
+      "description": "Types for describing system architecture, authorization boundaries, and components.",
+      "$defs": {
+        "Authorization_Status": {
+          "type": "string",
+          "enum": [
+            "authorized",
+            "denied",
+            "pendingAuthorization",
+            "conditionallyAuthorized",
+            "notYetRequested",
+            "revoked"
+          ],
+          "description": "Authorization to Operate (ATO) status for the system.",
+          "title": "Authorization Status"
+        },
+        "Categorization_Level": {
+          "type": "string",
+          "enum": [
+            "low",
+            "moderate",
+            "high"
+          ],
+          "description": "FIPS 199 security categorization level (impact level).",
+          "title": "Categorization Level"
+        },
+        "Input_Override": {
+          "type": "object",
+          "unevaluatedProperties": false,
+          "required": [
+            "inputName",
+            "value"
+          ],
+          "properties": {
+            "baselineRef": {
+              "type": "string",
+              "description": "Name of the baseline this override applies to. If omitted, applies to all baselines that define this input."
+            },
+            "inputName": {
+              "type": "string",
+              "description": "Name of the input being overridden. Must match an Input.name in the referenced baseline."
             },
-            "tags": {
-              "type": "object",
-              "additionalProperties": true,
-              "description": "A set of tags - usually metadata like CCI, STIG ID, severity."
+            "value": {
+              "description": "The overridden value. Should match the type of the original input."
             },
-            "code": {
+            "justification": {
               "type": "string",
-              "description": "The raw source code of the requirement. Set to null for manual-only requirements or requirements not yet implemented; use verificationMethod to disambiguate manual-by-design from manual-pending-automation. Note that if this is an overlay, it does not include the underlying source code."
+              "description": "Rationale for why this override is needed."
             },
-            "sourceLocation": {
-              "$ref": "#/$defs/Source_Location",
-              "description": "The explicit location of the requirement within the source code."
+            "approvedBy": {
+              "$ref": "https://mitre.github.io/hdf-libs/schemas/primitives/common/v3.5.0#/$defs/Identity",
+              "description": "Identity of the person or system that approved this override."
+            }
+          },
+          "description": "An override of a baseline input value for a specific component. Enables system-specific tailoring of baseline parameters.",
+          "title": "Input Override"
+        },
+        "Target_Selector": {
+          "type": "object",
+          "additionalProperties": {
+            "type": "string"
+          },
+          "description": "A label selector that matches targets by label key-value pairs. All specified labels must match (AND logic). Example: { \"labels.component\": \"WebTier\" } matches targets with labels.component = \"WebTier\".",
+          "title": "Target Selector"
+        },
+        "Control_Designation": {
+          "type": "object",
+          "unevaluatedProperties": false,
+          "required": [
+            "controlId",
+            "designation",
+            "description"
+          ],
+          "properties": {
+            "controlId": {
+              "type": "string",
+              "description": "The control identifier (e.g., 'SC-7', 'AC-2 (1)'). Must match a NIST tag in a baseline requirement's tags."
             },
-            "controlType": {
+            "designation": {
               "type": "string",
-              "title": "Control Type",
+              "title": "Designation",
               "enum": [
-                "policy",
-                "procedure",
-                "technical",
-                "management",
-                "operational"
+                "common",
+                "system-specific",
+                "hybrid"
               ],
-              "description": "Classification of the control's nature, aligning with NIST SP 800-53 / SP 800-53A categories. 'policy' = an authored governance statement; 'procedure' = a documented process; 'technical' = an enforced technical configuration; 'management' = a programmatic/management activity; 'operational' = a recurring operational activity (e.g. AT, IR, MA families). Optional: when omitted, consumers may infer heuristically from family/id but should not assume a default."
+              "description": "NIST SP 800-53 control designation. 'common': fully provided by another component or system. 'system-specific': implemented by the inheriting component(s) only. 'hybrid': shared responsibility between provider and inheritor."
             },
-            "verificationMethod": {
-              "$ref": "#/$defs/Verification_Method_Enum",
-              "description": "How this requirement is intended to be verified. Disambiguates the two cases that null 'code' overloads: 'manual-by-design' (the requirement is statement-form and not amenable to automation, e.g. FedRAMP 20x KSIs); 'manual-pending-automation' (automation could exist but does not yet, e.g. a STIG rule lacking a fix). 'automated' = a check exists and runs without operator action; 'hybrid' = part automated, part manual. Optional: when omitted, consumers should not infer a default."
+            "providedBy": {
+              "type": "string",
+              "format": "uuid",
+              "description": "componentId of a local component that provides this control. Omit when the provider is an external system."
             },
-            "applicability": {
+            "systemRef": {
               "type": "string",
-              "title": "Applicability",
-              "enum": [
-                "required",
-                "optional",
-                "advisory"
-              ],
-              "description": "Whether the requirement is mandatory within its baseline. Distinct from severity (risk weight) and status (lifecycle state). Maps cleanly onto: FedRAMP rev5 OSCAL 'CORE' prop, FedRAMP 20x inline 'Optional:' markers, CMMC sublevel rows, and CIS Implementation Group memberships (IG1/IG2/IG3 may carry richer semantics; layer those onto props[]/tags{}). Optional: when omitted, consumers should treat the requirement as 'required' by convention."
-            }
-          },
-          "examples": [
-            {
-              "$comment": "v3.1.x-style requirement: classification fields omitted. Consumers must continue to handle this shape under v3.4.0 (backward compatibility).",
-              "id": "SV-238196",
-              "title": "The Ubuntu operating system must enforce password complexity",
-              "impact": 0.5,
-              "tags": {
-                "nist": [
-                  "IA-5"
-                ],
-                "severity": "medium",
-                "cci": [
-                  "CCI-000192"
-                ]
-              },
-              "refs": [
-                {
-                  "url": "https://public.cyber.mil/stigs/"
-                }
-              ],
-              "descriptions": [
-                {
-                  "label": "default",
-                  "data": "Use of a complex password helps to increase the time and resources required to compromise the password."
-                },
-                {
-                  "label": "check",
-                  "data": "Verify the value of 'minlen' in /etc/security/pwquality.conf."
-                }
-              ]
+              "format": "uri-reference",
+              "description": "Reference to another hdf-system document whose component provides this control. Use when the provider is in a different system. Omit when the provider is local."
             },
-            {
-              "$comment": "v3.2 example populating all three classification fields. controlType=technical because AC-3 is enforced via configuration, not policy text. verificationMethod=automated because a check exists. applicability=required because this is a CORE control in the source baseline.",
-              "id": "AC-3",
-              "title": "Access Enforcement",
-              "impact": 0.7,
-              "tags": {
-                "nist": [
-                  "AC-3"
-                ],
-                "severity": "high"
+            "inheritedBy": {
+              "type": "array",
+              "items": {
+                "type": "string",
+                "format": "uuid"
               },
-              "descriptions": [
-                {
-                  "label": "default",
-                  "data": "The information system enforces approved authorizations for logical access to information and system resources."
-                }
-              ],
-              "code": "control 'AC-3' do; impact 0.7; end",
-              "controlType": "technical",
-              "verificationMethod": "automated",
-              "applicability": "required"
+              "description": "componentIds that inherit this control. If omitted, all components in the system inherit it."
             },
+            "description": {
+              "type": "string",
+              "description": "Justification for this designation — who provides the control, why it's inherited, and any relevant authorization references."
+            }
+          },
+          "examples": [
             {
-              "$comment": "v3.2 example for a manual-by-design requirement. FedRAMP 20x KSIs are statement-form: code is omitted (not null) and verificationMethod=manual-by-design distinguishes this from 'automation could exist but doesn't yet'. controlType=policy because this is an authored governance statement.",
-              "id": "KSI-CNA-01",
-              "title": "Cyber Security Plan documents the system",
-              "impact": 0.5,
-              "tags": {
-                "ksi": [
-                  "KSI-CNA"
-                ]
-              },
-              "descriptions": [
-                {
-                  "label": "default",
-                  "data": "The Cyber Security Plan documents the system, its boundary, and its components."
-                }
+              "controlId": "IA-2",
+              "designation": "common",
+              "providedBy": "aaaaaaaa-bbbb-cccc-dddd-eeeeeeeeeeee",
+              "inheritedBy": [
+                "11111111-2222-3333-4444-555555555555"
               ],
-              "controlType": "policy",
-              "verificationMethod": "manual-by-design",
-              "applicability": "required"
+              "description": "User identification and authentication provided by Keycloak SSO via SAML 2.0."
             },
             {
-              "$comment": "v3.2 example for a STIG rule lacking a <fix>. Differs from manual-by-design: automation should exist, just not yet. applicability=advisory used here because the source format flagged it as recommended-but-not-mandatory; CIS-style IG memberships and FedRAMP 'Optional:' markers map onto applicability=optional or advisory similarly.",
-              "id": "SV-999999",
-              "title": "Example STIG rule pending automation",
-              "impact": 0.3,
-              "tags": {
-                "stig_id": "SV-999999"
-              },
-              "descriptions": [
-                {
-                  "label": "default",
-                  "data": "Example requirement that is intended to be automated but currently lacks a fix block."
-                },
-                {
-                  "label": "check",
-                  "data": "Manual review of system configuration is required."
-                }
-              ],
-              "verificationMethod": "manual-pending-automation",
-              "applicability": "advisory"
+              "controlId": "PE-2",
+              "designation": "common",
+              "description": "Physical access authorizations provided by AWS GovCloud per FedRAMP High authorization."
             }
           ],
-          "description": "Core requirement fields shared between baseline requirements and evaluated requirements. Contains the fundamental requirement definition without assessment results.",
-          "title": "Requirement Core"
-        },
-        "Verification_Method_Enum": {
-          "type": "string",
-          "enum": [
-            "automated",
-            "manual-by-design",
-            "manual-pending-automation",
-            "hybrid"
-          ],
-          "description": "How a requirement is intended to be verified. Disambiguates the two cases that null 'code' overloads: 'manual-by-design' (the requirement is statement-form and not amenable to automation, e.g. FedRAMP 20x KSIs); 'manual-pending-automation' (automation could exist but does not yet, e.g. a STIG rule lacking a fix). 'automated' = a check exists and runs without operator action; 'hybrid' = part automated, part manual. Named '_Enum' to disambiguate from the unrelated Verification_Method DID-context struct.",
-          "title": "Verification Method Enum"
-        },
-        "Severity": {
-          "type": "string",
-          "enum": [
-            "critical",
-            "high",
-            "medium",
-            "low",
-            "informational"
-          ],
-          "description": "Severity rating for a requirement. Typically derived from the numeric impact score.",
-          "title": "Severity"
-        },
-        "Cloud_Provider": {
-          "type": [
-            "string",
-            "null"
-          ],
-          "enum": [
-            "aws",
-            "azure",
-            "gcp",
-            "oci",
-            "other",
-            null
-          ],
-          "description": "Cloud service provider identifier.",
-          "title": "Cloud Provider"
+          "description": "Declares a control's designation within a system — whether it is common (provided by another component or system), system-specific (implemented locally), or hybrid (shared responsibility). Maps to NIST SP 800-53 Appendix C control designations and OSCAL SSP by-component provided/inherited semantics.",
+          "title": "Control Designation"
         }
       }
     },
-    "https://mitre.github.io/hdf-libs/schemas/primitives/extensions/v3.4.0": {
+    "https://mitre.github.io/hdf-libs/schemas/primitives/extensions/v3.5.0": {
       "$schema": "https://json-schema.org/draft/2020-12/schema",
-      "$id": "https://mitre.github.io/hdf-libs/schemas/primitives/extensions/v3.4.0",
+      "$id": "https://mitre.github.io/hdf-libs/schemas/primitives/extensions/v3.5.0",
       "title": "HDF Extension Primitives",
       "description": "Extension types for waivers, attestations, generators, and integrity.",
       "$defs": {
@@ -1319,16 +1468,23 @@
             }
           ],
           "properties": {
+            "externalReferences": {
+              "type": "array",
+              "items": {
+                "$ref": "https://mitre.github.io/hdf-libs/schemas/primitives/common/v3.5.0#/$defs/External_Reference"
+              },
+              "description": "Optional references to the external artifacts behind this override (e.g. the STIX bundle/object or CTI feed motivating an E:A riskAdjustment). Inert context distinct from `evidence`; see External_Reference. Symmetric with Standalone_Override.externalReferences for the inline (results-embedded) override carrier."
+            },
             "type": {
-              "$ref": "https://mitre.github.io/hdf-libs/schemas/primitives/amendments/v3.4.0#/$defs/Override_Type",
+              "$ref": "https://mitre.github.io/hdf-libs/schemas/primitives/amendments/v3.5.0#/$defs/Override_Type",
               "description": "The type of override applied to this requirement."
             },
             "status": {
-              "$ref": "https://mitre.github.io/hdf-libs/schemas/primitives/result/v3.4.0#/$defs/Result_Status",
+              "$ref": "https://mitre.github.io/hdf-libs/schemas/primitives/result/v3.5.0#/$defs/Result_Status",
               "description": "The new status this override sets for the requirement. Optional when only impact is being overridden."
             },
             "impact": {
-              "$ref": "https://mitre.github.io/hdf-libs/schemas/primitives/amendments/v3.4.0#/$defs/Impact_Override",
+              "$ref": "https://mitre.github.io/hdf-libs/schemas/primitives/amendments/v3.5.0#/$defs/Impact_Override",
               "description": "Override to the requirement's impact score. At least one of status or impact must be set."
             },
             "reason": {
@@ -1336,7 +1492,7 @@
               "description": "Explanation for why this override was applied."
             },
             "appliedBy": {
-              "$ref": "https://mitre.github.io/hdf-libs/schemas/primitives/common/v3.4.0#/$defs/Identity",
+              "$ref": "https://mitre.github.io/hdf-libs/schemas/primitives/common/v3.5.0#/$defs/Identity",
               "description": "Identity of who applied this override. For simple cases, use type 'simple' with just an identifier."
             },
             "appliedAt": {
@@ -1350,27 +1506,27 @@
               "description": "Timestamp when this override expires and must be reviewed/renewed. REQUIRED - no permanent overrides allowed. ISO 8601 format."
             },
             "signature": {
-              "$ref": "https://mitre.github.io/hdf-libs/schemas/primitives/common/v3.4.0#/$defs/Signature",
+              "$ref": "https://mitre.github.io/hdf-libs/schemas/primitives/common/v3.5.0#/$defs/Signature",
               "description": "Optional digital signature for enhanced trust and non-repudiation. Supports hardware security tokens (PKCS#11/PKCS#12), Yubikeys, GPG keys, passkeys, and other signing methods."
             },
             "evidence": {
               "type": "array",
               "items": {
-                "$ref": "https://mitre.github.io/hdf-libs/schemas/primitives/common/v3.4.0#/$defs/Evidence"
+                "$ref": "https://mitre.github.io/hdf-libs/schemas/primitives/common/v3.5.0#/$defs/Evidence"
               },
               "description": "Supporting evidence for this override, such as screenshots demonstrating manual verification for attestations."
             },
             "previousChecksum": {
-              "$ref": "https://mitre.github.io/hdf-libs/schemas/primitives/common/v3.4.0#/$defs/Checksum",
+              "$ref": "https://mitre.github.io/hdf-libs/schemas/primitives/common/v3.5.0#/$defs/Checksum",
               "description": "SHA-256 checksum of the previous amendment in chronological order. Creates a tamper-evident chain of amendments (similar to blockchain). Null for the first amendment on a requirement."
             },
             "cvss": {
-              "$ref": "https://mitre.github.io/hdf-libs/schemas/primitives/cvss/v3.4.0#/$defs/Cvss",
+              "$ref": "https://mitre.github.io/hdf-libs/schemas/primitives/cvss/v3.5.0#/$defs/Cvss",
               "$comment": "When present alongside impact.value on a riskAdjustment override, impact.value should be approximately cvss.computedScore / 10.0. Soft consistency rule — validators may warn but should not error. The cvss block makes Environmental/Threat enrichment auditable.",
               "description": "Structured CVSS scoring data backing this override. Captures the rubric (which Environmental/Threat metrics the consumer modified, the recomputed score) used to justify a riskAdjustment. For other override types this is optional context."
             },
             "justification": {
-              "$ref": "https://mitre.github.io/hdf-libs/schemas/primitives/amendments/v3.4.0#/$defs/Justification",
+              "$ref": "https://mitre.github.io/hdf-libs/schemas/primitives/amendments/v3.5.0#/$defs/Justification",
               "description": "Structured controlled-vocabulary classification for why this override applies. Complements (does not replace) the free-text 'reason' field. Most useful on falsePositive and attestation overrides where the structured category enables filtering and lossless round-trip with VEX / OSCAL / FedRAMP DR. See the Justification primitive for the precedent vocabulary and rationale."
             }
           },
@@ -1399,6 +1555,34 @@
               "appliedAt": "2026-04-14T10:00:00Z",
               "expiresAt": "2026-10-14T00:00:00Z"
             },
+            {
+              "$comment": "Inline riskAdjustment carrying the STIX source that motivated it via externalReferences (the enrichment envelope, with the raw sighting embedded losslessly in document). This is the shape the enrich pass writes onto Evaluated_Requirement.overrides[] for the E:A recompute.",
+              "type": "riskAdjustment",
+              "impact": {
+                "value": 0.9
+              },
+              "reason": "CVE-2021-44228 actively exploited in the wild per STIX threat intelligence",
+              "appliedBy": {
+                "identifier": "secops@agency.gov",
+                "type": "email"
+              },
+              "appliedAt": "2026-07-27T00:00:00Z",
+              "expiresAt": "2026-10-25T00:00:00Z",
+              "externalReferences": [
+                {
+                  "sourceName": "stix",
+                  "externalId": "sighting--a1b2c3d4-0000-4a2b-9c3d-000000000002",
+                  "kind": "threat-intel",
+                  "rel": "evidence",
+                  "document": {
+                    "type": "sighting",
+                    "spec_version": "2.1",
+                    "id": "sighting--a1b2c3d4-0000-4a2b-9c3d-000000000002",
+                    "sighting_of_ref": "vulnerability--f7c1b8e0-1234-4a2b-9c3d-000000000001"
+                  }
+                }
+              ]
+            },
             {
               "type": "falsePositive",
               "status": "passed",
@@ -1458,7 +1642,8 @@
             "type",
             "explanation",
             "appliedBy",
-            "appliedAt"
+            "appliedAt",
+            "expiresAt"
           ],
           "properties": {
             "type": {
@@ -1477,7 +1662,7 @@
               "description": "Detailed explanation of the plan, including what actions will be taken."
             },
             "appliedBy": {
-              "$ref": "https://mitre.github.io/hdf-libs/schemas/primitives/common/v3.4.0#/$defs/Identity",
+              "$ref": "https://mitre.github.io/hdf-libs/schemas/primitives/common/v3.5.0#/$defs/Identity",
               "description": "Identity of who created this POA&M. For simple cases, use type 'simple' with just an identifier."
             },
             "appliedAt": {
@@ -1488,28 +1673,28 @@
             "expiresAt": {
               "type": "string",
               "format": "date-time",
-              "description": "Optional expiration date for this POA&M requiring review/renewal. ISO 8601 format."
+              "description": "Required deadline for this POA&M. A POA&M is a time-boxed acceptance of an open finding; without a deadline it lets a failing requirement duck remediation indefinitely. Source a real date (e.g. a remediation target or vendor-fix date) — never a wall-clock default. ISO 8601 format."
             },
             "milestones": {
               "type": "array",
               "items": {
-                "$ref": "https://mitre.github.io/hdf-libs/schemas/primitives/common/v3.4.0#/$defs/Milestone"
+                "$ref": "https://mitre.github.io/hdf-libs/schemas/primitives/common/v3.5.0#/$defs/Milestone"
               },
               "description": "Optional array of milestones tracking progress toward completion."
             },
             "signature": {
-              "$ref": "https://mitre.github.io/hdf-libs/schemas/primitives/common/v3.4.0#/$defs/Signature",
+              "$ref": "https://mitre.github.io/hdf-libs/schemas/primitives/common/v3.5.0#/$defs/Signature",
               "description": "Optional digital signature for enhanced trust and non-repudiation."
             },
             "evidence": {
               "type": "array",
               "items": {
-                "$ref": "https://mitre.github.io/hdf-libs/schemas/primitives/common/v3.4.0#/$defs/Evidence"
+                "$ref": "https://mitre.github.io/hdf-libs/schemas/primitives/common/v3.5.0#/$defs/Evidence"
               },
               "description": "Supporting evidence for this POA&M, such as documentation of compensating controls or mitigation implementation."
             },
             "previousChecksum": {
-              "$ref": "https://mitre.github.io/hdf-libs/schemas/primitives/common/v3.4.0#/$defs/Checksum",
+              "$ref": "https://mitre.github.io/hdf-libs/schemas/primitives/common/v3.5.0#/$defs/Checksum",
               "description": "SHA-256 checksum of the previous amendment in chronological order. Creates a tamper-evident chain of amendments (similar to blockchain). Null for the first amendment on a requirement."
             }
           },
@@ -1522,6 +1707,7 @@
                 "type": "email"
               },
               "appliedAt": "2025-12-01T09:00:00Z",
+              "expiresAt": "2099-12-31T00:00:00Z",
               "milestones": [
                 {
                   "description": "Update base Docker image to use OpenSSL 3.0.x",
@@ -1554,7 +1740,7 @@
                 "description": "Automated POA&M creation from vulnerability scan"
               },
               "appliedAt": "2025-11-28T14:00:00Z",
-              "expiresAt": "2026-02-28T00:00:00Z",
+              "expiresAt": "2099-12-31T00:00:00Z",
               "milestones": [
                 {
                   "description": "Configure firewall rules to restrict database access to management VLAN",
@@ -1589,7 +1775,7 @@
                 "type": "email"
               },
               "appliedAt": "2025-12-05T10:00:00Z",
-              "expiresAt": "2026-04-01T00:00:00Z",
+              "expiresAt": "2099-12-31T00:00:00Z",
               "milestones": [
                 {
                   "description": "Complete migration to replacement system",
@@ -1641,7 +1827,8 @@
             },
             "format": {
               "type": "string",
-              "description": "The file format, if it is a recognized named format shared by multiple tools. Examples: 'SARIF', 'XCCDF'. Omit for tool-specific formats where the tool name already implies the format (Nessus XML, gosec JSON)."
+              "description": "The named format of the source data, when it follows a recognized format specification with its own identity: an interchange format emitted by many tools ('SARIF', 'XCCDF', 'OSCAL') or one of several named output formats a single tool produces ('FVDL', 'exec-json', 'FPF'). Never a serialization structure — 'JSON', 'XML', and 'CSV' are encodings, not formats. Omit for a tool's native output: an absent format means the tool's own shape, and data arriving as a named format is converted by that format's converter, which sets this field alongside the producing tool's name.",
+              "$comment": "Format-not-serialization rule decided 2026-08-01; bare JSON/XML/CSV labels were swept from the converters at the same time."
             }
           },
           "description": "The security tool that produced the assessment data represented in this HDF file. Aligns with SARIF, OSCAL, and CycloneDX terminology.",
@@ -1660,7 +1847,7 @@
           },
           "properties": {
             "algorithm": {
-              "$ref": "https://mitre.github.io/hdf-libs/schemas/primitives/common/v3.4.0#/$defs/Hash_Algorithm",
+              "$ref": "https://mitre.github.io/hdf-libs/schemas/primitives/common/v3.5.0#/$defs/Hash_Algorithm",
               "description": "The hash algorithm used for the checksum."
             },
             "checksum": {
@@ -1693,9 +1880,9 @@
         }
       }
     },
-    "https://mitre.github.io/hdf-libs/schemas/primitives/amendments/v3.4.0": {
+    "https://mitre.github.io/hdf-libs/schemas/primitives/amendments/v3.5.0": {
       "$schema": "https://json-schema.org/draft/2020-12/schema",
-      "$id": "https://mitre.github.io/hdf-libs/schemas/primitives/amendments/v3.4.0",
+      "$id": "https://mitre.github.io/hdf-libs/schemas/primitives/amendments/v3.5.0",
       "title": "HDF Amendment Primitives",
       "description": "Types for waivers, attestations, and POA&Ms that modify requirement compliance status.",
       "$defs": {
@@ -1803,6 +1990,13 @@
             ]
           },
           "properties": {
+            "externalReferences": {
+              "type": "array",
+              "items": {
+                "$ref": "https://mitre.github.io/hdf-libs/schemas/primitives/common/v3.5.0#/$defs/External_Reference"
+              },
+              "description": "Optional references to the external artifacts behind this override (e.g. the STIX bundle/object, advisory, or CTI feed that motivated it). Inert context distinct from `evidence`; see External_Reference."
+            },
             "type": {
               "$ref": "#/$defs/Override_Type",
               "description": "The type of amendment."
@@ -1816,7 +2010,7 @@
               "description": "Name of the baseline containing the requirement. Required when the system has multiple baselines with potentially overlapping requirement IDs."
             },
             "status": {
-              "$ref": "https://mitre.github.io/hdf-libs/schemas/primitives/result/v3.4.0#/$defs/Result_Status",
+              "$ref": "https://mitre.github.io/hdf-libs/schemas/primitives/result/v3.5.0#/$defs/Result_Status",
               "description": "The new status this amendment sets. Optional when only impact is being overridden."
             },
             "impact": {
@@ -1828,7 +2022,7 @@
               "description": "Justification for this amendment."
             },
             "appliedBy": {
-              "$ref": "https://mitre.github.io/hdf-libs/schemas/primitives/common/v3.4.0#/$defs/Identity",
+              "$ref": "https://mitre.github.io/hdf-libs/schemas/primitives/common/v3.5.0#/$defs/Identity",
               "description": "Identity of who applied this amendment."
             },
             "appliedAt": {
@@ -1844,20 +2038,20 @@
             "evidence": {
               "type": "array",
               "items": {
-                "$ref": "https://mitre.github.io/hdf-libs/schemas/primitives/common/v3.4.0#/$defs/Evidence"
+                "$ref": "https://mitre.github.io/hdf-libs/schemas/primitives/common/v3.5.0#/$defs/Evidence"
               },
               "description": "Supporting evidence (screenshots, logs, URLs, documents)."
             },
             "signature": {
-              "$ref": "https://mitre.github.io/hdf-libs/schemas/primitives/common/v3.4.0#/$defs/Signature",
+              "$ref": "https://mitre.github.io/hdf-libs/schemas/primitives/common/v3.5.0#/$defs/Signature",
               "description": "Digital signature for non-repudiation."
             },
             "previousChecksum": {
-              "$ref": "https://mitre.github.io/hdf-libs/schemas/primitives/common/v3.4.0#/$defs/Checksum",
+              "$ref": "https://mitre.github.io/hdf-libs/schemas/primitives/common/v3.5.0#/$defs/Checksum",
               "description": "Checksum of the prior amendment in the chain. Creates a tamper-evident linked list. Null for the first amendment."
             },
             "cvss": {
-              "$ref": "https://mitre.github.io/hdf-libs/schemas/primitives/cvss/v3.4.0#/$defs/Cvss",
+              "$ref": "https://mitre.github.io/hdf-libs/schemas/primitives/cvss/v3.5.0#/$defs/Cvss",
               "$comment": "When present alongside impact.value on a riskAdjustment override, impact.value should be approximately cvss.computedScore / 10.0. Soft consistency rule — validators may warn but should not error. The cvss block makes Environmental/Threat enrichment auditable.",
               "description": "Structured CVSS scoring data backing this override. Captures the rubric (which Environmental/Threat metrics the consumer modified, the recomputed score) used to justify a riskAdjustment. For other override types this is optional context."
             },
@@ -1868,7 +2062,7 @@
             "milestones": {
               "type": "array",
               "items": {
-                "$ref": "https://mitre.github.io/hdf-libs/schemas/primitives/common/v3.4.0#/$defs/Milestone"
+                "$ref": "https://mitre.github.io/hdf-libs/schemas/primitives/common/v3.5.0#/$defs/Milestone"
               },
               "description": "Remediation milestones (primarily for POA&M type amendments)."
             },
@@ -1885,7 +2079,7 @@
             "affectedPackages": {
               "type": "array",
               "items": {
-                "$ref": "https://mitre.github.io/hdf-libs/schemas/primitives/affected-package/v3.4.0#/$defs/Affected_Package"
+                "$ref": "https://mitre.github.io/hdf-libs/schemas/primitives/affected-package/v3.5.0#/$defs/Affected_Package"
               },
               "description": "Software packages this amendment is scoped to, distinct from componentRef (which scopes to an HDF-internal Component by UUID). Use when the source amendment format references packages by purl/cpe/name+version — e.g., VEX `affects[]` / `products[]`, OSCAL POA&M `subjects[]`, FedRAMP component-aware amendments. Symmetric with Evaluated_Requirement.affectedPackages, which scopes findings to the same package vocabulary. When omitted, the amendment applies system-wide (or only to componentRef when that is set)."
             }
@@ -2018,9 +2212,9 @@
         }
       }
     },
-    "https://mitre.github.io/hdf-libs/schemas/primitives/result/v3.4.0": {
+    "https://mitre.github.io/hdf-libs/schemas/primitives/result/v3.5.0": {
       "$schema": "https://json-schema.org/draft/2020-12/schema",
-      "$id": "https://mitre.github.io/hdf-libs/schemas/primitives/result/v3.4.0",
+      "$id": "https://mitre.github.io/hdf-libs/schemas/primitives/result/v3.5.0",
       "title": "HDF Result Primitives",
       "description": "Types for representing assessment results and statuses.",
       "$defs": {
@@ -2151,9 +2345,9 @@
         }
       }
     },
-    "https://mitre.github.io/hdf-libs/schemas/primitives/cvss/v3.4.0": {
+    "https://mitre.github.io/hdf-libs/schemas/primitives/cvss/v3.5.0": {
       "$schema": "https://json-schema.org/draft/2020-12/schema",
-      "$id": "https://mitre.github.io/hdf-libs/schemas/primitives/cvss/v3.4.0",
+      "$id": "https://mitre.github.io/hdf-libs/schemas/primitives/cvss/v3.5.0",
       "title": "HDF CVSS Primitives",
       "description": "Types for representing CVSS (Common Vulnerability Scoring System) data attached to assessment findings. Supports CVSS v2.0, v3.0, v3.1, and v4.0 metric groups (Base, Threat, Environmental, Supplemental).",
       "$defs": {
@@ -2355,9 +2549,9 @@
         }
       }
     },
-    "https://mitre.github.io/hdf-libs/schemas/primitives/affected-package/v3.4.0": {
+    "https://mitre.github.io/hdf-libs/schemas/primitives/affected-package/v3.5.0": {
       "$schema": "https://json-schema.org/draft/2020-12/schema",
-      "$id": "https://mitre.github.io/hdf-libs/schemas/primitives/affected-package/v3.4.0",
+      "$id": "https://mitre.github.io/hdf-libs/schemas/primitives/affected-package/v3.5.0",
       "title": "HDF Affected Package Primitives",
       "description": "Types for representing the software package(s) affected by a vulnerability finding.",
       "$defs": {