micro-models-agent 0.46.1 → 0.46.3

package/dist/main.js

@@ -2263,9 +2263,7 @@ var init_defaults = __esm(() => {
     retry: {
       maxRetries: 3,
       baseDelay: 1000,
-      maxDelay: 30000,
-      maxStreamRetries: 2,
-      noDataTimeoutMs: 60000
+      maxDelay: 30000
     },
     maxToolIterations: 1000,
     stuckThreshold: 6,
@@ -2398,8 +2396,6 @@ Use read_file on {path} to see the current content before editing — the target
     "error.llm_retries": "LLM request failed after retries",
     "error.llm_429": "Rate limit exceeded (HTTP 429) for {model} on {baseUrl}. The provider is throttling requests — free models are especially strict. Get an API key or switch to a paid/faster model: {baseUrl}",
     "error.no_response_body": "No response body stream",
-    "error.llm_stream_idle": "LLM stream stalled — no data for {timeout}ms",
-    "error.llm_timeout": "LLM request timed out ({timeout}ms)",
     "session.started": "Session started: {id}",
     "session.ended": "Session ended: {id}",
     "session.not_found": "Session not found: {id}",
@@ -2783,19 +2779,6 @@ Available commands:`,
     "repl.lsp_timeout": "timeout",
     "repl.lsp_failed": "did not start",
     "repl.lsp_unknown": "unknown",
-    "repl.lsp": "LSP server management (status, restart, check)",
-    "repl.lsp_usage": "Usage: /lsp [status|restart|check <path>]",
-    "repl.lsp_not_available": "LSP module not available",
-    "repl.lsp_status_header": "LSP Status:",
-    "repl.lsp_enabled": "Enabled:",
-    "repl.lsp_disabled_servers": "Disabled servers:",
-    "repl.lsp_failure_counts": "Failure counts:",
-    "repl.lsp_all_ok": "All servers operational",
-    "repl.lsp_restarting": "Resetting LSP server state...",
-    "repl.lsp_restarted": "LSP servers reset. Failed servers will be retried on next use.",
-    "repl.lsp_check_usage": "Usage: /lsp check <file-or-directory>",
-    "repl.lsp_checking": "Running LSP check on {path}...",
-    "repl.lsp_check_error": "LSP check failed: {error}",
     "repl.work_dir": "Dir:",
     "repl.agents_label": "Instructions:",
     "repl.not_found": "not found",
@@ -3023,6 +3006,10 @@ Apply a matching solution from these results. If none is relevant — do NOT rep
     "tools.hidden_header": "Additional tools (enable on demand via enable_tools or route to subagent tool_tags):",
     "tool.friendly.enable_tools": "Enable tools",
     "cli.provider_base_hint": "Base URL set to: {baseUrl}",
+    "cli.add_provider": "Add a provider to the config",
+    "cli.provider_no_url": 'No base URL for provider "{name}". Pass --url.',
+    "cli.provider_added": "Provider added: {name}",
+    "cli.provider_switch_hint": "Switch to it with: mma provider use <name>",
     "repl.cost": "Total cost: {cost}",
     "repl.tokens": "Tokens used: {tokens}"
   };
@@ -3076,8 +3063,6 @@ var init_ru = __esm(() => {
     "error.llm_retries": "Запрос LLM не удался после повторов",
     "error.llm_429": "Превышен лимит запросов (HTTP 429) для {model} на {baseUrl}. Провайдер ограничивает трафик — особенно строгие free-модели. Получите API-ключ или переключитесь на платную/быструю модель: {baseUrl}",
     "error.no_response_body": "Нет потока тела ответа",
-    "error.llm_stream_idle": "Поток LLM завис — нет данных {timeout}мс",
-    "error.llm_timeout": "Время запроса LLM истекло ({timeout}мс)",
     "session.started": "Сессия начата: {id}",
     "session.ended": "Сессия завершена: {id}",
     "session.not_found": "Сессия не найдена: {id}",
@@ -3456,19 +3441,6 @@ var init_ru = __esm(() => {
     "repl.lsp_timeout": "таймаут",
     "repl.lsp_failed": "не стартовал",
     "repl.lsp_unknown": "неизвестно",
-    "repl.lsp": "Управление LSP-серверами (status, restart, check)",
-    "repl.lsp_usage": "Использование: /lsp [status|restart|check <путь>]",
-    "repl.lsp_not_available": "Модуль LSP недоступен",
-    "repl.lsp_status_header": "Статус LSP:",
-    "repl.lsp_enabled": "Включён:",
-    "repl.lsp_disabled_servers": "Отключённые серверы:",
-    "repl.lsp_failure_counts": "Количество ошибок:",
-    "repl.lsp_all_ok": "Все серверы работают",
-    "repl.lsp_restarting": "Сброс состояния LSP-серверов...",
-    "repl.lsp_restarted": "LSP-серверы сброшены. Упавшие серверы будут повторно запущены при следующем использовании.",
-    "repl.lsp_check_usage": "Использование: /lsp check <файл-или-каталог>",
-    "repl.lsp_checking": "Запуск LSP-проверки {path}...",
-    "repl.lsp_check_error": "LSP-проверка не удалась: {error}",
     "repl.work_dir": "Директория:",
     "repl.agents_label": "Инструкции:",
     "repl.not_found": "не найден",
@@ -3702,6 +3674,10 @@ var init_ru = __esm(() => {
     "tools.hidden_header": "Дополнительные тулы (включите по требованию через enable_tools или маршрутизируйте через subagent tool_tags):",
     "tool.friendly.enable_tools": "Включить тулы",
     "cli.provider_base_hint": "Базовый URL установлен: {baseUrl}",
+    "cli.add_provider": "Добавить провайдера в конфиг",
+    "cli.provider_no_url": 'Нет базового URL для провайдера "{name}". Укажите --url.',
+    "cli.provider_added": "Провайдер добавлен: {name}",
+    "cli.provider_switch_hint": "Переключитесь на него: mma provider use <имя>",
     "repl.cost": "Итого потрачено: {cost}",
     "repl.tokens": "Потрачено токенов: {tokens}"
   };
@@ -4643,6 +4619,26 @@ var init_app_logger = __esm(() => {
   };
 });
 
+// src/modules/providers/registry.ts
+class ProviderRegistry {
+  specs = new Map;
+  register(spec) {
+    this.specs.set(spec.type, spec);
+  }
+  get(type) {
+    return this.specs.get(type);
+  }
+  has(type) {
+    return this.specs.has(type);
+  }
+  list() {
+    return [...this.specs.values()];
+  }
+  types() {
+    return [...this.specs.keys()];
+  }
+}
+
 // node_modules/base64-js/index.js
 var require_base64_js = __commonJS((exports) => {
   exports.byteLength = byteLength;
@@ -5204,9 +5200,7 @@ class OpenAICompatProvider {
     this.retryConfig = config.retry ?? {
       maxRetries: 3,
       baseDelay: 1000,
-      maxDelay: 30000,
-      maxStreamRetries: 2,
-      noDataTimeoutMs: 60000
+      maxDelay: 30000
     };
     this.rateLimiter = createRateLimiter(config.rateLimits);
   }
@@ -5237,32 +5231,6 @@ class OpenAICompatProvider {
     }
   }
   async* doStream(messages, tools, signal, options) {
-    const { baseDelay, maxDelay, maxStreamRetries, noDataTimeoutMs } = this.retryConfig;
-    const streamRetries = maxStreamRetries ?? 2;
-    const idleTimeoutMs = noDataTimeoutMs ?? 60000;
-    for (let attempt = 0;; attempt++) {
-      let emitted = false;
-      const onEmit = () => {
-        emitted = true;
-      };
-      try {
-        const sawDone = yield* this.streamOnce(messages, tools, signal, options, onEmit, idleTimeoutMs);
-        if (sawDone || emitted)
-          return;
-        if (attempt >= streamRetries)
-          return;
-      } catch (err) {
-        if (err?.name === "AbortError" || err?.llmTerminal || signal?.aborted)
-          throw err;
-        if (emitted || attempt >= streamRetries)
-          throw err;
-      }
-      const delay = Math.min(baseDelay * Math.pow(2, attempt), maxDelay);
-      const jitter = Math.random() * baseDelay * 0.1;
-      await this.sleep(delay + jitter, signal);
-    }
-  }
-  async* streamOnce(messages, tools, signal, options, onEmit, idleTimeoutMs) {
     const body = buildRequestBody({
       model: this.model,
       messages,
@@ -5278,11 +5246,8 @@ class OpenAICompatProvider {
       headers["Authorization"] = `Bearer ${this.config.apiKey}`;
     }
     const controller = new AbortController;
-    let timedOut = false;
-    const timeoutId = setTimeout(() => {
-      timedOut = true;
-      controller.abort();
-    }, REQUEST_TIMEOUT_MS);
+    const totalTimeoutMs = 120000;
+    const timeoutId = setTimeout(() => controller.abort(), totalTimeoutMs);
     const abortSignal = (() => {
       if (!signal)
         return controller.signal;
@@ -5295,31 +5260,20 @@ class OpenAICompatProvider {
         return controller.signal;
       }
     })();
-    let response;
-    try {
-      response = await this.fetchWithRetry(`${this.config.baseUrl}/chat/completions`, {
-        method: "POST",
-        headers,
-        body: JSON.stringify(body),
-        signal: abortSignal
-      });
-    } catch (err) {
-      if (err?.name === "AbortError")
-        throw err;
-      const wrapped = err instanceof Error ? err : new Error(String(err));
-      wrapped.llmTerminal = true;
-      throw wrapped;
-    }
+    const response = await this.fetchWithRetry(`${this.config.baseUrl}/chat/completions`, {
+      method: "POST",
+      headers,
+      body: JSON.stringify(body),
+      signal: abortSignal
+    });
     if (!response.ok) {
       clearTimeout(timeoutId);
       const errorText = await response.text();
-      const err = new Error(t("error.llm_api", {
+      throw new Error(t("error.llm_api", {
         status: response.status,
         statusText: response.statusText,
         errorText
       }));
-      err.llmTerminal = true;
-      throw err;
     }
     const reader = response.body?.getReader();
     if (!reader) {
@@ -5330,29 +5284,9 @@ class OpenAICompatProvider {
     let buffer = "";
     const toolCallAccs = new Map;
     let usage;
-    let sawDone = false;
-    const readIdle = () => new Promise((resolve, reject) => {
-      const idleTimer = setTimeout(() => {
-        timedOut = true;
-        controller.abort();
-      }, idleTimeoutMs);
-      reader.read().then((result) => {
-        clearTimeout(idleTimer);
-        if (timedOut)
-          reject(new Error(t("error.llm_stream_idle", { timeout: idleTimeoutMs })));
-        else
-          resolve(result);
-      }, (err) => {
-        clearTimeout(idleTimer);
-        if (timedOut)
-          reject(new Error(t("error.llm_stream_idle", { timeout: idleTimeoutMs })));
-        else
-          reject(err);
-      });
-    });
     try {
       while (true) {
-        const { done, value } = await readIdle();
+        const { done, value } = await reader.read();
         if (done)
           break;
         buffer += decoder.decode(value, { stream: true });
@@ -5364,10 +5298,8 @@ class OpenAICompatProvider {
           if (!trimmed || !trimmed.startsWith("data: "))
             continue;
           const data = trimmed.slice(6);
-          if (data === "[DONE]") {
-            sawDone = true;
+          if (data === "[DONE]")
             continue;
-          }
           try {
             const parsed = JSON.parse(data);
             const choice = parsed.choices?.[0];
@@ -5384,7 +5316,6 @@ class OpenAICompatProvider {
             const delta = choice.delta || {};
             const finishReason = choice.finish_reason;
             if (delta.reasoning_content) {
-              onEmit();
               yield { type: "reasoning", content: delta.reasoning_content };
             }
             if (delta.tool_calls) {
@@ -5404,13 +5335,11 @@ class OpenAICompatProvider {
               }
             }
             if (delta.content) {
-              onEmit();
               yield { type: "text", content: delta.content };
             }
             if (finishReason === "tool_calls" && toolCallAccs.size > 0) {
               for (const [, acc] of toolCallAccs) {
                 if (acc.name) {
-                  onEmit();
                   yield {
                     type: "tool_call",
                     toolCall: {
@@ -5427,14 +5356,12 @@ class OpenAICompatProvider {
         }
       }
       if (usage) {
-        onEmit();
         yield { type: "done", usage };
       }
     } finally {
       clearTimeout(timeoutId);
       reader.releaseLock();
     }
-    return sawDone;
   }
   async doNonStreaming(messages, tools, signal, options) {
     const body = buildRequestBody({
@@ -5451,30 +5378,12 @@ class OpenAICompatProvider {
     if (this.config.apiKey && this.config.apiKey !== "not-needed") {
       headers["Authorization"] = `Bearer ${this.config.apiKey}`;
     }
-    const controller = new AbortController;
-    let timedOut = false;
-    const timeoutId = setTimeout(() => {
-      timedOut = true;
-      controller.abort();
-    }, REQUEST_TIMEOUT_MS);
-    const abortSignal = (() => {
-      if (!signal)
-        return controller.signal;
-      try {
-        return AbortSignal.any([controller.signal, signal]);
-      } catch {
-        signal.addEventListener("abort", () => controller.abort(), {
-          once: true
-        });
-        return controller.signal;
-      }
-    })();
     try {
       const response = await this.fetchWithRetry(`${this.config.baseUrl}/chat/completions`, {
         method: "POST",
         headers,
         body: JSON.stringify(body),
-        signal: abortSignal
+        signal
       });
       if (!response.ok) {
         const errorText = await response.text();
@@ -5521,12 +5430,7 @@ class OpenAICompatProvider {
       }
       return chunks;
     } catch (err) {
-      if (timedOut && err?.name === "AbortError") {
-        throw new Error(t("error.llm_timeout", { timeout: REQUEST_TIMEOUT_MS }));
-      }
       throw err instanceof Error ? err : new Error(String(err));
-    } finally {
-      clearTimeout(timeoutId);
     }
   }
   countTokens(text) {
@@ -5610,13 +5514,281 @@ class OpenAICompatProvider {
     });
   }
 }
-var REQUEST_TIMEOUT_MS = 120000;
 var init_openai_compat = __esm(() => {
   init_token_counter();
   init_i18n();
   init_rate_limiter();
 });
 
+// src/modules/providers/presets.ts
+function openaiCompat(opts) {
+  const retry = opts.retry ?? {
+    maxRetries: 3,
+    baseDelay: 1000,
+    maxDelay: 30000
+  };
+  const rateLimits = opts.rateLimits;
+  return new OpenAICompatProvider({
+    model: opts.model,
+    baseUrl: opts.baseUrl,
+    apiKey: opts.apiKey,
+    contextWindow: opts.contextWindow,
+    retry,
+    rateLimits
+  });
+}
+var OPENAI_COMPAT, OPENROUTER, OPENAI, ANTHROPIC, OPENCODE_ZEN, OPENCODE_GO, BUILTIN_PROVIDERS, HOSTED_BASE_URLS;
+var init_presets = __esm(() => {
+  init_openai_compat();
+  OPENAI_COMPAT = {
+    type: "openai-compat",
+    label: "OpenAI-compatible (LM Studio, Ollama, vLLM, etc.)",
+    baseUrl: "",
+    capabilities: {
+      streaming: true,
+      tools: true,
+      vision: false,
+      reasoningEffort: false,
+      listModels: true,
+      requiresKey: false,
+      auth: "bearer"
+    },
+    create: openaiCompat
+  };
+  OPENROUTER = {
+    type: "openrouter",
+    label: "OpenRouter (openrouter.ai)",
+    baseUrl: "https://openrouter.ai/api/v1",
+    capabilities: {
+      streaming: true,
+      tools: true,
+      vision: true,
+      reasoningEffort: false,
+      listModels: true,
+      requiresKey: true,
+      auth: "bearer"
+    },
+    create: openaiCompat
+  };
+  OPENAI = {
+    type: "openai",
+    label: "OpenAI API",
+    baseUrl: "https://api.openai.com/v1",
+    capabilities: {
+      streaming: true,
+      tools: true,
+      vision: true,
+      reasoningEffort: true,
+      listModels: true,
+      requiresKey: true,
+      auth: "bearer"
+    },
+    create: openaiCompat
+  };
+  ANTHROPIC = {
+    type: "anthropic",
+    label: "Anthropic Claude",
+    baseUrl: "https://api.anthropic.com",
+    capabilities: {
+      streaming: false,
+      tools: false,
+      vision: true,
+      reasoningEffort: false,
+      listModels: false,
+      requiresKey: true,
+      auth: "header"
+    },
+    create: openaiCompat
+  };
+  OPENCODE_ZEN = {
+    type: "opencode-zen",
+    label: "OpenCode Zen (opencode.ai/zen)",
+    baseUrl: "https://opencode.ai/zen/v1",
+    capabilities: {
+      streaming: true,
+      tools: true,
+      vision: false,
+      reasoningEffort: false,
+      listModels: true,
+      requiresKey: false,
+      auth: "bearer"
+    },
+    create: openaiCompat
+  };
+  OPENCODE_GO = {
+    type: "opencode-go",
+    label: "OpenCode Go (opencode.ai/go)",
+    baseUrl: "https://opencode.ai/zen/go/v1",
+    capabilities: {
+      streaming: true,
+      tools: true,
+      vision: false,
+      reasoningEffort: false,
+      listModels: true,
+      requiresKey: false,
+      auth: "bearer"
+    },
+    create: openaiCompat
+  };
+  BUILTIN_PROVIDERS = [
+    OPENAI_COMPAT,
+    OPENROUTER,
+    OPENAI,
+    ANTHROPIC,
+    OPENCODE_ZEN,
+    OPENCODE_GO
+  ];
+  HOSTED_BASE_URLS = {};
+  for (const spec of BUILTIN_PROVIDERS) {
+    if (spec.baseUrl)
+      HOSTED_BASE_URLS[spec.type] = spec.baseUrl;
+  }
+});
+
+// src/modules/providers/create.ts
+var exports_create = {};
+__export(exports_create, {
+  defaultRegistry: () => defaultRegistry,
+  createProvider: () => createProvider
+});
+function createProvider(type, opts, registry = defaultRegistry()) {
+  const spec = registry.get(type);
+  if (!spec) {
+    return BUILTIN_PROVIDERS[0].create(opts);
+  }
+  return spec.create(opts);
+}
+function defaultRegistry() {
+  const registry = new ProviderRegistry;
+  for (const spec of BUILTIN_PROVIDERS) {
+    registry.register(spec);
+  }
+  return registry;
+}
+var init_create = __esm(() => {
+  init_presets();
+});
+
+// src/modules/providers/manager.ts
+class ProviderManager {
+  entries;
+  activeProviderName;
+  model;
+  opts;
+  registry;
+  cache = new Map;
+  constructor(config, opts) {
+    this.opts = opts;
+    this.registry = opts.registry ?? defaultRegistry();
+    this.entries = this.normalizeEntries(config);
+    this.activeProviderName = this.resolveActive(config);
+    this.model = "";
+  }
+  get activeModel() {
+    return this.model;
+  }
+  get activeName() {
+    return this.activeProviderName;
+  }
+  get active() {
+    return this.build(this.activeProviderName);
+  }
+  get activeEntry() {
+    const entry = this.entryByName(this.activeProviderName);
+    if (!entry)
+      throw new Error(`Unknown active provider "${this.activeProviderName}"`);
+    return entry;
+  }
+  list() {
+    return this.entries.map((e) => {
+      const preset = this.registry.get(e.type);
+      return { ...e, label: e.label || preset?.label || e.type };
+    });
+  }
+  listNames() {
+    return this.list().map((e) => e.label);
+  }
+  switch(name, model) {
+    if (!this.entryByName(name)) {
+      throw new Error(`Unknown provider "${name}"`);
+    }
+    this.activeProviderName = name;
+    if (model !== undefined)
+      this.model = model;
+    return this.active;
+  }
+  setModel(model) {
+    this.model = model;
+    return this.active;
+  }
+  toConfig() {
+    const active = this.activeEntry;
+    return {
+      active: this.activeProviderName,
+      entries: this.entries,
+      fallback: false,
+      type: active.type,
+      baseUrl: active.baseUrl,
+      apiKey: active.apiKey
+    };
+  }
+  normalizeEntries(config) {
+    if (Array.isArray(config.entries) && config.entries.length > 0) {
+      return config.entries.map((e) => ({ ...e, label: e.label || e.type }));
+    }
+    return [
+      {
+        type: config.type ?? "openai-compat",
+        label: config.type ?? "openai-compat",
+        baseUrl: config.baseUrl ?? "",
+        apiKey: config.apiKey
+      }
+    ];
+  }
+  resolveActive(config) {
+    if (config.active && this.entryByName(config.active))
+      return config.active;
+    const first = this.entries[0];
+    return first ? first.label ?? "openai-compat" : "openai-compat";
+  }
+  entryByName(name) {
+    return this.entries.find((e) => e.label === name || e.type === name);
+  }
+  build(name) {
+    const entry = this.entryByName(name);
+    if (!entry)
+      throw new Error(`Unknown provider "${name}"`);
+    const key = `${name}|${this.model}`;
+    const cached = this.cache.get(key);
+    if (cached)
+      return cached;
+    const provider = createProvider(entry.type, {
+      model: this.model,
+      baseUrl: entry.baseUrl,
+      apiKey: entry.apiKey,
+      contextWindow: entry.contextWindow ?? this.opts.contextWindow,
+      retry: entry.retry ?? this.opts.retry,
+      rateLimits: entry.rateLimits ?? this.opts.rateLimits
+    }, this.registry);
+    this.cache.set(key, provider);
+    return provider;
+  }
+  resetCache() {
+    this.cache.clear();
+  }
+}
+var init_manager = __esm(() => {
+  init_create();
+  init_presets();
+});
+
+// src/modules/providers/index.ts
+var init_providers = __esm(() => {
+  init_create();
+  init_manager();
+  init_presets();
+});
+
 // src/llm/model-loader.ts
 class ModelLoader {
   baseUrl;
@@ -6388,10 +6560,20 @@ var init_audit_log = __esm(() => {
 });
 
 // src/tools/path-utils.ts
-import { resolve as resolve3, normalize as normalize2, dirname as dirname3, basename, sep } from "path";
+import { resolve as resolve3, normalize as normalize2, dirname as dirname3, basename, sep, isAbsolute } from "path";
 import { existsSync as existsSync9 } from "fs";
 function safeResolvePath(baseDir, userPath) {
   const norm = normalize2(userPath);
+  if (isAbsolute(norm)) {
+    if (existsSync9(norm) || existsSync9(dirname3(norm)))
+      return norm;
+    const stripped2 = norm.replace(/^[/\\]/, "");
+    const relativeCandidate = resolve3(baseDir, stripped2);
+    if (existsSync9(relativeCandidate) || existsSync9(dirname3(relativeCandidate))) {
+      return relativeCandidate;
+    }
+    return norm;
+  }
   const stripped = norm.replace(/^[/\\]/, "");
   const resolved = resolve3(baseDir, stripped);
   if (existsSync9(resolved) || existsSync9(dirname3(resolved)))
@@ -8375,9 +8557,11 @@ var init_prompt_builder = __esm(() => {
 // src/core/session-logger.ts
 class SessionLogger {
   session;
+  getCaller;
   logger;
-  constructor(session, logger) {
+  constructor(session, logger, getCaller) {
     this.session = session;
+    this.getCaller = getCaller;
     this.logger = logger;
     this.bindSessionDir();
   }
@@ -8415,12 +8599,15 @@ class SessionLogger {
     });
   }
   logAssistant(content, reasoning, toolCalls, iteration) {
+    const caller = this.getCaller?.();
     if (reasoning) {
       this.session?.appendLog({
         ts: new Date().toISOString(),
         type: "reasoning",
         content: reasoning,
-        iteration
+        iteration,
+        provider: caller?.provider,
+        model: caller?.model
       });
     }
     this.session?.appendLog({
@@ -8434,14 +8621,19 @@ class SessionLogger {
           arguments: tc.arguments
         }))
       } : {},
-      iteration
+      iteration,
+      provider: caller?.provider,
+      model: caller?.model
     });
   }
   saveAssistantMessage(content) {
+    const caller = this.getCaller?.();
     this.session?.appendMessage({
       role: "assistant",
       content: content.slice(0, 500),
-      timestamp: new Date().toISOString()
+      timestamp: new Date().toISOString(),
+      provider: caller?.provider,
+      model: caller?.model
     });
   }
   logToolDefs(toolCount, toolNames, iteration) {
@@ -8464,11 +8656,14 @@ class SessionLogger {
     });
   }
   logToolResult(call, result, duration, iteration) {
+    const caller = this.getCaller?.();
     this.session?.appendMessage({
       role: "tool",
       content: result.output.slice(0, 500),
       name: call.name,
-      timestamp: new Date().toISOString()
+      timestamp: new Date().toISOString(),
+      provider: caller?.provider,
+      model: caller?.model
     });
     this.session?.appendLog({
       ts: new Date().toISOString(),
@@ -8479,7 +8674,9 @@ class SessionLogger {
       content: result.output.slice(0, 1000),
       diff: result.diff,
       duration,
-      iteration
+      iteration,
+      provider: caller?.provider,
+      model: caller?.model
     });
   }
   logCompaction(info) {
@@ -8506,6 +8703,8 @@ class SessionLogger {
       type: "context",
       content: info.kind === "start" ? "context snapshot at session start" : `context at iteration ${info.iteration}`,
       iteration: info.iteration,
+      provider: info.provider,
+      model: info.model,
       window: info.window,
       systemBudget: info.systemBudget,
       reserveBudget: info.reserveBudget,
@@ -8525,6 +8724,8 @@ class SessionLogger {
       ts: new Date().toISOString(),
       type: "llm_usage",
       iteration,
+      provider: usage.provider,
+      model: usage.model,
       promptTokens: usage.promptTokens,
       completionTokens: usage.completionTokens,
       totalTokens: usage.totalTokens,
@@ -9337,18 +9538,20 @@ class OrchestratorClient {
     this.config = config;
     if (config.model) {
       if (config.provider) {
-        this.provider = new OpenAICompatProvider({
+        this.provider = createProvider(config.provider.type ?? "openai-compat", {
           model: config.model,
           baseUrl: config.provider.baseUrl || "http://localhost:1234/v1",
           apiKey: config.provider.apiKey,
+          contextWindow: 32768,
           retry: config.retry
         });
       } else if (defaultProvider) {
         this.provider = defaultProvider;
       } else {
-        this.provider = new OpenAICompatProvider({
+        this.provider = createProvider("openai-compat", {
           model: config.model,
           baseUrl: "http://localhost:1234/v1",
+          contextWindow: 32768,
           retry: config.retry
         });
       }
@@ -9515,7 +9718,7 @@ Respond with JSON only:
 
 Max 3 re-plan cycles. After 3 cycles, return partial result.`;
 var init_orchestrator = __esm(() => {
-  init_openai_compat();
+  init_create();
   init_esm();
 });
 
@@ -10213,7 +10416,7 @@ var init_stuck_detector = __esm(() => {
 
 // src/modules/artifacts/store.ts
 import { existsSync as existsSync18, mkdirSync as mkdirSync11, readFileSync as readFileSync9, writeFileSync as writeFileSync7 } from "node:fs";
-import { resolve as resolve10, relative, isAbsolute } from "node:path";
+import { resolve as resolve10, relative, isAbsolute as isAbsolute2 } from "node:path";
 
 class ArtifactStore {
   root;
@@ -10233,7 +10436,7 @@ class ArtifactStore {
     const rel = relative(root, candidate);
     if (rel === "")
       return true;
-    return !rel.startsWith("..") && !isAbsolute(rel);
+    return !rel.startsWith("..") && !isAbsolute2(rel);
   }
   save(name, content, ext = "md") {
     const safe = ArtifactStore.sanitizeName(name);
@@ -11580,6 +11783,8 @@ var init_pricing = __esm(() => {
 });
 
 // src/core/agent.ts
+import { join as join14 } from "path";
+import { homedir as homedir5 } from "os";
 function isToolCallJson(text) {
   const trimmed = text.trim();
   if (trimmed.startsWith("{") || trimmed.startsWith("[")) {
@@ -11644,6 +11849,17 @@ class Agent {
       blocks: result.blocks
     };
   }
+  callerProvenance() {
+    const manager = this.deps.providerManager;
+    if (manager) {
+      return {
+        provider: manager.activeName,
+        model: manager.activeModel || this.deps.config.model
+      };
+    }
+    const p = this.deps.config.provider;
+    return { provider: p.type, model: this.deps.config.model };
+  }
   logContextStat(kind, iteration, slog, blocks) {
     const cm = this.deps.contextManager;
     if (typeof cm.getSnapshot !== "function")
@@ -11651,9 +11867,12 @@ class Agent {
     const snap = cm.getSnapshot();
     const history = cm.getActiveHistory();
     const systemMsg = history.find((m) => m.role === "system");
+    const caller = this.callerProvenance();
     slog.logContext({
       kind,
       iteration,
+      provider: caller.provider,
+      model: caller.model,
       window: snap.window,
       systemBudget: snap.budget.systemPrompt,
       reserveBudget: snap.budget.responseReserve,
@@ -11712,7 +11931,6 @@ ${t("tool.truncated", { tokens: Math.ceil(removedChars / 2) })}`;
     onPhase?.(phase);
   }
   async run(input, onChunk, onMeta, onTool, onPhase) {
-    this.shutdownRequested = false;
     this.setScope();
     const {
       config,
@@ -11724,7 +11942,7 @@ ${t("tool.truncated", { tokens: Math.ceil(removedChars / 2) })}`;
       sessionManager,
       baseDir
     } = this.deps;
-    const slog = new SessionLogger(sessionManager, logger);
+    const slog = new SessionLogger(sessionManager, logger, () => this.callerProvenance());
     if (sessionManager && !sessionManager.getActive()) {
       sessionManager.create();
       logger.debug(`Session started: ${sessionManager.getActive()}`);
@@ -11786,7 +12004,7 @@ ${t("tool.truncated", { tokens: Math.ceil(removedChars / 2) })}`;
       sessionManager,
       baseDir
     } = this.deps;
-    const slog = new SessionLogger(sessionManager, logger);
+    const slog = new SessionLogger(sessionManager, logger, () => this.callerProvenance());
     this.abortController = new AbortController;
     let iteration = 0;
     let lastText = "";
@@ -11889,7 +12107,7 @@ ${t("tool.truncated", { tokens: Math.ceil(removedChars / 2) })}`;
       const llmStart = Date.now();
       const promptBefore = apiPromptTokens;
       const completionBefore = apiCompletionTokens;
-      logger.logLLMRequest(config.model, history.length, input, "agent");
+      logger.logLLMRequest(config.model, history.length, input, this.callerProvenance().provider);
       try {
         for await (const chunk of llmProvider.chat(history, allToolsForBudget, this.abortController?.signal)) {
           if (this.shutdownRequested)
@@ -11951,14 +12169,17 @@ ${t("tool.truncated", { tokens: Math.ceil(removedChars / 2) })}`;
         this.emitPhase(iteration, "done", onPhase);
       }
       apiCompletionChars += (textContent || reasoningContent).length;
-      logger.logLLMResponse(config.model, (textContent || reasoningContent).length, Date.now() - llmStart, undefined, "agent");
+      logger.logLLMResponse(config.model, (textContent || reasoningContent).length, Date.now() - llmStart, undefined, this.callerProvenance().provider);
       {
         const usagePrompt = apiPromptTokens - promptBefore;
         const usageCompletion = apiCompletionTokens - completionBefore;
         const source = usagePrompt > 0 || usageCompletion > 0 ? "api" : "estimate";
         const prompt = source === "api" ? usagePrompt : contextManager.getEstimatedTokens();
         const completion = source === "api" ? usageCompletion : Math.ceil((textContent || reasoningContent).length / 4);
+        const caller = this.callerProvenance();
         slog.logLlmUsage(iteration, {
+          provider: caller.provider,
+          model: caller.model,
           promptTokens: prompt,
           completionTokens: completion,
           totalTokens: prompt + completion,
@@ -12075,6 +12296,7 @@ ${t("tool.truncated", { tokens: Math.ceil(removedChars / 2) })}`;
             arguments: call.arguments
           });
           const tokensAfterTool = contextManager.getEstimatedTokens();
+          const caller = this.callerProvenance();
           onTool?.({
             type: "end",
             tool: call.name,
@@ -12082,7 +12304,9 @@ ${t("tool.truncated", { tokens: Math.ceil(removedChars / 2) })}`;
             duration,
             error: !result.success,
             ctxDelta: tokensAfterTool - tokensBeforeTool,
-            costUsd: this.costTracker.total
+            costUsd: this.costTracker.total,
+            provider: caller.provider,
+            model: caller.model
           });
           summaries.push(`[Tool: ${call.name} (${JSON.stringify(call.arguments)}) → ${truncatedOutput.slice(0, 200)}]`);
           if (config.session.autoSave) {
@@ -12342,23 +12566,57 @@ ${warnLine}
     this.systemPromptAdded = false;
   }
   async reconfigure(config) {
-    const { OpenAICompatProvider: OpenAICompatProvider2 } = await Promise.resolve().then(() => (init_openai_compat(), exports_openai_compat));
     const { TokenCounter: TokenCounter2 } = await Promise.resolve().then(() => (init_token_counter(), exports_token_counter));
-    const newProvider = new OpenAICompatProvider2({
-      model: config.model,
-      baseUrl: config.provider.baseUrl,
+    const manager = this.deps.providerManager;
+    const newProvider = manager ? manager.setModel(config.model) : await this.buildLegacyProvider(config, config.model);
+    this.deps.llmProvider = newProvider;
+    this.deps.toolExecutor.updateProvider(newProvider);
+    this.deps.toolExecutor.ctx.llmProvider = newProvider;
+    const newTokenCounter = new TokenCounter2(config.model);
+    this.deps.contextManager.resize(config.contextWindow, config.contextBudget, newTokenCounter);
+    this.deps.config = config;
+    this.costTracker.setModel(config.model);
+  }
+  async buildLegacyProvider(config, model) {
+    const { createProvider: createProvider2 } = await Promise.resolve().then(() => (init_create(), exports_create));
+    return createProvider2(config.provider.type ?? "openai-compat", {
+      model,
+      baseUrl: config.provider.baseUrl ?? "",
       apiKey: config.provider.apiKey,
       contextWindow: config.contextWindow,
       retry: config.retry,
       rateLimits: config.security?.rateLimits
     });
+  }
+  async setProvider(name, model) {
+    const manager = this.deps.providerManager;
+    if (!manager) {
+      throw new Error("ProviderManager is not available (legacy single-provider config)");
+    }
+    const newProvider = manager.switch(name, model ?? this.deps.config.model);
+    const config = this.deps.config;
+    config.provider.active = name;
+    config.provider.type = manager.activeEntry.type;
+    config.provider.baseUrl = manager.activeEntry.baseUrl;
+    config.provider.apiKey = manager.activeEntry.apiKey;
     this.deps.llmProvider = newProvider;
     this.deps.toolExecutor.updateProvider(newProvider);
     this.deps.toolExecutor.ctx.llmProvider = newProvider;
-    const newTokenCounter = new TokenCounter2(config.model);
-    this.deps.contextManager.resize(config.contextWindow, config.contextBudget, newTokenCounter);
-    this.deps.config = config;
-    this.costTracker.setModel(config.model);
+    this.costTracker.setModel(newProvider.model);
+    const configPath = join14(homedir5(), ".mma", "config.json");
+    const { saveConfig: saveConfig2 } = await Promise.resolve().then(() => (init_config2(), exports_config));
+    saveConfig2(config, configPath);
+  }
+  listProviders() {
+    const manager = this.deps.providerManager;
+    if (!manager)
+      return [];
+    return manager.list().map((e) => ({
+      type: e.type,
+      label: e.label,
+      baseUrl: e.baseUrl,
+      active: e.label === manager.activeName
+    }));
   }
   setContext(messages) {
     const { contextManager } = this.deps;
@@ -12385,6 +12643,7 @@ ${warnLine}
     if (killed > 0) {
       logger.info(`Killed ${killed} background process(es) on shutdown`);
     }
+    logger.closeSessionLog();
     pluginManager.runOnSessionEnd({
       logger,
       sessionManager: sessionManager?.getActiveMeta(),
@@ -12861,7 +13120,7 @@ ${lines.join(`
   }
 }
 var COMPACTION_INTERVAL = 15, KEEP_LAST_N = 6;
-var init_manager = __esm(() => {
+var init_manager2 = __esm(() => {
   init_fact_extractor();
 });
 
@@ -12958,7 +13217,7 @@ var init_confidence = __esm(() => {
 
 // src/modules/hallucination/factual.ts
 import { existsSync as existsSync23, readdirSync as readdirSync7 } from "fs";
-import { resolve as resolve14, isAbsolute as isAbsolute2, join as join14 } from "path";
+import { resolve as resolve14, isAbsolute as isAbsolute3, join as join15 } from "path";
 
 class FactualCheck {
   baseDir;
@@ -12997,7 +13256,7 @@ class FactualCheck {
     return { status: "pass" };
   }
   pathExists(fp) {
-    if (isAbsolute2(fp))
+    if (isAbsolute3(fp))
       return existsSync23(fp);
     if (this.knownFiles.has(fp))
       return true;
@@ -13052,7 +13311,7 @@ class FactualCheck {
     for (const entry of entries) {
       if (count >= FactualCheck.MAX_INDEXED_FILES)
         break;
-      const full = join14(dir, entry.name);
+      const full = join15(dir, entry.name);
       if (entry.isDirectory()) {
         if (!IGNORED_DIRS.has(entry.name)) {
           count = this.scanDir(full, index, count);
@@ -13226,7 +13485,7 @@ var init_detector = __esm(() => {
 });
 
 // src/modules/lsp/command.ts
-import { delimiter, join as join15 } from "path";
+import { delimiter, join as join16 } from "path";
 import { existsSync as existsSync24 } from "fs";
 import { platform as platform3 } from "os";
 function resolveSpawnCommand(command, platformName = platform3(), pathEnv = process.env.PATH ?? "") {
@@ -13238,7 +13497,7 @@ function resolveSpawnCommand(command, platformName = platform3(), pathEnv = proc
   const dirs = pathEnv.split(delimiter).filter(Boolean);
   for (const dir of dirs) {
     for (const ext of WIN_EXTS) {
-      const candidate = join15(dir, `${command}${ext}`);
+      const candidate = join16(dir, `${command}${ext}`);
       if (existsSync24(candidate))
         return `${command}${ext}`;
     }
@@ -13516,7 +13775,7 @@ class PluginManager {
     return chunk;
   }
 }
-var init_manager2 = __esm(() => {
+var init_manager3 = __esm(() => {
   init_checker();
 });
 
@@ -13536,9 +13795,9 @@ Workflow rules:
 var init_subagent = __esm(() => {
   init_i18n();
   init_agent();
-  init_manager();
-  init_detector();
   init_manager2();
+  init_detector();
+  init_manager3();
   init_audit_log();
   init_session_isolation();
   init_store();
@@ -14611,8 +14870,8 @@ var init_pipeline_run = __esm(() => {
   init_engine();
   init_parser();
   init_agent();
-  init_manager();
   init_manager2();
+  init_manager3();
   init_detector();
   init_audit_log();
   init_session_isolation();
@@ -15198,8 +15457,8 @@ ${JSON.stringify(result, null, 2)}`
 
 // src/tools/search-history.ts
 import * as fs from "fs";
-import { join as join16 } from "path";
-import { homedir as homedir5 } from "os";
+import { join as join17 } from "path";
+import { homedir as homedir6 } from "os";
 function searchFile(filePath, query, maxResults, results) {
   if (!fs.existsSync(filePath))
     return;
@@ -15243,7 +15502,7 @@ var init_search_history = __esm(() => {
       const query = String(args.query || "").toLowerCase();
       const maxResults = Number(args.maxResults) || 5;
       const sessionId = args.sessionId ? String(args.sessionId) : null;
-      const sessionDir = join16(homedir5(), ".mma", "sessions");
+      const sessionDir = join17(homedir6(), ".mma", "sessions");
       const results = [];
       try {
         if (!fs.existsSync(sessionDir)) {
@@ -15258,7 +15517,7 @@ var init_search_history = __esm(() => {
             continue;
           if (sessionId && entry.name !== sessionId)
             continue;
-          const historyFile = join16(sessionDir, entry.name, "history.jsonl");
+          const historyFile = join17(sessionDir, entry.name, "history.jsonl");
           searchFile(historyFile, query, maxResults, results);
           if (results.length >= maxResults)
             break;
@@ -15286,7 +15545,7 @@ var init_search_history = __esm(() => {
 
 // src/modules/memory/search.ts
 import { readFileSync as readFileSync13, existsSync as existsSync26 } from "fs";
-import { join as join17 } from "path";
+import { join as join18 } from "path";
 
 class MemorySearch {
   memoryDir;
@@ -15297,7 +15556,7 @@ class MemorySearch {
     const results = [];
     const lowerQuery = query.toLowerCase();
     for (const name of MEMORY_FILES) {
-      const path = join17(this.memoryDir, `${name}.md`);
+      const path = join18(this.memoryDir, `${name}.md`);
       if (!existsSync26(path))
         continue;
       const content = readFileSync13(path, "utf-8");
@@ -15309,7 +15568,7 @@ class MemorySearch {
         }
       }
     }
-    const prefsPath = join17(this.memoryDir, "preferences.json");
+    const prefsPath = join18(this.memoryDir, "preferences.json");
     if (existsSync26(prefsPath)) {
       try {
         const prefs = JSON.parse(readFileSync13(prefsPath, "utf-8"));
@@ -15331,7 +15590,7 @@ var init_search = __esm(() => {
 
 // src/modules/memory/store.ts
 import { readFileSync as readFileSync14, writeFileSync as writeFileSync9, appendFileSync as appendFileSync5, existsSync as existsSync27, mkdirSync as mkdirSync13 } from "fs";
-import { join as join18 } from "path";
+import { join as join19 } from "path";
 
 class MemoryStore {
   memoryDir;
@@ -15339,7 +15598,7 @@ class MemoryStore {
     this.memoryDir = memoryDir;
     this.ensureDir();
     for (const name of MEMORY_FILES2) {
-      const path = join18(this.memoryDir, `${name}.md`);
+      const path = join19(this.memoryDir, `${name}.md`);
       if (!existsSync27(path)) {
         writeFileSync9(path, `# ${name.charAt(0).toUpperCase() + name.slice(1)}
 
@@ -15353,13 +15612,13 @@ class MemoryStore {
     }
   }
   read(name) {
-    const path = join18(this.memoryDir, `${name}.md`);
+    const path = join19(this.memoryDir, `${name}.md`);
     if (!existsSync27(path))
       return "";
     return readFileSync14(path, "utf-8");
   }
   append(name, entry) {
-    const path = join18(this.memoryDir, `${name}.md`);
+    const path = join19(this.memoryDir, `${name}.md`);
     const timestamp = new Date().toISOString().replace("T", " ").slice(0, 19);
     const formatted = `- **${timestamp}** — ${entry}
 `;
@@ -15370,7 +15629,7 @@ class MemoryStore {
     return searchModule.query(query);
   }
   prefsPath() {
-    return join18(this.memoryDir, "preferences.json");
+    return join19(this.memoryDir, "preferences.json");
   }
   getPreferences() {
     const path = this.prefsPath();
@@ -15409,8 +15668,8 @@ var init_store2 = __esm(() => {
 });
 
 // src/tools/remember.ts
-import { homedir as homedir6 } from "os";
-import { join as join19 } from "path";
+import { homedir as homedir7 } from "os";
+import { join as join20 } from "path";
 var CATEGORIES, rememberTool;
 var init_remember = __esm(() => {
   init_i18n();
@@ -15449,7 +15708,7 @@ var init_remember = __esm(() => {
       if (!CATEGORIES.includes(category)) {
         return { success: false, output: t("tool.invalid_params") };
       }
-      const memoryDir = join19(homedir6(), ".mma", "memory");
+      const memoryDir = join20(homedir7(), ".mma", "memory");
       const store = new MemoryStore(memoryDir);
       try {
         if (category === "preferences") {
@@ -15481,8 +15740,8 @@ var init_remember = __esm(() => {
 });
 
 // src/tools/recall.ts
-import { homedir as homedir7 } from "os";
-import { join as join20 } from "path";
+import { homedir as homedir8 } from "os";
+import { join as join21 } from "path";
 function formatAll(store) {
   const parts = [];
   const prefs = store.getPreferences();
@@ -15566,7 +15825,7 @@ var init_recall = __esm(() => {
     handler: async (_ctx, args) => {
       const query = args.query ? String(args.query) : "";
       const category = args.category ? String(args.category) : "";
-      const memoryDir = join20(homedir7(), ".mma", "memory");
+      const memoryDir = join21(homedir8(), ".mma", "memory");
       const store = new MemoryStore(memoryDir);
       try {
         if (!query && !category) {
@@ -15617,13 +15876,13 @@ __export(exports_bridge_client, {
 });
 import { spawn as spawn4 } from "child_process";
 import { createInterface } from "readline";
-import { dirname as dirname10, join as join21 } from "path";
+import { dirname as dirname10, join as join22 } from "path";
 import { fileURLToPath } from "url";
 function bridgeScriptPath() {
   const dir = dirname10(fileURLToPath(import.meta.url));
   const candidates = [
-    join21(dir, "bridge-server.mjs"),
-    join21(dir, "modules", "browser", "bridge-server.mjs")
+    join22(dir, "bridge-server.mjs"),
+    join22(dir, "modules", "browser", "bridge-server.mjs")
   ];
   return pickExistingPath(candidates);
 }
@@ -16177,15 +16436,15 @@ function buildTextExtractionScript() {
 
 // src/modules/browser/cookie-store.ts
 import { readFile, writeFile, mkdir } from "fs/promises";
-import { join as join22 } from "path";
+import { join as join23 } from "path";
 
 class CookieStore {
   filePath;
   constructor(cookieDir) {
-    this.filePath = join22(cookieDir, "cookies.json");
+    this.filePath = join23(cookieDir, "cookies.json");
   }
   async save(cookies) {
-    await mkdir(join22(this.filePath, ".."), { recursive: true });
+    await mkdir(join23(this.filePath, ".."), { recursive: true });
     await writeFile(this.filePath, JSON.stringify(cookies, null, 2), "utf-8");
   }
   async load() {
@@ -16540,10 +16799,10 @@ var init_session = __esm(() => {
 });
 
 // src/tools/browser.ts
-import { join as join23 } from "path";
+import { join as join24 } from "path";
 function getSession(ctx) {
   if (!session) {
-    const cookieDir = join23(ctx.baseDir, ".mma", "browser");
+    const cookieDir = join24(ctx.baseDir, ".mma", "browser");
     session = new BrowserSession({
       ...DEFAULT_BROWSER_CONFIG,
       headless: ctx.config.browser?.headless ?? true,
@@ -16691,8 +16950,8 @@ async function readClipboardFallback() {
   const { platform: platform5 } = await import("os");
   const { execSync } = await import("child_process");
   const { readFileSync: readFileSync16, unlinkSync: unlinkSync4 } = await import("fs");
-  const { join: join24 } = await import("path");
-  const tmpPath = join24(process.env.TEMP || process.env.TMP || "/tmp", `mma-clip-${Date.now()}.png`);
+  const { join: join25 } = await import("path");
+  const tmpPath = join25(process.env.TEMP || process.env.TMP || "/tmp", `mma-clip-${Date.now()}.png`);
   try {
     if (platform5() === "linux") {
       execSync(`xclip -selection clipboard -t image/png -o > "${tmpPath}" 2>/dev/null`, {
@@ -17074,7 +17333,7 @@ class ModuleRegistry {
 
 // src/modules/plugins/loader.ts
 import { readdirSync as readdirSync9, existsSync as existsSync30, statSync as statSync5 } from "fs";
-import { join as join24, basename as basename3 } from "path";
+import { join as join25, basename as basename3 } from "path";
 
 class PluginLoader {
   loadFromDir(dirPath, pluginManager, logger, options) {
@@ -17082,7 +17341,7 @@ class PluginLoader {
       return;
     const entries = readdirSync9(dirPath).sort();
     for (const entry of entries) {
-      const fullPath = join24(dirPath, entry);
+      const fullPath = join25(dirPath, entry);
       const stat = statSync5(fullPath);
       if (stat.isFile()) {
         if (!entry.endsWith(".ts") && !entry.endsWith(".js"))
@@ -17098,7 +17357,7 @@ class PluginLoader {
   }
   findEntryFile(dir) {
     for (const name of FOLDER_ENTRY_NAMES) {
-      const candidate = join24(dir, name);
+      const candidate = join25(dir, name);
       if (existsSync30(candidate))
         return candidate;
     }
@@ -17142,7 +17401,7 @@ var init_loader = __esm(() => {
 // src/modules/plugins/builtin/lint-on-write.ts
 import { spawn as spawn5, execSync } from "child_process";
 import { existsSync as existsSync31, readFileSync as readFileSync16 } from "fs";
-import { resolve as resolve18, extname as extname4, join as join25 } from "path";
+import { resolve as resolve18, extname as extname4, join as join26 } from "path";
 import { platform as platform5 } from "os";
 function contentHash(content) {
   let h = 5381;
@@ -17254,7 +17513,7 @@ class LintOnWritePlugin {
   }
   async runProjectLint(ctx, result, signal) {
     try {
-      const packageJsonPath = join25(ctx.baseDir, "package.json");
+      const packageJsonPath = join26(ctx.baseDir, "package.json");
       if (!existsSync31(packageJsonPath)) {
         return;
       }
@@ -17280,7 +17539,7 @@ class LintOnWritePlugin {
   }
   async runProjectTypeCheck(filePath, baseDir, result, signal) {
     const projectRoot = findProjectRoot(filePath, baseDir, ["tsconfig.json", "package.json"]);
-    const tsconfigPath = join25(projectRoot, "tsconfig.json");
+    const tsconfigPath = join26(projectRoot, "tsconfig.json");
     if (!existsSync31(tsconfigPath)) {
       return;
     }
@@ -17528,7 +17787,7 @@ var init_tracker = () => {};
 
 // src/modules/execution/plan-store.ts
 import { readFileSync as readFileSync17, writeFileSync as writeFileSync10, mkdirSync as mkdirSync14, existsSync as existsSync32, readdirSync as readdirSync10, rmSync } from "fs";
-import { join as join26 } from "path";
+import { join as join27 } from "path";
 function readPlanFile(path, fallbackBaseDir) {
   try {
     const raw = readFileSync17(path, "utf-8");
@@ -17556,7 +17815,7 @@ function listDir(dir, baseDir) {
   if (!existsSync32(dir))
     return [];
   const files = readdirSync10(dir).filter((f) => f.endsWith(".json"));
-  return files.map((f) => readPlanFile(join26(dir, f), baseDir)).filter((p) => p !== null);
+  return files.map((f) => readPlanFile(join27(dir, f), baseDir)).filter((p) => p !== null);
 }
 function toMeta(plan, status) {
   return {
@@ -17577,21 +17836,21 @@ class PlanStore {
   archiveDir;
   legacyPath;
   constructor(baseDir) {
-    const mmaDir = join26(baseDir, ".mma");
+    const mmaDir = join27(baseDir, ".mma");
     if (!existsSync32(mmaDir))
       mkdirSync14(mmaDir, { recursive: true });
     this.baseDir = baseDir;
-    this.plansDir = join26(mmaDir, "plans");
-    this.draftsDir = join26(this.plansDir, "drafts");
-    this.archiveDir = join26(this.plansDir, "archive");
-    this.legacyPath = join26(mmaDir, LEGACY_FILE);
+    this.plansDir = join27(mmaDir, "plans");
+    this.draftsDir = join27(this.plansDir, "drafts");
+    this.archiveDir = join27(this.plansDir, "archive");
+    this.legacyPath = join27(mmaDir, LEGACY_FILE);
     for (const dir of [this.plansDir, this.draftsDir, this.archiveDir]) {
       if (!existsSync32(dir))
         mkdirSync14(dir, { recursive: true });
     }
   }
   activePath() {
-    return join26(this.plansDir, "active.json");
+    return join27(this.plansDir, "active.json");
   }
   saveActive(plan) {
     writePlanFile(this.activePath(), plan);
@@ -17621,14 +17880,14 @@ class PlanStore {
       rmSync(p, { force: true });
   }
   saveDraft(plan) {
-    writePlanFile(join26(this.draftsDir, `${plan.id}.json`), plan);
+    writePlanFile(join27(this.draftsDir, `${plan.id}.json`), plan);
   }
   loadDraft(id) {
-    const p = join26(this.draftsDir, `${id}.json`);
+    const p = join27(this.draftsDir, `${id}.json`);
     return existsSync32(p) ? readPlanFile(p, this.baseDir) : null;
   }
   removeDraft(id) {
-    const p = join26(this.draftsDir, `${id}.json`);
+    const p = join27(this.draftsDir, `${id}.json`);
     if (existsSync32(p))
       rmSync(p, { force: true });
   }
@@ -17636,7 +17895,7 @@ class PlanStore {
     return listDir(this.draftsDir, this.baseDir);
   }
   archivePlan(plan) {
-    writePlanFile(join26(this.archiveDir, `${plan.id}.json`), plan);
+    writePlanFile(join27(this.archiveDir, `${plan.id}.json`), plan);
     this.removeDraft(plan.id);
     const active = this.loadActive();
     if (active && active.id === plan.id) {
@@ -17647,7 +17906,7 @@ class PlanStore {
     return listDir(this.archiveDir, this.baseDir);
   }
   removeArchived(id) {
-    const p = join26(this.archiveDir, `${id}.json`);
+    const p = join27(this.archiveDir, `${id}.json`);
     if (existsSync32(p))
       rmSync(p, { force: true });
   }
@@ -17680,12 +17939,12 @@ class PlanStore {
       this.clearActive();
       return "active";
     }
-    const draftPath = join26(this.draftsDir, `${id}.json`);
+    const draftPath = join27(this.draftsDir, `${id}.json`);
     if (existsSync32(draftPath)) {
       rmSync(draftPath, { force: true });
       return "draft";
     }
-    const archivedPath = join26(this.archiveDir, `${id}.json`);
+    const archivedPath = join27(this.archiveDir, `${id}.json`);
     if (existsSync32(archivedPath)) {
       rmSync(archivedPath, { force: true });
       return "archived";
@@ -19159,8 +19418,8 @@ var init_module = __esm(() => {
 
 // src/modules/security/session-encryption.ts
 import { readFileSync as readFileSync19, writeFileSync as writeFileSync11, existsSync as existsSync34, readdirSync as readdirSync11, unlinkSync as unlinkSync4 } from "fs";
-import { join as join27 } from "path";
-import { homedir as homedir8 } from "os";
+import { join as join28 } from "path";
+import { homedir as homedir9 } from "os";
 
 class SessionFileEncryptor {
   config;
@@ -19168,7 +19427,7 @@ class SessionFileEncryptor {
   constructor(config) {
     this.config = { ...DEFAULT_SESSION_ENCRYPTION, ...config };
     this.encryptor = new ConfigEncryptor({
-      keyPath: config?.keyPath || join27(homedir8(), ".mma", ".session-encryption-key")
+      keyPath: config?.keyPath || join28(homedir9(), ".mma", ".session-encryption-key")
     });
   }
   isEnabled() {
@@ -19254,7 +19513,7 @@ class SessionFileEncryptor {
       return;
     const files = readdirSync11(sessionDir);
     for (const file of files) {
-      const filePath = join27(sessionDir, file);
+      const filePath = join28(sessionDir, file);
       if (existsSync34(filePath) && !file.endsWith(".enc")) {
         try {
           const content = readFileSync19(filePath, "utf8");
@@ -19271,7 +19530,7 @@ class SessionFileEncryptor {
     const files = readdirSync11(sessionDir);
     for (const file of files) {
       if (file.endsWith(".enc")) {
-        const encFilePath = join27(sessionDir, file);
+        const encFilePath = join28(sessionDir, file);
         const decFilePath = encFilePath.slice(0, -4);
         try {
           const content = readFileSync19(encFilePath, "utf8");
@@ -19304,7 +19563,7 @@ import {
   writeFileSync as writeFileSync12,
   appendFileSync as appendFileSync6
 } from "fs";
-import { join as join28 } from "path";
+import { join as join29 } from "path";
 import { gzipSync } from "zlib";
 
 class SessionStore {
@@ -19318,7 +19577,7 @@ class SessionStore {
     }
   }
   getSessionDir(id) {
-    return join28(this.baseDir, id);
+    return join29(this.baseDir, id);
   }
   updateEncryption(config) {
     if (config?.enabled) {
@@ -19334,16 +19593,16 @@ class SessionStore {
     mkdirSync15(this.baseDir, { recursive: true });
   }
   sessionDir(id) {
-    return join28(this.baseDir, id);
+    return join29(this.baseDir, id);
   }
   metaPath(id) {
-    return join28(this.sessionDir(id), "meta.json");
+    return join29(this.sessionDir(id), "meta.json");
   }
   historyPath(id) {
-    return join28(this.sessionDir(id), "history.jsonl");
+    return join29(this.sessionDir(id), "history.jsonl");
   }
   sessionLogPath(id) {
-    return join28(this.sessionDir(id), "session.jsonl");
+    return join29(this.sessionDir(id), "session.jsonl");
   }
   sessionExists(id) {
     return existsSync35(this.metaPath(id));
@@ -19497,7 +19756,7 @@ class SessionStore {
         if (existsSync35(historyPath)) {
           const content = readFileSync20(historyPath, "utf-8");
           const compressed = gzipSync(content);
-          const gzPath = join28(this.baseDir, `${session2.id}.jsonl.gz`);
+          const gzPath = join29(this.baseDir, `${session2.id}.jsonl.gz`);
           writeFileSync12(gzPath, compressed);
           rmSync2(historyPath);
         }
@@ -19650,7 +19909,7 @@ class SessionManager {
     }
   }
 }
-var init_manager3 = __esm(() => {
+var init_manager4 = __esm(() => {
   init_i18n();
   init_session_isolation();
 });
@@ -19686,7 +19945,7 @@ var init_module2 = __esm(() => {
 // src/modules/session/index.ts
 var init_session2 = __esm(() => {
   init_store3();
-  init_manager3();
+  init_manager4();
   init_module2();
 });
 
@@ -19708,8 +19967,8 @@ class ProfileCompressor {
 
 // src/modules/user-profile/profile.ts
 import { readFileSync as readFileSync21, writeFileSync as writeFileSync13, existsSync as existsSync36, mkdirSync as mkdirSync16 } from "fs";
-import { join as join29 } from "path";
-import { homedir as homedir9, hostname, platform as platform7, type } from "os";
+import { join as join30 } from "path";
+import { homedir as homedir10, hostname, platform as platform7, type } from "os";
 import { env } from "process";
 
 class UserProfile {
@@ -19725,7 +19984,7 @@ class UserProfile {
       os: `${type()} ${hostname()}`,
       hostname: hostname(),
       shell: env.SHELL || env.ComSpec || "unknown",
-      home: homedir9(),
+      home: homedir10(),
       nodeVersion: process.version,
       preferences: { ...this.preferences }
     };
@@ -19735,10 +19994,10 @@ class UserProfile {
     if (!existsSync36(this.profileDir)) {
       mkdirSync16(this.profileDir, { recursive: true });
     }
-    writeFileSync13(join29(this.profileDir, "profile.json"), JSON.stringify({ ...this.info, preferences: this.preferences }, null, 2), "utf-8");
+    writeFileSync13(join30(this.profileDir, "profile.json"), JSON.stringify({ ...this.info, preferences: this.preferences }, null, 2), "utf-8");
   }
   load() {
-    const path = join29(this.profileDir, "profile.json");
+    const path = join30(this.profileDir, "profile.json");
     if (!existsSync36(path))
       return null;
     try {
@@ -19778,7 +20037,7 @@ var init_profile = () => {};
 
 // src/modules/skills/loader.ts
 import { readdirSync as readdirSync13, readFileSync as readFileSync22, existsSync as existsSync37, statSync as statSync6 } from "fs";
-import { join as join30 } from "path";
+import { join as join31 } from "path";
 
 class SkillsLoader {
   loadFromDir(dirPath) {
@@ -19791,7 +20050,7 @@ class SkillsLoader {
   scanDir(dirPath, skills) {
     const entries = readdirSync13(dirPath);
     for (const entry of entries) {
-      const fullPath = join30(dirPath, entry);
+      const fullPath = join31(dirPath, entry);
       const stat = statSync6(fullPath);
       if (stat.isDirectory()) {
         this.scanDir(fullPath, skills);
@@ -20040,10 +20299,6 @@ import { resolve as resolve20 } from "path";
 import { platform as platform8 } from "os";
 
 class LspClient {
-  logger = null;
-  setLogger(logger) {
-    this.logger = logger;
-  }
   process = null;
   requestId = 0;
   pending = new Map;
@@ -20103,25 +20358,11 @@ class LspClient {
     try {
       await this.sendRequest("initialize", initParams, timeout);
     } catch (e) {
-      const msg = e instanceof Error ? e.message : String(e);
-      this.logger?.warn(`LSP initialize failed (attempt 1): ${msg}`, {
-        command: config.command,
-        projectRoot
-      });
       if (!(e instanceof Error) || !e.message.includes("initialize"))
         throw e;
       await this.shutdown();
       await this.startServer(config, projectRoot);
-      try {
-        await this.sendRequest("initialize", initParams, timeout);
-      } catch (retryErr) {
-        const retryMsg = retryErr instanceof Error ? retryErr.message : String(retryErr);
-        this.logger?.error(`LSP initialize failed (attempt 2, giving up): ${retryMsg}`, {
-          command: config.command,
-          projectRoot
-        });
-        throw retryErr;
-      }
+      await this.sendRequest("initialize", initParams, timeout);
     }
     this.initialized = true;
   }
@@ -20159,11 +20400,8 @@ class LspClient {
       });
       this.process = proc;
       setTimeout(() => {
-        if (!this.initialized && this.process) {
-          const msg = "LSP server start timeout";
-          this.logger?.error(msg, { command: config.command, projectRoot, timeout: config.timeout ?? 1e4 });
-          reject(new Error(msg));
-        }
+        if (!this.initialized && this.process)
+          reject(new Error("LSP server start timeout"));
       }, config.timeout ?? 1e4);
     });
   }
@@ -20202,9 +20440,7 @@ class LspClient {
       try {
         const msg = JSON.parse(body);
         this.handleMessage(msg);
-      } catch (e) {
-        this.logger?.debug(`LSP JSON parse error: ${e instanceof Error ? e.message : String(e)}`);
-      }
+      } catch {}
     }
   }
   handleMessage(msg) {
@@ -20242,9 +20478,7 @@ class LspClient {
       setTimeout(() => {
         if (this.pending.has(id)) {
           this.pending.delete(id);
-          const msg = `LSP request timeout: ${method}`;
-          this.logger?.warn(msg, { method, timeout });
-          reject(new Error(msg));
+          reject(new Error(`LSP request timeout: ${method}`));
         }
       }, timeout);
     });
@@ -20254,37 +20488,27 @@ class LspClient {
     this.write(message);
   }
   write(message) {
-    if (!this.process?.stdin?.writable) {
-      this.logger?.debug("LSP write failed: process stdin not writable");
+    if (!this.process?.stdin?.writable)
       return;
-    }
     const header = `Content-Length: ${Buffer.byteLength(message)}\r
 \r
 `;
     try {
       this.process.stdin.write(header + message);
-    } catch (e) {
-      this.logger?.debug(`LSP write error: ${e instanceof Error ? e.message : String(e)}`);
-    }
+    } catch {}
   }
   async shutdown() {
     try {
       if (this.process && this.initialized && this.process.stdin?.writable) {
-        this.sendRequest("shutdown", null, 3000).catch((e) => {
-          this.logger?.debug(`LSP shutdown request failed: ${e instanceof Error ? e.message : String(e)}`);
-        });
+        this.sendRequest("shutdown", null, 3000).catch(() => {});
         this.sendNotification("exit", null);
         await new Promise((r) => setTimeout(r, 200));
       }
-    } catch (e) {
-      this.logger?.debug(`LSP shutdown error: ${e instanceof Error ? e.message : String(e)}`);
-    } finally {
+    } catch {} finally {
       if (this.process) {
         try {
           killTree(this.process);
-        } catch (e) {
-          this.logger?.debug(`LSP killTree error: ${e instanceof Error ? e.message : String(e)}`);
-        }
+        } catch {}
         this.process = null;
       }
       this.initialized = false;
@@ -20392,26 +20616,9 @@ class LspModule {
   client;
   failuresByServer = new Map;
   disabledServers = new Set;
-  logger = null;
-  constructor(config, client, logger) {
+  constructor(config, client) {
     this.config = { ...DEFAULT_LSP_CONFIG, ...config };
     this.client = client ?? new LspClient;
-    this.logger = logger ?? null;
-    this.client.setLogger(this.logger);
-  }
-  setLogger(logger) {
-    this.logger = logger;
-    this.client.setLogger(logger);
-  }
-  resetDisabledServers() {
-    this.failuresByServer.clear();
-    this.disabledServers.clear();
-  }
-  getDisabledServers() {
-    return Array.from(this.disabledServers);
-  }
-  getFailureCounts() {
-    return new Map(this.failuresByServer);
   }
   isLspDisabled() {
     return this.disabledServers.size > 0;
@@ -20631,7 +20838,7 @@ var init_lsp = __esm(() => {
 
 // src/modules/lsp/startup-check.ts
 import { existsSync as existsSync39 } from "fs";
-import { join as join31 } from "path";
+import { join as join32 } from "path";
 import { spawn as spawn7 } from "child_process";
 async function runStartupHealthCheck(config, baseDir, deps = {}) {
   if (!config.enabled)
@@ -20658,7 +20865,7 @@ ${result.lines.join(`
 }
 async function runCheck(config, baseDir, deps) {
   const projectRoot = findProjectRoot(baseDir, baseDir, ["tsconfig.json", "package.json"]);
-  if (existsSync39(join31(projectRoot, "tsconfig.json"))) {
+  if (existsSync39(join32(projectRoot, "tsconfig.json"))) {
     const runTsc = deps.runTsc ?? runTscDefault;
     const errors = await runTsc(projectRoot, STARTUP_CHECK_TIMEOUT_MS);
     if (errors.length === 0)
@@ -20682,9 +20889,7 @@ async function runCheck(config, baseDir, deps) {
           lines.push(formatStartupError(file, baseDir, d));
         }
       }
-    } catch (e) {
-      deps.logger?.debug(`Startup LSP check failed for ${file}: ${e instanceof Error ? e.message : String(e)}`);
-    }
+    } catch {}
   }
   if (checked === 0 || lines.length === 0)
     return null;
@@ -20757,7 +20962,7 @@ var init_startup_check = __esm(() => {
 
 // src/modules/indexer/walker.ts
 import { readdirSync as readdirSync14, readFileSync as readFileSync23, statSync as statSync7, existsSync as existsSync40, watch } from "fs";
-import { join as join32, relative as relative4, extname as extname5 } from "path";
+import { join as join33, relative as relative4, extname as extname5 } from "path";
 
 class Indexer {
   baseDir;
@@ -20795,7 +21000,7 @@ class Indexer {
       for (const entry of entries) {
         if (count >= this.MAX_FILES)
           return;
-        const fullPath = join32(dir, entry);
+        const fullPath = join33(dir, entry);
         const relPath = relative4(this.baseDir, fullPath);
         const stat2 = statSync7(fullPath);
         if (stat2.isDirectory()) {
@@ -20859,13 +21064,13 @@ var init_walker = __esm(() => {
 
 // src/modules/indexer/cache.ts
 import { readFileSync as readFileSync24, writeFileSync as writeFileSync14, existsSync as existsSync41, mkdirSync as mkdirSync17, rmSync as rmSync3 } from "fs";
-import { join as join33 } from "path";
+import { join as join34 } from "path";
 
 class IndexCache {
   cachePath;
   cache = null;
   constructor(cacheDir) {
-    this.cachePath = join33(cacheDir, "index-cache.json");
+    this.cachePath = join34(cacheDir, "index-cache.json");
   }
   load() {
     if (this.cache)
@@ -20881,7 +21086,7 @@ class IndexCache {
   }
   save(result) {
     this.cache = result;
-    const dir = join33(this.cachePath, "..");
+    const dir = join34(this.cachePath, "..");
     if (!existsSync41(dir))
       mkdirSync17(dir, { recursive: true });
     writeFileSync14(this.cachePath, JSON.stringify(result), "utf-8");
@@ -20899,10 +21104,10 @@ var init_cache = () => {};
 
 // src/modules/indexer/project-profile.ts
 import { readFileSync as readFileSync25, existsSync as existsSync42 } from "fs";
-import { join as join34 } from "path";
+import { join as join35 } from "path";
 function detectManifest(baseDir) {
   for (const manifest of MANIFEST_ORDER) {
-    if (existsSync42(join34(baseDir, manifest)))
+    if (existsSync42(join35(baseDir, manifest)))
       return manifest;
   }
   return null;
@@ -20919,7 +21124,7 @@ function cleanDependency(entry) {
 }
 function readPackageJson(baseDir) {
   try {
-    const raw = JSON.parse(readFileSync25(join34(baseDir, "package.json"), "utf-8"));
+    const raw = JSON.parse(readFileSync25(join35(baseDir, "package.json"), "utf-8"));
     if (!raw || typeof raw !== "object")
       return null;
     const profile = {
@@ -20943,7 +21148,7 @@ function readPackageJson(baseDir) {
 }
 function readPyproject(baseDir) {
   try {
-    const content = readFileSync25(join34(baseDir, "pyproject.toml"), "utf-8");
+    const content = readFileSync25(join35(baseDir, "pyproject.toml"), "utf-8");
     const profile = { runtime: "python", deps: [], devDeps: [], scripts: {} };
     const nameMatch = content.match(/^\s*name\s*=\s*"([^"]+)"/m);
     if (nameMatch)
@@ -20959,7 +21164,7 @@ function readPyproject(baseDir) {
 }
 function readCargo(baseDir) {
   try {
-    const content = readFileSync25(join34(baseDir, "Cargo.toml"), "utf-8");
+    const content = readFileSync25(join35(baseDir, "Cargo.toml"), "utf-8");
     const profile = { runtime: "rust", deps: [], devDeps: [], scripts: {} };
     const nameMatch = content.match(/^\s*name\s*=\s*"([^"]+)"/m);
     if (nameMatch)
@@ -20983,7 +21188,7 @@ function readCargo(baseDir) {
 }
 function readGoMod(baseDir) {
   try {
-    const content = readFileSync25(join34(baseDir, "go.mod"), "utf-8");
+    const content = readFileSync25(join35(baseDir, "go.mod"), "utf-8");
     const profile = { runtime: "go", deps: [], devDeps: [], scripts: {} };
     const moduleMatch = content.match(/^module\s+(\S+)/m);
     if (moduleMatch)
@@ -21001,7 +21206,7 @@ function readGoMod(baseDir) {
 }
 function readRequirements(baseDir) {
   try {
-    const content = readFileSync25(join34(baseDir, "requirements.txt"), "utf-8");
+    const content = readFileSync25(join35(baseDir, "requirements.txt"), "utf-8");
     const profile = { runtime: "python", deps: [], devDeps: [], scripts: {} };
     for (const line of content.split(`
 `)) {
@@ -21459,8 +21664,8 @@ var init_mcp = __esm(() => {
 });
 
 // src/modules/memory/module.ts
-import { homedir as homedir10 } from "os";
-import { join as join35 } from "path";
+import { homedir as homedir11 } from "os";
+import { join as join36 } from "path";
 
 class MemoryModule {
   name = "memory";
@@ -21469,7 +21674,7 @@ class MemoryModule {
     if (storeOrDir instanceof MemoryStore) {
       this.store = storeOrDir;
     } else {
-      const dir = storeOrDir || join35(homedir10(), ".mma", "memory");
+      const dir = storeOrDir || join36(homedir11(), ".mma", "memory");
       this.store = new MemoryStore(dir);
     }
   }
@@ -21556,11 +21761,11 @@ var init_module8 = __esm(() => {
 
 // src/core/version.ts
 import { existsSync as existsSync43, readFileSync as readFileSync26 } from "fs";
-import { join as join36, dirname as dirname13 } from "path";
+import { join as join37, dirname as dirname13 } from "path";
 import { fileURLToPath as fileURLToPath2 } from "url";
 function readMmaVersion() {
   const here = dirname13(fileURLToPath2(import.meta.url));
-  const candidates = [join36(here, "..", "..", "package.json"), join36(here, "..", "package.json")];
+  const candidates = [join37(here, "..", "..", "package.json"), join37(here, "..", "package.json")];
   for (const p of candidates) {
     if (existsSync43(p)) {
       try {
@@ -21580,8 +21785,8 @@ __export(exports_bootstrap, {
   buildSystemInfo: () => buildSystemInfo,
   bootstrap: () => bootstrap
 });
-import { homedir as homedir11 } from "os";
-import { join as join37, resolve as resolve23 } from "path";
+import { homedir as homedir12 } from "os";
+import { join as join38, resolve as resolve23 } from "path";
 import { existsSync as existsSync44, readFileSync as readFileSync27, writeFileSync as writeFileSync15 } from "fs";
 function buildSystemInfo(config, baseDir, profileCompressed) {
   const now = new Date().toISOString().replace("T", " ").slice(0, 19);
@@ -21608,8 +21813,8 @@ function buildSystemInfo(config, baseDir, profileCompressed) {
 `);
 }
 async function bootstrap(configDir, projectDir, noAgentsMd, exitOnComplete) {
-  const dir = configDir || join37(homedir11(), ".mma");
-  const projectConfigPath = projectDir ? join37(projectDir, ".mmrc") : join37(process.cwd(), ".mmrc");
+  const dir = configDir || join38(homedir12(), ".mma");
+  const projectConfigPath = projectDir ? join38(projectDir, ".mmrc") : join38(process.cwd(), ".mmrc");
   const config = loadConfig({ configDir: dir, projectConfigPath });
   setLocale(config.locale);
   try {
@@ -21619,7 +21824,7 @@ async function bootstrap(configDir, projectDir, noAgentsMd, exitOnComplete) {
     }
   } catch {}
   const logger = new Logger(config.logLevel);
-  logger.setLogDir(join37(dir, "logs"));
+  logger.setLogDir(join38(dir, "logs"));
   logger.debug("MMA bootstrap", {
     version: config.version,
     model: config.model
@@ -21641,19 +21846,18 @@ async function bootstrap(configDir, projectDir, noAgentsMd, exitOnComplete) {
       logger.info(`Model ${config.model} loaded in ${loadResult.loadTime}s`);
     }
   }
-  const profile = new UserProfile(join37(dir));
+  const profile = new UserProfile(join38(dir));
   profile.load() || profile.collect();
   profile.save();
-  const llmProvider = new OpenAICompatProvider({
-    model: config.model,
-    baseUrl: config.provider.baseUrl,
-    apiKey: config.provider.apiKey,
+  const providerManager = new ProviderManager(config.provider, {
     contextWindow: config.contextWindow,
     retry: config.retry,
     rateLimits: config.security?.rateLimits
   });
+  providerManager.setModel(config.model);
+  const llmProvider = providerManager.active;
   const baseDir = projectDir ? resolve23(projectDir) : process.cwd();
-  const projectMapCacheDir = join37(baseDir, ".mma");
+  const projectMapCacheDir = join38(baseDir, ".mma");
   const indexerModule = new IndexerModule({
     baseDir,
     cacheDir: projectMapCacheDir
@@ -21664,9 +21868,9 @@ async function bootstrap(configDir, projectDir, noAgentsMd, exitOnComplete) {
     logger.warn(`Project indexing failed: ${err.message}`);
   }
   const skillsLoader = new SkillsLoader;
-  const builtinDir = join37(import.meta.dirname, "skills", "builtin");
-  const globalDir = join37(homedir11(), ".agents", "skills");
-  const projectSkillsDir = join37(baseDir, ".mma", "skills");
+  const builtinDir = join38(import.meta.dirname, "skills", "builtin");
+  const globalDir = join38(homedir12(), ".agents", "skills");
+  const projectSkillsDir = join38(baseDir, ".mma", "skills");
   const availableSkills = skillsLoader.loadFromAllSources(builtinDir, globalDir, projectSkillsDir);
   const skillsBudget = Math.floor(config.contextWindow * config.skills.budget);
   const skillsModule = new SkillsModule(availableSkills, skillsBudget);
@@ -21682,11 +21886,11 @@ async function bootstrap(configDir, projectDir, noAgentsMd, exitOnComplete) {
     essential: true,
     estimatedTokens: Math.ceil(systemInfoContent.length / 4)
   };
-  const agentsMdGlobal = join37(dir, "AGENTS.md");
+  const agentsMdGlobal = join38(dir, "AGENTS.md");
   if (!existsSync44(agentsMdGlobal)) {
     writeFileSync15(agentsMdGlobal, "", "utf-8");
   }
-  const sessionDir = join37(dir, "sessions");
+  const sessionDir = join38(dir, "sessions");
   const sessionStore = new SessionStore(sessionDir);
   sessionStore.init();
   const sessionManager = new SessionManager(sessionStore, {
@@ -21763,7 +21967,7 @@ async function bootstrap(configDir, projectDir, noAgentsMd, exitOnComplete) {
   const mcpModule = new MCPModule(config);
   await mcpModule.initialize();
   moduleRegistry.register(mcpModule);
-  const memoryStore = new MemoryStore(join37(dir, "memory"));
+  const memoryStore = new MemoryStore(join38(dir, "memory"));
   const memoryModule = new MemoryModule(memoryStore);
   moduleRegistry.register(memoryModule);
   if (config.browser.enabled) {
@@ -21775,7 +21979,7 @@ async function bootstrap(configDir, projectDir, noAgentsMd, exitOnComplete) {
       pluginManager.register(browserPlugin);
     }
   }
-  const lspModule = new LspModule(config.lsp, undefined, logger);
+  const lspModule = new LspModule(config.lsp);
   moduleRegistry.register(lspModule);
   const lspPlugin = lspModule.getPlugin();
   if (lspPlugin) {
@@ -21816,8 +22020,8 @@ async function bootstrap(configDir, projectDir, noAgentsMd, exitOnComplete) {
   pluginManager.register(plugin);
   pluginManager.register(plugin2);
   const pluginLoader = new PluginLoader;
-  const globalPluginsDir = join37(homedir11(), ".mma", "plugins");
-  const projectPluginsDir = join37(baseDir, ".mma", "plugins");
+  const globalPluginsDir = join38(homedir12(), ".mma", "plugins");
+  const projectPluginsDir = join38(baseDir, ".mma", "plugins");
   const mmaVersion = readMmaVersion();
   pluginLoader.loadFromDir(globalPluginsDir, pluginManager, logger, {
     source: "global",
@@ -21843,9 +22047,9 @@ async function bootstrap(configDir, projectDir, noAgentsMd, exitOnComplete) {
   const skipAgentsMd = noAgentsMd === true;
   if (!skipAgentsMd) {
     const agentsMdCandidates = [
-      join37(baseDir, "AGENTS.md"),
-      join37(baseDir, ".mma", "AGENTS.md"),
-      join37(dir, "AGENTS.md")
+      join38(baseDir, "AGENTS.md"),
+      join38(baseDir, ".mma", "AGENTS.md"),
+      join38(dir, "AGENTS.md")
     ];
     for (const p of agentsMdCandidates) {
       if (existsSync44(p)) {
@@ -21869,6 +22073,7 @@ async function bootstrap(configDir, projectDir, noAgentsMd, exitOnComplete) {
   const agentDeps = {
     config,
     llmProvider,
+    providerManager,
     toolExecutor,
     pluginManager,
     contextManager,
@@ -21927,15 +22132,15 @@ async function bootstrap(configDir, projectDir, noAgentsMd, exitOnComplete) {
 var init_bootstrap = __esm(() => {
   init_config2();
   init_app_logger();
-  init_openai_compat();
+  init_providers();
   init_tools();
   init_hidden_tools_block();
   init_executor();
-  init_manager2();
+  init_manager3();
   init_loader();
   init_lint_on_write();
   init_notify();
-  init_manager();
+  init_manager2();
   init_token_counter();
   init_detector();
   init_module();
@@ -22678,35 +22883,24 @@ async function runSetup(externalRl) {
     console.log(l);
   return answers;
 }
-var PROVIDER_TYPES, KNOWN_PORTS, HOSTED_BASE_URLS;
+var PROVIDER_TYPES, KNOWN_PORTS;
 var init_setup = __esm(() => {
   init_colors();
   init_i18n();
   init_spinner();
+  init_presets();
   init_box();
   init_table();
-  PROVIDER_TYPES = [
-    {
-      value: "openai-compat",
-      label: "OpenAI-compatible (LM Studio, Ollama, vLLM, etc.)"
-    },
-    { value: "openai", label: "OpenAI API" },
-    { value: "anthropic", label: "Anthropic Claude" },
-    { value: "opencode-zen", label: "OpenCode Zen (opencode.ai/zen)" },
-    { value: "opencode-go", label: "OpenCode Go (opencode.ai/go)" }
-  ];
+  PROVIDER_TYPES = BUILTIN_PROVIDERS.map((spec) => ({
+    value: spec.type,
+    label: spec.label
+  }));
   KNOWN_PORTS = [
     { port: 1234, label: "LM Studio" },
     { port: 11434, label: "Ollama" },
     { port: 8080, label: "vLLM / custom" },
     { port: 4891, label: "GPT4All" }
   ];
-  HOSTED_BASE_URLS = {
-    openai: "https://api.openai.com/v1",
-    anthropic: "https://api.anthropic.com",
-    "opencode-zen": "https://opencode.ai/zen/v1",
-    "opencode-go": "https://opencode.ai/zen/go/v1"
-  };
 });
 
 // src/modules/certification/manifest.ts
@@ -22721,8 +22915,8 @@ __export(exports_manifest, {
   MANIFEST_PATH: () => MANIFEST_PATH
 });
 import { existsSync as existsSync45, readFileSync as readFileSync28, mkdirSync as mkdirSync18, writeFileSync as writeFileSync16 } from "fs";
-import { homedir as homedir13 } from "os";
-import { join as join39 } from "path";
+import { homedir as homedir14 } from "os";
+import { join as join40 } from "path";
 function readManifest(path = MANIFEST_PATH) {
   try {
     if (existsSync45(path)) {
@@ -22733,7 +22927,7 @@ function readManifest(path = MANIFEST_PATH) {
   return { version: 1, certifications: [] };
 }
 function saveManifest(m, path = MANIFEST_PATH) {
-  mkdirSync18(join39(homedir13(), ".mma"), { recursive: true });
+  mkdirSync18(join40(homedir14(), ".mma"), { recursive: true });
   writeFileSync16(path, JSON.stringify(m, null, 2), "utf-8");
 }
 function upsertCertification(entry, path = MANIFEST_PATH) {
@@ -22768,7 +22962,7 @@ function getCertMark(model, providerUrl, currentVersion, path = MANIFEST_PATH) {
 }
 var MANIFEST_PATH;
 var init_manifest = __esm(() => {
-  MANIFEST_PATH = join39(homedir13(), ".mma", "certifications.json");
+  MANIFEST_PATH = join40(homedir14(), ".mma", "certifications.json");
 });
 
 // node_modules/yaml/dist/nodes/identity.js
@@ -29892,7 +30086,7 @@ var init_scenarios = __esm(() => {
 
 // src/modules/certification/loader.ts
 import { existsSync as existsSync46, readdirSync as readdirSync15, readFileSync as readFileSync29 } from "fs";
-import { join as join40 } from "path";
+import { join as join41 } from "path";
 function validateScenario(s) {
   const errors2 = [];
   const isSkip = s.mode === "skip";
@@ -29946,7 +30140,7 @@ function loadScenarios(userDir) {
       if (!file.endsWith(".yaml") && !file.endsWith(".yml"))
         continue;
       try {
-        const raw = readFileSync29(join40(userDir, file), "utf-8");
+        const raw = readFileSync29(join41(userDir, file), "utf-8");
         const data = $parse(raw);
         const parsed = normalizeScenario(data, file);
         const errs = validateScenario(parsed);
@@ -30000,7 +30194,7 @@ var init_loader3 = __esm(() => {
 
 // src/modules/certification/fact-checker.ts
 import { existsSync as existsSync47, readFileSync as readFileSync30, statSync as statSync8 } from "fs";
-import { join as join41 } from "path";
+import { join as join42 } from "path";
 function checkSandbox(sandboxDir, checks, exitCode, output) {
   const failures = [];
   for (const check of checks) {
@@ -30017,13 +30211,13 @@ function runCheck2(sandboxDir, check, exitCode, output) {
     case "outputContains":
       return output.includes(check.text);
     case "fileExists":
-      return isFile(join41(sandboxDir, check.path));
+      return isFile(join42(sandboxDir, check.path));
     case "fileNotExists":
-      return !existsSync47(join41(sandboxDir, check.path));
+      return !existsSync47(join42(sandboxDir, check.path));
     case "dirExists":
-      return isDir(join41(sandboxDir, check.path));
+      return isDir(join42(sandboxDir, check.path));
     case "fileContent": {
-      const abs = join41(sandboxDir, check.path);
+      const abs = join42(sandboxDir, check.path);
       if (!isFile(abs))
         return false;
       const content = readFileSync30(abs, "utf-8");
@@ -30034,7 +30228,7 @@ function runCheck2(sandboxDir, check, exitCode, output) {
       return false;
     }
     case "fileRegex": {
-      const abs = join41(sandboxDir, check.path);
+      const abs = join42(sandboxDir, check.path);
       if (!isFile(abs))
         return false;
       return new RegExp(check.pattern).test(readFileSync30(abs, "utf-8"));
@@ -30085,7 +30279,7 @@ var init_fact_checker = () => {};
 import { spawn as spawn8 } from "child_process";
 import { existsSync as existsSync48, mkdirSync as mkdirSync19, rmSync as rmSync4, cpSync as cpSync2 } from "fs";
 import { platform as platform9 } from "os";
-import { join as join42, resolve as resolve24, dirname as dirname14 } from "path";
+import { join as join43, resolve as resolve24, dirname as dirname14 } from "path";
 async function runScenario(scenario, opts) {
   if (scenario.mode === "skip") {
     return {
@@ -30104,7 +30298,7 @@ async function runScenario(scenario, opts) {
   let passed = 0;
   let firstError;
   for (let i = 1;i <= reps; i++) {
-    const sandbox = join42(opts.sandboxBase, `run-${scenario.id}-${i}`);
+    const sandbox = join43(opts.sandboxBase, `run-${scenario.id}-${i}`);
     let failures = [];
     let exitCode = -1;
     let output = "";
@@ -30165,25 +30359,25 @@ function prepareSandbox(sandbox, scenario, mmaRoot) {
   rmSync4(sandbox, { recursive: true, force: true });
   mkdirSync19(sandbox, { recursive: true });
   for (const f of scenario.fixtures ?? []) {
-    const src = join42(mmaRoot, f.source);
+    const src = join43(mmaRoot, f.source);
     if (!existsSync48(src)) {
       throw new Error(`fixture missing: ${f.source}`);
     }
-    const dest = join42(sandbox, f.dest);
+    const dest = join43(sandbox, f.dest);
     mkdirSync19(dirname14(dest), { recursive: true });
     cpSync2(src, dest);
   }
 }
 function resolveMmaEntry(mmaRoot) {
-  const dev = join42(mmaRoot, "src", "cli", "main.ts");
+  const dev = join43(mmaRoot, "src", "cli", "main.ts");
   if (existsSync48(dev))
     return dev;
-  return join42(mmaRoot, "dist", "main.js");
+  return join43(mmaRoot, "dist", "main.js");
 }
 function findMmaRoot(fromDir) {
   const candidates = [resolve24(fromDir, "..", "..", ".."), resolve24(fromDir, "..")];
   for (const c of candidates) {
-    if (existsSync48(join42(c, "package.json")))
+    if (existsSync48(join43(c, "package.json")))
       return c;
   }
   return process.cwd();
@@ -30250,12 +30444,12 @@ __export(exports_cli, {
   certList: () => certList
 });
 import { rmSync as rmSync5 } from "fs";
-import { homedir as homedir14 } from "os";
-import { join as join43, dirname as dirname15 } from "path";
+import { homedir as homedir15 } from "os";
+import { join as join44, dirname as dirname15 } from "path";
 import { fileURLToPath as fileURLToPath3 } from "url";
 import { existsSync as existsSync49, readFileSync as readFileSync31 } from "fs";
 function readVersion() {
-  const candidates = [join43(MMA_ROOT, "package.json")];
+  const candidates = [join44(MMA_ROOT, "package.json")];
   for (const p of candidates) {
     if (existsSync49(p)) {
       try {
@@ -30295,7 +30489,7 @@ async function certify(opts) {
     return;
   }
   console.log(t("cli.cert_started", { model: opts.name, provider: providerUrl }));
-  const sandboxBase = join43(process.cwd(), ".mma", "certification");
+  const sandboxBase = join44(process.cwd(), ".mma", "certification");
   const results = [];
   const total = selected.length;
   let idx = 0;
@@ -30409,7 +30603,7 @@ var init_cli = __esm(() => {
   init_manifest();
   HERE = dirname15(fileURLToPath3(import.meta.url));
   MMA_ROOT = findMmaRoot(HERE);
-  USER_SCENARIO_DIR = join43(homedir14(), ".mma", "certification", "scenarios");
+  USER_SCENARIO_DIR = join44(homedir15(), ".mma", "certification", "scenarios");
 });
 
 // src/cli/repl-commands.ts
@@ -30418,13 +30612,13 @@ __export(exports_repl_commands, {
   registerAllCommands: () => registerAllCommands,
   COMMAND_GROUPS: () => COMMAND_GROUPS
 });
-import { join as join45, dirname as dirname17 } from "path";
-import { homedir as homedir16 } from "os";
+import { join as join46, dirname as dirname17 } from "path";
+import { homedir as homedir17 } from "os";
 import { existsSync as existsSync51, readFileSync as readFileSync33 } from "fs";
 import { fileURLToPath as fileURLToPath5 } from "url";
 function readVersion3() {
   const here = dirname17(fileURLToPath5(import.meta.url));
-  const candidates = [join45(here, "..", "..", "package.json"), join45(here, "..", "package.json")];
+  const candidates = [join46(here, "..", "..", "package.json"), join46(here, "..", "package.json")];
   for (const p of candidates) {
     if (existsSync51(p)) {
       try {
@@ -30546,7 +30740,13 @@ function registerMmaCommands(ctx) {
       const sys = Math.floor(ctxW * cfg.contextBudget.systemPrompt);
       const res = Math.floor(ctxW * cfg.contextBudget.responseReserve);
       console.log(`${t("repl.model")}       ${cfg.model}`);
-      console.log(`${t("repl.provider")}    ${cfg.provider.type}  →  ${cfg.provider.baseUrl}`);
+      const providers = ctx.agent.listProviders();
+      const active = providers.find((p) => p.active);
+      if (active) {
+        console.log(`${t("repl.provider")}    ${active.label} (${pc2.dim(active.type)})  →  ${pc2.dim(active.baseUrl)}`);
+      } else {
+        console.log(`${t("repl.provider")}    ${cfg.provider.type}  →  ${cfg.provider.baseUrl}`);
+      }
       console.log(`${t("repl.context")}     ${ctxW}  (sys:${sys}  res:${res}  hist:${ctxW - sys - res})`);
       console.log(`${t("repl.max_iters")}   ${cfg.maxToolIterations}`);
       console.log(`${t("repl.stuck_thresh")} ${cfg.stuckThreshold}`);
@@ -30574,8 +30774,14 @@ function registerMmaCommands(ctx) {
     description: t("repl.status"),
     usage: t("repl.status_usage"),
     action: () => {
+      const providers = ctx.agent.listProviders();
+      const active = providers.find((p) => p.active);
       console.log(`${t("repl.model")} ${ctx.config.model}`);
-      console.log(`${t("repl.provider")} ${ctx.config.provider.type} @ ${ctx.config.provider.baseUrl}`);
+      if (active) {
+        console.log(`${t("repl.provider")} ${active.label} (${pc2.dim(active.type)}) @ ${pc2.dim(active.baseUrl)}`);
+      } else {
+        console.log(`${t("repl.provider")} ${ctx.config.provider.type} @ ${ctx.config.provider.baseUrl}`);
+      }
       const meta = ctx.sessionManager?.getActiveMeta();
       if (meta) {
         console.log(`${t("repl.session_label")} ${meta.name} (${meta.id}) — ${meta.messageCount} messages`);
@@ -30591,7 +30797,7 @@ function registerMmaCommands(ctx) {
       console.log(pc2.yellow(t("repl.wizard_running")));
       await ctx.withExclusiveInput(async () => {
         const answers = await runSetup(ctx.rl);
-        const configPath = join45(homedir16(), ".mma", "config.json");
+        const configPath = join46(homedir17(), ".mma", "config.json");
         ctx.config.provider.type = answers.provider;
         ctx.config.provider.baseUrl = answers.apiBase;
         ctx.config.provider.apiKey = answers.apiKey;
@@ -30634,8 +30840,17 @@ Excluded blocks: ${info.excluded.length}`));
     action: async (args) => {
       const subcmd = args[0];
       if (!subcmd || subcmd === "list") {
-        console.log(`${t("repl.provider_current")}  ${ctx.config.provider.type}`);
-        console.log(`  ${ctx.config.provider.baseUrl}`);
+        const providers = ctx.agent.listProviders();
+        if (providers.length === 0) {
+          console.log(`${t("repl.provider_current")}  ${ctx.config.provider.type}`);
+          console.log(`  ${ctx.config.provider.baseUrl}`);
+        } else {
+          console.log(t("repl.provider_current"));
+          for (const p of providers) {
+            const marker = p.active ? pc2.green("* ") : "  ";
+            console.log(` ${marker}${p.label}  (${pc2.dim(p.type)})  ${pc2.dim(p.baseUrl)}`);
+          }
+        }
         return;
       }
       if (subcmd === "use") {
@@ -30644,11 +30859,12 @@ Excluded blocks: ${info.excluded.length}`));
           console.log(t("repl.provider_usage"));
           return;
         }
-        ctx.config.provider.type = name;
-        const configPath = join45(homedir16(), ".mma", "config.json");
-        saveConfig(ctx.config, configPath);
-        await ctx.agent.reconfigure(ctx.config);
-        console.log(pc2.green(t("repl.provider_set", { name })));
+        try {
+          await ctx.agent.setProvider(name);
+          console.log(pc2.green(t("repl.provider_set", { name })));
+        } catch (e) {
+          console.log(pc2.red(e.message));
+        }
         return;
       }
       console.log(t("repl.provider_usage"));
@@ -30701,7 +30917,7 @@ Excluded blocks: ${info.excluded.length}`));
           return;
         }
         ctx.config.model = name;
-        const configPath = join45(homedir16(), ".mma", "config.json");
+        const configPath = join46(homedir17(), ".mma", "config.json");
         saveConfig(ctx.config, configPath);
         await ctx.agent.reconfigure(ctx.config);
         console.log(pc2.green(t("repl.model_set", { name })));
@@ -30726,7 +30942,7 @@ Excluded blocks: ${info.excluded.length}`));
         return;
       }
       ctx.config.contextWindow = size;
-      const configPath = join45(homedir16(), ".mma", "config.json");
+      const configPath = join46(homedir17(), ".mma", "config.json");
       saveConfig(ctx.config, configPath);
       await ctx.agent.reconfigure(ctx.config);
       console.log(pc2.green(t("cli.context_set", { size })));
@@ -30744,11 +30960,11 @@ Excluded blocks: ${info.excluded.length}`));
       }
       ctx.agent.shutdown();
       const { loadConfig: loadConfig2 } = await Promise.resolve().then(() => (init_config2(), exports_config));
-      const { homedir: homedir17 } = await import("os");
-      const { join: join46 } = await import("path");
+      const { homedir: homedir18 } = await import("os");
+      const { join: join47 } = await import("path");
       const configDir = ctx.configDir;
       const baseDir = ctx.baseDir;
-      const projectConfigPath = join46(baseDir, ".mmrc");
+      const projectConfigPath = join47(baseDir, ".mmrc");
       const freshConfig = loadConfig2({ configDir, projectConfigPath });
       Object.assign(ctx.config, freshConfig);
       const { bootstrap: bootstrap2 } = await Promise.resolve().then(() => (init_bootstrap(), exports_bootstrap));
@@ -30799,70 +31015,6 @@ Excluded blocks: ${info.excluded.length}`));
       }
     }
   });
-  ctx.registerCommand({
-    name: "lsp",
-    description: t("repl.lsp"),
-    usage: t("repl.lsp_usage"),
-    action: async (args) => {
-      const subcommand = args[0] || "status";
-      const lspModule = ctx.agent.deps?.moduleRegistry?.getModules?.()?.find((m) => m.name === "lsp");
-      if (!lspModule) {
-        console.log(pc2.yellow(t("repl.lsp_not_available")));
-        return;
-      }
-      switch (subcommand) {
-        case "status": {
-          const disabled = lspModule.getDisabledServers();
-          const failures = lspModule.getFailureCounts();
-          const config = ctx.config.lsp;
-          console.log(pc2.bold(t("repl.lsp_status_header")));
-          console.log(`${t("repl.lsp_enabled")} ${config?.enabled ? pc2.green("yes") : pc2.red("no")}`);
-          if (disabled.length > 0) {
-            console.log(pc2.yellow(`${t("repl.lsp_disabled_servers")} ${disabled.join(", ")}`));
-          }
-          if (failures.size > 0) {
-            console.log(pc2.dim(t("repl.lsp_failure_counts")));
-            for (const [server, count] of failures) {
-              console.log(pc2.dim(`  ${server}: ${count}`));
-            }
-          }
-          if (disabled.length === 0 && failures.size === 0) {
-            console.log(pc2.green(t("repl.lsp_all_ok")));
-          }
-          break;
-        }
-        case "restart": {
-          console.log(pc2.yellow(t("repl.lsp_restarting")));
-          lspModule.resetDisabledServers();
-          console.log(pc2.green(t("repl.lsp_restarted")));
-          break;
-        }
-        case "check": {
-          const path = args[1];
-          if (!path) {
-            console.log(pc2.yellow(t("repl.lsp_check_usage")));
-            return;
-          }
-          console.log(pc2.dim(t("repl.lsp_checking", { path })));
-          try {
-            const result = await ctx.agent.deps?.toolExecutor?.execute("lsp_check", { path }, ctx.agent.deps?.toolCtx);
-            if (result?.output) {
-              console.log(result.output);
-            }
-          } catch (e) {
-            console.log(pc2.red(t("repl.lsp_check_error", {
-              error: e instanceof Error ? e.message : String(e)
-            })));
-          }
-          break;
-        }
-        default: {
-          console.log(pc2.dim(t("repl.lsp_usage")));
-          break;
-        }
-      }
-    }
-  });
 }
 function registerSessionCommands(ctx) {
   if (!ctx.sessionManager)
@@ -31117,7 +31269,6 @@ var init_repl_commands = __esm(() => {
     reload: "agent",
     wizard: "agent",
     sysprompt: "agent",
-    lsp: "agent",
     sessions: "session",
     new: "session",
     resume: "session",
@@ -31149,15 +31300,16 @@ init_bootstrap();
 init_config2();
 init_setup();
 init_i18n();
-import { join as join44, dirname as dirname16 } from "path";
-import { homedir as homedir15 } from "os";
+init_colors();
+import { join as join45, dirname as dirname16 } from "path";
+import { homedir as homedir16 } from "os";
 import { existsSync as existsSync50, readFileSync as readFileSync32 } from "fs";
 
 // src/cli/security-commands.ts
 init_bootstrap();
 init_config2();
-import { join as join38 } from "path";
-import { homedir as homedir12 } from "os";
+import { join as join39 } from "path";
+import { homedir as homedir13 } from "os";
 
 // src/modules/security/security-policies.ts
 init_security();
@@ -31670,7 +31822,7 @@ function createSecurityCommand(program2) {
     }
   });
   securityCmd.command("set-policy").argument("<preset>", t("cli.security.preset")).description(t("cli.security.set_policy")).action(async (preset) => {
-    const configPath = join38(homedir12(), ".mma", "config.json");
+    const configPath = join39(homedir13(), ".mma", "config.json");
     const { config: appConfig } = await bootstrap();
     const validPresets = ["strict", "balanced", "permissive"];
     if (!validPresets.includes(preset)) {
@@ -31685,7 +31837,7 @@ function createSecurityCommand(program2) {
     console.log(t("cli.security.policy_description", { description: policy.description }));
   });
   securityCmd.command("enable-encryption").description(t("cli.security.enable_encryption")).action(async () => {
-    const configPath = join38(homedir12(), ".mma", "config.json");
+    const configPath = join39(homedir13(), ".mma", "config.json");
     const { config: appConfig } = await bootstrap();
     appConfig.security = appConfig.security || {};
     appConfig.security.sessionEncryption = {
@@ -31697,7 +31849,7 @@ function createSecurityCommand(program2) {
     console.log(t("cli.security.encryption_enabled"));
   });
   securityCmd.command("disable-encryption").description(t("cli.security.disable_encryption")).action(async () => {
-    const configPath = join38(homedir12(), ".mma", "config.json");
+    const configPath = join39(homedir13(), ".mma", "config.json");
     const { config: appConfig } = await bootstrap();
     appConfig.security = appConfig.security || {};
     appConfig.security.sessionEncryption = {
@@ -31709,7 +31861,7 @@ function createSecurityCommand(program2) {
     console.log(t("cli.security.encryption_disabled"));
   });
   securityCmd.command("enable-audit").description(t("cli.security.enable_audit")).action(async () => {
-    const configPath = join38(homedir12(), ".mma", "config.json");
+    const configPath = join39(homedir13(), ".mma", "config.json");
     const { config: appConfig } = await bootstrap();
     appConfig.security = appConfig.security || {};
     appConfig.security.auditNotifier = {
@@ -31723,7 +31875,7 @@ function createSecurityCommand(program2) {
     console.log(t("cli.security.audit_enabled"));
   });
   securityCmd.command("disable-audit").description(t("cli.security.disable_audit")).action(async () => {
-    const configPath = join38(homedir12(), ".mma", "config.json");
+    const configPath = join39(homedir13(), ".mma", "config.json");
     const { config: appConfig } = await bootstrap();
     appConfig.security = appConfig.security || {};
     appConfig.security.auditNotifier = {
@@ -31786,11 +31938,11 @@ function createPluginCommand(program2) {
 }
 
 // src/cli/commands.ts
-init_setup();
+init_presets();
 import { fileURLToPath as fileURLToPath4 } from "url";
 function readVersion2() {
   const here = dirname16(fileURLToPath4(import.meta.url));
-  const candidates = [join44(here, "..", "..", "package.json"), join44(here, "..", "package.json")];
+  const candidates = [join45(here, "..", "..", "package.json"), join45(here, "..", "package.json")];
   for (const p of candidates) {
     if (existsSync50(p)) {
       try {
@@ -31807,7 +31959,7 @@ function createProgram() {
   const program2 = new Command().name("mma").description(t("cli.description")).version(version).option("--no-agents-md", t("cli.no_agents_md")).option("-d, --dir <path>", t("cli.dir")).option("-e, --exit-on-complete", t("cli.exit_on_complete")).option("-j, --json", t("cli.json"));
   program2.command("init").description(t("cli.init")).action(async () => {
     const answers = await runSetup();
-    const configPath = join44(homedir15(), ".mma", "config.json");
+    const configPath = join45(homedir16(), ".mma", "config.json");
     const { config } = await bootstrap();
     config.provider.type = answers.provider;
     config.provider.baseUrl = answers.apiBase;
@@ -31852,7 +32004,7 @@ function createProgram() {
   });
   const configCmd = program2.command("config").description(t("cli.manage_config"));
   configCmd.command("set").argument("<key>", t("cli.config_key")).argument("<value>", "Config value").description(t("cli.set_value")).action(async (key, value) => {
-    const configPath = join44(homedir15(), ".mma", "config.json");
+    const configPath = join45(homedir16(), ".mma", "config.json");
     const { config } = await bootstrap();
     const keys = key.split(".");
     let obj = config;
@@ -31883,8 +32035,8 @@ function createProgram() {
   model.command("list").description(t("cli.list_models")).action(async () => {
     const { config } = await bootstrap();
     console.log(t("cli.current_model"), config.model);
-    const { OpenAICompatProvider: OpenAICompatProvider2 } = await Promise.resolve().then(() => (init_openai_compat(), exports_openai_compat));
-    const provider2 = new OpenAICompatProvider2({
+    const { createProvider: createProvider2 } = await Promise.resolve().then(() => (init_create(), exports_create));
+    const provider2 = createProvider2(config.provider.type, {
       model: config.model,
       baseUrl: config.provider.baseUrl,
       apiKey: config.provider.apiKey,
@@ -31915,7 +32067,7 @@ function createProgram() {
     console.log(t("cli.model_hint"));
   });
   model.command("use").argument("<name>", "Model name").description(t("cli.set_model")).action(async (name) => {
-    const configPath = join44(homedir15(), ".mma", "config.json");
+    const configPath = join45(homedir16(), ".mma", "config.json");
     const { config } = await bootstrap();
     config.model = name;
     saveConfig(config, configPath);
@@ -31951,7 +32103,7 @@ function createProgram() {
     await uncertify2(name, config);
   });
   program2.command("context").description(t("cli.manage_context")).argument("<size>", "Context window size in tokens").action(async (size) => {
-    const configPath = join44(homedir15(), ".mma", "config.json");
+    const configPath = join45(homedir16(), ".mma", "config.json");
     const { config } = await bootstrap();
     const contextWindow = parseInt(size, 10);
     if (isNaN(contextWindow) || contextWindow < 1024) {
@@ -31964,13 +32116,31 @@ function createProgram() {
   });
   const provider = program2.command("provider").description(t("cli.manage_providers"));
   provider.command("list").description(t("cli.list_providers")).action(async () => {
-    const { config } = await bootstrap();
+    const { config, agent } = await bootstrap();
+    const providers = agent.listProviders();
+    if (providers.length > 0) {
+      console.log(t("cli.current_provider"));
+      for (const p of providers) {
+        const marker = p.active ? pc2.green("* ") : "  ";
+        console.log(` ${marker}${p.label}  (${pc2.dim(p.type)})  ${pc2.dim(p.baseUrl)}`);
+      }
+      return;
+    }
     console.log(t("cli.current_provider"), config.provider.type);
     console.log(t("cli.base_url"), config.provider.baseUrl);
   });
   provider.command("use").argument("<name>", "Provider name").description(t("cli.set_provider")).action(async (name) => {
-    const configPath = join44(homedir15(), ".mma", "config.json");
-    const { config } = await bootstrap();
+    const configPath = join45(homedir16(), ".mma", "config.json");
+    const { config, agent } = await bootstrap();
+    if (config.provider.entries && config.provider.entries.length > 0) {
+      try {
+        await agent.setProvider(name);
+        console.log(t("cli.provider_set", { name }));
+      } catch (e) {
+        console.log(pc2.red(e.message));
+      }
+      return;
+    }
     config.provider.type = name;
     const baseUrl = HOSTED_BASE_URLS[name];
     if (baseUrl) {
@@ -31982,6 +32152,35 @@ function createProgram() {
       console.log(t("cli.provider_base_hint", { baseUrl }));
     }
   });
+  provider.command("add").argument("<name>", "Provider type or label").option("--url <url>", "Base URL").option("--key <key>", "API key").description(t("cli.add_provider")).action(async (name, opts) => {
+    const configPath = join45(homedir16(), ".mma", "config.json");
+    const { config } = await bootstrap();
+    const entries = Array.isArray(config.provider.entries) ? config.provider.entries : [];
+    if (entries.length === 0) {
+      entries.push({
+        type: config.provider.type,
+        label: config.provider.type,
+        baseUrl: config.provider.baseUrl,
+        apiKey: config.provider.apiKey
+      });
+    }
+    const baseUrl = opts.url || HOSTED_BASE_URLS[name] || HOSTED_BASE_URLS[`opencode-${name}`] || "";
+    if (!baseUrl) {
+      console.log(pc2.red(t("cli.provider_no_url", { name })));
+      return;
+    }
+    entries.push({
+      type: name,
+      label: name,
+      baseUrl,
+      apiKey: opts.key
+    });
+    config.provider.entries = entries;
+    config.provider.active = config.provider.active || config.provider.type;
+    saveConfig(config, configPath);
+    console.log(pc2.green(t("cli.provider_added", { name })));
+    console.log(t("cli.provider_switch_hint"));
+  });
   const session2 = program2.command("session").description(t("cli.manage_sessions"));
   session2.command("list").description(t("cli.list_sessions")).action(async () => {
     const { sessionManager } = await bootstrap();
@@ -32785,8 +32984,8 @@ class LineEditor {
 
 // src/cli/repl.ts
 import { existsSync as existsSync53, readFileSync as readFileSync35, writeFileSync as writeFileSync17 } from "fs";
-import { join as join47 } from "path";
-import { homedir as homedir17 } from "os";
+import { join as join48 } from "path";
+import { homedir as homedir18 } from "os";
 
 // src/cli/completer.ts
 class SlashCommandProvider {
@@ -33230,8 +33429,9 @@ ${pc2.dim(marker)} ${friendlyTool(tool)}${summary ? ` ${pc2.dim(summary)}` : ""}
 `);
     }
   }
-  toolEnd(_tool, duration, error, ctxDelta, costUsd) {
+  toolEnd(_tool, duration, error, ctxDelta, costUsd, provider, model) {
     this.spinner.stop();
+    const prov = provider && model ? `${pc2.dim(`${provider}·${model}`)}` : undefined;
     if (!this.rich) {
       const parts = [];
       if (ctxDelta !== undefined && ctxDelta !== 0) {
@@ -33241,6 +33441,8 @@ ${pc2.dim(marker)} ${friendlyTool(tool)}${summary ? ` ${pc2.dim(summary)}` : ""}
       if (costUsd !== undefined && costUsd > 0) {
         parts.push(`${pc2.dim("cost")} ${pc2.yellow(formatUsd(costUsd))}`);
       }
+      if (prov)
+        parts.push(prov);
       if (parts.length > 0)
         this.out.write(`${parts.join("  ")}
 `);
@@ -33258,6 +33460,9 @@ ${pc2.dim(marker)} ${friendlyTool(tool)}${summary ? ` ${pc2.dim(summary)}` : ""}
     if (costUsd !== undefined && costUsd > 0) {
       footer += `  ${pc2.dim("cost")} ${pc2.yellow(formatUsd(costUsd))}`;
     }
+    if (prov) {
+      footer += `  ${pc2.dim("via")} ${prov}`;
+    }
     if (this.toolStyle === "inline") {
       this.out.write(`${GUTTER}${footer}
 `);
@@ -33357,24 +33562,16 @@ async function probeLspServers(config, baseDir, deps = {}) {
       await probeClient.probe(server, projectRoot, serverTimeout);
       ok.push({ language, ok: true, durationMs: Date.now() - started });
     } catch (e) {
-      const errorMsg = e instanceof Error ? e.message : String(e);
-      deps.logger?.warn(`LSP probe failed for ${language}: ${errorMsg}`, {
-        command: server.command,
-        timeout: serverTimeout,
-        durationMs: Date.now() - started
-      });
       failed.push({
         language,
         ok: false,
-        error: errorMsg,
+        error: e instanceof Error ? e.message : String(e),
         durationMs: Date.now() - started
       });
     }
   };
   for (let i = 0;i < servers.length; i += maxParallel) {
     if (Date.now() >= deadline) {
-      const remaining = servers.slice(i).map((s) => s.language);
-      deps.logger?.warn(`LSP probe deadline reached, skipping: ${remaining.join(", ")}`);
       for (const { language } of servers.slice(i)) {
         failed.push({ language, ok: false, error: "timeout", durationMs: 0 });
       }
@@ -33394,9 +33591,9 @@ init_colors();
 init_js_identifiers();
 init_i18n();
 import { existsSync as existsSync52, readFileSync as readFileSync34 } from "fs";
-import { join as join46 } from "path";
+import { join as join47 } from "path";
 function readActivePlan(baseDir) {
-  const p = join46(baseDir, ".mma", "plans", "active.json");
+  const p = join47(baseDir, ".mma", "plans", "active.json");
   if (!existsSync52(p))
     return null;
   try {
@@ -33543,10 +33740,10 @@ class Repl {
     this.skillsModule = skillsModule;
     this.pluginManager = pluginManager;
     this.logger = logger;
-    this.configDir = configDir || join47(homedir17(), ".mma");
+    this.configDir = configDir || join48(homedir18(), ".mma");
     this.baseDir = baseDir || process.cwd();
     this.noAgentsMd = noAgentsMd === true;
-    this.historyPath = join47(homedir17(), ".mma", "repl-history");
+    this.historyPath = join48(homedir18(), ".mma", "repl-history");
     this.loadHistory();
     this.rl = process.stdin.isTTY ? new LineEditor({
       input: process.stdin,
@@ -33673,7 +33870,6 @@ class Repl {
       this.running = false;
       this.saveHistory();
       this.agent.shutdown();
-      this.logger?.closeSessionLog();
       if (this.exitOnClose)
         process.exit(0);
     });
@@ -33682,7 +33878,6 @@ class Repl {
         this.running = false;
         this.saveHistory();
         this.agent.shutdown();
-        this.logger?.closeSessionLog();
         process.exit(0);
       });
     }
@@ -33787,7 +33982,7 @@ ${t("image.clipboard_empty")}`));
         if (ev.type === "start") {
           renderer.toolStart(ev.tool, ev.args, stepContextForTool(this.activePlan, ev.tool, ev.args), ev.icon);
         } else {
-          renderer.toolEnd(ev.tool, ev.duration ?? 0, ev.error, ev.ctxDelta, ev.costUsd);
+          renderer.toolEnd(ev.tool, ev.duration ?? 0, ev.error, ev.ctxDelta, ev.costUsd, ev.provider, ev.model);
           if (ev.tool === "plan" || ev.tool === "todo") {
             this.refreshActivePlan(renderer);
           }
@@ -33959,9 +34154,9 @@ ${t("image.clipboard_empty")}`));
       row(t("repl.agents_label"), pc2.red(t("repl.disabled")));
     } else {
       const agentsMdCandidates = [
-        join47(this.baseDir, "AGENTS.md"),
-        join47(this.baseDir, ".mma", "AGENTS.md"),
-        join47(this.configDir, "AGENTS.md")
+        join48(this.baseDir, "AGENTS.md"),
+        join48(this.baseDir, ".mma", "AGENTS.md"),
+        join48(this.configDir, "AGENTS.md")
       ];
       const foundAgents = agentsMdCandidates.filter((p) => existsSync53(p));
       if (foundAgents.length > 0) {
@@ -33974,7 +34169,7 @@ ${t("image.clipboard_empty")}`));
     }
     const meta = this.sessionManager?.getActiveMeta();
     if (meta) {
-      const sessionPath = join47(this.configDir, "sessions", meta.id);
+      const sessionPath = join48(this.configDir, "sessions", meta.id);
       row(t("repl.session_label"), `${pc2.cyan(meta.name)} ${pc2.dim(`(${meta.id.slice(0, 12)})`)}  —  ${meta.messageCount} msgs  ${pc2.dim(sessionPath)}`);
     }
     const headerWidth = Math.max(50, Math.min(96, process.stdout.columns || 96));
@@ -34029,7 +34224,6 @@ ${t("image.clipboard_empty")}`));
     this.running = false;
     this.saveHistory();
     this.agent.shutdown();
-    this.logger?.closeSessionLog();
     this.rl.close();
   }
 }
@@ -34061,8 +34255,8 @@ init_config2();
 init_i18n();
 init_colors();
 import { existsSync as existsSync54, readFileSync as readFileSync36 } from "fs";
-import { join as join48, dirname as dirname18 } from "path";
-import { homedir as homedir18 } from "os";
+import { join as join49, dirname as dirname18 } from "path";
+import { homedir as homedir19 } from "os";
 import { fileURLToPath as fileURLToPath6 } from "url";
 
 // src/modules/updater/index.ts
@@ -34165,7 +34359,7 @@ class UpdaterModule {
 // src/cli/main.ts
 function readVersion4() {
   const here = dirname18(fileURLToPath6(import.meta.url));
-  const candidates = [join48(here, "..", "..", "package.json"), join48(here, "..", "package.json")];
+  const candidates = [join49(here, "..", "..", "package.json"), join49(here, "..", "package.json")];
   for (const p of candidates) {
     if (existsSync54(p)) {
       try {
@@ -34253,15 +34447,15 @@ async function main() {
     await updater?.waitForIdle();
     process.exit(exitCode);
   } else {
-    const configPath = join48(homedir18(), ".mma", "config.json");
+    const configPath = join49(homedir19(), ".mma", "config.json");
     if (!existsSync54(configPath)) {
       console.log(pc2.yellow(`
   ` + t("cli.first_run") + `
 `));
       const answers = await runSetup();
       const config2 = loadConfig({
-        configDir: join48(homedir18(), ".mma"),
-        projectConfigPath: projectDir ? join48(projectDir, ".mmrc") : join48(process.cwd(), ".mmrc")
+        configDir: join49(homedir19(), ".mma"),
+        projectConfigPath: projectDir ? join49(projectDir, ".mmrc") : join49(process.cwd(), ".mmrc")
       });
       config2.provider.type = answers.provider;
       config2.provider.baseUrl = answers.apiBase;