micro-models-agent 0.49.0 → 0.50.0

package/dist/main.js

@@ -2676,6 +2676,8 @@ Fix the error and re-edit the file (a clean write clears the failure), or mark t
     "cli.cert_fixture_missing": "Fixture missing for {id}: {path}",
     "cli.cert_marks_hint": "Markers: ✔ certified on this provider, ○ certified on an older MMA version, · not certified",
     "cli.manage_providers": "Manage providers",
+    "cli.provider_check": "Probe configured providers (free listModels call)",
+    "repl.provider_down": '[WARN] Provider "{name}" is unreachable: {error}',
     "cli.list_providers": "List providers",
     "cli.current_provider": "Current provider:",
     "cli.base_url": "Base URL:",
@@ -2829,14 +2831,14 @@ Available commands:`,
     "repl.wizard": "Run setup wizard",
     "repl.wizard_usage": "Usage: /wizard",
     "repl.wizard_running": "Running setup wizard... (current config will be overwritten)",
-    "repl.provider_list": "Show/set provider",
+    "repl.provider_list": "List configured providers or hot-swap the active one",
     "repl.provider_current": "Current provider",
     "repl.provider_set": "Provider set to: {name}",
-    "repl.provider_usage": "Usage: /provider list | /provider use <type>",
-    "repl.model_list": "Show/set model",
+    "repl.provider_usage": "/provider list - show entries (* = active, prio = fallback order) | /provider use <name> - switch without restart",
+    "repl.model_list": "List models of the active provider or switch the model",
     "repl.model_current": "Current model",
     "repl.model_set": "Model set to: {name}",
-    "repl.model_usage": "Usage: /model list | /model use <name>",
+    "repl.model_usage": "/model list - fetch models from the active provider | /model use <name> - switch model",
     "repl.group.general": "General",
     "repl.group.agent": "Agent",
     "repl.group.session": "Sessions",
@@ -3047,7 +3049,12 @@ 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.cost_breakdown": "By provider: {breakdown}",
     "repl.tokens": "Tokens used: {tokens}",
     "repl.ctrl_c_interrupt": `
 [Ctrl+C] Stopping agent... (press again to force)`,
@@ -3374,6 +3381,8 @@ var init_ru = __esm(() => {
     "cli.cert_fixture_missing": "Фикстура отсутствует для {id}: {path}",
     "cli.cert_marks_hint": "Маркеры: ✔ сертифицировано на этом провайдере, ○ сертифицировано на старой версии MMA, · не сертифицировано",
     "cli.manage_providers": "Управление провайдерами",
+    "cli.provider_check": "Проверить доступность провайдеров (бесплатный вызов listModels)",
+    "repl.provider_down": "[ВНИМАНИЕ] Провайдер «{name}» недоступен: {error}",
     "cli.list_providers": "Список провайдеров",
     "cli.current_provider": "Текущий провайдер:",
     "cli.base_url": "Базовый URL:",
@@ -3527,14 +3536,14 @@ var init_ru = __esm(() => {
     "repl.wizard": "Запустить мастер настройки",
     "repl.wizard_usage": "Использование: /wizard",
     "repl.wizard_running": "Запуск мастера настройки... (текущая конфигурация будет перезаписана)",
-    "repl.provider_list": "Показать/сменить провайдер",
+    "repl.provider_list": "Список настроенных провайдеров или горячая смена активного",
     "repl.provider_current": "Текущий провайдер",
     "repl.provider_set": "Провайдер установлен: {name}",
-    "repl.provider_usage": "Использование: /provider list | /provider use <тип>",
-    "repl.model_list": "Показать/сменить модель",
+    "repl.provider_usage": "/provider list — записи (* = активный, prio = порядок fallback) | /provider use <имя> — смена без перезапуска",
+    "repl.model_list": "Список моделей активного провайдера или смена модели",
     "repl.model_current": "Текущая модель",
     "repl.model_set": "Модель установлена: {name}",
-    "repl.model_usage": "Использование: /model list | /model use <имя>",
+    "repl.model_usage": "/model list — получить модели активного провайдера | /model use <имя> — сменить модель",
     "repl.reload": "Перезагрузить агента с текущим конфигом",
     "repl.reload_usage": "Использование: /reload",
     "repl.reloading": "Перезагрузка агента...",
@@ -3752,7 +3761,12 @@ 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.cost_breakdown": "По провайдерам: {breakdown}",
     "repl.tokens": "Потрачено токенов: {tokens}",
     "repl.ctrl_c_interrupt": `
 [Ctrl+C] Остановка агента... (ещё раз — принудительно)`,
@@ -4757,6 +4771,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;
@@ -5646,13 +5680,13 @@ class OpenAICompatProvider {
         headers
       });
       if (!response.ok) {
-        return [];
+        throw new Error(`HTTP ${response.status} from ${url}`);
       }
       const data = await response.json();
       const models = (data.data || data || []).map((m) => m.id || m.name || m.model || "").filter(Boolean);
       return models;
-    } catch {
-      return [];
+    } catch (err) {
+      throw err instanceof Error ? err : new Error(String(err));
     }
   }
   async fetchWithRetry(url, init) {
@@ -5681,12 +5715,16 @@ class OpenAICompatProvider {
       }
     }
     if (lastStatus === 429) {
-      throw new Error(t("error.llm_429", {
+      const e429 = new Error(t("error.llm_429", {
         model: this.model,
         baseUrl: this.config.baseUrl
       }));
+      e429.llmStatus = lastStatus;
+      throw e429;
     }
-    throw new Error(t("error.llm_retries"));
+    const eRetry = new Error(t("error.llm_retries"));
+    eRetry.llmStatus = lastStatus;
+    throw eRetry;
   }
   isRetryable(status) {
     return status === 429 || status >= 500;
@@ -5717,6 +5755,399 @@ var init_openai_compat = __esm(() => {
   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 };
+    }).map((e, i) => ({ e, i, p: e.priority ?? Number.MAX_SAFE_INTEGER })).sort((a, b) => a.p - b.p || a.i - b.i).map(({ e }) => e);
+  }
+  listNames() {
+    return this.list().map((e) => e.label);
+  }
+  pickFor(needs) {
+    const globalWindow = this.opts.contextWindow;
+    if (!needs.vision && !needs.tools && needs.minContext === undefined) {
+      return this.activeProviderName;
+    }
+    for (const e of this.list()) {
+      const caps = this.registry.get(e.type)?.capabilities;
+      if (needs.vision && !caps?.vision)
+        continue;
+      if (needs.tools && !caps?.tools)
+        continue;
+      if (needs.minContext !== undefined && (e.contextWindow ?? globalWindow) < needs.minContext) {
+        continue;
+      }
+      return e.label;
+    }
+    return;
+  }
+  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/health.ts
+async function probeProviders(targets, opts) {
+  const timeoutMs = opts?.timeoutMs ?? 5000;
+  const results = await Promise.all(targets.map((t2) => probeOne(t2, timeoutMs)));
+  return results;
+}
+async function probeOne(target, timeoutMs) {
+  const start = Date.now();
+  try {
+    const models = await withTimeout(target.listModels(), timeoutMs);
+    return { name: target.name, ok: true, ms: Date.now() - start, models: models.length };
+  } catch (err) {
+    const message = err instanceof Error ? err.message : String(err);
+    return {
+      name: target.name,
+      ok: false,
+      ms: Date.now() - start,
+      models: 0,
+      error: message
+    };
+  }
+}
+function withTimeout(promise, ms) {
+  return new Promise((resolve, reject) => {
+    const timer = setTimeout(() => reject(new Error(`timeout after ${ms}ms`)), ms);
+    promise.then((v) => {
+      clearTimeout(timer);
+      resolve(v);
+    }, (e) => {
+      clearTimeout(timer);
+      reject(e);
+    });
+  });
+}
+function targetsFromProviders(entries) {
+  return entries.map(({ name, provider }) => ({
+    name,
+    listModels: () => provider.listModels()
+  }));
+}
+
+// src/modules/providers/index.ts
+var init_providers = __esm(() => {
+  init_create();
+  init_manager();
+  init_presets();
+});
+
+// src/modules/providers/fallback.ts
+function isFailoverError(err) {
+  const e = err;
+  if (e?.name === "AbortError")
+    return false;
+  if (typeof e?.llmStatus === "number")
+    return e.llmStatus === 429 || e.llmStatus >= 500;
+  const normCode = (e?.code ?? "").replace(/[-_]/g, "").toLowerCase();
+  if (/^abort/.test(normCode))
+    return false;
+  if (/conn(refused|reset|timedout)|enotfound|eai_again|namenotresolved/.test(normCode)) {
+    return true;
+  }
+  return /fetch failed|unable to connect|network|econnrefused|enotfound|etimedout|socket hang up|connection refused|connection reset/i.test(e?.message ?? "");
+}
+
+class FallbackProvider {
+  source;
+  onFailover;
+  constructor(source, onFailover) {
+    this.source = source;
+    this.onFailover = onFailover;
+  }
+  get model() {
+    return this.source.active.model;
+  }
+  get contextWindow() {
+    return this.source.active.contextWindow;
+  }
+  async* chat(messages, tools, signal, options) {
+    const names = this.source.listNames();
+    if (names.length <= 1) {
+      yield* this.source.active.chat(messages, tools, signal, options);
+      return;
+    }
+    let emitted = false;
+    let idx = Math.max(0, names.indexOf(this.source.activeName));
+    let lastError;
+    for (let attempt = 0;attempt < names.length; attempt++) {
+      const name = names[idx];
+      const provider = name === this.source.activeName ? this.source.active : this.source.switch(name);
+      try {
+        for await (const chunk of provider.chat(messages, tools, signal, options)) {
+          emitted = true;
+          yield chunk;
+        }
+        return;
+      } catch (err) {
+        if (emitted || !isFailoverError(err))
+          throw err;
+        lastError = err;
+        idx = (idx + 1) % names.length;
+        this.onFailover?.(name, names[idx], err);
+      }
+    }
+    throw lastError;
+  }
+  countTokens(text) {
+    return this.source.active.countTokens(text);
+  }
+  async listModels() {
+    return this.source.active.listModels();
+  }
+}
+
 // src/llm/model-loader.ts
 class ModelLoader {
   baseUrl;
@@ -6018,6 +6449,16 @@ function safeResolvePath(baseDir, userPath) {
       return asIs;
   }
   const norm = normalize(userPath);
+  if (isAbsolute(norm)) {
+    if (existsSync7(norm) || existsSync7(dirname2(norm)))
+      return norm;
+    const stripped2 = norm.replace(/^[/\\]/, "");
+    const relativeCandidate = resolve(baseDir, stripped2);
+    if (existsSync7(relativeCandidate) || existsSync7(dirname2(relativeCandidate))) {
+      return relativeCandidate;
+    }
+    return norm;
+  }
   const stripped = norm.replace(/^[/\\]/, "");
   const resolved = resolve(baseDir, stripped);
   if (existsSync7(resolved) || existsSync7(dirname2(resolved)))
@@ -8636,9 +9077,11 @@ import { readFileSync as readFileSync9, existsSync as existsSync18 } from "fs";
 
 class SessionLogger {
   session;
+  getCaller;
   logger;
-  constructor(session, logger) {
+  constructor(session, logger, getCaller) {
     this.session = session;
+    this.getCaller = getCaller;
     this.logger = logger;
     this.bindSessionDir();
   }
@@ -8677,12 +9120,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({
@@ -8696,14 +9142,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) {
@@ -8726,11 +9177,14 @@ class SessionLogger {
     });
   }
   logToolResult(call, result, duration, iteration) {
+    const caller = this.getCaller?.();
     this.session?.appendMessage({
       role: "tool",
       content: sanitizeLogMessage(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(),
@@ -8741,7 +9195,9 @@ class SessionLogger {
       content: sanitizeLogMessage(result.output.slice(0, 1000)),
       diff: result.diff,
       duration,
-      iteration
+      iteration,
+      provider: caller?.provider,
+      model: caller?.model
     });
   }
   logCompaction(info) {
@@ -8768,6 +9224,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,
@@ -8787,6 +9245,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,
@@ -9622,18 +10082,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
         });
       }
@@ -9800,7 +10262,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();
 });
 
@@ -11849,6 +12311,7 @@ class CostTracker {
   model;
   _total = 0;
   _known = false;
+  byProvider = new Map;
   constructor(model, config) {
     this.model = model;
     this.config = config;
@@ -11856,16 +12319,36 @@ class CostTracker {
   setModel(model) {
     this.model = model;
   }
-  record(promptTokens, completionTokens) {
+  record(promptTokens, completionTokens, provider) {
+    const key = provider || "unknown";
     const cost = calculateCost(this.model, promptTokens, completionTokens, this.config);
     if (cost === undefined)
       return;
     this._known = true;
     this._total += cost;
+    let entry = this.byProvider.get(key);
+    if (!entry) {
+      entry = { total: 0, known: false };
+      this.byProvider.set(key, entry);
+    }
+    entry.known = true;
+    entry.total += cost;
   }
   get total() {
     return this._known ? this._total : undefined;
   }
+  totalFor(provider) {
+    const entry = this.byProvider.get(provider);
+    return entry && entry.known ? entry.total : undefined;
+  }
+  breakdown() {
+    const entries = [];
+    for (const [provider, entry] of this.byProvider) {
+      if (entry.known)
+        entries.push({ provider, cost: entry.total });
+    }
+    return entries.sort((a, b) => b.cost - a.cost);
+  }
   get formatted() {
     return this._known ? formatCost(this._total) : undefined;
   }
@@ -11908,6 +12391,12 @@ class Agent {
   get contextManager() {
     return this.deps.contextManager;
   }
+  callerProvenance() {
+    return {
+      provider: this.deps.config.provider?.type || "unknown",
+      model: this.deps.config.model
+    };
+  }
   getModule(name) {
     return this.deps.moduleRegistry?.get(name);
   }
@@ -12022,7 +12511,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()}`);
@@ -12076,7 +12565,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 = "";
@@ -12255,7 +12744,7 @@ ${t("tool.truncated", { tokens: Math.ceil(removedChars / 2) })}`;
           source,
           durationMs: Date.now() - llmStart
         });
-        this.costTracker.record(prompt, completion);
+        this.costTracker.record(prompt, completion, this.callerProvenance().provider);
       }
       if (this.shutdownRequested) {
         break;
@@ -12608,6 +13097,7 @@ ${warnLine}
         completionTokens: usageTokens.completion,
         totalTokens: usageTokens.total,
         totalCost: this.costTracker.total,
+        costBreakdown: this.costTracker.breakdown(),
         compactionCount: contextManager.getCompactionCount(),
         contextQuality: contextManager.getQuality()
       };
@@ -12623,6 +13113,7 @@ ${warnLine}
       completionTokens: usageTokens.completion,
       totalTokens: usageTokens.total,
       totalCost: this.costTracker.total,
+      costBreakdown: this.costTracker.breakdown(),
       compactionCount: contextManager.getCompactionCount(),
       contextQuality: contextManager.getQuality()
     };
@@ -12649,6 +13140,45 @@ ${warnLine}
     this.deps.config = config;
     this.costTracker.setModel(config.model);
   }
+  setProvider(name, model) {
+    const manager = new ProviderManager(this.deps.config.provider, {
+      contextWindow: this.deps.config.contextWindow,
+      retry: this.deps.config.retry,
+      rateLimits: this.deps.config.security?.rateLimits
+    });
+    manager.switch(name, model);
+    const providerCfg = manager.toConfig();
+    this.deps.config.provider = providerCfg;
+    this.deps.llmProvider = manager.active;
+    this.deps.toolExecutor.updateProvider(manager.active);
+    this.deps.toolExecutor.ctx.llmProvider = manager.active;
+  }
+  listProviders() {
+    const manager = new ProviderManager(this.deps.config.provider, {
+      contextWindow: this.deps.config.contextWindow,
+      retry: this.deps.config.retry,
+      rateLimits: this.deps.config.security?.rateLimits
+    });
+    const activeName = this.deps.config.provider.active;
+    return manager.list().map((e) => ({
+      ...e,
+      active: e.label === activeName || e.type === activeName
+    }));
+  }
+  getProviderFor(name) {
+    try {
+      const manager = new ProviderManager(this.deps.config.provider, {
+        contextWindow: this.deps.config.contextWindow,
+        retry: this.deps.config.retry,
+        rateLimits: this.deps.config.security?.rateLimits
+      });
+      manager.setModel(this.deps.config.model);
+      manager.switch(name);
+      return manager.active;
+    } catch {
+      return;
+    }
+  }
   setContext(messages) {
     const { contextManager } = this.deps;
     contextManager.clear();
@@ -12683,6 +13213,7 @@ ${warnLine}
 }
 var TOOL_RESULT_MAX_TOKENS_RATIO = 0.3, TOOL_RESULT_ABSOLUTE_MAX_CHARS = 15000, QUALITY_TRIGGER_THRESHOLD = 40, FORCED_COMPACTION_COOLDOWN = 3;
 var init_agent = __esm(() => {
+  init_manager();
   init_i18n();
   init_colors();
   init_prompt_builder();
@@ -13158,7 +13689,7 @@ ${lines.join(`
   }
 }
 var COMPACTION_INTERVAL = 15, KEEP_LAST_N = 6;
