agentvibes 4.5.7 → 4.6.2

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

@@ -31,6 +31,84 @@ import { spawn } from 'node:child_process';
 // Max pretext length to prevent excessively long TTS utterances
 const MAX_PRETEXT_LENGTH = 200;
 
+/**
+ * Attach a blinking █ cursor to a set of blessed buttons.
+ * Works alongside existing focus/blur handlers (e.g. ►..◄ indicators).
+ * While a spinner is active on a button, blink is paused for that button.
+ * Returns { cleanup, startSpinner(btn, screen), stopSpinner(btn, screen) }.
+ */
+export function attachBtnBlink(btns, screen) {
+  let _interval = null;
+  let _on = true;
+  let _active = null;
+  let _spinning = null;  // button currently showing a spinner
+
+  const _SPIN = ['⠋','⠙','⠹','⠸','⠼','⠴','⠦','⠧','⠇','⠏'];
+  let _spinIdx = 0;
+  let _spinInterval = null;
+
+  // Store original label on each button at attach time — never derive from current content
+  btns.forEach(btn => { btn._blinkBase = btn.content; });
+
+  // Focused with indicator ch right after ►  e.g. ►█Preview◄ / ► Preview◄ (same width)
+  function _focused(base, ch) { return `►${ch}${base}◄`; }
+
+  function _tick() {
+    if (!_active || _active === _spinning) return;
+    _on = !_on;
+    _active.setContent(_focused(_active._blinkBase, _on ? '█' : ' '));
+    screen.render();
+  }
+
+  btns.forEach(btn => {
+    btn.on('focus', () => {
+      _active = btn;
+      _on = true;
+      if (btn !== _spinning) {
+        btn.setContent(_focused(btn._blinkBase, '█'));
+        screen.render();
+      }
+      if (!_interval) _interval = setInterval(_tick, 500);
+    });
+    btn.on('blur', () => {
+      if (_active !== btn) return;
+      _active = null;
+      if (_interval) { clearInterval(_interval); _interval = null; _on = true; }
+      if (btn !== _spinning) {
+        btn.setContent(btn._blinkBase);
+        screen.render();
+      }
+    });
+  });
+
+  function startSpinner(btn) {
+    _spinning = btn;
+    _spinIdx = 0;
+    if (_spinInterval) clearInterval(_spinInterval);
+    _spinInterval = setInterval(() => {
+      _spinIdx = (_spinIdx + 1) % _SPIN.length;
+      btn.setContent(_active === btn
+        ? _focused(btn._blinkBase, _SPIN[_spinIdx])
+        : `${_SPIN[_spinIdx]}${btn._blinkBase}`);
+      screen.render();
+    }, 80);
+  }
+
+  function stopSpinner(btn) {
+    if (_spinInterval) { clearInterval(_spinInterval); _spinInterval = null; }
+    _spinning = null;
+    btn.setContent(_active === btn ? _focused(btn._blinkBase, '█') : btn._blinkBase);
+    screen.render();
+  }
+
+  function cleanup() {
+    if (_interval)    { clearInterval(_interval);    _interval    = null; }
+    if (_spinInterval){ clearInterval(_spinInterval); _spinInterval = null; }
+  }
+
+  return { cleanup, startSpinner, stopSpinner };
+}
+
 const IS_TEST = process.env.AGENTVIBES_TEST_MODE === 'true';
 
 let blessed;
@@ -547,7 +625,7 @@ ${_tl('bmadDesc')}
       top: 'center',
       left: 'center',
       width: 72,
-      height: 18,
+      height: 19,
       border: { type: 'line' },
       tags: true,
       label: _modalTitle(`${agent.icon || '🧙'} ${agent.displayName} (${agent.title || 'Agent'})`),
@@ -569,9 +647,13 @@ ${_tl('bmadDesc')}
         const emoji = PERSONALITY_EMOJIS[p] || '';
         return `${emoji} ${p === 'none' ? 'None' : p.charAt(0).toUpperCase() + p.slice(1)}`;
       }},
