arcane-os 0.7.0 → 0.7.1

package/runtime/arcane/modules/ComponentContracts.js

@@ -407,27 +407,60 @@ function effectiveDashboardVisibility(definitions=[],visibility={}){
     );
 }
 
-function formatAIRuntimeProgress(progress,fallback){
-    const phase=is.string(progress?.phase)&&progress.phase
-        ?progress.phase
-        :fallback;
-    const completed=progress?.completed;
-    const total=progress?.total;
-    const unit=is.string(progress?.unit)
-        ?progress.unit
-        :'';
-    if(!is.finite(completed)
-        ||!is.finite(total)
-        ||total<=0
-        ||!unit){
-        return phase;
+function formatAIRuntimeProgress(progress, fallback) {
+    const phase = is.string(progress?.phase) && progress.phase
+        ? progress.phase
+        : fallback;
+    const parts = [phase];
+    const message = is.string(progress?.message) && progress.message
+        ? progress.message
+        : is.string(progress?.stage) && progress.stage
+            ? progress.stage
+            : '';
+    if (message && message !== phase) {
+        parts.push(message);
     }
-    return `${phase} · ${completed} of ${total} ${unit}`;
+    const item = is.string(progress?.item) && progress.item
+        ? progress.item
+        : is.string(progress?.file) && progress.file
+            ? progress.file
+            : '';
+    if (item && item !== message) {
+        parts.push(item);
+    }
+    const completed = progress?.completed;
+    const total = progress?.total;
+    const unit = is.string(progress?.unit)
+        ? progress.unit
+        : '';
+    if (is.finite(completed) && is.finite(total) && total > 0 && unit) {
+        parts.push(`${completed} of ${total} ${unit}`);
+    } else if (is.finite(completed) && completed >= 0 && unit === 'files') {
+        parts.push(`${completed} files complete`);
+    }
+    if (is.finite(progress?.elapsedMs) && progress.elapsedMs >= 0) {
+        const elapsedSeconds = Math.floor(progress.elapsedMs / 1000);
+        const hours = Math.floor(elapsedSeconds / 3600);
+        const minutes = Math.floor(elapsedSeconds % 3600 / 60);
+        const seconds = elapsedSeconds % 60;
+        parts.push(
+            hours > 0
+                ? `${hours}h ${minutes}m elapsed`
+                : minutes > 0
+                    ? `${minutes}m ${String(seconds).padStart(2, '0')}s elapsed`
+                    : `${seconds}s elapsed`
+        );
+    }
+    if (progress?.heartbeat === true) {
+        parts.push('Still working');
+    }
+    return parts.join(' · ');
 }
 
 function createSTTActivationController({
     host,
     button,
+    progress = null,
     onChange,
     EventClass=globalThis.CustomEvent,
     eventSource=null
@@ -595,6 +628,40 @@ function createSTTActivationController({
             &&['unloaded','loading','unloading','error'].includes(role.state);
     }
 
+    function renderProgress() {
+        if (!progress) {
+            return;
+        }
+        const active = !destroyed
+            && (requestPending || ['loading', 'unloading'].includes(role?.state));
+        progress.hidden = !active;
+        if (!active) {
+            progress.removeAttribute('value');
+            progress.removeAttribute('max');
+            progress.removeAttribute('aria-valuetext');
+            return;
+        }
+        const completed = role?.progress?.completed;
+        const total = role?.progress?.total;
+        const unit = role?.progress?.unit;
+        if (!is.finite(completed)
+            || completed < 0
+            || !is.finite(total)
+            || total <= 0
+            || !is.string(unit)
+            || !unit) {
+            progress.removeAttribute('value');
+            progress.removeAttribute('max');
+        } else {
+            progress.max = total;
+            progress.value = completed;
+        }
+        progress.setAttribute(
+            'aria-valuetext',
+            status()
+        );
+    }
+
     async function request(nextAction){
         if(destroyed||requestPending||action()!==nextAction){
             return false;
@@ -647,6 +714,7 @@ function createSTTActivationController({
                 ||action()!==nextAction){
                 return false;
             }
+            renderProgress();
             onChange();
             if(destroyed
                 ||generation!==requestGeneration
@@ -715,6 +783,7 @@ function createSTTActivationController({
             if(!destroyed&&generation===requestGeneration){
                 requestPending=false;
                 try{
+                    renderProgress();
                     onChange();
                 }catch(error){
                     arcaneLogging.error('Unable to render STT activation state:',error);
@@ -749,6 +818,7 @@ function createSTTActivationController({
             requestPending=false;
         }
         role=nextRole;
+        renderProgress();
     }
 
     function destroy(){
@@ -758,6 +828,7 @@ function createSTTActivationController({
         destroyed=true;
         requestGeneration+=1;
         requestPending=false;
+        renderProgress();
         try{
             button.removeEventListener('click',activateSelectedSTT);
         }catch(error){