Merge branch 'main' into perf/highway-sustain-glow-no-shadowblur

shadowBlur cost scales with the blurred device-pixel area. The lit-sustain
trail can span half the canvas, the canvas is DPR-scaled (4x pixels on a
2x Mac), and the blur ran on every frame exactly while a sustain is HELD
— i.e. at the moment the player most notices a hitch. Sustain-heavy songs
(e.g. fingerpicked acoustic charts) hit this constantly.

Replace the blur with three inflated low-alpha fills of the same trail
quad: reads as the same soft shimmering glow (the shimmer LUT still
drives per-frame flicker, feedBack#254 intent preserved) at a flat,
area-independent cost. Also drops the now-dead shadowBlur reset in the
crackle pass; no shadowBlur uses remain in highway.js.

Co-Authored-By: Claude Fable 5 <noreply@anthropic.com>

CHANGELOG.md

@@ -7,31 +7,10 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 
 ## [Unreleased]
 
-### Added
-- **Sort and filter the library by your personal difficulty rating — now visible at a glance, not just in the edit drawer.** `song_user_meta.user_difficulty` (the 1–5 planning rating, settable manually or seeded by a plugin like the community `difficulty_tagger`) already existed but was only readable by opening a song's per-song details drawer. The library API gains `sort=difficulty` / `sort=difficulty-desc` — a correlated subquery over `song_user_meta`, following the same unrated-rows-sort-to-the-bottom-in-both-directions pattern as the existing `mastery` sort — and library cards now show the rating as a `◆N` badge (v2 grid/tree views and the v3 grid alike), next to the tuning and lyrics badges. The classic tree view's `query_artists` batch-attaches `user_difficulty` the same way `query_page` already did for the grid, so the badge actually renders there too instead of staying dark. Tests: `tests/test_library_filters.py::test_difficulty_sort_pushes_unrated_to_bottom`, `tests/test_library_filters.py::test_tree_view_songs_carry_user_difficulty`.
-- **`lib/midi_import.py`: `convert_midi_tempo_map` — MIDI imports can finally carry
-  their bars.** The keys/drums note converters always computed a tempo-aware
-  tick→seconds map internally (to bake note times to absolute seconds) and then threw
-  it away — and never read `time_signature` meta at all — so every MIDI import landed
-  with no measures and an implied 4/4 regardless of what the file said. The new helper
-  extracts the whole grid: `tempos` (`{time, bpm}`), `time_signatures` (`{time,
-  ts:[num,den]}`, the song-timeline sidecar shape), and a full `beats` grid on the
-  editor's row shape (numbered downbeats with a `den` hint, `-1` interior beats,
-  eighth-note rows in 6/8 etc.). Event scope mirrors the existing tick map — SMF
-  type 0/1 merge meta across tracks, type 2 reads only the chosen track (independent
-  timelines must never share a grid); mid-bar signature events apply at the next bar
-  boundary; times are computed from absolute ticks through the cumulative tempo table
-  and rounded once at emit, so rounding error never accumulates with song length.
-  Consumed by the editor's upcoming multitrack MIDI import (tempo-seed dialog). Tests:
-  `tests/test_midi_tempo_map.py`.
-
 ### Fixed
