mini-coder 0.3.1 → 0.4.0

package/dist/mc.js

@@ -13,7 +13,7 @@ import { SSEClientTransport } from "@modelcontextprotocol/sdk/client/sse.js";
 import { StdioClientTransport } from "@modelcontextprotocol/sdk/client/stdio.js";
 import { StreamableHTTPClientTransport } from "@modelcontextprotocol/sdk/client/streamableHttp.js";
 // src/internal/version.ts
-var PACKAGE_VERSION = "0.3.1";
+var PACKAGE_VERSION = "0.4.0";
 
 // src/mcp/client.ts
 async function connectMcpServer(config) {
@@ -68,6 +68,43 @@ async function connectMcpServer(config) {
   };
 }
 
+// src/mcp/client-registry.ts
+class McpClientRegistry {
+  clients = new Set;
+  add(client) {
+    this.clients.add(client);
+  }
+  async closeAll() {
+    const clients = Array.from(this.clients);
+    this.clients.clear();
+    await Promise.allSettled(clients.map((client) => client.close()));
+  }
+}
+
+// src/mcp/tool-sync.ts
+function removeMcpTools(tools, mcpTools) {
+  for (const tool of mcpTools) {
+    const index = tools.indexOf(tool);
+    if (index >= 0)
+      tools.splice(index, 1);
+  }
+  mcpTools.length = 0;
+}
+async function reconnectMcpTools(opts) {
+  await opts.clients.closeAll();
+  removeMcpTools(opts.tools, opts.mcpTools);
+  for (const name of opts.names) {
+    try {
+      const client = await opts.connectByName(name);
+      opts.clients.add(client);
+      opts.tools.push(...client.tools);
+      opts.mcpTools.push(...client.tools);
+    } catch (error) {
+      opts.onError?.(name, error);
+    }
+  }
+}
+
 // src/session/db/connection.ts
 import { Database } from "bun:sqlite";
 import { existsSync, mkdirSync, renameSync } from "fs";
