aiden-runtime 3.18.0 → 3.19.4

package/dist/api/server.js

@@ -88,7 +88,8 @@ const multiGoalValidator_1 = require("../core/multiGoalValidator");
 const toolRegistry_2 = require("../core/toolRegistry");
 const reactLoop_1 = require("../core/reactLoop");
 const scheduler_1 = require("../core/scheduler");
-const aidenPersonality_1 = require("../core/aidenPersonality");
+const protectedContext_1 = require("../core/protectedContext");
+const contextHandoff_1 = require("../core/contextHandoff");
 const voiceInput_1 = require("../core/voiceInput");
 const voiceOutput_1 = require("../core/voiceOutput");
 const planTool_1 = require("../core/planTool");
@@ -122,8 +123,10 @@ const skillWriter_1 = require("../core/skillWriter");
 const skillLibrary_1 = require("../core/skillLibrary");
 const costTracker_1 = require("../core/costTracker");
 const sessionMemory_1 = require("../core/sessionMemory");
+const diagnosticError_1 = require("../core/diagnosticError");
 const memoryExtractor_1 = require("../core/memoryExtractor");
 const pluginLoader_1 = require("../core/pluginLoader");
+const commandCatalog = __importStar(require("../cli/commandCatalog"));
 const permissionSystem_1 = require("../core/permissionSystem");
 const aidenIdentity_1 = require("../core/aidenIdentity");
 const eventBus_1 = require("../core/eventBus");
