Skip to content

Next Gen STEP AP242 Native-ish BREP Geometric Modeling Kernel

refactor(cir-5s-a0): sort CIR/FRep code into Materializer and Diagnostics namespaces

Yuechen Li8ebc793c9f65
diff --git a/Aetheris.Firmament.FrictionLab/CIRLab/CirBrepX4RecognizerSourceContractLab.cs b/Aetheris.Firmament.FrictionLab/CIRLab/CirBrepX4RecognizerSourceContractLab.cs
index 3652678e..0644bb73 100644
--- a/Aetheris.Firmament.FrictionLab/CIRLab/CirBrepX4RecognizerSourceContractLab.cs
+++ b/Aetheris.Firmament.FrictionLab/CIRLab/CirBrepX4RecognizerSourceContractLab.cs
@@ -3,6 +3,8 @@ using Aetheris.Kernel.Core.Cir;
using Aetheris.Kernel.Core.Math;
using Aetheris.Kernel.Firmament;
using Aetheris.Kernel.Firmament.Execution;
+using Aetheris.Kernel.Firmament.Materializer;
+using Aetheris.Kernel.Firmament.Diagnostics;
using Aetheris.Kernel.Firmament.Lowering;
namespace Aetheris.FrictionLab;
diff --git a/Aetheris.Firmament.FrictionLab/CIRLab/FrepBrepRecoveryPolicyLab.cs b/Aetheris.Firmament.FrictionLab/CIRLab/FrepBrepRecoveryPolicyLab.cs
index 9c85e723..3344a87b 100644
--- a/Aetheris.Firmament.FrictionLab/CIRLab/FrepBrepRecoveryPolicyLab.cs
+++ b/Aetheris.Firmament.FrictionLab/CIRLab/FrepBrepRecoveryPolicyLab.cs
@@ -1,6 +1,8 @@
using Aetheris.Kernel.Core.Cir;
using Aetheris.Kernel.Core.Judgment;
using Aetheris.Kernel.Firmament.Execution;
+using Aetheris.Kernel.Firmament.Materializer;
+using Aetheris.Kernel.Firmament.Diagnostics;
namespace Aetheris.FrictionLab;
diff --git a/Aetheris.FrictionLab.Tests/CIRLab/CirBrepX31FirmamentLoweringEntrypointLabTests.cs b/Aetheris.FrictionLab.Tests/CIRLab/CirBrepX31FirmamentLoweringEntrypointLabTests.cs
index 43b7a02d..88d4adb2 100644
--- a/Aetheris.FrictionLab.Tests/CIRLab/CirBrepX31FirmamentLoweringEntrypointLabTests.cs
+++ b/Aetheris.FrictionLab.Tests/CIRLab/CirBrepX31FirmamentLoweringEntrypointLabTests.cs
@@ -3,6 +3,8 @@ using Aetheris.FrictionLab;
using Aetheris.Kernel.Core.Cir;
using Aetheris.Kernel.Firmament;
using Aetheris.Kernel.Firmament.Execution;
+using Aetheris.Kernel.Firmament.Materializer;
+using Aetheris.Kernel.Firmament.Diagnostics;
using Aetheris.Kernel.Firmament.Lowering;
using Aetheris.Kernel.StandardLibrary;
diff --git a/Aetheris.FrictionLab.Tests/CIRLab/CirBrepX4RecognizerSourceContractLabTests.cs b/Aetheris.FrictionLab.Tests/CIRLab/CirBrepX4RecognizerSourceContractLabTests.cs
index 81c5f727..fef63ad0 100644
--- a/Aetheris.FrictionLab.Tests/CIRLab/CirBrepX4RecognizerSourceContractLabTests.cs
+++ b/Aetheris.FrictionLab.Tests/CIRLab/CirBrepX4RecognizerSourceContractLabTests.cs
@@ -3,6 +3,8 @@ using Aetheris.Kernel.Core.Cir;
using Aetheris.Kernel.Core.Math;
using Aetheris.Kernel.Firmament;
using Aetheris.Kernel.Firmament.Execution;
+using Aetheris.Kernel.Firmament.Materializer;
+using Aetheris.Kernel.Firmament.Diagnostics;
using Aetheris.Kernel.Firmament.Lowering;
namespace Aetheris.FrictionLab.Tests.CIRLab;
diff --git a/Aetheris.Kernel.Firmament.Tests/CirBoxCylinderRecognizerTests.cs b/Aetheris.Kernel.Firmament.Tests/CirBoxCylinderRecognizerTests.cs
index fb597658..5c292ef7 100644
--- a/Aetheris.Kernel.Firmament.Tests/CirBoxCylinderRecognizerTests.cs
+++ b/Aetheris.Kernel.Firmament.Tests/CirBoxCylinderRecognizerTests.cs
@@ -2,6 +2,8 @@ using Aetheris.Kernel.Core.Cir;
using Aetheris.Kernel.Core.Math;
using Aetheris.Kernel.Core.Numerics;
using Aetheris.Kernel.Firmament.Execution;
+using Aetheris.Kernel.Firmament.Materializer;
+using Aetheris.Kernel.Firmament.Diagnostics;
namespace Aetheris.Kernel.Firmament.Tests;
diff --git a/Aetheris.Kernel.Firmament.Tests/CirBrepMaterializerTests.cs b/Aetheris.Kernel.Firmament.Tests/CirBrepMaterializerTests.cs
index f5c2439a..74a15bea 100644
--- a/Aetheris.Kernel.Firmament.Tests/CirBrepMaterializerTests.cs
+++ b/Aetheris.Kernel.Firmament.Tests/CirBrepMaterializerTests.cs
@@ -1,6 +1,8 @@
using Aetheris.Kernel.Core.Cir;
using Aetheris.Kernel.Core.Math;
using Aetheris.Kernel.Firmament.Execution;
+using Aetheris.Kernel.Firmament.Materializer;
+using Aetheris.Kernel.Firmament.Diagnostics;
using Aetheris.Kernel.Firmament.Lowering;
namespace Aetheris.Kernel.Firmament.Tests;
diff --git a/Aetheris.Kernel.Firmament.Tests/CombinedPatchBodyRemapperTests.cs b/Aetheris.Kernel.Firmament.Tests/CombinedPatchBodyRemapperTests.cs
index 7c1996e9..7a098a16 100644
--- a/Aetheris.Kernel.Firmament.Tests/CombinedPatchBodyRemapperTests.cs
+++ b/Aetheris.Kernel.Firmament.Tests/CombinedPatchBodyRemapperTests.cs
@@ -1,5 +1,7 @@
using Aetheris.Kernel.Core.Cir;
using Aetheris.Kernel.Firmament.Execution;
+using Aetheris.Kernel.Firmament.Materializer;
+using Aetheris.Kernel.Firmament.Diagnostics;
namespace Aetheris.Kernel.Firmament.Tests;
diff --git a/Aetheris.Kernel.Firmament.Tests/D3PlacementSemanticsTruthExtractionTests.cs b/Aetheris.Kernel.Firmament.Tests/D3PlacementSemanticsTruthExtractionTests.cs
index b8c4513f..5f9cb499 100644
--- a/Aetheris.Kernel.Firmament.Tests/D3PlacementSemanticsTruthExtractionTests.cs
+++ b/Aetheris.Kernel.Firmament.Tests/D3PlacementSemanticsTruthExtractionTests.cs
@@ -3,6 +3,8 @@ using Aetheris.Kernel.Core.Brep.Boolean;
using Aetheris.Kernel.Core.Math;
using Aetheris.Kernel.Core.Numerics;
using Aetheris.Kernel.Firmament.Execution;
+using Aetheris.Kernel.Firmament.Materializer;
+using Aetheris.Kernel.Firmament.Diagnostics;
using Aetheris.Kernel.Firmament.Lowering;
using Aetheris.Kernel.Firmament.Parsing;
using Aetheris.Kernel.Firmament.Validation;
diff --git a/Aetheris.Kernel.Firmament.Tests/DuplicateEdgeCleanupPlannerTests.cs b/Aetheris.Kernel.Firmament.Tests/DuplicateEdgeCleanupPlannerTests.cs
index 89fd100c..064b0951 100644
--- a/Aetheris.Kernel.Firmament.Tests/DuplicateEdgeCleanupPlannerTests.cs
+++ b/Aetheris.Kernel.Firmament.Tests/DuplicateEdgeCleanupPlannerTests.cs
@@ -1,5 +1,7 @@
using Aetheris.Kernel.Core.Cir;
using Aetheris.Kernel.Firmament.Execution;
+using Aetheris.Kernel.Firmament.Materializer;
+using Aetheris.Kernel.Firmament.Diagnostics;
namespace Aetheris.Kernel.Firmament.Tests;
diff --git a/Aetheris.Kernel.Firmament.Tests/EmittedTokenPairingAnalyzerTests.cs b/Aetheris.Kernel.Firmament.Tests/EmittedTokenPairingAnalyzerTests.cs
index a70c44b2..a88f3c9d 100644
--- a/Aetheris.Kernel.Firmament.Tests/EmittedTokenPairingAnalyzerTests.cs
+++ b/Aetheris.Kernel.Firmament.Tests/EmittedTokenPairingAnalyzerTests.cs
@@ -1,5 +1,7 @@
using Aetheris.Kernel.Core.Cir;
using Aetheris.Kernel.Firmament.Execution;
+using Aetheris.Kernel.Firmament.Materializer;
+using Aetheris.Kernel.Firmament.Diagnostics;
namespace Aetheris.Kernel.Firmament.Tests;
diff --git a/Aetheris.Kernel.Firmament.Tests/FacePatchCandidateDryRunTests.cs b/Aetheris.Kernel.Firmament.Tests/FacePatchCandidateDryRunTests.cs
index 10de59f7..b162123e 100644
--- a/Aetheris.Kernel.Firmament.Tests/FacePatchCandidateDryRunTests.cs
+++ b/Aetheris.Kernel.Firmament.Tests/FacePatchCandidateDryRunTests.cs
@@ -1,6 +1,8 @@
using Aetheris.Kernel.Core.Cir;
using Aetheris.Kernel.Core.Math;
using Aetheris.Kernel.Firmament.Execution;
+using Aetheris.Kernel.Firmament.Materializer;
+using Aetheris.Kernel.Firmament.Diagnostics;
namespace Aetheris.Kernel.Firmament.Tests;
diff --git a/Aetheris.Kernel.Firmament.Tests/FirmamentBooleanCanonicalSuccessTests.cs b/Aetheris.Kernel.Firmament.Tests/FirmamentBooleanCanonicalSuccessTests.cs
index 105beea2..ef33e959 100644
--- a/Aetheris.Kernel.Firmament.Tests/FirmamentBooleanCanonicalSuccessTests.cs
+++ b/Aetheris.Kernel.Firmament.Tests/FirmamentBooleanCanonicalSuccessTests.cs
@@ -1,5 +1,7 @@
using Aetheris.Kernel.Core.Diagnostics;
using Aetheris.Kernel.Firmament.Execution;
+using Aetheris.Kernel.Firmament.Materializer;
+using Aetheris.Kernel.Firmament.Diagnostics;
using Aetheris.Kernel.Firmament.Lowering;
namespace Aetheris.Kernel.Firmament.Tests;
diff --git a/Aetheris.Kernel.Firmament.Tests/FirmamentCirDifferentialAnalysisTests.cs b/Aetheris.Kernel.Firmament.Tests/FirmamentCirDifferentialAnalysisTests.cs
index aaae7eb5..c7c766b5 100644
--- a/Aetheris.Kernel.Firmament.Tests/FirmamentCirDifferentialAnalysisTests.cs
+++ b/Aetheris.Kernel.Firmament.Tests/FirmamentCirDifferentialAnalysisTests.cs
@@ -3,6 +3,8 @@ using Aetheris.Kernel.Core.Brep.Queries;
using Aetheris.Kernel.Core.Cir;
using Aetheris.Kernel.Core.Math;
using Aetheris.Kernel.Firmament.Execution;
+using Aetheris.Kernel.Firmament.Materializer;
+using Aetheris.Kernel.Firmament.Diagnostics;
using Aetheris.Kernel.Firmament.Lowering;
using System.Globalization;
using System.Text.Json;
diff --git a/Aetheris.Kernel.Firmament.Tests/FirmamentPlacementAnchorSemanticsTests.cs b/Aetheris.Kernel.Firmament.Tests/FirmamentPlacementAnchorSemanticsTests.cs
index fdfc60fb..897fb1ae 100644
--- a/Aetheris.Kernel.Firmament.Tests/FirmamentPlacementAnchorSemanticsTests.cs
+++ b/Aetheris.Kernel.Firmament.Tests/FirmamentPlacementAnchorSemanticsTests.cs
@@ -1,5 +1,7 @@
using Aetheris.Kernel.Core.Math;
using Aetheris.Kernel.Firmament.Execution;
+using Aetheris.Kernel.Firmament.Materializer;
+using Aetheris.Kernel.Firmament.Diagnostics;
using Aetheris.Kernel.Firmament.Lowering;
namespace Aetheris.Kernel.Firmament.Tests;
diff --git a/Aetheris.Kernel.Firmament.Tests/FirmamentPrimitiveExecutionTests.cs b/Aetheris.Kernel.Firmament.Tests/FirmamentPrimitiveExecutionTests.cs
index dac083f0..35126a5e 100644
--- a/Aetheris.Kernel.Firmament.Tests/FirmamentPrimitiveExecutionTests.cs
+++ b/Aetheris.Kernel.Firmament.Tests/FirmamentPrimitiveExecutionTests.cs
@@ -2,6 +2,8 @@ using System.Linq;
using Aetheris.Kernel.Core.Brep;
using Aetheris.Kernel.Firmament.Lowering;
using Aetheris.Kernel.Firmament.Execution;
+using Aetheris.Kernel.Firmament.Materializer;
+using Aetheris.Kernel.Firmament.Diagnostics;
using Aetheris.Kernel.Core.Math;
using Aetheris.Kernel.Core.Topology;
diff --git a/Aetheris.Kernel.Firmament.Tests/FirmamentStepExporterTests.cs b/Aetheris.Kernel.Firmament.Tests/FirmamentStepExporterTests.cs
index f5a7393c..bcdda40c 100644
--- a/Aetheris.Kernel.Firmament.Tests/FirmamentStepExporterTests.cs
+++ b/Aetheris.Kernel.Firmament.Tests/FirmamentStepExporterTests.cs
@@ -2,6 +2,8 @@ using System.Linq;
using Aetheris.Kernel.Core.Step242;
using Aetheris.Kernel.Core.Math;
using Aetheris.Kernel.Firmament.Execution;
+using Aetheris.Kernel.Firmament.Materializer;
+using Aetheris.Kernel.Firmament.Diagnostics;
using Aetheris.Kernel.Firmament.Lowering;
namespace Aetheris.Kernel.Firmament.Tests;
diff --git a/Aetheris.Kernel.Firmament.Tests/FirmamentValidationExecutionTests.cs b/Aetheris.Kernel.Firmament.Tests/FirmamentValidationExecutionTests.cs
index c8d13a28..46866730 100644
--- a/Aetheris.Kernel.Firmament.Tests/FirmamentValidationExecutionTests.cs
+++ b/Aetheris.Kernel.Firmament.Tests/FirmamentValidationExecutionTests.cs
@@ -1,6 +1,8 @@
using Aetheris.Kernel.Core.Brep;
using Aetheris.Kernel.Core.Topology;
using Aetheris.Kernel.Firmament.Execution;
+using Aetheris.Kernel.Firmament.Materializer;
+using Aetheris.Kernel.Firmament.Diagnostics;
using Aetheris.Kernel.Firmament.Lowering;
using Aetheris.Kernel.Firmament.ParsedModel;
diff --git a/Aetheris.Kernel.Firmament.Tests/G3DebugSpanAlignmentTests.cs b/Aetheris.Kernel.Firmament.Tests/G3DebugSpanAlignmentTests.cs
index 0567f429..c3dcaf50 100644
--- a/Aetheris.Kernel.Firmament.Tests/G3DebugSpanAlignmentTests.cs
+++ b/Aetheris.Kernel.Firmament.Tests/G3DebugSpanAlignmentTests.cs
@@ -4,6 +4,8 @@ using Aetheris.Kernel.Core.Geometry;
using Aetheris.Kernel.Core.Math;
using Aetheris.Kernel.Core.Numerics;
using Aetheris.Kernel.Firmament.Execution;
+using Aetheris.Kernel.Firmament.Materializer;
+using Aetheris.Kernel.Firmament.Diagnostics;
using Aetheris.Kernel.Firmament.Lowering;
using Aetheris.Kernel.Firmament.Parsing;
using Aetheris.Kernel.Firmament.Validation;
diff --git a/Aetheris.Kernel.Firmament.Tests/MaterializationReadinessAnalyzerTests.cs b/Aetheris.Kernel.Firmament.Tests/MaterializationReadinessAnalyzerTests.cs
index 4836654f..b62d3524 100644
--- a/Aetheris.Kernel.Firmament.Tests/MaterializationReadinessAnalyzerTests.cs
+++ b/Aetheris.Kernel.Firmament.Tests/MaterializationReadinessAnalyzerTests.cs
@@ -1,5 +1,7 @@
using Aetheris.Kernel.Core.Cir;
using Aetheris.Kernel.Firmament.Execution;
+using Aetheris.Kernel.Firmament.Materializer;
+using Aetheris.Kernel.Firmament.Diagnostics;
namespace Aetheris.Kernel.Firmament.Tests;
diff --git a/Aetheris.Kernel.Firmament.Tests/NativeGeometryStateDifferentialHelper.cs b/Aetheris.Kernel.Firmament.Tests/NativeGeometryStateDifferentialHelper.cs
index bec185d8..8b9d3ab6 100644
--- a/Aetheris.Kernel.Firmament.Tests/NativeGeometryStateDifferentialHelper.cs
+++ b/Aetheris.Kernel.Firmament.Tests/NativeGeometryStateDifferentialHelper.cs
@@ -1,6 +1,8 @@
using Aetheris.Kernel.Core.Brep;
using Aetheris.Kernel.Core.Math;
using Aetheris.Kernel.Firmament.Execution;
+using Aetheris.Kernel.Firmament.Materializer;
+using Aetheris.Kernel.Firmament.Diagnostics;
namespace Aetheris.Kernel.Firmament.Tests;
diff --git a/Aetheris.Kernel.Firmament.Tests/NativeGeometryStateTests.cs b/Aetheris.Kernel.Firmament.Tests/NativeGeometryStateTests.cs
index 03bb41ab..9b243ff8 100644
--- a/Aetheris.Kernel.Firmament.Tests/NativeGeometryStateTests.cs
+++ b/Aetheris.Kernel.Firmament.Tests/NativeGeometryStateTests.cs
@@ -1,5 +1,7 @@
using Aetheris.Kernel.Core.Math;
using Aetheris.Kernel.Firmament.Execution;
+using Aetheris.Kernel.Firmament.Materializer;
+using Aetheris.Kernel.Firmament.Diagnostics;
namespace Aetheris.Kernel.Firmament.Tests;
diff --git a/Aetheris.Kernel.Firmament.Tests/RestrictedContourSnapAnalyzerTests.cs b/Aetheris.Kernel.Firmament.Tests/RestrictedContourSnapAnalyzerTests.cs
index ae72b884..47826d48 100644
--- a/Aetheris.Kernel.Firmament.Tests/RestrictedContourSnapAnalyzerTests.cs
+++ b/Aetheris.Kernel.Firmament.Tests/RestrictedContourSnapAnalyzerTests.cs
@@ -1,5 +1,7 @@
using Aetheris.Kernel.Core.Cir;
using Aetheris.Kernel.Firmament.Execution;
+using Aetheris.Kernel.Firmament.Materializer;
+using Aetheris.Kernel.Firmament.Diagnostics;
namespace Aetheris.Kernel.Firmament.Tests;
diff --git a/Aetheris.Kernel.Firmament.Tests/RestrictedContourSnapSelectionTests.cs b/Aetheris.Kernel.Firmament.Tests/RestrictedContourSnapSelectionTests.cs
index 5b8aeb2c..682ac1a8 100644
--- a/Aetheris.Kernel.Firmament.Tests/RestrictedContourSnapSelectionTests.cs
+++ b/Aetheris.Kernel.Firmament.Tests/RestrictedContourSnapSelectionTests.cs
@@ -1,5 +1,7 @@
using Aetheris.Kernel.Core.Cir;
using Aetheris.Kernel.Firmament.Execution;
+using Aetheris.Kernel.Firmament.Materializer;
+using Aetheris.Kernel.Firmament.Diagnostics;
namespace Aetheris.Kernel.Firmament.Tests;
diff --git a/Aetheris.Kernel.Firmament.Tests/RetainedLoopTrimOracleIntegrationTests.cs b/Aetheris.Kernel.Firmament.Tests/RetainedLoopTrimOracleIntegrationTests.cs
index 0bc2e84f..b782583e 100644
--- a/Aetheris.Kernel.Firmament.Tests/RetainedLoopTrimOracleIntegrationTests.cs
+++ b/Aetheris.Kernel.Firmament.Tests/RetainedLoopTrimOracleIntegrationTests.cs
@@ -1,5 +1,7 @@
using Aetheris.Kernel.Core.Cir;
using Aetheris.Kernel.Firmament.Execution;
+using Aetheris.Kernel.Firmament.Materializer;
+using Aetheris.Kernel.Firmament.Diagnostics;
namespace Aetheris.Kernel.Firmament.Tests;
diff --git a/Aetheris.Kernel.Firmament.Tests/ShellStitchingDryRunTests.cs b/Aetheris.Kernel.Firmament.Tests/ShellStitchingDryRunTests.cs
index ab602d83..49421847 100644
--- a/Aetheris.Kernel.Firmament.Tests/ShellStitchingDryRunTests.cs
+++ b/Aetheris.Kernel.Firmament.Tests/ShellStitchingDryRunTests.cs
@@ -1,5 +1,7 @@
using Aetheris.Kernel.Core.Cir;
using Aetheris.Kernel.Firmament.Execution;
+using Aetheris.Kernel.Firmament.Materializer;
+using Aetheris.Kernel.Firmament.Diagnostics;
namespace Aetheris.Kernel.Firmament.Tests;
diff --git a/Aetheris.Kernel.Firmament.Tests/SourceSurfaceAndTrimCapabilityTests.cs b/Aetheris.Kernel.Firmament.Tests/SourceSurfaceAndTrimCapabilityTests.cs
index 9400bd60..fe258560 100644
--- a/Aetheris.Kernel.Firmament.Tests/SourceSurfaceAndTrimCapabilityTests.cs
+++ b/Aetheris.Kernel.Firmament.Tests/SourceSurfaceAndTrimCapabilityTests.cs
@@ -1,6 +1,8 @@
using Aetheris.Kernel.Core.Cir;
using Aetheris.Kernel.Core.Math;
using Aetheris.Kernel.Firmament.Execution;
+using Aetheris.Kernel.Firmament.Materializer;
+using Aetheris.Kernel.Firmament.Diagnostics;
namespace Aetheris.Kernel.Firmament.Tests;
diff --git a/Aetheris.Kernel.Firmament.Tests/SurfaceFamilyBoxCylinderPressureTestTests.cs b/Aetheris.Kernel.Firmament.Tests/SurfaceFamilyBoxCylinderPressureTestTests.cs
index b0602c50..51436239 100644
--- a/Aetheris.Kernel.Firmament.Tests/SurfaceFamilyBoxCylinderPressureTestTests.cs
+++ b/Aetheris.Kernel.Firmament.Tests/SurfaceFamilyBoxCylinderPressureTestTests.cs
@@ -1,5 +1,7 @@
using Aetheris.Kernel.Core.Cir;
using Aetheris.Kernel.Firmament.Execution;
+using Aetheris.Kernel.Firmament.Materializer;
+using Aetheris.Kernel.Firmament.Diagnostics;
namespace Aetheris.Kernel.Firmament.Tests;
diff --git a/Aetheris.Kernel.Firmament.Tests/SurfaceFamilyShellAssemblerTests.cs b/Aetheris.Kernel.Firmament.Tests/SurfaceFamilyShellAssemblerTests.cs
index ffce36ae..80dcd820 100644
--- a/Aetheris.Kernel.Firmament.Tests/SurfaceFamilyShellAssemblerTests.cs
+++ b/Aetheris.Kernel.Firmament.Tests/SurfaceFamilyShellAssemblerTests.cs
@@ -1,5 +1,7 @@
using Aetheris.Kernel.Core.Cir;
using Aetheris.Kernel.Firmament.Execution;
+using Aetheris.Kernel.Firmament.Materializer;
+using Aetheris.Kernel.Firmament.Diagnostics;
namespace Aetheris.Kernel.Firmament.Tests;
diff --git a/Aetheris.Kernel.Firmament.Tests/SurfaceFamilyStitchCandidatePlannerTests.cs b/Aetheris.Kernel.Firmament.Tests/SurfaceFamilyStitchCandidatePlannerTests.cs
index 0f4d2b35..8f1b7100 100644
--- a/Aetheris.Kernel.Firmament.Tests/SurfaceFamilyStitchCandidatePlannerTests.cs
+++ b/Aetheris.Kernel.Firmament.Tests/SurfaceFamilyStitchCandidatePlannerTests.cs
@@ -1,5 +1,7 @@
using Aetheris.Kernel.Core.Cir;
using Aetheris.Kernel.Firmament.Execution;
+using Aetheris.Kernel.Firmament.Materializer;
+using Aetheris.Kernel.Firmament.Diagnostics;
namespace Aetheris.Kernel.Firmament.Tests;
diff --git a/Aetheris.Kernel.Firmament.Tests/SurfaceFamilyStitchExecutorTests.cs b/Aetheris.Kernel.Firmament.Tests/SurfaceFamilyStitchExecutorTests.cs
index d6d37723..92c09f3a 100644
--- a/Aetheris.Kernel.Firmament.Tests/SurfaceFamilyStitchExecutorTests.cs
+++ b/Aetheris.Kernel.Firmament.Tests/SurfaceFamilyStitchExecutorTests.cs
@@ -1,5 +1,7 @@
using Aetheris.Kernel.Core.Cir;
using Aetheris.Kernel.Firmament.Execution;
+using Aetheris.Kernel.Firmament.Materializer;
+using Aetheris.Kernel.Firmament.Diagnostics;
namespace Aetheris.Kernel.Firmament.Tests;
diff --git a/Aetheris.Kernel.Firmament.Tests/SurfaceFeatureDescriptorValidationTests.cs b/Aetheris.Kernel.Firmament.Tests/SurfaceFeatureDescriptorValidationTests.cs
index 1a006475..7ca5aaf4 100644
--- a/Aetheris.Kernel.Firmament.Tests/SurfaceFeatureDescriptorValidationTests.cs
+++ b/Aetheris.Kernel.Firmament.Tests/SurfaceFeatureDescriptorValidationTests.cs
@@ -1,4 +1,6 @@
using Aetheris.Kernel.Firmament.Execution;
+using Aetheris.Kernel.Firmament.Materializer;
+using Aetheris.Kernel.Firmament.Diagnostics;
namespace Aetheris.Kernel.Firmament.Tests;
diff --git a/Aetheris.Kernel.Firmament.Tests/SurfaceFeatureDryRunGeneratorTests.cs b/Aetheris.Kernel.Firmament.Tests/SurfaceFeatureDryRunGeneratorTests.cs
index 38268c08..50d52c9e 100644
--- a/Aetheris.Kernel.Firmament.Tests/SurfaceFeatureDryRunGeneratorTests.cs
+++ b/Aetheris.Kernel.Firmament.Tests/SurfaceFeatureDryRunGeneratorTests.cs
@@ -1,4 +1,6 @@
using Aetheris.Kernel.Firmament.Execution;
+using Aetheris.Kernel.Firmament.Materializer;
+using Aetheris.Kernel.Firmament.Diagnostics;
namespace Aetheris.Kernel.Firmament.Tests;
diff --git a/Aetheris.Kernel.Firmament.Tests/SurfaceFeatureEvidenceGeneratorTests.cs b/Aetheris.Kernel.Firmament.Tests/SurfaceFeatureEvidenceGeneratorTests.cs
index 51eca4e1..f81fc61a 100644
--- a/Aetheris.Kernel.Firmament.Tests/SurfaceFeatureEvidenceGeneratorTests.cs
+++ b/Aetheris.Kernel.Firmament.Tests/SurfaceFeatureEvidenceGeneratorTests.cs
@@ -1,4 +1,6 @@
using Aetheris.Kernel.Firmament.Execution;
+using Aetheris.Kernel.Firmament.Materializer;
+using Aetheris.Kernel.Firmament.Diagnostics;
namespace Aetheris.Kernel.Firmament.Tests;
diff --git a/Aetheris.Kernel.Firmament.Tests/SurfaceFeaturePlanningBridgeTests.cs b/Aetheris.Kernel.Firmament.Tests/SurfaceFeaturePlanningBridgeTests.cs
index f59a0d93..c6ca4777 100644
--- a/Aetheris.Kernel.Firmament.Tests/SurfaceFeaturePlanningBridgeTests.cs
+++ b/Aetheris.Kernel.Firmament.Tests/SurfaceFeaturePlanningBridgeTests.cs
@@ -1,4 +1,6 @@
using Aetheris.Kernel.Firmament.Execution;
+using Aetheris.Kernel.Firmament.Materializer;
+using Aetheris.Kernel.Firmament.Diagnostics;
namespace Aetheris.Kernel.Firmament.Tests;
diff --git a/Aetheris.Kernel.Firmament.Tests/SurfacePatchDescriptorScaffoldTests.cs b/Aetheris.Kernel.Firmament.Tests/SurfacePatchDescriptorScaffoldTests.cs
index 0e378bbe..06241cd7 100644
--- a/Aetheris.Kernel.Firmament.Tests/SurfacePatchDescriptorScaffoldTests.cs
+++ b/Aetheris.Kernel.Firmament.Tests/SurfacePatchDescriptorScaffoldTests.cs
@@ -3,6 +3,8 @@ using Aetheris.Kernel.Core.Geometry;
using Aetheris.Kernel.Core.Math;
using Aetheris.Kernel.Core.Cir;
using Aetheris.Kernel.Firmament.Execution;
+using Aetheris.Kernel.Firmament.Materializer;
+using Aetheris.Kernel.Firmament.Diagnostics;
namespace Aetheris.Kernel.Firmament.Tests;
diff --git a/Aetheris.Kernel.Firmament.Tests/SurfaceRestrictedFieldMarchingSquaresTests.cs b/Aetheris.Kernel.Firmament.Tests/SurfaceRestrictedFieldMarchingSquaresTests.cs
index 12732355..38ba7cd0 100644
--- a/Aetheris.Kernel.Firmament.Tests/SurfaceRestrictedFieldMarchingSquaresTests.cs
+++ b/Aetheris.Kernel.Firmament.Tests/SurfaceRestrictedFieldMarchingSquaresTests.cs
@@ -1,5 +1,7 @@
using Aetheris.Kernel.Core.Cir;
using Aetheris.Kernel.Firmament.Execution;
+using Aetheris.Kernel.Firmament.Materializer;
+using Aetheris.Kernel.Firmament.Diagnostics;
namespace Aetheris.Kernel.Firmament.Tests;
diff --git a/Aetheris.Kernel.Firmament.Tests/SurfaceRestrictedFieldTests.cs b/Aetheris.Kernel.Firmament.Tests/SurfaceRestrictedFieldTests.cs
index 1340e530..c9adf664 100644
--- a/Aetheris.Kernel.Firmament.Tests/SurfaceRestrictedFieldTests.cs
+++ b/Aetheris.Kernel.Firmament.Tests/SurfaceRestrictedFieldTests.cs
@@ -1,6 +1,8 @@
using Aetheris.Kernel.Core.Cir;
using Aetheris.Kernel.Core.Math;
using Aetheris.Kernel.Firmament.Execution;
+using Aetheris.Kernel.Firmament.Materializer;
+using Aetheris.Kernel.Firmament.Diagnostics;
namespace Aetheris.Kernel.Firmament.Tests;
diff --git a/Aetheris.Kernel.Firmament.Tests/SurfaceTrimContourStitcherTests.cs b/Aetheris.Kernel.Firmament.Tests/SurfaceTrimContourStitcherTests.cs
index 3533bb3c..f9efb2f7 100644
--- a/Aetheris.Kernel.Firmament.Tests/SurfaceTrimContourStitcherTests.cs
+++ b/Aetheris.Kernel.Firmament.Tests/SurfaceTrimContourStitcherTests.cs
@@ -1,6 +1,8 @@
using Aetheris.Kernel.Core.Cir;
using Aetheris.Kernel.Core.Math;
using Aetheris.Kernel.Firmament.Execution;
+using Aetheris.Kernel.Firmament.Materializer;
+using Aetheris.Kernel.Firmament.Diagnostics;
namespace Aetheris.Kernel.Firmament.Tests;
diff --git a/Aetheris.Kernel.Firmament.Tests/TieredTrimRepresentationBuilderTests.cs b/Aetheris.Kernel.Firmament.Tests/TieredTrimRepresentationBuilderTests.cs
index ab39fca0..05210cf2 100644
--- a/Aetheris.Kernel.Firmament.Tests/TieredTrimRepresentationBuilderTests.cs
+++ b/Aetheris.Kernel.Firmament.Tests/TieredTrimRepresentationBuilderTests.cs
@@ -1,5 +1,7 @@
using Aetheris.Kernel.Core.Cir;
using Aetheris.Kernel.Firmament.Execution;
+using Aetheris.Kernel.Firmament.Materializer;
+using Aetheris.Kernel.Firmament.Diagnostics;
namespace Aetheris.Kernel.Firmament.Tests;
diff --git a/Aetheris.Kernel.Firmament.Tests/TopologyAssemblyDryRunTests.cs b/Aetheris.Kernel.Firmament.Tests/TopologyAssemblyDryRunTests.cs
index ef821448..dd86e383 100644
--- a/Aetheris.Kernel.Firmament.Tests/TopologyAssemblyDryRunTests.cs
+++ b/Aetheris.Kernel.Firmament.Tests/TopologyAssemblyDryRunTests.cs
@@ -1,5 +1,7 @@
using Aetheris.Kernel.Core.Cir;
using Aetheris.Kernel.Firmament.Execution;
+using Aetheris.Kernel.Firmament.Materializer;
+using Aetheris.Kernel.Firmament.Diagnostics;
namespace Aetheris.Kernel.Firmament.Tests;
diff --git a/Aetheris.Kernel.Firmament.Tests/TopologyPairingEvidenceTests.cs b/Aetheris.Kernel.Firmament.Tests/TopologyPairingEvidenceTests.cs
index 5024e211..9ac448d1 100644
--- a/Aetheris.Kernel.Firmament.Tests/TopologyPairingEvidenceTests.cs
+++ b/Aetheris.Kernel.Firmament.Tests/TopologyPairingEvidenceTests.cs
@@ -1,5 +1,7 @@
using Aetheris.Kernel.Core.Cir;
using Aetheris.Kernel.Firmament.Execution;
+using Aetheris.Kernel.Firmament.Materializer;
+using Aetheris.Kernel.Firmament.Diagnostics;
namespace Aetheris.Kernel.Firmament.Tests;
diff --git a/Aetheris.Kernel.Firmament/Execution/EmittedTokenPairingAnalyzer.cs b/Aetheris.Kernel.Firmament/Diagnostics/EmittedTokenPairingAnalyzer.cs
similarity index 98%
rename from Aetheris.Kernel.Firmament/Execution/EmittedTokenPairingAnalyzer.cs
rename to Aetheris.Kernel.Firmament/Diagnostics/EmittedTokenPairingAnalyzer.cs
index 6ffea1c3..db308141 100644
--- a/Aetheris.Kernel.Firmament/Execution/EmittedTokenPairingAnalyzer.cs
+++ b/Aetheris.Kernel.Firmament/Diagnostics/EmittedTokenPairingAnalyzer.cs
@@ -1,6 +1,7 @@
using Aetheris.Kernel.Core.Cir;
+using Aetheris.Kernel.Firmament.Execution;
-namespace Aetheris.Kernel.Firmament.Execution;
+namespace Aetheris.Kernel.Firmament.Diagnostics;
internal enum TokenPairingStatus
{
diff --git a/Aetheris.Kernel.Firmament/Execution/FacePatchCandidateDryRun.cs b/Aetheris.Kernel.Firmament/Diagnostics/FacePatchCandidateDryRun.cs
similarity index 99%
rename from Aetheris.Kernel.Firmament/Execution/FacePatchCandidateDryRun.cs
rename to Aetheris.Kernel.Firmament/Diagnostics/FacePatchCandidateDryRun.cs
index b61cda5c..59fdf7f1 100644
--- a/Aetheris.Kernel.Firmament/Execution/FacePatchCandidateDryRun.cs
+++ b/Aetheris.Kernel.Firmament/Diagnostics/FacePatchCandidateDryRun.cs
@@ -1,7 +1,8 @@
using Aetheris.Kernel.Core.Cir;
using Aetheris.Kernel.Core.Math;
+using Aetheris.Kernel.Firmament.Execution;
-namespace Aetheris.Kernel.Firmament.Execution;
+namespace Aetheris.Kernel.Firmament.Diagnostics;
internal enum FacePatchCandidateReadiness
{
diff --git a/Aetheris.Kernel.Firmament/Diagnostics/FirmamentDiagnosticCode.cs b/Aetheris.Kernel.Firmament/Diagnostics/FirmamentDiagnosticCode.cs
index 3cdd37ab..0df3c5c5 100644
--- a/Aetheris.Kernel.Firmament/Diagnostics/FirmamentDiagnosticCode.cs
+++ b/Aetheris.Kernel.Firmament/Diagnostics/FirmamentDiagnosticCode.cs
@@ -1,3 +1,4 @@
+using Aetheris.Kernel.Firmament.Execution;
namespace Aetheris.Kernel.Firmament.Diagnostics;
public readonly record struct FirmamentDiagnosticCode(string Value)
diff --git a/Aetheris.Kernel.Firmament/Diagnostics/FirmamentDiagnosticCodes.cs b/Aetheris.Kernel.Firmament/Diagnostics/FirmamentDiagnosticCodes.cs
index 7ea64281..aafe7d47 100644
--- a/Aetheris.Kernel.Firmament/Diagnostics/FirmamentDiagnosticCodes.cs
+++ b/Aetheris.Kernel.Firmament/Diagnostics/FirmamentDiagnosticCodes.cs
@@ -1,3 +1,4 @@
+using Aetheris.Kernel.Firmament.Execution;
namespace Aetheris.Kernel.Firmament.Diagnostics;
public static class FirmamentDiagnosticCodes
diff --git a/Aetheris.Kernel.Firmament/Diagnostics/FirmamentDiagnosticConventions.cs b/Aetheris.Kernel.Firmament/Diagnostics/FirmamentDiagnosticConventions.cs
index 203c3bd7..04692a9c 100644
--- a/Aetheris.Kernel.Firmament/Diagnostics/FirmamentDiagnosticConventions.cs
+++ b/Aetheris.Kernel.Firmament/Diagnostics/FirmamentDiagnosticConventions.cs
@@ -1,3 +1,4 @@
+using Aetheris.Kernel.Firmament.Execution;
namespace Aetheris.Kernel.Firmament.Diagnostics;
public static class FirmamentDiagnosticConventions
diff --git a/Aetheris.Kernel.Firmament/Execution/MaterializationReadinessAnalyzer.cs b/Aetheris.Kernel.Firmament/Diagnostics/MaterializationReadinessAnalyzer.cs
similarity index 99%
rename from Aetheris.Kernel.Firmament/Execution/MaterializationReadinessAnalyzer.cs
rename to Aetheris.Kernel.Firmament/Diagnostics/MaterializationReadinessAnalyzer.cs
index 74b3ce2f..bee8fc30 100644
--- a/Aetheris.Kernel.Firmament/Execution/MaterializationReadinessAnalyzer.cs
+++ b/Aetheris.Kernel.Firmament/Diagnostics/MaterializationReadinessAnalyzer.cs
@@ -1,6 +1,7 @@
using Aetheris.Kernel.Core.Cir;
+using Aetheris.Kernel.Firmament.Execution;
-namespace Aetheris.Kernel.Firmament.Execution;
+namespace Aetheris.Kernel.Firmament.Diagnostics;
internal enum EmissionReadiness
{
diff --git a/Aetheris.Kernel.Firmament/Diagnostics/Placeholder.cs b/Aetheris.Kernel.Firmament/Diagnostics/Placeholder.cs
index a788660e..9d9c29f1 100644
--- a/Aetheris.Kernel.Firmament/Diagnostics/Placeholder.cs
+++ b/Aetheris.Kernel.Firmament/Diagnostics/Placeholder.cs
@@ -1,3 +1,4 @@
+using Aetheris.Kernel.Firmament.Execution;
namespace Aetheris.Kernel.Firmament.Diagnostics;
internal static class Placeholder;
diff --git a/Aetheris.Kernel.Firmament/Execution/ShellStitchingDryRun.cs b/Aetheris.Kernel.Firmament/Diagnostics/ShellStitchingDryRun.cs
similarity index 99%
rename from Aetheris.Kernel.Firmament/Execution/ShellStitchingDryRun.cs
rename to Aetheris.Kernel.Firmament/Diagnostics/ShellStitchingDryRun.cs
index 6bbefad8..e71dced0 100644
--- a/Aetheris.Kernel.Firmament/Execution/ShellStitchingDryRun.cs
+++ b/Aetheris.Kernel.Firmament/Diagnostics/ShellStitchingDryRun.cs
@@ -1,6 +1,7 @@
using Aetheris.Kernel.Core.Cir;
+using Aetheris.Kernel.Firmament.Execution;
-namespace Aetheris.Kernel.Firmament.Execution;
+namespace Aetheris.Kernel.Firmament.Diagnostics;
internal enum ShellClosureReadiness
{
diff --git a/Aetheris.Kernel.Firmament/Execution/SurfaceFamilyBoxCylinderPressureTest.cs b/Aetheris.Kernel.Firmament/Diagnostics/SurfaceFamilyBoxCylinderPressureTest.cs
similarity index 99%
rename from Aetheris.Kernel.Firmament/Execution/SurfaceFamilyBoxCylinderPressureTest.cs
rename to Aetheris.Kernel.Firmament/Diagnostics/SurfaceFamilyBoxCylinderPressureTest.cs
index f6f10692..361fc908 100644
--- a/Aetheris.Kernel.Firmament/Execution/SurfaceFamilyBoxCylinderPressureTest.cs
+++ b/Aetheris.Kernel.Firmament/Diagnostics/SurfaceFamilyBoxCylinderPressureTest.cs
@@ -1,8 +1,9 @@
using Aetheris.Kernel.Core.Brep;
using Aetheris.Kernel.Core.Cir;
using Aetheris.Kernel.Core.Step242;
+using Aetheris.Kernel.Firmament.Execution;
-namespace Aetheris.Kernel.Firmament.Execution;
+namespace Aetheris.Kernel.Firmament.Diagnostics;
internal enum SurfaceFamilyPressureSeverity { Info, Warning, Blocking, Fatal }
internal enum SurfaceFamilyPressureStageStatus { Succeeded, Skipped, Deferred, Failed }
diff --git a/Aetheris.Kernel.Firmament/Execution/SurfaceFeatureDryRunGenerator.cs b/Aetheris.Kernel.Firmament/Diagnostics/SurfaceFeatureDryRunGenerator.cs
similarity index 98%
rename from Aetheris.Kernel.Firmament/Execution/SurfaceFeatureDryRunGenerator.cs
rename to Aetheris.Kernel.Firmament/Diagnostics/SurfaceFeatureDryRunGenerator.cs
index 996658ba..27f93fb3 100644
--- a/Aetheris.Kernel.Firmament/Execution/SurfaceFeatureDryRunGenerator.cs
+++ b/Aetheris.Kernel.Firmament/Diagnostics/SurfaceFeatureDryRunGenerator.cs
@@ -1,4 +1,5 @@
-namespace Aetheris.Kernel.Firmament.Execution;
+using Aetheris.Kernel.Firmament.Execution;
+namespace Aetheris.Kernel.Firmament.Diagnostics;
internal enum SurfaceFeatureDryRunStatus
{
diff --git a/Aetheris.Kernel.Firmament/Execution/SurfacePatchDescriptorScaffold.cs b/Aetheris.Kernel.Firmament/Diagnostics/SurfacePatchDescriptorScaffold.cs
similarity index 99%
rename from Aetheris.Kernel.Firmament/Execution/SurfacePatchDescriptorScaffold.cs
rename to Aetheris.Kernel.Firmament/Diagnostics/SurfacePatchDescriptorScaffold.cs
index e17906b7..85a99201 100644
--- a/Aetheris.Kernel.Firmament/Execution/SurfacePatchDescriptorScaffold.cs
+++ b/Aetheris.Kernel.Firmament/Diagnostics/SurfacePatchDescriptorScaffold.cs
@@ -6,8 +6,9 @@ using Aetheris.Kernel.Core.Brep;
using Aetheris.Kernel.Core.Math;
using Aetheris.Kernel.Core.Judgment;
using Aetheris.Kernel.Core.Topology;
+using Aetheris.Kernel.Firmament.Execution;
-namespace Aetheris.Kernel.Firmament.Execution;
+namespace Aetheris.Kernel.Firmament.Diagnostics;
/// <summary>
/// CIR-F8.1 scaffold: descriptor-first path toward surface-family materialization.
diff --git a/Aetheris.Kernel.Firmament/Execution/TopologyAssemblyDryRun.cs b/Aetheris.Kernel.Firmament/Diagnostics/TopologyAssemblyDryRun.cs
similarity index 98%
rename from Aetheris.Kernel.Firmament/Execution/TopologyAssemblyDryRun.cs
rename to Aetheris.Kernel.Firmament/Diagnostics/TopologyAssemblyDryRun.cs
index 5bed1831..140e27f0 100644
--- a/Aetheris.Kernel.Firmament/Execution/TopologyAssemblyDryRun.cs
+++ b/Aetheris.Kernel.Firmament/Diagnostics/TopologyAssemblyDryRun.cs
@@ -1,6 +1,7 @@
using Aetheris.Kernel.Core.Cir;
+using Aetheris.Kernel.Firmament.Execution;
-namespace Aetheris.Kernel.Firmament.Execution;
+namespace Aetheris.Kernel.Firmament.Diagnostics;
internal enum TopologyAssemblyReadiness
{
diff --git a/Aetheris.Kernel.Firmament/Execution/TopologyPairingEvidenceDryRun.cs b/Aetheris.Kernel.Firmament/Diagnostics/TopologyPairingEvidenceDryRun.cs
similarity index 99%
rename from Aetheris.Kernel.Firmament/Execution/TopologyPairingEvidenceDryRun.cs
rename to Aetheris.Kernel.Firmament/Diagnostics/TopologyPairingEvidenceDryRun.cs
index c5b18abc..2eb84670 100644
--- a/Aetheris.Kernel.Firmament/Execution/TopologyPairingEvidenceDryRun.cs
+++ b/Aetheris.Kernel.Firmament/Diagnostics/TopologyPairingEvidenceDryRun.cs
@@ -1,6 +1,7 @@
using Aetheris.Kernel.Core.Cir;
+using Aetheris.Kernel.Firmament.Execution;
-namespace Aetheris.Kernel.Firmament.Execution;
+namespace Aetheris.Kernel.Firmament.Diagnostics;
internal enum TopologyPairingReadiness
{
diff --git a/Aetheris.Kernel.Firmament/FirmamentCompilationArtifact.cs b/Aetheris.Kernel.Firmament/FirmamentCompilationArtifact.cs
index a0882f8e..405d0ab5 100644
--- a/Aetheris.Kernel.Firmament/FirmamentCompilationArtifact.cs
+++ b/Aetheris.Kernel.Firmament/FirmamentCompilationArtifact.cs
@@ -1,5 +1,7 @@
using Aetheris.Kernel.Firmament.CompiledModel;
using Aetheris.Kernel.Firmament.Execution;
+using Aetheris.Kernel.Firmament.Materializer;
+using Aetheris.Kernel.Firmament.Diagnostics;
using Aetheris.Kernel.Firmament.Lowering;
using Aetheris.Kernel.Firmament.ParsedModel;
diff --git a/Aetheris.Kernel.Firmament/FirmamentCompiler.cs b/Aetheris.Kernel.Firmament/FirmamentCompiler.cs
index b74bc5bf..bba88a7e 100644
--- a/Aetheris.Kernel.Firmament/FirmamentCompiler.cs
+++ b/Aetheris.Kernel.Firmament/FirmamentCompiler.cs
@@ -1,5 +1,7 @@
using Aetheris.Kernel.Core.Results;
using Aetheris.Kernel.Firmament.Execution;
+using Aetheris.Kernel.Firmament.Materializer;
+using Aetheris.Kernel.Firmament.Diagnostics;
using Aetheris.Kernel.Firmament.Lowering;
using Aetheris.Kernel.Firmament.Mapping;
using Aetheris.Kernel.Firmament.Parsing;
diff --git a/Aetheris.Kernel.Firmament/FirmamentStepExporter.cs b/Aetheris.Kernel.Firmament/FirmamentStepExporter.cs
index 9f38f412..518f1ee0 100644
--- a/Aetheris.Kernel.Firmament/FirmamentStepExporter.cs
+++ b/Aetheris.Kernel.Firmament/FirmamentStepExporter.cs
@@ -8,6 +8,8 @@ using Aetheris.Kernel.Core.Results;
using Aetheris.Kernel.Core.Step242;
using Aetheris.Kernel.Firmament.Diagnostics;
using Aetheris.Kernel.Firmament.Execution;
+using Aetheris.Kernel.Firmament.Materializer;
+using Aetheris.Kernel.Firmament.Diagnostics;
using Aetheris.Kernel.Firmament.Lowering;
using Aetheris.Kernel.Firmament.ParsedModel;
using Aetheris.Kernel.Firmament.Validation;
diff --git a/Aetheris.Kernel.Firmament/GlobalUsings.Cir5sA0.cs b/Aetheris.Kernel.Firmament/GlobalUsings.Cir5sA0.cs
new file mode 100644
index 00000000..a1158f82
--- /dev/null
+++ b/Aetheris.Kernel.Firmament/GlobalUsings.Cir5sA0.cs
@@ -0,0 +1,2 @@
+global using Aetheris.Kernel.Firmament.Diagnostics;
+global using Aetheris.Kernel.Firmament.Materializer;
diff --git a/Aetheris.Kernel.Firmament/Lowering/FirmamentCirLowerer.cs b/Aetheris.Kernel.Firmament/Lowering/FirmamentCirLowerer.cs
index ade0f98a..388ab28a 100644
--- a/Aetheris.Kernel.Firmament/Lowering/FirmamentCirLowerer.cs
+++ b/Aetheris.Kernel.Firmament/Lowering/FirmamentCirLowerer.cs
@@ -4,6 +4,8 @@ using Aetheris.Kernel.Core.Diagnostics;
using Aetheris.Kernel.Core.Results;
using Aetheris.Kernel.Firmament.ParsedModel;
using Aetheris.Kernel.Firmament.Execution;
+using Aetheris.Kernel.Firmament.Materializer;
+using Aetheris.Kernel.Firmament.Diagnostics;
namespace Aetheris.Kernel.Firmament.Lowering;
diff --git a/Aetheris.Kernel.Firmament/Execution/CirBoxCylinderRecognizer.cs b/Aetheris.Kernel.Firmament/Materializer/CirBoxCylinderRecognizer.cs
similarity index 98%
rename from Aetheris.Kernel.Firmament/Execution/CirBoxCylinderRecognizer.cs
rename to Aetheris.Kernel.Firmament/Materializer/CirBoxCylinderRecognizer.cs
index 413c184d..45e2d369 100644
--- a/Aetheris.Kernel.Firmament/Execution/CirBoxCylinderRecognizer.cs
+++ b/Aetheris.Kernel.Firmament/Materializer/CirBoxCylinderRecognizer.cs
@@ -1,8 +1,9 @@
using Aetheris.Kernel.Core.Cir;
using Aetheris.Kernel.Core.Math;
using Aetheris.Kernel.Core.Numerics;
+using Aetheris.Kernel.Firmament.Execution;
-namespace Aetheris.Kernel.Firmament.Execution;
+namespace Aetheris.Kernel.Firmament.Materializer;
internal enum CirBoxCylinderRecognitionReason
{
diff --git a/Aetheris.Kernel.Firmament/Execution/CirBrepMaterializer.cs b/Aetheris.Kernel.Firmament/Materializer/CirBrepMaterializer.cs
similarity index 99%
rename from Aetheris.Kernel.Firmament/Execution/CirBrepMaterializer.cs
rename to Aetheris.Kernel.Firmament/Materializer/CirBrepMaterializer.cs
index 28092b58..d47e0909 100644
--- a/Aetheris.Kernel.Firmament/Execution/CirBrepMaterializer.cs
+++ b/Aetheris.Kernel.Firmament/Materializer/CirBrepMaterializer.cs
@@ -4,8 +4,9 @@ using Aetheris.Kernel.Core.Cir;
using Aetheris.Kernel.Core.Diagnostics;
using Aetheris.Kernel.Core.Judgment;
using Aetheris.Kernel.Core.Math;
+using Aetheris.Kernel.Firmament.Execution;
-namespace Aetheris.Kernel.Firmament.Execution;
+namespace Aetheris.Kernel.Firmament.Materializer;
internal static class CirBrepMaterializer
{
diff --git a/Aetheris.Kernel.Firmament/Execution/NativeGeometryRematerializer.cs b/Aetheris.Kernel.Firmament/Materializer/NativeGeometryRematerializer.cs
similarity index 96%
rename from Aetheris.Kernel.Firmament/Execution/NativeGeometryRematerializer.cs
rename to Aetheris.Kernel.Firmament/Materializer/NativeGeometryRematerializer.cs
index d1aa34e4..e844988c 100644
--- a/Aetheris.Kernel.Firmament/Execution/NativeGeometryRematerializer.cs
+++ b/Aetheris.Kernel.Firmament/Materializer/NativeGeometryRematerializer.cs
@@ -2,8 +2,9 @@ using Aetheris.Kernel.Core.Cir;
using Aetheris.Kernel.Core.Diagnostics;
using Aetheris.Kernel.Core.Results;
using Aetheris.Kernel.Firmament.Lowering;
+using Aetheris.Kernel.Firmament.Execution;
-namespace Aetheris.Kernel.Firmament.Execution;
+namespace Aetheris.Kernel.Firmament.Materializer;
internal static class NativeGeometryRematerializer
{
diff --git a/Aetheris.Kernel.Firmament/Validation/FirmamentBooleanRequiredFieldValidator.cs b/Aetheris.Kernel.Firmament/Validation/FirmamentBooleanRequiredFieldValidator.cs
index c57a593b..d370cf1b 100644
--- a/Aetheris.Kernel.Firmament/Validation/FirmamentBooleanRequiredFieldValidator.cs
+++ b/Aetheris.Kernel.Firmament/Validation/FirmamentBooleanRequiredFieldValidator.cs
@@ -5,6 +5,8 @@ using Aetheris.Kernel.Core.Diagnostics;
using Aetheris.Kernel.Core.Results;
using Aetheris.Kernel.Firmament.Diagnostics;
using Aetheris.Kernel.Firmament.Execution;
+using Aetheris.Kernel.Firmament.Materializer;
+using Aetheris.Kernel.Firmament.Diagnostics;
using Aetheris.Kernel.Firmament.ParsedModel;
namespace Aetheris.Kernel.Firmament.Validation;
diff --git a/Aetheris.Kernel.Firmament/Validation/FirmamentSafeSubtractFeatureGraphValidator.cs b/Aetheris.Kernel.Firmament/Validation/FirmamentSafeSubtractFeatureGraphValidator.cs
index f250c6a4..50be54f0 100644
--- a/Aetheris.Kernel.Firmament/Validation/FirmamentSafeSubtractFeatureGraphValidator.cs
+++ b/Aetheris.Kernel.Firmament/Validation/FirmamentSafeSubtractFeatureGraphValidator.cs
@@ -5,6 +5,8 @@ using Aetheris.Kernel.Core.Math;
using Aetheris.Kernel.Core.Numerics;
using Aetheris.Kernel.Core.Results;
using Aetheris.Kernel.Firmament.Execution;
+using Aetheris.Kernel.Firmament.Materializer;
+using Aetheris.Kernel.Firmament.Diagnostics;
using Aetheris.Kernel.Firmament.Lowering;
namespace Aetheris.Kernel.Firmament.Validation;
diff --git a/Aetheris.Kernel.Firmament/Validation/FirmamentSchemaCncDfmValidator.cs b/Aetheris.Kernel.Firmament/Validation/FirmamentSchemaCncDfmValidator.cs
index 695f92ae..f703b35c 100644
--- a/Aetheris.Kernel.Firmament/Validation/FirmamentSchemaCncDfmValidator.cs
+++ b/Aetheris.Kernel.Firmament/Validation/FirmamentSchemaCncDfmValidator.cs
@@ -6,6 +6,8 @@ using Aetheris.Kernel.Core.Results;
using Aetheris.Kernel.Firmament.CompiledModel;
using Aetheris.Kernel.Firmament.Diagnostics;
using Aetheris.Kernel.Firmament.Execution;
+using Aetheris.Kernel.Firmament.Materializer;
+using Aetheris.Kernel.Firmament.Diagnostics;
namespace Aetheris.Kernel.Firmament.Validation;
diff --git a/Aetheris.Kernel.Firmament/Validation/FirmamentSchemaEnclosedVoidValidator.cs b/Aetheris.Kernel.Firmament/Validation/FirmamentSchemaEnclosedVoidValidator.cs
index 6155ff81..f0a04b67 100644
--- a/Aetheris.Kernel.Firmament/Validation/FirmamentSchemaEnclosedVoidValidator.cs
+++ b/Aetheris.Kernel.Firmament/Validation/FirmamentSchemaEnclosedVoidValidator.cs
@@ -5,6 +5,8 @@ using Aetheris.Kernel.Core.Results;
using Aetheris.Kernel.Firmament.CompiledModel;
using Aetheris.Kernel.Firmament.Diagnostics;
using Aetheris.Kernel.Firmament.Execution;
+using Aetheris.Kernel.Firmament.Materializer;
+using Aetheris.Kernel.Firmament.Diagnostics;
namespace Aetheris.Kernel.Firmament.Validation;
diff --git a/docs/cir-5s-a0-namespace-organization.md b/docs/cir-5s-a0-namespace-organization.md
new file mode 100644
index 00000000..4a386c39
--- /dev/null
+++ b/docs/cir-5s-a0-namespace-organization.md
@@ -0,0 +1,59 @@
+# CIR-5S-A0 Namespace Organization (CirCore / Materializer / Diagnostics)
+
+## Purpose
+This A0 milestone performs **mechanical sorting only** for CIR/FRep-adjacent code to reduce namespace confusion before production FRep→BRep recovery planning/materialization work.
+
+No algorithms were rewritten and no behavior changes were intended.
+
+## Target split
+- **CirCore**: CIR/FRep representation + evaluation/analysis primitives.
+- **Materializer**: FRep/CIR → BRep recovery/materialization policy and emit path.
+- **Diagnostics**: readiness, dry-run, pairing/stitching evidence, and pressure-test scaffolding.
+
+## Inventory (Phase 1)
+
+| Current file | Current namespace | Proposed area | Proposed namespace | Reason | Risk | Notes |
+|---|---|---|---|---|---|---|
+| `Aetheris.Kernel.Core/Cir/CirNode.cs` | `Aetheris.Kernel.Core.Cir` | LeaveInPlace (CirCore already) | `Aetheris.Kernel.Core.Cir` | Core CIR model. | Low | CirCore concept already represented by `Core/Cir` folder. |
+| `Aetheris.Kernel.Core/Cir/CirNodes.cs` | `Aetheris.Kernel.Core.Cir` | LeaveInPlace (CirCore already) | `Aetheris.Kernel.Core.Cir` | Core CIR operations. | Low | No move needed in A0. |
+| `Aetheris.Kernel.Core/Cir/CirTape.cs` | `Aetheris.Kernel.Core.Cir` | LeaveInPlace (CirCore already) | `Aetheris.Kernel.Core.Cir` | Tape representation/eval. | Low | No move needed in A0. |
+| `Aetheris.Kernel.Core/Cir/CirAnalysis.cs` | `Aetheris.Kernel.Core.Cir` | LeaveInPlace (CirCore already) | `Aetheris.Kernel.Core.Cir` | CIR evaluation/interval analysis. | Low | No move needed in A0. |
+| `Aetheris.Kernel.Core/Cir/CirRegionPlanner.cs` | `Aetheris.Kernel.Core.Cir` | LeaveInPlace (CirCore already) | `Aetheris.Kernel.Core.Cir` | Region planning core. | Low | No move needed in A0. |
+| `Aetheris.Kernel.Core/Cir/CirAdaptiveVolumeEstimator.cs` | `Aetheris.Kernel.Core.Cir` | LeaveInPlace (CirCore already) | `Aetheris.Kernel.Core.Cir` | Core adaptive evaluation. | Low | No move needed in A0. |
+| `Aetheris.Kernel.Firmament/Execution/CirBrepMaterializer.cs` | `Aetheris.Kernel.Firmament.Execution` | Materializer | `Aetheris.Kernel.Firmament.Materializer` | Primary CIR→BRep recovery/materialization path. | Low | Moved in A0. |
+| `Aetheris.Kernel.Firmament/Execution/CirBoxCylinderRecognizer.cs` | `Aetheris.Kernel.Firmament.Execution` | Materializer | `Aetheris.Kernel.Firmament.Materializer` | Recovery recognizer/policy signal. | Low | Moved in A0. |
+| `Aetheris.Kernel.Firmament/Execution/NativeGeometryRematerializer.cs` | `Aetheris.Kernel.Firmament.Execution` | Materializer | `Aetheris.Kernel.Firmament.Materializer` | Rematerialization entrypoint. | Low | Moved in A0. |
+| `Aetheris.Kernel.Firmament/Execution/MaterializationReadinessAnalyzer.cs` | `Aetheris.Kernel.Firmament.Execution` | Diagnostics | `Aetheris.Kernel.Firmament.Diagnostics` | Readiness diagnostics/reporting. | Low | Moved in A0. |
+| `Aetheris.Kernel.Firmament/Execution/FacePatchCandidateDryRun.cs` | `Aetheris.Kernel.Firmament.Execution` | Diagnostics | `Aetheris.Kernel.Firmament.Diagnostics` | Dry-run patch descriptors. | Low | Moved in A0. |
+| `Aetheris.Kernel.Firmament/Execution/TopologyPairingEvidenceDryRun.cs` | `Aetheris.Kernel.Firmament.Execution` | Diagnostics | `Aetheris.Kernel.Firmament.Diagnostics` | Pairing evidence diagnostics. | Low | Moved in A0. |
+| `Aetheris.Kernel.Firmament/Execution/TopologyAssemblyDryRun.cs` | `Aetheris.Kernel.Firmament.Execution` | Diagnostics | `Aetheris.Kernel.Firmament.Diagnostics` | Topology assembly dry-run. | Low | Moved in A0. |
+| `Aetheris.Kernel.Firmament/Execution/ShellStitchingDryRun.cs` | `Aetheris.Kernel.Firmament.Execution` | Diagnostics | `Aetheris.Kernel.Firmament.Diagnostics` | Shell stitching dry-run diagnostics. | Low | Moved in A0. |
+| `Aetheris.Kernel.Firmament/Execution/EmittedTokenPairingAnalyzer.cs` | `Aetheris.Kernel.Firmament.Execution` | Diagnostics | `Aetheris.Kernel.Firmament.Diagnostics` | Token pairing diagnostics. | Low | Moved in A0. |
+| `Aetheris.Kernel.Firmament/Execution/SurfacePatchDescriptorScaffold.cs` | `Aetheris.Kernel.Firmament.Execution` | Diagnostics | `Aetheris.Kernel.Firmament.Diagnostics` | Diagnostic scaffolding. | Medium | Referenced by multiple tests; moved with namespace updates. |
+| `Aetheris.Kernel.Firmament/Execution/SurfaceFeatureDryRunGenerator.cs` | `Aetheris.Kernel.Firmament.Execution` | Diagnostics | `Aetheris.Kernel.Firmament.Diagnostics` | Dry-run planning output. | Low | Moved in A0. |
+| `Aetheris.Kernel.Firmament/Execution/SurfaceFamilyBoxCylinderPressureTest.cs` | `Aetheris.Kernel.Firmament.Execution` | Diagnostics | `Aetheris.Kernel.Firmament.Diagnostics` | Pressure-test harness/reporting. | Low | Moved in A0. |
+| `Aetheris.Kernel.Firmament/Execution/SurfaceRestrictedField.cs` | `Aetheris.Kernel.Firmament.Execution` | LeaveInPlace (Ambiguous) | Unchanged in A0 | Could be CirCore-style field primitive but currently co-located with Firmament execution and stitch flow. | High | Defer to A1 to avoid dependency churn. |
+
+## A0 result
+
+### New namespace/folder boundaries
+- `Aetheris.Kernel.Firmament.Materializer`
+- `Aetheris.Kernel.Firmament.Diagnostics`
+
+### Files moved in A0
+- Materializer: `CirBrepMaterializer`, `CirBoxCylinderRecognizer`, `NativeGeometryRematerializer`.
+- Diagnostics: readiness/dry-run/pairing/stitch/pressure/scaffold files listed above.
+
+### Intentionally left in place
+- `Aetheris.Kernel.Core/Cir/*` is already the practical **CirCore** boundary in this repo.
+- Most `Aetheris.Kernel.Firmament/Execution/*` remain in place for A0 to avoid broad namespace blast radius.
+- `SurfaceRestrictedField` and related restricted-field helpers are deferred as ambiguous/high-risk ownership candidates.
+
+## Dependency guidance
+- **CirCore** (`Aetheris.Kernel.Core.Cir`) should stay free of Firmament materialization policy and test-diagnostic pressure paths.
+- **Materializer** may depend on CirCore + BRep + Firmament replay/materialization state.
+- **Diagnostics** may depend on CirCore, Materializer, and Firmament execution evidence; production paths should not take required dependencies on diagnostics unless documented.
+
+## Follow-up for CIR-5S-A1
+- Re-evaluate remaining `Execution/*` files for further partitioning (especially `SurfaceRestrictedField`, stitch executors/planners, and mixed execution-policy files).
+- Consider introducing a dedicated `Aetheris.Kernel.Core/CirCore` folder alias only if team wants explicit folder branding; functionally the existing `Core/Cir` boundary already serves CirCore.