@mitre/hdf-schema 3.3.2 → 3.4.0

package/dist/schemas/hdf-results.schema.json

@@ -1,6 +1,6 @@
 {
   "$schema": "https://json-schema.org/draft/2020-12/schema",
-  "$id": "https://mitre.github.io/hdf-libs/schemas/hdf-results/v3.3.0",
+  "$id": "https://mitre.github.io/hdf-libs/schemas/hdf-results/v3.4.0",
   "type": "object",
   "unevaluatedProperties": false,
   "required": [
@@ -20,7 +20,7 @@
     "components": {
       "type": "array",
       "items": {
-        "$ref": "https://mitre.github.io/hdf-libs/schemas/primitives/component/v3.3.0#/$defs/Component"
+        "$ref": "https://mitre.github.io/hdf-libs/schemas/primitives/component/v3.4.0#/$defs/Component"
       },
       "description": "The components that were assessed. Each component describes a system element (host, container, cloud resource, application, etc.) with optional identity, SBOM, and external references."
     },
@@ -32,27 +32,27 @@
       "description": "Information on the baselines that were evaluated, including findings."
     },
     "statistics": {
-      "$ref": "https://mitre.github.io/hdf-libs/schemas/primitives/statistics/v3.3.0#/$defs/Statistics",
+      "$ref": "https://mitre.github.io/hdf-libs/schemas/primitives/statistics/v3.4.0#/$defs/Statistics",
       "description": "Statistics for the assessment run, including duration and result counts."
     },
     "generator": {
-      "$ref": "https://mitre.github.io/hdf-libs/schemas/primitives/extensions/v3.3.0#/$defs/Generator",
+      "$ref": "https://mitre.github.io/hdf-libs/schemas/primitives/extensions/v3.4.0#/$defs/Generator",
       "description": "Information about the tool that generated this file."
     },
     "tool": {
-      "$ref": "https://mitre.github.io/hdf-libs/schemas/primitives/extensions/v3.3.0#/$defs/Tool",
+      "$ref": "https://mitre.github.io/hdf-libs/schemas/primitives/extensions/v3.4.0#/$defs/Tool",
       "description": "The security tool that produced the assessment data in this file."
     },
     "integrity": {
-      "$ref": "https://mitre.github.io/hdf-libs/schemas/primitives/extensions/v3.3.0#/$defs/Integrity",
+      "$ref": "https://mitre.github.io/hdf-libs/schemas/primitives/extensions/v3.4.0#/$defs/Integrity",
       "description": "Cryptographic integrity information for verifying this file."
     },
     "runner": {
-      "$ref": "https://mitre.github.io/hdf-libs/schemas/primitives/runner/v3.3.0#/$defs/Runner",
+      "$ref": "https://mitre.github.io/hdf-libs/schemas/primitives/runner/v3.4.0#/$defs/Runner",
       "description": "Information about the test execution environment where the security tool was run. Distinct from targets (what is being tested)."
     },
     "remediation": {
-      "$ref": "https://mitre.github.io/hdf-libs/schemas/primitives/common/v3.3.0#/$defs/Remediation",
+      "$ref": "https://mitre.github.io/hdf-libs/schemas/primitives/common/v3.4.0#/$defs/Remediation",
       "description": "Optional reference to automated remediation resources (Ansible playbooks, Terraform scripts, etc.) for fixing failing requirements found in this assessment."
     },
     "systemRef": {
@@ -160,14 +160,14 @@
       ],
       "allOf": [
         {
-          "$ref": "https://mitre.github.io/hdf-libs/schemas/primitives/common/v3.3.0#/$defs/Baseline_Metadata"
+          "$ref": "https://mitre.github.io/hdf-libs/schemas/primitives/common/v3.4.0#/$defs/Baseline_Metadata"
         }
       ],
       "properties": {
         "depends": {
           "type": "array",
           "items": {
-            "$ref": "https://mitre.github.io/hdf-libs/schemas/primitives/common/v3.3.0#/$defs/Dependency"
+            "$ref": "https://mitre.github.io/hdf-libs/schemas/primitives/common/v3.4.0#/$defs/Dependency"
           },
           "description": "The set of dependencies this baseline depends on."
         },
@@ -180,15 +180,15 @@
           "description": "The description - should be more detailed than the summary."
         },
         "integrity": {
-          "$ref": "https://mitre.github.io/hdf-libs/schemas/primitives/extensions/v3.3.0#/$defs/Integrity",
+          "$ref": "https://mitre.github.io/hdf-libs/schemas/primitives/extensions/v3.4.0#/$defs/Integrity",
           "description": "Cryptographic integrity information for verifying this baseline has not been tampered with."
         },
         "originalChecksum": {
-          "$ref": "https://mitre.github.io/hdf-libs/schemas/primitives/common/v3.3.0#/$defs/Checksum",
+          "$ref": "https://mitre.github.io/hdf-libs/schemas/primitives/common/v3.4.0#/$defs/Checksum",
           "description": "SHA-256 checksum of the original baseline definition file (before execution). This is an immutable reference to the baseline as defined, used to detect tampering with baseline requirements or metadata."
         },
         "resultsChecksum": {
-          "$ref": "https://mitre.github.io/hdf-libs/schemas/primitives/common/v3.3.0#/$defs/Checksum",
+          "$ref": "https://mitre.github.io/hdf-libs/schemas/primitives/common/v3.4.0#/$defs/Checksum",
           "description": "SHA-256 checksum of the raw results before any amendments (statusOverrides or POAMs). Used to detect tampering with test results. Compare with currentChecksum to verify amendment integrity."
         },
         "statusMessage": {
@@ -206,14 +206,14 @@
         "groups": {
           "type": "array",
           "items": {
-            "$ref": "https://mitre.github.io/hdf-libs/schemas/primitives/common/v3.3.0#/$defs/Requirement_Group"
+            "$ref": "https://mitre.github.io/hdf-libs/schemas/primitives/common/v3.4.0#/$defs/Requirement_Group"
           },
           "description": "A set of descriptions for the requirement groups."
         },
         "inputs": {
           "type": "array",
           "items": {
-            "$ref": "https://mitre.github.io/hdf-libs/schemas/primitives/parameter/v3.3.0#/$defs/Input"
+            "$ref": "https://mitre.github.io/hdf-libs/schemas/primitives/parameter/v3.4.0#/$defs/Input"
           },
           "description": "Typed inputs used to parameterize this baseline at execution time. See the Input primitive for the full schema."
         },
@@ -238,7 +238,7 @@
       ],
       "allOf": [
         {
-          "$ref": "https://mitre.github.io/hdf-libs/schemas/primitives/common/v3.3.0#/$defs/Requirement_Core"
+          "$ref": "https://mitre.github.io/hdf-libs/schemas/primitives/common/v3.4.0#/$defs/Requirement_Core"
         }
       ],
       "properties": {
@@ -246,7 +246,7 @@
           "type": "array",
           "minItems": 1,
           "items": {
-            "$ref": "https://mitre.github.io/hdf-libs/schemas/primitives/result/v3.3.0#/$defs/Requirement_Description"
+            "$ref": "https://mitre.github.io/hdf-libs/schemas/primitives/result/v3.4.0#/$defs/Requirement_Description"
           },
           "contains": {
             "type": "object",
@@ -262,37 +262,37 @@
           "description": "Array of labeled descriptions. At least one description with label 'default' must be present. Convention: place default description first. Common labels: 'default', 'check', 'fix', 'rationale'."
         },
         "severity": {
-          "$ref": "https://mitre.github.io/hdf-libs/schemas/primitives/common/v3.3.0#/$defs/Severity",
+          "$ref": "https://mitre.github.io/hdf-libs/schemas/primitives/common/v3.4.0#/$defs/Severity",
           "description": "Explicit severity rating. Typically derived from impact score but provided explicitly for clarity."
         },
         "sourceLocation": {
-          "$ref": "https://mitre.github.io/hdf-libs/schemas/primitives/common/v3.3.0#/$defs/Source_Location",
+          "$ref": "https://mitre.github.io/hdf-libs/schemas/primitives/common/v3.4.0#/$defs/Source_Location",
           "description": "The explicit location of the requirement within the source code."
         },
         "results": {
           "type": "array",
           "minItems": 1,
           "items": {
-            "$ref": "https://mitre.github.io/hdf-libs/schemas/primitives/result/v3.3.0#/$defs/Requirement_Result"
+            "$ref": "https://mitre.github.io/hdf-libs/schemas/primitives/result/v3.4.0#/$defs/Requirement_Result"
           },
           "description": "The set of all tests within the requirement and their results."
         },
         "statusOverrides": {
           "type": "array",
           "items": {
-            "$ref": "https://mitre.github.io/hdf-libs/schemas/primitives/extensions/v3.3.0#/$defs/Status_Override"
+            "$ref": "https://mitre.github.io/hdf-libs/schemas/primitives/extensions/v3.4.0#/$defs/Status_Override"
           },
           "description": "Chronological history of all overrides applied to this requirement. Overrides are intentional changes to the compliance status and/or impact score (waivers, attestations, false positives, risk adjustments). Most recent override should be first in array. Preserves full audit trail."
         },
         "poams": {
           "type": "array",
           "items": {
-            "$ref": "https://mitre.github.io/hdf-libs/schemas/primitives/extensions/v3.3.0#/$defs/POAM"
+            "$ref": "https://mitre.github.io/hdf-libs/schemas/primitives/extensions/v3.4.0#/$defs/POAM"
           },
           "description": "Plan of Action and Milestones for tracking remediation, mitigation, or risk acceptance. POAMs do NOT change effectiveStatus - they track the work being done to address a failure. Separate from statusOverrides which DO change status."
         },
         "effectiveStatus": {
-          "$ref": "https://mitre.github.io/hdf-libs/schemas/primitives/result/v3.3.0#/$defs/Result_Status",
+          "$ref": "https://mitre.github.io/hdf-libs/schemas/primitives/result/v3.4.0#/$defs/Result_Status",
           "description": "The current effective compliance status of this requirement after applying the most recent non-expired override with a status field, or computed from results (worst-wins) if no status-bearing overrides exist."
         },
         "effectiveImpact": {
@@ -302,29 +302,29 @@
           "description": "The current effective impact score (0.0–1.0) after applying the most recent non-expired override with an impact field. Absent when no impact overrides apply; consumers should use the requirement's impact field in that case."
         },
         "disposition": {
-          "$ref": "https://mitre.github.io/hdf-libs/schemas/primitives/amendments/v3.3.0#/$defs/Override_Type",
+          "$ref": "https://mitre.github.io/hdf-libs/schemas/primitives/amendments/v3.4.0#/$defs/Override_Type",
           "description": "The type of the most recent non-expired override or POAM governing this requirement. Indicates why the requirement is in its current state (e.g., waiver, falsePositive, riskAdjustment) or what remediation is being tracked (poam). Absent when no overrides or POAMs apply."
         },
         "evidence": {
           "type": "array",
           "items": {
-            "$ref": "https://mitre.github.io/hdf-libs/schemas/primitives/common/v3.3.0#/$defs/Evidence"
+            "$ref": "https://mitre.github.io/hdf-libs/schemas/primitives/common/v3.4.0#/$defs/Evidence"
           },
           "description": "Supporting evidence for this requirement's findings, such as screenshots, code samples, or log excerpts."
         },
         "cvss": {
           "type": "array",
           "items": {
-            "$ref": "https://mitre.github.io/hdf-libs/schemas/primitives/cvss/v3.3.0#/$defs/Cvss"
+            "$ref": "https://mitre.github.io/hdf-libs/schemas/primitives/cvss/v3.4.0#/$defs/Cvss"
           },
           "description": "Structured CVSS scoring data for vulnerability findings. One entry per CVE — a finding may match multiple CVEs (common in vulnerability scanners). Captures vendor-supplied Base metrics plus optional consumer-owned Threat / Environmental / Supplemental groups for risk adjustment. See cvss.schema.json."
         },
         "epss": {
-          "$ref": "https://mitre.github.io/hdf-libs/schemas/primitives/epss/v3.3.0#/$defs/Epss",
+          "$ref": "https://mitre.github.io/hdf-libs/schemas/primitives/epss/v3.4.0#/$defs/Epss",
           "description": "FIRST.org EPSS (Exploit Prediction Scoring System) score for this CVE finding. Used alongside CVSS for prioritization — captures the probability the vulnerability will be exploited."
         },
         "kev": {
-          "$ref": "https://mitre.github.io/hdf-libs/schemas/primitives/kev/v3.3.0#/$defs/Kev",
+          "$ref": "https://mitre.github.io/hdf-libs/schemas/primitives/kev/v3.4.0#/$defs/Kev",
           "description": "CISA Known Exploited Vulnerabilities (KEV) catalog status. When inKev=true, dateAdded and dueDate carry the federal patching deadline."
         },
         "cwe": {
@@ -338,7 +338,7 @@
         "affectedPackages": {
           "type": "array",
           "items": {
-            "$ref": "https://mitre.github.io/hdf-libs/schemas/primitives/affected-package/v3.3.0#/$defs/Affected_Package"
+            "$ref": "https://mitre.github.io/hdf-libs/schemas/primitives/affected-package/v3.4.0#/$defs/Affected_Package"
           },
           "description": "Packages affected by this vulnerability finding. Vulnerability-finding-scoped — see components[] on hdf-system for component-level package inventories. One entry per matched package signature (scanners often report multiple CPE variations per CVE)."
         }
@@ -626,11 +626,11 @@
       "description": "A requirement that has been evaluated, including any findings.",
       "title": "Evaluated Requirement"
     },
-    "https://mitre.github.io/hdf-libs/schemas/primitives/component/v3.3.0": {
+    "https://mitre.github.io/hdf-libs/schemas/primitives/component/v3.4.0": {
       "$schema": "https://json-schema.org/draft/2020-12/schema",
-      "$id": "https://mitre.github.io/hdf-libs/schemas/primitives/component/v3.3.0",
+      "$id": "https://mitre.github.io/hdf-libs/schemas/primitives/component/v3.4.0",
       "title": "HDF Component Primitives",
-      "description": "First-class system component with identity, polymorphic type, SBOM embedding, and system-binding properties. Components are the successor to Targets, adding stable identity (componentId), external system cross-references, and software inventory.",
+      "description": "First-class system component with identity, polymorphic type, generalized BOM attachment (boms[]), and system-binding properties. Components are the successor to Targets, adding stable identity (componentId), external system cross-references, and manifest inventory (SBOM, AI model/dataset, and reserved future BOM kinds).",
       "$defs": {
         "Base_Component": {
           "type": "object",
@@ -654,9 +654,11 @@
                 "application",
                 "artifact",
                 "network",
-                "database"
+                "database",
+                "aiModel",
+                "dataset"
               ],
-              "description": "Component type discriminator. Same values as Target types."
+              "description": "Component type discriminator. Same values as Target types, plus aiModel and dataset (thin AI subject components whose detail lives in an attached ai-model / dataset BOM)."
             },
             "name": {
               "type": "string",
@@ -672,7 +674,7 @@
               "description": "Description of this component's role or purpose."
             },
             "owner": {
-              "$ref": "https://mitre.github.io/hdf-libs/schemas/primitives/common/v3.3.0#/$defs/Identity",
+              "$ref": "https://mitre.github.io/hdf-libs/schemas/primitives/common/v3.4.0#/$defs/Identity",
               "description": "Team or individual responsible for this component. Enables per-component ownership when different teams manage different parts of a system."
             },
             "externalIds": {
@@ -689,23 +691,19 @@
               },
               "description": "Optional key-value labels for flexible grouping. Well-known keys: system, component, environment, region, team. Values must be strings."
             },
-            "sbom": {
-              "description": "Embedded CycloneDX or SPDX SBOM document representing this component's software inventory. The sbomFormat field determines which format constraints apply.",
-              "$comment": "Validated conditionally: CycloneDX requires bomFormat='CycloneDX' + specVersion; SPDX requires spdxVersion + SPDXID. Full SBOM schema validation is a tool-level concern."
-            },
-            "sbomRef": {
-              "type": "string",
-              "format": "uri-reference",
-              "description": "URI reference to an external CycloneDX or SPDX SBOM document for this component. May be a relative path, absolute URI, or fragment identifier."
+            "boms": {
+              "type": "array",
+              "items": {
+                "$ref": "https://mitre.github.io/hdf-libs/schemas/primitives/bom/v3.4.0#/$defs/Bom"
+              },
+              "description": "Component-scoped Bills of Materials (SBOM, ai-model, dataset, or any reserved bomType), each carried by passthrough (ref/document) or normalized. Replaces the former sbom/sbomRef/sbomFormat trio; a component may carry several BOMs (e.g. an SBOM plus an ai-model BOM). See primitives/bom.schema.json."
             },
-            "sbomFormat": {
-              "type": "string",
-              "title": "SBOM Format",
-              "enum": [
-                "cyclonedx",
-                "spdx"
-              ],
-              "description": "Format of the SBOM (embedded or referenced). Required when sbom or sbomRef is present."
+            "integrity": {
+              "type": "array",
+              "items": {
+                "$ref": "https://mitre.github.io/hdf-libs/schemas/primitives/common/v3.4.0#/$defs/Checksum"
+              },
+              "description": "Cryptographic integrity of this component's underlying artifact — model weights or shards, dataset archive, container image, or package bytes. An array supports multi-file/sharded artifacts. This is the single, generic home for artifact/subject integrity across all component types (it replaced the former per-type Container_Image digest and Artifact checksum fields). Distinct from BOM-document integrity (Bom.hashes[]) and from the document tamper-evidence Integrity type."
             },
             "baselineRefs": {
               "type": "array",
@@ -717,115 +715,42 @@
             "inputOverrides": {
               "type": "array",
               "items": {
-                "$ref": "https://mitre.github.io/hdf-libs/schemas/primitives/system/v3.3.0#/$defs/Input_Override"
+                "$ref": "https://mitre.github.io/hdf-libs/schemas/primitives/system/v3.4.0#/$defs/Input_Override"
               },
               "description": "System-specific overrides for baseline input values."
             },
             "targetSelector": {
-              "$ref": "https://mitre.github.io/hdf-libs/schemas/primitives/system/v3.3.0#/$defs/Target_Selector",
+              "$ref": "https://mitre.github.io/hdf-libs/schemas/primitives/system/v3.4.0#/$defs/Target_Selector",
               "description": "Label selector to match targets belonging to this component during migration. Targets with matching labels are automatically included."
             }
           },
-          "allOf": [
+          "examples": [
             {
-              "if": {
-                "allOf": [
-                  {
-                    "properties": {
-                      "sbomFormat": {
-                        "const": "cyclonedx"
-                      }
-                    },
-                    "required": [
-                      "sbomFormat"
-                    ]
-                  },
-                  {
-                    "properties": {
-                      "sbom": {
-                        "type": "object"
-                      }
-                    },
-                    "required": [
-                      "sbom"
-                    ]
-                  }
-                ]
+              "type": "aiModel",
+              "name": "Llama-2-7b-chat (finetuned)",
+              "componentId": "b7c8d9e0-1a2b-4c3d-8e4f-5a6b7c8d9e0f",
+              "owner": {
+                "type": "email",
+                "identifier": "ml-platform@agency.gov"
               },
-              "then": {
-                "properties": {
-                  "sbom": {
-                    "type": "object",
-                    "required": [
-                      "bomFormat",
-                      "specVersion"
-                    ],
-                    "properties": {
-                      "bomFormat": {
-                        "type": "string",
-                        "const": "CycloneDX",
-                        "description": "Must be 'CycloneDX' for CycloneDX SBOM documents."
-                      },
-                      "specVersion": {
-                        "type": "string",
-                        "description": "CycloneDX specification version (e.g., '1.4', '1.5', '1.6')."
-                      }
-                    },
-                    "additionalProperties": true
-                  }
+              "integrity": [
+                {
+                  "algorithm": "sha256",
+                  "value": "d1f2e3a4b5c6978869504132a1b2c3d4e5f6071829304152637485960a1b2c3d"
                 }
-              }
-            },
-            {
-              "if": {
-                "allOf": [
-                  {
-                    "properties": {
-                      "sbomFormat": {
-                        "const": "spdx"
-                      }
-                    },
-                    "required": [
-                      "sbomFormat"
-                    ]
-                  },
-                  {
-                    "properties": {
-                      "sbom": {
-                        "type": "object"
-                      }
-                    },
-                    "required": [
-                      "sbom"
-                    ]
-                  }
-                ]
-              },
-              "then": {
-                "properties": {
-                  "sbom": {
-                    "type": "object",
-                    "required": [
-                      "spdxVersion",
-                      "SPDXID"
-                    ],
-                    "properties": {
-                      "spdxVersion": {
-                        "type": "string",
-                        "description": "SPDX specification version (e.g., 'SPDX-2.3')."
-                      },
-                      "SPDXID": {
-                        "type": "string",
-                        "description": "SPDX document identifier (e.g., 'SPDXRef-DOCUMENT')."
-                      }
-                    },
-                    "additionalProperties": true
+              ],
+              "boms": [
+                {
+                  "bomType": "ai-model",
+                  "format": "cyclonedx-ml",
+                  "model": {
+                    "adaptationType": "finetune"
                   }
                 }
-              }
+              ]
             }
           ],
-          "description": "Base properties shared by all component types. Extends the Target concept with stable identity, external references, and SBOM embedding.",
+          "description": "Base properties shared by all component types. Extends the Target concept with stable identity, external references, generalized BOM attachment (boms[]), and unified artifact integrity (integrity[]).",
           "title": "Base Component"
         },
         "Component": {
@@ -864,6 +789,12 @@
             },
             {
               "$ref": "#/$defs/Database_Component"
+            },
+            {
+              "$ref": "#/$defs/AI_Model_Component"
+            },
+            {
+              "$ref": "#/$defs/Dataset_Component"
             }
           ]
         },
@@ -878,10 +809,18 @@
                 "type": {
                   "const": "host"
                 },
+                "hostname": {
+                  "type": "string",
+                  "description": "Short, OS-reported host name (the unqualified machine name, e.g. 'web01'). Kept distinct from 'fqdn' because an FQDN is not reliably decomposable into hostname + domain (standalone/workgroup hosts have no domain; a directory domain is not the FQDN's DNS suffix). Aligns with ECS host.hostname and DISA STIG CKL HOST_NAME. Store the short name the source reports; do not derive it from the FQDN."
+                },
                 "fqdn": {
                   "type": "string",
                   "format": "hostname",
-                  "description": "Fully qualified domain name."
+                  "description": "Fully qualified domain name (e.g. 'web01.prod.example.com'). Distinct from 'hostname' (short) and 'domain' (directory domain). ECS recommends storing this lowercase; the schema does not enforce case so source fidelity is preserved on round-trip."
+                },
+                "domain": {
+                  "type": "string",
+                  "description": "Directory domain the host is a member of — Active Directory / NetBIOS / LDAP domain (ECS host.domain semantics), NOT necessarily the DNS suffix of the FQDN. A standalone or workgroup host has a hostname but no domain. Not derivable from the FQDN; populate only from a source that carries directory membership."
                 },
                 "ipAddress": {
                   "anyOf": [
@@ -914,10 +853,13 @@
           ],
           "examples": [
             {
+              "$comment": "Domain-joined host carrying all three identity fields separately: short hostname, FQDN, and the (distinct) directory domain. HOST_NAME and HOST_FQDN from a STIG checklist map here; note the AD domain differs from the FQDN's DNS suffix.",
               "type": "host",
               "name": "web-server-prod-01",
               "componentId": "a1b2c3d4-e5f6-4a7b-8c9d-0e1f2a3b4c5d",
+              "hostname": "web01",
               "fqdn": "web01.prod.example.com",
+              "domain": "CORP",
               "ipAddress": "10.0.1.50",
               "osName": "Ubuntu",
               "osVersion": "22.04 LTS",
@@ -925,6 +867,16 @@
                 "cmdb": "ASSET-12345",
                 "aws": "i-0abc123def456789"
               }
+            },
+            {
+              "$comment": "Standalone/workgroup host: has a short hostname but no directory domain — 'domain' is omitted rather than fabricated from the FQDN suffix.",
+              "type": "host",
+              "name": "kiosk-lab-07",
+              "hostname": "kiosk-lab-07",
+              "fqdn": "kiosk-lab-07.lab.example.com",
+              "ipAddress": "192.168.4.7",
+              "osName": "Windows",
+              "osVersion": "11 23H2"
             }
           ],
           "description": "A physical or virtual server, workstation, or network device.",
@@ -956,16 +908,26 @@
                 "tag": {
                   "type": "string",
                   "description": "Image tag. Example: '1.25'."
-                },
-                "digest": {
-                  "type": "string",
-                  "pattern": "^(sha256:[a-f0-9]{64}|sha512:[a-f0-9]{128}|blake3:[a-f0-9]{64})$",
-                  "description": "Image digest for immutable reference."
                 }
               }
             }
           ],
-          "description": "A static container image (not running).",
+          "examples": [
+            {
+              "type": "containerImage",
+              "name": "nginx",
+              "registry": "docker.io",
+              "repository": "library/nginx",
+              "tag": "1.25-alpine",
+              "integrity": [
+                {
+                  "algorithm": "sha256",
+                  "value": "a9286defaba7b3a519d585ba0e37d0b2cbee74ebfe590960b0b1d6a5e97d1e1d"
+                }
+              ]
+            }
+          ],
+          "description": "A static container image (not running). Image integrity — formerly the 'digest' field — is expressed via the shared Base_Component.integrity array.",
           "title": "Container Image Component"
         },
         "Container_Instance_Component": {
@@ -1042,7 +1004,7 @@
                   "const": "cloudAccount"
                 },
                 "provider": {
-                  "$ref": "https://mitre.github.io/hdf-libs/schemas/primitives/common/v3.3.0#/$defs/Cloud_Provider",
+                  "$ref": "https://mitre.github.io/hdf-libs/schemas/primitives/common/v3.4.0#/$defs/Cloud_Provider",
                   "description": "Cloud provider."
                 },
                 "accountId": {
@@ -1081,7 +1043,7 @@
                   "const": "cloudResource"
                 },
                 "provider": {
-                  "$ref": "https://mitre.github.io/hdf-libs/schemas/primitives/common/v3.3.0#/$defs/Cloud_Provider",
+                  "$ref": "https://mitre.github.io/hdf-libs/schemas/primitives/common/v3.4.0#/$defs/Cloud_Provider",
                   "description": "Cloud provider."
                 },
                 "resourceType": {
@@ -1188,15 +1150,26 @@
                 "version": {
                   "type": "string",
                   "description": "Package version."
-                },
-                "checksum": {
-                  "type": "string",
-                  "description": "Package checksum for verification."
                 }
               }
             }
           ],
-          "description": "A software artifact or dependency (for SCA tools).",
+          "examples": [
+            {
+              "type": "artifact",
+              "name": "express",
+              "packageManager": "npm",
+              "packageName": "express",
+              "version": "4.18.2",
+              "integrity": [
+                {
+                  "algorithm": "sha512",
+                  "value": "cf83e1357eefb8bdf1542850d66d8007d620e4050b5715dc83f4a921d36ce9ce47d0d13c5d85f2b0ff8318d2877eec2f63b931bd47417a81a538327af927da3e"
+                }
+              ]
+            }
+          ],
+          "description": "A software artifact or dependency (for SCA tools). Package integrity — formerly the 'checksum' field — is expressed via the shared Base_Component.integrity array.",
           "title": "Artifact Component"
         },
         "Network_Component": {
@@ -1258,12 +1231,120 @@
           ],
           "description": "A database instance.",
           "title": "Database Component"