-      { key: 'music',        label: 'Music',       getValue: () => {
+      { key: 'musicTrack',   label: 'Music Track', getValue: () => {
+        if (!draft.backgroundMusic.enabled) return '(disabled)';
+        return formatTrackName(draft.backgroundMusic.track) || '(none)';
+      }},
+      { key: 'musicVol',    label: 'Music Vol',   getValue: () => {
         if (!draft.backgroundMusic.enabled) return '(disabled)';
-        return `${formatTrackName(draft.backgroundMusic.track)} Vol:${draft.backgroundMusic.volume}%`;
+        return `${draft.backgroundMusic.volume ?? 20}%`;
       }},
     ];
 
@@ -612,7 +694,7 @@ ${_tl('bmadDesc')}
       left: 2,
       right: 2,
       tags: true,
-      content: '{#455a64-fg}[↑↓] Navigate fields  [Enter] Edit field  [Space] Sample  [Esc] Cancel{/#455a64-fg}',
+      content: '{white-fg}[↑↓] Navigate  [Enter] Edit  [Tab] → Preview/Save  [Esc] Cancel{/white-fg}',
       style: { bg: COLORS.contentBg },
     });
 
@@ -634,22 +716,20 @@ ${_tl('bmadDesc')}
           hover: { bg: COLORS.btnFocus, fg: COLORS.btnFocusFg, bold: true },
         },
       });
-      btn.on('focus', () => {
-        const raw = btn.content.replace(/[►◄]/g, '').trim();
-        btn.setContent(`►${raw}◄`);
-        screen.render();
-      });
-      btn.on('blur', () => {
-        const raw = btn.content.replace(/[►◄]/g, '').trim();
-        btn.setContent(raw);
-        screen.render();
-      });
+      // Focus indicator handled by attachBtnBlink
       btn.key(['enter', 'space'], () => onClick());
       btn.on('click', () => onClick());
       return btn;
     }
 
