arcane-os 0.16.2 → 0.17.0

package/CHANGELOG.md

@@ -1,5 +1,27 @@
 # Changelog
 
+## 0.17.0
+
+- Add neutral `modal.configure({dismissible})` configuration, defaulting to
+  `true`. Setting it to `false` hides the close button and prevents Escape,
+  backdrop and close-button dismissal while preserving the owner's existing
+  programmatic close/destroy lifecycle and running-task behavior.
+- Retain the configuration through population, open/close cycles and task
+  completion. Keep focus within useful content when hiding a focused close
+  control, and preserve default modal behavior for existing consumers.
+
+## 0.16.3
+
+- Remember browser-reported PWA installation in app-scoped DBOPFS and suppress
+  the SDK's floating and inline installation controls on later visits. Capture
+  native events immediately while restoring the saved flag; keep rendering,
+  component loading and worker registration independent.
+- Preserve confirmed installation across late reads, prompt results and display
+  changes. Save installed-app launches as well as `appinstalled`, without
+  mistaking prompt acceptance or ordinary fullscreen for installation. Expose
+  initial storage readiness and complete persistence errors through the shared
+  install owner, and retain confirmed-install writes through owner disposal.
+
 ## 0.16.2
 
 - Scope explicit application selection and workspace resolution to the named

package/browser-runtime/pwa-install.mjs