-- **Tuner: opening the player screen no longer throws `NotFoundError` and aborts the player render (feedBack#800).** `injectPlayerButton()` anchored the injected Tuner button with `controls.querySelector('button:last-child')`, which — unlike a `:scope`-scoped query — can match a **nested** button that is not a direct child of `#player-controls`. `controls.insertBefore(btn, nestedButton)` then throws `NotFoundError` (the reference node must be a direct child), and because the injection runs from the tuner's `screen:changed` → player handler, the throw propagated out of the player-screen transition and stalled its render (surfaced by a headless render of a notation arrangement; the v3 path was already safe via the plugin-control slot, only the classic path had the bad anchor). The anchor is now `:scope > button:last-of-type` (a direct child only) with a `parentNode === controls` guard before `insertBefore`, falling back to `appendChild`. `plugins/tuner` → 1.3.4. Tests: `tests/plugins/tuner/js/inject_player_button.test.js` (nested-last-button repro, direct-child insert, no-button append, idempotency, v3 slot path).
 - **Auto-sync: DTW step constraint — riff-based songs no longer produce garbage sync points.** `librosa.sequence.dtw`'s default step pattern allows unbounded horizontal/vertical path runs, and on music with long self-similar chroma stretches (riff-driven stoner/doom, drone sections) the flat cost surface let the warping path collapse — minutes of score mapped onto a single audio frame, so the per-bar warp imported charts wildly out of sync while reporting success (observed on a real 138 BPM tab: effective displayed tempo 159 BPM, three sync points sharing one audio timestamp). `_dtw_align` now uses the standard music-sync slope-constrained step pattern (`[[1,1],[1,2],[2,1]]`, local tempo ratio bounded to 0.5x–2x), which makes the degenerate path impossible, with a fallback to unconstrained steps when the global length ratio makes the constrained pattern infeasible (e.g. a tab aligned against a full-concert video). Validated on the failing song: coarse points track the recording 1:1, refined downbeats land on onset peaks at 3.3x background energy.
 
 ### Added
-- **3D Keys Highway: key layout modes, lane-color opacity & octave lines.** A new **Highway layout** settings section rebuilds how sharps/flats and lanes draw on the 3D piano highway. **Sharps & flats layout** (`keys3d_bg_sharpMode`) picks between **floating** (the original raised-sharp look), **flat** (one plane, zero-overlap piano-shaped tiled lanes with the naturals evened out), and **realistic** (one plane, bars sized like the physical keys) — default **realistic**; the geometry lives in pure, unit-tested `laneSpanFlat()`/`laneSpanReal()` helpers. **Lane color opacity** (`keys3d_bg_laneOpacity`, 0–1, default 0) fades the pitch-class lane tint from full vivid color down to a dark floor with guide lines only at the key-block boundaries (E→F and each octave); the lane strips, per-lane separators and block lines crossfade with the value. **Octave separators** (`keys3d_bg_octaveGaps`, default on) and **Octave line contrast** (`keys3d_bg_octaveContrast`, 0–1) control the B→C octave divider, which auto-shifts from a dark to a bright layer as lane opacity fades. Settings re-read on init and apply on the next chart build. `plugins/keys_highway_3d` → 0.2.0. Tests: `plugins/keys_highway_3d/tests/fx_settings.test.js` (new defaults, sharp-mode setting, lane-geometry tiling/evening for flat, uniform/overlap for realistic, and an active-range boundary case where a white key's edge stays untrimmed when its neighboring sharp falls outside the active range).
-- **Unmapped-percussion capture now records velocities alongside times.** Both drum converters' opt-in `out_unmapped` reporting (`lib/midi_import.py` `convert_drum_track_from_midi`, `lib/gp2rs.py` `convert_drum_track_to_drumtab`) gain an index-aligned `velocities` list next to `times`, carrying each dropped note's real dynamics (MIDI velocity verbatim; GP velocity with the same 1–127 gate as mapped hits, falling back to the 100 import default). This lets a hand-mapping UI (the editor's unmapped-notes dialog) restore mapped notes at their source dynamics instead of flattening everything to `v:100`. The GP path's chronological sort now reorders times and velocities in lockstep so multi-voice measures can't silently reassign dynamics. Additive — callers that ignore the new key are unaffected. Tests: `tests/test_midi_import_drums.py`, `tests/test_gp2rs_drums.py`.
 - **Handedness (left-handed) is now a first-class choice in the instrument selector — and surfaced during onboarding.** Left-handed players could already mirror the highway, but only via a buried Settings toggle they had to find *after* setup — so a lefty hit the tour, the tuner and calibration all right-handed first. The v3 instrument badge popover now has a **Handedness: Right / Left** row alongside Instrument / Strings / Tuning (all player-orientation choices), writing the same `lefty` preference (`highway.setLefty` when a live highway exists, else the `lefty` localStorage key it reads on init; the Settings checkbox stays in sync). The first-run tour's "Choose your instrument" step — which runs **before** the tuner/audio-calibration steps — now calls it out so lefties flip it up front. Frontend-only, additive: `static/v3/badges.js`, `static/v3/onboarding-tour.js`. Tests: `tests/js/badges_handedness.test.js`.
 - **"Colorblind (deuteranope)" highway string-color preset.** Adds a one-click preset to the shared "Highway String Colors" picker, sitting next to the existing Okabe–Ito "Colorblind-friendly" preset — contributed by a deuteranopic player who found the Okabe–Ito set still hard to separate. It retunes the six main strings (red / yellow-green / blue / orange / teal / deep-purple) and keeps that set's 7/8-string colors, and applies to **both** the 2D and 3D highways via the shared picker. Frontend-only, additive: `static/app.js` (`HWC_PRESETS`).
 - **`lib/gp_autosync.py`: piecewise time-warp helpers + a working `refine_sync()`.** `auto_sync()` has always computed per-bar sync points (DTW), but consumers could only apply the scalar bar-1 `audio_offset`, so any tempo difference between the recording and the tab's authored tempo accumulated audibly over the song. New librosa-free helpers expose the full mapping: `bar_start_times(gp_path)` (per-bar score times on the same axis as the sync points — GPIF bar-resolution map for `.gp`/`.gpx`, per-tick integration for GP3/4/5), `build_warp_anchors(points, bar_starts)` (strictly-monotonic `(score, audio)` anchor pairs), `warp_time(t, anchors)` (piecewise-linear map with edge-slope extrapolation for count-ins/tails), `warp_song_times(song, warp)` (retimes a `lib.song.Song` in place: notes + sustains, chords, beats, sections, anchors, handshapes, per-phrase difficulty levels, tone changes, tempo overrides), and `gp_has_expandable_repeats(gp_path)` (detects GP3/4/5 repeat/volta/direction markup whose playback expansion the as-written sync points cannot map — callers fall back to offset-only sync). Also implements `refine_sync()`, which the editor plugin's refine-sync endpoint has imported since the snapshot but which never existed in core (the Refine button 500'd): it densifies the coarse DTW points to every Nth bar and re-times each with a local onset phase sweep (sweep radius clamped under half a beat so periodic material can't lock a full beat off; short scoring grid + median residual snap). Synthetic click-track validation: ~13ms mean / ~40ms max error from ±180ms coarse input across 117–123 BPM recordings of a 120 BPM tab. Tests: `tests/test_gp_autosync_warp.py`.

lib/gp2rs.py

@@ -1836,10 +1836,9 @@ def convert_drum_track_to_drumtab(
     drum strings. Unknown percussion sounds (cowbell, tambourine etc.) are
     skipped — round-tripping them would require teaching `lib/drums.py` first.
     Callers can pass an empty dict as ``out_unmapped`` to receive a per-MIDI
-    record of every skipped note (``{midi: {"count": int, "times": [...],
-    "velocities": [...]}}``, times/velocities index-aligned and capped at
-    100 samples per note — velocities carry the source notes' real dynamics)
-    so they can surface a warning or offer a manual mapping UI.
+    record of every skipped note (``{midi: {"count": int, "times": [...]}}``,
+    times capped at 100 samples per note) so they can surface a warning or
+    offer a manual mapping UI.
 
     Honours GP repeat brackets and D.S./D.C./Coda/Fine jumps when
     ``expand_repeats`` is true — same `_build_playback_schedule` machinery
@@ -1895,29 +1894,18 @@ def convert_drum_track_to_drumtab(
                             # NB: do NOT shadow the outer `entry` loop
                             # variable from `for entry in schedule:`.
                             unmapped_rec = out_unmapped.setdefault(
-                                int(midi_note),
-                                {"count": 0, "times": [], "velocities": []})
+                                int(midi_note), {"count": 0, "times": []})
                             unmapped_rec["count"] += 1
                             if len(unmapped_rec["times"]) < 100:
                                 unmapped_rec["times"].append(round(t, 3))
-                                # Index-aligned with times: the note's real
-                                # dynamics (same 1-127 gate as mapped hits,
-                                # falling back to the 100 import default) so
-                                # a hand-mapping UI doesn't flatten them.
-                                _uv = int(getattr(note, "velocity", 0) or 0)
-                                unmapped_rec["velocities"].append(
-                                    _uv if 1 <= _uv <= 127 else 100)
                         continue
 
                     hit: dict = {"t": round(t, 3), "p": piece}
 
-                    # Velocity: GP stores 1-127 MIDI velocity directly. Note
-                    # this is GP's *authoring* default (95, Velocities.default)
-                    # — unrelated to the drumtab render default of 100
-                    # (DEFAULT_VELOCITY, lib/drums.py:179), which only applies
-                    # when `v` is omitted from a hit. Pass the GP value through
-                    # verbatim, clamping defensively so a corrupt file can't
-                    # poison the wire format.
+                    # Velocity: GP stores 1-127 MIDI velocity directly; default
+                    # is 95 (Velocities.default). Pass through verbatim,
+                    # clamping defensively so a corrupt file can't poison the
+                    # wire format.
                     vel = int(getattr(note, "velocity", 0) or 0)
                     if 1 <= vel <= 127:
                         hit["v"] = vel
@@ -1958,21 +1946,9 @@ def convert_drum_track_to_drumtab(
     # Times for unmapped notes were collected in beat-iteration order;
     # multi-voice measures can produce out-of-order beats, so sort each
     # entry's `times` list chronologically before returning to the caller.
-    # Velocities are index-aligned with times, so they must sort in
-    # LOCKSTEP — sorting times alone would silently reassign dynamics.
     if out_unmapped is not None:
         for _rec in out_unmapped.values():
-            _vels = _rec.get("velocities")
-            if _vels and len(_vels) == len(_rec["times"]):
-                _pairs = sorted(zip(_rec["times"], _vels))
-                _rec["times"] = [p[0] for p in _pairs]
-                _rec["velocities"] = [p[1] for p in _pairs]
-            else:
-                # Belt-and-suspenders: times & velocities are always appended
-                # together under the same `len(times) < 100` guard above, so
-                # in practice the lengths can't diverge. Kept as a defensive
-                # fallback, not a real divergence case.
-                _rec["times"].sort()
+            _rec["times"].sort()
 
     return {
         "version": drums_mod.SCHEMA_VERSION,

lib/midi_import.py

@@ -203,13 +203,7 @@ def convert_midi_track_to_keys_wire(
     #     a foreign track's tempo events do NOT apply to the chosen
     #     track. Merging would mis-time the notes — restrict the tempo
     #     scan to the selected track only.
-    # ``ticks_per_beat`` is 0 for a malformed header and NEGATIVE for SMPTE
-    # division (mido returns the signed short as-is). Both feed the two
-    # divisions below (tempo-table build + tick_to_seconds), so guard here:
-    # 0 would raise ZeroDivisionError and a negative value would yield
-    # negative/garbage times. Use ``> 0`` (not ``or``) so the negative SMPTE
-    # case also falls back to the SMF default.
-    ticks_per_beat = midi.ticks_per_beat if midi.ticks_per_beat > 0 else 480
+    ticks_per_beat = midi.ticks_per_beat
     raw_events: list[tuple[int, int]] = [(0, 500000)]  # default 120 BPM
     midi_type = getattr(midi, "type", 1)
     tempo_source = (
@@ -358,14 +352,7 @@ def _build_tick_to_seconds(midi: mido.MidiFile, track_index: int) -> Callable[[i
       - type 1: parallel tracks share the timeline; merge tempo events.
       - type 2: independent timelines; tempo only from the chosen track.
     """
-    # A metrical header carries positive ticks-per-beat. mido reads the SMF
-    # division as a signed short, so an SMPTE-division file surfaces as a
-    # negative value and a malformed header as 0 — both make the two division
-    # sites below divide by a non-positive number (ZeroDivisionError, or
-    # negative seconds that send the bar walk off the rails). Fall back to the
-    # SMF default here, the single place every caller routes ticks through, so
-    # each caller's own fallback is real rather than cosmetic.
-    ticks_per_beat = midi.ticks_per_beat if midi.ticks_per_beat > 0 else 480
+    ticks_per_beat = midi.ticks_per_beat
     raw_events: list[tuple[int, int]] = [(0, 500000)]  # default 120 BPM
     midi_type = getattr(midi, "type", 1)
     tempo_source = (
@@ -406,141 +393,6 @@ def _build_tick_to_seconds(midi: mido.MidiFile, track_index: int) -> Callable[[i
     return tick_to_seconds
 
 
-# Safety valve for the bar walk below: a malformed SMF (absurd tempo + long
-# trailing meta) could otherwise imply millions of bars. Real charts sit
-# orders of magnitude below this.
-_TEMPO_MAP_MAX_BARS = 20000
-
-
-def convert_midi_tempo_map(midi_path: str, track_index: int = 0) -> dict:
-    """Extract the song-timeline grid a `.mid` file carries: tempos, time
-    signatures, and a full beat grid — the data the note converters here
-    always computed internally (to bake note times) and then threw away,
-    which left every MIDI import with no bars, no measures, and an implied
-    4/4 no matter what the file said.
-
-    Returns ``{"tempos": [...], "time_signatures": [...], "beats": [...]}``:
-
-    - ``tempos``: ``{time, bpm}`` per tempo event (deduped per tick).
-    - ``time_signatures``: ``{time, ts: [num, den]}`` per signature event —
-      the song-timeline sidecar shape (feedpak-spec §7.4).
-    - ``beats``: one row per beat on the editor grid shape — downbeats carry
-      a running ``measure`` (1, 2, 3, …) plus a ``den`` hint (the signature
-      denominator), interior beats carry ``measure: -1``. The beat unit
-      follows the active signature (6/8 ⇒ six eighth-note rows per bar).
-
-    Event scope mirrors ``_build_tick_to_seconds``: SMF type 0/1 merge meta
-    from all tracks (shared timeline); type 2 reads ONLY ``track_index``
-    (independent timelines — callers must never share one grid across
-    type-2 tracks). Signature changes apply at the NEXT bar boundary when a
-    file places one mid-bar (ill-formed but seen in the wild). All times
-    are computed from absolute ticks through the cumulative tempo table and
-    rounded once at emit — rounding error never accumulates with song
-    length. An SMF with no note events yields empty ``beats``.
-    """
-    midi = mido.MidiFile(midi_path)
-    # Positive for metrical files; 0 (malformed) or negative (SMPTE division,
-    # read as a signed short) otherwise — fall back so beat_ticks below stays
-    # sane, mirroring the guard inside _build_tick_to_seconds.
-    ticks_per_beat = midi.ticks_per_beat if midi.ticks_per_beat > 0 else 480
-    midi_type = getattr(midi, "type", 1)
-    # Same scope both converters use: type 2 reads only the chosen track
-    # (independent timelines); type 0/1 merge all tracks (shared timeline).
-    source_tracks = (
-        [midi.tracks[track_index]] if midi_type == 2 else midi.tracks
-    )
-    tick_to_seconds = _build_tick_to_seconds(midi, track_index)
-
-    # ── collect meta + the end of musical content in one pass ────────────
-    sig_events: list[tuple[int, int, int]] = []
-    tempo_events: list[tuple[int, int]] = []
-    end_tick = 0
-    for tr in source_tracks:
-        abs_tick = 0
-        for msg in tr:
-            abs_tick += msg.time
-            if msg.type == "time_signature":
-                num = int(getattr(msg, "numerator", 4) or 4)
-                den = int(getattr(msg, "denominator", 4) or 4)
-                if num > 0 and den > 0:
-                    sig_events.append((abs_tick, num, den))
-            elif msg.type == "set_tempo":
-                tempo_events.append((abs_tick, int(msg.tempo)))
-            elif msg.type in ("note_on", "note_off"):
-                end_tick = max(end_tick, abs_tick)
-
-    # Dedupe at equal ticks (last wins), matching the tempo-table rule.
-    sig_events.sort(key=lambda e: e[0])
-    sigs: list[tuple[int, int, int]] = []
-    for ev in sig_events:
-        if sigs and sigs[-1][0] == ev[0]:
-            sigs[-1] = ev
-        else:
-            sigs.append(ev)
-    if not sigs or sigs[0][0] > 0:
-        sigs.insert(0, (0, 4, 4))
-
-    tempo_events.sort(key=lambda e: e[0])
-    seen_tempo_ticks: dict[int, int] = {}
-    for ev_tick, ev_tempo in tempo_events:
-        seen_tempo_ticks[ev_tick] = ev_tempo
-    sorted_tempo_ticks = sorted(seen_tempo_ticks)
-    tempos_out: list[dict] = []
-    # Seed the MIDI default (120 BPM) at time 0 when the first tempo event
-    # lands after the start (or there are none). The beat grid already runs
-    # at 120 for the head of the song, so the sidecar must say so too —
-    # symmetric with the (0, 4, 4) default seeded into the signatures above.
-    if not sorted_tempo_ticks or sorted_tempo_ticks[0] > 0:
-        tempos_out.append({"time": 0.0, "bpm": 120.0})
-    for ev_tick in sorted_tempo_ticks:
-        tempos_out.append({
-            "time": round(tick_to_seconds(ev_tick), 3),
-            "bpm": round(60_000_000.0 / seen_tempo_ticks[ev_tick], 3),
-        })
-
-    time_signatures_out = [
-        {"time": round(tick_to_seconds(t), 3), "ts": [num, den]}
-        for t, num, den in sigs
-    ]
-
-    # ── walk bars from tick 0 to the end of the notes ────────────────────
-    beats: list[dict] = []
-    if end_tick > 0:
-        cur_tick = 0.0
-        measure = 1
-        sig_idx = 0
-        while cur_tick < end_tick and measure <= _TEMPO_MAP_MAX_BARS:
-            # Active signature: the latest event at or before this bar's
-            # start. Mid-bar events wait for the next boundary by
-            # construction (we only re-read between bars).
-            while (sig_idx + 1 < len(sigs)
-                    and sigs[sig_idx + 1][0] <= cur_tick + 1e-6):
-                sig_idx += 1
-            _, num, den = sigs[sig_idx]
-            beat_ticks = ticks_per_beat * 4.0 / den
-            beats.append({
-                "time": round(tick_to_seconds(int(round(cur_tick))), 3),
-                "measure": measure,
-                "den": den,
-            })
-            for k in range(1, num):
-                sub_tick = cur_tick + k * beat_ticks
-                if sub_tick >= end_tick:
-                    break
-                beats.append({
-                    "time": round(tick_to_seconds(int(round(sub_tick))), 3),
-                    "measure": -1,
-                })
-            cur_tick += num * beat_ticks
-            measure += 1
-
-    return {
-        "tempos": tempos_out,
-        "time_signatures": time_signatures_out,
-        "beats": beats,
-    }
-
-
 # ── Drum track listing (channel-9 only) ──────────────────────────────────────
 
 # Velocity below this is treated as a ghost note. GM doesn't have an explicit
@@ -634,12 +486,10 @@ def convert_drum_track_from_midi(
 
     Callers can pass an empty dict as ``out_unmapped`` to receive a
     per-MIDI record of every channel-9 note_on that didn't resolve to a
-    piece-id (``{midi: {"count": int, "times": [float, ...],
-    "velocities": [int, ...]}}``, times/velocities index-aligned and
-    capped at 100 samples per note — velocities carry the source notes'
-    real dynamics so a hand-mapping UI doesn't have to flatten them to a
-    default). The default path skips this capture entirely so MIDIs
-    heavy with cowbell/tambourine/etc. take no extra work.
+    piece-id (``{midi: {"count": int, "times": [float, ...]}}``, times
+    capped at 100 samples per note). The default path skips this
+    capture entirely so MIDIs heavy with cowbell/tambourine/etc. take
+    no extra work.
     """
     offset = float(audio_offset)
     if not math.isfinite(offset):
@@ -677,13 +527,10 @@ def convert_drum_track_from_midi(
                     continue
                 t = tick_to_seconds(abs_tick) + offset
                 entry = out_unmapped.setdefault(
-                    midi_note, {"count": 0, "times": [], "velocities": []})
+                    midi_note, {"count": 0, "times": []})
                 entry["count"] += 1
                 if len(entry["times"]) < 100:
                     entry["times"].append(round(t, 3))
-                    # Index-aligned with times: the note's real dynamics,
-                    # so hand-mapping doesn't flatten everything to 100.
-                    entry["velocities"].append(int(msg.velocity))
                 continue
             # Mapped note: compute t once for the raw entry.
             t = tick_to_seconds(abs_tick) + offset

lib/sloppak.py

@@ -703,32 +703,20 @@ def load_song(
                     and isinstance(e.get("d"), (int, float))
                 ]
                 if song.lyrics:
-                    # Provenance. The feedpak spec (§7.1) vocabulary is
-                    # {authored, transcribed, user}; older manifests + the
-                    # in-tree readers also use the source-format names
-                    # (xml/notechart) and the WhisperX engine name
-                    # (whisperx). Accept the union so both spec-compliant
-                    # writers (e.g. the stem_splitter plugin emitting
-                    # `transcribed`) and legacy packs validate. Validate
-                    # against the closed enum so a hand-edited (or otherwise
-                    # malformed) manifest can't propagate a YAML dict / list /
-                    # arbitrary string into the highway WS `lyrics.source`
-                    # field and out to plugin badges. Anything outside the
-                    # enum (or the wrong type) falls back to "xml" — the
-                    # back-compat default — instead of being stringified and
-                    # trusted.
-                    # Post-alias values only: `whisperx` is normalised to
-                    # `transcribed` before the membership check below, so (like
-                    # `sng`) it is intentionally absent from this set.
-                    _ALLOWED_LYRICS_SOURCES = {
-                        "xml", "notechart", "user",
-                        "authored", "transcribed",
-                    }
-                    # Legacy aliases: older manifests labelled note-chart-derived
-                    # lyrics with the source format's name, and the WhisperX
-                    # fallback with the engine name — normalise both to the
-                    # spec vocabulary the badges now expect.
-                    _LYRICS_SOURCE_ALIASES = {"sng": "notechart", "whisperx": "transcribed"}
+                    # Provenance — populated by the converter (xml/notechart),
+                    # the WhisperX fallback (whisperx), or hand-edits
+                    # (user). Validate against the closed enum so a
+                    # hand-edited (or otherwise malformed) manifest can't
+                    # propagate a YAML dict / list / arbitrary string
+                    # into the highway WS `lyrics.source` field and out
+                    # to plugin badges. Anything outside the enum (or
+                    # the wrong type) falls back to "xml" — the spec's
+                    # back-compat default — instead of being stringified
+                    # and trusted.
+                    _ALLOWED_LYRICS_SOURCES = {"xml", "notechart", "whisperx", "user"}
+                    # Legacy alias: older manifests labelled note-chart-derived
+                    # lyrics with the source format's name; normalise it.
+                    _LYRICS_SOURCE_ALIASES = {"sng": "notechart"}
                     raw_source = manifest.get("lyrics_source")
                     if isinstance(raw_source, str):
                         raw_source = _LYRICS_SOURCE_ALIASES.get(raw_source, raw_source)

plugins/keys_highway_3d/README.md

@@ -3,34 +3,12 @@
 RS+-style falling-note 3D piano highway for [Slopsmith](https://github.com/got-feedback/feedback), fed by the **Sloppak Notation Format** (sloppak-spec §5.3) — part of the piano/keys first-class epic (slopsmith#828, plugin workstream slopsmith#824).
 
 - Consumes the `notation_info` / `notation_measures` highway-WS stream over a private per-instance socket and flattens measure → staff → voice → beat → note into `{midi, t, durSec, hand}` (durations derived from written `dur`/`dot`/`tu` at the running tempo; ties extend; overlap-clamped).
-- 3D perspective highway to a vanishing point with a real white/black-key keyboard; per-key **pitch-class colors** (Synthesia convention — C red, D yellow, E blue, …) with hand (rh/lh) as a secondary brightness cue. Selectable **note-color palettes** (settings → Note colors, `keys3d_bg_palette`, default the per-octave scheme): a per-octave rainbow (each octave its own hue, darker sharps), the original per-pitch "Rainbow" table, vivid/pastel per-pitch variants, and single-hue two-tone palettes (uniform naturals, darker sharps) for players who want "black key coming" to read at a glance; notes, key glow, lane guides and hit flames all follow the pick live.
+- 3D perspective highway to a vanishing point with a real white/black-key keyboard; per-key **pitch-class colours** (Synthesia convention — C red, D yellow, E blue, …) with hand (rh/lh) as a secondary brightness cue.
 - Full RS+ visual treatment: key **letter glyphs** printed on the active-range key tops (cached CanvasTextures), **bevelled gem-style note blocks** (ExtrudeGeometry, geometry/material caches keyed by size and pitch-class×hand), **floating bar numbers** scrolling with the notes, **active-range lane dimming** so the playable span pops, and a **glowing pulsing hit-line** (layered additive gradient planes — no postprocessing).
 - Performance discipline: no per-frame allocations or DOM queries in `draw()`. Chart-scoped resources — note geometries/materials, bar-number and glow textures — are cached and disposed on chart teardown; the key-letter glyph `CanvasTexture`s live in a shared module-level cache that survives teardown and is reused across instances.
 - Auto-selected for arrangements with notation via `matchesArrangement(songInfo.has_notation)`; capability-native `visualization` provider declaration.
-- **Camera settings**: camera-rig presets (`keys3d_bg_camera` — classic low rig / elevated / overhead; default overhead, applied live, adaptive pan-zoom preserved) with base-rig fine-tune sliders for height, distance and tilt (`keys3d_bg_camHeight` / `camDist` / `camTilt`) that nudge the vantage point the follow-motion orbits. Numeric FX keys clamp to per-key declared ranges (`FX_RANGES`, default 0–1).
-- **Highway-layout options** (settings → Highway layout). **Sharps & flats**
-  (`keys3d_bg_sharpMode`, string; default `realistic`) picks the sharp layout:
-  `floating` (original raised-plane sharps, white-only lanes); `flat` (one plane,
-  zero-overlap piano-shaped tiled lanes — white lanes trimmed where a sharp adjoins
-  them, and each sharp leaned toward the edge natural beside it so the naturals come
-  out close to even: C/D/E/F/B equal, G/A a hair smaller since G# can't lean; pure
-  `laneSpanFlat()`); `realistic` (one plane, bars sized like the physical keys — full
-  naturals always rendered full, full black keys drawn on top and only occluding a
-  natural where a sharp note actually coincides in time; pure `laneSpanReal()`).
-  **Lane color opacity** (`keys3d_bg_laneOpacity`, 0–1, default 0) fades the
-  pitch-class lane tint; at 0 (default) the strips are a dark floor with guide lines
-  only at the key-block boundaries (E→F and each octave B→C), so each block is bounded
-  rather than every lane — the notes keep their colors; toward 1 it fills in full,
-  vivid colored lanes. The strips, per-lane separators and block lines crossfade with
-  this value. **Octave separators** (`keys3d_bg_octaveGaps`, default on) widens the
-  gap a touch at each B→C octave boundary. **Octave line contrast**
-  (`keys3d_bg_octaveContrast`, 0–1, default 0.5) scales how hard the B→C octave line
-  reads; it is drawn as a dark layer (scaled by lane opacity) plus a bright layer
-  (scaled by its inverse), so it auto-shifts dark→bright as the lanes fade — no mode
-  switch needed. All are geometry-time — applied on the next chart build via
-  `init()`'s re-read.
 - **Web MIDI input scoring**: module-level MIDI singleton (one access per tab, focused-instance routing) with device auto-connect by saved id+name, loopback blocklist, channel filter, transpose and CC64 sustain (`keys3d_` localStorage prefix; `window.keysH3d*` settings API). Hit detection matches played MIDI against the flattened chart notes within ±0.10 s with per-note dedupe and a missed-note sweep (only while a device is connected — never retroactive across a mid-song connect).
-- **Live hit feedback on the MIDI path** (not the chart): key depress (~4° back-edge pivot, ~120 ms spring; the key letter rides along), wrong-note red key flash, and a vertical flame flare on hits (pooled additive sprites, white-hot base fading into the pitch-class color, ~400 ms).
+- **Live hit feedback on the MIDI path** (not the chart): key depress (~4° back-edge pivot, ~120 ms spring; the key letter rides along), wrong-note red key flash, and a vertical flame flare on hits (pooled additive sprites, white-hot base fading into the pitch-class colour, ~400 ms).
 - **End-of-run stats**: POSTs `/api/stats` `{filename, arrangement, score, accuracy}` exactly once per run with the same formula as the guitar notedetect path (`accuracy = hits / max(1, hits+misses)`, `score = round(hits·100·accuracy)`), then notifies the progression core when present.
 - **Capability wiring** (all guarded for servers without the hosts): registers as a note-detection `midi` provider (`keys-midi`, `verify.target`), opens a per-song binding scoped to the chart's keys range, reports hit/miss observability events, and exposes Web MIDI inputs to the audio-input domain with pseudonymized labels (`midi-input-1`, …) via `source.enumerate/describe/open/close`.
 - Headless test hook: `window.__keysHwTest = { injectNoteOn(midi, when), getScore() }`.

plugins/keys_highway_3d/plugin.json

@@ -1,7 +1,7 @@
 {
   "id": "keys_highway_3d",
   "name": "Keys Highway 3D",
-  "version": "0.2.0",
+  "version": "0.1.1",
   "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

@@ -9,7 +9,7 @@
 //
 // Visual contract is the frame analysis on slopsmith#824 (RS+ reference):
 // 3D perspective highway to a vanishing point, notes landing on a real 3D
-// keyboard, per-key Synthesia-style PITCH-CLASS colors (hand is only a
+// keyboard, per-key Synthesia-style PITCH-CLASS colours (hand is only a
 // secondary brightness cue), active-range key highlighting with letters,
 // a glowing hit-line, bevelled cuboid notes sized by durSec, floating bar
 // numbers, and key-depress + flame feedback driven by the LIVE MIDI input
@@ -59,7 +59,7 @@
     // World scroll speed (units / second) — matches the sibling highways.
     const TS = 130 * K;
 
-    // Per-pitch-class colors (Synthesia convention observed in the RS+
+    // Per-pitch-class colours (Synthesia convention observed in the RS+
     // reference frames: C=red, D=yellow, E=blue, F=light blue-grey, …).
     // Index = midi % 12 (C, C#, D, …, B). Sharps take a dimmed blend of
     // their neighbours so black-key notes stay distinguishable.
@@ -79,196 +79,10 @@
     ];
 
     // Hand cue is SECONDARY (slopsmith#824 design call): right hand renders
-    // at full brightness, left hand slightly darkened — color stays the
+    // at full brightness, left hand slightly darkened — colour stays the
     // pitch class.
     const HAND_BRIGHTNESS = { rh: 1.0, lh: 0.72 };
 
-    // Selectable note-color palettes. Index = midi % 12, same contract as
-    // PITCH_CLASS_COLORS — which stays byte-identical as the 'classic'
-    // entry, so anyone who never touches the setting sees the stock look.
-    // Two palette families:
-    //   per-pitch  — every pitch class gets its own hue (classic/vivid/pastel)
-    //   two-tone   — naturals share one hue, sharps a darker shade of it, so
-    //                a dark gem always telegraphs "black key coming"
-    //                (emerald/ice)
-    const NOTE_PALETTES = {
-        classic: PITCH_CLASS_COLORS,
-        emerald: [
-            0x3fe25f, // C  — bright green (naturals)
-            0x17863a, // C# — dark green (sharps)
-            0x3fe25f, // D
-            0x17863a, // D#
-            0x3fe25f, // E
-            0x3fe25f, // F
-            0x17863a, // F#
-            0x3fe25f, // G
-            0x17863a, // G#
-            0x3fe25f, // A
-            0x17863a, // A#
-            0x3fe25f, // B
-        ],
-        vivid: [
-            0xff2020, // C
-            0xd45a10, // C#
-            0xffe000, // D
-            0xb8c010, // D#
-            0x1e6aff, // E
-            0x9fd0e8, // F
-            0x2fae7e, // F#
-            0x20e050, // G
-            0xa89a20, // G#
-            0xff8a00, // A
-            0xd05888, // A#
-            0xd040ff, // B
-        ],
-        pastel: [
-            0xff9a9a, // C
-            0xd0a078, // C#
-            0xffe9a0, // D
-            0xcfd08a, // D#
-            0x9ec0ff, // E
-            0xc8dde8, // F
-            0x9ecfba, // F#
-            0x9fe8b0, // G
-            0xcfc79a, // G#
-            0xffc890, // A
-            0xd8a8ba, // A#
-            0xe0b0ff, // B
-        ],
-        ice: [
-            0x58c8ff, // C  — bright ice blue (naturals)
-            0x2a6a9a, // C# — deep blue (sharps)
-            0x58c8ff, // D
-            0x2a6a9a, // D#
-            0x58c8ff, // E
-            0x58c8ff, // F
-            0x2a6a9a, // F#
-            0x58c8ff, // G
-            0x2a6a9a, // G#
-            0x58c8ff, // A
-            0x2a6a9a, // A#
-            0x58c8ff, // B
-        ],
-    };
-
-    // Octave-based color scheme ('octaves'): every octave gets a distinct
-    // hue that steps like a rainbow (clear, uniform sections — NOT a smooth
-    // blend — so each octave is uniquely identifiable, but neighbouring
-    // octaves stay close so the change isn't jarring). Loops if a song runs
-    // past the table. Within an octave, sharps/flats take a darker shade of
-    // the same hue — the same two-tone idea as 'emerald'. Octave index =
-    // floor(midi/12) - 1 (so C1..B1 = octave 1). The three keys below C1
-    // (A0/A#0/B0 = octave 0) and anything lower get a distinct cool slate so
-    // the very bottom of the board reads apart from the red start.
-    const OCTAVE_HUES = [
-        0xe23a3a, // oct 1 (C1–B1)  red
-        0xe2803a, // oct 2          orange
-        0xe0c73a, // oct 3          yellow
-        0x5fc23a, // oct 4          green
-        0x3ac2a0, // oct 5          teal
-        0x3a86e2, // oct 6          blue
-        0x6a4ae2, // oct 7          indigo
-        0xc23ae2, // oct 8 (C8)     magenta
-    ];
-    const OCTAVE_SUBC1_HUE = 0x8090a0;  // A0/A#0/B0 and below — cool slate
-    const OCTAVE_SHARP_DARKEN = 0.5;    // sharps render at 50% of the octave hue
-    function _darkenHex(hex, f) {
-        const r = Math.round(((hex >> 16) & 0xff) * f);
-        const g = Math.round(((hex >> 8) & 0xff) * f);
-        const b = Math.round((hex & 0xff) * f);
-        return (r << 16) | (g << 8) | b;
-    }
-    function _isBlackPc(midi) {
-        return [1, 3, 6, 8, 10].indexOf(((midi % 12) + 12) % 12) !== -1;
-    }
-    // Which way a sharp leans to even out the naturals: toward the EDGE
-    // natural next to it. +1 = up (toward the higher natural), −1 = down, 0 =
-    // centred. C#/F# sit below an inner natural so they lean down to C/F;
-    // D#/A# lean up to E/B; G# has an inner natural on both sides, so it can't
-    // lean and stays put.
-    function _sharpLeanDir(pc) {
-        if (pc === 1 || pc === 6) return -1;   // C#, F#
-        if (pc === 3 || pc === 10) return 1;   // D#, A#
-        return 0;                              // G#
-    }
-    // Floor span [left,right] of a key's lane in the FLAT (piano-shaped)
-    // layout, in world units, given the key's centre x (`cx`). Pure/isolated
-    // on purpose — this ONE function defines the layout, so a variant is a
-    // one-function swap. Zero-overlap tiling: a white lane is trimmed by
-    // `sharpHalf` wherever it meets a sharp, and the sharp fills that gap. Each
-    // sharp is nudged `shift` toward the edge natural beside it (see
-    // _sharpLeanDir), which steals a sliver from that edge natural and widens
-    // the squeezed inner natural — at shift = sharpHalf/3 the C-D-E-F-B
-    // naturals come out equal. Lanes still tile edge-to-edge (no overlap, no
-    // gap). With `gaps`, each B→C octave boundary opens an extra `octGap`
-    // divider by shaving half of it off the B and the C (naturals only).
-    // `range`, when given, gates the trim to a neighbouring sharp that is
-    // itself inside `range.activeLow..range.activeHigh`. A white key at the
-    // active-range boundary (see the `midi < range.activeLow ||
-    // midi > range.activeHigh` skip around the lane-strip loop) may sit next
-    // to a sharp pitch-class that falls just outside the active range — that
-    // sharp's lane is never drawn, so trimming the white key's edge for it
-    // leaves a dark, unfilled sliver. Gating on range keeps that edge full
-    // while leaving the normal (fully in-range) zero-overlap tiling intact.
-    // Callers that don't pass `range` (e.g. the unit tests exercising raw
-    // tiling geometry) keep the unconditional trim.
-    function laneSpanFlat(midi, black, cx, dims, gaps, range) {
-        const { whiteW, sharpHalf, shift, octGap } = dims;
-        if (black) {
-            const c = cx + _sharpLeanDir(((midi % 12) + 12) % 12) * shift;
-            return { left: c - sharpHalf, right: c + sharpHalf };
-        }
-        const neighborActive = (m) => !range || (m >= range.activeLow && m <= range.activeHigh);
-        // White: each side that meets a sharp is trimmed to that (leaned) sharp's
-        // near edge; a side that meets another white keeps the half-slot edge.
-        let left = cx - whiteW / 2;
-        let right = cx + whiteW / 2;
-        if (_isBlackPc(midi - 1) && neighborActive(midi - 1)) {
-            const bc = (cx - whiteW / 2) + _sharpLeanDir(((midi - 1) % 12 + 12) % 12) * shift;
-            left = bc + sharpHalf;
-        }
-        if (_isBlackPc(midi + 1) && neighborActive(midi + 1)) {
-            const bc = (cx + whiteW / 2) + _sharpLeanDir(((midi + 1) % 12 + 12) % 12) * shift;
-            right = bc - sharpHalf;
-        }
-        const pc = ((midi % 12) + 12) % 12;
-        if (gaps) {
-            if (pc === 11) right -= octGap / 2; // B: gap on its right (→ C)
-            if (pc === 0) left += octGap / 2;   // C: gap on its left (← B)
-        }
-        return { left, right };
-    }
-    // 'realistic' layout span: every bar sized to the physical key it lands on.
-    // Naturals are the same full width (2·natHalf) centred on the key; sharps are
-    // the full black-key width (2·sharpHalf) at their standard half-slot, which
-    // makes them overlap — the caller draws sharps on top. A natural therefore
-    // always renders full and is only covered where a sharp note actually
-    // coincides in time. `gaps` widens the B→C divider (naturals only).
-    function laneSpanReal(midi, black, cx, dims, gaps) {
-        const half = black ? dims.sharpHalf : dims.natHalf;
-        let left = cx - half, right = cx + half;
-        if (gaps && !black) {
-            const pc = ((midi % 12) + 12) % 12;
-            if (pc === 11) right -= dims.octGap / 2;
-            if (pc === 0) left += dims.octGap / 2;
-        }
-        return { left, right };
-    }
-    // Color (24-bit int) for a midi note under the octave scheme: hue by
-    // octave, darker for sharps. Pure (no THREE) so it is unit-testable.
-    function octaveNoteColor(midi) {
-        const oct = Math.floor(midi / 12) - 1;      // C1..B1 => 1
-        let hex = (oct <= 0)
-            ? OCTAVE_SUBC1_HUE
-            : OCTAVE_HUES[(oct - 1) % OCTAVE_HUES.length];
-        if (_isBlackPc(midi)) hex = _darkenHex(hex, OCTAVE_SHARP_DARKEN);
-        return hex;
-    }
-    // Every valid palette id: the 12-entry pitch-class tables PLUS the
-    // procedural 'octaves' scheme (which is not a 12-array, so it lives
-    // outside NOTE_PALETTES and is validated through this list).
-    const PALETTE_IDS = [...Object.keys(NOTE_PALETTES), 'octaves'];
-
     // Note block cross-section height and bevel (world units). The bevel
     // turns the flat slabs into glossy gem-like blocks that catch the light
     // on their edges — the RS+ reference look.
@@ -283,8 +97,8 @@
     // Gem vertical gradient (bottom shade → top highlight), baked per-vertex into
     // the note geometry so a block reads as a lit 3D gem instead of a flat fill —
     // same approach as the bundled guitar highway_3d (`gNoteGrad`). The ramp is
-    // greyscale so one geometry serves every pitch-class color; the material
-    // multiplies its color by it via vertexColors.
+    // greyscale so one geometry serves every pitch-class colour; the material
+    // multiplies its colour by it via vertexColors.
     const GEM_SHADE_BOT = 0.12, GEM_SHADE_TOP = 1.1; // strong gem gradient (top slightly blows toward a highlight)
 
     const NOTE_NAMES = ['C', 'C#', 'D', 'D#', 'E', 'F', 'F#', 'G', 'G#', 'A', 'A#', 'B'];
@@ -1099,35 +913,7 @@
         scoreFx: true,    // 2D overlay: +N pops, combo rings, streak-break wash
         bgIntensity: 0.5, // background-ambience density/strength
         bgReactive: true, // background reacts to the audio analyser
-        // Highway-layout options (apply on the next chart build via init()'s
-        // fx re-read). The sharp LAYOUT is a separate string setting
-        // (keys3d_bg_sharpMode); these two are the booleans.
-        octaveGaps: true,      // ON: wider divider gap at each B→C octave boundary
-        laneOpacity: 0.0,      // 0–1: lane-color strength. 0 (default) = dark floor +
-        //                        block guide lines (E→F, B→C); 1 = full colored lanes; crossfades.
-        octaveContrast: 0.5,   // 0–1: how strongly the B→C octave line stands out. It
-        //                        auto-darkens with lane opacity and brightens as it fades.
-        // Camera base-rig fine-tune. These shift the BASE vantage point the
-        // auto-pan/zoom follow-motion is built on (they multiply/offset the
-        // active CAM_PRESET before the per-frame pan + dolly), so the camera
-        // still tracks the notes — just from a nudged height/distance/tilt.
-        camHeight: 1.0,   // ×preset camera height (higher = more overhead)
-        camDist: 1.0,     // ×preset camera distance (larger = further back)
-        camTilt: 0.0,     // aim offset up(+)/down(−); 0 = neutral — the tuned overhead aim lives in CAM_PRESETS.overhead, so this fine-tune only nudges from a preset (and Classic + tilt 0 == the historical rig)
     };
-    // Numeric FX keys clamp to a declared [min, max]; keys absent from this
-    // table keep the historical 0–1 slider range. The camera fine-tune knobs
-    // are multipliers/offsets centred on 1 (or 0), so they need headroom and a
-    // floor a 0–1 range couldn't express.
-    const FX_RANGES = {
-        camHeight: [0.4, 2.2],
-        camDist: [0.4, 2.2],
-        camTilt: [-1.0, 1.0],
-    };
-    function _fxClamp(key, n) {
-        const r = FX_RANGES[key] || [0, 1];
-        return Math.min(r[1], Math.max(r[0], n));
-    }
     const FX_LS_PREFIX = 'keys3d_bg_';
     // Theme id lives OUTSIDE FX_DEFAULTS (string, not bool/number) — its own
     // localStorage key + validation against BG_THEMES.
@@ -1304,88 +1090,6 @@
         } catch (_) { /* dispatch unavailable — persisted value applies next init */ }
     };
 
-    // Note-color palette id — string-valued like the theme, so it gets its
-    // own validated key + setter rather than an FX_DEFAULTS slot.
-    const FX_LS_PALETTE = 'keys3d_bg_palette';
-    function readPaletteSetting() {
-        try {
-            const id = localStorage.getItem(FX_LS_PALETTE);
-            if (id && PALETTE_IDS.indexOf(id) !== -1) return id;
-        } catch (_) {}
-        // Default: the octave scheme (each octave its own color, darker
-        // sharps) — the plug-and-play piano look. Emerald/classic/etc. remain
-        // selectable.
-        return 'octaves';
-    }
-    window.keys3dSetPalette = function (id) {
-        if (PALETTE_IDS.indexOf(id) === -1) return;
-        try { localStorage.setItem(FX_LS_PALETTE, id); } catch (_) {}
-        try {
-            window.dispatchEvent(new CustomEvent('keys3d:settings', { detail: { palette: id } }));
-        } catch (_) { /* dispatch unavailable — persisted value applies next init */ }
-    };
-
-    // Sharp-display layout id — string-valued (3-way), its own validated key +
-    // setter. 'floating' = the original raised-plane sharps with white-only
-    // lanes; 'flat' = every note on one plane with piano-shaped tiled lanes
-    // (sharps leaned to even the naturals); 'realistic'
-    // = one plane with note bars sized like the physical keys (full naturals,
-    // full sharps overlapping on top). Geometry-time — applied on the next chart
-    // build via init()'s re-read.
-    const FX_LS_SHARPMODE = 'keys3d_bg_sharpMode';
-    const SHARP_MODES = ['floating', 'flat', 'realistic'];
-    function readSharpModeSetting() {
-        try {
-            const id = localStorage.getItem(FX_LS_SHARPMODE);
-            if (id && SHARP_MODES.indexOf(id) !== -1) return id;
-        } catch (_) {}
-        return 'realistic'; // default layout: physical-key-sized bars on one plane
-    }
-    window.keys3dSetSharpMode = function (id) {
-        if (SHARP_MODES.indexOf(id) === -1) return;
-        try { localStorage.setItem(FX_LS_SHARPMODE, id); } catch (_) {}
-        try {
-            window.dispatchEvent(new CustomEvent('keys3d:settings', { detail: { sharpMode: id } }));
-        } catch (_) { /* dispatch unavailable — persisted value applies next init */ }
-    };
-
-    // Camera-rig presets. 'classic' is the original low, near-telephoto rig
-    // (numerically identical to the historical constants, so 'classic' with the
-    // neutral camTilt default reproduces the exact stock framing). y/z/lookY/lookZ
-    // are in pre-K world units — the instance multiplies by K at the use sites,
-    // same as the old constants did. Zoom scales position AND look-at every
-    // frame, so all presets inherit the adaptive dolly behaviour unchanged.
-    // Each preset carries its OWN tuned aim in lookY: 'overhead' bakes in the
-    // plug-and-play downward tilt (the −0.6 × CAM_TILT_UNITS = −33 that used to
-    // ship as the camTilt default) so the default look is unchanged while
-    // camTilt now defaults to 0 (a neutral nudge from whatever preset is picked).
-    const CAM_PRESETS = {
-        classic:  { fov: 40, y: 46,  z: 112, lookY: 8,   lookZ: -165 },
-        elevated: { fov: 44, y: 78,  z: 118, lookY: 4,   lookZ: -150 },
-        overhead: { fov: 48, y: 118, z: 74,  lookY: -33, lookZ: -115 },
-    };
-    // Camera preset id — string-valued like the theme, so it gets its own
-    // validated key + setter rather than an FX_DEFAULTS slot.
-    const FX_LS_CAMERA = 'keys3d_bg_camera';
-    function readCameraSetting() {
-        try {
-            const id = localStorage.getItem(FX_LS_CAMERA);
-            if (id && CAM_PRESETS[id]) return id;
-        } catch (_) {}
-        // Default: the overhead reading rig — its lookY already carries the
-        // tuned downward aim, so with the neutral camTilt default it gives the
-        // plug-and-play piano view out of the box. Others selectable ('classic'
-        // + neutral tilt = the exact historical rig).
-        return 'overhead';
-    }
-    window.keys3dSetCamera = function (id) {
-        if (!CAM_PRESETS[id]) return;
-        try { localStorage.setItem(FX_LS_CAMERA, id); } catch (_) {}
-        try {
-            window.dispatchEvent(new CustomEvent('keys3d:settings', { detail: { camera: id } }));
-        } catch (_) { /* dispatch unavailable — persisted value applies next init */ }
-    };
-
     function readFxSettings() {
         const fx = Object.assign({}, FX_DEFAULTS);
         try {
@@ -1400,10 +1104,10 @@
                     else if (raw === '0' || raw === 'false') fx[k] = false;
                 } else {
                     const n = parseFloat(raw);
-                    // Numeric FX keys clamp to their declared range
-                    // (default 0-1) so a corrupt/foreign write can't
-                    // overdrive opacities or the geometry multipliers.
-                    if (Number.isFinite(n)) fx[k] = _fxClamp(k, n);
+                    // All numeric FX keys are 0-1 sliders — clamp so a
+                    // corrupt/foreign write can't overdrive opacities
+                    // or the camera pulse.
+                    if (Number.isFinite(n)) fx[k] = Math.min(1, Math.max(0, n));
                 }
             }
         } catch (_) { /* localStorage unavailable — use defaults */ }
@@ -1423,7 +1127,7 @@
         } else {
             v = Number(value);
             if (!Number.isFinite(v)) return;
-            v = _fxClamp(key, v);   // declared range, default 0-1
+            v = Math.min(1, Math.max(0, v));   // all numeric FX keys are 0-1
         }
         try {
             localStorage.setItem(FX_LS_PREFIX + key, typeof v === 'boolean' ? (v ? '1' : '0') : String(v));
@@ -1665,8 +1369,6 @@
         // Theme/material handles (built by buildScene/buildKeyboardAndHighway;
         // _applyTheme / _applyCinematic / the glow slider retune them live).
         let _theme = readThemeSetting();
-        let _palette = readPaletteSetting();
-        let _sharpMode = readSharpModeSetting(); // 'floating' | 'flat' | 'realistic'
         let ambLight = null, dirLight = null;
         let _floorMat = null;
         const _railMats = [];      // lane-edge rail materials (theme laneDim)
@@ -1730,20 +1432,8 @@
             return [1, 3, 6, 8, 10].includes(((midi % 12) + 12) % 12);
         }
 
-        function _paletteColor(pc) {
-            return (NOTE_PALETTES[_palette] || PITCH_CLASS_COLORS)[pc];
-        }
-
-        // Base color (24-bit int, no hand dimming) for a midi note under the
-        // active palette — the octave scheme is procedural, every other
-        // palette is a 12-entry pitch-class table.
-        function _noteHex(midi) {
-            if (_palette === 'octaves') return octaveNoteColor(midi);
-            return _paletteColor(((midi % 12) + 12) % 12);
-        }
-
         function noteColor(midi, hand) {
-            const base = new T.Color(_noteHex(midi));
+            const base = new T.Color(PITCH_CLASS_COLORS[((midi % 12) + 12) % 12]);
             const b = HAND_BRIGHTNESS[hand] != null ? HAND_BRIGHTNESS[hand] : 1.0;
             base.multiplyScalar(b);
             return base;
@@ -1770,51 +1460,15 @@
         const WHITE_W = 12 * K, WHITE_L = 46 * K, WHITE_H = 5 * K;
         const BLACK_W = 6.4 * K, BLACK_L = 28 * K, BLACK_H = 6.5 * K;
         const HIGHWAY_LEN = 1150 * K; // longer runway → ~8.8s of lookahead visible
-        // 'flat' piano-shaped-lane geometry (see laneSpanFlat). Zero-overlap tiling:
-        // white lanes are trimmed by FLAT_SHARP_HALF where they meet a sharp and
-        // the sharp fills the gap, so nothing overlaps. To keep the naturals
-        // even, each sharp is nudged FLAT_SHARP_SHIFT toward the EDGE natural
-        // beside it (C#→C, D#→E, F#→F, A#→B; G# stays centred, no edge to lean
-        // on) — that steals a sliver from the edge natural and hands it to the
-        // squeezed inner natural. At shift = sharpHalf/3 the C-D-E-F-B naturals
-        // come out exactly equal; G/A land a hair smaller (G# can't lean). The
-        // sharps ride the same flat plane (no lift — they never overlap a
-        // natural). OCT_GAP is the extra divider opened at each octave boundary
-        // when the octaveGaps option is on.
-        const FLAT_SHARP_HALF = 2.2 * K;                 // sharp half-width (4.4K wide)
-        const FLAT_SHARP_SHIFT = FLAT_SHARP_HALF / 3;    // sharp lean that evens the naturals
-        const OCT_GAP = 0.9 * K;
-        const LANE_DIMS_FLAT = {
-            whiteW: WHITE_W, sharpHalf: FLAT_SHARP_HALF, shift: FLAT_SHARP_SHIFT, octGap: OCT_GAP,
-        };
-        // 'realistic' layout (laneSpanReal): every note bar is the size of the
-        // physical key it lands on — naturals the full white-key width (always
-        // rendered full, only occluded where a sharp note actually overlaps in
-        // time) and sharps the full black-key width at their standard positions,
-        // drawn on top with a hair of REAL_SHARP_LIFT (anti z-fight).
-        const REAL_NAT_HALF = WHITE_W * 0.47;   // natural bar ≈ physical white key (~11.3K)
-        const REAL_SHARP_HALF = BLACK_W / 2;    // sharp bar = physical black key (6.4K)
-        const REAL_SHARP_LIFT = 0.3 * K;
-        const LANE_DIMS_REAL = { natHalf: REAL_NAT_HALF, sharpHalf: REAL_SHARP_HALF, octGap: OCT_GAP };
-        // Lane span for the active non-floating sharp mode. `range`
-        // (activeLow/activeHigh) is optional and only consulted by the flat
-        // layout, to gate the boundary-key edge trim (see laneSpanFlat).
-        const _flatMode = () => _sharpMode === 'flat' || _sharpMode === 'realistic';
-        function laneSpanFor(midi, black, cx, gaps, range) {
-            return _sharpMode === 'realistic'
-                ? laneSpanReal(midi, black, cx, LANE_DIMS_REAL, gaps)
-                : laneSpanFlat(midi, black, cx, LANE_DIMS_FLAT, gaps, range);
-        }
 
-        // Camera — the default 'classic' preset is a low, near-telephoto rig
-        // (RS+-style): a narrow FOV from low and back gives a deep receding
-        // runway and frames ~2 octaves instead of cramming the whole note
-        // range full-width. The x position pans to follow the active notes
-        // (see updateScene), so wide pieces stay zoomed in on the played hand
-        // rather than shrinking every key. The rig numbers now come from the
-        // user-selectable CAM_PRESETS table; switching applies live because
-        // position/lookAt are re-derived every frame.
-        let _camPreset = CAM_PRESETS[readCameraSetting()] || CAM_PRESETS.classic;
+        // Camera — low, near-telephoto rig (RS+-style): a narrow FOV from low
+        // and back gives a deep receding runway and frames ~2 octaves instead
+        // of cramming the whole note range full-width. The x position pans to
+        // follow the active notes (see updateScene), so wide pieces stay zoomed
+        // in on the played hand rather than shrinking every key.
+        const CAM_FOV = 40;
+        const CAM_Y = 46 * K, CAM_Z = 112 * K;
+        const LOOK_Y = 8 * K, LOOK_Z = -165 * K;
         // Pan-follow: a slow ease toward a wide, gently-weighted centroid so the
         // camera glides with the melody instead of darting as notes enter/leave.
         const CAM_PAN_LERP = 0.022;      // per-frame ease (~1s glide @60fps)
@@ -1830,26 +1484,7 @@
         const CAM_ZOOM_BASE_KEYS = 11;   // white keys framed at zoom = 1
         const CAM_ZOOM_MIN = 0.9, CAM_ZOOM_MAX = 4.8;
         const CAM_ZOOM_LERP = 0.025;     // smooth zoom ease
-        // Full-swing of the camTilt aim offset (pre-K units) at slider ±1.
-        const CAM_TILT_UNITS = 55;
-
-        // Base rig with the live fine-tune knobs applied — height/distance
-        // multiply the preset, tilt offsets the aim height. Returns the
-        // effective {y, z, lookY, lookZ} in pre-K units; the caller scales by
-        // K and the auto-zoom. Keeps the pan/dolly follow-motion intact —
-        // these only move the vantage point it orbits around. Writes into a
-        // reusable object (returned live) so the per-frame camera update stays
-        // allocation-free — the callers read it synchronously and never retain
-        // it, so a single shared instance is safe.
-        const _rigOut = { y: 0, z: 0, lookY: 0, lookZ: 0 };
-        function _rig() {
-            _rigOut.y = _camPreset.y * fx.camHeight;
-            _rigOut.z = _camPreset.z * fx.camDist;
-            _rigOut.lookY = _camPreset.lookY + fx.camTilt * CAM_TILT_UNITS;
-            _rigOut.lookZ = _camPreset.lookZ;
-            return _rigOut;
-        }
-        // Per-key approach glow: a key lights in its pitch-class color ONLY while a
+        // Per-key approach glow: a key lights in its pitch-class colour 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
         const KEY_GLOW_STRENGTH = 1.15;  // peak emissive intensity (note at the hit-line)
@@ -2310,9 +1945,10 @@
             _envRT = _makeStudioEnv(T, ren);
             if (_envRT) scene.environment = _envRT.texture;
 
-            cam = new T.PerspectiveCamera(_camPreset.fov, 1, 0.1, 2000 * K);
+            cam = new T.PerspectiveCamera(CAM_FOV, 1, 0.1, 2000 * K);
             _camX = 0; _camTargetX = 0; _camZoom = 1; _camTargetZoom = 1;
-            { const r = _rig(); cam.position.set(0, r.y * K, r.z * K); cam.lookAt(0, r.lookY * K, r.lookZ * K); }
+            cam.position.set(0, CAM_Y, CAM_Z);
+            cam.lookAt(0, LOOK_Y, LOOK_Z);
 
             ambLight = new T.AmbientLight(0xffffff, 0.75);
             dirLight = new T.DirectionalLight(0xffffff, 1.1);
@@ -2438,9 +2074,9 @@
             });
             // Extrusion spans z ∈ [-bevel, depth + bevel]; centre it.
             geo.translate(0, 0, -depth / 2);
-            // Bake a vertical brightness ramp into vertex colors (bottom shade →
+            // Bake a vertical brightness ramp into vertex colours (bottom shade →
             // top highlight) so the gem reads 3D; the material multiplies its
-            // pitch-class color by this (vertexColors).
+            // pitch-class colour by this (vertexColors).
             geo.computeBoundingBox();
             const y0 = geo.boundingBox.min.y, yr = (geo.boundingBox.max.y - y0) || 1;
             const pos = geo.attributes.position;
@@ -2455,16 +2091,13 @@
             return geo;
         }
 
-        // Glossy note material, cached per resolved color. Keying by the
-        // final color int (hand brightness already baked in by noteColor)
-        // works for every palette — including 'octaves', where two notes of
-        // the same pitch class in different octaves are DIFFERENT colors and
-        // must not share a material (a pitch-class key would collide them).
+        // Glossy note material, cached per (pitch class, hand).
         function _noteMaterial(midi, hand) {
-            const col = noteColor(midi, hand);
-            const key = col.getHex();
+            const handKey = HAND_BRIGHTNESS[hand] != null ? hand : 'rh';
+            const key = (((midi % 12) + 12) % 12) + '|' + handKey;
             let mat = _noteMatCache.get(key);
             if (mat) return mat;
+            const col = noteColor(midi, hand);
             // MeshPhysicalMaterial with a clearcoat: lacquered glass-gem
             // look — a sharp coat highlight over a colored body, lit by the
             // studio env map. This is the "not plastic" ask: the old matte
@@ -2474,7 +2107,7 @@
             // share one shader program.)
             mat = new T.MeshPhysicalMaterial({
                 color: col,
-                vertexColors: true,         // multiply color by the baked gem ramp
+                vertexColors: true,         // multiply colour by the baked gem ramp
                 emissive: col,
                 emissiveIntensity: NOTE_EMISSIVE_BASE * _glowMul(),
                 roughness: 0.32,
@@ -2496,10 +2129,7 @@
             return 0.72 + 0.22 * Math.min(1, Math.max(0, fx.vibrancy));
         }
         function _laneGuideOpacity() {
-            // Vibrancy sets the ceiling (much brighter than the old subtle
-            // 0.10–0.22 range); the laneOpacity slider then scales 0 → ceiling.
-            const vib = 0.32 + 0.52 * Math.min(1, Math.max(0, fx.vibrancy)); // ~0.32..0.84
-            return vib * Math.min(1, Math.max(0, fx.laneOpacity));
+            return 0.10 + 0.12 * Math.min(1, Math.max(0, fx.vibrancy));
         }
 
         // Live vibrancy slider: retint everything already built — the
@@ -2515,39 +2145,6 @@
             for (const m of _laneGuideMats) m.opacity = lop;
         }
 
-        // Live palette switch: recolor everything already built — cached
-        // note materials (future clones), per-note clones, key emissives
-        // (incl. the wrong-flash restore state), lane guides — and drop the
-        // pitch-class flame textures so the next spawn bakes the new hues.
-        // Same no-rebuild approach as _applyVibrancy.
-        function _applyPalette() {
-            // The base-material cache is keyed by resolved color, so old
-            // entries are simply stale under a new palette — drop them and let
-            // the next build re-cache. The live per-note clones below are
-            // retinted directly from each note's midi (palette-correct).
-            for (const m of _noteMatCache.values()) m.dispose();
-            _noteMatCache.clear();
-            for (const nm of noteMeshes) {
-                if (!nm.mesh || !nm.mesh.material) continue;
-                const col = noteColor(nm.note.midi, nm.note.hand);
-                nm.mesh.material.color.copy(col);
-                nm.mesh.material.emissive.copy(col);
-            }
-            for (const [midi, km] of keyMeshes) {
-                const col = noteColor(midi, 'rh');
-                km.material.emissive.copy(col);
-                km.userData.origEmissive = col.getHex();
-            }
-            for (const m of _laneGuideMats) {
-                if (m.userData.midi != null) m.color.copy(noteColor(m.userData.midi, 'rh'));
-            }
-            _clearFlameTextures();
-            // Re-arm the pool so no slot keeps rendering a disposed texture
-            // (a flame mid-flight briefly re-tints — next spawn sets its
-            // true pitch texture).
-            for (const s of _flamePool) s.mat.map = _flameTexture(0);
-        }
-
         function _barNumberTexture(idx) {
             let tex = _barTexCache.get(idx);
             if (tex) return tex;
@@ -2584,15 +2181,13 @@
             return _glowTex;
         }
 
-        // Vertical flame texture for hit flares / held-key halos: white-hot
-        // base fading up into the note's color, with a horizontal falloff.
-        // Cached per resolved color (bounded — 12 for pitch-class palettes,
-        // up to ~one-per-octave for 'octaves'), so a flare always matches the
-        // struck note's color whatever the palette.
-        function _flameTexture(midi) {
-            const c = _noteHex(midi);
-            let tex = _flameTexCache.get(c);
+        // Vertical flame texture for hit flares: white-hot base fading up
+        // into the pitch-class colour, with a horizontal falloff. Cached per
+        // pitch class (bounded, 12 entries).
+        function _flameTexture(pc) {
+            let tex = _flameTexCache.get(pc);
             if (tex) return tex;
+            const c = PITCH_CLASS_COLORS[pc];
             const r = (c >> 16) & 0xff, g = (c >> 8) & 0xff, b = c & 0xff;
             const cnv = document.createElement('canvas');
             cnv.width = 64;
@@ -2612,7 +2207,7 @@
             ctx.fillStyle = falloff;
             ctx.fillRect(0, 0, 64, 128);
             tex = new T.CanvasTexture(cnv);
-            _flameTexCache.set(c, tex);
+            _flameTexCache.set(pc, tex);
             return tex;
         }
 
@@ -2699,7 +2294,7 @@
             if (!entry) return;
             const slot = _flamePool[_flameIdx];
             _flameIdx = (_flameIdx + 1) % _flamePool.length;
-            slot.mat.map = _flameTexture(midi);
+            slot.mat.map = _flameTexture(((midi % 12) + 12) % 12);
             slot.start = wallNow;
             slot.baseY = entry.black ? BLACK_H + WHITE_H * 0.6 : WHITE_H;
             slot.sprite.position.x = keyX(entry, _layoutInfo.whiteCount);
@@ -2768,9 +2363,9 @@
                 }
             }
 
-            // Lane guides: a faint color strip running up the runway from each
-            // active key, in that key's pitch-class color. A falling note shares
-            // its target key's color, so the player can trace it straight down
+            // Lane guides: a faint colour strip running up the runway from each
+            // active key, in that key's pitch-class colour. A falling note shares
+            // its target key's colour, so the player can trace it straight down
             // its lane to the right key even when it sits near the frame edge.
             //
             // The lanes sit at the NOTES' travel height (coplanar), not on the
@@ -2780,87 +2375,28 @@
             // lane, perfectly aligned with the lane and its key.
             const guideLen = HIGHWAY_LEN - WHITE_L;
             const laneY = WHITE_H + NOTE_H / 2 + 0.5 * K; // == white-note travel height
-            const gaps = fx.octaveGaps;
-            const floating = _sharpMode === 'floating';
-            const t = Math.min(1, Math.max(0, fx.laneOpacity));       // lane-color opacity
-            const octC = Math.min(1, Math.max(0, fx.octaveContrast)); // 0..1 line-contrast
-            const themeLaneDim = (() => { const c = _bgThemeColors(_theme); return c.laneDim != null ? c.laneDim : 0x2a2a3e; })();
-            // A vertical guide line running the full runway at world x (skips
-            // near-transparent lines so the crossfade never builds dead meshes).
-            const addLine = (x, color, opacity, wpx, trackTheme) => {
-                if (opacity < 0.02) return;
-                const m = new T.MeshBasicMaterial({ color, transparent: true, opacity, depthWrite: false });
-                if (trackTheme) _railMats.push(m); // theme retint tracks these; fixed guides stay put
-                const line = new T.Mesh(new T.PlaneGeometry(wpx, guideLen), m);
-                line.rotation.x = -Math.PI / 2;
-                line.position.set(x, laneY + 0.06 * K, hitZ - guideLen / 2);
-                keyboardGroup.add(line);
-            };
             for (const [midi, entry] of layout) {
                 if (midi < range.activeLow || midi > range.activeHigh) continue;
-                // Floating: white-only lanes (blacks float, lane-less). Flat/
-                // realistic: every key gets a piano-shaped lane.
-                if (entry.black && floating) continue;
-                // Lane footprint per mode.
-                let left, right, stripY = laneY;
-                if (floating) {
-                    const cx = keyX(entry, whiteCount);
-                    left = cx - WHITE_W / 2; right = cx + WHITE_W / 2;
-                    if (gaps) {
-                        const pc = ((midi % 12) + 12) % 12;
-                        if (pc === 11) right -= OCT_GAP / 2; // B → C boundary
-                        if (pc === 0) left += OCT_GAP / 2;
-                    }
-                } else {
-                    const span = laneSpanFor(midi, entry.black, keyX(entry, whiteCount), gaps, range);
-                    left = span.left; right = span.right;
-                    if (_sharpMode === 'realistic' && entry.black) stripY = laneY + REAL_SHARP_LIFT;
-                }
-                const center = (left + right) / 2;
-                // Colored lane strip + a subtle per-lane separator — fade in with
-                // lane opacity. (As lanes fade, the block/octave lines below take
-                // over as the guide.)
-                if (t > 0.02) {
-                    // Floating keeps the historical 0.84-wide white strip; the
-                    // piano-shaped lanes inset a touch for a dark separator.
-                    const stripW = floating ? (right - left) - WHITE_W * 0.16 : (right - left) * 0.9;
-                    const gmat = new T.MeshBasicMaterial({
-                        color: noteColor(midi, 'rh'), transparent: true,
-                        opacity: _laneGuideOpacity(), depthWrite: false, // includes lane opacity
-                    });
-                    gmat.userData.midi = midi; // palette retint needs the lane's pitch
-                    _laneGuideMats.push(gmat);
-                    const strip = new T.Mesh(new T.PlaneGeometry(stripW, guideLen), gmat);
-                    strip.rotation.x = -Math.PI / 2;
-                    strip.position.set(center, stripY, hitZ - guideLen / 2);
-                    keyboardGroup.add(strip);
-                    // Per-lane separator, fading with the strips. Skip realistic
-                    // sharps (they overlap the white columns).
-                    if (!(entry.black && _sharpMode === 'realistic')) {
-                        addLine(left, themeLaneDim, 0.5 * t, 0.6 * K, true);
-                    }
-                }
-            }
-            // Structural divider lines: ONE per "block" boundary — E→F and B→C —
-            // so each block of keys (C-D-E, F-G-A-B) is bounded, not every lane.
-            // They crossfade IN as the lanes fade OUT. The B→C octave line is a
-            // dark layer (reads over bright lanes, scales with lane opacity) plus
-            // a bright layer (reads over the dark floor, scales with the inverse),
-            // so it auto-shifts dark→bright as you fade lanes; octaveContrast
-            // scales the whole thing.
-            for (let midi = range.activeLow; midi <= range.activeHigh; midi++) {
-                const pc = ((midi % 12) + 12) % 12;
-                const isEF = pc === 4;   // E → F block boundary
-                const isBC = pc === 11;  // B → C octave boundary
-                if (!isEF && !isBC) continue;
-                const boundaryX = keyX(layout.get(midi), whiteCount) + WHITE_W / 2;
-                if (isBC) {
-                    addLine(boundaryX, 0x05060a, octC * 0.92 * t, 1.1 * K, false);              // dark, over lanes
-                    addLine(boundaryX, 0xd8dcec, (0.42 + octC * 0.5) * (1 - t), 1.1 * K, false); // bright, over floor
-                } else {
-                    // E→F block divider — a guide that appears as the lanes fade.
-                    addLine(boundaryX, 0x6a6a7a, 0.5 * (1 - t), 0.8 * K, false);
-                }
+                if (entry.black) continue; // one strip per semitone-slot lands on whites
+                const gmat = new T.MeshBasicMaterial({
+                    color: noteColor(midi, 'rh'), transparent: true,
+                    opacity: _laneGuideOpacity(), depthWrite: false,
+                });
+                _laneGuideMats.push(gmat);
+                const strip = new T.Mesh(new T.PlaneGeometry(WHITE_W * 0.84, guideLen), gmat);
+                strip.rotation.x = -Math.PI / 2;
+                strip.position.set(keyX(entry, whiteCount), laneY, hitZ - guideLen / 2);
+                keyboardGroup.add(strip);
+                // Thin brighter rails at the lane edges for crisp separation.
+                const railMat = new T.MeshBasicMaterial({
+                    color: (() => { const c = _bgThemeColors(_theme); return c.laneDim != null ? c.laneDim : 0x2a2a3e; })(),
+                    transparent: true, opacity: 0.5, depthWrite: false,
+                });
+                _railMats.push(railMat);
+                const rail = new T.Mesh(new T.PlaneGeometry(0.6 * K, guideLen), railMat);
+                rail.rotation.x = -Math.PI / 2;
+                rail.position.set(keyX(entry, whiteCount) - WHITE_W / 2, laneY + 0.05 * K, hitZ - guideLen / 2);
+                keyboardGroup.add(rail);
             }
 
             // Keys (whites first so blacks overlay). Geometries are shared
@@ -2880,7 +2416,7 @@
                 const inRange = midi >= range.activeLow && midi <= range.activeHigh;
                 const material = new T.MeshStandardMaterial({
                     color: black ? 0x070708 : 0xe8e8ee,
-                    // Pitch-class color preset on emissive but OFF at rest — the key
+                    // Pitch-class colour preset on emissive but OFF at rest — the key
                     // is neutral until a note approaches, when updateScene ramps the
                     // intensity up by proximity.
                     emissive: noteColor(midi, 'rh'),
@@ -2966,31 +2502,11 @@
                 const entry = layout.get(note.midi);
                 if (!entry) continue;
                 const len = Math.max(4 * K, note.durSec * TS);
-                // Non-floating layouts: notes ride the naturals' plane and take
-                // their piano-shaped lane's width/centre. Floating (default):
-                // original elevated sharps, key-centred bars.
-                let w, x, y;
-                if (_flatMode()) {
-                    const span = laneSpanFor(
-                        note.midi, entry.black, keyX(entry, whiteCount), fx.octaveGaps, range);
-                    // 'realistic' bars are full (physical-key size); 'flat' bars are
-                    // inset a touch for a dark separator in the tight tiling.
-                    const inset = _sharpMode === 'realistic' ? 1.0 : 0.9;
-                    w = (span.right - span.left) * inset;
-                    x = (span.left + span.right) / 2;
-                    // Coplanar; in 'realistic' the sharps ride a hair proud so they
-                    // draw over the naturals they overlap without z-fighting.
-                    const lift = (_sharpMode === 'realistic' && entry.black) ? REAL_SHARP_LIFT : 0;
-                    y = WHITE_H + NOTE_H / 2 + 0.5 * K + lift;
-                } else {
-                    w = (entry.black ? BLACK_W : WHITE_W * 0.94) * 0.9;
-                    x = keyX(entry, whiteCount);
-                    y = (entry.black ? BLACK_H + WHITE_H : WHITE_H) + NOTE_H / 2 + 0.5 * K;
-                }
+                const w = (entry.black ? BLACK_W : WHITE_W * 0.94) * 0.9;
                 // Clone per note so each can glow independently while being consumed.
                 const mesh = new T.Mesh(_noteGeometry(w, len), _noteMaterial(note.midi, note.hand).clone());
-                mesh.position.x = x;
-                mesh.position.y = y;
+                mesh.position.x = keyX(entry, whiteCount);
+                mesh.position.y = (entry.black ? BLACK_H + WHITE_H : WHITE_H) + NOTE_H / 2 + 0.5 * K;
                 mesh.visible = false;
                 notesGroup.add(mesh);
                 // Note-name label: a camera-facing sprite (readable at this low camera
@@ -3259,7 +2775,8 @@
             }
             _camX += (_camTargetX - _camX) * CAM_PAN_LERP;
             _camZoom += (_camTargetZoom - _camZoom) * CAM_ZOOM_LERP;
-            { 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); }
+            cam.position.set(_camX, CAM_Y * _camZoom, CAM_Z * _camZoom);
+            cam.lookAt(_camX, LOOK_Y * _camZoom, LOOK_Z * _camZoom);
 
             for (const km of keyMeshes.values()) km.userData.glow = 0;
             for (const { mesh, note, len, label } of noteMeshes) {
@@ -3700,13 +3217,9 @@
                 if (_isReady) teardown();
                 highwayCanvas = canvas;
                 fx = readFxSettings();
-                // Persisted string settings refresh here too — a palette,
-                // camera, theme or background style saved while no instance was
-                // listening (e.g. changed on the Settings screen, where the live
-                // viz is torn down) must not come up stale on a later init().
-                _palette = readPaletteSetting();
-                _sharpMode = readSharpModeSetting();
-                _camPreset = CAM_PRESETS[readCameraSetting()] || CAM_PRESETS.classic;
+                // Persisted string settings refresh here too — a theme saved
+                // while no instance was listening must not come up stale on a
+                // later init().
                 _theme = readThemeSetting();
                 _bgStyle = readBgStyleSetting();
                 loadThree().then(() => {
@@ -3752,23 +3265,6 @@
                             _bgStyle = d.bgStyle;
                             _bgMountStyle();
                         }
-                        if (d && d.palette && PALETTE_IDS.indexOf(d.palette) !== -1) {
-                            _palette = d.palette;
-                            _applyPalette();
-                        }
-                        if (d && d.sharpMode && SHARP_MODES.indexOf(d.sharpMode) !== -1) {
-                            // Geometry-time — takes effect on the next chart build.
-                            _sharpMode = d.sharpMode;
-                        }
-                        if (d && d.camera && CAM_PRESETS[d.camera]) {
-                            _camPreset = CAM_PRESETS[d.camera];
-                            // Position/lookAt re-derive next frame; only the
-                            // projection needs an explicit poke.
-                            if (cam) {
-                                cam.fov = _camPreset.fov;
-                                cam.updateProjectionMatrix();
-                            }
-                        }
                     };
                     window.addEventListener('keys3d:settings', _fxThemeHandler);
                     window.addEventListener('keys3d:settings', _fxHandler);
@@ -3974,24 +3470,10 @@
         readFxSettings,
         readThemeSetting,
         readBgStyleSetting,
-        readPaletteSetting,
-        readCameraSetting,
-        readSharpModeSetting,
-        SHARP_MODES,
         _bgThemeColors,
         BG_THEMES,
         BG_STYLE_IDS,
-        NOTE_PALETTES,
-        PITCH_CLASS_COLORS,
-        PALETTE_IDS,
-        OCTAVE_HUES,
-        octaveNoteColor,
-        _isBlackPc,
-        laneSpanFlat,
-        laneSpanReal,
-        CAM_PRESETS,
         FX_DEFAULTS,
-        FX_RANGES,
         _classifyTiming,
     };
 

plugins/keys_highway_3d/settings.html

@@ -12,22 +12,6 @@
     <div class="mt-3">
         <h4 class="text-xs font-medium text-gray-300 mb-2">Graphics</h4>
 
-        <label for="keysh3d-fx-palette" class="text-xs font-medium text-gray-400 mb-1 block">Note colors</label>
-        <select id="keysh3d-fx-palette"
-            onchange="window.keys3dSetPalette && window.keys3dSetPalette(this.value)"
-            class="w-full bg-dark-700 border border-gray-800 rounded-lg px-3 py-2 text-xs text-gray-300 outline-none">
-            <option value="octaves" selected>Octaves (color per octave, darker sharps)</option>
-            <option value="emerald">Emerald (green, darker sharps)</option>
-            <option value="ice">Ice (blue, darker sharps)</option>
-            <option value="classic">Rainbow (per-pitch)</option>
-            <option value="vivid">Vivid (per-pitch, punchier)</option>
-            <option value="pastel">Pastel (per-pitch, soft)</option>
-        </select>
-        <p class="text-xs text-gray-500 mt-1 mb-3">
-            Choose the color scheme for the falling notes, key glow, lane
-            guides and hit flames. Each option is described in its own label.
-        </p>
-
         <label for="keysh3d-fx-theme" class="text-xs font-medium text-gray-400 mb-1 block">Scene theme</label>
         <select id="keysh3d-fx-theme"
             onchange="window.keys3dSetTheme && window.keys3dSetTheme(this.value)"
@@ -46,117 +30,7 @@
         </select>
         <p class="text-xs text-gray-500 mt-1 mb-3">
             Background gradient, floor and lane rails — the same theme names
-            as the guitar highway. Note colors come from the
-            "Note colors" palette above.
-        </p>
-
-        <label for="keysh3d-fx-camera" class="text-xs font-medium text-gray-400 mb-1 block">Camera angle</label>
-        <select id="keysh3d-fx-camera"
-            onchange="window.keys3dSetCamera && window.keys3dSetCamera(this.value)"
-            class="w-full bg-dark-700 border border-gray-800 rounded-lg px-3 py-2 text-xs text-gray-300 outline-none">
-            <option value="classic">Classic (low, deep runway)</option>
-            <option value="elevated">Elevated (higher, more board)</option>
-            <option value="overhead" selected>Overhead (top-down reading view)</option>
-        </select>
-        <p class="text-xs text-gray-500 mt-1 mb-3">
-            Where the camera sits. Classic is the original low rig; Elevated
-            lifts it for a fuller view of the keybed; Overhead looks down the
-            lanes for a sheet-reading feel. Applies live, keeps the
-            auto-pan/zoom that follows your hands.
-        </p>
-
-        <label for="keysh3d-fx-camheight" class="text-xs font-medium text-gray-400 mb-1 block">
-            Camera height <span id="keysh3d-fx-camheight-val" class="text-gray-500 font-mono">1.00</span>
-        </label>
-        <input type="range" id="keysh3d-fx-camheight"
-            min="0.4" max="2.2" step="0.02" value="1"
-            oninput="window.keys3dSetFx && window.keys3dSetFx('camHeight', this.value); document.getElementById('keysh3d-fx-camheight-val').textContent = parseFloat(this.value).toFixed(2)"
-            class="w-full">
-        <p class="text-xs text-gray-500 mt-1">
-            Raise or lower the camera around the angle above (higher = more
-            top-down). Fine-tunes the base view; the follow-motion stays.
-        </p>
-
-        <label for="keysh3d-fx-camdist" class="text-xs font-medium text-gray-400 mb-1 mt-3 block">
-            Camera distance <span id="keysh3d-fx-camdist-val" class="text-gray-500 font-mono">1.00</span>
-        </label>
-        <input type="range" id="keysh3d-fx-camdist"
-            min="0.4" max="2.2" step="0.02" value="1"
-            oninput="window.keys3dSetFx && window.keys3dSetFx('camDist', this.value); document.getElementById('keysh3d-fx-camdist-val').textContent = parseFloat(this.value).toFixed(2)"
-            class="w-full">
-        <p class="text-xs text-gray-500 mt-1">
-            Pull the camera back or push it in (larger = further away, smaller
-            = closer).
-        </p>
-
-        <label for="keysh3d-fx-camtilt" class="text-xs font-medium text-gray-400 mb-1 mt-3 block">
-            Camera tilt <span id="keysh3d-fx-camtilt-val" class="text-gray-500 font-mono">0.00</span>
-        </label>
-        <input type="range" id="keysh3d-fx-camtilt"
-            min="-1" max="1" step="0.02" value="0"
-            oninput="window.keys3dSetFx && window.keys3dSetFx('camTilt', this.value); document.getElementById('keysh3d-fx-camtilt-val').textContent = parseFloat(this.value).toFixed(2)"
-            class="w-full">
-        <p class="text-xs text-gray-500 mt-1 mb-3">
-            Tilt the view up (+) or down (−) without moving the camera —
-            aims higher up the runway or down toward the keys. 0 = neutral.
-        </p>
-
-        <h4 class="text-xs font-medium text-gray-300 mb-2 mt-4">Highway layout</h4>
-
-        <label for="keysh3d-fx-sharpmode" class="text-xs font-medium text-gray-400 mb-1 block">Sharps &amp; flats</label>
-        <select id="keysh3d-fx-sharpmode"
-            onchange="window.keys3dSetSharpMode && window.keys3dSetSharpMode(this.value)"
-            class="w-full bg-dark-700 border border-gray-800 rounded-lg px-3 py-2 text-xs text-gray-300 outline-none">
-            <option value="floating">Floating</option>
-            <option value="flat">Non-floating</option>
-            <option value="realistic" selected>Realistic key sizes (default — best with no colored lanes)</option>
-        </select>
-        <p class="text-xs text-gray-500 mt-1 mb-3">
-            How sharps and flats are drawn. <em>Floating</em>: they ride a raised
-            plane above the naturals. <em>Non-floating</em>: everything on one
-            plane, each key its own even piano-shaped lane. <em>Realistic key
-            sizes</em>: one plane, bars sized like the real keys (full naturals,
-            full black keys on top). Applies next time you open a song.
-        </p>
-
-        <label for="keysh3d-fx-laneopacity" class="text-xs font-medium text-gray-400 mb-1 block">
-            Lane color opacity <span id="keysh3d-fx-laneopacity-val" class="text-gray-500 font-mono">0.00</span>
-        </label>
-        <input type="range" id="keysh3d-fx-laneopacity"
-            min="0" max="1" step="0.05" value="0"
-            oninput="window.keys3dSetFx && window.keys3dSetFx('laneOpacity', this.value); document.getElementById('keysh3d-fx-laneopacity-val').textContent = parseFloat(this.value).toFixed(2)"
-            class="w-full">
-        <p class="text-xs text-gray-500 mt-1 mb-3">
-            How strongly each lane is tinted its note color. 0.00 (default) is a
-            dark floor with plain guide lines only between the key blocks (at E–F
-            and each octave); the notes keep their colors and pop off the floor.
-            Raise toward 1.00 for full, vivid colored lanes. Applies next time you
-            open a song.
-        </p>
-
-        <label for="keysh3d-fx-octavegaps" class="flex items-center gap-2 text-xs text-gray-300 cursor-pointer mt-3">
-            <input type="checkbox" id="keysh3d-fx-octavegaps" checked
-                onchange="window.keys3dSetFx && window.keys3dSetFx('octaveGaps', this.checked)">
-            Octave separators
-        </label>
-        <p class="text-xs text-gray-500 mt-1 mb-3">
-            Widen the gap a little at each octave boundary (every B to the C
-            above it) so octaves are easier to read. Applies next time you open
-            a song.
-        </p>
-
-        <label for="keysh3d-fx-octavecontrast" class="text-xs font-medium text-gray-400 mb-1 mt-3 block">
-            Octave line contrast <span id="keysh3d-fx-octavecontrast-val" class="text-gray-500 font-mono">0.50</span>
-        </label>
-        <input type="range" id="keysh3d-fx-octavecontrast"
-            min="0" max="1" step="0.05" value="0.5"
-            oninput="window.keys3dSetFx && window.keys3dSetFx('octaveContrast', this.value); document.getElementById('keysh3d-fx-octavecontrast-val').textContent = parseFloat(this.value).toFixed(2)"
-            class="w-full">
-        <p class="text-xs text-gray-500 mt-1 mb-3">
-            How strongly the octave line (every B to C) stands out. It adapts to
-            the lane color opacity automatically — darkening the line against
-            bright lanes and brightening it as you fade them toward the dark
-            floor. Applies next time you open a song.
+            as the guitar highway. Pitch-class note colours never change.
         </p>
 
         <label for="keysh3d-fx-cinematic" class="flex items-center gap-2 text-xs text-gray-300 cursor-pointer">
@@ -242,7 +116,7 @@
         <label for="keysh3d-fx-timing" class="flex items-center gap-2 text-xs text-gray-300 cursor-pointer mt-3">
             <input type="checkbox" id="keysh3d-fx-timing" checked
                 onchange="window.keys3dSetFx && window.keys3dSetFx('timingFx', this.checked)">
-            Timing colors
+            Timing colours
         </label>
         <p class="text-xs text-gray-500 mt-1">
             Tint the sparks by timing — on-time green, early cyan, late
@@ -305,9 +179,6 @@
             hydrateFxBool('cinematic', 'keysh3d-fx-cinematic');
             hydrateFxBool('bgReactive', 'keysh3d-fx-bgreactive');
             hydrateFxBool('scoreFx', 'keysh3d-fx-scorefx');
-            // Highway-layout: octaveGaps defaults ON (bool); laneOpacity /
-            // octaveContrast are 0-1 sliders hydrated with hydrateFxRange below.
-            hydrateFxBool('octaveGaps', 'keysh3d-fx-octavegaps');
             const hydrateFxRange = (key, elId, valId) => {
                 const n = parseFloat(localStorage.getItem('keys3d_bg_' + key));
                 if (!Number.isFinite(n)) return;
@@ -319,26 +190,6 @@
             hydrateFxRange('vibrancy', 'keysh3d-fx-vibrancy', 'keysh3d-fx-vibrancy-val');
             hydrateFxRange('glow', 'keysh3d-fx-glow', 'keysh3d-fx-glow-val');
             hydrateFxRange('bgIntensity', 'keysh3d-fx-bgintensity', 'keysh3d-fx-bgintensity-val');
-            hydrateFxRange('laneOpacity', 'keysh3d-fx-laneopacity', 'keysh3d-fx-laneopacity-val');
-            hydrateFxRange('octaveContrast', 'keysh3d-fx-octavecontrast', 'keysh3d-fx-octavecontrast-val');
-            // Camera fine-tune sliders live outside 0-1 — clamp to the
-            // control's own min/max (mirrors screen.js FX_RANGES).
-            const hydrateFxRangeIn = (key, elId, valId) => {
-                const n = parseFloat(localStorage.getItem('keys3d_bg_' + key));
-                if (!Number.isFinite(n)) return;
-                const el = document.getElementById(elId);
-                const v = Math.min(parseFloat(el.max), Math.max(parseFloat(el.min), n));
-                el.value = String(v);
-                document.getElementById(valId).textContent = v.toFixed(2);
-            };
-            hydrateFxRangeIn('camHeight', 'keysh3d-fx-camheight', 'keysh3d-fx-camheight-val');
-            hydrateFxRangeIn('camDist', 'keysh3d-fx-camdist', 'keysh3d-fx-camdist-val');
-            hydrateFxRangeIn('camTilt', 'keysh3d-fx-camtilt', 'keysh3d-fx-camtilt-val');
-            const storedCamera = localStorage.getItem('keys3d_bg_camera');
-            const cameraSel = document.getElementById('keysh3d-fx-camera');
-            if (storedCamera && Array.from(cameraSel.options).some(o => o.value === storedCamera)) {
-                cameraSel.value = storedCamera;
-            }
             const storedStyle = localStorage.getItem('keys3d_bg_style');
             const styleSel = document.getElementById('keysh3d-fx-bgstyle');
             if (storedStyle && Array.from(styleSel.options).some(o => o.value === storedStyle)) {
@@ -349,16 +200,6 @@
             if (storedTheme && Array.from(themeSel.options).some(o => o.value === storedTheme)) {
                 themeSel.value = storedTheme;
             }
-            const storedPalette = localStorage.getItem('keys3d_bg_palette');
-            const paletteSel = document.getElementById('keysh3d-fx-palette');
-            if (storedPalette && Array.from(paletteSel.options).some(o => o.value === storedPalette)) {
-                paletteSel.value = storedPalette;
-            }
-            const storedSharp = localStorage.getItem('keys3d_bg_sharpMode');
-            const sharpSel = document.getElementById('keysh3d-fx-sharpmode');
-            if (storedSharp && Array.from(sharpSel.options).some(o => o.value === storedSharp)) {
-                sharpSel.value = storedSharp;
-            }
         } catch (e) {
             console.warn('[Keys-Hwy3D settings] hydration failed:', e);
         }

plugins/keys_highway_3d/tests/fx_settings.test.js

@@ -148,405 +148,3 @@ test('FX defaults: ambience + score FX ship enabled', () => {
     assert.equal(FX_DEFAULTS.bgIntensity, 0.5);
     assert.equal(FX_DEFAULTS.bgReactive, true);
 });
-
-/* ── Note-colour palettes (feat/keys3d-note-palettes) ────────────────── */
-
-test('note palettes: 12 entries each, classic IS the stock table', () => {
-    const { NOTE_PALETTES, PITCH_CLASS_COLORS } =
-        load().slopsmithViz_keys_highway_3d.__test;
-    assert.deepEqual(Object.keys(NOTE_PALETTES),
-        ['classic', 'emerald', 'vivid', 'pastel', 'ice']);
-    for (const [id, colors] of Object.entries(NOTE_PALETTES)) {
-        assert.equal(colors.length, 12, id + ' has one colour per pitch class');
-        for (const c of colors) {
-            assert.ok(Number.isInteger(c) && c >= 0 && c <= 0xffffff,
-                id + ' colours are 24-bit ints');
-        }
-    }
-    // 'classic' preserves the shipped look byte-identically — it is the
-    // same array, not a copy that could drift.
-    assert.equal(NOTE_PALETTES.classic, PITCH_CLASS_COLORS);
-    assert.equal(PITCH_CLASS_COLORS[0], 0xff3030); // C stays red in classic
-});
-
-test('note palettes: two-tone tables use darker sharps than naturals', () => {
-    const { NOTE_PALETTES } = load().slopsmithViz_keys_highway_3d.__test;
-    const luma = (c) =>
-        0.2126 * ((c >> 16) & 0xff) + 0.7152 * ((c >> 8) & 0xff) + 0.0722 * (c & 0xff);
-    for (const id of ['emerald', 'ice']) {
-        const p = NOTE_PALETTES[id];
-        for (const sharp of [1, 3, 6, 8, 10]) {
-            assert.ok(luma(p[sharp]) < luma(p[0]),
-                id + ' sharp pc ' + sharp + ' darker than naturals');
-        }
-    }
-});
-
-test('readPaletteSetting: octaves default, validated overrides only', () => {
-    // No localStorage in the vm → the plug-and-play default.
-    const bare = load().slopsmithViz_keys_highway_3d.__test;
-    assert.equal(bare.readPaletteSetting(), 'octaves');
-    // An explicit non-default value (classic) overrides.
-    const store = { keys3d_bg_palette: 'classic' };
-    const win = load({
-        localStorage: {
-            getItem: (k) => (k in store ? store[k] : null),
-            setItem: (k, v) => { store[k] = v; },
-        },
-    });
-    const { readPaletteSetting } = win.slopsmithViz_keys_highway_3d.__test;
-    assert.equal(readPaletteSetting(), 'classic');
-    // Corrupt/foreign value → the default rather than an undefined scheme.
-    store.keys3d_bg_palette = 'banana';
-    assert.equal(readPaletteSetting(), 'octaves');
-});
-
-test('keys3dSetPalette: persists + dispatches valid ids, ignores unknown', () => {
-    const store = {};
-    const events = [];
-    const win = load({
-        localStorage: {
-            getItem: (k) => (k in store ? store[k] : null),
-            setItem: (k, v) => { store[k] = v; },
-        },
-        dispatchEvent: (ev) => { events.push(ev); return true; },
-        CustomEvent: class CustomEvent {
-            constructor(type, opts) { this.type = type; this.detail = opts && opts.detail; }
-        },
-    });
-    win.keys3dSetPalette('emerald');
-    assert.equal(store.keys3d_bg_palette, 'emerald');
-    assert.equal(events.length, 1);
-    assert.equal(events[0].type, 'keys3d:settings');
-    assert.equal(events[0].detail.palette, 'emerald');
-    // Unknown id: no write, no event.
-    win.keys3dSetPalette('banana');
-    assert.equal(store.keys3d_bg_palette, 'emerald');
-    assert.equal(events.length, 1);
-    // 'octaves' (procedural, not a 12-array) is a valid selectable id.
-    win.keys3dSetPalette('octaves');
-    assert.equal(store.keys3d_bg_palette, 'octaves');
-    assert.equal(events.length, 2);
-});
-
-test('PALETTE_IDS: the array palettes plus the procedural octaves scheme', () => {
-    const { PALETTE_IDS, NOTE_PALETTES } = load().slopsmithViz_keys_highway_3d.__test;
-    assert.deepEqual([...PALETTE_IDS],
-        [...Object.keys(NOTE_PALETTES), 'octaves']);
-    assert.ok(PALETTE_IDS.indexOf('octaves') !== -1);
-    assert.ok(!('octaves' in NOTE_PALETTES)); // it is NOT a 12-entry table
-});
-
-test('octaveNoteColor: hue steps per octave, loops, sharps darker, sub-C1 distinct', () => {
-    const { octaveNoteColor, OCTAVE_HUES } = load().slopsmithViz_keys_highway_3d.__test;
-    const luma = (c) =>
-        0.2126 * ((c >> 16) & 0xff) + 0.7152 * ((c >> 8) & 0xff) + 0.0722 * (c & 0xff);
-    // C1 (midi 24) = first hue; C2 (36) = second; C8 (108) = 8th (index 7).
-    assert.equal(octaveNoteColor(24), OCTAVE_HUES[0]);   // C1 red
-    assert.equal(octaveNoteColor(35), OCTAVE_HUES[0]);   // B1 still octave 1
-    assert.equal(octaveNoteColor(36), OCTAVE_HUES[1]);   // C2 orange
-    assert.equal(octaveNoteColor(60), OCTAVE_HUES[3]);   // C4 (middle C)
-    assert.equal(octaveNoteColor(108), OCTAVE_HUES[7]);  // C8 last hue
-    // Naturals across one octave (C1..B1 whites) all share the octave hue.
-    for (const nat of [24, 26, 28, 29, 31, 33, 35]) {
-        assert.equal(octaveNoteColor(nat), OCTAVE_HUES[0], 'natural ' + nat);
-    }
-    // Sharps in an octave are a DARKER shade of that same hue.
-    for (const sharp of [25, 27, 30, 32, 34]) { // C#1..A#1
-        assert.ok(luma(octaveNoteColor(sharp)) < luma(OCTAVE_HUES[0]),
-            'sharp ' + sharp + ' darker than the octave natural');
-    }
-    // The three keys below C1 (A0/A#0/B0) share a distinct sub-C1 colour,
-    // different from the red octave-1 start.
-    assert.equal(octaveNoteColor(21), octaveNoteColor(23)); // A0 == B0 hue
-    assert.notEqual(octaveNoteColor(21), OCTAVE_HUES[0]);
-    // Loop: an octave past the table wraps (safety for out-of-88 midi).
-    assert.equal(octaveNoteColor(24 + 12 * OCTAVE_HUES.length), OCTAVE_HUES[0]);
-});
-
-/* ── Camera presets + fine-tune (feat/keys3d-camera) ─────────────────── */
-
-test('FX defaults: camera height/distance/tilt all neutral (preset carries the tuned aim)', () => {
-    const { FX_DEFAULTS, FX_RANGES } = load().slopsmithViz_keys_highway_3d.__test;
-    assert.equal(FX_DEFAULTS.camHeight, 1.0);
-    assert.equal(FX_DEFAULTS.camDist, 1.0);
-    // Tilt ships NEUTRAL (0): the tuned plug-and-play aim now lives in
-    // CAM_PRESETS.overhead.lookY, so the fine-tune only nudges from a preset
-    // and 'classic' + this default reproduces the exact historical rig.
-    assert.equal(FX_DEFAULTS.camTilt, 0.0);
-    assert.ok(FX_DEFAULTS.camTilt >= FX_RANGES.camTilt[0] && FX_DEFAULTS.camTilt <= FX_RANGES.camTilt[1]);
-    // Height/distance bracket 1 (can go lower AND higher); tilt spans 0.
-    assert.ok(FX_RANGES.camHeight[0] < 1 && 1 < FX_RANGES.camHeight[1]);
-    assert.ok(FX_RANGES.camDist[0] < 1 && 1 < FX_RANGES.camDist[1]);
-    assert.ok(FX_RANGES.camTilt[0] < 0 && 0 < FX_RANGES.camTilt[1]);
-});
-
-test('camTilt: negative values survive the clamp (down-tilt must be reachable)', () => {
-    const store = {};
-    const win = load({
-        localStorage: {
-            getItem: (k) => (k in store ? store[k] : null),
-            setItem: (k, v) => { store[k] = v; },
-        },
-        dispatchEvent: () => true,
-        CustomEvent: class { constructor(t, o) { this.type = t; this.detail = o && o.detail; } },
-    });
-    const { FX_RANGES } = win.slopsmithViz_keys_highway_3d.__test;
-    win.keys3dSetFx('camTilt', -0.5);
-    assert.equal(store.keys3d_bg_camTilt, '-0.5');   // NOT crushed to 0 by a 0-1 clamp
-    win.keys3dSetFx('camTilt', -99);
-    assert.equal(parseFloat(store.keys3d_bg_camTilt), FX_RANGES.camTilt[0]);
-});
-
-test('FX ranges: reader + setter clamp to the declared range, not 0-1', () => {
-    const store = { keys3d_bg_camHeight: '5', keys3d_bg_camDist: '0.01' };
-    const events = [];
-    const win = load({
-        localStorage: {
-            getItem: (k) => (k in store ? store[k] : null),
-            setItem: (k, v) => { store[k] = v; },
-        },
-        dispatchEvent: (ev) => { events.push(ev); return true; },
-        CustomEvent: class CustomEvent {
-            constructor(type, opts) { this.type = type; this.detail = opts && opts.detail; }
-        },
-    });
-    const { readFxSettings, FX_RANGES } = win.slopsmithViz_keys_highway_3d.__test;
-    // Reader: corrupt/out-of-range writes clamp to the declared bounds.
-    assert.equal(readFxSettings().camHeight, FX_RANGES.camHeight[1]);
-    assert.equal(readFxSettings().camDist, FX_RANGES.camDist[0]);
-    // Setter: same clamp on the way in; a value above 1 must survive
-    // (the historical 0-1 clamp would have crushed 1.3 to 1).
-    win.keys3dSetFx('camHeight', 1.3);
-    assert.equal(store.keys3d_bg_camHeight, '1.3');
-    win.keys3dSetFx('camDist', 99);
-    assert.equal(parseFloat(store.keys3d_bg_camDist), FX_RANGES.camDist[1]);
-    // Un-ranged keys keep the historical 0-1 clamp.
-    win.keys3dSetFx('vibrancy', 2);
-    assert.equal(store.keys3d_bg_vibrancy, '1');
-});
-
-test('scrollZ: distance-to-hitline scales linearly with the speed argument', () => {
-    const { scrollZ } = load().slopsmithViz_keys_highway_3d.__test;
-    const hitZ = 0;
-    const d1 = scrollZ(2, 0, hitZ, 130) - hitZ;   // 2s ahead at stock speed
-    const d2 = scrollZ(2, 0, hitZ, 260) - hitZ;   // same note at 2x speed
-    assert.equal(d2, d1 * 2);
-    // At the hit moment the note is at the hit-line regardless of speed.
-    assert.equal(scrollZ(5, 5, hitZ, 130), hitZ);
-    assert.equal(scrollZ(5, 5, hitZ, 260), hitZ);
-});
-
-test('camera presets: classic preserves the stock rig, overhead is the default', () => {
-    const { CAM_PRESETS, readCameraSetting } = load().slopsmithViz_keys_highway_3d.__test;
-    assert.deepEqual(Object.keys(CAM_PRESETS), ['classic', 'elevated', 'overhead']);
-    // 'classic' preserves the historical constants (pre-K units) even though
-    // it is no longer the default — anyone who picks it gets the old rig back
-    // EXACTLY, because camTilt now defaults to 0 (neutral): effective aim =
-    // classic.lookY + 0*CAM_TILT_UNITS = 8, the historical LOOK_Y.
-    assert.deepEqual({ ...CAM_PRESETS.classic },
-        { fov: 40, y: 46, z: 112, lookY: 8, lookZ: -165 });
-    for (const [id, p] of Object.entries(CAM_PRESETS)) {
-        for (const f of ['fov', 'y', 'z', 'lookY', 'lookZ']) {
-            assert.ok(Number.isFinite(p[f]), id + '.' + f + ' is a number');
-        }
-        assert.ok(p.y > 0 && p.z > 0, id + ' sits above and behind the keys');
-    }
-    assert.equal(readCameraSetting(), 'overhead'); // no localStorage in the vm → tuned default
-});
-
-test('camera default look is unchanged: overhead bakes the old tuned tilt, camTilt is neutral', () => {
-    const { CAM_PRESETS, FX_DEFAULTS } = load().slopsmithViz_keys_highway_3d.__test;
-    const CAM_TILT_UNITS = 55; // full-swing of the camTilt offset at ±1 (screen.js)
-    // The shipped default look = overhead preset + the default camTilt. Before,
-    // that was lookY 0 + (−0.6 × 55) = −33; the tuned aim now lives in the
-    // preset (lookY −33) with a neutral camTilt (0), so the effective aim — and
-    // thus the out-of-the-box framing — is byte-identical.
-    const effOverhead = CAM_PRESETS.overhead.lookY + FX_DEFAULTS.camTilt * CAM_TILT_UNITS;
-    assert.equal(effOverhead, -33);
-    // 'classic' + the neutral default reproduces the historical LOOK_Y (8) —
-    // the "pick Classic for the original look" promise, now actually true.
-    const effClassic = CAM_PRESETS.classic.lookY + FX_DEFAULTS.camTilt * CAM_TILT_UNITS;
-    assert.equal(effClassic, 8);
-});
-
-test('keys3dSetCamera: persists + dispatches valid ids, ignores unknown', () => {
-    const store = {};
-    const events = [];
-    const win = load({
-        localStorage: {
-            getItem: (k) => (k in store ? store[k] : null),
-            setItem: (k, v) => { store[k] = v; },
-        },
-        dispatchEvent: (ev) => { events.push(ev); return true; },
-        CustomEvent: class CustomEvent {
-            constructor(type, opts) { this.type = type; this.detail = opts && opts.detail; }
-        },
-    });
-    win.keys3dSetCamera('overhead');
-    assert.equal(store.keys3d_bg_camera, 'overhead');
-    assert.equal(events.length, 1);
-    assert.equal(events[0].type, 'keys3d:settings');
-    assert.equal(events[0].detail.camera, 'overhead');
-    win.keys3dSetCamera('helicopter');
-    assert.equal(store.keys3d_bg_camera, 'overhead');
-    assert.equal(events.length, 1);
-    const { readCameraSetting } = win.slopsmithViz_keys_highway_3d.__test;
-    assert.equal(readCameraSetting(), 'overhead');
-    store.keys3d_bg_camera = 'garbage';
-    assert.equal(readCameraSetting(), 'overhead');
-});
-
-/* ── Flat-sharps / piano-shaped lanes (feat/keys3d-flat-lanes) ───────── */
-
-test('FX defaults: octave separators on, lanes off (minimal default look)', () => {
-    const { FX_DEFAULTS } = load().slopsmithViz_keys_highway_3d.__test;
-    assert.equal(FX_DEFAULTS.octaveGaps, true);   // octave separators ship on
-    assert.equal(FX_DEFAULTS.laneOpacity, 0.0);   // dark floor + guide lines by default
-    assert.equal(FX_DEFAULTS.octaveContrast, 0.5);
-    // Sharp LAYOUT is a string setting, not an FX bool.
-    assert.equal('flatSharps' in FX_DEFAULTS, false);
-    assert.equal('laneColors' in FX_DEFAULTS, false); // superseded by laneOpacity
-});
-
-test('keys3dSetFx: highway-layout controls persist (bool + sliders)', () => {
-    const store = {};
-    const win = load({
-        localStorage: {
-            getItem: (k) => (k in store ? store[k] : null),
-            setItem: (k, v) => { store[k] = v; },
-        },
-        dispatchEvent: () => true,
-        CustomEvent: class { constructor(t, o) { this.type = t; this.detail = o && o.detail; } },
-    });
-    win.keys3dSetFx('octaveGaps', true);
-    assert.equal(store.keys3d_bg_octaveGaps, '1');
-    // laneOpacity / octaveContrast are 0-1 numbers, persisted verbatim + clamped.
-    win.keys3dSetFx('laneOpacity', 0.35);
-    assert.equal(store.keys3d_bg_laneOpacity, '0.35');
-    win.keys3dSetFx('laneOpacity', 5); // clamps to the 0-1 range
-    assert.equal(store.keys3d_bg_laneOpacity, '1');
-    win.keys3dSetFx('octaveContrast', 0.8);
-    assert.equal(store.keys3d_bg_octaveContrast, '0.8');
-});
-
-test('sharpMode: realistic default, validated ids, persists + dispatches', () => {
-    const bare = load().slopsmithViz_keys_highway_3d.__test;
-    assert.deepEqual([...bare.SHARP_MODES], ['floating', 'flat', 'realistic']);
-    assert.equal(bare.readSharpModeSetting(), 'realistic'); // no localStorage → default
-    const store = {};
-    const events = [];
-    const win = load({
-        localStorage: {
-            getItem: (k) => (k in store ? store[k] : null),
-            setItem: (k, v) => { store[k] = v; },
-        },
-        dispatchEvent: (ev) => { events.push(ev); return true; },
-        CustomEvent: class { constructor(t, o) { this.type = t; this.detail = o && o.detail; } },
-    });
-    win.keys3dSetSharpMode('flat'); // a non-default id, to exercise persistence
-    assert.equal(store.keys3d_bg_sharpMode, 'flat');
-    assert.equal(events[0].detail.sharpMode, 'flat');
-    assert.equal(win.slopsmithViz_keys_highway_3d.__test.readSharpModeSetting(), 'flat');
-    // Unknown id ignored (no write, no event).
-    win.keys3dSetSharpMode('bogus');
-    assert.equal(store.keys3d_bg_sharpMode, 'flat');
-    assert.equal(events.length, 1);
-});
-
-test('laneSpanFlat (V5): lanes tile with zero overlap and even the naturals', () => {
-    const { laneSpanFlat, _isBlackPc } = load().slopsmithViz_keys_highway_3d.__test;
-    const sh = 2.2, shift = 2.2 / 3;
-    const dims = { whiteW: 12, sharpHalf: sh, shift, octGap: 0.9 }; // mirrors shipped LANE_DIMS_FLAT
-    // cx for one octave: whites on integer slots, blacks on half-slots — the
-    // same slot geometry keyLayout/keyX produce (cx = slot * whiteW=12).
-    const CX = {
-        60: 0, 61: 6, 62: 12, 63: 18, 64: 24, 65: 36, 66: 42,
-        67: 48, 68: 54, 69: 60, 70: 66, 71: 72, 72: 84,
-    };
-    const midis = [60, 61, 62, 63, 64, 65, 66, 67, 68, 69, 70, 71, 72];
-    const spans = midis.map((m) => laneSpanFlat(m, _isBlackPc(m), CX[m], dims, false));
-    const wOf = (s) => s.right - s.left;
-    const w = (m) => wOf(spans[midis.indexOf(m)]);
-    // Zero-overlap tiling: every lane abuts the previous one (no gap, no overlap).
-    for (let i = 1; i < spans.length; i++) {
-        assert.ok(Math.abs(spans[i].left - spans[i - 1].right) < 1e-9, 'lane ' + midis[i] + ' abuts');
-    }
-    // Sharps are all the same width.
-    for (const m of [61, 63, 66, 68, 70]) {
-        assert.ok(Math.abs(w(m) - 2 * sh) < 1e-9, 'sharp ' + m + ' width');
-    }
-    // The lean evens the naturals: C, D, E, F, B all come out equal.
-    for (const m of [62, 64, 65, 71]) {
-        assert.ok(Math.abs(w(m) - w(60)) < 1e-9, 'natural ' + m + ' == C (evened)');
-    }
-    // G and A are the only slightly-smaller naturals (G# can't lean) — still
-    // clearly wider than a sharp, and MUCH closer to the rest than plain V2
-    // (which would leave D at 12−2·sh, far below C's 12−sh).
-    assert.ok(Math.abs(w(67) - w(69)) < 1e-9, 'G == A');
-    assert.ok(w(67) < w(60) && w(67) > 2 * sh, 'G/A a touch smaller, still wider than a sharp');
-    assert.ok(w(60) - w(67) < sh, 'natural spread is under one sharp-width');
-});
-
-test('laneSpanReal (V4): naturals uniform, sharps full-width and overlapping', () => {
-    const { laneSpanReal } = load().slopsmithViz_keys_highway_3d.__test;
-    const dims = { natHalf: 5.64, sharpHalf: 3.2, octGap: 0.9 }; // mirrors LANE_DIMS_REAL
-    const wOf = (s) => s.right - s.left;
-    // Every natural is the same full width, whatever its neighbours.
-    for (const [midi, slot] of [[60, 0], [62, 1], [64, 2], [67, 4], [71, 6]]) {
-        assert.ok(Math.abs(wOf(laneSpanReal(midi, false, slot * 12, dims, false)) - 2 * 5.64) < 1e-9,
-            'natural ' + midi + ' uniform');
-    }
-    // Sharps are the full (wider) black-key width and overlap their naturals.
-    const C = laneSpanReal(60, false, 0, dims, false);
-    const Cs = laneSpanReal(61, true, 6, dims, false);
-    assert.ok(Math.abs(wOf(Cs) - 2 * 3.2) < 1e-9, 'sharp full width');
-    assert.ok(Cs.left < C.right, 'sharp overlaps (tucks over) the natural');
-});
-
-test('laneSpanFlat (V5): octaveGaps widens B→C by octGap, sharps unaffected', () => {
-    const { laneSpanFlat } = load().slopsmithViz_keys_highway_3d.__test;
-    const dims = { whiteW: 12, sharpHalf: 2.2, shift: 2.2 / 3, octGap: 0.9 };
-    const gapOff = laneSpanFlat(72, false, 84, dims, false).left - laneSpanFlat(71, false, 72, dims, false).right;
-    const gapOn = laneSpanFlat(72, false, 84, dims, true).left - laneSpanFlat(71, false, 72, dims, true).right;
-    assert.ok(Math.abs((gapOn - gapOff) - dims.octGap) < 1e-9, 'B→C divider grows by octGap');
-    // Sharps are unaffected by the octave-gap option.
-    const s = laneSpanFlat(61, true, 6, dims, true);
-    assert.ok(Math.abs((s.right - s.left) - 2 * dims.sharpHalf) < 1e-9, 'sharp width unchanged by gaps');
-});
-
-test('laneSpanFlat (V5): active-range boundary key is NOT trimmed by an out-of-range neighbor sharp', () => {
-    const { laneSpanFlat } = load().slopsmithViz_keys_highway_3d.__test;
-    const dims = { whiteW: 12, sharpHalf: 2.2, shift: 2.2 / 3, octGap: 0.9 }; // mirrors LANE_DIMS_FLAT
-    // F (midi 65, cx 36): its upper neighbor F# (66) is a sharp. When F sits
-    // at range.activeHigh and F# is excluded from the active range, F# never
-    // gets a lane drawn (see the activeLow/activeHigh skip around the
-    // lane-strip loop) — trimming F's right edge for it would leave a dark,
-    // unfilled sliver. The edge should stay full instead.
-    const highBoundary = { activeLow: 60, activeHigh: 65 };
-    const fAtBoundary = laneSpanFlat(65, false, 36, dims, false, highBoundary);
-    assert.ok(Math.abs(fAtBoundary.right - (36 + dims.whiteW / 2)) < 1e-9,
-        'F right edge stays full when F# is out of the active range');
-    // Same key, but now F# IS in the active range: normal zero-overlap
-    // tiling applies — the trim matches the ungated (no-range) call exactly,
-    // so in-range geometry is unaffected by this fix.
-    const highIncluded = { activeLow: 60, activeHigh: 66 };
-    const fWithSharpInRange = laneSpanFlat(65, false, 36, dims, false, highIncluded);
-    const fUngated = laneSpanFlat(65, false, 36, dims, false);
-    assert.ok(Math.abs(fWithSharpInRange.right - fUngated.right) < 1e-9,
-        'F trims normally once F# is back in range');
-    assert.ok(fWithSharpInRange.right < fAtBoundary.right, 'in-range trim is narrower than the boundary full edge');
-
-    // Symmetric case on the low edge: D (midi 62, cx 12), lower neighbor C#
-    // (61) excluded when D sits at range.activeLow.
-    const lowBoundary = { activeLow: 62, activeHigh: 72 };
-    const dAtBoundary = laneSpanFlat(62, false, 12, dims, false, lowBoundary);
-    assert.ok(Math.abs(dAtBoundary.left - (12 - dims.whiteW / 2)) < 1e-9,
-        'D left edge stays full when C# is out of the active range');
-    const lowIncluded = { activeLow: 61, activeHigh: 72 };
-    const dWithSharpInRange = laneSpanFlat(62, false, 12, dims, false, lowIncluded);
-    const dUngated = laneSpanFlat(62, false, 12, dims, false);
-    assert.ok(Math.abs(dWithSharpInRange.left - dUngated.left) < 1e-9,
-        'D trims normally once C# is back in range');
-});
-

plugins/tuner/plugin.json

@@ -1,7 +1,7 @@
 {
   "id": "tuner",
   "name": "Guitar/Bass Tuner",
-  "version": "1.3.4",
+  "version": "1.3.3",
   "bundled": true,
   "private": false,
   "script": "screen.js",

plugins/tuner/utils/ui.js

@@ -869,15 +869,8 @@ window._tunerUI = function(state, actions) {
         btn.textContent = 'Tuner';
         btn.title = 'Open Tuner';
         btn.onclick = window.tuner.toggle;
-        // Anchor to the last DIRECT-child button of `controls` (the classic
-        // transport's close/exit button). A bare `button:last-child` can match
-        // a NESTED button that is not a direct child of `controls`, and
-        // `insertBefore()` then throws NotFoundError — which propagated out of
-        // the player-screen transition and aborted its render (feedBack#800).
-        // `:scope > button:last-of-type` restricts the anchor to a direct child;
-        // the parentNode check is a belt-and-suspenders guard before insertBefore.
-        const closeBtn = isV3 ? null : controls.querySelector(':scope > button:last-of-type');
-        if (closeBtn && closeBtn.parentNode === controls) controls.insertBefore(btn, closeBtn);
+        const closeBtn = isV3 ? null : controls.querySelector('button:last-child');
+        if (closeBtn) controls.insertBefore(btn, closeBtn);
         else controls.appendChild(btn);
         updatePlayerButton();
     }

server.py

@@ -1348,23 +1348,16 @@ class MetadataDB:
         return [{"tag": r[0], "count": r[1]} for r in rows]
 
     def user_meta_map(self, filenames) -> dict:
-        """Batch {filename: user_difficulty} for a set of rows (set values
-        only). Lets query_page / query_artists embed difficulty without an
-        N+1. Chunked under SQLite's variable limit — query_artists can pass
-        every song across 50 artists, well past a single IN (...)."""
+        """Batch {filename: user_difficulty} for a page of rows (set values
+        only). Lets query_page embed difficulty without an N+1."""
         fns = list(filenames)
-        out: dict = {}
-        for i in range(0, len(fns), 400):
-            chunk = fns[i:i + 400]
-            if not chunk:
-                break
-            ph = ",".join("?" * len(chunk))
-            rows = self.conn.execute(
-                f"SELECT filename, user_difficulty FROM song_user_meta "
-                f"WHERE filename IN ({ph}) AND user_difficulty IS NOT NULL", chunk).fetchall()
-            for fn, diff in rows:
-                out[fn] = diff
-        return out
+        if not fns:
+            return {}
+        ph = ",".join("?" * len(fns))
+        rows = self.conn.execute(
+            f"SELECT filename, user_difficulty FROM song_user_meta "
+            f"WHERE filename IN ({ph}) AND user_difficulty IS NOT NULL", fns).fetchall()
+        return {r[0]: r[1] for r in rows}
 
     def tags_map(self, filenames) -> dict:
         """Batch {filename: [tags]} for a page of rows."""
@@ -4114,18 +4107,6 @@ class MetadataDB:
                 "((SELECT MAX(best_accuracy) FROM song_stats s WHERE s.filename = songs.filename) IS NULL) ASC, "
                 "(SELECT MAX(best_accuracy) FROM song_stats s WHERE s.filename = songs.filename) DESC"
             ),
-            # Personal difficulty rating (song_user_meta.user_difficulty, 1..5 —
-            # manually set or seeded by the difficulty_tagger plugin), via a
-            # correlated subquery like mastery above (drops to OFFSET paging).
-            # Unrated songs push to the bottom in both directions.
-            "difficulty": (
-                "((SELECT user_difficulty FROM song_user_meta u WHERE u.filename = songs.filename) IS NULL) ASC, "
-                "(SELECT user_difficulty FROM song_user_meta u WHERE u.filename = songs.filename) ASC"
-            ),
-            "difficulty-desc": (
-                "((SELECT user_difficulty FROM song_user_meta u WHERE u.filename = songs.filename) IS NULL) ASC, "
-                "(SELECT user_difficulty FROM song_user_meta u WHERE u.filename = songs.filename) DESC"
-            ),
         }
         if group and sort in ("mastery", "mastery-desc"):
             # Sort law (§7.1): mastery aggregates MAX across the WHOLE group —
@@ -4400,11 +4381,6 @@ class MetadataDB:
         from collections import OrderedDict
         estd = self._estd_set()
         favs = self.favorite_set()
-        # Personal difficulty rides along here too (feedBack#810 follow-up),
-        # same batched pattern as query_page — without this the tree view's
-        # difficulty badge silently never renders (song.user_difficulty was
-        # always undefined for every row).
-        udm = self.user_meta_map([r[0] for r in rows])
         artists = OrderedDict()
         for r in rows:
             artist = r[2] or "Unknown Artist"
@@ -4426,7 +4402,6 @@ class MetadataDB:
                 "tuning_name": r[12] or "",
                 "has_estd": r[0] in estd,
                 "favorite": r[0] in favs,
-                "user_difficulty": udm.get(r[0]),
             })
 
         # Pick most common name variant per artist/album
@@ -10790,9 +10765,6 @@ def save_settings(data: dict):
     config_file = CONFIG_DIR / "config.json"
     updates: dict = {}
     messages: list[str] = []
-    # Named dlc_warnings (not `warnings`) so it can't shadow the module-level
-    # `import warnings` used elsewhere in this file.
-    dlc_warnings: list[str] = []
 
     if "dlc_dir" in data:
         dlc_path = data["dlc_dir"]
@@ -10812,16 +10784,7 @@ def save_settings(data: dict):
                             if f.suffix.lower() in sloppak_mod.SONG_EXTS)
                 messages.append(f"DLC folder: {count} song files found")
             else:
-                # A non-resolving DLC path (a stale value, an unplugged
-                # external/network drive, or a path carried over from another
-                # machine) must NOT abort the whole POST. saveSettings() bundles
-                # dlc_dir together with demucs_server_url / default_arrangement /
-                # av_offset_ms in a single request, so an early `return` here
-                # silently dropped every co-submitted key — this is the "can't
-                # set the Demucs server address" report (feedBack-demucs-server
-                # #3). Record it as a warning, skip persisting dlc_dir, and keep
-                # validating the rest so the other settings still save.
-                dlc_warnings.append(f"DLC directory not found: {dlc_path}")
+                return {"error": f"DLC directory not found: {dlc_path}"}
 
     # Both of these are consumed downstream as strings (e.g.
     # demucs_server_url.rstrip('/')), so reject non-string shapes
@@ -11078,15 +11041,7 @@ def save_settings(data: dict):
                 return {"error": str(exc)}
             cfg = settings_with_instrument_profiles(cfg)
         _atomic_write_file(config_file, json.dumps(cfg, indent=2).encode("utf-8"))
-    resp = {"message": ". ".join(messages) if messages else "Settings saved"}
-    if dlc_warnings:
-        # `warnings` is an additive response field (existing clients read
-        # `message || error`); fold the text into `message` too so the current
-        # settings status line still surfaces the bad DLC path even though the
-        # rest of the save succeeded.
-        resp["warnings"] = dlc_warnings
-        resp["message"] = resp["message"] + " — " + "; ".join(dlc_warnings)
-    return resp
+    return {"message": ". ".join(messages) if messages else "Settings saved"}
 
 
 # Keys a client "Reset {category}" action may clear. Resetting removes the key

static/app.js

@@ -1110,7 +1110,6 @@ const _LIB_VIEW_VALUES = new Set(['grid', 'tree', 'folder']);
 const _LIB_SORT_VALUES = new Set([
     'artist', 'artist-desc', 'title', 'title-desc',
     'recent', 'year-desc', 'year', 'tuning',
-    'difficulty', 'difficulty-desc',
 ]);
 const _LIB_FORMAT_VALUES = new Set(['', 'sloppak', 'loose']);
 // Tree-view expand/collapse persistence. Three states per tree:
@@ -2079,7 +2078,6 @@ function renderGridCards(songs, containerId = 'lib-grid', mode = 'replace') {
                     ${(() => { const _nm = _getArrangementNamingMode(); return (song.arrangements || []).map(a => _arrangementBadgeHtml(a, _nm)).join(''); })()}
                     ${tuning ? `<span class="px-1.5 py-0.5 rounded ${tuning === 'E Standard' ? 'bg-green-900/30 text-green-400' : 'bg-yellow-900/30 text-yellow-400'}">${esc(tuning)}</span>` : ''}
                     ${song.has_lyrics ? `<span class="px-1.5 py-0.5 bg-purple-900/30 rounded text-purple-300">Lyrics</span>` : ''}
-                    ${song.user_difficulty != null ? `<span class="px-1.5 py-0.5 bg-blue-900/30 rounded text-blue-300" title="Your difficulty rating">◆${esc(song.user_difficulty)}</span>` : ''}
                     ${duration ? `<span class="text-gray-600">${duration}</span>` : ''}
                 </div>
                 ${retuneBtn}
@@ -2279,8 +2277,6 @@ async function renderTreeInto(containerId, countId, stats, letter, q, favoritesO
                     html += `<span class="px-1.5 py-0.5 rounded ${tuning === 'E Standard' ? 'bg-green-900/30 text-green-400' : 'bg-yellow-900/30 text-yellow-400'}">${esc(tuning)}</span>`;
                 if (song.has_lyrics)
                     html += `<span class="px-1.5 py-0.5 bg-purple-900/30 rounded text-purple-300">Lyrics</span>`;
-                if (song.user_difficulty != null)
-                    html += `<span class="px-1.5 py-0.5 bg-blue-900/30 rounded text-blue-300" title="Your difficulty rating">◆${esc(song.user_difficulty)}</span>`;
                 if (duration)
                     html += `<span class="text-gray-600 w-10 text-right">${duration}</span>`;
                 if (stdRetune)
@@ -4383,7 +4379,7 @@ async function uploadSongs(fileList) {
         if (lower.endsWith('.feedpak') || lower.endsWith('.sloppak')) {
             files.push(f);
         } else {
-            failures.push(`${f.name}: only .feedpak or .sloppak accepted`);
+            failures.push(`${f.name}: only .feedpak accepted`);
         }
     }
     if (files.length === 0) {

static/index.html

@@ -119,8 +119,6 @@
                         <option value="year-desc">Year (newest)</option>
                         <option value="year">Year (oldest)</option>
                         <option value="tuning">Tuning</option>
-                        <option value="difficulty">Difficulty (easiest first)</option>
-                        <option value="difficulty-desc">Difficulty (hardest first)</option>
                     </select>
                     <!-- Format filter (shared) -->
                     <select id="lib-format" onchange="sortLibrary()"

static/v3/index.html

@@ -194,7 +194,7 @@
 
     <!-- Hidden file input shared by the navbar "Upload" link. Kept at body
          level so it stays reachable regardless of which screen is active. -->
-    <input type="file" id="upload-songs-file" accept=".feedpak,.sloppak" multiple class="hidden" onchange="uploadSongs(this.files); this.value=''">
+    <input type="file" id="upload-songs-file" accept=".sloppak" multiple class="hidden" onchange="uploadSongs(this.files); this.value=''">
 
     <!-- ══ HOME (Hero + Library) — reused as the v3 "Songs" screen ════════ -->
     <div id="home" class="screen">
@@ -641,12 +641,7 @@
                             </div>
                         </div>
                         <div class="fb-srow-control">
-                            <!-- Autosave on blur/enter via a single-key POST (like every other v3
-                                 setting), so setting the address never depends on the shared Save
-                                 button — whose bundled dlc_dir could otherwise block it. Save button
-                                 kept for discoverability. -->
                             <input type="text" id="demucs-server-url" placeholder="http://192.168.1.100:7865"
-                                onchange="persistSetting('demucs_server_url', this.value.trim())"
                                 class="bg-dark-700 border border-gray-800 rounded-xl px-4 py-2.5 text-sm text-gray-300 placeholder-gray-600 focus:border-accent/50 outline-none">
                             <button onclick="saveSettings()" class="bg-accent hover:bg-accent-light px-6 py-2.5 rounded-xl text-sm font-semibold text-white transition">Save</button>
                         </div>

static/v3/songs.js

@@ -38,9 +38,6 @@
         // Mastery = best accuracy across arrangements (song_stats); unscored songs
         // sort last either way. Ascending surfaces what needs work; never default.
         ['mastery', 'Needs practice first'], ['mastery-desc', 'Most mastered first'],
-        // Personal difficulty (song_user_meta.user_difficulty, 1-5); unrated
-        // songs sort last either way.
-        ['difficulty', 'Difficulty (easiest first)'], ['difficulty-desc', 'Difficulty (hardest first)'],
     ];
     const FORMATS = [['', 'All formats'], ['sloppak', 'Feedpak'], ['loose', 'Folder']];
     const ARRANGEMENTS = ['Lead', 'Rhythm', 'Bass', 'Combo', 'Vocals'];
@@ -169,15 +166,15 @@
         const f = saved.filters;
         if (f && typeof f === 'object') {
             const arr = (x) => (Array.isArray(x) ? x.slice() : []);
-            // mastery + match + genre are session-only facets (deliberately not
+            // mastery + match are session-only facets (deliberately not
             // persisted), but the restored object must still CARRY the keys —
-            // the filter drawer indexes f.mastery/f.match/f.genre unconditionally,
-            // so dropping them here breaks the drawer for anyone with saved prefs.
+            // the filter drawer indexes f.mastery/f.match unconditionally, so
+            // dropping them here breaks the drawer for anyone with saved prefs.
             state.filters = {
                 arr_has: arr(f.arr_has), arr_lacks: arr(f.arr_lacks),
                 stem_has: arr(f.stem_has), stem_lacks: arr(f.stem_lacks),
                 lyrics: f.lyrics || '', tunings: arr(f.tunings),
-                mastery: [], match: [], genre: [],
+                mastery: [], match: [],
             };
         }
     }
@@ -2824,7 +2821,7 @@
             '<div class="flex items-center justify-between"><h3 class="text-lg font-semibold text-fb-text">Filters</h3>' +
             '<button data-drawer-close class="text-fb-textDim hover:text-fb-text">✕</button></div>' +
             section('Arrangements', ARRANGEMENTS.map((a) => triPill('arr', a, a, triState(f.arr_has, f.arr_lacks, a))).join('')) +
-            section('Stems (feedpak)', STEMS.map((s) => triPill('stem', s, s, triState(f.stem_has, f.stem_lacks, s))).join('')) +
+            section('Stems (sloppak)', STEMS.map((s) => triPill('stem', s, s, triState(f.stem_has, f.stem_lacks, s))).join('')) +
             section('Lyrics', ['', '1', '0'].map((v) => '<button data-lyrics="' + v + '" class="px-2 py-1 rounded-md text-xs border ' + (f.lyrics === v ? 'bg-fb-primary text-white border-fb-primary' : 'bg-gray-800/50 text-fb-textDim border-gray-700') + '">' + (v === '' ? 'Any' : v === '1' ? 'Has lyrics' : 'No lyrics') + '</button>').join('')) +
             // Progress (mastery bands) — multi-select; server filters via song_stats.
             section('Progress', [['mastered', 'Mastered'], ['in_progress', 'In progress'], ['not_started', 'Not started']].map((it) => '<button data-mastery="' + it[0] + '" class="px-2 py-1 rounded-md text-xs border ' + (f.mastery.includes(it[0]) ? 'bg-fb-primary text-white border-fb-primary' : 'bg-gray-800/50 text-fb-textDim border-gray-700') + '">' + it[1] + '</button>').join('')) +

tests/plugins/tuner/js/inject_player_button.test.js

@@ -1,191 +0,0 @@
-// Regression test for feedBack#800: tuner injectPlayerButton() must anchor the
-// injected button to a DIRECT-child button of #player-controls. The old
-// `controls.querySelector('button:last-child')` could resolve to a NESTED
-// button, and `controls.insertBefore(btn, nestedButton)` then throws
-// NotFoundError — which propagated out of the player-screen transition and
-// aborted its render.
-//
-// Same isolation strategy as the core tests/js suite: extract the real function
-// from source with extractFunction() and run it in a vm sandbox over a small
-// but faithful DOM model. The model's insertBefore() enforces the real DOM
-// invariant (reference node must be a direct child, else NotFoundError), and
-// querySelector() implements the exact semantics of both the old
-// (`button:last-child`) and new (`:scope > button:last-of-type`) selectors — so
-// reverting the fix makes this test throw.
-
-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 { extractFunction } = require('../../../js/test_utils');
-
-const UI_JS = path.join(__dirname, '..', '..', '..', '..', 'plugins', 'tuner', 'utils', 'ui.js');
-const SRC = fs.readFileSync(UI_JS, 'utf8');
-const FN_SRC = extractFunction(SRC, 'function injectPlayerButton(');
-
-// ── Minimal, faithful DOM model ──────────────────────────────────────────────
-
-class El {
-    constructor(tag, id = '') {
-        this.tagName = tag.toUpperCase();
-        this.id = id;
-        this.children = [];
-        this.parentNode = null;
-        this.textContent = '';
-        this.title = '';
-        this.onclick = null;
-    }
-    appendChild(node) {
-        node.parentNode = this;
-        this.children.push(node);
-        return node;
-    }
-    insertBefore(node, ref) {
-        const idx = this.children.indexOf(ref);
-        if (ref == null || idx === -1) {
-            // Faithful to the browser: ref must be a direct child.
-            const e = new Error(
-                "Failed to execute 'insertBefore' on 'Node': The node before which the "
-                + 'new node is to be inserted is not a child of this node.'
-            );
-            e.name = 'NotFoundError';
-            throw e;
-        }
-        node.parentNode = this;
-        this.children.splice(idx, 0, node);
-        return node;
-    }
-    querySelector(sel) {
-        if (sel === ':scope > button:last-of-type') {
-            // Last direct-child <button>.
-            const btns = this.children.filter((c) => c.tagName === 'BUTTON');
-            return btns.length ? btns[btns.length - 1] : null;
-        }
-        if (sel === 'button:last-child') {
-            // First descendant <button> (document order) that is the last child
-            // of its own parent — the buggy legacy anchor.
-            let found = null;
-            const walk = (node) => {
-                for (const c of node.children) {
-                    if (found) return;
-                    const isLast = c.parentNode.children[c.parentNode.children.length - 1] === c;
-                    if (c.tagName === 'BUTTON' && isLast) { found = c; return; }
-                    walk(c);
-                }
-            };
-            walk(this);
-            return found;
-        }
-        throw new Error(`unhandled selector in stub: ${sel}`);
-    }
-}
-
-function findById(node, id) {
-    if (!node) return null;
-    if (node.id === id) return node;
-    for (const c of node.children) {
-        const r = findById(c, id);
-        if (r) return r;
-    }
-    return null;
-}
-
-// Run the extracted injectPlayerButton() against a given controls tree.
-// Returns { controls, threw }.
-function run({ controls, isV3 = false, slot = null }) {
-    const roots = [controls, slot].filter(Boolean);
-    const document = {
-        getElementById(id) {
-            if (id === 'player-controls') return controls;
-            for (const r of roots) {
-                const hit = findById(r, id);
-                if (hit) return hit;
-            }
-            return null;
-        },
-        createElement(tag) { return new El(tag); },
-    };
-    const window = {
-        feedBack: isV3
-            ? { uiVersion: 'v3', ui: { playerControlSlot: () => slot } }
-            : { uiVersion: 'v2' },
-        tuner: { toggle: () => {} },
-    };
-    const sandbox = {
-        window,
-        document,
-        Element: El,
-        updatePlayerButton: () => {},
-    };
-    vm.createContext(sandbox);
-    let threw = null;
-    try {
-        vm.runInContext(FN_SRC + '\nglobalThis.__run = injectPlayerButton;\n__run();', sandbox);
-    } catch (e) {
-        threw = e;
-    }
-    return { controls, slot, threw };
-}
-
-// ── Tests ────────────────────────────────────────────────────────────────────
-
-test('does not throw when the last button is nested (feedBack#800 repro)', () => {
-    // controls > div.transport > [play, close]; `close` is button:last-child of
-    // the div but NOT a direct child of controls. The old anchor threw here.
-    const controls = new El('div', 'player-controls');
-    const transport = new El('div');
-    transport.appendChild(new El('button', 'play'));
-    transport.appendChild(new El('button', 'close'));
-    controls.appendChild(transport);
-
-    const { threw } = run({ controls });
-    assert.equal(threw, null, threw && threw.message);
-    // With no direct-child button, it appends to controls.
-    assert.ok(findById(controls, 'btn-tuner-player'), 'tuner button was added');
-    assert.equal(controls.children[controls.children.length - 1].id, 'btn-tuner-player');
-});
-
-test('inserts before the last direct-child button when one exists', () => {
-    const controls = new El('div', 'player-controls');
-    controls.appendChild(new El('button', 'play'));
-    controls.appendChild(new El('button', 'close'));
-
-    const { threw } = run({ controls });
-    assert.equal(threw, null, threw && threw.message);
-    const ids = controls.children.map((c) => c.id);
-    // tuner button sits immediately before the last direct-child button.
-    assert.deepEqual(ids, ['play', 'btn-tuner-player', 'close']);
-});
-
-test('appends when controls has no buttons at all', () => {
-    const controls = new El('div', 'player-controls');
-    controls.appendChild(new El('span'));
-    const { threw } = run({ controls });
-    assert.equal(threw, null, threw && threw.message);
-    assert.equal(controls.children[controls.children.length - 1].id, 'btn-tuner-player');
-});
-
-test('is idempotent — a second call does not add a duplicate', () => {
-    const controls = new El('div', 'player-controls');
-    controls.appendChild(new El('button', 'close'));
-    run({ controls });
-    run({ controls });
-    const injected = controls.children.filter((c) => c.id === 'btn-tuner-player');
-    assert.equal(injected.length, 1);
-});
-
-test('v3 mounts into the plugin-control slot and never uses the legacy anchor', () => {
-    const slot = new El('div', 'plugin-control-slot');
-    // A nested button in the slot would trip the legacy anchor; v3 must ignore it.
-    const inner = new El('div');
-    inner.appendChild(new El('button', 'other'));
-    slot.appendChild(inner);
-    const controls = new El('div', 'player-controls');
-
-    const { threw } = run({ controls, isV3: true, slot });
-    assert.equal(threw, null, threw && threw.message);
-    assert.ok(findById(slot, 'btn-tuner-player'), 'tuner button mounted into the slot');
-    assert.equal(findById(controls, 'btn-tuner-player'), null, 'not mounted into #player-controls');
-});

tests/test_gp2rs_drums.py

@@ -223,15 +223,15 @@ def test_unmapped_percussion_silently_skipped(monkeypatch):
 
 def test_unmapped_percussion_reported_via_out_unmapped(monkeypatch):
     """Opting in via out_unmapped records the dropped MIDI notes (count +
-    times + velocities) so a caller can surface a warning / mapping UI."""
+    times) so a caller can surface a warning / mapping UI."""
     _setup(monkeypatch)
     track = _fake_track(
         string_midis=[56, 36, 54],
         beats=[
-            (0.0, [_fake_note(string_idx=1, velocity=88)]),  # cowbell — drop
-            (1.0, [_fake_note(string_idx=2)]),               # kick — keep
-            (1.5, [_fake_note(string_idx=3, velocity=25)]),  # tambourine — drop
-            (2.0, [_fake_note(string_idx=1, velocity=44)]),  # cowbell again — drop
+            (0.0, [_fake_note(string_idx=1)]),   # cowbell — drop
+            (1.0, [_fake_note(string_idx=2)]),   # kick — keep
+            (1.5, [_fake_note(string_idx=3)]),   # tambourine — drop
+            (2.0, [_fake_note(string_idx=1)]),   # cowbell again — drop
         ],
     )
     song = SimpleNamespace(tracks=[track])
@@ -247,44 +247,6 @@ def test_unmapped_percussion_reported_via_out_unmapped(monkeypatch):
     # Times are captured (rounded to 3 dp).
     assert unmapped[56]["times"] == [0.0, 2.0]
     assert unmapped[54]["times"] == [1.5]
-    # Velocities ride index-aligned with times — the mapping UI can carry
-    # the source dynamics through instead of flattening to a default.
-    assert unmapped[56]["velocities"] == [88, 44]
-    assert unmapped[54]["velocities"] == [25]
-
-
-def test_unmapped_velocities_sort_in_lockstep_with_times(monkeypatch):
-    """Multi-voice measures can capture times out of order; the final sort
-    must reorder velocities WITH their times, not leave them behind."""
-    _setup(monkeypatch)
-    track = _fake_track(
-        string_midis=[56],
-        beats=[
-            # Deliberately reversed chronology within the measure.
-            (2.0, [_fake_note(string_idx=1, velocity=44)]),
-            (0.0, [_fake_note(string_idx=1, velocity=88)]),
-        ],
-    )
-    song = SimpleNamespace(tracks=[track])
-    unmapped: dict[int, dict] = {}
-    gp2rs.convert_drum_track_to_drumtab(song, 0, out_unmapped=unmapped)
-    assert unmapped[56]["times"] == [0.0, 2.0]
-    assert unmapped[56]["velocities"] == [88, 44], \
-        "velocity must follow its time through the sort"
-
-
-def test_unmapped_out_of_range_velocity_falls_back_to_default(monkeypatch):
-    """A corrupt/zero GP velocity records the 100 import default rather
-    than poisoning the aligned list."""
-    _setup(monkeypatch)
-    track = _fake_track(
-        string_midis=[56],
-        beats=[(0.0, [_fake_note(string_idx=1, velocity=0)])],
-    )
-    song = SimpleNamespace(tracks=[track])
-    unmapped: dict[int, dict] = {}
-    gp2rs.convert_drum_track_to_drumtab(song, 0, out_unmapped=unmapped)
-    assert unmapped[56]["velocities"] == [100]
 
 
 def test_zero_velocity_omitted_from_wire(monkeypatch):

tests/test_library_filters.py

@@ -293,45 +293,6 @@ def test_year_sort_asc_oldest_first(client, seeded):
     assert files == ["b.archive", "a.archive", "f.archive", "d.sloppak", "c.sloppak", "e.sloppak"]
 
 
-def test_difficulty_sort_pushes_unrated_to_bottom(client, server_mod):
-    """Personal difficulty (song_user_meta.user_difficulty) sorts like
-    mastery: an unrated (NULL) row must fall to the bottom in BOTH
-    directions rather than colliding with a real 1..5 rating at either
-    end."""
-    _put(server_mod, filename="easy.archive", title="Easy", artist="A",
-         arrangements=[{"index": 0, "name": "Lead", "notes": 1}])
-    _put(server_mod, filename="hard.archive", title="Hard", artist="B",
-         arrangements=[{"index": 0, "name": "Lead", "notes": 1}])
-    _put(server_mod, filename="unrated.archive", title="Unrated", artist="C",
-         arrangements=[{"index": 0, "name": "Lead", "notes": 1}])
-    server_mod.meta_db.set_song_user_meta("easy.archive", user_difficulty=1)
-    server_mod.meta_db.set_song_user_meta("hard.archive", user_difficulty=5)
-
-    asc = [s["filename"] for s in _get(client, sort="difficulty")["songs"]]
-    assert asc == ["easy.archive", "hard.archive", "unrated.archive"]
-
-    desc = [s["filename"] for s in _get(client, sort="difficulty-desc")["songs"]]
-    assert desc == ["hard.archive", "easy.archive", "unrated.archive"]
-
-
-def test_tree_view_songs_carry_user_difficulty(client, server_mod):
-    """`/api/library/artists` (the classic tree view's `query_artists`) must
-    batch-attach `user_difficulty` the same way `query_page` does for the
-    grid — otherwise the tree view's difficulty badge silently never
-    renders (song.user_difficulty stays undefined for every row)."""
-    _put(server_mod, filename="rated.archive", title="Rated", artist="A",
-         arrangements=[{"index": 0, "name": "Lead", "notes": 1}])
-    _put(server_mod, filename="unrated.archive", title="Unrated", artist="A",
-         arrangements=[{"index": 0, "name": "Lead", "notes": 1}])
-    server_mod.meta_db.set_song_user_meta("rated.archive", user_difficulty=4)
-
-    data = client.get("/api/library/artists").json()
-    songs = data["artists"][0]["albums"][0]["songs"]
-    by_filename = {s["filename"]: s for s in songs}
-    assert by_filename["rated.archive"]["user_difficulty"] == 4
-    assert by_filename["unrated.archive"]["user_difficulty"] is None
-
-
 def test_tuning_sort_down_tuned_before_up_tuned_at_same_distance(client, server_mod):
     """Within an ABS(tuning_sort_key) tier, the down-tuned variant
     must come before the up-tuned one so the order matches the chart's

tests/test_midi_import.py

@@ -277,56 +277,3 @@ def test_wire_format_shape(tmp_path):
     assert "anchors" in result
     assert "tuning" in result
     assert "capo" in result
-
-
-# ── non-positive division guard (legacy inline tempo path) ───────────────────
-
-def test_zero_division_does_not_crash(tmp_path):
-    """A malformed header (ticks_per_beat == 0) must not raise ZeroDivisionError.
-
-    The legacy inline tempo map in convert_midi_track_to_keys_wire divides by
-    ticks_per_beat at two sites; a 0 division falls back to the SMF default so
-    the note is still emitted with a sane, non-negative time.
-    """
-    mid = mido.MidiFile(ticks_per_beat=0)
-    track = mido.MidiTrack()
-    mid.tracks.append(track)
-    # Note starts after a one-"beat" rest so a bad divisor would skew its start.
-    track.append(mido.Message("note_on",  channel=0, note=60, velocity=64, time=480))
-    track.append(mido.Message("note_off", channel=0, note=60, velocity=0,  time=480))
-
-    path = _save(mid, tmp_path)
-    assert mido.MidiFile(path).ticks_per_beat == 0  # precondition: divisor is 0
-    result = convert_midi_track_to_keys_wire(path, track_index=0)
-    assert len(result["notes"]) == 1
-    n = result["notes"][0]
-    # 480-tick fallback @ 120 BPM: one beat = 0.5 s.
-    assert n["t"] == pytest.approx(0.5)
-    assert n["t"] >= 0.0
-    assert n["sus"] == pytest.approx(0.5)
-
-
-def test_smpte_negative_division_produces_nonnegative_times(tmp_path):
-    """SMPTE division (mido returns a NEGATIVE ticks_per_beat) must not yield
-    negative times through the legacy inline path.
-
-    ``or 480`` would miss this (a negative value is truthy); the ``> 0`` guard
-    falls back so the emitted note keeps a sane, non-negative start time.
-    """
-    mid = mido.MidiFile()
-    mid.ticks_per_beat = -1  # simulate a SMPTE / malformed signed-short division
-    track = mido.MidiTrack()
-    mid.tracks.append(track)
-    track.append(mido.Message("note_on",  channel=0, note=60, velocity=64, time=480))
-    track.append(mido.Message("note_off", channel=0, note=60, velocity=0,  time=480))
-
-    path = _save(mid, tmp_path)
-    assert mido.MidiFile(path).ticks_per_beat < 0  # precondition: negative divisor
-    result = convert_midi_track_to_keys_wire(path, track_index=0)
-    assert len(result["notes"]) == 1
-    n = result["notes"][0]
-    assert n["t"] >= 0.0
-    assert n["sus"] >= 0.0
-    # 480-tick fallback @ 120 BPM: one beat = 0.5 s.
-    assert n["t"] == pytest.approx(0.5)
-    assert n["sus"] == pytest.approx(0.5)

tests/test_midi_import_drums.py

@@ -185,18 +185,18 @@ def test_unmapped_drum_note_skipped(tmp_path):
 
 def test_unmapped_drum_note_reported_via_out_unmapped(tmp_path):
     """Opting in via out_unmapped records the dropped MIDI notes (count +
-    times + velocities) so a caller can surface a warning / mapping UI."""
+    times) so a caller can surface a warning / mapping UI."""
     mid = mido.MidiFile(type=1, ticks_per_beat=480)
     track = mido.MidiTrack()
     mid.tracks.append(track)
     track.append(mido.MetaMessage("set_tempo", tempo=500000, time=0))
-    track.append(mido.Message("note_on",  channel=9, note=56, velocity=88,  time=0))    # cowbell — drop
+    track.append(mido.Message("note_on",  channel=9, note=56, velocity=100, time=0))    # cowbell — drop
     track.append(mido.Message("note_off", channel=9, note=56, velocity=0,   time=240))
     track.append(mido.Message("note_on",  channel=9, note=36, velocity=100, time=0))    # kick — keep
     track.append(mido.Message("note_off", channel=9, note=36, velocity=0,   time=240))
-    track.append(mido.Message("note_on",  channel=9, note=54, velocity=25,  time=0))    # tambourine — drop
+    track.append(mido.Message("note_on",  channel=9, note=54, velocity=100, time=0))    # tambourine — drop
     track.append(mido.Message("note_off", channel=9, note=54, velocity=0,   time=240))
-    track.append(mido.Message("note_on",  channel=9, note=56, velocity=44,  time=0))    # cowbell again — drop
+    track.append(mido.Message("note_on",  channel=9, note=56, velocity=100, time=0))    # cowbell again — drop
     track.append(mido.Message("note_off", channel=9, note=56, velocity=0,   time=240))
 
     unmapped: dict[int, dict] = {}
@@ -209,10 +209,6 @@ def test_unmapped_drum_note_reported_via_out_unmapped(tmp_path):
     # Each unmapped MIDI carries the times at which it fired (rounded 3 dp).
     assert all(isinstance(t, float) for t in unmapped[56]["times"])
     assert len(unmapped[56]["times"]) == 2
-    # Velocities ride index-aligned with times — the mapping UI can carry
-    # the source dynamics through instead of flattening to a default.
-    assert unmapped[56]["velocities"] == [88, 44]
-    assert unmapped[54]["velocities"] == [25]
 
 
 def test_non_channel9_events_ignored(tmp_path):

tests/test_midi_tempo_map.py

@@ -1,251 +0,0 @@
-"""Tests for lib/midi_import.py — convert_midi_tempo_map.
-
-The note converters always computed a tempo-aware tick→seconds map internally
-(to bake note times) and then threw it away — and never read time_signature
-meta at all — so every MIDI import landed with no bars, no measures, and an
-implied 4/4 regardless of the file. convert_midi_tempo_map extracts the grid:
-tempos, time signatures (song-timeline shape), and a full beat grid on the
-editor's row shape (numbered downbeats with a `den` hint, `-1` sub-beats).
-
-Every test drives the REAL function against a real .mid built in-memory with
-mido and saved to tmp_path — no stubs, adversarial inputs included (type-2
-scoping, mid-bar signatures, duplicate meta ticks, empty files, long files
-for rounding drift).
-
-Run: pytest tests/test_midi_tempo_map.py -v
-"""
-
-import mido
-import pytest
-
-from midi_import import _TEMPO_MAP_MAX_BARS, convert_midi_tempo_map
-
-
-# ── helpers ───────────────────────────────────────────────────────────────────
-
-def _save(mid: mido.MidiFile, tmp_path, name: str = "t.mid") -> str:
-    p = tmp_path / name
-    mid.save(str(p))
-    return str(p)
-
-
-def _note_pair(track, pitch=60, at=0, dur=240):
-    track.append(mido.Message("note_on", note=pitch, velocity=90, time=at))
-    track.append(mido.Message("note_off", note=pitch, velocity=0, time=dur))
-
-
-def _downbeats(result):
-    return [b for b in result["beats"] if b["measure"] > 0]
-
-
-def _subbeats(result):
-    return [b for b in result["beats"] if b["measure"] == -1]
-
-
-# ── the plain case ────────────────────────────────────────────────────────────
-
-def test_default_grid_is_120_bpm_four_four(tmp_path):
-    mid = mido.MidiFile(ticks_per_beat=480)
-    tr = mido.MidiTrack(); mid.tracks.append(tr)
-    _note_pair(tr, at=0, dur=480 * 8)          # two 4/4 bars of content
-    res = convert_midi_tempo_map(_save(mid, tmp_path))
-    assert res["tempos"] == [{"time": 0.0, "bpm": 120.0}]
-    assert res["time_signatures"] == [{"time": 0.0, "ts": [4, 4]}]
-    dbs = _downbeats(res)
-    assert [d["measure"] for d in dbs] == [1, 2]
-    assert [d["time"] for d in dbs] == [0.0, 2.0]      # 4 beats at 0.5 s
-    assert all(d["den"] == 4 for d in dbs)
-    # 3 interior beats per full bar at 0.5 s spacing.
-    assert [b["time"] for b in _subbeats(res)][:3] == [0.5, 1.0, 1.5]
-
-
-# ── tempo handling ────────────────────────────────────────────────────────────
-
-def test_tempo_change_bends_the_grid(tmp_path):
-    mid = mido.MidiFile(ticks_per_beat=480)
-    meta = mido.MidiTrack(); mid.tracks.append(meta)
-    meta.append(mido.MetaMessage("set_tempo", tempo=500000, time=0))       # 120
-    meta.append(mido.MetaMessage("set_tempo", tempo=250000, time=480 * 4)) # 240 at bar 2
-    notes = mido.MidiTrack(); mid.tracks.append(notes)
-    _note_pair(notes, at=0, dur=480 * 8)
-    res = convert_midi_tempo_map(_save(mid, tmp_path))
-    assert [t["bpm"] for t in res["tempos"]] == [120.0, 240.0]
-    dbs = _downbeats(res)
-    # Bar 1 spans 2.0 s at 120; bar 2 starts at 2.0 and its beats halve.
-    assert dbs[0]["time"] == 0.0 and dbs[1]["time"] == 2.0
-    bar2_subs = [b["time"] for b in _subbeats(res) if b["time"] > 2.0]
-    assert bar2_subs[:3] == [2.25, 2.5, 2.75]
-
-def test_rounding_does_not_accumulate_over_a_long_file(tmp_path):
-    # 500 bars at 120 BPM: beat times must stay exactly on the 0.5 s lattice
-    # (absolute-tick computation — never beat N derived from beat N-1).
-    mid = mido.MidiFile(ticks_per_beat=480)
-    tr = mido.MidiTrack(); mid.tracks.append(tr)
-    _note_pair(tr, at=0, dur=480 * 4 * 500)
-    res = convert_midi_tempo_map(_save(mid, tmp_path))
-    dbs = _downbeats(res)
-    assert len(dbs) == 500
-    assert dbs[-1]["time"] == pytest.approx((500 - 1) * 2.0, abs=0.0005)
-    assert dbs[250]["time"] == pytest.approx(250 * 2.0, abs=0.0005)
-
-
-# ── time signatures (the previously-unread meta) ─────────────────────────────
-
-def test_time_signature_changes_shape_the_bars(tmp_path):
-    mid = mido.MidiFile(ticks_per_beat=480)
-    meta = mido.MidiTrack(); mid.tracks.append(meta)
-    meta.append(mido.MetaMessage("time_signature", numerator=4, denominator=4, time=0))
-    meta.append(mido.MetaMessage("time_signature", numerator=3, denominator=4, time=480 * 4))
-    notes = mido.MidiTrack(); mid.tracks.append(notes)
-    _note_pair(notes, at=0, dur=480 * 10)      # 4/4 bar + two 3/4 bars
-    res = convert_midi_tempo_map(_save(mid, tmp_path))
-    assert [s["ts"] for s in res["time_signatures"]] == [[4, 4], [3, 4]]
-    dbs = _downbeats(res)
-    assert [d["time"] for d in dbs] == [0.0, 2.0, 3.5]   # 3/4 bars are 1.5 s
-    # Bar 2 has exactly two interior beats.
-    bar2 = [b for b in res["beats"] if 2.0 < b["time"] < 3.5]
-    assert [b["measure"] for b in bar2] == [-1, -1]
-
-def test_six_eight_uses_eighth_note_rows(tmp_path):
-    mid = mido.MidiFile(ticks_per_beat=480)
-    meta = mido.MidiTrack(); mid.tracks.append(meta)
-    meta.append(mido.MetaMessage("time_signature", numerator=6, denominator=8, time=0))
-    notes = mido.MidiTrack(); mid.tracks.append(notes)
-    _note_pair(notes, at=0, dur=480 * 3)       # one full 6/8 bar
-    res = convert_midi_tempo_map(_save(mid, tmp_path))
-    dbs = _downbeats(res)
-    assert dbs[0]["den"] == 8
-    bar1 = [b["time"] for b in res["beats"] if b["time"] < 1.5]
-    # Six eighth-note rows at 120 BPM (quarter = 0.5 s ⇒ eighth = 0.25 s).
-    assert bar1 == [0.0, 0.25, 0.5, 0.75, 1.0, 1.25]
-
-def test_mid_bar_signature_applies_at_the_next_boundary(tmp_path):
-    mid = mido.MidiFile(ticks_per_beat=480)
-    meta = mido.MidiTrack(); mid.tracks.append(meta)
-    # Ill-formed: 3/4 lands halfway through bar 1.
-    meta.append(mido.MetaMessage("time_signature", numerator=3, denominator=4, time=480 * 2))
-    notes = mido.MidiTrack(); mid.tracks.append(notes)
-    _note_pair(notes, at=0, dur=480 * 8)
-    res = convert_midi_tempo_map(_save(mid, tmp_path))
-    dbs = _downbeats(res)
-    # Bar 1 stays 4/4 (2.0 s); bar 2 onward is 3/4.
-    assert dbs[0]["time"] == 0.0 and dbs[0]["den"] == 4
-    # Bar 2 is the 3/4 bar, but its denominator is still 4 (3 quarter notes).
-    assert dbs[1]["time"] == 2.0 and dbs[1]["den"] == 4
-    assert dbs[2]["time"] - dbs[1]["time"] == pytest.approx(1.5, abs=0.002)
-
-def test_duplicate_signature_ticks_last_wins(tmp_path):
-    mid = mido.MidiFile(ticks_per_beat=480)
-    meta = mido.MidiTrack(); mid.tracks.append(meta)
-    meta.append(mido.MetaMessage("time_signature", numerator=4, denominator=4, time=0))
-    meta.append(mido.MetaMessage("time_signature", numerator=7, denominator=8, time=0))
-    notes = mido.MidiTrack(); mid.tracks.append(notes)
-    _note_pair(notes, at=0, dur=480 * 4)
-    res = convert_midi_tempo_map(_save(mid, tmp_path))
-    assert res["time_signatures"][-1]["ts"] == [7, 8]
-    assert _downbeats(res)[0]["den"] == 8
-
-
-# ── SMF type scoping (adversarial) ───────────────────────────────────────────
-
-def test_type2_reads_meta_from_the_chosen_track_only(tmp_path):
-    mid = mido.MidiFile(ticks_per_beat=480, type=2)
-    bogus = mido.MidiTrack(); mid.tracks.append(bogus)
-    bogus.append(mido.MetaMessage("set_tempo", tempo=100000, time=0))       # 600 BPM
-    bogus.append(mido.MetaMessage("time_signature", numerator=7, denominator=8, time=0))
-    _note_pair(bogus, at=0, dur=480)
-    real = mido.MidiTrack(); mid.tracks.append(real)
-    real.append(mido.MetaMessage("set_tempo", tempo=500000, time=0))        # 120 BPM
-    _note_pair(real, at=0, dur=480 * 4)
-    res = convert_midi_tempo_map(_save(mid, tmp_path), track_index=1)
-    # The bogus track's 600 BPM / 7-8 never leak into track 1's grid.
-    assert [t["bpm"] for t in res["tempos"]] == [120.0]
-    assert res["time_signatures"] == [{"time": 0.0, "ts": [4, 4]}]
-    assert _downbeats(res)[0]["den"] == 4
-
-
-# ── degenerate inputs ────────────────────────────────────────────────────────
-
-def test_empty_file_yields_empty_beats_but_valid_shape(tmp_path):
-    mid = mido.MidiFile(ticks_per_beat=480)
-    mid.tracks.append(mido.MidiTrack())
-    res = convert_midi_tempo_map(_save(mid, tmp_path))
-    assert res["beats"] == []
-    assert res["tempos"] == [{"time": 0.0, "bpm": 120.0}]
-    assert res["time_signatures"] == [{"time": 0.0, "ts": [4, 4]}]
-
-def test_grid_covers_all_notes_and_stops_after_them(tmp_path):
-    mid = mido.MidiFile(ticks_per_beat=480)
-    tr = mido.MidiTrack(); mid.tracks.append(tr)
-    _note_pair(tr, at=480 * 5, dur=480)        # note inside bar 2 only
-    res = convert_midi_tempo_map(_save(mid, tmp_path))
-    dbs = _downbeats(res)
-    assert dbs[0]["time"] == 0.0, "grid starts at zero (SMF convention)"
-    assert dbs[-1]["measure"] == 2
-    assert all(b["time"] <= 3.0 + 1e-9 for b in res["beats"]), \
-        "no beats past the end of musical content"
-
-
-@pytest.mark.parametrize("division", [0, -1, -25600])
-def test_non_positive_division_header_does_not_crash(tmp_path, division):
-    # A malformed header reloads with ticks_per_beat == 0; a true SMPTE-division
-    # file reloads negative (mido reads the division as a signed short). Either
-    # way the tick→seconds closure would divide by a non-positive number —
-    # raising ZeroDivisionError (0) or walking off into negative times
-    # (negative) — without the header fallback. The grid must still come out on
-    # a sane, bounded 4/4 / 120-BPM default.
-    mid = mido.MidiFile(ticks_per_beat=division)
-    tr = mido.MidiTrack(); mid.tracks.append(tr)
-    _note_pair(tr, at=0, dur=480 * 8)
-    assert mido.MidiFile(_save(mid, tmp_path)).ticks_per_beat == division  # precondition
-    res = convert_midi_tempo_map(_save(mid, tmp_path))
-    assert res["tempos"] == [{"time": 0.0, "bpm": 120.0}]
-    assert res["time_signatures"] == [{"time": 0.0, "ts": [4, 4]}]
-    dbs = _downbeats(res)
-    assert [d["measure"] for d in dbs] == [1, 2]
-    assert all(isinstance(b["time"], float) and b["time"] >= 0.0
-               for b in res["beats"])
-
-
-def test_first_tempo_after_start_seeds_default_120_at_zero(tmp_path):
-    # First (and only) set_tempo lands at bar 2. The head of the song already
-    # played at the MIDI default of 120 BPM, so the tempos sidecar must open
-    # with a 120-BPM row at time 0 — symmetric with the 4/4 signature default.
-    mid = mido.MidiFile(ticks_per_beat=480)
-    meta = mido.MidiTrack(); mid.tracks.append(meta)
-    meta.append(mido.MetaMessage("set_tempo", tempo=250000, time=480 * 4))   # 240 at bar 2
-    notes = mido.MidiTrack(); mid.tracks.append(notes)
-    _note_pair(notes, at=0, dur=480 * 8)
-    res = convert_midi_tempo_map(_save(mid, tmp_path))
-    assert res["tempos"][0] == {"time": 0.0, "bpm": 120.0}
-    assert res["tempos"][1] == {"time": 2.0, "bpm": 240.0}
-    # The seeded default actually matches the grid the head of the song used.
-    assert _downbeats(res)[0]["time"] == 0.0
-
-
-def test_type0_single_track_carries_tempo_timesig_and_notes(tmp_path):
-    # Explicit SMF format 0: one track holds tempo + signature + notes.
-    mid = mido.MidiFile(ticks_per_beat=480, type=0)
-    tr = mido.MidiTrack(); mid.tracks.append(tr)
-    tr.append(mido.MetaMessage("set_tempo", tempo=500000, time=0))            # 120
-    tr.append(mido.MetaMessage("time_signature", numerator=3, denominator=4, time=0))
-    _note_pair(tr, at=0, dur=480 * 6)          # two 3/4 bars
-    res = convert_midi_tempo_map(_save(mid, tmp_path))
-    assert mido.MidiFile(_save(mid, tmp_path)).type == 0  # precondition
-    assert res["tempos"] == [{"time": 0.0, "bpm": 120.0}]
-    assert res["time_signatures"] == [{"time": 0.0, "ts": [3, 4]}]
-    dbs = _downbeats(res)
-    assert [d["measure"] for d in dbs] == [1, 2]
-    assert [d["time"] for d in dbs] == [0.0, 1.5]     # 3/4 bar = 1.5 s at 120
-    assert all(d["den"] == 4 for d in dbs)
-
-
-def test_max_bars_safety_valve_caps_the_walk(tmp_path):
-    # A note one bar past the cap must not blow the walk past its ceiling.
-    mid = mido.MidiFile(ticks_per_beat=480)
-    tr = mido.MidiTrack(); mid.tracks.append(tr)
-    _note_pair(tr, at=0, dur=480 * 4 * (_TEMPO_MAP_MAX_BARS + 1))
-    res = convert_midi_tempo_map(_save(mid, tmp_path))
-    dbs = _downbeats(res)
-    assert len(dbs) == _TEMPO_MAP_MAX_BARS
-    assert dbs[-1]["measure"] == _TEMPO_MAP_MAX_BARS

tests/test_settings_api.py

@@ -219,47 +219,6 @@ def test_dlc_dir_empty_string_clears(client, tmp_path):
     assert _read_cfg(tmp_path)["dlc_dir"] == ""
 
 
-def test_unresolvable_dlc_dir_does_not_block_other_keys(client, tmp_path):
-    # Regression (feedBack-demucs-server#3): the v3 "Save" button next to the
-    # Demucs field bundles dlc_dir with demucs_server_url in one POST. A DLC
-    # path that doesn't resolve on THIS machine (stale value / unplugged drive)
-    # must not abort the whole request — the co-submitted demucs_server_url has
-    # to persist, and the bad path is surfaced as a warning rather than a hard
-    # error that drops every other key.
-    missing = str(tmp_path / "does-not-exist")
-    r = client.post("/api/settings", json={
-        "dlc_dir": missing,
-        "demucs_server_url": "http://demucs.example:7865",
-        "default_arrangement": "Lead",
-    })
-    assert r.status_code == 200
-    body = r.json()
-    # No hard error; the bad path is reported as a warning.
-    assert "error" not in body
-    assert any("does-not-exist" in w for w in body.get("warnings", []))
-    assert "does-not-exist" in body["message"]
-    cfg = _read_cfg(tmp_path)
-    # The valid keys persisted...
-    assert cfg["demucs_server_url"] == "http://demucs.example:7865"
-    assert cfg["default_arrangement"] == "Lead"
-    # ...and the unresolvable path was NOT written.
-    assert cfg.get("dlc_dir", "") != missing
-
-
-def test_valid_dlc_dir_still_reports_song_count(client, tmp_path):
-    # The happy path is unchanged: a resolvable DLC dir persists and the
-    # response message still carries the "N song files found" summary (no
-    # warnings key when nothing went wrong).
-    dlc = tmp_path / "dlc"
-    dlc.mkdir()
-    r = client.post("/api/settings", json={"dlc_dir": str(dlc)})
-    assert r.status_code == 200
-    body = r.json()
-    assert "warnings" not in body
-    assert "song files found" in body["message"]
-    assert _read_cfg(tmp_path)["dlc_dir"] == str(dlc)
-
-
 @pytest.mark.parametrize("key", ["default_arrangement", "demucs_server_url"])
 def test_string_key_null_is_noop(client, tmp_path, key):
     # Match the dlc_dir contract: null preserves the on-disk value.