+        },
+        "AI_Model_Component": {
+          "allOf": [
+            {
+              "$ref": "#/$defs/Base_Component"
+            },
+            {
+              "type": "object",
+              "properties": {
+                "type": {
+                  "const": "aiModel"
+                },
+                "modelId": {
+                  "type": "string",
+                  "description": "Provider/registry identifier for the model. Examples: a Hugging Face repo id ('meta-llama/Llama-2-7b-hf') or a model purl. Correlates the component to its ai-model BOM(s) and to lineage references from other models."
+                },
+                "version": {
+                  "type": "string",
+                  "description": "Model version, revision, or checkpoint tag."
+                }
+              }
+            }
+          ],
+          "examples": [
+            {
+              "type": "aiModel",
+              "name": "Llama-2-7b-chat (finetuned)",
+              "componentId": "b7c8d9e0-1a2b-4c3d-8e4f-5a6b7c8d9e0f",
+              "modelId": "acme/llama-2-7b-chat-support",
+              "version": "1.2.0",
+              "integrity": [
+                {
+                  "algorithm": "sha256",
+                  "value": "d1f2e3a4b5c6978869504132a1b2c3d4e5f6071829304152637485960a1b2c3d"
+                }
+              ],
+              "boms": [
+                {
+                  "bomType": "ai-model",
+                  "format": "cyclonedx-ml",
+                  "model": {
+                    "modelArchitecture": "transformer",
+                    "parameterCount": 6738415616,
+                    "serializationFormat": "safetensors",
+                    "adaptationType": "finetune",
+                    "baseModelRef": "meta-llama/Llama-2-7b-hf"
+                  }
+                }
+              ]
+            }
+          ],
+          "description": "A thin AI-model component: identity and correlation only (parallel to Host_Component's fqdn/ip). All model detail — architecture, parameter count, serialization format, lineage — lives in an attached ai-model BOM (boms[]), never on the component itself.",
+          "title": "AI Model Component"
+        },
+        "Dataset_Component": {
+          "allOf": [
+            {
+              "$ref": "#/$defs/Base_Component"
+            },
+            {
+              "type": "object",
+              "properties": {
+                "type": {
+                  "const": "dataset"
+                },
+                "datasetId": {
+                  "type": "string",
+                  "description": "Provider/registry identifier for the dataset. Examples: a Hugging Face dataset repo id ('HuggingFaceH4/ultrachat_200k'), a DOI, or a dataset purl. Correlates the component to its dataset BOM(s) and to datasetRefs from ai-model components."
+                },
+                "version": {
+                  "type": "string",
+                  "description": "Dataset version, release identifier, or — for highly dynamic datasets — a timestamped release marker."
+                }
+              }
+            }
+          ],
+          "examples": [
+            {
+              "type": "dataset",
+              "name": "UltraChat-200k (filtered)",
+              "componentId": "c1d2e3f4-a5b6-4c7d-8e9f-0a1b2c3d4e5f",
+              "datasetId": "acme/ultrachat-200k-filtered",
+              "version": "2026-06-01",
+              "integrity": [
+                {
+                  "algorithm": "sha256",
+                  "value": "9f86d081884c7d659a2feaa0c55ad015a3bf4f1b2b0b822cd15d6c15b0f00a08"
+                }
+              ],
+              "boms": [
+                {
+                  "bomType": "dataset",
+                  "format": "croissant",
+                  "dataset": {
+                    "recordCount": 180000,
+                    "datasetFormat": "parquet",
+                    "dataClassification": "public",
+                    "baseDatasetRefs": [
+                      "HuggingFaceH4/ultrachat_200k"
+                    ],
+                    "derivation": "filtered"
+                  }
+                }
+              ]
+            }
+          ],
+          "description": "A thin dataset component: identity and correlation only, symmetric with AI_Model_Component. All dataset detail — record count, format, classification, lineage — lives in an attached dataset BOM (boms[]), never on the component itself.",
+          "title": "Dataset Component"
         }
       }
     },
