agentvibes 5.6.9 → 5.7.1

package/src/services/language-service.js

@@ -1,47 +1,47 @@
-/**
- * LanguageService — single source of truth for the selected UI language.
- *
- * Persists the selection to ~/.claude/config/language.txt so it survives
- * process restarts.  Notifies registered listeners on every change so the
- * TUI can re-render dynamic labels immediately.
- */
-
-import fs from 'node:fs';
-import path from 'node:path';
-import os from 'node:os';
-import { t, SUPPORTED_LANGUAGES } from '../i18n/strings.js';
-
-const LANG_FILE = path.join(os.homedir(), '.claude', 'config', 'language.txt');
-const VALID_LANGS = new Set(SUPPORTED_LANGUAGES.map(l => l.value));
-
-export class LanguageService {
-  constructor() {
-    this._lang = this._load();
-    this._listeners = [];
-  }
-
-  _load() {
-    try {
-      const val = fs.readFileSync(LANG_FILE, 'utf8').trim();
-      return VALID_LANGS.has(val) ? val : 'en';
-    } catch {
-      return 'en';
-    }
-  }
-
-  getLang() { return this._lang; }
-
-  setLang(lang) {
-    if (!VALID_LANGS.has(lang)) return;
-    this._lang = lang;
-    try {
-      fs.mkdirSync(path.dirname(LANG_FILE), { recursive: true });
-      fs.writeFileSync(LANG_FILE, lang, { mode: 0o600 });
-    } catch { /* non-fatal */ }
-    this._listeners.forEach(fn => fn(lang));
-  }
-
-  onChange(fn) { this._listeners.push(fn); }
-
-  t(key) { return t(this._lang, key); }
-}
+/**
+ * LanguageService — single source of truth for the selected UI language.
+ *
+ * Persists the selection to ~/.claude/config/language.txt so it survives
+ * process restarts.  Notifies registered listeners on every change so the
+ * TUI can re-render dynamic labels immediately.
+ */
+
+import fs from 'node:fs';
+import path from 'node:path';
+import os from 'node:os';
+import { t, SUPPORTED_LANGUAGES } from '../i18n/strings.js';
+
+const LANG_FILE = path.join(os.homedir(), '.claude', 'config', 'language.txt');
+const VALID_LANGS = new Set(SUPPORTED_LANGUAGES.map(l => l.value));
+
+export class LanguageService {
+  constructor() {
+    this._lang = this._load();
+    this._listeners = [];
+  }
+
+  _load() {
+    try {
+      const val = fs.readFileSync(LANG_FILE, 'utf8').trim();
+      return VALID_LANGS.has(val) ? val : 'en';
+    } catch {
+      return 'en';
+    }
+  }
+
+  getLang() { return this._lang; }
+
+  setLang(lang) {
+    if (!VALID_LANGS.has(lang)) return;
+    this._lang = lang;
+    try {
+      fs.mkdirSync(path.dirname(LANG_FILE), { recursive: true });
+      fs.writeFileSync(LANG_FILE, lang, { mode: 0o600 });
+    } catch { /* non-fatal */ }
+    this._listeners.forEach(fn => fn(lang));
+  }
+
+  onChange(fn) { this._listeners.push(fn); }
+
+  t(key) { return t(this._lang, key); }
+}

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

@@ -481,19 +481,54 @@ export async function removeCopilotMcp(targetDir) {
   }
 }
 
