Resolve merge conflicts with Mistral provider

Include both Mistral and Ollama providers in factory,
config, and env docs.

lib/llm/index.mjs

@@ -1,21 +1,23 @@
 // LLM Factory — creates the configured provider or returns null
 
-import { AnthropicProvider } from './anthropic.mjs';
-import { OpenAIProvider } from './openai.mjs';
-import { OpenRouterProvider } from './openrouter.mjs';
-import { GeminiProvider } from './gemini.mjs';
-import { CodexProvider } from './codex.mjs';
-import { MiniMaxProvider } from './minimax.mjs';
-import { OllamaProvider } from './ollama.mjs';
+import { AnthropicProvider } from "./anthropic.mjs";
+import { OpenAIProvider } from "./openai.mjs";
+import { OpenRouterProvider } from "./openrouter.mjs";
+import { GeminiProvider } from "./gemini.mjs";
+import { CodexProvider } from "./codex.mjs";
+import { MiniMaxProvider } from "./minimax.mjs";
+import { MistralProvider } from "./mistral.mjs";
+import { OllamaProvider } from "./ollama.mjs";
 
-export { LLMProvider } from './provider.mjs';
-export { AnthropicProvider } from './anthropic.mjs';
-export { OpenAIProvider } from './openai.mjs';
-export { OpenRouterProvider } from './openrouter.mjs';
-export { GeminiProvider } from './gemini.mjs';
-export { CodexProvider } from './codex.mjs';
-export { MiniMaxProvider } from './minimax.mjs';
-export { OllamaProvider } from './ollama.mjs';
+export { LLMProvider } from "./provider.mjs";
+export { AnthropicProvider } from "./anthropic.mjs";
+export { OpenAIProvider } from "./openai.mjs";
+export { OpenRouterProvider } from "./openrouter.mjs";
+export { GeminiProvider } from "./gemini.mjs";
+export { CodexProvider } from "./codex.mjs";
+export { MiniMaxProvider } from "./minimax.mjs";
+export { MistralProvider } from "./mistral.mjs";
+export { OllamaProvider } from "./ollama.mjs";
 
 /**
  * Create an LLM provider based on config.
@@ -28,22 +30,26 @@ export function createLLMProvider(llmConfig) {
   const { provider, apiKey, model } = llmConfig;
 
   switch (provider.toLowerCase()) {
-    case 'anthropic':
+    case "anthropic":
       return new AnthropicProvider({ apiKey, model });
-    case 'openai':
+    case "openai":
       return new OpenAIProvider({ apiKey, model });
-    case 'openrouter':
+    case "openrouter":
       return new OpenRouterProvider({ apiKey, model });
-    case 'gemini':
+    case "gemini":
       return new GeminiProvider({ apiKey, model });
-    case 'codex':
+    case "codex":
       return new CodexProvider({ model });
-    case 'minimax':
+    case "minimax":
       return new MiniMaxProvider({ apiKey, model });
-    case 'ollama':
+    case "mistral":
+      return new MistralProvider({ apiKey, model });
+    case "ollama":
       return new OllamaProvider({ model, baseUrl: llmConfig.baseUrl });
     default:
-      console.warn(`[LLM] Unknown provider "${provider}". LLM features disabled.`);
+      console.warn(
+        `[LLM] Unknown provider "${provider}". LLM features disabled.`,
+      );
       return null;
   }
 }

lib/llm/mistral.mjs

@@ -0,0 +1,51 @@
+// Mistral AI Provider — raw fetch, no SDK
+// Uses Mistral's OpenAI-compatible Chat Completions API
+
+import { LLMProvider } from './provider.mjs';
+
+export class MistralProvider extends LLMProvider {
+  constructor(config) {
+    super(config);
+    this.name = 'mistral';
+    this.apiKey = config.apiKey;
+    this.model = config.model || 'mistral-large-latest';
+  }
+
+  get isConfigured() { return !!this.apiKey; }
+
+  async complete(systemPrompt, userMessage, opts = {}) {
+    const res = await fetch('https://api.mistral.ai/v1/chat/completions', {
+      method: 'POST',
+      headers: {
+        'Content-Type': 'application/json',
+        'Authorization': `Bearer ${this.apiKey}`,
+      },
+      body: JSON.stringify({
+        model: this.model,
+        max_tokens: opts.maxTokens || 4096,
+        messages: [
+          { role: 'system', content: systemPrompt },
+          { role: 'user', content: userMessage },
+        ],
+      }),
+      signal: AbortSignal.timeout(opts.timeout || 60000),
+    });
+
+    if (!res.ok) {
+      const err = await res.text().catch(() => '');
+      throw new Error(`Mistral API ${res.status}: ${err.substring(0, 200)}`);
+    }
+
+    const data = await res.json();
+    const text = data.choices?.[0]?.message?.content || '';
+
+    return {
+      text,
+      usage: {
+        inputTokens: data.usage?.prompt_tokens || 0,
+        outputTokens: data.usage?.completion_tokens || 0,
+      },
+      model: data.model || this.model,
+    };
+  }
+}