cc-viewer 1.6.270 → 1.6.271

package/dist/index.html

@@ -19,7 +19,7 @@
       if (pick) document.documentElement.setAttribute('data-theme', pick);
     } catch {}
   </script>
-  <script type="module" crossorigin src="/assets/index-CCAOHnbk.js"></script>
+  <script type="module" crossorigin src="/assets/index-CLfbZzwF.js"></script>
   <link rel="modulepreload" crossorigin href="/assets/vendor-antd-BG1SvzuN.js">
   <link rel="modulepreload" crossorigin href="/assets/vendor-codemirror-8NDhydlF.js">
   <link rel="modulepreload" crossorigin href="/assets/vendor-mdxeditor-BB4hhpxM.js">

package/dist/voice-packs/default/pack.json

@@ -1,24 +1,24 @@
 {
-  "name": "default-pixel-buddy",
-  "displayName": "Pixel Buddy · 像素小宠物 (默认)",
+  "name": "default-butler",
+  "displayName": "Butler · 皇上系列 (默认)",
   "placeholder": false,
   "events": {
     "planApproval": {
-      "file": "planApproval.wav",
-      "size": 16362
+      "file": "The_plan_awaits_your_approval_sir.MP3",
+      "size": 52712
     },
     "askQuestion": {
-      "file": "askQuestion.wav",
-      "size": 9748
+      "file": "A_choice_for_your_consideration_sir.MP3",
+      "size": 60236
     },
     "turnEnd": {
-      "file": "turnEnd.wav",
-      "size": 24744
+      "file": "It_is_done_sir.MP3",
+      "size": 45816
     }
   },
-  "cues": {
-    "planApproval": "Bi-poop?  (短低 + 上扬\"问\"句)",
-    "askQuestion": "Pip pip!  (两短促跳跳)",
-    "turnEnd": "Wee-doo~ ♪  (下行小调，满足)"
+  "voiceLines": {
+    "planApproval": "The plan awaits your approval, sir.",
+    "askQuestion": "A choice for your consideration, sir.",
+    "turnEnd": "It is done, sir."
   }
-}
+}

package/dist/voice-packs/sanguo/pack.json

@@ -0,0 +1,24 @@
+{
+  "name": "sanguo",
+  "displayName": "三国 (Sanguo)",
+  "placeholder": false,
+  "events": {
+    "planApproval": {
+      "file": "plan.MP3",
+      "size": 67759
+    },
+    "askQuestion": {
+      "file": "ask.MP3",
+      "size": 75282
+    },
+    "turnEnd": {
+      "file": "end.MP3",
+      "size": 70894
+    }
+  },
+  "voiceLines": {
+    "planApproval": "请陛下御览。",
+    "askQuestion": "请陛下圣裁。",
+    "turnEnd": "臣已办妥。"
+  }
+}

package/lib/voice-pack-events.js

@@ -21,7 +21,8 @@ export const EVENT_KEYS = [
 ];
 
 // Per-event default binding when no user override is set:
-//   - 'default' → play the bundled default-pack audio
+//   - 'default' → play the bundled default-pack (butler) audio
+//   - 'sanguo'  → play the bundled sanguo (三国) audio — initial seed for zh/zh-TW
 //   - null      → event is OFF by default (user must opt in)
 // turnEnd defaults to null because firing on every Claude reply is noisy
 //( — frequency overload mitigation).
@@ -30,3 +31,48 @@ export const DEFAULT_BINDINGS = Object.freeze({
   askQuestion: 'default',
   turnEnd: null,
 });
+
+// Bundled packs that ship inside the npm tarball under public/voice-packs/<id>/.
+// Used as a value whitelist in reconcile (manager.js) and a dispatch table in the
+// audio route (server.js) + URL builder (voicePackPlayer.js). Adding a third
+// pack means appending its id here and dropping a public/voice-packs/<id>/
+// directory + pack.json — no other code path needs editing.
+export const BUNDLED_PACK_IDS = Object.freeze(['default', 'sanguo']);
+
+// Locale → preferred bundled pack for initial seed of new users. Declarative
+// map (not control flow) so adding a third pack that wants to capture some
+// locale is a one-line table edit — never a new `if` branch.
+// Match strategy: exact-match locale → pack; missing locale → fall through to
+// DEFAULT_BINDINGS (butler).
+// Locale strings are normalised lowercase before lookup (i18n.js LANG_MAP
+// already folds variants like zh-Hans → zh, zh-HK → zh-TW; this map only
+// needs the canonical forms produced by getLang()).
+const LOCALE_DEFAULT_SEEDS = Object.freeze({
+  zh: 'sanguo',
+  'zh-tw': 'sanguo',
+});
+
+// Per-event default bindings for a given locale pack. Event keys that should
+// stay off-by-default (turnEnd is noisy on every reply) keep null regardless
+// of which pack the locale prefers.
+function bindingsForPack(packId) {
+  return Object.freeze({
+    planApproval: packId,
+    askQuestion: packId,
+    turnEnd: null,
+  });
+}
+
+// Initial-seed bindings for a fresh user, parameterised by detected locale.
+// Locale is read **once** at first-launch in AppBase — runtime lang changes
+// do NOT re-seed (that would silently mutate the user's persisted choice
+// — "no silent migration" P0 rule).
+// Pure function — safe to unit-test without mounting React.
+export function getDefaultBindingsForLocale(locale) {
+  const normalized = typeof locale === 'string' ? locale.toLowerCase() : '';
+  const packId = LOCALE_DEFAULT_SEEDS[normalized];
+  if (packId && BUNDLED_PACK_IDS.includes(packId)) {
+    return bindingsForPack(packId);
+  }
+  return DEFAULT_BINDINGS;
+}