+const AGENTVIBES_MARKER_START = '<!-- BEGIN AGENTVIBES -->';
+const AGENTVIBES_MARKER_END = '<!-- END AGENTVIBES -->';
+
+function wrapWithMarkers(content) {
+  return `${AGENTVIBES_MARKER_START}\n${content.trim()}\n${AGENTVIBES_MARKER_END}\n`;
+}
+
+function injectMarkerBlock(existing, newBlock) {
+  const start = existing.indexOf(AGENTVIBES_MARKER_START);
+  const end = existing.indexOf(AGENTVIBES_MARKER_END);
+  if (start !== -1 && end !== -1) {
+    return existing.substring(0, start) + newBlock + existing.substring(end + AGENTVIBES_MARKER_END.length + 1);
+  }
+  return existing.trimEnd() + (existing.trim() ? '\n\n' : '') + newBlock;
+}
+
+function removeMarkerBlock(existing) {
+  const start = existing.indexOf(AGENTVIBES_MARKER_START);
+  const end = existing.indexOf(AGENTVIBES_MARKER_END);
+  if (start === -1 || end === -1) return existing;
+  const before = existing.substring(0, start).trimEnd();
+  const after = existing.substring(end + AGENTVIBES_MARKER_END.length).replace(/^\n+/, '\n');
+  return (before + after).trimEnd() + '\n';
+}
+
 export async function installCopilotInstructions(targetDir, packageDir) {
   const destPath = path.join(targetDir, '.github', 'copilot-instructions.md');
   const srcPath = path.join(packageDir, '.github', 'copilot-instructions.md');
   try {
     await fs.mkdir(path.join(targetDir, '.github'), { recursive: true });
-    const content = await fs.readFile(srcPath, 'utf8');
-    await fs.writeFile(destPath, content);
+    const srcContent = await fs.readFile(srcPath, 'utf8');
+    let existing = '';
+    try { existing = await fs.readFile(destPath, 'utf8'); } catch { /* new file */ }
+    const block = wrapWithMarkers(srcContent);
+    await fs.writeFile(destPath, injectMarkerBlock(existing, block));
   } catch { /* best effort */ }
 }
 
 export async function removeCopilotInstructions(targetDir) {
+  const destPath = path.join(targetDir, '.github', 'copilot-instructions.md');
   try {
-    await fs.unlink(path.join(targetDir, '.github', 'copilot-instructions.md'));
+    const existing = await fs.readFile(destPath, 'utf8');
+    const updated = removeMarkerBlock(existing);
+    if (updated.trim()) {
+      await fs.writeFile(destPath, updated);
+    } else {
+      await fs.unlink(destPath);
+    }
   } catch { /* already gone */ }
 }
 
@@ -582,10 +617,15 @@ export function buildCodexToml(existingContent = '') {
 export async function installCodexInstructions(targetDir, packageDir) {
   const srcPath = path.join(packageDir, '.codex', 'AGENTS.md');
   try {
-    const content = await fs.readFile(srcPath, 'utf8');
+    const srcContent = await fs.readFile(srcPath, 'utf8');
+    const block = wrapWithMarkers(srcContent);
     await fs.mkdir(path.join(targetDir, '.codex'), { recursive: true });
-    await fs.writeFile(path.join(targetDir, '.codex', 'AGENTS.md'), content);
-    await fs.writeFile(path.join(targetDir, 'AGENTS.md'), content);
+
+    for (const dest of [path.join(targetDir, '.codex', 'AGENTS.md'), path.join(targetDir, 'AGENTS.md')]) {
+      let existing = '';
+      try { existing = await fs.readFile(dest, 'utf8'); } catch { /* new file */ }
+      await fs.writeFile(dest, injectMarkerBlock(existing, block));
+    }
   } catch { /* best effort */ }
 }
 
@@ -604,12 +644,17 @@ export async function installCodexHooks(targetDir, packageDir) {
 }
 
 export async function removeCodexInstructions(targetDir) {
-  try {
-    await fs.unlink(path.join(targetDir, '.codex', 'AGENTS.md'));
-  } catch { /* already gone */ }
-  try {
-    await fs.unlink(path.join(targetDir, 'AGENTS.md'));
-  } catch { /* already gone */ }
+  for (const dest of [path.join(targetDir, '.codex', 'AGENTS.md'), path.join(targetDir, 'AGENTS.md')]) {
+    try {
+      const existing = await fs.readFile(dest, 'utf8');
+      const updated = removeMarkerBlock(existing);
+      if (updated.trim()) {
+        await fs.writeFile(dest, updated);
+      } else {
+        await fs.unlink(dest);
+      }
+    } catch { /* already gone */ }
+  }
 }
 
 export async function removeCodexHooks(targetDir) {

package/src/services/provider-service.js

@@ -1,143 +1,143 @@
-/**
- * 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._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;