agentvibes 5.3.0 → 5.5.0

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

@@ -185,12 +185,15 @@ export function scanTracks() {
   const tracksDir = _getTracksDir();
   try {
     const files = fs.readdirSync(tracksDir);
+    const mp3s = files.filter(f => /\.mp3$/i.test(f));
+    // If the directory exists but has no mp3s (e.g. empty npm package dir),
+    // fall back to the static catalog so bundled tracks always show.
+    if (mp3s.length === 0) return BUILT_IN_TRACK_CATALOG.map(t => ({ ...t, isBuiltIn: true }));
     const builtInIds = new Set(BUILT_IN_TRACK_CATALOG.map(t => t.id));
     // Sort by the alphabetic part of the label (skip leading emoji/symbols)
     // so the order reflects the track NAME, not the emoji codepoint.
     const _sortKey = (s) => s.replace(/^[^a-zA-Z]+/, '');
-    return files
-      .filter(f => /\.mp3$/i.test(f))
+    return mp3s
       .map(f => ({ id: f, label: formatTrackLabel(f), isBuiltIn: builtInIds.has(f) }))
       .sort((a, b) => _sortKey(a.label).localeCompare(_sortKey(b.label), undefined, { sensitivity: 'base' }));
   } catch {

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

@@ -133,6 +133,10 @@ function loadCatalog() {
   // Build lookup map for O(1) access by voiceId
   _catalogMap = new Map();
   for (const c of _catalogEntries) _catalogMap.set(c.voiceId, c);
+
+  // Patch libritts_r onnx.json files so their speaker IDs become friendly names.
+  // Must run after catalog loads so the name mapping is available.
+  patchLibriTTSSpeakerNames();
 }
 
 /**
@@ -142,45 +146,48 @@ function loadCatalog() {
  * Safe to call multiple times — skips if already patched.
  */
 function patchLibriTTSSpeakerNames() {
+  // Load catalog once for all models
+  const catalogPath = path.resolve(__dirname, '..', '..', '..', 'voice-assignments.json');
+  if (!fs.existsSync(catalogPath)) return;
+  let speakers;
   try {
-    const jsonPath = path.join(PIPER_VOICES_DIR, 'en_US-libritts-high.onnx.json');
-    if (!fs.existsSync(jsonPath)) return;
-    const data = JSON.parse(fs.readFileSync(jsonPath, 'utf8'));
-    if (!data.speaker_id_map || data.num_speakers <= 1) return;
-
-    const names = Object.keys(data.speaker_id_map);
-    // Already patched if first name doesn't start with 'p' followed by digits
-    if (names.length > 0 && !/^p\d+$/.test(names[0])) return;
-
-    // Build index → p-name reverse map
-    const indexToP = {};
-    for (const [pname, idx] of Object.entries(data.speaker_id_map)) {
-      indexToP[idx] = pname;
-    }
+    speakers = JSON.parse(fs.readFileSync(catalogPath, 'utf8')).libritts_speakers ?? {};
+  } catch { return; }
+
+  // Models to patch and how to detect unpatched keys:
+  //   libritts-high  → raw keys are p-prefixed corpus IDs (p3922, p8699, …)
+  //   libritts_r-*   → raw keys are plain numeric corpus IDs (3922, 8699, …)
+  const MODELS = [
+    { file: 'en_US-libritts-high.onnx.json',   notPatched: (k) => /^p\d+$/.test(k) },
+    { file: 'en_US-libritts_r-medium.onnx.json', notPatched: (k) => /^\d+$/.test(k) },
+    { file: 'en_US-libritts_r-high.onnx.json',   notPatched: (k) => /^\d+$/.test(k) },
+  ];
+
+  for (const { file, notPatched } of MODELS) {
+    try {
+      const jsonPath = path.join(PIPER_VOICES_DIR, file);
+      if (!fs.existsSync(jsonPath)) continue;
+      const data = JSON.parse(fs.readFileSync(jsonPath, 'utf8'));
+      if (!data.speaker_id_map || data.num_speakers <= 1) continue;
 
-    // Load friendly names from catalog
-    const catalogPath = path.resolve(__dirname, '..', '..', '..', 'voice-assignments.json');
-    if (!fs.existsSync(catalogPath)) return;
-    const catalog = JSON.parse(fs.readFileSync(catalogPath, 'utf8'));
-    const speakers = catalog.libritts_speakers ?? {};
-
-    // Rebuild speaker_id_map with friendly names
-    const newMap = {};
-    for (const [idx, pname] of Object.entries(indexToP)) {
-      const friendly = speakers[idx]?.voice_name;
-      if (friendly) {
-        newMap[friendly] = parseInt(idx, 10);
-      } else {
-        newMap[pname] = parseInt(idx, 10);
+      const names = Object.keys(data.speaker_id_map);
+      // Skip if already patched (first key is a friendly name, not a raw corpus ID)
+      if (names.length === 0 || !notPatched(names[0])) continue;
+
+      // Values are 0-based sequential indices into the model — use as catalog key
+      const newMap = {};
+      for (const [rawKey, idx] of Object.entries(data.speaker_id_map)) {
+        const friendly = speakers[String(idx)]?.voice_name;
+        newMap[friendly ?? rawKey] = idx;
       }
-    }
 
-    data.speaker_id_map = newMap;
-    // Verify file ownership before writing (security: CLAUDE.md)
-    const stat = fs.statSync(jsonPath);
-    if (typeof process.getuid === 'function' && stat.uid !== process.getuid()) return;
-    fs.writeFileSync(jsonPath, JSON.stringify(data, null, 2), 'utf8');
-  } catch { /* non-fatal */ }
+      data.speaker_id_map = newMap;
+      // Verify file ownership before writing (security: CLAUDE.md)
+      const stat = fs.statSync(jsonPath);
+      if (typeof process.getuid === 'function' && stat.uid !== process.getuid()) continue;
+      fs.writeFileSync(jsonPath, JSON.stringify(data, null, 2), 'utf8');
+    } catch { /* non-fatal — skip this model */ }
+  }
 }
 
 // Column widths for the multi-column voice list
@@ -417,9 +424,9 @@ export function parseMultiSpeaker(voiceId) {
     try {
       const data = JSON.parse(fs.readFileSync(jsonPath, 'utf8'));
       let speakerId = data.speaker_id_map?.[speakerName] ?? null;
-      // Fallback: if the .onnx.json still has raw p-names (not yet patched),
+      // Fallback: if the .onnx.json still has raw corpus IDs (not yet patched),
       // look up the numeric speaker ID from voice-assignments.json catalog.
-      if (speakerId == null && model === 'en_US-libritts-high') {
+      if (speakerId == null && (model === 'en_US-libritts-high' || /^en_US-libritts_r-/.test(model))) {
         try {
           const catalogPath = path.resolve(__dirname, '..', '..', '..', 'voice-assignments.json');
           const catalog = JSON.parse(fs.readFileSync(catalogPath, 'utf8'));
@@ -443,6 +450,9 @@ export function parseMultiSpeaker(voiceId) {
  * @returns {string[]}
  */
 export function scanInstalledVoices() {
+  // Ensure catalog is loaded and libritts_r onnx.json files are patched
+  // before we read their speaker_id_map keys (otherwise we get raw corpus IDs).
+  loadCatalog();
   try {
     const files = fs.readdirSync(PIPER_VOICES_DIR);
     const onnxFiles = files
@@ -588,6 +598,30 @@ export function getVoiceMeta(voiceId) {
       _metaCache.set(voiceId, result);
       return result;
     }
+    // libritts_r variants share speaker names with libritts-high after patching
+    if (/^en_US-libritts_r-/.test(ms.model)) {
+      // After patching: speakerName is a friendly name — look up in libritts-high catalog
+      const highCat = _catalogMap.get(`en_US-libritts-high${MS_SEP}${ms.speakerName}`);
+      if (highCat) {
+        const result = { displayName: highCat.displayName, gender: highCat.gender, provider: `Piper (${ms.model})` };
+        _metaCache.set(voiceId, result);
+        return result;
+      }
+      // Before patching: speakerName is a raw numeric corpus ID — resolve via onnx.json value
+      if (/^\d+$/.test(ms.speakerName)) {
+        try {
+          const jsonPath = path.join(PIPER_VOICES_DIR, ms.model + '.onnx.json');
+          const data = JSON.parse(fs.readFileSync(jsonPath, 'utf8'));
+          const seqIdx = data.speaker_id_map?.[ms.speakerName];
+          if (seqIdx != null && _catalogEntries[seqIdx]) {
+            const cat = _catalogEntries[seqIdx];
+            const result = { displayName: cat.displayName, gender: cat.gender, provider: `Piper (${ms.model})` };
+            _metaCache.set(voiceId, result);
+            return result;
+          }
+        } catch { /* fall through */ }
+      }
+    }
     // Fallback for speakers not in the catalog (e.g. 16Speakers model)
     const displayName = uniquifyVoiceName(ms.speakerName.replace(/_/g, ' '));
     const result = {

package/src/installer.js

@@ -132,6 +132,36 @@ function isNativeWindows() {
   return process.platform === 'win32' && !process.env.WSL_DISTRO_NAME;
 }
 
+/**
+ * Wrap an ora spinner with safe fallbacks for all methods.
+ * Ensures compatibility across platforms (Windows, WSL, macOS, Linux) and ora versions.
+ * @param {Object} spinner - An ora spinner instance (or any spinner-like object)
+ * @returns {Object} A spinner proxy with guaranteed methods
+ */
+function createRobustSpinner(spinner) {
+  const safe = (method, fallback) => (...args) => {
+    if (typeof spinner[method] === 'function') {
+      try { spinner[method](...args); } catch { fallback?.(...args); }
+    } else {
+      fallback?.(...args);
+    }
+    return proxy;
+  };
+  const proxy = {
+    start:          safe('start'),
+    stop:           safe('stop'),
+    succeed:        safe('succeed', (t) => { if (t) process.stdout.write(`✓ ${t}\n`); }),
+    fail:           safe('fail',    (t) => { if (t) process.stderr.write(`✗ ${t}\n`); }),
+    warn:           safe('warn',    (t) => { if (t) process.stdout.write(`⚠ ${t}\n`); }),
+    info:           safe('info',    (t) => { if (t) process.stdout.write(`ℹ ${t}\n`); }),
+    stopAndPersist: safe('stopAndPersist'),
+    get text()      { return spinner.text ?? ''; },
+    set text(t)     { try { spinner.text = t; } catch { /* non-TTY */ } },
+    get isSpinning(){ return spinner.isSpinning ?? false; },
+  };
+  return proxy;
+}
+
 /**
  * Get the Piper provider name (always 'piper' on all platforms)
  * @returns {string} The piper provider identifier
@@ -3219,6 +3249,7 @@ async function handleTermuxSshConfiguration() {
  * @returns {Promise<{count: number, boxen: string}>} Number of files copied and boxen content
  */
 async function copyCommandFiles(targetDir, spinner) {
+  spinner = createRobustSpinner(spinner);
   spinner.start('Installing /agent-vibes slash commands...');
   const srcCommandsDir = path.join(__dirname, '..', '.claude', 'commands', 'agent-vibes');
   const commandsDir = path.join(targetDir, '.claude', 'commands');
@@ -3432,6 +3463,7 @@ function buildHookInstallationBoxen(installedFiles, failedFiles) {
  * @returns {Promise<{count: number, boxen: string|null}>} Number of files copied and boxen content
  */
 async function copyHookFiles(targetDir, spinner) {
+  spinner = createRobustSpinner(spinner);
   spinner.start('Installing TTS helper scripts...');
   const hooksSubdir = isNativeWindows() ? 'hooks-windows' : 'hooks';
   const srcHooksDir = path.join(__dirname, '..', '.claude', hooksSubdir);
@@ -3486,6 +3518,7 @@ async function copyHookFiles(targetDir, spinner) {
  * @returns {Promise<{count: number, boxen: string|null}>} Number of files copied and boxen content
  */
 async function copyPersonalityFiles(targetDir, spinner) {
+  spinner = createRobustSpinner(spinner);
   spinner.start('Installing personality templates...');
   const srcPersonalitiesDir = path.join(__dirname, '..', '.claude', 'personalities');
   const destPersonalitiesDir = path.join(targetDir, '.claude', 'personalities');
@@ -3568,6 +3601,7 @@ async function copyPersonalityFiles(targetDir, spinner) {
  * @returns {Promise<number>} Number of files copied
  */
 async function copyPluginFiles(targetDir, spinner) {
+  spinner = createRobustSpinner(spinner);
   spinner.start('Installing BMAD plugin files...');
   const srcPluginsDir = path.join(__dirname, '..', '.claude', 'plugins');
   const destPluginsDir = path.join(targetDir, '.claude', 'plugins');
@@ -3602,6 +3636,7 @@ async function copyPluginFiles(targetDir, spinner) {
  * @returns {Promise<number>} Number of files copied
  */
 async function copyBmadConfigFiles(targetDir, spinner) {
+  spinner = createRobustSpinner(spinner);
   spinner.start('Installing BMAD config files...');
   const srcBmadDir = path.join(__dirname, '..', '.agentvibes', 'bmad');
   const destBmadDir = path.join(targetDir, '.agentvibes', 'bmad');
@@ -3634,6 +3669,7 @@ async function copyBmadConfigFiles(targetDir, spinner) {
  * @returns {Promise<{count: number, boxen: string}>} Number of files copied and boxen content
  */
 async function copyBackgroundMusicFiles(targetDir, spinner) {
+  spinner = createRobustSpinner(spinner);
   spinner.start('Installing background music tracks...');
   const srcBackgroundsDir = path.join(__dirname, '..', '.claude', 'audio', 'tracks');
   const destBackgroundsDir = path.join(targetDir, '.claude', 'audio', 'tracks');
@@ -3756,6 +3792,7 @@ async function copyBackgroundMusicFiles(targetDir, spinner) {
  * @returns {Promise<number>} Number of files copied
  */
 async function copyConfigFiles(targetDir, spinner) {
+  spinner = createRobustSpinner(spinner);
   spinner.start('Installing configuration files...');
   const srcConfigDir = path.join(__dirname, '..', '.claude', 'config');
   const destConfigDir = path.join(targetDir, '.claude', 'config');
@@ -3818,6 +3855,7 @@ async function copyConfigFiles(targetDir, spinner) {
  * @param {Object} spinner - Ora spinner instance
  */
 async function copyCodexFiles(targetDir, spinner) {
+  spinner = createRobustSpinner(spinner);
   spinner.start('Installing Codex integration files...');
   const srcCodexDir = path.join(__dirname, '..', '.codex');
   const destCodexDir = path.join(targetDir, '.codex');
@@ -3871,6 +3909,7 @@ async function copyCodexFiles(targetDir, spinner) {
  * @param {Object} spinner - Ora spinner instance
  */
 async function configureSessionStartHook(targetDir, spinner) {
+  spinner = createRobustSpinner(spinner);
   spinner.start('Configuring AgentVibes hook for automatic TTS...');
   const claudeDir = path.join(targetDir, '.claude');
   const settingsPath = path.join(claudeDir, 'settings.json');
@@ -3926,6 +3965,7 @@ async function configureSessionStartHook(targetDir, spinner) {
  * @param {Object} spinner - Ora spinner instance
  */
 async function configurePartyModeHook(targetDir, spinner, homeDirOverride) {
+  spinner = createRobustSpinner(spinner);
   spinner.start('Configuring BMAD party mode TTS hook...');
   const homeDir = homeDirOverride || os.homedir();
   const globalClaudeDir = path.join(homeDir, '.claude');
@@ -4215,7 +4255,7 @@ async function checkAndInstallPiperWindows(targetDir, options) {
   }
   const piperDir = path.join(localAppData, 'Programs', 'Piper');
   const piperExe = path.join(piperDir, 'piper.exe');
-  const spinner = ora();
+  const spinner = createRobustSpinner(ora());
 
   if (fsSync.existsSync(piperExe)) {
     console.log(chalk.green('✓ Piper TTS is already installed at ' + piperDir + '\n'));
@@ -4844,7 +4884,14 @@ async function updatePersonalityFiles(targetDir, srcPersonalitiesDir) {
  * @returns {Object} Mock spinner object
  */
 function createSilentSpinner() {
-  const s = { start: () => s, succeed: () => s, info: () => s, fail: () => s, warn: () => s, stop: () => s };
+  const s = {
+    start: () => s, succeed: () => s, info: () => s,
+    fail: () => s, warn: () => s, stop: () => s,
+    stopAndPersist: () => s,
+    get text() { return ''; },
+    set text(_) {},
+    get isSpinning() { return false; },
+  };
   return s;
 }
 
@@ -5025,7 +5072,7 @@ function displayUpdateSummary(results) {
  * @param {Object} options - Update options
  */
 async function updateAgentVibes(targetDir, options) {
-  const spinner = ora('Updating AgentVibes...').start();
+  const spinner = createRobustSpinner(ora('Updating AgentVibes...').start());
 
   try {
     // Perform all update operations
@@ -5145,7 +5192,7 @@ async function install(options = {}) {
   const silentSpinner = createSilentSpinner();
 
   console.log('');
-  const spinner = ora('Installing AgentVibes...').start();
+  const spinner = createRobustSpinner(ora('Installing AgentVibes...').start());
 
   try {
     // Create .claude directory structure
@@ -5599,7 +5646,7 @@ program
       console.log(chalk.gray('✓ Auto-confirmed (--yes flag)\n'));
     }
 
-    const spinner = ora('Uninstalling AgentVibes...').start();
+    const spinner = createRobustSpinner(ora('Uninstalling AgentVibes...').start());
 
     try {
       let removedCount = 0;

package/src/services/llm-provider-service.js

@@ -198,7 +198,7 @@ export async function installClaudeMcp(targetDir) {
 
   try {
     // Copy hooks, commands, config, personality, plugin, bmad config files
-    const silentSpinner = { start: () => {}, succeed: () => {}, fail: () => {} };
+    const silentSpinner = { start: () => {}, stop: () => {}, succeed: () => {}, fail: () => {}, warn: () => {}, info: () => {}, stopAndPersist: () => {}, get text() { return ''; }, set text(_) {}, get isSpinning() { return false; } };
     const installer = await import('../installer.js');
     await installer.copyHookFiles(targetDir, silentSpinner);
     await installer.copyCommandFiles(targetDir, silentSpinner);