agentvibes 5.9.0 → 5.11.0

package/src/services/provider-service.js

@@ -1,143 +1,178 @@
-/**
- * AgentVibes Provider Service
- * Story 7.1: Provider & Voice Settings Group
- *
- * Detects installed TTS providers, reads/writes active provider and voice
- * through ConfigService. Gracefully degrades when detection fails.
- */
-
-import { execFileSync } from 'node:child_process';
-import fs from 'node:fs';
-import path from 'node:path';
-import os from 'node:os';
-
-export class ProviderService {
-  /**
-   * @param {import('./config-service.js').ConfigService} configService
-   */
-  constructor(configService) {
-    this._config = configService;
-    this._installedProviders = null; // cached after first detection
-  }
-
-  // ---------------------------------------------------------------------------
-  // Provider
-
-  /**
-   * Returns the currently active TTS provider from config.
-   * Defaults to 'piper' if not configured.
-   * @returns {string}
-   */
-  getActiveProvider() {
-    return this._config.getConfig().provider ?? 'piper';
-  }
-
-  /**
-   * Sets the active TTS provider in config AND syncs to .claude/tts-provider.txt
-   * so the shell hooks (play-tts.sh → provider-manager.sh) pick up the change.
-   * @param {string} provider
-   */
-  setActiveProvider(provider) {
-    this._config.set('provider', provider);
-    this._config.setGlobal('provider', provider);
-    this._syncProviderFile(provider);
-  }
-
-  /**
-   * Write provider to .claude/tts-provider.txt so shell hooks stay in sync.
-   * Writes to projectRoot/.claude/tts-provider.txt if .claude/ exists there,
-   * otherwise falls back to ~/.claude/tts-provider.txt.
-   * @param {string} provider
-   */
-  _syncProviderFile(provider) {
-    try {
-      const projectClaudeDir = path.resolve(this._config.getProjectRoot(), '.claude');
-      const targetDir = fs.existsSync(projectClaudeDir)
-        ? projectClaudeDir
-        : path.resolve(os.homedir(), '.claude');
-      const targetFile = path.resolve(targetDir, 'tts-provider.txt');
-      // Verify resolved path stays within targetDir (path traversal guard)
-      if (!targetFile.startsWith(targetDir + path.sep) && targetFile !== targetDir) return;
-      fs.mkdirSync(targetDir, { recursive: true });
-      fs.writeFileSync(targetFile, provider, 'utf8');
-    } catch {
-      // Non-fatal — config.json is the authoritative source
-    }
-  }
-
-  /**
-   * Returns an array of installed/available TTS providers.
-   * Detection uses `which` binary check. Always returns at least ['piper']
-   * as graceful degradation (piper is the primary supported provider).
-   * @returns {string[]}
-   */
-  getInstalledProviders() {
-    if (this._installedProviders) return this._installedProviders;
-
-    const providers = [];
-
-    if (this._isAvailable('piper')) providers.push('piper');
-    if (this._isAvailable('soprano')) providers.push('soprano');
-
-    // macOS Say (darwin only)
-    if (process.platform === 'darwin' && this._isAvailable('say')) {
-      providers.push('macos');
-    }
-
-    // Graceful degradation: always return at least piper
-    if (providers.length === 0) providers.push('piper');
-
-    this._installedProviders = providers;
-    return providers;
-  }
-
-  // ---------------------------------------------------------------------------
-  // Voice
-
-  /**
-   * Returns the currently active voice ID from config.
-   * Falls back to first installed voice if not configured.
-   * @returns {string|null}
-   */
-  getActiveVoiceId() {
-    const voice = this._config.getConfig().voice;
-    if (voice) return voice;
-    // Detect first installed voice instead of hardcoding a default that may not exist
-    const voicesDir = path.join(os.homedir(), '.claude', 'piper-voices');
-    try {
-      const models = fs.readdirSync(voicesDir).filter(f => f.endsWith('.onnx'));
-      if (models.length > 0) return models[0].replace(/\.onnx$/, '');
-    } catch { /* dir may not exist */ }
-    return null;
-  }
-
-  /**
-   * Sets the active voice ID in config.
-   * Writes to both project (if exists) and global config for portability.
-   * @param {string} voiceId
-   */
-  setActiveVoice(voiceId) {
-    this._config.set('voice', voiceId);
-    this._config.setGlobal('voice', voiceId);
-  }
-
-  // ---------------------------------------------------------------------------
-  // Private
-
-  /**
-   * Check if a binary is available in PATH using `which`.
-   * Binary names are all hardcoded (not user input) — safe from injection.
-   * @param {string} binary - hardcoded binary name ('piper', 'soprano', 'say')
-   * @returns {boolean}
-   */
-  _isAvailable(binary) {
-    try {
-      execFileSync('which', [binary], { stdio: 'ignore', timeout: 2000 });
-      return true;
-    } catch {
-      return false;
-    }
-  }
-}
-
-export default ProviderService;
+/**
+ * AgentVibes Provider Service
+ * Story 7.1: Provider & Voice Settings Group
+ *
+ * Detects installed TTS providers, reads/writes active provider and voice
+ * through ConfigService. Gracefully degrades when detection fails.
+ */
+
+import { execFileSync } from 'node:child_process';
+import fs from 'node:fs';
+import path from 'node:path';
+import os from 'node:os';
+
+export class ProviderService {
+  /**
+   * @param {import('./config-service.js').ConfigService} configService
+   */
+  constructor(configService) {
+    this._config = configService;
+    this._installedProviders = null; // cached after first detection
+  }
+
+  // ---------------------------------------------------------------------------
+  // Provider
+
+  /**
+   * Returns the currently active TTS provider from config.
+   * Defaults to 'piper' if not configured.
+   * @returns {string}
+   */
+  getActiveProvider() {
+    return this._config.getConfig().provider ?? 'piper';
+  }
+
+  /**
+   * Sets the active TTS provider in config AND syncs to .claude/tts-provider.txt
+   * so the shell hooks (play-tts.sh → provider-manager.sh) pick up the change.
+   * @param {string} provider
+   */
+  setActiveProvider(provider) {
+    this._config.set('provider', provider);
+    this._config.setGlobal('provider', provider);
+    this._syncProviderFile(provider);
+  }
+
+  /**
+   * Write provider to .claude/tts-provider.txt so shell hooks stay in sync.
+   * Writes to projectRoot/.claude/tts-provider.txt if .claude/ exists there,
+   * otherwise falls back to ~/.claude/tts-provider.txt.
+   * @param {string} provider
+   */
+  _syncProviderFile(provider) {
+    try {
+      const projectClaudeDir = path.resolve(this._config.getProjectRoot(), '.claude');
+      const targetDir = fs.existsSync(projectClaudeDir)
+        ? projectClaudeDir
+        : path.resolve(os.homedir(), '.claude');
+      const targetFile = path.resolve(targetDir, 'tts-provider.txt');
+      // Verify resolved path stays within targetDir (path traversal guard)
+      if (!targetFile.startsWith(targetDir + path.sep) && targetFile !== targetDir) return;
+      fs.mkdirSync(targetDir, { recursive: true });
+      fs.writeFileSync(targetFile, provider, 'utf8');
+    } catch {
+      // Non-fatal — config.json is the authoritative source
+    }
+  }
+
+  /**
+   * Returns an array of installed/available TTS providers.
+   * Detection uses `which` binary check. Always returns at least ['piper']
+   * as graceful degradation (piper is the primary supported provider).
+   * @returns {string[]}
+   */
+  getInstalledProviders() {
+    if (this._installedProviders) return this._installedProviders;
+
+    const providers = [];
+
+    if (this._isAvailable('piper')) providers.push('piper');
+    if (this._isKokoroInstalled()) providers.push('kokoro');
+    if (this._isElevenLabsConfigured()) providers.push('elevenlabs');
+    if (this._isAvailable('soprano')) providers.push('soprano');
+
+    // macOS Say (darwin only)
+    if (process.platform === 'darwin' && this._isAvailable('say')) {
+      providers.push('macos');
+    }
+
+    // Graceful degradation: always return at least piper
+    if (providers.length === 0) providers.push('piper');
+
+    this._installedProviders = providers;
+    return providers;
+  }
+
+  // ---------------------------------------------------------------------------
+  // Voice
+
+  /**
+   * Returns the currently active voice ID from config.
+   * Falls back to first installed voice if not configured.
+   * @returns {string|null}
+   */
+  getActiveVoiceId() {
+    const voice = this._config.getConfig().voice;
+    if (voice) return voice;
+    // Detect first installed voice instead of hardcoding a default that may not exist
+    const voicesDir = path.join(os.homedir(), '.claude', 'piper-voices');
+    try {
+      const models = fs.readdirSync(voicesDir).filter(f => f.endsWith('.onnx'));
+      if (models.length > 0) return models[0].replace(/\.onnx$/, '');
+    } catch { /* dir may not exist */ }
+    return null;
+  }
+
+  /**
+   * Sets the active voice ID in config.
+   * Writes to both project (if exists) and global config for portability.
+   * @param {string} voiceId
+   */
+  setActiveVoice(voiceId) {
+    this._config.set('voice', voiceId);
+    this._config.setGlobal('voice', voiceId);
+  }
+
+  // ---------------------------------------------------------------------------
+  // Private
+
+  /**
+   * Check if a binary is available in PATH using `which`.
+   * Binary names are all hardcoded (not user input) — safe from injection.
+   * @param {string} binary - hardcoded binary name ('piper', 'soprano', 'say')
+   * @returns {boolean}
+   */
+  _isAvailable(binary) {
+    try {
+      execFileSync('which', [binary], { stdio: 'ignore', timeout: 2000 }); // NOSONAR
+      return true;
+    } catch {
+      return false;
+    }
+  }
+
+  /**
+   * Check if the kokoro Python package is importable.
+   * Uses importlib.util.find_spec (no torch import) to avoid the slow load
+   * that can exceed the timeout and falsely report not-installed. Tries each
+   * platform-appropriate python command until one succeeds.
+   */
+  _isKokoroInstalled() {
+    // On Windows `python3` usually doesn't exist; `py` is the standard launcher.
+    const pythonCommands = process.platform === 'win32'
+      ? ['py', 'python', 'python3']
+      : ['python3', 'python'];
+    for (const pythonCmd of pythonCommands) {
+      try {
+        execFileSync(pythonCmd, ['-c', "import importlib.util,sys; sys.exit(0 if importlib.util.find_spec('kokoro') else 1)"], { stdio: 'ignore', timeout: 5000 }); // NOSONAR
+        return true;
+      } catch {
+        // try next python command
+      }
+    }
+    return false;
+  }
+
+  /** Check if ElevenLabs API key is configured (env var or key file). */
+  _isElevenLabsConfigured() {
+    if (process.env.ELEVENLABS_API_KEY?.trim()) return true;
+    try {
+      const keyFile = path.join(os.homedir(), '.agentvibes', 'elevenlabs-key.txt');
+      return fs.existsSync(keyFile) && fs.readFileSync(keyFile, 'utf8').trim().length > 0;
+    } catch {
+      return false;
+    }
+  }
+}
+
+export default ProviderService;

