@phuetz/code-buddy 1.6.1 → 2.0.0

package/dist/input/context-mentions.d.ts

@@ -21,10 +21,16 @@ export interface ExpandedInput {
     text: string;
     contexts: MentionContext[];
 }
+export interface ContextMentionParserOptions {
+    projectRoot?: string;
+    maxFileBytes?: number;
+}
 export declare class ContextMentionParser {
     private patterns;
+    private projectRoot;
     private maxFileSize;
     private maxUrlSize;
+    constructor(options?: ContextMentionParserOptions);
     expandMentions(input: string): Promise<ExpandedInput>;
     /**
      * Process new-style @web, @git <subcommand>, and @terminal mentions.
@@ -67,4 +73,4 @@ export declare function getContextMentionParser(): ContextMentionParser;
  * - The cleaned message (without the @mentions)
  * - Structured context blocks to inject into the system prompt or user message
  */
-export declare function processMentions(message: string): Promise<MentionResult>;
+export declare function processMentions(message: string, options?: ContextMentionParserOptions): Promise<MentionResult>;

package/dist/input/context-mentions.js

@@ -4,6 +4,7 @@ import axios from "axios";
 import { exec } from "child_process";
 import { promisify } from "util";
 import { getErrorMessage } from "../types/index.js";
+import { DEFAULT_FILE_MENTION_MAX_BYTES, resolveProjectFileMention, } from '../context/file-mentions.js';
 const execAsync = promisify(exec);
 export class ContextMentionParser {
     patterns = {
@@ -18,8 +19,13 @@ export class ContextMentionParser {
         'git-extended': /@git\s+(log|diff|blame)(?:\s+(.+?))?(?=\s*@\w|\s*$)/g,
         terminal: /@terminal\b/g,
     };
-    maxFileSize = 100 * 1024; // 100KB max for included files
+    projectRoot;
+    maxFileSize;
     maxUrlSize = 50 * 1024; // 50KB max for URL content
+    constructor(options = {}) {
+        this.projectRoot = options.projectRoot ?? process.cwd();
+        this.maxFileSize = options.maxFileBytes ?? DEFAULT_FILE_MENTION_MAX_BYTES;
+    }
     async expandMentions(input) {
         const contexts = [];
         let expandedText = input;
@@ -147,29 +153,21 @@ export class ContextMentionParser {
         }
     }
     async resolveFile(filePath, original) {
-        const resolvedPath = path.resolve(filePath);
-        if (!(await fs.pathExists(resolvedPath))) {
+        const result = await resolveProjectFileMention(filePath, {
+            projectRoot: this.projectRoot,
+            maxFileBytes: this.maxFileSize,
+        });
+        if (result === null) {
             throw new Error(`File not found: ${filePath}`);
         }
-        const stats = await fs.stat(resolvedPath);
-        if (stats.isDirectory()) {
-            const files = await fs.readdir(resolvedPath);
-            return {
-                type: "file",
-                original,
-                resolved: resolvedPath,
-                content: `Directory ${filePath}:\n${files.join("\n")}`,
-            };
-        }
-        if (stats.size > this.maxFileSize) {
-            throw new Error(`File too large: ${filePath} (${Math.round(stats.size / 1024)}KB > ${Math.round(this.maxFileSize / 1024)}KB)`);
+        if (result.status === 'ignored') {
+            throw new Error(`File mention refused (${result.reason}): ${result.message}`);
         }
-        const content = await fs.readFile(resolvedPath, "utf-8");
         return {
             type: "file",
             original,
-            resolved: resolvedPath,
-            content: `File ${filePath}:\n\`\`\`\n${content}\n\`\`\``,
+            resolved: result.path,
+            content: `File ${result.path}:\n\`\`\`\n${result.content}\n\`\`\``,
         };
     }
     async resolveUrl(url, original) {
@@ -535,8 +533,8 @@ export function getContextMentionParser() {
  * - The cleaned message (without the @mentions)
  * - Structured context blocks to inject into the system prompt or user message
  */
-export async function processMentions(message) {
-    const parser = getContextMentionParser();
+export async function processMentions(message, options) {
+    const parser = options ? new ContextMentionParser(options) : getContextMentionParser();
     const expanded = await parser.expandMentions(message);
     const contextBlocks = expanded.contexts
         .filter(ctx => ctx.content && !ctx.error)

package/dist/input/text-to-speech.d.ts

@@ -7,6 +7,7 @@ export interface TTSConfig {
     volume?: string;
     pitch?: string;
     autoSpeak?: boolean;
+    format?: 'wav' | 'ogg' | 'mp3';
 }
 export interface TTSState {
     isSpeaking: boolean;
@@ -25,6 +26,8 @@ export declare class TextToSpeechManager extends EventEmitter {
     private audioreaderBaseURL;
     private static readonly EDGE_VOICES;
     constructor(config?: Partial<TTSConfig>);
+    private emitError;
+    private resolvePiperVoiceModel;
     private ensureTempDir;
     private loadConfig;
     saveConfig(): void;

package/dist/input/text-to-speech.js

@@ -4,6 +4,8 @@ import fs from 'fs';
 import path from 'path';
 import os from 'os';
 import { commandExists } from '../utils/command-exists.js';
+import { logger } from '../utils/logger.js';
+import { readJsonAtomicSync, writeJsonAtomicSync } from '../utils/atomic-write.js';
 /**
  * Text-to-Speech Manager
  * Supports multiple TTS backends with Edge TTS as default
@@ -42,6 +44,7 @@ export class TextToSpeechManager extends EventEmitter {
             volume: config.volume || '+0%',
             pitch: config.pitch || '+0Hz',
             autoSpeak: config.autoSpeak ?? false,
+            format: config.format,
         };
         this.state = {
             isSpeaking: false,
@@ -51,6 +54,39 @@ export class TextToSpeechManager extends EventEmitter {
         this.ensureTempDir();
         this.loadConfig();
     }
+    emitError(error) {
+        const err = error instanceof Error ? error : new Error(String(error));
+        if (this.listenerCount('error') > 0) {
+            this.emit('error', err);
+            return;
+        }
+        logger.warn(`[tts] ${err.message}`);
+    }
+    resolvePiperVoiceModel() {
+        const configured = process.env.COWORK_PIPER_VOICE ||
+            process.env.CODEBUDDY_TTS_VOICE ||
+            process.env.CODEBUDDY_TTS_PIPER_MODEL ||
+            process.env.CODEBUDDY_PIPER_VOICE ||
+            (this.config.voice && this.config.voice.endsWith('.onnx')
+                ? this.config.voice
+                : undefined);
+        if (configured)
+            return configured;
+        const roots = [
+            path.join(os.homedir(), 'DEV', 'ai-stack', 'voice'),
+            path.join(os.homedir(), 'ai-stack', 'voice'),
+            path.join(os.homedir(), '.codebuddy', 'voice'),
+        ];
+        const names = ['fr_FR-siwis-medium.onnx', 'fr_FR-tom-medium.onnx'];
+        for (const root of roots) {
+            for (const name of names) {
+                const candidate = path.join(root, 'voices', name);
+                if (fs.existsSync(candidate))
+                    return candidate;
+            }
+        }
+        return undefined;
+    }
     ensureTempDir() {
         if (!fs.existsSync(this.tempDir)) {
             fs.mkdirSync(this.tempDir, { recursive: true });
@@ -58,23 +94,12 @@ export class TextToSpeechManager extends EventEmitter {
     }
     loadConfig() {
         const configPath = path.join(os.homedir(), '.codebuddy', 'tts-config.json');
-        if (fs.existsSync(configPath)) {
-            try {
-                const saved = JSON.parse(fs.readFileSync(configPath, 'utf-8'));
-                this.config = { ...this.config, ...saved };
-            }
-            catch {
-                // Use defaults
-            }
-        }
+        const saved = readJsonAtomicSync(configPath, {});
+        this.config = { ...this.config, ...saved };
     }
     saveConfig() {
-        const configDir = path.join(os.homedir(), '.codebuddy');
-        const configPath = path.join(configDir, 'tts-config.json');
-        if (!fs.existsSync(configDir)) {
-            fs.mkdirSync(configDir, { recursive: true });
-        }
-        fs.writeFileSync(configPath, JSON.stringify(this.config, null, 2));
+        const configPath = path.join(os.homedir(), '.codebuddy', 'tts-config.json');
+        writeJsonAtomicSync(configPath, this.config);
     }
     /**
      * Check if TTS is available
@@ -89,13 +114,32 @@ export class TextToSpeechManager extends EventEmitter {
                 return { available: res.ok };
             }
             catch {
-                return { available: false, reason: 'AudioReader not running. Start it with: cd ~/claude/AudioReader && python main.py' };
+                return { available: false, reason: 'AudioReader not running. Start the AudioReader HTTP service (default http://localhost:8000).' };
             }
         }
+        if (this.config.provider === 'piper') {
+            const piperBin = process.env.COWORK_PIPER_BIN || process.env.CODEBUDDY_PIPER_BIN || 'piper';
+            const configuredVoice = this.resolvePiperVoiceModel();
+            const binAvailable = path.isAbsolute(piperBin) || piperBin.includes(path.sep)
+                ? fs.existsSync(piperBin)
+                : await commandExists(piperBin);
+            if (!binAvailable) {
+                return {
+                    available: false,
+                    reason: `${piperBin} not found. Set COWORK_PIPER_BIN or CODEBUDDY_PIPER_BIN, or install piper on PATH.`,
+                };
+            }
+            if (configuredVoice && !fs.existsSync(configuredVoice)) {
+                return {
+                    available: false,
+                    reason: `Piper voice model not found: ${configuredVoice}`,
+                };
+            }
+            return { available: true };
+        }
         const command = this.config.provider === 'edge-tts' ? 'edge-tts' :
             this.config.provider === 'espeak' ? 'espeak' :
-                this.config.provider === 'say' ? 'say' :
-                    this.config.provider === 'piper' ? 'piper' : 'edge-tts';
+                this.config.provider === 'say' ? 'say' : 'edge-tts';
         if (await commandExists(command)) {
             return { available: true };
         }
@@ -136,7 +180,7 @@ export class TextToSpeechManager extends EventEmitter {
         try {
             const availability = await this.isAvailable();
             if (!availability.available) {
-                this.emit('error', new Error(availability.reason));
+                this.emitError(new Error(availability.reason));
                 return;
             }
             // Double-check enabled state after async availability check
@@ -169,7 +213,7 @@ export class TextToSpeechManager extends EventEmitter {
         }
         catch (error) {
             // Emit error event but don't throw - prevents unhandled rejections
-            this.emit('error', error);
+            this.emitError(error);
         }
         finally {
             this.state.isSpeaking = false;
@@ -278,11 +322,7 @@ export class TextToSpeechManager extends EventEmitter {
             // out of the box: COWORK_PIPER_BIN / COWORK_PIPER_VOICE (or the
             // CODEBUDDY_* aliases, or a `.onnx` path set as the configured voice).
             const piperBin = process.env.COWORK_PIPER_BIN || process.env.CODEBUDDY_PIPER_BIN || 'piper';
-            const voiceModel = process.env.COWORK_PIPER_VOICE ||
-                process.env.CODEBUDDY_PIPER_VOICE ||
-                (this.config.voice && this.config.voice.endsWith('.onnx')
-                    ? this.config.voice
-                    : undefined);
+            const voiceModel = this.resolvePiperVoiceModel();
             const piperArgs = ['--output_file', audioFile];
             if (voiceModel) {
                 piperArgs.push('--model', voiceModel);
@@ -316,6 +356,9 @@ export class TextToSpeechManager extends EventEmitter {
      */
     async speakWithAudioReader(text) {
         const voice = this.config.voice || 'ff_siwis';
+        const format = this.config.format === 'ogg' || this.config.format === 'mp3'
+            ? this.config.format
+            : 'wav';
         const response = await fetch(`${this.audioreaderBaseURL}/v1/audio/speech`, {
             method: 'POST',
             headers: { 'Content-Type': 'application/json' },
@@ -324,13 +367,13 @@ export class TextToSpeechManager extends EventEmitter {
                 input: text,
                 voice,
                 speed: 1.0,
-                response_format: 'wav',
+                response_format: format,
             }),
         });
         if (!response.ok) {
             throw new Error(`AudioReader TTS error: ${response.status} ${await response.text()}`);
         }
-        const audioFile = path.join(this.tempDir, `tts_${Date.now()}.wav`);
+        const audioFile = path.join(this.tempDir, `tts_${Date.now()}.${format}`);
         const buffer = Buffer.from(await response.arrayBuffer());
         fs.writeFileSync(audioFile, buffer);
         try {

package/dist/input/voice-control.d.ts

@@ -79,6 +79,7 @@ export declare class VoiceControl extends EventEmitter {
     private tempDir;
     private audioBuffer;
     constructor(config?: Partial<VoiceControlConfig>);
+    private emitError;
     /**
      * Initialize voice control system
      */

package/dist/input/voice-control.js

@@ -19,6 +19,7 @@ import * as os from 'os';
 import { WakeWordDetector } from '../voice/wake-word.js';
 import { logger } from '../utils/logger.js';
 import { commandExists } from '../utils/command-exists.js';
+import { readJsonAtomicSync, writeJsonAtomicSync } from '../utils/atomic-write.js';
 const DEFAULT_CONFIG = {
     enabled: false,
     wakeWord: 'hey grok',
@@ -145,6 +146,14 @@ export class VoiceControl extends EventEmitter {
         this.tempDir = path.join(os.tmpdir(), 'grok-voice-control');
         this.initialize();
     }
+    emitError(error) {
+        const err = error instanceof Error ? error : new Error(String(error));
+        if (this.listenerCount('error') > 0) {
+            this.emit('error', err);
+            return;
+        }
+        logger.warn(`[voice-control] ${err.message}`);
+    }
     /**
      * Initialize voice control system
      */
@@ -158,24 +167,15 @@ export class VoiceControl extends EventEmitter {
      */
     loadConfig() {
         const configPath = path.join(os.homedir(), '.codebuddy', 'voice-control.json');
-        if (fs.existsSync(configPath)) {
-            try {
-                const saved = JSON.parse(fs.readFileSync(configPath, 'utf-8'));
-                this.config = { ...this.config, ...saved };
-            }
-            catch {
-                // Use defaults
-            }
-        }
+        const saved = readJsonAtomicSync(configPath, {});
+        this.config = { ...this.config, ...saved };
     }
     /**
      * Save configuration
      */
     saveConfig() {
-        const configDir = path.join(os.homedir(), '.codebuddy');
-        const configPath = path.join(configDir, 'voice-control.json');
-        fs.ensureDirSync(configDir);
-        fs.writeFileSync(configPath, JSON.stringify(this.config, null, 2));
+        const configPath = path.join(os.homedir(), '.codebuddy', 'voice-control.json');
+        writeJsonAtomicSync(configPath, this.config);
     }
     /**
      * Register built-in voice commands
@@ -289,7 +289,7 @@ export class VoiceControl extends EventEmitter {
         }
         const availability = await this.isAvailable();
         if (!availability.available) {
-            this.emit('error', new Error(availability.reason || 'Voice control not available'));
+            this.emitError(new Error(availability.reason || 'Voice control not available'));
             return;
         }
         this.state.isListening = true;
@@ -339,7 +339,13 @@ export class VoiceControl extends EventEmitter {
         vadProcess.stdout.on('data', (data) => {
             // Feed raw audio to Porcupine wake word detector if active
             if (this.wakeWordDetector && this.wakeWordDetector.getEngine() === 'porcupine' && !this.state.isWakeWordActive) {
-                this.wakeWordDetector.processFrame(data);
+                try {
+                    this.wakeWordDetector.processFrame(data);
+                }
+                catch (error) {
+                    this.state.errorCount++;
+                    this.emitError(error);
+                }
             }
             if (this.state.isWakeWordActive || !this.config.wakeWordEnabled) {
                 this.audioBuffer.push(data);
@@ -365,7 +371,7 @@ export class VoiceControl extends EventEmitter {
         });
         vadProcess.on('error', (error) => {
             this.state.errorCount++;
-            this.emit('error', error);
+            this.emitError(error);
         });
     }
     /**
@@ -392,7 +398,7 @@ export class VoiceControl extends EventEmitter {
         this.recordingProcess.on('error', (error) => {
             this.state.isListening = false;
             this.state.errorCount++;
-            this.emit('error', error);
+            this.emitError(error);
         });
     }
     /**
@@ -471,7 +477,7 @@ export class VoiceControl extends EventEmitter {
         }
         catch (error) {
             this.state.errorCount++;
-            this.emit('error', error);
+            this.emitError(error);
         }
         finally {
             this.state.isProcessing = false;

package/dist/input/voice-input-enhanced.d.ts

@@ -35,6 +35,7 @@ export declare class VoiceInputManager extends EventEmitter {
     private levelInterval;
     private tempDir;
     constructor(config?: Partial<VoiceInputConfig>);
+    private emitError;
     /**
      * Ensure temp directory exists
      */

package/dist/input/voice-input-enhanced.js

@@ -5,6 +5,8 @@ import path from 'path';
 import os from 'os';
 import { getErrorMessage } from '../types/index.js';
 import { commandExists } from '../utils/command-exists.js';
+import { logger } from '../utils/logger.js';
+import { readJsonAtomicSync, writeJsonAtomicSync } from '../utils/atomic-write.js';
 /**
  * Type guard to check if error is an Axios-like error with response data
  */
@@ -44,6 +46,14 @@ export class VoiceInputManager extends EventEmitter {
         this.ensureTempDir();
         this.loadConfig();
     }
+    emitError(error) {
+        const err = error instanceof Error ? error : new Error(String(error));
+        if (this.listenerCount('error') > 0) {
+            this.emit('error', err);
+            return;
+        }
+        logger.warn(`[voice-input] ${err.message}`);
+    }
     /**
      * Ensure temp directory exists
      */
@@ -57,15 +67,8 @@ export class VoiceInputManager extends EventEmitter {
      */
     loadConfig() {
         const configPath = path.join(os.homedir(), '.codebuddy', 'voice-config.json');
-        if (fs.existsSync(configPath)) {
-            try {
-                const saved = JSON.parse(fs.readFileSync(configPath, 'utf-8'));
-                this.config = { ...this.config, ...saved };
-            }
-            catch (_error) {
-                // Use defaults
-            }
-        }
+        const saved = readJsonAtomicSync(configPath, {});
+        this.config = { ...this.config, ...saved };
     }
     /**
      * Save voice config
@@ -74,9 +77,12 @@ export class VoiceInputManager extends EventEmitter {
         const configDir = path.join(os.homedir(), '.codebuddy');
         const configPath = path.join(configDir, 'voice-config.json');
         if (!fs.existsSync(configDir)) {
-            fs.mkdirSync(configDir, { recursive: true });
+            fs.mkdirSync(configDir, { recursive: true, mode: 0o700 });
         }
-        fs.writeFileSync(configPath, JSON.stringify(this.config, null, 2));
+        else {
+            fs.chmodSync(configDir, 0o700);
+        }
+        writeJsonAtomicSync(configPath, this.config);
     }
     /**
      * Check if voice input is available
@@ -112,12 +118,18 @@ export class VoiceInputManager extends EventEmitter {
             }
         }
         // Check for API key if using whisper-api
-        if (this.config.provider === 'whisper-api' && !this.config.apiKey) {
+        if (this.config.provider === 'whisper-api' && !this.config.apiKey && !process.env.OPENAI_API_KEY) {
             return {
                 available: false,
                 reason: 'OpenAI API key required for Whisper API. Set in voice config or OPENAI_API_KEY env var.'
             };
         }
+        if (this.config.provider === 'system') {
+            return {
+                available: false,
+                reason: 'System speech recognition is not implemented. Use whisper-local or whisper-api provider.'
+            };
+        }
         return { available: true };
     }
     /**
@@ -139,7 +151,7 @@ export class VoiceInputManager extends EventEmitter {
         }
         const availability = await this.isAvailable();
         if (!availability.available) {
-            this.emit('error', new Error(availability.reason));
+            this.emitError(new Error(availability.reason));
             return;
         }
         this.state.isRecording = true;
@@ -192,7 +204,7 @@ export class VoiceInputManager extends EventEmitter {
             }
             this.state.isRecording = false;
             this.state.errorCount++;
-            this.emit('error', error);
+            this.emitError(error);
         });
     }
     /**
@@ -235,12 +247,12 @@ export class VoiceInputManager extends EventEmitter {
                 this.emit('transcription', result);
             }
             else {
-                this.emit('error', new Error(result.error || 'Transcription failed'));
+                this.emitError(new Error(result.error || 'Transcription failed'));
             }
         }
         catch (error) {
             this.state.errorCount++;
-            this.emit('error', error);
+            this.emitError(error);
         }
         finally {
             this.state.isProcessing = false;
@@ -290,6 +302,9 @@ export class VoiceInputManager extends EventEmitter {
                     resolve({ success: false, error: stderr || 'Whisper failed' });
                 }
             });
+            whisper.on('error', (error) => {
+                resolve({ success: false, error: getErrorMessage(error) });
+            });
         });
     }
     /**

package/dist/integrations/ci-autofix-pipeline.js

@@ -49,28 +49,23 @@ export class CIAutoFixPipeline {
             result.attempts.push(fixAttempt);
             if (fixAttempt.localTestsPassed) {
                 result.success = true;
-                // Push fix branch and create PR
+                // Commit named files only (never stage the whole tree) and push only a local origin.
                 try {
-                    const branchName = `autofix/${failure.branch}-${failure.runId.substring(0, 8)}`;
-                    await this.bash.execute(`git checkout -b ${branchName}`);
-                    await this.bash.execute('git add -A');
-                    await this.bash.execute(`git commit -m "fix(ci): auto-fix ${failure.jobName} failure
-
-Root cause: ${fixAttempt.rootCause.substring(0, 200)}
-
-Auto-generated by Code Buddy CI AutoFix Pipeline.
-Attempt ${attempt}/${MAX_ATTEMPTS}."`);
-                    const pushResult = await this.bash.execute(`git push -u origin ${branchName}`);
-                    if (pushResult.success) {
-                        fixAttempt.pushed = true;
-                        // Try to create PR via gh CLI
-                        const prResult = await this.bash.execute(`gh pr create --title "fix(ci): auto-fix ${failure.jobName}" --body "Auto-fix for CI failure in ${failure.jobName}.\\n\\n**Root cause:** ${fixAttempt.rootCause.substring(0, 300).replace(/"/g, '\\"')}\\n\\n**Files:** ${fixAttempt.filesModified.join(', ')}\\n\\nGenerated by Code Buddy CI AutoFix Pipeline." --base ${failure.branch}`);
-                        if (prResult.success && prResult.output) {
-                            result.prUrl = prResult.output.trim();
-                        }
+                    const { conventionalCommitNamedFiles, isLocalGitRemote } = await import('../commands/dev/golden-path.js');
+                    const message = `fix(ci): auto-fix ${failure.jobName} failure`;
+                    const commit = conventionalCommitNamedFiles(process.cwd(), message);
+                    if (!commit.committed) {
+                        logger.debug(`CI AutoFix: commit skipped: ${commit.error || 'no named files'}`);
+                        break;
+                    }
+                    const origin = (await this.bash.execute('git remote get-url origin')).output?.trim() || '';
+                    if (origin && isLocalGitRemote(origin)) {
+                        const pushResult = await this.bash.execute('git push -u origin HEAD');
+                        fixAttempt.pushed = Boolean(pushResult.success);
+                    }
+                    else {
+                        logger.info('CI AutoFix: skipping push (origin is not a local git remote and gh is not used here)');
                     }
-                    // Switch back to original branch
-                    await this.bash.execute(`git checkout ${failure.branch}`);
                 }
                 catch (err) {
                     logger.debug(`CI AutoFix: failed to push fix: ${err instanceof Error ? err.message : String(err)}`);

package/dist/integrations/ide/server.js

@@ -372,7 +372,8 @@ Return a focused replacement for the problematic range only.`,
         if (this.codebuddyClient) {
             return this.codebuddyClient;
         }
-        const apiKey = process.env.GROK_API_KEY?.trim();
+        const { resolveActiveProviderApiKey } = await import('../../config/env-schema.js');
+        const apiKey = resolveActiveProviderApiKey();
         if (!apiKey) {
             return null;
         }
@@ -383,7 +384,7 @@ Return a focused replacement for the problematic range only.`,
     async requireCodeBuddyClient() {
         const client = await this.getCodeBuddyClient();
         if (!client) {
-            throw new Error('GROK_API_KEY is required for IDE AI features');
+            throw new Error('An AI provider API key is required for IDE AI features');
         }
         return client;
     }

package/dist/integrations/json-rpc/server.js

@@ -197,7 +197,8 @@ export class JsonRpcServer {
         // Lazy load grok client
         if (!codebuddyClient) {
             const { CodeBuddyClient } = await import('../../codebuddy/index.js');
-            const apiKey = this.options.apiKey || process.env.GROK_API_KEY || '';
+            const { resolveActiveProviderApiKey } = await import('../../config/env-schema.js');
+            const apiKey = this.options.apiKey || resolveActiveProviderApiKey() || '';
             codebuddyClient = new CodeBuddyClient(apiKey);
         }
         const client = codebuddyClient;
@@ -235,7 +236,8 @@ export class JsonRpcServer {
         // Lazy load grok client
         if (!codebuddyClient) {
             const { CodeBuddyClient } = await import('../../codebuddy/index.js');
-            const apiKey = this.options.apiKey || process.env.GROK_API_KEY || '';
+            const { resolveActiveProviderApiKey } = await import('../../config/env-schema.js');
+            const apiKey = this.options.apiKey || resolveActiveProviderApiKey() || '';
             codebuddyClient = new CodeBuddyClient(apiKey);
         }
         const client = codebuddyClient;

package/dist/integrations/mcp/mcp-server.js

@@ -246,7 +246,8 @@ export class McpServer {
             required: ['prompt'],
         }, async (args) => {
             const { CodeBuddyClient } = await import('../../codebuddy/index.js');
-            const apiKey = process.env.GROK_API_KEY || '';
+            const { resolveActiveProviderApiKey } = await import('../../config/env-schema.js');
+            const apiKey = resolveActiveProviderApiKey() || '';
             const client = new CodeBuddyClient(apiKey);
             const userPrompt = args.context
                 ? `Context:\n${args.context}\n\nQuestion: ${args.prompt}`
@@ -266,7 +267,8 @@ export class McpServer {
             required: ['code', 'language'],
         }, async (args) => {
             const { CodeBuddyClient } = await import('../../codebuddy/index.js');
-            const apiKey = process.env.GROK_API_KEY || '';
+            const { resolveActiveProviderApiKey } = await import('../../config/env-schema.js');
+            const apiKey = resolveActiveProviderApiKey() || '';
             const client = new CodeBuddyClient(apiKey);
             const prompt = `Complete or modify this ${args.language} code${args.instruction ? ` (${args.instruction})` : ''}: