arcane-os 0.5.13 → 0.5.14

package/runtime/arcane/modules/CommunicationAppController.js

@@ -1,3 +1,4 @@
+import { arcaneLogging } from 'arcane-os/logging';
 import ArcaneCommunicationBridge from './ArcaneCommunicationBridge.js';
 import CommunicationHub from './CommunicationHub.js?v=2';
 import CommunicationPreferences from './CommunicationPreferences.js';
@@ -360,7 +361,7 @@ export default class CommunicationAppController{
                 hub.dispose();
             }
         }catch(error){
-            console.error('The communication hub could not be disposed cleanly.',error);
+            arcaneLogging.error('The communication hub could not be disposed cleanly.',error);
         }
     }
 

package/runtime/arcane/modules/ComponentContracts.js

@@ -1,3 +1,4 @@
+import { arcaneLogging } from 'arcane-os/logging';
 import {
     createArcaneEventSource,
     projectArcaneDOMEvent
@@ -713,7 +714,7 @@ function createSTTActivationController({
                 try{
                     onChange();
                 }catch(error){
-                    console.error('Unable to render STT activation state:',error);
+                    arcaneLogging.error('Unable to render STT activation state:',error);
                 }
             }
         }
@@ -724,7 +725,7 @@ function createSTTActivationController({
         if(nextAction){
             void request(nextAction).catch(
                 function reportSTTActivationRequestFailure(error){
-                    console.error('The STT activation request could not settle.',error);
+                    arcaneLogging.error('The STT activation request could not settle.',error);
                 }
             );
         }

package/runtime/arcane/modules/ConversationTimebox.js

@@ -1,3 +1,4 @@
+import { arcaneLogging } from 'arcane-os/logging';
 import {createArcaneEventSource} from 'arcane-os/event-manager';
 
 const CONVERSATION_TIMEBOX_TOOL_NAME='conversation_timebox';
@@ -168,7 +169,7 @@ function conversationTimeboxSubmissionKey(context={}){
 }
 
 function reportConversationTimeboxListenerError(error){
-    console.error('A conversation timebox listener failed.',error);
+    arcaneLogging.error('A conversation timebox listener failed.',error);
 }
 
 function conversationTimeboxError(message,code,reason,ErrorType=Error){

package/runtime/arcane/modules/DBOPFS.js

@@ -1,3 +1,4 @@
+import { arcaneLogging } from 'arcane-os/logging';
 import Is from "../../node_modules/strong-type/index.js";
 import {openApplicationDataDirectory} from './AppDataScope.js';
 import {
@@ -458,7 +459,7 @@ class DBOPFS {
                         );
                     }
                 }catch(error){
-                    console.error(`Error writing file '${fileName}' to table '${tableName}':`,error)
+                    arcaneLogging.error(`Error writing file '${fileName}' to table '${tableName}':`,error)
                     throw error
                 }
 
@@ -603,7 +604,7 @@ class DBOPFS {
                 const fileName=entries[index][0]
 
                 if(result.status!=='fulfilled'){
-                    console.error(`Failed to set file '${fileName}':`,result.reason)
+                    arcaneLogging.error(`Failed to set file '${fileName}':`,result.reason)
                 }
             }
         );
@@ -742,7 +743,7 @@ class DBOPFS {
             await table.removeEntry(fileName)
         }catch(error){
             if(error.name!=='NotFoundError'){
-                console.error(error)
+                arcaneLogging.error(error)
                 throw error
             }
         }
@@ -784,7 +785,7 @@ class DBOPFS {
             delete this.#tables[tableName]
             delete this.#tableHandles[tableName]
         }catch(error){
-            console.error(error)
+            arcaneLogging.error(error)
         }
 
         return true

package/runtime/arcane/modules/Errors.js

@@ -1,4 +1,5 @@
 import waitForComponent from './WaitForComponent.js';
+import { arcaneLogging,readArcaneDeveloperMode } from 'arcane-os/logging';
 import {
     arcaneEvents,
     createArcaneEventSource
@@ -154,18 +155,6 @@ async function sendWithWindowMail(target,...args){
     return target.mail.send(...args);
 }
 
-function defaultDeveloperModeStatus(target){
-    try{
-        if(target?.user?.ready!==true){
-            return null;
-        }
-
-        return target.user.developer===true;
-    }catch{
-        return false;
-    }
-}
-
 function appendDeveloperDetail(document,list,label,value){
     if(value===null||value===undefined||value===''){
         return;
@@ -340,7 +329,7 @@ class Errors {
         this.now=options.now||Date.now;
         this.schedule=options.schedule||globalThis.setTimeout.bind(globalThis);
         this.cancel=options.cancel||globalThis.clearTimeout.bind(globalThis);
-        this.logger=options.logger||globalThis.console;
+        this.logger=options.logger||arcaneLogging;
         this.storage=options.storage===undefined
             ? defaultStorage(target)
             : options.storage;
@@ -352,7 +341,7 @@ class Errors {
             || sendWithWindowMail.bind(null,target);
         this.isDeveloperMode=typeof options.isDeveloperMode==='function'
             ? options.isDeveloperMode
-            : defaultDeveloperModeStatus.bind(null,target);
+            : readArcaneDeveloperMode.bind(null,target);
         this.presentDeveloperIncident=typeof options.presentDeveloperIncident==='function'
             ? options.presentDeveloperIncident
             : presentDeveloperIncidentModal.bind(null,target);

package/runtime/arcane/modules/HTMLImport.js

@@ -1,3 +1,4 @@
+import { arcaneLogging } from 'arcane-os/logging';
 import {
   createArcaneEventSource,
   projectArcaneDOMEvent
@@ -299,7 +300,7 @@ class HTMLImport extends HTMLElement {
     let resolvedHref='';
     const operationId=`html-import-load-${this.#events.instanceId}-${generation}`;
     if(!href){
-      console.log('no href provided for html-import tag',this);
+      arcaneLogging.log('no href provided for html-import tag',this);
       this.#loadController=null;
       return;
     }
@@ -319,7 +320,7 @@ class HTMLImport extends HTMLElement {
         await this.#destroyImportedHost();
         return;
       }
-      console.error('Error loading HTML component:',err);
+      arcaneLogging.error('Error loading HTML component:',err);
       const detail={
           code:'HTML_IMPORT_FAILED',
           href,
@@ -369,7 +370,7 @@ class HTMLImport extends HTMLElement {
   }
 
   #reportImportedDestroyError(error,{events,href,operationId}){
-    console.error('Error destroying imported HTML component:',error);
+    arcaneLogging.error('Error destroying imported HTML component:',error);
     if(!events||events.disposed)return;
     const detail={
       code:'HTML_IMPORT_IMPORTED_COMPONENT_DESTROY_REJECTED',

package/runtime/arcane/modules/LocalAIReadinessController.js

@@ -1,3 +1,4 @@
+import { arcaneLogging } from 'arcane-os/logging';
 import {
     checkLocalAIReadiness,
     deriveLocalAIRequirements
@@ -287,7 +288,7 @@ export function createLocalAIReadinessController({
     function retry(){
         void check().catch(function ignoreDestroyedLocalAIRetry(error){
             if(error?.name!=='AbortError'){
-                console.error('Local AI readiness retry failed.',error);
+                arcaneLogging.error('Local AI readiness retry failed.',error);
             }
         });
     }

package/runtime/arcane/modules/MD.js

@@ -1,3 +1,4 @@
+import { arcaneLogging } from 'arcane-os/logging';
 import { marked } from './Marked.min.js';
 import Is from '../../node_modules/strong-type/index.js';
 
@@ -45,7 +46,7 @@ class MD {
 
     set raw(value=''){
         if(!is.string(value)){
-            console.trace('MD.raw must be a string.');
+            arcaneLogging.trace('MD.raw must be a string.');
             return this.#raw;
         }
         this.#raw = value;
@@ -55,7 +56,7 @@ class MD {
 
     append(value=''){
         if(!is.string(value)){
-            console.trace('MD.append must be a string.');
+            arcaneLogging.trace('MD.append must be a string.');
             return this.#raw;
         }
         this.#raw += value;

package/runtime/arcane/modules/MailOutbox.mjs

@@ -1,3 +1,4 @@
+import { arcaneLogging } from 'arcane-os/logging';
 export const MAIL_OUTBOX_PROTOCOL='arcane-mail-outbox/1';
 export const MAIL_OUTBOX_TABLE='mail_outbox';
 export const MAIL_OUTBOX_IDEMPOTENCY_WINDOW_MS=24*60*60*1000;
@@ -34,7 +35,7 @@ function reportMailOutboxObserverError(error){
             return;
         }
     }catch{}
-    try{globalThis.console?.error?.(error);}catch{}
+    try{arcaneLogging.error?.(error);}catch{}
 }
 
 function fail(message,code='MAIL_OUTBOX_INVALID',ErrorType=Error,cause){

package/runtime/arcane/modules/PersistentAIChatSession.js

@@ -1,3 +1,4 @@
+import { arcaneLogging } from 'arcane-os/logging';
 import ChatEntity from '../entities/Chat.js';
 import ConfiguredAIChatSession,{
     normalizeStructuralToolCall
@@ -475,7 +476,7 @@ class PersistentAIChatSession{
                 error instanceof Error?error:new Error('The saved chat history is invalid.'),
                 'AI_CHAT_INCOHERENT_PERSISTENCE',
             );
-            console.error('Arcane saved chat history is readable but not actionable.',error);
+            arcaneLogging.error('Arcane saved chat history is readable but not actionable.',error);
         }
         const storedSystem=storedMessages.find(message=>message.role==='system');
         const initialMessages=storedMessages

package/runtime/arcane/modules/ScreenCapture.js

@@ -1,3 +1,4 @@
+import { arcaneLogging } from 'arcane-os/logging';
 import {createArcaneEventSource} from 'arcane-os/event-manager';
 import GifEncoder from './GifEncoder.js';
 
@@ -252,7 +253,7 @@ function supportedRecorderType(Recorder){
 
 function reportDetachedError(error){
     if(typeof globalThis.reportError==='function')globalThis.reportError(error);
-    else globalThis.console?.error?.(error);
+    else arcaneLogging.error?.(error);
 }
 
 function monotonicNow(){

package/runtime/arcane/modules/ThemeBootstrap.js

@@ -1,3 +1,4 @@
+import { arcaneLogging } from 'arcane-os/logging';
 import {loadAndApplyTheme} from './ThemeManager.js';
 import {createArcaneEventSource} from 'arcane-os/event-manager';
 
@@ -43,7 +44,7 @@ function installAppearanceListener(ready){
             Promise.resolve(ready).then(function reloadTheme(result){
                 return result?.manager?.load?.();
             }).catch(function reportThemeReloadFailure(error){
-                console.warn(
+                arcaneLogging.warn(
                     '[Arcane theme] Unable to apply the changed host appearance.',
                     error
                 );
@@ -80,7 +81,7 @@ export function bootstrapArcaneTheme(options={}){
     }
 
     const ready=loadAndApplyTheme(options).catch(error=>{
-        console.warn('[Arcane theme] Unable to load the saved appearance; using the system theme.',error);
+        arcaneLogging.warn('[Arcane theme] Unable to load the saved appearance; using the system theme.',error);
         return {manager:null,state:null,error};
     });
 

package/runtime/arcane/modules/ToolCallRouter.js

@@ -1,10 +1,11 @@
+import { arcaneLogging } from 'arcane-os/logging';
 function parseArguments(value,name=''){
     let parsed=value;
     if(typeof parsed==='string'){
         try{
             parsed=JSON.parse(parsed);
         }catch(error){
-            console.warn(error);
+            arcaneLogging.warn(error);
             throw new Error(`Tool ${name} returned invalid JSON arguments.`);
         }
     }

package/src/import-map.mjs

@@ -844,8 +844,7 @@ function applyReferenceEdits(source,edits){
     return result;
 }
 
-function stringReferenceEdit(source,token,version){
-    const urlEdits=assetUrlVersionEdits(token.value,version);
+function stringReferenceEdit(source,token,version,urlEdits=assetUrlVersionEdits(token.value,version)){
     if(urlEdits.length===0)return null;
     const quote=source[token.start];
     const positions=[];
@@ -1091,31 +1090,67 @@ function importMapReferenceEdits(source,version,onReference){
             const valueIndex=cursor+2;
             const value=tokens[valueIndex];
             if(!value)return [];
-            properties.push({key:key.value,valueIndex,value});
             let end=valueIndex;
             if(value.type==='punctuator'&&(value.value==='{'||value.value==='[')){
                 end=matchingToken(tokens,valueIndex,value.value,value.value==='{'?'}':']');
                 if(end<0)return [];
             }
+            properties.push({key:key.value,keyToken:key,valueIndex,value,end:tokens[end].end});
             cursor=end+1;
             if(tokens[cursor]?.value===',')cursor+=1;
             else if(tokens[cursor]?.value!=='}')return [];
         }
         return properties;
     }
+    function addAlias(property,keys,value,aliases,alias=versionImportMapSpecifier(property.key,version)){
+        if(alias===property.key||keys.has(alias))return;
+        const keyEdit=stringReferenceEdit(source,property.keyToken,version,importMapUrlVersionEdits(property.key,version));
+        if(!keyEdit)return;
+        keys.add(alias);
+        aliases.push(`${keyEdit.value}: ${value}`);
+    }
+    function prependAliases(start,aliases,selectedEdits){
+        if(aliases.length===0)return;
+        // Authored keys retain priority even when different spellings normalize to one URL.
+        const offset=tokens[start].end;
+        selectedEdits.push({start:offset,end:offset,value:`${aliases.join(', ')}, `});
+    }
     function addImports(start){
-        for(const property of objectProperties(start)){
+        const selectedEdits=[];
+        const aliases=[];
+        const properties=objectProperties(start);
+        const keys=new Set(properties.map(function importKey(property){return property.key;}));
+        for(const property of properties){
+            if(property.value.value==='null'&&property.value.type==='identifier'){
+                addAlias(property,keys,'null',aliases);
+                continue;
+            }
             if(property.value.type!=='string')continue;
-            if(property.key.endsWith('/')||property.value.value.split(/[?#]/u)[0].endsWith('/'))continue;
+            if(property.key.endsWith('/'))continue;
             reportAssetReference(onReference,property.value.value,'import');
-            const edit=stringReferenceEdit(source,property.value,version);
-            if(edit)edits.push(edit);
+            const edit=property.value.value.split(/[?#]/u)[0].endsWith('/')
+                ?null:stringReferenceEdit(source,property.value,version);
+            if(edit)selectedEdits.push(edit);
+            addAlias(property,keys,edit?.value??source.slice(property.value.start,property.value.end),aliases);
         }
+        prependAliases(start,aliases,selectedEdits);
+        return selectedEdits;
     }
     for(const property of objectProperties(0)){
-        if(property.key==='imports')addImports(property.valueIndex);
+        if(property.key==='imports')edits.push(...addImports(property.valueIndex));
         if(property.key==='scopes'){
-            for(const scope of objectProperties(property.valueIndex))addImports(scope.valueIndex);
+            const scopes=objectProperties(property.valueIndex);
+            const aliases=[];
+            const keys=new Set(scopes.map(function scopeKey(scope){return scope.key;}));
+            for(const scope of scopes){
+                const scopeEdits=addImports(scope.valueIndex);
+                edits.push(...scopeEdits);
+                const value=applyReferenceEdits(source.slice(scope.value.start,scope.end),scopeEdits.map(function scopeRelativeEdit(edit){
+                    return {...edit,start:edit.start-scope.value.start,end:edit.end-scope.value.start};
+                }));
+                if(!scope.key.endsWith('/'))addAlias(scope,keys,value,aliases,versionImportMapUrl(scope.key,version));
+            }
+            prependAliases(property.valueIndex,aliases,edits);
         }
     }
     return edits;
@@ -1138,6 +1173,24 @@ function registerSpecifier(registry,specifier,target){
     registry.set(specifier,{specifier,target});
 }
 
+function versionImportMapSpecifier(specifier,version){
+    if(specifier.endsWith('/')||!/^(?:\.{1,2}\/|\/|[A-Za-z][A-Za-z0-9+.-]*:\/\/)/u.test(specifier))return specifier;
+    return versionImportMapUrl(specifier,version);
+}
+
+function versionImportMapUrl(value,version){
+    return applyReferenceEdits(value,importMapUrlVersionEdits(value,version));
+}
+
+function importMapUrlVersionEdits(value,version){
+    // Absolute map keys can match a relative import resolved against the document.
+    const authority=/^(?:[A-Za-z][A-Za-z0-9+.-]*:)?\/\/[^/?#]*/u.exec(value)?.[0];
+    const offset=authority?.length??0;
+    return assetUrlVersionEdits(value.slice(offset),version).map(function absoluteKeyEdit(edit){
+        return {...edit,start:edit.start+offset,end:edit.end+offset};
+    });
+}
+
 function validateInventory(files){
     if(!Array.isArray(files))throw new TypeError('buildImportMap files must be an array.');
     const exact=new Set();
@@ -1215,7 +1268,9 @@ export async function buildImportMap({files,signal,version=SDK_VERSION}={}){
     }
     const imports={};
     for(const entry of [...namedRegistry.values()].sort((left,right)=>compareText(left.specifier,right.specifier))){
-        imports[entry.specifier]=versionAssetUrl(entry.target,version);
+        const target=versionAssetUrl(entry.target,version);
+        imports[entry.specifier]=target;
+        imports[versionImportMapSpecifier(entry.specifier,version)]=target;
     }
     return {
         imports,