Next Gen STEP AP242 Native-ish BREP Geometric Modeling Kernel
Expose concept path capabilities in CLI inspection
Yuechen Lia39ac44edfca
diff --git a/Aetheris.CLI.Tests/CanonicalCliWorkflowTests.cs b/Aetheris.CLI.Tests/CanonicalCliWorkflowTests.csindex d8a4c618..e2ff1e01 100644--- a/Aetheris.CLI.Tests/CanonicalCliWorkflowTests.cs+++ b/Aetheris.CLI.Tests/CanonicalCliWorkflowTests.cs@@ -57,6 +57,25 @@ public sealed class CanonicalCliWorkflowTestsfinally { File.Delete(source); }}+ [Fact]+ public void Inspect_ConceptPath_ReportsTypedCapabilitiesMembersAndConsumers()+ {+ var root = FindRepositoryRoot();+ var source = Path.Combine(root, "fixtures", "FirmamentV2", "Canonical", "valid", "concept-path-compose-profile.firmament");+ var stdout = new StringWriter();+ var stderr = new StringWriter();++ var exitCode = Aetheris.CLI.CliRunner.Run(["inspect", source, "--json"], stdout, stderr);++ Assert.Equal(0, exitCode);+ Assert.True(string.IsNullOrWhiteSpace(stderr.ToString()));+ using var document = JsonDocument.Parse(stdout.ToString());+ var path = Assert.Single(document.RootElement.GetProperty("conceptPaths").EnumerateArray());+ Assert.Contains(path.GetProperty("capabilities").EnumerateArray(), value => value.GetString() == "ComposeProfileOperand");+ Assert.Contains(path.GetProperty("exposedMembers").EnumerateArray(), member => member.GetProperty("stableId").GetString() == "PlateOutline.South");+ Assert.Contains(path.GetProperty("consumers").EnumerateArray(), consumer => consumer.GetProperty("kind").GetString() == "ComposeOperation");+ }+[Fact]public void Analyze_Rejects_Firmament_With_A_Clear_Route_Hint(){@@ -68,4 +87,11 @@ public sealed class CanonicalCliWorkflowTestsAssert.Equal(1, exitCode);Assert.Contains("STEP", stderr.ToString(), StringComparison.OrdinalIgnoreCase);}++ private static string FindRepositoryRoot()+ {+ var directory = new DirectoryInfo(AppContext.BaseDirectory);+ while (directory is not null && !File.Exists(Path.Combine(directory.FullName, "Aetheris.slnx"))) directory = directory.Parent;+ return directory?.FullName ?? throw new DirectoryNotFoundException("Could not find the Aetheris repository root.");+ }}diff --git a/Aetheris.CLI/CliRunner.cs b/Aetheris.CLI/CliRunner.csindex db7e81f9..bd5a9e6a 100644--- a/Aetheris.CLI/CliRunner.cs+++ b/Aetheris.CLI/CliRunner.cs@@ -649,7 +649,8 @@ public static class CliRunnerreturn 1;}- var parse = FirmamentV2Parser.Parse(File.ReadAllText(fullPath), Path.GetDirectoryName(fullPath));+ var source = File.ReadAllText(fullPath);+ var parse = FirmamentV2Parser.Parse(source, Path.GetDirectoryName(fullPath));var document = parse.Document;var success = parse.IsSuccess && document is not null;var features = document?.ModifyBlocks?.SelectMany(block =>@@ -672,13 +673,24 @@ public static class CliRunnercolumns = table.Columns,table.SourceSpan}).ToArray() ?? [],- templateInstances = document?.ConceptIr?.TemplateInstantiations?.Select(instance => new+ templateInstances = (document?.TemplateInstantiations ?? document?.ConceptIr?.TemplateInstantiations)?.Select(instance => new{instance.Template,instance.Instance,instance.SpecializationIdentity,records = instance.RecordArguments?.ToDictionary(pair => pair.Key, pair => new { pair.Value.RecordType, pair.Value.StaticValue, pair.Value.Provenance, members = pair.Value.Members })}).ToArray() ?? [],+ conceptPaths = ProfileAuthoringParser.InspectConceptPaths(source),+ recognizedRegions = document?.RecognizedRegions?.Select(region => new+ {+ region.BodyName,+ region.RegionName,+ region.Kind,+ region.FaceRefs,+ region.Confidence,+ region.Evidence,+ region.Proposal+ }).ToArray() ?? [],features,pmi = document?.Pmi?.Select(item => new { item.Kind, item.Name, item.Target }).ToArray() ?? [],assertions = document?.VolumeAssertions?.Select(assertion => new { assertion.Id, assertion.TargetBodyId, assertion.ExpectedMm3, assertion.ToleranceMm3 }).ToArray() ?? [],diff --git a/Aetheris.Kernel.Firmament.Tests/ConceptPathAuthoringTests.cs b/Aetheris.Kernel.Firmament.Tests/ConceptPathAuthoringTests.csindex d7405f8e..bd69c2ae 100644--- a/Aetheris.Kernel.Firmament.Tests/ConceptPathAuthoringTests.cs+++ b/Aetheris.Kernel.Firmament.Tests/ConceptPathAuthoringTests.cs@@ -70,6 +70,90 @@ public sealed class ConceptPathAuthoringTestsAssert.True(ResolvedProfile2DValidator.Validate(profile).IsValid);}+ [Fact]+ public void ProfileFromPath_IsAnOrdinaryComposeOperand_WithPathProvenance()+ {+ var source = Rectangle("""+ Profile Plate From Outline+ Compose Body {+ Base Stock { Profile: Plate; From: 0mm; To: 2mm; Role: Stock }+ }+ """);++ var parsed = PrismaticProfileCompositionParser.Parse(source);++ Assert.Empty(parsed.Diagnostics);+ var feature = Assert.IsType<PrismaticProfileCompositionFeature>(parsed.Feature);+ Assert.Equal("Plate", Assert.Single(feature.Operations).ProfileReference);+ var profile = Assert.IsType<ResolvedProfile2D>(parsed.Profiles["Plate"]);+ Assert.All(profile.Loops.Single().Segments, segment =>+ Assert.StartsWith("concept-path:Outline.", segment.Provenance.ConceptStableId, StringComparison.Ordinal));+ var construction = Assert.IsType<PrismaticSectionStackConstruction>(+ PrismaticSectionStackCompiler.Normalize(parsed, out var diagnostics));+ Assert.Empty(diagnostics);+ Assert.Equal(100d, construction.AnalyticVolume, 9);+ }++ [Fact]+ public void ComposePathProfile_MissingPath_ReportsSpecificCapabilityDiagnostic()+ {+ var parsed = PrismaticProfileCompositionParser.Parse("""+ Profile Plate From MissingOutline+ Compose Body {+ Base Stock { Profile: Plate; From: 0mm; To: 2mm; Role: Stock }+ }+ """);++ Assert.Null(parsed.Feature);+ Assert.Contains("profile-path-missing:Plate:MissingOutline", parsed.Diagnostics);+ Assert.Contains("compose-operation-unresolved-profile:Stock:Plate", parsed.Diagnostics);+ }++ [Fact]+ public void Inspection_ReportsExposedMembersCapabilitiesConsumersAndProvenance()+ {+ var inspection = Assert.Single(ProfileAuthoringParser.InspectConceptPaths(Rectangle("""+ Profile Plate From Outline+ Compose Body {+ Base Stock { Profile: Plate; From: 0mm; To: 2mm; Role: Stock }+ }+ """)));++ Assert.Equal("concept-path:Outline", inspection.Provenance);+ Assert.Equal(["OrderedPlanarGeometry", "ProfileSource", "ComposeProfileOperand"], inspection.Capabilities);+ Assert.Contains(inspection.ExposedMembers!, member => member.Name == "South" && member.Capability == "ProfileGuide");+ Assert.Contains(inspection.ExposedMembers!, member => member.Name == "South.End" && member.Capability == "ProfileEndpoint");+ Assert.Contains(inspection.Consumers!, consumer => consumer.Kind == "Profile" && consumer.Name == "Plate");+ Assert.Contains(inspection.Consumers!, consumer => consumer.Kind == "ComposeOperation" && consumer.Name == "Stock");+ }++ [Fact]+ public void TableRecordTemplatePathCompose_PreservesInputAndSpecializationProvenance()+ {+ var source = FirmamentCorpusHarness.ReadFixtureText("fixtures/FirmamentV2/Canonical/valid/table-template-concept-path-compose.firmament");++ var parsed = FirmamentV2Parser.Parse(source);++ Assert.True(parsed.IsSuccess, string.Join(Environment.NewLine, parsed.Diagnostics));+ var instance = Assert.Single(parsed.Document!.TemplateInstantiations!);+ Assert.Equal("PlateTemplate", instance.Template);+ Assert.Equal("Plate", instance.Instance);+ var record = Assert.Single(instance.RecordArguments!).Value;+ Assert.Equal("ThickSmall", record.StaticValue);+ Assert.Contains("Table:PlateStandards row:0 key:Small", record.Provenance, StringComparison.Ordinal);+ Assert.Contains("derivedFrom:BaseSpec", record.Provenance, StringComparison.Ordinal);+ Assert.Equal("10mm", record.Members["Thickness"]);+ var expansionDiagnostics = new List<string>();+ var expanded = Assert.IsType<FirmamentV2TemplateExpansion.Result>(+ FirmamentV2TemplateExpansion.Expand(source, expansionDiagnostics));+ var composition = PrismaticProfileCompositionParser.Parse(expanded.Source);+ Assert.Empty(expansionDiagnostics);+ Assert.Empty(composition.Diagnostics);+ var construction = Assert.IsType<PrismaticSectionStackConstruction>(+ PrismaticSectionStackCompiler.Normalize(composition, out _));+ Assert.Equal(8000d, construction.AnalyticVolume, 9);+ }+private static string Rectangle(string profile) => """Concept Path Outline {Start: Point2(0mm, 0mm)diff --git a/Aetheris.Kernel.Firmament/FirmamentV2/ConceptPathAst.cs b/Aetheris.Kernel.Firmament/FirmamentV2/ConceptPathAst.csindex 4d31b9cb..c786949d 100644--- a/Aetheris.Kernel.Firmament/FirmamentV2/ConceptPathAst.cs+++ b/Aetheris.Kernel.Firmament/FirmamentV2/ConceptPathAst.cs@@ -14,5 +14,16 @@ public sealed record AbsoluteHeading(double Degrees) : ConceptPathDirection;public sealed record ToPoint(string Reference) : ConceptPathDirection;/// <summary>Compact resolved view used by the existing profile inspection JSON.</summary>-public sealed record ConceptPathInspection(string Name, double StartX, double StartY, double InitialHeadingDegrees, IReadOnlyList<ConceptPathEntryInspection> Entries);+public sealed record ConceptPathInspection(+ string Name,+ double StartX,+ double StartY,+ double InitialHeadingDegrees,+ IReadOnlyList<ConceptPathEntryInspection> Entries,+ IReadOnlyList<string>? Capabilities = null,+ IReadOnlyList<ConceptPathExposedMemberInspection>? ExposedMembers = null,+ IReadOnlyList<ConceptPathConsumerInspection>? Consumers = null,+ string? Provenance = null);public sealed record ConceptPathEntryInspection(string Name, string Kind, double StartX, double StartY, double EndX, double EndY, double HeadingDegrees, double? Radius, double? SweepDegrees, string GuideId, string EndpointId);+public sealed record ConceptPathExposedMemberInspection(string Name, string Kind, string Capability, string StableId);+public sealed record ConceptPathConsumerInspection(string Kind, string Name, string RequiredCapability, string Provenance);diff --git a/Aetheris.Kernel.Firmament/FirmamentV2/FirmamentV2Ast.cs b/Aetheris.Kernel.Firmament/FirmamentV2/FirmamentV2Ast.csindex ea16bdaa..6946922d 100644--- a/Aetheris.Kernel.Firmament/FirmamentV2/FirmamentV2Ast.cs+++ b/Aetheris.Kernel.Firmament/FirmamentV2/FirmamentV2Ast.cs@@ -2,7 +2,7 @@ using Aetheris.Kernel.Firmament.Materializer;namespace Aetheris.Kernel.Firmament.FirmamentV2;-public sealed record FirmamentV2Document(string ModelName, string Units, IReadOnlyList<FirmamentV2SolidBinding> Solids, IReadOnlyList<FirmamentV2ModifyBlock>? ModifyBlocks = null, IReadOnlyList<FirmamentV2TemplateDecl>? Templates = null, IReadOnlyList<FirmamentV2PmiDecl>? Pmi = null, IReadOnlyList<FirmamentV2RecognizedRegion>? RecognizedRegions = null, IReadOnlyList<FirmamentV2ReplacementDecl>? Replacements = null, IReadOnlyList<FirmamentV2LetDeclaration>? Lets = null, IReadOnlyList<FirmamentV2BoundLet>? BoundLets = null, IReadOnlyList<FirmamentV2LetRecordDeclaration>? LetRecords = null, IReadOnlyList<FirmamentV2BoundLetRecord>? BoundLetRecords = null, IReadOnlyList<FirmamentV2ManufacturingConceptDeclaration>? ManufacturingConcepts = null, IReadOnlyList<FirmamentV2FeatureConceptDeclaration>? FeatureConcepts = null, FirmamentV2PmiBlock? PmiBlock = null, FirmamentV2BoundPmiBlock? BoundPmi = null, ConceptIrDocument? ConceptIr = null, IReadOnlyList<FirmamentV2LatticeFillDecl>? LatticeFills = null, IReadOnlyList<FirmamentV2StandaloneLatticeFillDecl>? StandaloneLatticeFills = null, IReadOnlyList<FirmamentV2ProfileDecl>? Profiles = null, IReadOnlyList<FirmamentV2ComposeDecl>? Composes = null, IReadOnlyList<FirmamentV2SelectionDecl>? Selections = null, FirmamentV2StaticAuthoringDocument? StaticAuthoring = null, FirmamentV2CanonicalSymbolTable? SymbolTable = null, IReadOnlyList<FirmamentV2VolumeAssertion>? VolumeAssertions = null)+public sealed record FirmamentV2Document(string ModelName, string Units, IReadOnlyList<FirmamentV2SolidBinding> Solids, IReadOnlyList<FirmamentV2ModifyBlock>? ModifyBlocks = null, IReadOnlyList<FirmamentV2TemplateDecl>? Templates = null, IReadOnlyList<FirmamentV2PmiDecl>? Pmi = null, IReadOnlyList<FirmamentV2RecognizedRegion>? RecognizedRegions = null, IReadOnlyList<FirmamentV2ReplacementDecl>? Replacements = null, IReadOnlyList<FirmamentV2LetDeclaration>? Lets = null, IReadOnlyList<FirmamentV2BoundLet>? BoundLets = null, IReadOnlyList<FirmamentV2LetRecordDeclaration>? LetRecords = null, IReadOnlyList<FirmamentV2BoundLetRecord>? BoundLetRecords = null, IReadOnlyList<FirmamentV2ManufacturingConceptDeclaration>? ManufacturingConcepts = null, IReadOnlyList<FirmamentV2FeatureConceptDeclaration>? FeatureConcepts = null, FirmamentV2PmiBlock? PmiBlock = null, FirmamentV2BoundPmiBlock? BoundPmi = null, ConceptIrDocument? ConceptIr = null, IReadOnlyList<FirmamentV2LatticeFillDecl>? LatticeFills = null, IReadOnlyList<FirmamentV2StandaloneLatticeFillDecl>? StandaloneLatticeFills = null, IReadOnlyList<FirmamentV2ProfileDecl>? Profiles = null, IReadOnlyList<FirmamentV2ComposeDecl>? Composes = null, IReadOnlyList<FirmamentV2SelectionDecl>? Selections = null, FirmamentV2StaticAuthoringDocument? StaticAuthoring = null, FirmamentV2CanonicalSymbolTable? SymbolTable = null, IReadOnlyList<FirmamentV2VolumeAssertion>? VolumeAssertions = null, IReadOnlyList<ConceptIrTemplateInstantiation>? TemplateInstantiations = null){public FirmamentV2SolidBinding Solid => Solids[^1];public FirmamentV2SideHoleIntent? SideHoleIntent => ModifyBlocks?.SelectMany(m => m.Regions.Select(r =>diff --git a/Aetheris.Kernel.Firmament/FirmamentV2/FirmamentV2Parser.cs b/Aetheris.Kernel.Firmament/FirmamentV2/FirmamentV2Parser.csindex 4291b9d2..feab9e3a 100644--- a/Aetheris.Kernel.Firmament/FirmamentV2/FirmamentV2Parser.cs+++ b/Aetheris.Kernel.Firmament/FirmamentV2/FirmamentV2Parser.cs@@ -985,7 +985,8 @@ public static class FirmamentV2ParserPmi: compositionPmi,PmiBlock: compositionPmiBlock,BoundPmi: compositionBoundPmi,- Selections: compositionSelections);+ Selections: compositionSelections,+ TemplateInstantiations: templateInstantiations);diagnostics.Add("firmament-v2-unified-canonical-advanced-parsed");diagnostics.Add("firmament-v2-profile-compose-adapted");diagnostics.Add("firmament-v2-parse-succeeded");@@ -1031,7 +1032,8 @@ public static class FirmamentV2ParserPmi: profilePmi,PmiBlock: profilePmiBlock,BoundPmi: profileBoundPmi,- Selections: profileSelections);+ Selections: profileSelections,+ TemplateInstantiations: templateInstantiations);diagnostics.Add("firmament-v2-unified-canonical-advanced-parsed");diagnostics.Add("firmament-v2-profile-adapted");diagnostics.Add("firmament-v2-parse-succeeded");diff --git a/Aetheris.Kernel.Firmament/FirmamentV2/ProfileAuthoringParser.cs b/Aetheris.Kernel.Firmament/FirmamentV2/ProfileAuthoringParser.csindex 31b68def..a918e110 100644--- a/Aetheris.Kernel.Firmament/FirmamentV2/ProfileAuthoringParser.cs+++ b/Aetheris.Kernel.Firmament/FirmamentV2/ProfileAuthoringParser.cs@@ -26,13 +26,40 @@ public static class ProfileAuthoringParserpublic static IReadOnlyList<ConceptPathInspection> InspectConceptPaths(string source){var diagnostics = new List<string>();+ var expansion = FirmamentV2TemplateExpansion.Expand(source, diagnostics);+ if (expansion is not null) source = expansion.Source;var points = new Dictionary<string, (double X, double Y)>(StringComparer.Ordinal);var guides = new Dictionary<string, LineArcProfileCurve2D>(StringComparer.Ordinal);AddOrdinaryGuides(source, points, guides, diagnostics);- return BindPaths(source, points, guides, diagnostics).Values.Select(path => new ConceptPathInspection(- path.Name, path.Start.X, path.Start.Y, path.InitialHeading,- path.Steps.Select(step => new ConceptPathEntryInspection(step.Name, step.Geometry is LineArcCircularArc2D ? "Arc" : "Line", step.Start.X, step.Start.Y, step.End.X, step.End.Y, step.Heading,- step.Geometry is LineArcCircularArc2D arc ? arc.Radius : null, step.Geometry is LineArcCircularArc2D arc2 ? arc2.SweepAngleRadians * 180d / Math.PI : null, step.GuideName, step.EndpointName)).ToArray())).ToArray();+ var profiles = FindProfiles(source).Where(profile => profile.FromPath is not null).ToArray();+ var operations = Regex.Matches(source, @"\b(?:Base|Add|Remove)\s+(?<name>[A-Za-z_]\w*)\s*\{[\s\S]*?\bProfile\s*:\s*(?<profile>[A-Za-z_]\w*)", RegexOptions.CultureInvariant)+ .Cast<Match>().Select(match => (Name: match.Groups["name"].Value, Profile: match.Groups["profile"].Value, Offset: match.Index)).ToArray();+ return BindPaths(source, points, guides, diagnostics).Values.Select(path =>+ {+ var pathProfiles = profiles.Where(profile => profile.FromPath == path.Name).ToArray();+ var profileNames = pathProfiles.Select(profile => profile.Name).ToHashSet(StringComparer.Ordinal);+ var composeOperations = operations.Where(operation => profileNames.Contains(operation.Profile)).ToArray();+ var capabilities = new List<string> { "OrderedPlanarGeometry" };+ if (pathProfiles.Length > 0) capabilities.Add("ProfileSource");+ if (composeOperations.Length > 0) capabilities.Add("ComposeProfileOperand");+ var exposed = new List<ConceptPathExposedMemberInspection>+ {+ new("Start", "Point2", "ProfileEndpoint", $"{path.Name}.Start")+ };+ exposed.AddRange(path.Steps.SelectMany(step => new[]+ {+ new ConceptPathExposedMemberInspection(step.Name, step.Geometry is LineArcCircularArc2D ? "Arc2" : "Line2", "ProfileGuide", step.GuideName),+ new ConceptPathExposedMemberInspection(step.Name + ".End", "Point2", "ProfileEndpoint", step.EndpointName)+ }));+ var consumers = pathProfiles.Select(profile => new ConceptPathConsumerInspection("Profile", profile.Name, "ProfileSource", profile.SourceSpan))+ .Concat(composeOperations.Select(operation => new ConceptPathConsumerInspection("ComposeOperation", operation.Name, "ComposeProfileOperand", $"offset:{operation.Offset}")))+ .ToArray();+ return new ConceptPathInspection(+ path.Name, path.Start.X, path.Start.Y, path.InitialHeading,+ path.Steps.Select(step => new ConceptPathEntryInspection(step.Name, step.Geometry is LineArcCircularArc2D ? "Arc" : "Line", step.Start.X, step.Start.Y, step.End.X, step.End.Y, step.Heading,+ step.Geometry is LineArcCircularArc2D arc ? arc.Radius : null, step.Geometry is LineArcCircularArc2D arc2 ? arc2.SweepAngleRadians * 180d / Math.PI : null, step.GuideName, step.EndpointName)).ToArray(),+ capabilities, exposed, consumers, $"concept-path:{path.Name}");+ }).ToArray();}public static (ResolvedProfile2D? Profile, double Height, IReadOnlyList<string> Diagnostics) Parse(string source)@@ -55,6 +82,35 @@ public static class ProfileAuthoringParserreturn (new ResolvedProfile2D(profile.Name, profile.Frame ?? "XY", loops, plane ?? ConstructionPlane.WorldXY, start, end), height, diagnostics);}+ /// <summary>+ /// Resolves every Profile whose source is a Concept Path into the ordinary+ /// resolved-profile representation consumed by extrusion and composition.+ /// Concept Path syntax is intentionally erased at this boundary; segment+ /// provenance retains the authored path and step identities.+ /// </summary>+ internal static IReadOnlyDictionary<string, ResolvedProfile2D> BindPathDerivedProfiles(string source, List<string> diagnostics)+ {+ var authoredProfiles = FindProfiles(source).Where(candidate => candidate.FromPath is not null).ToArray();+ if (authoredProfiles.Length == 0) return new Dictionary<string, ResolvedProfile2D>();+ var points = new Dictionary<string, (double X, double Y)>(StringComparer.Ordinal);+ var guides = new Dictionary<string, LineArcProfileCurve2D>(StringComparer.Ordinal);+ AddOrdinaryGuides(source, points, guides, diagnostics);+ var paths = BindPaths(source, points, guides, diagnostics);+ var profiles = new Dictionary<string, ResolvedProfile2D>(StringComparer.Ordinal);+ foreach (var profile in authoredProfiles)+ {+ var plane = ResolveConstructionPlane(source, profile.Frame, diagnostics);+ var loops = BindProfileLoops(profile, paths, points, guides, diagnostics);+ if (plane is null || loops.Count == 0) continue;+ var resolved = new ResolvedProfile2D(profile.Name, profile.Frame ?? "XY", loops, plane);+ var validation = ResolvedProfile2DValidator.Validate(resolved);+ diagnostics.AddRange(validation.Diagnostics);+ if (validation.IsValid && !profiles.TryAdd(profile.Name, resolved))+ diagnostics.Add($"profile-duplicate:{profile.Name}");+ }+ return profiles;+ }+private static void AddOrdinaryGuides(string source, Dictionary<string, (double X, double Y)> points, Dictionary<string, LineArcProfileCurve2D> guides, List<string> diagnostics){foreach (Match match in Point.Matches(source))diff --git a/Aetheris.Kernel.Firmament/Materializer/PrismaticProfileComposition.cs b/Aetheris.Kernel.Firmament/Materializer/PrismaticProfileComposition.csindex a26394fd..84e4090a 100644--- a/Aetheris.Kernel.Firmament/Materializer/PrismaticProfileComposition.cs+++ b/Aetheris.Kernel.Firmament/Materializer/PrismaticProfileComposition.cs@@ -180,6 +180,15 @@ public static class PrismaticProfileCompositionParserif (validation.IsValid) profiles.Add(profile.Name, profile);}+ // Profile is the capability boundary. Concept Path is normalized by the+ // canonical profile binder before Compose resolves its operands, so the+ // section-stack compiler never needs a path-specific lowering branch.+ foreach (var pathProfile in ProfileAuthoringParser.BindPathDerivedProfiles(source, diagnostics))+ {+ if (!profiles.TryAdd(pathProfile.Key, pathProfile.Value))+ diagnostics.Add($"compose-profile-duplicate:{pathProfile.Key}");+ }+var compose = ComposeHead.Match(source);if (!compose.Success) return new(null, profiles, diagnostics.Append("compose-source-missing-compose").ToArray());var composeBody = Block(source, compose.Index + compose.Length - 1);diff --git a/artifacts/release/preview1-capabilities.json b/artifacts/release/preview1-capabilities.jsonindex c91e76d7..59c50e86 100644--- a/artifacts/release/preview1-capabilities.json+++ b/artifacts/release/preview1-capabilities.json@@ -21,7 +21,7 @@"features": [{"id":"primitives", "status":"Supported", "scope":"Exact Box, Cylinder, RoundedBox, Frustum.", "fixturePaths":["fixtures/FirmamentV2/Canonical/valid/bare-box.firmament", "fixtures/FirmamentV2/Canonical/valid/bare-cylinder.firmament", "fixtures/FirmamentV2/Canonical/valid/bare-rounded-box.firmament", "fixtures/FirmamentV2/Canonical/valid/bare-frustum.firmament"], "diagnostics":["firmament-v2-canonical-primitive-malformed"]},{"id":"concept-struct-construction-plane", "status":"SupportedBounded", "scope":"Concept/Struct semantics and immutable traced frames; Box shaft ThroughAll on admitted signed-permutation frame.", "fixturePaths":["fixtures/FirmamentV2/Hole/valid/construction-plane-through-hole.firmament"], "diagnostics":["HoleConstructionPlaneHostUnsupported", "HoleConstructionPlaneOrientationUnsupported", "HoleConstructionPlaneExtentUnsupported"]},- {"id":"concept-path-profile-compose", "status":"SupportedBounded", "scope":"Named line/arc paths lower to Profiles for Extrude. Compose supports low-level Profile Using/Layout Segment sources only; Concept Path-derived Profiles are not admitted by Compose.", "fixturePaths":["fixtures/FirmamentV2/Canonical/valid/concept-path-rectangle.firmament", "fixtures/FirmamentV2/Canonical/valid/concept-path-low-level-mixed.firmament", "fixtures/FirmamentV2/Canonical/valid/concept-path-inner-cutout.firmament", "fixtures/FirmamentV2/Canonical/valid/profile-compose-l-bracket.firmament"], "diagnostics":["concept-path-open-profile", "concept-path-wrong-winding", "concept-path-zero-radius-arc", "compose-operation-unresolved-profile"]},+ {"id":"concept-path-profile-compose", "status":"SupportedBounded", "scope":"Named line/arc paths normalize to ordinary resolved Profiles for Extrude and Compose. The bounded path vocabulary remains ordered Line, Arc, and Close geometry.", "fixturePaths":["fixtures/FirmamentV2/Canonical/valid/concept-path-rectangle.firmament", "fixtures/FirmamentV2/Canonical/valid/concept-path-low-level-mixed.firmament", "fixtures/FirmamentV2/Canonical/valid/concept-path-inner-cutout.firmament", "fixtures/FirmamentV2/Canonical/valid/concept-path-compose-profile.firmament"], "diagnostics":["concept-path-open-profile", "concept-path-wrong-winding", "concept-path-zero-radius-arc", "profile-path-missing", "compose-operation-unresolved-profile"]},{"id":"hole-shaft", "status":"SupportedBounded", "scope":"Face-local ThroughAll and documented blind/drill-point forms; Pattern generation and bounded construction-plane route.", "fixturePaths":["fixtures/FirmamentV2/Canonical/valid/box-through-hole.firmament", "fixtures/FirmamentV2/Hole/valid/feature-v2-shaft-hole-blind-step-verified.valid.firmfixture", "fixtures/FirmamentV2/Hole/valid/construction-plane-through-hole.firmament"], "diagnostics":["HoleConstructionPlaneExtentUnsupported", "hole-x4-unknown"]},{"id":"hole-counterbore", "status":"SupportedBounded", "scope":"Required counterbore fields; primitive and +Z ThroughAll disjoint Profile/Compose host.", "fixturePaths":["fixtures/FirmamentV2/Canonical/valid/counterbore-hole.firmament", "fixtures/FirmamentV2/Canonical/valid/profile-compose-l-bracket-counterbore-pmi.firmament"], "diagnostics":["hole-x4-bad-counterbore", "ProfileBoundaryChamferIntersectsCounterbore"]},{"id":"hole-countersink", "status":"SupportedBounded", "scope":"Required diameter and degree-angle fields on admitted simple host.", "fixturePaths":["fixtures/FirmamentV2/Canonical/valid/countersink-hole.firmament", "fixtures/FirmamentV2/Hole/valid/feature-v2-countersink-step-verified.valid.firmfixture"], "diagnostics":["firmament-v2-canonical-modify-malformed"]},@@ -55,7 +55,6 @@{"fixturePath":"fixtures/FirmamentV2/Canonical/invalid/pmi-projection-override-value.firmament", "diagnostic":"firmament-v2-pmi-projected-field-must-not-override-source-constraint"},{"fixturePath":"fixtures/FirmamentV2/Canonical/invalid/pmi-projection-failed-require.firmament", "diagnostic":"Require validation gate"},{"fixturePath":"fixtures/FirmamentV2/Canonical/invalid/concept-path-open-profile.firmament", "diagnostic":"open profile"},- {"fixturePath":"fixtures/FirmamentV2/Canonical/invalid/concept-path-compose-unresolved-profile.firmament", "diagnostic":"compose-operation-unresolved-profile"},{"fixturePath":"fixtures/FirmamentV2/Canonical/invalid/profile-compose-l-bracket-edgefinish-unsupported.firmament", "diagnostic":"unsupported EdgeFinish route"},{"fixturePath":"fixtures/FirmamentV2/Canonical/invalid/profile-compose-reflex-chamfer-shaft-collision.firmament", "diagnostic":"ProfileBoundaryChamferIntersectsShaft"},{"fixturePath":"fixtures/FirmamentV2/Canonical/invalid/profile-compose-reflex-chamfer-counterbore-collision.firmament", "diagnostic":"ProfileBoundaryChamferIntersectsCounterbore"}diff --git a/docs/firmament/concept-path-m1.md b/docs/firmament/concept-path-m1.mdindex 0cc65a9a..82d0badf 100644--- a/docs/firmament/concept-path-m1.md+++ b/docs/firmament/concept-path-m1.md@@ -6,6 +6,32 @@ Ordered guide adjacency removes repeated endpoint declarations for ordinary outlThe lowering emits `Path.Start`, `Path.Step`, and `Path.Step.End` identities into the same maps consumed by normal profile authoring. No path-specific resolved profile, materializer, STEP route, role-Match map, or automatic winding correction is introduced. Branches, cursor moves, arbitrary arc constructions, and role inference remain deferred.+## Preview 2 consolidation contract++`Concept Path` is the typed, ordered planar construction described above. It is+not general object-member navigation, raw BRep traversal, mesh selection,+reflection, or a string lookup API. Its exposed semantic members are the start+point plus each named guide and endpoint. A consuming `Profile` proves closure,+winding, and region validity and normalizes the path to `ResolvedProfile2D`.++That resolved Profile is the capability boundary. Extrude and Compose consume+the same representation, and Selection may consume its named profile segments.+No downstream BRep/section-stack backend receives Concept Path syntax. Segment+provenance retains `concept-path:<Path>.<Step>` together with the Profile stable+ID and source span. `aetheris inspect <file> --json` reports path capabilities,+exposed members, consumers, and provenance.++Template expansion occurs before path binding. Consequently a Template-authored+Concept Path remains ordinary path source after scalar or typed Record/Table+substitution. The document retains Template specialization and Record/Table+provenance even when the result takes the Profile/Compose adapter route.++Firmament's bounded `Instance.Member` Concept IR expressions, recognized STEP+regions, Forge capability output descriptors, and FEA `SemanticRegionBinding`+are distinct contracts. They are not silently treated as Concept Paths. See+`docs/preview2/consolidation-gap-inventory.md` for the admitted and deferred+matrix.+The matched rectangle comparison is materially shorter without concealing connectivity:| Measure | Low-level rectangle | Concept Path rectangle |diff --git a/docs/firmament/profile-composition-x1.md b/docs/firmament/profile-composition-x1.mdindex 454af66d..9da0d01a 100644--- a/docs/firmament/profile-composition-x1.md+++ b/docs/firmament/profile-composition-x1.md@@ -22,6 +22,12 @@ Struct Part {`Base` is mandatory and unique. `Add` and `Remove` retain operation name, referenced scaffold-backed `Profile`, interval, role, and source span. The parser resolves every named profile independently using the existing `Point2`/`Line2`/`Circle2` profile route.+P2-CONSOLIDATION-M1 also admits `Profile Name From Path`. The canonical Profile+binder first erases Concept Path syntax into the same `ResolvedProfile2D`+dictionary used by low-level `Profile ... Using ...` declarations. Compose has+no path-specific operation or section-stack lowering branch, and the path/step+stable IDs remain attached to every resolved segment.+`Placement` makes the positional contract explicit. X1 accepts the current production world placement only: anchor `[0,0,0]`, profile plane `XY`, extrusion axis `+Z`, and in-plane reference direction `+X`. Other anchors/orientations reject rather than being silently ignored. Older fixtures retain a labeled legacy implicit placement; reconstruction artifacts should declare it.The Feature AIR is `PrismaticProfileCompositionFeature`; lowering creates `PrismaticSectionStackConstruction` with sorted critical levels, open slabs, explicit material regions, transition regions, provenance, and analytic volume. The emitter owns one `PrismaticSectionStackBrepPlan` and preserves deterministic slab partitions rather than aggressively merging faces.diff --git a/docs/preview2/consolidation-gap-inventory.md b/docs/preview2/consolidation-gap-inventory.mdnew file mode 100644index 00000000..06ba1ac0--- /dev/null+++ b/docs/preview2/consolidation-gap-inventory.md@@ -0,0 +1,63 @@+# Preview 2 consolidation gap inventory++This is the current cleanup source of truth. Historical milestone documents are+kept as history; current claims are classified here and in the Preview 2 feature+manifest (`docs/preview2/feature-manifest.json`).++## Closed in M1++| Gap | Result |+| --- | --- |+| Concept Path -> Profile | Already valid; contract documented as validated `ResolvedProfile2D`. |+| Concept Path-derived Profile -> Compose | Closed through one resolved-profile operand dictionary. |+| Path Profile -> Selection | Supported through ordinary named Profile segments; native fixture covers it. |+| Template-authored path | Expansion precedes path binding; no template-specific lowering. |+| Table/Record-derived Template path | Exact native fixture builds; input and specialization provenance retained. |+| Capability inspection | CLI JSON reports path capabilities, members, consumers, stable IDs, and provenance. |+| Stale Preview 1 guard/fixture | Invalid fixture promoted to valid; capability manifest and roadmap updated. |+| CIR/FRep authority wording | Historical roadmap marked superseded and linked to settled architecture. |+| SurfaceMeshIR M1-era status | Current M2-M7 capability progression called out explicitly. |++## Still Experimental++- Whole-loop mixed line/arc Profile Fillet: exact shell executes, but curved-trim+ volume verification remains too loose for promotion.+- Forge trusted extensions: deterministic and validated, but trusted/in-process,+ explicitly registered, and not a sandbox/plugin marketplace.+- Bounded recognition and recovery routes where diagnostics label them as such.++## Intentionally unsupported++- Dynamic reflection, arbitrary object walking, and string-based+ `Resolve("A.B")` language semantics.+- Raw BRep topology traversal or mesh IDs as Concept Path.+- Arbitrary CIR/SDF -> exact BRep and arbitrary BRep -> authoritative CIR.+- Spline/NURBS support surfaces in SurfaceMeshIR.+- Unsupported Modify targets without existing exact identity/topology contracts.+- Untrusted Forge extension execution and implicit assembly scanning.++## Deferred post-Preview2++- One typed semantic-reference/value layer spanning Concept IR exposure,+ recognized imported regions, Forge outputs, Selection, Modify, and AnalysisIR.+- Profile-capable and boundary-region-capable semantic value kinds for that layer.+- General imported exact-profile recognition (no new recognition was invented).+- Curved FEA boundary constraints/loads, nonlinear mechanics, contact, dynamics,+ and higher-order recovery.+- General Forge loft/multi-body assembly, production source generation, nested+ host Record construction, and broader native InlineStep parameter ergonomics.+- Rational spline trim policy and general trimmed-support meshing.++## Candidate Preview 2 follow-ups++| Rank | Gap | Friction | Risk | Cost | Evidence | Preview 2 relevance |+| ---: | --- | ---: | ---: | ---: | ---: | ---: |+| 1 | Typed semantic reference shared by Selection/FEA/Recognize | 5 | 5 | 5 | 3 | 5 |+| 2 | Preserve exact recognized-region capability metadata in common binder | 5 | 4 | 4 | 3 | 5 |+| 3 | Compose/Profile source-span modernization | 3 | 3 | 3 | 4 | 4 |+| 4 | Forge semantic output/exposure contract | 4 | 4 | 5 | 2 | 4 |+| 5 | Curved-trim certified volume for mixed Fillet | 3 | 4 | 5 | 5 | 3 |+| 6 | Forge production source generator | 2 | 2 | 3 | 3 | 2 |++Scores are ordinal 1-5. No competing runtime strategy is selected here, so a+JudgmentEngine integration would add machinery without improving the audit.diff --git a/docs/preview2/consolidation-m1.md b/docs/preview2/consolidation-m1.mdnew file mode 100644index 00000000..7bd9264d--- /dev/null+++ b/docs/preview2/consolidation-m1.md@@ -0,0 +1,83 @@+# Preview 2 consolidation M1++Status: implemented and validated for the existing Concept Path language; the+broader semantic-reference proposal is audited and deliberately deferred.++## Outcome++Firmament's `Concept Path` is an ordered planar Line/Arc/Close construction. It+normalizes into `ResolvedProfile2D` at Profile binding. P2-CONSOLIDATION-M1+removes Compose's older syntax-category restriction: path-derived and low-level+Profiles now enter the same operand dictionary, section-stack construction,+exact BRep planner, and STEP exporter. Path syntax does not reach downstream+lowering.++The durable native fixture is+`fixtures/FirmamentV2/Canonical/valid/table-template-concept-path-compose.firmament`:+Static Table row -> Static Record -> `with`-derived Record -> Template -> Concept+Path -> Profile -> Compose -> Selection -> exact STEP. The smaller direct fixture+is `fixtures/FirmamentV2/Canonical/valid/concept-path-compose-profile.firmament`.++## Semantic contract and capability rule++A path exposes its typed start point, named Line/Arc guides, and named endpoints+inside one planar frame. Profile capability is proven only by successful+`ResolvedProfile2DValidator` validation: closed ordered loops, valid winding and+nondegenerate exact line/arc geometry. The rule is structural and independent of+whether the profile originated in low-level guides or Concept Path syntax.++Compose capability is therefore “resolves to a validated `ResolvedProfile2D`,”+not “was parsed by `Profile ... Using ...`.” Selection uses the same Profile+identity and named segments. Existing Profile EdgeFinish/Chamfer/Fillet routes+continue to admit only their documented exact boundary contracts; Compose+boundary finishes and other Modify targets were not broadened.++## Provenance and inspection++Resolved segments retain Profile stable ID, `concept-path:<Path>.<Step>`, source+span, derivation, and frame. `FirmamentV2Document.TemplateInstantiations` now+retains Template specialization plus Record/Table provenance on Profile/Compose+adapter documents. `aetheris inspect --json` reports path capabilities, exposed+members, consumers, and provenance alongside Template instances.++## Audit boundary++The milestone request used “Concept Path” to also mean navigation through+Template outputs, imported recognized regions, Forge extension outputs, and FEA+regions. That language feature does not exist today. Concept IR supports bounded+compile-time `Instance.Member` expressions and materialized `Expose` metadata;+Recognize stores exact face references; FEA currently parses region paths into a+typed `SemanticRegionBinding`; Forge capabilities return construction artifacts.+None exposes a common Profile/Compose semantic-value kind. Treating their dotted+strings as paths would violate the no-reflection/no-string-escape requirements.+The required common typed semantic-reference layer is a real post-M1 compiler+feature, not a safe consolidation patch.++## Subsystem closeout++- SurfaceMeshIR: Cone, Sphere, Torus, Hyperbola trim bands, sampled+ non-rational B-spline trims on analytic supports, planar feature bands, STL,+ and OBJ are implemented. Rational spline trims and spline/NURBS support+ surfaces remain bounded/unsupported.+- Continuum: BRep is exact topology; CIR is occupied continuum; SDF is a CIR+ backend; bounded SDF-to-BRep is decompilation. The old authoritative-volume+ roadmap is marked superseded without deleting its useful history.+- FEA: basic linear elasticity, exact planar semantic boundaries, traction,+ resultant force, pressure, native Box/box-hole, and canonical imported boxes+ work. Curved weak constraints, generalized Nitsche bounds, higher-order stress+ recovery, nonlinear mechanics, contact, and dynamics remain future work.+- Forge: typed Template invocation and the sample exact construction extension+ work. One construct output, bounded prism ConstructionIR, explicit discovery,+ no generalized loft/multi-body assembly, named imported resources, and no+ production source generator remain deliberate M1 limits.+- Mixed Profile Fillet: still Experimental. Later CIR architecture changed the+ representation story but did not close the release blocker: reimported curved+ trim volume still carries roughly 41k mm^3 conservative error envelopes. It is+ not a small local promotion.++## Evidence++Machine-readable classification, the support matrix, workflow results, and CLI+hashes live under `docs/preview2/evidence/consolidation-m1/`. The ranked source of+truth for remaining work is `consolidation-gap-inventory.md`; public status is+recorded in `feature-manifest.json`.diff --git a/docs/preview2/evidence/consolidation-m1/README.md b/docs/preview2/evidence/consolidation-m1/README.mdnew file mode 100644index 00000000..1c9b6bd8--- /dev/null+++ b/docs/preview2/evidence/consolidation-m1/README.md@@ -0,0 +1,30 @@+# P2-CONSOLIDATION-M1 evidence++- `limitation-inventory.json`: classified current limitations and historical+ seams using the A-F milestone taxonomy.+- `concept-path-support-matrix.csv`: positive/negative capability matrix.+- `workflow-evidence.json`: direct, native Table/Record/Template, InlineStep,+ Forge, FEA, SurfaceMeshIR, and deterministic-hash results.++The limitation search covered public docs/manifests, compiler diagnostics, and+test skip metadata. Historical experiment/research notes were not rewritten en+masse: where they preserve a past milestone, the current architecture document+or a superseded note is authoritative. No xUnit skipped Fact/Theory declarations+were found in the audited .NET projects.++Consistency findings:++1. Preview 1 release documents accurately recorded the old Compose restriction+ but looked current in repository search; they now carry historical notices.+2. The Preview 1 capability manifest and Preview 2 roadmap contained the stale+ active limitation; both now report the closed behavior.+3. The SurfaceMeshIR M1 document listed families subsequently delivered in+ M2-M7; it now labels that paragraph as M1-era history and summarizes current+ bounds.+4. The CIR/FRep authoritative-volume roadmap predated the settled authority+ split; it now carries a superseded-architecture notice without erasing useful+ historical work.+5. FEA docs already describe basic linear elasticity as implemented and clearly+ separate future curved/nonlinear/contact/dynamics work.+6. Forge docs already state the one-output/prism/sourcegen/import/discovery+ bounds precisely; they remain deliberate rather than stale.diff --git a/docs/preview2/evidence/consolidation-m1/concept-path-support-matrix.csv b/docs/preview2/evidence/consolidation-m1/concept-path-support-matrix.csvnew file mode 100644index 00000000..7eba7817--- /dev/null+++ b/docs/preview2/evidence/consolidation-m1/concept-path-support-matrix.csv@@ -0,0 +1,9 @@+source,inspect,selection,profile,compose,modify,fea_region,expected_diagnostic_or_note+direct_native_path,Supported,Supported,Supported,Supported,BoundedProfileEdgeFinish,UnsupportedAsPath,ResolvedProfile2D contract+concept_struct_member,BoundedConceptIR,Unsupported,Unsupported,Unsupported,Unsupported,Unsupported,No common Profile semantic value kind+template_authored_path,Supported,Supported,Supported,Supported,BoundedProfileEdgeFinish,UnsupportedAsPath,Template erases before path binding+table_record_template_path,Supported,Supported,Supported,Supported,BoundedProfileEdgeFinish,UnsupportedAsPath,Input and output provenance retained+inline_step_recognized_object,RecognizeMetadata,Unsupported,Unsupported,Unsupported,ReplacementOnly,SupportedBoundedExactPlanarFace,No recognized Profile capability+forge_extension_output,CapabilityMetadata,Unsupported,Unsupported,ConstructionArtifactOnly,Unsupported,AnalysisViaForgeTemplate,No ConceptIR exposed-member bridge+scalar_path_target,TypedValueOnly,Unsupported,Rejected,Rejected,Rejected,Rejected,required capability mismatch+missing_path,Diagnostic,Rejected,Rejected,Rejected,Rejected,Rejected,profile-path-missingdiff --git a/docs/preview2/feature-manifest.json b/docs/preview2/feature-manifest.jsonnew file mode 100644index 00000000..ae9a1121--- /dev/null+++ b/docs/preview2/feature-manifest.json@@ -0,0 +1,23 @@+{+ "version": "Preview 2 consolidation M1",+ "generatedAt": "2026-08-09",+ "statuses": ["Supported", "Experimental", "Bounded", "Unsupported"],+ "features": [+ {"id":"concept-path-planar-construction","status":"Supported","reason":"Typed ordered Line/Arc/Close construction with stable guide and endpoint identities."},+ {"id":"concept-path-profile","status":"Supported","reason":"Normalizes to validated ResolvedProfile2D without flattening or backend syntax branches."},+ {"id":"concept-path-profile-compose","status":"Supported","reason":"Path-derived Profiles use the ordinary Compose operand dictionary and exact section-stack path."},+ {"id":"concept-path-profile-selection","status":"Bounded","reason":"Named ProfileSegments/Loop selection is supported; selection is not arbitrary path traversal."},+ {"id":"template-record-table-path-compose","status":"Supported","reason":"Expansion precedes binding; fixture retains specialization and input provenance."},+ {"id":"general-semantic-member-path","status":"Unsupported","reason":"No common typed semantic-reference value spans Concept IR, Recognize, Forge, Modify, and AnalysisIR."},+ {"id":"inline-step-recognize-semantic-path","status":"Bounded","reason":"Recognize exposes exact face refs for replacement/inspection, not Profile-capable semantic values."},+ {"id":"fea-linear-elasticity","status":"Supported","reason":"Native and canonical imported bounded domains, exact planar constraints, traction, force, and pressure work."},+ {"id":"fea-curved-nonlinear-contact-dynamics","status":"Unsupported","reason":"Curved weak constraints, nonlinear mechanics, contact, and dynamics are future formulations."},+ {"id":"surface-mesh-ir","status":"Bounded","reason":"Analytic supports, planar holes/bands, Hyperbola and sampled non-rational B-spline trims, STL and OBJ; no NURBS support surfaces."},+ {"id":"continuum-authority","status":"Supported","reason":"BRep exact topology and CIR occupancy dual-lower from shared constructive intent; SDF is a CIR backend."},+ {"id":"arbitrary-representation-recovery","status":"Unsupported","reason":"Arbitrary BRep-to-CIR and CIR/SDF-to-exact-BRep are not assumed."},+ {"id":"forge-template-hosting","status":"Supported","reason":"Typed Template invocation, artifact validation, imported resources, and deterministic provenance."},+ {"id":"forge-construction-extension","status":"Bounded","reason":"Trusted explicitly registered capabilities, one construct output, bounded standard prism or validated ExactBrep."},+ {"id":"forge-general-assembly-loft-sourcegen","status":"Unsupported","reason":"Multi-body/general loft/nested host Record/source generator/plugin discovery are not production features."},+ {"id":"mixed-profile-whole-loop-fillet","status":"Experimental","reason":"Exact shell executes but curved-trim certified volume envelopes remain release-loose."}+ ]+}diff --git a/docs/preview2/surface-mesh-ir-m1.md b/docs/preview2/surface-mesh-ir-m1.mdindex 365374b9..c5d79ddd 100644--- a/docs/preview2/surface-mesh-ir-m1.md+++ b/docs/preview2/surface-mesh-ir-m1.md@@ -50,3 +50,11 @@ primitives, and doubly-periodic Torus primitives. See[surface-mesh-ir-m2.md](surface-mesh-ir-m2.md) and[surface-mesh-ir-m3.md](surface-mesh-ir-m3.md); general conic trim bands andarbitrary trimmed curved patches remain deliberate legacy fallbacks.++P2-CONSOLIDATION-M1 status: the paragraph above is M1-era history, not the+current public mesh matrix. M2 closed planar holes, M3 added Cone/Sphere/Torus,+M4 added bounded Hyperbola and torus trim bands, M5 added sampled non-rational+B-spline trims on analytic supports, M6/M7 added planar decomposition and+feature bands, and the CLI exports topology-preserving OBJ. Rational spline+trims, spline/NURBS support surfaces, and arbitrary trimmed-support meshing+remain explicitly bounded or unsupported; see the consolidation inventory.diff --git a/docs/release/2.0.0-preview.1-notes.md b/docs/release/2.0.0-preview.1-notes.mdindex 31995e2a..a4f61a4c 100644--- a/docs/release/2.0.0-preview.1-notes.md+++ b/docs/release/2.0.0-preview.1-notes.md@@ -1,5 +1,8 @@# Aetheris 2.0.0-preview.1+> Historical release record. P2-CONSOLIDATION-M1 later admitted Concept+> Path-derived Profiles to Compose; limitations below describe Preview 1 only.+First public preview of Aetheris, the exact code-first CAD compiler.## Highlightsdiff --git a/docs/release/2.0.0-preview.1-release.md b/docs/release/2.0.0-preview.1-release.mdindex c7e45eec..39de8d5f 100644--- a/docs/release/2.0.0-preview.1-release.md+++ b/docs/release/2.0.0-preview.1-release.md@@ -1,5 +1,8 @@# Aetheris 2.0.0-preview.1 release evidence+> Historical release record. P2-CONSOLIDATION-M1 later admitted Concept+> Path-derived Profiles to Compose; limitations below describe Preview 1 only.+- Release commit: `0928513ce232b6297438b938c39563009d61b457`- Tag: `v2.0.0-preview.1` (annotated tag object `9166b13`)- Release timestamp: 2026-08-08T09:12:19Zdiff --git a/docs/release/preview1-docs-claudefooding.md b/docs/release/preview1-docs-claudefooding.mdindex 15a150dd..dd3174cb 100644--- a/docs/release/preview1-docs-claudefooding.md+++ b/docs/release/preview1-docs-claudefooding.md@@ -1,5 +1,8 @@# Preview 1 documentation-only authoring review+> Historical Preview 1 evidence. P2-CONSOLIDATION-M1 later closed the+> Concept Path-derived Profile -> Compose limitation recorded below.+Date: 2026-08-07Context boundary: public manual content plus ordinary `aetheris --help` output.diff --git a/docs/release/preview1-feature-freeze.md b/docs/release/preview1-feature-freeze.mdindex 54e6d9dd..d726c9bb 100644--- a/docs/release/preview1-feature-freeze.md+++ b/docs/release/preview1-feature-freeze.md@@ -1,5 +1,8 @@# Preview 1 feature freeze+> Historical freeze. P2-CONSOLIDATION-M1 later admitted Concept Path-derived+> Profiles to Compose; the table below remains the Preview 1 snapshot.+## PurposeThis is the authoritative Preview 1 support contract. It freezes thediff --git a/docs/roadmap/cir-frep-authoritative-volume-post-preview1.md b/docs/roadmap/cir-frep-authoritative-volume-post-preview1.mdindex b7b75594..2f632f6b 100644--- a/docs/roadmap/cir-frep-authoritative-volume-post-preview1.md+++ b/docs/roadmap/cir-frep-authoritative-volume-post-preview1.md@@ -1,5 +1,13 @@# CIR/FRep authoritative volume after Preview 1+> **Superseded architecture note (Preview 2):** this proposal is retained as+> historical design context. CIR is now occupied-continuum authority, SDF is a+> CIR backend, and BRep remains exact boundary/topology authority. Generated+> dual representations lower independently from shared constructive intent;+> bounded SDF-to-BRep routes are decompilation/intent recovery, not topology+> ownership. See `docs/continuum/architecture.md`. The still-open certified+> volume work below does not transfer exact-topology authority to CIR.+## TargetMake `Assert Volume` consume a deterministic CIR/FRep occupied-volume result with an explicit absolute error interval, while independently requiring exact-BRep STEP reimport and topology validation.diff --git a/docs/roadmap/preview2-start.md b/docs/roadmap/preview2-start.mdindex 82087150..0e579ede 100644--- a/docs/roadmap/preview2-start.md+++ b/docs/roadmap/preview2-start.md@@ -6,7 +6,7 @@ starts from its frozen support matrix; it does not retroactively expand Preview- CIR/FRep authoritative occupied-volume evidence and whole-loop Fillet CIR lowering.- Re-evaluate promotion of experimental mixed whole-loop Fillet after that evidence.-- Admit Concept Path-derived Profiles to Compose.+- [Closed in P2-CONSOLIDATION-M1] Admit Concept Path-derived Profiles to Compose through the ordinary resolved-Profile contract.- Carry canonical-parser diagnostic source spans end to end.- Refactor Cadmata around MachinaLayout.js and consolidate its TSPack path.- Broaden foreign STEP boundary and negative-coverage testing without claiming general recovery.diff --git a/fixtures/FirmamentV2/Canonical/invalid/concept-path-compose-unresolved-profile.firmament b/fixtures/FirmamentV2/Canonical/valid/concept-path-compose-profile.firmamentsimilarity index 69%rename from fixtures/FirmamentV2/Canonical/invalid/concept-path-compose-unresolved-profile.firmamentrename to fixtures/FirmamentV2/Canonical/valid/concept-path-compose-profile.firmamentindex c910a2ee..102e59de 100644--- a/fixtures/FirmamentV2/Canonical/invalid/concept-path-compose-unresolved-profile.firmament+++ b/fixtures/FirmamentV2/Canonical/valid/concept-path-compose-profile.firmament@@ -1,4 +1,4 @@-Model ConceptPathComposeUnresolvedProfile {+Model ConceptPathComposeProfile {Units: mmConcept Path PlateOutline {@@ -16,4 +16,9 @@ Model ConceptPathComposeUnresolvedProfile {Base Stock { Profile: PlateProfile; From: 0mm; To: 10mm; Role: Stock }}}+ Selection PlateTopBoundary {+ Target: TopBoundary+ Source: PlateProfile.ProfileSegments([South, East, North, West])+ Require: ClosedLoop+ }}diff --git a/fixtures/FirmamentV2/Canonical/valid/table-template-concept-path-compose.firmament b/fixtures/FirmamentV2/Canonical/valid/table-template-concept-path-compose.firmamentnew file mode 100644index 00000000..28acca6e--- /dev/null+++ b/fixtures/FirmamentV2/Canonical/valid/table-template-concept-path-compose.firmament@@ -0,0 +1,48 @@+Model TableTemplateConceptPathCompose {+ Units: mm+ Enum PlateKind { Small Large }+ Record PlateStandard {+ Kind: PlateKind+ Width: Length+ Height: Length+ }+ Record PlateSpec {+ Standard: PlateStandard+ Thickness: Length+ }+ Static Table PlateStandards: PlateStandard Key: Kind {+ Kind: [Small, Large]+ Width: [40mm, 80mm]+ Height: [20mm, 30mm]+ }+ Static SmallStandard = PlateStandards[Small]+ Static BaseSpec: PlateSpec = PlateSpec {+ Standard: SmallStandard+ Thickness: 8mm+ }+ Static ThickSmall = BaseSpec with {+ Thickness: 10mm+ }+ Template < Spec: PlateSpec >+ Struct PlateTemplate {+ Require Positive => Spec.Standard.Width > 0mm && Spec.Standard.Height > 0mm && Spec.Thickness > 0mm+ Concept Path Outline {+ Start: Point2(0mm, 0mm)+ Heading: 0deg+ Line South { Length: Spec.Standard.Width }+ Line East { Turn: 90deg; Length: Spec.Standard.Height }+ Line North { Turn: 90deg; Length: Spec.Standard.Width }+ Close West+ }+ Profile PlateProfile From Outline+ Compose Body {+ Base Stock { Profile: PlateProfile; From: 0mm; To: Spec.Thickness; Role: Stock }+ }+ Selection TopBoundary {+ Target: TopBoundary+ Source: PlateProfile.ProfileSegments([South, East, North, West])+ Require: ClosedLoop+ }+ }+ Struct Plate = PlateTemplate < Spec: ThickSmall >+}