package/src/services/provider-voice-catalog.js

@@ -0,0 +1,126 @@
+/**
+ * Provider voice catalogs — single source of truth for the static voice lists
+ * of the cloud/neural providers, plus a helper that returns the voice pool for
+ * whichever provider is currently active.
+ *
+ * Piper voices are NOT listed here (they are discovered on disk via
+ * scanInstalledVoices); this module covers the providers whose voices are a
+ * fixed catalog: ElevenLabs and Kokoro. Single-voice providers (e.g. soprano)
+ * resolve to a single synthetic entry.
+ *
+ * @module services/provider-voice-catalog
+ */
+
+import { isSingleVoiceProvider } from './agent-voice-store.js';
+
+/** ElevenLabs library voices (voice_id + display metadata). */
+export const ELEVENLABS_VOICES = [
+  { id: 'EXAVITQu4vr4xnSDxMaL', name: 'Sarah',   gender: 'Female', lang: 'en-US', desc: 'Mature, reassuring'      },
+  { id: 'CwhRBWXzGAHq8TQ4Fs17', name: 'Roger',   gender: 'Male',   lang: 'en-US', desc: 'Laid-back, casual'       },
+  { id: 'FGY2WhTYpPnrIDTdsKH5', name: 'Laura',   gender: 'Female', lang: 'en-US', desc: 'Enthusiast, quirky'      },
+  { id: 'IKne3meq5aSn9XLyUdCD', name: 'Charlie', gender: 'Male',   lang: 'en-AU', desc: 'Deep, confident'         },
+  { id: 'JBFqnCBsd6RMkjVDRZzb', name: 'George',  gender: 'Male',   lang: 'en-GB', desc: 'Warm storyteller'        },
+  { id: 'N2lVS1w4EtoT3dr4eOWO', name: 'Callum',  gender: 'Male',   lang: 'en-US', desc: 'Husky trickster'         },
+  { id: 'SAz9YHcvj6GT2YYXdXww', name: 'River',   gender: '',       lang: 'en-US', desc: 'Relaxed, neutral'        },
+  { id: 'SOYHLrjzK2X1ezoPC6cr', name: 'Harry',   gender: 'Male',   lang: 'en-US', desc: 'Fierce warrior'          },
+  { id: 'TX3LPaxmHKxFdv7VOQHJ', name: 'Liam',    gender: 'Male',   lang: 'en-US', desc: 'Energetic creator'       },
+  { id: 'Xb7hH8MSUJpSbSDYk0k2', name: 'Alice',   gender: 'Female', lang: 'en-GB', desc: 'Clear educator'          },
+  { id: 'XrExE9yKIg1WjnnlVkGX', name: 'Matilda', gender: 'Female', lang: 'en-US', desc: 'Knowledgable, pro'       },
+  { id: 'bIHbv24MWmeRgasZH58o', name: 'Will',    gender: 'Male',   lang: 'en-US', desc: 'Relaxed optimist'        },
+  { id: 'cgSgspJ2msm6clMCkdW9', name: 'Jessica', gender: 'Female', lang: 'en-US', desc: 'Playful, bright'         },
+  { id: 'cjVigY5qzO86Huf0OWal', name: 'Eric',    gender: 'Male',   lang: 'en-US', desc: 'Smooth, trustworthy'     },
+  { id: 'hpp4J3VqNfWAUOO0d1Us', name: 'Bella',   gender: 'Female', lang: 'en-US', desc: 'Professional, warm'      },
+  { id: 'iP95p4xoKVk53GoZ742B', name: 'Chris',   gender: 'Male',   lang: 'en-US', desc: 'Charming, down-to-earth' },
+  { id: 'nPczCjzI2devNBz1zQrb', name: 'Brian',   gender: 'Male',   lang: 'en-US', desc: 'Deep, comforting'        },
+  { id: 'onwK4e9ZLuTAKqWW03F9', name: 'Daniel',  gender: 'Male',   lang: 'en-GB', desc: 'Steady broadcaster'      },
+  { id: 'pFZP5JQG7iQjIQuC4Bku', name: 'Lily',    gender: 'Female', lang: 'en-GB', desc: 'Velvety actress'         },
+  { id: 'pNInz6obpgDQGcFmaJgB', name: 'Adam',    gender: 'Male',   lang: 'en-US', desc: 'Dominant, firm'          },
+  { id: 'pqHfZKP75CvOlQylNhV4', name: 'Bill',    gender: 'Male',   lang: 'en-US', desc: 'Wise, mature'            },
+  // ── Added from the ElevenLabs voice library (raw library voice_ids) ───────
+  { id: 'HBDoL4wkcalemIO0nUAu', name: 'Emily',   gender: 'Female', lang: 'en-GB', desc: 'RPG, immersive'    },
+  { id: 'Mtmp3KhFIjYpWYRycDe3', name: 'John',    gender: 'Male',   lang: 'en-US', desc: 'Raspy surfer'      },
+  { id: '8kgj5469z1URcH4MB2G4', name: 'Sakuya',  gender: 'Female', lang: 'en-US', desc: 'Cheerful anime'    },
+  { id: '2ajXGJNYBR0iNHpS4VZb', name: 'Rob',     gender: 'Male',   lang: 'en-GB', desc: 'Tough, gritty'     },
+  { id: 'mMdTuD2nnFiCH88UdXSb', name: 'Jane',    gender: 'Female', lang: 'en-US', desc: 'Cinematic villain' },
+];
+
+/** Kokoro voice ids. Gender is encoded in the id: the 2nd char is f|m. */
+export const KOKORO_VOICE_IDS = [
+  // American English
+  'af_heart','af_alloy','af_aoede','af_bella','af_jessica','af_kore','af_nicole','af_nova','af_river','af_sarah','af_sky',
+  'am_adam','am_echo','am_eric','am_fenrir','am_liam','am_michael','am_onyx','am_puck',
+  // British English
+  'bf_alice','bf_emma','bf_isabella','bf_lily',
+  'bm_daniel','bm_fable','bm_george','bm_lewis',
+  // Japanese
+  'jf_alpha','jf_gongitsune','jf_nezumi','jf_tebukuro','jm_kumo',
+  // Mandarin Chinese
+  'zf_xiaobei','zf_xiaoni','zf_xiaoxiao','zf_xiaoyi','zm_yunxi','zm_yunxia','zm_yunyang',
+  // Spanish
+  'ef_dora','em_alex','em_santa',
+  // French
+  'ff_siwis',
+  // Hindi
+  'hf_alpha','hm_omega',
+  // Italian
+  'if_sara','im_nicola',
+  // Brazilian Portuguese
+  'pf_dora','pm_alex','pm_santa',
+  // Korean
+  'kf_alpha','km_hyunsu',
+];
+
+/**
+ * Infer a Kokoro voice's gender from its id. Kokoro ids follow `<lang><sex>_name`
+ * where the 2nd character is `f` (female) or `m` (male).
+ * @param {string} id
+ * @returns {'Female'|'Male'|''}
+ */
+export function kokoroGender(id) {
+  const c = typeof id === 'string' && id.length > 1 ? id[1].toLowerCase() : '';
+  if (c === 'f') return 'Female';
+  if (c === 'm') return 'Male';
+  return '';
+}
+
+/**
+ * Return the voice pool for the currently-active provider as `{ id, gender }`
+ * entries, suitable for gender-aware auto-assignment.
+ *
+ * Piper voices are discovered on disk, so the caller injects `scanInstalledVoices`
+ * and `getVoiceMeta` (both live in the voices-tab module) to avoid a circular
+ * import here.
+ *
+ * @param {string} provider - active provider id (piper|kokoro|elevenlabs|soprano|…)
+ * @param {object} helpers
+ * @param {() => string[]} helpers.scanInstalledVoices - lists installed Piper voice ids
+ * @param {(id: string) => {gender?: string}} helpers.getVoiceMeta - Piper voice metadata
+ * @returns {Array<{id: string, gender: string}>}
+ */
+export function voicesForProvider(provider, { scanInstalledVoices, getVoiceMeta } = {}) {
+  const p = (provider || 'piper').toLowerCase();
+
+  if (p === 'kokoro') {
+    return KOKORO_VOICE_IDS.map(id => ({ id, gender: kokoroGender(id) }));
+  }
+
+  if (p === 'elevenlabs') {
+    return ELEVENLABS_VOICES.map(v => ({ id: v.id, gender: v.gender || '' }));
+  }
+
+  // Single-voice providers (e.g. soprano): one synthetic entry named after the
+  // provider — every agent ends up sharing it, which is correct for these.
+  if (isSingleVoiceProvider(p)) {
+    return [{ id: p, gender: '' }];
+  }
+
+  // Piper (and any disk-discovered provider): read installed models.
+  if (typeof scanInstalledVoices === 'function') {
+    const metaOf = typeof getVoiceMeta === 'function' ? getVoiceMeta : () => ({});
+    return scanInstalledVoices().map(id => ({ id, gender: metaOf(id).gender || '' }));
+  }
+
+  return [];
+}
+
+export default { ELEVENLABS_VOICES, KOKORO_VOICE_IDS, kokoroGender, voicesForProvider };

