agentvibes 5.0.0 → 5.1.0

package/.claude/config/audio-effects.cfg

@@ -51,4 +51,4 @@ _party_mode|compand 0.3,1 6:-70,-60,-20|agent_vibes_dark_chill_step_loop.mp3|0.4
 # Default (no agent specified) - clean with Bachata background|||
 default||agent_vibes_chillwave_v2_loop.mp3|0.15
 analyst|reverb 70 50 100|agentvibes_soft_flamenco_loop.mp3|0.30
-llm:claude-code|light|agent_vibes_chillwave_v2_loop.mp3|0.15|en_US-lessac-high|Codex Worktree here
+llm:claude-code|light|agent_vibes_chillwave_v2_loop.mp3|0.15|en_US-lessac-high|Claude Code here|piper

package/.claude/hooks/play-tts.sh

@@ -131,20 +131,23 @@ TEXT="${TEXT//\\./.}"        # Remove \. (keep the period)
 _LLM_VOICE=""
 _LLM_PRETEXT=""
 _LLM_REVERB=""
+_LLM_ENGINE=""
 if [[ -n "$LLM_PROVIDER" ]]; then
   _llm_key="llm:${LLM_PROVIDER}"
   for _cfg in \
     "$PROJECT_ROOT/.claude/config/audio-effects.cfg" \
     "$HOME/.claude/config/audio-effects.cfg"; do
     if [[ -z "$_LLM_VOICE" && -z "$_LLM_PRETEXT" && -f "$_cfg" ]]; then
-      while IFS='|' read -r _key _reverb _bgfile _bgvol _voice _pretext _rest; do
+      while IFS='|' read -r _key _reverb _bgfile _bgvol _voice _pretext _engine _rest; do
         if [[ "$_key" == "$_llm_key" ]]; then
           _reverb="${_reverb## }"; _reverb="${_reverb%% }"
           _voice="${_voice## }"; _voice="${_voice%% }"
           _pretext="${_pretext## }"; _pretext="${_pretext%% }"
+          _engine="${_engine## }"; _engine="${_engine%% }"
           [[ -n "$_reverb" ]] && _LLM_REVERB="$_reverb"
           [[ -n "$_voice" ]] && _LLM_VOICE="$_voice"
           [[ -n "$_pretext" ]] && _LLM_PRETEXT="$_pretext"
+          [[ -n "$_engine" ]] && _LLM_ENGINE="$_engine"
           break
         fi
       done < "$_cfg"
@@ -187,8 +190,12 @@ fi
 # Source provider manager to get active provider
 source "$SCRIPT_DIR/provider-manager.sh"
 
-# Get active provider
-ACTIVE_PROVIDER=$(get_active_provider)
+# Get active provider (LLM-specific engine overrides global)
+if [[ -n "$_LLM_ENGINE" ]]; then
+  ACTIVE_PROVIDER="$_LLM_ENGINE"
+else
+  ACTIVE_PROVIDER=$(get_active_provider)
+fi
 
 # Show GitHub star reminder (once per day)
 "$SCRIPT_DIR/github-star-reminder.sh" 2>/dev/null || true

package/.claude/hooks-windows/play-tts.ps1

@@ -10,25 +10,21 @@ param(
     [string]$Text,
 
     [Parameter(Mandatory = $false, Position = 1)]
-    [string]$VoiceOverride,
-
-    [Parameter(Mandatory = $false)]
-    [string]$llm = ""
+    [string]$VoiceOverride
 )
 
 # Configuration paths
 # Priority: CLAUDE_PROJECT_DIR env var → script's parent project → user profile
