Assist: drop flickering hint paragraph; center tuner in its frame

The 'Play a note' paragraph toggled with every detection gap and shifted
the layout — removed (incl. unused .assist-hint rule). TuningMeter is a
fixed-width 260px block; the tuner tool's body row now centers it.

TOOLS_LOCAL.md

@@ -1,5 +1,7 @@
-# Local deployment (nyx server) — beta channel
+# Local deployment (nyx server) — beta channel (tracks main = production state by default)
-- Managed by Nyx; deploy script: `~/deploy/smt-beta.sh [branch]` (fetch, build, docker rebuild, restart)
+- Managed by Nyx; deploy script: `~/deploy/smt-beta.sh [branch]` (fetch, build, docker rebuild, restart; **default branch: main**)
-- Container: `smt-beta` (nginx:alpine, 127.0.0.1:8081), image `smt-beta-image`
+- Container: `smt-beta` (nginx:alpine, 127.0.0.1:8081 **and** tailnet IP 100.64.0.4:8081), image `smt-beta-image`
-- Tailnet URL: http://nyx-rg3jpx6w.internal.0jm.de/ (tailscale serve → 8081)
+- Tailnet URLs:
+  - http://nyx-rg3jpx6w.internal.0jm.de/ (tailscale serve → 8081; needs MagicDNS; Chrome history may autocomplete a broken https:// variant — delete it from history)
+  - **http://100.64.0.4:8081/ (preferred: Chrome never HTTPS-upgrades IP:port URLs, no MagicDNS needed)**
 - Note: `tailscale serve --https` not available on this tailnet (feature not enabled); plain HTTP inside tailnet only

src/App.css