-    "https://mitre.github.io/hdf-libs/schemas/primitives/common/v3.3.0": {
+    "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.3.0",
+      "$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": {
@@ -1272,9 +1353,10 @@
           "enum": [
             "sha256",
             "sha384",
-            "sha512"
+            "sha512",
+            "blake3"
           ],
-          "description": "Supported cryptographic hash algorithms for checksums and integrity verification.",
+          "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": {
@@ -1535,10 +1617,11 @@
                 "email",
                 "username",
                 "system",
+                "agent",
                 "simple",
                 "other"
               ],
-              "description": "The type of identifier. Use 'email' for email addresses, 'username' for user accounts, 'system' for automated systems, 'simple' for basic string identifiers without additional classification, or 'other' for custom identity systems."
+              "description": "The type of identifier. Use 'email' for email addresses, 'username' for user accounts, 'system' for deterministic non-interactive automation (CI jobs, cron, scanners), 'agent' for an AI/LLM agent acting with autonomy — kept distinct from 'system' so auditors can apply AI-specific scrutiny (e.g. 'an LLM proposed this' vs a deterministic job) and satisfy AI-source disclosure under frameworks like the EU AI Act and NIST AI RMF, 'simple' for basic string identifiers without additional classification, or 'other' for custom identity systems."
             },
             "description": {
               "type": "string",
@@ -1559,6 +1642,11 @@
               "type": "system",
               "identifier": "automated-scanner-01",
               "description": "Nightly compliance scan pipeline"
+            },
+            {
+              "type": "agent",
+              "identifier": "cve-enrichment-bot/v0.4.2",
+              "description": "OpenAI GPT-4 via internal CVE-enrichment tool; proposes environmental CVSS for human review"
             }
           ],
           "description": "Represents an identity that performed an action, such as capturing evidence or applying an override.",
