@mitre/hdf-schema 3.3.2 → 3.4.1

package/dist/go/hdf.go

@@ -138,9 +138,6 @@ type HDFResults struct {
 }
 
 // Information on a baseline that was evaluated, including any findings.
-//
-// Shared metadata fields for baselines. Used in both standalone baseline documents and
-// evaluated baseline results.
 type EvaluatedBaseline struct {
 	// The set of dependencies this baseline depends on.                                                              
 	Depends                                                                                    []Dependency           `json:"depends,omitempty"`
@@ -197,8 +194,7 @@ type EvaluatedBaseline struct {
 	Version                                                                                    *string                `json:"version,omitempty"`
 }
 
-// A dependency for a baseline. Can include relative paths or URLs for where to find the
-// dependency.
+// A dependency for a baseline. Can include relative paths or URLs for where to find the dependency.
 type Dependency struct {
 	// The branch name for a git repo.                                    
 	Branch                                                        *string `json:"branch,omitempty"`
@@ -232,9 +228,9 @@ type RequirementGroup struct {
 	Title                                                                                    *string  `json:"title,omitempty"`
 }
 
-// A typed input parameter that bridges governance requirements and scanner automation.
-// Inputs carry expected configuration values with type information, comparison operators,
-// and validation constraints, enabling traceability from policy through to scan results.
+// A typed input parameter that bridges governance requirements and scanner automation. Inputs carry
+// expected configuration values with type information, comparison operators, and validation
+// constraints, enabling traceability from policy through to scan results.
 type Input struct {
 	// Validation constraints for the input value.                                                                 
 	Constraints                                                                                *InputConstraints   `json:"constraints,omitempty"`
@@ -256,8 +252,6 @@ type Input struct {
 	Value                                                                                      interface{}         `json:"value,omitempty"`
 }
 
-// Validation constraints for the input value.
-//
 // Validation constraints for an input value.
 type InputConstraints struct {
 	// Enumeration of permitted values.                                                  
@@ -270,27 +264,8 @@ type InputConstraints struct {
 	Pattern                                                                *string       `json:"pattern,omitempty"`
 }
 
-// Cryptographic integrity information for verifying this baseline has not been tampered
-// with.
-//
-// Cryptographic integrity information for verifying the HDF file has not been tampered
-// with. If algorithm is provided, checksum must also be provided, and vice versa.
-//
-// Cryptographic integrity information for verifying this file.
-//
-// Cryptographic integrity information for verifying this comparison document.
-//
-// Cryptographic integrity information for verifying this system document has not been
-// tampered with.
-//
-// Cryptographic integrity information for verifying this plan document has not been
-// tampered with.
-//
-// Cryptographic integrity information for verifying this amendments document has not been
-// tampered with.
-//
-// Cryptographic integrity information for verifying this evidence package has not been
-// tampered with.
+// Cryptographic integrity information for verifying the HDF file has not been tampered with. If
+// algorithm is provided, checksum must also be provided, and vice versa.
 type Integrity struct {
 	// The hash algorithm used for the checksum.               
 	Algorithm                                   *HashAlgorithm `json:"algorithm,omitempty"`
@@ -302,30 +277,7 @@ type Integrity struct {
 	SignedBy                                    *string        `json:"signedBy,omitempty"`
 }
 
-// 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.
-//
 // Cryptographic checksum for baseline integrity verification.
-//
-// 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.
-//
-// 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.
-//
-// Optional cryptographic checksum for verifying the integrity of remediation resources
-// fetched from the URI. Recommended for security when referencing external automation
-// scripts.
-//
-// Cryptographic checksum of the source document for integrity verification.
-//
-// Checksum of the prior amendment in the chain. Creates a tamper-evident linked list. Null
-// for the first amendment.
-//
-// Cryptographic checksum for verifying the referenced document's integrity.
 type Checksum struct {
 	// The hash algorithm used for the checksum.              
 	Algorithm                                   HashAlgorithm `json:"algorithm"`
@@ -334,9 +286,6 @@ type Checksum struct {
 }
 
 // A requirement that has been evaluated, including any findings.
-//
-// Core requirement fields shared between baseline requirements and evaluated requirements.
-// Contains the fundamental requirement definition without assessment results.
 type EvaluatedRequirement struct {
 	// Packages affected by this vulnerability finding. Vulnerability-finding-scoped — see                              
 	// components[] on hdf-system for component-level package inventories. One entry per matched                        
@@ -433,14 +382,13 @@ type EvaluatedRequirement struct {
 }
 
 // Represents a package referenced by a vulnerability finding or by an amendment's scope. On
-// Evaluated_Requirement.affectedPackages it says 'this CVE affects these package versions'.
-// On Standalone_Override.affectedPackages it says 'this amendment is scoped to these
-// packages' (used by VEX, OSCAL POA&M, FedRAMP component-aware amendments). NOT a
-// system-level component identifier — see `components[]` on hdf-system for those. Validity
-// requires at least one of: (name + version + ecosystem), purl alone, or cpe alone. purl
-// and cpe are self-describing identifiers that encode name/version implicitly, so either
-// may stand on its own; the name+version+ecosystem combination is the explicit form for
-// sources without formal identifiers.
+// Evaluated_Requirement.affectedPackages it says 'this CVE affects these package versions'. On
+// Standalone_Override.affectedPackages it says 'this amendment is scoped to these packages' (used
+// by VEX, OSCAL POA&M, FedRAMP component-aware amendments). NOT a system-level component identifier
+// — see `components[]` on hdf-system for those. Validity requires at least one of: (name + version
+// + ecosystem), purl alone, or cpe alone. purl and cpe are self-describing identifiers that encode
+// name/version implicitly, so either may stand on its own; the name+version+ecosystem combination
+// is the explicit form for sources without formal identifiers.
 type AffectedPackage struct {
 	// Optional CPE 2.3 URI identifying the affected product. Validated leniently: only the                
 	// 'cpe:2.3:' prefix and the part-type letter ('a' application, 'h' hardware, 'o' operating            
@@ -469,16 +417,12 @@ type AffectedPackage struct {
 	Version                                                                                     *string    `json:"version,omitempty"`
 }
 
-// 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.
-//
-// A CVSS (Common Vulnerability Scoring System) score record for a vulnerability finding.
-// Captures the vendor-supplied Base metric group and optional consumer-supplied Threat,
-// Environmental, and Supplemental metric groups. Supports all four CVSS major versions
-// (2.0, 3.0, 3.1, 4.0). Vector strings are validated against a permissive umbrella grammar;
-// semantic validation (correct metrics per version, correct values per metric) is performed
-// by the hdf-utilities `validateCvssVector` helper rather than at the schema layer.
+// A CVSS (Common Vulnerability Scoring System) score record for a vulnerability finding. Captures
+// the vendor-supplied Base metric group and optional consumer-supplied Threat, Environmental, and
+// Supplemental metric groups. Supports all four CVSS major versions (2.0, 3.0, 3.1, 4.0). Vector
+// strings are validated against a permissive umbrella grammar; semantic validation (correct metrics
+// per version, correct values per metric) is performed by the hdf-utilities `validateCvssVector`
+// helper rather than at the schema layer.
 type Cvss struct {
 	// The Base score (0.0–10.0) computed from the base vector. Reflects the intrinsic,                       
 	// vendor-published severity before consumer enrichment.                                                  
@@ -532,13 +476,9 @@ type Description struct {
 	Label                                                                                       string `json:"label"`
 }
 
-// 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.
-//
-// FIRST.org Exploit Prediction Scoring System (EPSS) data for a single vulnerability. All
-// three fields are required when an Epss object is present; the date disambiguates which
-// day's score this is, since EPSS recomputes daily.
+// FIRST.org Exploit Prediction Scoring System (EPSS) data for a single vulnerability. All three
+// fields are required when an Epss object is present; the date disambiguates which day's score this
+// is, since EPSS recomputes daily.
 type Epss struct {
 	// ISO 8601 date (YYYY-MM-DD) on which FIRST.org published this EPSS score.                        
 	Date                                                                                       string  `json:"date"`
@@ -552,8 +492,8 @@ type Epss struct {
 	Score                                                                                      float64 `json:"score"`
 }
 
-// Supporting evidence for a finding or override, such as screenshots, code samples, log
-// excerpts, or URLs.
+// Supporting evidence for a finding or override, such as screenshots, code samples, log excerpts,
+// or URLs.
 type Evidence struct {
 	// Timestamp when this evidence was captured. ISO 8601 format.                                         
 	CapturedAt                                                                                *time.Time   `json:"capturedAt,omitempty"`
@@ -574,41 +514,8 @@ type Evidence struct {
 	Type                                                                                      EvidenceType `json:"type"`
 }
 
-// Identity of who or what captured this evidence.
-//
-// Represents an identity that performed an action, such as capturing evidence or applying
-// an override.
-//
-// Identity of who created this POA&M. For simple cases, use type 'simple' with just an
-// identifier.
-//
-// Identity of who completed this milestone.
-//
-// The identity that created this signature.
-//
-// Identity of who applied this override. For simple cases, use type 'simple' with just an
-// identifier.
-//
-// Identity of the person or system that approved this override.
-//
-// Team or individual responsible for this component. Enables per-component ownership when
-// different teams manage different parts of a system.
-//
-// 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.
-//
-// Team or individual responsible for this system's authorization and compliance. Maps to
-// OSCAL responsible-party with role 'system-owner'.
-//
-// Default identity of who created this amendments document. Individual overrides may
-// specify their own appliedBy.
-//
-// Identity of the authorizing official who approved these amendments.
-//
-// Identity of who applied this amendment.
-//
-// Identity of who prepared this evidence package.
+// Represents an identity that performed an action, such as capturing evidence or applying an
+// override.
 type Identity struct {
 	// Optional description of the identity or identity system, particularly useful when type is             
 	// 'other'.                                                                                              
@@ -616,8 +523,12 @@ type Identity struct {
 	// The identifier value. Example: 'user@example.com', 'jdoe', 'automated-scanner-01'.                    
 	Identifier                                                                                  string       `json:"identifier"`
 	// 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.                                               
+	// '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.                                                                              
 	Type                                                                                        IdentityType `json:"type"`
 }
 
@@ -682,21 +593,9 @@ type Milestone struct {
 	Status                                          MilestoneStatus `json:"status"`
 }
 
-// Optional digital signature for enhanced trust and non-repudiation.
-//
-// A digital signature following W3C Data Integrity Proofs pattern. Supports hardware
-// security tokens (PKCS#11/PKCS#12), Yubikeys, GPG keys, passkeys, and other cryptographic
-// signing methods via JWK, PEM, or Base58 key formats.
-//
-// 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.
-//
-// Digital signature for non-repudiation.
-//
-// Document-level digital signature covering all amendments.
-//
-// Digital signature covering the entire evidence package.
+// A digital signature following W3C Data Integrity Proofs pattern. Supports hardware security
+// tokens (PKCS#11/PKCS#12), Yubikeys, GPG keys, passkeys, and other cryptographic signing methods
+// via JWK, PEM, or Base58 key formats.
 type Signature struct {
 	// Challenge value from the verifier, used in challenge-response authentication.                    
 	Challenge                                                                        *string            `json:"challenge,omitempty"`
@@ -720,10 +619,8 @@ type Signature struct {
 	VerificationMethod                                                               VerificationMethod `json:"verificationMethod"`
 }
 
-// The verification method containing the public key for signature verification.
-//
-// Verification method containing the public key needed to verify a digital signature.
-// Supports multiple key formats including JWK (for RSA, EC), PEM, and Base58.
+// Verification method containing the public key needed to verify a digital signature. Supports
+// multiple key formats including JWK (for RSA, EC), PEM, and Base58.
 type VerificationMethod struct {
 	// The entity that controls this verification method. Can be a DID, URI, or other identifier.                       
 	Controller                                                                                   string                 `json:"controller"`
@@ -740,12 +637,6 @@ type VerificationMethod struct {
 }
 
 // A reference to an external document.
-//
-// A reference using the 'ref' field.
-//
-// A URL pointing at the reference.
-//
-// A URI pointing at the reference.
 type Reference struct {
 	Ref *Ref    `json:"ref,omitempty"`
 	URL *string `json:"url,omitempty"`
@@ -776,8 +667,6 @@ type RequirementResult struct {
 	Status                                                                                  ResultStatus `json:"status"`
 }
 
-// The explicit location of the requirement within the source code.
-//
 // The explicit location of a requirement within source code.
 type SourceLocation struct {
 	// The line on which this requirement is located.                  
@@ -786,9 +675,9 @@ type SourceLocation struct {
 	Ref                                                       *string  `json:"ref,omitempty"`
 }
 
-// An intentional change to a requirement's compliance status and/or impact score. At least
-// one of status or impact must be set. Overrides change the effectiveStatus or impact of
-// the requirement. All overrides must have an expiration date to enforce periodic review.
+// An intentional change to a requirement's compliance status and/or impact score. At least one of
+// status or impact must be set. Overrides change the effectiveStatus or impact of the requirement.
+// All overrides must have an expiration date to enforce periodic review.
 type StatusOverride struct {
 	// Timestamp when this override was applied. ISO 8601 format.                                               
 	AppliedAt                                                                                   time.Time       `json:"appliedAt"`
@@ -830,11 +719,8 @@ type StatusOverride struct {
 	Type                                                                                        OverrideType    `json:"type"`
 }
 
-// Override to the requirement's impact score. At least one of status or impact must be
-// set.
-//
-// An override to the requirement's impact score. The prior impact is the original result
-// value or the preceding override in the chain.
+// An override to the requirement's impact score. The prior impact is the original result value or
+// the preceding override in the chain.
 type ImpactOverride struct {
 	// The overridden impact score (0.0–1.0).        
 	Value                                    float64 `json:"value"`
@@ -852,36 +738,16 @@ type SupportedPlatform struct {
 	Release                                                                 *string `json:"release,omitempty"`
 }
 
-// A system component. Uses discriminated union pattern with 'type' field as discriminator.
-// Superset of Target with identity, external IDs, and SBOM support.
-//
-// A physical or virtual server, workstation, or network device.
-//
-// Base properties shared by all component types. Extends the Target concept with stable
-// identity, external references, and SBOM embedding.
-//
-// A static container image (not running).
-//
-// A running container instance.
-//
-// A container orchestration platform (Kubernetes, OpenShift, ECS, etc.).
-//
-// A cloud provider account (AWS account, Azure subscription, GCP project).
-//
-// A specific cloud resource (EC2 instance, S3 bucket, Azure VM, etc.).
-//
-// A code repository (for SAST tools).
-//
-// A running application or API (for DAST tools).
-//
-// A software artifact or dependency (for SCA tools).
-//
-// A network segment or network device.
-//
-// A database instance.
+// A system component. Uses discriminated union pattern with 'type' field as discriminator. Superset
+// of Target with identity, external IDs, and SBOM support.
 type Component struct {
 	// Names of baselines that apply to this component.                                                           
 	BaselineRefs                                                                                []string          `json:"baselineRefs,omitempty"`
+	// 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.                                                             
+	Boms                                                                                        []BillOfMaterials `json:"boms,omitempty"`
 	// Stable UUID (RFC 4122) for this component. Required in hdf-system documents, optional in                   
 	// hdf-results. Enables cross-document correlation, diffing, and data flow references.                        
 	ComponentID                                                                                 *string           `json:"componentId,omitempty"`
@@ -893,6 +759,13 @@ type Component struct {
 	ExternalIDS                                                                                 map[string]string `json:"externalIds,omitempty"`
 	// System-specific overrides for baseline input values.                                                       
 	InputOverrides                                                                              []InputOverride   `json:"inputOverrides,omitempty"`
+	// 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.                                                      
+	Integrity                                                                                   []Checksum        `json:"integrity,omitempty"`
 	// Optional key-value labels for flexible grouping. Well-known keys: system, component,                       
 	// environment, region, team. Values must be strings.                                                         
 	Labels                                                                                      map[string]string `json:"labels,omitempty"`
@@ -901,21 +774,27 @@ type Component struct {
 	// Team or individual responsible for this component. Enables per-component ownership when                    
 	// different teams manage different parts of a system.                                                        
 	Owner                                                                                       *Identity         `json:"owner,omitempty"`
-	// Embedded CycloneDX or SPDX SBOM document representing this component's software                            
-	// inventory. The sbomFormat field determines which format constraints apply.                                 
-	Sbom                                                                                        interface{}       `json:"sbom,omitempty"`
-	// Format of the SBOM (embedded or referenced). Required when sbom or sbomRef is present.                     
-	SbomFormat                                                                                  *SBOMFormat       `json:"sbomFormat,omitempty"`
-	// URI reference to an external CycloneDX or SPDX SBOM document for this component. May be a                  
-	// relative path, absolute URI, or fragment identifier.                                                       
-	SbomRef                                                                                     *string           `json:"sbomRef,omitempty"`
 	// Label selector to match targets belonging to this component during migration. Targets                      
 	// with matching labels are automatically included.                                                           
 	TargetSelector                                                                              map[string]string `json:"targetSelector,omitempty"`
-	// Component type discriminator. Same values as Target types.                                                 
+	// 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).                           
 	Type                                                                                        TargetType        `json:"type"`
-	// Fully qualified domain name.                                                                               
+	// 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.                                                           
+	Domain                                                                                      *string           `json:"domain,omitempty"`
+	// 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.                                
 	FQDN                                                                                        *string           `json:"fqdn,omitempty"`
+	// 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.                                                        
+	Hostname                                                                                    *string           `json:"hostname,omitempty"`
 	// IP address of the host.                                                                                    
 	IPAddress                                                                                   *string           `json:"ipAddress,omitempty"`
 	// MAC address in colon-separated hexadecimal format.                                                         
@@ -924,8 +803,6 @@ type Component struct {
 	OSName                                                                                      *string           `json:"osName,omitempty"`
 	// Operating system version.                                                                                  
 	OSVersion                                                                                   *string           `json:"osVersion,omitempty"`
-	// Image digest for immutable reference.                                                                      
-	Digest                                                                                      *string           `json:"digest,omitempty"`
 	// Container image ID.                                                                                        
 	ImageID                                                                                     *string           `json:"imageId,omitempty"`
 	// Container registry. Example: 'docker.io'.                                                                  
@@ -953,6 +830,11 @@ type Component struct {
 	// Package version.                                                                                           
 	//                                                                                                            
 	// Database version.                                                                                          
+	//                                                                                                            
+	// Model version, revision, or checkpoint tag.                                                                
+	//                                                                                                            
+	// Dataset version, release identifier, or — for highly dynamic datasets — a timestamped                      
+	// release marker.                                                                                            
 	Version                                                                                     *string           `json:"version,omitempty"`
 	// Cloud account identifier.                                                                                  
 	AccountID                                                                                   *string           `json:"accountId,omitempty"`
@@ -978,8 +860,6 @@ type Component struct {
 	URL                                                                                         *string           `json:"url,omitempty"`
 	// Environment. Example: 'production', 'staging', 'development'.                                              
 	Environment                                                                                 *string           `json:"environment,omitempty"`
-	// Package checksum for verification.                                                                         
-	Checksum                                                                                    *string           `json:"checksum,omitempty"`
 	// Package manager. Example: 'npm', 'maven', 'pip', 'nuget'.                                                  
 	PackageManager                                                                              *string           `json:"packageManager,omitempty"`
 	// Package name.                                                                                              
@@ -994,10 +874,190 @@ type Component struct {
 	Host                                                                                        *string           `json:"host,omitempty"`
 	// Database port.                                                                                             
 	Port                                                                                        *int64            `json:"port,omitempty"`
-}
-
-// An override of a baseline input value for a specific component. Enables system-specific
-// tailoring of baseline parameters.
+	// 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.                                                        
+	ModelID                                                                                     *string           `json:"modelId,omitempty"`
+	// 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.                                            
+	DatasetID                                                                                   *string           `json:"datasetId,omitempty"`
+}
+
+type BillOfMaterials struct {
+	// The manifest kind. Determines which normalized type-extension (model/dataset/packages)                         
+	// may appear.                                                                                                    
+	BOMType                                                                                    string                 `json:"bomType"`
+	// Normalized dataset extension. Permitted only when bomType is dataset.                                          
+	Dataset                                                                                    *DatasetBOMExtension   `json:"dataset,omitempty"`
+	// 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.                                                                                            
+	Document                                                                                   map[string]interface{} `json:"document,omitempty"`
+	// 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.                                                
+	Format                                                                                     string                 `json:"format"`
+	// 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.                                                                                                
+	Hashes                                                                                     []Checksum             `json:"hashes,omitempty"`
+	// 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.                                                                          
+	License                                                                                    *string                `json:"license,omitempty"`
+	// Normalized ai-model extension. Permitted only when bomType is ai-model.                                        
+	Model                                                                                      *AIModelBOMExtension   `json:"model,omitempty"`
+	// Normalized sbom extension: the flattened software package inventory. Permitted only when                       
+	// bomType is sbom.                                                                                               
+	Packages                                                                                   []SBOMPackage          `json:"packages,omitempty"`
+	// Passthrough by reference: URI (relative path, absolute URI, or fragment) to the native                         
+	// manifest document. Present for externally-hosted BOMs.                                                         
+	Ref                                                                                        *string                `json:"ref,omitempty"`
+	// Optional stable identifier for this BOM document (e.g. CycloneDX serialNumber, SPDX                            
+	// documentNamespace). Correlates the same BOM across evidence packages.                                          
+	UniqueID                                                                                   *string                `json:"uniqueId,omitempty"`
+}
+
+// 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.
+type DatasetBOMExtension struct {
+	// 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.                                        
+	BaseDatasetRefs                                                                             []string               `json:"baseDatasetRefs,omitempty"`
+	// Sensitivity/classification of the data. Examples: public, internal, confidential, pii,                          
+	// phi.                                                                                                            
+	DataClassification                                                                          *string                `json:"dataClassification,omitempty"`
+	// Physical format of the dataset. Examples: parquet, csv, jsonl, tfrecord, webdataset.                            
+	DatasetFormat                                                                               *string                `json:"datasetFormat,omitempty"`
+	// 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).                             
+	Derivation                                                                                  *DatasetDerivationType `json:"derivation,omitempty"`
+	// Free-text statement of the dataset's intended use (CISA/G7 minimum element).                                    
+	IntendedUse                                                                                 *string                `json:"intendedUse,omitempty"`
+	// 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.                                                                    
+	Modality                                                                                    *Modality              `json:"modality,omitempty"`
+	// Free-text description of the dataset's origin and collection process (CISA/G7 'Dataset                          
+	// provenance'; SPDX 3.0 dataset_dataCollectionProcess).                                                           
+	Provenance                                                                                  *string                `json:"provenance,omitempty"`
+	// Number of records/examples in the dataset.                                                                      
+	RecordCount                                                                                 *int64                 `json:"recordCount,omitempty"`
+	// 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).                                           
+	StatisticalProperties                                                                       *string                `json:"statisticalProperties,omitempty"`
+}
+
+// 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.
+type AIModelBOMExtension struct {
+	// Lineage relationship to baseModelRef, adopting Hugging Face's base_model_relation                             
+	// vocabulary (the only typed lineage enum in the ecosystem).                                                    
+	AdaptationType                                                                              *ModelAdaptationType `json:"adaptationType,omitempty"`
+	// 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.                     
+	BaseModelRef                                                                                *string              `json:"baseModelRef,omitempty"`
+	// 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.                                                                                             
+	DatasetRefs                                                                                 []string             `json:"datasetRefs,omitempty"`
+	// 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.                                                                                            
+	Hyperparameters                                                                             []Hyperparameter     `json:"hyperparameters,omitempty"`
+	// 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.                                  
+	InputOutput                                                                                 *InputOutput         `json:"inputOutput,omitempty"`
+	// Free-text statement of intended use and out-of-scope uses (CISA/G7 minimum element).                          
+	IntendedUse                                                                                 *string              `json:"intendedUse,omitempty"`
+	// 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.                                                        
+	LearningApproach                                                                            *string              `json:"learningApproach,omitempty"`
+	// Model architecture family. Examples: transformer, cnn, diffusion, mixture-of-experts.                         
+	ModelArchitecture                                                                           *string              `json:"modelArchitecture,omitempty"`
+	// Total trainable parameter count. No native CycloneDX/SPDX field exists; first-class here                      
+	// because the EU AI Act keys GPAI obligations off model scale.                                                  
+	ParameterCount                                                                              *int64               `json:"parameterCount,omitempty"`
+	// 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.                                                                                          
+	PerformanceMetrics                                                                          []PerformanceMetric  `json:"performanceMetrics,omitempty"`
+	// 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.                                                                 
+	SerializationFormat                                                                         *string              `json:"serializationFormat,omitempty"`
+	// 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.                                                                                         
+	Task                                                                                        *string              `json:"task,omitempty"`
+}
+
+type Hyperparameter struct {
+	// Hyper-parameter name. Examples: epochs, learning-rate, batch-size.        
+	Name                                                                 *string `json:"name,omitempty"`
+	// Hyper-parameter value (free-text).                                        
+	Value                                                                *string `json:"value,omitempty"`
+}
+
+// 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.
+type InputOutput struct {
+	// Maximum context/sequence length the model accepts, in tokens.                                   
+	ContextLength                                                                            *int64    `json:"contextLength,omitempty"`
+	// Input/output data types. Examples: string, byte[], float32, image.                              
+	DataTypes                                                                                []string  `json:"dataTypes,omitempty"`
+	// Input/output modalities. String or array of strings. Examples: text, image, audio.              
+	// Symmetric with Dataset_Extension.modality.                                                      
+	Modality                                                                                 *Modality `json:"modality,omitempty"`
+	// Tokenizer used for the model's input encoding. Examples: BPE, SentencePiece, tiktoken.          
+	Tokenizer                                                                                *string   `json:"tokenizer,omitempty"`
+}
+
+type PerformanceMetric struct {
+	// Metric name. Examples: accuracy, f1, BLEU, latency.                                             
+	Name                                                                                       *string `json:"name,omitempty"`
+	// Reported metric value, free-text because metrics are heterogeneous (percentages, scores,        
+	// milliseconds).                                                                                  
+	Value                                                                                      *string `json:"value,omitempty"`
+}
+
+// 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).
+type SBOMPackage struct {
+	// SPDX license identifiers/expressions for this package.                          
+	Licenses                                                                  []string `json:"licenses,omitempty"`
+	// Package name.                                                                   
+	Name                                                                      string   `json:"name"`
+	// Package URL (purl) — the preferred cross-BOM identity key when present.         
+	Purl                                                                      *string  `json:"purl,omitempty"`
+	// Package version.                                                                
+	Version                                                                   *string  `json:"version,omitempty"`
+}
+
+// An override of a baseline input value for a specific component. Enables system-specific tailoring
+// of baseline parameters.
 type InputOverride struct {
 	// Identity of the person or system that approved this override.                                       
 	ApprovedBy                                                                                 *Identity   `json:"approvedBy,omitempty"`
@@ -1012,19 +1072,7 @@ type InputOverride struct {
 	Value                                                                                      interface{} `json:"value"`
 }
 
-// Information about the tool that generated this file.
-//
 // Information about the tool that generated this HDF file.
-//
-// The tool that generated this file.
-//
-// Information about the tool that generated this comparison.
-//
-// Information about the tool that generated this system document.
-//
-// Information about the tool that generated this plan.
-//
-// Information about the tool that generated this document.
 type Generator struct {
 	// The name of the software that produced this HDF file. Example: 'gosec-to-hdf'.       
 	Name                                                                             string `json:"name"`
@@ -1032,15 +1080,9 @@ type Generator struct {
 	Version                                                                          string `json:"version"`
 }
 
-// Optional reference to automated remediation resources (Ansible playbooks, Terraform
-// scripts, etc.) for fixing failing requirements found in this assessment.
-//
-// Reference to automated remediation resources for implementing security controls. Points
-// to external automation content like Ansible playbooks, Terraform scripts, or
-// vendor-provided remediation tools.
-//
-// Optional reference to automated remediation resources (Ansible playbooks, Terraform
-// scripts, etc.) for implementing the security controls defined in this baseline.
+// Reference to automated remediation resources for implementing security controls. Points to
+// external automation content like Ansible playbooks, Terraform scripts, or vendor-provided
+// remediation tools.
 type Remediation struct {
 	// Optional cryptographic checksum for verifying the integrity of remediation resources            
 	// fetched from the URI. Recommended for security when referencing external automation             
@@ -1052,12 +1094,8 @@ type Remediation struct {
 	URI                                                                                      string    `json:"uri"`
 }
 
-// Information about the test execution environment where the security tool was run.
-// Distinct from targets (what is being tested).
-//
-// Information about the test execution environment. This is distinct from the target being
-// scanned - the runner is where the security tool executes, while targets are what is being
-// assessed.
+// Information about the test execution environment. This is distinct from the target being scanned
+// - the runner is where the security tool executes, while targets are what is being assessed.
 type Runner struct {
 	// The CPU architecture of the runner system. Example: 'x86_64', 'arm64', 'aarch64'.                   
 	Architecture                                                                                 *string   `json:"architecture,omitempty"`
@@ -1067,7 +1105,14 @@ type Runner struct {
 	// The container image used for the test execution. Example: 'inspec/inspec:latest',                   
 	// 'ghcr.io/my-org/scanner:v2.1.0'. Useful for CI/CD pipelines where tests run in containers.          
 	ContainerImage                                                                               *string   `json:"containerImage,omitempty"`
-	// The hostname of the runner system. Example: 'ci-runner-01', 'jenkins-agent-03',                     
+	// The directory domain the runner system belongs to (Active Directory / NetBIOS / LDAP),              
+	// NOT the DNS suffix of the FQDN. Example: 'CORP'.                                                    
+	Domain                                                                                       *string   `json:"domain,omitempty"`
+	// 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'.                                  
+	FQDN                                                                                         *string   `json:"fqdn,omitempty"`
+	// The short hostname of the runner system. Example: 'ci-runner-01', 'jenkins-agent-03',               
 	// 'k8s-node-worker-03'.                                                                               
 	Hostname                                                                                     *string   `json:"hostname,omitempty"`
 	// The name of the runner environment. Examples: 'ubuntu', 'macos', 'windows', 'docker',               
@@ -1081,8 +1126,6 @@ type Runner struct {
 	Release                                                                                      *string   `json:"release,omitempty"`
 }
 
-// Statistics for the assessment run, including duration and result counts.
-//
 // Statistics for the assessment run(s) such as duration and result counts.
 type Statistics struct {
 	// How long (in seconds) this assessment run took.                      
@@ -1091,8 +1134,6 @@ type Statistics struct {
 	Requirements                                             *StatisticHash `json:"requirements,omitempty"`
 }
 
-// Breakdowns of requirement statistics by result status.
-//
 // Statistics for requirement results, grouped by status.
 type StatisticHash struct {
 	// Statistics for requirements that encountered an error during assessment.                   
@@ -1107,28 +1148,14 @@ type StatisticHash struct {
 	Passed                                                                        *StatisticBlock `json:"passed,omitempty"`
 }
 
-// Statistics for requirements that encountered an error during assessment.
-//
 // Statistics for a given item, such as the total count.
-//
-// Statistics for requirements that failed.
-//
-// Statistics for requirements that are not applicable to the target.
-//
-// Statistics for requirements that were not reviewed (manual check required).
-//
-// Statistics for requirements that passed.
 type StatisticBlock struct {
 	// The total count. Example: the total number of requirements in a given category for a run.      
 	Total                                                                                       int64 `json:"total"`
 }
 
-// The security tool that produced the assessment data in this file.
-//
-// The security tool that produced the assessment data represented in this HDF file. Aligns
-// with SARIF, OSCAL, and CycloneDX terminology.
-//
-// The security tool that produced the assessment data in this source.
+// The security tool that produced the assessment data represented in this HDF file. Aligns with
+// SARIF, OSCAL, and CycloneDX terminology.
 type Tool struct {
 	// 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        
@@ -1141,11 +1168,8 @@ type Tool struct {
 	Version                                                                                    *string `json:"version,omitempty"`
 }
 
-// Information on the set of requirements that can be assessed, including baseline metadata
-// and requirement definitions.
-//
-// Shared metadata fields for baselines. Used in both standalone baseline documents and
-// evaluated baseline results.
+// Information on the set of requirements that can be assessed, including baseline metadata and
+// requirement definitions.
 type HDFBaseline struct {
 	// The set of dependencies this baseline depends on.                                                           
 	Depends                                                                                  []Dependency          `json:"depends,omitempty"`
@@ -1189,9 +1213,6 @@ type HDFBaseline struct {
 }
 
 // A requirement definition without assessment results.
-//
-// Core requirement fields shared between baseline requirements and evaluated requirements.
-// Contains the fundamental requirement definition without assessment results.
 type BaselineRequirement struct {
 	// Array of labeled descriptions. At least one description with label 'default' must be                             
 	// present. Convention: place default description first. Common labels: 'default', 'check',                         
@@ -1240,42 +1261,47 @@ type BaselineRequirement struct {
 	VerificationMethod                                                                          *VerificationMethodEnum `json:"verificationMethod,omitempty"`
 }
 
-// Structured comparison between two or more HDF security assessment documents. Supports
-// temporal, baseline, fleet, and multi-source comparison modes.
+// Structured comparison between two or more HDF security assessment documents. Supports temporal,
+// baseline, fleet, and multi-source comparison modes.
 type HDFComparison struct {
-	// Map of annotation IDs to annotation objects, providing context or action items for                            
-	// requirement diffs.                                                                                            
-	Annotations                                                                               map[string]Annotation  `json:"annotations,omitempty"`
-	// Comparison of baselines between sources.                                                                      
-	BaselineDiffs                                                                             []BaselineDiff         `json:"baselineDiffs,omitempty"`
-	// The mode of comparison being performed.                                                                       
-	ComparisonMode                                                                            ComparisonMode         `json:"comparisonMode"`
-	// Comparison of components between two system documents. Used in systemDrift mode.                              
-	ComponentDiffs                                                                            []ComponentDiff        `json:"componentDiffs,omitempty"`
-	// External/metadata changes separate from status changes (Terraform pattern).                                   
-	Drift                                                                                     []RequirementDiff      `json:"drift,omitempty"`
-	// Reserved for tool-specific data not defined in the HDF standard.                                              
-	Extensions                                                                                map[string]interface{} `json:"extensions,omitempty"`
-	// Schema version for this comparison format.                                                                    
-	FormatVersion                                                                             FormatVersion          `json:"formatVersion"`
-	// Information about the tool that generated this comparison.                                                    
-	Generator                                                                                 *Generator             `json:"generator,omitempty"`
-	// Cryptographic integrity information for verifying this comparison document.                                   
-	Integrity                                                                                 *Integrity             `json:"integrity,omitempty"`
-	// Configuration for how requirements were matched across sources.                                               
-	Matching                                                                                  *MatchingConfig        `json:"matching,omitempty"`
-	// Comparison of packages between two SBOMs. Used in systemDrift mode for SBOM comparison.                       
-	PackageDiffs                                                                              []PackageDiff          `json:"packageDiffs,omitempty"`
-	// Detailed comparison of individual requirements between sources.                                               
-	RequirementDiffs                                                                          []RequirementDiff      `json:"requirementDiffs"`
-	// The source documents being compared. At least two sources are required.                                       
-	Sources                                                                                   []Source               `json:"sources"`
-	// Summary statistics for the overall comparison.                                                                
-	Summary                                                                                   ComparisonSummary      `json:"summary"`
-	// URI identifying the system being compared in systemDrift mode.                                                
-	SystemRef                                                                                 *string                `json:"systemRef,omitempty"`
-	// When this comparison was performed.                                                                           
-	Timestamp                                                                                 *time.Time             `json:"timestamp,omitempty"`
+	// Map of annotation IDs to annotation objects, providing context or action items for                              
+	// requirement diffs.                                                                                              
+	Annotations                                                                                 map[string]Annotation  `json:"annotations,omitempty"`
+	// Comparison of baselines between sources.                                                                        
+	BaselineDiffs                                                                               []BaselineDiff         `json:"baselineDiffs,omitempty"`
+	// The mode of comparison being performed.                                                                         
+	ComparisonMode                                                                              ComparisonMode         `json:"comparisonMode"`
+	// Comparison of components between two system documents. Used in systemDrift mode. A                              
+	// component's BOM changes surface as a field change on its boms[] here.                                           
+	ComponentDiffs                                                                              []ComponentDiff        `json:"componentDiffs,omitempty"`
+	// External/metadata changes separate from status changes (Terraform pattern).                                     
+	Drift                                                                                       []RequirementDiff      `json:"drift,omitempty"`
+	// Reserved for tool-specific data not defined in the HDF standard.                                                
+	Extensions                                                                                  map[string]interface{} `json:"extensions,omitempty"`
+	// Schema version for this comparison format.                                                                      
+	FormatVersion                                                                               FormatVersion          `json:"formatVersion"`
+	// Information about the tool that generated this comparison.                                                      
+	Generator                                                                                   *Generator             `json:"generator,omitempty"`
+	// Cryptographic integrity information for verifying this comparison document.                                     
+	Integrity                                                                                   *Integrity             `json:"integrity,omitempty"`
+	// Configuration for how requirements were matched across sources.                                                 
+	Matching                                                                                    *MatchingConfig        `json:"matching,omitempty"`
+	// RESERVED — not emitted by the current systemDrift comparison. systemDrift now reports a                         
+	// component's BOM changes as a field change on its boms[] (see componentDiffs), and                               
+	// standalone SBOM package diffing is a separate `hdf diff <sbom> <sbom>` output shape. This                       
+	// field is retained for a future normalized package-level diff; consumers must not expect                         
+	// it from today's systemDrift output.                                                                             
+	PackageDiffs                                                                                []PackageDiff          `json:"packageDiffs,omitempty"`
+	// Detailed comparison of individual requirements between sources.                                                 
+	RequirementDiffs                                                                            []RequirementDiff      `json:"requirementDiffs"`
+	// The source documents being compared. At least two sources are required.                                         
+	Sources                                                                                     []Source               `json:"sources"`
+	// Summary statistics for the overall comparison.                                                                  
+	Summary                                                                                     ComparisonSummary      `json:"summary"`
+	// URI identifying the system being compared in systemDrift mode.                                                  
+	SystemRef                                                                                   *string                `json:"systemRef,omitempty"`
+	// When this comparison was performed.                                                                             
+	Timestamp                                                                                   *time.Time             `json:"timestamp,omitempty"`
 }
 
 // An annotation attached to a comparison, providing context or action items.
@@ -1399,8 +1425,6 @@ type Value struct {
 	Value                                                          interface{} `json:"value"`
 }
 
-// Configuration for how requirements were matched across sources.
-//
 // Configuration for how requirements are matched across sources.
 type MatchingConfig struct {
 	// Ordered list of fallback strategies tried when the primary strategy fails to find a match.                
@@ -1415,21 +1439,28 @@ type MatchingConfig struct {
 	PrimaryStrategy                                                                              MatchStrategy   `json:"primaryStrategy"`
 }
 
-// Comparison of a single package between two SBOM versions, matched by purl.
+// Comparison of a single BOM node between two BOM versions, matched by purl (software) or
+// identifier (models, datasets, hardware, crypto).
 type PackageDiff struct {
-	// License identifiers for this package.                                                               
-	Licenses                                                                              []string         `json:"licenses,omitempty"`
-	// Human-readable package name.                                                                        
-	Name                                                                                  *string          `json:"name,omitempty"`
-	// Package version in the new SBOM.                                                                    
-	NewVersion                                                                            *string          `json:"newVersion,omitempty"`
-	// Package version in the old SBOM.                                                                    
-	OldVersion                                                                            *string          `json:"oldVersion,omitempty"`
-	// Package URL (purl) used as the identity key for matching across SBOMs.                              
-	Purl                                                                                  string           `json:"purl"`
-	// The state of this package: added (new in new SBOM), removed (absent from new SBOM),                 
-	// updated (version changed), unchanged.                                                               
-	State                                                                                 PackageDiffState `json:"state"`
+	// Generic identity key for matching a BOM node across versions when no purl applies — e.g.                 
+	// a Hugging Face model ref, dataset uniqueId, crypto algorithm OID, or hardware part                       
+	// number. At least one of purl or identifier is required.                                                  
+	Identifier                                                                                 *string          `json:"identifier,omitempty"`
+	// License identifiers for this package.                                                                    
+	Licenses                                                                                   []string         `json:"licenses,omitempty"`
+	// Human-readable node name.                                                                                
+	Name                                                                                       *string          `json:"name,omitempty"`
+	// Package version in the new SBOM.                                                                         
+	NewVersion                                                                                 *string          `json:"newVersion,omitempty"`
+	// Package version in the old SBOM.                                                                         
+	OldVersion                                                                                 *string          `json:"oldVersion,omitempty"`
+	// Package URL (purl) — the preferred identity key for matching software packages across                    
+	// BOMs. Optional: BOM nodes without a purl (AI models, datasets, hardware parts, crypto                    
+	// algorithms) key on identifier instead.                                                                   
+	Purl                                                                                       *string          `json:"purl,omitempty"`
+	// The state of this package: added (new in new SBOM), removed (absent from new SBOM),                      
+	// updated (version changed), unchanged.                                                                    
+	State                                                                                      PackageDiffState `json:"state"`
 }
 
 // A source document participating in the comparison.
@@ -1500,8 +1531,6 @@ type ComparisonSummary struct {
 	Updated                                                                       *int64             `json:"updated,omitempty"`
 }
 
-// State counts broken down by severity level.
-//
 // Breakdown of state counts by severity level.
 type SeverityBreakdown struct {
 	// State counts for critical severity requirements.             
@@ -1514,15 +1543,7 @@ type SeverityBreakdown struct {
 	Medium                                             *StateCounts `json:"medium,omitempty"`
 }
 
-// State counts for critical severity requirements.
-//
 // Counts of requirements in each state.
-//
-// State counts for high severity requirements.
-//
-// State counts for low severity requirements.
-//
-// State counts for medium severity requirements.
 type StateCounts struct {
 	// Number of requirements present only in the old source.                     
 	Absent                                                                 *int64 `json:"absent,omitempty"`
@@ -1562,20 +1583,26 @@ type PerSourceSummary struct {
 	Updated                                                                                 *int64 `json:"updated,omitempty"`
 }
 
-// Describes a system's authorization boundary, components, and interconnections. Maps to
-// OSCAL SSP system-characteristics and FedRAMP system inventory.
+// Describes a system's authorization boundary, components, and interconnections. Maps to OSCAL SSP
+// system-characteristics and FedRAMP system inventory.
 type HDFSystem struct {
 	// Date the current authorization status was granted. ISO 8601 format.                                           
 	AuthorizationDate                                                                           *time.Time           `json:"authorizationDate,omitempty"`
 	// Current Authorization to Operate (ATO) status.                                                                
 	AuthorizationStatus                                                                         *AuthorizationStatus `json:"authorizationStatus,omitempty"`
+	// System-scoped Bills of Materials whose subject is the authorization boundary rather than                      
+	// a single component (e.g. a SaaSBOM of services, a KBOM of cluster inventory, an OBOM).                        
+	// Component-scoped BOMs (SBOM, ai-model) attach on the component instead. See                                   
+	// primitives/bom.schema.json.                                                                                   
+	Boms                                                                                        []BillOfMaterials    `json:"boms,omitempty"`
 	// Description of the system's authorization boundary. Example: network CIDR blocks, cloud                       
 	// VPC IDs, physical locations.                                                                                  
 	BoundaryDescription                                                                         *string              `json:"boundaryDescription,omitempty"`
 	// FIPS 199 security categorization (impact level).                                                              
 	CategorizationLevel                                                                         *CategorizationLevel `json:"categorizationLevel,omitempty"`
 	// System components within the authorization boundary. Uses the full polymorphic Component                      
-	// type with stable identity (componentId), external references, and SBOM support.                               
+	// type with stable identity (componentId), external references, and generalized BOM                             
+	// attachment (boms[]).                                                                                          
 	Components                                                                                  []Component          `json:"components"`
 	// Declares which controls are common, hybrid, or system-specific, and which component                           
 	// provides them. Maps to NIST SP 800-53 control designations and OSCAL                                          
@@ -1611,10 +1638,10 @@ type HDFSystem struct {
 	Version                                                                                     *string              `json:"version,omitempty"`
 }
 
-// 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.
+// 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.
 type ControlDesignation struct {
 	// The control identifier (e.g., 'SC-7', 'AC-2 (1)'). Must match a NIST tag in a baseline               
 	// requirement's tags.                                                                                  
@@ -1637,9 +1664,9 @@ type ControlDesignation struct {
 	SystemRef                                                                                   *string     `json:"systemRef,omitempty"`
 }
 
-// A data flow between two endpoints. The 'from' endpoint is always a local component; the
-// 'to' endpoint can be local, cross-system, or external. Use 'direction' to indicate
-// whether data flows one-way or both ways.
+// A data flow between two endpoints. The 'from' endpoint is always a local component; the 'to'
+// endpoint can be local, cross-system, or external. Use 'direction' to indicate whether data flows
+// one-way or both ways.
 type DataFlow struct {
 	// Authentication mechanism used for this connection. Examples: 'mTLS', 'OAuth2', 'API key',            
 	// 'SAML', 'Kerberos'.                                                                                  
@@ -1662,8 +1689,8 @@ type DataFlow struct {
 	To                                                                                          interface{} `json:"to"`
 }
 
-// Defines an assessment plan — what baselines to run against which targets, with resolved
-// inputs and scheduling. Maps to OSCAL Assessment Plan.
+// Defines an assessment plan — what baselines to run against which targets, with resolved inputs
+// and scheduling. Maps to OSCAL Assessment Plan.
 type HDFPlan struct {
 	// The assessments to perform. Each assessment pairs a baseline with targets and resolved                     
 	// inputs.                                                                                                    
@@ -1692,8 +1719,8 @@ type HDFPlan struct {
 	Version                                                                                     *string           `json:"version,omitempty"`
 }
 
-// A single assessment within a plan — defines which baseline to run against which targets
-// with what configuration.
+// A single assessment within a plan — defines which baseline to run against which targets with what
+// configuration.
 type Assessment struct {
 	// 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                       
@@ -1714,8 +1741,6 @@ type Assessment struct {
 	TargetSelector                                                                           map[string]string      `json:"targetSelector,omitempty"`
 }
 
-// Runner/scanner configuration for this assessment.
-//
 // Configuration for the assessment runner/scanner.
 type RunnerConfig struct {
 	// Name of the assessment runner. Example: 'cinc-auditor', 'inspec', 'openscap'.        
@@ -1724,8 +1749,6 @@ type RunnerConfig struct {
 	Version                                                                         *string `json:"version,omitempty"`
 }
 
-// Optional scheduling configuration for recurring assessments.
-//
 // Scheduling configuration for recurring assessments.
 type Schedule struct {
 	// Cron expression for recurring assessments. Example: '0 2 1 * *' (2 AM on the 1st of each           
@@ -1741,8 +1764,8 @@ type Schedule struct {
 	StartDate                                                                                  *time.Time `json:"startDate,omitempty"`
 }
 
-// Waivers, attestations, and POA&Ms that modify requirement compliance status or impact.
-// Amendments are standalone documents that can be applied to results via merge operations.
+// Waivers, attestations, and POA&Ms that modify requirement compliance status or impact. Amendments
+// are standalone documents that can be applied to results via merge operations.
 type HDFAmendments struct {
 	// Unique identifier for this amendments document. Useful for cross-referencing when                           
 	// multiple amendment documents target the same results.                                                       
@@ -1773,18 +1796,18 @@ type HDFAmendments struct {
 	Version                                                                                   *string              `json:"version,omitempty"`
 }
 
-// A standalone override to a requirement's compliance status or risk impact. Validation has
-// two branches gated on 'type': when type is 'operationalRequirement', neither 'status' nor
-// 'impact' may be set — the override records accepted risk without changing the finding
-// (documentation-only). For all other types, at least one of 'status' or 'impact' must be
-// set. This rule aligns with: (1) OSCAL Assessment Results — finding.target.status and
+// A standalone override to a requirement's compliance status or risk impact. Validation has two
+// branches gated on 'type': when type is 'operationalRequirement', neither 'status' nor 'impact'
+// may be set — the override records accepted risk without changing the finding
+// (documentation-only). For all other types, at least one of 'status' or 'impact' must be set. This
+// rule aligns with: (1) OSCAL Assessment Results — finding.target.status and
 // finding.associated-risk[].facet[] are separate axes
-// (https://pages.nist.gov/OSCAL/learn/concepts/layer/assessment/assessment-results/); (2)
-// FedRAMP deviation request types — Risk Adjustment changes impact only, Operational
-// Requirement documents acceptance only, False Positive changes status
-// (https://www.ignyteplatform.com/blog/fedramp/fedramp-deviation-requests-submit/); (3)
-// NIST SP 800-37 RMF — risk response (accept/mitigate/transfer) is a separate step from
-// control assessment status (https://csrc.nist.gov/pubs/sp/800/37/r2/final).
+// (https://pages.nist.gov/OSCAL/learn/concepts/layer/assessment/assessment-results/); (2) FedRAMP
+// deviation request types — Risk Adjustment changes impact only, Operational Requirement documents
+// acceptance only, False Positive changes status
+// (https://www.ignyteplatform.com/blog/fedramp/fedramp-deviation-requests-submit/); (3) NIST SP
+// 800-37 RMF — risk response (accept/mitigate/transfer) is a separate step from control assessment
+// status (https://csrc.nist.gov/pubs/sp/800/37/r2/final).
 type StandaloneOverride struct {
 	// 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                     
@@ -1843,49 +1866,51 @@ type StandaloneOverride struct {
 	Type                                                                                        OverrideType      `json:"type"`
 }
 
-// Bundles references to all HDF documents for audit, authorization, and compliance review.
-// Each content entry references a document by type, URI, and checksum for integrity
-// verification.
+// Bundles references to all HDF documents for audit, authorization, and compliance review. Each
+// content entry references a document by type, URI, and checksum for integrity verification.
 type HDFEvidencePackage struct {
-	// Summary of assessment completeness and compliance status.                                                   
-	CompletenessCheck                                                                           *CompletenessCheck `json:"completenessCheck,omitempty"`
-	// References to HDF documents included in this evidence package.                                              
-	Contents                                                                                    []ContentReference `json:"contents"`
-	// Description of the evidence package's purpose and scope.                                                    
-	Description                                                                                 *string            `json:"description,omitempty"`
-	// Information about the tool that generated this document.                                                    
-	Generator                                                                                   *Generator         `json:"generator,omitempty"`
-	// Cryptographic integrity information for verifying this evidence package has not been                        
-	// tampered with.                                                                                              
-	Integrity                                                                                   *Integrity         `json:"integrity,omitempty"`
-	// Optional key-value labels for grouping and querying evidence packages.                                      
-	Labels                                                                                      map[string]string  `json:"labels,omitempty"`
-	// Human-readable name for this evidence package. Example: 'Enterprise Portal ATO Evidence -                   
-	// Q1 2026'.                                                                                                   
-	Name                                                                                        string             `json:"name"`
-	// Unique identifier for this evidence package. Optional in casual use, expected in                            
-	// production ATO submissions. Auto-generated if omitted during creation.                                      
-	PackageID                                                                                   *string            `json:"packageId,omitempty"`
-	// URI to the hdf-plan document that drove this assessment. Used for completeness                              
-	// verification — every baseline in the plan should have a corresponding results document in                   
-	// this package.                                                                                               
-	PlanRef                                                                                     *string            `json:"planRef,omitempty"`
-	// When this evidence package was prepared. ISO 8601 format.                                                   
-	PreparedAt                                                                                  *time.Time         `json:"preparedAt,omitempty"`
-	// Identity of who prepared this evidence package.                                                             
-	PreparedBy                                                                                  *Identity          `json:"preparedBy,omitempty"`
-	// Digital signature covering the entire evidence package.                                                     
-	Signature                                                                                   *Signature         `json:"signature,omitempty"`
-	// URI to the hdf-system document this evidence package covers.                                                
-	SystemRef                                                                                   *string            `json:"systemRef,omitempty"`
-	// Version of this evidence package.                                                                           
-	Version                                                                                     *string            `json:"version,omitempty"`
-}
-
-// Summary of assessment completeness and compliance status.
-//
-// Informational summary of assessment completeness. Not authoritative — tools should
-// compute these from the referenced documents.
+	// Summary of assessment completeness and compliance status.                                                            
+	CompletenessCheck                                                                           *CompletenessCheck          `json:"completenessCheck,omitempty"`
+	// References to HDF documents included in this evidence package.                                                       
+	Contents                                                                                    []ContentReference          `json:"contents"`
+	// Description of the evidence package's purpose and scope.                                                             
+	Description                                                                                 *string                     `json:"description,omitempty"`
+	// References to external native-format evidence (log/telemetry corpora and other artifacts)                            
+	// carried by URI + integrity hash + format discriminator, without recreating the data                                  
+	// inside HDF. Logs in ECS/OCSF/etc. are legitimate accreditation evidence; HDF indexes them                            
+	// here rather than transcoding them.                                                                                   
+	ExternalEvidence                                                                            []ExternalEvidenceReference `json:"externalEvidence,omitempty"`
+	// Information about the tool that generated this document.                                                             
+	Generator                                                                                   *Generator                  `json:"generator,omitempty"`
+	// Cryptographic integrity information for verifying this evidence package has not been                                 
+	// tampered with.                                                                                                       
+	Integrity                                                                                   *Integrity                  `json:"integrity,omitempty"`
+	// Optional key-value labels for grouping and querying evidence packages.                                               
+	Labels                                                                                      map[string]string           `json:"labels,omitempty"`
+	// Human-readable name for this evidence package. Example: 'Enterprise Portal ATO Evidence -                            
+	// Q1 2026'.                                                                                                            
+	Name                                                                                        string                      `json:"name"`
+	// Unique identifier for this evidence package. Optional in casual use, expected in                                     
+	// production ATO submissions. Auto-generated if omitted during creation.                                               
+	PackageID                                                                                   *string                     `json:"packageId,omitempty"`
+	// URI to the hdf-plan document that drove this assessment. Used for completeness                                       
+	// verification — every baseline in the plan should have a corresponding results document in                            
+	// this package.                                                                                                        
+	PlanRef                                                                                     *string                     `json:"planRef,omitempty"`
+	// When this evidence package was prepared. ISO 8601 format.                                                            
+	PreparedAt                                                                                  *time.Time                  `json:"preparedAt,omitempty"`
+	// Identity of who prepared this evidence package.                                                                      
+	PreparedBy                                                                                  *Identity                   `json:"preparedBy,omitempty"`
+	// Digital signature covering the entire evidence package.                                                              
+	Signature                                                                                   *Signature                  `json:"signature,omitempty"`
+	// URI to the hdf-system document this evidence package covers.                                                         
+	SystemRef                                                                                   *string                     `json:"systemRef,omitempty"`
+	// Version of this evidence package.                                                                                    
+	Version                                                                                     *string                     `json:"version,omitempty"`
+}
+
+// Informational summary of assessment completeness. Not authoritative — tools should compute these
+// from the referenced documents.
 type CompletenessCheck struct {
 	// Whether all baselines referenced by system components have assessment results.               
 	AllBaselinesAssessed                                                              *bool         `json:"allBaselinesAssessed,omitempty"`
@@ -1901,8 +1926,6 @@ type CompletenessCheck struct {
 	UnresolvedPoams                                                                   *int64        `json:"unresolvedPoams,omitempty"`
 }
 
-// SBOM coverage across system components.
-//
 // SBOM coverage statistics for the system.
 type SBOMCoverage struct {
 	// Number of system components that have an associated SBOM.       
@@ -1911,7 +1934,7 @@ type SBOMCoverage struct {
 	TotalComponents                                             *int64 `json:"totalComponents,omitempty"`
 }
 
-// A reference to an HDF document or SBOM included in the evidence package.
+// A reference to an HDF document or BOM/manifest included in the evidence package.
 type ContentReference struct {
 	// Cryptographic checksum for verifying the referenced document's integrity.                          
 	Checksum                                                                                  *Checksum   `json:"checksum,omitempty"`
@@ -1926,8 +1949,51 @@ type ContentReference struct {
 	URI                                                                                       string      `json:"uri"`
 }
 
-// The comparison operator used when evaluating this input against observed values.
-//
+// A reference to external native-format evidence (log/telemetry corpus or other artifact) carried
+// by URI + integrity hash + format discriminator. Reference-only: the artifact is never embedded
+// (corpora can be huge) or transcoded (that would be lossy) — it stays canonical in its native
+// format and HDF acts as the structured index.
+type ExternalEvidenceReference struct {
+	// Cryptographic checksum of the referenced artifact for integrity verification.                                     
+	Checksum                                                                                   *Checksum                 `json:"checksum,omitempty"`
+	// Optional human-readable description of this evidence entry.                                                       
+	Description                                                                                *string                   `json:"description,omitempty"`
+	// The native format discriminator of the referenced artifact.                                                       
+	Format                                                                                     string                    `json:"format"`
+	// Optional producer-declared version of the format (e.g. ECS '9.4.0', OCSF '1.8.0').                                
+	// Free-text and untrusted — HDF does not validate it against a registry.                                            
+	FormatVersion                                                                              *string                   `json:"formatVersion,omitempty"`
+	// Optional IANA media type describing the on-disk serialization, orthogonal to 'format'                             
+	// (the semantic standard). Examples: application/x-ndjson, application/json,                                        
+	// application/vnd.apache.parquet, text/csv.                                                                         
+	MediaType                                                                                  *string                   `json:"mediaType,omitempty"`
+	// Optional descriptive metadata about the referenced corpus. Does not affect integrity.                             
+	Metadata                                                                                   *ExternalEvidenceMetadata `json:"metadata,omitempty"`
+	// URI to the external native-format evidence artifact (log/telemetry corpus, etc.). Can be                          
+	// a relative path or absolute URL. The data stays canonical in its native format — HDF                              
+	// references it, never parses or transcodes it.                                                                     
+	URI                                                                                        string                    `json:"uri"`
+}
+
+// Descriptive metadata about a referenced external evidence corpus. Does not affect integrity.
+type ExternalEvidenceMetadata struct {
+	// The tool/pipeline that collected or produced the corpus. Example: 'aws-security-lake',                           
+	// 'elastic-agent'.                                                                                                 
+	Collector                                                                                *string                    `json:"collector,omitempty"`
+	// Approximate number of records/events in the referenced corpus.                                                   
+	RecordCount                                                                              *int64                     `json:"recordCount,omitempty"`
+	// The time window the referenced evidence covers.                                                                  
+	TimeRange                                                                                *ExternalEvidenceTimeRange `json:"timeRange,omitempty"`
+}
+
+// The time window a referenced external evidence corpus covers.
+type ExternalEvidenceTimeRange struct {
+	// End of the time window the corpus covers (ISO 8601).             
+	End                                                      *time.Time `json:"end,omitempty"`
+	// Start of the time window the corpus covers (ISO 8601).           
+	Start                                                    *time.Time `json:"start,omitempty"`
+}
+
 // Comparison operator for evaluating the input value against observed values. Numeric:
 // eq/ne/lt/le/gt/ge. String: eq/ne/contains/matches. Collection: in/notIn.
 type ComparisonOperator string
@@ -1945,8 +2011,6 @@ const (
 	NotIn    ComparisonOperator = "notIn"
 )
 
-// The data type of this input.
-//
 // The data type of the input value. Aligns with InSpec input types.
 type InputType string
 
@@ -1959,12 +2023,12 @@ const (
 	String  InputType = "String"
 )
 
-// The hash algorithm used for the checksum.
-//
-// Supported cryptographic hash algorithms for checksums and integrity verification.
+// Supported cryptographic hash algorithms for checksums and integrity verification. blake3 covers
+// container-image and other artifact digests that use it.
 type HashAlgorithm string
 
 const (
+	Blake3 HashAlgorithm = "blake3"
 	Sha256 HashAlgorithm = "sha256"
 	Sha384 HashAlgorithm = "sha384"
 	Sha512 HashAlgorithm = "sha512"
@@ -2017,15 +2081,9 @@ const (
 	Technical   ControlType = "technical"
 )
 
-// Qualitative severity band corresponding to baseScore. CVSS 2.0 does not natively use
-// 'none' or 'critical' bands; map accordingly when populating.
-//
 // Qualitative CVSS severity band. Aligns with FIRST/NVD bands: none=0.0, low=0.1-3.9,
-// medium=4.0-6.9, high=7.0-8.9, critical=9.0-10.0. Distinct from the broader Severity enum
-// used on Requirement_Core (which includes 'informational').
-//
-// Qualitative severity band corresponding to computedScore. Same band convention as
-// baseSeverity.
+// medium=4.0-6.9, high=7.0-8.9, critical=9.0-10.0. Distinct from the broader Severity enum used on
+// Requirement_Core (which includes 'informational').
 type CVSSSeverity string
 
 const (
@@ -2047,29 +2105,19 @@ const (
 	The40 Version = "4.0"
 )
 
-// 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.
-//
-// The type of amendment, aligned with FedRAMP deviation request categories. 'waiver': risk
-// accepted by Authorizing Official. 'attestation': manually verified by assessor. 'poam':
-// remediation tracked (no status change). 'inherited': control provided by another
-// component or system. 'falsePositive': scanner incorrectly identified a finding — for
-// compliance scans (STIG, CIS), the check actually passes, so status is typically set to
-// 'passed'; for vulnerability scans (CVE, SCA), the flagged vulnerability does not apply to
-// this system, so status is typically set to 'notApplicable'. The disposition field on the
-// requirement distinguishes false positives from genuinely not-applicable findings.
-// 'riskAdjustment': impact score adjusted based on environmental context (FedRAMP Risk
-// Adjustment); does not change pass/fail status, only impact via the impact field.
-// 'operationalRequirement': deviation required by operational constraints (FedRAMP
-// Operational Requirement); the finding cannot be remediated because the system requires
-// the affected functionality. Remains an open risk. Migration note: 'exception' was removed
-// in v3.1.0 — use 'waiver' with status 'notApplicable' instead.
-//
-// The type of override applied to this requirement.
-//
-// The type of amendment.
+// The type of amendment, aligned with FedRAMP deviation request categories. 'waiver': risk accepted
+// by Authorizing Official. 'attestation': manually verified by assessor. 'poam': remediation
+// tracked (no status change). 'inherited': control provided by another component or system.
+// 'falsePositive': scanner incorrectly identified a finding — for compliance scans (STIG, CIS), the
+// check actually passes, so status is typically set to 'passed'; for vulnerability scans (CVE,
+// SCA), the flagged vulnerability does not apply to this system, so status is typically set to
+// 'notApplicable'. The disposition field on the requirement distinguishes false positives from
+// genuinely not-applicable findings. 'riskAdjustment': impact score adjusted based on environmental
+// context (FedRAMP Risk Adjustment); does not change pass/fail status, only impact via the impact
+// field. 'operationalRequirement': deviation required by operational constraints (FedRAMP
+// Operational Requirement); the finding cannot be remediated because the system requires the
+// affected functionality. Remains an open risk. Migration note: 'exception' was removed in v3.1.0 —
+// use 'waiver' with status 'notApplicable' instead.
 type OverrideType string
 
 const (
@@ -2082,20 +2130,9 @@ const (
 	RiskAdjustment         OverrideType = "riskAdjustment"
 )
 
-// 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.
-//
-// The status of an individual test result. 'notApplicable' indicates the requirement does
-// not apply to the target. 'notReviewed' indicates the requirement was not assessed (e.g.,
-// requires manual verification).
-//
-// The status of this test within the requirement. Example: 'failed'.
-//
-// The new status this override sets for the requirement. Optional when only impact is being
-// overridden.
-//
-// The new status this amendment sets. Optional when only impact is being overridden.
+// The status of an individual test result. 'notApplicable' indicates the requirement does not apply
+// to the target. 'notReviewed' indicates the requirement was not assessed (e.g., requires manual
+// verification).
 type ResultStatus string
 
 const (
@@ -2107,11 +2144,16 @@ const (
 )
 
 // 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.
+// '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.
 type IdentityType string
 
 const (
+	Agent              IdentityType = "agent"
 	Email              IdentityType = "email"
 	IdentityTypeOther  IdentityType = "other"
 	IdentityTypeSystem IdentityType = "system"
@@ -2152,9 +2194,6 @@ const (
 	VendorDependency    POAMType = "vendorDependency"
 )
 
-// Explicit severity rating. Typically derived from impact score but provided explicitly for
-// clarity.
-//
 // Severity rating for a requirement. Typically derived from the numeric impact score.
 type Severity string
 
@@ -2166,28 +2205,21 @@ const (
 	SeverityMedium   Severity = "medium"
 )
 
-// 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.
-//
-// Structured controlled-vocabulary reason for an override, complementing the free-text
-// 'reason' field. 'reason' carries the human-readable rationale an auditor reads;
-// 'justification' carries the machine-readable category enabling filtering, aggregation,
-// and lossless round-trip with structured ecosystems (VEX, OSCAL, FedRAMP DR). Both fields
-// may be present simultaneously and are NOT redundant: 'reason' explains the specific
-// circumstance; 'justification' classifies it. Authors SHOULD populate both when a
-// controlled-vocabulary value applies — the enum value alone is not self-explanatory to an
-// auditor. The vocabulary is drawn from the VEX ecosystem: the first five values are common
-// across OpenVEX, CSAF VEX, and CycloneDX VEX; the remaining six (requires_configuration /
-// requires_dependency / requires_environment / protected_by_compiler / protected_at_runtime
-// / protected_at_perimeter) are CycloneDX-specific and describe why the vulnerable code
-// path is unreachable in the deployed configuration. The enum is extended additively across
-// schema versions as other ecosystems' controlled vocabularies are integrated; documents
-// using values added in a newer schema version will fail validation against an older
-// schema. Consumers SHOULD validate against the schema version declared by the document
-// ($schema) rather than assume a fixed vocabulary.
+// Structured controlled-vocabulary reason for an override, complementing the free-text 'reason'
+// field. 'reason' carries the human-readable rationale an auditor reads; 'justification' carries
+// the machine-readable category enabling filtering, aggregation, and lossless round-trip with
+// structured ecosystems (VEX, OSCAL, FedRAMP DR). Both fields may be present simultaneously and are
+// NOT redundant: 'reason' explains the specific circumstance; 'justification' classifies it.
+// Authors SHOULD populate both when a controlled-vocabulary value applies — the enum value alone is
+// not self-explanatory to an auditor. The vocabulary is drawn from the VEX ecosystem: the first
+// five values are common across OpenVEX, CSAF VEX, and CycloneDX VEX; the remaining six
+// (requires_configuration / requires_dependency / requires_environment / protected_by_compiler /
+// protected_at_runtime / protected_at_perimeter) are CycloneDX-specific and describe why the
+// vulnerable code path is unreachable in the deployed configuration. The enum is extended
+// additively across schema versions as other ecosystems' controlled vocabularies are integrated;
+// documents using values added in a newer schema version will fail validation against an older
+// schema. Consumers SHOULD validate against the schema version declared by the document ($schema)
+// rather than assume a fixed vocabulary.
 type Justification string
 
 const (
@@ -2204,19 +2236,12 @@ const (
 	VulnerableCodeNotPresent                    Justification = "vulnerable_code_not_present"
 )
 
-// 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.
-//
-// 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.
+// 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.
 type VerificationMethodEnum string
 
 const (
@@ -2226,6 +2251,29 @@ const (
 	VerificationMethodEnumHybrid    VerificationMethodEnum = "hybrid"
 )
 
+// 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).
+type DatasetDerivationType string
+
+const (
+	Augmented                   DatasetDerivationType = "augmented"
+	DatasetDerivationTypeMerged DatasetDerivationType = "merged"
+	Filtered                    DatasetDerivationType = "filtered"
+	Sampled                     DatasetDerivationType = "sampled"
+)
+
+// Lineage relationship to baseModelRef, adopting Hugging Face's base_model_relation
+// vocabulary (the only typed lineage enum in the ecosystem).
+type ModelAdaptationType string
+
+const (
+	Adapter   ModelAdaptationType = "adapter"
+	Finetune  ModelAdaptationType = "finetune"
+	Merge     ModelAdaptationType = "merge"
+	Quantized ModelAdaptationType = "quantized"
+)
+
 type CloudProvider string
 
 const (
@@ -2236,18 +2284,12 @@ const (
 	Oci                CloudProvider = "oci"
 )
 
-// Format of the SBOM (embedded or referenced). Required when sbom or sbomRef is present.
-type SBOMFormat string
-
-const (
-	Cyclonedx SBOMFormat = "cyclonedx"
-	Spdx      SBOMFormat = "spdx"
-)
-
-// Component type discriminator. Same values as Target types.
+// 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).
 type TargetType string
 
 const (
+	AIModel           TargetType = "aiModel"
 	Application       TargetType = "application"
 	Artifact          TargetType = "artifact"
 	CloudAccount      TargetType = "cloudAccount"
@@ -2256,13 +2298,12 @@ const (
 	ContainerInstance TargetType = "containerInstance"
 	ContainerPlatform TargetType = "containerPlatform"
 	Database          TargetType = "database"
+	Dataset           TargetType = "dataset"
 	Host              TargetType = "host"
 	Network           TargetType = "network"
 	Repository        TargetType = "repository"
 )
 
-// The category of this annotation.
-//
 // The category of an annotation attached to a comparison.
 type AnnotationCategory string
 
@@ -2286,13 +2327,11 @@ const (
 	BaselineDiffStateUpdated   BaselineDiffState = "updated"
 )
 
-// The mode of comparison being performed.
-//
-// The mode of comparison. 'temporal' compares the same target over time. 'baseline'
-// compares against a golden reference. 'fleet' compares across multiple systems.
-// 'multiSource' compares outputs from different scanners. 'baselineEvolution' compares two
-// baseline documents to detect requirement changes between versions. 'systemDrift' compares
-// two system documents to detect component-level changes.
+// The mode of comparison. 'temporal' compares the same target over time. 'baseline' compares
+// against a golden reference. 'fleet' compares across multiple systems. 'multiSource' compares
+// outputs from different scanners. 'baselineEvolution' compares two baseline documents to detect
+// requirement changes between versions. 'systemDrift' compares two system documents to detect
+// component-level changes.
 type ComparisonMode string
 
 const (
@@ -2331,8 +2370,6 @@ const (
 	TargetChanged    ChangeReason = "targetChanged"
 )
 
-// How the conflict was resolved.
-//
 // How a conflict between multiple scanner results was resolved.
 type ConflictResolution string
 
@@ -2343,13 +2380,9 @@ const (
 	Unresolved               ConflictResolution = "unresolved"
 )
 
-// The strategy that was used to match this requirement across sources.
-//
-// The strategy used to match requirements across sources. 'exactId' matches by identical
-// IDs. 'mappedId' uses an ID mapping table. 'cciMatch'/'nistMatch' match by framework
-// identifiers. 'fuzzyTitle'/'fuzzyContent' use text similarity.
-//
-// The primary strategy used to match requirements across sources.
+// The strategy used to match requirements across sources. 'exactId' matches by identical IDs.
+// 'mappedId' uses an ID mapping table. 'cciMatch'/'nistMatch' match by framework identifiers.
+// 'fuzzyTitle'/'fuzzyContent' use text similarity.
 type MatchStrategy string
 
 const (
@@ -2361,20 +2394,18 @@ const (
 	NISTMatch    MatchStrategy = "nistMatch"
 )
 
-// The state of this requirement in the comparison.
-//
-// SARIF-compatible vocabulary extended for security. 'new' = present only in new source,
-// 'absent' = present only in old, 'unchanged' = same effective status, 'updated' = status
-// changed (generic), 'fixed' = was failing now passing, 'regressed' = was passing now
-// failing, 'moved' = reorganized same content, 'split'/'merged' = reserved for v1.1.
+// SARIF-compatible vocabulary extended for security. 'new' = present only in new source, 'absent' =
+// present only in old, 'unchanged' = same effective status, 'updated' = status changed (generic),
+// 'fixed' = was failing now passing, 'regressed' = was passing now failing, 'moved' = reorganized
+// same content, 'split'/'merged' = reserved for v1.1.
 type RequirementState string
 
 const (
 	Fixed                     RequirementState = "fixed"
-	Merged                    RequirementState = "merged"
 	Moved                     RequirementState = "moved"
 	Regressed                 RequirementState = "regressed"
 	RequirementStateAbsent    RequirementState = "absent"
+	RequirementStateMerged    RequirementState = "merged"
 	RequirementStateNew       RequirementState = "new"
 	RequirementStateUnchanged RequirementState = "unchanged"
 	RequirementStateUpdated   RequirementState = "updated"
@@ -2409,8 +2440,6 @@ const (
 	Xccdf    OriginalFormat = "xccdf"
 )
 
-// The role of this source in the comparison.
-//
 // The role of a source document in the comparison.
 type SourceRole string
 
@@ -2422,8 +2451,6 @@ const (
 	SourceRoleSystem    SourceRole = "system"
 )
 
-// Current Authorization to Operate (ATO) status.
-//
 // Authorization to Operate (ATO) status for the system.
 type AuthorizationStatus string
 
@@ -2436,8 +2463,6 @@ const (
 	Revoked                 AuthorizationStatus = "revoked"
 )
 
-// FIPS 199 security categorization (impact level).
-//
 // FIPS 199 security categorization level (impact level).
 type CategorizationLevel string
 
@@ -2467,10 +2492,8 @@ const (
 	Unidirectional Direction = "unidirectional"
 )
 
-// The type of assessment plan.
-//
-// The type of assessment. 'automated' for scanner-driven, 'manual' for human-performed,
-// 'hybrid' for both.
+// The type of assessment. 'automated' for scanner-driven, 'manual' for human-performed, 'hybrid'
+// for both.
 type PlanType string
 
 const (
@@ -2479,19 +2502,20 @@ const (
 	PlanTypeManual    PlanType = "manual"
 )
 
-// The type of HDF document being referenced.
-//
-// The type of document referenced in the evidence package.
+// The type of document referenced in the evidence package. 'bom' covers any
+// Bill-of-Materials/manifest document (SBOM, AI model/dataset, and reserved future kinds) — its
+// specific kind is carried by the referenced document's bomType, not by a per-kind Content_Type
+// value.
 type ContentType string
 
 const (
+	BOM           ContentType = "bom"
 	HdfAmendments ContentType = "hdf-amendments"
 	HdfBaseline   ContentType = "hdf-baseline"
 	HdfComparison ContentType = "hdf-comparison"
 	HdfPlan       ContentType = "hdf-plan"
 	HdfResults    ContentType = "hdf-results"
 	HdfSystem     ContentType = "hdf-system"
-	Sbom          ContentType = "sbom"
 )
 
 type Ref struct {
@@ -2514,6 +2538,33 @@ func (x *Ref) MarshalJSON() ([]byte, error) {
 	return marshalUnion(nil, nil, nil, x.String, x.AnythingMapArray != nil, x.AnythingMapArray, false, nil, false, nil, false, nil, false)
 }
 
+// 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.
+//
+// Input/output modalities. String or array of strings. Examples: text, image, audio.
+// Symmetric with Dataset_Extension.modality.
+type Modality struct {
+	String      *string
+	StringArray []string
+}
+
+func (x *Modality) UnmarshalJSON(data []byte) error {
+	x.StringArray = nil
+	object, err := unmarshalUnion(data, nil, nil, nil, &x.String, true, &x.StringArray, false, nil, false, nil, false, nil, false)
+	if err != nil {
+		return err
+	}
+	if object {
+	}
+	return nil
+}
+
+func (x *Modality) MarshalJSON() ([]byte, error) {
+	return marshalUnion(nil, nil, nil, x.String, x.StringArray != nil, x.StringArray, false, nil, false, nil, false, nil, false)
+}
+
 func unmarshalUnion(data []byte, pi **int64, pf **float64, pb **bool, ps **string, haveArray bool, pa interface{}, haveObject bool, pc interface{}, haveMap bool, pm interface{}, haveEnum bool, pe interface{}, nullable bool) (bool, error) {
 	if pi != nil {
 			*pi = nil