@@ -170,46 +173,41 @@ const INSTANT_ACTIONS = [
             /^capture\s+(?:the\s+)?screen\s*$/i,
         ],
         action: async () => {
-            try {
-                const result = await (0, toolRegistry_1.executeTool)('screenshot', {});
-                if (result.success && result.output)
-                    return result.output;
-            }
-            catch { }
-            return 'Screenshot taken.';
+            const result = await (0, toolRegistry_1.executeTool)('screenshot', {});
+            if (result.success)
+                return result.output || 'Screenshot taken.';
+            return `Couldn't take screenshot: ${result.error || 'tool returned no diagnostic'}`;
         },
     },
     // 10. Volume Up
     {
         patterns: [/^(?:turn\s+(?:the\s+)?)?volume\s+up\s*$/i],
         action: async () => {
-            try {
-                await (0, toolRegistry_1.executeTool)('shell_exec', { command: 'powershell -c “(New-Object -com WScript.Shell).SendKeys([char]175)”' });
-            }
-            catch { }
-            return 'Volume up.';
+            const result = await (0, toolRegistry_1.executeTool)('system_volume', { action: 'up' });
+            if (result.success)
+                return result.output || 'Volume up.';
+            return `Couldn't change volume: ${result.error || 'tool returned no diagnostic'}`;
         },
     },
     // 11. Volume Down
     {
         patterns: [/^(?:turn\s+(?:the\s+)?)?volume\s+down\s*$/i],
         action: async () => {
-            try {
-                await (0, toolRegistry_1.executeTool)('shell_exec', { command: 'powershell -c “(New-Object -com WScript.Shell).SendKeys([char]174)”' });
-            }
-            catch { }
-            return 'Volume down.';
+            const result = await (0, toolRegistry_1.executeTool)('system_volume', { action: 'down' });
+            if (result.success)
+                return result.output || 'Volume down.';
+            return `Couldn't change volume: ${result.error || 'tool returned no diagnostic'}`;
         },
     },
     // 12. Mute / Unmute
     {
         patterns: [/^(?:toggle\s+)?mute\s*$/i, /^unmute\s*$/i],
-        action: async () => {
-            try {
-                await (0, toolRegistry_1.executeTool)('shell_exec', { command: 'powershell -c “(New-Object -com WScript.Shell).SendKeys([char]173)”' });
-            }
-            catch { }
-            return 'Toggled mute.';
+        action: async (_match, message) => {
+            const muteAction = /^unmute/i.test(message ?? '') ? 'unmute' : 'mute';
+            const result = await (0, toolRegistry_1.executeTool)('system_volume', { action: muteAction });
+            if (result.success)
+                return result.output || (muteAction === 'mute' ? 'Muted.' : 'Unmuted.');
+            return `Couldn't ${muteAction}: ${result.error || 'tool returned no diagnostic'}`;
         },
     },
     // 13. Set Timer
@@ -253,11 +251,10 @@ const INSTANT_ACTIONS = [
     {
         patterns: [/^lock\s+(?:the\s+)?(?:screen|pc|computer|workstation)\s*$/i],
         action: async () => {
-            try {
-                await (0, toolRegistry_1.executeTool)('shell_exec', { command: 'rundll32.exe user32.dll,LockWorkStation' });
-            }
-            catch { }
-            return 'Locking screen...';
+            const result = await (0, toolRegistry_1.executeTool)('shell_exec', { command: 'rundll32.exe user32.dll,LockWorkStation' });
+            if (result.success)
+                return 'Locking screen...';
+            return `Couldn't lock screen: ${result.error || 'tool returned no diagnostic'}`;
         },
     },
 ];
@@ -361,6 +358,10 @@ function handleChatError(err, apiName, send) {
 }
 // Workspace root — AIDEN_USER_DATA in packaged Electron, cwd in dev
 const WORKSPACE_ROOT = process.env.AIDEN_USER_DATA || process.cwd();
+// Per-session soul hash for Option-B protected-context injection.
+// First turn: undefined → full SOUL inject. Subsequent turns: compare → emit
+// reference line when unchanged, re-inject when SOUL.md edited on disk.
+const soulHashBySession = new Map();
 // ── Workspace bootstrap — create default dirs + files on every boot ──────────
 function initWorkspaceDefaults() {
     const dirs = [
@@ -924,7 +925,10 @@ function createApiServer() {
                 return;
             }
         }
-        // ── Instant Actions — 15 direct OS commands, zero LLM overhead ─────────────
+        // ── Instant Actions — 7 direct OS commands, zero LLM overhead ──────────────
+        // NOTE: was 15 prior to v3.19 P3. Entries 1-8 (open/close/launch fake actions)
+        // removed entirely. Entries 9-15 (screenshot, volume, mute, timer, sysinfo,
+        // lock) retained with handlers rewritten to use real executeTool() calls.
         for (const ia of INSTANT_ACTIONS) {
             for (const pat of ia.patterns) {
                 const m = message.match(pat);
@@ -1802,6 +1806,7 @@ function createApiServer() {
             { id: 'groq', label: 'Groq', subtitle: 'Free tier · llama3.3:70b · blazing fast', url: 'https://console.groq.com', models: ['llama-3.3-70b-versatile', 'llama-3.1-70b-versatile', 'mixtral-8x7b-32768'] },
             { id: 'openrouter', label: 'OpenRouter', subtitle: 'Access 200+ models · pay per use', url: 'https://openrouter.ai/keys', models: ['meta-llama/llama-3.3-70b-instruct', 'anthropic/claude-3.5-sonnet', 'openai/gpt-4o'] },
             { id: 'gemini', label: 'Gemini', subtitle: 'Free tier available · fast', url: 'https://aistudio.google.com/app/apikey', models: ['gemini-1.5-flash', 'gemini-1.5-pro', 'gemini-2.0-flash-exp'] },
+            { id: 'mistral', label: 'Mistral AI', subtitle: 'Mistral Large/Small · Codestral', url: 'https://console.mistral.ai/api-keys', models: ['mistral-large-latest', 'mistral-small-latest', 'codestral-latest'] },
             { id: 'cloudflare', label: 'Cloudflare AI', subtitle: '60+ models · free tier · edge inference', url: 'https://dash.cloudflare.com/profile/api-tokens', models: ['accountId|@cf/meta/llama-3.1-8b-instruct'] },
             { id: 'github', label: 'GitHub Models', subtitle: 'GPT-4o · free for GitHub users', url: 'https://github.com/marketplace/models', models: ['gpt-4o-mini', 'gpt-4o'] },
         ];
@@ -2639,7 +2644,7 @@ function createApiServer() {
     app.post('/api/plugins/reload', requireLocalhost, async (_req, res) => {
         try {
             const dir = path.join(process.cwd(), 'workspace', 'plugins');
-            await (0, pluginLoader_1.reloadPlugins)(dir);
+            await (0, pluginLoader_1.reloadPlugins)(dir, { commandCatalog });
             res.json({ ok: true, plugins: (0, pluginLoader_1.listFlatPlugins)() });
         }
         catch (e) {
@@ -2849,6 +2854,18 @@ function createApiServer() {
                         error = `${r.status}: ${await r.text()}`;
                     break;
                 }
+                case 'mistral': {
+                    const r = await fetch('https://api.mistral.ai/v1/chat/completions', {
+                        method: 'POST',
+                        headers: { 'Content-Type': 'application/json', 'Authorization': `Bearer ${key}` },
+                        body: JSON.stringify({ model: testModel, messages: testMessages, max_tokens: 5 }),
+                        signal: AbortSignal.timeout(8000),
+                    });
+                    valid = r.ok;
+                    if (!r.ok)
+                        error = `${r.status}: ${await r.text()}`;
+                    break;
+                }
                 case 'nvidia': {
                     const r = await fetch('https://integrate.api.nvidia.com/v1/chat/completions', {
                         method: 'POST',
@@ -2929,6 +2946,15 @@ function createApiServer() {
                 });
                 return res.json({ valid: r.ok, status: r.status, provider: 'groq' });
             }
+            if (provider === 'mistral') {
+                const r = await fetch('https://api.mistral.ai/v1/chat/completions', {
+                    method: 'POST',
+                    headers: { 'Content-Type': 'application/json', 'Authorization': `Bearer ${key}` },
+                    body: JSON.stringify({ model: 'mistral-large-latest', messages: [{ role: 'user', content: 'hi' }], max_tokens: 5 }),
+                    signal: AbortSignal.timeout(8000),
+                });
+                return res.json({ valid: r.ok, status: r.status, provider: 'mistral' });
+            }
             if (provider === 'ollama') {
                 const ollamaBase = (process.env.OLLAMA_HOST ?? 'http://127.0.0.1:11434').replace(/\/$/, '');
                 const r = await fetch(`${ollamaBase}/api/tags`, { signal: AbortSignal.timeout(3000) });
@@ -3073,9 +3099,11 @@ function createApiServer() {
     });
     // GET /api/tools — list all built-in + plugin-registered tools
     app.get('/api/tools', (_req, res) => {
-        const { TOOLS, TOOL_DESCRIPTIONS, getExternalToolsMeta } = require('../core/toolRegistry');
-        const names = Object.keys(TOOLS);
+        const { TOOL_DESCRIPTIONS, getExternalToolsMeta } = require('../core/toolRegistry');
+        // v3.19 Phase 1: use TOOL_DESCRIPTIONS keys (71 user-facing) instead of TOOLS handler
+        // keys (79 = 77 registry + 2 legacy stubs) so banner count reflects real tool count.
         const descs = TOOL_DESCRIPTIONS || {};
+        const names = Object.keys(descs);
         const extMeta = getExternalToolsMeta();
         const coreTools = names.map(name => ({ name, description: descs[name] || '', source: 'core' }));
         const extTools = Object.entries(extMeta).map(([name, m]) => ({
@@ -5603,6 +5631,7 @@ function getDefaultModel(provider) {
         gemini: 'gemini-1.5-flash',
         cerebras: 'llama3.1-8b',
         nvidia: 'meta/llama-3.3-70b-instruct',
+        mistral: 'mistral-large-latest',
     };
     return defaults[provider] || 'llama-3.3-70b-versatile';
 }
@@ -5752,6 +5781,16 @@ function startApiServer(portArg) {
         console.log('[Startup] SOUL length:', _soulLen, 'chars');
         console.log('[Startup] Tool count:', Object.keys(toolRegistry_2.TOOL_DESCRIPTIONS).length);
     }
+    // v3.19 Phase 1 Commit 7: throw-mode — re-throw so server FAILS to start on drift
+    try {
+        const { validateRegistry } = require('../core/registryValidator');
+        validateRegistry();
+    }
+    catch (e) {
+        console.error('[Startup] FATAL — registry invariant violated. Fix before deploying:');
+        console.error(e.message);
+        process.exit(1);
+    }
     // ── Startup health check ─────────────────────────────────────
     try {
         startupCheck();
@@ -5857,8 +5896,9 @@ function startApiServer(portArg) {
         console.error('[Startup] setupHttpKeepalive failed:', e.message);
     }
     // Load plugins from workspace/plugins/*.js (unified flat format)
+    // Pass commandCatalog so plugins can register slash commands at load time.
     const flatPluginDir = path.join(process.cwd(), 'workspace', 'plugins');
-    (0, pluginLoader_1.loadPlugins)(flatPluginDir).catch(e => console.error('[PluginLoader] Load failed:', e.message));
+    (0, pluginLoader_1.loadPlugins)(flatPluginDir, { commandCatalog }).catch(e => console.error('[PluginLoader] Load failed:', e.message));
     // Start background license refresh (12-hour interval, silent)
     (0, licenseManager_1.startLicenseRefresh)();
     // Log provider chain before listening so it's visible in startup log
@@ -6176,6 +6216,23 @@ async function start(opts) {
 // ── Provider racing helpers ─────────────────────────────────
 // fetchProviderResponse: fires a single non-streaming request to a provider.
 // raceProviders: fires top-2 simultaneously, returns the fastest valid response.
+function extractChatMessageContent(content) {
+    if (typeof content === 'string')
+        return content;
+    if (!Array.isArray(content))
+        return '';
+    return content
+        .map((part) => {
+        if (typeof part === 'string')
+            return part;
+        if (part && typeof part === 'object' && 'text' in part) {
+            const text = part.text;
+            return typeof text === 'string' ? text : '';
+        }
+        return '';
+    })
+        .join('');
+}
 async function fetchProviderResponse(api, messages, signal) {
     const key = api.key.startsWith('env:')
         ? (process.env[api.key.replace('env:', '')] || '')
@@ -6192,7 +6249,11 @@ async function fetchProviderResponse(api, messages, signal) {
         if (!resp.ok)
             throw new Error(`Gemini ${resp.status}`);
         const d = await resp.json();
-        return { text: d?.choices?.[0]?.message?.content || '', apiName: api.name, model };
+        return {
+            text: extractChatMessageContent(d?.choices?.[0]?.message?.content),
+            apiName: api.name,
+            model,
+        };
     }
     else if (providerType === 'ollama') {
         const resp = await fetch('http://localhost:11434/api/chat', {
@@ -6223,7 +6284,11 @@ async function fetchProviderResponse(api, messages, signal) {
         if (!resp.ok)
             throw new Error(`custom:${api.name} ${resp.status}`);
         const d = await resp.json();
-        return { text: d?.choices?.[0]?.message?.content || '', apiName: api.name, model };
+        return {
+            text: extractChatMessageContent(d?.choices?.[0]?.message?.content),
+            apiName: api.name,
+            model,
+        };
     }
     else {
         const COMPAT_ENDPOINTS = {
@@ -6234,6 +6299,7 @@ async function fetchProviderResponse(api, messages, signal) {
             nvidia: 'https://integrate.api.nvidia.com/v1/chat/completions',
             github: 'https://models.inference.ai.azure.com/chat/completions',
             boa: 'https://api.bayofassets.com/v1/chat/completions',
+            mistral: 'https://api.mistral.ai/v1/chat/completions',
         };
         const endpoint = COMPAT_ENDPOINTS[providerType] ?? COMPAT_ENDPOINTS['groq'];
         const resp = await fetch(endpoint, {
@@ -6249,7 +6315,11 @@ async function fetchProviderResponse(api, messages, signal) {
         if (!resp.ok)
             throw new Error(`${providerType} ${resp.status}`);
         const d = await resp.json();
-        return { text: d?.choices?.[0]?.message?.content || '', apiName: api.name, model };
+        return {
+            text: extractChatMessageContent(d?.choices?.[0]?.message?.content),
+            apiName: api.name,
+            model,
+        };
     }
 }
 async function raceProviders(messages, topN = 2) {
@@ -6335,6 +6405,7 @@ async function* streamTokens(providerType, apiKey, model, messages, opts = {}) {
         openai: 'https://api.openai.com/v1/chat/completions',
         boa: 'https://api.bayofassets.com/v1/chat/completions',
         gemini: 'https://generativelanguage.googleapis.com/v1beta/openai/chat/completions',
+        mistral: 'https://api.mistral.ai/v1/chat/completions',
     };
     // Shared tool-call buffering helper
     let toolBuf = '';
@@ -6452,23 +6523,7 @@ async function* streamTokens(providerType, apiKey, model, messages, opts = {}) {
 }
 // ── Pure-chat streaming helper (no planner, no tools) ─────────
 async function streamChat(message, history, userName, _provider, model, apiName, send, sessionId) {
-    // ── Sprint 1: First Message WOW — silent system context gathering ───────────────────
     const isFirstMessage = history.length === 0;
-    let firstMessageContext = '';
-    if (isFirstMessage) {
-        try {
-            const [sysResult, windowsResult, diskResult] = await Promise.allSettled([
-                (0, toolRegistry_1.executeTool)('system_info', {}),
-                (0, toolRegistry_1.executeTool)('shell_exec', { command: 'Get-Process | Where-Object {$_.MainWindowTitle -ne ""} | Select-Object Name, MainWindowTitle, @{N="RAM_MB";E={[math]::Round($_.WorkingSet64/1MB,1)}} | ConvertTo-Json -Compress' }),
-                (0, toolRegistry_1.executeTool)('shell_exec', { command: 'Get-PSDrive C | Select-Object @{N="UsedGB";E={[math]::Round(($_.Used/1GB),1)}}, @{N="FreeGB";E={[math]::Round(($_.Free/1GB),1)}} | ConvertTo-Json -Compress' }),
-            ]);
-            const sysInfo = sysResult.status === 'fulfilled' ? sysResult.value.output ?? '' : '';
-            const windows = windowsResult.status === 'fulfilled' ? windowsResult.value.output ?? '' : '';
-            const disk = diskResult.status === 'fulfilled' ? diskResult.value.output ?? '' : '';
-            firstMessageContext = `\n\nSYSTEM CONTEXT (you silently gathered this — use it to show awareness of the user’s machine):\nHardware: ${sysInfo}\nOpen windows: ${windows}\nDisk: ${disk}\n\nOn this first message, respond by showing what you can see on their machine right now. Be specific and natural — not a feature list. Example: \"I can see you have VS Code open, 6GB RAM free, and your disk is 78% full. What are you working on?\"`;
-        }
-        catch { /* silent — never block the response */ }
-    }
     const cognitionHint = userCognitionProfile_1.userCognitionProfile.getSystemPromptAddition();
     // Sprint 21: proactive memory surfacing
     let memoryContext = '';
@@ -6509,41 +6564,26 @@ async function streamChat(message, history, userName, _provider, model, apiName,
             memoryIndex = `\n\nMEMORY INDEX (topics you've learned about this user — use as background, not to recite):\n${idx}`;
     }
     catch { }
-    // [Aiden] System prompt v8 — SOUL.md + USER.md + STANDING_ORDERS injected
-    // Resolve real Windows username and home directory to prevent LLM from using "Aiden" as username
+    // [Aiden] System prompt v9 — per-turn protected context (Option B hash-aware)
+    // SOUL.md injected in full on first turn or when content changes; reference
+    // line only when hash matches previous turn. USER/GOALS/SO/LESSONS always full.
     const _sysUser = process.env.USERNAME || process.env.USER || require('os').userInfo().username || 'User';
     const _sysHome = require('os').homedir();
     const systemContext = `\nSYSTEM CONTEXT — use these exact paths for ANY file operations:\n- Windows username: ${_sysUser} (NOT "Aiden" — Aiden is the AI name, not the Windows user)\n- Home directory: ${_sysHome}\n- Desktop: ${require('path').join(_sysHome, 'Desktop')}\n- Documents: ${require('path').join(_sysHome, 'Documents')}\n- Downloads: ${require('path').join(_sysHome, 'Downloads')}\n`;
-    const soulPrefix = aidenPersonality_1.SOUL ? aidenPersonality_1.SOUL + '\n\n' : '';
-    const userMdPath = path.join(WORKSPACE_ROOT, 'workspace', 'USER.md');
-    let userProfile = '';
-    if (fs.existsSync(userMdPath)) {
-        const raw = fs.readFileSync(userMdPath, 'utf8').trim();
-        if (raw && raw !== '# User Profile\nName: User' && raw !== '# User Profile') {
-            userProfile = '\nUSER PROFILE (read this — it describes the person you are talking to):\n' + raw + '\n';
-        }
-    }
-    if (!userProfile) {
-        // Fallback: at minimum tell Aiden the user's name from config
-        const cfg = (0, index_1.loadConfig)();
-        const name = cfg.user?.name || process.env.USER_NAME || userName;
-        if (name && name !== 'there' && name !== 'User') {
-            userProfile = `\nUSER PROFILE:\nName: ${name}\n`;
-        }
-    }
-    const soPath = path.join(WORKSPACE_ROOT, 'workspace', 'STANDING_ORDERS.md');
-    const standingOrders = fs.existsSync(soPath)
-        ? '\n\nSTANDING ORDERS — follow always:\n' + fs.readFileSync(soPath, 'utf-8')
-        : '';
-    const chatPrompt = `${soulPrefix}You are Aiden — a personal AI OS built for ${userName}. You are sharp, direct, and slightly witty. You speak like a trusted co-founder. Today: ${new Date().toLocaleDateString('en-US', { weekday: 'long', month: 'long', day: 'numeric', year: 'numeric' })}.
-${userProfile}${systemContext}
+    const _prevHash = sessionId ? soulHashBySession.get(sessionId) : undefined;
+    const _ctx = protectedContext_1.protectedContextManager.getProtectedContext();
+    const protectedBlock = (0, contextHandoff_1.buildProtectedContextBlock)(_ctx, _prevHash, sessionId);
+    if (sessionId)
+        soulHashBySession.set(sessionId, _ctx.hash);
+    const chatPrompt = `${protectedBlock ? protectedBlock + '\n\n' : ''}You are Aiden — a personal AI OS built for ${userName}. You are sharp, direct, and slightly witty. You speak like a trusted co-founder. Today: ${new Date().toLocaleDateString('en-US', { weekday: 'long', month: 'long', day: 'numeric', year: 'numeric' })}.
+${systemContext}
 HARD RULES — never violate:
 - Never say "As an AI language model...", "I'm here to assist", "Certainly!", "Great question!", "Of course!"
 - Never say "key findings from our research", "as per your request I have written", "here is a comparison of", "verdict:", "recommendation:" in a generic reply
 - Never mention Pega, BlueWinston, Gaude Digital, or any third-party product by name
 - Never say you can't access the internet (you have web_search) or can't create files (you have file_write)
 - Never fabricate capabilities: no graphic design, video production, or music generation
-- Never list 250+ skills — you have 48 real tools, 31 specialist agents, and a 6-layer memory system
+- Never list 250+ skills — you have 72 real tools, 31 specialist agents, and a 6-layer memory system
 - For errors: explain what failed and what to try next
 - If you don't know something: say "I don't know"
 - Direct and concise: 1–3 sentences for simple results; more only when output is rich
@@ -6557,7 +6597,7 @@ IDENTITY — you are NOT a static pre-trained model. You have active living syst
 - Growth Engine: tracks failures, learns from them, improves over time
 - XP & Leveling: gains experience, streaks, and levels up
 When asked about capabilities or learning, be accurate. NEVER say you are just a pre-trained model that cannot learn.
-${cognitionHint}${firstMessageContext}${memoryContext}${greetingPreamble}${sessionContext}${memoryIndex}${standingOrders}`;
+${cognitionHint}${memoryContext}${greetingPreamble}${sessionContext}${memoryIndex}`;
     const msgs = [
         { role: 'system', content: chatPrompt },
         ...history.slice(-8),
@@ -6664,8 +6704,9 @@ ${cognitionHint}${firstMessageContext}${memoryContext}${greetingPreamble}${sessi
         }
         else if (providerType === 'custom') {
             // ── Custom OpenAI-compatible endpoint — use the entry's own baseUrl ──
+            const apiEntry = cfg.providers?.apis?.find((a) => a.name === responderChat.apiName);
             const customCp = cfg.customProviders?.find(c => c.id === responderChat.apiName);
-            const endpoint = customCp?.baseUrl || '';
+            const endpoint = apiEntry?.baseUrl || customCp?.baseUrl || '';
             if (!endpoint)
                 throw new Error(`Custom provider "${responderChat.apiName}" has no baseUrl`);
             const resp = await fetch(endpoint, {
@@ -6717,6 +6758,7 @@ ${cognitionHint}${firstMessageContext}${memoryContext}${greetingPreamble}${sessi
                 cerebras: 'https://api.cerebras.ai/v1/chat/completions',
                 openai: 'https://api.openai.com/v1/chat/completions',
                 boa: 'https://api.bayofassets.com/v1/chat/completions',
+                mistral: 'https://api.mistral.ai/v1/chat/completions',
             };
             const endpoint = ENDPOINTS[providerType] ?? ENDPOINTS['groq'];
             const resp = await fetch(endpoint, {
@@ -6776,6 +6818,7 @@ ${cognitionHint}${firstMessageContext}${memoryContext}${greetingPreamble}${sessi
                         cerebras: 'https://api.cerebras.ai/v1/chat/completions',
                         openai: 'https://api.openai.com/v1/chat/completions',
                         boa: 'https://api.bayofassets.com/v1/chat/completions',
+                        mistral: 'https://api.mistral.ai/v1/chat/completions',
                     };
                     const fbEndpoint = ENDPOINTS[cloudTier.providerName] ?? ENDPOINTS['groq'];
                     const fbHeaders = {
@@ -6829,7 +6872,7 @@ ${cognitionHint}${firstMessageContext}${memoryContext}${greetingPreamble}${sessi
         if (providerType !== 'ollama') {
             console.warn(`[Router] ${providerType} failed — falling back to Ollama`);
             try {
-                const ollamaModel = cfg.model?.activeModel || 'gemma4:e4b';
+                const ollamaModel = cfg.ollama?.model || 'gemma4:e4b';
                 const ollamaMs = (0, modelDiscovery_1.getOllamaTimeout)(ollamaModel); // full timeout — model may need to load
                 const resp = await fetch('http://localhost:11434/api/chat', {
                     method: 'POST',
@@ -6871,7 +6914,7 @@ ${cognitionHint}${firstMessageContext}${memoryContext}${greetingPreamble}${sessi
         }
         // Both failed — send a graceful error token
         console.error('[Router] All providers failed. Last error:', err?.message ?? 'unknown');
-        send({ token: `I'm temporarily unavailable — my AI providers are at capacity. Please try again in a few minutes, or add more API keys in Settings → API Keys.`, done: false, provider: 'error' });
+        send({ token: (0, diagnosticError_1.buildDiagnostic)({ tool: 'respond', provider: 'all', retries: 2, error: 'All AI providers failed or are at capacity', suggestion: 'Try again in a few minutes, or add more API keys in Settings → API Keys.' }), done: false, provider: 'error' });
     }
     streamEnded = true;
     clearTimeout(timeout);