agentvibes 5.14.0 → 5.15.1

package/src/console/tabs/agents-tab.js

@@ -20,6 +20,7 @@ import {
   getFavorites, getThumbsDown, toggleThumbsUp, toggleThumbsDown,
 } from './voices-tab.js';
 import { buildAudioEnv, detectWavPlayer, detectRemoteLlm } from '../audio-env.js';
+import { createRowSpinner } from '../preview-transport.js';
 import { voicesForProvider } from '../../services/provider-voice-catalog.js';
 import { destroyList } from '../widgets/destroy-list.js';
 import { BRAND_PINK } from '../brand-colors.js';
@@ -139,7 +140,7 @@ const COLORS = {
   linkFg:     'bright-cyan',
 };
 
-const _FOOTER_BMAD_EN   = '[↑↓/jk] Navigate  [Space] Preview  [Enter] Configure  [A] Auto-assign  [B] Bulk  [X] Reset  [Q] Quit';
+const _FOOTER_BMAD_EN   = '[↑↓/jk] Navigate  [Space] Preview  [Enter] Configure  [A] Auto-assign  [B] Bulk  [Del] Reset  [Q] Quit';
 const _FOOTER_NOBMAD_EN = '[Tab] Switch Tab  [Q] Quit';
 
 const _modalTitle = (text) => ` {${BRAND_PINK}-fg}${text}{/${BRAND_PINK}-fg} `;
@@ -332,6 +333,10 @@ ${_tl('bmadDesc')}
     if (typeof focusMainTabBar === 'function') { focusMainTabBar(); screen.render(); }
   });
 
+  // Manual re-check: after installing BMAD from a separate terminal, Enter
+  // re-scans without leaving the tab. (Switching tabs also re-scans via onFocus.)
+  onboardingBox.key(['enter'], () => { refreshDisplay(); });
+
   // -------------------------------------------------------------------------
   // BMAD state — section header
 
@@ -421,7 +426,7 @@ ${_tl('bmadDesc')}
     left: 4,
     hidden: true,
     tags: true,
-    content: '{#546e7a-fg}[Space] Preview  [Enter] Configure  [X] Reset  [A] Auto-assign  [B] Bulk Edit{/#546e7a-fg}',
+    content: '{#546e7a-fg}[Space] Preview  [Enter] Configure  [Del] Reset  [A] Auto-assign  [B] Bulk Edit{/#546e7a-fg}',
     style: { bg: COLORS.contentBg },
   });
 
@@ -468,7 +473,7 @@ ${_tl('bmadDesc')}
     return btn;
   }
 