@@ -2046,7 +2134,7 @@
           },
           "examples": [
             {
-              "$comment": "v3.1.x-style requirement: classification fields omitted. Consumers must continue to handle this shape under v3.3.0 (backward compatibility).",
+              "$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,
@@ -2183,9 +2271,482 @@
         }
       }
     },
-    "https://mitre.github.io/hdf-libs/schemas/primitives/system/v3.3.0": {
+    "https://mitre.github.io/hdf-libs/schemas/primitives/bom/v3.4.0": {
       "$schema": "https://json-schema.org/draft/2020-12/schema",
-      "$id": "https://mitre.github.io/hdf-libs/schemas/primitives/system/v3.3.0",
+      "$id": "https://mitre.github.io/hdf-libs/schemas/primitives/bom/v3.4.0",
+      "title": "HDF BOM Primitives",
+      "description": "Generalized Bill-of-Materials / manifest representation. One extensible Bom shape, discriminated by bomType, carries any manifest kind (SBOM, AI model/dataset, and reserved future kinds) either by passthrough (opaque ref/embed of the native document) or normalized (converted into HDF's queryable shape). Subject identity (name, version, componentId) is inherited from the host component or system — the BOM never re-owns it. See ADR-0001.",
+      "$defs": {
+        "Bom_Type": {
+          "type": "string",
+          "title": "BOM Type",
+          "anyOf": [
+            {
+              "enum": [
+                "sbom",
+                "ai-model",
+                "dataset",
+                "hbom",
+                "cbom",
+                "saasbom",
+                "obom",
+                "mbom",
+                "kbom"
+              ]
+            },
+            {
+              "pattern": "^x-[a-z0-9]+(-[a-z0-9]+)*$"
+            }
+          ],
+          "description": "Discriminator for the manifest kind. Reserved, CycloneDX-aligned set: sbom (software), ai-model, dataset, hbom (hardware), cbom (cryptography), saasbom (services), obom (operations), mbom (manufacturing), kbom (Kubernetes). Normalized now: sbom, ai-model, dataset; reserved + passthrough-capable now, normalized in later releases: the rest. Custom or experimental kinds MUST use an 'x-' prefix (e.g. 'x-threat-model') so they cannot collide with a value later promoted into the reserved set; a non-'x-' value outside the reserved set is invalid. Adding a reserved value is a schema version bump. VEX/VDR/SecurityProfile are vulnerability assertions, not BOMs, and are intentionally excluded."
+        },
+        "Bom": {
+          "type": "object",
+          "title": "Bill of Materials",
+          "additionalProperties": false,
+          "required": [
+            "bomType",
+            "format"
+          ],
+          "properties": {
+            "bomType": {
+              "$ref": "#/$defs/Bom_Type",
+              "description": "The manifest kind. Determines which normalized type-extension (model/dataset/packages) may appear."
+            },
+            "format": {
+              "type": "string",
+              "description": "Source manifest format the BOM was produced from or references. Examples: cyclonedx, cyclonedx-ml, spdx, spdx-ai, huggingface, croissant. Free-form so new formats need no schema change; the converter that emits the BOM owns the value."
+            },
+            "ref": {
+              "type": "string",
+              "format": "uri-reference",
+              "description": "Passthrough by reference: URI (relative path, absolute URI, or fragment) to the native manifest document. Present for externally-hosted BOMs."
+            },
+            "document": {
+              "type": "object",
+              "description": "Passthrough by embedding: the native manifest carried opaquely (e.g. a raw CycloneDX or SPDX object). HDF does not constrain its internal shape — full manifest validation is a tool-level concern."
+            },
+            "hashes": {
+              "type": "array",
+              "items": {
+                "$ref": "https://mitre.github.io/hdf-libs/schemas/primitives/common/v3.4.0#/$defs/Checksum"
+              },
+              "description": "Integrity of the carried BOM *document* itself (the referenced/embedded manifest file), NOT the integrity of the BOM's subject artifact. Subject/artifact integrity (model weights, dataset archive) is a component-level concern, not carried here. Subject identity is inherited from the host component/system; per-node identity lives in the type-extension."
+            },
+            "uniqueId": {
+              "type": "string",
+              "description": "Optional stable identifier for this BOM document (e.g. CycloneDX serialNumber, SPDX documentNamespace). Correlates the same BOM across evidence packages."
+            },
+            "license": {
+              "type": [
+                "string",
+                "null"
+              ],
+              "description": "Optional license of the BOM document as a whole (SPDX license expression). Nullable and often meaningless (CBOM algorithms, many HBOM parts have no license); per-node licenses live in the type-extension, not here."
+            },
+            "model": {
+              "$ref": "#/$defs/AI_Model_Extension",
+              "description": "Normalized ai-model extension. Permitted only when bomType is ai-model."
+            },
+            "dataset": {
+              "$ref": "#/$defs/Dataset_Extension",
+              "description": "Normalized dataset extension. Permitted only when bomType is dataset."
+            },
+            "packages": {
+              "type": "array",
+              "items": {
+                "$ref": "#/$defs/SBOM_Package"
+              },
+              "description": "Normalized sbom extension: the flattened software package inventory. Permitted only when bomType is sbom."
+            }
+          },
+          "allOf": [
+            {
+              "$comment": "Three-tier discipline: the ai-model extension may appear only on an ai-model BOM.",
+              "if": {
+                "properties": {
+                  "bomType": {
+                    "const": "ai-model"
+                  }
+                },
+                "required": [
+                  "bomType"
+                ]
+              },
+              "else": {
+                "properties": {
+                  "model": false
+                }
+              }
+            },
+            {
+              "$comment": "The dataset extension may appear only on a dataset BOM.",
+              "if": {
+                "properties": {
+                  "bomType": {
+                    "const": "dataset"
+                  }
+                },
+                "required": [
+                  "bomType"
+                ]
+              },
+              "else": {
+                "properties": {
+                  "dataset": false
+                }
+              }
+            },
+            {
+              "$comment": "The normalized packages extension may appear only on an sbom BOM.",
+              "if": {
+                "properties": {
+                  "bomType": {
+                    "const": "sbom"
+                  }
+                },
+                "required": [
+                  "bomType"
+                ]
+              },
+              "else": {
+                "properties": {
+                  "packages": false
+                }
+              }
+            },
+            {
+              "$comment": "A BOM must carry at least one of ref/document/packages/model/dataset. This intentionally checks PRESENCE, not non-emptiness: under the partial-fidelity design a converter MAY emit an empty normalized extension (e.g. model:{}) alongside a raw `document` passthrough when a source has no cleanly-mappable fields, so this constraint deliberately does not require minProperties/minItems on the extension. A bare {bomType, format} carrying none of these keys is unusable and invalid.",
+              "anyOf": [
+                {
+                  "required": [
+                    "ref"
+                  ]
+                },
+                {
+                  "required": [
+                    "document"
+                  ]
+                },
+                {
+                  "required": [
+                    "packages"
+                  ]
+                },
+                {
+                  "required": [
+                    "model"
+                  ]
+                },
+                {
+                  "required": [
+                    "dataset"
+                  ]
+                }
+              ]
+            }
+          ],
+          "examples": [
+            {
+              "$comment": "Passthrough SBOM by external reference — the universal escape hatch, available to every bomType.",
+              "bomType": "sbom",
+              "format": "cyclonedx",
+              "ref": "https://artifacts.agency.gov/sbom/webtier.cdx.json",
+              "hashes": [
+                {
+                  "algorithm": "sha256",
+                  "value": "e3b0c44298fc1c149afbf4c8996fb92427ae41e4649b934ca495991b7852b855"
+                }
+              ]
+            },
+            {
+              "$comment": "Passthrough for a reserved-but-not-yet-normalized type (cbom) — carried opaquely until a normalized extension ships.",
+              "bomType": "cbom",
+              "format": "cyclonedx",
+              "document": {
+                "bomFormat": "CycloneDX",
+                "specVersion": "1.6"
+              }
+            },
+            {
+              "$comment": "Normalized ai-model BOM: CISA/G7-aligned fields live in the model extension, never at the component root or shared base.",
+              "bomType": "ai-model",
+              "format": "cyclonedx-ml",
+              "model": {
+                "modelArchitecture": "transformer",
+                "parameterCount": 6738415616,
+                "serializationFormat": "safetensors",
+                "adaptationType": "finetune",
+                "baseModelRef": "meta-llama/Llama-2-7b-hf",
+                "learningApproach": "supervised",
+                "task": "text-generation",
+                "performanceMetrics": [
+                  {
+                    "name": "MMLU",
+                    "value": "0.457"
+                  }
+                ],
+                "hyperparameters": [
+                  {
+                    "name": "epochs",
+                    "value": "3"
+                  },
+                  {
+                    "name": "learning-rate",
+                    "value": "2e-5"
+                  }
+                ],
+                "inputOutput": {
+                  "dataTypes": [
+                    "string"
+                  ],
+                  "modality": [
+                    "text"
+                  ],
+                  "contextLength": 4096,
+                  "tokenizer": "llama-bpe"
+                }
+              }
+            },
+            {
+              "$comment": "Normalized dataset BOM with lineage — a filtered derivative of a base dataset, referenced by an ai-model via datasetRefs.",
+              "bomType": "dataset",
+              "format": "croissant",
+              "dataset": {
+                "recordCount": 2500000,
+                "datasetFormat": "parquet",
+                "dataClassification": "public",
+                "intendedUse": "instruction fine-tuning",
+                "modality": "text",
+                "provenance": "Filtered from the public UltraChat corpus; low-quality and duplicate turns removed.",
+                "statisticalProperties": "Mean 512 tokens/record; 61% single-turn, 39% multi-turn; English-dominant (~92%).",
+                "baseDatasetRefs": [
+                  "HuggingFaceH4/ultrachat_200k"
+                ],
+                "derivation": "filtered"
+              }
+            }
+          ]
+        },
+        "AI_Model_Extension": {
+          "type": "object",
+          "additionalProperties": true,
+          "description": "Normalized AI-model fields, aligned to the CISA/G7 'SBOM for AI' minimum elements. All fields optional (standards-correct; only the EU AI Act makes a subset binding for high-risk/GPAI). Left open (additionalProperties: true) so a converter can carry unmapped native fields opaquely (partial-fidelity pattern). Subject name/version are inherited from the host aiModel component, not repeated here.",
+          "title": "AI Model BOM Extension",
+          "properties": {
+            "modelArchitecture": {
+              "type": "string",
+              "description": "Model architecture family. Examples: transformer, cnn, diffusion, mixture-of-experts."
+            },
+            "parameterCount": {
+              "type": "integer",
+              "minimum": 0,
+              "description": "Total trainable parameter count. No native CycloneDX/SPDX field exists; first-class here because the EU AI Act keys GPAI obligations off model scale."
+            },
+            "serializationFormat": {
+              "type": "string",
+              "description": "On-disk weight serialization format. Security-critical yet under-modeled by BOM specs: pickle/pytorch permits arbitrary code execution on load; safetensors does not. Examples: safetensors, pytorch, gguf, onnx, tensorflow."
+            },
+            "adaptationType": {
+              "type": "string",
+              "title": "Model Adaptation Type",
+              "enum": [
+                "finetune",
+                "adapter",
+                "quantized",
+                "merge"
+              ],
+              "description": "Lineage relationship to baseModelRef, adopting Hugging Face's base_model_relation vocabulary (the only typed lineage enum in the ecosystem)."
+            },
+            "baseModelRef": {
+              "type": "string",
+              "description": "Reference to the base model this one was adapted from (e.g. a Hugging Face repo id or purl). Correlates the lineage edge; the base model itself may carry its own ai-model BOM."
+            },
+            "datasetRefs": {
+              "type": "array",
+              "items": {
+                "type": "string"
+              },
+              "description": "References to the training/evaluation datasets this model was produced from — preferably a dataset component's componentId (correlating to a first-class dataset subject rather than duplicating dataset detail, per ADR §10), or a dataset BOM uniqueId/URI when no component exists."
+            },
+            "intendedUse": {
+              "type": "string",
+              "description": "Free-text statement of intended use and out-of-scope uses (CISA/G7 minimum element)."
+            },
+            "learningApproach": {
+              "type": "string",
+              "description": "Model's learning/training paradigm. Free-text because the value set varies across standards. Examples: supervised, self-supervised, semi-supervised, reinforcement. Cross-standard intersection: SPDX 3.0 ai_typeOfModel ∩ CycloneDX modelParameters.approach.type ∩ CISA/G7 learning type."
+            },
+            "task": {
+              "type": "string",
+              "description": "The ML task the model performs. Free-text. Examples: text-classification, sentiment-analysis, object-detection, translation. Sourced from CycloneDX modelParameters.task (SPDX 3.0 ai_domain is domain-level/adjacent, not the task); CISA/G7 intended-application."
+            },
+            "performanceMetrics": {
+              "type": "array",
+              "items": {
+                "type": "object",
+                "additionalProperties": true,
+                "properties": {
+                  "name": {
+                    "type": "string",
+                    "description": "Metric name. Examples: accuracy, f1, BLEU, latency."
+                  },
+                  "value": {
+                    "type": "string",
+                    "description": "Reported metric value, free-text because metrics are heterogeneous (percentages, scores, milliseconds)."
+                  }
+                }
+              },
+              "description": "Reported evaluation metrics as name/value pairs. Values are free-text because metrics are heterogeneous (accuracy, f1, BLEU, latency). The item stays open (additionalProperties: true) to carry native CycloneDX slice/confidenceInterval detail opaquely. Cross-standard intersection: SPDX 3.0 ai_metric ∩ CycloneDX quantitativeAnalysis.performanceMetrics ∩ CISA/G7 KPI cluster."
+            },
+            "hyperparameters": {
+              "type": "array",
+              "items": {
+                "type": "object",
+                "properties": {
+                  "name": {
+                    "type": "string",
+                    "description": "Hyper-parameter name. Examples: epochs, learning-rate, batch-size."
+                  },
+                  "value": {
+                    "type": "string",
+                    "description": "Hyper-parameter value (free-text)."
+                  }
+                }
+              },
+              "description": "Training hyper-parameters as name/value pairs (epochs, learning-rate, batch-size). This is the set of training knobs, NOT the model's trainable parameterCount — the two are routinely conflated. CISA/G7 'Model properties: hyper-parameters'; SPDX 3.0 ai_hyperparameter."
+            },
+            "inputOutput": {
+              "type": "object",
+              "additionalProperties": true,
+              "description": "Model input/output properties (CISA/G7 minimum element): I/O data types, modality, context/sequence length, and tokenizer. Sourced from CycloneDX modelParameters.inputs[].format / outputs[].format. All sub-fields optional.",
+              "properties": {
+                "dataTypes": {
+                  "type": "array",
+                  "items": {
+                    "type": "string"
+                  },
+                  "description": "Input/output data types. Examples: string, byte[], float32, image."
+                },
+                "modality": {
+                  "type": [
+                    "string",
+                    "array"
+                  ],
+                  "items": {
+                    "type": "string"
+                  },
+                  "description": "Input/output modalities. String or array of strings. Examples: text, image, audio. Symmetric with Dataset_Extension.modality."
+                },
+                "contextLength": {
+                  "type": "integer",
+                  "minimum": 0,
+                  "description": "Maximum context/sequence length the model accepts, in tokens."
+                },
+                "tokenizer": {
+                  "type": "string",
+                  "description": "Tokenizer used for the model's input encoding. Examples: BPE, SentencePiece, tiktoken."
+                }
+              }
+            }
+          }
+        },
+        "Dataset_Extension": {
+          "type": "object",
+          "additionalProperties": true,
+          "description": "Normalized dataset fields (SPDX 3.0 Dataset profile / MLCommons Croissant aligned). All optional; open for partial-fidelity passthrough of unmapped native fields. Symmetric with AI_Model_Extension: carries the dataset's own lineage (baseDatasetRefs/derivation) just as the model extension carries baseModelRef/adaptationType.",
+          "title": "Dataset BOM Extension",
+          "properties": {
+            "recordCount": {
+              "type": "integer",
+              "minimum": 0,
+              "description": "Number of records/examples in the dataset."
+            },
+            "datasetFormat": {
+              "type": "string",
+              "description": "Physical format of the dataset. Examples: parquet, csv, jsonl, tfrecord, webdataset."
+            },
+            "dataClassification": {
+              "type": "string",
+              "description": "Sensitivity/classification of the data. Examples: public, internal, confidential, pii, phi."
+            },
+            "intendedUse": {
+              "type": "string",
+              "description": "Free-text statement of the dataset's intended use (CISA/G7 minimum element)."
+            },
+            "modality": {
+              "type": [
+                "string",
+                "array"
+              ],
+              "items": {
+                "type": "string"
+              },
+              "description": "Content modality/kind of the data (CISA/G7 'Dataset content: modality'). Examples: text, image, tabular, timeseries, audio. DISTINCT from datasetFormat, which is the physical encoding (parquet/csv). Resolves SPDX 3.0 dataset_datasetType, which is content-kind, not physical format. String or array of strings."
+            },
+            "provenance": {
+              "type": "string",
+              "description": "Free-text description of the dataset's origin and collection process (CISA/G7 'Dataset provenance'; SPDX 3.0 dataset_dataCollectionProcess)."
+            },
+            "statisticalProperties": {
+              "type": "string",
+              "description": "Free-text summary of the dataset's statistical properties (CISA/G7 minimum element; open-ended by design). Intentionally free-text and will remain so permanently: recordCount is the one structured statistic, and restructuring this into an object later would break existing consumers, so it stays a string (additive-only)."
+            },
+            "baseDatasetRefs": {
+              "type": "array",
+              "items": {
+                "type": "string"
+              },
+              "description": "References to the source dataset(s) this one was derived from — a dataset componentId, or a dataset BOM uniqueId/URI when no component exists. The lineage edge parallel to ai-model's baseModelRef; the base dataset may carry its own dataset BOM."
+            },
+            "derivation": {
+              "type": "string",
+              "title": "Dataset Derivation Type",
+              "enum": [
+                "filtered",
+                "augmented",
+                "merged",
+                "sampled"
+              ],
+              "description": "Relationship of this dataset to baseDatasetRefs, parallel to the model extension's adaptationType. Minimal + extensible: filtered (subset by rule), augmented (added/synthesized records), merged (union of sources), sampled (statistical draw)."
+            }
+          }
+        },
+        "SBOM_Package": {
+          "type": "object",
+          "additionalProperties": true,
+          "description": "A single normalized software package entry within an sbom BOM. Minimal identity + version for querying/diffing; the full native record remains available via passthrough (document/ref).",
+          "title": "SBOM Package",
+          "required": [
+            "name"
+          ],
+          "properties": {
+            "name": {
+              "type": "string",
+              "description": "Package name."
+            },
+            "version": {
+              "type": "string",
+              "description": "Package version."
+            },
+            "purl": {
+              "type": "string",
+              "description": "Package URL (purl) — the preferred cross-BOM identity key when present."
+            },
+            "licenses": {
+              "type": "array",
+              "items": {
+                "type": "string"
+              },
+              "description": "SPDX license identifiers/expressions for this package."
+            }
+          }
+        }
+      }
+    },
+    "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": {
@@ -2236,7 +2797,7 @@
               "description": "Rationale for why this override is needed."
             },
             "approvedBy": {
-              "$ref": "https://mitre.github.io/hdf-libs/schemas/primitives/common/v3.3.0#/$defs/Identity",
+              "$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."
             }
           },
