agentvibes 4.0.1 → 4.4.0

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

@@ -21,8 +21,33 @@ import {
 import { formatTrackLabel, scanTracks, getMusicFavorites, toggleMusicFavorite, applyTrackToAudioEffects } from './music-tab.js';
 import { BRAND_PINK, BRAND_BLUE } from '../brand-colors.js';
 import { buildAudioEnv, detectMp3Player, detectWavPlayer } from '../audio-env.js';
+import { destroyList } from '../widgets/destroy-list.js';
+import { openReverbPicker } from '../widgets/reverb-picker.js';
+import { openPersonalityPicker } from '../widgets/personality-picker.js';
+import { PERSONALITY_EMOJIS } from '../constants/personalities.js';
+import { formatTrackName as _sharedFormatTrackName, formatReverbState as _sharedFormatReverbState } from '../widgets/format-utils.js';
+import { showNotice as _showNoticeWidget } from '../widgets/notice.js';
 
 const IS_TEST = process.env.AGENTVIBES_TEST_MODE === 'true';
+const _IS_WINDOWS = process.platform === 'win32' && !process.env.WSL_DISTRO_NAME;
+
+/** Resolve piper binary path — uses exe on Windows, 'piper' in PATH on Unix */
+function _resolvePiperBin() {
+  if (_IS_WINDOWS) {
+    const lad = process.env.LOCALAPPDATA ||
+      (process.env.USERPROFILE ? path.join(process.env.USERPROFILE, 'AppData', 'Local') : null);
+    if (lad) {
+      const exe = path.join(lad, 'Programs', 'Piper', 'piper.exe');
+      if (fs.existsSync(exe)) return exe;
+    }
+  }
+  return 'piper';
+}
+
+/** Build spawn options with Windows-safe defaults (no visible console, no detached) */
+function _spawnOpts(env, extraOpts = {}) {
+  return { stdio: 'ignore', detached: !_IS_WINDOWS, windowsHide: true, env, ...extraOpts };
+}
 
 // Sanitize strings before passing as env vars to shell commands.
 // Removes characters that could cause shell injection when expanded inside sh -c.
@@ -45,19 +70,19 @@ const _modalTitle = (text) => ` {${BRAND_PINK}-fg}${text}{/${BRAND_PINK}-fg} `;
 
 const COLORS = {
   contentBg:    '#0a0e1a',  // Near-black content background
-  sectionHdr:   '#7986cb',  // Light blue — section dividers
+  sectionHdr:   'bright-cyan',  // Matches header "Agent" color
   labelFg:      '#e3f2fd',  // Light blue text — labels
   valueFg:      '#ffff00',  // Yellow — current values
   btnDefault:   '#37474f',  // Dark slate — default button bg
-  btnFocus:     '#00e5ff',  // Cyan — focused button bg
-  btnFocusFg:   '#000000',  // Black — focused button text
+  btnFocus:     '#2e7d32',  // Green — focused/selected button bg
+  btnFocusFg:   '#ffffff',  // White — focused button text
   btnPress:     '#ff00ff',  // Magenta — pressed button bg
   btnChange:    '#37474f',  // Dark slate — Change buttons
   btnTest:      '#37474f',  // Dark slate — Test buttons
   btnEdit:      '#37474f',  // Dark slate — Edit buttons
   btnEnableOn:  '#37474f',  // Dark slate — Enabled toggle
   btnEnableOff: '#37474f',  // Dark slate — Disabled toggle
-  borderFg:     '#7986cb',  // Light blue — borders
+  borderFg:     'bright-cyan',  // Matches section headers
   footerBg:     '#2196f3',  // Blue — settings footer
   noticeFg:     '#90a4ae',  // Gray — stub notice text
 };
@@ -74,82 +99,11 @@ const MUSIC_DEFAULTS = Object.freeze({ enabled: false, track: 'agentvibes_soft_f
 // Verbosity display labels
 const VERBOSITY_LABELS = Object.freeze({ high: 'High', medium: 'Medium', low: 'Low', minimal: 'Minimal', custom: 'Custom' });
 
-// Personality emojis — mirrors installer.js personalityEmojis (src/installer.js:84)
-const PERSONALITY_EMOJIS = Object.freeze({
-  angry:        '😠',
-  annoying:     '😤',
-  crass:        '🤬',
-  dramatic:     '🎭',
-  'dry-humor':  '😐',
-  flirty:       '😘',
-  funny:        '😂',
-  grandpa:      '👴',
-  millennial:   '🙄',
-  moody:        '😒',
-  none:         '😊',
-  normal:       '😊',
-  pirate:       '⚓',
-  poetic:       '📜',
-  professional: '👔',
-  rapper:       '🎤',
-  robot:        '🤖',
-  sarcastic:    '😏',
-  sassy:        '💁',
-  'surfer-dude':'🏄',
-  zen:          '🧘',
-});
-
-// Known personalities (matches .claude/personalities/ directory)
-const PERSONALITIES = Object.freeze([
-  'none', 'angry', 'annoying', 'crass', 'dramatic', 'dry-humor',
-  'flirty', 'funny', 'grandpa', 'millennial', 'moody', 'normal',
-  'pirate', 'poetic', 'professional', 'rapper', 'robot', 'sarcastic',
-  'sassy', 'surfer-dude', 'zen',
-]);
-
-// Preview phrases — one short, exemplary, in-character line per personality.
-// Spoken automatically when the cursor lands on a personality in the picker.
-const PERSONALITY_PREVIEW_PHRASES = Object.freeze({
-  angry:        "UNACCEPTABLE! This build time is a DISASTER! Fix it NOW or so help me!",
-  annoying:     "Oh oh oh! Can I tell you something? Can I? Can I? PLEASE? It is so important!",
-  crass:        "Well damn, that code runs like my uncle's truck. Barely, and it smells funny.",
-  dramatic:     "The tests... have failed. I don't know how much longer I can do this.",
-  'dry-humor':  "Your code worked. I too am surprised.",
-  flirty:       "Ooh, a clean merge? You know exactly how to make my heart race.",
-  funny:        "Why do programmers hate nature? Too many bugs. I will show myself out.",
-  grandpa:      "Back in my day, we compiled by hand. Uphill. In the snow. Both ways.",
-  millennial:   "I literally cannot even with this error. I am so done. Like, actually deceased.",
-  moody:        "...It works. Whatever. Do not get used to it.",
-  pirate:       "Arrr! The build be sailin' smooth today, matey! No barnacles in sight!",
-  poetic:       "Like rivers to the sea, your code flows toward eventual compilation.",
-  professional: "I have completed the requested task and am prepared to document outcomes.",
-  rapper:       "Yo! Clean code flowin', tests are glowin', no bugs showin'!",
-  robot:        "TASK COMPLETE. EFFICIENCY: OPTIMAL. PROBABILITY OF SUCCESS: 97.3 PERCENT. BEEP.",
-  sarcastic:    "Oh wow, another bug. What a completely unexpected surprise. Truly shocking.",
-  sassy:        "Honey, whoever told you that was good code was not your friend.",
-  'surfer-dude':"Duuude! That commit totally shredded! Gnarly clean code, bro!",
-  zen:          "The bug is not the enemy. The bug is the teacher. Breathe. Commit.",
-  random:       "Who will I be today? Even I do not know. Expect the unexpected.",
-});
-
-// Human-readable track display names — matches installer track picker (src/installer.js:2280)
-const TRACK_NAMES = Object.freeze({
-  'agentvibes_soft_flamenco_loop.mp3':                 '🎻 Soft Flamenco',
-  'agent_vibes_bachata_v1_loop.mp3':                   '🎺 Bachata',
-  'agent_vibes_salsa_v2_loop.mp3':                     '💃 Salsa',
-  'agent_vibes_cumbia_v1_loop.mp3':                    '🎸 Cumbia',
-  'agent_vibes_bossa_nova_v2_loop.mp3':                '🌸 Bossa Nova',
-  'agent_vibes_japanese_city_pop_v1_loop.mp3':         '🌆 Japanese City Pop',
-  'agent_vibes_chillwave_v2_loop.mp3':                 '🌊 Chillwave',
-  'agent_vibes_dark_chill_step_loop.mp3':              '🌙 Dark Chill Step',
-  'agent_vibes_goa_trance_v2_loop.mp3':                '🌀 Goa Trance',
-  'agent_vibes_harpsichord_v2_loop.mp3':               '🎼 Harpsichord',
-  'agent_vibes_celtic_harp_v1_loop.mp3':               '🎻 Celtic Harp',
-  'agent_vibes_hawaiian_slack_key_guitar_v2_loop.mp3': '🌺 Hawaiian Slack Key Guitar',
-  'agent_vibes_arabic_v2_loop.mp3':                    '🎵 Arabic Oud',
-  'agent_vibes_ganawa_ambient_v2_loop.mp3':            '🪘 Gnawa Ambient',
-  'agent_vibes_tabla_dream_pop_v1_loop.mp3':           '🥁 Tabla Dream Pop',
-});
+// Personality emojis and names imported from src/console/constants/personalities.js
+// (via the import at the top of this file)
+
+// Human-readable track display names — moved to shared widgets/format-utils.js
+// TRACK_NAMES constant removed (M1 dedup). Use formatTrackName() instead.
 
 // Built-in track list for the picker (fallback when tracks dir is missing)
 const BUILT_IN_TRACKS = [
@@ -166,10 +120,7 @@ const BUILT_IN_TRACKS = [
  * @param {string} preset - 'off' | 'light' | 'medium' | 'heavy' | 'cathedral'
  * @returns {string}
  */
-export function formatReverbState(preset) {
-  const LABELS = { off: 'Off', light: 'Light (Small room)', medium: 'Medium (Conference room)', heavy: 'Heavy (Large hall)', cathedral: 'Cathedral (Epic space)' };
-  return LABELS[preset] ?? LABELS.light;
-}
+export const formatReverbState = _sharedFormatReverbState;
 
 /**
  * @param {boolean} enabled
@@ -192,18 +143,7 @@ export function formatVolume(volume) {
  * @param {string} track - filename (e.g. 'agentvibes_soft_flamenco_loop.mp3')
  * @returns {string}
  */
-export function formatTrackName(track) {
-  if (!track) return 'None';
-  if (TRACK_NAMES[track]) return TRACK_NAMES[track];
-  // Custom/unknown track: strip extension, agentvibes_/agent_vibes_ prefix,
-  // _v1/_v2/_loop/_v1_loop/_v2_loop suffixes, then title-case each word
-  return track
-    .replace(/\.[^.]+$/, '')
-    .replace(/^agentvibes_|^agent_vibes_/, '')
-    .replace(/_v\d+_loop$|_loop$|_v\d+$/, '')
-    .replace(/_/g, ' ')
-    .replace(/\b\w/g, c => c.toUpperCase());
-}
+export const formatTrackName = _sharedFormatTrackName;
 
 /**
  * @param {string} verbosity - 'high' | 'medium' | 'low'
@@ -492,9 +432,14 @@ export function createSettingsTab(screen, services) {
           `play "${trackPath}" repeat 9999 vol ${volFraction}`,
           `mpg123 -q --loop -1 "${trackPath}"`,
         ].join(' 2>/dev/null || ') + ' 2>/dev/null';
-        _testMusicProc = spawn('sh', ['-c', musicCmd], {
-          stdio: 'ignore', detached: true, env: _testEnv,
-        });
+        if (_IS_WINDOWS) {
+          const _mp3P = detectMp3Player(_testEnv);
+          _testMusicProc = _mp3P
+            ? spawn(_mp3P.bin, _mp3P.args(trackPath), _spawnOpts(_testEnv))
+            : null;
+        } else {
+          _testMusicProc = spawn('sh', ['-c', musicCmd], _spawnOpts(_testEnv));
+        }
         _testMusicProc.unref();
       }
     }
@@ -542,7 +487,7 @@ export function createSettingsTab(screen, services) {
           `soprano "$_AV_PHRASE" -o "$_AV_WAV"`,
         ].join(' || ');
         synthProc = spawn('sh', ['-c', cmd], {
-          stdio: 'ignore', detached: true, env: sopranoEnv,
+          stdio: 'ignore', detached: !_IS_WINDOWS, windowsHide: true, env: sopranoEnv,
         });
       } else {
         const voiceId = providerService.getActiveVoiceId();
@@ -555,8 +500,8 @@ export function createSettingsTab(screen, services) {
         }
         const _piperArgs = ['--model', voicePath, '--output_file', tempWav];
         if (_ms.speakerId != null) _piperArgs.push('--speaker', String(_ms.speakerId));
-        synthProc = spawn('piper', _piperArgs, {
-          stdio: ['pipe', 'ignore', 'ignore'], detached: true, env: _testEnv,
+        synthProc = spawn(_resolvePiperBin(), _piperArgs, {
+          stdio: ['pipe', 'ignore', 'ignore'], detached: !_IS_WINDOWS, windowsHide: true, env: _testEnv,
         });
         synthProc.stdin.write(ttsInput + '\n');
         synthProc.stdin.end();
@@ -607,7 +552,7 @@ export function createSettingsTab(screen, services) {
         _setTestBtnsLabel('■ Stop');
         const _wavPlayer1 = detectWavPlayer(_testEnv);
         const playProc = _wavPlayer1
-          ? spawn(_wavPlayer1.bin, _wavPlayer1.args(wavToPlay), { stdio: 'ignore', detached: true, env: _testEnv })
+          ? spawn(_wavPlayer1.bin, _wavPlayer1.args(wavToPlay), _spawnOpts(_testEnv))
           : null;
         if (!playProc) { _killTest(); _restoreTestBtnsLabels(); return; }
         _testVoiceProc = playProc;
@@ -712,9 +657,14 @@ export function createSettingsTab(screen, services) {
       `mpg123 -q "${trackPath}"`,
     ].join(' 2>/dev/null || ') + ' 2>/dev/null';
 
-    _musicTestProc = spawn('sh', ['-c', cmd], {
-      stdio: 'ignore', detached: true, env: _testEnv,
-    });
+    if (_IS_WINDOWS) {
+      const _mp3P2 = detectMp3Player(_testEnv);
+      _musicTestProc = _mp3P2
+        ? spawn(_mp3P2.bin, _mp3P2.args(trackPath), _spawnOpts(_testEnv))
+        : null;
+    } else {
+      _musicTestProc = spawn('sh', ['-c', cmd], _spawnOpts(_testEnv));
+    }
     _musicTestProc.unref();
     musicTestBtn.setContent('■ Stop');
     screen.render();
@@ -807,7 +757,7 @@ export function createSettingsTab(screen, services) {
       content: lbl, width: lbl.length, height: 1,
       top: 0, left: _xOff,
       keys: true, focusable: true,
-      style: { fg: '#00e5ff', bg: '#263238' },
+      style: { fg: 'bright-cyan', bg: '#263238' },
     });
     _subTabItemsMap[id] = item;
     _xOff += lbl.length;
@@ -821,7 +771,7 @@ export function createSettingsTab(screen, services) {
         item.style.bg = '#0288d1'; // light blue — active tab
         item.style.bold = true;
       } else {
-        item.style.fg = '#00e5ff';
+        item.style.fg = 'bright-cyan';
         item.style.bg = '#263238';
         item.style.bold = false;
       }
@@ -855,12 +805,24 @@ export function createSettingsTab(screen, services) {
     });
   }
 
+  // -------------------------------------------------------------------------
+  // Section header: ── Provider & Voice ──
+
+  const providerVoiceHeader = blessed.text({
+    parent: box,
+    top: 3,
+    left: 1,
+    content: '{bright-cyan-fg} 🎤 Provider & Voice {/bright-cyan-fg}',
+    tags: true,
+    style: { bg: COLORS.contentBg },
+  });
+
   // -------------------------------------------------------------------------
   // Provider row: label + value + [Switch] button
 
   const providerLabel = blessed.text({
     parent: box,
-    top: 3,
+    top: 5,
     left: 6,
     content: 'Provider:',
     style: { fg: COLORS.labelFg, bg: COLORS.contentBg },
@@ -868,7 +830,7 @@ export function createSettingsTab(screen, services) {
 
   const providerValue = blessed.text({
     parent: box,
-    top: 3,
+    top: 5,
     left: 22,
     width: 26,    // truncate before [Switch] at left:40
     wrap: false,
@@ -884,7 +846,7 @@ export function createSettingsTab(screen, services) {
       screen.render();
     }, _restoreFocus);
   });
-  switchBtn.top = 3;
+  switchBtn.top = 5;
   switchBtn.left = 52;
 
   // -------------------------------------------------------------------------
@@ -892,7 +854,7 @@ export function createSettingsTab(screen, services) {
 
   const voiceLabel = blessed.text({
     parent: box,
-    top: 5,
+    top: 7,
     left: 6,
     content: 'Current Voice:',
     style: { fg: COLORS.labelFg, bg: COLORS.contentBg },
@@ -900,7 +862,7 @@ export function createSettingsTab(screen, services) {
 
   const voiceValue = blessed.text({
     parent: box,
-    top: 5,
+    top: 7,
     left: 22,
     width: 26,    // truncate before [Change] at left:40
     wrap: false,
@@ -916,7 +878,7 @@ export function createSettingsTab(screen, services) {
       screen.render();
     }, _restoreFocus);
   }, { bg: COLORS.btnChange });
-  changeBtn.top = 5;
+  changeBtn.top = 7;
   changeBtn.left = 52;
 
   const playBtn = _createButton(box, screen, '▶ Play', COLORS, () => {
@@ -951,7 +913,7 @@ export function createSettingsTab(screen, services) {
       screen.render();
       const _wavPlayer2 = detectWavPlayer(_sampleEnv);
       if (!_wavPlayer2) { _stopSpinner(); _killSample(); playBtn.setContent('▶ Play'); screen.render(); return; }
-      const playProc = spawn(_wavPlayer2.bin, _wavPlayer2.args(tempWav), { stdio: 'ignore', detached: true, env: _sampleEnv });
+      const playProc = spawn(_wavPlayer2.bin, _wavPlayer2.args(tempWav), _spawnOpts(_sampleEnv));
       _sampleProcess = playProc;
       const _done = () => { _killSample(); playBtn.setContent('▶ Play'); _focusButton(playBtn); try { fs.unlinkSync(tempWav); } catch {} };
       playProc.on('exit', _done);
@@ -1052,7 +1014,7 @@ export function createSettingsTab(screen, services) {
         ].join(' || ');
 
         const soprano = spawn('sh', ['-c', cmd], {
-          stdio: 'ignore', detached: true, env: sopranoEnv,
+          stdio: 'ignore', detached: !_IS_WINDOWS, windowsHide: true, env: sopranoEnv,
         });
         _sampleProcess = soprano;
         soprano.on('exit', (code) => {
@@ -1074,8 +1036,8 @@ export function createSettingsTab(screen, services) {
       }
       const _piperArgs2 = ['--model', voicePath, '--output_file', tempWav];
       if (_ms2.speakerId != null) _piperArgs2.push('--speaker', String(_ms2.speakerId));
-      const piper = spawn('piper', _piperArgs2, {
-        stdio: ['pipe', 'ignore', 'ignore'], detached: true, env: _sampleEnv,
+      const piper = spawn(_resolvePiperBin(), _piperArgs2, {
+        stdio: ['pipe', 'ignore', 'ignore'], detached: !_IS_WINDOWS, windowsHide: true, env: _sampleEnv,
       });
       piper.stdin.write(phrase + '\n');
       piper.stdin.end();
@@ -1084,12 +1046,12 @@ export function createSettingsTab(screen, services) {
       piper.on('error', () => { _stopSpinner(); _killSample(); playBtn.setContent('▶ Play'); _focusButton(playBtn); });
     }
   });
-  playBtn.top = 5;
+  playBtn.top = 7;
   playBtn.left = 64;
 
   const voiceFileText = blessed.text({
     parent: box,
-    top: 6,
+    top: 8,
     left: 22,
     right: 2,
     wrap: false,
@@ -1104,7 +1066,7 @@ export function createSettingsTab(screen, services) {
     parent: box,
     top: 3,
     left: 1,
-    content: '{#7986cb-fg} ⚡ Audio Effects {/#7986cb-fg}',
+    content: '{bright-cyan-fg} ⚡ Audio Effects {/bright-cyan-fg}',
     tags: true,
     style: { bg: COLORS.contentBg },
   });
@@ -1131,7 +1093,7 @@ export function createSettingsTab(screen, services) {
   });
 
   const reverbChangeBtn = _createButton(box, screen, 'Change', COLORS, () => {
-    _openReverbPicker(screen, configService, (preset) => {
+    openReverbPicker(screen, configService.getConfig().effects?.reverbPreset ?? 'light', (preset) => {
       _setEffects(configService, { reverbPreset: preset });
       refreshDisplay();
     }, _restoreFocus);
@@ -1160,7 +1122,7 @@ export function createSettingsTab(screen, services) {
     parent: box,
     top: 7,
     left: 1,
-    content: '{#7986cb-fg} 🎸 Background Music {/#7986cb-fg}',
+    content: '{bright-cyan-fg} 🎸 Background Music {/bright-cyan-fg}',
     tags: true,
     style: { bg: COLORS.contentBg },
   });
@@ -1256,12 +1218,24 @@ export function createSettingsTab(screen, services) {
   volumeChangeBtn.top = 11;
   volumeChangeBtn.left = 52;
 
+  // -------------------------------------------------------------------------
+  // Section header: ── Style ──
+
+  const styleHeader = blessed.text({
+    parent: box,
+    top: 3,
+    left: 1,
+    content: '{bright-cyan-fg} 🎭 Style {/bright-cyan-fg}',
+    tags: true,
+    style: { bg: COLORS.contentBg },
+  });
+
   // -------------------------------------------------------------------------
   // Verbosity row: label + value + [Change] button
 
   const verbosityLabel = blessed.text({
     parent: box,
-    top: 3,
+    top: 5,
     left: 6,
     content: 'Verbosity:',
     style: { fg: COLORS.labelFg, bg: COLORS.contentBg },
@@ -1269,7 +1243,7 @@ export function createSettingsTab(screen, services) {
 
   const verbosityValue = blessed.text({
     parent: box,
-    top: 3,
+    top: 5,
     left: 22,
     width: 26,    // truncate before [Change] at left:40
     wrap: false,
@@ -1280,12 +1254,12 @@ export function createSettingsTab(screen, services) {
   const verbosityChangeBtn = _createButton(box, screen, 'Change', COLORS, () => {
     _openVerbosityPicker(screen, configService, () => refreshDisplay(), _restoreFocus);
   }, { bg: COLORS.btnChange });
-  verbosityChangeBtn.top = 3;
+  verbosityChangeBtn.top = 5;
   verbosityChangeBtn.left = 52;
 
   const verbosityPathText = blessed.text({
     parent: box,
-    top: 4,
+    top: 6,
     left: 22,
     right: 2,
     wrap: false,
@@ -1298,7 +1272,7 @@ export function createSettingsTab(screen, services) {
 
   const personalityLabel = blessed.text({
     parent: box,
-    top: 5,
+    top: 7,
     left: 6,
     content: 'Personality:',
     style: { fg: COLORS.labelFg, bg: COLORS.contentBg },
@@ -1306,7 +1280,7 @@ export function createSettingsTab(screen, services) {
 
   const personalityValue = blessed.text({
     parent: box,
-    top: 5,
+    top: 7,
     left: 22,
     width: 26,    // truncate before [Change] at left:40
     wrap: false,
@@ -1315,12 +1289,12 @@ export function createSettingsTab(screen, services) {
   });
 
   const personalityChangeBtn = _createButton(box, screen, 'Change', COLORS, () => {
-    _openPersonalityPicker(screen, configService, (name) => {
+    openPersonalityPicker(screen, configService.getConfig().personality ?? 'none', (name) => {
       configService.set('personality', name);
       refreshDisplay();
     }, _restoreFocus);
   }, { bg: COLORS.btnChange });
-  personalityChangeBtn.top = 5;
+  personalityChangeBtn.top = 7;
   personalityChangeBtn.left = 52;
 
   const personalityTestBtn = _createButton(box, screen, '▶ Preview', COLORS, () => {
@@ -1331,12 +1305,12 @@ export function createSettingsTab(screen, services) {
       : _buildPreviewPhrase();
     _runTest(false, phrase);
   }, { bg: COLORS.btnTest });
-  personalityTestBtn.top = 5;
+  personalityTestBtn.top = 7;
   personalityTestBtn.left = 64;
 
   const personalityFileText = blessed.text({
     parent: box,
-    top: 6,
+    top: 8,
     left: 22,
     right: 2,
     wrap: false,
@@ -1350,9 +1324,9 @@ export function createSettingsTab(screen, services) {
 
   const introTextHeader = blessed.text({
     parent: box,
-    top: 8,
+    top: 10,
     left: 1,
-    content: '{#7986cb-fg} ✍️ Intro Text {/#7986cb-fg}',
+    content: '{bright-cyan-fg} ✍️ Intro Text {/bright-cyan-fg}',
     tags: true,
     style: { bg: COLORS.contentBg },
   });
@@ -1362,7 +1336,7 @@ export function createSettingsTab(screen, services) {
 
   const introTextLabel = blessed.text({
     parent: box,
-    top: 10,
+    top: 12,
     left: 6,
     content: 'Intro Text:',
     style: { fg: COLORS.labelFg, bg: COLORS.contentBg },
@@ -1370,7 +1344,7 @@ export function createSettingsTab(screen, services) {
 
   const introTextValue = blessed.text({
     parent: box,
-    top: 10,
+    top: 12,
     left: 22,
     width: 26,    // truncate before [Edit] at left:40
     wrap: false,
@@ -1381,19 +1355,19 @@ export function createSettingsTab(screen, services) {
   const introEditBtn = _createButton(box, screen, 'Edit', COLORS, () => {
     _openIntroTextEditor(screen, configService, () => { refreshDisplay(); }, _restoreFocus);
   }, { bg: COLORS.btnEdit });
-  introEditBtn.top = 10;
+  introEditBtn.top = 12;
   introEditBtn.left = 52;
 
   const introClearBtn = _createButton(box, screen, 'Clear', COLORS, () => {
     configService.set('pretext', '');
     refreshDisplay();
   }, { bg: '#c62828' });
-  introClearBtn.top = 10;
+  introClearBtn.top = 12;
   introClearBtn.left = 64;
 
   const introPathText = blessed.text({
     parent: box,
-    top: 11,
+    top: 13,
     left: 22,
     right: 2,
     wrap: false,
@@ -1413,7 +1387,7 @@ export function createSettingsTab(screen, services) {
     parent: box,
     top: 3,
     left: 2,
-    content: '{#7986cb-fg} 📡 Audio Destination {/#7986cb-fg}',
+    content: '{bright-cyan-fg} 📡 Audio Destination {/bright-cyan-fg}',
     tags: true,
     style: { bg: COLORS.contentBg },
   });
@@ -1542,7 +1516,7 @@ export function createSettingsTab(screen, services) {
     const current = configService.getConfig().audio_stream_mode ?? 'text';
     configService.set('audio_stream_mode', current === 'text' ? 'pulse' : 'text');
     refreshDisplay();
-  }, { bg: '#2e7d32' });  // green = recommended
+  }, { bg: '#1565c0' });  // blue — distinct from green focus
   audioStreamModeBtn.top = 7;
   audioStreamModeBtn.left = 64;
   audioStreamModeBtn.hide();
@@ -1566,7 +1540,7 @@ export function createSettingsTab(screen, services) {
     parent: box,
     top: 11,
     left: 2,
-    content: '{#7986cb-fg} 💾 Config Storage {/#7986cb-fg}',
+    content: '{bright-cyan-fg} 💾 Config Storage {/bright-cyan-fg}',
     tags: true,
     style: { bg: COLORS.contentBg },
   });
@@ -1632,7 +1606,7 @@ export function createSettingsTab(screen, services) {
       refreshConfigDisplay();
       _showNotice(screen, 'Settings Saved');
     }, () => { _currentIdx = _buttons.indexOf(saveLocallyBtn); _focusButton(saveLocallyBtn); });
-  }, { bg: '#2e7d32' });   // green
+  }, { bg: '#1565c0' });   // blue — distinct from green focus
   saveLocallyBtn.bottom = 0;
   saveLocallyBtn.left = 46;
 
@@ -1660,6 +1634,7 @@ export function createSettingsTab(screen, services) {
   // Widget groups for each sub-tab (used by _showSubTab to show/hide)
   const _subTabWidgets = {
     voice: [
+      providerVoiceHeader,
       providerLabel, providerValue, switchBtn,
       voiceLabel, voiceValue, changeBtn, playBtn, voiceFileText,
     ],
@@ -1671,6 +1646,7 @@ export function createSettingsTab(screen, services) {
       volumeLabel, volumeValue, volumeChangeBtn,
     ],
     personality: [
+      styleHeader,
       verbosityLabel, verbosityValue, verbosityChangeBtn, verbosityPathText,
       personalityLabel, personalityValue, personalityChangeBtn, personalityTestBtn, personalityFileText,
       introTextHeader,
@@ -2131,7 +2107,7 @@ export function createSettingsTab(screen, services) {
       audioSshValue.setContent(audioAlias || '(none)');
       const streamMode = cfg.audio_stream_mode ?? 'text';
       audioStreamModeBtn.setContent(streamMode === 'pulse' ? 'Streaming Pulse Audio' : 'Streaming Text Only ✓');
-      audioStreamModeBtn.style.bg = streamMode === 'text' ? '#2e7d32' : COLORS.btnChange;
+      audioStreamModeBtn.style.bg = streamMode === 'text' ? '#1565c0' : COLORS.btnChange;
     } else {
       audioSshLabel.hide();
       audioSshValue.hide();
@@ -2302,14 +2278,14 @@ function _createButton(parent, screen, label, COLORS, onClick, opts = {}) {
 const _ALL_PROVIDERS = [
   { id: 'piper',        name: 'Piper TTS',    platforms: ['linux', 'darwin', 'win32'], desc: 'High-quality local neural TTS' },
   { id: 'soprano',      name: 'Soprano',      platforms: ['linux', 'darwin'],          desc: 'Ultra-fast neural TTS (single voice)' },
-  { id: 'windows-sapi', name: 'Windows SAPI', platforms: ['win32'],                   desc: 'Windows built-in text-to-speech' },
+  { id: 'sapi',         name: 'Windows SAPI', platforms: ['win32'],                   desc: 'Windows built-in text-to-speech' },
   { id: 'macos',        name: 'Mac Say',      platforms: ['darwin'],                  desc: 'macOS built-in text-to-speech' },
 ];
 
 const _INSTALL_CMDS = {
   piper:          ['pip install piper-tts', 'OR:   pipx install piper-tts', '', 'Voices are downloaded separately:', 'Run: agentvibes install  (then choose Piper)'],
   soprano:        ['pip install soprano-tts', 'OR:   pipx install soprano-tts', '', 'Keep model loaded for fast synthesis:', 'soprano-webui'],
-  'windows-sapi': ['Built-in on Windows — no install required.', 'Only works in a native Windows shell,', 'not inside WSL. Use piper or soprano in WSL.'],
+  sapi:           ['Built-in on Windows — no install required.', 'Only works in a native Windows shell,', 'not inside WSL. Use piper or soprano in WSL.'],
   macos:          ['Built-in on macOS — no install required.', 'The say command ships with every Mac.'],
 };
 
@@ -2354,7 +2330,7 @@ function _openProviderPicker(screen, providerService, onSelect, onClose) {
   // Environment header
   blessed.text({
     parent: modal, top: 0, left: 1, tags: true,
-    content: `{#00e5ff-fg}🖥  Environment:{/#00e5ff-fg} {bold}${envLabel}{/bold}`,
+    content: `{bright-cyan-fg}🖥  Environment:{/bright-cyan-fg} {bold}${envLabel}{/bold}`,
     style: { bg: COLORS.contentBg },
   });
   blessed.text({
@@ -2404,8 +2380,8 @@ function _openProviderPicker(screen, providerService, onSelect, onClose) {
         _close(); onSelect(prov.id);
       } else {
         const lines = _INSTALL_CMDS[prov.id] ?? ['No instructions available.'];
-        instrTitle.setContent(`{#7986cb-fg}Install — ${prov.name}:{/#7986cb-fg}`);
-        instrContent.setContent(lines.map(l => l ? `{#00e5ff-fg}${l}{/#00e5ff-fg}` : '').join('\n'));
+        instrTitle.setContent(`{bright-cyan-fg}Install — ${prov.name}:{/bright-cyan-fg}`);
+        instrContent.setContent(lines.map(l => l ? `{bright-cyan-fg}${l}{/bright-cyan-fg}` : '').join('\n'));
         screen.render();
       }
     });
@@ -2419,7 +2395,7 @@ function _openProviderPicker(screen, providerService, onSelect, onClose) {
 
   const instrTitle = blessed.text({
     parent: modal, top: 11, left: 1, width: 66, tags: true,
-    content: '{#7986cb-fg}Install instructions — click Install beside a provider:{/#7986cb-fg}',
+    content: '{bright-cyan-fg}Install instructions — click Install beside a provider:{/bright-cyan-fg}',
     style: { bg: COLORS.contentBg },
   });
   const instrContent = blessed.text({
@@ -2453,19 +2429,14 @@ function _openProviderPicker(screen, providerService, onSelect, onClose) {
 }
 
 // ---------------------------------------------------------------------------
-// Private: Destroy a list/modal widget and force-invalidate olines so blessed
-// physically redraws every cell the widget covered (avoids ghost rendering).
+// Private: Destroy helper — now imported from shared widgets/destroy-list.js
+// (kept as comment for git blame traceability)
 
-function _destroyList(list, screen, onClose) {
-  list.destroy();
-  try {
-    for (let r = 0; r < screen.height; r++)
-      for (let c = 0; c < screen.width; c++)
-        if (screen.olines[r]?.[c]) screen.olines[r][c][0] = -1;
-  } catch {}
-  onClose?.();
-  screen.render();
-}
+// NOTE: The following line was the old _destroyList definition, now using shared import:
+// import { destroyList } from '../widgets/destroy-list.js';
+//
+// Old code removed to eliminate duplication (M1 fix).
+// The shared destroyList has identical behavior.
 
 // ---------------------------------------------------------------------------
 // Private: Show a temporary stub notice text
@@ -2536,11 +2507,11 @@ function _showSavePreview(screen, filePath, data, onConfirm, onClose) {
     style: {
       fg: '#e3f2fd',
       bg: COLORS.contentBg,
-      border: { fg: '#00e5ff' },
+      border: { fg: 'bright-cyan' },
     },
   });
 
-  function _close() { _destroyList(modal, screen, onClose); }
+  function _close() { destroyList(modal, screen, onClose); }
 
   modal.key(['escape'], _close);
 
@@ -2555,7 +2526,7 @@ function _showSavePreview(screen, filePath, data, onConfirm, onClose) {
   const okBtn = _createButton(modal, screen, 'OK — Save', COLORS, () => {
     _close();
     onConfirm();
-  }, { bg: '#2e7d32' });
+  }, { bg: '#1565c0' });
   okBtn.top  = btnRow;
   okBtn.left = midX + 2;
 
@@ -2568,27 +2539,7 @@ function _showSavePreview(screen, filePath, data, onConfirm, onClose) {
 }
 
 function _showNotice(screen, message) {
-  const width = Math.max(28, message.length + 6);
-  const modal = blessed.box({
-    parent: screen,
-    top: 'center',
-    left: 'center',
-    width,
-    height: 3,
-    border: { type: 'line' },
-    tags: true,
-    content: `{center}${message}{/center}`,
-    style: {
-      fg: '#e3f2fd',
-      bg: COLORS.contentBg,
-      border: { fg: '#00e5ff' },
-    },
-  });
-  screen.render();
-
-  setTimeout(() => {
-    _destroyList(modal, screen);
-  }, 2500);
+  _showNoticeWidget(screen, message, { bg: COLORS.contentBg });
 }
 
 // ---------------------------------------------------------------------------
@@ -2605,64 +2556,8 @@ function _setEffects(configService, partial) {
 }
 
 // ---------------------------------------------------------------------------
-// Private: Inline reverb preset picker
-
-function _openReverbPicker(screen, configService, onSelect, onClose) {
-  const PRESETS = [
-    { label: 'Off (Dry, no reverb)',        value: 'off' },
-    { label: 'Light (Small room)',           value: 'light' },
-    { label: 'Medium (Conference room)',     value: 'medium' },
-    { label: 'Heavy (Large hall)',           value: 'heavy' },
-    { label: 'Cathedral (Epic space)',       value: 'cathedral' },
-  ];
-
-  const currentPreset = configService.getConfig().effects?.reverbPreset ?? 'light';
-  const currentIdx = Math.max(0, PRESETS.findIndex(p => p.value === currentPreset));
-
-  const list = blessed.list({
-    parent: screen,
-    top: 'center',
-    left: 'center',
-    width: 40,
-    height: PRESETS.length + 4,
-    border: { type: 'line' },
-    tags: true,
-    label: _modalTitle('Select Reverb Preset'),
-    items: PRESETS.map((p, i) => (i === currentIdx ? `● ${p.label}` : `  ${p.label}`)),
-    keys: true,
-    vi: false,
-    mouse: true,
-    style: {
-      border: { fg: COLORS.btnFocus },
-      selected: { bg: COLORS.btnFocus, fg: COLORS.btnFocusFg, bold: true },
-      item: { fg: '#e3f2fd' },
-    },
-  });
-
-  list.select(currentIdx);
-  list.focus();
-  screen.render();
-
-  list.key(['enter', 'space'], () => {
-    const selected = PRESETS[list.selected];
-    if (!selected) return;
-    _destroyList(list, screen, onClose);
-
-    // Apply to audio config via effects-manager.sh
-    const effectsScript = path.join(process.cwd(), '.claude', 'hooks', 'effects-manager.sh');
-    spawnSync('bash', [effectsScript, 'set-reverb', selected.value, 'default'], {
-      stdio: 'ignore',
-      timeout: 5000,
-      env: { ...process.env },
-    });
-
-    onSelect(selected.value);
-  });
-
-  list.key(['escape', 'q'], () => {
-    _destroyList(list, screen, onClose);
-  });
-}
+// Private: _openReverbPicker removed — now using shared import:
+//   import { openReverbPicker } from '../widgets/reverb-picker.js';
 
 // ---------------------------------------------------------------------------
 // Private: Background music config read/write helpers
@@ -2700,7 +2595,7 @@ function _openTrackPicker(screen, configService, onSelect, onClose) {
   const currentTrack = (configService.getConfig().backgroundMusic?.track ?? MUSIC_DEFAULTS.track);
   const items = allItems.map(t =>
     t.file === ADD_SENTINEL
-      ? `  {#00e5ff-fg}+ Add Custom Track{/#00e5ff-fg}`
+      ? `  {bright-cyan-fg}+ Add Custom Track{/bright-cyan-fg}`
       : (t.file === currentTrack ? `● ${t.label}` : `  ${t.label}`)
   );
   const currentIdx = tracks.findIndex(t => t.file === currentTrack);
@@ -2737,18 +2632,18 @@ function _openTrackPicker(screen, configService, onSelect, onClose) {
     if (!selected) return;
     if (selected.file === ADD_SENTINEL) {
       // Destroy list first, then open path-input dialog
-      _destroyList(list, screen);
+      destroyList(list, screen);
       _openCustomTrackInput(screen, tracksDir, (newFile) => {
         onSelect(newFile);
       }, onClose);
       return;
     }
-    _destroyList(list, screen, onClose);
+    destroyList(list, screen, onClose);
     onSelect(selected.file);
   });
 
   list.key(['escape', 'q'], () => {
-    _destroyList(list, screen, onClose);
+    destroyList(list, screen, onClose);
   });
 }
 
@@ -2939,9 +2834,14 @@ function _openVolumePicker(screen, configService, onSelect, onClose) {
       `mpg123 -q "${trackPath}"`,
     ].join(' 2>/dev/null || ') + ' 2>/dev/null';
 
-    _previewProcess = spawn('sh', ['-c', cmd], {
-      stdio: 'ignore', detached: true, env: _previewEnv,
-    });
+    if (_IS_WINDOWS) {
+      const _mp3P3 = detectMp3Player(_previewEnv);
+      _previewProcess = _mp3P3
+        ? spawn(_mp3P3.bin, _mp3P3.args(trackPath), _spawnOpts(_previewEnv))
+        : null;
+    } else {
+      _previewProcess = spawn('sh', ['-c', cmd], _spawnOpts(_previewEnv));
+    }
     _previewProcess.unref();
     _refreshList();
 
@@ -3077,7 +2977,7 @@ function _openMusicBrowserModal(screen, configService, navigationService, onDone
       fg: COLORS.labelFg,
       bg: COLORS.contentBg,
       border: { fg: COLORS.borderFg },
-      selected: { bg: '#1a237e', fg: '#00e5ff', bold: true },
+      selected: { bg: '#2e7d32', fg: '#ffffff', bold: true },
       item: { fg: COLORS.labelFg },
     },
   });
@@ -3090,7 +2990,7 @@ function _openMusicBrowserModal(screen, configService, navigationService, onDone
     right: 2,
     tags: true,
     content: '',
-    style: { fg: '#00e5ff', bg: COLORS.contentBg },
+    style: { fg: 'bright-cyan', bg: COLORS.contentBg },
   });
 
   // ---- File location hint ----
@@ -3184,15 +3084,16 @@ function _openMusicBrowserModal(screen, configService, navigationService, onDone
 
     const _mp3Player = detectMp3Player(_modalEnv);
     if (!_mp3Player) return;
+    const _isWin = process.platform === 'win32' && !process.env.WSL_DISTRO_NAME;
     _previewProcess = spawn(_mp3Player.bin, _mp3Player.args(trackPath), {
-      stdio: 'ignore', detached: true, env: _modalEnv,
+      stdio: 'ignore', detached: !_isWin, windowsHide: true, env: _modalEnv,
     });
     _previewProcess.unref();
     _previewTrackId = trackId;
 
     const label = _allTracks.find(t => t.id === trackId)?.label ?? formatTrackLabel(trackId);
     if (!_closed) {
-      modalPreviewLine.setContent(`{#00e5ff-fg}\u266A Previewing: ${label}  (Space to stop){/#00e5ff-fg}`);
+      modalPreviewLine.setContent(`{bright-cyan-fg}\u266A Previewing: ${label}  (Space to stop){/bright-cyan-fg}`);
       screen.render();
     }
 
@@ -3301,13 +3202,13 @@ function _openVerbosityPicker(screen, configService, onDone, onClose) {
   list.key(['enter', 'space'], () => {
     const selected = levels[list.selected];
     if (!selected) return;
-    _destroyList(list, screen, onClose);
+    destroyList(list, screen, onClose);
     configService.set('verbosity', selected.toLowerCase());
     onDone();
   });
 
   list.key(['escape', 'q'], () => {
-    _destroyList(list, screen, onClose);
+    destroyList(list, screen, onClose);
   });
 }
 
@@ -3487,7 +3388,7 @@ function _openVoiceBrowserModal(screen, providerService, configService, navigati
     keys: true,
     style: {
       fg: COLORS.valueFg,
-      bg: '#1a237e',
+      bg: '#1a3a5c',
       focus: { bg: '#283593' },
     },
   });
@@ -3497,7 +3398,7 @@ function _openVoiceBrowserModal(screen, providerService, configService, navigati
     parent: modal,
     top: 2,
     left: 6,
-    content: `{#7986cb-fg}${'Name'.padEnd(COL_NAME_W)}${'Gender'.padEnd(COL_GENDER_W)}Provider{/#7986cb-fg}`,
+    content: `{bright-cyan-fg}${'Name'.padEnd(COL_NAME_W)}${'Gender'.padEnd(COL_GENDER_W)}Provider{/bright-cyan-fg}`,
     tags: true,
     style: { bg: COLORS.contentBg },
   });
@@ -3518,7 +3419,7 @@ function _openVoiceBrowserModal(screen, providerService, configService, navigati
       fg: COLORS.labelFg,
       bg: COLORS.contentBg,
       border: { fg: COLORS.borderFg },
-      selected: { bg: '#1a237e', fg: '#00e5ff', bold: true },
+      selected: { bg: '#2e7d32', fg: '#ffffff', bold: true },
       item: { fg: COLORS.labelFg },
     },
   });
@@ -3528,7 +3429,7 @@ function _openVoiceBrowserModal(screen, providerService, configService, navigati
     parent: modal,
     bottom: 5,
     left: 2,
-    content: `{#7986cb-fg}── Voice Info ${'─'.repeat(50)}{/#7986cb-fg}`,
+    content: `{bright-cyan-fg}── Voice Info ${'─'.repeat(50)}{/bright-cyan-fg}`,
     tags: true,
     style: { bg: COLORS.contentBg },
   });
@@ -3550,7 +3451,7 @@ function _openVoiceBrowserModal(screen, providerService, configService, navigati
     right: 2,
     tags: true,
     content: '',
-    style: { fg: '#00e5ff', bg: COLORS.contentBg },
+    style: { fg: 'bright-cyan', bg: COLORS.contentBg },
   });
 
   // ---- Key hint bar ----
@@ -3655,11 +3556,22 @@ function _openVoiceBrowserModal(screen, providerService, configService, navigati
     const tempWav = path.join(os.tmpdir(), `agentvibes-preview-${Date.now()}.wav`);
     const phrase  = SAMPLE_PHRASES[Math.floor(Math.random() * SAMPLE_PHRASES.length)];
 
+    const _isWinPreview = process.platform === 'win32' && !process.env.WSL_DISTRO_NAME;
+    let _piperBin3 = 'piper';
+    if (_isWinPreview) {
+      const _lad = process.env.LOCALAPPDATA ||
+        (process.env.USERPROFILE ? path.join(process.env.USERPROFILE, 'AppData', 'Local') : null);
+      if (_lad) {
+        const _exe = path.join(_lad, 'Programs', 'Piper', 'piper.exe');
+        if (fs.existsSync(_exe)) _piperBin3 = _exe;
+      }
+    }
     const _piperArgs3 = ['--model', voicePath, '--output_file', tempWav];
     if (_ms3.speakerId != null) _piperArgs3.push('--speaker', String(_ms3.speakerId));
-    const piper = spawn('piper', _piperArgs3, {
+    const piper = spawn(_piperBin3, _piperArgs3, {
       stdio: ['pipe', 'ignore', 'ignore'],
-      detached: true,
+      detached: !_isWinPreview,
+      windowsHide: true,
       env: _spawnEnv,
     });
     piper.stdin.write(phrase + '\n');
@@ -3668,7 +3580,7 @@ function _openVoiceBrowserModal(screen, providerService, configService, navigati
     _playingProcess = piper;
     _playingVoiceId = voiceId;
     if (!_closed) {
-      modalPreviewLine.setContent(`{#00e5ff-fg}♪ Synthesizing: ${voiceId}…{/#00e5ff-fg}`);
+      modalPreviewLine.setContent(`{bright-cyan-fg}♪ Synthesizing: ${voiceId}…{/bright-cyan-fg}`);
       screen.render();
     }
 
@@ -3681,7 +3593,7 @@ function _openVoiceBrowserModal(screen, providerService, configService, navigati
         _playingVoiceId = null;
         _playingProcess = null;
         if (!_closed) {
-          modalPreviewLine.setContent('{#00e5ff-fg}♪ Preview failed (piper error — is piper installed?){/#00e5ff-fg}');
+          modalPreviewLine.setContent('{bright-cyan-fg}♪ Preview failed (piper error — is piper installed?){/bright-cyan-fg}');
           screen.render();
           setTimeout(() => { if (!_closed) { modalPreviewLine.setContent(''); screen.render(); } }, 4000);
         }
@@ -3692,13 +3604,14 @@ function _openVoiceBrowserModal(screen, providerService, configService, navigati
       if (!_wavPlayer3) return;
       const playProc = spawn(_wavPlayer3.bin, _wavPlayer3.args(tempWav), {
         stdio: 'ignore',
-        detached: true,
+        detached: !_isWinPreview,
+        windowsHide: true,
         env: _spawnEnv,
       });
       _playingProcess = playProc;
 
       if (!_closed) {
-        modalPreviewLine.setContent(`{#00e5ff-fg}♪ Playing: ${voiceId}  (Space to stop){/#00e5ff-fg}`);
+        modalPreviewLine.setContent(`{bright-cyan-fg}♪ Playing: ${voiceId}  (Space to stop){/bright-cyan-fg}`);
         screen.render();
       }
 
@@ -3723,7 +3636,7 @@ function _openVoiceBrowserModal(screen, providerService, configService, navigati
       _playingVoiceId = null;
       _playingProcess = null;
       if (!_closed) {
-        modalPreviewLine.setContent('{#00e5ff-fg}♪ Cannot find piper — install with: pipx install piper-tts{/#00e5ff-fg}');
+        modalPreviewLine.setContent('{bright-cyan-fg}♪ Cannot find piper — install with: pipx install piper-tts{/bright-cyan-fg}');
         screen.render();
         setTimeout(() => { if (!_closed) { modalPreviewLine.setContent(''); screen.render(); } }, 4000);
       }
@@ -3815,135 +3728,5 @@ function _openVoiceBrowserModal(screen, providerService, configService, navigati
 }
 
 // ---------------------------------------------------------------------------
-// Private: Inline personality picker
-
-function _openPersonalityPicker(screen, configService, onSelect, onClose) {
-  const current = configService.getConfig().personality ?? 'none';
-  const currentIdx = Math.max(0, PERSONALITIES.indexOf(current));
-
-  const list = blessed.list({
-    parent: screen,
-    top: 'center',
-    left: 'center',
-    width: 44,
-    height: Math.min(PERSONALITIES.length + 4, 22),
-    border: { type: 'line' },
-    tags: true,
-    label: _modalTitle('Select Personality'),
-    items: PERSONALITIES.map((p, i) => {
-      const emoji = PERSONALITY_EMOJIS[p] ?? '✨';
-      const label = p === 'none' ? 'None' : p.charAt(0).toUpperCase() + p.slice(1);
-      const mark  = i === currentIdx ? '✅' : '   ';
-      return `${mark} ${emoji} ${label}`;
-    }),
-    keys: true,
-    vi: true,
-    mouse: true,
-    style: {
-      border: { fg: COLORS.btnFocus },
-      selected: { bg: COLORS.btnFocus, fg: COLORS.btnFocusFg, bold: true },
-      item: { fg: '#e3f2fd' },
-    },
-  });
-
-  list.select(currentIdx);
-  list.focus();
-  screen.render();
-
-  // ---------- Hover TTS preview ----------
-
-  let _pickerTtsProc  = null;
-  let _playingItemIdx = -1;
-
-  // Add or remove " (playing)" from a list item (strips any trailing █ first)
-  function _setItemPlaying(idx, playing) {
-    const item = list.items?.[idx];
-    if (!item) return;
-    const base = (item.content ?? '').replace(/ █$/, '').replace(/ \(playing\)$/, '');
-    item.setContent(playing ? `${base} (playing)` : base);
-  }
-
-  function _killPickerTts() {
-    if (_pickerTtsProc) {
-      try { process.kill(-_pickerTtsProc.pid, 'SIGTERM'); } catch {}
-      _pickerTtsProc = null;
-    }
-    if (_playingItemIdx >= 0) {
-      _setItemPlaying(_playingItemIdx, false);
-      _playingItemIdx = -1;
-    }
-  }
-
-  function _speakPersonalityPreview(personality) {
-    _killPickerTts();
-    const phrase = PERSONALITY_PREVIEW_PHRASES[personality];
-    if (!phrase) return;
-    const ttsScript = path.join(process.cwd(), '.claude', 'hooks', 'play-tts.sh');
-    _pickerTtsProc = spawn('bash', [ttsScript, phrase], {
-      stdio: 'ignore',
-      detached: true,
-      env: buildAudioEnv(),
-    });
-    _playingItemIdx = list.selected;
-    _setItemPlaying(_playingItemIdx, true);
-    screen.render();
-    // Clear indicator when audio finishes naturally
-    _pickerTtsProc.on('exit', () => {
-      if (_playingItemIdx >= 0) {
-        _setItemPlaying(_playingItemIdx, false);
-        _playingItemIdx = -1;
-        screen.render();
-      }
-      _pickerTtsProc = null;
-    });
-    _pickerTtsProc.unref();
-  }
-
-  // Hover: auto-speaks preview phrase when cursor moves
-  list.on('select item', () => {
-    _speakPersonalityPreview(PERSONALITIES[list.selected]);
-  });
-
-  // [Space] plays the selected personality, or stops if the same item is already playing.
-  // Uses item-aware toggle so navigating with ↓ (which auto-plays) doesn't prevent Space from working.
-  list.key(['space'], () => {
-    if (_pickerTtsProc && _playingItemIdx === list.selected) {
-      _killPickerTts(); // true toggle: stop only if this exact item is playing
-    } else {
-      _speakPersonalityPreview(PERSONALITIES[list.selected]); // play or switch
-    }
-  });
-
-  // Type-to-jump: press a letter to jump to the first matching personality (cycles on repeat)
-  const _jumpBlocked = new Set(['j', 'k', 'g', 'h', 'l', 'd', 'u', 'q']);
-  list.on('keypress', (ch, key) => {
-    if (!ch || key.ctrl || key.meta) return;
-    const lower = ch.toLowerCase();
-    if (!/^[a-z]$/.test(lower)) return;
-    if (_jumpBlocked.has(lower)) return;
-    const count = PERSONALITIES.length;
-    const start = list.selected ?? 0;
-    for (let i = 1; i <= count; i++) {
-      const idx = (start + i) % count;
-      if (PERSONALITIES[idx].startsWith(lower)) {
-        list.select(idx);
-        screen.render();
-        break;
-      }
-    }
-  });
-
-  // [Enter] confirms selection
-  list.key(['enter'], () => {
-    const selected = PERSONALITIES[list.selected];
-    if (!selected) return;
-    _killPickerTts();
-    _destroyList(list, screen, onClose);
-    onSelect(selected);
-  });
-
-  list.key(['escape', 'q'], () => {
-    _killPickerTts();
-    _destroyList(list, screen, onClose);
-  });
-}
+// Private: _openPersonalityPicker removed — now using shared import:
+//   import { openPersonalityPicker } from '../widgets/personality-picker.js';