-# Local project settings ALWAYS override global (~/.claude)
 $ScriptPath = Split-Path -Parent $MyInvocation.MyCommand.Path
 
 if ($env:CLAUDE_PROJECT_DIR -and (Test-Path "$env:CLAUDE_PROJECT_DIR\.claude")) {
     $ClaudeDir = "$env:CLAUDE_PROJECT_DIR\.claude"
 } else {
     $PackageClaudeDir = Join-Path (Split-Path -Parent (Split-Path -Parent $ScriptPath)) ".claude"
-    if (Test-Path $PackageClaudeDir) {
-        $ClaudeDir = $PackageClaudeDir
-    } elseif (Test-Path "$env:USERPROFILE\.claude\tts-provider.txt") {
+    if (Test-Path "$env:USERPROFILE\.claude\tts-provider.txt") {
         $ClaudeDir = "$env:USERPROFILE\.claude"
+    } elseif (Test-Path $PackageClaudeDir) {
+        $ClaudeDir = $PackageClaudeDir
     } else {
         $ClaudeDir = "$env:USERPROFILE\.claude"
     }
@@ -46,78 +42,6 @@ if (Test-Path $MuteFile) {
     }
 }
 
-# Per-LLM config lookup: if --llm is passed, look up llm:<name> in audio-effects.cfg
-# Format: llm:<name>|SOX_EFFECTS|BACKGROUND_FILE|BACKGROUND_VOLUME|VOICE|PRETEXT
-$LlmVoice = ""
-$LlmPretext = ""
-$LlmReverb = ""
-$ProjectRoot = Split-Path -Parent $ClaudeDir
-$ConfigDir = "$ClaudeDir\config"
-
-if ($llm) {
-    $llmKey = "llm:$llm"
-    # Check project-local audio-effects.cfg first, then global
-    $cfgPaths = @(
-        "$ConfigDir\audio-effects.cfg",
-        "$env:USERPROFILE\.claude\config\audio-effects.cfg"
-    )
-    foreach ($cfgPath in $cfgPaths) {
-        if (-not $LlmVoice -and -not $LlmPretext -and (Test-Path $cfgPath)) {
-            foreach ($line in (Get-Content $cfgPath)) {
-                if ($line -match "^$([regex]::Escape($llmKey))\|") {
-                    $parts = $line -split '\|'
-                    # parts: [0]=key [1]=reverb_preset [2]=bg_file [3]=bg_vol [4]=voice [5]=pretext
-                    if ($parts.Length -ge 2 -and $parts[1].Trim()) {
-                        $LlmReverb = $parts[1].Trim()
-                    }
-                    if ($parts.Length -ge 5 -and $parts[4].Trim()) {
-                        $LlmVoice = $parts[4].Trim()
-                    }
-                    if ($parts.Length -ge 6 -and $parts[5].Trim()) {
-                        $LlmPretext = $parts[5].Trim()
-                    }
-                    break
-                }
-            }
-        }
-    }
-    # Apply LLM voice override (only if no explicit VoiceOverride was passed)
-    if ($LlmVoice -and -not $VoiceOverride) {
-        $VoiceOverride = $LlmVoice
-    }
-    # Export LLM key for child scripts (process-local, not system-wide)
-    $env:AGENTVIBES_LLM_KEY = "llm:$llm"
-}
-
-# Prepend pretext if configured
-# Priority: LLM-specific pretext → project .agentvibes/config.json → project .claude/config/tts-pretext.txt
-#           → global ~/.agentvibes/config.json → global ~/.claude/config/tts-pretext.txt
-$Pretext = $LlmPretext
-if (-not $Pretext) {
-    $PretextSources = @(
-        (Join-Path $ProjectRoot ".agentvibes\config.json"),
-        "$ClaudeDir\config\tts-pretext.txt",
-        "$env:USERPROFILE\.agentvibes\config.json",
-        "$env:USERPROFILE\.claude\config\tts-pretext.txt"
-    )
-    foreach ($src in $PretextSources) {
-        if (-not $Pretext -and (Test-Path $src)) {
-            if ($src -match '\.json$') {
-                try {
-                    $avCfg = Get-Content $src -Raw | ConvertFrom-Json
-                    if ($avCfg.pretext) { $Pretext = $avCfg.pretext.Trim() }
-                } catch { }
-            } else {
-                $val = (Get-Content $src -Raw).Trim()
-                if ($val) { $Pretext = $val }
-            }
-        }
-    }
-}
-if ($Pretext) {
-    $Text = "$Pretext, $Text"
-}
-
 # Determine active provider
 $ActiveProvider = "sapi"
 if (Test-Path $ProviderFile) {
@@ -177,17 +101,12 @@ if (Test-Path $AgentVibesConfig) {
 }
 
 # Check if reverb is enabled (allowlist validation)
-# LLM-specific reverb overrides global setting
 $ReverbLevel = "off"
-if ($LlmReverb -and $LlmReverb -in @("off", "light", "medium", "heavy", "cathedral")) {
-    $ReverbLevel = $LlmReverb
-} else {
-    $ReverbFile = "$ConfigDir\reverb-level.txt"
-    if (Test-Path $ReverbFile) {
-        $reverbVal = (Get-Content $ReverbFile -Raw).Trim()
-        if ($reverbVal -in @("off", "light", "medium", "heavy", "cathedral")) {
-            $ReverbLevel = $reverbVal
-        }
+$ReverbFile = "$ConfigDir\reverb-level.txt"
+if (Test-Path $ReverbFile) {
+    $reverbVal = (Get-Content $ReverbFile -Raw).Trim()
+    if ($reverbVal -in @("off", "light", "medium", "heavy", "cathedral")) {
+        $ReverbLevel = $reverbVal
     }
 }
 $HasReverb = $ReverbLevel -ne "off"
@@ -214,6 +133,10 @@ $PreSynthWav = $env:AGENTVIBES_PRESYNTHESIZED_WAV
 $UsePreSynth = $PreSynthWav -and (Test-Path $PreSynthWav) -and
     (Get-Item $PreSynthWav -ErrorAction SilentlyContinue).Length -gt 0
 
+# Tracks the path of the WAV the provider just synthesized.
+# Used to defend against playing stale cached audio when synthesis silently fails.
+$SynthesizedWavPath = $null
+
 # If background music or reverb enabled and ffmpeg available, tell provider to skip playback
 if (($BgEnabled -or $HasReverb) -and $HasFfmpeg) {
     $env:AGENTVIBES_NO_PLAY = "1"
@@ -248,17 +171,25 @@ if ($UsePreSynth) {
                 $providerOutput = & $ProviderScript $Text 6>&1 2>&1
             }
             # Re-emit preserving colors from InformationRecords (Write-Host output)
+            # Also extract the synthesized WAV path from the provider's OK line.
             foreach ($item in $providerOutput) {
+                $lineText = $null
                 if ($item -is [System.Management.Automation.InformationRecord]) {
                     $msg = $item.MessageData
                     if ($msg -is [System.Management.Automation.HostInformationMessage]) {
                         Write-Host $msg.Message -ForegroundColor $msg.ForegroundColor -NoNewline:$msg.NoNewLine
                         if (-not $msg.NoNewLine) { Write-Host }
+                        $lineText = $msg.Message
                     } else {
                         Write-Host "$item"
+                        $lineText = "$item"
                     }
                 } else {
                     Write-Host "$item"
+                    $lineText = "$item"
+                }
+                if ($lineText -and $lineText -match '\[OK\]\s+Saved to:\s+(.+\.wav)') {
+                    $SynthesizedWavPath = $Matches[1].Trim()
                 }
             }
         } else {
@@ -280,13 +211,23 @@ if ($UsePreSynth) {
 if (($BgEnabled -or $HasReverb) -and $HasFfmpeg) {
     Remove-Item env:AGENTVIBES_NO_PLAY -ErrorAction SilentlyContinue
 
-    # Find the WAV to post-process: use pre-synthesized file if available, else most recent
+    # Find the WAV to post-process. Never fall back to "most recent on disk"
+    # because that plays a random stale cache file when synthesis silently fails.
     $AudioDir = "$ClaudeDir\audio"
-    $RecentWav = if ($UsePreSynth) {
-        Get-Item $PreSynthWav -ErrorAction SilentlyContinue
-    } else {
-        Get-ChildItem -Path $AudioDir -Filter "tts-*.wav" -ErrorAction SilentlyContinue |
-            Sort-Object LastWriteTime -Descending | Select-Object -First 1
+    $RecentWav = $null
+    if ($UsePreSynth) {
+        $RecentWav = Get-Item $PreSynthWav -ErrorAction SilentlyContinue
+    }
+    elseif ($SynthesizedWavPath -and (Test-Path $SynthesizedWavPath)) {
+        $cand = Get-Item $SynthesizedWavPath -ErrorAction SilentlyContinue
+        if ($cand -and $cand.Length -gt 0) {
+            $RecentWav = $cand
+        }
+    }
+    if (-not $RecentWav) {
+        Write-Host "[ERROR] No fresh synthesized WAV - refusing stale cache" -ForegroundColor Red
+        Remove-Item env:AGENTVIBES_NO_PLAY -ErrorAction SilentlyContinue
+        exit 1
     }
 
     if ($RecentWav -and $RecentWav.Length -gt 0) {
@@ -322,7 +263,6 @@ if (($BgEnabled -or $HasReverb) -and $HasFfmpeg) {
             if (Test-Path $AudioEffectsCfg) {
                 # Try agent-specific config first, then fall back to default
                 # Format: AGENT_NAME|SOX_EFFECTS|BACKGROUND_FILE|BACKGROUND_VOLUME
-                # Lookup order: agent name → llm:<name> → default
                 $agentName = $env:AGENTVIBES_AGENT_NAME
                 $configLine = $null
 
@@ -335,16 +275,6 @@ if (($BgEnabled -or $HasReverb) -and $HasFfmpeg) {
                         }
                     }
                 }
-                # Try LLM-specific config (--llm parameter)
-                if (-not $configLine -and $llm) {
-                    $llmBgKey = "llm:$llm"
-                    foreach ($line in $cfgLines) {
-                        if ($line -match "^$([regex]::Escape($llmBgKey))\|") {
-                            $configLine = $line
-                            break
-                        }
-                    }
-                }
                 # Fall back to default
                 if (-not $configLine) {
                     foreach ($line in $cfgLines) {

package/README.md

@@ -11,7 +11,7 @@
 [![Publish](https://github.com/paulpreibisch/AgentVibes/actions/workflows/publish.yml/badge.svg)](https://github.com/paulpreibisch/AgentVibes/actions/workflows/publish.yml)
 [![License](https://img.shields.io/badge/License-Apache_2.0-blue.svg)](https://opensource.org/licenses/Apache-2.0)
 
-**Author**: Paul Preibisch ([@997Fire](https://x.com/997Fire)) | **Version**: v5.0.0
+**Author**: Paul Preibisch ([@997Fire](https://x.com/997Fire)) | **Version**: v5.1.0
 
 ---
 
@@ -43,7 +43,21 @@ Whether you're using Claude Code, GitHub Copilot, OpenAI Codex, Claude Desktop,
 
 ---
 
-## 🚀 NEW IN v5.0.0 — Multi-Provider Support: Claude Code + Copilot + Codex
+## 🎙️ NEW IN v5.1.0 — Voice Picker Overhaul + Auto-Save Agent Modal
+
+- **Auto-save in agent modal** — Voice/personality/music/reverb/pretext changes save automatically as you edit them. Brief "✓ Saved!" toast confirms each change.
+- **Unique LibriTTS names** — 904 speakers get deterministic surnames: **Anna Bell**, **Anna Carter**, …, **Anna Quinn**. No more "Anna-2", "Anna-3" duplicates.
+- **Pink ♀ / blue ♂ gender symbols** — Colored gender indicators in the main Voices tab and all voice picker modals.
+- **First-letter quick jump** — Press `a`–`z` in any voice picker to jump to that letter. `q`, `j`, `k`, `g`, `h`, `l` reserved for nav/cancel.
+- **PgUp / PgDn / Home / End** in voice pickers
+- **3 new background music tracks** — Late Night Hip Hop Groove, Drifting Down the Hall, Midnight Charleston Stomp
+- **Search bar removed from voice pickers** — replaced by first-letter jump (faster, no focus issues)
+- **Voices tab corruption fix** — uninstalled rows no longer lose their Provider column when navigated onto
+- **Music + Voices tab blink artifacts gone**
+
+---
+
+## 🚀 v5.0.0 — Multi-Provider Support: Claude Code + Copilot + Codex
 
 - **GitHub Copilot + OpenAI Codex in VS Code** — AgentVibes now supports all three major AI coding assistants. Install and configure each from the TUI.
 - **One Setup tab** — 4-step wizard (Language → Deps → TTS Engine → Providers) replaces old installer + LLM tabs. Returning users skip to Providers.

package/RELEASE_NOTES.md

@@ -1,5 +1,53 @@
 # AgentVibes Release Notes
 
+## 🎙️ v5.1.0 — Voice Picker Overhaul + Auto-Save Agent Modal
+
+**Release Date:** April 2026
+
+### New Features
+
+- **Auto-save in agent edit modal** — Per-agent voice/personality/music/reverb/pretext changes now save automatically as you edit them. The explicit Save button is gone; a brief "✓ Saved!" toast confirms each change. Cancel and Reset to Defaults still behave as before.
+
+- **Unique LibriTTS speaker names** — The 904 LibriTTS speakers no longer show as "Anna", "Anna-2", "Anna-3", … "Anna-16". Each gets a deterministic surname from a 16-name pool: **Anna Bell**, **Anna Carter**, **Anna Davis**, …, **Anna Quinn**. Underlying voice IDs are unchanged so existing user configs still resolve.
+
+- **Pink/blue gender symbols** — Female voices show **♀** in pink (magenta), male voices show **♂** in light blue (bright-cyan), unknown shows `—`. Header `Gender` column replaced with colored `♀/♂` (10 → 4 chars wide), freeing room for longer names. Applied to the main Voices tab AND all 3 voice picker modals (Setup, Agents, Settings).
+
+- **First-letter quick jump in voice pickers** — Press any letter `a`–`z` to jump to the first voice starting with that letter. Reserved keys (`q`, `j`, `k`, `g`, `h`, `l`) are blocked so they keep their cancel / vi-nav meanings.
+
+- **Page navigation in voice pickers** — `PgUp`, `PgDn`, `Home`, `End` now work in all voice picker modals.
+
+- **3 new background music tracks** — `Late Night Hip Hop Groove`, `Drifting Down the Hall` (90s vibes), and `Midnight Charleston Stomp` (swing). Track count goes from 15 → 18.
+
+### Improvements
+
+- **Voice picker search bar removed** — Replaced with first-letter quick jump. The old search textbox had focus issues that swallowed nav keys. The jump is faster for typical "find voice X" use.
+
+- **Track list sorting fixed** — Tracks with emoji prefixes (e.g. `🎤 Late Night Hip Hop Groove`) now sort by the alphabetic part of the name, not the emoji codepoint. Order is consistent across Node/ICU versions.
+
+- **Favorite hotkey is now `*` only** — Removed the duplicate `f` binding for marking favorites in voice pickers and the main Voices tab. `f` is now free for first-letter jump (e.g. jumping to Frank or Felix). The `*` marker remains the canonical way to toggle favorites.
+
+### Bug Fixes
+
+- **Voices tab uninstalled rows no longer corrupt** — Selecting an uninstalled voice was visually deleting its Provider column due to a regex strip that over-matched the row's `bright-black-fg` wrapper. Replaced with a precise hint anchor that only strips the exact hint text.
+
+- **Music tab + Voices tab blink artifacts gone** — `█` cursors no longer leave stray blocks behind when scrolling rapidly through the list. Both tabs now use a precise blink-strip helper instead of the fragile position-based slicer.
+
+- **Setup tab no longer silently fails** — `_renderScreen3` was wrapping the entire `setupCompleted` write block in a single empty `try/catch {}`. Corrupt local config files are now backed up to `config.json.bak` and rewritten fresh, with errors logged to stderr — no more "stuck repeating setup" with no explanation.
+
+- **Voice picker `q` cancel now works** — The new first-letter jump was swallowing `q` (and other vi nav keys). Reserved key blocklist added.
+
+- **Track picker case-insensitive sort** — New tracks with Title Case names (`Late Night Hip Hop Groove.mp3`) no longer jump to the top of the list above the lowercase `agent_vibes_*` tracks.
+
+### User Impact
+
+- Editing an agent's voice or settings is now faster — no need to remember to click Save
+- The voice picker is dramatically less cluttered with 904 LibriTTS speakers all having unique, friendly names
+- Gender at a glance via colored symbols
+- Three new music tracks for variety
+- Blink/scroll artifacts gone in both Voices and Music tabs
+
+---
+
 ## 🚀 v5.0.0 — Multi-Provider Support: Claude Code + Copilot + Codex
 
 **Release Date:** April 2026

package/package.json

@@ -1,7 +1,7 @@
 {
   "$schema": "https://json.schemastore.org/package.json",
   "name": "agentvibes",
-  "version": "5.0.0",
+  "version": "5.1.0",
   "description": "Now your AI Agents can finally talk back! Professional TTS voice for Claude Code, Claude Desktop (via MCP), and Clawdbot with multi-provider support.",
   "homepage": "https://agentvibes.org",
   "keywords": [

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

@@ -16,7 +16,7 @@ import { openTrackPicker, openVolumeInput } from '../widgets/track-picker.js';
 import { formatReverbState, formatTrackName, formatVoiceName } from '../widgets/format-utils.js';
 import {
   PIPER_VOICES_DIR, SAMPLE_PHRASES,
-  parseMultiSpeaker, scanInstalledVoices, getVoiceMeta,
+  parseMultiSpeaker, scanInstalledVoices, getVoiceMeta, genderIconTag,
 } from './voices-tab.js';
 import { buildAudioEnv, detectWavPlayer } from '../audio-env.js';
 import { destroyList } from '../widgets/destroy-list.js';
@@ -729,8 +729,10 @@ ${_tl('bmadDesc')}
       btnBlink.startSpinner(previewBtn);
     });
 
-    const saveBtn = _modalBtn('Save', 18, () => {
-      // Only save fields that differ from global
+    // Auto-save the current draft (called after every field change).
+    // Only persists fields that differ from the global defaults — same logic
+    // the explicit Save button used to use, just triggered automatically.
+    function _autoSaveAgent() {
       const toSave = {};
       if (draft.voice && draft.voice !== globalCfg.voice) toSave.voice = draft.voice;
       if (draft.pretext !== AgentVoiceStore.getDefaultPretext(agent.displayName, agent.title)) toSave.pretext = draft.pretext;
@@ -742,22 +744,20 @@ ${_tl('bmadDesc')}
         toSave.backgroundMusic = draft.backgroundMusic;
       }
       voiceStore.setAgentProfile(agent.id, toSave);
-      _closeModal();
       refreshDisplay();
-      // Show temporary "Saved!" toast
       _showSavedToast(agent.displayName);
-    });
+    }
 
-    const resetAllBtn = _modalBtn('Reset to Defaults', 26, () => {
+    const resetBtn = _modalBtn('Reset to Defaults', 18, () => {
       voiceStore.resetAgentProfile(agent.id);
       _closeModal();
       refreshDisplay();
     });
 
-    const cancelBtn = _modalBtn('Cancel', 50, _closeModal);
+    const closeBtn = _modalBtn('Cancel', 42, _closeModal);
 
     // Blinking █ cursor + preview spinner — reusable across all modal buttons
-    const btnBlink = attachBtnBlink([previewBtn, saveBtn, resetAllBtn, cancelBtn], screen);
+    const btnBlink = attachBtnBlink([previewBtn, resetBtn, closeBtn], screen);
 
     function _closeModal() {
       if (_closed) return;
@@ -779,6 +779,7 @@ ${_tl('bmadDesc')}
       switch (field.key) {
         case 'voice':
           _openVoicePickerForAgent(agent, draft, () => {
+            _autoSaveAgent();
             fieldList.setItems(_fieldItems());
             fieldList.select(idx);
             fieldList.focus();
@@ -788,6 +789,7 @@ ${_tl('bmadDesc')}
 
         case 'pretext':
           _openPretextEditor(modal, draft, () => {
+            _autoSaveAgent();
             fieldList.setItems(_fieldItems());
             fieldList.select(idx);
             fieldList.focus();
@@ -798,6 +800,7 @@ ${_tl('bmadDesc')}
         case 'reverbPreset':
           openReverbPicker(screen, draft.reverbPreset, (val) => {
             draft.reverbPreset = val;
+            _autoSaveAgent();
             fieldList.setItems(_fieldItems());
             fieldList.select(idx);
             fieldList.focus();
@@ -811,6 +814,7 @@ ${_tl('bmadDesc')}
         case 'personality':
           openPersonalityPicker(screen, draft.personality, (val) => {
             draft.personality = val;
+            _autoSaveAgent();
             fieldList.setItems(_fieldItems());
             fieldList.select(idx);
             fieldList.focus();
@@ -825,6 +829,7 @@ ${_tl('bmadDesc')}
           openTrackPicker(screen, draft.backgroundMusic.track, draft.backgroundMusic.volume, (track) => {
             draft.backgroundMusic.track = track;
             draft.backgroundMusic.enabled = true;
+            _autoSaveAgent();
             fieldList.setItems(_fieldItems());
             fieldList.select(idx);
             fieldList.focus();
@@ -839,6 +844,7 @@ ${_tl('bmadDesc')}
           openVolumeInput(screen, draft.backgroundMusic.volume, (volume) => {
             draft.backgroundMusic.volume = volume;
             if (draft.backgroundMusic.track) draft.backgroundMusic.enabled = true;
+            _autoSaveAgent();
             fieldList.setItems(_fieldItems());
             fieldList.select(idx);
             fieldList.focus();
@@ -861,9 +867,8 @@ ${_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);
+    resetBtn.key(['escape'], _closeModal);
+    closeBtn.key(['escape'], _closeModal);
 
     // Tab + arrow navigation within modal
     fieldList.key(['tab'], () => { previewBtn.focus(); screen.render(); });
@@ -887,23 +892,19 @@ ${_tl('bmadDesc')}
       _prevFieldSel = cur;
     });
 
-    // Wrap: up on buttons → back to field list (last/first field respectively)
+    // Wrap: up on buttons → back to field list
     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(); });
+    resetBtn.key(['up'], () => { fieldList.focus(); fieldList.select(FIELDS.length - 1); screen.render(); });
+    closeBtn.key(['up'], () => { fieldList.focus(); fieldList.select(FIELDS.length - 1); screen.render(); });
 
-    saveBtn.key(['tab', 'right'], () => { resetAllBtn.focus(); screen.render(); });
-    saveBtn.key(['left'], () => { previewBtn.focus(); screen.render(); });
+    previewBtn.key(['tab', 'right'], () => { resetBtn.focus(); screen.render(); });
+    previewBtn.key(['left'], () => { closeBtn.focus(); screen.render(); });
 
-    resetAllBtn.key(['tab', 'right'], () => { cancelBtn.focus(); screen.render(); });
-    resetAllBtn.key(['left'], () => { saveBtn.focus(); screen.render(); });
+    resetBtn.key(['tab', 'right'], () => { closeBtn.focus(); screen.render(); });
+    resetBtn.key(['left'], () => { previewBtn.focus(); screen.render(); });
 
-    cancelBtn.key(['tab', 'right'], () => { fieldList.focus(); screen.render(); });
-    cancelBtn.key(['left'], () => { resetAllBtn.focus(); screen.render(); });
+    closeBtn.key(['tab', 'right'], () => { fieldList.focus(); screen.render(); });
+    closeBtn.key(['left'], () => { resetBtn.focus(); screen.render(); });
 
     fieldList.focus();
     screen.render();
@@ -914,7 +915,6 @@ ${_tl('bmadDesc')}
 
   function _openVoicePickerForAgent(agent, draft, onDone) {
     let _allVoices = [];
-    let _filterText = '';
     let _previewProc = null;
     let _previewVoiceId = null;
     let _vpClosed = false;
@@ -959,29 +959,19 @@ ${_tl('bmadDesc')}
     });
     vpModal.setFront();
 
-    // Search
-    blessed.text({
-      parent: vpModal, top: 1, left: 2,
-      content: 'Search:', style: { fg: COLORS.labelFg, bg: COLORS.contentBg },
-    });
-    const vpSearch = blessed.textbox({
-      parent: vpModal, top: 1, left: 11, width: 40, height: 1,
-      inputOnFocus: true, keys: true,
-      style: { fg: COLORS.valueFg, bg: '#1a3a5c', focus: { bg: '#245a80' } },
-    });
-
     // Column header
-    const COL_N = 28;
-    const COL_G = 10;
+    const COL_N = 30;
+    const COL_G = 4;
     blessed.text({
-      parent: vpModal, top: 2, left: 6, tags: true,
-      content: `{bright-cyan-fg}${'Name'.padEnd(COL_N)}${'Gender'.padEnd(COL_G)}Provider{/bright-cyan-fg}`,
+      parent: vpModal, top: 1, left: 6, tags: true,
+      content: `{bright-cyan-fg}${'Name'.padEnd(COL_N)}{/bright-cyan-fg}{magenta-fg}♀{/magenta-fg}/{bright-cyan-fg}♂{/bright-cyan-fg} {bright-cyan-fg}Provider{/bright-cyan-fg}`,
       style: { bg: COLORS.contentBg },
     });
 
     const vpList = blessed.list({
-      parent: vpModal, top: 3, left: 2, right: 2, bottom: 5,
+      parent: vpModal, top: 2, left: 2, right: 2, bottom: 5,
       keys: true, vi: true, mouse: true,
+      tags: true,
       border: { type: 'line' },
       scrollbar: { ch: '│', style: { fg: COLORS.borderFg } },
       style: {
@@ -1004,16 +994,10 @@ ${_tl('bmadDesc')}
 
     blessed.text({
       parent: vpModal, bottom: 2, left: 2, right: 2, tags: true,
-      content: '{#455a64-fg}[↑↓/jk] Navigate  [Enter] Select  [Space] Preview  [/] Search  [Esc] Cancel{/#455a64-fg}',
+      content: '{#455a64-fg}[↑↓] Nav  [PgUp/PgDn] Page  [Home/End]  [a-z] Jump  [Enter] Select  [Space] Preview  [Esc] Cancel{/#455a64-fg}',
       style: { bg: COLORS.contentBg },
     });
 
-    function _getFiltered() {
-      if (!_filterText) return _allVoices;
-      const f = _filterText.toLowerCase();
-      return _allVoices.filter(v => v.toLowerCase().includes(f));
-    }
-
     function _buildVoiceItems(voices) {
       return voices.map(v => {
         const isActive = v === draft.voice;
@@ -1023,7 +1007,8 @@ ${_tl('bmadDesc')}
         const name = meta.displayName.length > COL_N
           ? meta.displayName.slice(0, COL_N - 1) + '…'
           : meta.displayName.padEnd(COL_N);
-        return ` ${dot} ${name}${meta.gender.padEnd(COL_G)}${meta.provider}`;
+        // genderIconTag has invisible color tags — pad with literal spaces (1 visible char + 3 spaces = 4)
+        return ` ${dot} ${name}${genderIconTag(meta.gender)}   ${meta.provider}`;
       });
     }
 
@@ -1032,8 +1017,10 @@ ${_tl('bmadDesc')}
       const savedIdx = vpList.selected ?? 0;
       const savedScroll = vpList.childBase ?? 0;
       _allVoices = scanInstalledVoices();
-      const filtered = _getFiltered();
-      const items = _buildVoiceItems(filtered);
+      // Sort by display name so the first-letter quick jump is intuitive
+      _allVoices.sort((a, b) => getVoiceMeta(a).displayName.localeCompare(
+        getVoiceMeta(b).displayName, undefined, { sensitivity: 'base' }));
+      const items = _buildVoiceItems(_allVoices);
       vpList.setItems(items.length > 0 ? items : [' (no voices found)']);
       vpList.select(Math.min(savedIdx, items.length - 1));
       vpList.childBase = Math.min(savedScroll, Math.max(0, items.length - (vpList.height - 2)));
@@ -1104,25 +1091,41 @@ ${_tl('bmadDesc')}
       piper.on('error', () => { _previewProc = null; _previewVoiceId = null; });
     }
 
-    vpSearch.on('keypress', () => {
-      setTimeout(() => { _filterText = vpSearch.getValue().trim(); _refreshVP(); }, 0);
-    });
-    vpSearch.key(['escape'], () => { vpList.focus(); screen.render(); });
-    vpList.key(['/'], () => { vpSearch.clearValue(); vpSearch.focus(); screen.render(); });
     vpList.key(['enter'], () => {
-      const filtered = _getFiltered();
-      const sel = filtered[vpList.selected];
+      const sel = _allVoices[vpList.selected];
       if (sel) { draft.voice = sel; _closeVP(); }
     });
     vpList.key(['space'], () => {
-      const filtered = _getFiltered();
-      const sel = filtered[vpList.selected];
+      const sel = _allVoices[vpList.selected];
       if (sel) _previewVoice(sel);
     });
     vpList.key(['escape', 'q'], _closeVP);
 
+    // PageUp / PageDown / Home / End navigation
+    const _pageSize = () => Math.max(1, (vpList.height ?? 10) - 2);
+    vpList.key(['pageup'],   () => { vpList.up(_pageSize());   screen.render(); });
+    vpList.key(['pagedown'], () => { vpList.down(_pageSize()); screen.render(); });
+    vpList.key(['home'],     () => { vpList.select(0); screen.render(); });
+    vpList.key(['end'],      () => { vpList.select(Math.max(0, _allVoices.length - 1)); screen.render(); });
+
+    // First-letter quick jump: typing 'a' jumps to the first voice starting
+    // with A. Block keys reserved by the list widget (vi nav, cancel) so
+    // they don't get swallowed: q (cancel), j/k/g/h/l (vi navigation).
+    const _vpJumpBlocked = new Set(['j', 'k', 'g', 'h', 'l', 'q']);
+    vpList.on('keypress', (ch, key) => {
+      if (!ch || key?.ctrl || key?.meta) return;
+      if (!/^[a-zA-Z]$/.test(ch)) return;
+      const target = ch.toLowerCase();
+      if (_vpJumpBlocked.has(target)) return;
+      const idx = _allVoices.findIndex(v => {
+        const name = getVoiceMeta(v).displayName.toLowerCase();
+        return name.startsWith(target);
+      });
+      if (idx >= 0) { vpList.select(idx); screen.render(); }
+    });
+
     _refreshVP();
-    const activeIdx = _getFiltered().indexOf(draft.voice);
+    const activeIdx = _allVoices.indexOf(draft.voice);
     if (activeIdx >= 0) vpList.select(activeIdx);
     vpList.focus();
     screen.render();