@@ -2318,9 +2879,9 @@
         }
       }
     },
-    "https://mitre.github.io/hdf-libs/schemas/primitives/statistics/v3.3.0": {
+    "https://mitre.github.io/hdf-libs/schemas/primitives/statistics/v3.4.0": {
       "$schema": "https://json-schema.org/draft/2020-12/schema",
-      "$id": "https://mitre.github.io/hdf-libs/schemas/primitives/statistics/v3.3.0",
+      "$id": "https://mitre.github.io/hdf-libs/schemas/primitives/statistics/v3.4.0",
       "title": "HDF Statistics Primitives",
       "description": "Statistics types for tracking assessment run metrics.",
       "$defs": {
@@ -2389,9 +2950,9 @@
         }
       }
     },
-    "https://mitre.github.io/hdf-libs/schemas/primitives/extensions/v3.3.0": {
+    "https://mitre.github.io/hdf-libs/schemas/primitives/extensions/v3.4.0": {
       "$schema": "https://json-schema.org/draft/2020-12/schema",
-      "$id": "https://mitre.github.io/hdf-libs/schemas/primitives/extensions/v3.3.0",
+      "$id": "https://mitre.github.io/hdf-libs/schemas/primitives/extensions/v3.4.0",
       "title": "HDF Extension Primitives",
       "description": "Extension types for waivers, attestations, generators, and integrity.",
       "$defs": {
@@ -2419,15 +2980,15 @@
           ],
           "properties": {
             "type": {
-              "$ref": "https://mitre.github.io/hdf-libs/schemas/primitives/amendments/v3.3.0#/$defs/Override_Type",
+              "$ref": "https://mitre.github.io/hdf-libs/schemas/primitives/amendments/v3.4.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.3.0#/$defs/Result_Status",
+              "$ref": "https://mitre.github.io/hdf-libs/schemas/primitives/result/v3.4.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.3.0#/$defs/Impact_Override",
+              "$ref": "https://mitre.github.io/hdf-libs/schemas/primitives/amendments/v3.4.0#/$defs/Impact_Override",
               "description": "Override to the requirement's impact score. At least one of status or impact must be set."
             },
             "reason": {
@@ -2435,7 +2996,7 @@
               "description": "Explanation for why this override was applied."
             },
             "appliedBy": {
-              "$ref": "https://mitre.github.io/hdf-libs/schemas/primitives/common/v3.3.0#/$defs/Identity",
+              "$ref": "https://mitre.github.io/hdf-libs/schemas/primitives/common/v3.4.0#/$defs/Identity",
               "description": "Identity of who applied this override. For simple cases, use type 'simple' with just an identifier."
             },
             "appliedAt": {
@@ -2449,27 +3010,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.3.0#/$defs/Signature",
+              "$ref": "https://mitre.github.io/hdf-libs/schemas/primitives/common/v3.4.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.3.0#/$defs/Evidence"
+                "$ref": "https://mitre.github.io/hdf-libs/schemas/primitives/common/v3.4.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.3.0#/$defs/Checksum",
+              "$ref": "https://mitre.github.io/hdf-libs/schemas/primitives/common/v3.4.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.3.0#/$defs/Cvss",
+              "$ref": "https://mitre.github.io/hdf-libs/schemas/primitives/cvss/v3.4.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.3.0#/$defs/Justification",
+              "$ref": "https://mitre.github.io/hdf-libs/schemas/primitives/amendments/v3.4.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."
             }
           },
@@ -2576,7 +3137,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.3.0#/$defs/Identity",
+              "$ref": "https://mitre.github.io/hdf-libs/schemas/primitives/common/v3.4.0#/$defs/Identity",
               "description": "Identity of who created this POA&M. For simple cases, use type 'simple' with just an identifier."
             },
             "appliedAt": {
@@ -2592,23 +3153,23 @@
             "milestones": {
               "type": "array",
               "items": {
-                "$ref": "https://mitre.github.io/hdf-libs/schemas/primitives/common/v3.3.0#/$defs/Milestone"
+                "$ref": "https://mitre.github.io/hdf-libs/schemas/primitives/common/v3.4.0#/$defs/Milestone"
               },
               "description": "Optional array of milestones tracking progress toward completion."
             },
             "signature": {
-              "$ref": "https://mitre.github.io/hdf-libs/schemas/primitives/common/v3.3.0#/$defs/Signature",
+              "$ref": "https://mitre.github.io/hdf-libs/schemas/primitives/common/v3.4.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.3.0#/$defs/Evidence"
+                "$ref": "https://mitre.github.io/hdf-libs/schemas/primitives/common/v3.4.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.3.0#/$defs/Checksum",
+              "$ref": "https://mitre.github.io/hdf-libs/schemas/primitives/common/v3.4.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."
             }
           },
@@ -2759,7 +3320,7 @@
           },
           "properties": {
             "algorithm": {
-              "$ref": "https://mitre.github.io/hdf-libs/schemas/primitives/common/v3.3.0#/$defs/Hash_Algorithm",
+              "$ref": "https://mitre.github.io/hdf-libs/schemas/primitives/common/v3.4.0#/$defs/Hash_Algorithm",
               "description": "The hash algorithm used for the checksum."
             },
             "checksum": {
@@ -2792,9 +3353,9 @@
         }
       }
     },
