agentvibes 4.6.0 → 4.6.2

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'], () => {

package/templates/agentvibes-receiver.sh

@@ -441,7 +441,7 @@ if [[ -n "$BG_FILE" ]] && command -v ffmpeg &>/dev/null; then
       TOTAL_DUR=$(awk "BEGIN {printf \"%.2f\", $DURATION + 2}")
       FADE_OUT=$(awk "BEGIN {printf \"%.2f\", $DURATION}")
       timeout 20 ffmpeg -y -i "$PLAY_FILE" -stream_loop -1 -i "$BG_PATH" \
-        -filter_complex "[1:a]volume=${BG_VOLUME},afade=t=in:st=0:d=0.3,afade=t=out:st=${FADE_OUT}:d=2[bg];[0:a]adelay=2000|2000[v];[v][bg]amix=inputs=2:duration=longest[out]" \
+        -filter_complex "[1:a]volume=${BG_VOLUME},afade=t=in:st=0:d=0.3,afade=t=out:st=${FADE_OUT}:d=2[bg];[0:a]adelay=1000|1000,volume=1.5[v];[v][bg]amix=inputs=2:duration=longest:normalize=0[out]" \
         -map "[out]" -t "$TOTAL_DUR" "$FINAL_WAV" </dev/null 2>/dev/null && PLAY_FILE="$FINAL_WAV"
     fi
   fi