Skip to content

Next Gen STEP AP242 Native-ish BREP Geometric Modeling Kernel

Support PMI obligations in Firmament validation

Yuechen Lid05335d4072e
diff --git a/Aetheris.CLI.Tests/FirmamentV2RuntimeConceptValidationCliTests.cs b/Aetheris.CLI.Tests/FirmamentV2RuntimeConceptValidationCliTests.cs
index c7dc731f..e53ff32c 100644
--- a/Aetheris.CLI.Tests/FirmamentV2RuntimeConceptValidationCliTests.cs
+++ b/Aetheris.CLI.Tests/FirmamentV2RuntimeConceptValidationCliTests.cs
@@ -59,6 +59,33 @@ public sealed class FirmamentV2RuntimeConceptValidationCliTests
Assert.DoesNotContain("--forge-pack", stdout.ToString(), StringComparison.Ordinal);
}
+ [Fact]
+ public void ValidateJson_ConceptPmiObligationWarningFixture_ReturnsZeroAndContainsObligationRow()
+ {
+ var fixturePath = FixturePath("Language/valid/concept-pmi-obligation-missing-warning.valid.firmfixture");
+ var stdout = new StringWriter();
+ var stderr = new StringWriter();
+
+ var exitCode = CliRunner.Run(["validate", fixturePath, "--json"], stdout, stderr);
+
+ Assert.Equal(0, exitCode);
+ Assert.Equal(string.Empty, stderr.ToString());
+
+ using var document = JsonDocument.Parse(stdout.ToString());
+ var validation = document.RootElement.GetProperty("firmamentV2Validation");
+ Assert.Equal("valid", validation.GetProperty("status").GetString());
+ Assert.True(validation.TryGetProperty("conceptPmiObligations", out var obligations));
+ Assert.Contains(
+ obligations.EnumerateArray(),
+ obligation => obligation.GetProperty("kind").GetString() == "diameter"
+ && obligation.GetProperty("sourceConcept").GetString() == "hole<Shaft>"
+ && obligation.GetProperty("status").GetString() == "missing");
+ Assert.Contains(
+ validation.GetProperty("diagnostics").EnumerateArray(),
+ diagnostic => diagnostic.GetProperty("code").GetString() == "forge.pmi.obligation.missing"
+ && diagnostic.GetProperty("severity").GetString() == "warning");
+ }
+
private static string FixturePath(string relative) => Path.Combine(FindRepoRoot(), "fixtures", "FirmamentV2", relative);
private static string FindRepoRoot()
diff --git a/Aetheris.CLI/AirTrace.cs b/Aetheris.CLI/AirTrace.cs
index 6a60493f..f8e7c0ca 100644
--- a/Aetheris.CLI/AirTrace.cs
+++ b/Aetheris.CLI/AirTrace.cs
@@ -407,19 +407,22 @@ internal static class AirTraceReportBuilder
private static bool IsMetadataOnlyFixture(FirmFixture fixture)
{
var implementation = fixture.Metadata.GetValueOrDefault("implementation");
- if (string.Equals(implementation, "not-implemented", StringComparison.Ordinal) || string.Equals(implementation, "deferred", StringComparison.Ordinal)) return true;
+ if (string.Equals(implementation, "not-implemented", StringComparison.Ordinal)
+ || string.Equals(implementation, "design-only-not-implemented", StringComparison.Ordinal)
+ || string.Equals(implementation, "deferred", StringComparison.Ordinal)) return true;
return !SupportedFixtureCases.Contains(fixture.CaseName, StringComparer.Ordinal) && string.Equals(implementation, "rejected", StringComparison.Ordinal);
}
private static AirTraceReport BuildMetadataOnlyFixture(FirmFixture fixture)
{
var implementation = fixture.Metadata.GetValueOrDefault("implementation") ?? (fixture.Expectation == "invalid" ? "rejected" : "not-implemented");
- var expectedDiagnostic = fixture.Metadata.GetValueOrDefault("expected-diagnostic") ?? (implementation == "not-implemented" ? "firmament-feature-not-implemented" : "firmament-fixture-rejected");
- var actualStage = fixture.ExpectedStage ?? (implementation == "deferred" ? "deferred" : implementation == "rejected" || fixture.Expectation == "invalid" ? "rejected" : "not-implemented");
- var isNotImplemented = implementation is "not-implemented" or "deferred";
+ var normalizedImplementation = implementation == "design-only-not-implemented" ? "not-implemented" : implementation;
+ var expectedDiagnostic = fixture.Metadata.GetValueOrDefault("expected-diagnostic") ?? (normalizedImplementation == "not-implemented" ? "firmament-feature-not-implemented" : "firmament-fixture-rejected");
+ var actualStage = fixture.ExpectedStage ?? (normalizedImplementation == "deferred" ? "deferred" : normalizedImplementation == "rejected" || fixture.Expectation == "invalid" ? "rejected" : "not-implemented");
+ var isNotImplemented = normalizedImplementation is "not-implemented" or "deferred";
var expectationSatisfied = fixture.Expectation == "valid"
? isNotImplemented && (actualStage is "not-implemented" or "deferred" || fixture.ExpectedStage == actualStage)
- : implementation == "rejected" || actualStage == "rejected";
+ : normalizedImplementation == "rejected" || actualStage == "rejected";
var diagnostics = Stable([.. fixture.Diagnostics, "air-firmament-a1-metadata-only-fixture-classified", expectedDiagnostic, isNotImplemented ? "air-firmament-a1-feature-not-implemented" : "air-firmament-a1-fixture-rejected", expectationSatisfied ? "air-firmament-a1-expectation-satisfied" : "air-firmament-a1-expectation-not-satisfied"]).ToArray();
return new("AIR-FIRMAMENT-A1", "trace", "lowering", "firmfixture", fixture.CaseName, expectationSatisfied, isNotImplemented ? "Fixture is valid Firmament design intent but its lowering/materialization route is deliberately not implemented in A1." : "Fixture is rejected by metadata contract with stable diagnostic.",
new("FirmamentFixture", "none", fixture.Metadata.GetValueOrDefault("category") ?? "none", "none", "metadata-only-fixture", fixture.CaseName, fixture.Metadata.GetValueOrDefault("fixture-id") ?? fixture.CaseName, "AIR-FIRMAMENT-A1"),
diff --git a/Aetheris.CLI/FirmFixture.cs b/Aetheris.CLI/FirmFixture.cs
index 76329ff6..f91ed960 100644
--- a/Aetheris.CLI/FirmFixture.cs
+++ b/Aetheris.CLI/FirmFixture.cs
@@ -14,13 +14,12 @@ internal sealed record FirmFixture(
internal static class FirmFixtureLoader
{
- public static readonly string[] ValidExtensions = [".valid.firmfixture", ".invalid.firmfixture"];
+ public static readonly string[] ValidExtensions = [".valid.firmfixture", ".invalid.firmfixture", ".firmfixture"];
public static FirmFixture Load(string path)
{
var normalized = path.Replace('\\', '/');
if (!File.Exists(path)) throw new FirmFixtureException("air-x7-fixture-file-not-found", $"Firmament fixture file was not found: {path}");
- var expectation = ClassifyExpectation(path);
var lines = File.ReadAllLines(path);
var metadata = new SortedDictionary<string, string>(StringComparer.Ordinal);
foreach (var raw in lines)
@@ -37,9 +36,13 @@ internal static class FirmFixtureLoader
metadata[key] = value;
}
+ var expectation = ClassifyExpectation(path, metadata.GetValueOrDefault("expected"));
+
if (!metadata.TryGetValue("case", out var caseName) || string.IsNullOrWhiteSpace(caseName))
throw new FirmFixtureException("air-x7-firmfixture-metadata-invalid", "Firmament fixture requires leading metadata `// case: <name>`.");
- if (metadata.TryGetValue("expected", out var expected) && !string.Equals(expected, expectation, StringComparison.Ordinal))
+ if ((path.EndsWith(".valid.firmfixture", StringComparison.Ordinal) || path.EndsWith(".invalid.firmfixture", StringComparison.Ordinal))
+ && metadata.TryGetValue("expected", out var expected)
+ && !string.Equals(expected, expectation, StringComparison.Ordinal))
throw new FirmFixtureException("air-x7-firmfixture-metadata-invalid", $"Fixture extension implies '{expectation}' but metadata expected '{expected}'.");
var sourceBody = ExtractSourceBody(lines);
@@ -70,11 +73,13 @@ internal static class FirmFixtureLoader
return string.Join(Environment.NewLine, lines.Skip(bodyStart)).Trim();
}
- public static string ClassifyExpectation(string path)
+ public static string ClassifyExpectation(string path, string? expectedMetadata = null)
{
if (path.EndsWith(".valid.firmfixture", StringComparison.Ordinal)) return "valid";
if (path.EndsWith(".invalid.firmfixture", StringComparison.Ordinal)) return "invalid";
- throw new FirmFixtureException("air-x7-invalid-firmfixture-extension", "Trace fixtures must use `.valid.firmfixture` or `.invalid.firmfixture`.");
+ if (path.EndsWith(".firmfixture", StringComparison.Ordinal) && string.Equals(expectedMetadata, "not-implemented", StringComparison.Ordinal)) return "valid";
+ if (path.EndsWith(".firmfixture", StringComparison.Ordinal) && string.Equals(expectedMetadata, "invalid", StringComparison.Ordinal)) return "invalid";
+ throw new FirmFixtureException("air-x7-invalid-firmfixture-extension", "Trace fixtures must use `.valid.firmfixture`, `.invalid.firmfixture`, or metadata-qualified `.firmfixture`.");
}
}
diff --git a/Aetheris.Forge/Abstractions/FirmamentInterop/ForgeConceptRegistry.cs b/Aetheris.Forge/Abstractions/FirmamentInterop/ForgeConceptRegistry.cs
index 724a872a..69990a2e 100644
--- a/Aetheris.Forge/Abstractions/FirmamentInterop/ForgeConceptRegistry.cs
+++ b/Aetheris.Forge/Abstractions/FirmamentInterop/ForgeConceptRegistry.cs
@@ -7,6 +7,11 @@ public interface IForgeConcept
IEnumerable<FirmamentDiagnostic> Validate(ConceptValidationContext context);
}
+public interface IForgePmiObligationProvider
+{
+ IEnumerable<PmiObligation> GetPmiObligations(ConceptValidationContext context);
+}
+
public interface IForgeConceptPack
{
string Id { get; }
@@ -168,3 +173,11 @@ public sealed class ConceptValidationContext
return false;
}
}
+
+public sealed record PmiObligation(
+ string Kind,
+ ConceptId SourceConcept,
+ string? SourceName,
+ string? TargetSource,
+ string? ExpectedDimensionField,
+ FirmamentDiagnosticSeverity Severity);
diff --git a/Aetheris.Forge/Standard/CounterboreHoleConcept.cs b/Aetheris.Forge/Standard/CounterboreHoleConcept.cs
index f97d3b1e..641b9e6a 100644
--- a/Aetheris.Forge/Standard/CounterboreHoleConcept.cs
+++ b/Aetheris.Forge/Standard/CounterboreHoleConcept.cs
@@ -2,7 +2,7 @@ using Aetheris.Forge.Abstractions.FirmamentInterop;
namespace Aetheris.Forge.Standard;
-public sealed class CounterboreHoleConcept : IForgeConcept
+public sealed class CounterboreHoleConcept : IForgeConcept, IForgePmiObligationProvider
{
public ConceptId Id => new("hole", "Counterbore");
@@ -76,4 +76,19 @@ public sealed class CounterboreHoleConcept : IForgeConcept
return diagnostics;
}
+
+ public IEnumerable<PmiObligation> GetPmiObligations(ConceptValidationContext context)
+ {
+ ArgumentNullException.ThrowIfNull(context);
+ return
+ [
+ new PmiObligation(
+ "diameter",
+ Id,
+ context.Application.Name,
+ context.TryGetTargetSource("target", out var targetSource) ? targetSource : null,
+ "diameter",
+ FirmamentDiagnosticSeverity.Warning)
+ ];
+ }
}
diff --git a/Aetheris.Forge/Standard/CountersinkHoleConcept.cs b/Aetheris.Forge/Standard/CountersinkHoleConcept.cs
index c70e1400..60fa0ed0 100644
--- a/Aetheris.Forge/Standard/CountersinkHoleConcept.cs
+++ b/Aetheris.Forge/Standard/CountersinkHoleConcept.cs
@@ -2,7 +2,7 @@ using Aetheris.Forge.Abstractions.FirmamentInterop;
namespace Aetheris.Forge.Standard;
-public sealed class CountersinkHoleConcept : IForgeConcept
+public sealed class CountersinkHoleConcept : IForgeConcept, IForgePmiObligationProvider
{
public ConceptId Id => new("hole", "Countersink");
@@ -77,4 +77,19 @@ public sealed class CountersinkHoleConcept : IForgeConcept
return diagnostics;
}
+
+ public IEnumerable<PmiObligation> GetPmiObligations(ConceptValidationContext context)
+ {
+ ArgumentNullException.ThrowIfNull(context);
+ return
+ [
+ new PmiObligation(
+ "diameter",
+ Id,
+ context.Application.Name,
+ context.TryGetTargetSource("target", out var targetSource) ? targetSource : null,
+ "diameter",
+ FirmamentDiagnosticSeverity.Warning)
+ ];
+ }
}
diff --git a/Aetheris.Forge/Standard/ShaftHoleConcept.cs b/Aetheris.Forge/Standard/ShaftHoleConcept.cs
index 4e40ce15..aa41d9c0 100644
--- a/Aetheris.Forge/Standard/ShaftHoleConcept.cs
+++ b/Aetheris.Forge/Standard/ShaftHoleConcept.cs
@@ -2,7 +2,7 @@ using Aetheris.Forge.Abstractions.FirmamentInterop;
namespace Aetheris.Forge.Standard;
-public sealed class ShaftHoleConcept : IForgeConcept
+public sealed class ShaftHoleConcept : IForgeConcept, IForgePmiObligationProvider
{
public ConceptId Id => new("hole", "Shaft");
@@ -43,4 +43,19 @@ public sealed class ShaftHoleConcept : IForgeConcept
return diagnostics;
}
+
+ public IEnumerable<PmiObligation> GetPmiObligations(ConceptValidationContext context)
+ {
+ ArgumentNullException.ThrowIfNull(context);
+ return
+ [
+ new PmiObligation(
+ "diameter",
+ Id,
+ context.Application.Name,
+ context.TryGetTargetSource("target", out var targetSource) ? targetSource : null,
+ "diameter",
+ FirmamentDiagnosticSeverity.Warning)
+ ];
+ }
}
diff --git a/Aetheris.Kernel.Firmament.Tests/FirmamentV2ValidationReportTests.cs b/Aetheris.Kernel.Firmament.Tests/FirmamentV2ValidationReportTests.cs
index d95c984c..03f707d9 100644
--- a/Aetheris.Kernel.Firmament.Tests/FirmamentV2ValidationReportTests.cs
+++ b/Aetheris.Kernel.Firmament.Tests/FirmamentV2ValidationReportTests.cs
@@ -67,6 +67,61 @@ public sealed class FirmamentV2ValidationReportTests
Assert.Contains(report.Diagnostics, d => d.Code == FirmamentV2Parser.PmiUnknownDatum && d.Severity == "fatal");
}
+ [Fact]
+ public void ForgeCsA4_ConceptPmiObligation_SatisfiedCountersinkDiameter_IsReportedWithoutWarning()
+ {
+ var report = Report("Language/valid/concept-pmi-obligation-satisfied.valid.firmfixture");
+
+ Assert.Equal("valid", report.Status);
+ var obligation = Assert.Single(report.ConceptPmiObligations);
+ Assert.Equal("diameter", obligation.Kind);
+ Assert.Equal("hole<Countersink>", obligation.SourceConcept);
+ Assert.Equal("mountHole", obligation.SourceName);
+ Assert.Equal("satisfied", obligation.Status);
+ Assert.Equal("mountHoleDiameter", obligation.MatchedPmi);
+ Assert.DoesNotContain(report.Diagnostics, d => d.Code == "forge.pmi.obligation.missing");
+ Assert.Equal(1, report.Summary.PmiObligationCount);
+ Assert.Equal(1, report.Summary.SatisfiedPmiObligationCount);
+ Assert.Equal(0, report.Summary.MissingPmiObligationCount);
+ }
+
+ [Fact]
+ public void ForgeCsA4_ConceptPmiObligation_MissingShaftDiameter_StaysValidAndWarns()
+ {
+ var report = Report("Language/valid/concept-pmi-obligation-missing-warning.valid.firmfixture");
+
+ Assert.Equal("valid", report.Status);
+ var obligation = Assert.Single(report.ConceptPmiObligations);
+ Assert.Equal("diameter", obligation.Kind);
+ Assert.Equal("hole<Shaft>", obligation.SourceConcept);
+ Assert.Equal("pilotHole", obligation.SourceName);
+ Assert.Equal("missing", obligation.Status);
+ Assert.Equal("forge.pmi.obligation.missing", obligation.DiagnosticCode);
+ Assert.Contains(report.Diagnostics, d => d.Code == "forge.pmi.obligation.missing" && d.Severity == "warning");
+ }
+
+ [Fact]
+ public void ForgeCsA4_ConceptPmiObligation_MissingWarningDoesNotOverrideDeferredExportStatus()
+ {
+ var report = Report("Language/valid/concept-pmi-obligation-with-deferred-export.valid.firmfixture");
+
+ Assert.Equal("valid-with-deferred-export", report.Status);
+ Assert.Single(report.ConceptPmiObligations, obligation => obligation.Status == "missing");
+ Assert.Contains(report.Diagnostics, d => d.Code == "forge.pmi.obligation.missing" && d.Severity == "warning");
+ Assert.Contains(report.Pmi, p => p.ExportSupport == "deferred");
+ }
+
+ [Fact]
+ public void ForgeCsA4_ConceptPmiObligation_InvalidConceptDoesNotEmitMisleadingObligation()
+ {
+ var report = Report("Language/invalid/concept-pmi-obligation-invalid-countersink.invalid.firmfixture");
+
+ Assert.Equal("invalid", report.Status);
+ Assert.Contains(report.Diagnostics, d => d.Code == "forge.hole.countersink.diameter-order" && d.Severity == "fatal");
+ Assert.Empty(report.ConceptPmiObligations);
+ Assert.DoesNotContain(report.Diagnostics, d => d.Code == "forge.pmi.obligation.missing");
+ }
+
private static FirmamentV2ValidationReport Report(string relative)
{
var path = Path.Combine(FindRepoRoot(), "fixtures/FirmamentV2", relative);
diff --git a/Aetheris.Kernel.Firmament/FirmamentV2/FirmamentV2RuntimeConceptValidation.cs b/Aetheris.Kernel.Firmament/FirmamentV2/FirmamentV2RuntimeConceptValidation.cs
index 60655855..f9fe13e7 100644
--- a/Aetheris.Kernel.Firmament/FirmamentV2/FirmamentV2RuntimeConceptValidation.cs
+++ b/Aetheris.Kernel.Firmament/FirmamentV2/FirmamentV2RuntimeConceptValidation.cs
@@ -7,6 +7,7 @@ namespace Aetheris.Kernel.Firmament.FirmamentV2;
public sealed record FirmamentV2RuntimeConceptValidationResult(
string Provider,
IReadOnlyList<FirmamentV2RuntimeConceptValidationEntry> Concepts,
+ IReadOnlyList<PmiObligation> PmiObligations,
IReadOnlyList<FirmamentDiagnostic> Diagnostics);
public sealed record FirmamentV2RuntimeConceptValidationEntry(
@@ -28,7 +29,7 @@ public static class FirmamentV2RuntimeConceptValidation
{
if (document is null)
{
- return new FirmamentV2RuntimeConceptValidationResult(string.Empty, [], []);
+ return new FirmamentV2RuntimeConceptValidationResult(string.Empty, [], [], []);
}
var registry = new ForgeConceptRegistry();
@@ -37,6 +38,7 @@ public static class FirmamentV2RuntimeConceptValidation
var variables = new FirmamentV2VariablesAdapter(document);
var conceptResults = new List<FirmamentV2RuntimeConceptValidationEntry>();
+ var obligations = new List<PmiObligation>();
var diagnostics = new List<FirmamentDiagnostic>();
foreach (var declaration in document.ManufacturingConcepts ?? [])
@@ -47,6 +49,7 @@ public static class FirmamentV2RuntimeConceptValidation
pack.Id,
registry,
conceptResults,
+ obligations,
diagnostics);
}
@@ -58,12 +61,14 @@ public static class FirmamentV2RuntimeConceptValidation
pack.Id,
registry,
conceptResults,
+ obligations,
diagnostics);
}
return new FirmamentV2RuntimeConceptValidationResult(
pack.Id,
conceptResults,
+ obligations,
diagnostics);
}
@@ -73,6 +78,7 @@ public static class FirmamentV2RuntimeConceptValidation
string provider,
IForgeRegistry registry,
ICollection<FirmamentV2RuntimeConceptValidationEntry> conceptResults,
+ ICollection<PmiObligation> obligations,
ICollection<FirmamentDiagnostic> diagnostics)
{
if (!registry.TryResolve(application.ConceptId, out var concept))
@@ -80,7 +86,8 @@ public static class FirmamentV2RuntimeConceptValidation
return;
}
- var conceptDiagnostics = concept.Validate(new ConceptValidationContext(application, variables))
+ var context = new ConceptValidationContext(application, variables);
+ var conceptDiagnostics = concept.Validate(context)
.Distinct()
.ToArray();
@@ -96,5 +103,20 @@ public static class FirmamentV2RuntimeConceptValidation
{
diagnostics.Add(diagnostic);
}
+
+ if (conceptDiagnostics.Any(diagnostic => diagnostic.Severity == FirmamentDiagnosticSeverity.Fatal))
+ {
+ return;
+ }
+
+ if (concept is not IForgePmiObligationProvider obligationProvider)
+ {
+ return;
+ }
+
+ foreach (var obligation in obligationProvider.GetPmiObligations(context).Distinct())
+ {
+ obligations.Add(obligation);
+ }
}
}
diff --git a/Aetheris.Kernel.Firmament/FirmamentV2/FirmamentV2ValidationReport.cs b/Aetheris.Kernel.Firmament/FirmamentV2/FirmamentV2ValidationReport.cs
index 4f8a727d..ec4a16be 100644
--- a/Aetheris.Kernel.Firmament/FirmamentV2/FirmamentV2ValidationReport.cs
+++ b/Aetheris.Kernel.Firmament/FirmamentV2/FirmamentV2ValidationReport.cs
@@ -9,11 +9,12 @@ public sealed record FirmamentV2ValidationReport(
IReadOnlyList<FirmamentV2ValidationLet> Lets,
IReadOnlyList<FirmamentV2ValidationConcept> Concepts,
IReadOnlyList<FirmamentV2ValidationPmiRecord> Pmi,
+ IReadOnlyList<FirmamentV2ValidationConceptPmiObligation> ConceptPmiObligations,
FirmamentV2ValidationExportSupport ExportSupport,
IReadOnlyList<FirmamentV2ValidationDiagnostic> Diagnostics,
FirmamentV2ValidationSummary Summary);
-public sealed record FirmamentV2ValidationSummary(int LetCount, int TolerancedLetCount, int ConceptCount, int ValidConceptCount, int PmiRecordCount, int ExportSupportedPmiCount, int ExportDeferredPmiCount, int FatalDiagnosticCount, int WarningDiagnosticCount);
+public sealed record FirmamentV2ValidationSummary(int LetCount, int TolerancedLetCount, int ConceptCount, int ValidConceptCount, int PmiRecordCount, int ExportSupportedPmiCount, int ExportDeferredPmiCount, int PmiObligationCount, int SatisfiedPmiObligationCount, int MissingPmiObligationCount, int FatalDiagnosticCount, int WarningDiagnosticCount);
public sealed record FirmamentV2ValidationDiagnostic(string Code, string Severity, string Message, string? FieldName = null, string? Target = null);
public sealed record FirmamentV2ValidationExportSupport(int SupportedPmiCount, int DeferredPmiCount, IReadOnlyDictionary<string, string> Matrix);
public sealed record FirmamentV2ValidationLet(string Name, string Type, string Nominal, FirmamentV2ValidationTolerance? Tolerance, string Source, IReadOnlyList<string> Dependencies, IReadOnlyList<FirmamentV2ValidationDiagnostic> Diagnostics);
@@ -23,6 +24,7 @@ public sealed record FirmamentV2ValidationConcept(string Kind, string? Name, str
public sealed record FirmamentV2ValidationConceptField(string Name, string Type, bool HasTolerance, string Source);
public sealed record FirmamentV2ValidationPmiRecord(string Kind, string Name, string Status, string ExportSupport, string? Target, IReadOnlyList<string> Targets, IReadOnlyList<string> DatumRefs, FirmamentV2ValidationDimension? Dimension, string? Reason, IReadOnlyList<FirmamentV2ValidationDiagnostic> Diagnostics);
public sealed record FirmamentV2ValidationDimension(string Nominal, FirmamentV2ValidationTolerance? Tolerance);
+public sealed record FirmamentV2ValidationConceptPmiObligation(string Kind, string SourceConcept, string? SourceName, string? Target, string? ExpectedDimensionField, string Status, string Severity, string? MatchedPmi = null, string? DiagnosticCode = null);
public static class FirmamentV2ValidationReportBuilder
{
@@ -42,6 +44,15 @@ public static class FirmamentV2ValidationReportBuilder
var lets = document is null ? [] : BuildLets(document);
var concepts = document is null ? [] : BuildConcepts(document, runtimeValidation);
var pmi = document is null ? [] : BuildPmi(document, diagnostics);
+ var conceptPmiEvaluation = document is null
+ ? new FirmamentV2ConceptPmiObligationEvaluation([], [])
+ : BuildConceptPmiObligations(document, runtimeValidation);
+ diagnostics = diagnostics
+ .Concat(conceptPmiEvaluation.Diagnostics)
+ .Distinct()
+ .ToArray();
+ fatalCount = diagnostics.Count(diagnostic => diagnostic.Severity == "fatal");
+ warningCount = diagnostics.Length - fatalCount;
var supported = pmi.Count(record => record.ExportSupport is "supported" or "supported-when-target-resolves");
var deferred = pmi.Count(record => record.ExportSupport == "deferred");
var status = fatalCount > 0 ? "invalid" : deferred > 0 ? "valid-with-deferred-export" : "valid";
@@ -53,6 +64,9 @@ public static class FirmamentV2ValidationReportBuilder
pmi.Count,
supported,
deferred,
+ conceptPmiEvaluation.Obligations.Count,
+ conceptPmiEvaluation.Obligations.Count(row => row.Status == "satisfied"),
+ conceptPmiEvaluation.Obligations.Count(row => row.Status == "missing"),
fatalCount,
warningCount);
@@ -62,6 +76,7 @@ public static class FirmamentV2ValidationReportBuilder
lets,
concepts,
pmi,
+ conceptPmiEvaluation.Obligations,
new FirmamentV2ValidationExportSupport(supported, deferred, ExportMatrix),
diagnostics,
summary);
@@ -195,6 +210,63 @@ public static class FirmamentV2ValidationReportBuilder
}).ToArray();
}
+ private static FirmamentV2ConceptPmiObligationEvaluation BuildConceptPmiObligations(
+ FirmamentV2Document document,
+ FirmamentV2RuntimeConceptValidationResult runtimeValidation)
+ {
+ var boundPmiByName = (document.BoundPmi?.Datums ?? [])
+ .Concat(document.BoundPmi?.Dimensions ?? [])
+ .Concat(document.BoundPmi?.Controls ?? [])
+ .ToDictionary(record => record.Name, StringComparer.Ordinal);
+
+ var obligations = new List<FirmamentV2ValidationConceptPmiObligation>();
+ var diagnostics = new List<FirmamentV2ValidationDiagnostic>();
+
+ foreach (var obligation in runtimeValidation.PmiObligations)
+ {
+ var matchedPmi = MatchPmi(obligation, boundPmiByName.Values);
+ var status = matchedPmi is null ? "missing" : "satisfied";
+ var severity = obligation.Severity switch
+ {
+ FirmamentDiagnosticSeverity.Fatal => "fatal",
+ FirmamentDiagnosticSeverity.Warning => "warning",
+ _ => "info"
+ };
+
+ obligations.Add(new FirmamentV2ValidationConceptPmiObligation(
+ obligation.Kind,
+ obligation.SourceConcept.ToString(),
+ obligation.SourceName,
+ obligation.TargetSource,
+ obligation.ExpectedDimensionField,
+ status,
+ severity,
+ matchedPmi?.Name,
+ status == "missing" ? "forge.pmi.obligation.missing" : null));
+
+ if (status == "missing")
+ {
+ diagnostics.Add(new FirmamentV2ValidationDiagnostic(
+ "forge.pmi.obligation.missing",
+ severity,
+ MissingObligationMessage(obligation),
+ obligation.ExpectedDimensionField,
+ obligation.TargetSource));
+ }
+ }
+
+ return new FirmamentV2ConceptPmiObligationEvaluation(obligations, diagnostics);
+ }
+
+ private static FirmamentV2BoundPmiRecord? MatchPmi(PmiObligation obligation, IEnumerable<FirmamentV2BoundPmiRecord> records) =>
+ records.FirstOrDefault(record =>
+ string.Equals(KindName(record.Kind), obligation.Kind, StringComparison.Ordinal)
+ && !string.IsNullOrWhiteSpace(obligation.TargetSource)
+ && record.Targets.Any(target => string.Equals(target, obligation.TargetSource, StringComparison.Ordinal)));
+
+ private static string MissingObligationMessage(PmiObligation obligation) =>
+ $"{obligation.SourceConcept} feature {obligation.SourceName ?? "<unnamed>"} has no matching {obligation.Kind} PMI record.";
+
private static FirmamentV2ValidationDimension? Dimension(FirmamentV2BoundPmiRecord? boundRecord)
{
if (boundRecord is null)
@@ -286,4 +358,8 @@ public static class FirmamentV2ValidationReportBuilder
["perpendicular"] = "deferred",
["coplanar"] = "deferred"
};
+
+ private sealed record FirmamentV2ConceptPmiObligationEvaluation(
+ IReadOnlyList<FirmamentV2ValidationConceptPmiObligation> Obligations,
+ IReadOnlyList<FirmamentV2ValidationDiagnostic> Diagnostics);
}
diff --git a/docs/implementation/forge-cs-a3-runtime-concept-validation.md b/docs/implementation/forge-cs-a3-runtime-concept-validation.md
index af6b0604..854cca1d 100644
--- a/docs/implementation/forge-cs-a3-runtime-concept-validation.md
+++ b/docs/implementation/forge-cs-a3-runtime-concept-validation.md
@@ -166,6 +166,8 @@ Added fixtures:
- `fixtures/FirmamentV2/Language/invalid/concept-cnc-minimum-tool-radius.invalid.firmfixture`
- `fixtures/FirmamentV2/Language/valid/concept-shaft-missing-tolerance-warning.valid.firmfixture`
+Forward link: [`forge-cs-a4-concept-pmi-obligations.md`](forge-cs-a4-concept-pmi-obligations.md) extends the same runtime concept path with report-only PMI obligation rows and warning-only missing-obligation findings.
+
## Explicit non-scope
FORGE-CS-A3 does not add:
diff --git a/docs/implementation/forge-cs-a4-concept-pmi-obligations.md b/docs/implementation/forge-cs-a4-concept-pmi-obligations.md
new file mode 100644
index 00000000..33b6df60
--- /dev/null
+++ b/docs/implementation/forge-cs-a4-concept-pmi-obligations.md
@@ -0,0 +1,170 @@
+# FORGE-CS-A4 concept PMI obligations
+
+Milestone: **FORGE-CS-A4**
+
+Phase 2 doctrine remains:
+
+```text
+Firmament remains data.
+C# owns logic.
+Forge is the interop boundary.
+```
+
+## Purpose
+
+FORGE-CS-A4 lets built-in C# Forge concepts contribute **report-only** PMI obligations to the existing Firmament V2 validation report surfaced by:
+
+```bash
+dotnet run --project Aetheris.CLI -- validate <file.firmament|file.firmfixture> --json
+```
+
+The goal is intentionally narrow:
+
+- built-in C# concepts can declare bounded PMI obligations;
+- the report compares those obligations against existing authored `pmi` records;
+- satisfied and missing obligations become structured report rows;
+- missing obligations surface as warning-only findings;
+- no Firmament source mutation, PMI auto-generation, or AP242 export behavior is added.
+
+## Obligation provider API
+
+The A1/A3 runtime interop layer now includes an optional provider surface:
+
+```csharp
+public interface IForgePmiObligationProvider
+{
+ IEnumerable<PmiObligation> GetPmiObligations(ConceptValidationContext context);
+}
+```
+
+`PmiObligation` carries:
+
+- `Kind`
+- `SourceConcept`
+- `SourceName`
+- `TargetSource`
+- `ExpectedDimensionField`
+- `Severity`
+
+This interface is optional. `IForgeConcept` itself was not widened, so concepts without PMI behavior remain unchanged.
+
+## Built-in concept coverage
+
+A4 adds report-only diameter PMI obligations for these built-in hole concepts:
+
+- `hole<Shaft>`
+- `hole<Counterbore>`
+- `hole<Countersink>`
+
+Each emits one deterministic through-diameter obligation:
+
+- `kind: diameter`
+- `expectedDimensionField: diameter`
+- `target: <feature target field source>`
+- `sourceConcept: hole<...>`
+- `sourceName: <feature declaration name>`
+- `severity: warning`
+
+`process<CNC>` contributes no PMI obligations in A4.
+
+Counterbore-specific and countersink-specific secondary obligations such as entry diameter/depth/angle remain deferred to keep A4 bounded.
+
+## Evaluation policy
+
+Obligations are evaluated only for concept applications whose A3 runtime diagnostics contain **no fatal findings**.
+
+Chosen policy:
+
+- valid concept application -> evaluate PMI obligations
+- invalid concept application -> emit no PMI obligation rows
+
+This avoids misleading “missing PMI” warnings for concepts that are already semantically invalid.
+
+## Statuses and diagnostics
+
+Implemented A4 statuses:
+
+- `satisfied`
+- `missing`
+
+Missing obligations emit warning diagnostics with:
+
+- `code: forge.pmi.obligation.missing`
+- `severity: warning`
+
+Satisfied obligations emit no additional diagnostics.
+
+Missing obligations do **not** make the top-level validation report invalid. Report status policy remains:
+
+- fatal diagnostics -> `invalid`
+- otherwise export-deferred PMI present -> `valid-with-deferred-export`
+- otherwise -> `valid`
+
+## Matching rules
+
+A4 uses conservative matching against existing bound record-shaped PMI from `FirmamentV2BoundPmiBlock`.
+
+Implemented diameter matching rule:
+
+- PMI record kind is `diameter`
+- bound PMI target exactly matches the obligation `TargetSource`
+
+This is the bounded minimum-acceptable Phase 2 rule. A4 does **not** attempt geometric equivalence, topology equivalence, or richer dimension-source identity matching.
+
+## Report JSON shape
+
+`firmamentV2Validation` now includes:
+
+- `conceptPmiObligations[]`
+
+Each row includes:
+
+- `kind`
+- `sourceConcept`
+- `sourceName`
+- `target`
+- `expectedDimensionField`
+- `status`
+- `severity`
+- `matchedPmi` when satisfied
+- `diagnosticCode` when missing
+
+The summary now also carries:
+
+- `pmiObligationCount`
+- `satisfiedPmiObligationCount`
+- `missingPmiObligationCount`
+
+## Tests and fixtures
+
+Added/report-updated coverage for:
+
+- satisfied countersink diameter obligation
+- missing shaft diameter obligation warning
+- missing obligation plus export-deferred PMI preserving `valid-with-deferred-export`
+- invalid concept not emitting misleading PMI obligation rows
+- CLI JSON surfacing `conceptPmiObligations`
+
+Added fixtures:
+
+- `fixtures/FirmamentV2/Language/valid/concept-pmi-obligation-satisfied.valid.firmfixture`
+- `fixtures/FirmamentV2/Language/valid/concept-pmi-obligation-missing-warning.valid.firmfixture`
+- `fixtures/FirmamentV2/Language/valid/concept-pmi-obligation-with-deferred-export.valid.firmfixture`
+- `fixtures/FirmamentV2/Language/invalid/concept-pmi-obligation-invalid-countersink.invalid.firmfixture`
+
+Also normalized missing fixture metadata on several existing Firmament V2 fixtures so corpus-style CLI tests can classify them consistently.
+
+## Explicit non-scope
+
+FORGE-CS-A4 does not add:
+
+- Firmament document mutation
+- PMI auto-creation
+- AP242 export changes
+- external concept packs
+- plugin loading
+- Roslyn compilation
+- templates
+- geometry generation
+- parser changes
+- parser registry replacement
diff --git a/fixtures/FirmamentV2/InlineStep/invalid/inline-step-v2-record-pmi-diameter-missing-tolerance.invalid.firmfixture b/fixtures/FirmamentV2/InlineStep/invalid/inline-step-v2-record-pmi-diameter-missing-tolerance.invalid.firmfixture
index 09688f38..e80df579 100644
--- a/fixtures/FirmamentV2/InlineStep/invalid/inline-step-v2-record-pmi-diameter-missing-tolerance.invalid.firmfixture
+++ b/fixtures/FirmamentV2/InlineStep/invalid/inline-step-v2-record-pmi-diameter-missing-tolerance.invalid.firmfixture
@@ -1,5 +1,12 @@
// fixture-id: inline-step-v2-record-pmi-diameter-missing-tolerance
+// case: inline-step-v2-record-pmi-diameter-missing-tolerance
+// category: InlineStep
+// syntax-version: FirmamentV2
// validity: invalid
+// implementation: parser-backed
+// expected: invalid
+// expected-stage: parsed
+// expected-diagnostic: firmament-v2-pmi-dimension-missing-tolerance
model InlineStepRecordPmiDiameterMissingTolerance {
units mm
let holeDiameter: length = 6.0mm
diff --git a/fixtures/FirmamentV2/InlineStep/invalid/inline-step-v2-record-pmi-export-deferred-flatness.invalid.firmfixture b/fixtures/FirmamentV2/InlineStep/invalid/inline-step-v2-record-pmi-export-deferred-flatness.invalid.firmfixture
index 93dfe4d7..a9c6cf99 100644
--- a/fixtures/FirmamentV2/InlineStep/invalid/inline-step-v2-record-pmi-export-deferred-flatness.invalid.firmfixture
+++ b/fixtures/FirmamentV2/InlineStep/invalid/inline-step-v2-record-pmi-export-deferred-flatness.invalid.firmfixture
@@ -1,5 +1,12 @@
// fixture-id: inline-step-v2-record-pmi-export-deferred-flatness
+// case: inline-step-v2-record-pmi-export-deferred-flatness
+// category: InlineStep
+// syntax-version: FirmamentV2
// validity: invalid
+// implementation: parser-backed
+// expected: invalid
+// expected-stage: deterministic rejection
+// expected-diagnostic: firmament-v2-pmi-export-deferred
model InlineStepRecordPmiDeferredFlatness {
units mm
solid part: InlineStep { path: "../testdata/canonical-through-hole.step" }
diff --git a/fixtures/FirmamentV2/Language/invalid/concept-cnc-minimum-tool-radius.invalid.firmfixture b/fixtures/FirmamentV2/Language/invalid/concept-cnc-minimum-tool-radius.invalid.firmfixture
index d5687ec2..df5ab6f9 100644
--- a/fixtures/FirmamentV2/Language/invalid/concept-cnc-minimum-tool-radius.invalid.firmfixture
+++ b/fixtures/FirmamentV2/Language/invalid/concept-cnc-minimum-tool-radius.invalid.firmfixture
@@ -3,6 +3,10 @@
// category: Language
// syntax-version: FirmamentV2
// validity: invalid
+// implementation: rejected
+// expected: invalid
+// expected-stage: rejected
+// expected-diagnostic: firmament-fixture-rejected
model CncMinimumToolRadiusInvalid {
units mm
diff --git a/fixtures/FirmamentV2/Language/invalid/concept-counterbore-diameter-order.invalid.firmfixture b/fixtures/FirmamentV2/Language/invalid/concept-counterbore-diameter-order.invalid.firmfixture
index 8975bbfd..b348cbb4 100644
--- a/fixtures/FirmamentV2/Language/invalid/concept-counterbore-diameter-order.invalid.firmfixture
+++ b/fixtures/FirmamentV2/Language/invalid/concept-counterbore-diameter-order.invalid.firmfixture
@@ -3,6 +3,10 @@
// category: Language
// syntax-version: FirmamentV2
// validity: invalid
+// implementation: rejected
+// expected: invalid
+// expected-stage: rejected
+// expected-diagnostic: firmament-fixture-rejected
model CounterboreDiameterOrderInvalid {
units mm
diff --git a/fixtures/FirmamentV2/Language/invalid/concept-countersink-angle-range.invalid.firmfixture b/fixtures/FirmamentV2/Language/invalid/concept-countersink-angle-range.invalid.firmfixture
index 8c67ff34..0c6fa134 100644
--- a/fixtures/FirmamentV2/Language/invalid/concept-countersink-angle-range.invalid.firmfixture
+++ b/fixtures/FirmamentV2/Language/invalid/concept-countersink-angle-range.invalid.firmfixture
@@ -3,6 +3,10 @@
// category: Language
// syntax-version: FirmamentV2
// validity: invalid
+// implementation: rejected
+// expected: invalid
+// expected-stage: rejected
+// expected-diagnostic: firmament-fixture-rejected
model CountersinkAngleRangeInvalid {
units mm
diff --git a/fixtures/FirmamentV2/Language/invalid/concept-countersink-diameter-order.invalid.firmfixture b/fixtures/FirmamentV2/Language/invalid/concept-countersink-diameter-order.invalid.firmfixture
index 5a2aea97..d90ae39e 100644
--- a/fixtures/FirmamentV2/Language/invalid/concept-countersink-diameter-order.invalid.firmfixture
+++ b/fixtures/FirmamentV2/Language/invalid/concept-countersink-diameter-order.invalid.firmfixture
@@ -3,6 +3,10 @@
// category: Language
// syntax-version: FirmamentV2
// validity: invalid
+// implementation: rejected
+// expected: invalid
+// expected-stage: rejected
+// expected-diagnostic: firmament-fixture-rejected
model CountersinkDiameterOrderInvalid {
units mm
diff --git a/fixtures/FirmamentV2/Language/invalid/concept-pmi-obligation-invalid-countersink.invalid.firmfixture b/fixtures/FirmamentV2/Language/invalid/concept-pmi-obligation-invalid-countersink.invalid.firmfixture
new file mode 100644
index 00000000..e6ba6fb4
--- /dev/null
+++ b/fixtures/FirmamentV2/Language/invalid/concept-pmi-obligation-invalid-countersink.invalid.firmfixture
@@ -0,0 +1,27 @@
+// fixture-id: concept-pmi-obligation-invalid-countersink
+// case: forge-cs-a4-concept-pmi-obligation-invalid-countersink
+// category: Language
+// syntax-version: FirmamentV2
+// validity: invalid
+// implementation: rejected
+// expected: invalid
+// expected-stage: rejected
+// expected-diagnostic: firmament-fixture-rejected
+
+model ConceptPmiObligationInvalidCountersink {
+ units mm
+
+ let d: length = 10.0mm tol 0.05mm
+ let csd: length = 8.0mm tol 0.05mm
+
+ solid part: Box {
+ size: [20, 20, 6]
+ }
+
+ feature badHole: hole<Countersink> {
+ target: part.region("holeA")
+ diameter: d
+ countersinkDiameter: csd
+ angle: 90deg
+ }
+}
diff --git a/fixtures/FirmamentV2/Language/valid/concept-pmi-obligation-missing-warning.valid.firmfixture b/fixtures/FirmamentV2/Language/valid/concept-pmi-obligation-missing-warning.valid.firmfixture
new file mode 100644
index 00000000..86181f8e
--- /dev/null
+++ b/fixtures/FirmamentV2/Language/valid/concept-pmi-obligation-missing-warning.valid.firmfixture
@@ -0,0 +1,23 @@
+// fixture-id: concept-pmi-obligation-missing-warning
+// case: forge-cs-a4-concept-pmi-obligation-missing-warning
+// category: Language
+// syntax-version: FirmamentV2
+// validity: valid
+// implementation: parser-backed
+// expected: valid
+// expected-stage: feature-air
+
+model ConceptPmiObligationMissingWarning {
+ units mm
+
+ let d: length = 6.0mm tol 0.05mm
+
+ solid part: Box {
+ size: [20, 20, 6]
+ }
+
+ feature pilotHole: hole<Shaft> {
+ target: part.region("pilotHole")
+ diameter: d
+ }
+}
diff --git a/fixtures/FirmamentV2/Language/valid/concept-pmi-obligation-satisfied.valid.firmfixture b/fixtures/FirmamentV2/Language/valid/concept-pmi-obligation-satisfied.valid.firmfixture
new file mode 100644
index 00000000..44e2c224
--- /dev/null
+++ b/fixtures/FirmamentV2/Language/valid/concept-pmi-obligation-satisfied.valid.firmfixture
@@ -0,0 +1,32 @@
+// fixture-id: concept-pmi-obligation-satisfied
+// case: forge-cs-a4-concept-pmi-obligation-satisfied
+// category: Language
+// syntax-version: FirmamentV2
+// validity: valid
+// implementation: parser-backed
+// expected: valid
+// expected-stage: feature-air
+
+model ConceptPmiObligationSatisfied {
+ units mm
+
+ let MountingPattern {
+ holeDiameter: length = 6.0mm tol 0.05mm
+ countersinkDiameter: length = 10.0mm tol 0.10mm
+ }
+
+ solid part: Box {
+ size: [20, 20, 6]
+ }
+
+ feature mountHole: hole<Countersink> {
+ target: part.region("mountHoleA")
+ diameter: MountingPattern.holeDiameter
+ countersinkDiameter: MountingPattern.countersinkDiameter
+ angle: 90deg
+ }
+
+ pmi {
+ diameter mountHoleDiameter { target: part.region("mountHoleA") dimension: MountingPattern.holeDiameter }
+ }
+}
diff --git a/fixtures/FirmamentV2/Language/valid/concept-pmi-obligation-with-deferred-export.valid.firmfixture b/fixtures/FirmamentV2/Language/valid/concept-pmi-obligation-with-deferred-export.valid.firmfixture
new file mode 100644
index 00000000..02e1b6ee
--- /dev/null
+++ b/fixtures/FirmamentV2/Language/valid/concept-pmi-obligation-with-deferred-export.valid.firmfixture
@@ -0,0 +1,30 @@
+// fixture-id: concept-pmi-obligation-with-deferred-export
+// case: forge-cs-a4-concept-pmi-obligation-with-deferred-export
+// category: Language
+// syntax-version: FirmamentV2
+// validity: valid
+// implementation: parser-backed
+// expected: valid
+// expected-stage: feature-air
+
+model ConceptPmiObligationWithDeferredExport {
+ units mm
+
+ let d: length = 6.0mm tol 0.05mm
+
+ solid part: Box {
+ size: [20, 20, 6]
+ expose {
+ face(+Z) => top
+ }
+ }
+
+ feature pilotHole: hole<Shaft> {
+ target: part.region("pilotHole")
+ diameter: d
+ }
+
+ pmi {
+ flatness topFlatness { target: top tolerance: 0.03mm }
+ }
+}
diff --git a/fixtures/FirmamentV2/Language/valid/concept-shaft-missing-tolerance-warning.valid.firmfixture b/fixtures/FirmamentV2/Language/valid/concept-shaft-missing-tolerance-warning.valid.firmfixture
index 06222b20..6f1cf0a4 100644
--- a/fixtures/FirmamentV2/Language/valid/concept-shaft-missing-tolerance-warning.valid.firmfixture
+++ b/fixtures/FirmamentV2/Language/valid/concept-shaft-missing-tolerance-warning.valid.firmfixture
@@ -3,6 +3,9 @@
// category: Language
// syntax-version: FirmamentV2
// validity: valid
+// implementation: parser-backed
+// expected: valid
+// expected-stage: feature-air
model ShaftMissingToleranceWarning {
units mm