-    const saveBtn = _modalBtn('Save', 4, () => {
+    const previewBtn = _modalBtn('Preview', 4, () => {
+      _sampleAgentWithDraft({ ...agent }, draft, () => {
+        btnBlink.stopSpinner(previewBtn);
+      });
+      btnBlink.startSpinner(previewBtn);
+    });
+
+    const saveBtn = _modalBtn('Save', 18, () => {
       // Only save fields that differ from global
       const toSave = {};
       if (draft.voice && draft.voice !== globalCfg.voice) toSave.voice = draft.voice;
@@ -668,20 +748,26 @@ ${_tl('bmadDesc')}
       _showSavedToast(agent.displayName);
     });
 
-    const resetAllBtn = _modalBtn('Reset to Defaults', 14, () => {
+    const resetAllBtn = _modalBtn('Reset to Defaults', 26, () => {
       voiceStore.resetAgentProfile(agent.id);
       _closeModal();
       refreshDisplay();
     });
 
-    const cancelBtn = _modalBtn('Cancel', 38, _closeModal);
+    const cancelBtn = _modalBtn('Cancel', 50, _closeModal);
+
+    // Blinking █ cursor + preview spinner — reusable across all modal buttons
+    const btnBlink = attachBtnBlink([previewBtn, saveBtn, resetAllBtn, cancelBtn], screen);
 
     function _closeModal() {
       if (_closed) return;
       _closed = true;
       _killPreview();
+      btnBlink.cleanup();
       navigationService?.closeModal();
       destroyList(modal, screen);
+      agentList.focus();
+      screen.render();
     }
 
     // Field editing via Enter
@@ -735,10 +821,9 @@ ${_tl('bmadDesc')}
           });
           break;
 
-        case 'music':
-          openTrackPicker(screen, draft.backgroundMusic.track, draft.backgroundMusic.volume, (track, volume) => {
+        case 'musicTrack':
+          openTrackPicker(screen, draft.backgroundMusic.track, draft.backgroundMusic.volume, (track) => {
             draft.backgroundMusic.track = track;
-            draft.backgroundMusic.volume = volume;
             draft.backgroundMusic.enabled = true;
             fieldList.setItems(_fieldItems());
             fieldList.select(idx);
@@ -747,6 +832,20 @@ ${_tl('bmadDesc')}
           }, () => {
             fieldList.focus();
             screen.render();
+          }, { skipVolume: true });
+          break;
+
+        case 'musicVol':
+          openVolumeInput(screen, draft.backgroundMusic.volume, (volume) => {
+            draft.backgroundMusic.volume = volume;
+            if (draft.backgroundMusic.track) draft.backgroundMusic.enabled = true;
+            fieldList.setItems(_fieldItems());
+            fieldList.select(idx);
+            fieldList.focus();
+            screen.render();
+          }, () => {
+            fieldList.focus();
+            screen.render();
           });
           break;
       }
@@ -761,15 +860,50 @@ ${_tl('bmadDesc')}
 
     // Escape = close
     fieldList.key(['escape', 'q'], _closeModal);
+    previewBtn.key(['escape'], _closeModal);
     saveBtn.key(['escape'], _closeModal);
     resetAllBtn.key(['escape'], _closeModal);
     cancelBtn.key(['escape'], _closeModal);
 
-    // Tab navigation within modal
-    fieldList.key(['tab'], () => { saveBtn.focus(); screen.render(); });
-    saveBtn.key(['tab'], () => { resetAllBtn.focus(); screen.render(); });
-    resetAllBtn.key(['tab'], () => { cancelBtn.focus(); screen.render(); });
-    cancelBtn.key(['tab'], () => { fieldList.focus(); screen.render(); });
+    // Tab + arrow navigation within modal
+    fieldList.key(['tab'], () => { previewBtn.focus(); screen.render(); });
+
+    // Wrap: down on last field → focus first button; up on first field → focus first button
+    // One extra arrow press at boundary moves to button row.
+    // Track previous selection so arriving at boundary doesn't immediately jump.
+    let _prevFieldSel = 0;
+    fieldList.key(['down'], () => {
+      const cur = fieldList.selected ?? 0;
+      if (cur === FIELDS.length - 1 && _prevFieldSel === FIELDS.length - 1) {
+        previewBtn.focus(); screen.render();
+      }
+      _prevFieldSel = cur;
+    });
+    fieldList.key(['up'], () => {
+      const cur = fieldList.selected ?? 0;
+      if (cur === 0 && _prevFieldSel === 0) {
+        previewBtn.focus(); screen.render();
+      }
+      _prevFieldSel = cur;
+    });
+
+    // Wrap: up on buttons → back to field list (last/first field respectively)
+    previewBtn.key(['up'], () => { fieldList.focus(); fieldList.select(FIELDS.length - 1); screen.render(); });
+    saveBtn.key(['up'], () => { fieldList.focus(); fieldList.select(FIELDS.length - 1); screen.render(); });
+    resetAllBtn.key(['up'], () => { fieldList.focus(); fieldList.select(FIELDS.length - 1); screen.render(); });
+    cancelBtn.key(['up'], () => { fieldList.focus(); fieldList.select(FIELDS.length - 1); screen.render(); });
+
+    previewBtn.key(['tab', 'right'], () => { saveBtn.focus(); screen.render(); });
+    previewBtn.key(['left'], () => { cancelBtn.focus(); screen.render(); });
+
+    saveBtn.key(['tab', 'right'], () => { resetAllBtn.focus(); screen.render(); });
+    saveBtn.key(['left'], () => { previewBtn.focus(); screen.render(); });
+
+    resetAllBtn.key(['tab', 'right'], () => { cancelBtn.focus(); screen.render(); });
+    resetAllBtn.key(['left'], () => { saveBtn.focus(); screen.render(); });
+
+    cancelBtn.key(['tab', 'right'], () => { fieldList.focus(); screen.render(); });
+    cancelBtn.key(['left'], () => { resetAllBtn.focus(); screen.render(); });
 
     fieldList.focus();
     screen.render();
@@ -1047,8 +1181,8 @@ ${_tl('bmadDesc')}
   // -------------------------------------------------------------------------
   // Sample agent with a draft profile (no save) — same full pipeline
 
-  function _sampleAgentWithDraft(agent, draft) {
-    _sampleWithFullProfile(agent, draft);
+  function _sampleAgentWithDraft(agent, draft, onComplete) {
+    _sampleWithFullProfile(agent, draft, onComplete);
   }
 
   // -------------------------------------------------------------------------
@@ -1056,7 +1190,7 @@ ${_tl('bmadDesc')}
   // Writes a temp agent profile JSON, then calls the enhanced TTS pipeline
   // which applies voice + reverb + background music.
 
-  function _sampleWithFullProfile(agent, profile) {
+  function _sampleWithFullProfile(agent, profile, onComplete) {
     _killPreview();
     const gen = ++_playGeneration;
 
@@ -1071,9 +1205,9 @@ ${_tl('bmadDesc')}
     const isWindows = process.platform === 'win32' && !process.env.WSL_DISTRO_NAME;
 
     if (isWindows) {
-      // On Windows, synthesize with piper.exe directly then play the wav,
-      // avoiding bash/wsl.exe which opens a visible console window.
-      _sampleWithPiperDirect(gen, voiceId, phrase);
+      // On Windows, call play-tts.ps1 via PowerShell with draft settings patched
+      // in so reverb, background music, and personality are applied.
+      _sampleWithFullEffectsWindows(gen, agent, profile, phrase, onComplete);
     } else {
       // On Linux/macOS/WSL, use play-tts.sh
       const _spawnEnv = buildAudioEnv();
@@ -1178,6 +1312,77 @@ ${_tl('bmadDesc')}
     });
   }
 
+  /** Windows full-effects preview: temporarily patches config files then calls play-tts.ps1 */
+  function _sampleWithFullEffectsWindows(gen, agent, profile, phrase, onComplete) {
+    const _spawnEnv = buildAudioEnv();
+    const homeDir = process.env.USERPROFILE || os.homedir();
+    // Use project-local .claude if it exists, else global ~/.claude
+    const claudeDir = fs.existsSync(path.join(_projectRoot, '.claude'))
+      ? path.join(_projectRoot, '.claude')
+      : path.join(homeDir, '.claude');
+    const configDir  = path.join(claudeDir, 'config');
+    const hooksDir   = path.join(claudeDir, 'hooks-windows');
+    const playTts    = path.join(hooksDir, 'play-tts.ps1');
+    if (!fs.existsSync(playTts)) { _sampleWithPiperDirect(gen, profile.voice || '', phrase); return; }
+
+    // Files to temporarily patch
+    const personalityFile  = path.join(configDir, 'personality.txt');
+    const reverbFile       = path.join(configDir, 'reverb-level.txt');
+    const bgEnabledFile    = path.join(configDir, 'background-music-enabled.txt');
+    const audioEffectsCfg  = path.join(configDir, 'audio-effects.cfg');
+
+    // Save originals
+    const _read = f => { try { return fs.readFileSync(f, 'utf8'); } catch { return null; } };
+    const origPersonality = _read(personalityFile);
+    const origReverb      = _read(reverbFile);
+    const origBgEnabled   = _read(bgEnabledFile);
+    const origAudioEffects = _read(audioEffectsCfg);
+
+    const bgMusic   = profile.backgroundMusic;
+    let tempCfgLine = '';
+
+    try {
+      if (profile.personality && profile.personality !== 'none')
+        fs.writeFileSync(personalityFile, profile.personality);
+      if (profile.reverbPreset)
+        fs.writeFileSync(reverbFile, profile.reverbPreset);
+      if (bgMusic?.enabled && bgMusic?.track) {
+        fs.writeFileSync(bgEnabledFile, 'true');
+        const vol = ((bgMusic.volume ?? 20) / 100).toFixed(2);
+        tempCfgLine = `${agent.id}||${bgMusic.track}|${vol}`;
+        fs.writeFileSync(audioEffectsCfg, `${tempCfgLine}\n${origAudioEffects || ''}`);
+      }
+    } catch { /* degrade gracefully */ }
+
+    const voiceId = profile.voice || '';
+    const psArgs  = ['-NoProfile', '-ExecutionPolicy', 'Bypass', '-File', playTts, phrase];
+    if (voiceId) psArgs.push(voiceId);
+
+    const proc = spawn('powershell', psArgs, {
+      stdio: 'ignore', detached: false, windowsHide: true,
+      // CLAUDE_PROJECT_DIR tells play-tts.ps1 to use the project's .claude/config
+      // rather than falling back to ~/.claude where our patches don't exist.
+      env: { ..._spawnEnv, AGENTVIBES_AGENT_NAME: agent.id, CLAUDE_PROJECT_DIR: _projectRoot },
+    });
+    _playingProcess = proc;
+
+    function _restore() {
+      try {
+        if (origPersonality !== null) fs.writeFileSync(personalityFile, origPersonality);
+        else try { fs.unlinkSync(personalityFile); } catch {}
+        if (origReverb !== null) fs.writeFileSync(reverbFile, origReverb);
+        if (bgMusic?.enabled && bgMusic?.track) {
+          if (origBgEnabled !== null) fs.writeFileSync(bgEnabledFile, origBgEnabled);
+          else try { fs.unlinkSync(bgEnabledFile); } catch {}
+          if (origAudioEffects !== null) fs.writeFileSync(audioEffectsCfg, origAudioEffects);
+        }
+      } catch {}
+    }
+
+    proc.on('exit', () => { if (gen === _playGeneration) { _playingProcess = null; _stopSpinner(); } _restore(); if (onComplete) onComplete(); });
+    proc.on('error', () => { if (gen === _playGeneration) { _playingProcess = null; _stopSpinner(); } _restore(); if (onComplete) onComplete(); });
+  }
+
   // -------------------------------------------------------------------------
   // Auto-assign helpers
 
@@ -1199,9 +1404,10 @@ ${_tl('bmadDesc')}
     grace: 'Female', heather: 'Female', ivy: 'Female', jane: 'Female',
     jenny: 'Female', julia: 'Female', kate: 'Female', laura: 'Female',
     lily: 'Female', maria: 'Female', mary: 'Female', nina: 'Female',
-    olivia: 'Female', paige: 'Female', rachel: 'Female', sally: 'Female',
-    sara: 'Female', sarah: 'Female', sophie: 'Female', tina: 'Female',
-    wendy: 'Female', zoe: 'Female',
+    olivia: 'Female', paige: 'Female', quinn: 'Female', rachel: 'Female',
+    sally: 'Female', sara: 'Female', sarah: 'Female', sophie: 'Female',
+    tina: 'Female', wendy: 'Female', zoe: 'Female',
+    freya: 'Female', saga: 'Female',
     // Male
     alan: 'Male', barry: 'Male', bob: 'Male', carl: 'Male',
     charlie: 'Male', dan: 'Male', david: 'Male', eric: 'Male',

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

@@ -974,6 +974,7 @@ export function createInstallTab(screen, services) {
   screen.key(['left'], () => {
     if (box.hidden || _checking) return;
     if (_screen === 4) return;
+    if (_screen === 5) return;  // Screen 5: ← handled by button nav
     if (_screen > 0) {
       _screen--;
       _showCurrentScreen();

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

@@ -190,12 +190,13 @@ export const COL_GENDER_W = 10;
 
 // Well-known piper dataset → gender
 const GENDER_MAP = {
+  // Single-speaker datasets
   amy: 'Female', kristin: 'Female', jenny: 'Female', cori: 'Female',
   aria: 'Female', glados: 'Female', litvyak: 'Female', hfc_female: 'Female',
   ljspeech: 'Female',
   alan: 'Male', joe: 'Male', john: 'Male', ryan: 'Male', lessac: 'Male',
   kusal: 'Male', hfc_male: 'Male', danny: 'Male', arctic: 'Male',
-  l2arctic: 'Male', libritts: 'Male', libritts_r: 'Male',
+  l2arctic: 'Male',
   // 16Speakers multi-speaker model (names from speaker_id_map)
   cori_samuel: 'Female', kara_shallenberg: 'Female', kristin_hughes: 'Female',
   maria_kasper: 'Female', rose_ibex: 'Female', owlivia: 'Female',
@@ -203,6 +204,21 @@ const GENDER_MAP = {
   mike_pelton: 'Male', mark_nelson: 'Male', michael_scherer: 'Male',
   james_k_white: 'Male', progressingamerica: 'Male', steve_c: 'Male',
   paul_hampton: 'Male', martin_clifton: 'Male',
+  // LibriTTS / common first names used as multi-speaker speaker IDs
+  anna: 'Female', bella: 'Female', chloe: 'Female', donna: 'Female',
+  ella: 'Female', faith: 'Female', gina: 'Female', holly: 'Female',
+  ivy: 'Female', jane: 'Female', kelly: 'Female', laura: 'Female',
+  mary: 'Female', nina: 'Female', olivia: 'Female', penny: 'Female',
+  rachel: 'Female', sarah: 'Female', tara: 'Female', uma: 'Female',
+  vera: 'Female', wendy: 'Female', yara: 'Female', zoe: 'Female',
+  betty: 'Female', cindy: 'Female', debra: 'Female', erica: 'Female',
+  faye: 'Female', gloria: 'Female', quinn: 'Female',
+  alex: 'Male', ben: 'Male', carl: 'Male', dan: 'Male', evan: 'Male',
+  frank: 'Male', greg: 'Male', hank: 'Male', ivan: 'Male', jake: 'Male',
+  kevin: 'Male', leo: 'Male', mike: 'Male', nathan: 'Male', oscar: 'Male',
+  paul: 'Male', rick: 'Male', sam: 'Male', tom: 'Male', victor: 'Male',
+  will: 'Male', xavier: 'Male', zach: 'Male', adam: 'Male', brad: 'Male',
+  colin: 'Male', derek: 'Male', ethan: 'Male', felix: 'Male',
 };
 
 // Well-known piper dataset → nice display name
@@ -229,9 +245,15 @@ export function inferGender(voiceId, dataset) {
   // Explicit in name
   if (id.includes('_female') || ds.includes('female')) return 'Female';
   if (id.includes('_male')   || ds.includes('male'))   return 'Male';
-  // Lookup by dataset, name segment, or full id (for multi-speaker names)
-  const key = ds || (id.split('-')[1] ?? '');
-  return GENDER_MAP[key] ?? GENDER_MAP[id] ?? '—';
+  // Dataset lookup first
+  if (ds && GENDER_MAP[ds]) return GENDER_MAP[ds];
+  // For multi-speaker speaker names like "Anna-9", strip trailing "-N" suffix
+  // then look up the base name (e.g. "anna")
+  const baseName = id.replace(/-\d+$/, '');
+  if (GENDER_MAP[baseName]) return GENDER_MAP[baseName];
+  // Fall back to middle segment of voice ID (e.g. "ryan" from "en_US-ryan-high")
+  const segment = id.split('-')[1] ?? '';
+  return GENDER_MAP[segment] ?? GENDER_MAP[id] ?? '—';
 }
 
 /**
@@ -321,7 +343,18 @@ export function parseMultiSpeaker(voiceId) {
     const jsonPath = path.join(PIPER_VOICES_DIR, model + '.onnx.json');
     try {
       const data = JSON.parse(fs.readFileSync(jsonPath, 'utf8'));
-      const speakerId = data.speaker_id_map?.[speakerName] ?? null;
+      let speakerId = data.speaker_id_map?.[speakerName] ?? null;
+      // Fallback: if the .onnx.json still has raw p-names (not yet patched),
+      // look up the numeric speaker ID from voice-assignments.json catalog.
+      if (speakerId == null && model === 'en_US-libritts-high') {
+        try {
+          const catalogPath = path.resolve(__dirname, '..', '..', '..', 'voice-assignments.json');
+          const catalog = JSON.parse(fs.readFileSync(catalogPath, 'utf8'));
+          const speakers = catalog.libritts_speakers ?? {};
+          const entry = Object.entries(speakers).find(([, e]) => e.voice_name === speakerName);
+          if (entry) speakerId = parseInt(entry[0], 10);
+        } catch { /* non-fatal */ }
+      }
       return { model, speakerId, speakerName, isMultiSpeaker: true };
     } catch {
       return { model, speakerId: null, speakerName, isMultiSpeaker: true };

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

@@ -42,30 +42,48 @@ export function openVolumeInput(screen, currentVol, onConfirm, onClose) {
     parent: screen,
     top: 'center',
     left: 'center',
-    width: 38,
-    height: 8,
+    width: 44,
+    height: 11,
     border: { type: 'line' },
     tags: true,
     label: _modalTitle('Music Volume'),
     style: { border: { fg: 'bright-cyan' } },
   });
 
-  const barText = blessed.text({
+  blessed.text({
     parent: box,
     top: 1,
     left: 2,
-    width: 32,
+    width: 38,
+    tags: true,
+    content: '{cyan-fg}Use ← → arrow keys to adjust volume{/cyan-fg}',
+  });
+
+  const barText = blessed.text({
+    parent: box,
+    top: 3,
+    left: 2,
+    width: 38,
     tags: true,
     content: '',
   });
 
-  const hint = blessed.text({
+  blessed.text({
     parent: box,
     top: 5,
-    left: 1,
-    width: 34,
+    left: 2,
+    width: 38,
     tags: true,
-    content: '{#455a64-fg}[←→] ±5  [1-9] type  [Enter] OK  [Esc] Cancel{/#455a64-fg}',
+    content: '{white-fg}[← →] ±5  [0-9] number  [Esc] Cancel{/white-fg}',
+  });
+
+  blessed.text({
+    parent: box,
+    top: 7,
+    left: 2,
+    width: 38,
+    tags: true,
+    content: '{white-fg}[Enter] Confirm  then {bold}{cyan-fg}[Tab]{/cyan-fg}{/bold} → Save{/white-fg}',
   });
 
   function _renderBar() {
@@ -73,10 +91,13 @@ export function openVolumeInput(screen, currentVol, onConfirm, onClose) {
     const empty = 20 - filled;
     const bar = '{bright-cyan-fg}' + '█'.repeat(filled) + '{/bright-cyan-fg}' +
                 '{#263238-fg}' + '░'.repeat(empty) + '{/#263238-fg}';
-    barText.setContent(`{#90a4ae-fg}Volume:{/#90a4ae-fg} ${bar} {bold}${vol}%{/bold}`);
+    barText.setContent(`{white-fg}Volume:{/white-fg} ${bar} {bold}${vol}%{/bold}`);
     screen.render();
   }
   _renderBar();
+  // Take focus so fieldList's key handlers don't fire while this dialog is open
+  box.focus();
+  screen.render();
 
   // Capture keypress directly on screen to avoid input mode issues
   let _digits = '';
@@ -99,8 +120,12 @@ export function openVolumeInput(screen, currentVol, onConfirm, onClose) {
     screen.removeListener('keypress', _onKey);
     box.destroy();
     screen.render();
-    if (confirm && onConfirm) onConfirm(vol);
-    if (onClose) onClose();
+    // Defer callbacks so the Enter keypress finishes propagating before fieldList
+    // regains focus — otherwise the same Enter event re-opens the track picker.
+    setTimeout(() => {
+      if (confirm && onConfirm) onConfirm(vol);
+      if (onClose) onClose();
+    }, 0);
   }
 }
 
@@ -121,7 +146,7 @@ const BUILT_IN_TRACKS = [
  * @param {Function} onSelect      - called with (trackFile, volume)
  * @param {Function} [onClose]     - called after modal fully closes
  */
-export function openTrackPicker(screen, currentTrack, currentVolume, onSelect, onClose) {
+export function openTrackPicker(screen, currentTrack, currentVolume, onSelect, onClose, options = {}) {
   const tracksDir = path.join(process.cwd(), '.claude', 'audio', 'tracks');
   let tracks;
   try {
@@ -271,17 +296,24 @@ export function openTrackPicker(screen, currentTrack, currentVolume, onSelect, o
     if (selected) _previewTrack(selected.file);
   });
 
-  // Enter = select track, then prompt for volume
+  // Enter = select track; if skipVolume, return track only, otherwise prompt for volume
   list.key(['enter'], () => {
     const selected = tracks[list.selected];
     if (!selected) return;
-    // Close the track list first (without firing onClose yet), then open volume input
     _killPreview();
     if (list._label2) list._label2.destroy();
-    destroyList(list, screen, null);
-    openVolumeInput(screen, currentVolume ?? 20, (volume) => {
-      onSelect(selected.file, volume);
-    }, onClose);
+    if (options.skipVolume) {
+      destroyList(list, screen, null);
+      setTimeout(() => {
+        onSelect(selected.file);
+        if (onClose) onClose();
+      }, 0);
+    } else {
+      destroyList(list, screen, null);
+      openVolumeInput(screen, currentVolume ?? 20, (volume) => {
+        onSelect(selected.file, volume);
+      }, onClose);
+    }
   });
 
   list.key(['escape', 'q'], () => {