Skip to content

Next Gen STEP AP242 Native-ish BREP Geometric Modeling Kernel

Harden and prepare Aetheris 2.0.0-preview.2 release

Yuechen Libd131b1552dd
diff --git a/.github/workflows/dotnet.yml b/.github/workflows/dotnet.yml
index f8278106..30f55355 100644
--- a/.github/workflows/dotnet.yml
+++ b/.github/workflows/dotnet.yml
@@ -50,7 +50,7 @@ jobs:
node-version: 26
cache: npm
cache-dependency-path: aetheris.client/package-lock.json
- - name: Restore and build frozen baseline
+ - name: Restore and build Preview 2 frozen baseline
run: |
dotnet restore Aetheris.slnx
dotnet restore demos/Aetheris.PmiInjectionDemo/Aetheris.PmiInjectionDemo.csproj
@@ -66,7 +66,7 @@ jobs:
run: ./scripts/package-release.ps1 -Version ($env:GITHUB_REF_NAME.TrimStart('v')) -OutputDirectory artifacts/release/published
- uses: actions/upload-artifact@v4
with:
- name: preview1-release
+ name: preview2-release
path: artifacts/release/published
if-no-files-found: error
@@ -77,7 +77,7 @@ jobs:
- uses: actions/checkout@v4
- uses: actions/download-artifact@v4
with:
- name: preview1-release
+ name: preview2-release
path: release
- name: Clean-directory CLI and package smoke
shell: pwsh
@@ -92,9 +92,17 @@ jobs:
& $cli build smoke.firmament
& $cli inspect smoke.firmament
& $cli verify smoke.firmament
+ Copy-Item '${{ github.workspace }}/fixtures/AssemblyM3/bearing-module.firmament' assembly.firmament
+ & $cli asm inspect assembly.firmament --json
+ Copy-Item '${{ github.workspace }}/fixtures/DrawingM0/bearing-block-drawing.firmament' drawing.firmament
+ & $cli drawing compile drawing.firmament --out-dir drawing-out --json
+ if (-not (Test-Path drawing-out/*.pdf) -or -not (Test-Path drawing-out/*.pptx)) { throw 'Drawing PDF/PPTX smoke outputs missing.' }
$package = Get-ChildItem release/packages/*.nupkg | Select-Object -First 1
- Expand-Archive $package.FullName local-feed/Aetheris.CLI
- if (-not (Test-Path local-feed/Aetheris.CLI/tools/net10.0/any/aetheris.dll)) { throw 'Tool payload missing.' }
+ New-Item -ItemType Directory local-feed, installed-tool | Out-Null
+ Copy-Item $package.FullName local-feed
+ dotnet tool install --tool-path installed-tool Aetheris.CLI --version 2.0.0-preview.2 --add-source local-feed --ignore-failed-sources
+ & installed-tool/aetheris --version
+ & installed-tool/aetheris build smoke.firmament
publish:
needs: release-smoke
@@ -107,7 +115,7 @@ jobs:
- uses: actions/checkout@v4
- uses: actions/download-artifact@v4
with:
- name: preview1-release
+ name: preview2-release
path: release
- name: Authenticate to NuGet with trusted publishing
id: nuget-login
@@ -120,5 +128,6 @@ jobs:
env:
GH_TOKEN: ${{ github.token }}
run: |
- gh release create "${GITHUB_REF_NAME}" --repo "${GITHUB_REPOSITORY}" --title "Aetheris ${GITHUB_REF_NAME#v}" --prerelease --notes-file docs/release/2.0.0-preview.1-notes.md release/Aetheris-*.zip release/aetheris-firmament-*.vsix release/SHA256SUMS.txt release/packages/*.nupkg || \
+ gh release create "${GITHUB_REF_NAME}" --repo "${GITHUB_REPOSITORY}" --title "Aetheris ${GITHUB_REF_NAME#v}" --latest --notes-file docs/release/2.0.0-preview.2-notes.md release/Aetheris-*.zip release/aetheris-firmament-*.vsix release/SHA256SUMS.txt release/packages/*.nupkg || \
gh release upload "${GITHUB_REF_NAME}" --repo "${GITHUB_REPOSITORY}" --clobber release/Aetheris-*.zip release/aetheris-firmament-*.vsix release/SHA256SUMS.txt release/packages/*.nupkg
+ gh release edit "${GITHUB_REF_NAME}" --repo "${GITHUB_REPOSITORY}" --latest --prerelease=false --notes-file docs/release/2.0.0-preview.2-notes.md
diff --git a/Aetheris.CLI/Aetheris.CLI.csproj b/Aetheris.CLI/Aetheris.CLI.csproj
index 2109e0f4..2d584a06 100644
--- a/Aetheris.CLI/Aetheris.CLI.csproj
+++ b/Aetheris.CLI/Aetheris.CLI.csproj
@@ -16,7 +16,7 @@
<ProjectUrl>https://yuechen-li-dev.github.io/aetheris/</ProjectUrl>
<PackageLicenseExpression>AGPL-3.0-only</PackageLicenseExpression>
<PackageReadmeFile>Aetheris.CLI.README.md</PackageReadmeFile>
- <PackageReleaseNotes>Preview 1: first public Aetheris CLI release.</PackageReleaseNotes>
+ <PackageReleaseNotes>Preview 2: Firmament V2, Forge Host, assemblies, engineering modules, Continuum/FEA, drawings, and release hardening.</PackageReleaseNotes>
<AllowedOutputExtensionsInPackageBuildOutputFolder>.dll;.exe;.json</AllowedOutputExtensionsInPackageBuildOutputFolder>
</PropertyGroup>
diff --git a/Aetheris.CLI/CliRunner.cs b/Aetheris.CLI/CliRunner.cs
index e87e9ff7..7145a495 100644
--- a/Aetheris.CLI/CliRunner.cs
+++ b/Aetheris.CLI/CliRunner.cs
@@ -3466,6 +3466,7 @@ Model CanonicalPanel {
stdout.WriteLine(" analyze Analyze STEP topology and analytic surfaces.");
stdout.WriteLine(" fea Compile and solve a Firmament linear-elastic analysis and export Abaqus verification input.");
stdout.WriteLine(" drawing Compile a Firmament Drawing Template to DrawingIR, SVG, vector A4 PDF, and native editable PPTX.");
+ stdout.WriteLine(" asm Inspect, execute, import, and export Firmament V2 assemblies.");
stdout.WriteLine(" modules Inspect built-in engineering Modules and capabilities.");
stdout.WriteLine(" verify Build/reimport and verify a model.");
stdout.WriteLine();
@@ -3480,6 +3481,7 @@ Model CanonicalPanel {
stdout.WriteLine(" aetheris analyze imported.step --json");
stdout.WriteLine(" aetheris fea plate-with-hole.firmament --out-dir artifacts --json");
stdout.WriteLine(" aetheris drawing compile bearing-block-drawing.firmament --out-dir artifacts/drawing --json");
+ stdout.WriteLine(" aetheris asm inspect bearing-module.firmament --json");
stdout.WriteLine();
stdout.WriteLine("Run 'aetheris <command> --help' for command-specific usage.");
}
diff --git a/Aetheris.Forge.Host.Tests/ForgeHostM1Tests.cs b/Aetheris.Forge.Host.Tests/ForgeHostM1Tests.cs
index 6d6532fe..b4cfeb71 100644
--- a/Aetheris.Forge.Host.Tests/ForgeHostM1Tests.cs
+++ b/Aetheris.Forge.Host.Tests/ForgeHostM1Tests.cs
@@ -78,6 +78,29 @@ public sealed class ForgeHostM1Tests
Assert.Contains(result.Diagnostics, diagnostic => diagnostic.Code == "forge-extension-missing");
}
+ [Fact]
+ public void UnsafeExtensionRequiresExplicitHostConsent()
+ {
+ var denied = new ForgeHost([new UnsafeExtension()]);
+ var result = ForgeTemplates.SecretCoupon(denied.LoadModule(ModulePath), new SecretCouponSpec(20, 12, 4)).Compile();
+ Assert.False(result.IsSuccess);
+ Assert.Contains(result.Diagnostics, diagnostic => diagnostic.Code == "forge-extension-unsafe-consent-required"
+ && diagnostic.Message.Contains("UNSAFE", StringComparison.Ordinal));
+
+ var allowed = new ForgeHost([new UnsafeExtension()], options: new ForgeHostOptions(AllowUnsafeExtensions: true));
+ Assert.Contains(allowed.Capabilities, capability => capability.Id.Value == "Unsafe.Capability");
+ }
+
+ [Fact]
+ public void EnumCaseIsTypedAndNeverStringCoerced()
+ {
+ var value = ForgeValue.EnumCase("MetricBoltSize", "M8");
+ Assert.Equal("MetricBoltSize", value.TypeName);
+ Assert.IsType<ForgeEnumCase>(value);
+ Assert.Equal("M8", ((ForgeEnumCase)value).CaseName);
+ Assert.Throws<ArgumentException>(() => ForgeValue.EnumCase("MetricBoltSize", "M8; Inject"));
+ }
+
[Fact]
public void RegistryOrdersMultipleExtensionsAndRejectsCapabilityCollisions()
{
@@ -229,6 +252,15 @@ public sealed class ForgeHostM1Tests
public void Register(ForgeExtensionRegistry registry) => registry.RegisterCapability(new ThrowingCapability());
}
+ private sealed class UnsafeExtension : IForgeExtension
+ {
+ public string Id => "Unsafe.Extension";
+ public Version Version => new(1, 0, 0);
+ public ForgeExtensionSafety Safety => ForgeExtensionSafety.UNSAFE;
+ public void Register(ForgeExtensionRegistry registry) => registry.RegisterCapability(
+ new StubCapability(Id, Version, "Unsafe.Capability", ForgeCapabilityDeterminism.Deterministic));
+ }
+
private sealed class ThrowingCapability : IForgeCapability
{
public ForgeCapabilityDescriptorV1 Descriptor { get; } = new(
diff --git a/Aetheris.Forge.Host/ForgeHost.cs b/Aetheris.Forge.Host/ForgeHost.cs
index a758dedf..ea27b436 100644
--- a/Aetheris.Forge.Host/ForgeHost.cs
+++ b/Aetheris.Forge.Host/ForgeHost.cs
@@ -30,9 +30,11 @@ public sealed class ForgeHost
public ForgeHost(
IEnumerable<IForgeExtension>? extensions = null,
- ForgeExtensionManifest? manifest = null)
+ ForgeExtensionManifest? manifest = null,
+ ForgeHostOptions? options = null)
{
- registry = new ForgeExtensionRegistry();
+ options ??= new ForgeHostOptions();
+ registry = new ForgeExtensionRegistry(options.AllowUnsafeExtensions);
var start = Stopwatch.GetTimestamp();
var registrationFailures = new List<ForgeDiagnostic>();
foreach (var extension in extensions ?? [])
diff --git a/Aetheris.Forge.Host/ForgeHostModels.cs b/Aetheris.Forge.Host/ForgeHostModels.cs
index acee0d89..df2eefe3 100644
--- a/Aetheris.Forge.Host/ForgeHostModels.cs
+++ b/Aetheris.Forge.Host/ForgeHostModels.cs
@@ -9,6 +9,9 @@ using Aetheris.Semantics;
namespace Aetheris.Forge.Host;
+/// <summary>Deliberate host policy for extension execution. UNSAFE is denied by default.</summary>
+public sealed record ForgeHostOptions(bool AllowUnsafeExtensions = false);
+
public sealed record ForgeDiagnostic(
string Code,
ForgeDiagnosticSeverity Severity,
diff --git a/Aetheris.Forge.Host/ForgeValues.cs b/Aetheris.Forge.Host/ForgeValues.cs
index 8f293134..1beb09dc 100644
--- a/Aetheris.Forge.Host/ForgeValues.cs
+++ b/Aetheris.Forge.Host/ForgeValues.cs
@@ -13,6 +13,7 @@ public abstract record ForgeValue(string TypeName)
public static ForgeValue From(Length value) => new ForgeLength(value.Millimeters);
public static ForgeValue From(Angle value) => new ForgeAngle(value.Degrees);
public static ForgeValue From(Version value) => new ForgeVersion(value);
+ public static ForgeValue EnumCase(string enumType, string caseName) => new ForgeEnumCase(enumType, caseName);
}
/// <summary>An application-side length expressed explicitly in millimetres.</summary>
@@ -61,6 +62,27 @@ public sealed record ForgeType(string Name) : ForgeValue("Type")
internal override string CanonicalLiteral => Name;
}
+/// <summary>A typed Firmament enum case. It is emitted as a symbol, never coerced to a string.</summary>
+public sealed record ForgeEnumCase : ForgeValue
+{
+ public ForgeEnumCase(string enumType, string caseName) : base(ValidateIdentifier(enumType, nameof(enumType)))
+ {
+ CaseName = ValidateIdentifier(caseName, nameof(caseName));
+ }
+
+ public string EnumType => TypeName;
+ public string CaseName { get; }
+ internal override string CanonicalLiteral => CaseName;
+
+ private static string ValidateIdentifier(string value, string parameterName)
+ {
+ ArgumentException.ThrowIfNullOrWhiteSpace(value, parameterName);
+ if (!(char.IsLetter(value[0]) || value[0] == '_') || value.Skip(1).Any(character => !(char.IsLetterOrDigit(character) || character == '_')))
+ throw new ArgumentException("Firmament enum type and case names must be identifiers.", parameterName);
+ return value;
+ }
+}
+
/// <summary>Typed seam from a Template parameter to an ImportedStepResource on the invocation.</summary>
public sealed record ForgeImportedStep(string ResourceName) : ForgeValue("ImportedStep")
{
diff --git a/Aetheris.Forge.SampleExtension/SecretGeometryExtension.cs b/Aetheris.Forge.SampleExtension/SecretGeometryExtension.cs
index cb227939..5a19d858 100644
--- a/Aetheris.Forge.SampleExtension/SecretGeometryExtension.cs
+++ b/Aetheris.Forge.SampleExtension/SecretGeometryExtension.cs
@@ -13,6 +13,7 @@ public sealed class SecretGeometryExtension : IForgeExtension
public static readonly Version ExtensionVersion = new(1, 0, 0);
public string Id => ExtensionId;
public Version Version => ExtensionVersion;
+ public ForgeExtensionSafety Safety => ForgeExtensionSafety.Safe;
public void Register(ForgeExtensionRegistry registry) => registry.RegisterCapability(new SecretCouponCapability());
}
diff --git a/Aetheris.Forge/Extensions/ForgeExtensionContracts.cs b/Aetheris.Forge/Extensions/ForgeExtensionContracts.cs
index a333d626..2a697340 100644
--- a/Aetheris.Forge/Extensions/ForgeExtensionContracts.cs
+++ b/Aetheris.Forge/Extensions/ForgeExtensionContracts.cs
@@ -30,6 +30,16 @@ public enum ForgeCapabilityDeterminism
ExperimentalNonDeterministic = 2,
}
+/// <summary>
+/// Declares the authority requested by an extension. Safe is the default.
+/// UNSAFE means arbitrary in-process C# authority and requires explicit host consent.
+/// </summary>
+public enum ForgeExtensionSafety
+{
+ Safe = 1,
+ UNSAFE = 2,
+}
+
public enum ForgeCapabilityParameterType
{
Length = 1,
@@ -140,6 +150,7 @@ public interface IForgeExtension
{
string Id { get; }
Version Version { get; }
+ ForgeExtensionSafety Safety => ForgeExtensionSafety.Safe;
void Register(ForgeExtensionRegistry registry);
}
@@ -162,10 +173,17 @@ public sealed class ForgeExtensionRegistry
{
private readonly SortedDictionary<string, IForgeCapability> capabilities = new(StringComparer.Ordinal);
private readonly SortedDictionary<string, Version> extensions = new(StringComparer.Ordinal);
+ private readonly bool allowUnsafeExtensions;
+
+ public ForgeExtensionRegistry(bool allowUnsafeExtensions = false) => this.allowUnsafeExtensions = allowUnsafeExtensions;
public void RegisterExtension(IForgeExtension extension)
{
ArgumentNullException.ThrowIfNull(extension);
+ if (extension.Safety == ForgeExtensionSafety.UNSAFE && !allowUnsafeExtensions)
+ throw new ForgeExtensionRegistrationException(
+ "forge-extension-unsafe-consent-required",
+ $"Extension '{extension.Id}' declares UNSAFE arbitrary C# authority. The host must explicitly set AllowUnsafeExtensions=true to load it.");
if (extensions.TryGetValue(extension.Id, out var existing))
throw new ForgeExtensionRegistrationException(
existing == extension.Version ? "forge-extension-duplicate" : "forge-extension-version-conflict",
diff --git a/Aetheris.Kernel.Firmament.Tests/ConceptPathAuthoringTests.cs b/Aetheris.Kernel.Firmament.Tests/ConceptPathAuthoringTests.cs
index bd69c2ae..dee5ad1b 100644
--- a/Aetheris.Kernel.Firmament.Tests/ConceptPathAuthoringTests.cs
+++ b/Aetheris.Kernel.Firmament.Tests/ConceptPathAuthoringTests.cs
@@ -106,7 +106,7 @@ public sealed class ConceptPathAuthoringTests
Assert.Null(parsed.Feature);
Assert.Contains("profile-path-missing:Plate:MissingOutline", parsed.Diagnostics);
- Assert.Contains("compose-operation-unresolved-profile:Stock:Plate", parsed.Diagnostics);
+ Assert.Contains("ConceptPathProfileNotAdmittedByCompose:Stock:Plate", parsed.Diagnostics);
}
[Fact]
diff --git a/Aetheris.Kernel.Firmament/FirmamentV2/FirmamentTemplateHostBridge.cs b/Aetheris.Kernel.Firmament/FirmamentV2/FirmamentTemplateHostBridge.cs
index ade3aeee..5c9543ca 100644
--- a/Aetheris.Kernel.Firmament/FirmamentV2/FirmamentTemplateHostBridge.cs
+++ b/Aetheris.Kernel.Firmament/FirmamentV2/FirmamentTemplateHostBridge.cs
@@ -72,18 +72,24 @@ public static class FirmamentTemplateHostBridge
ArgumentNullException.ThrowIfNull(moduleSource);
ArgumentNullException.ThrowIfNull(arguments);
var collected = new List<string>();
- var expansion = FirmamentV2TemplateExpansion.ExpandHostInvocation(
- moduleSource,
- templateName,
- instanceName,
- arguments.ToDictionary(
+ Dictionary<string, FirmamentV2TemplateExpansion.HostArgument> hostArguments;
+ try
+ {
+ hostArguments = arguments.ToDictionary(
pair => pair.Key,
pair => new FirmamentV2TemplateExpansion.HostArgument(
pair.Value.Literal,
pair.Value.RecordType,
pair.Value.RecordFields),
- StringComparer.Ordinal),
- collected);
+ StringComparer.Ordinal);
+ }
+ catch (ArgumentException)
+ {
+ diagnostics = ["firmament-host-argument-duplicate"];
+ return null;
+ }
+ var expansion = FirmamentV2TemplateExpansion.ExpandHostInvocation(
+ moduleSource, templateName, instanceName, hostArguments, collected);
diagnostics = collected.Distinct(StringComparer.Ordinal).Order(StringComparer.Ordinal).ToArray();
if (expansion is null) return null;
var instance = expansion.Instantiations.Single();
diff --git a/Aetheris.Kernel.Firmament/Materializer/PrismaticProfileComposition.cs b/Aetheris.Kernel.Firmament/Materializer/PrismaticProfileComposition.cs
index aadbbc99..0bd80c07 100644
--- a/Aetheris.Kernel.Firmament/Materializer/PrismaticProfileComposition.cs
+++ b/Aetheris.Kernel.Firmament/Materializer/PrismaticProfileComposition.cs
@@ -216,7 +216,7 @@ public static class PrismaticProfileCompositionParser
var profile = match.Groups["profile"].Value;
var from = N(match, "from"); var to = N(match, "to");
if (!names.Add(name)) diagnostics.Add($"compose-duplicate-operation:{name}");
- if (!profiles.ContainsKey(profile)) diagnostics.Add($"compose-operation-unresolved-profile:{name}:{profile}");
+ if (!profiles.ContainsKey(profile)) diagnostics.Add($"ConceptPathProfileNotAdmittedByCompose:{name}:{profile}");
if (!double.IsFinite(from) || !double.IsFinite(to) || from >= to) diagnostics.Add($"compose-invalid-interval:{name}:{from:R}:{to:R}");
operations.Add(new(name, Enum.Parse<PrismaticProfileIntent>(match.Groups["intent"].Value), profile, from, to, match.Groups["role"].Success ? match.Groups["role"].Value : match.Groups["intent"].Value, $"offset:{match.Index}"));
}
diff --git a/Directory.Build.props b/Directory.Build.props
index 239dfb96..bdae2045 100644
--- a/Directory.Build.props
+++ b/Directory.Build.props
@@ -1,9 +1,9 @@
<Project>
<PropertyGroup>
- <Version>2.0.0-preview.1</Version>
+ <Version>2.0.0-preview.2</Version>
<AssemblyVersion>2.0.0.0</AssemblyVersion>
<FileVersion>2.0.0.0</FileVersion>
- <InformationalVersion>2.0.0-preview.1</InformationalVersion>
+ <InformationalVersion>2.0.0-preview.2</InformationalVersion>
<TreatWarningsAsErrors>false</TreatWarningsAsErrors>
<Nullable>enable</Nullable>
<ImplicitUsings>enable</ImplicitUsings>
diff --git a/README.md b/README.md
index d2dc21f6..ca19faef 100644
--- a/README.md
+++ b/README.md
@@ -1,10 +1,11 @@
-# Aetheris + Firmament v1
+# Aetheris 2.0.0-preview.2 + Firmament V2
-> The public Preview 1 language-manual source is maintained in the sibling
+> The public Preview 2 language-manual source is maintained in the sibling
> `yuechen-li-dev.github.io` repository at `src/aetheris` and published under
> `/aetheris/`. Documentation here includes architecture, implementation
> evidence, and historical milestone records; the authoritative frozen support
-> contract is `docs/release/preview1-feature-freeze.md`.
+> contract is `docs/preview2/feature-manifest.json` and the release notes in
+> `docs/release/2.0.0-preview.2-notes.md`.
Firmament is a deterministic DSL for generating CAD geometry (STEP AP242) via Aetheris.
@@ -28,11 +29,11 @@ parameters and are erased before geometry AIR. A Table is not a runtime
dataframe, SQL surface, or spreadsheet import format. See
[the M1 language note](docs/preview2/firmament-tables-with-m1.md).
-## Preview 1 release
+## Preview 2 release
-Aetheris 2.0.0-preview.1 is available as a complete Windows x64 bundle and as
+Aetheris 2.0.0-preview.2 is available as a complete Windows x64 bundle and as
the `Aetheris.CLI` .NET global tool. Download the bundle (including Cadmata)
-from the [GitHub Release](https://github.com/yuechen-li-dev/Aetheris/releases/tag/v2.0.0-preview.1),
+from the [GitHub Release](https://github.com/yuechen-li-dev/Aetheris/releases/tag/v2.0.0-preview.2),
or install the CLI with:
```bash
@@ -40,7 +41,7 @@ dotnet tool install --global Aetheris.CLI --prerelease
```
The NuGet tool does not include Cadmata; use the Windows bundle for `aetheris view`.
-The public manual, installation guidance, support boundary, and Preview 1
+The public manual, installation guidance, support boundary, and Preview 2
limitations are at [yuechen-li-dev.github.io/aetheris](https://yuechen-li-dev.github.io/aetheris/).
## What works today
diff --git a/docs/forge/kernel-sdk-migration.md b/docs/forge/kernel-sdk-migration.md
index 2a6a72c2..4ec61232 100644
--- a/docs/forge/kernel-sdk-migration.md
+++ b/docs/forge/kernel-sdk-migration.md
@@ -1,5 +1,38 @@
# Forge SDK package migration
+## Preview 2 safety model
+
+Host users do not need KernelSDK. Application configurators should reference
+`Aetheris.Forge.Host`; KernelSDK is for advanced C# extension development.
+
+`IForgeExtension.Safety` defaults to `ForgeExtensionSafety.Safe`. A Safe
+extension receives typed inputs, semantic/construction builders, requested
+lowering targets, deterministic math, and explicit resources supplied by the
+host. Aetheris does not provide process, network, environment-secret, arbitrary
+filesystem, or host-internal services.
+
+This capability surface is enforced at the Aetheris API boundary, including
+explicit registration, argument validation, output validation, and typed
+diagnostics. It is not a CLR security sandbox: in-process C# can call the .NET
+base class library directly. Safe is a reviewed capability contract, not
+isolation from malicious code.
+
+An extension needing arbitrary C# authority must declare:
+
+```csharp
+public ForgeExtensionSafety Safety => ForgeExtensionSafety.UNSAFE;
+```
+
+The host rejects it with `forge-extension-unsafe-consent-required` unless the
+application deliberately opts in:
+
+```csharp
+new ForgeHost(extensions, options: new ForgeHostOptions(AllowUnsafeExtensions: true));
+```
+
+The canonical SecretGeometry extension explicitly declares Safe and uses typed
+ConstructionIR/SemanticValue output only.
+
The former `Aetheris.Forge.Sdk` name mixed two audiences and has been removed before a stable NuGet release made compatibility forwarding necessary.
Use:
diff --git a/docs/preview2/consolidation-gap-inventory.md b/docs/preview2/consolidation-gap-inventory.md
index 94878652..86345045 100644
--- a/docs/preview2/consolidation-gap-inventory.md
+++ b/docs/preview2/consolidation-gap-inventory.md
@@ -25,8 +25,10 @@ manifest (`docs/preview2/feature-manifest.json`).
- 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.
+- Forge Safe extensions: deterministic, explicitly registered, and validated.
+ They are capability-bounded by public contract but still execute in-process;
+ CLR isolation is not claimed. Arbitrary authority must declare `UNSAFE` and
+ receive explicit host consent.
- Bounded recognition and recovery routes where diagnostics label them as such.
## Intentionally unsupported
@@ -37,7 +39,7 @@ manifest (`docs/preview2/feature-manifest.json`).
- 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.
+- Implicit extension assembly scanning and claims of a perfect CLR sandbox.
## Deferred post-Preview2
diff --git a/docs/preview2/evidence/release-hardening/backlog-inventory.md b/docs/preview2/evidence/release-hardening/backlog-inventory.md
new file mode 100644
index 00000000..7e6bbf9c
--- /dev/null
+++ b/docs/preview2/evidence/release-hardening/backlog-inventory.md
@@ -0,0 +1,22 @@
+# Preview 2 release-hardening inventory
+
+Audited 2026-08-10 against current code, tests, `docs`, `references`, release
+metadata, TODO/FIXME evidence, and Preview 1 release records.
+
+| Item | Disposition | Current evidence |
+| --- | --- | --- |
+| Concept Path Profile + Compose semantics | Closed | `ConceptPathAuthoringTests.ProfileFromPath_IsAnOrdinaryComposeOperand_WithPathProvenance` and consolidation M1 evidence. |
+| Generic Compose unresolved-profile diagnostic | Fixed in hardening | Renamed to `ConceptPathProfileNotAdmittedByCompose`; regression assertion updated. |
+| Canonical parser source spans | Experimental but acceptable | Normal-user V2 AST nodes for Templates, Require, Module/Panel/Assembly/Drawing/Review-facing declarations carry authored `FirmamentV2SourceSpan`; parser-wide legacy string diagnostics remain bounded debt. |
+| CIR/FRep whole-loop volume authority | Partially closed | Shared constructive intent and BRep ownership now provide supported authority; mixed line/arc whole-loop fillet remains Experimental because curved-trim certified volume envelopes are release-loose. Universal authority is not claimed. |
+| Parasolid chamfer interop | External/vendor issue | Aetheris keeps validated AP242 output authoritative; no importer-specific workaround was introduced. Vendor reproduction remains external. |
+| `FirmamentTemplateHostBridge.Expand` duplicate-key exception | Fixed in hardening | Duplicate enumerations convert to `firmament-host-argument-duplicate`; raw `ArgumentException` no longer leaks for this caller misuse. |
+| Forge enum/symbol typed value | Fixed in hardening | `ForgeEnumCase` is typed by declared enum, validates identifiers, emits a bare symbol, and never string-coerces. |
+| Forge extension default trust | Fixed in hardening | Safe default plus explicit `UNSAFE` declaration and `AllowUnsafeExtensions` host consent gate. |
+| Old `Aetheris.Forge.Sdk` package | Obsolete | Migration documentation points to Host/KernelSDK; no current project/package uses the old name. |
+| General NURBS, SheetMetal, SubD/SDF, G1/G2 Panels | Deferred post-P2 | Feature-freeze non-goals; status documented as Future/bounded. |
+| Mixed-profile whole-loop fillet | Experimental but acceptable | Exact shell exists; measurement certification boundary remains explicit. |
+| Implicit plugin discovery / hostile-code sandbox | Deferred post-P2 | No implicit scanning; in-process CLR isolation is not falsely claimed. |
+
+Historical milestone documents remain evidence of their then-current boundaries.
+The current contract is the feature manifest, Preview 2 notes, and this inventory.
diff --git a/docs/preview2/evidence/release-hardening/clean-install.md b/docs/preview2/evidence/release-hardening/clean-install.md
new file mode 100644
index 00000000..1e1f5d04
--- /dev/null
+++ b/docs/preview2/evidence/release-hardening/clean-install.md
@@ -0,0 +1,10 @@
+# Clean-install contract
+
+The release smoke lane installs `Aetheris.CLI.2.0.0-preview.2.nupkg` into a new
+tool directory from a local package feed, outside project-reference execution.
+It verifies version/help, canonical compile, STEP inspection/verification,
+assembly inspection, and Drawing PDF/PPTX output. The standalone ZIP is expanded
+into a clean directory and tested independently.
+
+Official paths are the NuGet global tool, self-contained Windows x64 bundle,
+and Firmament VSIX. Prerequisites are listed in the Preview 2 release notes.
diff --git a/docs/preview2/evidence/release-hardening/package-inventory.md b/docs/preview2/evidence/release-hardening/package-inventory.md
new file mode 100644
index 00000000..8b1b602c
--- /dev/null
+++ b/docs/preview2/evidence/release-hardening/package-inventory.md
@@ -0,0 +1,19 @@
+# Preview 2 package inventory and dependency policy
+
+| Public artifact | Version | Publication |
+| --- | --- | --- |
+| `Aetheris.CLI` NuGet global tool | `2.0.0-preview.2` | NuGet.org |
+| Windows x64 CLI + Cadmata bundle | `2.0.0-preview.2` | GitHub Release |
+| Firmament VSIX | `0.2.0-preview.2` | GitHub Release |
+| `Aetheris.Forge.Host` assembly | `2.0.0-preview.2` | Included in source/build contracts; not independently published in this freeze |
+| `Aetheris.Forge.KernelSDK` assembly | `2.0.0-preview.2` | Included in source/build contracts; not independently published in this freeze |
+
+Only `Aetheris.CLI` is an intentionally established NuGet package for Preview 2.
+Host and KernelSDK have coherent names and public assembly versions, but their
+current project-reference dependency graph has not been promoted into a complete
+independently published NuGet package family. Publishing only their leaf packages
+would create unresolved dependencies, so this release does not do so accidentally.
+
+The CLI tool embeds the bounded runtime graph: Kernel.Firmament/Core,
+StandardLibrary, Forge contracts, Semantics, Continuum, FEA, Collaboration,
+Modules/BuiltIn, Surfacing, Piping, SheetMetal, and FrictionLab runtime support.
diff --git a/docs/preview2/evidence/release-hardening/security-dependency-report.md b/docs/preview2/evidence/release-hardening/security-dependency-report.md
new file mode 100644
index 00000000..d0837292
--- /dev/null
+++ b/docs/preview2/evidence/release-hardening/security-dependency-report.md
@@ -0,0 +1,9 @@
+# Security and dependency audit
+
+Release validation records the final NuGet vulnerability audit, frontend
+dependency checks, and secret/path scan in `validation-report.md` after artifact
+construction.
+
+KernelSDK denies `UNSAFE` extensions by default with a typed diagnostic. Safe
+extensions are constrained to Aetheris-provided typed seams by API design; the
+remaining in-process CLR restriction is contractual and documented.
diff --git a/docs/preview2/evidence/release-hardening/validation-report.md b/docs/preview2/evidence/release-hardening/validation-report.md
new file mode 100644
index 00000000..f4dcde2e
--- /dev/null
+++ b/docs/preview2/evidence/release-hardening/validation-report.md
@@ -0,0 +1,59 @@
+# Preview 2 final validation report
+
+Validated on Windows x64, .NET SDK 10.0.302, 2026-08-10.
+
+## Build and tests
+
+- `dotnet build Aetheris.slnx -f net10.0 /m:1`: success, 0 warnings, 0 errors.
+- `dotnet test Aetheris.slnx -f net10.0 --no-build`: 2,696 passed,
+ 0 failed, 0 skipped across 11 discovered test assemblies. The legacy
+ `Aetheris.FrictionLab.Tests` assembly contains no discoverable tests.
+- Focused KernelSDK/Host safety and enum regressions: 10 passed.
+- Focused Concept Path/Compose diagnostics: 11 passed.
+- Cadmata frontend: 78 tests passed; format, typecheck, build, and lint passed.
+- Firmament VSIX: 13 extension/grammar tests passed; typecheck and bundle passed.
+- Public documentation sibling checkout already presents Preview 2 as current;
+ its production build passed without modifying that repository.
+
+## Installed artifact smoke
+
+- Self-contained bundle: `aetheris 2.0.0-preview.2`, help, validate, build,
+ STEP inspect, and verify passed from a fresh extraction directory.
+- NuGet package: installed into a fresh tool path from a local feed; reported
+ `aetheris 2.0.0-preview.2`; canonical compile and STEP inspect passed.
+- Assembly: `aetheris asm inspect fixtures/AssemblyM0/bearing-module.firmament
+ --json` succeeded, including fit/tolerance results.
+- Drawing: canonical fixture emitted DrawingIR, SVG, vector PDF, editable PPTX,
+ review PPTX, and DFM review PPTX.
+- Modules: packaged CLI returned the built-in module catalog.
+- Forge sample/database/Continuum/FEA/SurfaceMeshIR/Piping/Surfacing/Review lanes
+ are covered by the passing solution test matrix and persisted milestone evidence.
+
+## Security and dependencies
+
+- `dotnet list Aetheris.slnx package --vulnerable --include-transitive` reported
+ no vulnerable packages in the publishable CLI graph. The `.esproj` is not a
+ PackageReference project and is audited through tspack/npm instead.
+- npm packaging audit reported 0 vulnerabilities.
+- tspack retained two acknowledged advisories: 21 multi-version lock resolutions
+ and 114 lifecycle scripts blocked by category policy. Neither executed nor
+ produced a release failure.
+- Targeted secret/path scan found no credentials. Historical evidence files do
+ contain developer-machine absolute paths; none are included in release assets.
+
+## Reproducibility
+
+Two consecutive complete packaging runs produced byte-identical artifacts.
+ZIP entry timestamps, NuGet package relationship IDs, and static-web-asset
+Last-Modified metadata are canonicalized by `scripts/package-release.ps1`.
+
+| Artifact | Bytes | SHA-256 |
+| --- | ---: | --- |
+| `Aetheris-2.0.0-preview.2-win-x64.zip` | 95,329,050 | `b0c8b9f94ee0e48ccbc4b782def925cd4691cb336423daef51ea0369b82ea065` |
+| `aetheris-firmament-0.2.0-preview.2.vsix` | 12,143 | `badd7dbb9a045a6d6fa163bbbaeb03d22ef5b38e1aa60b4d986ce4bef5799762` |
+| `Aetheris.CLI.2.0.0-preview.2.nupkg` | 3,529,189 | `0766dc525c7e89f775037ea75face25b26bc426f18527fed903c5606548ef219` |
+
+The NuGet package contains the CLI tool payload and its runtime assemblies,
+readme, nuspec, and tool settings; it contains no source tree, tests, secrets,
+or evidence directory. The Windows bundle includes the self-contained CLI and
+Cadmata by contract. The VSIX contains ten editor-extension entries only.
diff --git a/docs/preview2/feature-manifest.json b/docs/preview2/feature-manifest.json
index 9e9d5b52..4e8c8c94 100644
--- a/docs/preview2/feature-manifest.json
+++ b/docs/preview2/feature-manifest.json
@@ -1,7 +1,7 @@
{
- "version": "Preview 2 Assembly M2",
- "generatedAt": "2026-08-09",
- "statuses": ["Supported", "Experimental", "Bounded", "Unsupported"],
+ "version": "2.0.0-preview.2 feature freeze",
+ "generatedAt": "2026-08-10",
+ "statuses": ["Supported", "Experimental", "Bounded", "Future", "Legacy"],
"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."},
@@ -16,9 +16,9 @@
{"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-construction-extension","status":"Bounded","reason":"Safe-declared explicitly registered capabilities are the default; UNSAFE arbitrary C# requires explicit host consent. CLR isolation of Safe code is contractual, not a security boundary."},
{"id":"forge-semantic-output","status":"Supported","reason":"Capabilities may expose validated SemanticValue roots/members; SecretGeometry exact faces use ordinary path, Selection and FEA consumers."},
- {"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":"forge-general-assembly-loft-sourcegen","status":"Future","reason":"Multi-body/general loft/nested host Record/source generator/plugin discovery are not Preview 2 production features."},
{"id":"mixed-profile-whole-loop-fillet","status":"Experimental","reason":"Exact shell executes but curved-trim certified volume envelopes remain release-loose."},
{"id":"firmasm-assembly-profile","status":"Supported","reason":".firmasm uses Firmament V2 syntax with exactly one root Assembly; historical JSON-shaped input migrates through the ordinary compiler."},
{"id":"ap242-product-structure","status":"Bounded","reason":"Products, nested occurrences, shared exact definitions, and rigid transforms round-trip; Aetheris-only Mate, Interface, and tolerance semantics remain in Firmament."},
diff --git a/docs/release/2.0.0-preview.2-notes.md b/docs/release/2.0.0-preview.2-notes.md
new file mode 100644
index 00000000..a1c62ba4
--- /dev/null
+++ b/docs/release/2.0.0-preview.2-notes.md
@@ -0,0 +1,70 @@
+# Aetheris 2.0.0-preview.2
+
+Preview 2 is the feature-freeze release for Aetheris' current code-first CAD
+stack. It focuses on completing and reconciling existing work: Firmament V2,
+exact construction, engineering assemblies and modules, analysis, drawings,
+collaboration, packaging, and the advanced Forge extension boundary.
+
+GitHub policy: although the version remains a SemVer preview, this is the
+current public Aetheris release and is intentionally marked Latest so the older
+PMI demo is not presented as the current product release.
+
+## Highlights
+
+- Firmament V2 Concepts, Templates, Records, static Tables, typed values,
+ semantic paths, Profile/Compose, and source-grounded diagnostics.
+- Forge Host for ordinary application integration and KernelSDK for advanced
+ extension authors. Safe is the default; extensions declaring `UNSAFE` require
+ explicit `ForgeHostOptions(AllowUnsafeExtensions: true)` consent.
+- Exact ConstructionIR/BRep/AP242 workflows, bounded SurfaceMeshIR, Continuum
+ dual representation, linear-elastic FEA, and tolerance stack-up.
+- Firmament V2 assemblies with Interfaces, Mates, reusable definitions, AP242
+ product-structure round trips, and Cadmata assembly inspection.
+- Built-in Surfacing, Panels, Piping, and engineering Modules with explicit
+ bounded/experimental status.
+- Drawing Templates producing SVG, vector PDF, and editable PPTX, plus DFM
+ review and collaboration exports.
+- Database-driven CAD sample using SQLite/LINQ and typed Forge Host invocation.
+
+## Install
+
+The official Preview 2 paths are the NuGet global tool, the Windows x64 bundle
+(which includes Cadmata), and the Firmament VSIX from this release.
+
+```powershell
+dotnet tool install --global Aetheris.CLI --version 2.0.0-preview.2
+aetheris --version
+aetheris --help
+```
+
+The CLI requires the .NET 10 runtime. The self-contained Windows bundle does
+not. Cadmata/browser and Vulkan/WebGL support are optional viewer concerns; no
+external STEP tool is required for compilation or inspection. The .NET 10 SDK,
+Node/tspack, VS Code packaging tools, and vendor CAD importers are development
+or interoperability tools, not CLI runtime prerequisites.
+
+## Breaking changes from Preview 1
+
+- `.firmasm` now uses the Firmament V2 assembly profile. Historical JSON-shaped
+ syntax is legacy and should be migrated to `Assembly`, `Part`, `Interface`,
+ and `Mate` declarations.
+- `Aetheris.Forge.Sdk` was split into `Aetheris.Forge.Host` for consumers and
+ `Aetheris.Forge.KernelSDK` for extension development.
+- The generic `compose-operation-unresolved-profile` diagnostic is now
+ `ConceptPathProfileNotAdmittedByCompose`.
+- Template/static syntax follows current V2 `Record`, `Static Table`, and named
+ argument rules; unsupported historical source forms are not silently guessed.
+
+## Known limitations
+
+- Panel G1/G2 continuity, SheetMetal, SubD/SDF authoring, and general NURBS
+ support are future work.
+- SurfaceMeshIR, recognition/recovery, curved FEA, mixed-profile whole-loop
+ fillets, and AP242 product structure are bounded as described in the feature
+ manifest.
+- Parasolid chamfer import behavior remains an external/vendor interoperability
+ issue where Aetheris' AP242 output validates; geometry correctness is not
+ weakened for an unverified importer workaround.
+- Safe KernelSDK extensions receive only typed Aetheris interfaces by contract,
+ but .NET in-process code is not a cryptographic sandbox. `UNSAFE` accurately
+ denotes arbitrary C# authority and requires explicit host opt-in.
diff --git a/docs/release/Aetheris.CLI.README.md b/docs/release/Aetheris.CLI.README.md
index d486de2c..42b6d631 100644
--- a/docs/release/Aetheris.CLI.README.md
+++ b/docs/release/Aetheris.CLI.README.md
@@ -16,4 +16,4 @@ download the Windows bundle from the GitHub release for package-relative Cadmata
discovery and the complete desktop experience.
See the [Aetheris manual](https://yuechen-li-dev.github.io/aetheris/) for the
-supported Firmament surface and Preview 1 limitations.
+supported Firmament surface and Preview 2 limitations.
diff --git a/scripts/package-release.ps1 b/scripts/package-release.ps1
index 08a21089..ef8a8e50 100644
--- a/scripts/package-release.ps1
+++ b/scripts/package-release.ps1
@@ -10,20 +10,66 @@ $ErrorActionPreference = 'Stop'
$repoRoot = Split-Path -Parent $PSScriptRoot
$output = [System.IO.Path]::GetFullPath((Join-Path $repoRoot $OutputDirectory))
$stage = Join-Path $output 'stage'
+
+function Normalize-ZipArchive([string]$Path, [switch]$NuGetPackage) {
+ $temporary = "$Path.deterministic"
+ $source = [System.IO.Compression.ZipFile]::OpenRead($Path)
+ $target = [System.IO.Compression.ZipFile]::Open($temporary, [System.IO.Compression.ZipArchiveMode]::Create)
+ try {
+ foreach ($sourceEntry in ($source.Entries | Sort-Object FullName)) {
+ $entryName = $sourceEntry.FullName
+ if ($NuGetPackage -and $entryName -match '^package/services/metadata/core-properties/.+\.psmdcp$') {
+ $entryName = 'package/services/metadata/core-properties/aetheris.psmdcp'
+ }
+ $targetEntry = $target.CreateEntry($entryName, [System.IO.Compression.CompressionLevel]::Optimal)
+ $targetEntry.LastWriteTime = [DateTimeOffset]::new(1980, 1, 1, 0, 0, 0, [TimeSpan]::Zero)
+ if ($sourceEntry.FullName.EndsWith('/')) { continue }
+ $input = $sourceEntry.Open()
+ $outputStream = $targetEntry.Open()
+ try {
+ if ($NuGetPackage -and $sourceEntry.FullName -eq '_rels/.rels') {
+ $reader = [System.IO.StreamReader]::new($input)
+ try { $content = $reader.ReadToEnd() } finally { $reader.Dispose() }
+ $content = [Regex]::Replace($content, 'package/services/metadata/core-properties/[^"'']+\.psmdcp', 'package/services/metadata/core-properties/aetheris.psmdcp')
+ $content = [Regex]::Replace($content, '(manifest" Target="/Aetheris\.CLI\.nuspec" Id=")[^"]+', '${1}RManifest')
+ $content = [Regex]::Replace($content, '(core-properties" Target="/package/services/metadata/core-properties/aetheris\.psmdcp" Id=")[^"]+', '${1}RCoreProperties')
+ $writer = [System.IO.StreamWriter]::new($outputStream, [System.Text.UTF8Encoding]::new($false))
+ try { $writer.Write($content) } finally { $writer.Dispose() }
+ }
+ else { $input.CopyTo($outputStream) }
+ }
+ finally { $outputStream.Dispose(); $input.Dispose() }
+ }
+ }
+ finally { $target.Dispose(); $source.Dispose() }
+ Move-Item -LiteralPath $temporary -Destination $Path -Force
+}
Remove-Item -LiteralPath $output -Recurse -Force -ErrorAction SilentlyContinue
New-Item -ItemType Directory -Force -Path $stage, (Join-Path $output 'packages') | Out-Null
Push-Location (Join-Path $repoRoot 'aetheris.client')
try {
- npm ci
- npm test
- npm run build
+ tspack sync
+ tspack check
+ tspack run typecheck
+ tspack run test
+ tspack run build
+ tspack run lint
}
finally { Pop-Location }
dotnet publish (Join-Path $repoRoot 'Aetheris.CLI/Aetheris.CLI.csproj') -c Release -r win-x64 --self-contained true -p:Version=$Version -o (Join-Path $stage 'Aetheris-win-x64')
dotnet publish (Join-Path $repoRoot 'Aetheris.Server/Aetheris.Server.csproj') -c Release -r win-x64 --self-contained true -p:Version=$Version -o (Join-Path $stage 'Aetheris-win-x64/cadmata')
-dotnet pack (Join-Path $repoRoot 'Aetheris.CLI/Aetheris.CLI.csproj') -c Release --no-build -p:Version=$Version -o (Join-Path $output 'packages')
+$endpoints = Join-Path $stage 'Aetheris-win-x64/cadmata/Cadmata.staticwebassets.endpoints.json'
+if (Test-Path -LiteralPath $endpoints) {
+ $canonicalEndpoints = [Regex]::Replace([IO.File]::ReadAllText($endpoints),
+ '"Last-Modified","Value":"[^"]+"', '"Last-Modified","Value":"Mon, 01 Jan 2024 00:00:00 GMT"')
+ [IO.File]::WriteAllText($endpoints, $canonicalEndpoints, [Text.UTF8Encoding]::new($false))
+}
+# Build the framework-dependent tool payload explicitly. Reusing the preceding
+# RID-specific publish output can package stale non-RID bytes with a new filename.
+dotnet pack (Join-Path $repoRoot 'Aetheris.CLI/Aetheris.CLI.csproj') -c Release -p:Version=$Version -p:DebugType=None -p:DebugSymbols=false -o (Join-Path $output 'packages')
+Get-ChildItem -LiteralPath (Join-Path $output 'packages') -Filter '*.nupkg' -File | ForEach-Object { Normalize-ZipArchive $_.FullName -NuGetPackage }
Get-ChildItem -LiteralPath $stage -Recurse -Filter '*.pdb' -File | Remove-Item -Force
$extensionRoot = Join-Path $repoRoot 'tools/vscode-firmament'
@@ -33,11 +79,24 @@ try {
npx tsc --noEmit
node --test tests/*.test.ts
npx esbuild src/extension.ts --bundle --platform=node --format=cjs --external:vscode --outfile=dist/extension.cjs
- npx vsce package --no-dependencies --out (Join-Path $output 'aetheris-firmament-0.1.0-preview.1.vsix')
+ npx vsce package --no-dependencies --out (Join-Path $output 'aetheris-firmament-0.2.0-preview.2.vsix')
}
finally { Pop-Location }
+Normalize-ZipArchive (Join-Path $output 'aetheris-firmament-0.2.0-preview.2.vsix')
$zip = Join-Path $output "Aetheris-$Version-win-x64.zip"
-Compress-Archive -Path (Join-Path $stage 'Aetheris-win-x64') -DestinationPath $zip -CompressionLevel Optimal
-$releaseFiles = @($zip, (Join-Path $output 'aetheris-firmament-0.1.0-preview.1.vsix')) + (Get-ChildItem -LiteralPath (Join-Path $output 'packages') -Filter '*.nupkg' -File | Select-Object -ExpandProperty FullName)
+$sourceRoot = Join-Path $stage 'Aetheris-win-x64'
+$archive = [System.IO.Compression.ZipFile]::Open($zip, [System.IO.Compression.ZipArchiveMode]::Create)
+try {
+ Get-ChildItem -LiteralPath $sourceRoot -Recurse -File | Sort-Object FullName | ForEach-Object {
+ $relative = [System.IO.Path]::GetRelativePath($sourceRoot, $_.FullName).Replace('\', '/')
+ $entry = $archive.CreateEntry("Aetheris-win-x64/$relative", [System.IO.Compression.CompressionLevel]::Optimal)
+ $entry.LastWriteTime = [DateTimeOffset]::new(1980, 1, 1, 0, 0, 0, [TimeSpan]::Zero)
+ $input = $_.OpenRead()
+ $entryStream = $entry.Open()
+ try { $input.CopyTo($entryStream) } finally { $entryStream.Dispose(); $input.Dispose() }
+ }
+}
+finally { $archive.Dispose() }
+$releaseFiles = @($zip, (Join-Path $output 'aetheris-firmament-0.2.0-preview.2.vsix')) + (Get-ChildItem -LiteralPath (Join-Path $output 'packages') -Filter '*.nupkg' -File | Select-Object -ExpandProperty FullName)
$releaseFiles | Get-FileHash -Algorithm SHA256 | ForEach-Object { "{0} {1}" -f $_.Hash.ToLowerInvariant(), $_.Path.Substring($output.Length + 1) } | Set-Content (Join-Path $output 'SHA256SUMS.txt')
diff --git a/tools/vscode-firmament/CHANGELOG.md b/tools/vscode-firmament/CHANGELOG.md
index 59efc529..366762a2 100644
--- a/tools/vscode-firmament/CHANGELOG.md
+++ b/tools/vscode-firmament/CHANGELOG.md
@@ -1,5 +1,11 @@
# Changelog
+## 0.2.0-preview.2
+
+- Align Firmament V2 syntax, diagnostics, commands, and reference links with
+ Aetheris 2.0.0-preview.2.
+- Keep CLI execution gated by VS Code workspace trust.
+
## 0.1.0-preview.1
- Register Firmament and provide canonical TextMate highlighting, language configuration, and snippets.
diff --git a/tools/vscode-firmament/README.md b/tools/vscode-firmament/README.md
index ad283b0f..eaa29946 100644
--- a/tools/vscode-firmament/README.md
+++ b/tools/vscode-firmament/README.md
@@ -6,7 +6,7 @@ Firmament is Aetheris's canonical, intent-oriented language for mechanical desig
Install the Aetheris CLI so `aetheris` is on `PATH`, or set `aetheris.executablePath` to the executable. The extension never implements or guesses compiler semantics.
-Current development builds are installed from the supplied VSIX: in VS Code run **Extensions: Install from VSIX...** and select `aetheris-firmament-0.1.0-preview.1.vsix`.
+Preview 2 builds are installed from the supplied VSIX: in VS Code run **Extensions: Install from VSIX...** and select `aetheris-firmament-0.2.0-preview.2.vsix`.
## Commands
diff --git a/tools/vscode-firmament/manifest.tsx b/tools/vscode-firmament/manifest.tsx
index c7f76b1e..a04f808a 100644
--- a/tools/vscode-firmament/manifest.tsx
+++ b/tools/vscode-firmament/manifest.tsx
@@ -39,7 +39,7 @@ export default define(
<Workspace name="aetheris-firmament" runtime="nodejs">
<Package
name="aetheris-firmament"
- version="0.1.0-preview.1"
+ version="0.2.0-preview.2"
kind="app"
license="MIT"
dependencies={{
@@ -93,7 +93,7 @@ export default define(
"package",
"--no-dependencies",
"--out",
- "../../artifacts/vscode/aetheris-firmament-0.1.0-preview.1.vsix",
+ "../../artifacts/release/preview2/aetheris-firmament-0.2.0-preview.2.vsix",
],
},
]}
diff --git a/tools/vscode-firmament/package.json b/tools/vscode-firmament/package.json
index 85afc309..e9e9748f 100644
--- a/tools/vscode-firmament/package.json
+++ b/tools/vscode-firmament/package.json
@@ -2,14 +2,14 @@
"name": "aetheris-firmament",
"displayName": "Aetheris Firmament",
"description": "Firmament language support and CLI-backed workflows for Aetheris.",
- "version": "0.1.0-preview.1",
+ "version": "0.2.0-preview.2",
"publisher": "aetheris",
"license": "MIT",
"preview": true,
"type": "module",
"repository": {
"type": "git",
- "url": "https://github.com/yuechen-li/Aetheris.git"
+ "url": "https://github.com/yuechen-li-dev/Aetheris.git"
},
"engines": {
"vscode": "^1.90.0"