Next Gen STEP AP242 Native-ish BREP Geometric Modeling Kernel
CIR-F15.3: reconcile F15.2 token promotion test expectations
Yuechen Li45418af8d64a
diff --git a/Aetheris.Kernel.Firmament.Tests/SurfacePatchDescriptorScaffoldTests.cs b/Aetheris.Kernel.Firmament.Tests/SurfacePatchDescriptorScaffoldTests.csindex 6a4889d2..cc604401 100644--- a/Aetheris.Kernel.Firmament.Tests/SurfacePatchDescriptorScaffoldTests.cs+++ b/Aetheris.Kernel.Firmament.Tests/SurfacePatchDescriptorScaffoldTests.cs@@ -253,7 +253,9 @@ public sealed class SurfacePatchDescriptorScaffoldTestsvar hasCanonicalInnerEvidence = generation.Candidates.Any(c =>c.RetentionRole == FacePatchRetentionRole.BaseBoundaryRetainedOutsideTool&& c.SourceSurface.Family == SurfacePatchFamily.Planar- && c.RetainedRegionLoops.Any(l => l.LoopKind == RetainedRegionLoopKind.InnerTrim && l.CircularGeometry is not null && l.Status == RetainedRegionLoopStatus.ExactReady));+ && c.RetainedRegionLoops.Any(l => l.LoopKind == RetainedRegionLoopKind.InnerTrim+ && l.CircularGeometry is not null+ && (l.Status == RetainedRegionLoopStatus.ExactReady || l.Status == RetainedRegionLoopStatus.SpecialCaseReady)));var result = new PlanarSurfaceMaterializer().EmitSupportedPlanarPatches(root);if (hasCanonicalInnerEvidence){@@ -294,7 +296,9 @@ public sealed class SurfacePatchDescriptorScaffoldTestsvar hasInner = generation.Candidates.Any(c =>c.RetentionRole == FacePatchRetentionRole.BaseBoundaryRetainedOutsideTool&& c.SourceSurface.Family == SurfacePatchFamily.Planar- && c.RetainedRegionLoops.Any(l => l.LoopKind == RetainedRegionLoopKind.InnerTrim && l.CircularGeometry is not null && l.Status == RetainedRegionLoopStatus.ExactReady));+ && c.RetainedRegionLoops.Any(l => l.LoopKind == RetainedRegionLoopKind.InnerTrim+ && l.CircularGeometry is not null+ && (l.Status == RetainedRegionLoopStatus.ExactReady || l.Status == RetainedRegionLoopStatus.SpecialCaseReady)));var innerEntries = result.Entries.SelectMany(e => e.IdentityMap?.Entries ?? []).Where(e => e.Role == EmittedTopologyRole.InnerCircularTrim && e.Kind == EmittedTopologyKind.Edge).ToArray();if (hasInner){@@ -316,7 +320,9 @@ public sealed class SurfacePatchDescriptorScaffoldTestsvar hasInner = generation.Candidates.Any(c =>c.RetentionRole == FacePatchRetentionRole.BaseBoundaryRetainedOutsideTool&& c.SourceSurface.Family == SurfacePatchFamily.Planar- && c.RetainedRegionLoops.Any(l => l.LoopKind == RetainedRegionLoopKind.InnerTrim && l.CircularGeometry is not null && l.Status == RetainedRegionLoopStatus.ExactReady));+ && c.RetainedRegionLoops.Any(l => l.LoopKind == RetainedRegionLoopKind.InnerTrim+ && l.CircularGeometry is not null+ && (l.Status == RetainedRegionLoopStatus.ExactReady || l.Status == RetainedRegionLoopStatus.SpecialCaseReady)));if (hasInner) Assert.Contains(result.Entries, e => e.IdentityMap is not null && e.IdentityMap.Entries.Any(x => x.Role == EmittedTopologyRole.InnerCircularTrim));}@@ -324,10 +330,10 @@ public sealed class SurfacePatchDescriptorScaffoldTests[Fact]public void PlanarPatchSet_BoxMinusCylinder_NoInnerCircleTokenWhenNoRetainedCircleEvidence(){- var root = new CirSubtractNode(new CirBoxNode(10, 10, 10), new CirCylinderNode(2, 12));+ var root = new CirSubtractNode(new CirBoxNode(10, 10, 10), new CirTorusNode(4, 1));var result = new PlanarSurfaceMaterializer().EmitSupportedPlanarPatches(root);Assert.DoesNotContain(result.Entries.SelectMany(e => e.IdentityMap?.Entries ?? []), e => e.Role == EmittedTopologyRole.InnerCircularTrim && e.TrimIdentityToken is not null);- Assert.Contains(result.Entries, e => e.Emitted && e.Diagnostics.Any(d => d.Contains("emitted-untrimmed-planar-patch", StringComparison.OrdinalIgnoreCase)));+ Assert.Contains(result.Entries, e => !e.Emitted && e.Diagnostics.Any(d => d.Contains("skipped-candidate-readiness", StringComparison.OrdinalIgnoreCase)));}[Fact]@@ -621,4 +627,69 @@ public sealed class SurfacePatchDescriptorScaffoldTestsAssert.False(success);Assert.Contains("does not encode bounded rectangle corners", diagnostic, StringComparison.OrdinalIgnoreCase);}+ [Fact]+ public void PlanarPatchSet_BoxMinusCylinder_EmitsInnerCircleToken_FromRealEvidence()+ {+ var root = new CirSubtractNode(new CirBoxNode(10, 10, 10), new CirCylinderNode(2, 8));+ var result = new PlanarSurfaceMaterializer().EmitSupportedPlanarPatches(root);++ var emittedInnerEntries = result.Entries+ .Where(e => e.Emitted)+ .SelectMany(e => e.IdentityMap?.Entries ?? [])+ .Where(e => e.Role == EmittedTopologyRole.InnerCircularTrim)+ .ToArray();++ Assert.NotEmpty(emittedInnerEntries);+ Assert.Contains(emittedInnerEntries, e => e.TrimIdentityToken is not null);+ Assert.Contains(result.Entries.SelectMany(e => e.Diagnostics), d => d.Contains("emitted-inner-circle-planar-patch", StringComparison.OrdinalIgnoreCase));+ Assert.Contains(result.Entries.SelectMany(e => e.Candidate.Diagnostics), d => d.Contains("loop-geometry-bind-success", StringComparison.OrdinalIgnoreCase));+ }++ [Fact]+ public void PlanarPatchSet_BoxMinusCylinder_EmittedInnerCirclePatchHasTwoLoops()+ {+ var root = new CirSubtractNode(new CirBoxNode(10, 10, 10), new CirCylinderNode(2, 8));+ var result = new PlanarSurfaceMaterializer().EmitSupportedPlanarPatches(root);+ var innerCircleEntry = result.Entries.First(e => e.Emitted && e.IdentityMap?.Entries.Any(x => x.Role == EmittedTopologyRole.InnerCircularTrim) == true);++ var body = innerCircleEntry.Emission!.Body!;+ var face = Assert.Single(body.Topology.Faces);+ Assert.Equal(2, face.LoopIds.Count);+ Assert.Contains(innerCircleEntry.Candidate.RetainedRegionLoops, l => l.CircularGeometry is not null && l.LoopKind == RetainedRegionLoopKind.InnerTrim);+ }++ [Fact]+ public void ShellAssembler_SeesMatchingPlanarAndCylindricalTokens_AfterPromotion()+ {+ var root = new CirSubtractNode(new CirBoxNode(10, 10, 10), new CirCylinderNode(2, 8));+ var result = SurfaceFamilyShellAssembler.TryAssembleBoxMinusCylinder(root);++ Assert.False(result.FullShellAssembled);+ Assert.Contains(result.Diagnostics, d => d.Contains("emitted-identity-planar-inner-circle-token-attached", StringComparison.OrdinalIgnoreCase));+ Assert.Contains(result.Diagnostics, d => d.Contains("cylindrical", StringComparison.OrdinalIgnoreCase) && d.Contains("token", StringComparison.OrdinalIgnoreCase));+ Assert.Contains(result.Diagnostics, d => d.Contains("match-candidates", StringComparison.OrdinalIgnoreCase));+ }++ [Fact]+ public void RetainedLoopBinding_BaseSidePlanarCandidate_UsesCylindricalEvidence()+ {+ var root = new CirSubtractNode(new CirBoxNode(10, 10, 10), new CirCylinderNode(2, 8));+ var candidate = FacePatchCandidateGenerator.Generate(root)+ .Candidates+ .First(c => c.RetentionRole == FacePatchRetentionRole.BaseBoundaryRetainedOutsideTool && c.SourceSurface.Family == SurfacePatchFamily.Planar);++ var circle = Assert.Single(candidate.RetainedRegionLoops.Where(l => l.OppositeSurfaceFamily == SurfacePatchFamily.Cylindrical && l.CircularGeometry is not null));+ Assert.Equal(2d, circle.CircularGeometry!.Value.Radius, 8);+ Assert.Contains(candidate.Diagnostics, d => d.Contains("loop-geometry-bind-success", StringComparison.OrdinalIgnoreCase));+ }++ [Fact]+ public void UnsafeCandidatesStillSkipPrecisely()+ {+ var root = new CirSubtractNode(new CirBoxNode(10, 10, 10), new CirTorusNode(4, 1));+ var result = new PlanarSurfaceMaterializer().EmitSupportedPlanarPatches(root);+ Assert.Contains(result.Entries.SelectMany(e => e.Diagnostics), d => d.Contains("skipped-candidate-readiness", StringComparison.OrdinalIgnoreCase));+ Assert.Contains(result.Entries.SelectMany(e => e.Candidate.Diagnostics), d => d.Contains("trim-capability-deferred", StringComparison.OrdinalIgnoreCase));+ }+}diff --git a/Aetheris.Kernel.Firmament/Execution/FacePatchCandidateDryRun.cs b/Aetheris.Kernel.Firmament/Execution/FacePatchCandidateDryRun.csindex 9cb72aab..ad79fb12 100644--- a/Aetheris.Kernel.Firmament/Execution/FacePatchCandidateDryRun.cs+++ b/Aetheris.Kernel.Firmament/Execution/FacePatchCandidateDryRun.cs@@ -358,6 +358,7 @@ internal static class FacePatchCandidateGeneratorvar families = trim.CurveFamilies.Count == 0 ? [TrimCurveFamily.Unsupported] : trim.CurveFamilies;foreach (var curveFamily in families){+ var bound = RetainedLoopGeometryBinder.TryBindCircularLoop(source, other, curveFamily, status, isBase, out var circularDiagnostic, out var circular);loops.Add(new RetainedRegionLoopDescriptor(loopKind,curveFamily,@@ -367,10 +368,8 @@ internal static class FacePatchCandidateGeneratorisBase ? source.OrientationRole : FacePatchOrientationRole.Reversed,retentionRole,status,- BuildPerLoopDiagnostic(source.Family, other.Family, curveFamily, status, trim.Reason),- RetainedLoopGeometryBinder.TryBindCircularLoop(source, other, curveFamily, status, isBase, out var circularDiagnostic, out var circular)- ? circular- : null));+ $"{BuildPerLoopDiagnostic(source.Family, other.Family, curveFamily, status, trim.Reason)} | binder-opposite={other.Provenance} | {(bound ? "loop-geometry-bind-success" : "loop-geometry-bind-skip")}: {circularDiagnostic}",+ bound ? circular : null));}}diff --git a/Aetheris.Kernel.Firmament/Execution/SurfaceFamilyShellAssembler.cs b/Aetheris.Kernel.Firmament/Execution/SurfaceFamilyShellAssembler.csindex b03e426a..9212e974 100644--- a/Aetheris.Kernel.Firmament/Execution/SurfaceFamilyShellAssembler.cs+++ b/Aetheris.Kernel.Firmament/Execution/SurfaceFamilyShellAssembler.cs@@ -52,6 +52,10 @@ internal static class SurfaceFamilyShellAssemblerdiagnostics.Add(emittedEntries.Any(e => e.Role == EmittedTopologyRole.CylindricalSeam)? "emitted-identity-cylindrical-seam-role-tagged: cylindrical seam metadata is available.": "emitted-identity-cylindrical-seam-role-missing: cylindrical seam metadata not found.");+ var cylBoundaryEntries = emittedEntries.Where(e => e.Role is EmittedTopologyRole.CylindricalTopBoundary or EmittedTopologyRole.CylindricalBottomBoundary).ToArray();+ diagnostics.Add(cylBoundaryEntries.Any(e => e.TrimIdentityToken is not null)+ ? "emitted-identity-cylindrical-boundary-token-attached: cylindrical boundary token evidence is present."+ : "emitted-identity-cylindrical-boundary-token-missing: cylindrical boundary emitted without token evidence.");var matched = emittedEntries.Where(e => e.TrimIdentityToken is { } tok && pairedTokens.Contains(tok.OrderingKey)).ToArray();diagnostics.Add(matched.Length > 0? $"emitted-identity-token-match-candidates: found {matched.Length} emitted topology candidate(s) matching dry-run shared trim identity tokens."diff --git a/Aetheris.Kernel.Firmament/Execution/SurfacePatchDescriptorScaffold.cs b/Aetheris.Kernel.Firmament/Execution/SurfacePatchDescriptorScaffold.csindex 4c605b0f..147fa603 100644--- a/Aetheris.Kernel.Firmament/Execution/SurfacePatchDescriptorScaffold.cs+++ b/Aetheris.Kernel.Firmament/Execution/SurfacePatchDescriptorScaffold.cs@@ -325,7 +325,9 @@ internal sealed class PlanarSurfaceMaterializer : ISurfaceFamilyMaterializervar readiness = new MaterializationReadinessReport(true, EmissionReadiness.EvidenceReadyForEmission, [], [], 1, 1, 1, 0, 0, 0, 0, [], false);var retainedCircles = candidate.RetainedRegionLoops- .Where(l => l.LoopKind == RetainedRegionLoopKind.InnerTrim && l.CircularGeometry is not null && l.Status == RetainedRegionLoopStatus.ExactReady)+ .Where(l => l.LoopKind == RetainedRegionLoopKind.InnerTrim+ && l.CircularGeometry is not null+ && (l.Status == RetainedRegionLoopStatus.ExactReady || l.Status == RetainedRegionLoopStatus.SpecialCaseReady)).Select(l => l.CircularGeometry!.Value).ToArray();SurfaceMaterializationResult? emission = null;@@ -333,7 +335,7 @@ internal sealed class PlanarSurfaceMaterializer : ISurfaceFamilyMaterializer{if (candidate.SourceSurface.BoundedPlanarGeometry is not { Kind: BoundedPlanarPatchGeometryKind.Rectangle }){- entries.Add(new PlanarPatchSetEntry(candidate, null, false, null, ["skipped-missing-rectangular-geometry: rectangular bounded planar geometry is required.", "skipped-missing-retained-circle-geometry: no exact-ready canonical retained circular loop geometry found for this candidate."]));+ entries.Add(new PlanarPatchSetEntry(candidate, null, false, null, ["skipped-missing-rectangular-geometry: rectangular bounded planar geometry is required.", "skipped-missing-retained-circle-geometry: no exact-ready/special-case-ready canonical retained circular loop geometry found for this candidate."]));continue;}diff --git a/docs/cir-f152-real-planar-retained-circle-promotion.md b/docs/cir-f152-real-planar-retained-circle-promotion.mdnew file mode 100644index 00000000..d48e08e3--- /dev/null+++ b/docs/cir-f152-real-planar-retained-circle-promotion.md@@ -0,0 +1,44 @@+# CIR-F15.2 — real planar retained-circle evidence promotion for `Subtract(Box,Cylinder)`++## Root cause++Bucket **A (binder diagnostics/evidence visibility gap)**: base-side planar candidates already invoked retained-loop circle binding, but diagnostics did not clearly prove binder invocation/opposite selection/token propagation in the real patch-set path. This made F15.1 investigations appear as if exact-ready retained circle geometry was absent.++## Promotion rule in this milestone++For each base-side planar candidate, retain canonical circle evidence only when all gates hold:++- trim family is `Circle`,+- loop status is `ExactReady` or `SpecialCaseReady`,+- source is planar with bounded geometry,+- opposite source is cylindrical,+- planar normal / cylinder axis relation is circular-safe,+- cylindrical evidence has finite radius,+- deterministic ordering token exists.++Otherwise diagnostics remain explicit and conservative.++## What changed++- Per-loop diagnostics now include binder invocation outcome and opposite provenance (`binder-opposite=...`, `loop-geometry-bind-success`/`loop-geometry-bind-skip`).+- Shell assembler now reports cylindrical boundary token presence vs explicit missing-token state.+- Focused tests now assert real evidence flow from `EmitSupportedPlanarPatches(Subtract(Box,Cylinder))` through planar token emission and shell visibility.++## Safety gates preserved++- No geometry/token fabrication.+- Deferred/unsupported readiness still skips.+- Multi-inner-loop planar emission still skipped.+- Non-planar and non-cylindrical opposite pairings still skipped.++## Shell assembler visibility++`SurfaceFamilyShellAssembler` remains visibility-only. It reports planar/cylindrical emitted token candidates and matching dry-run token keys, but performs no shell merge/stitching.++## SEM-A0 status++Preserved: internal-only evidence diagnostics and identity metadata; no generated user-facing topology naming.++## Recommended F16 next step++Implement topology merge/stitch execution only after adding deterministic multi-boundary token disambiguation rules (especially for cylindrical top/bottom boundary correspondence) and explicit conflict diagnostics.