agentvibes 5.11.2 → 5.12.0

package/src/i18n/de.js

@@ -143,7 +143,6 @@ export default {
   voicesSwitchBtn: "[Stimme wechseln]",
   voicesFavoriteBtn: "[★ Favorit]",
   voicesDownloadBtn: "[Stimme herunterladen]",
-  voicesInstallAllBtn: "[BMAD-Stimmen installieren]",
   voicesRowHintInstalled: "[Space] Vorschau  [Enter] Auswählen  [*] Favorit",
   voicesRowHintUninstalled: "[Enter] Herunterladen und installieren",
   musicRowHint: "[Space] Abspielen  [Enter] Auswählen  [*] Favorit",

package/src/i18n/en.js

@@ -143,7 +143,6 @@ export default {
   voicesSwitchBtn: "[Switch Voice]",
   voicesFavoriteBtn: "[+ Thumbs Up]",
   voicesDownloadBtn: "[Download Voice]",
-  voicesInstallAllBtn: "[Install BMAD Voices]",
   voicesRowHintInstalled: "[Space] Preview  [Enter] Select  [+/*] Up  [-] Down",
   voicesRowHintUninstalled: "[Enter] Download & Install",
   musicRowHint: "[Space] Play  [Enter] Select  [+/*] Favorite",

package/src/i18n/es.js

@@ -143,7 +143,6 @@ export default {
   voicesSwitchBtn: "[Cambiar Voz]",
   voicesFavoriteBtn: "[★ Favorito]",
   voicesDownloadBtn: "[Descargar Voz]",
-  voicesInstallAllBtn: "[Instalar Voces BMAD]",
   voicesRowHintInstalled: "[Space] Vista previa  [Enter] Seleccionar  [*] Favorito",
   voicesRowHintUninstalled: "[Enter] Descargar e instalar",
   musicRowHint: "[Space] Reproducir  [Enter] Seleccionar  [*] Favorito",

package/src/i18n/fr.js

@@ -143,7 +143,6 @@ export default {
   voicesSwitchBtn: "[Changer la voix]",
   voicesFavoriteBtn: "[★ Favori]",
   voicesDownloadBtn: "[Télécharger la voix]",
-  voicesInstallAllBtn: "[Installer les voix BMAD]",
   voicesRowHintInstalled: "[Space] Aperçu  [Enter] Sélectionner  [*] Favori",
   voicesRowHintUninstalled: "[Enter] Télécharger et installer",
   musicRowHint: "[Space] Lire  [Enter] Sélectionner  [*] Favori",

package/src/i18n/hi.js

@@ -143,7 +143,6 @@ export default {
   voicesSwitchBtn: "[आवाज़ बदलें]",
   voicesFavoriteBtn: "[★ पसंदीदा]",
   voicesDownloadBtn: "[आवाज़ डाउनलोड]",
-  voicesInstallAllBtn: "[BMAD आवाज़ें इंस्टॉल करें]",
   voicesRowHintInstalled: "[Space] पूर्वावलोकन  [Enter] चुनें  [*] पसंदीदा",
   voicesRowHintUninstalled: "[Enter] डाउनलोड और इंस्टॉल करें",
   musicRowHint: "[Space] चलाएं  [Enter] चुनें  [*] पसंदीदा",

package/src/i18n/ja.js

@@ -143,7 +143,6 @@ export default {
   voicesSwitchBtn: "[音声切り替え]",
   voicesFavoriteBtn: "[★ お気に入り]",
   voicesDownloadBtn: "[音声ダウンロード]",
-  voicesInstallAllBtn: "[BMADボイスをインストール]",
   voicesRowHintInstalled: "[Space] プレビュー  [Enter] 選択  [*] お気に入り",
   voicesRowHintUninstalled: "[Enter] ダウンロードしてインストール",
   musicRowHint: "[Space] 再生  [Enter] 選択  [*] お気に入り",

package/src/i18n/ko.js

@@ -143,7 +143,6 @@ export default {
   voicesSwitchBtn: "[음성 전환]",
   voicesFavoriteBtn: "[★ 즐겨찾기]",
   voicesDownloadBtn: "[음성 다운로드]",
-  voicesInstallAllBtn: "[BMAD 음성 설치]",
   voicesRowHintInstalled: "[Space] 미리보기  [Enter] 선택  [*] 즐겨찾기",
   voicesRowHintUninstalled: "[Enter] 다운로드 및 설치",
   musicRowHint: "[Space] 재생  [Enter] 선택  [*] 즐겨찾기",

package/src/i18n/pt.js

@@ -143,7 +143,6 @@ export default {
   voicesSwitchBtn: "[Trocar Voz]",
   voicesFavoriteBtn: "[★ Favorito]",
   voicesDownloadBtn: "[Baixar Voz]",
-  voicesInstallAllBtn: "[Instalar Vozes BMAD]",
   voicesRowHintInstalled: "[Space] Visualizar  [Enter] Selecionar  [*] Favorito",
   voicesRowHintUninstalled: "[Enter] Baixar e instalar",
   musicRowHint: "[Space] Reproduzir  [Enter] Selecionar  [*] Favorito",

package/src/i18n/zh-CN.js

@@ -143,7 +143,6 @@ export default {
   voicesSwitchBtn: "[切换语音]",
   voicesFavoriteBtn: "[★ 收藏]",
   voicesDownloadBtn: "[下载语音]",
-  voicesInstallAllBtn: "[安装BMAD语音]",
   voicesRowHintInstalled: "[Space] 预览  [Enter] 选择  [*] 收藏",
   voicesRowHintUninstalled: "[Enter] 下载并安装",
   musicRowHint: "[Space] 播放  [Enter] 选择  [*] 收藏",

package/src/installer.js

@@ -4176,6 +4176,52 @@ async function copyCodexFiles(targetDir, spinner) {
  * @param {string} targetDir - Target installation directory
  * @param {Object} spinner - Ora spinner instance
  */
+/**
+ * Safely read a JSON settings file that is about to be modified in place.
+ *
+ * Non-Destructive Configuration Rule: a corrupt settings.json (e.g. one stray
+ * trailing comma) must NEVER be silently overwritten — doing so wipes all of the
+ * user's real settings. This helper distinguishes three cases so callers can
+ * skip-and-warn on corruption instead of clobbering:
+ *   - missing / empty  -> { exists:false, corrupt:false } (safe to create fresh)
+ *   - present + valid   -> { exists:true,  corrupt:false, data }
+ *   - present + invalid -> { exists:true,  corrupt:true }  (caller must NOT write)
+ * @param {string} filePath
+ * @returns {Promise<{exists:boolean, corrupt:boolean, data:object}>}
+ */
+async function readJsonConfigSafe(filePath) {
+  let raw;
+  try {
+    raw = await fs.readFile(filePath, 'utf8');
+  } catch (err) {
+    if (err && err.code === 'ENOENT') return { exists: false, corrupt: false, data: {} };
+    // Unreadable for another reason (permissions, etc.) — treat as present+corrupt
+    // so we never overwrite a file we could not fully read.
+    return { exists: true, corrupt: true, data: {} };
+  }
+  if (raw.trim() === '') return { exists: false, corrupt: false, data: {} };
+  try {
+    const parsed = JSON.parse(raw);
+    if (!parsed || typeof parsed !== 'object' || Array.isArray(parsed)) {
+      return { exists: true, corrupt: true, data: {} };
+    }
+    return { exists: true, corrupt: false, data: parsed };
+  } catch {
+    return { exists: true, corrupt: true, data: {} };
+  }
+}
+
+/**
+ * Best-effort backup of a config file before mutating it. Writes `<file>.bak`.
+ * A backup failure is non-fatal (callers only mutate files that parsed cleanly).
+ * @param {string} filePath
+ */
+async function backupConfigFile(filePath) {
+  try {
+    await fs.copyFile(filePath, filePath + '.bak');
+  } catch { /* best-effort backup — never block the install on this */ }
+}
+
 async function configureSessionStartHook(targetDir, spinner) {
   spinner = createRobustSpinner(spinner);
   spinner.start('Configuring AgentVibes hook for automatic TTS...');
@@ -4184,13 +4230,15 @@ async function configureSessionStartHook(targetDir, spinner) {
   const templateSettingsPath = path.join(__dirname, '..', '.claude', 'settings.json');
 
   try {
-    let existingSettings = {};
-    try {
-      const existingContent = await fs.readFile(settingsPath, 'utf8');
-      existingSettings = JSON.parse(existingContent);
-    } catch {
-      // File doesn't exist or is invalid - use template
+    const existing = await readJsonConfigSafe(settingsPath);
+    if (existing.corrupt) {
+      spinner.warn(chalk.yellow(
+        `settings.json at ${settingsPath} is not valid JSON — leaving it untouched to avoid data loss.\n` +
+        `   Fix the file manually and re-run to enable the AgentVibes hook.\n`
+      ));
+      return;
     }
+    const existingSettings = existing.data;
 
     const templateContent = await fs.readFile(templateSettingsPath, 'utf8');
     const templateSettings = JSON.parse(templateContent);
@@ -4216,6 +4264,7 @@ async function configureSessionStartHook(targetDir, spinner) {
         existingSettings.$schema = templateSettings.$schema;
       }
 
+      if (existing.exists) await backupConfigFile(settingsPath);
       await fs.writeFile(settingsPath, JSON.stringify(existingSettings, null, 2));
       spinner.succeed(chalk.green('SessionStart hook configured!\n'));
     } else {
@@ -4260,14 +4309,17 @@ async function configurePartyModeHook(targetDir, spinner, homeDirOverride) {
       ? `powershell -NoProfile -ExecutionPolicy Bypass -File "$HOME\\.claude\\hooks-windows\\bmad-party-speak.ps1"`
       : `bash "$HOME/.claude/hooks/bmad-party-speak.sh"`;
 
-    // Read/create global settings.json
-    let settings = {};
-    try {
-      const content = await fs.readFile(globalSettingsPath, 'utf8');
-      settings = JSON.parse(content);
-    } catch {
-      // File missing or invalid — start fresh
+    // Read/create global settings.json — never overwrite a corrupt file (would
+    // wipe the user's real global settings).
+    const existingGlobal = await readJsonConfigSafe(globalSettingsPath);
+    if (existingGlobal.corrupt) {
+      spinner.warn(chalk.yellow(
+        `Global settings.json at ${globalSettingsPath} is not valid JSON — leaving it untouched.\n` +
+        `   Fix it manually and re-run to enable party mode TTS.\n`
+      ));
+      return;
     }
+    let settings = existingGlobal.data;
 
     if (!settings.hooks) settings.hooks = {};
 
@@ -4286,6 +4338,7 @@ async function configurePartyModeHook(targetDir, spinner, homeDirOverride) {
       settings.hooks.PostToolUse.push({
         hooks: [{ type: 'command', command: hookCommand }]
       });
+      if (existingGlobal.exists) await backupConfigFile(globalSettingsPath);
       await fs.writeFile(globalSettingsPath, JSON.stringify(settings, null, 2));
       spinner.succeed(chalk.green('BMAD party mode TTS hook configured!\n'));
     } else {
@@ -4671,7 +4724,7 @@ async function checkAndInstallPiperWindows(targetDir, options) {
       }
       console.log(chalk.green('\n✅ LibriTTS voices ready! Browse with /agent-vibes:list\n'));
     } else {
-      console.log(chalk.gray('   Skipped. Download later via: npx agentvibes  → Voices tab → Install BMAD Voices\n'));
+      console.log(chalk.gray('   Skipped. Download later via: npx agentvibes voices download\n'));
     }
   }
 }
@@ -5356,6 +5409,124 @@ async function updateGlobalHooks(srcHooksDir, homeDirOverride) {
   return updated;
 }
 
+/**
+ * Story AVI-S8.5 (Stage 2 packaging) — ship the utterance resolver bundle
+ * (bin/resolve-utterance.js + src/services/{utterance-resolver,utterance-loader}.js)
+ * into a target `.claude` tree so the play-tts hooks can find it.
+ *
+ * Layout (F-5): a SELF-CONTAINED bundle dir `<claudeDir>/agentvibes-resolver/`:
+ *     agentvibes-resolver/
+ *       package.json                     -> {"type":"module"}
+ *       bin/resolve-utterance.js
+ *       src/services/utterance-resolver.js
+ *       src/services/utterance-loader.js
+ * The bundle's OWN package.json declares ESM, so `node resolve-utterance.js`
+ * works on EVERY Node version (the CLI uses `import`; without this, Node < 22.7
+ * treats the copied .js as CommonJS and the import throws → players silently fall
+ * back to legacy forever). It lives in a dedicated dir, NOT in `<claudeDir>/hooks/`,
+ * so it can't change the module type of any user-owned `.js` hook. The players
+ * probe `$SCRIPT_DIR/../agentvibes-resolver/bin/resolve-utterance.js`; its
+ * `../src/services/...` imports resolve inside the bundle dir.
+ *
+ * This is AgentVibes-owned code — same class as the hook scripts themselves —
+ * so copy/overwrite on update is correct. manifestSafeCopy still refuses to
+ * clobber a user-modified copy (saves a .user.bak) and running this twice is
+ * a no-op on the second pass (Non-Destructive Configuration Rule).
+ *
+ * @param {string} claudeDir - Absolute path to the target `.claude` directory
+ * @param {Object} manifest - Loaded manifest (hash lookups for safe-copy decisions)
+ * @param {Object} manifestUpdates - Mutated in place with new hash entries
+ * @returns {Promise<number>} Count of files actually copied/updated this run
+ */
+async function copyResolverBundleTo(claudeDir, manifest, manifestUpdates) {
+  const pkgRoot = path.join(__dirname, '..');
+  const bundleDir = path.join(claudeDir, 'agentvibes-resolver');
+  const srcBin = path.join(pkgRoot, 'bin', 'resolve-utterance.js');
+  const srcResolver = path.join(pkgRoot, 'src', 'services', 'utterance-resolver.js');
+  const srcLoader = path.join(pkgRoot, 'src', 'services', 'utterance-loader.js');
+
+  const targets = [
+    { src: srcBin, dest: path.join(bundleDir, 'bin', 'resolve-utterance.js') },
+    { src: srcResolver, dest: path.join(bundleDir, 'src', 'services', 'utterance-resolver.js') },
+    { src: srcLoader, dest: path.join(bundleDir, 'src', 'services', 'utterance-loader.js') },
+  ];
+
+  let count = 0;
+  for (const { src, dest } of targets) {
+    await fs.mkdir(path.dirname(dest), { recursive: true });
+    try {
+      const result = await manifestSafeCopy(src, dest, manifest);
+      if (result.action !== 'skipped') {
+        if (result.hash) manifestUpdates[dest] = { hash: result.hash, installedAt: new Date().toISOString() };
+        if (result.action !== 'unchanged') count++;
+      }
+    } catch {
+      // src missing (e.g. stripped package) — skip silently, players fall back to legacy
+    }
+  }
+
+  // The ESM marker — a fixed one-liner (not copied from a src file). Write it
+  // only if absent or different, so a second run is a no-op.
+  try {
+    const pkgJsonPath = path.join(bundleDir, 'package.json');
+    const desired = JSON.stringify({ type: 'module', private: true, name: 'agentvibes-resolver-bundle' }, null, 2) + '\n';
+    let existing = null;
+    try { existing = await fs.readFile(pkgJsonPath, 'utf8'); } catch { /* absent */ }
+    if (existing !== desired) {
+      await fs.mkdir(bundleDir, { recursive: true });
+      await fs.writeFile(pkgJsonPath, desired);
+      count++;
+    }
+  } catch {
+    // best-effort — if this fails the players fall back to legacy, never break
+  }
+  return count;
+}
+
+/**
+ * Install/update the resolver bundle into a project-local (or explicitly
+ * targeted) `.claude` directory. Mirrors copyHookFiles' manifest handling.
+ * @param {string} targetDir - Target installation directory (parent of .claude/)
+ * @param {Object} spinner - Ora spinner instance
+ * @returns {Promise<{count: number}>} Count of files copied/updated
+ */
+async function copyResolverBundle(targetDir, spinner) {
+  spinner = createRobustSpinner(spinner);
+  spinner.start('Installing utterance resolver bundle...');
+  const claudeDir = path.join(targetDir, '.claude');
+  const manifestPath = getProjectManifestPath(targetDir);
+  const manifest = await loadManifest(manifestPath);
+  const manifestUpdates = {};
+
+  const count = await copyResolverBundleTo(claudeDir, manifest, manifestUpdates);
+
+  if (Object.keys(manifestUpdates).length > 0) {
+    await saveManifest(manifestPath, { ...manifest, ...manifestUpdates }).catch(() => { /* best effort */ });
+  }
+  spinner.succeed(chalk.green('Installed utterance resolver bundle!\n'));
+  return { count };
+}
+
+/**
+ * Keep the resolver bundle up to date in the global ~/.claude/ tree on every
+ * `npx agentvibes update`, regardless of targetDir — mirrors updateGlobalHooks()
+ * since most real installs point their hooks at $HOME, not a project dir.
+ * @param {string} [homeDirOverride] - Override home dir (for testing only)
+ * @returns {Promise<number>} Count of files copied/updated
+ */
+async function updateGlobalResolverBundle(homeDirOverride) {
+  const homeDir = homeDirOverride || os.homedir();
+  const claudeDir = path.join(homeDir, '.claude');
+  const manifestPath = getGlobalManifestPath(homeDir);
+  const manifest = await loadManifest(manifestPath);
+  const manifestUpdates = { ...manifest };
+
+  const count = await copyResolverBundleTo(claudeDir, manifest, manifestUpdates);
+
+  await saveManifest(manifestPath, manifestUpdates).catch(() => { /* best effort */ });
+  return count;
+}
+
 /**
  * Restart the AgentVibes TTS queue watcher on Windows after an update.
  * Only runs if the watcher is already installed (~/.agentvibes/tts-watcher.ps1 exists),
@@ -5378,7 +5549,9 @@ async function restartWatcherIfInstalled(homeDirOverride) {
     return false;
   }
 
-  const { spawnSync, spawn } = require('child_process');
+  // spawn/spawnSync come from the top-level ESM import (line 48). A require()
+  // here throws "require is not defined" in this "type":"module" package and
+  // aborted `agentvibes update` mid-run for every SSH-receiver user.
 
   // Kill old watcher — use array args to avoid quoting issues
   spawnSync('powershell.exe', [ // NOSONAR
@@ -5427,6 +5600,12 @@ async function performUpdateOperations(targetDir, spinner) {
   const hookResult = await copyHookFiles(targetDir, silentSpinner);
   console.log(chalk.green(`✓ Updated ${hookResult.count} TTS scripts`));
 
+  // Update the utterance resolver bundle alongside the hooks it feeds (AVI-S8.5 Stage 2)
+  const resolverResult = await copyResolverBundle(targetDir, silentSpinner);
+  if (resolverResult.count > 0) {
+    console.log(chalk.green(`✓ Updated ${resolverResult.count} resolver bundle files`));
+  }
+
   // Also update critical hooks in global ~/.claude/hooks/ if present (fixes stale installs)
   const hooksSubdir = isNativeWindows() ? 'hooks-windows' : 'hooks';
   const srcHooksDir = path.join(__dirname, '..', '.claude', hooksSubdir);
@@ -5435,6 +5614,12 @@ async function performUpdateOperations(targetDir, spinner) {
     console.log(chalk.green(`✓ Updated ${globalHooksUpdated} critical scripts in ~/.claude/hooks/`));
   }
 
+  // Keep the global ~/.claude/ resolver bundle current too (mirrors updateGlobalHooks)
+  const globalResolverUpdated = await updateGlobalResolverBundle();
+  if (globalResolverUpdated > 0) {
+    console.log(chalk.green(`✓ Updated ${globalResolverUpdated} resolver bundle files in ~/.claude/`));
+  }
+
   // On Windows: restart the TTS queue watcher if it was previously installed via
   // setup-ssh-receiver.ps1.  This propagates hook updates without requiring the
   // user to manually run update-watcher.ps1 after every `npx agentvibes update`.
@@ -5648,6 +5833,7 @@ async function install(options = {}) {
     // Copy all files silently
     await copyCommandFiles(targetDir, silentSpinner);
     await copyHookFiles(targetDir, silentSpinner);
+    await copyResolverBundle(targetDir, silentSpinner);
     await copyPersonalityFiles(targetDir, silentSpinner);
     await copyPluginFiles(targetDir, silentSpinner);
     await copyBmadConfigFiles(targetDir, silentSpinner);
@@ -5660,6 +5846,8 @@ async function install(options = {}) {
     const hooksSubdirInstall = isNativeWindows() ? 'hooks-windows' : 'hooks';
     const srcHooksDirInstall = path.join(__dirname, '..', '.claude', hooksSubdirInstall);
     await updateGlobalHooks(srcHooksDirInstall);
+    // Populate global ~/.claude/ resolver bundle too, same reasoning as above (AVI-S8.5 Stage 2)
+    await updateGlobalResolverBundle();
 
     await configureSessionStartHook(targetDir, silentSpinner);
     await configurePartyModeHook(targetDir, silentSpinner);
@@ -6805,11 +6993,13 @@ export {
   copyConfigFiles, copyCodexFiles, configureSessionStartHook, configurePartyModeHook, ensureGitRepo,
   installPluginManifest, checkAndInstallPiper,
   updateGlobalHooks, updateCommandFiles, updatePersonalityFiles,
+  copyResolverBundle, updateGlobalResolverBundle,
   CRITICAL_HOOKS, CRITICAL_HOOKS_WINDOWS,
   // Manifest utilities (used by tests and external tooling)
   getProjectManifestPath, getGlobalManifestPath,
   loadManifest, saveManifest, computeFileHash, manifestSafeCopy, removeManifestFiles,
   // Pure helper functions exported for testing
+  readJsonConfigSafe, backupConfigFile,
   isPiperProvider, supportsEmoji, getPersonalityIcon,
   detectEnvironment, createPageHeaderFooter, buildNavigationChoices, handleNavigationAction, getPageTitle,
   getUserShell, showWelcome, getReleaseInfoBoxen, generateActivationInstructions,