package/lib/voice-pack-manager.js

@@ -13,26 +13,30 @@ import { join, extname } from 'node:path';
 import { randomUUID } from 'node:crypto';
 import { fileURLToPath } from 'node:url';
 import { dirname } from 'node:path';
-import { EVENT_KEYS, DEFAULT_BINDINGS } from './voice-pack-events.js';
+import { EVENT_KEYS, DEFAULT_BINDINGS, BUNDLED_PACK_IDS } from './voice-pack-events.js';
 
 const __filename = fileURLToPath(import.meta.url);
 const __dirname = dirname(__filename);
 
-// Default pack lookup order:
-//   1. <repo>/dist/voice-packs/default/   — production (Vite copies public/* into dist/, npm ships dist/ only)
-//   2. <repo>/public/voice-packs/default/ — dev (source tree, before `npm run build`)
-// Content-neutral folder name — the bundled audio's theme can change (Pixel Buddy
-// today, "皇上" recordings tomorrow, user override later) without renaming dirs.
-const DEFAULT_PACK_DIRS = [
-  join(__dirname, '..', 'dist', 'voice-packs', 'default'),
-  join(__dirname, '..', 'public', 'voice-packs', 'default'),
-];
-
-// Surface a packaging-regression warning at module load if neither default-pack
-// dir exists — keeps a future relocation of this file or a broken
+// Bundled pack lookup order, per packId:
+//   1. <repo>/dist/voice-packs/<packId>/   — production (Vite copies public/* into dist/, npm ships dist/ only)
+//   2. <repo>/public/voice-packs/<packId>/ — dev (source tree, before `npm run build`)
+// Adding a new pack: append id to BUNDLED_PACK_IDS in voice-pack-events.js +
+// drop public/voice-packs/<id>/ with pack.json. No code path here needs editing.
+function bundledPackDirs(packId) {
+  return [
+    join(__dirname, '..', 'dist', 'voice-packs', packId),
+    join(__dirname, '..', 'public', 'voice-packs', packId),
+  ];
+}
+
+// Surface a packaging-regression warning at module load when any declared bundled
+// pack is missing — keeps a future relocation of this file or a broken
 // `npm pack` from silently shipping a feature without its bundled audio.