package/src/services/tts-engine-service.js

@@ -8,6 +8,10 @@
 import { execFileSync } from 'node:child_process';
 import path from 'node:path';
 import fs from 'node:fs';
+import os from 'node:os';
+import { fileURLToPath } from 'node:url';
+
+const _hooksDir = path.join(path.dirname(fileURLToPath(import.meta.url)), '..', '..', '.claude', 'hooks');
 
 const TTS_ENGINES = [
   {
@@ -16,10 +20,29 @@ const TTS_ENGINES = [
       ? 'winget install --id Rhasspy.Piper --accept-package-agreements --accept-source-agreements'
       : process.platform === 'darwin'
         ? 'brew install piper'
-        : 'pip install piper-tts',
+        : `${path.join(_hooksDir, 'piper-installer.sh')} --non-interactive`,
+    // Structured form — robust against spaces in paths (do NOT split installCmd on ' ').
+    installSpec: process.platform === 'win32'
+      ? { cmd: 'winget', args: ['install', '--id', 'Rhasspy.Piper', '--accept-package-agreements', '--accept-source-agreements'] }
+      : process.platform === 'darwin'
+        ? { cmd: 'brew', args: ['install', 'piper'] }
+        : { cmd: path.join(_hooksDir, 'piper-installer.sh'), args: ['--non-interactive'] },
+  },
+  {
+    id: 'kokoro', name: 'Kokoro TTS', desc: 'Local neural TTS — 60+ voices, 8 languages, no API key', native: false,
+    installCmd: `${path.join(_hooksDir, 'kokoro-installer.sh')} --non-interactive`,
+    // Structured form — robust against spaces in paths (do NOT split installCmd on ' ').
+    installSpec: { cmd: path.join(_hooksDir, 'kokoro-installer.sh'), args: ['--non-interactive'] },
+    requiresApiKey: false,
   },
   {
-    id: 'soprano', name: 'Soprano TTS', desc: 'Web-based TTS service with premium voices', native: false,
+    id: 'elevenlabs', name: 'ElevenLabs', desc: 'Premium cloud voices — free tier available, 32+ languages', native: false,
+    installCmd: `echo "Set ELEVENLABS_API_KEY in your shell profile. Free key at elevenlabs.io"`,
+    requiresApiKey: true,
+    apiKeyEnvVar: 'ELEVENLABS_API_KEY',
+  },
+  {
+    id: 'soprano', name: 'Soprano TTS', desc: 'Local neural TTS via Gradio WebUI', native: false,
     installCmd: 'pip install soprano-tts',
   },
   { id: 'sapi', name: 'Windows SAPI', desc: 'Built-in Windows speech — no install needed', native: true, platform: 'win32' },
@@ -35,6 +58,32 @@ export function checkEngineInstalled(engineId) {
   if (!engine) return false;
   if (engine.native) return true; // Native engines are always available on their platform
 
+  // ElevenLabs: check API key in env or key file
+  if (engineId === 'elevenlabs') {
+    if (process.env.ELEVENLABS_API_KEY?.trim()) return true;
+    try {
+      const keyFile = path.join(os.homedir(), '.agentvibes', 'elevenlabs-key.txt');
+      return fs.existsSync(keyFile) && fs.readFileSync(keyFile, 'utf8').trim().length > 0;
+    } catch { return false; }
+  }
+
+  // Kokoro: use find_spec (no import) to avoid the slow torch load that causes ETIMEDOUT.
+  // Try each platform-appropriate python command (Windows lacks `python3`).
+  if (engineId === 'kokoro') {
+    const pythonCommands = process.platform === 'win32'
+      ? ['py', 'python', 'python3']
+      : ['python3', 'python'];
+    for (const pythonCmd of pythonCommands) {
+      try {
+        execFileSync(pythonCmd, ['-c', "import importlib.util,sys; sys.exit(0 if importlib.util.find_spec('kokoro') else 1)"], { stdio: 'ignore', timeout: 3000 }); // NOSONAR
+        return true;
+      } catch {
+        // try next python command
+      }
+    }
+    return false;
+  }
+
   // Check binary availability — soprano has two possible binaries
   const binaryMap = { piper: ['piper'], soprano: ['soprano-tts', 'soprano-webui'] };
   const binaries = binaryMap[engineId];
@@ -49,10 +98,10 @@ export function checkEngineInstalled(engineId) {
             (process.env.USERPROFILE ? path.join(process.env.USERPROFILE, 'AppData', 'Local') : null);
           if (localAppData && fs.existsSync(path.join(localAppData, 'Programs', 'Piper', 'piper.exe'))) return true;
         }
-        execFileSync('where', [binary], { stdio: 'ignore', timeout: 2000 });
+        execFileSync('where', [binary], { stdio: 'ignore', timeout: 2000 }); // NOSONAR
         return true;
       }
-      execFileSync('which', [binary], { stdio: 'ignore', timeout: 2000 });
+      execFileSync('which', [binary], { stdio: 'ignore', timeout: 2000 }); // NOSONAR
       return true;
     } catch {
       // try next binary