@@ -11,7 +11,11 @@ export function getPwaInstall() {
     if (sharedOwner && sharedOwner.state.status !== 'disposed') {
         return sharedOwner;
     }
-    const owner = {get state() { return snapshot(); }, subscribe, prompt, dismiss, dispose};
+    const owner = {
+        get state() { return snapshot(); },
+        get ready() { return ready; },
+        subscribe, prompt, dismiss, dispose
+    };
     const source = createArcaneEventSource(owner, {
         source: 'arcane.pwa.install', eventTypes: [PWA_INSTALL_STATE_EVENT]
     });
@@ -20,6 +24,9 @@ export function getPwaInstall() {
         '(display-mode: standalone), (display-mode: minimal-ui), '
         + '(display-mode: fullscreen), (display-mode: window-controls-overlay)'
     );
+    const installedDisplayMode = globalThis.matchMedia?.(
+        '(display-mode: standalone), (display-mode: minimal-ui), (display-mode: window-controls-overlay)'
+    );
     const manifestUrl = globalThis.document?.querySelector('link[rel~="manifest"]')?.href;
     const dismissalKey = `arcane.pwa.install.dismissed:${manifestUrl ?? globalThis.location?.href ?? ''}`;
     let deferredPrompt = null;
@@ -28,6 +35,11 @@ export function getPwaInstall() {
     let status = isRunningAsApp() ? 'running' : 'waiting';
     let outcome = null;
     let error = null;
+    let installed = isInstalledApp();
+    let storedInstalled = false;
+    let storageReady = false;
+    let storageError = null;
+    let saveTask = null;
     try {
         dismissed = globalThis.sessionStorage?.getItem(dismissalKey) === 'true';
     } catch (storageError) {
@@ -38,9 +50,17 @@ export function getPwaInstall() {
         return displayMode?.matches === true || globalThis.navigator?.standalone === true;
     }
 
+    function isInstalledApp() {
+        // Ordinary browser fullscreen is not evidence of installation.
+        return installedDisplayMode?.matches === true || globalThis.navigator?.standalone === true;
+    }
+
     function snapshot() {
-        return {status, available: deferredPrompt !== null && !disposed,
-            dismissed, outcome, error};
+        return {
+            status,
+            available: storageReady && deferredPrompt !== null && !installed && !isRunningAsApp() && !disposed,
+            installed, dismissed, outcome, error, storageError
+        };
     }
 
     function publish(nextStatus, nextError = null) {
@@ -67,24 +87,92 @@ export function getPwaInstall() {
         }
     }
 
+    async function loadInstallStorage() {
+        if (!globalThis.dbopfs) {
+            await import('arcane/DBOPFS');
+        }
+        const storage = globalThis.dbopfs;
+        if (!storage) {
+            throw new Error('PWA installation state could not open DBOPFS.');
+        }
+        await storage.readyPromise;
+        return storage;
+    }
+
+    function reportStorageError(failure) {
+        storageError = failure;
+        console.warn('Arcane PWA installation state could not be persisted or restored:', failure);
+        publish(status, error);
+    }
+
+    async function restoreInstallation() {
+        try {
+            const storage = await storageTask;
+            const record = await storage.get('pwa', 'installed.json', true);
+            storedInstalled = record?.installed === true;
+            if (!disposed && storedInstalled) {
+                installed = true;
+                deferredPrompt = null;
+            }
+        } catch (failure) {
+            reportStorageError(failure);
+        }
+        storageReady = true;
+        if (!disposed) {
+            if (installed) {
+                publish(isRunningAsApp() ? 'running' : 'installed', error);
+            } else if (deferredPrompt && !isRunningAsApp()) {
+                publish('available', error);
+            } else {
+                publish(status, error);
+            }
+        }
+        return snapshot();
+    }
+
+    async function saveInstallation() {
+        // The initial read avoids rewriting an already remembered installation.
+        await ready;
+        if (storedInstalled) return;
+        const storage = await storageTask;
+        await storage.set(
+            'pwa',
+            'installed.json',
+            {installed: true}
+        );
+        storedInstalled = true;
+        storageError = null;
+        publish(status, error);
+    }
+
+    function rememberInstallation() {
+        installed = true;
+        deferredPrompt = null;
+        // Retain and observe this durable write even if the page owner detaches.
+        saveTask ??= saveInstallation().catch(reportStorageError);
+    }
+
     function onBeforeInstallPrompt(event) {
-        if (disposed || isRunningAsApp() || status === 'installed' || status === 'accepted') return;
+        if (disposed || installed || isRunningAsApp() || status === 'accepted') return;
         event.preventDefault();
         deferredPrompt = event;
         outcome = null;
-        publish('available');
+        publish(storageReady ? 'available' : 'waiting');
     }
 
     function onInstalled() {
-        deferredPrompt = null;
+        rememberInstallation();
         // This event may precede Android's completion of WebAPK creation.
         publish('installed');
     }
 
     function onDisplayModeChange() {
+        if (isInstalledApp()) rememberInstallation();
         if (isRunningAsApp()) {
             deferredPrompt = null;
             publish('running');
+        } else if (installed) {
+            publish('installed');
         } else if (status === 'running') {
             publish('waiting');
         }
@@ -108,7 +196,7 @@ export function getPwaInstall() {
     }
 
     function prompt() {
-        if (disposed || !deferredPrompt) return Promise.resolve(null);
+        if (!snapshot().available) return Promise.resolve(null);
         const event = deferredPrompt;
         deferredPrompt = null;
         publish('prompting');
@@ -162,8 +250,12 @@ export function getPwaInstall() {
     observe(globalThis, 'beforeinstallprompt', onBeforeInstallPrompt);
     observe(globalThis, 'appinstalled', onInstalled);
     observe(displayMode, 'change', onDisplayModeChange);
+    observe(installedDisplayMode, 'change', onDisplayModeChange);
     observe(globalThis, 'pagehide', onPageHide);
     sharedOwner = owner;
+    const storageTask = loadInstallStorage();
+    const ready = restoreInstallation();
+    if (installed) rememberInstallation();
     return owner;
 }
 

package/docs/reference/pwa.md

@@ -293,18 +293,29 @@ does not infer installation support from the user-agent string. See
 ## getPwaInstall()
 
 Import `getPwaInstall` and `PWA_INSTALL_STATE_EVENT` from `arcane-os/pwa`.
-`getPwaInstall()` synchronously returns the shared page owner with `state`,
+`getPwaInstall()` synchronously returns the shared page owner with `state`, `ready`,
 `subscribe`, `prompt`, `dismiss` and `dispose`. Call it early when owning a
 separate install entry point so it can capture `beforeinstallprompt` before
 loading the UI. The generated bootstrap already does this through
 `mountPwaInstallPrompt()`.
 
-`state` contains `status`, `available`, `dismissed`, `outcome` and `error`.
+`state` contains `status`, `available`, `installed`, `dismissed`, `outcome`,
+`error` and `storageError`.
 Status is `waiting`, `available`, `prompting`, `accepted`, `dismissed`,
 `installed`, `running`, `error` or `disposed`. `available` means a native event
-is retained; a dismissed floating suggestion can still have `available: true`.
+is retained, the initial installation-record read has settled, and installation
+has not been recorded or detected. A dismissed floating suggestion can still
+have `available: true`. `installed` is true after browser-reported installation
+or restoration of that app's saved installation record.
 `outcome` is the browser's `accepted` or `dismissed` choice, or `null` before a
-choice. `error` carries the complete prompt error, or `null`.
+choice. `error` carries the complete prompt error, or `null`; `storageError`
+carries the complete DBOPFS read or write error, or `null`.
+
+`ready` resolves to the state after the initial DBOPFS read settles. Native
+events are captured synchronously while this read runs. Only installation
+availability waits for it; page rendering, component loading and worker
+registration continue independently. A storage failure is logged and published
+as `storageError`; `ready` still resolves and native installation remains usable.
 
 `subscribe(listener, {emitCurrent: true, signal} = {})` immediately replays
 state by default and returns an unsubscribe function. Later state travels
@@ -315,7 +326,8 @@ registration, storage initialization or model readiness.
 Call `prompt()` directly from the user's install click, before any asynchronous
 wait. It invokes the browser prompt in the same call stack, consumes the event
 once, and returns a promise for the browser's choice. It resolves to `null`
-when there is no retained event or the owner is disposed. Failure publishes
+when installation is unavailable, including while the saved state is loading
+or after installation is remembered. Failure publishes
 `error` state and rejects. A new native event is required for another prompt.
 
 ```javascript
@@ -336,8 +348,24 @@ installButton.addEventListener('click', function requestInstallation() {
 
 `dismiss()` remembers the session choice without consuming the retained event
 and returns the current state. A browser-native dismissed choice is remembered
-too. `appinstalled` clears the event and publishes `installed`; running in an
-app display mode publishes `running` and suppresses the prompt. These states
+too. `appinstalled` clears the event, publishes `installed`, and saves
+`{installed: true}` as `pwa/installed.json` through the current app-scoped
+DBOPFS singleton. An installed-app launch in standalone, minimal-ui or
+window-controls-overlay mode, or with `navigator.standalone === true`, also
+records installation. Ordinary fullscreen suppresses the current prompt but
+does not record installation because browsers can enter fullscreen without
+installing an app; see the [display-mode specification](https://drafts.csswg.org/mediaqueries-5/#display-modes).
+
+Every new owner reads the saved flag, so both floating and explicit inline
+controls stay hidden on subsequent visits in that browser origin's app scope.
+The SDK never clears this flag or resets it when display mode changes. Prompt
+acceptance and dismissal alone do not write it. The record is independent of
+resource-check history and other application data. A pending read cannot undo
+newly observed installation, and a confirmed installation's pending write is
+retained through owner disposal. A write failure remains observable without
+making the current installed session eligible again.
+
+Running in an app display mode publishes `running`. These states
 do not establish offline readiness. On Android, `appinstalled` can arrive
 before WebAPK creation finishes. See the
 [browser lifecycle distinction](https://web.dev/learn/pwa/detection/).

package/docs/reference/runtime-components.md

@@ -79,7 +79,7 @@ appropriate.
 | [`markdown-document.html`](#markdown-documenthtml) | Renders and navigates a complete Markdown document with focusable fragments. | `configure()`<br>`load()`<br>`render()`<br>`clear()`<br>`fail()`<br>`focus()`<br>`focusFragment()`<br>`destroy()` | `markdown-document-ready`<br>`markdown-document-state`<br>`markdown-document-loading`<br>`markdown-document-rendered`<br>`markdown-document-empty`<br>`markdown-document-error`<br>`markdown-document-navigate` | Complete Markdown/state normalized; malformed input and Marked/DOM failures remain visible |
 | [`markdown-editor.html`](#markdown-editorhtml) | Configurable Markdown authoring, toolbar, preview, title, and save surface. | `configure()`<br>`focus()`<br>`clear()`<br>`saveEntry()`<br>`destroy()` | `markdown-editor-ready`<br>`markdown-editor-change`<br>`markdown-editor-saved` | Editor values normalized; injected save result mixed |
 | [`media-embed.html`](#media-embedhtml) | Loads a parsed YouTube video or playlist embed with ordinary hosting by default, optional privacy enhancement, and an external-platform action. | `configure()`<br>`load()`<br>`destroy()` | `media-embed-ready`<br>`media-load`<br>`media-error`<br>`media-open-platform` | URL/error normalized; iframe/platform behavior native |
-| [`modal.html`](#modalhtml) | Generic modal with population, open/close, actions, and sequential task execution. | `populate()`<br>`open()`<br>`close()`<br>`runTasks()`<br>`destroy()` | `modal-ready`<br>`modal-opened`<br>`modal-closed`<br>`modal-action` | Modal state normalized; injected task results mixed |
+| [`modal.html`](#modalhtml) | Generic modal with population, configurable user dismissal, actions, and concurrent task execution. | `configure()`<br>`populate()`<br>`open()`<br>`close()`<br>`runTasks()`<br>`destroy()`<br>`running`<br>`opened` | `modal-ready`<br>`modal-opened`<br>`modal-closed`<br>`modal-action` | Modal state normalized; injected task results mixed |
 | [`output-panel.html`](#output-panelhtml) | Presents status, output, body, coverage, actions, pending, error, and cleared states. | `configure()`<br>`setOutput()`<br>`setBody()`<br>`setCoverage()`<br>`setActions()`<br>`setPending()`<br>`setStatus()`<br>`setError()`<br>`clear()`<br>`destroy()` | `output-panel-ready`<br>`output-panel-state`<br>`output-panel-change`<br>`output-panel-action`<br>`output-panel-error`<br>`output-panel-cleared` | DOM-normalized |
 | [`preferences-form.html`](#preferences-formhtml) | Builds a schema-driven preferences form with submit, reset, busy, and status behavior. | `configure()`<br>`getValues()`<br>`setValues()`<br>`setBusy()`<br>`setStatus()`<br>`destroy()` | `preferences-form-ready`<br>`preferences-change`<br>`preferences-submit`<br>`preferences-reset` | Normalized form values |
 | [`pwa-install.html`](#pwa-installhtml) | Presents a dismissible browser installation action with floating or inline placement. | `configure()`<br>`install()`<br>`dismiss()`<br>`destroy()`<br>`state`<br>`ready` | `pwa-install-ready`<br>`pwa-install-change`<br>`pwa-install-dismissed` | Browser install availability and outcome supplied by the shared PWA owner |
@@ -944,11 +944,28 @@ Shared dependencies: [`YouTubeMedia.js`](runtime-modules.md#youtubemediajs).
 
 ### Overview
 
-Generic modal with population, open/close, actions, and sequential task execution.
+Generic modal with population, configurable user dismissal, actions, and concurrent task execution.
 
 ### Public surface
 
-Methods/properties: `populate()`, `open()`, `close()`, `runTasks()`, `destroy()`.
+Methods/properties: `configure()`, `populate()`, `open()`, `close()`, `runTasks()`,
+`destroy()`, `running`, `opened`.
+
+`configure({dismissible})` synchronously returns the current `{dismissible}`
+configuration, or `false` after destruction. `dismissible` starts as `true`;
+omitting it preserves the current choice. A supplied value must be a boolean.
+Setting it to `false` hides the close button and prevents user dismissal through
+Escape, backdrop clicks and the close button. Setting it back to `true` restores
+normal user dismissal. The choice persists across population, open/close cycles
+and task completion. If the close button held focus when disabled, focus moves
+to a content control or the focusable modal body.
+
+This option does not prevent the owning application from calling `close()` or
+`destroy()`. The existing running-task behavior remains: `close()` leaves a
+running modal open unless called with its existing second `force` argument set
+to `true`; `destroy()` releases the component. Product-specific conditions for
+closing a modal belong to the application. Content, actions and task results
+are preserved, and `runTasks()` continues to execute independent jobs concurrently.
 
 Events: `modal-ready`, `modal-opened`, `modal-closed`, `modal-action`.
 
@@ -1069,6 +1086,12 @@ availability comes from the browser's `beforeinstallprompt` event through
 `getPwaInstall()`. Without an available event, the suggestion stays hidden;
 absence does not identify why installation is unavailable. Installed-app events,
 accepted prompts, and an already running installed display mode hide it.
+The shared SDK owner persists browser-reported installation in app-scoped
+DBOPFS. Both floating and inline controls stay hidden while that record is
+loading and remain hidden on later visits when installation is remembered.
+Acceptance alone does not save installation. The component's `ready` means
+its methods and subscription are attached; storage completion belongs to the
+shared owner's `ready` promise and does not delay page rendering.
 
 ### Example
 

package/docs/reference/sdk-api.md

@@ -6231,13 +6231,24 @@ payload and current-state subscription behavior.
 
 ### Overview
 
-`getPwaInstall()` returns one synchronous page owner exposing `state`,
+`getPwaInstall()` returns one synchronous page owner exposing `state`, `ready`,
 `subscribe`, `prompt`, `dismiss` and `dispose`. It captures the browser's
 `beforeinstallprompt` event and observes `appinstalled` and app display-mode
 changes. A missing event leaves installation availability unknown and the owner
 waiting; it does not prove browser incompatibility.
 
-State contains `status`, `available`, `dismissed`, `outcome` and `error`.
+State contains `status`, `available`, `installed`, `dismissed`, `outcome`,
+`error` and `storageError`. The owner restores `pwa/installed.json` through the
+app-scoped DBOPFS singleton and saves `{installed: true}` after `appinstalled`
+or an installed-app launch. Remembered installation suppresses both floating
+and inline controls on later visits. Acceptance alone and ordinary fullscreen
+do not record installation.
+
+`ready` resolves to the state once the initial read settles. Native events are
+captured immediately, while install availability waits for that read. Rendering
+and worker registration remain independent. Storage failures are logged and
+published in `storageError`; they do not reject `ready` or reverse an observed
+installation. Confirmed-install writes remain owned after disposal.
 Subscriptions replay current state by default. `prompt()` must be called
 directly within the install click to preserve native user activation. It
 consumes the event once and returns the browser choice, resolves to `null` when

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "arcane-os",
-  "version": "0.16.2",
+  "version": "0.17.0",
   "description": "Arcane OS JavaScript SDK, project-local CLI, browser runtime, and repository-portable application packager.",
   "type": "module",
   "main": "./src/index.mjs",
@@ -68,7 +68,7 @@
     "test": "npm run test:unit && npm run test:functional && npm run test:integration && npm run test:regression",
     "test:release": "node ./bin/arcane-test.mjs test/npm-release.test.mjs",
     "test:unit": "node ./bin/arcane-test.mjs test/app-descriptor.test.mjs test/app-schema.test.mjs test/app-selection.test.mjs test/contracts.test.mjs test/doctor.test.mjs test/mail-credentials.test.mjs test/mail-outbox.test.mjs test/mail-public-api.test.mjs test/mail-send.test.mjs test/mail-transport.test.mjs test/targets.test.mjs test/workspace-operation-lock.test.mjs",
-    "test:functional": "node ./bin/arcane-test.mjs test/browser-speech-providers.test.mjs test/browser-wasm-gpu-notice.test.mjs test/browser-wasm-download-resume.test.mjs test/cli.test.mjs test/dbopfs-document-library.test.mjs test/dev-server.test.mjs test/dev-pwa.test.mjs test/dom-event-instrumentation.test.mjs test/event-manager.test.mjs test/events.test.mjs test/import-map.test.mjs test/mail-cli.test.mjs test/mail-runtime.test.mjs test/mail-server.test.mjs test/packaging.test.mjs test/pwa-packaging.test.mjs test/pwa-client.test.mjs test/pwa-install.test.mjs test/pwa-worker.test.mjs test/persistent-ai-chat-session.test.mjs test/reference-completeness.test.mjs test/runtime-api-behavior.test.mjs test/runtime.test.mjs test/scaffold.test.mjs test/speech-playback.test.mjs test/site.test.mjs test/update-check.test.mjs",
+    "test:functional": "node ./bin/arcane-test.mjs test/browser-speech-providers.test.mjs test/browser-wasm-gpu-notice.test.mjs test/browser-wasm-download-resume.test.mjs test/cli.test.mjs test/dbopfs-document-library.test.mjs test/dev-server.test.mjs test/dev-pwa.test.mjs test/dom-event-instrumentation.test.mjs test/event-manager.test.mjs test/events.test.mjs test/import-map.test.mjs test/mail-cli.test.mjs test/mail-runtime.test.mjs test/mail-server.test.mjs test/modal.test.mjs test/packaging.test.mjs test/pwa-packaging.test.mjs test/pwa-client.test.mjs test/pwa-install.test.mjs test/pwa-worker.test.mjs test/persistent-ai-chat-session.test.mjs test/reference-completeness.test.mjs test/runtime-api-behavior.test.mjs test/runtime.test.mjs test/scaffold.test.mjs test/speech-playback.test.mjs test/site.test.mjs test/update-check.test.mjs",
     "test:integration": "node ./bin/arcane-test.mjs test/integrated-shared.test.mjs test/integrated-workspace.test.mjs test/mail-browser.test.mjs test/native-plan.test.mjs test/native-provider-loader.test.mjs test/npm-release.test.mjs test/release-bundle.test.mjs test/release-capability-smoke.test.mjs test/shared-payload-batch.test.mjs test/tarball.test.mjs test/browser-wasm-cpu.test.mjs test/wllama-webgpu-runtime.test.mjs",
     "test:regression": "node ./bin/arcane-test.mjs test/channel-workflows.test.mjs test/html-import-registration.test.mjs test/logging-regression.test.mjs test/markdown-speech.test.mjs test/prepared-speech.test.mjs test/native-provider-generation.test.mjs test/speech-queue-regression.test.mjs test/testing.test.mjs test/test-sets.test.mjs",
     "check": "node tools/check-source.mjs && npm test",

package/runtime/arcane/components/modal.html

@@ -150,7 +150,7 @@
         <button id="close" class="modal-button" part="close" type="button" aria-label="Close" title="Close">&#10005;</button>
         <header id="modal-header" class="modal-header" part="header" hidden><slot id="header-slot" name="header"></slot></header>
         <input type="search" id="modal-search" class="modal-search hidden" part="search" placeholder="Search..." aria-label="Search modal content">
-        <div id="modal-content" class="modal-content" part="body"><slot name="body"></slot></div>
+        <div id="modal-content" class="modal-content" part="body" tabindex="-1"><slot name="body"></slot></div>
         <footer id="modal-footer" class="modal-footer" part="footer" hidden><slot id="footer-slot" name="footer"></slot></footer>
     </div>
 </dialog>
@@ -174,11 +174,13 @@
     const modalStack=window.modalStack=window.modalStack||[];
 
     let running=false;
+    let dismissible = true;
     let disposed=false;
     let activeRun=Promise.resolve([]);
     let returnFocus=null;
 
     host.ready=false;
+    host.configure = configure;
     host.populate=populate;
     host.open=open;
     host.close=close;
@@ -195,13 +197,18 @@
         opened:{get:function getOpenedState(){return dialog.open;}}
     });
 
-    dialog.addEventListener('cancel',function preventRunningDialogCancellation(event){
-        event.preventDefault();
-        close(event);
-    });
+    dialog.addEventListener(
+        'cancel',
+        function handleDialogCancellation(event) {
+            event.preventDefault();
+            if (dismissible) {
+                close(event);
+            }
+        }
+    );
 
     dialog.addEventListener('click',function closeFromDialogBackdrop(event){
-        if(event.target!==dialog||running){
+        if (event.target !== dialog || running || !dismissible) {
             return;
         }
         const bounds=dialog.getBoundingClientRect();
@@ -214,9 +221,45 @@
         }
     });
 
-    closeButton.addEventListener('click',function closeFromButton(event){
-        close(event);
-    });
+    closeButton.addEventListener(
+        'click',
+        function closeFromButton(event) {
+            if (dismissible) {
+                close(event);
+            }
+        }
+    );
+
+    function configure(input = {}) {
+        if (disposed) return false;
+        if (input === null || !is.object(input) || is.array(input)) {
+            throw new TypeError('Modal configuration must be an object.');
+        }
+        if (input.dismissible !== undefined) {
+            if (!is.boolean(input.dismissible)) {
+                throw new TypeError('Modal dismissible must be a boolean.');
+            }
+            dismissible = input.dismissible;
+        }
+        const closeButtonFocused = shadowRoot.activeElement === closeButton;
+        updateCloseButton();
+        if (dialog.open && !dismissible && closeButtonFocused) {
+            focusOpenedModal();
+        }
+        return {dismissible};
+    }
+
+    function updateCloseButton() {
+        closeButton.classList.toggle('hidden', running || !dismissible);
+    }
+
+    function focusOpenedModal() {
+        const focusTarget = modalContent.querySelector('[autofocus],input:not([disabled]),select:not([disabled]),textarea:not([disabled]),button:not([disabled]),a[href]')
+            || (running || !dismissible ? modalContent : closeButton);
+        focusTarget.focus(
+            {preventScroll: true}
+        );
+    }
 
     for(const slot of [headerSlot,footerSlot]){
         const region=slot.parentElement;
@@ -253,10 +296,7 @@
                 ?document.activeElement
                 :null;
             dialog.showModal();
-            queueMicrotask(function focusOpenedModal(){
-                const focusTarget=modalContent.querySelector('[autofocus],input:not([disabled]),select:not([disabled]),textarea:not([disabled]),button:not([disabled]),a[href]')||closeButton;
-                focusTarget?.focus({preventScroll:true});
-            });
+            queueMicrotask(focusOpenedModal);
             emit('modal-opened',{}, {opened:true});
         }
         return true;
@@ -274,7 +314,7 @@
         if(wasOpen){
             dialog.close();
         }
-        closeButton.classList.remove('hidden');
+        updateCloseButton();
 
         const stackIndex=modalStack.indexOf(host);
         if(stackIndex>-1){
@@ -317,7 +357,7 @@
     }
 
     async function populate(content='<p>Content goes here</p>',search=false){
-        closeButton.classList.remove('hidden');
+        updateCloseButton();
         modalSearch.classList.toggle('hidden',!search);
         if(content instanceof Node){
             modalContent.replaceChildren(content);
@@ -349,7 +389,7 @@
         }
 
         running=true;
-        closeButton.classList.add('hidden');
+        updateCloseButton();
         modalSearch.classList.add('hidden');
         modalContent.replaceChildren();
 
@@ -399,16 +439,20 @@
             return result.status==='rejected';
         });
         running=false;
-        closeButton.classList.remove('hidden');
+        updateCloseButton();
 
         if(failed){
             heading.innerText='Some Tasks Could Not Be Completed';
-            message.innerText='You may close this message and try again.';
+            message.innerText = dismissible
+                ? 'You may close this message and try again.'
+                : 'Review the failed tasks and try again.';
             return results;
         }
 
         heading.innerText='All Tasks Complete';
-        message.innerText='Every task completed. You may close this message.';
+        message.innerText = dismissible
+            ? 'Every task completed. You may close this message.'
+            : 'Every task completed.';
         return results;
     }