-  const resetBtn = _createBtn('[X] Reset', () => {
+  const resetBtn = _createBtn('[Del] Reset', () => {
     const agent = _agents[agentList.selected ?? 0];
     if (agent) {
       voiceStore.resetAgentProfile(agent.id);
@@ -1073,6 +1078,11 @@ ${_tl('bmadDesc')}
       content: '', style: { fg: 'bright-cyan', bg: COLORS.contentBg },
     });
 
+    // Row spinner: "⠹ Previewing (locally|remotely via SSH)  (Space to stop)" ON
+    // the selected row — shared with every other picker. renderItem restores the
+    // row on stop. vpPreviewLine is retained for parity but no longer shows preview.
+    const _vpSpin = createRowSpinner(vpList, screen, (i) => _buildVoiceItems([_allVoices[i]])[0], { isClosed: () => _vpClosed });
+
     blessed.text({
       parent: vpModal, bottom: 3, left: 2, right: 2, height: 1, tags: true,
       content: '{white-fg}[↑↓] Nav  [PgUp/PgDn] Page  [a-z] Jump{/white-fg}',
@@ -1119,7 +1129,7 @@ ${_tl('bmadDesc')}
     }
 
     function _previewVoice(voiceId) {
-      if (_previewVoiceId === voiceId) { _killVP(); vpPreviewLine.setContent(''); _refreshVP(); return; }
+      if (_previewVoiceId === voiceId) { _killVP(); _vpSpin.stop(); return; }
       _killVP();
       if (_previewMinTimer) { clearTimeout(_previewMinTimer); _previewMinTimer = null; }
 
@@ -1131,15 +1141,15 @@ ${_tl('bmadDesc')}
         const playTtsScript = _hookScript('hooks-windows', 'play-tts.ps1');
         if (!fs.existsSync(playTtsScript)) return;
         _previewVoiceId = voiceId;
-        if (!_vpClosed) { vpPreviewLine.setContent(`{bright-cyan-fg}♪ Playing: ${voiceId}...{/bright-cyan-fg}`); _refreshVP(); }
+        if (!_vpClosed) { _vpSpin.start(vpList.selected, false); }
         _previewProc = spawn('powershell', [ // NOSONAR
           '-NoProfile', '-ExecutionPolicy', 'Bypass', '-File', playTtsScript, phrase, voiceId,
         ], { stdio: 'ignore', detached: false, windowsHide: true,
           env: { ..._spawnEnv, AGENTVIBES_VOICE_SOURCE: 'audition' } });
         _previewProc.on('exit', () => {
-          if (_previewVoiceId === voiceId) { _previewVoiceId = null; _previewProc = null; if (!_vpClosed) { vpPreviewLine.setContent(''); _refreshVP(); } }
+          if (_previewVoiceId === voiceId) { _previewVoiceId = null; _previewProc = null; _vpSpin.stop(); }
         });
-        _previewProc.on('error', () => { _previewProc = null; _previewVoiceId = null; });
+        _previewProc.on('error', () => { _previewProc = null; _previewVoiceId = null; _vpSpin.stop(); });
         return;
       }
 
@@ -1166,12 +1176,12 @@ ${_tl('bmadDesc')}
         cwd: _projectRoot,
       });
       _previewVoiceId = voiceId;
-      if (!_vpClosed) { vpPreviewLine.setContent(`{bright-cyan-fg}♪ Playing: ${voiceId}...{/bright-cyan-fg}`); _refreshVP(); }
+      if (!_vpClosed) { _vpSpin.start(vpList.selected, !!remoteLlm); }
 
       const _clearAfterMinDisplay = () => {
         if (_previewVoiceId === voiceId) {
           _previewVoiceId = null; _previewProc = null;
-          if (!_vpClosed) { vpPreviewLine.setContent(''); _refreshVP(); }
+          _vpSpin.stop();
         }
         _previewMinTimer = null;
       };
@@ -1878,7 +1888,12 @@ ${_tl('bmadDesc')}
   // -------------------------------------------------------------------------
   // Key bindings
 
-  agentList.key(['x', 'X'], () => {
+  // Reset uses Delete/Backspace — NOT a letter. 'x'/'X' is the GLOBAL shortcut
+  // for the Receiver tab (navigation.js KEY_TO_TAB), and screen-level keys fire
+  // even while this list is focused, so binding Reset to X reset the agent AND
+  // jumped to the Receiver tab. Delete has no global binding and doesn't clash
+  // with type-to-jump.
+  agentList.key(['delete', 'backspace'], () => {
     const agent = _agents[agentList.selected ?? 0];
     if (agent) {
       voiceStore.resetAgentProfile(agent.id);
@@ -2038,6 +2053,11 @@ ${_tl('bmadDesc')}
     },
 
     onFocus() {
+      // Re-detect on focus so BMAD installed in another tab/terminal (or just
+      // now, via the onboarding install command) appears without restarting the
+      // TUI. Tab switching invokes onFocus, so returning to this tab IS the
+      // rescan — onboarding ⇄ agent list flips automatically.
+      refreshDisplay();
       if (_bmadDetected) {
         agentList.focus();
       } else {

package/src/console/tabs/music-tab.js

@@ -13,7 +13,7 @@ import fs from 'node:fs';
 import path from 'node:path';
 import { fileURLToPath } from 'node:url';
 import { buildAudioEnv, spawnMp3Player } from '../audio-env.js';
-import { resolveMusicProvider, spawnMusicRemote } from '../music-preview.js';
+import { resolveMusicProvider, spawnMusicRemote, createRowSpinner } from '../music-preview.js';
 import { playBlingCue } from '../bling.js';
 import { t } from '../../i18n/strings.js';
 
@@ -372,6 +372,20 @@ export function createMusicTab(screen, services) {
     },
   });
 
+  // Row spinner: paints "⠹ Previewing (locally|remotely via SSH)  (Space to stop)"
+  // ON the selected track row — shared with every other picker. renderItem
+  // restores the row's normal content when the preview stops.
+  const _trackSpin = createRowSpinner(trackList, screen, (i) => {
+    const t = _getVisibleTracks()[i];
+    if (!t) return '';
+    const { track: activeTrackId } = _getMusic(configService);
+    return _buildListItems([t], activeTrackId, getMusicFavorites(configService))[0];
+    // static: track rows carry double-width emoji; animating/reallocating them
+    // desyncs blessed's terminal output (jumps/corruption). Write the indicator
+    // ONCE (padded to full width to clear the old row), no animation, no realloc —
+    // the least-fragile option for emoji rows.
+  }, { isClosed: () => box.hidden, static: true });
+
   // -------------------------------------------------------------------------
   // Status panel
 
@@ -522,7 +536,23 @@ export function createMusicTab(screen, services) {
     return _stripHint(_stripBlink(raw));
   }
 
+  // Strip hint text + blink cursor from EVERY row and forget the hint anchor.
+  // Called when a preview starts so the internal buffer is clean before the
+  // spinner's full-repaint (otherwise a stale hint/blink would be faithfully
+  // re-rendered by the realloc).
+  function _clearRowDecorations() {
+    const items = trackList.items || [];
+    for (let i = 0; i < items.length; i++) {
+      if (items[i]) items[i].setContent(_stripDecorations(items[i].content));
+    }
+    _hintIdx = -1; _hintBase = '';
+  }
+
   function _updateHint(idx) {
+    // While a preview spinner is animating a row, it owns row rendering — the
+    // inline hint must not rewrite rows (it would fight the 80ms spinner and
+    // leave ghost characters on the previewing row when the cursor moves).
+    if (_trackSpin.isActive()) return;
     const items = trackList.items;
     // Restore previously hinted row — pad with spaces to overwrite ghost hint text
     const _pad = ' '.repeat(60);
@@ -621,17 +651,20 @@ export function createMusicTab(screen, services) {
       if (_remotePlayingTrackId === trackId) {
         _sendMusicRemote(_mp, { stop: true });
         _remotePlayingTrackId = null;
+        _trackSpin.stop();
+        if (_listFocused) _updateHint(trackList.selected);
         previewLine.setContent(_listFocused ? _hintText() : '');
         screen.render();
         return;
       }
       // Bling first (fire-and-forget, plays locally) — same readiness cue as the
-      // voice preview — then forward the track to the receiver.
+      // voice preview — then forward the track to the receiver. The receiver keeps
+      // playing until an explicit stop, so the row spinner persists (no floor).
       playBlingCue(_PKG_ROOT);
-      const rlabel = _allTracks.find(t => t.id === trackId)?.label ?? formatTrackLabel(trackId);
       if (_sendMusicRemote(_mp, { track: trackId })) {
         _remotePlayingTrackId = trackId;
-        previewLine.setContent(`{${COLORS.playingFg}-fg}♪ Playing on receiver: ${rlabel}  (Space to stop){/${COLORS.playingFg}-fg}`);
+        _clearRowDecorations();   // spinner owns the rows; wipe stale hint/blink first
+        _trackSpin.start(trackList.selected, true);
       }
       screen.render();
       return;
@@ -642,6 +675,8 @@ export function createMusicTab(screen, services) {
     if (_playingTrackId === trackId) {
       _killPlayingProcess();
       _playingTrackId = null;
+      _trackSpin.stop();
+      if (_listFocused) _updateHint(trackList.selected);
       previewLine.setContent(_listFocused ? _hintText() : '');
       screen.render();
       return;
@@ -668,17 +703,15 @@ export function createMusicTab(screen, services) {
 
     _playingProcess = proc;
     _playingTrackId = trackId;
-
-    const label = _allTracks.find(t => t.id === trackId)?.label ?? formatTrackLabel(trackId);
-    previewLine.setContent(`{${COLORS.playingFg}-fg}♪ Previewing: ${label}  (Space again to stop){/${COLORS.playingFg}-fg}`);
+    _clearRowDecorations();   // spinner owns the rows; wipe stale hint/blink first
+    _trackSpin.start(trackList.selected, false);
     screen.render();
 
     proc.on('exit', () => {
       if (_playingTrackId === trackId) {
         _playingTrackId = null;
         _playingProcess = null;
-        previewLine.setContent(_listFocused ? _hintText() : '');
-        refreshDisplay(); // clears (playing) label
+        _trackSpin.stop();
       }
     });
 
@@ -687,7 +720,7 @@ export function createMusicTab(screen, services) {
         _killPlayingProcess();
         _playingTrackId = null;
         _playingProcess = null;
-        previewLine.setContent(_listFocused ? _hintText() : '');
+        _trackSpin.stop();
       }
     });
   }
@@ -819,6 +852,7 @@ export function createMusicTab(screen, services) {
     function _close() {
       _killPlayingProcess();
       _playingTrackId = null;
+      _trackSpin.stop();
       previewLine.setContent(_listFocused ? _hintText() : '');
       modal.destroy();
       trackList.focus();
@@ -942,8 +976,9 @@ export function createMusicTab(screen, services) {
   trackList.key(['space'], () => {
     const trackId = _getSelectedTrackId();
     if (trackId) {
+      // No refreshDisplay() here — it rebuilds every row via setItems and would
+      // clobber the preview spinner's row (the spinner now shows preview state).
       _playTrack(trackId);
-      refreshDisplay();
     }
   });
 
@@ -1013,6 +1048,10 @@ export function createMusicTab(screen, services) {
   let _tlBlink = { interval: null, on: false, sel: -1 };
   process.on('exit', () => { if (_tlBlink.interval) clearInterval(_tlBlink.interval); });
   function _tlTick() {
+    // While a preview is animating a row, the preview spinner (80ms) owns the
+    // display — don't fight it with the 500ms blink cursor (that interleaving
+    // left ghost characters on the previewing row).
+    if (_trackSpin.isActive()) return;
     _tlBlink.on = !_tlBlink.on;
     const items = trackList.items;
     const cur = trackList.selected ?? 0;
@@ -1134,6 +1173,7 @@ export function createMusicTab(screen, services) {
       // Stop any preview when leaving the tab
       _killPlayingProcess();
       _playingTrackId = null;
+      _trackSpin.stop();
       previewLine.setContent('');
       box.hide();
       screen.render();
@@ -1148,6 +1188,7 @@ export function createMusicTab(screen, services) {
       // Stop preview when focus leaves Music tab
       _killPlayingProcess();
       _playingTrackId = null;
+      _trackSpin.stop();
     },
 
     getFooterText() {

package/src/console/tabs/setup-tab.js

@@ -46,6 +46,7 @@ import { destroyList } from '../widgets/destroy-list.js';
 import { scanInstalledVoices, getVoiceMeta, previewPhrase, genderIconTag, formatVoiceRow, voiceRowHeader, PIPER_VOICES_DIR, SAMPLE_PHRASES, parseMultiSpeaker, getFavorites, getThumbsDown, toggleFavorite, toggleThumbsUp, toggleThumbsDown } from './voices-tab.js';
 import { attachBtnBlink } from './agents-tab.js';
 import { buildAudioEnv, detectWavPlayer } from '../audio-env.js';
+import { previewRowContent, createRowSpinner, padTaggedTo } from '../preview-transport.js';
 import { buildBlingCommand, playBlingCue } from '../bling.js';
 import { spawn, spawnSync } from 'node:child_process';
 
@@ -2907,6 +2908,7 @@ export function createSetupTab(screen, services) {
     let _kSpinFrame = 0;
     let _kSpinningIdx = -1;
     let _kSpinStartTs = 0;
+    let _kSpinRemote = false;  // whether the active preview is forwarded to the receiver
     let _kFloorTimer = null;   // pending _stopKSpinnerWithFloor timer (tracked so it can be cancelled)
     // Remote SSH preview is fire-and-forget: play-tts-ssh-remote.sh backgrounds
     // the ssh call and exits within milliseconds, so the row spinner would be
@@ -2916,17 +2918,20 @@ export function createSetupTab(screen, services) {
     // visible "preview sent" cue (fire-and-forget has no playback signal to await).
     const _K_MIN_SPIN_MS = 1100;
 
-    function _startKSpinner(listIdx) {
+    function _startKSpinner(listIdx, remote = false) {
       _stopKSpinner();
       _kSpinningIdx = listIdx;
       _kSpinFrame = 0;
       _kSpinStartTs = Date.now();
+      _kSpinRemote = remote;
       _kSpinInterval = setInterval(() => {
         if (_kClosed) { _stopKSpinner(); return; }
-        const spin = `{cyan-fg}${_K_SPIN[_kSpinFrame++ % _K_SPIN.length]}{/cyan-fg}`;
-        kPicker.setItem(listIdx, `${_kokoroItem(voices[listIdx])} ${spin}`);
+        // Row indicator: "⠹ Previewing (locally|remotely via SSH)  (Space to stop)".
+        // The row IS the selected voice, so the name is intentionally omitted.
+        kPicker.setItem(listIdx, padTaggedTo(previewRowContent(_K_SPIN[_kSpinFrame++ % _K_SPIN.length], _kSpinRemote), kPicker.width || 78));
         screen.render();
       }, 80);
+      if (_kSpinInterval.unref) _kSpinInterval.unref(); // never keep the process alive
     }
 
     function _stopKSpinner() {
@@ -3277,7 +3282,7 @@ export function createSetupTab(screen, services) {
 
       // ── Remote preview: route through SSH pipeline so receiver plays it ──
       if (_validSshHost) {
-        _startKSpinner(kPicker.selected);
+        _startKSpinner(kPicker.selected, true);
         const hookDir = path.join(packageDir, '.claude', 'hooks');
         const remoteEnv = { ...process.env, CLAUDE_PROJECT_DIR: targetDir, AGENTVIBES_SSH_HOST: _sshHost };
         if (_validSshKey)  remoteEnv.AGENTVIBES_SSH_KEY  = _sshKey;
@@ -3392,6 +3397,7 @@ export function createSetupTab(screen, services) {
           }
           screen.render();
         }, 120);
+        if (_kAnimInterval.unref) _kAnimInterval.unref(); // never keep the process alive
       }
 
       function _stopDlAnim() {
@@ -3788,10 +3794,15 @@ export function createSetupTab(screen, services) {
     function _setHint(text) { elBox.setLabel(text || _defaultHint); screen.render(); }
     _setHint(_defaultHint);
 
+    // Row spinner: "⠹ Previewing (locally)  (Space to stop)" on the selected row.
+    // ElevenLabs preview always plays locally today, so the badge is honestly
+    // local; _setHint stays for error messages only.
+    const _elSpin = createRowSpinner(elPicker, screen, (i) => _items[i], { isClosed: () => _elClosed });
+
     function _previewEl() {
       if (_elPreviewProc) {  // toggle off
         _killElPreview();
-        _setHint(_defaultHint);
+        _elSpin.stop();
         return;
       }
       const v = ELEVENLABS_VOICES[elPicker.selected];
@@ -3808,18 +3819,17 @@ export function createSetupTab(screen, services) {
         return;
       }
       _elPreviewProc = proc;
-      _setHint(` {cyan-fg}♪ ${v.name}... (Space=stop){/cyan-fg} `);
+      _elSpin.start(elPicker.selected, false);
       proc.on('exit', (code) => {
         _elPreviewProc = null;
         if (_elClosed) return;
+        _elSpin.stop();
         if (code && code !== 0) {
           _setHint(' {red-fg}Preview failed — check API key / plan{/red-fg} ');
           setTimeout(() => { if (!_elClosed) _setHint(_defaultHint); }, 3000);
-        } else {
-          _setHint(_defaultHint);
         }
       });
-      proc.on('error', () => { _elPreviewProc = null; if (!_elClosed) _setHint(' {red-fg}Preview failed{/red-fg} '); });
+      proc.on('error', () => { _elPreviewProc = null; _elSpin.stop(); if (!_elClosed) _setHint(' {red-fg}Preview failed{/red-fg} '); });
     }
 
     elPicker.key(['enter'], () => {
@@ -4137,6 +4147,11 @@ export function createSetupTab(screen, services) {
       content: ' ', style: { fg: 'cyan', bg: COLORS.contentBg },
     });
 
+    // Row spinner: paints "⠹ Previewing (locally|remotely via SSH)  (Space to stop)"
+    // ON the selected row (shared with every other picker). renderItem restores the
+    // row's normal content on stop. vpPreviewLine is kept for error messages only.
+    const _vpSpin = createRowSpinner(vpList, screen, (i) => _buildVoiceItems([_allVoices[i]])[0], { isClosed: () => _vpClosed });
+
     // Movement hints at the bottom (primary actions live in the top help bar, so
     // they are not duplicated here). Standardized [key] = label formatting.
     blessed.text({
@@ -4186,7 +4201,7 @@ export function createSetupTab(screen, services) {
     }
 
     function _previewVoice(voiceId) {
-      if (_previewVoiceId === voiceId) { _killVP(); vpPreviewLine.setContent(''); _refreshVP(); return; }
+      if (_previewVoiceId === voiceId) { _killVP(); _vpSpin.stop(); return; }
       _killVP();
 
       const phrase = previewPhrase(voiceId);
@@ -4238,12 +4253,12 @@ export function createSetupTab(screen, services) {
         }
         _previewProc = rProc;
         _previewVoiceId = voiceId;
-        if (!_vpClosed) { _refreshVP(); vpPreviewLine.setContent('{bright-magenta-fg}♪ Synthesizing on remote...{/bright-magenta-fg}'); screen.render(); }
+        if (!_vpClosed) { _vpSpin.start(vpList.selected, true); }
         rProc.on('exit', () => {
           if (_previewVoiceId === voiceId) {
             _previewVoiceId = null; _previewProc = null;
-            // Keep message + ♪ visible for 5s while remote device synthesises and plays
-            setTimeout(() => { if (!_vpClosed) { vpPreviewLine.setContent(''); _refreshVP(); } }, 5000);
+            // Fire-and-forget SSH exits in ms; keep the row cue up briefly, then restore.
+            _vpSpin.stopWithFloor();
           }
         });
         rProc.on('error', () => { _previewProc = null; _previewVoiceId = null; });
@@ -4279,9 +4294,9 @@ export function createSetupTab(screen, services) {
         }
         _previewProc = nProc;
         _previewVoiceId = voiceId;
-        if (!_vpClosed) { vpPreviewLine.setContent(`{cyan-fg}♪ Playing: ${voiceId}...{/cyan-fg}`); _refreshVP(); }
-        nProc.on('exit', () => { if (_previewVoiceId === voiceId) { _previewVoiceId = null; _previewProc = null; if (!_vpClosed) { vpPreviewLine.setContent(''); _refreshVP(); } } });
-        nProc.on('error', () => { _previewProc = null; _previewVoiceId = null; });
+        if (!_vpClosed) { _vpSpin.start(vpList.selected, false); }
+        nProc.on('exit', () => { if (_previewVoiceId === voiceId) { _previewVoiceId = null; _previewProc = null; _vpSpin.stop(); } });
+        nProc.on('error', () => { _previewProc = null; _previewVoiceId = null; _vpSpin.stop(); });
         return;
       }
 
@@ -4316,14 +4331,14 @@ export function createSetupTab(screen, services) {
       _previewVoiceId = voiceId;
 
       if (!_vpClosed) {
-        vpPreviewLine.setContent(`{cyan-fg}♪ Synthesizing: ${voiceId}...{/cyan-fg}`);
-        _refreshVP();
+        _vpSpin.start(vpList.selected, false);
       }
 
       piper.on('exit', (code) => {
         if (_previewVoiceId !== voiceId) { try { fs.unlinkSync(tempWav); } catch {} return; }
         if (code !== 0) {
           _previewProc = null; _previewVoiceId = null;
+          _vpSpin.stop();
           if (!_vpClosed) {
             vpPreviewLine.setContent('{red-fg}♪ Preview failed — is Piper installed?{/red-fg}');
             screen.render();
@@ -4341,14 +4356,15 @@ export function createSetupTab(screen, services) {
           env: _spawnEnv,
         });
         _previewProc = pp;
-        if (!_vpClosed) { vpPreviewLine.setContent(`{cyan-fg}♪ Playing: ${voiceId}{/cyan-fg}`); screen.render(); }
+        // Row spinner already running from the synth phase — keep it through playback.
         pp.on('exit', () => {
-          if (_previewVoiceId === voiceId) { _previewVoiceId = null; _previewProc = null; if (!_vpClosed) { vpPreviewLine.setContent(''); _refreshVP(); } }
+          if (_previewVoiceId === voiceId) { _previewVoiceId = null; _previewProc = null; _vpSpin.stop(); }
           try { fs.unlinkSync(tempWav); } catch {}
         });
       });
       piper.on('error', () => {
         _previewProc = null; _previewVoiceId = null;
+        _vpSpin.stop();
         if (!_vpClosed) {
           vpPreviewLine.setContent('{red-fg}♪ Cannot find Piper — install it first{/red-fg}');
           screen.render();

package/src/console/widgets/track-picker.js

@@ -14,7 +14,7 @@ import { BRAND_PINK } from '../brand-colors.js';
 import { renderHelpBar, selectorTitle } from './help-bar.js';
 import { formatTrackName } from './format-utils.js';
 import { buildAudioEnv, spawnMp3Player } from '../audio-env.js';
-import { resolveMusicProvider, spawnMusicRemote } from '../music-preview.js';
+import { resolveMusicProvider, spawnMusicRemote, createRowSpinner } from '../music-preview.js';
 import { playBlingCue } from '../bling.js';
 
 // AgentVibes package/repo root — resolves bundled assets (bling cue) and is the
@@ -231,12 +231,20 @@ export function openTrackPicker(screen, currentTrack, currentVolume, onSelect, o
     },
   });
 
-  // Transient preview/error status shows in the title area; idle restores the title.
+  // Transient error status shows in the title area; idle restores the title.
   function _setStatus(text) {
     box.setLabel(text || TITLE);
     screen.render();
   }
 
+  // Row spinner: paints "⠹ Previewing (locally|remotely via SSH)  (Space to stop)"
+  // ON the selected track row — shared with every other picker. _setStatus stays
+  // for error messages only.
+  let _closed = false;
+  const _rowSpin = createRowSpinner(list, screen, (i) => (
+    tracks[i] && tracks[i].file === currentTrack ? `● ${tracks[i].label}` : `  ${tracks[i] ? tracks[i].label : ''}`
+  ), { isClosed: () => _closed });
+
   if (currentIdx >= 0) list.select(currentIdx);
   list.focus();
   screen.render();
@@ -263,6 +271,7 @@ export function openTrackPicker(screen, currentTrack, currentVolume, onSelect, o
       if (mp.remote) _sendRemote(mp, { stop: true });
       _remotePreviewTrackId = null;
     }
+    _rowSpin.stop();
   }
 
   /**
@@ -310,16 +319,16 @@ export function openTrackPicker(screen, currentTrack, currentVolume, onSelect, o
       if (_remotePreviewTrackId === trackFile) {
         _sendRemote(_mp, { stop: true });
         _remotePreviewTrackId = null;
-        _setStatus();
+        _rowSpin.stop();
         return;
       }
       // Bling first (fire-and-forget, plays locally like the voice preview),
-      // then forward the track to the receiver.
+      // then forward the track to the receiver. The receiver keeps playing until
+      // an explicit stop, so the row spinner persists (no floor).
       playBlingCue(_PKG_ROOT);
       if (_sendRemote(_mp, { track: trackFile })) {
         _remotePreviewTrackId = trackFile;
-        const rlabel = tracks.find(t => t.file === trackFile)?.label ?? trackFile;
-        _setStatus(` {bright-cyan-fg}♪ ${rlabel}  (Space to stop){/bright-cyan-fg} `);
+        _rowSpin.start(list.selected, true);
       }
       return;
     }
@@ -357,25 +366,25 @@ export function openTrackPicker(screen, currentTrack, currentVolume, onSelect, o
 
     _previewProc = proc;
     _previewTrackId = trackFile;
-
-    const label = tracks.find(t => t.file === trackFile)?.label ?? trackFile;
-    _setStatus(` {bright-cyan-fg}♪ ${label}  (Space to stop){/bright-cyan-fg} `);
+    _rowSpin.start(list.selected, false);
 
     proc.on('exit', () => {
       if (_previewTrackId === trackFile) {
         _previewTrackId = null;
         _previewProc = null;
-        _setStatus();
+        _rowSpin.stop();
       }
     });
 
     proc.on('error', () => {
       _previewTrackId = null;
       _previewProc = null;
+      _rowSpin.stop();
     });
   }
 
   function _close(callback) {
+    _closed = true;
     _killPreview();
     if (callback) {
       callback();

package/src/i18n/de.js

@@ -199,5 +199,5 @@ export default {
   readmeScrollMore: "↓ Scrollen für mehr Inhalt ↓",
   readmeNotFound: "*(Keine README.md im aktuellen Verzeichnis gefunden)*",
   bmadFooterNobmad: "[Tab] Tab wechseln  [Q] Beenden",
-  bmadFooterBmad: "[↑↓/jk] Navigieren  [Space] Vorschau  [Enter] Konfigurieren  [A] Auto-zuweisen  [B] Stapel  [X] Zurücksetzen  [Q] Beenden",
+  bmadFooterBmad: "[↑↓/jk] Navigieren  [Space] Vorschau  [Enter] Konfigurieren  [A] Auto-zuweisen  [B] Stapel  [Del] Zurücksetzen  [Q] Beenden",
 };

package/src/i18n/en.js

@@ -198,6 +198,6 @@ export default {
   helpSearchLabel: "Search:",
   readmeScrollMore: "↓ Scroll for more content ↓",
   readmeNotFound: "*(No README.md found in current directory)*",
-  bmadFooterNobmad: "[Tab] Switch Tab  [Q] Quit",
-  bmadFooterBmad: "[↑↓/jk] Navigate  [Space] Preview  [Enter] Configure  [A] Auto-assign  [B] Bulk  [X] Reset  [Q] Quit",
+  bmadFooterNobmad: "[Enter] Re-check  [Tab] Switch Tab  [Q] Quit",
+  bmadFooterBmad: "[↑↓/jk] Navigate  [Space] Preview  [Enter] Configure  [A] Auto-assign  [B] Bulk  [Del] Reset  [Q] Quit",
 };

package/src/i18n/es.js

@@ -199,5 +199,5 @@ export default {
   readmeScrollMore: "↓ Desplázate para ver más ↓",
   readmeNotFound: "*(No se encontró README.md en el directorio actual)*",
   bmadFooterNobmad: "[Tab] Cambiar Pestaña  [Q] Salir",
-  bmadFooterBmad: "[↑↓/jk] Navegar  [Space] Previsualizar  [Enter] Configurar  [A] Auto-asignar  [B] Masivo  [X] Restablecer  [Q] Salir",
+  bmadFooterBmad: "[↑↓/jk] Navegar  [Space] Previsualizar  [Enter] Configurar  [A] Auto-asignar  [B] Masivo  [Del] Restablecer  [Q] Salir",
 };

package/src/i18n/fr.js

@@ -199,5 +199,5 @@ export default {
   readmeScrollMore: "↓ Défiler pour plus de contenu ↓",
   readmeNotFound: "*(Aucun README.md trouvé dans le répertoire actuel)*",
   bmadFooterNobmad: "[Tab] Changer d'onglet  [Q] Quitter",
-  bmadFooterBmad: "[↑↓/jk] Naviguer  [Space] Aperçu  [Enter] Configurer  [A] Auto-assigner  [B] Lot  [X] Réinitialiser  [Q] Quitter",
+  bmadFooterBmad: "[↑↓/jk] Naviguer  [Space] Aperçu  [Enter] Configurer  [A] Auto-assigner  [B] Lot  [Del] Réinitialiser  [Q] Quitter",
 };

package/src/i18n/hi.js

@@ -199,5 +199,5 @@ export default {
   readmeScrollMore: "↓ अधिक सामग्री के लिए स्क्रॉल करें ↓",
   readmeNotFound: "*(वर्तमान निर्देशिका में README.md नहीं मिला)*",
   bmadFooterNobmad: "[Tab] टैब बदलें  [Q] बाहर",
-  bmadFooterBmad: "[↑↓/jk] नेविगेट  [Space] प्रीव्यू  [Enter] कॉन्फ़िगर  [A] ऑटो-असाइन  [B] बल्क  [X] रीसेट  [Q] बाहर",
+  bmadFooterBmad: "[↑↓/jk] नेविगेट  [Space] प्रीव्यू  [Enter] कॉन्फ़िगर  [A] ऑटो-असाइन  [B] बल्क  [Del] रीसेट  [Q] बाहर",
 };

package/src/i18n/ja.js

@@ -199,5 +199,5 @@ export default {
   readmeScrollMore: "↓ スクロールして続きを見る ↓",
   readmeNotFound: "*(現在のディレクトリにREADME.mdが見つかりません)*",
   bmadFooterNobmad: "[Tab] タブ切替  [Q] 終了",
-  bmadFooterBmad: "[↑↓/jk] 移動  [Space] プレビュー  [Enter] 設定  [A] 自動割当  [B] 一括  [X] リセット  [Q] 終了",
+  bmadFooterBmad: "[↑↓/jk] 移動  [Space] プレビュー  [Enter] 設定  [A] 自動割当  [B] 一括  [Del] リセット  [Q] 終了",
 };

package/src/i18n/ko.js

@@ -199,5 +199,5 @@ export default {
   readmeScrollMore: "↓ 아래로 스크롤하여 더 보기 ↓",
   readmeNotFound: "*(현재 디렉토리에서 README.md를 찾을 수 없습니다)*",
   bmadFooterNobmad: "[Tab] 탭 전환  [Q] 나가기",
-  bmadFooterBmad: "[↑↓/jk] 탐색  [Space] 미리보기  [Enter] 설정  [A] 자동배정  [B] 일괄  [X] 초기화  [Q] 나가기",
+  bmadFooterBmad: "[↑↓/jk] 탐색  [Space] 미리보기  [Enter] 설정  [A] 자동배정  [B] 일괄  [Del] 초기화  [Q] 나가기",
 };

package/src/i18n/pt.js

@@ -199,5 +199,5 @@ export default {
   readmeScrollMore: "↓ Role para mais conteúdo ↓",
   readmeNotFound: "*(Nenhum README.md encontrado no diretório atual)*",
   bmadFooterNobmad: "[Tab] Mudar Aba  [Q] Sair",
-  bmadFooterBmad: "[↑↓/jk] Navegar  [Space] Visualizar  [Enter] Configurar  [A] Auto-atribuir  [B] Lote  [X] Redefinir  [Q] Sair",
+  bmadFooterBmad: "[↑↓/jk] Navegar  [Space] Visualizar  [Enter] Configurar  [A] Auto-atribuir  [B] Lote  [Del] Redefinir  [Q] Sair",
 };

package/src/i18n/zh-CN.js

@@ -199,5 +199,5 @@ export default {
   readmeScrollMore: "↓ 向下滚动查看更多 ↓",
   readmeNotFound: "*(当前目录中未找到README.md)*",
   bmadFooterNobmad: "[Tab] 切换标签  [Q] 退出",
-  bmadFooterBmad: "[↑↓/jk] 导航  [Space] 预览  [Enter] 配置  [A] 自动分配  [B] 批量  [X] 重置  [Q] 退出",
+  bmadFooterBmad: "[↑↓/jk] 导航  [Space] 预览  [Enter] 配置  [A] 自动分配  [B] 批量  [Del] 重置  [Q] 退出",
 };

package/src/installer.js

@@ -5442,8 +5442,13 @@ async function updateCommandFiles(targetDir, spinner) {
  * These hooks contain bug fixes (e.g. markdown stripping) that must propagate
  * on every `npx agentvibes update` regardless of target directory.
  */
-const CRITICAL_HOOKS = ['stop-tts.sh', 'stop.sh', 'play-tts.sh', 'play-tts-piper.sh', 'audio-processor.sh', 'session-start-tts.sh', 'bmad-party-speak.sh'];
-const CRITICAL_HOOKS_WINDOWS = ['play-tts.ps1', 'play-tts-piper.ps1', 'audio-processor.ps1', 'session-start-tts.ps1', 'bmad-speak.ps1', 'bmad-party-speak.ps1', 'tts-watcher.ps1'];
+// agentvibes-session-id.{sh,ps1} are listed because play-tts.{sh,ps1} SHELL OUT to
+// them to expand a {{session}} pretext. They were absent here, so on a global
+// install the global-update path never shipped them and the self-ID silently
+// degraded to an empty string forever — the callers fail soft by design, so the
+// omission produced no error, just a feature that never worked.
+const CRITICAL_HOOKS = ['stop-tts.sh', 'stop.sh', 'play-tts.sh', 'play-tts-piper.sh', 'audio-processor.sh', 'session-start-tts.sh', 'bmad-party-speak.sh', 'agentvibes-session-id.sh'];
+const CRITICAL_HOOKS_WINDOWS = ['play-tts.ps1', 'play-tts-piper.ps1', 'audio-processor.ps1', 'session-start-tts.ps1', 'bmad-speak.ps1', 'bmad-party-speak.ps1', 'tts-watcher.ps1', 'agentvibes-session-id.ps1'];
 
 /**
  * Update critical hooks in the global ~/.claude/hooks/ directory if it exists.