-if (!DEFAULT_PACK_DIRS.some(d => existsSync(d))) {
-  console.warn('[voice-pack] no default-pack directory found at', DEFAULT_PACK_DIRS.join(' | '), '— bundled audio will 404, frontend falls back to chime');
+for (const packId of BUNDLED_PACK_IDS) {
+  if (!bundledPackDirs(packId).some(d => existsSync(d))) {
+    console.warn(`[voice-pack] no bundled-pack directory found for "${packId}" — bundled audio will 404, frontend falls back to chime`);
+  }
 }
 
 export { EVENT_KEYS } from './voice-pack-events.js';
@@ -172,17 +176,63 @@ export function deleteUserAudio(logDir, id) {
   return removed;
 }
 
-// Default-pack lookup — eventKey → bundled file under DEFAULT_PACK_DIRS.
-// Returns null when the file is absent (e.g. placeholder generation never ran),
-// letting the API surface a clear 404 and the front-end fall back to its Web Audio chime.
-export function getDefaultPackPath(eventKey) {
+// Read pack.json from the given dir; returns parsed object or null. Per-dir so
+// a dist/ pack and a public/ pack can describe different files (dev iteration).
+// Parse failures emit a single console.warn so a broken manifest doesn't make
+// the entire bundled pack silently disappear from the Settings UI (the pack
+// would fall back to literal `<eventKey>.<ext>` lookup, which fails for
+// descriptive filenames like ask.MP3 → empty pack → not listed).
+function readPackManifest(dir) {
+  const p = join(dir, 'pack.json');
+  if (!existsSync(p)) return null;
+  try { return JSON.parse(readFileSync(p, 'utf-8')); }
+  catch (err) {
+    try { console.warn(`[voice-pack] failed to parse pack.json at ${p}:`, err?.message || err); } catch { /* ignore */ }
+    return null;
+  }
+}
+
+// Validate a pack.json events[eventKey].file value and resolve it inside `dir`.
+// Returns { path, format } when safe + existing, null otherwise. The file field
+// is descriptive (e.g. "The_plan_awaits_your_approval_sir.MP3") so we have to
+// allow non-eventKey filenames while still rejecting traversal / symlink games.
+// Exported as _resolveBundledPackManifestFile for unit-testing the rejection
+// rules without standing up the bundled pack dir.
+export function _resolveBundledPackManifestFile(dir, file) {
+  if (typeof file !== 'string' || file.length === 0 || file.length > 200) return null;
+  if (file.includes('/') || file.includes('\\') || file.includes('\0')) return null;
+  if (file === '.' || file === '..' || file.startsWith('.')) return null;
+  const ext = extname(file).toLowerCase();
+  if (!ALLOWED_EXTS.has(ext)) return null;
+  const p = join(dir, file);
+  if (!existsSync(p)) return null;
+  try { if (lstatSync(p).isSymbolicLink()) return null; } catch { return null; }
+  return { path: p, format: ext.slice(1) };
+}
+
+// Bundled-pack lookup — (packId, eventKey) → file inside bundledPackDirs(packId).
+// Resolution order per dir:
+//   1. pack.json events[eventKey].file (descriptive filename, e.g. butler voice line)
+//   2. literal `<eventKey>.<ext>` (legacy / placeholder-generator convention)
+// Returns null when neither exists, letting the API 404 and the front-end fall
+// back to its Web Audio chime.
+// packId is whitelisted against BUNDLED_PACK_IDS to neutralise a malformed
+// route segment (e.g. '../etc') reaching the FS layer.
+export function getBundledPackPath(packId, eventKey) {
+  if (!BUNDLED_PACK_IDS.includes(packId)) return null;
   if (!EVENT_KEYS.includes(eventKey)) return null;
-  for (const dir of DEFAULT_PACK_DIRS) {
+  for (const dir of bundledPackDirs(packId)) {
+    const manifest = readPackManifest(dir);
+    const manifestFile = manifest?.events?.[eventKey]?.file;
+    if (manifestFile) {
+      const hit = _resolveBundledPackManifestFile(dir, manifestFile);
+      if (hit) return hit;
+    }
     for (const ext of ALLOWED_EXTS) {
       const p = join(dir, `${eventKey}${ext}`);
       if (!existsSync(p)) continue;
       // Symlink hardening — same threat model as getUserAudioPath above. The
-      // default-pack directories live inside the package install, so a tampered
+      // bundled-pack directories live inside the package install, so a tampered
       // install could ship symlinks; skip rather than dereference.
       try { if (lstatSync(p).isSymbolicLink()) continue; } catch { continue; }
       return { path: p, format: ext.slice(1) };
@@ -191,12 +241,21 @@ export function getDefaultPackPath(eventKey) {
   return null;
 }
 
-export function listDefaultPack() {
-  const haveAnyDir = DEFAULT_PACK_DIRS.some(d => existsSync(d));
-  if (!haveAnyDir) return [];
+// Back-compat thin wrapper. External callers that imported the original name
+// keep working; new code should use getBundledPackPath directly.
+export function getDefaultPackPath(eventKey) {
+  return getBundledPackPath('default', eventKey);
+}
+
+// Per-pack event listing — used by /api/voice-pack/list to surface every
+// bundled pack to the Settings UI.
+export function listBundledPack(packId) {
+  if (!BUNDLED_PACK_IDS.includes(packId)) return [];
+  const dirs = bundledPackDirs(packId);
+  if (!dirs.some(d => existsSync(d))) return [];
   const out = [];
   for (const eventKey of EVENT_KEYS) {
-    const hit = getDefaultPackPath(eventKey);
+    const hit = getBundledPackPath(packId, eventKey);
     if (hit) {
       let size = 0;
       try { size = statSync(hit.path).size; } catch { /* ignore */ }
@@ -206,32 +265,70 @@ export function listDefaultPack() {
   return out;
 }
 
-// Surfaces the pack.json `placeholder` flag so the Settings UI can label the
-// "Default" option as a placeholder (— discoverability of the
+// Read pack.json manifest metadata for the Settings UI — displayName,
+// placeholder flag, voiceLines. Returns null when no manifest exists.
+function readBundledPackMeta(packId) {
+  for (const dir of bundledPackDirs(packId)) {
+    const meta = readPackManifest(dir);
+    if (meta) return meta;
+  }
+  return null;
+}
+
+// Returns every bundled pack with enough metadata for Settings UI to render
+// a dropdown row: id, displayName (falls back to id), placeholder flag, and
+// the per-event file listing. Empty packs (no files on disk) are skipped so
+// a partial install doesn't show an unusable option.
+export function listBundledPacks() {
+  const out = [];
+  for (const packId of BUNDLED_PACK_IDS) {
+    const events = listBundledPack(packId);
+    if (events.length === 0) continue;
+    const meta = readBundledPackMeta(packId);
+    out.push({
+      id: packId,
+      displayName: meta?.displayName || packId,
+      placeholder: !!meta?.placeholder,
+      events,
+    });
+  }
+  return out;
+}
+
+// Legacy listing — kept so callers that haven't migrated to listBundledPacks()
+// continue to get the default pack's events.
+export function listDefaultPack() {
+  return listBundledPack('default');
+}
+
+// Surfaces the pack.json `placeholder` flag so the Settings UI can label
+// a bundled pack as a placeholder (— discoverability of the
 // placeholder→real-recording replacement path). Returns false when no manifest
 // is present (treats absence as "not flagged" rather than guessing).
+export function isBundledPackPlaceholder(packId) {
+  if (!BUNDLED_PACK_IDS.includes(packId)) return false;
+  const meta = readBundledPackMeta(packId);
+  return !!meta?.placeholder;
+}
+
+// Back-compat thin wrapper.
 export function isDefaultPackPlaceholder() {
-  for (const dir of DEFAULT_PACK_DIRS) {
-    const p = join(dir, 'pack.json');
-    if (!existsSync(p)) continue;
-    try {
-      const meta = JSON.parse(readFileSync(p, 'utf-8'));
-      return !!meta?.placeholder;
-    } catch { /* keep looking */ }
-  }
-  return false;
+  return isBundledPackPlaceholder('default');
 }
 
 // Reconcile a voice-pack settings blob against on-disk state. Any event whose
 // bound id no longer exists is silently reset to null — surfaces in the next
 // GET /api/preferences without the client doing anything. Returns the reconciled
 // object (caller decides whether to persist it).
+// Literal strings in BUNDLED_PACK_IDS (currently 'default' and 'sanguo') are
+// passed through verbatim — they're checked against the bundled-pack route
+// at playback time, not against logDir/voice-packs/.
 export function reconcileVoicePackPrefs(logDir, vp) {
   if (!vp || typeof vp !== 'object') return vp;
   const events = vp.events && typeof vp.events === 'object' ? { ...vp.events } : {};
   for (const key of EVENT_KEYS) {
     const val = events[key];
-    if (val == null || val === 'default') continue;
+    if (val == null || BUNDLED_PACK_IDS.includes(val)) continue;
     if (typeof val !== 'string' || !isValidId(val)) { events[key] = null; continue; }
     if (!getUserAudioPath(logDir, val)) events[key] = null;
   }
@@ -239,7 +336,7 @@ export function reconcileVoicePackPrefs(logDir, vp) {
 }
 
 // Re-export shared defaults so consumers can pull everything from one module.
-export { DEFAULT_BINDINGS };
+export { DEFAULT_BINDINGS, BUNDLED_PACK_IDS };
 
 // mergeApprovalModalPrefs / mergeVoicePackInto moved to lib/approval-modal-prefs.js
 //( — merge logic isn't voice-pack-specific). Import from

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "cc-viewer",
-  "version": "1.6.270",
+  "version": "1.6.271",
   "description": "Claude Code Logger visualization management tool",
   "license": "MIT",
   "main": "server.js",

package/pty-manager.js

@@ -248,7 +248,7 @@ export async function spawnClaude(proxyPort, cwd, extraArgs = [], claudePath = n
     if (hasContinue && exitCode !== 0 && outputBuffer.includes('No conversation found')) {
       console.error('[CC Viewer] -c failed (no conversation), retrying without -c');
       const retryArgs = extraArgs.filter(a => a !== '-c' && a !== '--continue');
-      spawnClaude(proxyPort, cwd, retryArgs, claudePath, isNpmVersion, serverPort, serverProtocol);
+      spawnClaude(proxyPort, cwd, retryArgs, claudePath, isNpmVersion, serverPort, serverProtocol, internalToken);
       return;
     }
 
@@ -264,7 +264,7 @@ export async function spawnClaude(proxyPort, cwd, extraArgs = [], claudePath = n
     if (flagRejected) {
       console.error('[CC Viewer] claude rejected --thinking-display, marking as unsupported and retrying without flag');
       _thinkingDisplayRejectedPaths.add(claudePath);
-      spawnClaude(proxyPort, cwd, extraArgs, claudePath, isNpmVersion, serverPort, serverProtocol);
+      spawnClaude(proxyPort, cwd, extraArgs, claudePath, isNpmVersion, serverPort, serverProtocol, internalToken);
       return;
     }