@@ -1041,29 +1041,53 @@ button {
 
 .phrase-setup {
     margin-bottom: 16px;
-    border-bottom: 1px solid color-mix(in srgb, var(--color-text-main) 12%, transparent);
+    border: 1px solid color-mix(in srgb, var(--color-text-main) 18%, transparent);
-    padding-bottom: 12px;
+    border-radius: 10px;
+    background: color-mix(in srgb, var(--color-text-main) 4%, transparent);
 }
 
 .phrase-setup summary {
     display: flex;
     align-items: center;
-    gap: 6px;
+    gap: 8px;
     cursor: pointer;
-    font-size: 13px;
+    font-size: 15px;
-    color: var(--color-text-muted);
+    font-weight: 600;
+    color: var(--color-text-main);
+    padding: 12px 14px;
     user-select: none;
+    list-style: none;
+    border-radius: 10px;
+    transition: background 0.15s ease;
+}
+
+/* Hide the default disclosure triangle — the chevron icon does the job */
+.phrase-setup summary::-webkit-details-marker {
+    display: none;
 }
 
 .phrase-setup summary:hover {
-    color: var(--color-text-main);
+    background: color-mix(in srgb, var(--color-text-main) 7%, transparent);
+}
+
+.phrase-setup[open] summary {
+    border-bottom: 1px solid color-mix(in srgb, var(--color-text-main) 12%, transparent);
+    border-radius: 10px 10px 0 0;
+}
+
+.phrase-setup summary svg {
+    transition: transform 0.15s ease;
+}
+
+.phrase-setup[open] summary svg {
+    transform: rotate(180deg);
 }
 
 .phrase-setup-grid {
     display: grid;
     grid-template-columns: repeat(auto-fit, minmax(130px, 1fr));
     gap: 10px 14px;
-    margin-top: 12px;
+    padding: 12px 14px 14px;
 }
 
 .phrase-setup-grid label {
@@ -1166,13 +1190,6 @@ button {
   overflow-x: auto;
 }
 
-.assist-hint {
-  font-size: 12px;
-  color: var(--color-text-muted);
-  margin: 0;
-  text-align: center;
-}
-
 /* ---- Transport step group (preview stepping) ---------------------------- */
 .transport-step-group {
   display: flex;

src/App.tsx

@@ -277,11 +277,19 @@ function App() {
 
           <div className="header-controls">
             <div className="game-mode-toggle">
+              <button
+                className={`toggle-option ${settings.gameMode === 'assist' ? 'active' : ''}`}
+                onClick={() => setSettings(s => ({ ...s, gameMode: 'assist' }))}
+                title="Practice companion: shows played notes while you work from paper"
+              >
+                Assist
+              </button>
               <button
                 className={`toggle-option ${settings.gameMode === 'sight_reading' ? 'active' : ''}`}
                 onClick={() => setSettings(s => ({ ...s, gameMode: 'sight_reading' }))}
+                title="Learn to read notes from the staff"
               >
-                Sight Reading
+                Learn Notes
               </button>
               <button
                 className={`toggle-option ${settings.gameMode === 'ear_training' ? 'active' : ''}`}
@@ -296,13 +304,6 @@ function App() {
               >
                 Phrases
               </button>
-              <button
-                className={`toggle-option ${settings.gameMode === 'assist' ? 'active' : ''}`}
-                onClick={() => setSettings(s => ({ ...s, gameMode: 'assist' }))}
-                title="Practice companion: shows played notes while you work from paper"
-              >
-                Assist
-              </button>
             </div>
 
             <button
@@ -373,6 +374,9 @@ function App() {
                 {listening ? <Mic size={28} /> : <MicOff size={28} />}
               </button>
 
+              {/* Live staff omitted in Assist mode: the Assist card already
+                  shows the played note large above the fretboard. */}
+              {!isAssist && (
                 <LiveNoteStaff
                   midi={displayedPitch ? displayedPitch.midi : null}
                   transpose={resolveClefTranspose(currentInstrumentDef, settings.difficulty).transpose}
@@ -380,6 +384,7 @@ function App() {
                   clef={currentInstrumentDef.clefMode === 'treble' ? 'treble' : currentInstrumentDef.clefMode === 'bass' ? 'bass' : undefined}
                   theme={settings.theme}
                 />
+              )}
               <div className={`pitch-readout ${displayedPitch ? 'active' : ''}`}>
                 {displayedPitch ? (
                   <>

src/components/AssistMode.tsx

@@ -30,6 +30,10 @@ export const AssistMode: React.FC<AssistModeProps> = ({ pitchData, windowWidth }
     const fretted = isFrettedInstrument(settings.instrument) && !!currentTuning;
     const pf = getPracticeFilter(settings);
 
+    const { clef, transpose } = useMemo(() =>
+        resolveClefTranspose(currentInstrumentDef, settings.difficulty),
+    [currentInstrumentDef, settings.difficulty]);
+
     // Alternative positions for the detected note (respect fret window filter)
     const positions = useMemo(() => {
         if (!fretted || !currentTuning || !pitchData) return [];
@@ -38,9 +42,23 @@ export const AssistMode: React.FC<AssistModeProps> = ({ pitchData, windowWidth }
         return all.filter(p => p.fret >= Math.max(0, pf.fretMin) && p.fret <= Math.min(24, pf.fretMax));
     }, [fretted, currentTuning, pitchData, pf.fretWindowEnabled, pf.fretMin, pf.fretMax]);
 
-    const { clef, transpose } = useMemo(() =>
+    // Full written range of the currently configured pool (strings × frets,
-        resolveClefTranspose(currentInstrumentDef, settings.difficulty),
+    // respecting the same filter as the position markers). The staff box is
-    [currentInstrumentDef, settings.difficulty]);
+    // sized to fit it, so notes render at their TRUE written position with
+    // real ledger lines — no 8va/8vb octave shifting.
+    const range = useMemo(() => {
+        if (!fretted || !currentTuning) return undefined;
+        const strings = pf.strings.length > 0
+            ? currentTuning.strings.filter((_, i) => pf.strings.includes(i))
+            : currentTuning.strings;
+        if (strings.length === 0) return undefined;
+        const lo = pf.fretWindowEnabled ? Math.max(0, pf.fretMin) : 0;
+        const hi = pf.fretWindowEnabled ? Math.min(24, pf.fretMax) : 24;
+        return {
+            min: Math.min(...strings) + lo + transpose,
+            max: Math.max(...strings) + hi + transpose,
+        };
+    }, [fretted, currentTuning, pf.strings, pf.fretWindowEnabled, pf.fretMin, pf.fretMax, transpose]);
 
     const staffWidth = Math.min(windowWidth - 40, 860);
 
@@ -61,6 +79,8 @@ export const AssistMode: React.FC<AssistModeProps> = ({ pitchData, windowWidth }
                     keySignature={settings.keySignature}
                     clef={clef === 'grand' ? undefined : clef}
                     width={Math.min(240, staffWidth)}
+                    height={88}
+                    range={range}
                     theme={settings.theme}
                 />
             </div>
@@ -71,19 +91,12 @@ export const AssistMode: React.FC<AssistModeProps> = ({ pitchData, windowWidth }
                         tuning={currentTuning}
                         positions={positions}
                         maxFrets={15}
-                        showHints={false}
+                        showHints={true}
                         interactive={false}
                         displayTranspose={transpose}
                     />
                 </div>
             )}
-
-            {!pitchData && (
-                <p className="assist-hint">
-                    Play a note — it shows here. Mic is{' '}
-                    {settings.showTuningMeter ? 'on' : 'controlled by the mic button below'}.
-                </p>
-            )}
         </div>
     );
 };

src/components/Controls.tsx

@@ -68,8 +68,8 @@ export const Controls: React.FC<ControlsProps> = ({ currentPitch }) => {
             )}
             {shouldShowFilters && <TargetNoteControls />}
 
-            {/* Bottom Section: Tools Grid (2 Columns now) */}
+            {/* Bottom Section: Tools Grid (stacked in all modes) */}
-            <div className="tools-grid" style={inPhraseMode ? { gridTemplateColumns: '1fr' } : undefined}>
+            <div className="tools-grid" style={{ gridTemplateColumns: '1fr' }}>
                 {/* Tool 1: Tuner */}
                 <div style={{ display: 'flex', flexDirection: 'column', gap: '8px', border: '1px solid rgba(128,128,128,0.2)', padding: '12px', borderRadius: '8px' }}>
                     <div style={{ display: 'flex', alignItems: 'center', justifyContent: 'space-between' }}>
@@ -86,7 +86,7 @@ export const Controls: React.FC<ControlsProps> = ({ currentPitch }) => {
                         </button>
                     </div>
                     {settings.showTuningMeter && (
-                        <div style={{ paddingTop: '8px', borderTop: '1px solid color-mix(in srgb, var(--color-text-main) 10%, transparent)' }}>
+                        <div style={{ paddingTop: '8px', borderTop: '1px solid color-mix(in srgb, var(--color-text-main) 10%, transparent)', display: 'flex', justifyContent: 'center' }}>
                             <TuningMeter
                                 cents={currentPitch ? currentPitch.cents : null}
                                 noteName={currentPitch ? currentPitch.note : null}

src/components/LiveNoteStaff.tsx

@@ -21,14 +21,45 @@ interface LiveNoteStaffProps {
      *  clef auto-switches treble/bass around middle C (piano-style). */
     clef?: 'treble' | 'bass';
     width?: number;
+    /** Box height. 64px matches the mic bar; larger boxes (e.g. 88px in
+     *  Assist mode) give ledger lines room inside instead of being clipped
+     *  by the parent's overflow: hidden. Ignored when `range` is set. */
+    height?: number;
+    /** Written-pitch range the box must fit WITHOUT octave shifting.
+     *  When set, notes render at their true staff position with real ledger
+     *  lines (no 8va/8vb marker) and the box height is computed from the
+     *  range so every note in it stays inside the box. */
+    range?: { min: number; max: number };
     theme?: 'light' | 'dark' | 'auto';
 }
 
 const BOX_H = 64;   // mic button height — vertical centering via the bar
 // VexFlow draws the first stave line ~40.5px BELOW the constructor y
-// (default space_above_staff_ln = 4 line-spaces). To center a 38px staff in
+// (default space_above_staff_ln = 4 line-spaces). To center the ~38px staff
-// the 64px box the constructor y must be negative.
+// in a box of height h the constructor y must be negative. For h = 64 this
-const STAVE_Y = -28;
+// yields -27.5 ≈ -28 (the original hardcoded value).
+const staveYFor = (h: number) => (h - 38) / 2 - 40.5;
+
+// Diatonic index (C0 = 0, one step per letter name) for ledger-line math.
+const DI_STEP = [0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11];
+const diFromMidi = (m: number) => Math.floor(m / 12 - 1) * 7 + DI_STEP[m % 12];
+// Top/bottom staff-line diatonic index per clef (treble F5/E4, bass A3/G2).
+const CLEF_LINES: Record<'treble' | 'bass', { top: number; bottom: number }> = {
+    treble: { top: 38, bottom: 30 },
+    bass: { top: 26, bottom: 18 },
+};
+// One diatonic step = half a staff space = 5px (standard 10px spaces).
+// Box that fits a whole written range: staff anchored below the top
+// headroom so the highest note has room for its ledger lines, lowest note
+// the same at the bottom.
+const rangeLayout = (range: { min: number; max: number }, clef: 'treble' | 'bass') => {
+    const lines = CLEF_LINES[clef];
+    const aboveLines = Math.max(0, Math.ceil((diFromMidi(range.max) - lines.top) / 2));
+    const belowLines = Math.max(0, Math.ceil((lines.bottom - diFromMidi(range.min)) / 2));
+    const abovePx = aboveLines * 10 + 10;   // + notehead margin
+    const belowPx = belowLines * 10 + 10;
+    return { height: abovePx + 38 + belowPx, y: abovePx - 40.5 };
+};
 
 export const LiveNoteStaff: React.FC<LiveNoteStaffProps> = ({
     midi,
@@ -36,9 +67,18 @@ export const LiveNoteStaff: React.FC<LiveNoteStaffProps> = ({
     keySignature = 'C',
     clef: clefOverride,
     width = 130,
+    height = BOX_H,
+    range,
     theme = 'auto',
 }) => {
     const containerRef = useRef<HTMLDivElement>(null);
+
+    // Box geometry: range-fit wins over the fixed height prop.
+    const fit = range
+        ? rangeLayout(range, clefOverride ?? 'treble')
+        : { height, y: staveYFor(height) };
+    const boxH = fit.height;
+    const staveY = fit.y;
     const [schemeVersion, setSchemeVersion] = useState(0);
     useEffect(() => {
         const mq = window.matchMedia('(prefers-color-scheme: dark)');
@@ -53,7 +93,7 @@ export const LiveNoteStaff: React.FC<LiveNoteStaffProps> = ({
         container.innerHTML = '';
 
         const renderer = new Renderer(container, Renderer.Backends.SVG);
-        renderer.resize(width, BOX_H);
+        renderer.resize(width, boxH);
         const context = renderer.getContext();
 
         const resolvedColor =
@@ -63,7 +103,7 @@ export const LiveNoteStaff: React.FC<LiveNoteStaffProps> = ({
         context.setFillStyle(resolvedColor);
         context.setStrokeStyle(resolvedColor);
 
-        const stave = new Stave(0, STAVE_Y, width - 2);
+        const stave = new Stave(0, staveY, width - 2);
         stave.setDefaultLedgerLineStyle({ strokeStyle: resolvedColor, lineWidth: 2 });
         const written0 = midi !== null ? midi + transpose : null;
         // Instrument-fixed clef when provided (guitar always treble, bass
@@ -79,7 +119,10 @@ export const LiveNoteStaff: React.FC<LiveNoteStaffProps> = ({
             //   treble: staff E4..F5 (+ up to two ledger lines each way)
             //   bass:   staff G2..A3 (+ up to two ledger lines each way)
             let written = written0!;
+            // Range-fit mode renders the TRUE written position with real
+            // ledger lines — no 8va/8vb shifting.
             let octaveMark: '8va' | '8vb' | null = null;
+            if (!range) {
                 if (clef === 'treble') {
                     while (written < 58) { written += 12; octaveMark = '8vb'; }
                     while (written > 81) { written -= 12; octaveMark = '8va'; }
@@ -87,6 +130,7 @@ export const LiveNoteStaff: React.FC<LiveNoteStaffProps> = ({
                     while (written < 40) { written += 12; octaveMark = '8vb'; }
                     while (written > 61) { written -= 12; octaveMark = '8va'; }
                 }
+            }
 
             const spec = getNoteInKey(written, keySignature);
             const note = new StaveNote({
@@ -113,13 +157,13 @@ export const LiveNoteStaff: React.FC<LiveNoteStaffProps> = ({
             new Formatter().joinVoices([voice]).format([voice], width - 40);
             voice.draw(context, stave);
         }
-    }, [midi, transpose, keySignature, clefOverride, width, theme, schemeVersion]);
+    }, [midi, transpose, keySignature, clefOverride, width, boxH, staveY, range, theme, schemeVersion]);
 
     return (
         <div
             ref={containerRef}
             className="live-note-staff"
-            style={{ width, height: BOX_H }}
+            style={{ width, height: boxH }}
             role="img"
             aria-label={midi !== null ? 'Currently played note' : 'No note currently detected'}
         />

src/components/MetronomeWidget.tsx

@@ -55,13 +55,22 @@ export const MetronomeWidget: React.FC<MetronomeWidgetProps> = ({
 
     const isSync = syncMode === 'option' && !!rhythm.syncToExercise;
     const runActive = gate === true;
+    // Phrase mode (syncMode 'option') has no on/off switch — the sync
+    // checkbox replaces it (unchecked = free metronome, checked = synced to
+    // the exercise), so the metronome is always armed there. Gating on
+    // rhythm.active would leave phrase users with no way to enable clicks.
+    const armed = syncMode === 'option' ? true : rhythm.active;
     // Sync: pendulum/click only while the run is active (the run's scheduler
     // is the click source; the widget's own scheduler stays off).
     // Free/plain: the widget's own scheduler runs whenever armed.
-    const running = isSync ? runActive : rhythm.active;
+    const running = isSync ? runActive : armed;
+
+    // Timer mode = one beat per N seconds: effective BPM 60/seconds so
+    // clicks and pendulum match the trainer's auto-advance cadence.
+    const effectiveBpm = rhythm.mode === 'bpm' ? rhythm.bpm : 60 / Math.max(1, rhythm.seconds);
 
     const { restart } = useMetronome({
-        bpm: rhythm.bpm,
+        bpm: effectiveBpm,
         volume: rhythm.sound ? rhythm.volume : 0,
         playing: running && !isSync,
         onTick: handleTick,
@@ -77,8 +86,7 @@ export const MetronomeWidget: React.FC<MetronomeWidgetProps> = ({
         });
     }, [isSync, runActive]);
 
-    const beatMs = 60000 / Math.max(1, rhythm.bpm);
+    const beatMs = 60000 / Math.max(1, effectiveBpm);
-    const armed = rhythm.active;
 
     return (
         <div style={{ display: 'flex', flexDirection: 'column', gap: '8px' }}>

src/components/PhraseTrainer.tsx

@@ -85,13 +85,15 @@ export const PhraseTrainer = forwardRef<PhraseHandle, PhraseTrainerProps>(
         const pace: PhraseSettings['pace'] = settings.rhythm.syncToExercise ? 'tempo' : 'step';
         phrase.pace = pace;
         // Click decision — ONE source: the metronome widget's sound checkbox.
-        // - Sync (tempo): run clicks when armed && sound (count-in incl.);
+        // Phrase mode has no metronome on/off switch (the sync checkbox
-        //   widget silent while idle.
+        // replaces it, see MetronomeWidget), so rhythm.active must NOT gate
-        // - Free metronome: widget clicks freely; the run stays silent to
+        // clicks here — with the default active:false a synced run would
-        //   avoid doubling (sync off in tempo = free widget during runs).
+        // stay silent with no way to fix it from this mode.
-        phrase.clickSound = pace === 'tempo'
+        // - Sync (tempo): run clicks when sound is on (count-in included);
-            ? settings.rhythm.active && settings.rhythm.sound
+        //   the widget stays silent while idle.
-            : settings.rhythm.active && settings.rhythm.sound && !settings.rhythm.syncToExercise;
+        // - Free metronome (step): the widget clicks freely; the run stays
+        //   silent to avoid doubling.
+        phrase.clickSound = settings.rhythm.sound;
         const setPhrase = useCallback((updates: Partial<PhraseSettings>) => {
             updateSettings(s => ({ ...s, phrase: { ...getPhraseSettings(s), ...updates } }));
         }, [updateSettings]);

src/components/SingleNoteTrainer.tsx

@@ -149,25 +149,43 @@ export const SingleNoteTrainer = forwardRef<SingleNoteHandle, SingleNoteTrainerP
                 )}
 
                 {!settings.zenMode && (
-                    <div className="action-row" style={{ marginTop: '24px', display: 'flex', justifyContent: 'center', gap: '16px' }}>
+                    <>
+                        {/* Display toggles — switch style (like phrase mode):
+                            pure show/hide, no trainer actions. */}
+                        <div className="display-toggles" style={{ marginTop: '24px' }}>
                             {currentInstrumentDef.showTuning && (
+                                <div className="display-toggle">
+                                    <span className="display-toggle-label">
+                                        <Guitar size={15} />
+                                        {currentInstrumentDef.id === 'piano' ? 'Piano' : 'Guitar'}
+                                    </span>
                                     <button
-                                className={`hint-button ${settings.showFretboard ? 'active' : ''}`}
+                                        className={`switch-button ${settings.showFretboard ? 'active' : ''}`}
                                         onClick={() => setSettings(s => ({ ...s, showFretboard: !s.showFretboard }))}
                                         title={`Toggle Virtual ${currentInstrumentDef.displayName} (Keyboard Shortcut: V)`}
+                                        aria-label={`Show virtual ${currentInstrumentDef.displayName}`}
                                     >
-                                <Guitar size={18} />
+                                        <div className="switch-thumb" />
-                                {currentInstrumentDef.id === 'piano' ? 'Piano' : 'Guitar'}
                                     </button>
+                                </div>
                             )}
+                            <div className="display-toggle">
+                                <span className="display-toggle-label">
+                                    <HelpCircle size={15} />
+                                    Hint
+                                </span>
                                 <button
-                            className={`hint-button ${settings.showHint ? 'active' : ''}`}
+                                    className={`switch-button ${settings.showHint ? 'active' : ''}`}
                                     onClick={() => setSettings(s => ({ ...s, showHint: !s.showHint }))}
                                     title="Keyboard Shortcut: H"
+                                    aria-label="Show hint"
                                 >
-                            <HelpCircle size={18} />
+                                    <div className="switch-thumb" />
-                            {settings.showHint ? "Hide Hint" : "Show Hint"}
                                 </button>
+                            </div>
+                        </div>
+
+                        <div className="action-row" style={{ marginTop: '16px', display: 'flex', justifyContent: 'center', gap: '16px' }}>
                             <button
                                 className="hint-button"
                                 onClick={() => playNote(targetMidi, settings.referenceNoteDuration ?? 1.5, settings.autoPlayVolume ?? 0.5)}
@@ -181,6 +199,7 @@ export const SingleNoteTrainer = forwardRef<SingleNoteHandle, SingleNoteTrainerP
                                 Skip Note
                             </button>
                         </div>
+                    </>
                 )}
             </div>
         );

src/hooks/useGameLogic.ts

@@ -85,7 +85,11 @@ export const useGameLogic = (
 
     const { restart: restartMetronome } = useMetronome({
         bpm: effectiveBpm,
-        volume: settings.rhythm.sound ? settings.rhythm.volume : 0,
+        // Audible clicks come from the shared footer widget (Controls) in
+        // non-zen single-note modes — this scheduler is only the tick source
+        // for auto-advance. Sounding it here too doubles every beat. In zen
+        // mode the widget isn't rendered, so this scheduler IS the click.
+        volume: settings.zenMode && settings.rhythm.sound ? settings.rhythm.volume : 0,
         playing: settings.rhythm.active,
         onTick: handleTick
     });

src/hooks/useMetronome.ts

@@ -34,6 +34,8 @@ export function useMetronome({ bpm, volume, playing, onTick }: MetronomeOptions)
 
     const playClick = useCallback((time: number) => {
         if (!audioContext.current) return;
+        onTickRef.current(currentBeat.current);
+        if (volume <= 0) return; // silent tick source — no audio nodes needed
 
         const osc = audioContext.current.createOscillator();
         const gainNode = audioContext.current.createGain();

src/types/SettingsTypes.ts

@@ -134,6 +134,11 @@ export interface AppSettings {
     instrument: string;
     rhythm: RhythmSettings;
     zenMode: boolean;
+    /**
+     * TODO: Rename 'sight_reading' to 'learn_notes' internally (UI label is
+     * already "Learn Notes"). Deferred because the value is persisted in
+     * localStorage — needs a settings migration for existing users.
+     */
     gameMode: 'sight_reading' | 'ear_training' | 'phrase' | 'assist';
     customMinFret?: number;
     customMaxFret?: number;