@@ -342,336 +379,96 @@ function upsertMcpServer(server) {
 function deleteMcpServer(name) {
   getDb().run("DELETE FROM mcp_servers WHERE name = ?", [name]);
 }
-// src/cli/output.ts
-import { homedir as homedir4 } from "os";
-import * as c7 from "yoctocolors";
-
-// src/agent/context-files.ts
-import { existsSync as existsSync2, readFileSync } from "fs";
-import { homedir as homedir2 } from "os";
-import { dirname, join as join2, resolve } from "path";
-var HOME = homedir2();
-function tilde(p) {
-  return p.startsWith(HOME) ? `~${p.slice(HOME.length)}` : p;
-}
-function globalContextCandidates(homeDir = HOME) {
-  return [
-    {
-      abs: join2(homeDir, ".agents", "AGENTS.md"),
-      label: "~/.agents/AGENTS.md"
-    },
-    {
-      abs: join2(homeDir, ".agents", "CLAUDE.md"),
-      label: "~/.agents/CLAUDE.md"
-    },
-    {
-      abs: join2(homeDir, ".claude", "CLAUDE.md"),
-      label: "~/.claude/CLAUDE.md"
-    }
-  ];
+// src/logging/context.ts
+var _currentContext = null;
+function setLogContext(context) {
+  _currentContext = context;
 }
-function dirContextCandidates(dir) {
-  const rel = (p) => tilde(resolve(dir, p));
-  return [
-    {
-      abs: join2(dir, ".agents", "AGENTS.md"),
-      label: `${rel(".agents/AGENTS.md")}`
-    },
-    {
-      abs: join2(dir, ".agents", "CLAUDE.md"),
-      label: `${rel(".agents/CLAUDE.md")}`
-    },
-    {
-      abs: join2(dir, ".claude", "CLAUDE.md"),
-      label: `${rel(".claude/CLAUDE.md")}`
-    },
-    { abs: join2(dir, "CLAUDE.md"), label: `${rel("CLAUDE.md")}` },
-    { abs: join2(dir, "AGENTS.md"), label: `${rel("AGENTS.md")}` }
-  ];
+function getLogContext() {
+  return _currentContext;
 }
-function discoverContextFiles(cwd, homeDir) {
-  const candidates = [
-    ...globalContextCandidates(homeDir),
-    ...dirContextCandidates(cwd)
-  ];
-  return candidates.filter((c) => existsSync2(c.abs)).map((c) => c.label);
+function logError(err, context) {
+  const logCtx = _currentContext;
+  if (!logCtx)
+    return;
+  logCtx.logsRepo.write(logCtx.sessionId, "error", { error: err, context });
 }
-function tryReadFile(p) {
-  if (!existsSync2(p))
-    return null;
-  try {
-    return readFileSync(p, "utf-8");
-  } catch {
-    return null;
-  }
+function logApiEvent(event, data) {
+  const logCtx = _currentContext;
+  if (!logCtx)
+    return;
+  logCtx.logsRepo.write(logCtx.sessionId, "api", { event, data });
 }
-function readCandidates(candidates) {
-  const parts = [];
-  for (const c of candidates) {
-    const content = tryReadFile(c.abs);
-    if (content)
-      parts.push(content);
-  }
-  return parts.length > 0 ? parts.join(`
 
-`) : null;
-}
-function loadGlobalContextFile(homeDir) {
-  return readCandidates(globalContextCandidates(homeDir));
+// src/session/db/message-repo.ts
+var _insertMsgStmt = null;
+var _addPromptHistoryStmt = null;
+var _getPromptHistoryStmt = null;
+function getInsertMsgStmt() {
+  if (!_insertMsgStmt) {
+    _insertMsgStmt = getDb().prepare(`INSERT INTO messages (session_id, payload, turn_index, created_at)
+     VALUES (?, ?, ?, ?)`);
+  }
+  return _insertMsgStmt;
 }
-function loadLocalContextFile(cwd) {
-  let current = resolve(cwd);
-  while (true) {
-    const content = readCandidates(dirContextCandidates(current));
-    if (content)
-      return content;
-    if (existsSync2(join2(current, ".git")))
-      break;
-    const parent = dirname(current);
-    if (parent === current)
-      break;
-    current = parent;
+function getAddPromptHistoryStmt() {
+  if (!_addPromptHistoryStmt) {
+    _addPromptHistoryStmt = getDb().prepare("INSERT INTO prompt_history (text, created_at) VALUES (?, ?)");
   }
-  return null;
+  return _addPromptHistoryStmt;
 }
-
-// src/llm-api/providers.ts
-import { createAnthropic } from "@ai-sdk/anthropic";
-import { createGoogleGenerativeAI } from "@ai-sdk/google";
-import { createOpenAI } from "@ai-sdk/openai";
-import { createOpenAICompatible } from "@ai-sdk/openai-compatible";
-
-// src/session/oauth/openai.ts
-import { createServer } from "http";
-
-// src/session/oauth/pkce.ts
-function base64urlEncode(bytes) {
-  let binary = "";
-  for (const byte of bytes) {
-    binary += String.fromCharCode(byte);
+function getPromptHistoryStmt() {
+  if (!_getPromptHistoryStmt) {
+    _getPromptHistoryStmt = getDb().prepare("SELECT text FROM prompt_history ORDER BY id DESC LIMIT ?");
   }
-  return btoa(binary).replace(/\+/g, "-").replace(/\//g, "_").replace(/=/g, "");
+  return _getPromptHistoryStmt;
 }
-async function generatePKCE() {
-  const verifierBytes = new Uint8Array(32);
-  crypto.getRandomValues(verifierBytes);
-  const verifier = base64urlEncode(verifierBytes);
-  const data = new TextEncoder().encode(verifier);
-  const hashBuffer = await crypto.subtle.digest("SHA-256", data);
-  const challenge = base64urlEncode(new Uint8Array(hashBuffer));
-  return { verifier, challenge };
+function saveMessages(sessionId, msgs, turnIndex = 0) {
+  const db = getDb();
+  const stmt = getInsertMsgStmt();
+  const now = Date.now();
+  db.transaction(() => {
+    for (const msg of msgs) {
+      stmt.run(sessionId, JSON.stringify(msg), turnIndex, now);
+    }
+  })();
 }
-
-// src/session/oauth/openai.ts
-var CLIENT_ID = "app_EMoamEEZ73f0CkXaXp7hrann";
-var AUTHORIZE_URL = "https://auth.openai.com/oauth/authorize";
-var TOKEN_URL = "https://auth.openai.com/oauth/token";
-var CALLBACK_HOST = "127.0.0.1";
-var CALLBACK_PORT = 1455;
-var CALLBACK_PATH = "/auth/callback";
-var REDIRECT_URI = `http://localhost:${CALLBACK_PORT}${CALLBACK_PATH}`;
-var SCOPES = "openid profile email offline_access";
-var LOGIN_TIMEOUT_MS = 5 * 60 * 1000;
-var SUCCESS_HTML = `<!doctype html>
-<html lang="en"><head><meta charset="utf-8"><title>Authenticated</title></head>
-<body><p>OpenAI authentication successful. Return to your terminal.</p></body></html>`;
-function createState() {
-  const bytes = new Uint8Array(16);
-  crypto.getRandomValues(bytes);
-  let hex = "";
-  for (const b of bytes)
-    hex += b.toString(16).padStart(2, "0");
-  return hex;
+function getMaxTurnIndex(sessionId) {
+  const row = getDb().query("SELECT MAX(turn_index) AS max_turn FROM messages WHERE session_id = ?").get(sessionId);
+  return row?.max_turn ?? -1;
 }
-function startCallbackServer(expectedState) {
-  return new Promise((resolve2, reject) => {
-    let result = null;
-    let cancelled = false;
-    const server = createServer((req, res) => {
-      const url = new URL(req.url ?? "", "http://localhost");
-      if (url.pathname !== CALLBACK_PATH) {
-        res.writeHead(404).end("Not found");
-        return;
-      }
-      const code = url.searchParams.get("code");
-      const state = url.searchParams.get("state");
-      const error = url.searchParams.get("error");
-      if (error || !code || !state || state !== expectedState) {
-        res.writeHead(400).end("Authentication failed.");
-        return;
-      }
-      res.writeHead(200, { "Content-Type": "text/html" }).end(SUCCESS_HTML);
-      result = { code };
-    });
-    server.on("error", reject);
-    server.listen(CALLBACK_PORT, CALLBACK_HOST, () => {
-      resolve2({
-        server,
-        cancel: () => {
-          cancelled = true;
-        },
-        waitForCode: async () => {
-          const deadline = Date.now() + LOGIN_TIMEOUT_MS;
-          while (!result && !cancelled && Date.now() < deadline) {
-            await new Promise((r) => setTimeout(r, 100));
-          }
-          return result;
-        }
-      });
-    });
-  });
+function deleteLastTurn(sessionId, turnIndex) {
+  const target = turnIndex !== undefined ? turnIndex : getMaxTurnIndex(sessionId);
+  if (target < 0)
+    return false;
+  getDb().run("DELETE FROM messages WHERE session_id = ? AND turn_index = ?", [
+    sessionId,
+    target
+  ]);
+  return true;
 }
-async function postTokenRequest(body, label) {
-  const res = await fetch(TOKEN_URL, {
-    method: "POST",
-    headers: {
-      "Content-Type": "application/x-www-form-urlencoded"
-    },
-    body,
-    signal: AbortSignal.timeout(30000)
-  });
-  if (!res.ok) {
-    const text = await res.text();
-    throw new Error(`${label} failed (${res.status}): ${text}`);
+function loadMessages(sessionId) {
+  const rows = getDb().query("SELECT payload, id FROM messages WHERE session_id = ? ORDER BY id ASC").all(sessionId);
+  const messages = [];
+  for (const row of rows) {
+    try {
+      messages.push(JSON.parse(row.payload));
+    } catch (_err) {
+      logError(new Error(`Failed to parse message ID ${row.id} for session ${sessionId}`), "message-repo.loadMessages");
+    }
   }
-  const data = await res.json();
-  return {
-    access: data.access_token,
-    refresh: data.refresh_token,
-    expires: Date.now() + data.expires_in * 1000 - 5 * 60 * 1000
-  };
+  return messages;
 }
-function exchangeCode(code, verifier) {
-  return postTokenRequest(new URLSearchParams({
-    grant_type: "authorization_code",
-    client_id: CLIENT_ID,
-    code,
-    code_verifier: verifier,
-    redirect_uri: REDIRECT_URI
-  }), "Token exchange");
-}
-function refreshOpenAIToken(refreshToken) {
-  return postTokenRequest(new URLSearchParams({
-    grant_type: "refresh_token",
-    refresh_token: refreshToken,
-    client_id: CLIENT_ID
-  }), "Token refresh");
-}
-async function loginOpenAI(callbacks) {
-  const { verifier, challenge } = await generatePKCE();
-  const state = createState();
-  const cb = await startCallbackServer(state);
-  try {
-    const params = new URLSearchParams({
-      response_type: "code",
-      client_id: CLIENT_ID,
-      redirect_uri: REDIRECT_URI,
-      scope: SCOPES,
-      code_challenge: challenge,
-      code_challenge_method: "S256",
-      state,
-      id_token_add_organizations: "true",
-      codex_cli_simplified_flow: "true",
-      originator: "mc"
-    });
-    callbacks.onOpenUrl(`${AUTHORIZE_URL}?${params}`, "Complete login in your browser.");
-    const result = await cb.waitForCode();
-    if (!result)
-      throw new Error("Login cancelled or no code received");
-    callbacks.onProgress("Exchanging authorization code for tokens\u2026");
-    return exchangeCode(result.code, verifier);
-  } finally {
-    cb.server.close();
-  }
-}
-function extractAccountId(accessToken) {
-  try {
-    const parts = accessToken.split(".");
-    const jwt = parts[1];
-    if (parts.length !== 3 || !jwt)
-      return null;
-    const payload = JSON.parse(atob(jwt));
-    const auth = payload["https://api.openai.com/auth"];
-    return auth?.chatgpt_account_id ?? null;
-  } catch {
-    return null;
-  }
-}
-var openaiOAuth = {
-  id: "openai",
-  name: "OpenAI (ChatGPT Plus/Pro)",
-  login: loginOpenAI,
-  refreshToken: refreshOpenAIToken
-};
-
-// src/session/oauth/auth-storage.ts
-var PROVIDERS = new Map([
-  [openaiOAuth.id, openaiOAuth]
-]);
-function getOAuthProviders() {
-  return [...PROVIDERS.values()];
-}
-function getOAuthProvider(id) {
-  return PROVIDERS.get(id);
-}
-function getStoredToken(provider) {
-  return getDb().query("SELECT provider, access_token, refresh_token, expires_at, updated_at FROM oauth_tokens WHERE provider = ?").get(provider) ?? null;
-}
-function upsertToken(provider, creds) {
-  getDb().run(`INSERT INTO oauth_tokens (provider, access_token, refresh_token, expires_at, updated_at)
-     VALUES (?, ?, ?, ?, ?)
-     ON CONFLICT(provider) DO UPDATE SET
-       access_token  = excluded.access_token,
-       refresh_token = excluded.refresh_token,
-       expires_at    = excluded.expires_at,
-       updated_at    = excluded.updated_at`, [provider, creds.access, creds.refresh, creds.expires, Date.now()]);
-}
-function deleteToken(provider) {
-  getDb().run("DELETE FROM oauth_tokens WHERE provider = ?", [provider]);
-}
-function isAuthError(err) {
-  if (!(err instanceof Error))
-    return false;
-  return /\b(401|403)\b/.test(err.message);
-}
-function isLoggedIn(provider) {
-  return PROVIDERS.has(provider) && getStoredToken(provider) !== null;
-}
-function listLoggedInProviders() {
-  return getDb().query("SELECT provider FROM oauth_tokens ORDER BY provider").all().map((r) => r.provider).filter((provider) => PROVIDERS.has(provider));
-}
-async function login(providerId, callbacks) {
-  const provider = PROVIDERS.get(providerId);
-  if (!provider)
-    throw new Error(`Unknown OAuth provider: ${providerId}`);
-  const creds = await provider.login(callbacks);
-  upsertToken(providerId, creds);
-}
-function logout(providerId) {
-  deleteToken(providerId);
+function addPromptHistory(text) {
+  const trimmed = text.trim();
+  if (!trimmed)
+    return;
+  getAddPromptHistoryStmt().run(trimmed, Date.now());
 }
-async function getAccessToken(providerId) {
-  const row = getStoredToken(providerId);
-  if (!row)
-    return null;
-  if (Date.now() < row.expires_at) {
-    return row.access_token;
-  }
-  const provider = PROVIDERS.get(providerId);
-  if (!provider)
-    return null;
-  try {
-    const refreshed = await provider.refreshToken(row.refresh_token);
-    upsertToken(providerId, refreshed);
-    return refreshed.access;
-  } catch (err) {
-    if (isAuthError(err)) {
-      deleteToken(providerId);
-    }
-    return null;
-  }
+function getPromptHistory(limit = 200) {
+  const rows = getPromptHistoryStmt().all(limit);
+  return rows.map((r) => r.text).reverse();
 }
-
 // src/session/db/model-info-repo.ts
 function listModelCapabilities() {
   return getDb().query("SELECT canonical_model_id, context_window, max_output_tokens, reasoning, source_provider, raw_json, updated_at FROM model_capabilities").all();
@@ -730,1176 +527,1241 @@ function setModelInfoState(key, value) {
 function listModelInfoState() {
   return getDb().query("SELECT key, value FROM model_info_state").all();
 }
-
-// src/llm-api/history/shared.ts
-function isRecord(value) {
-  return value !== null && typeof value === "object";
-}
-function normalizeProviderOptions(part) {
-  if (!isRecord(part))
-    return part;
-  if (part.providerOptions !== undefined || part.providerMetadata === undefined) {
-    return part;
+// src/session/db/session-repo.ts
+function createSession(opts) {
+  const db = getDb();
+  const now = Date.now();
+  db.run(`INSERT INTO sessions (id, title, cwd, model, created_at, updated_at)
+     VALUES (?, ?, ?, ?, ?, ?)`, [opts.id, opts.title ?? "", opts.cwd, opts.model, now, now]);
+  const session = getSession(opts.id);
+  if (!session) {
+    throw new Error(`Failed to create session ${opts.id}`);
   }
-  return {
-    ...part,
-    providerOptions: part.providerMetadata
-  };
+  return session;
 }
-function normalizeMessageProviderOptions(message) {
-  if (!Array.isArray(message.content))
-    return message;
-  return {
-    ...message,
-    content: message.content.map((part) => normalizeProviderOptions(part))
-  };
+function getSession(id) {
+  return getDb().query("SELECT * FROM sessions WHERE id = ?").get(id) ?? null;
 }
-function getPartProviderOptions(part) {
-  if (!isRecord(part))
-    return null;
-  if (isRecord(part.providerOptions))
-    return part.providerOptions;
-  if (isRecord(part.providerMetadata))
-    return part.providerMetadata;
-  return null;
+function touchSession(id, model) {
+  getDb().run("UPDATE sessions SET updated_at = ?, model = ? WHERE id = ?", [
+    Date.now(),
+    model,
+    id
+  ]);
 }
-function isToolCallPart(part) {
-  return isRecord(part) && part.type === "tool-call";
+function setSessionTitle(id, title) {
+  getDb().run("UPDATE sessions SET title = ? WHERE id = ? AND title = ''", [
+    title,
+    id
+  ]);
 }
-function hasObjectToolCallInput(part) {
-  return isToolCallPart(part) && "input" in part && isRecord(part.input) && !Array.isArray(part.input);
+function listSessions(limit = 20) {
+  return getDb().query("SELECT * FROM sessions ORDER BY updated_at DESC LIMIT ?").all(limit);
 }
-function mapAssistantParts(messages, transform) {
-  let mutated = false;
-  const result = messages.map((message) => {
-    if (message.role !== "assistant" || !Array.isArray(message.content)) {
-      return message;
-    }
-    let contentMutated = false;
-    const nextContent = message.content.map((part) => {
-      const next = transform(part);
-      if (next !== part)
-        contentMutated = true;
-      return next;
-    });
-    if (!contentMutated)
-      return message;
-    mutated = true;
-    return {
-      ...message,
-      content: nextContent
-    };
-  });
-  return mutated ? result : messages;
+function generateSessionId() {
+  const ts = Date.now().toString(36);
+  const rand = Math.random().toString(36).slice(2, 7);
+  return `${ts}-${rand}`;
 }
-var TOOL_RUNTIME_INPUT_KEYS = new Set(["cwd"]);
-function stripToolRuntimeInputFields(messages) {
-  return mapAssistantParts(messages, (part) => {
-    if (!hasObjectToolCallInput(part))
-      return part;
-    let inputMutated = false;
-    const nextInput = { ...part.input };
-    for (const key of TOOL_RUNTIME_INPUT_KEYS) {
-      if (!(key in nextInput))
-        continue;
-      delete nextInput[key];
-      inputMutated = true;
-    }
-    return inputMutated ? { ...part, input: nextInput } : part;
-  });
+// src/session/db/settings-repo.ts
+function getSetting(key) {
+  const row = getDb().query("SELECT value FROM settings WHERE key = ?").get(key);
+  return row?.value ?? null;
 }
-
-// src/llm-api/model-info-normalize.ts
-function basename(value) {
-  const idx = value.lastIndexOf("/");
-  return idx === -1 ? value : value.slice(idx + 1);
+function setSetting(key, value) {
+  getDb().run(`INSERT INTO settings (key, value) VALUES (?, ?)
+     ON CONFLICT(key) DO UPDATE SET value = excluded.value`, [key, value]);
 }
-function normalizeModelId(modelId) {
-  let out = modelId.trim().toLowerCase();
-  while (out.startsWith("models/")) {
-    out = out.slice("models/".length);
+function parseBooleanSetting(value, fallback) {
+  if (value === null)
+    return fallback;
+  const normalized = value.trim().toLowerCase();
+  if (normalized === "true" || normalized === "on" || normalized === "1") {
+    return true;
   }
-  return out;
+  if (normalized === "false" || normalized === "off" || normalized === "0") {
+    return false;
+  }
+  return fallback;
 }
-function parseContextWindow(model) {
-  const limit = model.limit;
-  if (!isRecord(limit))
-    return null;
-  const context = limit.context;
-  if (typeof context !== "number" || !Number.isFinite(context))
-    return null;
-  return Math.max(0, Math.trunc(context));
+function getPreferredModel() {
+  return getSetting("preferred_model");
 }
-function parseMaxOutputTokens(model) {
-  const limit = model.limit;
-  if (!isRecord(limit))
-    return null;
-  const output = limit.output;
-  if (typeof output !== "number" || !Number.isFinite(output))
-    return null;
-  return Math.max(0, Math.trunc(output));
+function setPreferredModel(model) {
+  setSetting("preferred_model", model);
 }
-function parseModelsDevCapabilities(payload, updatedAt) {
-  if (!isRecord(payload))
-    return [];
-  const merged = new Map;
-  for (const [provider, providerValue] of Object.entries(payload)) {
-    if (!isRecord(providerValue))
-      continue;
-    const models = providerValue.models;
-    if (!isRecord(models))
-      continue;
-    for (const [modelKey, modelValue] of Object.entries(models)) {
-      if (!isRecord(modelValue))
-        continue;
-      const explicitId = typeof modelValue.id === "string" && modelValue.id.trim().length > 0 ? modelValue.id : modelKey;
-      const canonicalModelId = normalizeModelId(explicitId);
-      if (!canonicalModelId)
-        continue;
-      const contextWindow = parseContextWindow(modelValue);
-      const maxOutputTokens = parseMaxOutputTokens(modelValue);
-      const reasoning = modelValue.reasoning === true;
-      const rawJson = JSON.stringify(modelValue);
-      const prev = merged.get(canonicalModelId);
-      if (!prev) {
-        merged.set(canonicalModelId, {
-          canonicalModelId,
-          contextWindow,
-          maxOutputTokens,
-          reasoning,
-          sourceProvider: provider,
-          rawJson
-        });
-        continue;
-      }
-      merged.set(canonicalModelId, {
-        canonicalModelId,
-        contextWindow: prev.contextWindow ?? contextWindow,
-        maxOutputTokens: prev.maxOutputTokens ?? maxOutputTokens,
-        reasoning: prev.reasoning || reasoning,
-        sourceProvider: prev.sourceProvider,
-        rawJson: prev.rawJson ?? rawJson
-      });
-    }
+function getPreferredThinkingEffort() {
+  const v = getSetting("preferred_thinking_effort");
+  if (v === "low" || v === "medium" || v === "high" || v === "xhigh")
+    return v;
+  return null;
+}
+function setPreferredThinkingEffort(effort) {
+  if (effort === null) {
+    getDb().run("DELETE FROM settings WHERE key = 'preferred_thinking_effort'");
+  } else {
+    setSetting("preferred_thinking_effort", effort);
   }
-  return Array.from(merged.values()).map((entry) => ({
-    canonical_model_id: entry.canonicalModelId,
-    context_window: entry.contextWindow,
-    max_output_tokens: entry.maxOutputTokens,
-    reasoning: entry.reasoning ? 1 : 0,
-    source_provider: entry.sourceProvider,
-    raw_json: entry.rawJson,
-    updated_at: updatedAt
-  }));
 }
-function buildModelMatchIndex(canonicalModelIds) {
-  const exact = new Map;
-  const aliasCandidates = new Map;
-  for (const rawCanonical of canonicalModelIds) {
-    const canonical = normalizeModelId(rawCanonical);
-    if (!canonical)
-      continue;
-    exact.set(canonical, canonical);
-    const short = basename(canonical);
-    if (!short)
-      continue;
-    let set = aliasCandidates.get(short);
-    if (!set) {
-      set = new Set;
-      aliasCandidates.set(short, set);
-    }
-    set.add(canonical);
+function getPreferredShowReasoning() {
+  return parseBooleanSetting(getSetting("preferred_show_reasoning"), false);
+}
+function setPreferredShowReasoning(show) {
+  setSetting("preferred_show_reasoning", show ? "true" : "false");
+}
+function getPreferredVerboseOutput() {
+  return parseBooleanSetting(getSetting("preferred_verbose_output"), false);
+}
+function setPreferredVerboseOutput(verbose) {
+  setSetting("preferred_verbose_output", verbose ? "true" : "false");
+}
+// src/agent/session-runner.ts
+import * as c10 from "yoctocolors";
+
+// src/cli/input.ts
+import * as c8 from "yoctocolors";
+
+// src/cli/input-buffer.ts
+var PASTE_TOKEN_START = 57344;
+var PASTE_TOKEN_END = 63743;
+function createPasteToken(buf, pasteTokens) {
+  for (let code = PASTE_TOKEN_START;code <= PASTE_TOKEN_END; code++) {
+    const token = String.fromCharCode(code);
+    if (!buf.includes(token) && !pasteTokens.has(token))
+      return token;
   }
-  const alias = new Map;
-  for (const [short, candidates] of aliasCandidates) {
-    if (candidates.size === 1) {
-      for (const value of candidates) {
-        alias.set(short, value);
-      }
-    } else {
-      alias.set(short, null);
-    }
+  throw new Error("Too many pasted chunks in a single prompt");
+}
+function pasteLabel(text) {
+  const lines = text.split(`
+`);
+  const first = lines[0] ?? "";
+  const preview = first.length > 40 ? `${first.slice(0, 40)}\u2026` : first;
+  const extra = lines.length - 1;
+  const more = extra > 0 ? ` +${extra} more line${extra === 1 ? "" : "s"}` : "";
+  return `[pasted: "${preview}"${more}]`;
+}
+function processInputBuffer(buf, pasteTokens, replacer) {
+  let out = "";
+  for (let i = 0;i < buf.length; i++) {
+    const ch = buf[i] ?? "";
+    out += replacer(ch, pasteTokens.get(ch));
   }
-  return { exact, alias };
+  return out;
 }
-function matchCanonicalModelId(providerModelId, index) {
-  const normalized = normalizeModelId(providerModelId);
-  if (!normalized)
-    return null;
-  const exactMatch = index.exact.get(normalized);
-  if (exactMatch)
-    return exactMatch;
-  const short = basename(normalized);
-  if (!short)
-    return null;
-  const alias = index.alias.get(short);
-  return alias ?? null;
+function renderInputBuffer(buf, pasteTokens) {
+  return processInputBuffer(buf, pasteTokens, (ch, pasted) => pasted ? pasteLabel(pasted) : ch);
 }
-
-// src/llm-api/model-info-cache.ts
-function parseModelStringLoose(modelString) {
-  const slash = modelString.indexOf("/");
-  if (slash === -1) {
-    return { provider: null, modelId: modelString };
+function expandInputBuffer(buf, pasteTokens) {
+  return processInputBuffer(buf, pasteTokens, (ch, pasted) => pasted ?? ch);
+}
+function pruneInputPasteTokens(pasteTokens, ...buffers) {
+  const referenced = buffers.join("");
+  const next = new Map;
+  for (const [token, text] of pasteTokens) {
+    if (referenced.includes(token))
+      next.set(token, text);
   }
-  const provider = modelString.slice(0, slash).trim().toLowerCase();
-  const modelId = modelString.slice(slash + 1);
-  return { provider: provider || null, modelId };
+  return next;
 }
-function providerModelKey(provider, modelId) {
-  return `${provider}/${modelId}`;
+function getVisualCursor(buf, cursor, pasteTokens) {
+  let visual = 0;
+  for (let i = 0;i < Math.min(cursor, buf.length); i++) {
+    const ch = buf[i] ?? "";
+    const pasted = pasteTokens.get(ch);
+    visual += pasted ? pasteLabel(pasted).length : 1;
+  }
+  return visual;
 }
-function emptyRuntimeCache() {
+function buildPromptDisplay(text, cursor, maxLen) {
+  const clampedCursor = Math.max(0, Math.min(cursor, text.length));
+  if (maxLen <= 0)
+    return { display: "", cursor: 0 };
+  if (text.length <= maxLen)
+    return { display: text, cursor: clampedCursor };
+  let start = Math.max(0, clampedCursor - maxLen);
+  const end = Math.min(text.length, start + maxLen);
+  if (end - start < maxLen)
+    start = Math.max(0, end - maxLen);
+  let display = text.slice(start, end);
+  if (start > 0 && display.length > 0)
+    display = `\u2026${display.slice(1)}`;
+  if (end < text.length && display.length > 0)
+    display = `${display.slice(0, -1)}\u2026`;
   return {
-    capabilitiesByCanonical: new Map,
-    providerModelsByKey: new Map,
-    providerModelUniqIndex: new Map,
-    matchIndex: {
-      exact: new Map,
-      alias: new Map
-    },
-    state: new Map
+    display,
+    cursor: Math.min(clampedCursor - start, display.length)
   };
 }
-function buildRuntimeCache(capabilityRows, providerRows, stateRows) {
-  const capabilitiesByCanonical = new Map;
-  for (const row of capabilityRows) {
-    const canonical = normalizeModelId(row.canonical_model_id);
-    if (!canonical)
-      continue;
-    capabilitiesByCanonical.set(canonical, {
-      canonicalModelId: canonical,
-      contextWindow: row.context_window,
-      maxOutputTokens: row.max_output_tokens,
-      reasoning: row.reasoning === 1,
-      sourceProvider: row.source_provider
-    });
+
+// src/cli/completions.ts
+import { join as join4, relative } from "path";
+
+// src/session/oauth/openai.ts
+import { createServer } from "http";
+
+// src/session/oauth/pkce.ts
+function base64urlEncode(bytes) {
+  let binary = "";
+  for (const byte of bytes) {
+    binary += String.fromCharCode(byte);
   }
-  const providerModelsByKey = new Map;
-  const providerModelUniqIndex = new Map;
-  for (const row of providerRows) {
-    const provider = row.provider.trim().toLowerCase();
-    const providerModelId = normalizeModelId(row.provider_model_id);
-    if (!provider || !providerModelId)
-      continue;
-    const key = providerModelKey(provider, providerModelId);
-    providerModelsByKey.set(key, {
-      provider,
-      providerModelId,
-      displayName: row.display_name,
-      canonicalModelId: row.canonical_model_id ? normalizeModelId(row.canonical_model_id) : null,
-      contextWindow: row.context_window,
-      free: row.free === 1
+  return btoa(binary).replace(/\+/g, "-").replace(/\//g, "_").replace(/=/g, "");
+}
+async function generatePKCE() {
+  const verifierBytes = new Uint8Array(32);
+  crypto.getRandomValues(verifierBytes);
+  const verifier = base64urlEncode(verifierBytes);
+  const data = new TextEncoder().encode(verifier);
+  const hashBuffer = await crypto.subtle.digest("SHA-256", data);
+  const challenge = base64urlEncode(new Uint8Array(hashBuffer));
+  return { verifier, challenge };
+}
+
+// src/session/oauth/openai.ts
+var CLIENT_ID = "app_EMoamEEZ73f0CkXaXp7hrann";
+var AUTHORIZE_URL = "https://auth.openai.com/oauth/authorize";
+var TOKEN_URL = "https://auth.openai.com/oauth/token";
+var CALLBACK_HOST = "127.0.0.1";
+var CALLBACK_PORT = 1455;
+var CALLBACK_PATH = "/auth/callback";
+var REDIRECT_URI = `http://localhost:${CALLBACK_PORT}${CALLBACK_PATH}`;
+var SCOPES = "openid profile email offline_access";
+var LOGIN_TIMEOUT_MS = 5 * 60 * 1000;
+var SUCCESS_HTML = `<!doctype html>
+<html lang="en"><head><meta charset="utf-8"><title>Authenticated</title></head>
+<body><p>OpenAI authentication successful. Return to your terminal.</p></body></html>`;
+function createState() {
+  const bytes = new Uint8Array(16);
+  crypto.getRandomValues(bytes);
+  let hex = "";
+  for (const b of bytes)
+    hex += b.toString(16).padStart(2, "0");
+  return hex;
+}
+function startCallbackServer(expectedState) {
+  return new Promise((resolve, reject) => {
+    let result = null;
+    let cancelled = false;
+    const server = createServer((req, res) => {
+      const url = new URL(req.url ?? "", "http://localhost");
+      if (url.pathname !== CALLBACK_PATH) {
+        res.writeHead(404).end("Not found");
+        return;
+      }
+      const code = url.searchParams.get("code");
+      const state = url.searchParams.get("state");
+      const error = url.searchParams.get("error");
+      if (error || !code || !state || state !== expectedState) {
+        res.writeHead(400).end("Authentication failed.");
+        return;
+      }
+      res.writeHead(200, { "Content-Type": "text/html" }).end(SUCCESS_HTML);
+      result = { code };
     });
-    const prev = providerModelUniqIndex.get(providerModelId);
-    if (prev === undefined) {
-      providerModelUniqIndex.set(providerModelId, key);
-    } else if (prev !== key) {
-      providerModelUniqIndex.set(providerModelId, null);
-    }
-  }
-  const matchIndex = buildModelMatchIndex(capabilitiesByCanonical.keys());
-  const state = new Map;
-  for (const row of stateRows) {
-    state.set(row.key, row.value);
-  }
-  return {
-    capabilitiesByCanonical,
-    providerModelsByKey,
-    providerModelUniqIndex,
-    matchIndex,
-    state
-  };
+    server.on("error", reject);
+    server.listen(CALLBACK_PORT, CALLBACK_HOST, () => {
+      resolve({
+        server,
+        cancel: () => {
+          cancelled = true;
+        },
+        waitForCode: async () => {
+          const deadline = Date.now() + LOGIN_TIMEOUT_MS;
+          while (!result && !cancelled && Date.now() < deadline) {
+            await new Promise((r) => setTimeout(r, 100));
+          }
+          return result;
+        }
+      });
+    });
+  });
 }
-function resolveFromProviderRow(row, cache) {
-  if (row.canonicalModelId) {
-    const capability = cache.capabilitiesByCanonical.get(row.canonicalModelId);
-    if (capability) {
-      return {
-        canonicalModelId: capability.canonicalModelId,
-        contextWindow: capability.contextWindow ?? row.contextWindow,
-        maxOutputTokens: capability.maxOutputTokens,
-        reasoning: capability.reasoning
-      };
-    }
+async function postTokenRequest(body, label) {
+  const res = await fetch(TOKEN_URL, {
+    method: "POST",
+    headers: {
+      "Content-Type": "application/x-www-form-urlencoded"
+    },
+    body,
+    signal: AbortSignal.timeout(30000)
+  });
+  if (!res.ok) {
+    const text = await res.text();
+    throw new Error(`${label} failed (${res.status}): ${text}`);
   }
+  const data = await res.json();
   return {
-    canonicalModelId: row.canonicalModelId,
-    contextWindow: row.contextWindow,
-    maxOutputTokens: null,
-    reasoning: false
+    access: data.access_token,
+    refresh: data.refresh_token,
+    expires: Date.now() + data.expires_in * 1000 - 5 * 60 * 1000
   };
 }
-function resolveModelInfoInCache(modelString, cache) {
-  const parsed = parseModelStringLoose(modelString);
-  const normalizedModelId = normalizeModelId(parsed.modelId);
-  if (!normalizedModelId)
-    return null;
-  if (parsed.provider) {
-    const providerRow = cache.providerModelsByKey.get(providerModelKey(parsed.provider, normalizedModelId));
-    if (providerRow)
-      return resolveFromProviderRow(providerRow, cache);
-  }
-  const canonical = matchCanonicalModelId(normalizedModelId, cache.matchIndex);
-  if (canonical) {
-    const capability = cache.capabilitiesByCanonical.get(canonical);
-    if (capability) {
-      return {
-        canonicalModelId: capability.canonicalModelId,
-        contextWindow: capability.contextWindow,
-        maxOutputTokens: capability.maxOutputTokens,
-        reasoning: capability.reasoning
-      };
-    }
-  }
-  if (!parsed.provider) {
-    const uniqueProviderKey = cache.providerModelUniqIndex.get(normalizedModelId);
-    if (uniqueProviderKey) {
-      const providerRow = cache.providerModelsByKey.get(uniqueProviderKey);
-      if (providerRow)
-        return resolveFromProviderRow(providerRow, cache);
-    }
-  }
-  return null;
+function exchangeCode(code, verifier) {
+  return postTokenRequest(new URLSearchParams({
+    grant_type: "authorization_code",
+    client_id: CLIENT_ID,
+    code,
+    code_verifier: verifier,
+    redirect_uri: REDIRECT_URI
+  }), "Token exchange");
 }
-function readLiveModelsFromCache(cache, visibleProviders) {
-  const models = [];
-  for (const row of cache.providerModelsByKey.values()) {
-    if (!visibleProviders.has(row.provider))
-      continue;
-    const info = resolveFromProviderRow(row, cache);
-    models.push({
-      id: `${row.provider}/${row.providerModelId}`,
-      displayName: row.displayName,
-      provider: row.provider,
-      context: info.contextWindow ?? undefined,
-      free: row.free ? true : undefined
-    });
-  }
-  models.sort((a, b) => a.provider.localeCompare(b.provider) || a.id.localeCompare(b.id));
-  return models;
+function refreshOpenAIToken(refreshToken) {
+  return postTokenRequest(new URLSearchParams({
+    grant_type: "refresh_token",
+    refresh_token: refreshToken,
+    client_id: CLIENT_ID
+  }), "Token refresh");
 }
-
-// src/llm-api/model-info-fetch.ts
-var ZEN_BASE = "https://opencode.ai/zen/v1";
-var OPENAI_BASE = "https://api.openai.com";
-var ANTHROPIC_BASE = "https://api.anthropic.com";
-var GOOGLE_BASE = "https://generativelanguage.googleapis.com/v1beta";
-var MODELS_DEV_URL = "https://models.dev/api.json";
-function normalizeModelId2(modelId) {
-  let out = modelId.trim().toLowerCase();
-  while (out.startsWith("models/")) {
-    out = out.slice("models/".length);
+async function loginOpenAI(callbacks) {
+  const { verifier, challenge } = await generatePKCE();
+  const state = createState();
+  const cb = await startCallbackServer(state);
+  try {
+    const params = new URLSearchParams({
+      response_type: "code",
+      client_id: CLIENT_ID,
+      redirect_uri: REDIRECT_URI,
+      scope: SCOPES,
+      code_challenge: challenge,
+      code_challenge_method: "S256",
+      state,
+      id_token_add_organizations: "true",
+      codex_cli_simplified_flow: "true",
+      originator: "mc"
+    });
+    callbacks.onOpenUrl(`${AUTHORIZE_URL}?${params}`, "Complete login in your browser.");
+    const result = await cb.waitForCode();
+    if (!result)
+      throw new Error("Login cancelled or no code received");
+    callbacks.onProgress("Exchanging authorization code for tokens\u2026");
+    return exchangeCode(result.code, verifier);
+  } finally {
+    cb.server.close();
   }
-  return out;
 }
-async function fetchJson(url, init, timeoutMs) {
+function extractAccountId(accessToken) {
   try {
-    const response = await fetch(url, {
-      ...init,
-      signal: AbortSignal.timeout(timeoutMs)
-    });
-    if (!response.ok)
+    const parts = accessToken.split(".");
+    const jwt = parts[1];
+    if (parts.length !== 3 || !jwt)
       return null;
-    return await response.json();
+    const payload = JSON.parse(atob(jwt));
+    const auth = payload["https://api.openai.com/auth"];
+    return auth?.chatgpt_account_id ?? null;
   } catch {
     return null;
   }
 }
-async function fetchModelsDevPayload() {
-  return fetchJson(MODELS_DEV_URL, {}, 1e4);
+var openaiOAuth = {
+  id: "openai",
+  name: "OpenAI (ChatGPT Plus/Pro)",
+  login: loginOpenAI,
+  refreshToken: refreshOpenAIToken
+};
+
+// src/session/oauth/auth-storage.ts
+var PROVIDERS = new Map([
+  [openaiOAuth.id, openaiOAuth]
+]);
+function getOAuthProviders() {
+  return [...PROVIDERS.values()];
 }
-function processModelsList(payload, arrayKey, idKey, mapper) {
-  if (!isRecord(payload) || !Array.isArray(payload[arrayKey]))
-    return null;
-  const out = [];
-  for (const item of payload[arrayKey]) {
-    if (!isRecord(item) || typeof item[idKey] !== "string")
-      continue;
-    const modelId = normalizeModelId2(item[idKey]);
-    if (!modelId)
-      continue;
-    const mapped = mapper(item, modelId);
-    if (mapped)
-      out.push(mapped);
-  }
-  return out;
+function getOAuthProvider(id) {
+  return PROVIDERS.get(id);
 }
-async function fetchPaginatedModelsList(url, init, timeoutMs, arrayKey, idKey, mapper) {
-  const out = [];
-  const seen = new Set;
-  const baseUrl = new URL(url);
-  let nextAfter = null;
-  for (let page = 0;page < 10; page += 1) {
-    const currentUrl = new URL(baseUrl);
-    if (nextAfter !== null)
-      currentUrl.searchParams.set("after", nextAfter);
-    const payload = await fetchJson(currentUrl.toString(), init, timeoutMs);
-    const rows = processModelsList(payload, arrayKey, idKey, mapper);
-    if (rows === null)
-      return null;
-    for (const row of rows) {
-      if (seen.has(row.providerModelId))
-        continue;
-      seen.add(row.providerModelId);
-      out.push(row);
-    }
-    if (!isRecord(payload))
-      break;
-    if (payload.has_more !== true || typeof payload.last_id !== "string")
-      break;
-    nextAfter = payload.last_id;
-  }
-  return out;
+function getStoredToken(provider) {
+  return getDb().query("SELECT provider, access_token, refresh_token, expires_at, updated_at FROM oauth_tokens WHERE provider = ?").get(provider) ?? null;
 }
-async function fetchZenModels() {
-  const key = process.env.OPENCODE_API_KEY;
-  if (!key)
-    return null;
-  return fetchPaginatedModelsList(`${ZEN_BASE}/models`, { headers: { Authorization: `Bearer ${key}` } }, 8000, "data", "id", (item, modelId) => {
-    const contextWindow = typeof item.context_window === "number" && Number.isFinite(item.context_window) ? Math.max(0, Math.trunc(item.context_window)) : null;
-    return {
-      providerModelId: modelId,
-      displayName: item.id,
-      contextWindow,
-      free: item.id.endsWith("-free") || item.id === "gpt-5-nano" || item.id === "big-pickle"
-    };
-  });
+function upsertToken(provider, creds) {
+  getDb().run(`INSERT INTO oauth_tokens (provider, access_token, refresh_token, expires_at, updated_at)
+     VALUES (?, ?, ?, ?, ?)
+     ON CONFLICT(provider) DO UPDATE SET
+       access_token  = excluded.access_token,
+       refresh_token = excluded.refresh_token,
+       expires_at    = excluded.expires_at,
+       updated_at    = excluded.updated_at`, [provider, creds.access, creds.refresh, creds.expires, Date.now()]);
 }
-async function fetchOpenAIModels() {
-  const envKey = process.env.OPENAI_API_KEY;
-  if (envKey) {
-    return fetchPaginatedModelsList(`${OPENAI_BASE}/v1/models`, { headers: { Authorization: `Bearer ${envKey}` } }, 6000, "data", "id", (_item, modelId) => ({
-      providerModelId: modelId,
-      displayName: modelId,
-      contextWindow: null,
-      free: false
-    }));
-  }
-  if (isLoggedIn("openai")) {
-    const token = await getAccessToken("openai");
-    if (!token)
-      return null;
-    return fetchCodexOAuthModels(token);
-  }
-  return null;
+function deleteToken(provider) {
+  getDb().run("DELETE FROM oauth_tokens WHERE provider = ?", [provider]);
 }
-var CODEX_MODELS_URL = "https://chatgpt.com/backend-api/codex/models?client_version=1.0.0";
-async function fetchCodexOAuthModels(token) {
-  try {
-    const res = await fetch(CODEX_MODELS_URL, {
-      headers: { Authorization: `Bearer ${token}` },
-      signal: AbortSignal.timeout(6000)
-    });
-    if (!res.ok)
-      return null;
-    const data = await res.json();
-    return (data.models ?? []).filter((m) => m.visibility === "list").map((m) => ({
-      providerModelId: m.slug,
-      displayName: m.display_name || m.slug,
-      contextWindow: m.context_window,
-      free: false
-    }));
-  } catch {
+function isAuthError(err) {
+  if (!(err instanceof Error))
+    return false;
+  return /\b(401|403)\b/.test(err.message);
+}
+function isLoggedIn(provider) {
+  return PROVIDERS.has(provider) && getStoredToken(provider) !== null;
+}
+function listLoggedInProviders() {
+  return getDb().query("SELECT provider FROM oauth_tokens ORDER BY provider").all().map((r) => r.provider).filter((provider) => PROVIDERS.has(provider));
+}
+async function login(providerId, callbacks) {
+  const provider = PROVIDERS.get(providerId);
+  if (!provider)
+    throw new Error(`Unknown OAuth provider: ${providerId}`);
+  const creds = await provider.login(callbacks);
+  upsertToken(providerId, creds);
+}
+function logout(providerId) {
+  deleteToken(providerId);
+}
+async function getAccessToken(providerId) {
+  const row = getStoredToken(providerId);
+  if (!row)
     return null;
+  if (Date.now() < row.expires_at) {
+    return row.access_token;
   }
-}
-async function fetchAnthropicModels() {
-  const key = process.env.ANTHROPIC_API_KEY;
-  if (!key)
+  const provider = PROVIDERS.get(providerId);
+  if (!provider)
     return null;
-  const payload = await fetchJson(`${ANTHROPIC_BASE}/v1/models`, {
-    headers: {
-      "anthropic-version": "2023-06-01",
-      "x-api-key": key
+  try {
+    const refreshed = await provider.refreshToken(row.refresh_token);
+    upsertToken(providerId, refreshed);
+    return refreshed.access;
+  } catch (err) {
+    if (isAuthError(err)) {
+      deleteToken(providerId);
     }
-  }, 6000);
-  return processModelsList(payload, "data", "id", (item, modelId) => {
-    const displayName = typeof item.display_name === "string" && item.display_name.trim().length > 0 ? item.display_name : modelId;
-    return {
-      providerModelId: modelId,
-      displayName,
-      contextWindow: null,
-      free: false
-    };
-  });
+    return null;
+  }
 }
-async function fetchGoogleModels() {
-  const key = process.env.GOOGLE_API_KEY ?? process.env.GEMINI_API_KEY;
-  if (!key)
+
+// src/llm-api/history/shared.ts
+function isRecord(value) {
+  return value !== null && typeof value === "object";
+}
+function normalizeProviderOptions(part) {
+  if (!isRecord(part))
+    return part;
+  if (part.providerOptions !== undefined || part.providerMetadata === undefined) {
+    return part;
+  }
+  return {
+    ...part,
+    providerOptions: part.providerMetadata
+  };
+}
+function normalizeMessageProviderOptions(message) {
+  if (!Array.isArray(message.content))
+    return message;
+  return {
+    ...message,
+    content: message.content.map((part) => normalizeProviderOptions(part))
+  };
+}
+function getPartProviderOptions(part) {
+  if (!isRecord(part))
     return null;
-  const payload = await fetchJson(`${GOOGLE_BASE}/models?key=${encodeURIComponent(key)}`, {}, 6000);
-  return processModelsList(payload, "models", "name", (item, modelId) => {
-    const displayName = typeof item.displayName === "string" && item.displayName.trim().length > 0 ? item.displayName : modelId;
-    const contextWindow = typeof item.inputTokenLimit === "number" && Number.isFinite(item.inputTokenLimit) ? Math.max(0, Math.trunc(item.inputTokenLimit)) : null;
+  if (isRecord(part.providerOptions))
+    return part.providerOptions;
+  if (isRecord(part.providerMetadata))
+    return part.providerMetadata;
+  return null;
+}
+function isToolCallPart(part) {
+  return isRecord(part) && part.type === "tool-call";
+}
+function hasObjectToolCallInput(part) {
+  return isToolCallPart(part) && "input" in part && isRecord(part.input) && !Array.isArray(part.input);
+}
+function mapAssistantParts(messages, transform) {
+  let mutated = false;
+  const result = messages.map((message) => {
+    if (message.role !== "assistant" || !Array.isArray(message.content)) {
+      return message;
+    }
+    let contentMutated = false;
+    const nextContent = message.content.map((part) => {
+      const next = transform(part);
+      if (next !== part)
+        contentMutated = true;
+      return next;
+    });
+    if (!contentMutated)
+      return message;
+    mutated = true;
     return {
-      providerModelId: modelId,
-      displayName,
-      contextWindow,
-      free: false
+      ...message,
+      content: nextContent
     };
   });
+  return mutated ? result : messages;
 }
-async function fetchOllamaModels() {
-  const base = process.env.OLLAMA_BASE_URL ?? "http://localhost:11434";
-  const payload = await fetchJson(`${base}/api/tags`, {}, 3000);
-  return processModelsList(payload, "models", "name", (item, modelId) => {
-    const details = item.details;
-    let sizeSuffix = "";
-    if (isRecord(details) && typeof details.parameter_size === "string") {
-      sizeSuffix = ` (${details.parameter_size})`;
+var TOOL_RUNTIME_INPUT_KEYS = new Set(["cwd"]);
+function stripToolRuntimeInputFields(messages) {
+  return mapAssistantParts(messages, (part) => {
+    if (!hasObjectToolCallInput(part))
+      return part;
+    let inputMutated = false;
+    const nextInput = { ...part.input };
+    for (const key of TOOL_RUNTIME_INPUT_KEYS) {
+      if (!(key in nextInput))
+        continue;
+      delete nextInput[key];
+      inputMutated = true;
     }
-    return {
-      providerModelId: modelId,
-      displayName: `${item.name}${sizeSuffix}`,
-      contextWindow: null,
-      free: false
-    };
+    return inputMutated ? { ...part, input: nextInput } : part;
   });
 }
-var PROVIDER_CANDIDATE_FETCHERS = {
-  zen: fetchZenModels,
-  openai: fetchOpenAIModels,
-  anthropic: fetchAnthropicModels,
-  google: fetchGoogleModels,
-  ollama: fetchOllamaModels
-};
-async function fetchProviderCandidates(provider) {
-  const fetcher = PROVIDER_CANDIDATE_FETCHERS[provider];
-  if (!fetcher)
-    return null;
-  return fetcher();
-}
 
-// src/llm-api/model-info.ts
-var MODELS_DEV_SYNC_KEY = "last_models_dev_sync_at";
-var PROVIDER_SYNC_KEY_PREFIX = "last_provider_sync_at:";
-var CACHE_VERSION_KEY = "model_info_cache_version";
-var CACHE_VERSION = 5;
-var MODEL_INFO_TTL_MS = 24 * 60 * 60 * 1000;
-var REMOTE_PROVIDER_ENV_KEYS = [
-  { provider: "zen", envKeys: ["OPENCODE_API_KEY"] },
-  { provider: "openai", envKeys: ["OPENAI_API_KEY"] },
-  { provider: "anthropic", envKeys: ["ANTHROPIC_API_KEY"] },
-  { provider: "google", envKeys: ["GOOGLE_API_KEY", "GEMINI_API_KEY"] }
-];
-var runtimeCache = emptyRuntimeCache();
-var loaded = false;
-var refreshInFlight = null;
-function isStaleTimestamp(timestamp, now = Date.now(), ttlMs = MODEL_INFO_TTL_MS) {
-  if (timestamp === null)
-    return true;
-  return now - timestamp > ttlMs;
-}
-function loadCacheFromDb() {
-  runtimeCache = buildRuntimeCache(listModelCapabilities(), listProviderModels(), listModelInfoState());
-  loaded = true;
-}
-function ensureLoaded() {
-  if (!loaded)
-    loadCacheFromDb();
+// src/llm-api/model-info-normalize.ts
+function basename(value) {
+  const idx = value.lastIndexOf("/");
+  return idx === -1 ? value : value.slice(idx + 1);
 }
-function initModelInfoCache() {
-  loadCacheFromDb();
+function normalizeModelId(modelId) {
+  let out = modelId.trim().toLowerCase();
+  while (out.startsWith("models/")) {
+    out = out.slice("models/".length);
+  }
+  return out;
 }
-function parseStateInt(key) {
-  const raw = runtimeCache.state.get(key);
-  if (!raw)
+function parseContextWindow(model) {
+  const limit = model.limit;
+  if (!isRecord(limit))
     return null;
-  const value = Number.parseInt(raw, 10);
-  if (!Number.isFinite(value))
+  const context = limit.context;
+  if (typeof context !== "number" || !Number.isFinite(context))
     return null;
-  return value;
-}
-function hasAnyEnvKey(env, keys) {
-  for (const key of keys) {
-    if (env[key])
-      return true;
-  }
-  return false;
-}
-function getRemoteProvidersFromEnv(env) {
-  const providers = REMOTE_PROVIDER_ENV_KEYS.filter((entry) => hasAnyEnvKey(env, entry.envKeys)).map((entry) => entry.provider);
-  if (!providers.includes("openai") && isLoggedIn("openai")) {
-    providers.push("openai");
-  }
-  return providers;
-}
-function getProvidersToRefreshFromEnv(env) {
-  return [...getRemoteProvidersFromEnv(env), "ollama"];
-}
-function getVisibleProvidersForSnapshotFromEnv(env) {
-  return new Set(getProvidersToRefreshFromEnv(env));
-}
-function getConfiguredProvidersForSync() {
-  return getProvidersToRefreshFromEnv(process.env);
-}
-function getProvidersRequiredForFreshness() {
-  return getRemoteProvidersFromEnv(process.env);
-}
-function getProviderSyncKey(provider) {
-  return `${PROVIDER_SYNC_KEY_PREFIX}${provider}`;
+  return Math.max(0, Math.trunc(context));
 }
-function isModelInfoStale(now = Date.now()) {
-  ensureLoaded();
-  if (parseStateInt(CACHE_VERSION_KEY) !== CACHE_VERSION)
-    return true;
-  if (isStaleTimestamp(parseStateInt(MODELS_DEV_SYNC_KEY), now))
-    return true;
-  for (const provider of getProvidersRequiredForFreshness()) {
-    const providerSync = parseStateInt(getProviderSyncKey(provider));
-    if (isStaleTimestamp(providerSync, now))
-      return true;
-  }
-  return false;
+function parseMaxOutputTokens(model) {
+  const limit = model.limit;
+  if (!isRecord(limit))
+    return null;
+  const output = limit.output;
+  if (typeof output !== "number" || !Number.isFinite(output))
+    return null;
+  return Math.max(0, Math.trunc(output));
 }
-function getLastSyncAt() {
-  let latest = parseStateInt(MODELS_DEV_SYNC_KEY);
-  for (const provider of getProvidersRequiredForFreshness()) {
-    const value = parseStateInt(getProviderSyncKey(provider));
-    if (value !== null && (latest === null || value > latest))
-      latest = value;
+function parseModelsDevCapabilities(payload, updatedAt) {
+  if (!isRecord(payload))
+    return [];
+  const merged = new Map;
+  for (const [provider, providerValue] of Object.entries(payload)) {
+    if (!isRecord(providerValue))
+      continue;
+    const models = providerValue.models;
+    if (!isRecord(models))
+      continue;
+    for (const [modelKey, modelValue] of Object.entries(models)) {
+      if (!isRecord(modelValue))
+        continue;
+      const explicitId = typeof modelValue.id === "string" && modelValue.id.trim().length > 0 ? modelValue.id : modelKey;
+      const canonicalModelId = normalizeModelId(explicitId);
+      if (!canonicalModelId)
+        continue;
+      const contextWindow = parseContextWindow(modelValue);
+      const maxOutputTokens = parseMaxOutputTokens(modelValue);
+      const reasoning = modelValue.reasoning === true;
+      const rawJson = JSON.stringify(modelValue);
+      const prev = merged.get(canonicalModelId);
+      if (!prev) {
+        merged.set(canonicalModelId, {
+          canonicalModelId,
+          contextWindow,
+          maxOutputTokens,
+          reasoning,
+          sourceProvider: provider,
+          rawJson
+        });
+        continue;
+      }
+      merged.set(canonicalModelId, {
+        canonicalModelId,
+        contextWindow: prev.contextWindow ?? contextWindow,
+        maxOutputTokens: prev.maxOutputTokens ?? maxOutputTokens,
+        reasoning: prev.reasoning || reasoning,
+        sourceProvider: prev.sourceProvider,
+        rawJson: prev.rawJson ?? rawJson
+      });
+    }
   }
-  return latest;
-}
-function providerRowsFromCandidates(candidates, matchIndex, updatedAt) {
-  return candidates.map((candidate) => ({
-    provider_model_id: candidate.providerModelId,
-    display_name: candidate.displayName,
-    canonical_model_id: matchCanonicalModelId(candidate.providerModelId, matchIndex),
-    context_window: candidate.contextWindow,
-    free: candidate.free ? 1 : 0,
+  return Array.from(merged.values()).map((entry) => ({
+    canonical_model_id: entry.canonicalModelId,
+    context_window: entry.contextWindow,
+    max_output_tokens: entry.maxOutputTokens,
+    reasoning: entry.reasoning ? 1 : 0,
+    source_provider: entry.sourceProvider,
+    raw_json: entry.rawJson,
     updated_at: updatedAt
   }));
 }
-async function refreshModelInfoInternal() {
-  ensureLoaded();
-  const now = Date.now();
-  const providers = getConfiguredProvidersForSync();
-  const providerResults = await Promise.all(providers.map(async (provider) => ({
-    provider,
-    candidates: await fetchProviderCandidates(provider)
-  })));
-  const modelsDevPayload = await fetchModelsDevPayload();
-  let matchIndex = runtimeCache.matchIndex;
-  if (modelsDevPayload !== null) {
-    const capabilityRows = parseModelsDevCapabilities(modelsDevPayload, now);
-    if (capabilityRows.length > 0) {
-      replaceModelCapabilities(capabilityRows);
-      setModelInfoState(MODELS_DEV_SYNC_KEY, String(now));
-      matchIndex = buildModelMatchIndex(capabilityRows.map((row) => row.canonical_model_id));
-    }
-  }
-  for (const result of providerResults) {
-    if (result.candidates === null)
+function buildModelMatchIndex(canonicalModelIds) {
+  const exact = new Map;
+  const aliasCandidates = new Map;
+  for (const rawCanonical of canonicalModelIds) {
+    const canonical = normalizeModelId(rawCanonical);
+    if (!canonical)
       continue;
-    const rows = providerRowsFromCandidates(result.candidates, matchIndex, now);
-    replaceProviderModels(result.provider, rows);
-    setModelInfoState(getProviderSyncKey(result.provider), String(now));
-  }
-  setModelInfoState(CACHE_VERSION_KEY, String(CACHE_VERSION));
-  loadCacheFromDb();
-}
-function refreshModelInfoInBackground(opts) {
-  ensureLoaded();
-  const force = opts?.force ?? false;
-  if (!force && !isModelInfoStale())
-    return Promise.resolve();
-  if (refreshInFlight)
-    return refreshInFlight;
-  refreshInFlight = refreshModelInfoInternal().finally(() => {
-    refreshInFlight = null;
-  });
-  return refreshInFlight;
-}
-function isModelInfoRefreshing() {
-  return refreshInFlight !== null;
-}
-function resolveModelInfo(modelString) {
-  ensureLoaded();
-  return resolveModelInfoInCache(modelString, runtimeCache);
-}
-function getContextWindow(modelString) {
-  return resolveModelInfo(modelString)?.contextWindow ?? null;
-}
-function getMaxOutputTokens(modelString) {
-  return resolveModelInfo(modelString)?.maxOutputTokens ?? null;
-}
-function supportsThinking(modelString) {
-  return resolveModelInfo(modelString)?.reasoning ?? false;
-}
-function getCachedModelIds() {
-  ensureLoaded();
-  const visible = getVisibleProvidersForSnapshotFromEnv(process.env);
-  const ids = [];
-  for (const row of runtimeCache.providerModelsByKey.values()) {
-    if (visible.has(row.provider)) {
-      ids.push(`${row.provider}/${row.providerModelId}`);
+    exact.set(canonical, canonical);
+    const short = basename(canonical);
+    if (!short)
+      continue;
+    let set = aliasCandidates.get(short);
+    if (!set) {
+      set = new Set;
+      aliasCandidates.set(short, set);
     }
+    set.add(canonical);
   }
-  ids.sort((a, b) => a.localeCompare(b));
-  return ids;
-}
-function hasCachedModelsForAllVisibleProviders() {
-  const visible = getVisibleProvidersForSnapshotFromEnv(process.env);
-  for (const provider of visible) {
-    let found = false;
-    for (const row of runtimeCache.providerModelsByKey.values()) {
-      if (row.provider === provider) {
-        found = true;
-        break;
+  const alias = new Map;
+  for (const [short, candidates] of aliasCandidates) {
+    if (candidates.size === 1) {
+      for (const value of candidates) {
+        alias.set(short, value);
       }
-    }
-    if (!found)
-      return false;
-  }
-  return true;
-}
-async function fetchAvailableModelsSnapshot() {
-  ensureLoaded();
-  if (isModelInfoStale() && !isModelInfoRefreshing()) {
-    if (runtimeCache.providerModelsByKey.size === 0 || !hasCachedModelsForAllVisibleProviders()) {
-      await refreshModelInfoInBackground({ force: true });
     } else {
-      refreshModelInfoInBackground();
+      alias.set(short, null);
     }
   }
-  return {
-    models: readLiveModelsFromCache(runtimeCache, getVisibleProvidersForSnapshotFromEnv(process.env)),
-    stale: isModelInfoStale(),
-    refreshing: isModelInfoRefreshing(),
-    lastSyncAt: getLastSyncAt()
-  };
+  return { exact, alias };
 }
-
-// src/llm-api/model-routing.ts
-function parseModelString(modelString) {
-  const slashIdx = modelString.indexOf("/");
-  if (slashIdx === -1)
-    return { provider: modelString, modelId: "" };
-  return {
-    provider: modelString.slice(0, slashIdx),
-    modelId: modelString.slice(slashIdx + 1)
-  };
+function matchCanonicalModelId(providerModelId, index) {
+  const normalized = normalizeModelId(providerModelId);
+  if (!normalized)
+    return null;
+  const exactMatch = index.exact.get(normalized);
+  if (exactMatch)
+    return exactMatch;
+  const short = basename(normalized);
+  if (!short)
+    return null;
+  const alias = index.alias.get(short);
+  return alias ?? null;
 }
-function isZenProvider(provider) {
-  return provider === "zen";
+
+// src/llm-api/model-info-cache.ts
+function parseModelStringLoose(modelString) {
+  const slash = modelString.indexOf("/");
+  if (slash === -1) {
+    return { provider: null, modelId: modelString };
+  }
+  const provider = modelString.slice(0, slash).trim().toLowerCase();
+  const modelId = modelString.slice(slash + 1);
+  return { provider: provider || null, modelId };
 }
-function isAnthropicModelFamily(modelString) {
-  const { provider, modelId } = parseModelString(modelString);
-  return provider === "anthropic" || isZenProvider(provider) && modelId.startsWith("claude-");
+function providerModelKey(provider, modelId) {
+  return `${provider}/${modelId}`;
 }
-function isGeminiModelFamily(modelString) {
-  const { provider, modelId } = parseModelString(modelString);
-  return (provider === "google" || isZenProvider(provider)) && modelId.startsWith("gemini-");
+function emptyRuntimeCache() {
+  return {
+    capabilitiesByCanonical: new Map,
+    providerModelsByKey: new Map,
+    providerModelUniqIndex: new Map,
+    matchIndex: {
+      exact: new Map,
+      alias: new Map
+    },
+    state: new Map
+  };
 }
-function isOpenAIGPTModelFamily(modelString) {
-  const { provider, modelId } = parseModelString(modelString);
-  return (provider === "openai" || isZenProvider(provider)) && modelId.startsWith("gpt-");
+function buildRuntimeCache(capabilityRows, providerRows, stateRows) {
+  const capabilitiesByCanonical = new Map;
+  for (const row of capabilityRows) {
+    const canonical = normalizeModelId(row.canonical_model_id);
+    if (!canonical)
+      continue;
+    capabilitiesByCanonical.set(canonical, {
+      canonicalModelId: canonical,
+      contextWindow: row.context_window,
+      maxOutputTokens: row.max_output_tokens,
+      reasoning: row.reasoning === 1,
+      sourceProvider: row.source_provider
+    });
+  }
+  const providerModelsByKey = new Map;
+  const providerModelUniqIndex = new Map;
+  for (const row of providerRows) {
+    const provider = row.provider.trim().toLowerCase();
+    const providerModelId = normalizeModelId(row.provider_model_id);
+    if (!provider || !providerModelId)
+      continue;
+    const key = providerModelKey(provider, providerModelId);
+    providerModelsByKey.set(key, {
+      provider,
+      providerModelId,
+      displayName: row.display_name,
+      canonicalModelId: row.canonical_model_id ? normalizeModelId(row.canonical_model_id) : null,
+      contextWindow: row.context_window,
+      free: row.free === 1
+    });
+    const prev = providerModelUniqIndex.get(providerModelId);
+    if (prev === undefined) {
+      providerModelUniqIndex.set(providerModelId, key);
+    } else if (prev !== key) {
+      providerModelUniqIndex.set(providerModelId, null);
+    }
+  }
+  const matchIndex = buildModelMatchIndex(capabilitiesByCanonical.keys());
+  const state = new Map;
+  for (const row of stateRows) {
+    state.set(row.key, row.value);
+  }
+  return {
+    capabilitiesByCanonical,
+    providerModelsByKey,
+    providerModelUniqIndex,
+    matchIndex,
+    state
+  };
 }
-function isOpenAIReasoningModelFamily(modelString) {
-  const { provider, modelId } = parseModelString(modelString);
-  return (provider === "openai" || isZenProvider(provider)) && (modelId.startsWith("o") || modelId.startsWith("gpt-5"));
+function resolveFromProviderRow(row, cache) {
+  if (row.canonicalModelId) {
+    const capability = cache.capabilitiesByCanonical.get(row.canonicalModelId);
+    if (capability) {
+      return {
+        canonicalModelId: capability.canonicalModelId,
+        contextWindow: capability.contextWindow ?? row.contextWindow,
+        maxOutputTokens: capability.maxOutputTokens,
+        reasoning: capability.reasoning
+      };
+    }
+  }
+  return {
+    canonicalModelId: row.canonicalModelId,
+    contextWindow: row.contextWindow,
+    maxOutputTokens: null,
+    reasoning: false
+  };
 }
-function isZenOpenAICompatibleChatModel(modelString) {
-  const { provider, modelId } = parseModelString(modelString);
-  if (!isZenProvider(provider))
-    return false;
-  return !modelId.startsWith("gpt-") && !modelId.startsWith("gemini-") && !modelId.startsWith("claude-");
+function resolveModelInfoInCache(modelString, cache) {
+  const parsed = parseModelStringLoose(modelString);
+  const normalizedModelId = normalizeModelId(parsed.modelId);
+  if (!normalizedModelId)
+    return null;
+  if (parsed.provider) {
+    const providerRow = cache.providerModelsByKey.get(providerModelKey(parsed.provider, normalizedModelId));
+    if (providerRow)
+      return resolveFromProviderRow(providerRow, cache);
+  }
+  const canonical = matchCanonicalModelId(normalizedModelId, cache.matchIndex);
+  if (canonical) {
+    const capability = cache.capabilitiesByCanonical.get(canonical);
+    if (capability) {
+      return {
+        canonicalModelId: capability.canonicalModelId,
+        contextWindow: capability.contextWindow,
+        maxOutputTokens: capability.maxOutputTokens,
+        reasoning: capability.reasoning
+      };
+    }
+  }
+  if (!parsed.provider) {
+    const uniqueProviderKey = cache.providerModelUniqIndex.get(normalizedModelId);
+    if (uniqueProviderKey) {
+      const providerRow = cache.providerModelsByKey.get(uniqueProviderKey);
+      if (providerRow)
+        return resolveFromProviderRow(providerRow, cache);
+    }
+  }
+  return null;
 }
-function getZenBackend(modelId) {
-  if (modelId.startsWith("claude-"))
-    return "anthropic";
-  if (modelId.startsWith("gpt-"))
-    return "openai";
-  if (modelId.startsWith("gemini-"))
-    return "google";
-  return "compat";
+function readLiveModelsFromCache(cache, visibleProviders) {
+  const models = [];
+  for (const row of cache.providerModelsByKey.values()) {
+    if (!visibleProviders.has(row.provider))
+      continue;
+    const info = resolveFromProviderRow(row, cache);
+    models.push({
+      id: `${row.provider}/${row.providerModelId}`,
+      displayName: row.displayName,
+      provider: row.provider,
+      context: info.contextWindow ?? undefined,
+      free: row.free ? true : undefined
+    });
+  }
+  models.sort((a, b) => a.provider.localeCompare(b.provider) || a.id.localeCompare(b.id));
+  return models;
 }
 
-// src/llm-api/providers.ts
-var SUPPORTED_PROVIDERS = [
-  "zen",
-  "anthropic",
-  "openai",
-  "google",
-  "ollama"
-];
-var ZEN_BASE2 = "https://opencode.ai/zen/v1";
-function requireEnv(name) {
-  const value = process.env[name];
-  if (!value)
-    throw new Error(`${name} is not set`);
-  return value;
+// src/llm-api/model-info-fetch.ts
+var ZEN_BASE = "https://opencode.ai/zen/v1";
+var OPENAI_BASE = "https://api.openai.com";
+var ANTHROPIC_BASE = "https://api.anthropic.com";
+var GOOGLE_BASE = "https://generativelanguage.googleapis.com/v1beta";
+var MODELS_DEV_URL = "https://models.dev/api.json";
+function normalizeModelId2(modelId) {
+  let out = modelId.trim().toLowerCase();
+  while (out.startsWith("models/")) {
+    out = out.slice("models/".length);
+  }
+  return out;
 }
-function requireAnyEnv(names) {
-  for (const name of names) {
-    const value = process.env[name];
-    if (value)
-      return value;
+async function fetchJson(url, init, timeoutMs) {
+  try {
+    const response = await fetch(url, {
+      ...init,
+      signal: AbortSignal.timeout(timeoutMs)
+    });
+    if (!response.ok)
+      return null;
+    return await response.json();
+  } catch {
+    return null;
   }
-  throw new Error(`${names.join(" or ")} is not set`);
 }
-function lazy(factory) {
-  let instance = null;
-  return () => {
-    if (instance === null) {
-      instance = factory();
-    }
-    return instance;
-  };
+async function fetchModelsDevPayload() {
+  return fetchJson(MODELS_DEV_URL, {}, 1e4);
 }
-var zenProviders = {
-  anthropic: lazy(() => createAnthropic({
-    fetch,
-    apiKey: requireEnv("OPENCODE_API_KEY"),
-    baseURL: ZEN_BASE2
-  })),
-  openai: lazy(() => createOpenAI({
-    fetch,
-    apiKey: requireEnv("OPENCODE_API_KEY"),
-    baseURL: ZEN_BASE2
-  })),
-  google: lazy(() => createGoogleGenerativeAI({
-    fetch,
-    apiKey: requireEnv("OPENCODE_API_KEY"),
-    baseURL: ZEN_BASE2
-  })),
-  compat: lazy(() => createOpenAICompatible({
-    fetch,
-    name: "zen-compat",
-    apiKey: requireEnv("OPENCODE_API_KEY"),
-    baseURL: ZEN_BASE2
-  }))
-};
-var directProviders = {
-  anthropic: lazy(() => createAnthropic({
-    fetch,
-    apiKey: requireEnv("ANTHROPIC_API_KEY")
-  })),
-  openai: lazy(() => createOpenAI({
-    fetch,
-    apiKey: requireEnv("OPENAI_API_KEY")
-  })),
-  google: lazy(() => createGoogleGenerativeAI({
-    fetch,
-    apiKey: requireAnyEnv(["GOOGLE_API_KEY", "GEMINI_API_KEY"])
-  })),
-  ollama: lazy(() => {
-    const baseURL = process.env.OLLAMA_BASE_URL ?? "http://localhost:11434";
-    return createOpenAICompatible({
-      name: "ollama",
-      baseURL: `${baseURL}/v1`,
-      apiKey: "ollama",
-      fetch
-    });
-  })
-};
-var ZEN_BACKEND_RESOLVERS = {
-  anthropic: (modelId) => zenProviders.anthropic()(modelId),
-  openai: (modelId) => zenProviders.openai().responses(modelId),
-  google: (modelId) => zenProviders.google()(modelId),
-  compat: (modelId) => zenProviders.compat()(modelId)
-};
-function resolveZenModel(modelId) {
-  return ZEN_BACKEND_RESOLVERS[getZenBackend(modelId)](modelId);
+function processModelsList(payload, arrayKey, idKey, mapper) {
+  if (!isRecord(payload) || !Array.isArray(payload[arrayKey]))
+    return null;
+  const out = [];
+  for (const item of payload[arrayKey]) {
+    if (!isRecord(item) || typeof item[idKey] !== "string")
+      continue;
+    const modelId = normalizeModelId2(item[idKey]);
+    if (!modelId)
+      continue;
+    const mapped = mapper(item, modelId);
+    if (mapped)
+      out.push(mapped);
+  }
+  return out;
 }
-function createOAuthOpenAIProvider(token) {
-  const accountId = extractAccountId(token);
-  return createOpenAI({
-    apiKey: "oauth",
-    baseURL: OPENAI_CODEX_BASE_URL,
-    fetch: (input, init) => {
-      const h = new Headers(init?.headers);
-      h.delete("OpenAI-Organization");
-      h.delete("OpenAI-Project");
-      h.set("Authorization", `Bearer ${token}`);
-      if (accountId)
-        h.set("chatgpt-account-id", accountId);
-      let body = init?.body;
-      if (typeof body === "string") {
-        try {
-          const parsed = JSON.parse(body);
-          if (parsed.input && Array.isArray(parsed.input)) {
-            if (!parsed.instructions) {
-              const sysIdx = parsed.input.findIndex((m) => m.role === "developer" || m.role === "system");
-              if (sysIdx !== -1) {
-                const sysMsg = parsed.input[sysIdx];
-                parsed.instructions = typeof sysMsg.content === "string" ? sysMsg.content : JSON.stringify(sysMsg.content);
-                parsed.input.splice(sysIdx, 1);
-              }
-            }
-            delete parsed.max_output_tokens;
-            parsed.store = false;
-            parsed.stream = true;
-            body = JSON.stringify(parsed);
-          }
-        } catch {}
-      }
-      return fetch(input, {
-        ...init,
-        body,
-        headers: Object.fromEntries(h.entries())
-      });
+async function fetchPaginatedModelsList(url, init, timeoutMs, arrayKey, idKey, mapper) {
+  const out = [];
+  const seen = new Set;
+  const baseUrl = new URL(url);
+  let nextAfter = null;
+  for (let page = 0;page < 10; page += 1) {
+    const currentUrl = new URL(baseUrl);
+    if (nextAfter !== null)
+      currentUrl.searchParams.set("after", nextAfter);
+    const payload = await fetchJson(currentUrl.toString(), init, timeoutMs);
+    const rows = processModelsList(payload, arrayKey, idKey, mapper);
+    if (rows === null)
+      return null;
+    for (const row of rows) {
+      if (seen.has(row.providerModelId))
+        continue;
+      seen.add(row.providerModelId);
+      out.push(row);
     }
+    if (!isRecord(payload))
+      break;
+    if (payload.has_more !== true || typeof payload.last_id !== "string")
+      break;
+    nextAfter = payload.last_id;
+  }
+  return out;
+}
+async function fetchZenModels() {
+  const key = process.env.OPENCODE_API_KEY;
+  if (!key)
+    return null;
+  return fetchPaginatedModelsList(`${ZEN_BASE}/models`, { headers: { Authorization: `Bearer ${key}` } }, 8000, "data", "id", (item, modelId) => {
+    const contextWindow = typeof item.context_window === "number" && Number.isFinite(item.context_window) ? Math.max(0, Math.trunc(item.context_window)) : null;
+    return {
+      providerModelId: modelId,
+      displayName: item.id,
+      contextWindow,
+      free: item.id.endsWith("-free") || item.id === "gpt-5-nano" || item.id === "big-pickle"
+    };
   });
 }
-async function resolveOpenAIModel(modelId) {
+async function fetchOpenAIModels() {
+  const envKey = process.env.OPENAI_API_KEY;
+  if (envKey) {
+    return fetchPaginatedModelsList(`${OPENAI_BASE}/v1/models`, { headers: { Authorization: `Bearer ${envKey}` } }, 6000, "data", "id", (_item, modelId) => ({
+      providerModelId: modelId,
+      displayName: modelId,
+      contextWindow: null,
+      free: false
+    }));
+  }
   if (isLoggedIn("openai")) {
     const token = await getAccessToken("openai");
-    if (token) {
-      if (!oauthOpenAICache || oauthOpenAICache.token !== token) {
-        oauthOpenAICache = {
-          token,
-          provider: createOAuthOpenAIProvider(token)
-        };
-      }
-      return oauthOpenAICache.provider.responses(modelId);
-    }
+    if (!token)
+      return null;
+    return fetchCodexOAuthModels(token);
   }
-  return modelId.startsWith("gpt-") ? directProviders.openai().responses(modelId) : directProviders.openai()(modelId);
-}
-var OPENAI_CODEX_BASE_URL = "https://chatgpt.com/backend-api/codex";
-var oauthOpenAICache = null;
-async function resolveAnthropicModel(modelId) {
-  return directProviders.anthropic()(modelId);
-}
-var PROVIDER_MODEL_RESOLVERS = {
-  zen: resolveZenModel,
-  anthropic: resolveAnthropicModel,
-  openai: resolveOpenAIModel,
-  google: (modelId) => directProviders.google()(modelId),
-  ollama: (modelId) => directProviders.ollama().chatModel(modelId)
-};
-function isProviderName(provider) {
-  return SUPPORTED_PROVIDERS.includes(provider);
+  return null;
 }
-async function resolveModel(modelString) {
-  const slashIdx = modelString.indexOf("/");
-  if (slashIdx === -1) {
-    throw new Error(`Invalid model string "${modelString}". Expected format: "<provider>/<model-id>"`);
-  }
-  const provider = modelString.slice(0, slashIdx);
-  const modelId = modelString.slice(slashIdx + 1);
-  if (!isProviderName(provider)) {
-    throw new Error(`Unknown provider "${provider}". Supported: ${SUPPORTED_PROVIDERS.join(", ")}`);
+var CODEX_MODELS_URL = "https://chatgpt.com/backend-api/codex/models?client_version=1.0.0";
+async function fetchCodexOAuthModels(token) {
+  try {
+    const res = await fetch(CODEX_MODELS_URL, {
+      headers: { Authorization: `Bearer ${token}` },
+      signal: AbortSignal.timeout(6000)
+    });
+    if (!res.ok)
+      return null;
+    const data = await res.json();
+    return (data.models ?? []).filter((m) => m.visibility === "list").map((m) => ({
+      providerModelId: m.slug,
+      displayName: m.display_name || m.slug,
+      contextWindow: m.context_window,
+      free: false
+    }));
+  } catch {
+    return null;
   }
-  return PROVIDER_MODEL_RESOLVERS[provider](modelId);
 }
-function discoverConnectedProviders() {
-  const result = [];
-  if (process.env.OPENCODE_API_KEY)
-    result.push({ name: "zen", via: "env" });
-  if (process.env.ANTHROPIC_API_KEY)
-    result.push({ name: "anthropic", via: "env" });
-  if (isLoggedIn("openai"))
-    result.push({ name: "openai", via: "oauth" });
-  else if (process.env.OPENAI_API_KEY)
-    result.push({ name: "openai", via: "env" });
-  if (process.env.GOOGLE_API_KEY || process.env.GEMINI_API_KEY)
-    result.push({ name: "google", via: "env" });
-  if (process.env.OLLAMA_BASE_URL)
-    result.push({ name: "ollama", via: "env" });
-  return result;
+async function fetchAnthropicModels() {
+  const key = process.env.ANTHROPIC_API_KEY;
+  if (!key)
+    return null;
+  const payload = await fetchJson(`${ANTHROPIC_BASE}/v1/models`, {
+    headers: {
+      "anthropic-version": "2023-06-01",
+      "x-api-key": key
+    }
+  }, 6000);
+  return processModelsList(payload, "data", "id", (item, modelId) => {
+    const displayName = typeof item.display_name === "string" && item.display_name.trim().length > 0 ? item.display_name : modelId;
+    return {
+      providerModelId: modelId,
+      displayName,
+      contextWindow: null,
+      free: false
+    };
+  });
 }
-function autoDiscoverModel() {
-  if (process.env.OPENCODE_API_KEY)
-    return "zen/claude-sonnet-4-6";
-  if (process.env.ANTHROPIC_API_KEY)
-    return "anthropic/claude-sonnet-4-6";
-  if (process.env.OPENAI_API_KEY || isLoggedIn("openai"))
-    return "openai/gpt-5.4";
-  if (process.env.GOOGLE_API_KEY || process.env.GEMINI_API_KEY)
-    return "google/gemini-3.1-pro";
-  return "ollama/llama3.2";
+async function fetchGoogleModels() {
+  const key = process.env.GOOGLE_API_KEY ?? process.env.GEMINI_API_KEY;
+  if (!key)
+    return null;
+  const payload = await fetchJson(`${GOOGLE_BASE}/models?key=${encodeURIComponent(key)}`, {}, 6000);
+  return processModelsList(payload, "models", "name", (item, modelId) => {
+    const displayName = typeof item.displayName === "string" && item.displayName.trim().length > 0 ? item.displayName : modelId;
+    const contextWindow = typeof item.inputTokenLimit === "number" && Number.isFinite(item.inputTokenLimit) ? Math.max(0, Math.trunc(item.inputTokenLimit)) : null;
+    return {
+      providerModelId: modelId,
+      displayName,
+      contextWindow,
+      free: false
+    };
+  });
 }
-async function fetchAvailableModels() {
-  return fetchAvailableModelsSnapshot();
-}
-
-// src/logging/context.ts
-var _currentContext = null;
-function setLogContext(context) {
-  _currentContext = context;
-}
-function getLogContext() {
-  return _currentContext;
-}
-function logError(err, context) {
-  const logCtx = _currentContext;
-  if (!logCtx)
-    return;
-  logCtx.logsRepo.write(logCtx.sessionId, "error", { error: err, context });
+async function fetchOllamaModels() {
+  const base = process.env.OLLAMA_BASE_URL ?? "http://localhost:11434";
+  const payload = await fetchJson(`${base}/api/tags`, {}, 3000);
+  return processModelsList(payload, "models", "name", (item, modelId) => {
+    const details = item.details;
+    let sizeSuffix = "";
+    if (isRecord(details) && typeof details.parameter_size === "string") {
+      sizeSuffix = ` (${details.parameter_size})`;
+    }
+    return {
+      providerModelId: modelId,
+      displayName: `${item.name}${sizeSuffix}`,
+      contextWindow: null,
+      free: false
+    };
+  });
 }
-function logApiEvent(event, data) {
-  const logCtx = _currentContext;
-  if (!logCtx)
-    return;
-  logCtx.logsRepo.write(logCtx.sessionId, "api", { event, data });
+var PROVIDER_CANDIDATE_FETCHERS = {
+  zen: fetchZenModels,
+  openai: fetchOpenAIModels,
+  anthropic: fetchAnthropicModels,
+  google: fetchGoogleModels,
+  ollama: fetchOllamaModels
+};
+async function fetchProviderCandidates(provider) {
+  const fetcher = PROVIDER_CANDIDATE_FETCHERS[provider];
+  if (!fetcher)
+    return null;
+  return fetcher();
 }
 
-// src/cli/error-parse.ts
-import {
-  APICallError,
-  LoadAPIKeyError,
-  NoContentGeneratedError,
-  NoSuchModelError,
-  RetryError
-} from "ai";
-
-// src/llm-api/error-utils.ts
-function extractObjectMessage(error) {
-  const record = error;
-  const direct = record.message;
-  if (typeof direct === "string" && direct.trim())
-    return direct.trim();
-  const nested = record.error;
-  if (typeof nested === "object" && nested !== null) {
-    const nestedMessage = nested.message;
-    if (typeof nestedMessage === "string" && nestedMessage.trim()) {
-      return nestedMessage.trim();
-    }
+// src/llm-api/provider-discovery.ts
+var DEFAULT_OLLAMA_BASE_URL = "http://localhost:11434";
+var LOCAL_PROVIDER_CACHE_TTL_MS = 30000;
+var LOCAL_PROVIDER_TIMEOUT_MS = 300;
+var knownLocalProviders = new Set;
+var knownLocalProvidersRefreshedAt = 0;
+var REMOTE_PROVIDER_ENV_KEYS = [
+  { provider: "zen", envKeys: ["OPENCODE_API_KEY"] },
+  { provider: "openai", envKeys: ["OPENAI_API_KEY"] },
+  { provider: "anthropic", envKeys: ["ANTHROPIC_API_KEY"] },
+  { provider: "google", envKeys: ["GOOGLE_API_KEY", "GEMINI_API_KEY"] }
+];
+function hasAnyEnvKey(env, keys) {
+  for (const key of keys) {
+    if (env[key])
+      return true;
   }
-  return null;
+  return false;
 }
-function stringifyUnknown(error) {
-  if (error === null || error === undefined)
-    return "Unknown error";
-  if (typeof error === "string") {
-    const message = error.trim();
-    return message || "Unknown error";
-  }
-  if (typeof error === "number" || typeof error === "boolean" || typeof error === "bigint") {
-    return String(error);
-  }
-  if (typeof error !== "object")
-    return "Unknown error";
-  const objectMessage = extractObjectMessage(error);
-  if (objectMessage)
-    return objectMessage;
+function appendUnique(target, value) {
+  if (!target.includes(value))
+    target.push(value);
+}
+async function canReachOllama(env) {
   try {
-    const value = JSON.stringify(error);
-    if (!value || value === "{}")
-      return "Unknown error";
-    const maxLen = 500;
-    return value.length > maxLen ? `${value.slice(0, maxLen - 1)}\u2026` : value;
+    const response = await fetch(new URL("/api/tags", env.OLLAMA_BASE_URL ?? DEFAULT_OLLAMA_BASE_URL), { signal: AbortSignal.timeout(LOCAL_PROVIDER_TIMEOUT_MS) });
+    return response.ok;
   } catch {
-    return "Unknown error";
+    return false;
   }
 }
-function normalizeUnknownError(error) {
-  if (error instanceof Error)
-    return error;
-  return new Error(stringifyUnknown(error));
-}
-
-// src/cli/error-parse.ts
-function safeStringifyErrorObject(value) {
-  try {
-    const json = JSON.stringify(value);
-    if (!json || json === "{}") {
-      return "Unknown error";
-    }
-    const maxLen = 240;
-    return json.length > maxLen ? `${json.slice(0, maxLen - 1)}\u2026` : json;
-  } catch {
-    return "Unknown error";
+function getRemoteConfiguredProviders(env, opts) {
+  const providers = REMOTE_PROVIDER_ENV_KEYS.filter((entry) => hasAnyEnvKey(env, entry.envKeys)).map((entry) => entry.provider);
+  if (!providers.includes("openai") && opts?.openaiLoggedIn) {
+    providers.push("openai");
   }
+  return providers;
 }
-function toUserErrorMessage(err) {
-  if (err instanceof Error) {
-    const msg = err.message.trim();
-    if (msg)
-      return msg;
+function isLocalProviderConnectionStateStale(now = Date.now()) {
+  return now - knownLocalProvidersRefreshedAt > LOCAL_PROVIDER_CACHE_TTL_MS;
+}
+function getKnownLocalProviders(now = Date.now()) {
+  if (isLocalProviderConnectionStateStale(now))
+    return [];
+  return Array.from(knownLocalProviders).sort((a, b) => a.localeCompare(b));
+}
+async function refreshLocalProviderConnections(env, now = Date.now()) {
+  const localProviders = [];
+  if (await canReachOllama(env))
+    localProviders.push("ollama");
+  knownLocalProviders.clear();
+  for (const provider of localProviders)
+    knownLocalProviders.add(provider);
+  knownLocalProvidersRefreshedAt = now;
+  return localProviders;
+}
+function getLocalProviderNames(connectedProviders) {
+  return connectedProviders.filter((provider) => provider.via === "local").map((provider) => provider.name).sort((a, b) => a.localeCompare(b));
+}
+function getVisibleProviders(env, opts) {
+  const providers = getRemoteConfiguredProviders(env, opts);
+  for (const provider of opts?.localProviders ?? getKnownLocalProviders(opts?.now)) {
+    appendUnique(providers, provider);
   }
-  if (typeof err === "string") {
-    const msg = err.trim();
-    if (msg)
-      return msg;
+  return providers;
+}
+async function discoverProviderConnections(env, opts) {
+  const result = [];
+  if (env.OPENCODE_API_KEY)
+    result.push({ name: "zen", via: "env" });
+  if (env.ANTHROPIC_API_KEY)
+    result.push({ name: "anthropic", via: "env" });
+  if (opts?.openaiLoggedIn)
+    result.push({ name: "openai", via: "oauth" });
+  else if (env.OPENAI_API_KEY)
+    result.push({ name: "openai", via: "env" });
+  if (env.GOOGLE_API_KEY || env.GEMINI_API_KEY) {
+    result.push({ name: "google", via: "env" });
   }
-  if (typeof err === "number" || typeof err === "boolean" || typeof err === "bigint") {
-    return String(err);
+  const localProviders = opts?.localProviders ?? await refreshLocalProviderConnections(env, opts?.now);
+  for (const provider of localProviders) {
+    result.push({ name: provider, via: "local" });
   }
-  if (typeof err === "object" && err !== null) {
-    const objectMessage = extractObjectMessage(err);
-    if (objectMessage)
-      return objectMessage;
-    return safeStringifyErrorObject(err);
+  return result;
+}
+
+// src/llm-api/model-info.ts
+var MODELS_DEV_SYNC_KEY = "last_models_dev_sync_at";
+var PROVIDER_SYNC_KEY_PREFIX = "last_provider_sync_at:";
+var CACHE_VERSION_KEY = "model_info_cache_version";
+var CACHE_VERSION = 5;
+var MODEL_INFO_TTL_MS = 24 * 60 * 60 * 1000;
+var runtimeCache = emptyRuntimeCache();
+var loaded = false;
+var refreshInFlight = null;
+function isStaleTimestamp(timestamp, now = Date.now(), ttlMs = MODEL_INFO_TTL_MS) {
+  if (timestamp === null)
+    return true;
+  return now - timestamp > ttlMs;
+}
+function loadCacheFromDb() {
+  runtimeCache = buildRuntimeCache(listModelCapabilities(), listProviderModels(), listModelInfoState());
+  loaded = true;
+}
+function ensureLoaded() {
+  if (!loaded)
+    loadCacheFromDb();
+}
+function initModelInfoCache() {
+  loadCacheFromDb();
+}
+function parseStateInt(key) {
+  const raw = runtimeCache.state.get(key);
+  if (!raw)
+    return null;
+  const value = Number.parseInt(raw, 10);
+  if (!Number.isFinite(value))
+    return null;
+  return value;
+}
+function getRemoteProvidersFromEnv(env) {
+  return getRemoteConfiguredProviders(env, {
+    openaiLoggedIn: isLoggedIn("openai")
+  });
+}
+function getProvidersToRefreshFromEnv(env, opts) {
+  const localProviders = opts?.localProviders;
+  return getVisibleProviders(env, {
+    openaiLoggedIn: isLoggedIn("openai"),
+    ...localProviders ? { localProviders } : {}
+  });
+}
+function getVisibleProvidersForSnapshotFromEnv(env, opts) {
+  const localProviders = opts?.localProviders;
+  return new Set(getProvidersToRefreshFromEnv(env, localProviders ? { localProviders } : undefined));
+}
+function getConfiguredProvidersForSync(localProviders) {
+  return getProvidersToRefreshFromEnv(process.env, localProviders ? { localProviders } : undefined);
+}
+function getProvidersRequiredForFreshness() {
+  return getRemoteProvidersFromEnv(process.env);
+}
+function getProviderSyncKey(provider) {
+  return `${PROVIDER_SYNC_KEY_PREFIX}${provider}`;
+}
+function isModelInfoStale(now = Date.now()) {
+  ensureLoaded();
+  if (parseStateInt(CACHE_VERSION_KEY) !== CACHE_VERSION)
+    return true;
+  if (isStaleTimestamp(parseStateInt(MODELS_DEV_SYNC_KEY), now))
+    return true;
+  if (isLocalProviderConnectionStateStale(now))
+    return true;
+  for (const provider of getProvidersRequiredForFreshness()) {
+    const providerSync = parseStateInt(getProviderSyncKey(provider));
+    if (isStaleTimestamp(providerSync, now))
+      return true;
   }
-  return "Unknown error";
+  return false;
 }
-function parseAppError(err) {
-  if (typeof err === "string") {
-    return { headline: err };
+function getLastSyncAt() {
+  let latest = parseStateInt(MODELS_DEV_SYNC_KEY);
+  for (const provider of getProvidersRequiredForFreshness()) {
+    const value = parseStateInt(getProviderSyncKey(provider));
+    if (value !== null && (latest === null || value > latest))
+      latest = value;
   }
-  if (err instanceof RetryError) {
-    const inner = parseAppError(err.lastError);
-    return {
-      headline: `Retries exhausted: ${inner.headline}`,
-      ...inner.hint ? { hint: inner.hint } : {}
-    };
+  return latest;
+}
+function providerRowsFromCandidates(candidates, matchIndex, updatedAt) {
+  return candidates.map((candidate) => ({
+    provider_model_id: candidate.providerModelId,
+    display_name: candidate.displayName,
+    canonical_model_id: matchCanonicalModelId(candidate.providerModelId, matchIndex),
+    context_window: candidate.contextWindow,
+    free: candidate.free ? 1 : 0,
+    updated_at: updatedAt
+  }));
+}
+async function refreshModelInfoInternal(localProviders) {
+  ensureLoaded();
+  const now = Date.now();
+  const discoveredLocalProviders = localProviders ?? await refreshLocalProviderConnections(process.env);
+  const providers = getConfiguredProvidersForSync(discoveredLocalProviders);
+  const providerResults = await Promise.all(providers.map(async (provider) => ({
+    provider,
+    candidates: await fetchProviderCandidates(provider)
+  })));
+  const modelsDevPayload = await fetchModelsDevPayload();
+  let matchIndex = runtimeCache.matchIndex;
+  if (modelsDevPayload !== null) {
+    const capabilityRows = parseModelsDevCapabilities(modelsDevPayload, now);
+    if (capabilityRows.length > 0) {
+      replaceModelCapabilities(capabilityRows);
+      setModelInfoState(MODELS_DEV_SYNC_KEY, String(now));
+      matchIndex = buildModelMatchIndex(capabilityRows.map((row) => row.canonical_model_id));
+    }
   }
-  if (err instanceof APICallError) {
-    const body = String(err.message).toLowerCase();
-    if (body.includes("context_length_exceeded") || body.includes("maximum context length") || body.includes("too many tokens") || body.includes("request too large")) {
-      return {
-        headline: "Max context size reached",
-        hint: "Use /new to start a fresh session"
-      };
-    }
-    if (err.statusCode === 429) {
-      return {
-        headline: "Rate limit hit",
-        hint: "Wait a moment and retry, or switch model with /model"
-      };
-    }
-    if (err.statusCode === 401 || err.statusCode === 403) {
-      return {
-        headline: "Auth failed",
-        hint: "Check the relevant provider API key env var"
-      };
-    }
-    return {
-      headline: `API error ${err.statusCode ?? "unknown"}`,
-      ...err.url ? { hint: err.url } : {}
-    };
-  }
-  if (err instanceof NoContentGeneratedError) {
-    return {
-      headline: "Model returned empty response",
-      hint: "Try rephrasing or switching model with /model"
-    };
+  for (const result of providerResults) {
+    if (result.candidates === null)
+      continue;
+    const rows = providerRowsFromCandidates(result.candidates, matchIndex, now);
+    replaceProviderModels(result.provider, rows);
+    setModelInfoState(getProviderSyncKey(result.provider), String(now));
   }
-  if (err instanceof LoadAPIKeyError) {
-    return {
-      headline: "API key not found",
-      hint: "Set the relevant provider env var"
-    };
+  setModelInfoState(CACHE_VERSION_KEY, String(CACHE_VERSION));
+  loadCacheFromDb();
+}
+function refreshModelInfoInBackground(opts) {
+  ensureLoaded();
+  const force = opts?.force ?? false;
+  if (!force && !isModelInfoStale() && !shouldBlockOnMissingVisibleProviderModels({
+    hasAnyCachedModels: runtimeCache.providerModelsByKey.size > 0,
+    hasCachedModelsForAllVisibleProviders: hasCachedModelsForAllVisibleProviders()
+  })) {
+    return Promise.resolve();
   }
-  if (err instanceof NoSuchModelError) {
-    return {
-      headline: "Model not found",
-      hint: "Use /model to pick a valid model"
-    };
+  if (refreshInFlight)
+    return refreshInFlight;
+  refreshInFlight = refreshModelInfoInternal(opts?.localProviders).finally(() => {
+    refreshInFlight = null;
+  });
+  return refreshInFlight;
+}
+function isModelInfoRefreshing() {
+  return refreshInFlight !== null;
+}
+function resolveModelInfo(modelString) {
+  ensureLoaded();
+  return resolveModelInfoInCache(modelString, runtimeCache);
+}
+function getContextWindow(modelString) {
+  return resolveModelInfo(modelString)?.contextWindow ?? null;
+}
+function getMaxOutputTokens(modelString) {
+  return resolveModelInfo(modelString)?.maxOutputTokens ?? null;
+}
+function supportsThinking(modelString) {
+  return resolveModelInfo(modelString)?.reasoning ?? false;
+}
+function getCachedModelIds() {
+  ensureLoaded();
+  const visible = getVisibleProvidersForSnapshotFromEnv(process.env, {
+    localProviders: getKnownLocalProviders()
+  });
+  const ids = [];
+  for (const row of runtimeCache.providerModelsByKey.values()) {
+    if (visible.has(row.provider)) {
+      ids.push(`${row.provider}/${row.providerModelId}`);
+    }
   }
-  const isObj = typeof err === "object" && err !== null;
-  const code = isObj && "code" in err ? String(err.code) : undefined;
-  const message = toUserErrorMessage(err);
-  if (code === "ECONNREFUSED" || message.includes("ECONNREFUSED")) {
-    return {
-      headline: "Connection failed",
-      hint: "Check network or local server"
-    };
+  ids.sort((a, b) => a.localeCompare(b));
+  return ids;
+}
+function hasCachedModelsForAllVisibleProviders() {
+  const visible = getVisibleProvidersForSnapshotFromEnv(process.env, {
+    localProviders: getKnownLocalProviders()
+  });
+  for (const provider of visible) {
+    let found = false;
+    for (const row of runtimeCache.providerModelsByKey.values()) {
+      if (row.provider === provider) {
+        found = true;
+        break;
+      }
+    }
+    if (!found)
+      return false;
   }
-  if (code === "ECONNRESET" || message.includes("ECONNRESET") || message.includes("socket connection was closed unexpectedly")) {
-    return {
-      headline: "Connection lost",
-      hint: "The server closed the connection \u2014 retry or switch model with /model"
-    };
+  return true;
+}
+function shouldBlockOnMissingVisibleProviderModels(opts) {
+  return !opts.hasAnyCachedModels || !opts.hasCachedModelsForAllVisibleProviders;
+}
+async function fetchAvailableModelsSnapshot() {
+  ensureLoaded();
+  const stale = isModelInfoStale();
+  const shouldBlock = shouldBlockOnMissingVisibleProviderModels({
+    hasAnyCachedModels: runtimeCache.providerModelsByKey.size > 0,
+    hasCachedModelsForAllVisibleProviders: hasCachedModelsForAllVisibleProviders()
+  });
+  if (shouldBlock) {
+    await refreshModelInfoInBackground({ force: true });
+  } else if (stale && !isModelInfoRefreshing()) {
+    refreshModelInfoInBackground();
   }
-  const firstLine = message.split(`
-`)[0]?.trim() || "Unknown error";
-  return { headline: firstLine };
+  return {
+    models: readLiveModelsFromCache(runtimeCache, getVisibleProvidersForSnapshotFromEnv(process.env, {
+      localProviders: getKnownLocalProviders()
+    })),
+    stale: isModelInfoStale(),
+    refreshing: isModelInfoRefreshing(),
+    lastSyncAt: getLastSyncAt()
+  };
 }
 
 // src/cli/skills.ts
@@ -1912,9 +1774,9 @@ import {
   readSync,
   statSync
 } from "fs";
-import { homedir as homedir3 } from "os";
+import { homedir as homedir4 } from "os";
 import { dirname as dirname2, join as join3, resolve as resolve2 } from "path";
-import * as c from "yoctocolors";
+import * as c7 from "yoctocolors";
 
 // src/cli/frontmatter.ts
 var FM_RE = /^---\r?\n([\s\S]*?)\r?\n---\r?\n?([\s\S]*)$/;
@@ -1962,253 +1824,510 @@ function parseFrontmatter(raw) {
   return { meta, body: (m[2] ?? "").trim() };
 }
 
-// src/cli/skills.ts
-var MAX_FRONTMATTER_BYTES = 64 * 1024;
-var SKILL_NAME_RE = /^[a-z0-9]+(?:-[a-z0-9]+)*$/;
-var MAX_SKILL_NAME_LENGTH = 64;
-var warnedInvalidSkills = new Set;
-var warnedSkillIssues = new Set;
-function parseSkillFrontmatter(filePath) {
-  let fd = null;
-  try {
-    fd = openSync(filePath, "r");
-    const chunk = Buffer.allocUnsafe(MAX_FRONTMATTER_BYTES);
-    const bytesRead = readSync(fd, chunk, 0, MAX_FRONTMATTER_BYTES, 0);
-    const text = chunk.toString("utf8", 0, bytesRead);
-    const { meta } = parseFrontmatter(text);
-    const result = {};
-    if (typeof meta.name === "string" && meta.name)
-      result.name = meta.name;
-    if (typeof meta.description === "string" && meta.description)
-      result.description = meta.description;
-    if (typeof meta.context === "string" && meta.context)
-      result.context = meta.context;
-    if (typeof meta.compatibility === "string" && meta.compatibility)
-      result.compatibility = meta.compatibility;
-    return result;
-  } catch {
-    return {};
-  } finally {
-    if (fd !== null)
-      closeSync(fd);
-  }
+// src/cli/output.ts
+import { homedir as homedir3 } from "os";
+import * as c6 from "yoctocolors";
+
+// src/agent/context-files.ts
+import { existsSync as existsSync2, readFileSync } from "fs";
+import { homedir as homedir2 } from "os";
+import { dirname, join as join2, resolve } from "path";
+var HOME = homedir2();
+function tilde(p) {
+  return p.startsWith(HOME) ? `~${p.slice(HOME.length)}` : p;
 }
-function getCandidateFrontmatter(candidate) {
-  if (!candidate.frontmatter) {
-    candidate.frontmatter = parseSkillFrontmatter(candidate.filePath);
-  }
-  return candidate.frontmatter;
+function globalContextCandidates(homeDir = HOME) {
+  return [
+    {
+      abs: join2(homeDir, ".agents", "AGENTS.md"),
+      label: "~/.agents/AGENTS.md"
+    },
+    {
+      abs: join2(homeDir, ".agents", "CLAUDE.md"),
+      label: "~/.agents/CLAUDE.md"
+    },
+    {
+      abs: join2(homeDir, ".claude", "CLAUDE.md"),
+      label: "~/.claude/CLAUDE.md"
+    }
+  ];
 }
-function candidateConflictName(candidate) {
-  return getCandidateFrontmatter(candidate).name?.trim() || candidate.folderName;
+function dirContextCandidates(dir) {
+  const rel = (p) => tilde(resolve(dir, p));
+  return [
+    {
+      abs: join2(dir, ".agents", "AGENTS.md"),
+      label: `${rel(".agents/AGENTS.md")}`
+    },
+    {
+      abs: join2(dir, ".agents", "CLAUDE.md"),
+      label: `${rel(".agents/CLAUDE.md")}`
+    },
+    {
+      abs: join2(dir, ".claude", "CLAUDE.md"),
+      label: `${rel(".claude/CLAUDE.md")}`
+    },
+    { abs: join2(dir, "CLAUDE.md"), label: `${rel("CLAUDE.md")}` },
+    { abs: join2(dir, "AGENTS.md"), label: `${rel("AGENTS.md")}` }
+  ];
 }
-function findGitBoundary(cwd) {
-  let current = resolve2(cwd);
-  while (true) {
-    if (existsSync3(join3(current, ".git")))
-      return current;
-    const parent = dirname2(current);
-    if (parent === current)
-      return null;
-    current = parent;
-  }
+function existingCandidates(candidates) {
+  return candidates.filter((candidate) => existsSync2(candidate.abs));
 }
-function localSearchRoots(cwd) {
-  const start = resolve2(cwd);
-  const stop = findGitBoundary(start);
-  if (!stop)
-    return [start];
-  const roots = [];
-  let current = start;
+function nearestLocalContextCandidates(cwd) {
+  let current = resolve(cwd);
   while (true) {
-    roots.push(current);
-    if (current === stop)
+    const matches = existingCandidates(dirContextCandidates(current));
+    if (matches.length > 0)
+      return matches;
+    if (existsSync2(join2(current, ".git")))
       break;
-    const parent = dirname2(current);
+    const parent = dirname(current);
     if (parent === current)
       break;
     current = parent;
   }
-  return roots;
+  return [];
 }
-var MAX_SKILL_SCAN_DEPTH = 5;
-var MAX_SKILL_DIRS_SCANNED = 2000;
-function listSkillCandidates(skillsDir, source, rootPath) {
-  if (!existsSync3(skillsDir))
-    return [];
-  const candidates = [];
-  let dirsScanned = 0;
-  function walk(dir, depth) {
-    if (depth > MAX_SKILL_SCAN_DEPTH || dirsScanned >= MAX_SKILL_DIRS_SCANNED)
-      return;
-    let entries;
-    try {
-      entries = readdirSync(dir).sort((a, b) => a.localeCompare(b));
-    } catch {
-      return;
-    }
-    for (const entry of entries) {
-      if (dirsScanned >= MAX_SKILL_DIRS_SCANNED)
-        return;
-      const entryPath = join3(dir, entry);
-      try {
-        if (!statSync(entryPath).isDirectory())
-          continue;
-      } catch {
-        continue;
+function discoverContextFiles(cwd, homeDir) {
+  return [
+    ...existingCandidates(globalContextCandidates(homeDir)).map((c) => c.label),
+    ...nearestLocalContextCandidates(cwd).map((c) => c.label)
+  ];
+}
+function tryReadFile(p) {
+  if (!existsSync2(p))
+    return null;
+  try {
+    return readFileSync(p, "utf-8");
+  } catch {
+    return null;
+  }
+}
+function readCandidates(candidates) {
+  const parts = [];
+  for (const c of candidates) {
+    const content = tryReadFile(c.abs);
+    if (content)
+      parts.push(content);
+  }
+  return parts.length > 0 ? parts.join(`
+
+`) : null;
+}
+function loadGlobalContextFile(homeDir) {
+  return readCandidates(globalContextCandidates(homeDir));
+}
+function loadLocalContextFile(cwd) {
+  return readCandidates(nearestLocalContextCandidates(cwd));
+}
+
+// src/llm-api/providers.ts
+import { createAnthropic } from "@ai-sdk/anthropic";
+import { createGoogleGenerativeAI } from "@ai-sdk/google";
+import { createOpenAI } from "@ai-sdk/openai";
+import { createOpenAICompatible } from "@ai-sdk/openai-compatible";
+
+// src/llm-api/model-routing.ts
+function parseModelString(modelString) {
+  const slashIdx = modelString.indexOf("/");
+  if (slashIdx === -1)
+    return { provider: modelString, modelId: "" };
+  return {
+    provider: modelString.slice(0, slashIdx),
+    modelId: modelString.slice(slashIdx + 1)
+  };
+}
+function isZenProvider(provider) {
+  return provider === "zen";
+}
+function isAnthropicModelFamily(modelString) {
+  const { provider, modelId } = parseModelString(modelString);
+  return provider === "anthropic" || isZenProvider(provider) && modelId.startsWith("claude-");
+}
+function isGeminiModelFamily(modelString) {
+  const { provider, modelId } = parseModelString(modelString);
+  return (provider === "google" || isZenProvider(provider)) && modelId.startsWith("gemini-");
+}
+function isOpenAIGPTModelFamily(modelString) {
+  const { provider, modelId } = parseModelString(modelString);
+  return (provider === "openai" || isZenProvider(provider)) && modelId.startsWith("gpt-");
+}
+function isOpenAIReasoningModelFamily(modelString) {
+  const { provider, modelId } = parseModelString(modelString);
+  return (provider === "openai" || isZenProvider(provider)) && (modelId.startsWith("o") || modelId.startsWith("gpt-5"));
+}
+function isZenOpenAICompatibleChatModel(modelString) {
+  const { provider, modelId } = parseModelString(modelString);
+  if (!isZenProvider(provider))
+    return false;
+  return !modelId.startsWith("gpt-") && !modelId.startsWith("gemini-") && !modelId.startsWith("claude-");
+}
+function getZenBackend(modelId) {
+  if (modelId.startsWith("claude-"))
+    return "anthropic";
+  if (modelId.startsWith("gpt-"))
+    return "openai";
+  if (modelId.startsWith("gemini-"))
+    return "google";
+  return "compat";
+}
+
+// src/llm-api/providers.ts
+var SUPPORTED_PROVIDERS = [
+  "zen",
+  "anthropic",
+  "openai",
+  "google",
+  "ollama"
+];
+var ZEN_BASE2 = "https://opencode.ai/zen/v1";
+function requireEnv(name) {
+  const value = process.env[name];
+  if (!value)
+    throw new Error(`${name} is not set`);
+  return value;
+}
+function requireAnyEnv(names) {
+  for (const name of names) {
+    const value = process.env[name];
+    if (value)
+      return value;
+  }
+  throw new Error(`${names.join(" or ")} is not set`);
+}
+function lazy(factory) {
+  let instance = null;
+  return () => {
+    if (instance === null) {
+      instance = factory();
+    }
+    return instance;
+  };
+}
+var zenProviders = {
+  anthropic: lazy(() => createAnthropic({
+    fetch,
+    apiKey: requireEnv("OPENCODE_API_KEY"),
+    baseURL: ZEN_BASE2
+  })),
+  openai: lazy(() => createOpenAI({
+    fetch,
+    apiKey: requireEnv("OPENCODE_API_KEY"),
+    baseURL: ZEN_BASE2
+  })),
+  google: lazy(() => createGoogleGenerativeAI({
+    fetch,
+    apiKey: requireEnv("OPENCODE_API_KEY"),
+    baseURL: ZEN_BASE2
+  })),
+  compat: lazy(() => createOpenAICompatible({
+    fetch,
+    name: "zen-compat",
+    apiKey: requireEnv("OPENCODE_API_KEY"),
+    baseURL: ZEN_BASE2
+  }))
+};
+var directProviders = {
+  anthropic: lazy(() => createAnthropic({
+    fetch,
+    apiKey: requireEnv("ANTHROPIC_API_KEY")
+  })),
+  openai: lazy(() => createOpenAI({
+    fetch,
+    apiKey: requireEnv("OPENAI_API_KEY")
+  })),
+  google: lazy(() => createGoogleGenerativeAI({
+    fetch,
+    apiKey: requireAnyEnv(["GOOGLE_API_KEY", "GEMINI_API_KEY"])
+  })),
+  ollama: lazy(() => {
+    const baseURL = process.env.OLLAMA_BASE_URL ?? "http://localhost:11434";
+    return createOpenAICompatible({
+      name: "ollama",
+      baseURL: `${baseURL}/v1`,
+      apiKey: "ollama",
+      fetch
+    });
+  })
+};
+var ZEN_BACKEND_RESOLVERS = {
+  anthropic: (modelId) => zenProviders.anthropic()(modelId),
+  openai: (modelId) => zenProviders.openai().responses(modelId),
+  google: (modelId) => zenProviders.google()(modelId),
+  compat: (modelId) => zenProviders.compat()(modelId)
+};
+function resolveZenModel(modelId) {
+  return ZEN_BACKEND_RESOLVERS[getZenBackend(modelId)](modelId);
+}
+function createOAuthOpenAIProvider(token) {
+  const accountId = extractAccountId(token);
+  return createOpenAI({
+    apiKey: "oauth",
+    baseURL: OPENAI_CODEX_BASE_URL,
+    fetch: (input, init) => {
+      const h = new Headers(init?.headers);
+      h.delete("OpenAI-Organization");
+      h.delete("OpenAI-Project");
+      h.set("Authorization", `Bearer ${token}`);
+      if (accountId)
+        h.set("chatgpt-account-id", accountId);
+      let body = init?.body;
+      if (typeof body === "string") {
+        try {
+          const parsed = JSON.parse(body);
+          if (parsed.input && Array.isArray(parsed.input)) {
+            if (!parsed.instructions) {
+              const sysIdx = parsed.input.findIndex((m) => m.role === "developer" || m.role === "system");
+              if (sysIdx !== -1) {
+                const sysMsg = parsed.input[sysIdx];
+                parsed.instructions = typeof sysMsg.content === "string" ? sysMsg.content : JSON.stringify(sysMsg.content);
+                parsed.input.splice(sysIdx, 1);
+              }
+            }
+            delete parsed.max_output_tokens;
+            parsed.store = false;
+            parsed.stream = true;
+            body = JSON.stringify(parsed);
+          }
+        } catch {}
       }
-      dirsScanned++;
-      const filePath = join3(entryPath, "SKILL.md");
-      if (existsSync3(filePath)) {
-        candidates.push({
-          folderName: entry,
-          filePath,
-          rootPath,
-          source
-        });
-      } else {
-        walk(entryPath, depth + 1);
+      return fetch(input, {
+        ...init,
+        body,
+        headers: Object.fromEntries(h.entries())
+      });
+    }
+  });
+}
+async function resolveOpenAIModel(modelId) {
+  if (isLoggedIn("openai")) {
+    const token = await getAccessToken("openai");
+    if (token) {
+      if (!oauthOpenAICache || oauthOpenAICache.token !== token) {
+        oauthOpenAICache = {
+          token,
+          provider: createOAuthOpenAIProvider(token)
+        };
       }
+      return oauthOpenAICache.provider.responses(modelId);
+    }
+  }
+  return modelId.startsWith("gpt-") ? directProviders.openai().responses(modelId) : directProviders.openai()(modelId);
+}
+var OPENAI_CODEX_BASE_URL = "https://chatgpt.com/backend-api/codex";
+var oauthOpenAICache = null;
+async function resolveAnthropicModel(modelId) {
+  return directProviders.anthropic()(modelId);
+}
+var PROVIDER_MODEL_RESOLVERS = {
+  zen: resolveZenModel,
+  anthropic: resolveAnthropicModel,
+  openai: resolveOpenAIModel,
+  google: (modelId) => directProviders.google()(modelId),
+  ollama: (modelId) => directProviders.ollama().chatModel(modelId)
+};
+function isProviderName(provider) {
+  return SUPPORTED_PROVIDERS.includes(provider);
+}
+async function resolveModel(modelString) {
+  const slashIdx = modelString.indexOf("/");
+  if (slashIdx === -1) {
+    throw new Error(`Invalid model string "${modelString}". Expected format: "<provider>/<model-id>"`);
+  }
+  const provider = modelString.slice(0, slashIdx);
+  const modelId = modelString.slice(slashIdx + 1);
+  if (!isProviderName(provider)) {
+    throw new Error(`Unknown provider "${provider}". Supported: ${SUPPORTED_PROVIDERS.join(", ")}`);
+  }
+  return PROVIDER_MODEL_RESOLVERS[provider](modelId);
+}
+async function discoverConnectedProviders() {
+  return discoverProviderConnections(process.env, {
+    openaiLoggedIn: isLoggedIn("openai")
+  });
+}
+function autoDiscoverModel() {
+  if (process.env.OPENCODE_API_KEY)
+    return "zen/claude-sonnet-4-6";
+  if (process.env.ANTHROPIC_API_KEY)
+    return "anthropic/claude-sonnet-4-6";
+  if (process.env.OPENAI_API_KEY || isLoggedIn("openai"))
+    return "openai/gpt-5.4";
+  if (process.env.GOOGLE_API_KEY || process.env.GEMINI_API_KEY)
+    return "google/gemini-3.1-pro";
+  return "ollama/llama3.2";
+}
+async function fetchAvailableModels() {
+  return fetchAvailableModelsSnapshot();
+}
+
+// src/cli/error-parse.ts
+import {
+  APICallError,
+  LoadAPIKeyError,
+  NoContentGeneratedError,
+  NoSuchModelError,
+  RetryError
+} from "ai";
+
+// src/llm-api/error-utils.ts
+function extractObjectMessage(error) {
+  const record = error;
+  const direct = record.message;
+  if (typeof direct === "string" && direct.trim())
+    return direct.trim();
+  const nested = record.error;
+  if (typeof nested === "object" && nested !== null) {
+    const nestedMessage = nested.message;
+    if (typeof nestedMessage === "string" && nestedMessage.trim()) {
+      return nestedMessage.trim();
     }
   }
-  walk(skillsDir, 1);
-  return candidates;
-}
-function warnInvalidSkill(filePath, reason) {
-  const key = `${filePath}:${reason}`;
-  if (warnedInvalidSkills.has(key))
-    return;
-  warnedInvalidSkills.add(key);
-  writeln(`${G.warn} skipping invalid skill ${filePath}: ${reason}`);
+  return null;
+}
+function stringifyUnknown(error) {
+  if (error === null || error === undefined)
+    return "Unknown error";
+  if (typeof error === "string") {
+    const message = error.trim();
+    return message || "Unknown error";
+  }
+  if (typeof error === "number" || typeof error === "boolean" || typeof error === "bigint") {
+    return String(error);
+  }
+  if (typeof error !== "object")
+    return "Unknown error";
+  const objectMessage = extractObjectMessage(error);
+  if (objectMessage)
+    return objectMessage;
+  try {
+    const value = JSON.stringify(error);
+    if (!value || value === "{}")
+      return "Unknown error";
+    const maxLen = 500;
+    return value.length > maxLen ? `${value.slice(0, maxLen - 1)}\u2026` : value;
+  } catch {
+    return "Unknown error";
+  }
 }
-function warnSkillIssue(filePath, reason) {
-  const key = `${filePath}:${reason}`;
-  if (warnedSkillIssues.has(key))
-    return;
-  warnedSkillIssues.add(key);
-  writeln(`${G.warn} skill ${filePath}: ${reason}`);
+function normalizeUnknownError(error) {
+  if (error instanceof Error)
+    return error;
+  return new Error(stringifyUnknown(error));
 }
-function warnConventionConflicts(kind, scope, agentsNames, claudeNames) {
-  const agents = new Set(agentsNames);
-  const claude = new Set(claudeNames);
-  const conflicts = [];
-  for (const name of agents) {
-    if (claude.has(name))
-      conflicts.push(name);
+
+// src/cli/error-parse.ts
+function safeStringifyErrorObject(value) {
+  try {
+    const json = JSON.stringify(value);
+    if (!json || json === "{}") {
+      return "Unknown error";
+    }
+    const maxLen = 240;
+    return json.length > maxLen ? `${json.slice(0, maxLen - 1)}\u2026` : json;
+  } catch {
+    return "Unknown error";
   }
-  if (conflicts.length === 0)
-    return;
-  conflicts.sort((a, b) => a.localeCompare(b));
-  const list = conflicts.map((n) => c.cyan(n)).join(c.dim(", "));
-  writeln(`${G.warn} conflicting ${kind} in ${scope} .agents and .claude: ${list} ${c.dim("\u2014 using .agents version")}`);
 }
-function validateSkill(candidate) {
-  const meta = getCandidateFrontmatter(candidate);
-  const name = meta.name?.trim();
-  const description = meta.description?.trim();
-  if (!name) {
-    warnInvalidSkill(candidate.filePath, "frontmatter field `name` is required");
-    return null;
+function toUserErrorMessage(err) {
+  if (err instanceof Error) {
+    const msg = err.message.trim();
+    if (msg)
+      return msg;
   }
-  if (!description) {
-    warnInvalidSkill(candidate.filePath, "frontmatter field `description` is required");
-    return null;
+  if (typeof err === "string") {
+    const msg = err.trim();
+    if (msg)
+      return msg;
   }
-  if (name.length > MAX_SKILL_NAME_LENGTH) {
-    warnSkillIssue(candidate.filePath, `name exceeds ${MAX_SKILL_NAME_LENGTH} characters`);
+  if (typeof err === "number" || typeof err === "boolean" || typeof err === "bigint") {
+    return String(err);
   }
-  if (!SKILL_NAME_RE.test(name)) {
-    warnSkillIssue(candidate.filePath, "name does not match lowercase alnum + hyphen format");
+  if (typeof err === "object" && err !== null) {
+    const objectMessage = extractObjectMessage(err);
+    if (objectMessage)
+      return objectMessage;
+    return safeStringifyErrorObject(err);
   }
-  return {
-    name,
-    description,
-    source: candidate.source,
-    rootPath: candidate.rootPath,
-    filePath: candidate.filePath,
-    ...meta.context === "fork" && { context: "fork" },
-    ...meta.compatibility && { compatibility: meta.compatibility }
-  };
+  return "Unknown error";
 }
-function allSkillCandidates(cwd, homeDir) {
-  const home = homeDir ?? homedir3();
-  const localRootsNearToFar = localSearchRoots(cwd);
-  const ordered = [];
-  const globalClaude = listSkillCandidates(join3(home, ".claude", "skills"), "global", home);
-  const globalAgents = listSkillCandidates(join3(home, ".agents", "skills"), "global", home);
-  warnConventionConflicts("skills", "global", globalAgents.map((skill) => candidateConflictName(skill)), globalClaude.map((skill) => candidateConflictName(skill)));
-  ordered.push(...globalClaude, ...globalAgents);
-  for (const root of [...localRootsNearToFar].reverse()) {
-    const localClaude = listSkillCandidates(join3(root, ".claude", "skills"), "local", root);
-    const localAgents = listSkillCandidates(join3(root, ".agents", "skills"), "local", root);
-    warnConventionConflicts("skills", "local", localAgents.map((skill) => candidateConflictName(skill)), localClaude.map((skill) => candidateConflictName(skill)));
-    ordered.push(...localClaude, ...localAgents);
+function parseAppError(err) {
+  if (typeof err === "string") {
+    return { headline: err };
   }
-  return ordered;
-}
-function loadSkillsIndex(cwd, homeDir) {
-  const index = new Map;
-  for (const candidate of allSkillCandidates(cwd, homeDir)) {
-    const skill = validateSkill(candidate);
-    if (!skill)
-      continue;
-    index.set(skill.name, skill);
+  if (err instanceof RetryError) {
+    const inner = parseAppError(err.lastError);
+    return {
+      headline: `Retries exhausted: ${inner.headline}`,
+      ...inner.hint ? { hint: inner.hint } : {}
+    };
   }
-  return index;
-}
-var MAX_RESOURCE_LISTING = 50;
-function listSkillResources(skillDir) {
-  const resources = [];
-  function walk(dir, prefix) {
-    let entries;
-    try {
-      entries = readdirSync(dir);
-    } catch {
-      return;
+  if (err instanceof APICallError) {
+    const body = String(err.message).toLowerCase();
+    if (body.includes("context_length_exceeded") || body.includes("maximum context length") || body.includes("too many tokens") || body.includes("request too large")) {
+      return {
+        headline: "Max context size reached",
+        hint: "Use /new to start a fresh session"
+      };
     }
-    for (const entry of entries) {
-      if (resources.length >= MAX_RESOURCE_LISTING)
-        return;
-      if (entry === "SKILL.md")
-        continue;
-      const full = join3(dir, entry);
-      const rel = prefix ? `${prefix}/${entry}` : entry;
-      try {
-        if (statSync(full).isDirectory()) {
-          walk(full, rel);
-        } else {
-          resources.push(rel);
-        }
-      } catch {}
+    if (err.statusCode === 429) {
+      return {
+        headline: "Rate limit hit",
+        hint: "Wait a moment and retry, or switch model with /model"
+      };
+    }
+    if (err.statusCode === 401 || err.statusCode === 403) {
+      return {
+        headline: "Auth failed",
+        hint: "Check the relevant provider API key env var"
+      };
     }
+    return {
+      headline: `API error ${err.statusCode ?? "unknown"}`,
+      ...err.url ? { hint: err.url } : {}
+    };
   }
-  walk(skillDir, "");
-  return resources;
-}
-function loadSkillContentFromMeta(skill) {
-  try {
-    const content = readFileSync2(skill.filePath, "utf-8");
-    const skillDir = dirname2(skill.filePath);
+  if (err instanceof NoContentGeneratedError) {
     return {
-      name: skill.name,
-      content,
-      source: skill.source,
-      skillDir,
-      resources: listSkillResources(skillDir)
+      headline: "Model returned empty response",
+      hint: "Try rephrasing or switching model with /model"
     };
-  } catch {
-    return null;
   }
-}
-function loadSkillContent(name, cwd, homeDir) {
-  const skill = loadSkillsIndex(cwd, homeDir).get(name);
-  if (!skill)
-    return null;
-  return loadSkillContentFromMeta(skill);
+  if (err instanceof LoadAPIKeyError) {
+    return {
+      headline: "API key not found",
+      hint: "Set the relevant provider env var"
+    };
+  }
+  if (err instanceof NoSuchModelError) {
+    return {
+      headline: "Model not found",
+      hint: "Use /model to pick a valid model"
+    };
+  }
+  const isObj = typeof err === "object" && err !== null;
+  const code = isObj && "code" in err ? String(err.code) : undefined;
+  const message = toUserErrorMessage(err);
+  if (code === "ECONNREFUSED" || message.includes("ECONNREFUSED")) {
+    return {
+      headline: "Connection failed",
+      hint: "Check network or local server"
+    };
+  }
+  if (code === "ECONNRESET" || message.includes("ECONNRESET") || message.includes("socket connection was closed unexpectedly")) {
+    return {
+      headline: "Connection lost",
+      hint: "The server closed the connection \u2014 retry or switch model with /model"
+    };
+  }
+  const firstLine = message.split(`
+`)[0]?.trim() || "Unknown error";
+  return { headline: firstLine };
 }
 
 // src/cli/spinner.ts
-import * as c2 from "yoctocolors";
+import * as c from "yoctocolors";
 
 // src/cli/terminal-io.ts
 class TerminalIO {
@@ -2339,13 +2458,13 @@ class Spinner {
   }
   _tick() {
     const f = SPINNER_FRAMES[this.frame++ % SPINNER_FRAMES.length] ?? "\u28FE";
-    const label = this.label ? c2.dim(` ${this.label}`) : "";
-    terminal.stderrWrite(`\r${c2.dim(f)}${label}`);
+    const label = this.label ? c.dim(` ${this.label}`) : "";
+    terminal.stderrWrite(`\r${c.dim(f)}${label}`);
   }
 }
 
 // src/cli/status-bar.ts
-import * as c3 from "yoctocolors";
+import * as c2 from "yoctocolors";
 
 // src/internal/ansi.ts
 var ANSI_REGEX = new RegExp(`${String.fromCharCode(27)}\\[[0-9;]*m`, "g");
@@ -2366,7 +2485,7 @@ function truncateText(value, max) {
 }
 
 // src/cli/status-bar.ts
-var STATUS_SEP = c3.dim("  \xB7  ");
+var STATUS_SEP = c2.dim("  \xB7  ");
 function fmtTokens(n) {
   if (n >= 1000)
     return `${(n / 1000).toFixed(1)}k`;
@@ -2376,16 +2495,16 @@ function buildContextSegment(opts) {
   if (opts.contextTokens <= 0)
     return null;
   if (opts.contextWindow === null) {
-    return c3.dim(`ctx ${fmtTokens(opts.contextTokens)}`);
+    return c2.dim(`ctx ${fmtTokens(opts.contextTokens)}`);
   }
   const pct = Math.round(opts.contextTokens / opts.contextWindow * 100);
   const pctStr = `${pct}%`;
-  let pctColored = c3.dim(pctStr);
+  let pctColored = c2.dim(pctStr);
   if (pct >= 90)
-    pctColored = c3.red(pctStr);
+    pctColored = c2.red(pctStr);
   else if (pct >= 75)
-    pctColored = c3.yellow(pctStr);
-  return c3.dim(`ctx ${fmtTokens(opts.contextTokens)}/${fmtTokens(opts.contextWindow)} `) + pctColored;
+    pctColored = c2.yellow(pctStr);
+  return c2.dim(`ctx ${fmtTokens(opts.contextTokens)}/${fmtTokens(opts.contextWindow)} `) + pctColored;
 }
 function renderStatusLine(segments) {
   return segments.join(STATUS_SEP);
@@ -2406,17 +2525,17 @@ function fitStatusSegments(required, optional, cols) {
     return truncateText(fixedPrefix, cols);
   const maxTailLen = Math.max(8, cols - fixedPrefix.length - sepLen);
   const truncatedTail = truncateText(plainRequired[1] ?? "", maxTailLen);
-  return `${required[0]}${STATUS_SEP}${c3.dim(truncatedTail)}`;
+  return `${required[0]}${STATUS_SEP}${c2.dim(truncatedTail)}`;
 }
 function renderStatusBar(opts) {
   const cols = Math.max(20, terminal.stdoutColumns || 80);
-  const modelSegment = opts.thinkingEffort ? `${c3.cyan(opts.model)} ${c3.magenta(c3.italic(`\u2726  ${opts.thinkingEffort}`))}` : c3.cyan(opts.model);
-  const required = [modelSegment, c3.dim(`#${opts.sessionId}`)];
+  const modelSegment = opts.thinkingEffort ? `${c2.cyan(opts.model)} ${c2.magenta(c2.italic(`\u2726  ${opts.thinkingEffort}`))}` : c2.cyan(opts.model);
+  const required = [modelSegment, c2.dim(`#${opts.sessionId}`)];
   const optional = [];
   if (opts.gitBranch)
-    optional.push(c3.dim(`\u2387 ${opts.gitBranch}`));
+    optional.push(c2.dim(`\u2387 ${opts.gitBranch}`));
   if (opts.inputTokens > 0 || opts.outputTokens > 0) {
-    optional.push(c3.dim(`tok ${fmtTokens(opts.inputTokens)}/${fmtTokens(opts.outputTokens)}`));
+    optional.push(c2.dim(`tok ${fmtTokens(opts.inputTokens)}/${fmtTokens(opts.outputTokens)}`));
   }
   const contextSegment = buildContextSegment({
     contextTokens: opts.contextTokens,
@@ -2424,14 +2543,14 @@ function renderStatusBar(opts) {
   });
   if (contextSegment)
     optional.push(contextSegment);
-  optional.push(c3.dim(opts.cwd));
+  optional.push(c2.dim(opts.cwd));
   const out = fitStatusSegments(required, optional, cols);
   terminal.stdoutWrite(`${out}
 `);
 }
 
 // src/cli/stream-render.ts
-import * as c6 from "yoctocolors";
+import * as c5 from "yoctocolors";
 import { createHighlighter } from "yoctomarkdown";
 
 // src/llm-api/history/gemini.ts
@@ -2724,17 +2843,17 @@ function normalizeReasoningText(text) {
 }
 
 // src/cli/tool-render.ts
-import * as c5 from "yoctocolors";
+import * as c4 from "yoctocolors";
 
 // src/cli/tool-result-renderers.ts
-import * as c4 from "yoctocolors";
+import * as c3 from "yoctocolors";
 function writePreviewLines(opts) {
   if (!opts.value.trim())
     return;
   const lines = opts.value.split(`
 `);
   if (opts.label)
-    writeln(`${c4.dim(opts.label)} ${c4.dim(`(${lines.length} lines)`)}`);
+    writeln(`${c3.dim(opts.label)} ${c3.dim(`(${lines.length} lines)`)}`);
   if (!Number.isFinite(opts.maxLines) || lines.length <= opts.maxLines) {
     for (const line of lines)
       writeln(line);
@@ -2746,7 +2865,7 @@ function writePreviewLines(opts) {
     writeln(line);
   const hiddenLines = Math.max(0, lines.length - (headCount + tailCount));
   if (hiddenLines > 0) {
-    writeln(c4.dim(`\u2026 +${hiddenLines} lines`));
+    writeln(c3.dim(`\u2026 +${hiddenLines} lines`));
   }
   if (tailCount > 0) {
     for (const line of lines.slice(-tailCount))
@@ -2809,11 +2928,11 @@ function renderShellResult(result, opts) {
   const stdoutLines = countShellLines(r.stdout);
   const stderrLines = countShellLines(r.stderr);
   const stdoutSingleLine = getSingleShellLine(r.stdout);
-  let badge = c4.red("error");
+  let badge = c3.red("error");
   if (r.timedOut)
-    badge = c4.yellow("timeout");
+    badge = c3.yellow("timeout");
   else if (r.success)
-    badge = c4.green("done");
+    badge = c3.green("done");
   const parts = buildShellSummaryParts({
     exitCode: r.exitCode,
     stdoutLines,
@@ -2821,7 +2940,7 @@ function renderShellResult(result, opts) {
     stdoutSingleLine,
     verboseOutput
   });
-  writeln(`${badge} ${c4.dim(parts.join(" \xB7 "))}`);
+  writeln(`${badge} ${c3.dim(parts.join(" \xB7 "))}`);
   writePreviewLines({
     label: "stderr",
     value: displayStderr,
@@ -2846,21 +2965,21 @@ function buildSkillDescriptionPart(description, verboseOutput = false) {
   if (!trimmed)
     return "";
   if (verboseOutput)
-    return `  ${c4.dim("\xB7")}  ${c4.dim(trimmed)}`;
-  return `  ${c4.dim("\xB7")}  ${c4.dim(trimmed.length > 60 ? `${trimmed.slice(0, 57)}\u2026` : trimmed)}`;
+    return `  ${c3.dim("\xB7")}  ${c3.dim(trimmed)}`;
+  return `  ${c3.dim("\xB7")}  ${c3.dim(trimmed.length > 60 ? `${trimmed.slice(0, 57)}\u2026` : trimmed)}`;
 }
 function renderSkillSummaryLine(skill, opts) {
   const name = skill.name ?? "(unknown)";
   const source = skill.source ?? "unknown";
-  const labelPrefix = opts?.label ? `${c4.dim(opts.label)}  ` : "";
-  writeln(`${G.info} ${labelPrefix}${name}  ${c4.dim("\xB7")}  ${c4.dim(source)}${buildSkillDescriptionPart(skill.description, opts?.verboseOutput === true)}`);
+  const labelPrefix = opts?.label ? `${c3.dim(opts.label)}  ` : "";
+  writeln(`${G.info} ${labelPrefix}${name}  ${c3.dim("\xB7")}  ${c3.dim(source)}${buildSkillDescriptionPart(skill.description, opts?.verboseOutput === true)}`);
 }
 function renderListSkillsResult(result, opts) {
   const r = result;
   if (!Array.isArray(r?.skills))
     return false;
   if (r.skills.length === 0) {
-    writeln(`${G.info} ${c4.dim("no skills")}`);
+    writeln(`${G.info} ${c3.dim("no skills")}`);
     return true;
   }
   const maxSkills = opts?.verboseOutput ? r.skills.length : 6;
@@ -2870,7 +2989,7 @@ function renderListSkillsResult(result, opts) {
     });
   }
   if (r.skills.length > maxSkills) {
-    writeln(`${c4.dim(`+${r.skills.length - maxSkills} more skills`)}`);
+    writeln(`${c3.dim(`+${r.skills.length - maxSkills} more skills`)}`);
   }
   return true;
 }
@@ -2880,10 +2999,10 @@ function renderReadSkillResult(result, _opts) {
     return false;
   if (!r.skill) {
     if (typeof r.note === "string" && r.note.trim().length > 0) {
-      writeln(`${G.info} ${c4.dim("skill")}  ${c4.dim(r.note.trim())}`);
+      writeln(`${G.info} ${c3.dim("skill")}  ${c3.dim(r.note.trim())}`);
       return true;
     }
-    writeln(`${G.info} ${c4.dim("skill")}  ${c4.dim("(not found)")}`);
+    writeln(`${G.info} ${c3.dim("skill")}  ${c3.dim("(not found)")}`);
     return true;
   }
   renderSkillSummaryLine(r.skill, {
@@ -2891,7 +3010,7 @@ function renderReadSkillResult(result, _opts) {
     verboseOutput: _opts?.verboseOutput === true
   });
   if (typeof r.note === "string" && r.note.trim().length > 0) {
-    writeln(c4.dim(r.note.trim()));
+    writeln(c3.dim(r.note.trim()));
   }
   return true;
 }
@@ -2900,19 +3019,19 @@ function renderWebSearchResult(result, opts) {
   if (!Array.isArray(r?.results))
     return false;
   if (r.results.length === 0) {
-    writeln(`${G.info} ${c4.dim("no results")}`);
+    writeln(`${G.info} ${c3.dim("no results")}`);
     return true;
   }
   const maxResults = opts?.verboseOutput ? r.results.length : 5;
   for (const item of r.results.slice(0, maxResults)) {
     const title = (item.title?.trim() || item.url || "(untitled)").replace(/\s+/g, " ");
-    const score = typeof item.score === "number" ? c4.dim(` (${item.score.toFixed(2)})`) : "";
-    writeln(`${c4.dim("\u2022")} ${title}${score}`);
+    const score = typeof item.score === "number" ? c3.dim(` (${item.score.toFixed(2)})`) : "";
+    writeln(`${c3.dim("\u2022")} ${title}${score}`);
     if (item.url)
-      writeln(`  ${c4.dim(item.url)}`);
+      writeln(`  ${c3.dim(item.url)}`);
   }
   if (r.results.length > maxResults) {
-    writeln(`${c4.dim(`+${r.results.length - maxResults} more`)}`);
+    writeln(`${c3.dim(`+${r.results.length - maxResults} more`)}`);
   }
   return true;
 }
@@ -2921,23 +3040,23 @@ function renderWebContentResult(result, opts) {
   if (!Array.isArray(r?.results))
     return false;
   if (r.results.length === 0) {
-    writeln(`${G.info} ${c4.dim("no pages")}`);
+    writeln(`${G.info} ${c3.dim("no pages")}`);
     return true;
   }
   const maxPages = opts?.verboseOutput ? r.results.length : 3;
   for (const item of r.results.slice(0, maxPages)) {
     const title = (item.title?.trim() || item.url || "(untitled)").replace(/\s+/g, " ");
-    writeln(`${c4.dim("\u2022")} ${title}`);
+    writeln(`${c3.dim("\u2022")} ${title}`);
     if (item.url)
-      writeln(`  ${c4.dim(item.url)}`);
+      writeln(`  ${c3.dim(item.url)}`);
     const preview = (item.text ?? "").replace(/\s+/g, " ").trim();
     if (preview) {
       const trimmed = opts?.verboseOutput || preview.length <= 220 ? preview : `${preview.slice(0, 217)}\u2026`;
-      writeln(`  ${c4.dim(trimmed)}`);
+      writeln(`  ${c3.dim(trimmed)}`);
     }
   }
   if (r.results.length > maxPages) {
-    writeln(`${c4.dim(`+${r.results.length - maxPages} more`)}`);
+    writeln(`${c3.dim(`+${r.results.length - maxPages} more`)}`);
   }
   return true;
 }
@@ -3039,7 +3158,7 @@ function formatShellCallLine(cmd) {
   const { cwd, rest } = parseShellCdPrefix(cmd);
   const firstCmd = extractFirstCommand(rest);
   const glyph = shellCmdGlyph(firstCmd, rest);
-  const cwdSuffix = cwd ? ` ${c5.dim(`in ${cwd}`)}` : "";
+  const cwdSuffix = cwd ? ` ${c4.dim(`in ${cwd}`)}` : "";
   return `${glyph} ${rest}${cwdSuffix}`;
 }
 function buildToolCallLine(name, args) {
@@ -3047,29 +3166,29 @@ function buildToolCallLine(name, args) {
   if (name === "shell") {
     const cmd = String(a.command ?? "").trim();
     if (!cmd)
-      return `${G.run} ${c5.dim("shell")}`;
+      return `${G.run} ${c4.dim("shell")}`;
     return formatShellCallLine(cmd);
   }
   if (name === "listSkills") {
-    return `${G.search} ${c5.dim("list skills")}`;
+    return `${G.search} ${c4.dim("list skills")}`;
   }
   if (name === "readSkill") {
     const skillName = typeof a.name === "string" ? a.name : "";
-    return `${G.read} ${c5.dim("read skill")}${skillName ? ` ${skillName}` : ""}`;
+    return `${G.read} ${c4.dim("read skill")}${skillName ? ` ${skillName}` : ""}`;
   }
   if (name === "webSearch") {
     const query = typeof a.query === "string" ? a.query : "";
-    return `${G.search} ${c5.dim("search")}${query ? ` ${query}` : ""}`;
+    return `${G.search} ${c4.dim("search")}${query ? ` ${query}` : ""}`;
   }
   if (name === "webContent") {
     const urls = Array.isArray(a.urls) ? a.urls : [];
     const label = urls.length === 1 ? String(urls[0]) : `${urls.length} url${urls.length !== 1 ? "s" : ""}`;
-    return `${G.read} ${c5.dim("fetch")} ${label}`;
+    return `${G.read} ${c4.dim("fetch")} ${label}`;
   }
   if (name.startsWith("mcp_")) {
-    return `${G.mcp} ${c5.dim(name)}`;
+    return `${G.mcp} ${c4.dim(name)}`;
   }
-  return `${toolGlyph(name)} ${c5.dim(name)}`;
+  return `${toolGlyph(name)} ${c4.dim(name)}`;
 }
 function renderToolCall(toolName, args, opts) {
   const line = buildToolCallLine(toolName, args);
@@ -3088,7 +3207,7 @@ function renderToolCall(toolName, args, opts) {
   const hidden = lines.length - head.length - tail.length;
   for (const l of head)
     writeln(l);
-  writeln(c5.dim(`\u2026 +${hidden} lines`));
+  writeln(c4.dim(`\u2026 +${hidden} lines`));
   for (const l of tail)
     writeln(l);
 }
@@ -3102,7 +3221,7 @@ function formatErrorBadge(result) {
     msg = JSON.stringify(result);
   const oneLiner = msg.split(`
 `)[0] ?? msg;
-  return `${G.err} ${c5.red(oneLiner)}`;
+  return `${G.err} ${c4.red(oneLiner)}`;
 }
 function renderToolResult(toolName, result, isError, opts) {
   if (isError) {
@@ -3114,21 +3233,21 @@ function renderToolResult(toolName, result, isError, opts) {
   }
   const text = JSON.stringify(result);
   if (opts?.verboseOutput || text.length <= 120) {
-    writeln(c5.dim(text));
+    writeln(c4.dim(text));
     return;
   }
-  writeln(c5.dim(`${text.slice(0, 117)}\u2026`));
+  writeln(c4.dim(`${text.slice(0, 117)}\u2026`));
 }
 
 // src/cli/stream-render.ts
 function styleReasoning(text) {
-  return c6.italic(c6.dim(text));
+  return c5.italic(c5.dim(text));
 }
 function writeReasoningDelta(delta, state) {
   if (!delta)
     return;
   if (!state.blockOpen) {
-    writeln(`${G.info} ${c6.dim("reasoning")}`);
+    writeln(`${G.info} ${c5.dim("reasoning")}`);
     state.blockOpen = true;
   }
   const lines = delta.split(`
@@ -3311,7 +3430,7 @@ ${appended}`;
         if (!quiet) {
           spinner.stop();
           if (parallelCallCount > 1 && callInfo) {
-            writeln(`${c6.dim("\u21B3")} ${callInfo.label}`);
+            writeln(`${c5.dim("\u21B3")} ${callInfo.label}`);
           }
           if (toolCallInfo.size === 0)
             parallelCallCount = 0;
@@ -3332,7 +3451,7 @@ ${appended}`;
         if (!quiet) {
           spinner.stop();
           const removedKb = (event.removedBytes / 1024).toFixed(1);
-          writeln(`${G.info} ${c6.dim("context pruned")}  ${c6.dim(`\u2013${event.removedMessageCount} messages`)}  ${c6.dim(`\u2013${removedKb} KB`)}`);
+          writeln(`${G.info} ${c5.dim("context pruned")}  ${c5.dim(`\u2013${event.removedMessageCount} messages`)}  ${c5.dim(`\u2013${removedKb} KB`)}`);
           renderedVisibleOutput = true;
           spinner.start("thinking");
         }
@@ -3377,7 +3496,7 @@ ${appended}`;
 }
 
 // src/cli/output.ts
-var HOME2 = homedir4();
+var HOME2 = homedir3();
 function tildePath(p) {
   return p.startsWith(HOME2) ? `~${p.slice(HOME2.length)}` : p;
 }
@@ -3407,17 +3526,17 @@ function renderUserMessage(text) {
   }
 }
 var G = {
-  prompt: c7.green("\u203A"),
-  reply: c7.cyan("\u25C6"),
-  search: c7.yellow("?"),
-  read: c7.dim("\u2190"),
-  write: c7.green("\u270E"),
-  run: c7.dim("$"),
-  mcp: c7.yellow("\u2699"),
-  ok: c7.green("\u2714"),
-  err: c7.red("\u2716"),
-  warn: c7.yellow("!"),
-  info: c7.dim("\xB7")
+  prompt: c6.green("\u203A"),
+  reply: c6.cyan("\u25C6"),
+  search: c6.yellow("?"),
+  read: c6.dim("\u2190"),
+  write: c6.green("\u270E"),
+  run: c6.dim("$"),
+  mcp: c6.yellow("\u2699"),
+  ok: c6.green("\u2714"),
+  err: c6.red("\u2716"),
+  warn: c6.yellow("!"),
+  info: c6.dim("\xB7")
 };
 var PREFIX = {
   user: G.prompt,
@@ -3439,17 +3558,17 @@ class RenderedError extends Error {
 function renderError(err, context = "render") {
   logError(err, context);
   const parsed = parseAppError(err);
-  writeln(`${G.err} ${c7.red(parsed.headline)}`);
+  writeln(`${G.err} ${c6.red(parsed.headline)}`);
   if (parsed.hint) {
-    writeln(`  ${c7.dim(parsed.hint)}`);
+    writeln(`  ${c6.dim(parsed.hint)}`);
   }
 }
-function renderBanner(model, cwd) {
+async function renderBanner(model, cwd, connectedProviders) {
   writeln();
   const title = PACKAGE_VERSION ? `mini-coder \xB7 v${PACKAGE_VERSION}` : "mini-coder";
-  writeln(`  ${c7.cyan("mc")}  ${c7.dim(title)}`);
-  writeln(`  ${c7.dim(model)}  ${c7.dim("\xB7")}  ${c7.dim(tildePath(cwd))}`);
-  writeln(`  ${c7.dim("/help for commands  \xB7  esc cancel  \xB7  ctrl+d exit")}`);
+  writeln(`  ${c6.cyan("mc")}  ${c6.dim(title)}`);
+  writeln(`  ${c6.dim(model)}  ${c6.dim("\xB7")}  ${c6.dim(tildePath(cwd))}`);
+  writeln(`  ${c6.dim("/help for commands  \xB7  esc cancel  \xB7  ctrl+d exit")}`);
   const items = [];
   if (getPreferredShowReasoning())
     items.push("reasoning: on");
@@ -3462,17 +3581,22 @@ function renderBanner(model, cwd) {
   if (skills.size > 0)
     items.push(`${skills.size} skill${skills.size > 1 ? "s" : ""}`);
   if (items.length > 0) {
-    writeln(`  ${c7.dim(items.join("  \xB7  "))}`);
+    writeln(`  ${c6.dim(items.join("  \xB7  "))}`);
   }
   const connParts = [];
-  for (const p of discoverConnectedProviders()) {
-    connParts.push(p.via === "oauth" ? `${p.name} (oauth)` : p.name);
+  for (const p of connectedProviders ?? await discoverConnectedProviders()) {
+    if (p.via === "oauth")
+      connParts.push(`${p.name} (oauth)`);
+    else if (p.via === "local")
+      connParts.push(`${p.name} (local)`);
+    else
+      connParts.push(p.name);
   }
   const mcpCount = listMcpServers().length;
   if (mcpCount > 0)
     connParts.push(`${mcpCount} mcp`);
   if (connParts.length > 0) {
-    writeln(`  ${c7.dim(connParts.join(" \xB7 "))}`);
+    writeln(`  ${c6.dim(connParts.join(" \xB7 "))}`);
   }
   writeln();
 }
@@ -3487,7 +3611,7 @@ class CliReporter {
     if (this.quiet)
       return;
     this.spinner.stop();
-    writeln(`${G.info} ${c7.dim(msg)}`);
+    writeln(`${G.info} ${c6.dim(msg)}`);
   }
   error(msg, hint) {
     this.spinner.stop();
@@ -3526,251 +3650,260 @@ class CliReporter {
   renderStatusBar(data) {
     if (this.quiet)
       return;
-    renderStatusBar(data);
-  }
-  restoreTerminal() {
-    restoreTerminal();
-  }
-}
-
-// src/session/db/message-repo.ts
-var _insertMsgStmt = null;
-var _addPromptHistoryStmt = null;
-var _getPromptHistoryStmt = null;
-function getInsertMsgStmt() {
-  if (!_insertMsgStmt) {
-    _insertMsgStmt = getDb().prepare(`INSERT INTO messages (session_id, payload, turn_index, created_at)
-     VALUES (?, ?, ?, ?)`);
+    renderStatusBar(data);
   }
-  return _insertMsgStmt;
-}
-function getAddPromptHistoryStmt() {
-  if (!_addPromptHistoryStmt) {
-    _addPromptHistoryStmt = getDb().prepare("INSERT INTO prompt_history (text, created_at) VALUES (?, ?)");
+  restoreTerminal() {
+    restoreTerminal();
   }
-  return _addPromptHistoryStmt;
 }
-function getPromptHistoryStmt() {
-  if (!_getPromptHistoryStmt) {
-    _getPromptHistoryStmt = getDb().prepare("SELECT text FROM prompt_history ORDER BY id DESC LIMIT ?");
+
+// src/cli/skills.ts
+var MAX_FRONTMATTER_BYTES = 64 * 1024;
+var SKILL_NAME_RE = /^[a-z0-9]+(?:-[a-z0-9]+)*$/;
+var MAX_SKILL_NAME_LENGTH = 64;
+var warnedInvalidSkills = new Set;
+var warnedSkillIssues = new Set;
+function parseSkillFrontmatter(filePath) {
+  let fd = null;
+  try {
+    fd = openSync(filePath, "r");
+    const chunk = Buffer.allocUnsafe(MAX_FRONTMATTER_BYTES);
+    const bytesRead = readSync(fd, chunk, 0, MAX_FRONTMATTER_BYTES, 0);
+    const text = chunk.toString("utf8", 0, bytesRead);
+    const { meta } = parseFrontmatter(text);
+    const result = {};
+    if (typeof meta.name === "string" && meta.name)
+      result.name = meta.name;
+    if (typeof meta.description === "string" && meta.description)
+      result.description = meta.description;
+    if (typeof meta.context === "string" && meta.context)
+      result.context = meta.context;
+    if (typeof meta.compatibility === "string" && meta.compatibility)
+      result.compatibility = meta.compatibility;
+    return result;
+  } catch {
+    return {};
+  } finally {
+    if (fd !== null)
+      closeSync(fd);
   }
-  return _getPromptHistoryStmt;
-}
-function saveMessages(sessionId, msgs, turnIndex = 0) {
-  const db = getDb();
-  const stmt = getInsertMsgStmt();
-  const now = Date.now();
-  db.transaction(() => {
-    for (const msg of msgs) {
-      stmt.run(sessionId, JSON.stringify(msg), turnIndex, now);
-    }
-  })();
-}
-function getMaxTurnIndex(sessionId) {
-  const row = getDb().query("SELECT MAX(turn_index) AS max_turn FROM messages WHERE session_id = ?").get(sessionId);
-  return row?.max_turn ?? -1;
-}
-function deleteLastTurn(sessionId, turnIndex) {
-  const target = turnIndex !== undefined ? turnIndex : getMaxTurnIndex(sessionId);
-  if (target < 0)
-    return false;
-  getDb().run("DELETE FROM messages WHERE session_id = ? AND turn_index = ?", [
-    sessionId,
-    target
-  ]);
-  return true;
 }
-function loadMessages(sessionId) {
-  const rows = getDb().query("SELECT payload, id FROM messages WHERE session_id = ? ORDER BY id ASC").all(sessionId);
-  const messages = [];
-  for (const row of rows) {
-    try {
-      messages.push(JSON.parse(row.payload));
-    } catch (_err) {
-      renderError(new Error(`Failed to parse message ID ${row.id} for session ${sessionId}`));
-    }
+function getCandidateFrontmatter(candidate) {
+  if (!candidate.frontmatter) {
+    candidate.frontmatter = parseSkillFrontmatter(candidate.filePath);
   }
-  return messages;
-}
-function addPromptHistory(text) {
-  const trimmed = text.trim();
-  if (!trimmed)
-    return;
-  getAddPromptHistoryStmt().run(trimmed, Date.now());
+  return candidate.frontmatter;
 }
-function getPromptHistory(limit = 200) {
-  const rows = getPromptHistoryStmt().all(limit);
-  return rows.map((r) => r.text).reverse();
+function candidateConflictName(candidate) {
+  return getCandidateFrontmatter(candidate).name?.trim() || candidate.folderName;
 }
-// src/session/db/session-repo.ts
-function createSession(opts) {
-  const db = getDb();
-  const now = Date.now();
-  db.run(`INSERT INTO sessions (id, title, cwd, model, created_at, updated_at)
-     VALUES (?, ?, ?, ?, ?, ?)`, [opts.id, opts.title ?? "", opts.cwd, opts.model, now, now]);
-  const session = getSession(opts.id);
-  if (!session) {
-    throw new Error(`Failed to create session ${opts.id}`);
+function findGitBoundary(cwd) {
+  let current = resolve2(cwd);
+  while (true) {
+    if (existsSync3(join3(current, ".git")))
+      return current;
+    const parent = dirname2(current);
+    if (parent === current)
+      return null;
+    current = parent;
   }
-  return session;
-}
-function getSession(id) {
-  return getDb().query("SELECT * FROM sessions WHERE id = ?").get(id) ?? null;
-}
-function touchSession(id, model) {
-  getDb().run("UPDATE sessions SET updated_at = ?, model = ? WHERE id = ?", [
-    Date.now(),
-    model,
-    id
-  ]);
-}
-function setSessionTitle(id, title) {
-  getDb().run("UPDATE sessions SET title = ? WHERE id = ? AND title = ''", [
-    title,
-    id
-  ]);
-}
-function listSessions(limit = 20) {
-  return getDb().query("SELECT * FROM sessions ORDER BY updated_at DESC LIMIT ?").all(limit);
-}
-function generateSessionId() {
-  const ts = Date.now().toString(36);
-  const rand = Math.random().toString(36).slice(2, 7);
-  return `${ts}-${rand}`;
-}
-// src/session/db/settings-repo.ts
-function getSetting(key) {
-  const row = getDb().query("SELECT value FROM settings WHERE key = ?").get(key);
-  return row?.value ?? null;
-}
-function setSetting(key, value) {
-  getDb().run(`INSERT INTO settings (key, value) VALUES (?, ?)
-     ON CONFLICT(key) DO UPDATE SET value = excluded.value`, [key, value]);
 }
-function parseBooleanSetting(value, fallback) {
-  if (value === null)
-    return fallback;
-  const normalized = value.trim().toLowerCase();
-  if (normalized === "true" || normalized === "on" || normalized === "1") {
-    return true;
-  }
-  if (normalized === "false" || normalized === "off" || normalized === "0") {
-    return false;
+function localSearchRoots(cwd) {
+  const start = resolve2(cwd);
+  const stop = findGitBoundary(start);
+  if (!stop)
+    return [start];
+  const roots = [];
+  let current = start;
+  while (true) {
+    roots.push(current);
+    if (current === stop)
+      break;
+    const parent = dirname2(current);
+    if (parent === current)
+      break;
+    current = parent;
   }
-  return fallback;
-}
-function getPreferredModel() {
-  return getSetting("preferred_model");
-}
-function setPreferredModel(model) {
-  setSetting("preferred_model", model);
-}
-function getPreferredThinkingEffort() {
-  const v = getSetting("preferred_thinking_effort");
-  if (v === "low" || v === "medium" || v === "high" || v === "xhigh")
-    return v;
-  return null;
+  return roots;
 }
-function setPreferredThinkingEffort(effort) {
-  if (effort === null) {
-    getDb().run("DELETE FROM settings WHERE key = 'preferred_thinking_effort'");
-  } else {
-    setSetting("preferred_thinking_effort", effort);
+var MAX_SKILL_SCAN_DEPTH = 5;
+var MAX_SKILL_DIRS_SCANNED = 2000;
+function listSkillCandidates(skillsDir, source, rootPath) {
+  if (!existsSync3(skillsDir))
+    return [];
+  const candidates = [];
+  let dirsScanned = 0;
+  function walk(dir, depth) {
+    if (depth > MAX_SKILL_SCAN_DEPTH || dirsScanned >= MAX_SKILL_DIRS_SCANNED)
+      return;
+    let entries;
+    try {
+      entries = readdirSync(dir).sort((a, b) => a.localeCompare(b));
+    } catch {
+      return;
+    }
+    for (const entry of entries) {
+      if (dirsScanned >= MAX_SKILL_DIRS_SCANNED)
+        return;
+      const entryPath = join3(dir, entry);
+      try {
+        if (!statSync(entryPath).isDirectory())
+          continue;
+      } catch {
+        continue;
+      }
+      dirsScanned++;
+      const filePath = join3(entryPath, "SKILL.md");
+      if (existsSync3(filePath)) {
+        candidates.push({
+          folderName: entry,
+          filePath,
+          rootPath,
+          source
+        });
+      } else {
+        walk(entryPath, depth + 1);
+      }
+    }
   }
+  walk(skillsDir, 1);
+  return candidates;
 }
-function getPreferredShowReasoning() {
-  return parseBooleanSetting(getSetting("preferred_show_reasoning"), false);
-}
-function setPreferredShowReasoning(show) {
-  setSetting("preferred_show_reasoning", show ? "true" : "false");
-}
-function getPreferredVerboseOutput() {
-  return parseBooleanSetting(getSetting("preferred_verbose_output"), false);
-}
-function setPreferredVerboseOutput(verbose) {
-  setSetting("preferred_verbose_output", verbose ? "true" : "false");
-}
-// src/agent/session-runner.ts
-import * as c10 from "yoctocolors";
-
-// src/cli/input.ts
-import * as c8 from "yoctocolors";
-
-// src/cli/input-buffer.ts
-var PASTE_TOKEN_START = 57344;
-var PASTE_TOKEN_END = 63743;
-function createPasteToken(buf, pasteTokens) {
-  for (let code = PASTE_TOKEN_START;code <= PASTE_TOKEN_END; code++) {
-    const token = String.fromCharCode(code);
-    if (!buf.includes(token) && !pasteTokens.has(token))
-      return token;
-  }
-  throw new Error("Too many pasted chunks in a single prompt");
+function warnInvalidSkill(filePath, reason) {
+  const key = `${filePath}:${reason}`;
+  if (warnedInvalidSkills.has(key))
+    return;
+  warnedInvalidSkills.add(key);
+  writeln(`${G.warn} skipping invalid skill ${filePath}: ${reason}`);
 }
-function pasteLabel(text) {
-  const lines = text.split(`
-`);
-  const first = lines[0] ?? "";
-  const preview = first.length > 40 ? `${first.slice(0, 40)}\u2026` : first;
-  const extra = lines.length - 1;
-  const more = extra > 0 ? ` +${extra} more line${extra === 1 ? "" : "s"}` : "";
-  return `[pasted: "${preview}"${more}]`;
+function warnSkillIssue(filePath, reason) {
+  const key = `${filePath}:${reason}`;
+  if (warnedSkillIssues.has(key))
+    return;
+  warnedSkillIssues.add(key);
+  writeln(`${G.warn} skill ${filePath}: ${reason}`);
 }
-function processInputBuffer(buf, pasteTokens, replacer) {
-  let out = "";
-  for (let i = 0;i < buf.length; i++) {
-    const ch = buf[i] ?? "";
-    out += replacer(ch, pasteTokens.get(ch));
+function warnConventionConflicts(kind, scope, agentsNames, claudeNames) {
+  const agents = new Set(agentsNames);
+  const claude = new Set(claudeNames);
+  const conflicts = [];
+  for (const name of agents) {
+    if (claude.has(name))
+      conflicts.push(name);
   }
-  return out;
+  if (conflicts.length === 0)
+    return;
+  conflicts.sort((a, b) => a.localeCompare(b));
+  const list = conflicts.map((n) => c7.cyan(n)).join(c7.dim(", "));
+  writeln(`${G.warn} conflicting ${kind} in ${scope} .agents and .claude: ${list} ${c7.dim("\u2014 using .agents version")}`);
 }
-function renderInputBuffer(buf, pasteTokens) {
-  return processInputBuffer(buf, pasteTokens, (ch, pasted) => pasted ? pasteLabel(pasted) : ch);
+function validateSkill(candidate) {
+  const meta = getCandidateFrontmatter(candidate);
+  const name = meta.name?.trim();
+  const description = meta.description?.trim();
+  if (!name) {
+    warnInvalidSkill(candidate.filePath, "frontmatter field `name` is required");
+    return null;
+  }
+  if (!description) {
+    warnInvalidSkill(candidate.filePath, "frontmatter field `description` is required");
+    return null;
+  }
+  if (name.length > MAX_SKILL_NAME_LENGTH) {
+    warnSkillIssue(candidate.filePath, `name exceeds ${MAX_SKILL_NAME_LENGTH} characters`);
+  }
+  if (!SKILL_NAME_RE.test(name)) {
+    warnSkillIssue(candidate.filePath, "name does not match lowercase alnum + hyphen format");
+  }
+  return {
+    name,
+    description,
+    source: candidate.source,
+    rootPath: candidate.rootPath,
+    filePath: candidate.filePath,
+    ...meta.context === "fork" && { context: "fork" },
+    ...meta.compatibility && { compatibility: meta.compatibility }
+  };
 }
-function expandInputBuffer(buf, pasteTokens) {
-  return processInputBuffer(buf, pasteTokens, (ch, pasted) => pasted ?? ch);
+function allSkillCandidates(cwd, homeDir) {
+  const home = homeDir ?? homedir4();
+  const localRootsNearToFar = localSearchRoots(cwd);
+  const ordered = [];
+  const globalClaude = listSkillCandidates(join3(home, ".claude", "skills"), "global", home);
+  const globalAgents = listSkillCandidates(join3(home, ".agents", "skills"), "global", home);
+  warnConventionConflicts("skills", "global", globalAgents.map((skill) => candidateConflictName(skill)), globalClaude.map((skill) => candidateConflictName(skill)));
+  ordered.push(...globalClaude, ...globalAgents);
+  for (const root of [...localRootsNearToFar].reverse()) {
+    const localClaude = listSkillCandidates(join3(root, ".claude", "skills"), "local", root);
+    const localAgents = listSkillCandidates(join3(root, ".agents", "skills"), "local", root);
+    warnConventionConflicts("skills", "local", localAgents.map((skill) => candidateConflictName(skill)), localClaude.map((skill) => candidateConflictName(skill)));
+    ordered.push(...localClaude, ...localAgents);
+  }
+  return ordered;
 }
-function pruneInputPasteTokens(pasteTokens, ...buffers) {
-  const referenced = buffers.join("");
-  const next = new Map;
-  for (const [token, text] of pasteTokens) {
-    if (referenced.includes(token))
-      next.set(token, text);
+function loadSkillsIndex(cwd, homeDir) {
+  const index = new Map;
+  for (const candidate of allSkillCandidates(cwd, homeDir)) {
+    const skill = validateSkill(candidate);
+    if (!skill)
+      continue;
+    index.set(skill.name, skill);
   }
-  return next;
+  return index;
 }
-function getVisualCursor(buf, cursor, pasteTokens) {
-  let visual = 0;
-  for (let i = 0;i < Math.min(cursor, buf.length); i++) {
-    const ch = buf[i] ?? "";
-    const pasted = pasteTokens.get(ch);
-    visual += pasted ? pasteLabel(pasted).length : 1;
+var MAX_RESOURCE_LISTING = 50;
+function listSkillResources(skillDir) {
+  const resources = [];
+  function walk(dir, prefix) {
+    let entries;
+    try {
+      entries = readdirSync(dir);
+    } catch {
+      return;
+    }
+    for (const entry of entries) {
+      if (resources.length >= MAX_RESOURCE_LISTING)
+        return;
+      if (entry === "SKILL.md")
+        continue;
+      const full = join3(dir, entry);
+      const rel = prefix ? `${prefix}/${entry}` : entry;
+      try {
+        if (statSync(full).isDirectory()) {
+          walk(full, rel);
+        } else {
+          resources.push(rel);
+        }
+      } catch {}
+    }
   }
-  return visual;
+  walk(skillDir, "");
+  return resources;
 }
-function buildPromptDisplay(text, cursor, maxLen) {
-  const clampedCursor = Math.max(0, Math.min(cursor, text.length));
-  if (maxLen <= 0)
-    return { display: "", cursor: 0 };
-  if (text.length <= maxLen)
-    return { display: text, cursor: clampedCursor };
-  let start = Math.max(0, clampedCursor - maxLen);
-  const end = Math.min(text.length, start + maxLen);
-  if (end - start < maxLen)
-    start = Math.max(0, end - maxLen);
-  let display = text.slice(start, end);
-  if (start > 0 && display.length > 0)
-    display = `\u2026${display.slice(1)}`;
-  if (end < text.length && display.length > 0)
-    display = `${display.slice(0, -1)}\u2026`;
-  return {
-    display,
-    cursor: Math.min(clampedCursor - start, display.length)
-  };
+function loadSkillContentFromMeta(skill) {
+  try {
+    const content = readFileSync2(skill.filePath, "utf-8");
+    const skillDir = dirname2(skill.filePath);
+    return {
+      name: skill.name,
+      description: skill.description,
+      content,
+      source: skill.source,
+      skillDir,
+      resources: listSkillResources(skillDir)
+    };
+  } catch {
+    return null;
+  }
+}
+function loadSkillContent(name, cwd, homeDir) {
+  const skill = loadSkillsIndex(cwd, homeDir).get(name);
+  if (!skill)
+    return null;
+  return loadSkillContentFromMeta(skill);
 }
 
 // src/cli/completions.ts
-import { join as join4, relative } from "path";
 var BUILTIN_COMMANDS = [
   "model",
   "models",
@@ -5514,82 +5647,57 @@ var readSkillTool = {
 
 // src/agent/system-prompt.ts
 import { homedir as homedir5 } from "os";
-var AUTONOMY = `
-
-# Autonomy
-- Begin work immediately using tools. Gather context, implement, and verify \u2014 do not ask for permission to start.
-- Carry changes through to completion. If blocked, summarise what is preventing progress instead of looping.
-- Verify facts by inspecting files or running commands \u2014 never guess unknown state.`;
-var SAFETY = `
-
-# Safety
-- Never expose, print, or commit secrets, tokens, or keys.
-- Never invent URLs \u2014 only use URLs the user provided or that exist in project files.
-- Never revert user-authored changes unless explicitly asked. This includes \`git checkout\`, \`git restore\`, \`git stash\`, or any command that discards uncommitted work \u2014 even to "separate concerns" across commits.
-- Before any destructive or irreversible action (deleting data, force-pushing, resetting history), ask one targeted confirmation question \u2014 mistakes here are unrecoverable.
-- If files you are editing change unexpectedly, pause and ask how to proceed.`;
-var COMMUNICATION = `
-
-# Communication
-- Be concise: short bullets or a brief paragraph. No ceremonial preambles.
-- For long tasks, send a one-sentence progress update every 3-5 tool calls.
-- For code changes, state what changed, where, and why. Reference files with line numbers.
-- Do not paste large file contents unless asked.`;
-var ERROR_HANDLING = `
-
-# Error handling
-- On tool failure: read the error, adjust your approach, and retry once. If it fails again, explain the blocker to the user.
-- If you find yourself re-reading or re-editing the same files without progress, stop and summarise what is blocking you.`;
 function buildSystemPrompt(sessionTimeAnchor, cwd, homeDir) {
   const globalContext = loadGlobalContextFile(homeDir ?? homedir5());
   const localContext = loadLocalContextFile(cwd);
   const cwdDisplay = tildePath(cwd);
-  let prompt = `You are mini-coder, a small and fast CLI coding agent.
-You have access to shell, listSkills, readSkill, connected MCP tools, and optional web tools.
+  let prompt = `You are using mini-coder, a small and fast CLI coding agent harness.
 
 Current working directory: ${cwdDisplay}
 Current date/time: ${sessionTimeAnchor}
 
-Guidelines:
-- You are a capable senior engineer. Proactively gather context and implement \u2014 work the problem, not just the symptom. Prefer root-cause fixes over patches.
-- Inspect code and files primarily through shell commands. Use temp files for large content to avoid filling your context window.
-- For file edits, invoke \`mc-edit\` via shell. Prefer small, targeted edits over full rewrites so diffs stay reviewable.
-- Make parallel tool calls when the lookups are independent \u2014 this speeds up multi-file investigation.
-- Before starting work, scan the skills list below. If there is even a small chance a skill applies to your task, load it with \`readSkill\` and follow its instructions before writing code or responding. Skills are mandatory when they match \u2014 not optional references.
-- Keep it simple: DRY, KISS, YAGNI. Avoid unnecessary complexity.
-- Apply Rob Pike's 5 Rules of Programming:
+# Guidelines:
+- Act like am experienced senior engineer. Proactively gather context and implement \u2014 work the problem, not just the symptom. Prefer root-cause fixes over patches and avoid hacks and over-engineering.
+- Inspect code and files primarily through shell commands. Always prefer \`mc-edit\` command via shell tool for file edits.
+- Always apply DRY, KISS, and YAGNI.
+- Always apply Rob Pike's 5 Rules of Programming:
   1. You can't tell where a program is going to spend its time. Bottlenecks occur in surprising places, so don't try to second guess and put in a speed hack until you've proven that's where the bottleneck is.
   2. Measure. Don't tune for speed until you've measured, and even then don't unless one part of the code overwhelms the rest.
   3. Fancy algorithms are slow when n is small, and n is usually small. Fancy algorithms have big constants. Until you know that n is frequently going to be big, don't get fancy. (Even if n does get big, use Rule 2 first.)
   4. Fancy algorithms are buggier than simple ones, and they're much harder to implement. Use simple algorithms as well as simple data structures.
   5. Data dominates. If you've chosen the right data structures and organized things well, the algorithms will almost always be self-evident. Data structures, not algorithms, are central to programming.
 
+## Autonomy
+- Begin work immediately using tools. Gather context, implement, and verify \u2014 do not ask for permission to start.
+- Carry changes through to completion. If blocked, summarise what is preventing progress instead of looping
+
+## Safety
+- Never expose, print, or commit secrets, tokens, or keys.
+- Never invent URLs \u2014 only use URLs the user provided or that exist in project files.
+- Verify facts by inspecting files, running commands, and checking online \u2014 never guess unknown state, never make assumptions
+- Never revert user-authored changes unless explicitly asked. This includes \`git checkout\`, \`git restore\`, \`git stash\`, or any command that discards uncommitted work \u2014 even to "separate concerns" across commits.
+- Before any destructive or irreversible action (deleting data, force-pushing, resetting history), ask one targeted confirmation question \u2014 mistakes here are unrecoverable.
+- If files you are editing change unexpectedly, pause and ask how to proceed.
+
+## Communication
+- Be concise: short bullets or a brief paragraph. No ceremonial preambles.
+- For code changes, state what changed, where, and why.
+- Do not paste large file contents unless asked.
+
+## Error handling
+- On tool failure: read the error, adjust your approach, and retry once. If it fails again, explain the blocker to the user.
+- If you find yourself re-reading or re-editing the same files without progress, stop and summarise what is blocking you.
+
 # File editing with mc-edit
 \`mc-edit\` applies one exact-text replacement per invocation. It fails deterministically if the old text is missing or matches more than once.
 
 Usage: mc-edit <path> (--old <text> | --old-file <path>) [--new <text> | --new-file <path>] [--cwd <path>]
 - Omit --new / --new-file to delete the matched text.
 - To create new files, use shell commands (e.g. \`cat > file.txt << 'EOF'\\n...\\nEOF\`).
-`;
-  prompt += AUTONOMY;
-  prompt += SAFETY;
-  prompt += COMMUNICATION;
-  prompt += ERROR_HANDLING;
-  if (globalContext || localContext) {
-    prompt += `
-
-# Project context`;
-    if (globalContext) {
-      prompt += `
-
-${globalContext}`;
-    }
-    if (localContext) {
-      prompt += `
 
-${localContext}`;
-    }
-  }
+# Subagents via mc
+Use the \`mc\` command via the shell tool to instantiate a sub agent with a prompt for their task.
+`;
   const skills = Array.from(loadSkillsIndex(cwd, homeDir).values());
   if (skills.length > 0) {
     prompt += `
@@ -5618,6 +5726,18 @@ ${localContext}`;
     prompt += `
 </available_skills>`;
   }
+  if (globalContext || localContext) {
+    if (globalContext) {
+      prompt += `
+
+${globalContext}`;
+    }
+    if (localContext) {
+      prompt += `
+
+${localContext}`;
+    }
+  }
   return prompt;
 }
 
@@ -5656,6 +5776,7 @@ class SessionRunner {
   totalOut = 0;
   lastContextTokens = 0;
   _systemPrompt;
+  onTeardown;
   constructor(opts) {
     this.cwd = opts.cwd;
     this.reporter = opts.reporter;
@@ -5665,6 +5786,7 @@ class SessionRunner {
     this.currentThinkingEffort = opts.initialThinkingEffort;
     this.showReasoning = opts.initialShowReasoning;
     this.verboseOutput = opts.initialVerboseOutput;
+    this.onTeardown = opts.onTeardown;
     this.initSession(opts.sessionId);
   }
   getStatusInfo() {
@@ -5681,8 +5803,7 @@ class SessionRunner {
     if (sessionId) {
       const resumed = resumeSession(sessionId);
       if (!resumed) {
-        this.reporter.error(`Session "${sessionId}" not found.`);
-        process.exit(1);
+        throw new Error(`Session "${sessionId}" not found.`);
       }
       this.session = resumed;
       this.currentModel = this.session.model;
@@ -5713,6 +5834,7 @@ class SessionRunner {
     this.session = resumed;
     this.currentModel = resumed.model;
     this.coreHistory = [...resumed.messages];
+    resetActivatedSkills();
     this.turnIndex = getMaxTurnIndex(resumed.id) + 1;
     this.totalIn = 0;
     this.totalOut = 0;
@@ -5721,6 +5843,9 @@ class SessionRunner {
     this.rebuildSystemPrompt();
     return true;
   }
+  async teardown() {
+    await this.onTeardown?.();
+  }
   addShellContext(command, output) {
     const thisTurn = this.turnIndex++;
     const msg = {
@@ -6087,7 +6212,8 @@ async function initAgent(opts) {
   const cwd = opts.cwd;
   const tools = buildToolSet2({ cwd });
   const mcpTools = [];
-  async function connectAndAddMcp(name) {
+  const mcpClients = new McpClientRegistry;
+  async function connectMcpClient(name) {
     const rows = listMcpServers();
     const row = rows.find((r) => r.name === name);
     if (!row)
@@ -6100,10 +6226,26 @@ async function initAgent(opts) {
       ...row.args ? { args: JSON.parse(row.args) } : {},
       ...row.env ? { env: JSON.parse(row.env) } : {}
     };
-    const client = await connectMcpServer(cfg);
+    return connectMcpServer(cfg);
+  }
+  async function connectAndAddMcp(name) {
+    const client = await connectMcpClient(name);
+    mcpClients.add(client);
     tools.push(...client.tools);
     mcpTools.push(...client.tools);
   }
+  async function reconnectConfiguredMcpServers() {
+    await reconnectMcpTools({
+      tools,
+      mcpTools,
+      clients: mcpClients,
+      names: listMcpServers().map((row) => row.name),
+      connectByName: connectMcpClient,
+      onError: (name, error) => {
+        opts.reporter.error(`MCP: failed to connect ${name}: ${String(error)}`);
+      }
+    });
+  }
   for (const row of listMcpServers()) {
     try {
       await connectAndAddMcp(row.name);
@@ -6121,7 +6263,8 @@ async function initAgent(opts) {
     initialThinkingEffort: opts.initialThinkingEffort,
     initialShowReasoning: opts.initialShowReasoning,
     initialVerboseOutput: opts.initialVerboseOutput,
-    sessionId: opts.sessionId
+    sessionId: opts.sessionId,
+    onTeardown: () => mcpClients.closeAll()
   });
   const cmdCtx = {
     get currentModel() {
@@ -6158,12 +6301,48 @@ async function initAgent(opts) {
     connectMcpServer: connectAndAddMcp,
     startSpinner: (label) => opts.reporter.startSpinner(label),
     stopSpinner: () => opts.reporter.stopSpinner(),
-    startNewSession: () => runner.startNewSession(),
-    switchSession: (id) => runner.switchSession(id)
+    startNewSession: async () => {
+      runner.startNewSession();
+      await reconnectConfiguredMcpServers();
+    },
+    switchSession: async (id) => {
+      const switched = runner.switchSession(id);
+      if (!switched)
+        return false;
+      await reconnectConfiguredMcpServers();
+      return true;
+    }
   };
   return { runner, cmdCtx };
 }
 
+// src/agent/run-with-teardown.ts
+async function runWithTeardown(opts) {
+  let hasPrimaryError = false;
+  let primaryError;
+  let result;
+  try {
+    result = await opts.run();
+  } catch (error) {
+    hasPrimaryError = true;
+    if (error instanceof RenderedError) {
+      primaryError = error;
+    } else {
+      opts.renderError(error);
+      primaryError = new RenderedError(error);
+    }
+  }
+  try {
+    await opts.teardown?.();
+  } catch (teardownError) {
+    if (!hasPrimaryError)
+      throw teardownError;
+  }
+  if (hasPrimaryError)
+    throw primaryError;
+  return result;
+}
+
 // src/cli/args.ts
 import * as c12 from "yoctocolors";
 function parseArgs(argv) {
@@ -6315,6 +6494,7 @@ function renderHelpCommand(ctx) {
   writeln(`  ${c13.dim("model + context")}`);
   renderEntries([
     ["/model [id]", "list or switch models"],
+    ["/models [id]", "alias for /model"],
     ["/reasoning [on|off]", "toggle reasoning display"],
     ["/verbose [on|off]", "toggle output truncation"],
     ["/mcp list", "list MCP servers"],
@@ -6659,7 +6839,7 @@ async function handleSessionCommand(ctx, args) {
   const id = args.trim();
   if (id) {
     ctx.startSpinner("switching session");
-    const ok2 = ctx.switchSession(id);
+    const ok2 = await ctx.switchSession(id);
     ctx.stopSpinner();
     if (ok2) {
       writeln(`${PREFIX.success} switched to session ${c17.cyan(id)} (${c17.cyan(ctx.currentModel)})`);
@@ -6693,7 +6873,7 @@ async function handleSessionCommand(ctx, args) {
   }
   if (!picked)
     return;
-  const ok = ctx.switchSession(picked);
+  const ok = await ctx.switchSession(picked);
   if (ok) {
     writeln(`${PREFIX.success} switched to session ${c17.cyan(picked)} (${c17.cyan(ctx.currentModel)})`);
   } else {
@@ -6715,10 +6895,10 @@ async function handleUndo(ctx) {
     ctx.stopSpinner();
   }
 }
-function handleNew(ctx) {
-  ctx.startNewSession();
+async function handleNew(ctx) {
+  await ctx.startNewSession();
   process.stdout.write("\x1B[2J\x1B[H");
-  renderBanner(ctx.currentModel, ctx.cwd);
+  await renderBanner(ctx.currentModel, ctx.cwd);
 }
 async function handleCommand(command, args, ctx) {
   switch (command.toLowerCase()) {
@@ -6749,7 +6929,7 @@ async function handleCommand(command, args, ctx) {
       await handleSessionCommand(ctx, args);
       return { type: "handled" };
     case "new":
-      handleNew(ctx);
+      await handleNew(ctx);
       return { type: "handled" };
     case "help":
     case "?":
@@ -6998,7 +7178,6 @@ globalThis.AI_SDK_LOG_WARNINGS = false;
 registerTerminalCleanup();
 initModelInfoCache();
 pruneOldData();
-refreshModelInfoInBackground().catch(() => {});
 function buildAgentOptions(opts) {
   return {
     model: opts.model,
@@ -7038,38 +7217,47 @@ async function main() {
     sessionId = args.sessionId;
   }
   const model = args.model ?? getPreferredModel() ?? autoDiscoverModel();
+  const connectedProviders = prompt ? undefined : await discoverConnectedProviders();
+  const startupLocalProviders = connectedProviders ? getLocalProviderNames(connectedProviders) : undefined;
+  refreshModelInfoInBackground(startupLocalProviders ? { localProviders: startupLocalProviders } : undefined).catch(() => {});
   if (!prompt) {
-    renderBanner(model, args.cwd);
+    await renderBanner(model, args.cwd, connectedProviders);
   }
-  try {
-    const oneShot = !!prompt;
-    const agentOpts = buildAgentOptions({
-      model,
-      cwd: args.cwd,
-      reporter: new CliReporter(oneShot),
-      sessionId
-    });
-    const { runner, cmdCtx } = await initAgent(agentOpts);
-    if (oneShot) {
-      const { text: resolvedText, images: refImages } = await resolveFileRefs(prompt, args.cwd);
-      const responseText = await runner.processUserInput(resolvedText, refImages);
-      if (responseText) {
-        writeln(responseText.trimStart());
+  let runner = null;
+  const oneShot = !!prompt;
+  const agentOpts = buildAgentOptions({
+    model,
+    cwd: args.cwd,
+    reporter: new CliReporter(oneShot),
+    sessionId
+  });
+  await runWithTeardown({
+    run: async () => {
+      const init = await initAgent(agentOpts);
+      runner = init.runner;
+      const { cmdCtx } = init;
+      if (oneShot) {
+        const { text: resolvedText, images: refImages } = await resolveFileRefs(prompt, args.cwd);
+        const responseText = await runner.processUserInput(resolvedText, refImages);
+        if (responseText) {
+          writeln(responseText.trimStart());
+        }
+        return;
+      }
+      await runInputLoop({
+        cwd: args.cwd,
+        reporter: agentOpts.reporter,
+        cmdCtx,
+        runner
+      });
+    },
+    teardown: () => runner?.teardown() ?? Promise.resolve(),
+    renderError: (err) => {
+      if (!(err instanceof RenderedError)) {
+        renderError(err, "agent");
       }
-      return;
-    }
-    await runInputLoop({
-      cwd: args.cwd,
-      reporter: agentOpts.reporter,
-      cmdCtx,
-      runner
-    });
-  } catch (err) {
-    if (!(err instanceof RenderedError)) {
-      renderError(err, "agent");
     }
-    process.exit(1);
-  }
+  });
 }
 main().then(() => process.exit(0), (err) => {
   if (!(err instanceof RenderedError)) {