-    "https://mitre.github.io/hdf-libs/schemas/primitives/amendments/v3.3.0": {
+    "https://mitre.github.io/hdf-libs/schemas/primitives/amendments/v3.4.0": {
       "$schema": "https://json-schema.org/draft/2020-12/schema",
-      "$id": "https://mitre.github.io/hdf-libs/schemas/primitives/amendments/v3.3.0",
+      "$id": "https://mitre.github.io/hdf-libs/schemas/primitives/amendments/v3.4.0",
       "title": "HDF Amendment Primitives",
       "description": "Types for waivers, attestations, and POA&Ms that modify requirement compliance status.",
       "$defs": {
@@ -2915,7 +3476,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.3.0#/$defs/Result_Status",
+              "$ref": "https://mitre.github.io/hdf-libs/schemas/primitives/result/v3.4.0#/$defs/Result_Status",
               "description": "The new status this amendment sets. Optional when only impact is being overridden."
             },
             "impact": {
@@ -2927,7 +3488,7 @@
               "description": "Justification for this amendment."
             },
             "appliedBy": {
-              "$ref": "https://mitre.github.io/hdf-libs/schemas/primitives/common/v3.3.0#/$defs/Identity",
+              "$ref": "https://mitre.github.io/hdf-libs/schemas/primitives/common/v3.4.0#/$defs/Identity",
               "description": "Identity of who applied this amendment."
             },
             "appliedAt": {
@@ -2943,20 +3504,20 @@
             "evidence": {
               "type": "array",
               "items": {
-                "$ref": "https://mitre.github.io/hdf-libs/schemas/primitives/common/v3.3.0#/$defs/Evidence"
+                "$ref": "https://mitre.github.io/hdf-libs/schemas/primitives/common/v3.4.0#/$defs/Evidence"
               },
               "description": "Supporting evidence (screenshots, logs, URLs, documents)."
             },
             "signature": {
-              "$ref": "https://mitre.github.io/hdf-libs/schemas/primitives/common/v3.3.0#/$defs/Signature",
+              "$ref": "https://mitre.github.io/hdf-libs/schemas/primitives/common/v3.4.0#/$defs/Signature",
               "description": "Digital signature for non-repudiation."
             },
             "previousChecksum": {
-              "$ref": "https://mitre.github.io/hdf-libs/schemas/primitives/common/v3.3.0#/$defs/Checksum",
+              "$ref": "https://mitre.github.io/hdf-libs/schemas/primitives/common/v3.4.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.3.0#/$defs/Cvss",
+              "$ref": "https://mitre.github.io/hdf-libs/schemas/primitives/cvss/v3.4.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."
             },
@@ -2967,7 +3528,7 @@
             "milestones": {
               "type": "array",
               "items": {
-                "$ref": "https://mitre.github.io/hdf-libs/schemas/primitives/common/v3.3.0#/$defs/Milestone"
+                "$ref": "https://mitre.github.io/hdf-libs/schemas/primitives/common/v3.4.0#/$defs/Milestone"
               },
               "description": "Remediation milestones (primarily for POA&M type amendments)."
             },
@@ -2984,7 +3545,7 @@
             "affectedPackages": {
               "type": "array",
               "items": {
-                "$ref": "https://mitre.github.io/hdf-libs/schemas/primitives/affected-package/v3.3.0#/$defs/Affected_Package"
+                "$ref": "https://mitre.github.io/hdf-libs/schemas/primitives/affected-package/v3.4.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)."
             }
@@ -3117,9 +3678,9 @@
         }
       }
     },
-    "https://mitre.github.io/hdf-libs/schemas/primitives/result/v3.3.0": {
+    "https://mitre.github.io/hdf-libs/schemas/primitives/result/v3.4.0": {
       "$schema": "https://json-schema.org/draft/2020-12/schema",
-      "$id": "https://mitre.github.io/hdf-libs/schemas/primitives/result/v3.3.0",
+      "$id": "https://mitre.github.io/hdf-libs/schemas/primitives/result/v3.4.0",
       "title": "HDF Result Primitives",
       "description": "Types for representing assessment results and statuses.",
       "$defs": {
@@ -3250,9 +3811,9 @@
         }
       }
     },
-    "https://mitre.github.io/hdf-libs/schemas/primitives/cvss/v3.3.0": {
+    "https://mitre.github.io/hdf-libs/schemas/primitives/cvss/v3.4.0": {
       "$schema": "https://json-schema.org/draft/2020-12/schema",
-      "$id": "https://mitre.github.io/hdf-libs/schemas/primitives/cvss/v3.3.0",
+      "$id": "https://mitre.github.io/hdf-libs/schemas/primitives/cvss/v3.4.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": {
@@ -3454,9 +4015,9 @@
         }
       }
     },
-    "https://mitre.github.io/hdf-libs/schemas/primitives/affected-package/v3.3.0": {
+    "https://mitre.github.io/hdf-libs/schemas/primitives/affected-package/v3.4.0": {
       "$schema": "https://json-schema.org/draft/2020-12/schema",
-      "$id": "https://mitre.github.io/hdf-libs/schemas/primitives/affected-package/v3.3.0",
+      "$id": "https://mitre.github.io/hdf-libs/schemas/primitives/affected-package/v3.4.0",
       "title": "HDF Affected Package Primitives",
       "description": "Types for representing the software package(s) affected by a vulnerability finding.",
       "$defs": {
@@ -3569,9 +4130,9 @@
         }
       }
     },
-    "https://mitre.github.io/hdf-libs/schemas/primitives/runner/v3.3.0": {
+    "https://mitre.github.io/hdf-libs/schemas/primitives/runner/v3.4.0": {
       "$schema": "https://json-schema.org/draft/2020-12/schema",
-      "$id": "https://mitre.github.io/hdf-libs/schemas/primitives/runner/v3.3.0",
+      "$id": "https://mitre.github.io/hdf-libs/schemas/primitives/runner/v3.4.0",
       "title": "HDF Runner Primitive",
       "description": "Information about the test execution environment where the security tool/scanner was executed.",
       "$defs": {
@@ -3596,7 +4157,15 @@
             },
             "hostname": {
               "type": "string",
-              "description": "The hostname of the runner system. Example: 'ci-runner-01', 'jenkins-agent-03', 'k8s-node-worker-03'."
+              "description": "The short hostname of the runner system. Example: 'ci-runner-01', 'jenkins-agent-03', 'k8s-node-worker-03'."
+            },
+            "fqdn": {
+              "type": "string",
+              "description": "The fully qualified domain name of the runner system, when known. Distinct from the short 'hostname'; kept separate for the same reason as on host components (an FQDN is not reliably decomposable). Example: 'ci-runner-01.build.example.com'."
+            },
+            "domain": {
+              "type": "string",
+              "description": "The directory domain the runner system belongs to (Active Directory / NetBIOS / LDAP), NOT the DNS suffix of the FQDN. Example: 'CORP'."
             },
             "containerImage": {
               "type": "string",
@@ -3607,7 +4176,7 @@
               "description": "The container instance identifier. Example: 'a1b2c3d4e5f6', 'security-scan-job-xyz123'. Can be a Docker container ID, Kubernetes pod name, or other container runtime identifier."
             },
             "operator": {
-              "$ref": "https://mitre.github.io/hdf-libs/schemas/primitives/common/v3.3.0#/$defs/Identity",
+              "$ref": "https://mitre.github.io/hdf-libs/schemas/primitives/common/v3.4.0#/$defs/Identity",
               "description": "The identity of the person or system responsible for executing the test. This could be a human auditor manually completing a checklist, an automated CI/CD system, or a security tool. Optional field to support both automated and manual HDF generation."
             }
           },
@@ -3617,6 +4186,8 @@
               "release": "20.04",
               "architecture": "x86_64",
               "hostname": "github-runner-prod-01",
+              "fqdn": "github-runner-prod-01.build.example.com",
+              "domain": "CORP",
               "containerImage": "ghcr.io/inspec/inspec:5.22.3",
               "containerId": "security-scan-job-a1b2c3d4",
               "operator": {
@@ -3654,9 +4225,9 @@
         }
       }
     },