-var init_manager = __esm(() => {
+var init_manager2 = __esm(() => {
   init_fact_extractor();
 });
 
@@ -13828,7 +14359,7 @@ class PluginManager {
     return chunk;
   }
 }
-var init_manager2 = __esm(() => {
+var init_manager3 = __esm(() => {
   init_checker();
 });
 
@@ -13848,9 +14379,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();
@@ -14958,8 +15489,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();
@@ -20016,7 +20547,7 @@ class SessionManager {
     }
   }
 }
-var init_manager3 = __esm(() => {
+var init_manager4 = __esm(() => {
   init_i18n();
   init_session_isolation();
 });
@@ -20052,7 +20583,7 @@ var init_module2 = __esm(() => {
 // src/modules/session/index.ts
 var init_session2 = __esm(() => {
   init_store3();
-  init_manager3();
+  init_manager4();
   init_module2();
 });
 
@@ -22205,6 +22736,31 @@ function buildSystemInfo(config, baseDir, profileCompressed) {
     lines.push(`Plan rule (MANDATORY): any task creating files, installing packages, or requiring multiple actions MUST create a plan with the "plan" tool BEFORE starting. Each step = a concrete deliverable.`);
   }
   lines.push(`Runtime verification: when a bug is described in terms of runtime behavior (what happens when the app runs), reproduce it — run the app / build / browser tool — and confirm the fix against actual runtime output before calling "plan update step=N status=done". Check existing servers first with process_list/process_log: a stale dev server started BEFORE your change still runs the old pipeline and keeps failing even after the files on disk are fixed. Restart or kill it (process_kill) and verify the exact endpoint/port the user reported — a fresh server on a new port does NOT prove the user's error is gone.`);
+  const sec = config.security;
+  if (sec?.enabled) {
+    const secLines = [`SECURITY RESTRICTIONS (enforced — blocked calls return "[SECURITY BLOCKED]", do not retry them):`];
+    if (sec.bash?.enabled && sec.bash.blacklist.length > 0) {
+      const cmds = sec.bash.blacklist.slice(0, 15).join(", ");
+      secLines.push(`Forbidden bash commands: ${cmds}${sec.bash.blacklist.length > 15 ? ", …" : ""}.`);
+      if (sec.bash.whitelist.length > 0) {
+        secLines.push(`Only whitelisted bash commands are allowed: ${sec.bash.whitelist.slice(0, 15).join(", ")}.`);
+      }
+      if (sec.bash.blockDangerousFlags) {
+        secLines.push(`Pipes/redirects/chaining (| > >> ; &&) in bash are blocked — one plain command per call.`);
+      }
+    }
+    if (sec.paths?.enabled && sec.paths.denied.length > 0) {
+      const paths = sec.paths.denied.slice(0, 10).join(", ");
+      secLines.push(`Denied paths (read/write): ${paths}${sec.paths.denied.length > 10 ? ", …" : ""}.`);
+    }
+    if (sec.network?.enabled && sec.network.deniedDomains.length > 0) {
+      const domains = sec.network.deniedDomains.slice(0, 10).join(", ");
+      secLines.push(`Denied network domains: ${domains}${sec.network.deniedDomains.length > 10 ? ", …" : ""}.`);
+    }
+    if (secLines.length > 1) {
+      lines.push(...secLines);
+    }
+  }
   const hasMCP = config.mcpServers && Object.values(config.mcpServers).some((s) => s.enabled !== false);
   if (hasMCP) {
     lines.push(`MCP servers are available — use the named MCP tools (prefixed mcp__) to query external services.`);
@@ -22249,14 +22805,18 @@ async function bootstrap(configDir, projectDir, noAgentsMd, exitOnComplete) {
   const profile = new UserProfile(join39(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);
+  let llmProvider = providerManager.active;
+  if (config.provider.fallback && providerManager.listNames().length > 1) {
+    llmProvider = new FallbackProvider(providerManager, (from, to, error) => {
+      logger.warn(`provider failover: ${from} -> ${to} (${error.message.slice(0, 120)})`);
+    });
+  }
   const baseDir = projectDir ? resolve23(projectDir) : process.cwd();
   const envReport = collectEnvironment({
     configDir: dir,
@@ -22547,15 +23107,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();
@@ -23299,35 +23859,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
@@ -31151,7 +31700,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}`);
@@ -31179,8 +31734,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`);
@@ -31239,8 +31800,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") {
@@ -31249,11 +31819,13 @@ Excluded blocks: ${info.excluded.length}`));
           console.log(t("repl.provider_usage"));
           return;
         }
-        ctx.config.provider.type = name;
-        const configPath = join47(homedir17(), ".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);
+          ctx.refreshModelCache();
+          console.log(pc2.green(t("repl.provider_set", { name })));
+        } catch (e) {
+          console.log(pc2.red(e.message));
+        }
         return;
       }
       console.log(t("repl.provider_usage"));
@@ -31281,6 +31853,7 @@ Excluded blocks: ${info.excluded.length}`));
           const models = await provider.listModels();
           s.stop();
           if (models.length > 0) {
+            ctx.refreshModelCache();
             console.log(t("cli.available_models"));
             const { getCertMark: getCertMark2 } = await Promise.resolve().then(() => (init_manifest(), exports_manifest));
             for (const m of models) {
@@ -31752,6 +32325,7 @@ init_bootstrap();
 init_config2();
 init_setup();
 init_i18n();
+init_colors();
 import { join as join46 } from "path";
 import { homedir as homedir16 } from "os";
 
@@ -32388,7 +32962,7 @@ function createPluginCommand(program2) {
 }
 
 // src/cli/commands.ts
-init_setup();
+init_presets();
 init_version();
 var version = readMmaVersion();
 function createProgram() {
@@ -32471,8 +33045,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,
@@ -32551,14 +33125,51 @@ function createProgram() {
     console.log(t("cli.context_set", { size: contextWindow }));
   });
   const provider = program2.command("provider").description(t("cli.manage_providers"));
+  provider.command("check").description(t("cli.provider_check")).option("--timeout <ms>", "Per-provider probe timeout in ms").action(async (opts) => {
+    const { config, agent } = await bootstrap();
+    const providers = agent.listProviders();
+    const targets = targetsFromProviders(providers.length > 0 ? providers.map((p) => ({ name: p.label, provider: agent.getProviderFor(p.label) })).filter((x) => Boolean(x.provider)) : [
+      {
+        name: config.provider.type,
+        provider: agent.getProviderFor(config.provider.active || config.provider.type)
+      }
+    ].filter((x) => Boolean(x.provider)));
+    const results = await probeProviders(targets, {
+      timeoutMs: opts.timeout ? Number(opts.timeout) : 5000
+    });
+    for (const r of results) {
+      const mark = r.ok ? pc2.green("✓") : pc2.red("✗");
+      const detail = r.ok ? pc2.dim(`${r.ms}ms, ${r.models} models`) : pc2.red(r.error ?? "failed");
+      console.log(` ${mark} ${r.name.padEnd(16)} ${detail}`);
+    }
+  });
   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("* ") : "  ";
+        const prio = p.priority !== undefined ? `  ${pc2.dim(`prio=${p.priority}`)}` : "";
+        console.log(` ${marker}${p.label}  (${pc2.dim(p.type)})  ${pc2.dim(p.baseUrl)}${prio}`);
+      }
+      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 = join46(homedir16(), ".mma", "config.json");
-    const { config } = await bootstrap();
+    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) {
@@ -32570,6 +33181,43 @@ 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").option("--priority <n>", "Fallback priority (lower = tried first)").option("--context-window <n>", "Context window override for this entry").option("--rpm <n>", "Max requests per minute for this entry").option("--parallel <n>", "Max parallel tasks for this entry").description(t("cli.add_provider")).action(async (name, opts) => {
+    const configPath = join46(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,
+      ...opts.priority !== undefined ? { priority: Number(opts.priority) } : {},
+      ...opts.contextWindow !== undefined ? { contextWindow: Number(opts.contextWindow) } : {},
+      ...opts.rpm !== undefined || opts.parallel !== undefined ? {
+        rateLimits: {
+          maxRequestsPerMinute: Number(opts.rpm ?? 0) || 60,
+          maxParallelTasks: Number(opts.parallel ?? 0) || 1
+        }
+      } : {}
+    });
+    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();
@@ -33406,6 +34054,34 @@ class SubcommandProvider {
     return this.subcommands.filter((s) => s.startsWith(ctx.partial));
   }
 }
+
+class ModelArgProvider {
+  name = "model-args";
+  getModels;
+  constructor(getModels) {
+    this.getModels = getModels;
+  }
+  match(ctx) {
+    return ctx.tokenIndex === 2 && ctx.tokens[0] === "/model" && ctx.tokens[1] === "use";
+  }
+  complete(ctx) {
+    return this.getModels().filter((m) => m.startsWith(ctx.partial));
+  }
+}
+class ProviderArgProvider {
+  name = "provider-args";
+  providers;
+  constructor(providers) {
+    this.providers = providers;
+  }
+  match(ctx) {
+    return ctx.tokenIndex === 2 && ctx.tokens[0] === "/provider" && ctx.tokens[1] === "use";
+  }
+  complete(ctx) {
+    return this.providers.filter((p) => p.startsWith(ctx.partial));
+  }
+}
+
 class SessionNameProvider {
   name = "session-names";
   getNames;
@@ -33672,6 +34348,9 @@ class FormattingStream {
     return result;
   }
 }
+function formatWarning(text) {
+  return pc2.yellow(pc2.bold(t("ui.warning_prefix")) + text);
+}
 
 // src/ui/renderer.ts
 init_spinner();
@@ -33818,8 +34497,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) {
@@ -33829,6 +34509,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("  ")}
 `);
@@ -33846,6 +34528,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}
 `);
@@ -33936,7 +34621,7 @@ async function probeLspServers(config, baseDir, deps = {}) {
   const ok = [];
   const failed = [];
   const deadline = Date.now() + deadlineMs;
-  const probeOne = async (language, server) => {
+  const probeOne2 = async (language, server) => {
     const projectRoot = findProjectRoot(baseDir, baseDir, server.workspaceMarkers ?? []);
     const serverTimeout = Math.min(server.timeout ?? timeoutCap, timeoutCap);
     const started = Date.now();
@@ -33971,7 +34656,7 @@ async function probeLspServers(config, baseDir, deps = {}) {
       break;
     }
     const wave = servers.slice(i, i + maxParallel);
-    await Promise.all(wave.map(({ language, config: server }) => probeOne(language, server)));
+    await Promise.all(wave.map(({ language, config: server }) => probeOne2(language, server)));
   }
   return { ok, failed, noneApplicable: false };
 }
@@ -34061,6 +34746,14 @@ function stepContextForTool(plan, tool, args) {
 
 // src/cli/repl.ts
 init_prices();
+
+// src/ui/output.ts
+function writeWarning(text) {
+  process.stdout.write(formatWarning(text) + `
+`);
+}
+
+// src/cli/repl.ts
 function formatContextBar(used, limit, compactions, quality) {
   const pct = Math.min(100, Math.round(used / limit * 100));
   const barLen = 20;
@@ -34080,6 +34773,7 @@ function formatContextBar(used, limit, compactions, quality) {
 
 class Repl {
   completer = new Completer;
+  modelCache = [];
   running = false;
   agentRunning = false;
   inputLocked = false;
@@ -34175,6 +34869,28 @@ class Repl {
       this.completer.registerProvider(new SubcommandProvider("skill", ["list", "loaded", "load", "unload", "search"]));
       this.completer.registerProvider(new SkillNameProvider(this.skillsModule));
     }
+    this.completer.registerProvider(new SubcommandProvider("provider", ["list", "use"]));
+    this.completer.registerProvider(new SubcommandProvider("model", ["list", "use"]));
+    const entryLabels = this.config.provider?.entries?.map((e) => e.label || e.type) ?? [];
+    if (entryLabels.length > 0) {
+      this.completer.registerProvider(new ProviderArgProvider(entryLabels));
+    }
+    this.completer.registerProvider(new ModelArgProvider(() => this.modelCache));
+    this.refreshModelCache();
+  }
+  refreshModelCache() {
+    (async () => {
+      try {
+        const name = this.config.provider.active || this.config.provider.entries?.[0]?.label || this.config.provider.type;
+        const provider = this.agent.getProviderFor(name);
+        if (!provider)
+          return;
+        const models = await provider.listModels();
+        if (models.length > 0) {
+          this.modelCache = models.sort();
+        }
+      } catch {}
+    })();
   }
   setupListeners() {
     let multiLineBuffer = "";
@@ -34358,7 +35074,7 @@ ${t("image.clipboard_empty")}`));
         if (ev.type === "start") {
           renderer.toolStart(ev.tool, ev.args, stepContextForTool(this.execModule?.getActivePlan() ?? null, 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.renderPlan(renderer);
           }
@@ -34557,6 +35273,18 @@ ${t("image.clipboard_empty")}`));
           this.updateLspRow(headerWidth, lspSummary);
       }).catch(() => {});
     }
+    if ((this.config.provider.entries?.length ?? 0) > 1) {
+      probeProviders(targetsFromProviders((this.config.provider.entries ?? []).map((e) => ({
+        name: e.label || e.type,
+        provider: this.agent.getProviderFor(e.label || e.type)
+      })).filter((x) => Boolean(x.provider))), { timeoutMs: 5000 }).then((results) => {
+        for (const r of results) {
+          if (!r.ok && r.name !== this.config.provider.active) {
+            writeWarning(t("repl.provider_down", { name: r.name, error: r.error ?? "" }));
+          }
+        }
+      }).catch(() => {});
+    }
   }
   updateLspRow(headerWidth, summary) {
     if (this.agentRunning || !process.stdout.isTTY)
@@ -34619,6 +35347,10 @@ function printRunResult(result, flush) {
   if (result.success) {
     if (result.totalCost !== undefined && result.totalCost > 0) {
       console.log(pc2.dim(`${t("repl.cost", { cost: formatCost(result.totalCost) })}`));
+      if (result.costBreakdown && result.costBreakdown.length > 1) {
+        const parts = result.costBreakdown.map((e) => `${e.provider} ${formatCost(e.cost)}`);
+        console.log(pc2.dim(`  ${t("repl.cost_breakdown", { breakdown: parts.join(", ") })}`));
+      }
     } else if (result.totalTokens !== undefined && result.totalTokens > 0) {
       console.log(pc2.dim(`${t("repl.tokens", { tokens: result.totalTokens })}`));
     }
@@ -34833,7 +35565,8 @@ async function main() {
         promptTokens: result2.promptTokens ?? null,
         completionTokens: result2.completionTokens ?? null,
         totalTokens: result2.totalTokens ?? null,
-        totalCost: result2.totalCost ?? null
+        totalCost: result2.totalCost ?? null,
+        costBreakdown: result2.costBreakdown ?? []
       }, null, 2));
       process.stdout.write(`
 `);