arcane-os 0.40.0 → 0.41.0

package/runtime/arcane/components/speech.html

@@ -518,7 +518,7 @@
             requestUserMute();
         } else {
             pendingUnmute = true;
-            host.muted = true;
+            host.muted = false;
             if (!settleSuccessfulUnmute()) {
                 synchronizeAIMutedState();
                 continuePendingUnmute();
@@ -567,21 +567,24 @@
         if (sttBecameUnready) {
             cancelSTTOperation('runtime-unready');
         }
-        if (ttsBecameUnready) {
+        if (ttsBecameUnready && ttsRole.state !== 'error') {
             pendingUnmute = false;
-            host.muted = true;
             stopTTSPlayback();
         }
-        if (ttsRole.state === 'error' && (pendingUnmute || !host.muted)) {
+        if (ttsRole.state === 'error') {
             pendingUnmute = false;
-            host.muted = true;
-            stopTTSPlayback();
         }
 
-        settleSuccessfulUnmute();
+        const unmuteSettled = settleSuccessfulUnmute();
         continuePendingUnmute();
 
         synchronizeAIMutedState();
+        if (!unmuteSettled
+            && previousTTSRole.state !== 'ready'
+            && ttsRole.state === 'ready'
+            && !host.muted) {
+            resumeTTSPlayback();
+        }
         renderControls();
         renderStatus();
     }
@@ -720,6 +723,9 @@
             if (pendingTTSIntent === 'load') {
                 label = 'Cancel voice load';
                 description = 'Cancel loading the selected voice.';
+            } else if (!host.muted) {
+                label = 'Load voice';
+                description = 'Load the selected voice.';
             }
         } else if (ttsRole.state === 'error') {
             disabled = !providerSelected;
@@ -960,7 +966,7 @@
             return;
         }
 
-        if (host.muted) {
+        if (host.muted || ['unloaded', 'error'].includes(ttsRole.state)) {
             void requestUserUnmute();
         } else {
             requestUserMute();
@@ -976,7 +982,7 @@
         }
         const wasMuted = host.muted;
         pendingUnmute = false;
-        const shouldUnload = !wasMuted
+        const shouldUnload = (!wasMuted && is.function(globalThis.ai?.setSpeechMuted))
             || pendingTTSIntent === 'load'
             || ['loading', 'ready', 'error'].includes(ttsRole.state);
         host.muted = true;
@@ -1004,9 +1010,9 @@
         ) {
             return false;
         }
+        host.muted = false;
         if (!is.function(globalThis.ai?.setSpeechMuted)) {
             pendingUnmute = true;
-            host.muted = true;
             renderControls();
             renderStatus();
             return false;
@@ -1021,8 +1027,7 @@
                 && ['unloaded', 'loading', 'error'].includes(ttsRole.state)
             );
         if (!canRequestLoad) {
-            host.muted = true;
-            stopTTSPlayback();
+            pendingUnmute = false;
             reportTTSLifecycleError(
                 new Error('No selected speech provider is available to load.'),
                 'load'
@@ -1038,8 +1043,6 @@
         }
         if (!requested) {
             pendingUnmute = false;
-            host.muted = true;
-            stopTTSPlayback();
             renderControls();
             renderStatus();
             return false;
@@ -1117,8 +1120,6 @@
             pendingTTSIntent = null;
             if (action === 'load') {
                 pendingUnmute = false;
-                host.muted = true;
-                stopTTSPlayback();
             }
             reportTTSLifecycleError(error, action, operationId);
             return false;
@@ -1211,8 +1212,6 @@
             : 'synthesis';
         const failure = failures[normalizedBoundary];
         const message = visibleErrorMessage(error, failure.message);
-        host.muted = true;
-        stopTTSPlayback();
         localStatus = {
             message,
             tone: 'error'

package/src/dev-server.mjs

@@ -13,7 +13,7 @@ import {APP_CONFIG_NAME, validateAppConfig} from './packager/core.mjs';
 import {createEventQueue} from './event-queue.mjs';
 import {
     applyPwaEntryReferences,inspectImportMapHtml,MANAGED_IMPORT_MAP_ATTRIBUTE,
-    readWorkspaceAssetVersion,rewriteAssetReferences,versionAssetUrl
+    readWorkspaceAssetVersion,resolveAssetReference,rewriteAssetReferences,versionAssetUrl
 } from './import-map.mjs';
 import {createPwaArtifacts,selectPwaFiles} from './pwa.mjs';
 
@@ -658,14 +658,15 @@ async function sourcePwaAssets(routeSet, mappings, signal, resourceUrls, resourc
                 }
             }
         }
-        for (const {url, kind, baseHref, baseKind} of references) {
+        for (const reference of references) {
+            const {url, kind} = reference;
             if (kind === 'import' && !/^(?:\.{1,2}\/|\/)/u.test(url)) continue;
             let target;
-            let base;
             try {
-                base = baseHref ? new URL(baseHref, current.url)
-                    : managedMap || baseKind === 'document' ? documentUrl : current.url;
-                target = new URL(versionAssetUrl(url, null), base);
+                target = resolveAssetReference(
+                    {...reference, url: versionAssetUrl(url, null)},
+                    {ownerUrl: current.url, documentUrl, managedMap}
+                );
             } catch {
                 // Non-URL source values retain their authored behavior.
                 continue;
@@ -695,6 +696,11 @@ async function sourcePwaAssets(routeSet, mappings, signal, resourceUrls, resourc
     return [...selectedUrls].sort();
 }
 
+export async function collectSourcePwaAssets({workspaceRoot,appId,signal,onEvent}={}){
+    const routes=await sourceRoutes(workspaceRoot,appId,{signal,onEvent});
+    return sourcePwaAssets(routes,routes.mappings,signal,new Set(),new Set());
+}
+
 function closeDevelopmentListeners(fileServer, tlsServer) {
     const closeTls = tlsServer ? new Promise(
         function closeRawTlsListener(resolve, reject) {
@@ -1236,13 +1242,16 @@ async function startOwnedDevServer({
                     .includes(request.headers['sec-fetch-dest']);
                 const rewrite=runtimeResource||entryDocument||browserResource||managedMap
                     ||resourcePaths.has(target.path);
-                const onReference = function observeServedResource({url,kind,baseHref,baseKind}) {
+                const onReference = function observeServedResource(reference) {
+                    const {url,kind,baseKind}=reference;
                     if (pwaEnabled && kind !== 'fetch'
                         && !(kind === 'import' && !/^(?:\.{1,2}\/|\/)/u.test(url))) {
                         try {
                             const documentUrl = new URL(target.path, 'http://arcane.invalid');
-                            const base = baseHref ? new URL(baseHref, documentUrl) : documentUrl;
-                            const resource = new URL(versionAssetUrl(url, null), base);
+                            const resource = resolveAssetReference(
+                                {...reference,url:versionAssetUrl(url,null)},
+                                {ownerUrl:documentUrl}
+                            );
                             if (resource.origin === documentUrl.origin) {
                                 pwaResourceUrls.add(`${resource.pathname}${resource.search}`);
                             }
@@ -1254,8 +1263,7 @@ async function startOwnedDevServer({
                         ||(kind==='import'&&!/^(?:\.{1,2}\/|\/)/u.test(url)))return;
                     try{
                         const documentUrl=new URL(target.path,'http://arcane.invalid');
-                        const base=baseHref?new URL(baseHref,documentUrl):documentUrl;
-                        const resource=new URL(url,base);
+                        const resource=resolveAssetReference(reference,{ownerUrl:documentUrl});
                         if(resource.origin===documentUrl.origin
                             &&/\.(?:m?js|html?|css)$/iu.test(resource.pathname)){
                             resourcePaths.add(decodeURIComponent(resource.pathname));

package/src/import-map.mjs

@@ -1281,6 +1281,23 @@ export function rewriteAssetReferences(source,{filePath,version=SDK_VERSION,onRe
     return source;
 }
 
+export function resolveAssetReference({url,baseHref,baseKind},{ownerUrl,documentUrl=ownerUrl,managedMap=false}){
+    if(baseKind==='component-runtime'&&url.startsWith('./arcane/')){
+        const owner=new URL(ownerUrl);
+        const marker='/arcane/components/';
+        const componentIndex=owner.pathname.lastIndexOf(marker);
+        if(componentIndex>=0){
+            // HTMLImport resolves these component attributes against their
+            // installed runtime, independently of the host document's base.
+            const runtimeRoot=new URL(owner.pathname.slice(0,componentIndex+'/arcane/'.length),owner.origin);
+            return new URL(url.slice('./arcane/'.length),runtimeRoot);
+        }
+    }
+    const base=baseHref?new URL(baseHref,ownerUrl)
+        :managedMap||baseKind==='document'?documentUrl:ownerUrl;
+    return new URL(url,base);
+}
+
 function registerSpecifier(registry,specifier,target){
     registry.set(specifier,{specifier,target});
 }
@@ -2071,7 +2088,9 @@ function htmlReferenceEdits(source,version,onReference){
                 :element.tag==='link'&&relationships.includes('preload')
                     &&['script','worker','style'].includes(destination)?destination==='style'?'style':'script':'asset';
             const view=htmlAttributeView(original);
-            if(view)reportAssetReference(reportHtmlReference,view.decoded,kind);
+            if(view)reportAssetReference(reportHtmlReference,view.decoded,kind,
+                (name==='href'||name==='src')&&view.decoded.startsWith('./arcane/')
+                    ?'component-runtime':undefined);
             const value=versionHtmlAttribute(original,version);
             if(value===original)continue;
             const position=attributes.positions.get(name);

package/src/packager/core.mjs

@@ -19,6 +19,7 @@ import {
     applyPwaEntryReferences,
     inspectImportMapHtml,
     readWorkspaceAssetVersion,
+    resolveAssetReference,
     rewriteAssetReferences,
     versionAssetUrl
 } from '../import-map.mjs';
@@ -967,17 +968,19 @@ async function packageWithContext(context,options={}){
                 resource={references,...(pwaDocumentSources.has(relative)?{content}:{})};
                 resources.set(relative,resource);
             }
-            for(const {url,kind,baseHref,baseKind} of resource.references){
+            for(const reference of resource.references){
+                const {url,kind,baseHref}=reference;
                 const traversable=kind!=='fetch'&&(kind!=='asset'||/\.css(?:[?#]|$)/iu.test(url))
                     &&(kind!=='import'||/^(?:\.{1,2}\/|\/)/u.test(url));
                 if(!pwaEnabled&&!traversable)continue;
                 if(kind==='import'&&!/^(?:\.{1,2}\/|\/)/u.test(url))continue;
                 try{
                     const ownerUrl=new URL(packageResourceUrl(relative),entryUrl.origin);
-                    const base=baseHref?new URL(baseHref,ownerUrl)
-                        :baseKind==='document'||path.posix.basename(relative)==='arcane.importmap.json'
-                            ?current.documentUrl:ownerUrl;
-                    const target=new URL(url,base);
+                    const target=resolveAssetReference(reference,{
+                        ownerUrl,
+                        documentUrl:current.documentUrl,
+                        managedMap:path.posix.basename(relative)==='arcane.importmap.json'
+                    });
                     if(target.origin===entryUrl.origin){
                         const file=decodeURIComponent(target.pathname).replace(/^\//u,'');
                         if(pwaEnabled&&offlineInventory.has(file)){

package/src/toolchain.mjs

@@ -11,7 +11,7 @@ import {
     validateWorkspace
 } from './workspace.mjs';
 import {loadArcaneIntegratedProvider} from './integrated-provider-loader.mjs';
-import {startDevServer} from './dev-server.mjs';
+import {collectSourcePwaAssets,startDevServer} from './dev-server.mjs';
 import {applyPwaEntryReferences,generateImportMap,readApplicationTestImportMapContext} from './import-map.mjs';
 import {createPwaArtifacts} from './pwa.mjs';
 import {readInstalledSdkLayout} from './sdk-runtime-layout.mjs';
@@ -337,11 +337,21 @@ async function refreshRootApplicationFiles(prepared,inspected,importMap,{signal,
         ...inspected.files.filter(file=>file!=='index.html'||manifest.include.includes('index.html')),
         importMap.artifactRelativePath
     ])];
+    const sourceOrigin='http://arcane.invalid';
+    const selectedPaths=new Set(files.map(function selectedStaticPath(file){
+        return new URL(`/${file.split('/').map(encodeURIComponent).join('/')}`,sourceOrigin).pathname;
+    }));
+    const assets=installed?.direct&&manifest.pwa?.enabled
+        ?(await collectSourcePwaAssets({workspaceRoot,appId,signal,onEvent})).filter(function selectedStaticVariant(value){
+            const url=new URL(value,sourceOrigin);
+            return url.origin===sourceOrigin&&selectedPaths.has(url.pathname);
+        }):[];
     const pwa=installed?.direct&&manifest.pwa?.enabled?createPwaArtifacts({
         app:{id:appId,displayName:manifest.displayName,version:manifest.version,entry},
         sdkVersion:installed.version,
         pwa:manifest.pwa,
         files,
+        assets,
         basePath:'/',
         appBase:'/',
         installationId:`/apps/${appId}/`,