-    "https://mitre.github.io/hdf-libs/schemas/primitives/parameter/v3.3.0": {
+    "https://mitre.github.io/hdf-libs/schemas/primitives/parameter/v3.4.0": {
       "$schema": "https://json-schema.org/draft/2020-12/schema",
-      "$id": "https://mitre.github.io/hdf-libs/schemas/primitives/parameter/v3.3.0",
+      "$id": "https://mitre.github.io/hdf-libs/schemas/primitives/parameter/v3.4.0",
       "title": "HDF Parameter Primitives",
       "description": "Input/parameter type definitions for typed, traceable configuration values that bridge governance prose and scanner automation.",
       "$defs": {
@@ -3787,9 +4358,9 @@
         }
       }
     },
-    "https://mitre.github.io/hdf-libs/schemas/primitives/epss/v3.3.0": {
+    "https://mitre.github.io/hdf-libs/schemas/primitives/epss/v3.4.0": {
       "$schema": "https://json-schema.org/draft/2020-12/schema",
-      "$id": "https://mitre.github.io/hdf-libs/schemas/primitives/epss/v3.3.0",
+      "$id": "https://mitre.github.io/hdf-libs/schemas/primitives/epss/v3.4.0",
       "title": "HDF EPSS Primitive",
       "description": "Type for representing FIRST.org's Exploit Prediction Scoring System (EPSS) data for a vulnerability. EPSS estimates the probability that a CVE will be exploited in the wild in the next 30 days. See https://www.first.org/epss/ for the underlying model and methodology.",
       "$defs": {
@@ -3846,9 +4417,9 @@
         }
       }
     },
-    "https://mitre.github.io/hdf-libs/schemas/primitives/kev/v3.3.0": {
+    "https://mitre.github.io/hdf-libs/schemas/primitives/kev/v3.4.0": {
       "$schema": "https://json-schema.org/draft/2020-12/schema",
-      "$id": "https://mitre.github.io/hdf-libs/schemas/primitives/kev/v3.3.0",
+      "$id": "https://mitre.github.io/hdf-libs/schemas/primitives/kev/v3.4.0",
       "title": "HDF Kev Primitives",
       "description": "Types for representing CISA Known Exploited Vulnerabilities (KEV) catalog membership. The KEV catalog (https://www.cisa.gov/known-exploited-vulnerabilities-catalog) flags CVEs that are confirmed actively exploited in the wild and drives federal patching urgency under CISA Binding Operational Directive 22-01.",
       "$defs": {