Added command timeouts for refresh-providers and sync-song

CHANGELOG.md

@@ -7,23 +7,6 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 
 ## [Unreleased]
 
-### Changed
-- **`MetadataDB` moved out of `server.py` into `lib/metadata_db.py` (R3, move-only).**
-  The library metadata cache — the `MetadataDB` class (4,018 lines) plus the query
-  helpers it owns (keyset paging cursors, the tuning grouping key, smart-arrangement
-  naming, tag normalisation, the startup DB-restore swap) — now lives in its own flat
-  `lib/` module. `server.py` drops from **14,037 → 9,705 lines** and keeps the
-  `meta_db` singleton, so `server.meta_db` and `server.app` resolve exactly as before
-  and every route is untouched. The only non-verbatim change is the seam that lets the
-  class leave `server.py`: `MetadataDB.__init__` now takes `config_dir` explicitly
-  (`meta_db = MetadataDB(CONFIG_DIR)`) instead of reading the module-level `CONFIG_DIR`,
-  which also means `lib/metadata_db.py` performs no IO at import (Principle V). Logging
-  still goes through the `feedBack.server` logger, so existing log filters and `caplog`
-  assertions resolve to the same logger object. `tests/test_settings_export_library_db.py`
-  now imports `_apply_pending_db_restore` from `metadata_db` (the test moved with its
-  subject); no other test changed. Every moved block is byte-identical to its
-  `server.py` original.
-
 ### Added
 - **Plugins can ship an ES-module `src/` tree (module-migration rails, R0).** The host gains three things so a plugin can move off a single global-scope `screen.js` IIFE onto native ES modules with **no build step**: (1) a new sandboxed `GET /api/plugins/{id}/src/{path}` route that serves a plugin's `src/` source subtree, containment-checked by the same `safe_join` guard as `assets/` (traversal/absolute/NUL → 404); (2) the live-edit cache contract — `Cache-Control: no-cache` + a weak mtime/size `ETag` + `If-None-Match`→`304` — applied to `src/`, `screen.js`, and `assets/` (previously `screen.js` sent no cache headers and `assets/` emitted an ETag but never revalidated), so an edited module reloads on refresh while unchanged ones `304`; and (3) `scriptType`/`minHost` passthrough from `plugin.json` to `/api/plugins`, with the loader injecting a plugin that declares `"scriptType":"module"` as `<script type="module">` (its screen.js becomes `import './src/main.js'`). A `<script type=module>` fires its load event only after its whole static-import graph evaluates, preserving the loader's completion-by-`onload` + `_loadingPluginId` contract. Classic plugins are unaffected; `minHost` is passthrough-only for now (enforcement deferred). Tests: `tests/test_plugin_src_route.py` (serve/media-type/traversal/304/no-stale-304/screen.js+assets conditional), `tests/js/plugin_loader_script_type.test.js` (guarded module injection).
 - **Module-migration governance & rails (R0).** Constitution amended to **v1.2.0**: Principle II now names native ES modules as a first-class, *build-free* extension mechanism (the `scriptType:"module"` load path, both plugins and — over time — core's `static/js/`), keeping the no-bundler/no-transpiler/source-served rule intact; Operating Constraints gains a "Module load contract" clause (a `<script type=module>` load event awaits the whole static-import graph, so completion-by-`onload` is preserved; per-visit re-init comes from the `screen:changed` event, not screen.js re-execution). Mirrored into `CLAUDE.md`. New `docs/plugin-modules.md` (the migration playbook — layering, import-time purity, `import.meta.url` assets, the ETag live-edit loop) and `docs/size-exemptions.md` (the signed 1,500-line size-norm register; Byron signs core/bundled rows, Christian the authored virtuoso row). Adds a **maintainer/CI-only** ESLint gate (`eslint.config.js` + a `lint` CI job): `max-lines` warns at 1,500 as a non-blocking ratchet (ceilings for exempt files mirror the register), and `import-x/no-unresolved` + `import-x/no-cycle` hard-error on ES-module graphs — dormant until module code lands, never on the serve/Docker path.

CLAUDE.md

@@ -90,7 +90,7 @@ Best practices:
 - `extract_meta()` — metadata extraction callable
 - `meta_db` — shared MetadataDB instance
 - `library_providers` — shared library provider registry for source-aware browsing
-- `register_library_provider(provider)` — register a plugin-provided library source. Providers expose `id`, `label`, optional `kind`/`capabilities`, and callable `query_page`, `query_artists`, `query_stats`, and `tuning_names` methods. Providers with `art.read` may also expose `get_art(song_id)` returning one of: a `Response` object (any media type, served as-is); raw `bytes` or `bytearray` (**assumed PNG** — use a `Response` or a `dict` with `content`+`media_type` keys for JPEG/WebP or other formats); a URL string (http/https → 302 redirect; other schemes are rejected with 400); a filesystem path string or `Path` (served as a file with auto-detected media type); or a `dict` with a `url`, `path`, or `content` key. Providers with `song.sync` may expose `sync_song(song_id)` returning `None` (success with no local file) or a `dict` — the dict is passed through as the JSON response and should include `filename`/`local_filename` if a local playable file was produced.
+- `register_library_provider(provider)` — register a plugin-provided library source. Providers expose `id`, `label`, optional `kind`/`capabilities`, optional `slow: true` (or `is_slow`/`slow_mode`) when responses may take a while, and callable `query_page`, `query_artists`, `query_stats`, and `tuning_names` methods. Providers with `art.read` may also expose `get_art(song_id)` returning one of: a `Response` object (any media type, served as-is); raw `bytes` or `bytearray` (**assumed PNG** — use a `Response` or a `dict` with `content`+`media_type` keys for JPEG/WebP or other formats); a URL string (http/https → 302 redirect; other schemes are rejected with 400); a filesystem path string or `Path` (served as a file with auto-detected media type); or a `dict` with a `url`, `path`, or `content` key. Providers with `song.sync` may expose `sync_song(song_id)` returning `None` (success with no local file) or a `dict` — the dict is passed through as the JSON response and should include `filename`/`local_filename` if a local playable file was produced.
 - `unregister_library_provider(provider_id)` — remove a plugin-provided library source by id. The built-in `local` provider cannot be removed.
 - `get_sloppak_cache_dir()` — sloppak cache path
 - `load_sibling(name)` — loads a sibling module from this plugin's directory under a unique, namespaced module name. See "Sibling imports" below.
@@ -585,12 +585,13 @@ a local pointer + code map.
 pytest                         # Run all tests
 pytest tests/test_song.py -v   # Specific file
 pytest -k "round_trip" -v      # Pattern match
+uv run pytest                  # Run through the locked local uv environment
 ```
 
 - Framework: pytest
 - Config: `pyproject.toml` sets `pythonpath = [".", "lib"]` and `testpaths = ["tests"]`
 - CI: GitHub Actions runs pytest on push/PR to main (Python 3.12)
-- Test dependencies: `requirements-test.txt`
+- Test dependencies: `requirements-test.txt`; uv reads the mirrored `test` dependency group in `pyproject.toml`
 
 ## Tuning the note_detect plugin
 

docs/capability-recipes.md

@@ -80,6 +80,8 @@ A plugin that only reads public events should declare `observer` and no command
 
 A plugin that registers a remote client or generated library source declares itself as a `library` provider. The backend registration call is still made from `routes.py` with `context["register_library_provider"](...)`; the native browser library capability turns the provider registry into runtime provider participants. A thin server wrapper that only exposes the local library over HTTP should not declare `library` as a provider unless it also registers a provider in the library registry.
 
+Provider objects may set `slow: true` when their backing connection can take a while to answer. Core exposes that flag through `/api/library/providers` and the browser library capability so library views show explicit loading indicators instead of looking idle during the wait.
+
 ```json
 {
   "id": "remote_library_client",

docs/size-exemptions.md

@@ -54,11 +54,8 @@ without a *signed* exemption" is unenforceable.
 
 ## Planned, NOT exempt (owned by split plans — listed so nothing falls between states)
 
-core `static/app.js` (11,852) · `static/highway.js` (4,168, whole file) · `server.py`
-(9,705 — was 14,037; ratcheted by the R3 `MetadataDB` extraction) ·
-`lib/metadata_db.py` (4,373 — new in R3; the `MetadataDB` class alone is 4,018 lines
-and is a monolith in its own right, to be split per-table once the router train
-lands) · `static/v3/songs.js` (4,134) · `static/capabilities/audio-session.js`
+core `static/app.js` (11,821) · `static/highway.js` (4,154, whole file) · `server.py`
+(13,948) · `static/v3/songs.js` (4,134) · `static/capabilities/audio-session.js`
 (2,974) · `plugins/highway_3d/screen.js` (15,656) · `plugins/keys_highway_3d/screen.js`
 (3,780) · `plugins/drum_highway_3d/screen.js` (3,597) — and every monolith with a PR
 train in the refactor plan. Test files (e.g. `tests/test_plugins.py`) are out of scope

lib/gp2rs.py

@@ -1114,7 +1114,7 @@ def _build_xml(
     ET.SubElement(root, "arrangement").text = arrangement
     ET.SubElement(root, "offset").text = f"{audio_offset:.3f}"
     ET.SubElement(root, "songLength").text = f"{song_length:.3f}"
-    ET.SubElement(root, "startBeat").text = f"{beats[0].time:.6f}" if beats else "0.000000"
+    ET.SubElement(root, "startBeat").text = f"{beats[0].time:.3f}" if beats else "0.000"
     ET.SubElement(root, "averageTempo").text = str(tempo)
     ET.SubElement(root, "artistName").text = artist
     ET.SubElement(root, "albumName").text = album
@@ -1139,17 +1139,10 @@ def _build_xml(
         tuning_el.set(f"string{i}", str(tuning[i] if i < len(tuning) else 0))
     ET.SubElement(root, "capo").text = "0"
 
-    # Ebeats — write beat times at MICROSECOND (6-decimal) precision, not
-    # millisecond (3-decimal). The editor/timeline DERIVES per-bar BPM from beat
-    # spans (bpm = beats·60/span), which amplifies any rounding: at 3 decimals a
-    # constant-tempo GP (e.g. 140) shows a spurious ±0.05–0.7 BPM per-bar drift
-    # (worse for fast/odd meters) because most bar lengths don't land on a ms
-    # boundary. gp2rs computes these times exactly from the GP tempo map, so the
-    # only loss is this format string — 6 decimals makes the derived tempo match
-    # GP's authored value. (Everything else stays at :.3f; only beats drive tempo.)
+    # Ebeats
     ebeats = ET.SubElement(root, "ebeats", count=str(len(beats)))
     for b in beats:
-        ET.SubElement(ebeats, "ebeat", time=f"{b.time:.6f}", measure=str(b.measure))
+        ET.SubElement(ebeats, "ebeat", time=f"{b.time:.3f}", measure=str(b.measure))
 
     # Sections
     sections_el = ET.SubElement(root, "sections", count=str(len(sections)))

lib/scan_worker.py

@@ -3,7 +3,7 @@
 This module is deliberately kept apart from ``server.py`` so that
 ``ProcessPoolExecutor`` workers can import and unpickle ``_scan_one``
 without dragging in ``server.py``'s import-time side effects
-(``configure_logging()``, ``meta_db = MetadataDB(CONFIG_DIR)`` opening/migrating
+(``configure_logging()``, ``meta_db = MetadataDB()`` opening/migrating
 SQLite, and ``register_plugin_api(app)`` registering routes).
 
 The background scan spawns its pool with the ``spawn`` start method (see

lib/tunings.py

@@ -98,22 +98,6 @@ def open_midis_to_freqs(midis: list[int], reference_pitch: float = DEFAULT_REFER
     return [round(midi_to_freq(m, reference_pitch), 2) for m in midis]
 
 
-def freqs_to_midis(freqs: list[float], reference_pitch: float = DEFAULT_REFERENCE_PITCH) -> list[int] | None:
-    """Return absolute open-string MIDI notes for frequencies at the supplied
-    A4 reference — the inverse of open_midis_to_freqs. None if any entry is
-    non-numeric or non-positive (a provider could hand us anything)."""
-    out: list[int] = []
-    for f in freqs:
-        try:
-            f = float(f)
-        except (TypeError, ValueError):
-            return None
-        if f <= 0:
-            return None
-        out.append(int(round(69 + 12 * math.log2(f / reference_pitch))))
-    return out
-
-
 def tuning_offsets_from_midis(instrument_key: str, midis: list[int]) -> list[int] | None:
     """Return semitone offsets from the instrument's standard open strings."""
     standard = STANDARD_OPEN_MIDIS.get(instrument_key)

plugins/drum_highway_3d/plugin.json

@@ -1,7 +1,7 @@
 {
   "id": "drum_highway_3d",
   "name": "3D Drum Highway",
-  "version": "0.3.2",
+  "version": "0.3.1",
   "type": "visualization",
   "bundled": true,
   "script": "screen.js",

plugins/drum_highway_3d/screen.js

@@ -1361,41 +1361,6 @@
         } catch (_) { /* dispatch unavailable — persisted value applies next init */ }
     };
 
-    /* ======================================================================
-     *  Camera Director bridge resolver (pure — exported via createFactory.__test)
-     * ====================================================================== */
-
-    /**
-     * The active splitscreen API, defensive on the global-name rename in flight
-     * (feedBackSplitscreen is canonical; slopsmithSplitscreen is the legacy alias).
-     * @returns {object|null} the splitscreen API, or null when not present
-     */
-    function _ssApi() { return window.feedBackSplitscreen || window.slopsmithSplitscreen || null; }
-
-    /**
-     * Resolve the Camera Director camera for a canvas: this panel's camera under
-     * splitscreen, else the global, else null (Camera Director absent → stock
-     * framing). Throw-safe on panelIndexFor so a misbehaving splitscreen build
-     * can't break framing.
-     * @param {HTMLCanvasElement} canvas this renderer's highway canvas
-     * @param {object|null} ss the splitscreen API (see _ssApi)
-     * @param {object|null} panelsMap window.__h3dCamCtlPanels (per-panel cameras by index)
-     * @param {object|null} globalCam window.__h3dCamCtl (single global camera)
-     * @returns {object|null} the resolved free-camera bridge, or null
-     */
-    function _resolveFreeCam(canvas, ss, panelsMap, globalCam) {
-        if (panelsMap && ss && typeof ss.panelIndexFor === 'function') {
-            try {
-                const i = ss.panelIndexFor(canvas);
-                // Only a non-negative integer indexes the panel map — a non-int /
-                // negative / string index (or a prototype key) must not resolve an
-                // unintended/inherited property; fall through to the global then.
-                if (Number.isInteger(i) && i >= 0 && panelsMap[i]) return panelsMap[i];
-            } catch (e) { /* ignore */ }
-        }
-        return globalCam || null;
-    }
-
     /* ======================================================================
      *  Renderer factory
      * ====================================================================== */
@@ -1449,7 +1414,7 @@
         let _sparkPts = null, _sparkPos = null, _sparkCol = null, _sparkVel = null, _sparkLife = null;
         let _fxLastWall = 0;          // wall clock for FX integration (sparks, pulse decay)
         let _kickPulse = 0;           // kick-hit camera-dip + floor-wash envelope
-        let _camBaseH = null, _camBaseD = null;  // positionCamera's unpulsed pose (null until it first runs; applyCamera's guard depends on this)
+        let _camBaseH = 0, _camBaseD = 0;  // positionCamera's unpulsed pose
         let _gaussTex = null;         // shared soft-falloff texture for flash quads
         let _laneFlashQuads = [];     // pooled additive quad per hand lane (z=0)
         let _kickFlashQuad = null;    // full-width flash quad for the kick bar
@@ -2686,48 +2651,6 @@
             cam.lookAt(0, 0, -AHEAD * TS * 0.45);
         }
 
-        /**
-         * Camera Director bridge for THIS panel — delegates to the pure, unit-
-         * tested _resolveFreeCam / _ssApi (resolver block above the factory).
-         * Reads the live globals: per-panel map __h3dCamCtlPanels → this panel's
-         * camera, else the global __h3dCamCtl, else null (stock framing).
-         * @param {HTMLCanvasElement} canvas this panel's highway canvas
-         * @returns {object|null} the resolved free-camera bridge, or null
-         */
-        function _freeCamFor(canvas) {
-            return _resolveFreeCam(canvas, _ssApi(), window.__h3dCamCtlPanels, window.__h3dCamCtl);
-        }
-
-        // Per-frame camera write: static base pose (positionCamera) + kick-pulse Y
-        // dip, then layer Camera Director free-cam offsets (dolly/height/orbit on
-        // the camera-from-target vector; pan/pitch on the look target). Runs every
-        // frame so a live free-cam drag is smooth; allocation-free; NaN-safe; a
-        // null/disabled bridge reproduces the stock static+pulse pose exactly.
-        function applyCamera() {
-            if (_camBaseH == null) return;               // before first positionCamera()
-            const _dip = (_kickPulse > 0.001) ? (0.8 * K * _kickPulse * fx.hitFx) : 0;
-            let _cx = 0, _cy = _camBaseH - _dip, _cz = _camBaseD;
-            let _lx = 0, _ly = 0, _lz = -AHEAD * TS * 0.45;
-            const _fc = _freeCamFor(highwayCanvas);
-            if (_fc && _fc.enabled) {
-                const _dm = Number.isFinite(_fc.distMul) ? _fc.distMul : 1;
-                const _hm = Number.isFinite(_fc.heightMul) ? _fc.heightMul : 1;
-                const _yaw = Number.isFinite(_fc.yaw) ? _fc.yaw : 0;
-                let _vx = _cx - _lx, _vy = _cy - _ly, _vz = _cz - _lz;
-                _vx *= _dm; _vy *= _dm; _vz *= _dm;   // dolly (zoom)
-                _vy *= _hm;                            // height
-                const _cyw = Math.cos(_yaw), _syw = Math.sin(_yaw);
-                const _rx = _vx * _cyw - _vz * _syw, _rz = _vx * _syw + _vz * _cyw; // orbit around Y
-                _cx = _lx + _rx; _cy = _ly + _vy; _cz = _lz + _rz;
-                const _px = Number.isFinite(_fc.panX) ? _fc.panX : 0;
-                const _py = Number.isFinite(_fc.panY) ? _fc.panY : 0;
-                const _pt = Number.isFinite(_fc.pitch) ? _fc.pitch : 0;
-                _lx += _px * K; _ly += (_pt + _py) * K;
-            }
-            cam.position.set(_cx, _cy, _cz);
-            cam.lookAt(_lx, _ly, _lz);
-        }
-
         function buildLanes(_floorW, floorD) {
             laneGroup = new T.Group();
             laneStripeMats = [];
@@ -3508,18 +3431,15 @@
                             BG_STYLES[_bgState._style].update(_bgState.s, bands, fdt, nowMs / 1000);
                         } catch (_) { /* visual-only */ }
                     }
-                    // Kick pulse decays each frame; it drives the floor flash and,
-                    // via applyCamera(), the camera Y dip.
                     if (_kickPulse > 0.001) {
                         _kickPulse *= Math.exp(-fdt * 7);
+                        cam.position.y = _camBaseH - 0.8 * K * _kickPulse * fx.hitFx;
                         if (_floorFlash) _floorFlash.material.opacity = 0.25 * _kickPulse * fx.hitFx;
                     } else if (_kickPulse !== 0) {
                         _kickPulse = 0;
+                        cam.position.y = _camBaseH;
                         if (_floorFlash) _floorFlash.material.opacity = 0;
                     }
-                    // Write the camera every frame: static base pose + kick dip +
-                    // Camera Director free-cam offsets (per-panel-aware).
-                    applyCamera();
                 }
                 // Approach highlight: raise each lane stripe toward its next
                 // note (accumulated by the rebuildNotes walk above).
@@ -3645,8 +3565,6 @@
     // vm-loaded with no DOM/WebGL; everything here must stay side-effect
     // free to call).
     window.slopsmithViz_drum_highway_3d.__test = {
-        _resolveFreeCam,
-        _ssApi,
         _variantForHit,
         _classifyTiming,
         readFxSettings,

plugins/drum_highway_3d/tests/camera_bridge.test.js

@@ -1,78 +0,0 @@
-// Camera Director bridge resolver tests: per-panel select, global fallback,
-// null-when-absent, throw-safety, and the splitscreen global-name alias. Loads
-// screen.js in a bare vm window and exercises the __test exports (no DOM/WebGL).
-const { test } = require('node:test');
-const assert = require('node:assert/strict');
-const fs = require('node:fs');
-const path = require('node:path');
-const vm = require('node:vm');
-
-function load() {
-    const window = {
-        console,
-        location: { protocol: 'http:', host: 'localhost' },
-        slopsmith: {},
-    };
-    window.window = window;
-    window.globalThis = window;
-    const context = vm.createContext(window);
-    const src = fs.readFileSync(path.join(__dirname, '..', 'screen.js'), 'utf8');
-    vm.runInContext(src, context, { filename: 'screen.js' });
-    return { window, __test: window.slopsmithViz_drum_highway_3d.__test };
-}
-
-test('_resolveFreeCam: per-panel camera under splitscreen', () => {
-    const { __test } = load();
-    const c0 = {}, c1 = {};
-    const ss = { panelIndexFor: (c) => (c === c0 ? 0 : 1) };
-    const map = { 0: { id: 'p0' }, 1: { id: 'p1' } };
-    assert.equal(__test._resolveFreeCam(c0, ss, map, { id: 'g' }).id, 'p0');
-    assert.equal(__test._resolveFreeCam(c1, ss, map, { id: 'g' }).id, 'p1');
-});
-
-test('_resolveFreeCam: falls back to global when there is no panel map', () => {
-    const { __test } = load();
-    const g = { id: 'global' };
-    assert.equal(__test._resolveFreeCam({}, { panelIndexFor: () => 0 }, null, g), g);
-});
-
-test('_resolveFreeCam: falls back to global when the panel has no map entry', () => {
-    const { __test } = load();
-    const g = { id: 'global' };
-    const ss = { panelIndexFor: () => 3 };            // index 3 absent from map
-    assert.equal(__test._resolveFreeCam({}, ss, { 0: {} }, g), g);
-});
-
-test('_resolveFreeCam: null when Camera Director is absent (no global)', () => {
-    const { __test } = load();
-    assert.equal(__test._resolveFreeCam({}, null, null, null), null);
-    assert.equal(__test._resolveFreeCam({}, { panelIndexFor: () => 0 }, {}, undefined), null);
-});
-
-test('_resolveFreeCam: throw-safe on panelIndexFor → falls back to global', () => {
-    const { __test } = load();
-    const g = { id: 'global' };
-    const ss = { panelIndexFor: () => { throw new Error('boom'); } };
-    assert.equal(__test._resolveFreeCam({}, ss, { 0: {} }, g), g);
-});
-
-test('_resolveFreeCam: NaN/negative/float/string index → falls back to global', () => {
-    const { __test } = load();
-    const g = { id: 'global' };
-    assert.equal(__test._resolveFreeCam({}, { panelIndexFor: () => NaN }, { 0: {} }, g), g);
-    assert.equal(__test._resolveFreeCam({}, { panelIndexFor: () => -1 }, { 0: {} }, g), g);
-    assert.equal(__test._resolveFreeCam({}, { panelIndexFor: () => 0.5 }, { 0: {} }, g), g);
-    // A string/prototype key must not resolve an inherited property (e.g. toString).
-    assert.equal(__test._resolveFreeCam({}, { panelIndexFor: () => 'toString' }, {}, g), g);
-});
-
-test('_ssApi: null when neither global set; slopsmith alias; feedBack canonical wins', () => {
-    const { window, __test } = load();
-    assert.equal(__test._ssApi(), null);
-    const legacy = { panelIndexFor: () => 0 };
-    window.slopsmithSplitscreen = legacy;
-    assert.equal(__test._ssApi(), legacy);            // legacy alias picked up
-    const current = { panelIndexFor: () => 1 };
-    window.feedBackSplitscreen = current;
-    assert.equal(__test._ssApi(), current);           // canonical name takes precedence
-});

plugins/highway_3d/plugin.json

@@ -1,7 +1,7 @@
 {
     "id": "highway_3d",
     "name": "3D Highway",
-    "version": "3.31.5",
+    "version": "3.31.3",
     "type": "visualization",
     "bundled": true,
     "script": "screen.js",

plugins/highway_3d/screen.js

@@ -548,20 +548,9 @@
             ctrl.ownsActx = !(fogAudio && fogAudio.ctx);
             ctrl.actx = (fogAudio && fogAudio.ctx) || new Ctx();
             if (ctrl.actx.state === 'suspended' && ctrl.actx.resume) ctrl.actx.resume().catch(() => {});
-            // Seed the DRAWING BUFFER (canvas.width/height) to the device-pixel
-            // render size and report that SAME size to Butterchurn. Its on-screen
-            // pass viewports to the reported size but never sizes the output canvas
-            // itself — leaving the buffer at the 300x150 default blits the whole
-            // visualizer into a corner that CSS then stretches across the highway.
-            // pixelRatio:1 because DPR is now folded into the reported size, so
-            // buffer == viewport == internal texsize (no double-counting).
-            const _bcRatio0 = Math.min(window.devicePixelRatio || 1, 1.5);
-            const _bcW0 = Math.max(1, Math.round((sz.w || 1280) * _bcRatio0));
-            const _bcH0 = Math.max(1, Math.round((sz.h || 720) * _bcRatio0));
-            canvas.width = _bcW0; canvas.height = _bcH0;
             ctrl.viz = bc.createVisualizer(ctrl.actx, canvas, {
-                width: _bcW0, height: _bcH0,
-                pixelRatio: 1, textureRatio: 1,
+                width: sz.w || 1280, height: sz.h || 720,
+                pixelRatio: Math.min(window.devicePixelRatio || 1, 1.5), textureRatio: 1,
             });
             if (_bcIsDesktop()) {
                 try {
@@ -595,27 +584,6 @@
             ctrl.actx = null; ctrl.viz = null; ctrl.dead = true;
             _bcControllers.delete(ctrl);
         });
-        // Size the Butterchurn output: set the canvas DRAWING BUFFER to the
-        // device-pixel render size AND report that same size, so buffer ==
-        // on-screen viewport == full fill. Butterchurn never sizes the output
-        // canvas itself; the previous code set only CSS size, leaving the buffer
-        // at the 300x150 default -> the viz showed a stretched lower-left corner
-        // (worse the larger the panel). Ratio reuses the highway's DPR budget.
-        function _bcApplySize(cssW, cssH) {
-            if (!(cssW > 0 && cssH > 0)) return;
-            ctrl.lastW = cssW; ctrl.lastH = cssH;
-            const ratio = Math.min(window.devicePixelRatio || 1, 1.5);
-            const bw = Math.max(1, Math.round(cssW * ratio)), bh = Math.max(1, Math.round(cssH * ratio));
-            if (canvas.width !== bw) canvas.width = bw;
-            if (canvas.height !== bh) canvas.height = bh;
-            const wpx = cssW + 'px', hpx = cssH + 'px';
-            // Confine ALL layers to exactly the highway-canvas rect so the opaque
-            // backdrop can't bleed over the transport bar above the highway.
-            [ctrl.canvas, ctrl.backdrop, ctrl.scrim, ctrl.tint].forEach((el) => {
-                if (el) { el.style.width = wpx; el.style.height = hpx; el.style.right = 'auto'; el.style.bottom = 'auto'; }
-            });
-            if (ctrl.viz && ctrl.viz.setRendererSize) { try { ctrl.viz.setRendererSize(bw, bh); } catch (e) {} }
-        }
         return {
             applySettings() { ctrl.applySettings(); },
             dead() { return ctrl.dead; },
@@ -644,11 +612,18 @@
                 if (!ctrl.viz || !s.enabled) return; // skip GPU work when the bg is off
                 const sz = sizeProvider && sizeProvider();
                 if (sz && sz.w > 0 && sz.h > 0 && (sz.w !== ctrl.lastW || sz.h !== ctrl.lastH)) {
-                    _bcApplySize(sz.w, sz.h);
+                    ctrl.lastW = sz.w; ctrl.lastH = sz.h;
+                    const wpx = sz.w + 'px', hpx = sz.h + 'px';
+                    // Confine ALL layers to exactly the highway-canvas rect so the opaque
+                    // backdrop can't bleed over the transport bar above the highway.
+                    [ctrl.canvas, ctrl.backdrop, ctrl.scrim, ctrl.tint].forEach((el) => {
+                        if (el) { el.style.width = wpx; el.style.height = hpx; el.style.right = 'auto'; el.style.bottom = 'auto'; }
+                    });
+                    try { ctrl.viz.setRendererSize(sz.w, sz.h); } catch (e) {}
                 }
                 try { ctrl.viz.render(); } catch (e) {}
             },
-            resize(w, h) { _bcApplySize(w, h); },
+            resize(w, h) { if (ctrl.viz && ctrl.viz.setRendererSize) { try { ctrl.viz.setRendererSize(w, h); } catch (e) {} ctrl.lastW = w; ctrl.lastH = h; } },
             destroy() {
                 ctrl.dead = true;
                 _bcControllers.delete(ctrl);
@@ -2620,51 +2595,10 @@
     }
     const FRET_NUMBER_GHOST_SCOPE_IDS = ['chords', 'all'];
 
-    /**
-     * localStorage panel key for per-panel background settings ('main' or
-     * 'panel<index>'). Defensive on the splitscreen global-name rename in flight,
-     * and throw-safe on panelIndexFor — same as _freeCamFor — so a misbehaving
-     * splitscreen build can't take down background-settings resolution. Only a
-     * non-negative integer index yields a 'panel<N>' key; anything else (null,
-     * NaN, negative, non-integer) falls back to 'main' so a bad index can never
-     * mint a bogus "panelNaN"-style key.
-     * @param {HTMLCanvasElement} canvas this renderer's highway canvas
-     * @returns {string} 'main' or 'panel<index>'
-     */
     function _bgPanelKey(canvas) {
-        const ss = window.feedBackSplitscreen || window.slopsmithSplitscreen;
-        let idx = null;
-        if (ss && typeof ss.panelIndexFor === 'function') {
-            try { idx = ss.panelIndexFor(canvas); } catch (e) { idx = null; }
-        }
-        return (Number.isInteger(idx) && idx >= 0) ? 'panel' + idx : 'main';
-    }
-
-    /**
-     * Camera Director bridge resolver. Prefers THIS panel's per-panel camera under
-     * splitscreen (window.__h3dCamCtlPanels[panelIndex]) and falls back to the
-     * single global (window.__h3dCamCtl); returns null when Camera Director is
-     * absent → 100% stock framing. Defensive on the splitscreen global-name rename
-     * in flight (feedBackSplitscreen vs slopsmithSplitscreen); throw-safe on
-     * panelIndexFor. Mirrors the panel resolution in _bgPanelKey.
-     * @param {HTMLCanvasElement} canvas this renderer's highway canvas
-     * @returns {object|null} the resolved free-camera bridge, or null
-     */
-    function _freeCamFor(canvas) {
-        const map = window.__h3dCamCtlPanels;
-        if (map) {
-            const ss = window.feedBackSplitscreen || window.slopsmithSplitscreen;
-            if (ss && typeof ss.panelIndexFor === 'function') {
-                try {
-                    const i = ss.panelIndexFor(canvas);
-                    // Only a non-negative integer indexes the map (same hardening
-                    // as _bgPanelKey) — a non-int / negative / string index must not
-                    // resolve an unintended/inherited property; fall through then.
-                    if (Number.isInteger(i) && i >= 0 && map[i]) return map[i];
-                } catch (e) { /* ignore */ }
-            }
-        }
-        return window.__h3dCamCtl || null;
+        const ss = window.feedBackSplitscreen;
+        const idx = (ss && typeof ss.panelIndexFor === 'function') ? ss.panelIndexFor(canvas) : null;
+        return (idx == null) ? 'main' : 'panel' + idx;
     }
     // In-memory fallback for when localStorage is blocked (private mode,
     // sandboxed iframes, some test runners). _bgWriteGlobal stages the
@@ -14730,10 +14664,7 @@
             // suppressed while the Camera Director owns the view (it wins).
             const _startAspect = (_tune && Number.isFinite(_tune.startAspect) && _tune.startAspect > 0)
                 ? _tune.startAspect : HORPLUS_START_ASPECT;
-            // Resolve the Camera Director bridge once (per-panel under splitscreen,
-            // else global). Used both for the wide-pane gate and the transforms below.
-            const _freeCam = _freeCamFor(highwayCanvas);
-            const _dirActive = !!(_freeCam && _freeCam.enabled);
+            const _dirActive = !!(window.__h3dCamCtl && window.__h3dCamCtl.enabled);
             const _wide = !!(_tune && _paneAspect > _startAspect) && !_dirActive;
             const _poseHMul = (_wide && Number.isFinite(_tune.heightMul)) ? _tune.heightMul : 1;
             const _poseDMul = (_wide && Number.isFinite(_tune.distMul)) ? _tune.distMul : 1;
@@ -14760,16 +14691,13 @@
             if (_poseHMul !== 1) _camY *= _poseHMul;
             if (_poseDMul !== 1) _camZ *= _poseDMul;
             // ── Free-camera user tweaks (orbit / height / zoom / pan) ──
-            // Driven by the Camera Director plugin via the camera bridge:
-            // window.__h3dCamCtlPanels[panelIndexFor(canvas)] when split (this
-            // panel's own camera), falling back to the global window.__h3dCamCtl.
+            // Driven by the Camera Director plugin via window.__h3dCamCtl.
             // Layered ON TOP of the auto-framing so note tracking still works.
             // The bridge is read once into _freeCam and reused for both the
             // position and the look-at transforms; every field is coerced to a
             // finite number before use so a malformed object can never feed NaN
             // into cam.position / cam.lookAt.
-            // _freeCam resolved above via _freeCamFor(highwayCanvas): the
-            // per-panel __h3dCamCtlPanels entry, else global __h3dCamCtl, else null.
+            const _freeCam = window.__h3dCamCtl;
             const _lookAtZ = -FOCUS_D * 0.35 * _poseLookZMul;
             if (_freeCam && _freeCam.enabled) {
                 const _distMul = Number.isFinite(_freeCam.distMul) ? _freeCam.distMul : 1;

plugins/keys_highway_3d/plugin.json

@@ -1,7 +1,7 @@
 {
   "id": "keys_highway_3d",
   "name": "Keys Highway 3D",
-  "version": "0.2.1",
+  "version": "0.2.0",
   "description": "RS+-style 3D falling-note piano highway fed by the Sloppak Notation Format, with Web MIDI input scoring.",
   "type": "visualization",
   "bundled": true,

plugins/keys_highway_3d/screen.js

@@ -813,36 +813,20 @@
         _writeStore(STORE_KEYS.midiPick, JSON.stringify({ id: id || '', name: name || '', key: key || '' }));
     }
 
-    // Pure decision logic (exported via __test): pick which device to
-    // auto-connect to from the current source list, the domain-wide selection
-    // (`globalKey`, from Settings → Input Setup), and this plugin's own legacy
-    // saved pick. Returns null for "connect to nothing" (explicit None opt-out,
-    // or the configured device currently absent during hotplug recovery).
-    //
-    // The domain-wide selection is the SOURCE OF TRUTH (checked first): a device
-    // configured globally must never be overridden by a stale plugin-local pick
-    // or an arbitrary first-device fallback — that override was the bug. The
-    // local pick is retained only as a fallback BELOW the global (and for
-    // name-recovery when the global's logicalSourceKey went stale, e.g. a
-    // browser that regenerates MIDI port ids across reloads). Auto-connect no
-    // longer writes the local pick, so it only ever holds a value an explicit
-    // selection put there (or a stale one from a pre-fix build — the global
-    // still wins over it).
-    function _pickMidiTarget(inputs, saved, globalKey, allowFallback) {
-        if (!inputs.length) return null;
-        const notBlocked = (i) => !!i && !_MIDI_BLOCKLIST_RE.test(i.name || '');
-        // Explicit "None" opt-out (set only via the device-select API).
-        if (saved && saved.id === '' && saved.name === '') return null;
-
-        // 1. Domain-wide selection (Settings → Input Setup) — source of truth.
-        if (globalKey) {
-            const g = inputs.find(i => i.key === globalKey);
-            if (notBlocked(g)) return g;
-        }
-
-        // 2. Legacy plugin-local pick, as a fallback below the global. Prefer the
-        // globally-unique logicalSourceKey, then the legacy bare sourceId, then
-        // case-insensitive name (Chrome on Linux regenerates ids per page load).
+    function _midiAutoConnect(allowFallback) {
+        // Recovery (sources-changed after unplug) passes false: never switch to a
+        // fallback input, because _midiConnect persists the pick and that would
+        // overwrite the user's saved device on a transient multi-device unplug
+        // (the original returns on replug and reconnects then).
+        if (allowFallback === undefined) allowFallback = true;
+        const inputs = _midiSources();
+        if (!inputs.length) return;
+        const saved = _readSavedPick();
+        // Explicit "None" opt-out.
+        if (saved && saved.id === '' && saved.name === '') return;
+        // Prefer the globally-unique logicalSourceKey, then the legacy bare
+        // sourceId, then case-insensitive name (Chrome on Linux regenerates ids
+        // per page load), then first non-loopback.
         let target = null;
         if (saved && saved.key) target = inputs.find(i => i.key === saved.key) || null;
         if (!target && saved && saved.id) target = inputs.find(i => i.id === saved.id) || null;
@@ -850,50 +834,23 @@
             const n = saved.name.toLowerCase();
             target = inputs.find(i => (i.name || '').toLowerCase() === n) || null;
         }
-        // Never honour a saved pick that resolves to a loopback / "Midi Through"
-        // port — it carries no device input, so it silently eats every note.
-        if (target && !notBlocked(target)) target = null;
-        if (target) return target;
-
-        // 3. Nothing configured resolved to a present device. In recovery
-        // (allowFallback=false) with a configured preference — a global pick or a
-        // saved pick — that's currently absent, preserve it rather than switching
-        // to an arbitrary device on a transient multi-device unplug. With no
-        // preference at all, a first-device grab is the intended first-hotplug
-        // auto-connect, allowed even in recovery.
-        const hasPreference = !!(globalKey || (saved && (saved.key || saved.id || saved.name)));
-        if (!allowFallback && hasPreference) return null;
-        // Connect to nothing rather than a loopback: if every present device is
-        // blocklisted, a first-device grab would attach to a "Midi Through"/IAC
-        // port that carries no input and silently eats every note.
-        return inputs.find(notBlocked) || null;
-    }
-
-    function _midiAutoConnect(allowFallback) {
-        // Recovery (sources-changed after unplug) passes false: never switch to a
-        // fallback input on a transient multi-device unplug (the configured
-        // device returns on replug and reconnects then). Auto-connect is
-        // non-persisting (persist omitted → false): it opens the resolved device
-        // for this session WITHOUT writing the plugin-local pick or the shared
-        // domain selection, so opening this highway can't clobber the user's
-        // globally-configured device.
-        if (allowFallback === undefined) allowFallback = true;
-        const inputs = _midiSources();
-        const saved = _readSavedPick();
-        const mi = _mi();
-        const globalKey = mi && typeof mi.getSelected === 'function' ? mi.getSelected() : null;
-        const target = _pickMidiTarget(inputs, saved, globalKey, allowFallback);
-        if (!target) return;
+        // Never honour a saved pick that's a loopback / "Midi Through" port — it
+        // carries no device input, so a stale pick silently eats every note. The
+        // saved-pick lookups above bypass the block-list; re-apply it here.
+        if (target && _MIDI_BLOCKLIST_RE.test(target.name || '')) target = null;
+        if (!target) {
+            // Skip the substitute ONLY when a saved pick exists but is currently
+            // absent (recovery: preserve it, don't clobber on a transient unplug).
+            // With no saved pick at all, a fallback is the intended first-hotplug
+            // auto-connect — allow it even in recovery.
+            const hasSavedPick = !!(saved && (saved.key || saved.id || saved.name));
+            if (!allowFallback && hasSavedPick) return;
+            target = inputs.find(i => !_MIDI_BLOCKLIST_RE.test(i.name || '')) || inputs[0];
+        }
         _midiConnect(target.id, target.name, target.key);
     }
 
-    // `persist` gates the two preference writes. Only an EXPLICIT device
-    // selection (the device-select API) persists: it writes the plugin-local
-    // pick AND the shared domain selection (`mi.select`, so the user's choice
-    // becomes the global default). Auto-connect and programmatic opens pass
-    // falsy — they open the resolved device for this session only, never
-    // touching either store, so they can't clobber a globally-configured device.
-    async function _midiConnect(id, name, key, persist) {
+    async function _midiConnect(id, name, key) {
         // Capture our generation AFTER _midiDetach()'s own bump, so a later
         // detach (device removal / new connect / opt-out) reliably supersedes us.
         _midiDetach();
@@ -904,7 +861,7 @@
         for (const inst of _instances) {
             if (inst && typeof inst._releaseAllHeld === 'function') inst._releaseAllHeld();
         }
-        if (persist) _writeSavedPick(id || '', name || '', key || '');
+        _writeSavedPick(id || '', name || '', key || '');
         const mi = _mi();
         if ((id || key) && mi) {
             // Prefer the globally-unique logicalSourceKey so two providers that
@@ -917,19 +874,13 @@
                 const lkey = src.key || ('web-midi::' + src.id);
                 _midiInput = { id: src.id, name: src.name, key: lkey };
                 _midiJustConnected = true;
-                // Only an explicit selection writes the shared global default;
-                // open takes the logicalSourceKey directly, so select() is not
-                // needed to open — it exists purely to set the global. Persist it
-                // BEFORE the no-instance early return so a settings-panel pick with
-                // no live renderer still updates the shared default (best-effort:
-                // a select hiccup must not abort the connect).
-                if (persist) { try { await mi.select(lkey); } catch (_) { /* best-effort */ } }
                 // No live renderer to consume OR release a session — don't hold one
                 // open (settings-only ensure-init, or the last instance was torn
-                // down during async discovery). A later renderer mount re-runs
-                // auto-connect and opens for real, releasing on destroy.
+                // down during async discovery). The pick is saved; a later renderer
+                // mount re-runs auto-connect and opens for real, releasing on destroy.
                 if (_instances.size === 0) { _midiNotifyDeviceListChanged(); return; }
                 try {
+                    await mi.select(lkey);
                     const res = await mi.open({ requester: PLUGIN_ID, logicalSourceKey: lkey });
                     // A newer _midiConnect (device switch / None / replug) ran while
                     // we awaited open — discard this stale session so we don't wire a
@@ -1088,11 +1039,10 @@
     window.keysH3dGetMidiInputId = function () { return _midiInput ? _midiInput.id : ''; };
     window.keysH3dSetMidiInput = function (id) {
         // `id` may be a logicalSourceKey (new host calls) or a legacy sourceId.
-        // Explicit user selection → persist (local pick + shared global default).
         const src = id
             ? (_midiSources().find(s => s.key === id) || _midiSources().find(s => s.id === id))
             : null;
-        _midiConnect(src ? src.id : (id || ''), src ? src.name : '', src ? src.key : '', true);
+        _midiConnect(src ? src.id : (id || ''), src ? src.name : '', src ? src.key : '');
         return true;
     };
     window.keysH3dGetMidiChannel = function () { return _cfg.midiChannel; };
@@ -1597,8 +1547,6 @@
 
     function _aiOpen(req) {
         // Opening a MIDI source connects the corresponding Web MIDI input.
-        // Programmatic open (audio-input source.open) — non-persisting: it must
-        // not rewrite the user's saved pick or the shared global default.
         const idx = _aiIndexFor(req && (req.sourceId || req.logicalSourceKey));
         const inputs = _midiSources();   // carries .key (logicalSourceKey), unlike _midiListInputs()
         if (idx == null || idx >= inputs.length) {
@@ -1652,41 +1600,6 @@
         _aiRegisteredCount = 0;
     }
 
-    /* ======================================================================
-     *  Camera Director bridge resolver (pure — exported via createFactory.__test)
-     * ====================================================================== */
-
-    /**
-     * The active splitscreen API, defensive on the global-name rename in flight
-     * (feedBackSplitscreen is canonical; slopsmithSplitscreen is the legacy alias).
-     * @returns {object|null} the splitscreen API, or null when not present
-     */
-    function _ssApi() { return window.feedBackSplitscreen || window.slopsmithSplitscreen || null; }
-
-    /**
-     * Resolve the Camera Director camera for a canvas: this panel's camera under
-     * splitscreen, else the global, else null (Camera Director absent → 100% stock
-     * framing). Throw-safe on panelIndexFor so a misbehaving splitscreen build
-     * can't break framing.
-     * @param {HTMLCanvasElement} canvas this renderer's highway canvas
-     * @param {object|null} ss the splitscreen API (see _ssApi)
-     * @param {object|null} panelsMap window.__h3dCamCtlPanels (per-panel cameras by index)
-     * @param {object|null} globalCam window.__h3dCamCtl (single global camera)
-     * @returns {object|null} the resolved free-camera bridge, or null
-     */
-    function _resolveFreeCam(canvas, ss, panelsMap, globalCam) {
-        if (panelsMap && ss && typeof ss.panelIndexFor === 'function') {
-            try {
-                const i = ss.panelIndexFor(canvas);
-                // Only a non-negative integer indexes the panel map — a non-int /
-                // negative / string index (or a prototype key) must not resolve an
-                // unintended/inherited property; fall through to the global then.
-                if (Number.isInteger(i) && i >= 0 && panelsMap[i]) return panelsMap[i];
-            } catch (e) { /* ignore */ }
-        }
-        return globalCam || null;
-    }
-
     /* ======================================================================
      *  Renderer factory
      * ====================================================================== */
@@ -1936,18 +1849,6 @@
             _rigOut.lookZ = _camPreset.lookZ;
             return _rigOut;
         }
-
-        /**
-         * Camera Director bridge for THIS panel — delegates to the pure, unit-
-         * tested _resolveFreeCam / _ssApi (resolver block above the factory).
-         * Reads the live globals: per-panel map __h3dCamCtlPanels → this panel's
-         * camera, else the global __h3dCamCtl, else null (stock framing).
-         * @param {HTMLCanvasElement} canvas this panel's highway canvas
-         * @returns {object|null} the resolved free-camera bridge, or null
-         */
-        function _freeCamFor(canvas) {
-            return _resolveFreeCam(canvas, _ssApi(), window.__h3dCamCtlPanels, window.__h3dCamCtl);
-        }
         // Per-key approach glow: a key lights in its pitch-class color ONLY while a
         // note is heading for it, ramping up the closer that note gets to the hit-line.
         const KEY_GLOW_AHEAD = 2.0;      // seconds before the hit-line a key starts to light
@@ -3358,33 +3259,7 @@
             }
             _camX += (_camTargetX - _camX) * CAM_PAN_LERP;
             _camZoom += (_camTargetZoom - _camZoom) * CAM_ZOOM_LERP;
-            {
-                const r = _rig();
-                let _cx = _camX, _cy = r.y * K * _camZoom, _cz = r.z * K * _camZoom;
-                let _lx = _camX, _ly = r.lookY * K * _camZoom, _lz = r.lookZ * K * _camZoom;
-                // Camera Director free-cam offsets (per-panel-aware), layered on top
-                // of the auto-framing so pan/zoom-follow still works. Dolly/height/
-                // orbit act on the camera-from-target vector; pan/pitch shift the
-                // look target. NaN-safe; null/disabled bridge → stock.
-                const _fc = _freeCamFor(highwayCanvas);
-                if (_fc && _fc.enabled) {
-                    const _dm = Number.isFinite(_fc.distMul) ? _fc.distMul : 1;
-                    const _hm = Number.isFinite(_fc.heightMul) ? _fc.heightMul : 1;
-                    const _yaw = Number.isFinite(_fc.yaw) ? _fc.yaw : 0;
-                    let _vx = _cx - _lx, _vy = _cy - _ly, _vz = _cz - _lz;
-                    _vx *= _dm; _vy *= _dm; _vz *= _dm;   // dolly (zoom)
-                    _vy *= _hm;                            // height
-                    const _cyw = Math.cos(_yaw), _syw = Math.sin(_yaw);
-                    const _rx = _vx * _cyw - _vz * _syw, _rz = _vx * _syw + _vz * _cyw; // orbit around Y
-                    _cx = _lx + _rx; _cy = _ly + _vy; _cz = _lz + _rz;
-                    const _px = Number.isFinite(_fc.panX) ? _fc.panX : 0;
-                    const _py = Number.isFinite(_fc.panY) ? _fc.panY : 0;
-                    const _pt = Number.isFinite(_fc.pitch) ? _fc.pitch : 0;
-                    _lx += _px * K; _ly += (_pt + _py) * K;
-                }
-                cam.position.set(_cx, _cy, _cz);
-                cam.lookAt(_lx, _ly, _lz);
-            }
+            { const r = _rig(); cam.position.set(_camX, r.y * K * _camZoom, r.z * K * _camZoom); cam.lookAt(_camX, r.lookY * K * _camZoom, r.lookZ * K * _camZoom); }
 
             for (const km of keyMeshes.values()) km.userData.glow = 0;
             for (const { mesh, note, len, label } of noteMeshes) {
@@ -4085,8 +3960,6 @@
     };
     // Pure data-layer + scoring hooks for headless tests.
     window.slopsmithViz_keys_highway_3d.__test = {
-        _resolveFreeCam,
-        _ssApi,
         beatDurSec,
         flattenNotation,
         keyRange,
@@ -4120,7 +3993,6 @@
         FX_DEFAULTS,
         FX_RANGES,
         _classifyTiming,
-        _pickMidiTarget,
     };
 
     // Headless verification hook: lets Playwright drive synthetic note-ons

plugins/keys_highway_3d/tests/camera_bridge.test.js

@@ -1,78 +0,0 @@
-// Camera Director bridge resolver tests: per-panel select, global fallback,
-// null-when-absent, throw-safety, and the splitscreen global-name alias. Loads
-// screen.js in a bare vm window and exercises the __test exports (no DOM/WebGL).
-const { test } = require('node:test');
-const assert = require('node:assert/strict');
-const fs = require('node:fs');
-const path = require('node:path');
-const vm = require('node:vm');
-
-function load() {
-    const window = {
-        console,
-        location: { protocol: 'http:', host: 'localhost' },
-        slopsmith: {},
-    };
-    window.window = window;
-    window.globalThis = window;
-    const context = vm.createContext(window);
-    const src = fs.readFileSync(path.join(__dirname, '..', 'screen.js'), 'utf8');
-    vm.runInContext(src, context, { filename: 'screen.js' });
-    return { window, __test: window.slopsmithViz_keys_highway_3d.__test };
-}
-
-test('_resolveFreeCam: per-panel camera under splitscreen', () => {
-    const { __test } = load();
-    const c0 = {}, c1 = {};
-    const ss = { panelIndexFor: (c) => (c === c0 ? 0 : 1) };
-    const map = { 0: { id: 'p0' }, 1: { id: 'p1' } };
-    assert.equal(__test._resolveFreeCam(c0, ss, map, { id: 'g' }).id, 'p0');
-    assert.equal(__test._resolveFreeCam(c1, ss, map, { id: 'g' }).id, 'p1');
-});
-
-test('_resolveFreeCam: falls back to global when there is no panel map', () => {
-    const { __test } = load();
-    const g = { id: 'global' };
-    assert.equal(__test._resolveFreeCam({}, { panelIndexFor: () => 0 }, null, g), g);
-});
-
-test('_resolveFreeCam: falls back to global when the panel has no map entry', () => {
-    const { __test } = load();
-    const g = { id: 'global' };
-    const ss = { panelIndexFor: () => 3 };            // index 3 absent from map
-    assert.equal(__test._resolveFreeCam({}, ss, { 0: {} }, g), g);
-});
-
-test('_resolveFreeCam: null when Camera Director is absent (no global)', () => {
-    const { __test } = load();
-    assert.equal(__test._resolveFreeCam({}, null, null, null), null);
-    assert.equal(__test._resolveFreeCam({}, { panelIndexFor: () => 0 }, {}, undefined), null);
-});
-
-test('_resolveFreeCam: throw-safe on panelIndexFor → falls back to global', () => {
-    const { __test } = load();
-    const g = { id: 'global' };
-    const ss = { panelIndexFor: () => { throw new Error('boom'); } };
-    assert.equal(__test._resolveFreeCam({}, ss, { 0: {} }, g), g);
-});
-
-test('_resolveFreeCam: NaN/negative/float/string index → falls back to global', () => {
-    const { __test } = load();
-    const g = { id: 'global' };
-    assert.equal(__test._resolveFreeCam({}, { panelIndexFor: () => NaN }, { 0: {} }, g), g);
-    assert.equal(__test._resolveFreeCam({}, { panelIndexFor: () => -1 }, { 0: {} }, g), g);
-    assert.equal(__test._resolveFreeCam({}, { panelIndexFor: () => 0.5 }, { 0: {} }, g), g);
-    // A string/prototype key must not resolve an inherited property (e.g. toString).
-    assert.equal(__test._resolveFreeCam({}, { panelIndexFor: () => 'toString' }, {}, g), g);
-});
-
-test('_ssApi: null when neither global set; slopsmith alias; feedBack canonical wins', () => {
-    const { window, __test } = load();
-    assert.equal(__test._ssApi(), null);
-    const legacy = { panelIndexFor: () => 0 };
-    window.slopsmithSplitscreen = legacy;
-    assert.equal(__test._ssApi(), legacy);            // legacy alias picked up
-    const current = { panelIndexFor: () => 1 };
-    window.feedBackSplitscreen = current;
-    assert.equal(__test._ssApi(), current);           // canonical name takes precedence
-});

plugins/keys_highway_3d/tests/data_layer.test.js

@@ -188,99 +188,3 @@ test('measureMarkers extracts idx/t pairs', () => {
         [{ idx: 1, t: 0 }, { idx: 2, t: 2.5 }],
     );
 });
-
-test('_pickMidiTarget: no plugin-local pick defers to the domain-wide selection, not "first device"', () => {
-    const { _pickMidiTarget } = load();
-    const inputs = [
-        { id: 'a', name: 'Device A', key: 'web-midi::a' },
-        { id: 'b', name: 'Device B', key: 'web-midi::b' },
-    ];
-    // Fresh install / never picked here — must use the Input Setup global,
-    // NOT fall through to inputs[0].
-    const target = _pickMidiTarget(inputs, null, 'web-midi::b', true);
-    assert.equal(target.id, 'b');
-});
-
-test('_pickMidiTarget: the domain-wide selection is the source of truth — it wins over a stale plugin-local pick', () => {
-    const { _pickMidiTarget } = load();
-    const inputs = [
-        { id: 'a', name: 'Device A', key: 'web-midi::a' },
-        { id: 'b', name: 'Device B', key: 'web-midi::b' },
-    ];
-    // A stale local pick (e.g. left by a pre-fix build's auto-connect) must
-    // NOT override the device the user configured in Settings → Input Setup.
-    const target = _pickMidiTarget(inputs, { id: 'a', name: 'Device A', key: 'web-midi::a' }, 'web-midi::b', true);
-    assert.equal(target.id, 'b');
-});
-
-test('_pickMidiTarget: local pick is used as a fallback when no global is configured', () => {
-    const { _pickMidiTarget } = load();
-    const inputs = [
-        { id: 'a', name: 'Device A', key: 'web-midi::a' },
-        { id: 'b', name: 'Device B', key: 'web-midi::b' },
-    ];
-    const target = _pickMidiTarget(inputs, { id: 'a', name: 'Device A', key: 'web-midi::a' }, null, true);
-    assert.equal(target.id, 'a');
-});
-
-test('_pickMidiTarget: local pick name-recovers when its logicalSourceKey went stale (id regeneration)', () => {
-    const { _pickMidiTarget } = load();
-    // Same physical device, new id/key across a reload; the saved key/id miss
-    // but the name still matches.
-    const inputs = [{ id: 'a2', name: 'Device A', key: 'web-midi::a2' }];
-    const target = _pickMidiTarget(inputs, { id: 'a1', name: 'Device A', key: 'web-midi::a1' }, null, true);
-    assert.equal(target.id, 'a2');
-});
-
-test('_pickMidiTarget: domain-wide selection is ignored if it names a blocklisted loopback port', () => {
-    const { _pickMidiTarget } = load();
-    const inputs = [
-        { id: 'thru', name: 'IAC Driver Bus 1', key: 'web-midi::thru' },
-        { id: 'b', name: 'Device B', key: 'web-midi::b' },
-    ];
-    const target = _pickMidiTarget(inputs, null, 'web-midi::thru', true);
-    assert.equal(target.id, 'b'); // falls through to the first non-loopback device
-});
-
-test('_pickMidiTarget: when every present device is a loopback, connect to nothing (never a dead port)', () => {
-    const { _pickMidiTarget } = load();
-    const inputs = [
-        { id: 'thru', name: 'MIDI Through Port-0', key: 'web-midi::thru' },
-        { id: 'iac', name: 'IAC Driver Bus 1', key: 'web-midi::iac' },
-    ];
-    // No non-loopback device exists — must NOT fall back to inputs[0] (a port
-    // that carries no input and would silently eat every note).
-    const target = _pickMidiTarget(inputs, null, null, true);
-    assert.equal(target, null);
-});
-
-test('_pickMidiTarget: explicit "None" opt-out still wins over any global default', () => {
-    const { _pickMidiTarget } = load();
-    const inputs = [{ id: 'a', name: 'Device A', key: 'web-midi::a' }];
-    const target = _pickMidiTarget(inputs, { id: '', name: '' }, 'web-midi::a', true);
-    assert.equal(target, null);
-});
-
-test('_pickMidiTarget: a present global wins even during hotplug recovery', () => {
-    const { _pickMidiTarget } = load();
-    const inputs = [{ id: 'b', name: 'Device B', key: 'web-midi::b' }];
-    // The configured global device is present — reconnect to it, don't bail.
-    const target = _pickMidiTarget(inputs, null, 'web-midi::b', false);
-    assert.equal(target.id, 'b');
-});
-
-test('_pickMidiTarget: recovery (allowFallback=false) preserves an absent configured device instead of grabbing a random one', () => {
-    const { _pickMidiTarget } = load();
-    const inputs = [{ id: 'b', name: 'Device B', key: 'web-midi::b' }];
-    // The configured device ('x', global) is currently unplugged; a transient
-    // recovery must NOT switch to the unrelated device that is present.
-    const target = _pickMidiTarget(inputs, null, 'web-midi::x', false);
-    assert.equal(target, null);
-});
-
-test('_pickMidiTarget: recovery with no preference at all still allows a first-hotplug grab', () => {
-    const { _pickMidiTarget } = load();
-    const inputs = [{ id: 'b', name: 'Device B', key: 'web-midi::b' }];
-    const target = _pickMidiTarget(inputs, null, null, false);
-    assert.equal(target.id, 'b');
-});

static/app.js

@@ -1871,7 +1871,10 @@ function _setLibraryLoadingMessage(containerId, countId, message) {
     const count = document.getElementById(countId);
     if (count) count.textContent = 'Loading source...';
     if (container) {
-        container.innerHTML = `<div class="rounded-xl border border-gray-800/50 bg-dark-700/30 px-4 py-6 text-sm text-gray-300">${esc(message || 'Loading library...')}</div>`;
+        container.innerHTML = `<div role="status" aria-live="polite" class="rounded-xl border border-gray-800/50 bg-dark-700/30 px-4 py-6 text-sm text-gray-300 flex items-center gap-3">
+            <span class="inline-block h-4 w-4 rounded-full border-2 border-gray-600 border-t-accent animate-spin" aria-hidden="true"></span>
+            <span>${esc(message || 'Loading library...')}</span>
+        </div>`;
     }
 }
 
@@ -1880,6 +1883,9 @@ function _libraryLoadingText() {
     if (!provider || provider.id === 'local' || provider.kind === 'local') {
         return 'Loading library...';
     }
+    if (provider.slow === true) {
+        return `Loading ${provider.label || provider.id}... this source may take a while.`;
+    }
     return `Connecting to ${provider.label || provider.id}...`;
 }
 
@@ -4864,47 +4870,6 @@ window.jucePlayer = jucePlayer;
     // (a network blip on /api/audio-local-path, an isAudioRunning() race
     // during a device restart) are deliberately NOT memoised so they retry.
     let _rerouteRejectedUrl = null;
-    // Exclusive-style output backends silence every other client on the
-    // endpoint — including our own <audio> element. The share mode IS the
-    // JUCE output device type: "Windows Audio (Exclusive Mode)" is a
-    // hardcoded, unlocalised JUCE type name; ASIO drivers typically hold
-    // the endpoint exclusively too. "Windows Audio (Low Latency Mode)" is
-    // shared and must NOT match.
-    function _isExclusiveOutputType(t) {
-        return t === 'Windows Audio (Exclusive Mode)' || t === 'ASIO';
-    }
-    // [feedpak-route] diagnostics: log the raw outputType string once per
-    // value change (this runs on a 350ms poll — logging every tick would
-    // flood the diagnostics buffer).
-    let _loggedOutputType;
-    async function _outputIsExclusive() {
-        if (typeof juceApi.getCurrentDevice !== 'function') {
-            if (_loggedOutputType !== '<no-getCurrentDevice>') {
-                _loggedOutputType = '<no-getCurrentDevice>';
-                console.warn('[feedpak-route] juceApi.getCurrentDevice missing — cannot detect exclusive output');
-            }
-            return false;
-        }
-        try {
-            const dev = await juceApi.getCurrentDevice();
-            const t = dev?.outputType || dev?.type || '';
-            const excl = _isExclusiveOutputType(t);
-            if (t !== _loggedOutputType) {
-                _loggedOutputType = t;
-                console.log('[feedpak-route] outputType=', JSON.stringify(t), '→ exclusive=', excl);
-            }
-            return excl;
-        } catch (e) {
-            if (_loggedOutputType !== '<getCurrentDevice-failed>') {
-                _loggedOutputType = '<getCurrentDevice-failed>';
-                console.warn('[feedpak-route] getCurrentDevice failed:', e);
-            }
-            return false;
-        }
-    }
-    // highway.js's initial song-load routing consults this for the same
-    // feedpak-under-exclusive decision the watcher makes below.
-    window._juceOutputIsExclusive = _outputIsExclusive;
     // Returns true when window._currentSongAudio no longer references the exact
     // snapshot object captured at reroute entry — i.e. the song was swapped (or
     // cleared) mid-flight. Staleness is detected by object-reference identity,
@@ -4945,12 +4910,8 @@ window.jucePlayer = jucePlayer;
         audio.pause();
         try {
             const res = await fetch(`/api/audio-local-path?url=${encodeURIComponent(url)}`);
-            if (!res.ok) {
-                console.warn('[feedpak-route] audio-local-path HTTP', res.status, 'for', url);
-                throw new Error('HTTP ' + res.status);
-            }
+            if (!res.ok) throw new Error('HTTP ' + res.status);
             const { path } = await res.json();
-            console.log('[feedpak-route] audio-local-path resolved:', (typeof path === 'string' && path.split(/[\\/]/).pop()) || '<missing>');
             if (_isStale(songAudio)) return 'stale';   // song changed mid-fetch
             const ok = await juceApi.loadBackingTrack(path);
             if (ok === false) {
@@ -5168,12 +5129,8 @@ window.jucePlayer = jucePlayer;
     async function _reevaluateJuceRouting() {
         if (_rerouteInFlight) return;
         const songAudio = window._currentSongAudio;
-        // /audio/ songs are always JUCE-routable. A feedpak full-mix
-        // (single-mix pack, no stems) is routable ONLY under an
-        // exclusive-style output — in shared mode it must stay on HTML5 so
-        // the stem mixer / WebAudio path keeps working. Sloppak stem URLs
-        // are never routable (per-stem mix can't ride a single transport).
-        if (!songAudio || (!songAudio.juceEligible && !songAudio.feedpakFullMix)) return;
+        // Only /audio/ songs are JUCE-routable; sloppak stems stay on HTML5.
+        if (!songAudio || !songAudio.juceEligible) return;
         // Don't race highway.js's own initial song-load routing: it owns
         // _juceMode until _juceRoutingPromise settles. Re-running our switch
         // concurrently would double-call loadBackingTrack for the same URL.
@@ -5191,30 +5148,13 @@ window.jucePlayer = jucePlayer;
             try { running = await juceApi.isAudioRunning(); }
             catch (_) { return; }
             if (_isStale(songAudio)) return;               // song changed during IPC
-            // Eligibility is evaluated per tick, not snapshotted at song load:
-            // the output share mode can change mid-song (device switch in the
-            // Audio Engine panel), and a feedpak full-mix must follow it —
-            // exclusive → ride the engine; back to shared → return to HTML5.
-            let eligible = !!songAudio.juceEligible;
-            if (!eligible && songAudio.feedpakFullMix && running) {
-                eligible = await _outputIsExclusive();
-                if (_isStale(songAudio)) return;           // song changed during IPC
-            }
-            const wantJuce = !!(running && eligible);
-            // [feedpak-route] diagnostics: one line per decision change (the
-            // watcher polls at 350ms; steady state must not spam the buffer).
-            const _decision = 'running=' + running + ' eligible=' + eligible
-                + ' feedpakFullMix=' + !!songAudio.feedpakFullMix
-                + ' juceMode=' + !!window._juceMode + ' url=' + songAudio.url;
-            if (_decision !== window._lastFeedpakRouteDecision) {
-                window._lastFeedpakRouteDecision = _decision;
-                console.log('[feedpak-route] watcher:', _decision);
-            }
-            if (wantJuce === !!window._juceMode) return;   // routing already consistent
+            if (!!running === !!window._juceMode) return;  // routing already consistent
+
+            const wantJuce = running && !window._juceMode;
             // Don't keep retrying a track JUCE explicitly rejected.
             if (wantJuce && songAudio.url === _rerouteRejectedUrl) return;
 
-            if (wantJuce) {
+            if (running) {
                 const outcome = await _switchHtml5ToJuce(songAudio);
                 // Memoise ONLY an explicit hard JUCE reject. A successful
                 // switch clears the memo; a 'stale' abort (song changed
@@ -5229,10 +5169,9 @@ window.jucePlayer = jucePlayer;
                 // outcome === 'stale': leave _rerouteRejectedUrl as-is.
             } else {
                 await _switchJuceToHtml5(songAudio);
-                // The engine stopped (or a feedpak's output left exclusive
-                // mode). Clear any hard-reject memo so a later engine restart
-                // or mode change re-evaluates the track at least once — the
-                // rejection may have been a transient device/decoder state.
+                // The engine just stopped. Clear any hard-reject memo so a
+                // later engine restart re-evaluates the track at least once —
+                // the rejection may have been a transient device/decoder state.
                 _rerouteRejectedUrl = null;
             }
         } catch (e) {
@@ -5264,209 +5203,6 @@ window.jucePlayer = jucePlayer;
     }, 350);
 })();
 
-// Renderer-audio bus feeder (desktop Phase 2): when the engine holds the
-// output endpoint in an exclusive-style mode, Chromium cannot reach the
-// device, so any song audio still played by the renderer goes silent. The
-// Phase 1 watcher above already migrates what a single-file transport can
-// carry (loose /audio/ songs, feedpak full-mixes) onto the native backing
-// transport. This feeder covers the rest — the stems plugin's multi-stem
-// WebAudio graph, plus <audio>-element songs the native transport could not
-// take (e.g. a codec loadBackingTrack rejected).
-//
-// Mechanism: capture the renderer-side master with an AudioWorklet tap,
-// re-point the owning AudioContext at a null sink so it keeps rendering
-// without a device, and push ~10 ms chunks over IPC into the engine's
-// renderer bus, where they are mixed into the exclusive output like a
-// backing track (~10-20 ms added latency on song audio only; the guitar
-// monitoring path is untouched). Validated by the fix12 tester spike:
-// null-sink rendering works, clocks hold (drift → 0), no overflow.
-//
-// Docker sphere: window.feedBackDesktop is undefined → this whole block is
-// inert. Shared-mode desktop: the bus stays disabled (no double audio) and
-// captured contexts keep/regain their default sink.
-(function _installRendererBusFeeder() {
-    const api = window.feedBackDesktop?.audio;
-    if (!api || typeof api.setRendererBus !== 'function'
-             || typeof api.pushRendererAudio !== 'function') return;
-
-    const TAP_WORKLET = `
-        class FeedbackBusTap extends AudioWorkletProcessor {
-            process(inputs) {
-                const inp = inputs[0];
-                if (inp && inp[0]) {
-                    const L = inp[0], R = inp[1] || inp[0];
-                    const out = new Float32Array(L.length * 2);
-                    for (let i = 0; i < L.length; i++) { out[i*2] = L[i]; out[i*2+1] = R[i]; }
-                    this.port.postMessage(out, [out.buffer]);
-                }
-                return true;
-            }
-        }
-        registerProcessor('feedback-bus-tap', FeedbackBusTap);
-    `;
-    const _tapModuleUrl = URL.createObjectURL(new Blob([TAP_WORKLET], { type: 'application/javascript' }));
-    const _tapModuleLoaded = new WeakSet();   // AudioContexts with the module added
-
-    // One tap per captured graph. `active` gates the push (the worklet keeps
-    // running when inactive — it's silent bookkeeping, not audio).
-    function _makeTap(ctx) {
-        const state = { node: null, active: false, batch: [], batchFrames: 0 };
-        state.attach = async (sourceNode) => {
-            if (!_tapModuleLoaded.has(ctx)) {
-                await ctx.audioWorklet.addModule(_tapModuleUrl);
-                _tapModuleLoaded.add(ctx);
-            }
-            if (!state.node) {
-                state.node = new AudioWorkletNode(ctx, 'feedback-bus-tap', { numberOfInputs: 1, channelCount: 2 });
-                const BATCH = Math.round(ctx.sampleRate / 100);   // ~10 ms
-                state.node.port.onmessage = (e) => {
-                    if (!state.active) { state.batch = []; state.batchFrames = 0; return; }
-                    state.batch.push(e.data);
-                    state.batchFrames += e.data.length / 2;
-                    if (state.batchFrames >= BATCH) {
-                        const merged = new Float32Array(state.batchFrames * 2);
-                        let o = 0;
-                        for (const c of state.batch) { merged.set(c, o); o += c.length; }
-                        api.pushRendererAudio(merged, ctx.sampleRate);
-                        state.batch = []; state.batchFrames = 0;
-                    }
-                };
-            }
-            sourceNode.connect(state.node);
-            // No onward connection: the tap is a sink-side observer; audibility
-            // in shared mode comes from the graph's own destination path.
-        };
-        state.detach = (sourceNode) => {
-            state.active = false;
-            state.batch = []; state.batchFrames = 0;
-            if (state.node && sourceNode) {
-                try { sourceNode.disconnect(state.node); } catch (_) { /* already gone */ }
-            }
-        };
-        return state;
-    }
-
-    // ── Core <audio> element capture ─────────────────────────────────────────
-    // createMediaElementSource permanently reroutes the element into its
-    // context, so it is created lazily — only the first time an exclusive
-    // device actually needs it — and never torn down. From then on the element
-    // always plays through _elCtx; sink toggling routes it to the speakers
-    // (shared mode) or the null sink + bus (exclusive mode).
-    let _elCtx = null, _elSource = null, _elTap = null;
-    async function _ensureElementCapture() {
-        if (_elCtx) return;
-        const el = document.getElementById('audio');
-        if (!el) throw new Error('no core audio element');
-        _elCtx = new AudioContext();
-        _elSource = _elCtx.createMediaElementSource(el);
-        _elSource.connect(_elCtx.destination);
-        _elTap = _makeTap(_elCtx);
-        await _elTap.attach(_elSource);
-    }
-
-    // ── Engagement state machine ─────────────────────────────────────────────
-    // 'off' | 'element' | 'stems'
-    let _mode = 'off';
-    let _stemsGraph = null;   // { context, masterNode } snapshot while engaged
-    let _stemsTap = null;
-    const _stemsTaps = new WeakMap();  // context → tap (stems ctx is reused across songs)
-    let _busy = false;
-
-    async function _setSink(ctx, exclusive) {
-        if (typeof ctx.setSinkId !== 'function') throw new Error('setSinkId unsupported');
-        await ctx.setSinkId(exclusive ? { type: 'none' } : '');
-        if (ctx.state !== 'running') await ctx.resume().catch(() => {});
-    }
-
-    async function _disengage() {
-        if (_mode === 'off') return;
-        const prev = _mode;
-        _mode = 'off';
-        try { await api.setRendererBus(false, 0); } catch (_) { /* engine gone */ }
-        if (prev === 'element' && _elCtx) {
-            _elTap.active = false;
-            await _setSink(_elCtx, false).catch(() => {});
-        } else if (prev === 'stems' && _stemsGraph) {
-            if (_stemsTap) _stemsTap.detach(_stemsGraph.masterNode);
-            await _setSink(_stemsGraph.context, false).catch(() => {});
-            _stemsGraph = null; _stemsTap = null;
-        }
-        console.log('[renderer-bus] disengaged (' + prev + ')');
-    }
-
-    async function _engageStems(graph) {
-        await _setSink(graph.context, true);
-        let tap = _stemsTaps.get(graph.context);
-        if (!tap) { tap = _makeTap(graph.context); _stemsTaps.set(graph.context, tap); }
-        await tap.attach(graph.masterNode);
-        await api.setRendererBus(true, 1.0);
-        tap.active = true;
-        _stemsGraph = graph; _stemsTap = tap;
-        _mode = 'stems';
-        console.log('[renderer-bus] engaged: stems graph → engine bus');
-    }
-
-    async function _engageElement() {
-        await _ensureElementCapture();
-        await _setSink(_elCtx, true);
-        await api.setRendererBus(true, 1.0);
-        _elTap.active = true;
-        _mode = 'element';
-        console.log('[renderer-bus] engaged: <audio> element → engine bus');
-    }
-
-    async function _reevaluate() {
-        if (_busy) return;
-        _busy = true;
-        try {
-            let running = false, exclusive = false;
-            try {
-                running = await api.isAudioRunning();
-            } catch (_) { /* engine unreachable → treat as not running */ }
-            if (running) {
-                // Reuse the Phase 1 predicate installed by the routing watcher
-                // (getCurrentDevice + exclusive-type check with change-logged
-                // diagnostics). Fail closed if it is somehow absent.
-                exclusive = !!(await window._juceOutputIsExclusive?.());
-            }
-
-            // The stems plugin publishes its live graph while a multi-stem
-            // song is loaded (and removes it on teardown).
-            const stems = (window.feedBack || window.slopsmith)?.stems?.audioGraph || null;
-            // Element songs: a song is loaded, it is NOT riding the native
-            // transport (Phase 1 owns those), and the stems graph is not the
-            // player. Covers native-transport rejects (codec) in exclusive
-            // mode — without this they would be silent.
-            const songAudio = window._currentSongAudio;
-            const elementSong = !!songAudio && !window._juceMode && !stems;
-
-            let want = 'off';
-            if (running && exclusive) {
-                if (stems) want = 'stems';
-                else if (elementSong) want = 'element';
-            }
-
-            const stemsGraphChanged = _mode === 'stems' && stems !== _stemsGraph;
-            if (want !== _mode || stemsGraphChanged) {
-                await _disengage();
-                if (want === 'stems') await _engageStems(stems);
-                else if (want === 'element') await _engageElement();
-            }
-        } catch (e) {
-            console.warn('[renderer-bus] reevaluate failed (will retry):', e);
-            _mode = 'off';
-        } finally {
-            _busy = false;
-        }
-    }
-
-    // Same cadence/rationale as the routing watcher above. Also re-check on
-    // visibility return so a device switch made while hidden is reconciled.
-    setInterval(() => { if (!document.hidden) void _reevaluate(); }, 500);
-    document.addEventListener('visibilitychange', () => { if (!document.hidden) void _reevaluate(); });
-    window._reevaluateRendererBus = _reevaluate;
-})();
-
 // Desktop JUCE backing uses an empty <audio> element; plugins such as Section Map
 // still seek via audio.currentTime / pause / play. Mirror those onto jucePlayer
 // while _juceMode is active. Same-tick pause+seek coalesce into a single seek

static/capabilities.js

@@ -86,6 +86,7 @@
     // operation is still completing through the provider.
     const COMMAND_TIMEOUTS_MS = {
         'audio-mix': { 'get-fader-value': 2100, 'set-fader-value': 2100 },
+        'library': { 'refresh-providers': 15000, 'sync-song': 15000 },
         'midi-input': { 'discover': 15000, 'open-source': 15000 },
     };
     function _commandTimeoutFor(capability, commandName) {

static/capabilities/audio-effects.js

@@ -9,8 +9,6 @@
 
     const SCHEMA = 'feedBack.audio_effects.diagnostics.v1';
     const PLAN_SCHEMA = 'feedBack.audio_effects.chain_plan.v1';
-// Pre-rebrand plugins (rig_builder <= 2.9.x) still send the old schema id — accept it as an alias.
-const LEGACY_PLAN_SCHEMA = 'slopsmith.audio_effects.chain_plan.v1';
     const OWNER_ID = 'core.audio.effects';
     const DEFAULT_ROUTE_KEY = 'desktop-main';
     const DEFAULT_TIMEOUT_MS = 2000;
@@ -736,7 +734,7 @@ const LEGACY_PLAN_SCHEMA = 'slopsmith.audio_effects.chain_plan.v1';
         const errors = [];
         const source = _plainObject(rawPlan);
         const schema = _string(source.schema || source.version, PLAN_SCHEMA);
-        if (schema !== PLAN_SCHEMA && schema !== LEGACY_PLAN_SCHEMA && schema !== '1') errors.push('Unsupported chain plan schema');
+        if (schema !== PLAN_SCHEMA && schema !== '1') errors.push('Unsupported chain plan schema');
         const planRoute = _safeRoute(source.routeKey || source.route || routeKey);
         if (planRoute !== routeKey) errors.push('Chain plan route does not match selected route');
         const providerId = _safeId(source.providerId || provider.providerId, provider.providerId);

static/capabilities/library.js

@@ -13,6 +13,7 @@
         label: 'My Library',
         kind: 'local',
         capabilities: ['library.read', 'art.read', 'song.play', 'favorite.write', 'metadata.write', 'retune.write'],
+        slow: false,
         default: true,
     });
     const PROVIDER_OPERATIONS = Object.freeze({
@@ -72,6 +73,7 @@
             label: String(provider.label || provider.name || providerId),
             kind: String(provider.kind || (providerId === 'local' ? 'local' : 'remote')),
             capabilities: _strings(provider.capabilities),
+            slow: provider.slow === true || provider.is_slow === true || provider.slow_mode === true,
             default: provider.default === true || providerId === 'local',
         };
     }
@@ -141,6 +143,7 @@
                         label: provider.label || providerId,
                         kind: provider.kind || (providerId === 'local' ? 'local' : 'remote'),
                         capabilities: _strings(provider.capabilities),
+                        slow: provider.slow === true,
                         ownerPluginId: _ownerPluginId(provider) || null,
                         default: provider.default === true || providerId === 'local',
                     },

static/highway.js

@@ -3409,57 +3409,21 @@ function createHighway() {
                                 if (msg.audio_url) {
                                     const audio = document.getElementById('audio');
                                     const audioFilename = msg.audio_url.split('/').pop();
-                                    // /audio/ URLs are always JUCE-routable. A feedpak full-mix
-                                    // (single-mix pack: original audio, no stems) is routable too,
-                                    // but ONLY under an exclusive-style output — the actual
-                                    // exclusive check happens at routing time (app.js watcher /
-                                    // the async block below), not here, because the share mode
-                                    // can change while the song is loaded. Sloppak stem URLs are
-                                    // never routable.
+                                    // Only attempt JUCE routing for /audio/ URLs — sloppak stems
+                                    // (/api/sloppak/…) are not resolvable via audio-local-path.
                                     const isAudioUrl = msg.audio_url.startsWith('/audio/');
-                                    // "Full mix" covers BOTH single-mix pack shapes:
-                                    //  - stem-less packs (original_audio: in the manifest,
-                                    //    audio_url == original_audio_url), and
-                                    //  - single-stem packs (stems: [full.ogg] only) — the server
-                                    //    puts the full mix in the stems list, has_original_audio
-                                    //    is false, and audio_url points at the one stem. With one
-                                    //    stem there is no per-stem mix to preserve, so routing it
-                                    //    natively loses nothing. Real multi-stem (>1) stays out
-                                    //    until Phase 2.
-                                    const isFeedpakFullMix = !isAudioUrl
-                                        && msg.audio_url.startsWith('/api/sloppak/')
-                                        && ((!!msg.has_original_audio && !msg.has_stems)
-                                            || (msg.stems || []).length === 1);
                                     // Record the loaded song's audio so app.js can re-route it
                                     // between the HTML5 and JUCE paths if the audio engine is
                                     // started/stopped after the song is already loaded. Set this
                                     // unconditionally (not just on reload): when alreadyLoaded is
                                     // true the watcher must still see correct, current metadata.
-                                    window._currentSongAudio = {
-                                        url: msg.audio_url,
-                                        juceEligible: isAudioUrl,
-                                        feedpakFullMix: isFeedpakFullMix,
-                                    };
+                                    window._currentSongAudio = { url: msg.audio_url, juceEligible: isAudioUrl };
                                     const alreadyLoaded = window._juceMode
                                         ? window._juceAudioUrl === msg.audio_url
                                         : (audio.src && audio.src.includes(audioFilename));
-                                    // [feedpak-route] diagnostics: every eligibility input in one
-                                    // line — shows up in the exported diagnostics bundle. If
-                                    // has_stems is true the pack is multi-stem and Phase 1
-                                    // deliberately does not route it (Phase 2 work).
-                                    console.log('[feedpak-route] song-load:',
-                                        'url=', msg.audio_url,
-                                        'isAudioUrl=', isAudioUrl,
-                                        'isFeedpakFullMix=', isFeedpakFullMix,
-                                        'has_stems=', !!msg.has_stems,
-                                        'stems=', (msg.stems || []).length,
-                                        'has_original_audio=', !!msg.has_original_audio,
-                                        'format=', msg.format,
-                                        'alreadyLoaded=', alreadyLoaded,
-                                        'juceApi=', !!window.feedBackDesktop?.audio);
                                     if (!alreadyLoaded) {
                                         const juceApi = window.feedBackDesktop?.audio;
-                                        if ((isAudioUrl || isFeedpakFullMix) && juceApi) {
+                                        if (isAudioUrl && juceApi) {
                                             // Run JUCE routing off the critical message-processing chain
                                             // so subsequent notes/chords/ready messages aren't blocked
                                             // waiting for IPC + HTTP round-trips. The 'ready' handler
@@ -3502,24 +3466,7 @@ function createHighway() {
                                                         clearTimeout(barrierTimer);
                                                         if (gen !== _wsGen) return; // navigated away during the wait
                                                     }
-                                                    // Feedpak full-mix rides the engine ONLY under an
-                                                    // exclusive-style output (shared mode falls through to
-                                                    // the HTML5 fallback below, keeping the WebAudio path
-                                                    // fully working). /audio/ songs route whenever the
-                                                    // engine runs, as before. If the share mode changes
-                                                    // later, the app.js watcher re-evaluates and migrates.
-                                                    let routeToJuce = await juceApi.isAudioRunning();
-                                                    console.log('[feedpak-route] initial-load: engineRunning=', routeToJuce);
-                                                    if (routeToJuce) {
-                                                        if (gen !== _wsGen) return; // stale
-                                                        if (isFeedpakFullMix) {
-                                                            const exclFn = window._juceOutputIsExclusive;
-                                                            routeToJuce = !!(await exclFn?.());
-                                                            console.log('[feedpak-route] initial-load: feedpak exclusive check →',
-                                                                routeToJuce, '(predicate installed=', typeof exclFn === 'function', ')');
-                                                        }
-                                                    }
-                                                    if (routeToJuce) {
+                                                    if (await juceApi.isAudioRunning()) {
                                                         if (gen !== _wsGen) return; // stale
                                                         const res = await fetch(`/api/audio-local-path?url=${encodeURIComponent(audioUrl)}`);
                                                         if (!res.ok) throw new Error('HTTP ' + res.status);

static/v3/songs.js

@@ -64,6 +64,7 @@
 
         filters: { arr_has: [], arr_lacks: [], stem_has: [], stem_lacks: [], lyrics: '', tunings: [], mastery: [], match: [], genre: [] },
         page: 0, total: 0, loading: false, built: false, accuracy: {}, tuningNames: [], genres: [],
+        providers: [],
         artistCatalog: [], renderedHash: '',
         scrollBound: false,
         songsById: {}, selectMode: false, selected: new Set(),
@@ -442,6 +443,24 @@
 
     async function jget(url) { try { const r = await fetch(url); return r.ok ? r.json() : null; } catch (e) { return null; } }
 
+    function activeProvider() {
+        return (state.providers || []).find((provider) => provider.id === state.provider) || { id: state.provider || 'local', label: 'My Library', kind: 'local' };
+    }
+
+    function providerLoadingText() {
+        const provider = activeProvider();
+        if (!provider || provider.id === 'local' || provider.kind === 'local') return 'Loading library...';
+        if (provider.slow === true) return 'Loading ' + (provider.label || provider.id) + '... this source may take a while.';
+        return 'Connecting to ' + (provider.label || provider.id) + '...';
+    }
+
+    function loadingPanelHtml() {
+        return '<div role="status" aria-live="polite" class="rounded-lg border border-fb-border/50 bg-fb-card/50 px-4 py-5 text-sm text-fb-textDim flex items-center gap-3" style="grid-column:1/-1">' +
+            '<span class="inline-block h-4 w-4 rounded-full border-2 border-fb-border border-t-fb-primary animate-spin" aria-hidden="true"></span>' +
+            '<span>' + esc(providerLoadingText()) + '</span>' +
+            '</div>';
+    }
+
     // ── Provider-aware song helpers ────────────────────────────────────────
     // Remote library providers (feedBack-plugin-remote-library-*) expose songs
     // by provider-owned id with their own art/sync/play flow. Reuse the legacy
@@ -2090,6 +2109,10 @@
             grid.style.top = '0px';
             const sizer = _sizerEl();
             if (sizer) sizer.style.height = '0px';
+            const countEl = document.getElementById('v3-songs-count');
+            if (countEl) countEl.textContent = 'Loading source...';
+            grid.innerHTML = loadingPanelHtml();
+            if (sizer) sizer.style.height = grid.offsetHeight + 'px';
         }
         state.loading = true;
         await _loadPage(0);
@@ -2385,7 +2408,7 @@
     async function loadAlbums() {
         const host = document.getElementById('v3-songs-albums');
         if (!host) return;
-        host.innerHTML = '<p class="text-fb-textDim text-sm">Loading…</p>';
+        host.innerHTML = '<div role="status" aria-live="polite" class="text-fb-textDim text-sm flex items-center gap-3"><span class="inline-block h-4 w-4 rounded-full border-2 border-fb-border border-t-fb-primary animate-spin" aria-hidden="true"></span><span>' + esc(providerLoadingText()) + '</span></div>';
         const data = await jget('/api/library/albums?' + queryParams().toString());
         const albums = (data && data.albums) || [];
         if (!albums.length) { host.innerHTML = '<p class="text-fb-textDim text-sm py-8 text-center">No albums match.</p>'; return; }
@@ -2770,7 +2793,7 @@
         // (e.g. toggling select mode) restores them instead of collapsing all.
         const openArtists = new Set(
             [...host.querySelectorAll('details[open]')].map((d) => d.getAttribute('data-artist')));
-        host.innerHTML = '<p class="text-fb-textDim text-sm">Loading…</p>';
+        host.innerHTML = '<div role="status" aria-live="polite" class="text-fb-textDim text-sm flex items-center gap-3"><span class="inline-block h-4 w-4 rounded-full border-2 border-fb-border border-t-fb-primary animate-spin" aria-hidden="true"></span><span>' + esc(providerLoadingText()) + '</span></div>';
         // Page through ALL artists — the endpoint clamps size to 100, so a
         // single request would silently truncate libraries with >100 artists.
         const artists = [];
@@ -3457,12 +3480,14 @@
                 const snap = await fn.call(lp);
                 if (snap && Array.isArray(snap.providers)) {
                     state.provider = snap.current || (snap.providers[0] && snap.providers[0].id) || 'local';
+                    state.providers = snap.providers;
                     return snap.providers;
                 }
             }
         } catch (e) { /* */ }
         const data = await jget('/api/library/providers');
-        return (data && data.providers) || [{ id: 'local', label: 'My Library' }];
+        state.providers = (data && data.providers) || [{ id: 'local', label: 'My Library', kind: 'local' }];
+        return state.providers;
     }
 
     async function render() {

tests/js/capabilities_lifecycle.test.js

@@ -77,4 +77,34 @@ test('failed no-op registrations do not block reload and rehydrate replacement',
     assert.equal(participants.length, 1);
     assert.equal(result.status, 'applied');
     assert.equal(result.payload.generation, 2);
-});
+});
+
+test('library long-running commands override the default handler timeout', async () => {
+    const window = loadCapabilities();
+    const api = window.feedBack.capabilities;
+    const delay = ms => new Promise(resolve => setTimeout(resolve, ms));
+
+    api.registerParticipant('stems', {
+        stems: {
+            roles: ['owner'],
+            commands: ['slow-probe'],
+            handlers: { 'slow-probe': async () => { await delay(300); return { outcome: 'handled' }; } },
+            runtime: true,
+        },
+    });
+    const timedOut = await api.dispatch({ capability: 'stems', command: 'slow-probe', source: 'test' });
+    assert.equal(timedOut.outcome, 'failed');
+    assert.match(timedOut.reason, /timed out after 250 ms/);
+
+    api.registerParticipant('core.library', {
+        library: {
+            roles: ['owner'],
+            commands: ['sync-song'],
+            handlers: { 'sync-song': async () => { await delay(300); return { outcome: 'handled', payload: { ok: true } }; } },
+            runtime: true,
+        },
+    });
+    const synced = await api.dispatch({ capability: 'library', command: 'sync-song', source: 'test' });
+    assert.equal(synced.status, 'applied');
+    assert.equal(synced.payload.ok, true);
+});

tests/js/juce_engine_reroute.test.js

@@ -40,7 +40,7 @@ function extractWatcherIIFE(src) {
 
 // Build a sandbox with fakes and run the watcher IIFE inside it. Returns the
 // sandbox so tests can drive window._reevaluateJuceRouting and inspect state.
-function makeSandbox({ isAudioRunning, loadBackingTrack, outputType = 'Windows Audio' }) {
+function makeSandbox({ isAudioRunning, loadBackingTrack }) {
     const calls = { loadBackingTrack: [], jucePlay: 0, jucePause: 0, audioPlay: 0 };
 
     const audio = {
@@ -65,7 +65,6 @@ function makeSandbox({ isAudioRunning, loadBackingTrack, outputType = 'Windows A
     const juceApi = {
         isAudioRunning: () => Promise.resolve(isAudioRunning()),
         loadBackingTrack: (p) => { calls.loadBackingTrack.push(p); return Promise.resolve(loadBackingTrack()); },
-        getCurrentDevice: () => Promise.resolve({ outputType: typeof outputType === 'function' ? outputType() : outputType }),
         getBackingDuration: () => Promise.resolve(180),
         seekBacking: () => Promise.resolve(),
         startBacking: () => Promise.resolve(),
@@ -153,87 +152,6 @@ test('non-JUCE-eligible song (sloppak stems) is never rerouted', async () => {
     assert.equal(sb.__calls.loadBackingTrack.length, 0);
 });
 
-test('feedpak full-mix + exclusive output → migrates to JUCE', async () => {
-    const sb = makeSandbox({
-        isAudioRunning: () => true,
-        loadBackingTrack: () => true,
-        outputType: 'Windows Audio (Exclusive Mode)',
-    });
-    sb.window._juceMode = false;
-    sb.window._currentSongAudio = {
-        url: '/api/sloppak/song.sloppak/file/stems/full.ogg',
-        juceEligible: false,
-        feedpakFullMix: true,
-    };
-
-    await sb.window._reevaluateJuceRouting();
-
-    assert.equal(sb.window._juceMode, true, 'feedpak full-mix rides the engine under exclusive output');
-    assert.equal(sb.__calls.loadBackingTrack.length, 1);
-});
-
-test('feedpak full-mix + ASIO output → migrates to JUCE', async () => {
-    const sb = makeSandbox({
-        isAudioRunning: () => true,
-        loadBackingTrack: () => true,
-        outputType: 'ASIO',
-    });
-    sb.window._juceMode = false;
-    sb.window._currentSongAudio = {
-        url: '/api/sloppak/song.sloppak/file/stems/full.ogg',
-        juceEligible: false,
-        feedpakFullMix: true,
-    };
-
-    await sb.window._reevaluateJuceRouting();
-
-    assert.equal(sb.window._juceMode, true, 'ASIO is exclusive-style; feedpak rides the engine');
-});
-
-test('feedpak full-mix + shared output → stays on HTML5 (stem mixer untouched)', async () => {
-    for (const shared of ['Windows Audio', 'Windows Audio (Low Latency Mode)', 'DirectSound']) {
-        const sb = makeSandbox({
-            isAudioRunning: () => true,
-            loadBackingTrack: () => true,
-            outputType: shared,
-        });
-        sb.window._juceMode = false;
-        sb.window._currentSongAudio = {
-            url: '/api/sloppak/song.sloppak/file/stems/full.ogg',
-            juceEligible: false,
-            feedpakFullMix: true,
-        };
-
-        await sb.window._reevaluateJuceRouting();
-
-        assert.equal(sb.window._juceMode, false, `stays on HTML5 for shared type "${shared}"`);
-        assert.equal(sb.__calls.loadBackingTrack.length, 0);
-    }
-});
-
-test('feedpak on JUCE + output leaves exclusive mode → migrates back to HTML5', async () => {
-    let type = 'Windows Audio (Exclusive Mode)';
-    const sb = makeSandbox({
-        isAudioRunning: () => true,
-        loadBackingTrack: () => true,
-        outputType: () => type,
-    });
-    const url = '/api/sloppak/song.sloppak/file/stems/full.ogg';
-    sb.window._juceMode = true;
-    sb.window._juceAudioUrl = url;
-    sb.window._currentSongAudio = { url, juceEligible: false, feedpakFullMix: true };
-
-    // Still exclusive: routing is consistent, no switch.
-    await sb.window._reevaluateJuceRouting();
-    assert.equal(sb.window._juceMode, true, 'consistent while exclusive');
-
-    // Device switched to shared mid-song: must return to HTML5.
-    type = 'Windows Audio';
-    await sb.window._reevaluateJuceRouting();
-    assert.equal(sb.window._juceMode, false, 'returned to HTML5 after leaving exclusive mode');
-    assert.equal(sb.audio.src, url, 'HTML5 element re-pointed at the song');
-});
-
 test('JUCE hard-reject is memoised → not retried on the next poll', async () => {
     const sb = makeSandbox({ isAudioRunning: () => true, loadBackingTrack: () => false });
     sb.window._juceMode = false;

tests/js/renderer_bus_feeder.test.js

@@ -1,195 +0,0 @@
-// Behavioral tests for the renderer-audio bus feeder in static/app.js.
-//
-// The feeder (an IIFE, `_installRendererBusFeeder`) captures renderer-side
-// song audio (stems-plugin WebAudio master, or the core <audio> element) and
-// pushes it into the desktop engine's renderer bus while the output device is
-// exclusive-style — the Phase 2 path for audio the native backing transport
-// cannot carry. These tests extract that IIFE from source and exercise
-// `window._reevaluateRendererBus` against fakes, covering: stems engagement
-// under exclusive output, disengagement on return to shared mode, inertness
-// in shared mode / while the native transport owns the song, and the
-// element-capture fallback.
-
-const { test } = require('node:test');
-const assert = require('node:assert/strict');
-const fs = require('node:fs');
-const path = require('node:path');
-const vm = require('node:vm');
-
-const APP_JS = path.join(__dirname, '..', '..', 'static', 'app.js');
-
-function extractFeederIIFE(src) {
-    const marker = '(function _installRendererBusFeeder() {';
-    const start = src.indexOf(marker);
-    assert.ok(start !== -1, 'feeder IIFE not found in app.js');
-    const openBrace = src.indexOf('{', start);
-    let depth = 1;
-    let i = openBrace + 1;
-    while (i < src.length && depth > 0) {
-        const ch = src[i];
-        if (ch === '{') depth++;
-        else if (ch === '}') depth--;
-        i++;
-    }
-    assert.ok(depth === 0, 'unbalanced braces in feeder IIFE');
-    const tail = src.slice(i, i + 5);
-    assert.match(tail, /^\)\(\)/, 'feeder IIFE not immediately invoked');
-    return src.slice(start, i) + ')();';
-}
-
-function makeFakeContext(sampleRate = 48000) {
-    const ctx = {
-        sampleRate,
-        state: 'running',
-        sinkIdCalls: [],
-        destination: { isDestination: true },
-        setSinkId(v) { this.sinkIdCalls.push(v); return Promise.resolve(); },
-        resume() { this.state = 'running'; return Promise.resolve(); },
-        audioWorklet: { addModule: () => Promise.resolve() },
-        createMediaElementSource(el) {
-            this.mediaSourceEl = el;
-            return { connect() {}, disconnect() {} };
-        },
-    };
-    return ctx;
-}
-
-function makeSandbox({ isAudioRunning = () => true, exclusive = () => true } = {}) {
-    const calls = { setRendererBus: [], pushRendererAudio: [] };
-
-    const api = {
-        isAudioRunning: () => Promise.resolve(isAudioRunning()),
-        setRendererBus: (en, g) => { calls.setRendererBus.push([en, g]); return Promise.resolve(); },
-        pushRendererAudio: (buf, rate) => { calls.pushRendererAudio.push([buf.length, rate]); },
-    };
-
-    class FakeWorkletNode {
-        constructor() { this.port = { onmessage: null }; }
-        connect() {}
-        disconnect() {}
-    }
-
-    const sandbox = {
-        console: { log() {}, warn() {}, error() {} },
-        URL: { createObjectURL: () => 'blob:tap', revokeObjectURL() {} },
-        Blob: class { constructor() {} },
-        AudioWorkletNode: FakeWorkletNode,
-        AudioContext: function () { const c = makeFakeContext(); sandbox.__createdContexts.push(c); return c; },
-        WeakSet, WeakMap, Promise, Float32Array, Math,
-        setInterval: () => 0,
-        document: {
-            hidden: false,
-            addEventListener() {},
-            getElementById: () => sandbox.__audioEl,
-        },
-        __createdContexts: [],
-        __audioEl: { id: 'audio' },
-        __calls: calls,
-        window: null,
-    };
-    sandbox.window = {
-        feedBackDesktop: { audio: api },
-        _juceOutputIsExclusive: () => Promise.resolve(exclusive()),
-        _juceMode: false,
-        _currentSongAudio: null,
-        feedBack: { stems: {} },
-    };
-    sandbox.globalThis = sandbox;
-
-    const src = fs.readFileSync(APP_JS, 'utf8');
-    vm.createContext(sandbox);
-    vm.runInContext(extractFeederIIFE(src), sandbox);
-    assert.equal(typeof sandbox.window._reevaluateRendererBus, 'function',
-        'feeder must expose window._reevaluateRendererBus');
-    return sandbox;
-}
-
-function makeStemsGraph() {
-    return {
-        context: makeFakeContext(),
-        masterNode: { connect() {}, disconnect() {} },
-    };
-}
-
-test('stems graph + exclusive output → bus enabled, stems ctx null-sinked', async () => {
-    const sb = makeSandbox({ exclusive: () => true });
-    const graph = makeStemsGraph();
-    sb.window.feedBack.stems.audioGraph = graph;
-
-    await sb.window._reevaluateRendererBus();
-
-    assert.deepEqual(sb.__calls.setRendererBus.at(-1), [true, 1.0], 'bus enabled');
-    assert.equal(graph.context.sinkIdCalls.at(-1)?.type, 'none', 'stems ctx re-pointed at null sink');
-});
-
-test('output returns to shared → bus disabled, sink restored', async () => {
-    let excl = true;
-    const sb = makeSandbox({ exclusive: () => excl });
-    const graph = makeStemsGraph();
-    sb.window.feedBack.stems.audioGraph = graph;
-
-    await sb.window._reevaluateRendererBus();
-    excl = false;
-    await sb.window._reevaluateRendererBus();
-
-    assert.deepEqual(sb.__calls.setRendererBus.at(-1), [false, 0], 'bus disabled');
-    assert.equal(graph.context.sinkIdCalls.at(-1), '', 'default sink restored');
-});
-
-test('stems graph + shared output → feeder stays off (no double audio)', async () => {
-    const sb = makeSandbox({ exclusive: () => false });
-    sb.window.feedBack.stems.audioGraph = makeStemsGraph();
-
-    await sb.window._reevaluateRendererBus();
-
-    assert.equal(sb.__calls.setRendererBus.length, 0, 'bus never touched in shared mode');
-});
-
-test('element song + exclusive → element captured into bus', async () => {
-    const sb = makeSandbox({ exclusive: () => true });
-    sb.window._currentSongAudio = { url: '/api/sloppak/x.sloppak/file/stems/full.ogg' };
-    sb.window._juceMode = false;
-
-    await sb.window._reevaluateRendererBus();
-
-    assert.equal(sb.__createdContexts.length, 1, 'capture context created');
-    assert.equal(sb.__createdContexts[0].mediaSourceEl, sb.__audioEl, 'element source captured');
-    assert.deepEqual(sb.__calls.setRendererBus.at(-1), [true, 1.0], 'bus enabled');
-});
-
-test('song riding the native transport (_juceMode) → feeder stays off', async () => {
-    const sb = makeSandbox({ exclusive: () => true });
-    sb.window._currentSongAudio = { url: '/audio/song.ogg' };
-    sb.window._juceMode = true;
-
-    await sb.window._reevaluateRendererBus();
-
-    assert.equal(sb.__calls.setRendererBus.length, 0, 'native transport owns the song');
-    assert.equal(sb.__createdContexts.length, 0, 'no capture context created');
-});
-
-test('stems graph replaced mid-engagement → re-engages on the new graph', async () => {
-    const sb = makeSandbox({ exclusive: () => true });
-    const g1 = makeStemsGraph();
-    sb.window.feedBack.stems.audioGraph = g1;
-    await sb.window._reevaluateRendererBus();
-
-    const g2 = makeStemsGraph();
-    sb.window.feedBack.stems.audioGraph = g2;
-    await sb.window._reevaluateRendererBus();
-
-    assert.equal(g2.context.sinkIdCalls.at(-1)?.type, 'none', 'new graph null-sinked');
-    assert.deepEqual(sb.__calls.setRendererBus.at(-1), [true, 1.0], 're-enabled for new graph');
-});
-
-test('engine stops → bus disabled', async () => {
-    let running = true;
-    const sb = makeSandbox({ isAudioRunning: () => running, exclusive: () => true });
-    sb.window.feedBack.stems.audioGraph = makeStemsGraph();
-    await sb.window._reevaluateRendererBus();
-
-    running = false;
-    await sb.window._reevaluateRendererBus();
-
-    assert.deepEqual(sb.__calls.setRendererBus.at(-1), [false, 0], 'bus disabled after engine stop');
-});

tests/js/v3_slow_provider_loading.test.js

@@ -0,0 +1,36 @@
+// Pins the slow-library-provider loading states in the classic and v3 library
+// surfaces. Providers can declare `slow: true`; the UI should show explicit
+// wait copy plus a status region instead of silently blanking while fetches run.
+
+'use strict';
+const { test } = require('node:test');
+const assert = require('node:assert/strict');
+const fs = require('node:fs');
+const path = require('node:path');
+
+const root = path.join(__dirname, '..', '..');
+const SONGS = fs.readFileSync(path.join(root, 'static', 'v3', 'songs.js'), 'utf8');
+const APP = fs.readFileSync(path.join(root, 'static', 'app.js'), 'utf8');
+
+test('v3 Songs slow providers get explicit loading copy', () => {
+    assert.match(SONGS, /function providerLoadingText\(\)[\s\S]*?provider\.slow\s*===\s*true[\s\S]*?this source may take a while\./,
+        'v3 providerLoadingText must branch on provider.slow and explain the longer wait');
+    assert.match(SONGS, /function loadingPanelHtml\(\)[\s\S]*?providerLoadingText\(\)/,
+        'v3 grid loading panel must render the provider-aware loading message');
+});
+
+test('v3 loading indicators are announced as polite status regions', () => {
+    assert.match(SONGS, /function loadingPanelHtml\(\)[\s\S]*?role="status"\s+aria-live="polite"/,
+        'v3 grid loading panel must be a polite status region');
+    assert.match(SONGS, /loadAlbums[\s\S]*role="status"\s+aria-live="polite"[\s\S]*providerLoadingText\(\)/,
+        'v3 albums loading state must be a polite status region');
+    assert.match(SONGS, /loadTree[\s\S]*role="status"\s+aria-live="polite"[\s\S]*providerLoadingText\(\)/,
+        'v3 list loading state must be a polite status region');
+});
+
+test('classic library loading indicator is announced and uses slow provider copy', () => {
+    assert.match(APP, /function _setLibraryLoadingMessage[\s\S]*?role="status"\s+aria-live="polite"/,
+        'classic library loading card must be a polite status region');
+    assert.match(APP, /function _libraryLoadingText\(\)[\s\S]*?provider\.slow\s*===\s*true[\s\S]*?this source may take a while\./,
+        'classic library loading text must branch on provider.slow');
+});

tests/test_audio_local_path.py

@@ -103,99 +103,13 @@ def test_returns_404_for_nonexistent_file(client_and_server):
     assert "error" in r.json()
 
 
-# ── sloppak URLs (feedpak full-mix, desktop exclusive-mode routing) ──────────
-
-@pytest.fixture()
-def dlc_client(tmp_path, monkeypatch):
-    """Loopback TestClient with a temp DLC_DIR for sloppak resolution."""
-    dlc = tmp_path / "dlc"
-    dlc.mkdir()
-    monkeypatch.setenv("DLC_DIR", str(dlc))
-    monkeypatch.setenv("CONFIG_DIR", str(tmp_path / "cfg"))
-    monkeypatch.setenv("FEEDBACK_SYNC_STARTUP", "1")
-    sys.modules.pop("server", None)
-    server = importlib.import_module("server")
-    # Module-level sloppak source-dir cache survives re-import; clear it so a
-    # prior test's filename key can't shadow this test's temp DLC_DIR.
-    server.sloppak_mod._source_cache.clear()
-    monkeypatch.setattr(server, "load_plugins", lambda *a, **kw: None)
-    monkeypatch.setattr(server, "startup_scan", lambda: None)
-    static_tmp = tmp_path / "static"
-    static_tmp.mkdir()
-    monkeypatch.setattr(server, "STATIC_DIR", static_tmp)
-    tc = TestClient(server.app, client=("127.0.0.1", 50000))
-    try:
-        yield tc, server, dlc
-    finally:
-        tc.close()
-        meta_db = getattr(server, "meta_db", None)
-        conn = getattr(meta_db, "conn", None)
-        if conn is not None:
-            getattr(__import__("sys").modules.get("server"), "_join_background_db_threads", lambda: None)()
-            conn.close()
-
-
-def _make_sloppak(dlc, name="song.sloppak"):
-    """Create a minimal directory-form sloppak with a full-mix file."""
-    pak = dlc / name
-    (pak / "stems").mkdir(parents=True)
-    (pak / "stems" / "full.ogg").write_bytes(b"OggS-fake")
-    return pak
-
-
-def test_sloppak_url_resolves_to_local_path(dlc_client):
-    tc, _server, dlc = dlc_client
-    pak = _make_sloppak(dlc)
-    r = tc.get(
-        "/api/audio-local-path",
-        params={"url": "/api/sloppak/song.sloppak/file/stems/full.ogg"},
-    )
-    assert r.status_code == 200, r.text
-    assert r.json()["path"] == str((pak / "stems" / "full.ogg").resolve())
-
-
-def test_sloppak_url_percent_encoded_segments_decode(dlc_client):
-    tc, _server, dlc = dlc_client
-    _make_sloppak(dlc, name="My Song.sloppak")
-    r = tc.get(
-        "/api/audio-local-path",
-        params={"url": "/api/sloppak/My%20Song.sloppak/file/stems/full.ogg"},
-    )
-    assert r.status_code == 200, r.text
-
-
-def test_sloppak_url_rel_traversal_is_403(dlc_client):
-    tc, _server, dlc = dlc_client
-    _make_sloppak(dlc)
-    (dlc / "secret.txt").write_text("top secret")
-    r = tc.get(
-        "/api/audio-local-path",
-        params={"url": "/api/sloppak/song.sloppak/file/..%2Fsecret.txt"},
-    )
-    assert r.status_code == 403, r.text
-
-
-def test_sloppak_url_filename_traversal_is_403(dlc_client):
-    tc, _server, _dlc = dlc_client
-    r = tc.get(
-        "/api/audio-local-path",
-        params={"url": "/api/sloppak/..%2F..%2F..%2Fetc/file/passwd"},
-    )
-    assert r.status_code == 403, r.text
-
-
-def test_sloppak_url_without_dlc_configured_is_404(client_and_server):
-    """No DLC_DIR in the base fixture — resolver reports 'not configured'."""
-    client, _ = client_and_server
-    r = client.get(
-        "/api/audio-local-path",
-        params={"url": "/api/sloppak/mysong/file/stems/full.ogg"},
-    )
-    assert r.status_code == 404
-
-
 # ── rejected non-/audio/ inputs ───────────────────────────────────────────────
 
+def test_rejects_sloppak_url(client_and_server):
+    client, _ = client_and_server
+    r = client.get("/api/audio-local-path", params={"url": "/api/sloppak/mysong/file/stems/full.ogg"})
+    assert r.status_code == 400
+
 
 def test_rejects_empty_url(client_and_server):
     client, _ = client_and_server

tests/test_gp2rs.py

@@ -121,10 +121,7 @@ def _converter_ebeats(converter, numerator, denominator, tempo_changes=None):
 def _assert_ebeats(converter, numerator, denominator, expected_times, tempo_changes=None):
     ebeats = _converter_ebeats(converter, numerator, denominator, tempo_changes)
 
-    # Compare by value, not string: beat times are written at 6-decimal
-    # (microsecond) precision so the derived per-bar tempo matches the authored
-    # GP value, but these tests only care about the spacing, not the format.
-    assert [float(ebeat.get("time")) for ebeat in ebeats] == [float(t) for t in expected_times]
+    assert [ebeat.get("time") for ebeat in ebeats] == expected_times
     assert [ebeat.get("measure") for ebeat in ebeats] == [
         "1",
         *["-1"] * (len(expected_times) - 1),

tests/test_library_providers.py

@@ -50,6 +50,7 @@ class FakeLibraryProvider:
     id = "remote:frodo"
     label = "Frodo's Library"
     kind = "remote"
+    slow = True
     capabilities = ("library.read", "art.read", "song.sync")
 
     def __init__(self):
@@ -170,6 +171,7 @@ def test_registered_provider_handles_library_endpoints(server_mod, client):
     assert remote["label"] == "Frodo's Library"
     assert remote["kind"] == "remote"
     assert remote["default"] is False
+    assert remote["slow"] is True
     assert remote["capabilities"] == ["art.read", "library.read", "song.sync"]
 
     songs = client.get("/api/library", params={

tests/test_settings_api.py

@@ -50,7 +50,7 @@ def client(tmp_path, monkeypatch):
     # Point CONFIG_DIR at a per-test temp path BEFORE server's
     # import-time side effects run. server.py reads CONFIG_DIR from the
     # environment at module load (line 35) and immediately constructs
-    # `meta_db = MetadataDB(CONFIG_DIR)` at module level, which calls
+    # `meta_db = MetadataDB()` at module level, which calls
     # CONFIG_DIR.mkdir(...) and opens a sqlite file — a plain
     # post-import monkeypatch on server.CONFIG_DIR wouldn't catch those
     # side effects, and the real user config dir would get written to.

tests/test_settings_export_library_db.py

@@ -22,11 +22,6 @@ from pathlib import Path
 import pytest
 from fastapi.testclient import TestClient
 
-# The startup DB swap lives with the DB layer it guards, not with server.py.
-# metadata_db reads no environment at import, so a plain module import is safe
-# alongside the env-patched `server_mod` fixture below.
-from metadata_db import _apply_pending_db_restore
-
 
 @pytest.fixture()
 def server_mod(tmp_path, monkeypatch):
@@ -224,7 +219,7 @@ def test_apply_pending_db_restore_swaps_and_clears_sidecars(server_mod, tmp_path
     (tmp_path / "web_library.db-shm").write_bytes(b"OLD-SHM")
     (tmp_path / "web_library.db.restore").write_bytes(new_db)
 
-    _apply_pending_db_restore(tmp_path)
+    server_mod._apply_pending_db_restore(tmp_path)
 
     assert main.read_bytes() == new_db                  # swapped in
     assert not (tmp_path / "web_library.db.restore").exists()
@@ -239,7 +234,7 @@ def test_apply_pending_db_restore_discards_corrupt_keeps_live(server_mod, tmp_pa
     main.write_bytes(b"LIVE-GOOD-DB")
     (tmp_path / "web_library.db.restore").write_bytes(b"SQLite format 3\x00" + b"\xff" * 64)
 
-    _apply_pending_db_restore(tmp_path)
+    server_mod._apply_pending_db_restore(tmp_path)
 
     assert main.read_bytes() == b"LIVE-GOOD-DB"          # live DB preserved
     assert not (tmp_path / "web_library.db.restore").exists()  # bad restore dropped
@@ -247,7 +242,7 @@ def test_apply_pending_db_restore_discards_corrupt_keeps_live(server_mod, tmp_pa
 
 def test_apply_pending_db_restore_noop_without_staging(server_mod, tmp_path):
     (tmp_path / "web_library.db").write_bytes(b"LIVE")
-    _apply_pending_db_restore(tmp_path)        # nothing staged
+    server_mod._apply_pending_db_restore(tmp_path)        # nothing staged
     assert (tmp_path / "web_library.db").read_bytes() == b"LIVE"
 
 
@@ -271,7 +266,7 @@ def test_full_db_backup_restore_round_trip(client, server_mod, tmp_path):
     # Simulate a restart: close the live conn, apply the staged restore,
     # reopen — the song is back.
     server_mod.meta_db.conn.close()
-    _apply_pending_db_restore(tmp_path)
+    server_mod._apply_pending_db_restore(tmp_path)
     conn = sqlite3.connect(str(tmp_path / "web_library.db"))
     try:
         rows = conn.execute(

tests/test_tunings.py

@@ -249,30 +249,3 @@ def test_flat_string_count_patch_resets_incompatible_named_tuning():
     patched = apply_flat_instrument_patch_to_profiles(settings, {"string_count": 7})
     assert patched["string_count"] == 7
     assert patched["tuning"] == "Standard"
-
-
-# ── freqs_to_midis (the /api/tunings tuningMidis inverse) ────────────────────
-
-def test_freqs_to_midis_round_trips_every_builtin_at_440():
-    from tunings import freqs_to_midis
-    for key, presets in TUNING_PRESET_MIDIS.items():
-        for name, midis in presets.items():
-            assert freqs_to_midis(open_midis_to_freqs(midis)) == midis, f"{key}/{name}"
-
-
-def test_freqs_to_midis_round_trips_at_nonstandard_reference():
-    # The consumer footgun this exists to kill: frequencies served at a 432/450
-    # reference must recover the SAME integer midis when inverted at that
-    # reference (client-side log2-at-440 reconstruction drifts here).
-    from tunings import freqs_to_midis
-    for ref in (430.0, 432.0, 444.0, 450.0):
-        for midis in (TUNING_PRESET_MIDIS["guitar-8"]["Standard"], TUNING_PRESET_MIDIS["bass-5"]["Standard"]):
-            freqs = open_midis_to_freqs(midis, ref)
-            assert freqs_to_midis(freqs, ref) == midis, f"ref={ref}"
-
-
-def test_freqs_to_midis_rejects_garbage():
-    from tunings import freqs_to_midis
-    assert freqs_to_midis([82.41, 0]) is None          # non-positive
-    assert freqs_to_midis([82.41, "x"]) is None        # non-numeric
-    assert freqs_to_midis([]) == []                    # vacuously fine