arcane-os 0.54.1 → 0.55.0

package/src/packager/core.mjs

@@ -20,6 +20,7 @@ import {
     applyPwaEntryReferences,
     inspectImportMapHtml,
     readWorkspaceAssetVersion,
+    removePwaEntryReferences,
     resolveAssetReference,
     rewriteAssetReferences,
     versionAssetUrl
@@ -920,6 +921,51 @@ async function packageWithContext(context,options={}){
             await copyBase();
         }
         let files=await listOutputFiles(stagingRoot,{signal});
+        const entryUrl=new URL(packageResourceUrl(entryPath),'http://arcane.invalid/');
+        const selectedFiles=new Set(files);
+        const explicitDocumentPaths=context.config.documents===undefined?null:new Set(
+            inspected.browserDocuments.map(function selectedDocumentPath(document){return document.packagePath;})
+        );
+        const pwaDocumentPaths=new Set(explicitDocumentPaths??[entryPath]);
+        for(const selected of explicitDocumentPaths===null?context.config.include:[]){
+            const selectedPath=appPackagePath(context,selected);
+            if(/\.html?$/iu.test(selected)&&selectedFiles.has(selectedPath))pwaDocumentPaths.add(selectedPath);
+        }
+        for(const document of inspected.browserDocuments){
+            const appDocument=context.config.include.some(function includesAppDocument(selected){
+                return sameOrDescendant(document.path,selected);
+            });
+            if(appDocument&&(appPath===''||document.managedMaps.length>0)&&selectedFiles.has(document.packagePath)){
+                pwaDocumentPaths.add(document.packagePath);
+            }
+        }
+        if (!pwaEnabled) {
+            // Remove source-generated registration before native processing can follow it.
+            const removals = await Promise.allSettled(
+                [...pwaDocumentPaths].map(
+                    async function removeStagedPwaReferences(documentPath) {
+                        throwIfAborted(signal);
+                        const filePath = path.join(stagingRoot, ...documentPath.split('/'));
+                        const source = await readFile(filePath, 'utf8');
+                        const content = removePwaEntryReferences(
+                            source,
+                            {
+                                documentUrl: new URL(packageResourceUrl(documentPath), entryUrl.origin),
+                                manifestUrl: new URL(`/${PWA_MANIFEST_NAME}`, entryUrl.origin)
+                            }
+                        );
+                        if (content !== source) await writeFile(filePath, content, 'utf8');
+                    }
+                )
+            );
+            // Settle every stage write before a failure can trigger stage cleanup.
+            const errors = [];
+            for (const removal of removals) {
+                if (removal.status === 'rejected') errors.push(removal.reason);
+            }
+            if (errors.length === 1) throw errors[0];
+            if (errors.length > 1) throw new AggregateError(errors, 'Selected PWA reference removal failed.');
+        }
         if(moduleFormat==='native'){
             files=await materializeNativeModules({
                 stagingRoot,
@@ -937,27 +983,10 @@ async function packageWithContext(context,options={}){
         const inventory=new Set(files);
         const offlineInventory=pwaEnabled?new Set(selectPwaFiles(files,context.config.pwa,appPath)):null;
         const offlineReferences=new Set();
-        const entryUrl=new URL(packageResourceUrl(entryPath),'http://arcane.invalid/');
         const pwaDocumentSources=new Map();
-        const explicitDocumentPaths=context.config.documents===undefined?null:new Set(
-            inspected.browserDocuments.map(function selectedDocumentPath(document){return document.packagePath;})
-        );
         if(pwaEnabled){
-            const documentPaths=new Set(explicitDocumentPaths??[entryPath]);
-            for(const selected of explicitDocumentPaths===null?context.config.include:[]){
-                const selectedPath=appPackagePath(context,selected);
-                if(/\.html?$/iu.test(selected)&&inventory.has(selectedPath))documentPaths.add(selectedPath);
-            }
-            for(const document of inspected.browserDocuments){
-                const appDocument=context.config.include.some(function includesAppDocument(selected){
-                    return sameOrDescendant(document.path,selected);
-                });
-                if(appDocument&&(appPath===''||document.managedMaps.length>0)&&inventory.has(document.packagePath)){
-                    documentPaths.add(document.packagePath);
-                }
-            }
             await Promise.all(
-                [...documentPaths].map(
+                [...pwaDocumentPaths].map(
                     async function readPwaDocument(documentPath) {
                         const source = await readFile(
                             path.join(stagingRoot, ...documentPath.split('/')),

package/src/targets/index.mjs

@@ -21,7 +21,7 @@ const DEFINITIONS=[
         id:'portable',displayName:'Portable native application',status:'pairing-required',
         platforms:['windows','linux'],architectures:['x64','arm64'],formats:['portable'],
         signingModes:['unsigned-local-test'],
-        reason:'Portable output is available when paired to an Arcane OS native provider.'
+        reason:'Portable app payloads use the SDK package provider by default; explicit provider pairing remains available.'
     },
     {
         id:'windows-x64',displayName:'Windows x64 executable',status:'pairing-required',
@@ -226,6 +226,7 @@ export function createNativeTargetAdapter({targetId,nativeBuilder}={}){
         appReleaseRoot,
         release,
         appDescriptor,
+        selectedSdk,
         dependencyReleases,
         minimumCoreVersion,
         protectedRoots,
@@ -242,6 +243,7 @@ export function createNativeTargetAdapter({targetId,nativeBuilder}={}){
             appReleaseRoot,
             release,
             appDescriptor,
+            selectedSdk,
             dependencyReleases,
             minimumCoreVersion,
             protectedRoots,

package/src/toolchain.mjs

@@ -836,8 +836,11 @@ function sameCanonicalPath(left,right){
     return normalize(left)===normalize(right);
 }
 
-export function assertIntegratedNativeToolchain({workspaceMode,workspaceRoot,toolchainRoot,target}={}){
+export function assertIntegratedNativeToolchain({
+    workspaceMode,workspaceRoot,toolchainRoot,target,providerSource='arcane-checkout'
+}={}){
     if(workspaceMode!=='integrated')return;
+    if(providerSource==='sdk-package'&&target==='portable')return;
     if(!is.string(toolchainRoot)||!sameCanonicalPath(workspaceRoot,toolchainRoot)){
         throw new ArcaneError(
             ERROR_CODES.policyDenied,
@@ -992,6 +995,7 @@ function pathsOverlap(left,right){
 
 async function packageNativeRelease(prepared,app,{
     workspaceOperationLease,
+    selectedSdk,
     signal,
     onEvent
 }={}){
@@ -1010,6 +1014,7 @@ async function packageNativeRelease(prepared,app,{
         release,
         nativeInput:{
             appDescriptor:app.descriptor,
+            ...(selectedSdk===undefined?{}:{selectedSdk}),
             appReleaseRoot:release.outputRoot??path.resolve(prepared.workspaceRoot,release.output),
             release:{manifest:release.manifest,files:[...release.files]}
         }
@@ -1027,7 +1032,8 @@ async function executePairedNativeBuild(options,adapter,{
         target,
         workspaceMode:initialPrepared.workspaceMode,
         workspaceRoot:initialPrepared.workspaceRoot,
-        toolchainRoot:options.toolchainRoot
+        toolchainRoot:options.toolchainRoot,
+        providerSource:options.providerSource
     });
     if(options.dryRun){
         throw new ArcaneError(
@@ -1051,6 +1057,11 @@ async function executePairedNativeBuild(options,adapter,{
     }
     const dependencyApps=await nativeDependencyClosure(initialPrepared,{target,signal,onEvent});
     const prepared=initialPrepared;
+    const installedSdk=await readInstalledSdkLayout(prepared.workspaceRoot,prepared.validation.config);
+    const selectedSdk=installedSdk===null?undefined:{
+        packageRoot:installedSdk.packageRoot,
+        packageSource:installedSdk.packageSource
+    };
     const packageOutputs=[];
     for(const app of [prepared.validation.app,...dependencyApps]){
         const releaseRoot=resolvePackageOutputRoot(
@@ -1073,13 +1084,13 @@ async function executePairedNativeBuild(options,adapter,{
         descriptorSource:prepared.validation.app.descriptorSource,
         descriptorPath:prepared.validation.app.descriptorPath,
         validation:prepared.validation
-    },{workspaceOperationLease,signal,onEvent});
+    },{workspaceOperationLease,selectedSdk,signal,onEvent});
     const dependencyReleases=[];
     for(const dependency of dependencyApps){
         dependencyReleases.push(await packageNativeRelease(
             prepared,
             dependency,
-            {workspaceOperationLease,signal,onEvent}
+            {workspaceOperationLease,selectedSdk,signal,onEvent}
         ));
     }
     const toolchain=await adapter.prepare({
@@ -1094,7 +1105,11 @@ async function executePairedNativeBuild(options,adapter,{
         toolchainRoot:options.toolchainRoot,
         toolchain,
         ...selectedRelease.nativeInput,
-        dependencyReleases:dependencyReleases.map(item=>item.nativeInput),
+        dependencyReleases:dependencyReleases.map(item=>({
+            appId:item.appId,
+            releaseRoot:item.nativeInput.appReleaseRoot,
+            release:item.nativeInput.release
+        })),
         minimumCoreVersion:ARCANE_MACHINE_BUNDLE_VERSION,
         protectedRoots,
         outputRoot,