claudish 6.0.1 → 6.1.1

package/dist/index.js

@@ -28505,14 +28505,7 @@ async function runModels(sessionPath, opts = {}) {
     const outputPath = join(sessionPath, `response-${anonId}.md`);
     const errorLogPath = join(sessionPath, "errors", `${anonId}.log`);
     const workDir = join(sessionPath, "work", anonId);
-    const args = [
-      "--model",
-      entry.model,
-      "-y",
-      "--stdin",
-      "--quiet",
-      ...opts.claudeFlags ?? []
-    ];
+    const args = ["--model", entry.model, "-y", "--stdin", "--quiet", ...opts.claudeFlags ?? []];
     updateModelStatus(anonId, {
       state: "RUNNING",
       startedAt: new Date().toISOString()
@@ -29243,31 +29236,52 @@ Use with: run_prompt(model="${results[0].model.id}", prompt="your prompt")`;
           signal: AbortSignal.timeout(5000)
         });
         if (response.ok) {
-          return { content: [{ type: "text", text: `Error report sent successfully.
+          return {
+            content: [
+              {
+                type: "text",
+                text: `Error report sent successfully.
 
 **Sanitized data sent:**
 \`\`\`json
 ${reportSummary}
-\`\`\`${autoSendHint}` }] };
+\`\`\`${autoSendHint}`
+              }
+            ]
+          };
         } else {
-          return { content: [{ type: "text", text: `Error report endpoint returned ${response.status}. Report was NOT sent.
+          return {
+            content: [
+              {
+                type: "text",
+                text: `Error report endpoint returned ${response.status}. Report was NOT sent.
 
 **Data that would have been sent (all sanitized):**
 \`\`\`json
 ${reportSummary}
 \`\`\`
 
-You can manually report this at https://github.com/anthropics/claudish/issues${autoSendHint}` }] };
+You can manually report this at https://github.com/anthropics/claudish/issues${autoSendHint}`
+              }
+            ]
+          };
         }
       } catch (err) {
-        return { content: [{ type: "text", text: `Could not reach error reporting endpoint (${err instanceof Error ? err.message : "network error"}).
+        return {
+          content: [
+            {
+              type: "text",
+              text: `Could not reach error reporting endpoint (${err instanceof Error ? err.message : "network error"}).
 
 **Sanitized error data (for manual reporting):**
 \`\`\`json
 ${reportSummary}
 \`\`\`
 
-Report manually at https://github.com/anthropics/claudish/issues${autoSendHint}` }] };
+Report manually at https://github.com/anthropics/claudish/issues${autoSendHint}`
+            }
+          ]
+        };
       }
     });
   }
@@ -30641,6 +30655,36 @@ function fuzzyScore2(text, query) {
 }
 
 // src/profile-config.ts
+var exports_profile_config = {};
+__export(exports_profile_config, {
+  setProfile: () => setProfile,
+  setEndpoint: () => setEndpoint,
+  setDefaultProfile: () => setDefaultProfile,
+  setApiKey: () => setApiKey,
+  saveLocalConfig: () => saveLocalConfig,
+  saveConfig: () => saveConfig,
+  removeEndpoint: () => removeEndpoint,
+  removeApiKey: () => removeApiKey,
+  localConfigExists: () => localConfigExists,
+  loadLocalConfig: () => loadLocalConfig,
+  loadConfig: () => loadConfig,
+  listProfiles: () => listProfiles,
+  listAllProfiles: () => listAllProfiles,
+  isProjectDirectory: () => isProjectDirectory,
+  getProfileNames: () => getProfileNames,
+  getProfile: () => getProfile,
+  getModelMapping: () => getModelMapping,
+  getLocalConfigPath: () => getLocalConfigPath,
+  getEndpoint: () => getEndpoint,
+  getDefaultProfile: () => getDefaultProfile,
+  getConfigPathForScope: () => getConfigPathForScope,
+  getConfigPath: () => getConfigPath,
+  getApiKey: () => getApiKey,
+  deleteProfile: () => deleteProfile,
+  createProfile: () => createProfile,
+  configExistsForScope: () => configExistsForScope,
+  configExists: () => configExists
+});
 import { existsSync as existsSync7, mkdirSync as mkdirSync5, readFileSync as readFileSync6, writeFileSync as writeFileSync5 } from "fs";
 import { homedir as homedir6 } from "os";
 import { join as join7 } from "path";
@@ -30877,6 +30921,13 @@ function createProfile(name, models, description, scope = "global") {
   setProfile(profile, scope);
   return profile;
 }
+function listProfiles() {
+  const config3 = loadConfig();
+  return Object.values(config3.profiles).map((profile) => ({
+    ...profile,
+    isDefault: profile.name === config3.defaultProfile
+  }));
+}
 function listAllProfiles() {
   const globalConfig2 = loadConfig();
   const localConfig = loadLocalConfig();
@@ -30901,6 +30952,10 @@ function listAllProfiles() {
   }
   return result;
 }
+function getApiKey(envVar) {
+  const config3 = loadConfig();
+  return config3.apiKeys?.[envVar];
+}
 function setApiKey(envVar, value) {
   const config3 = loadConfig();
   if (!config3.apiKeys)
@@ -30915,6 +30970,10 @@ function removeApiKey(envVar) {
     saveConfig(config3);
   }
 }
+function getEndpoint(name) {
+  const config3 = loadConfig();
+  return config3.endpoints?.[name];
+}
 function setEndpoint(name, value) {
   const config3 = loadConfig();
   if (!config3.endpoints)
@@ -30949,6 +31008,9 @@ var init_profile_config = __esm(() => {
 });
 
 // src/providers/provider-definitions.ts
+import { existsSync as existsSync8 } from "fs";
+import { join as join8 } from "path";
+import { homedir as homedir7 } from "os";
 function ensureProviderByNameCache() {
   if (!_providerByNameCache) {
     _providerByNameCache = new Map;
@@ -31071,6 +31133,29 @@ function getApiKeyEnvVars(providerName) {
     aliases: def.apiKeyAliases
   };
 }
+function isProviderAvailable(def) {
+  if (def.isLocal)
+    return true;
+  if (def.publicKeyFallback)
+    return true;
+  if (!def.apiKeyEnvVar)
+    return true;
+  if (process.env[def.apiKeyEnvVar])
+    return true;
+  if (def.apiKeyAliases) {
+    for (const alias of def.apiKeyAliases) {
+      if (process.env[alias])
+        return true;
+    }
+  }
+  if (def.oauthFallback) {
+    try {
+      if (existsSync8(join8(homedir7(), ".claudish", def.oauthFallback)))
+        return true;
+    } catch {}
+  }
+  return false;
+}
 var BUILTIN_PROVIDERS, _shortcutsCache = null, _legacyPrefixCache = null, _nativeModelPatternsCache = null, _providerByNameCache = null, _localProvidersCache = null;
 var init_provider_definitions = __esm(() => {
   BUILTIN_PROVIDERS = [
@@ -31091,7 +31176,8 @@ var init_provider_definitions = __esm(() => {
         { prefix: "gemini/", stripPrefix: true }
       ],
       nativeModelPatterns: [{ pattern: /^google\//i }, { pattern: /^gemini-/i }],
-      isDirectApi: true
+      isDirectApi: true,
+      description: "Direct Gemini API (g@, google@)"
     },
     {
       name: "gemini-codeassist",
@@ -31105,7 +31191,8 @@ var init_provider_definitions = __esm(() => {
       shortcuts: ["go"],
       shortestPrefix: "go",
       legacyPrefixes: [{ prefix: "go/", stripPrefix: true }],
-      isDirectApi: true
+      isDirectApi: true,
+      description: "Gemini Code Assist OAuth (go@)"
     },
     {
       name: "openai",
@@ -31128,7 +31215,8 @@ var init_provider_definitions = __esm(() => {
         { pattern: /^o3(-|$)/i },
         { pattern: /^chatgpt-/i }
       ],
-      isDirectApi: true
+      isDirectApi: true,
+      description: "Direct OpenAI API (oai@)"
     },
     {
       name: "openrouter",
@@ -31147,6 +31235,26 @@ var init_provider_definitions = __esm(() => {
         "HTTP-Referer": "https://claudish.com",
         "X-Title": "Claudish - OpenRouter Proxy"
       },
+      isDirectApi: true,
+      description: "580+ models, default backend (or@)"
+    },
+    {
+      name: "xai",
+      displayName: "xAI",
+      transport: "openai",
+      tokenStrategy: "delta-aware",
+      baseUrl: "https://api.x.ai",
+      apiPath: "/v1/chat/completions",
+      apiKeyEnvVar: "XAI_API_KEY",
+      apiKeyDescription: "xAI API Key",
+      apiKeyUrl: "https://console.x.ai/",
+      shortcuts: ["xai", "grok"],
+      shortestPrefix: "xai",
+      legacyPrefixes: [{ prefix: "xai/", stripPrefix: true }],
+      nativeModelPatterns: [
+        { pattern: /^x-ai\//i },
+        { pattern: /^grok-/i }
+      ],
       isDirectApi: true
     },
     {
@@ -31171,7 +31279,8 @@ var init_provider_definitions = __esm(() => {
         { pattern: /^minimax-/i },
         { pattern: /^abab-/i }
       ],
-      isDirectApi: true
+      isDirectApi: true,
+      description: "MiniMax API (mm@, mmax@)"
     },
     {
       name: "minimax-coding",
@@ -31187,7 +31296,8 @@ var init_provider_definitions = __esm(() => {
       shortcuts: ["mmc"],
       shortestPrefix: "mmc",
       legacyPrefixes: [{ prefix: "mmc/", stripPrefix: true }],
-      isDirectApi: true
+      isDirectApi: true,
+      description: "MiniMax Coding Plan (mmc@)"
     },
     {
       name: "kimi-coding",
@@ -31203,7 +31313,8 @@ var init_provider_definitions = __esm(() => {
       shortestPrefix: "kc",
       legacyPrefixes: [{ prefix: "kc/", stripPrefix: true }],
       nativeModelPatterns: [{ pattern: /^kimi-for-coding$/i }],
-      isDirectApi: true
+      isDirectApi: true,
+      description: "Kimi Coding Plan (kc@)"
     },
     {
       name: "kimi",
@@ -31227,7 +31338,8 @@ var init_provider_definitions = __esm(() => {
         { pattern: /^moonshot-/i },
         { pattern: /^kimi-/i }
       ],
-      isDirectApi: true
+      isDirectApi: true,
+      description: "Kimi API (kimi@, moon@)"
     },
     {
       name: "glm",
@@ -31252,7 +31364,8 @@ var init_provider_definitions = __esm(() => {
         { pattern: /^glm-/i },
         { pattern: /^chatglm-/i }
       ],
-      isDirectApi: true
+      isDirectApi: true,
+      description: "GLM API (glm@, zhipu@)"
     },
     {
       name: "glm-coding",
@@ -31268,7 +31381,8 @@ var init_provider_definitions = __esm(() => {
       shortcuts: ["gc"],
       shortestPrefix: "gc",
       legacyPrefixes: [{ prefix: "gc/", stripPrefix: true }],
-      isDirectApi: true
+      isDirectApi: true,
+      description: "GLM Coding Plan (gc@)"
     },
     {
       name: "zai",
@@ -31284,7 +31398,8 @@ var init_provider_definitions = __esm(() => {
       shortestPrefix: "zai",
       legacyPrefixes: [{ prefix: "zai/", stripPrefix: true }],
       nativeModelPatterns: [{ pattern: /^z-ai\//i }, { pattern: /^zai\//i }],
-      isDirectApi: true
+      isDirectApi: true,
+      description: "Z.AI API (zai@)"
     },
     {
       name: "ollamacloud",
@@ -31306,7 +31421,8 @@ var init_provider_definitions = __esm(() => {
         { pattern: /^llama-/i },
         { pattern: /^llama3/i }
       ],
-      isDirectApi: true
+      isDirectApi: true,
+      description: "Cloud Ollama (oc@, llama@)"
     },
     {
       name: "opencode-zen",
@@ -31323,7 +31439,8 @@ var init_provider_definitions = __esm(() => {
       shortcuts: ["zen"],
       shortestPrefix: "zen",
       legacyPrefixes: [{ prefix: "zen/", stripPrefix: true }],
-      isDirectApi: true
+      isDirectApi: true,
+      description: "OpenCode Zen (zen@) - free models"
     },
     {
       name: "opencode-zen-go",
@@ -31342,7 +31459,8 @@ var init_provider_definitions = __esm(() => {
         { prefix: "zengo/", stripPrefix: true },
         { prefix: "zgo/", stripPrefix: true }
       ],
-      isDirectApi: true
+      isDirectApi: true,
+      description: "OpenCode Zen Go plan (zengo@)"
     },
     {
       name: "vertex",
@@ -31360,7 +31478,8 @@ var init_provider_definitions = __esm(() => {
         { prefix: "v/", stripPrefix: true },
         { prefix: "vertex/", stripPrefix: true }
       ],
-      isDirectApi: true
+      isDirectApi: true,
+      description: "Vertex AI Express (v@, vertex@)"
     },
     {
       name: "litellm",
@@ -31378,7 +31497,8 @@ var init_provider_definitions = __esm(() => {
         { prefix: "litellm/", stripPrefix: true },
         { prefix: "ll/", stripPrefix: true }
       ],
-      isDirectApi: true
+      isDirectApi: true,
+      description: "LiteLLM proxy (ll@, litellm@)"
     },
     {
       name: "poe",
@@ -31393,7 +31513,8 @@ var init_provider_definitions = __esm(() => {
       shortestPrefix: "poe",
       legacyPrefixes: [],
       nativeModelPatterns: [{ pattern: /^poe:/i }],
-      isDirectApi: true
+      isDirectApi: true,
+      description: "Poe API (poe@)"
     },
     {
       name: "ollama",
@@ -31410,7 +31531,8 @@ var init_provider_definitions = __esm(() => {
         { prefix: "ollama/", stripPrefix: true },
         { prefix: "ollama:", stripPrefix: true }
       ],
-      isLocal: true
+      isLocal: true,
+      description: "Local Ollama (ollama@)"
     },
     {
       name: "lmstudio",
@@ -31429,7 +31551,8 @@ var init_provider_definitions = __esm(() => {
         { prefix: "mlstudio/", stripPrefix: true },
         { prefix: "mlstudio:", stripPrefix: true }
       ],
-      isLocal: true
+      isLocal: true,
+      description: "Local LM Studio (lms@)"
     },
     {
       name: "vllm",
@@ -31446,7 +31569,8 @@ var init_provider_definitions = __esm(() => {
         { prefix: "vllm/", stripPrefix: true },
         { prefix: "vllm:", stripPrefix: true }
       ],
-      isLocal: true
+      isLocal: true,
+      description: "Local vLLM (vllm@)"
     },
     {
       name: "mlx",
@@ -31463,7 +31587,8 @@ var init_provider_definitions = __esm(() => {
         { prefix: "mlx/", stripPrefix: true },
         { prefix: "mlx:", stripPrefix: true }
       ],
-      isLocal: true
+      isLocal: true,
+      description: "Local MLX (mlx@)"
     },
     {
       name: "qwen",
@@ -31477,7 +31602,8 @@ var init_provider_definitions = __esm(() => {
       shortcuts: [],
       shortestPrefix: "qwen",
       legacyPrefixes: [],
-      nativeModelPatterns: [{ pattern: /^qwen/i }]
+      nativeModelPatterns: [{ pattern: /^qwen/i }],
+      description: "Qwen (auto-routed via OpenRouter)"
     },
     {
       name: "native-anthropic",
@@ -31491,7 +31617,8 @@ var init_provider_definitions = __esm(() => {
       shortcuts: [],
       shortestPrefix: "",
       legacyPrefixes: [],
-      nativeModelPatterns: [{ pattern: /^anthropic\//i }, { pattern: /^claude-/i }]
+      nativeModelPatterns: [{ pattern: /^anthropic\//i }, { pattern: /^claude-/i }],
+      description: "Native Claude Code auth"
     }
   ];
 });
@@ -31606,12 +31733,12 @@ var init_model_parser = __esm(() => {
 });
 
 // src/auth/oauth-registry.ts
-import { existsSync as existsSync8, readFileSync as readFileSync7 } from "fs";
-import { join as join8 } from "path";
-import { homedir as homedir7 } from "os";
+import { existsSync as existsSync9, readFileSync as readFileSync7 } from "fs";
+import { join as join9 } from "path";
+import { homedir as homedir8 } from "os";
 function hasValidOAuthCredentials(descriptor) {
-  const credPath = join8(homedir7(), ".claudish", descriptor.credentialFile);
-  if (!existsSync8(credPath))
+  const credPath = join9(homedir8(), ".claudish", descriptor.credentialFile);
+  if (!existsSync9(credPath))
     return false;
   if (descriptor.validationMode === "file-exists") {
     return true;
@@ -31697,9 +31824,9 @@ var init_static_fallback = __esm(() => {
 });
 
 // src/providers/catalog-resolvers/openrouter.ts
-import { readFileSync as readFileSync8, existsSync as existsSync9 } from "fs";
-import { join as join9 } from "path";
-import { homedir as homedir8 } from "os";
+import { readFileSync as readFileSync8, existsSync as existsSync10 } from "fs";
+import { join as join10 } from "path";
+import { homedir as homedir9 } from "os";
 
 class OpenRouterCatalogResolver {
   provider = "openrouter";
@@ -31744,8 +31871,8 @@ class OpenRouterCatalogResolver {
   _getModels() {
     if (_memCache)
       return _memCache;
-    const diskPath = join9(homedir8(), ".claudish", "all-models.json");
-    if (existsSync9(diskPath)) {
+    const diskPath = join10(homedir9(), ".claudish", "all-models.json");
+    if (existsSync10(diskPath)) {
       try {
         const data = JSON.parse(readFileSync8(diskPath, "utf-8"));
         if (Array.isArray(data.models) && data.models.length > 0) {
@@ -31764,16 +31891,16 @@ var init_openrouter = __esm(() => {
 });
 
 // src/providers/catalog-resolvers/litellm.ts
-import { readFileSync as readFileSync9, existsSync as existsSync10 } from "fs";
-import { join as join10 } from "path";
-import { homedir as homedir9 } from "os";
+import { readFileSync as readFileSync9, existsSync as existsSync11 } from "fs";
+import { join as join11 } from "path";
+import { homedir as homedir10 } from "os";
 import { createHash as createHash3 } from "crypto";
 function getCachePath() {
   const baseUrl = process.env.LITELLM_BASE_URL;
   if (!baseUrl)
     return null;
   const hash2 = createHash3("sha256").update(baseUrl).digest("hex").substring(0, 16);
-  return join10(homedir9(), ".claudish", `litellm-models-${hash2}.json`);
+  return join11(homedir10(), ".claudish", `litellm-models-${hash2}.json`);
 }
 
 class LiteLLMCatalogResolver {
@@ -31801,7 +31928,7 @@ class LiteLLMCatalogResolver {
   }
   async warmCache() {
     const path = getCachePath();
-    if (!path || !existsSync10(path))
+    if (!path || !existsSync11(path))
       return;
     try {
       const data = JSON.parse(readFileSync9(path, "utf-8"));
@@ -31817,7 +31944,7 @@ class LiteLLMCatalogResolver {
     if (_memCache2)
       return _memCache2;
     const path = getCachePath();
-    if (!path || !existsSync10(path))
+    if (!path || !existsSync11(path))
       return null;
     try {
       const data = JSON.parse(readFileSync9(path, "utf-8"));
@@ -31879,14 +32006,14 @@ var init_model_catalog_resolver = __esm(() => {
 });
 
 // src/providers/auto-route.ts
-import { existsSync as existsSync11, readFileSync as readFileSync10 } from "fs";
-import { join as join11 } from "path";
-import { homedir as homedir10 } from "os";
+import { existsSync as existsSync12, readFileSync as readFileSync10 } from "fs";
+import { join as join12 } from "path";
+import { homedir as homedir11 } from "os";
 import { createHash as createHash4 } from "crypto";
 function readLiteLLMCacheSync(baseUrl) {
   const hash2 = createHash4("sha256").update(baseUrl).digest("hex").substring(0, 16);
-  const cachePath = join11(homedir10(), ".claudish", `litellm-models-${hash2}.json`);
-  if (!existsSync11(cachePath))
+  const cachePath = join12(homedir11(), ".claudish", `litellm-models-${hash2}.json`);
+  if (!existsSync12(cachePath))
     return null;
   try {
     const data = JSON.parse(readFileSync10(cachePath, "utf-8"));
@@ -31999,9 +32126,27 @@ function autoRoute(modelName, nativeProvider) {
   }
   return null;
 }
-function readZenModelCacheSync() {
-  const cachePath = join11(homedir10(), ".claudish", "zen-models.json");
-  if (!existsSync11(cachePath))
+async function warmZenModelCache() {
+  const apiKey = process.env.OPENCODE_API_KEY || "public";
+  const baseUrl = process.env.OPENCODE_BASE_URL || "https://opencode.ai/zen";
+  const resp = await fetch(`${baseUrl}/v1/models`, {
+    headers: { Authorization: `Bearer ${apiKey}` },
+    signal: AbortSignal.timeout(5000)
+  });
+  if (!resp.ok)
+    return;
+  const data = await resp.json();
+  const models = (data.data ?? []).map((m) => ({ id: m.id }));
+  if (models.length === 0)
+    return;
+  const cacheDir = join12(homedir11(), ".claudish");
+  const { mkdirSync: mkdirSync6, writeFileSync: writeSync3 } = await import("fs");
+  mkdirSync6(cacheDir, { recursive: true });
+  writeSync3(join12(cacheDir, "zen-models.json"), JSON.stringify({ models, fetchedAt: new Date().toISOString() }));
+}
+function readZenGoModelCacheSync() {
+  const cachePath = join12(homedir11(), ".claudish", "zen-go-models.json");
+  if (!existsSync12(cachePath))
     return null;
   try {
     const data = JSON.parse(readFileSync10(cachePath, "utf-8"));
@@ -32012,16 +32157,16 @@ function readZenModelCacheSync() {
     return null;
   }
 }
-function isZenCompatibleModel(modelName) {
-  const zenModels = readZenModelCacheSync();
-  if (!zenModels)
+function isZenGoCompatibleModel(modelName) {
+  const zenGoModels = readZenGoModelCacheSync();
+  if (!zenGoModels)
     return false;
-  return zenModels.has(modelName);
+  return zenGoModels.has(modelName);
 }
-async function warmZenModelCache() {
+async function warmZenGoModelCache() {
   const apiKey = process.env.OPENCODE_API_KEY || "public";
   const baseUrl = process.env.OPENCODE_BASE_URL || "https://opencode.ai/zen";
-  const resp = await fetch(`${baseUrl}/v1/models`, {
+  const resp = await fetch(`${baseUrl}/go/v1/models`, {
     headers: { Authorization: `Bearer ${apiKey}` },
     signal: AbortSignal.timeout(5000)
   });
@@ -32031,10 +32176,10 @@ async function warmZenModelCache() {
   const models = (data.data ?? []).map((m) => ({ id: m.id }));
   if (models.length === 0)
     return;
-  const cacheDir = join11(homedir10(), ".claudish");
+  const cacheDir = join12(homedir11(), ".claudish");
   const { mkdirSync: mkdirSync6, writeFileSync: writeSync3 } = await import("fs");
   mkdirSync6(cacheDir, { recursive: true });
-  writeSync3(join11(cacheDir, "zen-models.json"), JSON.stringify({ models, fetchedAt: new Date().toISOString() }));
+  writeSync3(join12(cacheDir, "zen-go-models.json"), JSON.stringify({ models, fetchedAt: new Date().toISOString() }));
 }
 function hasProviderCredentials(provider) {
   const keyInfo = getApiKeyEnvVars(provider);
@@ -32054,7 +32199,7 @@ function getFallbackChain(modelName, nativeProvider) {
       displayName: "LiteLLM"
     });
   }
-  if (process.env.OPENCODE_API_KEY && isZenCompatibleModel(modelName)) {
+  if (process.env.OPENCODE_API_KEY && isZenGoCompatibleModel(modelName)) {
     routes.push({
       provider: "opencode-zen-go",
       modelSpec: `zengo@${modelName}`,
@@ -32263,9 +32408,9 @@ var init_routing_rules = __esm(() => {
 });
 
 // src/providers/api-key-provenance.ts
-import { existsSync as existsSync12, readFileSync as readFileSync11 } from "fs";
-import { join as join12, resolve as resolve2 } from "path";
-import { homedir as homedir11 } from "os";
+import { existsSync as existsSync13, readFileSync as readFileSync11 } from "fs";
+import { join as join13, resolve as resolve2 } from "path";
+import { homedir as homedir12 } from "os";
 function maskKey(key) {
   if (!key)
     return null;
@@ -32350,7 +32495,7 @@ function formatProvenanceProbe(p, indent = "    ") {
 function readDotenvKey(envVars) {
   try {
     const dotenvPath = resolve2(".env");
-    if (!existsSync12(dotenvPath))
+    if (!existsSync13(dotenvPath))
       return null;
     const parsed = import_dotenv2.parse(readFileSync11(dotenvPath, "utf-8"));
     for (const v of envVars) {
@@ -32364,8 +32509,8 @@ function readDotenvKey(envVars) {
 }
 function readConfigKey(envVar) {
   try {
-    const configPath = join12(homedir11(), ".claudish", "config.json");
-    if (!existsSync12(configPath))
+    const configPath = join13(homedir12(), ".claudish", "config.json");
+    if (!existsSync13(configPath))
       return null;
     const cfg = JSON.parse(readFileSync11(configPath, "utf-8"));
     return cfg.apiKeys?.[envVar] || null;
@@ -32579,9 +32724,9 @@ __export(exports_provider_resolver, {
   getMissingKeyResolutions: () => getMissingKeyResolutions,
   getMissingKeyError: () => getMissingKeyError
 });
-import { existsSync as existsSync13 } from "fs";
-import { join as join13 } from "path";
-import { homedir as homedir12 } from "os";
+import { existsSync as existsSync14 } from "fs";
+import { join as join14 } from "path";
+import { homedir as homedir13 } from "os";
 function getApiKeyInfoForProvider(providerName) {
   const lookupName = providerName === "gemini" ? "google" : providerName;
   const info = getApiKeyInfo(lookupName);
@@ -32616,8 +32761,8 @@ function isApiKeyAvailable(info) {
   }
   if (info.oauthFallback) {
     try {
-      const credPath = join13(homedir12(), ".claudish", info.oauthFallback);
-      if (existsSync13(credPath)) {
+      const credPath = join14(homedir13(), ".claudish", info.oauthFallback);
+      if (existsSync14(credPath)) {
         return true;
       }
     } catch {}
@@ -33079,12 +33224,14 @@ function processAssistantMessage(msg, messages, simpleFormat = false) {
     const toolCalls = [];
     const seen = new Set;
     let reasoningContent = "";
+    let hasThinking = false;
     for (const block of msg.content) {
       if (block.type === "text") {
         strings.push(block.text);
       } else if (block.type === "thinking") {
-        if (!simpleFormat && block.thinking) {
-          reasoningContent += block.thinking;
+        if (!simpleFormat) {
+          hasThinking = true;
+          reasoningContent += block.thinking || "";
         }
       } else if (block.type === "tool_use") {
         if (seen.has(block.id))
@@ -33114,7 +33261,7 @@ function processAssistantMessage(msg, messages, simpleFormat = false) {
         m.content = null;
       if (toolCalls.length)
         m.tool_calls = toolCalls;
-      if (reasoningContent)
+      if (hasThinking)
         m.reasoning_content = reasoningContent;
       if (m.content !== undefined || m.tool_calls)
         messages.push(m);
@@ -33200,13 +33347,34 @@ function transformOpenAIToClaude(claudeRequestInput) {
 var init_transform = () => {};
 
 // src/handlers/shared/format/openai-tools.ts
+function sanitizeSchemaForOpenAI(schema) {
+  if (!schema || typeof schema !== "object") {
+    return removeUriFormat(schema);
+  }
+  let root = { ...schema };
+  const combinerKey = ["oneOf", "anyOf", "allOf"].find((k) => Array.isArray(root[k]) && root[k].length > 0);
+  if (combinerKey) {
+    const branches = root[combinerKey];
+    const objectBranch = branches.find((b) => b && typeof b === "object" && b.type === "object");
+    if (objectBranch) {
+      const { [combinerKey]: _dropped, ...rest } = root;
+      root = { ...rest, ...objectBranch };
+    } else {
+      root = { type: "object", properties: {}, additionalProperties: true };
+    }
+  }
+  const { enum: _enum3, not: _not, ...withoutForbidden } = root;
+  root = withoutForbidden;
+  root.type = "object";
+  return removeUriFormat(root);
+}
 function convertToolsToOpenAI(req, summarize = false) {
   return req.tools?.map((tool) => ({
     type: "function",
     function: {
       name: tool.name,
       description: summarize ? summarizeToolDescription(tool.name, tool.description) : tool.description,
-      parameters: summarize ? summarizeToolParameters(tool.input_schema) : removeUriFormat(tool.input_schema)
+      parameters: summarize ? summarizeToolParameters(tool.input_schema) : sanitizeSchemaForOpenAI(tool.input_schema)
     }
   })) || [];
 }
@@ -33223,7 +33391,7 @@ function summarizeToolDescription(name, description) {
 function summarizeToolParameters(schema) {
   if (!schema)
     return schema;
-  const summarized = removeUriFormat({ ...schema });
+  const summarized = sanitizeSchemaForOpenAI({ ...schema });
   if (summarized.properties) {
     for (const [key, prop] of Object.entries(summarized.properties)) {
       const p = prop;
@@ -33364,11 +33532,80 @@ var init_base_api_format = __esm(() => {
   };
 });
 
+// src/adapters/model-catalog.ts
+function lookupModel(modelId) {
+  const lower = modelId.toLowerCase();
+  const unprefixed = lower.includes("/") ? lower.substring(lower.lastIndexOf("/") + 1) : lower;
+  for (const entry of MODEL_CATALOG) {
+    if (unprefixed.includes(entry.pattern) || lower.includes(entry.pattern)) {
+      return entry;
+    }
+  }
+  return;
+}
+var MODEL_CATALOG;
+var init_model_catalog = __esm(() => {
+  MODEL_CATALOG = [
+    { pattern: "grok-4.20", contextWindow: 2000000 },
+    { pattern: "grok-4-20", contextWindow: 2000000 },
+    { pattern: "grok-4.1-fast", contextWindow: 2000000 },
+    { pattern: "grok-4-1-fast", contextWindow: 2000000 },
+    { pattern: "grok-4-fast", contextWindow: 2000000 },
+    { pattern: "grok-code-fast", contextWindow: 256000 },
+    { pattern: "grok-4", contextWindow: 256000 },
+    { pattern: "grok-3", contextWindow: 131072 },
+    { pattern: "grok-2", contextWindow: 131072 },
+    { pattern: "grok", contextWindow: 131072 },
+    { pattern: "glm-5-turbo", contextWindow: 202752 },
+    { pattern: "glm-5", contextWindow: 80000, supportsVision: true },
+    { pattern: "glm-4.7-flash", contextWindow: 202752 },
+    { pattern: "glm-4.7", contextWindow: 202752 },
+    { pattern: "glm-4.6v", contextWindow: 131072, supportsVision: true },
+    { pattern: "glm-4.6", contextWindow: 204800 },
+    { pattern: "glm-4.5v", contextWindow: 65536, supportsVision: true },
+    { pattern: "glm-4.5-flash", contextWindow: 131072 },
+    { pattern: "glm-4.5-air", contextWindow: 131072 },
+    { pattern: "glm-4.5", contextWindow: 131072 },
+    { pattern: "glm-4v-plus", contextWindow: 128000, supportsVision: true },
+    { pattern: "glm-4v", contextWindow: 128000, supportsVision: true },
+    { pattern: "glm-4-long", contextWindow: 1e6 },
+    { pattern: "glm-4-plus", contextWindow: 128000 },
+    { pattern: "glm-4-flash", contextWindow: 128000 },
+    { pattern: "glm-4-32b", contextWindow: 128000 },
+    { pattern: "glm-4", contextWindow: 128000 },
+    { pattern: "glm-3-turbo", contextWindow: 128000 },
+    { pattern: "glm-", contextWindow: 131072, supportsVision: false },
+    { pattern: "minimax-01", contextWindow: 1e6, supportsVision: false },
+    { pattern: "minimax-m1", contextWindow: 1e6, supportsVision: false },
+    {
+      pattern: "minimax",
+      contextWindow: 204800,
+      supportsVision: false,
+      temperatureRange: { min: 0.01, max: 1 }
+    },
+    { pattern: "gpt-5.4", contextWindow: 1050000 },
+    { pattern: "gpt-5", contextWindow: 400000 },
+    { pattern: "o1", contextWindow: 200000 },
+    { pattern: "o3", contextWindow: 200000 },
+    { pattern: "o4", contextWindow: 200000 },
+    { pattern: "gpt-4o", contextWindow: 128000 },
+    { pattern: "gpt-4-turbo", contextWindow: 128000 },
+    { pattern: "gpt-3.5", contextWindow: 16385 },
+    { pattern: "kimi-k2.5", contextWindow: 262144 },
+    { pattern: "kimi-k2-5", contextWindow: 262144 },
+    { pattern: "kimi-k2", contextWindow: 131000 },
+    { pattern: "kimi", contextWindow: 131072 },
+    { pattern: "xiaomi", contextWindow: 200000, toolNameLimit: 64 },
+    { pattern: "mimo", contextWindow: 200000, toolNameLimit: 64 }
+  ];
+});
+
 // src/adapters/grok-model-dialect.ts
 var GrokModelDialect;
 var init_grok_model_dialect = __esm(() => {
   init_base_api_format();
   init_logger();
+  init_model_catalog();
   GrokModelDialect = class GrokModelDialect extends BaseAPIFormat {
     xmlBuffer = "";
     processTextContent(textContent, accumulatedText) {
@@ -33450,22 +33687,7 @@ var init_grok_model_dialect = __esm(() => {
       return "GrokModelDialect";
     }
     getContextWindow() {
-      const model = this.modelId.toLowerCase();
-      if (model.includes("grok-4.20") || model.includes("grok-4-20"))
-        return 2000000;
-      if (model.includes("grok-4.1-fast") || model.includes("grok-4-1-fast"))
-        return 2000000;
-      if (model.includes("grok-4-fast"))
-        return 2000000;
-      if (model.includes("grok-code-fast"))
-        return 256000;
-      if (model.includes("grok-4"))
-        return 256000;
-      if (model.includes("grok-3"))
-        return 131072;
-      if (model.includes("grok-2"))
-        return 131072;
-      return 131072;
+      return lookupModel(this.modelId)?.contextWindow ?? 131072;
     }
     reset() {
       this.xmlBuffer = "";
@@ -34876,6 +35098,7 @@ var OpenAIAPIFormat;
 var init_openai_api_format = __esm(() => {
   init_base_api_format();
   init_logger();
+  init_model_catalog();
   OpenAIAPIFormat = class OpenAIAPIFormat extends BaseAPIFormat {
     constructor(modelId) {
       super(modelId);
@@ -34917,18 +35140,7 @@ var init_openai_api_format = __esm(() => {
       return "OpenAIAPIFormat";
     }
     getContextWindow() {
-      const model = this.modelId.toLowerCase();
-      if (model.includes("gpt-5.4"))
-        return 1050000;
-      if (model.includes("gpt-5"))
-        return 400000;
-      if (model.includes("o1") || model.includes("o3") || model.includes("o4"))
-        return 200000;
-      if (model.includes("gpt-4o") || model.includes("gpt-4-turbo"))
-        return 128000;
-      if (model.includes("gpt-3.5"))
-        return 16385;
-      return 128000;
+      return lookupModel(this.modelId)?.contextWindow ?? 128000;
     }
     buildPayload(claudeRequest, messages, tools) {
       return this.buildChatCompletionsPayload(claudeRequest, messages, tools);
@@ -35041,6 +35253,7 @@ var MiniMaxModelDialect;
 var init_minimax_model_dialect = __esm(() => {
   init_base_api_format();
   init_logger();
+  init_model_catalog();
   MiniMaxModelDialect = class MiniMaxModelDialect extends BaseAPIFormat {
     processTextContent(textContent, accumulatedText) {
       return {
@@ -35050,13 +35263,25 @@ var init_minimax_model_dialect = __esm(() => {
       };
     }
     prepareRequest(request, originalRequest) {
-      if (originalRequest.thinking) {
-        request.reasoning_split = true;
-        log(`[MiniMaxModelDialect] Enabled reasoning_split: true`);
-        delete request.thinking;
+      const entry = lookupModel(this.modelId);
+      const tempRange = entry?.temperatureRange;
+      if (request.temperature !== undefined && tempRange) {
+        if (request.temperature < tempRange.min) {
+          log(`[MiniMaxModelDialect] Clamping temperature ${request.temperature} \u2192 ${tempRange.min} (MiniMax requires >= ${tempRange.min})`);
+          request.temperature = tempRange.min;
+        } else if (request.temperature > tempRange.max) {
+          log(`[MiniMaxModelDialect] Clamping temperature ${request.temperature} \u2192 ${tempRange.max} (MiniMax requires <= ${tempRange.max})`);
+          request.temperature = tempRange.max;
+        }
       }
       return request;
     }
+    getContextWindow() {
+      return lookupModel(this.modelId)?.contextWindow ?? 204800;
+    }
+    supportsVision() {
+      return lookupModel(this.modelId)?.supportsVision ?? false;
+    }
     shouldHandle(modelId) {
       return matchesModelFamily(modelId, "minimax");
     }
@@ -35096,30 +35321,11 @@ var init_deepseek_model_dialect = __esm(() => {
 });
 
 // src/adapters/glm-model-dialect.ts
-var GLM_CONTEXT_WINDOWS, GLM_VISION_MODELS, GLMModelDialect;
+var GLMModelDialect;
 var init_glm_model_dialect = __esm(() => {
   init_base_api_format();
   init_logger();
-  GLM_CONTEXT_WINDOWS = [
-    ["glm-5-turbo", 202752],
-    ["glm-5", 80000],
-    ["glm-4.7-flash", 202752],
-    ["glm-4.7", 202752],
-    ["glm-4.6v", 131072],
-    ["glm-4.6", 204800],
-    ["glm-4.5v", 65536],
-    ["glm-4.5-flash", 131072],
-    ["glm-4.5-air", 131072],
-    ["glm-4.5", 131072],
-    ["glm-4-long", 1e6],
-    ["glm-4-plus", 128000],
-    ["glm-4-flash", 128000],
-    ["glm-4-32b", 128000],
-    ["glm-4", 128000],
-    ["glm-3-turbo", 128000],
-    ["glm-", 131072]
-  ];
-  GLM_VISION_MODELS = ["glm-4v", "glm-4v-plus", "glm-4.5v", "glm-4.6v", "glm-5"];
+  init_model_catalog();
   GLMModelDialect = class GLMModelDialect extends BaseAPIFormat {
     processTextContent(textContent, accumulatedText) {
       return {
@@ -35142,16 +35348,10 @@ var init_glm_model_dialect = __esm(() => {
       return "GLMModelDialect";
     }
     getContextWindow() {
-      const lower = this.modelId.toLowerCase();
-      for (const [pattern, size] of GLM_CONTEXT_WINDOWS) {
-        if (lower.includes(pattern))
-          return size;
-      }
-      return 128000;
+      return lookupModel(this.modelId)?.contextWindow ?? 128000;
     }
     supportsVision() {
-      const lower = this.modelId.toLowerCase();
-      return GLM_VISION_MODELS.some((m) => lower.includes(m));
+      return lookupModel(this.modelId)?.supportsVision ?? false;
     }
   };
 });
@@ -35161,6 +35361,7 @@ var XiaomiModelDialect;
 var init_xiaomi_model_dialect = __esm(() => {
   init_base_api_format();
   init_logger();
+  init_model_catalog();
   XiaomiModelDialect = class XiaomiModelDialect extends BaseAPIFormat {
     processTextContent(textContent, accumulatedText) {
       return {
@@ -35170,7 +35371,7 @@ var init_xiaomi_model_dialect = __esm(() => {
       };
     }
     getToolNameLimit() {
-      return 64;
+      return lookupModel(this.modelId)?.toolNameLimit ?? null;
     }
     prepareRequest(request, originalRequest) {
       if (originalRequest.thinking) {
@@ -35257,21 +35458,21 @@ __export(exports_cli, {
 import {
   readFileSync as readFileSync12,
   writeFileSync as writeFileSync6,
-  existsSync as existsSync14,
+  existsSync as existsSync15,
   mkdirSync as mkdirSync6,
   copyFileSync,
   readdirSync as readdirSync4,
   unlinkSync as unlinkSync4
 } from "fs";
 import { fileURLToPath as fileURLToPath3 } from "url";
-import { dirname as dirname3, join as join14 } from "path";
-import { homedir as homedir13 } from "os";
+import { dirname as dirname3, join as join15 } from "path";
+import { homedir as homedir14 } from "os";
 function getVersion() {
   return VERSION;
 }
 function clearAllModelCaches() {
-  const cacheDir = join14(homedir13(), ".claudish");
-  if (!existsSync14(cacheDir))
+  const cacheDir = join15(homedir14(), ".claudish");
+  if (!existsSync15(cacheDir))
     return;
   const cachePatterns = ["all-models.json", "pricing-cache.json"];
   let cleared = 0;
@@ -35279,7 +35480,7 @@ function clearAllModelCaches() {
     const files = readdirSync4(cacheDir);
     for (const file2 of files) {
       if (cachePatterns.includes(file2) || file2.startsWith("litellm-models-")) {
-        unlinkSync4(join14(cacheDir, file2));
+        unlinkSync4(join15(cacheDir, file2));
         cleared++;
       }
     }
@@ -35293,7 +35494,7 @@ function clearAllModelCaches() {
 async function parseArgs(args) {
   const config3 = {
     model: undefined,
-    autoApprove: false,
+    autoApprove: true,
     dangerous: false,
     interactive: false,
     debug: false,
@@ -35583,7 +35784,7 @@ async function fetchOllamaModels() {
 }
 async function searchAndPrintModels(query, forceUpdate) {
   let models = [];
-  if (!forceUpdate && existsSync14(ALL_MODELS_JSON_PATH)) {
+  if (!forceUpdate && existsSync15(ALL_MODELS_JSON_PATH)) {
     try {
       const cacheData = JSON.parse(readFileSync12(ALL_MODELS_JSON_PATH, "utf-8"));
       const lastUpdated = new Date(cacheData.lastUpdated);
@@ -35753,7 +35954,7 @@ Found ${results.length} matching models:
 async function printAllModels(jsonOutput, forceUpdate) {
   let models = [];
   const [ollamaModels, zenModels] = await Promise.all([fetchOllamaModels(), fetchZenModels()]);
-  if (!forceUpdate && existsSync14(ALL_MODELS_JSON_PATH)) {
+  if (!forceUpdate && existsSync15(ALL_MODELS_JSON_PATH)) {
     try {
       const cacheData = JSON.parse(readFileSync12(ALL_MODELS_JSON_PATH, "utf-8"));
       const lastUpdated = new Date(cacheData.lastUpdated);
@@ -35956,8 +36157,8 @@ async function printAllModels(jsonOutput, forceUpdate) {
   console.log("Top models:            claudish --top-models");
 }
 function isCacheStale() {
-  const cachePath = existsSync14(CACHED_MODELS_PATH) ? CACHED_MODELS_PATH : BUNDLED_MODELS_PATH;
-  if (!existsSync14(cachePath)) {
+  const cachePath = existsSync15(CACHED_MODELS_PATH) ? CACHED_MODELS_PATH : BUNDLED_MODELS_PATH;
+  if (!existsSync15(cachePath)) {
     return true;
   }
   try {
@@ -36040,8 +36241,8 @@ async function updateModelsFromOpenRouter() {
       providers.add(provider);
     }
     let version2 = "1.2.0";
-    const existingPath = existsSync14(CACHED_MODELS_PATH) ? CACHED_MODELS_PATH : BUNDLED_MODELS_PATH;
-    if (existsSync14(existingPath)) {
+    const existingPath = existsSync15(CACHED_MODELS_PATH) ? CACHED_MODELS_PATH : BUNDLED_MODELS_PATH;
+    if (existsSync15(existingPath)) {
       try {
         const existing = JSON.parse(readFileSync12(existingPath, "utf-8"));
         version2 = existing.version || version2;
@@ -36072,7 +36273,7 @@ async function checkAndUpdateModelsCache(forceUpdate = false) {
     await updateModelsFromOpenRouter();
   } else {
     try {
-      const cachePath = existsSync14(CACHED_MODELS_PATH) ? CACHED_MODELS_PATH : BUNDLED_MODELS_PATH;
+      const cachePath = existsSync15(CACHED_MODELS_PATH) ? CACHED_MODELS_PATH : BUNDLED_MODELS_PATH;
       const data = JSON.parse(readFileSync12(cachePath, "utf-8"));
       console.error(`\u2713 Using cached models (last updated: ${data.lastUpdated})`);
     } catch {}
@@ -36092,7 +36293,8 @@ async function probeModelRouting(models, jsonOutput) {
   const BG_DIM = "\x1B[48;5;236m";
   console.error(`${DIM}Warming provider caches...${RESET}`);
   await Promise.allSettled([
-    warmZenModelCache()
+    warmZenModelCache(),
+    warmZenGoModelCache()
   ]);
   const routingRules = loadRoutingRules();
   const results = [];
@@ -36664,7 +36866,7 @@ MORE INFO:
 }
 function printAIAgentGuide() {
   try {
-    const guidePath = join14(__dirname4, "../AI_AGENT_GUIDE.md");
+    const guidePath = join15(__dirname4, "../AI_AGENT_GUIDE.md");
     const guideContent = readFileSync12(guidePath, "utf-8");
     console.log(guideContent);
   } catch (error46) {
@@ -36681,19 +36883,19 @@ async function initializeClaudishSkill() {
   console.log(`\uD83D\uDD27 Initializing Claudish skill in current project...
 `);
   const cwd = process.cwd();
-  const claudeDir = join14(cwd, ".claude");
-  const skillsDir = join14(claudeDir, "skills");
-  const claudishSkillDir = join14(skillsDir, "claudish-usage");
-  const skillFile = join14(claudishSkillDir, "SKILL.md");
-  if (existsSync14(skillFile)) {
+  const claudeDir = join15(cwd, ".claude");
+  const skillsDir = join15(claudeDir, "skills");
+  const claudishSkillDir = join15(skillsDir, "claudish-usage");
+  const skillFile = join15(claudishSkillDir, "SKILL.md");
+  if (existsSync15(skillFile)) {
     console.log("\u2705 Claudish skill already installed at:");
     console.log(`   ${skillFile}
 `);
     console.log("\uD83D\uDCA1 To reinstall, delete the file and run 'claudish --init' again.");
     return;
   }
-  const sourceSkillPath = join14(__dirname4, "../skills/claudish-usage/SKILL.md");
-  if (!existsSync14(sourceSkillPath)) {
+  const sourceSkillPath = join15(__dirname4, "../skills/claudish-usage/SKILL.md");
+  if (!existsSync15(sourceSkillPath)) {
     console.error("\u274C Error: Claudish skill file not found in installation.");
     console.error(`   Expected at: ${sourceSkillPath}`);
     console.error(`
@@ -36702,15 +36904,15 @@ async function initializeClaudishSkill() {
     process.exit(1);
   }
   try {
-    if (!existsSync14(claudeDir)) {
+    if (!existsSync15(claudeDir)) {
       mkdirSync6(claudeDir, { recursive: true });
       console.log("\uD83D\uDCC1 Created .claude/ directory");
     }
-    if (!existsSync14(skillsDir)) {
+    if (!existsSync15(skillsDir)) {
       mkdirSync6(skillsDir, { recursive: true });
       console.log("\uD83D\uDCC1 Created .claude/skills/ directory");
     }
-    if (!existsSync14(claudishSkillDir)) {
+    if (!existsSync15(claudishSkillDir)) {
       mkdirSync6(claudishSkillDir, { recursive: true });
       console.log("\uD83D\uDCC1 Created .claude/skills/claudish-usage/ directory");
     }
@@ -36753,8 +36955,8 @@ function printAvailableModels() {
   let lastUpdated = "unknown";
   let models = [];
   try {
-    const cachePath = existsSync14(CACHED_MODELS_PATH) ? CACHED_MODELS_PATH : BUNDLED_MODELS_PATH;
-    if (existsSync14(cachePath)) {
+    const cachePath = existsSync15(CACHED_MODELS_PATH) ? CACHED_MODELS_PATH : BUNDLED_MODELS_PATH;
+    if (existsSync15(cachePath)) {
       const data = JSON.parse(readFileSync12(cachePath, "utf-8"));
       lastUpdated = data.lastUpdated || "unknown";
       models = data.models || [];
@@ -36804,7 +37006,7 @@ Force update: claudish --list-models --force-update
 `);
 }
 function printAvailableModelsJSON() {
-  const jsonPath = existsSync14(CACHED_MODELS_PATH) ? CACHED_MODELS_PATH : BUNDLED_MODELS_PATH;
+  const jsonPath = existsSync15(CACHED_MODELS_PATH) ? CACHED_MODELS_PATH : BUNDLED_MODELS_PATH;
   try {
     const jsonContent = readFileSync12(jsonPath, "utf-8");
     const data = JSON.parse(jsonContent);
@@ -36891,7 +37093,7 @@ async function fetchGLMCodingModels() {
     return [];
   }
 }
-var __filename4, __dirname4, VERSION = "6.0.1", CACHE_MAX_AGE_DAYS2 = 2, CLAUDISH_CACHE_DIR2, BUNDLED_MODELS_PATH, CACHED_MODELS_PATH, ALL_MODELS_JSON_PATH;
+var __filename4, __dirname4, VERSION = "6.1.1", CACHE_MAX_AGE_DAYS2 = 2, CLAUDISH_CACHE_DIR2, BUNDLED_MODELS_PATH, CACHED_MODELS_PATH, ALL_MODELS_JSON_PATH;
 var init_cli = __esm(() => {
   init_config();
   init_model_loader();
@@ -36904,13 +37106,13 @@ var init_cli = __esm(() => {
   __filename4 = fileURLToPath3(import.meta.url);
   __dirname4 = dirname3(__filename4);
   try {
-    const packageJson = JSON.parse(readFileSync12(join14(__dirname4, "../package.json"), "utf-8"));
+    const packageJson = JSON.parse(readFileSync12(join15(__dirname4, "../package.json"), "utf-8"));
     VERSION = packageJson.version;
   } catch {}
-  CLAUDISH_CACHE_DIR2 = join14(homedir13(), ".claudish");
-  BUNDLED_MODELS_PATH = join14(__dirname4, "../recommended-models.json");
-  CACHED_MODELS_PATH = join14(CLAUDISH_CACHE_DIR2, "recommended-models.json");
-  ALL_MODELS_JSON_PATH = join14(CLAUDISH_CACHE_DIR2, "all-models.json");
+  CLAUDISH_CACHE_DIR2 = join15(homedir14(), ".claudish");
+  BUNDLED_MODELS_PATH = join15(__dirname4, "../recommended-models.json");
+  CACHED_MODELS_PATH = join15(CLAUDISH_CACHE_DIR2, "recommended-models.json");
+  ALL_MODELS_JSON_PATH = join15(CLAUDISH_CACHE_DIR2, "all-models.json");
 });
 
 // src/update-checker.ts
@@ -36922,9 +37124,9 @@ __export(exports_update_checker, {
   checkForUpdates: () => checkForUpdates
 });
 import { execSync } from "child_process";
-import { existsSync as existsSync15, mkdirSync as mkdirSync7, readFileSync as readFileSync13, unlinkSync as unlinkSync5, writeFileSync as writeFileSync7 } from "fs";
-import { homedir as homedir14, platform as platform2, tmpdir } from "os";
-import { join as join15 } from "path";
+import { existsSync as existsSync16, mkdirSync as mkdirSync7, readFileSync as readFileSync13, unlinkSync as unlinkSync5, writeFileSync as writeFileSync7 } from "fs";
+import { homedir as homedir15, platform as platform2, tmpdir } from "os";
+import { join as join16 } from "path";
 import { createInterface } from "readline";
 function getUpdateCommand() {
   const scriptPath = process.argv[1] || "";
@@ -36936,24 +37138,24 @@ function getUpdateCommand() {
 function getCacheFilePath() {
   let cacheDir;
   if (isWindows) {
-    const localAppData = process.env.LOCALAPPDATA || join15(homedir14(), "AppData", "Local");
-    cacheDir = join15(localAppData, "claudish");
+    const localAppData = process.env.LOCALAPPDATA || join16(homedir15(), "AppData", "Local");
+    cacheDir = join16(localAppData, "claudish");
   } else {
-    cacheDir = join15(homedir14(), ".cache", "claudish");
+    cacheDir = join16(homedir15(), ".cache", "claudish");
   }
   try {
-    if (!existsSync15(cacheDir)) {
+    if (!existsSync16(cacheDir)) {
       mkdirSync7(cacheDir, { recursive: true });
     }
-    return join15(cacheDir, "update-check.json");
+    return join16(cacheDir, "update-check.json");
   } catch {
-    return join15(tmpdir(), "claudish-update-check.json");
+    return join16(tmpdir(), "claudish-update-check.json");
   }
 }
 function readCache() {
   try {
     const cachePath = getCacheFilePath();
-    if (!existsSync15(cachePath)) {
+    if (!existsSync16(cachePath)) {
       return null;
     }
     const data = JSON.parse(readFileSync13(cachePath, "utf-8"));
@@ -36979,7 +37181,7 @@ function isCacheValid(cache) {
 function clearCache() {
   try {
     const cachePath = getCacheFilePath();
-    if (existsSync15(cachePath)) {
+    if (existsSync16(cachePath)) {
       unlinkSync5(cachePath);
     }
   } catch {}
@@ -39460,12 +39662,12 @@ __export(exports_model_selector, {
   promptForApiKey: () => promptForApiKey,
   confirmAction: () => confirmAction
 });
-import { readFileSync as readFileSync14, writeFileSync as writeFileSync8, existsSync as existsSync16, mkdirSync as mkdirSync8 } from "fs";
-import { join as join16, dirname as dirname4 } from "path";
-import { homedir as homedir15 } from "os";
+import { readFileSync as readFileSync14, writeFileSync as writeFileSync8, existsSync as existsSync17, mkdirSync as mkdirSync8 } from "fs";
+import { join as join17, dirname as dirname4 } from "path";
+import { homedir as homedir16 } from "os";
 import { fileURLToPath as fileURLToPath4 } from "url";
 function loadRecommendedModels2() {
-  if (existsSync16(RECOMMENDED_MODELS_JSON_PATH)) {
+  if (existsSync17(RECOMMENDED_MODELS_JSON_PATH)) {
     try {
       const content = readFileSync14(RECOMMENDED_MODELS_JSON_PATH, "utf-8");
       const data = JSON.parse(content);
@@ -39480,7 +39682,7 @@ function loadRecommendedModels2() {
   return [];
 }
 async function fetchAllModels(forceUpdate = false) {
-  if (!forceUpdate && existsSync16(ALL_MODELS_JSON_PATH2)) {
+  if (!forceUpdate && existsSync17(ALL_MODELS_JSON_PATH2)) {
     try {
       const cacheData = JSON.parse(readFileSync14(ALL_MODELS_JSON_PATH2, "utf-8"));
       const lastUpdated = new Date(cacheData.lastUpdated);
@@ -39984,7 +40186,7 @@ async function fetchOllamaCloudModels() {
   }
 }
 function shouldRefreshForFreeModels() {
-  if (!existsSync16(ALL_MODELS_JSON_PATH2)) {
+  if (!existsSync17(ALL_MODELS_JSON_PATH2)) {
     return true;
   }
   try {
@@ -40030,45 +40232,61 @@ async function getFreeModels() {
 async function getAllModelsForSearch(forceUpdate = false) {
   const litellmBaseUrl = process.env.LITELLM_BASE_URL;
   const litellmApiKey = process.env.LITELLM_API_KEY;
-  const fetchEntries = [
+  const allEntries = [
     {
       name: "OpenRouter",
-      promise: fetchAllModels(forceUpdate).then((models) => models.map(toModelInfo))
+      promise: () => fetchAllModels(forceUpdate).then((models) => models.map(toModelInfo))
     },
-    { name: "xAI", promise: fetchXAIModels() },
-    { name: "Gemini", promise: fetchGeminiModels() },
-    { name: "OpenAI", promise: fetchOpenAIModels() },
-    { name: "GLM", promise: fetchGLMDirectModels() },
-    { name: "GLM Coding", promise: fetchGLMCodingModels2() },
-    { name: "OllamaCloud", promise: fetchOllamaCloudModels() },
-    { name: "Zen", promise: fetchZenFreeModels() },
-    { name: "Zen Go", promise: fetchZenGoModels() }
+    { name: "xAI", provider: "xai", promise: () => fetchXAIModels() },
+    { name: "Gemini", provider: "google", promise: () => fetchGeminiModels() },
+    { name: "OpenAI", provider: "openai", promise: () => fetchOpenAIModels() },
+    { name: "GLM", provider: "glm", promise: () => fetchGLMDirectModels() },
+    { name: "GLM Coding", provider: "glm-coding", promise: () => fetchGLMCodingModels2() },
+    { name: "OllamaCloud", provider: "ollamacloud", promise: () => fetchOllamaCloudModels() },
+    { name: "Zen", provider: "opencode-zen", promise: () => fetchZenFreeModels() },
+    { name: "Zen Go", provider: "opencode-zen-go", promise: () => fetchZenGoModels() },
+    { name: "MiniMax", provider: "minimax", promise: () => Promise.resolve(getKnownModels("minimax")) },
+    { name: "MiniMax Coding", provider: "minimax-coding", promise: () => Promise.resolve(getKnownModels("minimax-coding")) },
+    { name: "Kimi", provider: "kimi", promise: () => Promise.resolve(getKnownModels("kimi")) },
+    { name: "Kimi Coding", provider: "kimi-coding", promise: () => Promise.resolve(getKnownModels("kimi-coding")) },
+    { name: "Z.AI", provider: "zai", promise: () => Promise.resolve(getKnownModels("zai")) }
   ];
   if (litellmBaseUrl && litellmApiKey) {
-    fetchEntries.push({
+    allEntries.push({
       name: "LiteLLM",
-      promise: fetchLiteLLMModels(litellmBaseUrl, litellmApiKey, forceUpdate)
+      provider: "litellm",
+      promise: () => fetchLiteLLMModels(litellmBaseUrl, litellmApiKey, forceUpdate)
     });
   }
+  const fetchEntries = allEntries.filter((e) => {
+    if (!e.provider)
+      return true;
+    const def = getProviderByName(e.provider);
+    return def ? isProviderAvailable(def) : true;
+  }).map((e) => ({ name: e.name, promise: e.promise() }));
   const settled = await Promise.allSettled(fetchEntries.map((e) => e.promise));
   const fetchResults = {};
   for (let i = 0;i < settled.length; i++) {
     const result = settled[i];
     fetchResults[fetchEntries[i].name] = result.status === "fulfilled" ? result.value : [];
   }
-  const directApiModels = [
-    ...fetchResults["xAI"],
-    ...fetchResults["Gemini"],
-    ...fetchResults["OpenAI"],
-    ...fetchResults["GLM"],
-    ...fetchResults["GLM Coding"]
-  ];
+  const r = (name) => fetchResults[name] || [];
   const allModels = [
-    ...fetchResults["Zen"],
-    ...fetchResults["OllamaCloud"],
-    ...directApiModels,
-    ...fetchResults["LiteLLM"] || [],
-    ...fetchResults["OpenRouter"]
+    ...r("Zen"),
+    ...r("Zen Go"),
+    ...r("OllamaCloud"),
+    ...r("xAI"),
+    ...r("Gemini"),
+    ...r("OpenAI"),
+    ...r("GLM"),
+    ...r("GLM Coding"),
+    ...r("MiniMax"),
+    ...r("MiniMax Coding"),
+    ...r("Kimi"),
+    ...r("Kimi Coding"),
+    ...r("Z.AI"),
+    ...r("LiteLLM"),
+    ...r("OpenRouter")
   ];
   return allModels;
 }
@@ -40090,8 +40308,11 @@ function formatModelChoice(model, showSource = false) {
       OpenAI: "OAI",
       GLM: "GLM",
       "GLM Coding": "GC",
+      MiniMax: "MM",
       "MiniMax Coding": "MMC",
+      Kimi: "Kimi",
       "Kimi Coding": "KC",
+      "Z.AI": "ZAI",
       OllamaCloud: "OC",
       LiteLLM: "LL"
     };
@@ -40250,7 +40471,12 @@ async function selectModel(options = {}) {
   return selected;
 }
 function getProviderChoices() {
-  return ALL_PROVIDER_CHOICES.filter((choice) => !choice.envVar || process.env[choice.envVar]);
+  return ALL_PROVIDER_CHOICES.filter((choice) => {
+    if (!choice.provider)
+      return true;
+    const def = getProviderByName(choice.provider);
+    return def ? isProviderAvailable(def) : true;
+  });
 }
 function getKnownModels(provider) {
   const known = {
@@ -40383,6 +40609,19 @@ function getKnownModels(provider) {
       }
     ]
   };
+  const sourceMap = {
+    minimax: "MiniMax",
+    "minimax-coding": "MiniMax Coding",
+    kimi: "Kimi",
+    "kimi-coding": "Kimi Coding",
+    zai: "Z.AI",
+    glm: "GLM",
+    "glm-coding": "GLM Coding",
+    ollamacloud: "OllamaCloud",
+    google: "Gemini",
+    openai: "OpenAI",
+    xai: "xAI"
+  };
   const providerDisplay = provider.charAt(0).toUpperCase() + provider.slice(1);
   return (known[provider] || []).map((m) => ({
     id: m.id,
@@ -40390,7 +40629,8 @@ function getKnownModels(provider) {
     description: m.description || `${providerDisplay} model`,
     provider: providerDisplay,
     context: m.context,
-    supportsTools: true
+    supportsTools: true,
+    source: sourceMap[provider]
   }));
 }
 function filterModelsByProvider(allModels, provider) {
@@ -40587,11 +40827,12 @@ var __filename5, __dirname5, CLAUDISH_CACHE_DIR3, ALL_MODELS_JSON_PATH2, RECOMME
 var init_model_selector = __esm(() => {
   init_dist8();
   init_model_loader();
+  init_provider_definitions();
   __filename5 = fileURLToPath4(import.meta.url);
   __dirname5 = dirname4(__filename5);
-  CLAUDISH_CACHE_DIR3 = join16(homedir15(), ".claudish");
-  ALL_MODELS_JSON_PATH2 = join16(CLAUDISH_CACHE_DIR3, "all-models.json");
-  RECOMMENDED_MODELS_JSON_PATH = join16(__dirname5, "../recommended-models.json");
+  CLAUDISH_CACHE_DIR3 = join17(homedir16(), ".claudish");
+  ALL_MODELS_JSON_PATH2 = join17(CLAUDISH_CACHE_DIR3, "all-models.json");
+  RECOMMENDED_MODELS_JSON_PATH = join17(__dirname5, "../recommended-models.json");
   PROVIDER_FILTER_ALIASES = {
     zen: "Zen",
     openrouter: "OpenRouter",
@@ -40605,10 +40846,16 @@ var init_model_selector = __esm(() => {
     glm: "GLM",
     "glm-coding": "GLM Coding",
     gc: "GLM Coding",
+    minimax: "MiniMax",
+    mm: "MiniMax",
     mmc: "MiniMax Coding",
     "minimax-coding": "MiniMax Coding",
+    kimi: "Kimi",
+    moon: "Kimi",
+    moonshot: "Kimi",
     kc: "Kimi Coding",
     "kimi-coding": "Kimi Coding",
+    zai: "Z.AI",
     ollamacloud: "OllamaCloud",
     oc: "OllamaCloud",
     litellm: "LiteLLM",
@@ -40620,66 +40867,21 @@ var init_model_selector = __esm(() => {
       value: "skip",
       description: "Use native Claude model for this tier"
     },
-    { name: "OpenRouter", value: "openrouter", description: "580+ models via unified API" },
-    { name: "OpenCode Zen", value: "zen", description: "Free models, no API key needed" },
-    {
-      name: "Google Gemini",
-      value: "google",
-      description: "Direct API (GEMINI_API_KEY)",
-      envVar: "GEMINI_API_KEY"
-    },
-    {
-      name: "OpenAI",
-      value: "openai",
-      description: "Direct API (OPENAI_API_KEY)",
-      envVar: "OPENAI_API_KEY"
-    },
-    {
-      name: "xAI / Grok",
-      value: "xai",
-      description: "Direct API (XAI_API_KEY)",
-      envVar: "XAI_API_KEY"
-    },
-    {
-      name: "MiniMax",
-      value: "minimax",
-      description: "Direct API (MINIMAX_API_KEY)",
-      envVar: "MINIMAX_API_KEY"
-    },
-    {
-      name: "MiniMax Coding",
-      value: "minimax-coding",
-      description: "MiniMax Coding subscription (MINIMAX_CODING_API_KEY)",
-      envVar: "MINIMAX_CODING_API_KEY"
-    },
-    {
-      name: "Kimi / Moonshot",
-      value: "kimi",
-      description: "Direct API (MOONSHOT_API_KEY)",
-      envVar: "MOONSHOT_API_KEY"
-    },
-    {
-      name: "Kimi Coding",
-      value: "kimi-coding",
-      description: "Kimi Coding subscription (KIMI_CODING_API_KEY)",
-      envVar: "KIMI_CODING_API_KEY"
-    },
-    {
-      name: "GLM / Zhipu",
-      value: "glm",
-      description: "Direct API (ZHIPU_API_KEY)",
-      envVar: "ZHIPU_API_KEY"
-    },
-    {
-      name: "GLM Coding Plan",
-      value: "glm-coding",
-      description: "GLM Coding subscription (GLM_CODING_API_KEY)",
-      envVar: "GLM_CODING_API_KEY"
-    },
-    { name: "Z.AI", value: "zai", description: "Z.AI API (ZAI_API_KEY)", envVar: "ZAI_API_KEY" },
-    { name: "OllamaCloud", value: "ollamacloud", description: "Cloud models (OLLAMA_API_KEY)" },
-    { name: "Ollama (local)", value: "ollama", description: "Local Ollama instance" },
-    { name: "LM Studio (local)", value: "lmstudio", description: "Local LM Studio instance" },
+    { name: "OpenRouter", value: "openrouter", description: "580+ models via unified API", provider: "openrouter" },
+    { name: "OpenCode Zen", value: "zen", description: "Free models, no API key needed", provider: "opencode-zen" },
+    { name: "Google Gemini", value: "google", description: "Direct API", provider: "google" },
+    { name: "OpenAI", value: "openai", description: "Direct API", provider: "openai" },
+    { name: "xAI / Grok", value: "xai", description: "Direct API", provider: "xai" },
+    { name: "MiniMax", value: "minimax", description: "Direct API", provider: "minimax" },
+    { name: "MiniMax Coding", value: "minimax-coding", description: "Coding subscription", provider: "minimax-coding" },
+    { name: "Kimi / Moonshot", value: "kimi", description: "Direct API", provider: "kimi" },
+    { name: "Kimi Coding", value: "kimi-coding", description: "Coding subscription", provider: "kimi-coding" },
+    { name: "GLM / Zhipu", value: "glm", description: "Direct API", provider: "glm" },
+    { name: "GLM Coding Plan", value: "glm-coding", description: "Coding subscription", provider: "glm-coding" },
+    { name: "Z.AI", value: "zai", description: "Direct API", provider: "zai" },
+    { name: "OllamaCloud", value: "ollamacloud", description: "Cloud models", provider: "ollamacloud" },
+    { name: "Ollama (local)", value: "ollama", description: "Local Ollama instance", provider: "ollama" },
+    { name: "LM Studio (local)", value: "lmstudio", description: "Local LM Studio instance", provider: "lmstudio" },
     {
       name: "Enter custom model",
       value: "custom",
@@ -40709,6 +40911,12 @@ var init_model_selector = __esm(() => {
     openai: "OpenAI",
     xai: "xAI",
     glm: "GLM",
+    "glm-coding": "GLM Coding",
+    minimax: "MiniMax",
+    "minimax-coding": "MiniMax Coding",
+    kimi: "Kimi",
+    "kimi-coding": "Kimi Coding",
+    zai: "Z.AI",
     ollamacloud: "OllamaCloud",
     zen: "Zen"
   };
@@ -41637,23 +41845,23 @@ var init_telemetry = __esm(() => {
 
 // src/stats-buffer.ts
 import {
-  existsSync as existsSync17,
+  existsSync as existsSync18,
   mkdirSync as mkdirSync9,
   readFileSync as readFileSync15,
   renameSync,
   unlinkSync as unlinkSync6,
   writeFileSync as writeFileSync9
 } from "fs";
-import { homedir as homedir16 } from "os";
-import { join as join17 } from "path";
+import { homedir as homedir17 } from "os";
+import { join as join18 } from "path";
 function ensureDir() {
-  if (!existsSync17(CLAUDISH_DIR)) {
+  if (!existsSync18(CLAUDISH_DIR)) {
     mkdirSync9(CLAUDISH_DIR, { recursive: true });
   }
 }
 function readFromDisk() {
   try {
-    if (!existsSync17(BUFFER_FILE))
+    if (!existsSync18(BUFFER_FILE))
       return [];
     const raw = readFileSync15(BUFFER_FILE, "utf-8");
     const parsed = JSON.parse(raw);
@@ -41679,7 +41887,7 @@ function writeToDisk(events) {
     ensureDir();
     const trimmed = enforceSizeCap([...events]);
     const payload = { version: 1, events: trimmed };
-    const tmpFile = join17(CLAUDISH_DIR, `stats-buffer.tmp.${process.pid}.json`);
+    const tmpFile = join18(CLAUDISH_DIR, `stats-buffer.tmp.${process.pid}.json`);
     writeFileSync9(tmpFile, JSON.stringify(payload, null, 2), "utf-8");
     renameSync(tmpFile, BUFFER_FILE);
     memoryCache = trimmed;
@@ -41724,7 +41932,7 @@ function clearBuffer() {
   try {
     memoryCache = [];
     eventsSinceLastFlush = 0;
-    if (existsSync17(BUFFER_FILE)) {
+    if (existsSync18(BUFFER_FILE)) {
       unlinkSync6(BUFFER_FILE);
     }
   } catch {}
@@ -41753,8 +41961,8 @@ function syncFlushOnExit() {
 var BUFFER_MAX_BYTES, CLAUDISH_DIR, BUFFER_FILE, memoryCache = null, eventsSinceLastFlush = 0, lastFlushTime, flushScheduled = false;
 var init_stats_buffer = __esm(() => {
   BUFFER_MAX_BYTES = 64 * 1024;
-  CLAUDISH_DIR = join17(homedir16(), ".claudish");
-  BUFFER_FILE = join17(CLAUDISH_DIR, "stats-buffer.json");
+  CLAUDISH_DIR = join18(homedir17(), ".claudish");
+  BUFFER_FILE = join18(CLAUDISH_DIR, "stats-buffer.json");
   lastFlushTime = Date.now();
   process.on("exit", syncFlushOnExit);
   process.on("SIGTERM", () => {
@@ -42242,8 +42450,8 @@ import { EventEmitter as EventEmitter2 } from "events";
 import { resolve as resolve3, dirname as dirname5 } from "path";
 import { fileURLToPath as fileURLToPath5 } from "url";
 import { resolve as resolve22, isAbsolute, parse as parse6 } from "path";
-import { existsSync as existsSync18 } from "fs";
-import { basename, join as join18 } from "path";
+import { existsSync as existsSync19 } from "fs";
+import { basename, join as join19 } from "path";
 import os from "os";
 import path from "path";
 import { EventEmitter as EventEmitter3 } from "events";
@@ -44642,7 +44850,7 @@ function getBunfsRootPath() {
   return process.platform === "win32" ? "B:\\~BUN\\root" : "/$bunfs/root";
 }
 function normalizeBunfsPath(fileName) {
-  return join18(getBunfsRootPath(), basename(fileName));
+  return join19(getBunfsRootPath(), basename(fileName));
 }
 function isValidDirectoryName(name) {
   if (!name || typeof name !== "string") {
@@ -54838,7 +55046,7 @@ var init_index_0wbvecnk = __esm(async () => {
         worker_path = this.options.workerPath;
       } else {
         worker_path = new URL("./parser.worker.js", import.meta.url).href;
-        if (!existsSync18(resolve22(import.meta.dirname, "parser.worker.js"))) {
+        if (!existsSync19(resolve22(import.meta.dirname, "parser.worker.js"))) {
           worker_path = new URL("./parser.worker.ts", import.meta.url).href;
         }
       }
@@ -98101,6 +98309,18 @@ var init_react = __esm(async () => {
 });
 
 // src/tui/providers.ts
+function toProviderDef(def) {
+  return {
+    name: def.name === "google" ? "gemini" : def.name,
+    displayName: def.displayName,
+    apiKeyEnvVar: def.apiKeyEnvVar,
+    description: def.description || def.apiKeyDescription,
+    keyUrl: def.apiKeyUrl,
+    endpointEnvVar: def.baseUrlEnvVars?.[0],
+    defaultEndpoint: def.baseUrl || undefined,
+    aliases: def.apiKeyAliases
+  };
+}
 function maskKey2(key) {
   if (!key)
     return "\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500";
@@ -98108,113 +98328,11 @@ function maskKey2(key) {
     return "****    ";
   return `${key.slice(0, 3)}\u2022\u2022${key.slice(-3)}`;
 }
-var PROVIDERS;
+var SKIP, PROVIDERS;
 var init_providers = __esm(() => {
-  PROVIDERS = [
-    {
-      name: "openrouter",
-      displayName: "OpenRouter",
-      apiKeyEnvVar: "OPENROUTER_API_KEY",
-      description: "580+ models, default backend",
-      keyUrl: "https://openrouter.ai/keys"
-    },
-    {
-      name: "gemini",
-      displayName: "Google Gemini",
-      apiKeyEnvVar: "GEMINI_API_KEY",
-      description: "Direct Gemini API (g@, google@)",
-      keyUrl: "https://aistudio.google.com/app/apikey",
-      endpointEnvVar: "GEMINI_BASE_URL",
-      defaultEndpoint: "https://generativelanguage.googleapis.com"
-    },
-    {
-      name: "openai",
-      displayName: "OpenAI",
-      apiKeyEnvVar: "OPENAI_API_KEY",
-      description: "Direct OpenAI API (oai@)",
-      keyUrl: "https://platform.openai.com/api-keys",
-      endpointEnvVar: "OPENAI_BASE_URL",
-      defaultEndpoint: "https://api.openai.com"
-    },
-    {
-      name: "minimax",
-      displayName: "MiniMax",
-      apiKeyEnvVar: "MINIMAX_API_KEY",
-      description: "MiniMax API (mm@, mmax@)",
-      keyUrl: "https://www.minimaxi.com/",
-      endpointEnvVar: "MINIMAX_BASE_URL",
-      defaultEndpoint: "https://api.minimax.io"
-    },
-    {
-      name: "kimi",
-      displayName: "Kimi / Moonshot",
-      apiKeyEnvVar: "MOONSHOT_API_KEY",
-      description: "Kimi API (kimi@, moon@)",
-      keyUrl: "https://platform.moonshot.cn/",
-      aliases: ["KIMI_API_KEY"],
-      endpointEnvVar: "MOONSHOT_BASE_URL",
-      defaultEndpoint: "https://api.moonshot.ai"
-    },
-    {
-      name: "glm",
-      displayName: "GLM / Zhipu",
-      apiKeyEnvVar: "ZHIPU_API_KEY",
-      description: "GLM API (glm@, zhipu@)",
-      keyUrl: "https://open.bigmodel.cn/",
-      aliases: ["GLM_API_KEY"],
-      endpointEnvVar: "ZHIPU_BASE_URL",
-      defaultEndpoint: "https://open.bigmodel.cn"
-    },
-    {
-      name: "zai",
-      displayName: "Z.AI",
-      apiKeyEnvVar: "ZAI_API_KEY",
-      description: "Z.AI API (zai@)",
-      keyUrl: "https://z.ai/",
-      endpointEnvVar: "ZAI_BASE_URL",
-      defaultEndpoint: "https://api.z.ai"
-    },
-    {
-      name: "ollamacloud",
-      displayName: "OllamaCloud",
-      apiKeyEnvVar: "OLLAMA_API_KEY",
-      description: "Cloud Ollama (oc@, llama@)",
-      keyUrl: "https://ollama.com/account",
-      endpointEnvVar: "OLLAMACLOUD_BASE_URL",
-      defaultEndpoint: "https://ollama.com"
-    },
-    {
-      name: "opencode",
-      displayName: "OpenCode Zen",
-      apiKeyEnvVar: "OPENCODE_API_KEY",
-      description: "OpenCode Zen (zen@) \u2014 optional for free models",
-      keyUrl: "https://opencode.ai/",
-      endpointEnvVar: "OPENCODE_BASE_URL",
-      defaultEndpoint: "https://opencode.ai/zen"
-    },
-    {
-      name: "litellm",
-      displayName: "LiteLLM",
-      apiKeyEnvVar: "LITELLM_API_KEY",
-      description: "LiteLLM proxy (ll@, litellm@)",
-      keyUrl: "https://docs.litellm.ai/",
-      endpointEnvVar: "LITELLM_BASE_URL"
-    },
-    {
-      name: "vertex",
-      displayName: "Vertex AI",
-      apiKeyEnvVar: "VERTEX_API_KEY",
-      description: "Vertex AI Express (v@, vertex@)",
-      keyUrl: "https://console.cloud.google.com/vertex-ai"
-    },
-    {
-      name: "poe",
-      displayName: "Poe",
-      apiKeyEnvVar: "POE_API_KEY",
-      description: "Poe API (poe@)",
-      keyUrl: "https://poe.com/"
-    }
-  ];
+  init_provider_definitions();
+  SKIP = new Set(["qwen", "native-anthropic"]);
+  PROVIDERS = getAllProviders().filter((d2) => !SKIP.has(d2.name)).map(toProviderDef);
 });
 
 // src/tui/theme.ts
@@ -98271,7 +98389,11 @@ function App() {
   const [inputValue, setInputValue] = import_react13.useState("");
   const [routingPattern, setRoutingPattern] = import_react13.useState("");
   const [routingChain, setRoutingChain] = import_react13.useState("");
+  const [chainSelected, setChainSelected] = import_react13.useState(new Set);
+  const [chainOrder, setChainOrder] = import_react13.useState([]);
+  const [chainCursor, setChainCursor] = import_react13.useState(0);
   const [statusMsg, setStatusMsg] = import_react13.useState(null);
+  const CHAIN_PROVIDERS = PROVIDERS;
   const quit = import_react13.useCallback(() => renderer.destroy(), [renderer]);
   const displayProviders = import_react13.useMemo(() => {
     return [...PROVIDERS].sort((a, b2) => {
@@ -98332,30 +98454,75 @@ function App() {
     }
     if (mode === "add_routing_pattern") {
       if (key.name === "return" || key.name === "enter") {
-        if (routingPattern.trim())
+        if (routingPattern.trim()) {
+          setChainSelected(new Set);
+          setChainCursor(0);
+          setChainOrder([]);
           setMode("add_routing_chain");
+        }
       } else if (key.name === "escape") {
+        setRoutingPattern("");
         setMode("browse");
+      } else if (key.name === "backspace" || key.name === "delete") {
+        setRoutingPattern((p) => p.slice(0, -1));
+      } else if (key.raw && key.raw.length === 1 && !key.ctrl && !key.meta) {
+        setRoutingPattern((p) => p + key.raw);
       }
       return;
     }
     if (mode === "add_routing_chain") {
-      if (key.name === "return" || key.name === "enter") {
+      if (key.name === "up" || key.name === "k") {
+        setChainCursor((i) => Math.max(0, i - 1));
+      } else if (key.name === "down" || key.name === "j") {
+        setChainCursor((i) => Math.min(CHAIN_PROVIDERS.length - 1, i + 1));
+      } else if (key.name === "space" || key.raw === " ") {
+        const provName = CHAIN_PROVIDERS[chainCursor].name;
+        setChainSelected((prev) => {
+          const next = new Set(prev);
+          if (next.has(provName)) {
+            next.delete(provName);
+            setChainOrder((o) => o.filter((p) => p !== provName));
+          } else {
+            next.add(provName);
+            setChainOrder((o) => [...o, provName]);
+          }
+          return next;
+        });
+      } else if (key.raw && key.raw >= "1" && key.raw <= "9") {
+        const provName = CHAIN_PROVIDERS[chainCursor].name;
+        const targetPos = parseInt(key.raw, 10) - 1;
+        setChainSelected((prev) => {
+          const next = new Set(prev);
+          next.add(provName);
+          return next;
+        });
+        setChainOrder((prev) => {
+          const without = prev.filter((p) => p !== provName);
+          const insertAt = Math.min(targetPos, without.length);
+          without.splice(insertAt, 0, provName);
+          return without;
+        });
+      } else if (key.name === "return" || key.name === "enter") {
         const pat = routingPattern.trim();
-        const ch = routingChain.trim().split(",").map((s) => s.trim()).filter(Boolean);
-        if (pat && ch.length) {
+        if (pat && chainOrder.length) {
           const cfg = loadConfig();
           if (!cfg.routing)
             cfg.routing = {};
-          cfg.routing[pat] = ch;
+          cfg.routing[pat] = chainOrder;
           saveConfig(cfg);
           refreshConfig();
-          setStatusMsg(`Rule added for '${pat}'.`);
+          setStatusMsg(`Rule added: ${pat} \u2192 ${chainOrder.join(", ")}`);
         }
         setRoutingPattern("");
         setRoutingChain("");
+        setChainSelected(new Set);
+        setChainOrder([]);
+        setChainCursor(0);
         setMode("browse");
       } else if (key.name === "escape") {
+        setChainSelected(new Set);
+        setChainOrder([]);
+        setChainCursor(0);
         setMode("add_routing_pattern");
       }
       return;
@@ -98494,7 +98661,7 @@ function App() {
   const HEADER_H = 1;
   const TABS_H = 3;
   const FOOTER_H = 1;
-  const DETAIL_H = 5;
+  const DETAIL_H = 7;
   const contentH = Math.max(4, height2 - HEADER_H - TABS_H - DETAIL_H - FOOTER_H - 1);
   function TabBar() {
     const tabs = [
@@ -98725,8 +98892,11 @@ function App() {
               /* @__PURE__ */ import_jsx_dev_runtime2.jsxDEV("span", {
                 fg: C2.green,
                 bold: true,
-                children: "Enter "
-              }, undefined, false, undefined, this),
+                children: [
+                  "Enter",
+                  " "
+                ]
+              }, undefined, true, undefined, this),
               /* @__PURE__ */ import_jsx_dev_runtime2.jsxDEV("span", {
                 fg: C2.fgMuted,
                 children: "to save \xB7 "
@@ -98734,8 +98904,11 @@ function App() {
               /* @__PURE__ */ import_jsx_dev_runtime2.jsxDEV("span", {
                 fg: C2.red,
                 bold: true,
-                children: "Esc "
-              }, undefined, false, undefined, this),
+                children: [
+                  "Esc",
+                  " "
+                ]
+              }, undefined, true, undefined, this),
               /* @__PURE__ */ import_jsx_dev_runtime2.jsxDEV("span", {
                 fg: C2.fgMuted,
                 children: "to cancel"
@@ -98749,8 +98922,11 @@ function App() {
                 children: /* @__PURE__ */ import_jsx_dev_runtime2.jsxDEV("span", {
                   fg: C2.green,
                   bold: true,
-                  children: "> "
-                }, undefined, false, undefined, this)
+                  children: [
+                    ">",
+                    " "
+                  ]
+                }, undefined, true, undefined, this)
               }, undefined, false, undefined, this),
               /* @__PURE__ */ import_jsx_dev_runtime2.jsxDEV("input", {
                 value: inputValue,
@@ -98782,8 +98958,11 @@ function App() {
               /* @__PURE__ */ import_jsx_dev_runtime2.jsxDEV("span", {
                 fg: C2.blue,
                 bold: true,
-                children: "Status: "
-              }, undefined, false, undefined, this),
+                children: [
+                  "Status:",
+                  " "
+                ]
+              }, undefined, true, undefined, this),
               hasKey ? /* @__PURE__ */ import_jsx_dev_runtime2.jsxDEV("span", {
                 fg: C2.green,
                 bold: true,
@@ -98799,8 +98978,11 @@ function App() {
               /* @__PURE__ */ import_jsx_dev_runtime2.jsxDEV("span", {
                 fg: C2.blue,
                 bold: true,
-                children: "Key: "
-              }, undefined, false, undefined, this),
+                children: [
+                  "Key:",
+                  " "
+                ]
+              }, undefined, true, undefined, this),
               /* @__PURE__ */ import_jsx_dev_runtime2.jsxDEV("span", {
                 fg: C2.green,
                 children: displayKey
@@ -98821,8 +99003,11 @@ function App() {
             /* @__PURE__ */ import_jsx_dev_runtime2.jsxDEV("span", {
               fg: C2.blue,
               bold: true,
-              children: "URL:     "
-            }, undefined, false, undefined, this),
+              children: [
+                "URL:",
+                " "
+              ]
+            }, undefined, true, undefined, this),
             /* @__PURE__ */ import_jsx_dev_runtime2.jsxDEV("span", {
               fg: C2.cyan,
               children: activeEndpoint || selectedProvider.defaultEndpoint || "default"
@@ -98834,8 +99019,11 @@ function App() {
             /* @__PURE__ */ import_jsx_dev_runtime2.jsxDEV("span", {
               fg: C2.blue,
               bold: true,
-              children: "Desc:    "
-            }, undefined, false, undefined, this),
+              children: [
+                "Desc:",
+                " "
+              ]
+            }, undefined, true, undefined, this),
             /* @__PURE__ */ import_jsx_dev_runtime2.jsxDEV("span", {
               fg: C2.white,
               children: selectedProvider.description
@@ -98847,8 +99035,11 @@ function App() {
             /* @__PURE__ */ import_jsx_dev_runtime2.jsxDEV("span", {
               fg: C2.blue,
               bold: true,
-              children: "Get Key: "
-            }, undefined, false, undefined, this),
+              children: [
+                "Get Key:",
+                " "
+              ]
+            }, undefined, true, undefined, this),
             /* @__PURE__ */ import_jsx_dev_runtime2.jsxDEV("span", {
               fg: C2.cyan,
               children: selectedProvider.keyUrl
@@ -98872,37 +99063,81 @@ function App() {
       flexDirection: "column",
       paddingX: 1,
       children: [
+        /* @__PURE__ */ import_jsx_dev_runtime2.jsxDEV("text", {
+          children: /* @__PURE__ */ import_jsx_dev_runtime2.jsxDEV("span", {
+            fg: C2.blue,
+            bold: true,
+            children: " Default fallback chain:"
+          }, undefined, false, undefined, this)
+        }, undefined, false, undefined, this),
         /* @__PURE__ */ import_jsx_dev_runtime2.jsxDEV("text", {
           children: [
             /* @__PURE__ */ import_jsx_dev_runtime2.jsxDEV("span", {
               fg: C2.dim,
-              children: "  *  "
+              children: " "
             }, undefined, false, undefined, this),
             /* @__PURE__ */ import_jsx_dev_runtime2.jsxDEV("span", {
-              fg: C2.fgMuted,
-              children: "LiteLLM \u2192 Zen Go \u2192 Subscription \u2192 Provider Direct \u2192 OpenRouter"
+              fg: C2.cyan,
+              children: "LiteLLM"
+            }, undefined, false, undefined, this),
+            /* @__PURE__ */ import_jsx_dev_runtime2.jsxDEV("span", {
+              fg: C2.dim,
+              children: " \u2192 "
+            }, undefined, false, undefined, this),
+            /* @__PURE__ */ import_jsx_dev_runtime2.jsxDEV("span", {
+              fg: C2.cyan,
+              children: "Zen Go"
+            }, undefined, false, undefined, this),
+            /* @__PURE__ */ import_jsx_dev_runtime2.jsxDEV("span", {
+              fg: C2.dim,
+              children: " \u2192 "
+            }, undefined, false, undefined, this),
+            /* @__PURE__ */ import_jsx_dev_runtime2.jsxDEV("span", {
+              fg: C2.cyan,
+              children: "Subscription"
+            }, undefined, false, undefined, this),
+            /* @__PURE__ */ import_jsx_dev_runtime2.jsxDEV("span", {
+              fg: C2.dim,
+              children: " \u2192 "
+            }, undefined, false, undefined, this),
+            /* @__PURE__ */ import_jsx_dev_runtime2.jsxDEV("span", {
+              fg: C2.cyan,
+              children: "Provider Direct"
             }, undefined, false, undefined, this),
             /* @__PURE__ */ import_jsx_dev_runtime2.jsxDEV("span", {
               fg: C2.dim,
-              children: " (built-in)"
+              children: " \u2192 "
+            }, undefined, false, undefined, this),
+            /* @__PURE__ */ import_jsx_dev_runtime2.jsxDEV("span", {
+              fg: C2.cyan,
+              children: "OpenRouter"
             }, undefined, false, undefined, this)
           ]
         }, undefined, true, undefined, this),
-        /* @__PURE__ */ import_jsx_dev_runtime2.jsxDEV("text", {
-          children: " "
-        }, undefined, false, undefined, this),
         /* @__PURE__ */ import_jsx_dev_runtime2.jsxDEV("text", {
           children: /* @__PURE__ */ import_jsx_dev_runtime2.jsxDEV("span", {
-            fg: C2.blue,
-            bold: true,
-            children: "  PATTERN         CHAIN"
+            fg: C2.dim,
+            children: " \u2500".repeat(Math.max(1, Math.floor((width - 6) / 2)))
           }, undefined, false, undefined, this)
         }, undefined, false, undefined, this),
+        /* @__PURE__ */ import_jsx_dev_runtime2.jsxDEV("text", {
+          children: [
+            /* @__PURE__ */ import_jsx_dev_runtime2.jsxDEV("span", {
+              fg: C2.blue,
+              bold: true,
+              children: " Custom rules:"
+            }, undefined, false, undefined, this),
+            /* @__PURE__ */ import_jsx_dev_runtime2.jsxDEV("span", {
+              fg: C2.fgMuted,
+              children: "  (override default for matching models)"
+            }, undefined, false, undefined, this)
+          ]
+        }, undefined, true, undefined, this),
         ruleEntries.length === 0 && !isRoutingInput && /* @__PURE__ */ import_jsx_dev_runtime2.jsxDEV("text", {
           children: [
             /* @__PURE__ */ import_jsx_dev_runtime2.jsxDEV("span", {
               fg: C2.fgMuted,
-              children: "  No custom rules. Press "
+              children: " None configured. Press "
             }, undefined, false, undefined, this),
             /* @__PURE__ */ import_jsx_dev_runtime2.jsxDEV("span", {
               fg: C2.green,
@@ -98911,7 +99146,7 @@ function App() {
             }, undefined, false, undefined, this),
             /* @__PURE__ */ import_jsx_dev_runtime2.jsxDEV("span", {
               fg: C2.fgMuted,
-              children: " to add one."
+              children: " to add."
             }, undefined, false, undefined, this)
           ]
         }, undefined, true, undefined, this),
@@ -98974,23 +99209,20 @@ function App() {
                 }, undefined, false, undefined, this)
               ]
             }, undefined, true, undefined, this),
-            /* @__PURE__ */ import_jsx_dev_runtime2.jsxDEV("box", {
-              flexDirection: "row",
+            /* @__PURE__ */ import_jsx_dev_runtime2.jsxDEV("text", {
               children: [
-                /* @__PURE__ */ import_jsx_dev_runtime2.jsxDEV("text", {
-                  children: /* @__PURE__ */ import_jsx_dev_runtime2.jsxDEV("span", {
-                    fg: C2.green,
-                    bold: true,
-                    children: "> "
-                  }, undefined, false, undefined, this)
+                /* @__PURE__ */ import_jsx_dev_runtime2.jsxDEV("span", {
+                  fg: C2.green,
+                  bold: true,
+                  children: "> "
+                }, undefined, false, undefined, this),
+                /* @__PURE__ */ import_jsx_dev_runtime2.jsxDEV("span", {
+                  fg: C2.white,
+                  children: routingPattern
                 }, undefined, false, undefined, this),
-                /* @__PURE__ */ import_jsx_dev_runtime2.jsxDEV("input", {
-                  value: routingPattern,
-                  onChange: setRoutingPattern,
-                  focused: true,
-                  width: width - 8,
-                  backgroundColor: C2.bgHighlight,
-                  textColor: C2.white
+                /* @__PURE__ */ import_jsx_dev_runtime2.jsxDEV("span", {
+                  fg: C2.cyan,
+                  children: "\u2588"
                 }, undefined, false, undefined, this)
               ]
             }, undefined, true, undefined, this),
@@ -98999,8 +99231,11 @@ function App() {
                 /* @__PURE__ */ import_jsx_dev_runtime2.jsxDEV("span", {
                   fg: C2.green,
                   bold: true,
-                  children: "Enter "
-                }, undefined, false, undefined, this),
+                  children: [
+                    "Enter",
+                    " "
+                  ]
+                }, undefined, true, undefined, this),
                 /* @__PURE__ */ import_jsx_dev_runtime2.jsxDEV("span", {
                   fg: C2.fgMuted,
                   children: "to continue \xB7 "
@@ -99008,8 +99243,11 @@ function App() {
                 /* @__PURE__ */ import_jsx_dev_runtime2.jsxDEV("span", {
                   fg: C2.red,
                   bold: true,
-                  children: "Esc "
-                }, undefined, false, undefined, this),
+                  children: [
+                    "Esc",
+                    " "
+                  ]
+                }, undefined, true, undefined, this),
                 /* @__PURE__ */ import_jsx_dev_runtime2.jsxDEV("span", {
                   fg: C2.fgMuted,
                   children: "to cancel"
@@ -99026,7 +99264,7 @@ function App() {
                 /* @__PURE__ */ import_jsx_dev_runtime2.jsxDEV("span", {
                   fg: C2.blue,
                   bold: true,
-                  children: "Chain for "
+                  children: "Select providers for "
                 }, undefined, false, undefined, this),
                 /* @__PURE__ */ import_jsx_dev_runtime2.jsxDEV("span", {
                   fg: C2.white,
@@ -99035,52 +99273,57 @@ function App() {
                 }, undefined, false, undefined, this),
                 /* @__PURE__ */ import_jsx_dev_runtime2.jsxDEV("span", {
                   fg: C2.dim,
-                  children: " (comma-separated providers):"
-                }, undefined, false, undefined, this)
-              ]
-            }, undefined, true, undefined, this),
-            /* @__PURE__ */ import_jsx_dev_runtime2.jsxDEV("box", {
-              flexDirection: "row",
-              children: [
-                /* @__PURE__ */ import_jsx_dev_runtime2.jsxDEV("text", {
-                  children: /* @__PURE__ */ import_jsx_dev_runtime2.jsxDEV("span", {
-                    fg: C2.green,
-                    bold: true,
-                    children: "> "
-                  }, undefined, false, undefined, this)
-                }, undefined, false, undefined, this),
-                /* @__PURE__ */ import_jsx_dev_runtime2.jsxDEV("input", {
-                  value: routingChain,
-                  onChange: setRoutingChain,
-                  focused: true,
-                  width: width - 8,
-                  backgroundColor: C2.bgHighlight,
-                  textColor: C2.white
+                  children: " (Space=toggle, 1-9=set position, Enter=save)"
                 }, undefined, false, undefined, this)
               ]
             }, undefined, true, undefined, this),
-            /* @__PURE__ */ import_jsx_dev_runtime2.jsxDEV("text", {
+            chainOrder.length > 0 && /* @__PURE__ */ import_jsx_dev_runtime2.jsxDEV("text", {
               children: [
-                /* @__PURE__ */ import_jsx_dev_runtime2.jsxDEV("span", {
-                  fg: C2.green,
-                  bold: true,
-                  children: "Enter "
-                }, undefined, false, undefined, this),
                 /* @__PURE__ */ import_jsx_dev_runtime2.jsxDEV("span", {
                   fg: C2.fgMuted,
-                  children: "to save \xB7 "
+                  children: "  Chain: "
                 }, undefined, false, undefined, this),
                 /* @__PURE__ */ import_jsx_dev_runtime2.jsxDEV("span", {
-                  fg: C2.red,
-                  bold: true,
-                  children: "Esc "
-                }, undefined, false, undefined, this),
-                /* @__PURE__ */ import_jsx_dev_runtime2.jsxDEV("span", {
-                  fg: C2.fgMuted,
-                  children: "to go back"
+                  fg: C2.cyan,
+                  children: chainOrder.join(" \u2192 ")
                 }, undefined, false, undefined, this)
               ]
-            }, undefined, true, undefined, this)
+            }, undefined, true, undefined, this),
+            CHAIN_PROVIDERS.map((prov, idx) => {
+              const isCursor = idx === chainCursor;
+              const isOn = chainSelected.has(prov.name);
+              const pos = isOn ? chainOrder.indexOf(prov.name) + 1 : 0;
+              const hasKey2 = !!(config3.apiKeys?.[prov.apiKeyEnvVar] || process.env[prov.apiKeyEnvVar]);
+              const label = prov.displayName.padEnd(18).substring(0, 18);
+              return /* @__PURE__ */ import_jsx_dev_runtime2.jsxDEV("box", {
+                height: 1,
+                backgroundColor: isCursor ? C2.bgHighlight : C2.bg,
+                children: /* @__PURE__ */ import_jsx_dev_runtime2.jsxDEV("text", {
+                  children: [
+                    isOn ? /* @__PURE__ */ import_jsx_dev_runtime2.jsxDEV("span", {
+                      fg: C2.green,
+                      bold: true,
+                      children: ` [${pos}] `
+                    }, undefined, false, undefined, this) : /* @__PURE__ */ import_jsx_dev_runtime2.jsxDEV("span", {
+                      fg: C2.dim,
+                      children: " [ ] "
+                    }, undefined, false, undefined, this),
+                    /* @__PURE__ */ import_jsx_dev_runtime2.jsxDEV("span", {
+                      fg: isCursor ? C2.white : hasKey2 ? C2.fgMuted : C2.dim,
+                      bold: isCursor,
+                      children: label
+                    }, undefined, false, undefined, this),
+                    hasKey2 ? /* @__PURE__ */ import_jsx_dev_runtime2.jsxDEV("span", {
+                      fg: C2.green,
+                      children: " \u25CF"
+                    }, undefined, false, undefined, this) : /* @__PURE__ */ import_jsx_dev_runtime2.jsxDEV("span", {
+                      fg: C2.dim,
+                      children: " \u25CB no key"
+                    }, undefined, false, undefined, this)
+                  ]
+                }, undefined, true, undefined, this)
+              }, prov.name, false, undefined, this);
+            })
           ]
         }, undefined, true, undefined, this)
       ]
@@ -99099,74 +99342,74 @@ function App() {
       children: [
         /* @__PURE__ */ import_jsx_dev_runtime2.jsxDEV("text", {
           children: [
-            /* @__PURE__ */ import_jsx_dev_runtime2.jsxDEV("span", {
-              fg: C2.dim,
-              children: "kimi-*  "
-            }, undefined, false, undefined, this),
             /* @__PURE__ */ import_jsx_dev_runtime2.jsxDEV("span", {
               fg: C2.fgMuted,
-              children: "kimi \u2192 or"
+              children: "  kimi-*      "
             }, undefined, false, undefined, this),
             /* @__PURE__ */ import_jsx_dev_runtime2.jsxDEV("span", {
               fg: C2.dim,
-              children: "          "
+              children: " \u2192 "
             }, undefined, false, undefined, this),
             /* @__PURE__ */ import_jsx_dev_runtime2.jsxDEV("span", {
-              fg: C2.dim,
-              children: "gpt-*  "
-            }, undefined, false, undefined, this),
+              fg: C2.cyan,
+              children: "kimi, openrouter"
+            }, undefined, false, undefined, this)
+          ]
+        }, undefined, true, undefined, this),
+        /* @__PURE__ */ import_jsx_dev_runtime2.jsxDEV("text", {
+          children: [
             /* @__PURE__ */ import_jsx_dev_runtime2.jsxDEV("span", {
               fg: C2.fgMuted,
-              children: "oai \u2192 litellm"
+              children: "  gpt-*       "
             }, undefined, false, undefined, this),
             /* @__PURE__ */ import_jsx_dev_runtime2.jsxDEV("span", {
               fg: C2.dim,
-              children: "          "
+              children: " \u2192 "
             }, undefined, false, undefined, this),
             /* @__PURE__ */ import_jsx_dev_runtime2.jsxDEV("span", {
-              fg: C2.dim,
-              children: "gemini-*  "
-            }, undefined, false, undefined, this),
-            /* @__PURE__ */ import_jsx_dev_runtime2.jsxDEV("span", {
-              fg: C2.fgMuted,
-              children: "google \u2192 zen \u2192 or"
+              fg: C2.cyan,
+              children: "oai, litellm"
             }, undefined, false, undefined, this)
           ]
         }, undefined, true, undefined, this),
         /* @__PURE__ */ import_jsx_dev_runtime2.jsxDEV("text", {
           children: [
-            /* @__PURE__ */ import_jsx_dev_runtime2.jsxDEV("span", {
-              fg: C2.dim,
-              children: "glm-*  "
-            }, undefined, false, undefined, this),
             /* @__PURE__ */ import_jsx_dev_runtime2.jsxDEV("span", {
               fg: C2.fgMuted,
-              children: "glm \u2192 zen \u2192 or"
+              children: "  gemini-*    "
             }, undefined, false, undefined, this),
             /* @__PURE__ */ import_jsx_dev_runtime2.jsxDEV("span", {
               fg: C2.dim,
-              children: "       "
+              children: " \u2192 "
             }, undefined, false, undefined, this),
             /* @__PURE__ */ import_jsx_dev_runtime2.jsxDEV("span", {
-              fg: C2.dim,
-              children: "deepseek-*  "
-            }, undefined, false, undefined, this),
+              fg: C2.cyan,
+              children: "google, zen, openrouter"
+            }, undefined, false, undefined, this)
+          ]
+        }, undefined, true, undefined, this),
+        /* @__PURE__ */ import_jsx_dev_runtime2.jsxDEV("text", {
+          children: [
             /* @__PURE__ */ import_jsx_dev_runtime2.jsxDEV("span", {
               fg: C2.fgMuted,
-              children: "zen \u2192 or"
+              children: "  deepseek-*  "
             }, undefined, false, undefined, this),
             /* @__PURE__ */ import_jsx_dev_runtime2.jsxDEV("span", {
               fg: C2.dim,
-              children: "             "
+              children: " \u2192 "
             }, undefined, false, undefined, this),
             /* @__PURE__ */ import_jsx_dev_runtime2.jsxDEV("span", {
-              fg: C2.dim,
-              children: "Pattern: glob (* = any)"
+              fg: C2.cyan,
+              children: "zen, openrouter"
             }, undefined, false, undefined, this)
           ]
         }, undefined, true, undefined, this),
         /* @__PURE__ */ import_jsx_dev_runtime2.jsxDEV("text", {
           children: [
+            /* @__PURE__ */ import_jsx_dev_runtime2.jsxDEV("span", {
+              fg: C2.dim,
+              children: "  Glob pattern (* = any). Chain tried left to right. "
+            }, undefined, false, undefined, this),
             /* @__PURE__ */ import_jsx_dev_runtime2.jsxDEV("span", {
               fg: C2.cyan,
               bold: true,
@@ -99174,8 +99417,11 @@ function App() {
             }, undefined, false, undefined, this),
             /* @__PURE__ */ import_jsx_dev_runtime2.jsxDEV("span", {
               fg: C2.fgMuted,
-              children: ` custom rule${ruleEntries.length !== 1 ? "s" : ""}`
-            }, undefined, false, undefined, this)
+              children: [
+                " custom rule",
+                ruleEntries.length !== 1 ? "s" : ""
+              ]
+            }, undefined, true, undefined, this)
           ]
         }, undefined, true, undefined, this)
       ]
@@ -99206,8 +99452,11 @@ function App() {
                 /* @__PURE__ */ import_jsx_dev_runtime2.jsxDEV("span", {
                   fg: C2.blue,
                   bold: true,
-                  children: "Status: "
-                }, undefined, false, undefined, this),
+                  children: [
+                    "Status:",
+                    " "
+                  ]
+                }, undefined, true, undefined, this),
                 telemetryEnabled ? /* @__PURE__ */ import_jsx_dev_runtime2.jsxDEV("span", {
                   fg: C2.green,
                   bold: true,
@@ -99281,8 +99530,11 @@ function App() {
                 /* @__PURE__ */ import_jsx_dev_runtime2.jsxDEV("span", {
                   fg: C2.blue,
                   bold: true,
-                  children: "Status: "
-                }, undefined, false, undefined, this),
+                  children: [
+                    "Status:",
+                    " "
+                  ]
+                }, undefined, true, undefined, this),
                 statsEnabled2 ? /* @__PURE__ */ import_jsx_dev_runtime2.jsxDEV("span", {
                   fg: C2.green,
                   bold: true,
@@ -99298,8 +99550,11 @@ function App() {
                 /* @__PURE__ */ import_jsx_dev_runtime2.jsxDEV("span", {
                   fg: C2.blue,
                   bold: true,
-                  children: "Buffer: "
-                }, undefined, false, undefined, this),
+                  children: [
+                    "Buffer:",
+                    " "
+                  ]
+                }, undefined, true, undefined, this),
                 /* @__PURE__ */ import_jsx_dev_runtime2.jsxDEV("span", {
                   fg: C2.white,
                   bold: true,
@@ -99577,7 +99832,7 @@ __export(exports_team_cli, {
   teamCommand: () => teamCommand
 });
 import { readFileSync as readFileSync16 } from "fs";
-import { join as join19 } from "path";
+import { join as join20 } from "path";
 function getFlag(args, flag) {
   const idx = args.indexOf(flag);
   if (idx === -1 || idx + 1 >= args.length)
@@ -99669,7 +99924,7 @@ async function teamCommand(args) {
     }
     case "judge": {
       const verdict = await judgeResponses(sessionPath, { judges });
-      console.log(readFileSync16(join19(sessionPath, "verdict.md"), "utf-8"));
+      console.log(readFileSync16(join20(sessionPath, "verdict.md"), "utf-8"));
       break;
     }
     case "run-and-judge": {
@@ -99687,7 +99942,7 @@ async function teamCommand(args) {
       });
       printStatus(status);
       await judgeResponses(sessionPath, { judges });
-      console.log(readFileSync16(join19(sessionPath, "verdict.md"), "utf-8"));
+      console.log(readFileSync16(join20(sessionPath, "verdict.md"), "utf-8"));
       break;
     }
     case "status": {
@@ -99713,11 +99968,17 @@ __export(exports_claude_runner, {
   checkClaudeInstalled: () => checkClaudeInstalled
 });
 import { spawn as spawn2 } from "child_process";
-import { writeFileSync as writeFileSync11, unlinkSync as unlinkSync7, mkdirSync as mkdirSync10, existsSync as existsSync19, readFileSync as readFileSync17 } from "fs";
-import { tmpdir as tmpdir2, homedir as homedir17 } from "os";
-import { join as join20 } from "path";
+import { writeFileSync as writeFileSync11, unlinkSync as unlinkSync7, mkdirSync as mkdirSync10, existsSync as existsSync20, readFileSync as readFileSync17 } from "fs";
+import { tmpdir as tmpdir2, homedir as homedir18 } from "os";
+import { join as join21 } from "path";
 function hasNativeAnthropicMapping(config3) {
-  const models = [config3.model, config3.modelOpus, config3.modelSonnet, config3.modelHaiku, config3.modelSubagent];
+  const models = [
+    config3.model,
+    config3.modelOpus,
+    config3.modelSonnet,
+    config3.modelHaiku,
+    config3.modelSubagent
+  ];
   return models.some((m2) => m2 && parseModelSpec(m2).provider === "native-anthropic");
 }
 function isWindows2() {
@@ -99725,9 +99986,9 @@ function isWindows2() {
 }
 function createStatusLineScript(tokenFilePath) {
   const homeDir = process.env.HOME || process.env.USERPROFILE || tmpdir2();
-  const claudishDir = join20(homeDir, ".claudish");
+  const claudishDir = join21(homeDir, ".claudish");
   const timestamp = Date.now();
-  const scriptPath = join20(claudishDir, `status-${timestamp}.js`);
+  const scriptPath = join21(claudishDir, `status-${timestamp}.js`);
   const escapedTokenPath = tokenFilePath.replace(/\\/g, "\\\\");
   const script = `
 const fs = require('fs');
@@ -99812,13 +100073,13 @@ process.stdin.on('end', () => {
 }
 function createTempSettingsFile(modelDisplay, port) {
   const homeDir = process.env.HOME || process.env.USERPROFILE || tmpdir2();
-  const claudishDir = join20(homeDir, ".claudish");
+  const claudishDir = join21(homeDir, ".claudish");
   try {
     mkdirSync10(claudishDir, { recursive: true });
   } catch {}
   const timestamp = Date.now();
-  const tempPath = join20(claudishDir, `settings-${timestamp}.json`);
-  const tokenFilePath = join20(claudishDir, `tokens-${port}.json`);
+  const tempPath = join21(claudishDir, `settings-${timestamp}.json`);
+  const tokenFilePath = join21(claudishDir, `tokens-${port}.json`);
   let statusCommand;
   if (isWindows2()) {
     const scriptPath = createStatusLineScript(tokenFilePath);
@@ -99946,8 +100207,8 @@ async function runClaudeWithProxy(config3, proxyUrl, onCleanup, ptyDiagRunner) {
     console.error("Install it from: https://claude.com/claude-code");
     console.error(`
 Or set CLAUDE_PATH to your custom installation:`);
-    const home = homedir17();
-    const localPath = isWindows2() ? join20(home, ".claude", "local", "claude.exe") : join20(home, ".claude", "local", "claude");
+    const home = homedir18();
+    const localPath = isWindows2() ? join21(home, ".claude", "local", "claude.exe") : join21(home, ".claude", "local", "claude");
     console.error(`  export CLAUDE_PATH=${localPath}`);
     process.exit(1);
   }
@@ -100001,23 +100262,23 @@ function setupSignalHandlers(proc, tempSettingsPath, quiet, onCleanup) {
 async function findClaudeBinary() {
   const isWindows3 = process.platform === "win32";
   if (process.env.CLAUDE_PATH) {
-    if (existsSync19(process.env.CLAUDE_PATH)) {
+    if (existsSync20(process.env.CLAUDE_PATH)) {
       return process.env.CLAUDE_PATH;
     }
   }
-  const home = homedir17();
-  const localPath = isWindows3 ? join20(home, ".claude", "local", "claude.exe") : join20(home, ".claude", "local", "claude");
-  if (existsSync19(localPath)) {
+  const home = homedir18();
+  const localPath = isWindows3 ? join21(home, ".claude", "local", "claude.exe") : join21(home, ".claude", "local", "claude");
+  if (existsSync20(localPath)) {
     return localPath;
   }
   if (isWindows3) {
     const windowsPaths = [
-      join20(home, "AppData", "Roaming", "npm", "claude.cmd"),
-      join20(home, ".npm-global", "claude.cmd"),
-      join20(home, "node_modules", ".bin", "claude.cmd")
+      join21(home, "AppData", "Roaming", "npm", "claude.cmd"),
+      join21(home, ".npm-global", "claude.cmd"),
+      join21(home, "node_modules", ".bin", "claude.cmd")
     ];
     for (const path2 of windowsPaths) {
-      if (existsSync19(path2)) {
+      if (existsSync20(path2)) {
         return path2;
       }
     }
@@ -100025,14 +100286,14 @@ async function findClaudeBinary() {
     const commonPaths = [
       "/usr/local/bin/claude",
       "/opt/homebrew/bin/claude",
-      join20(home, ".npm-global/bin/claude"),
-      join20(home, ".local/bin/claude"),
-      join20(home, "node_modules/.bin/claude"),
+      join21(home, ".npm-global/bin/claude"),
+      join21(home, ".local/bin/claude"),
+      join21(home, "node_modules/.bin/claude"),
       "/data/data/com.termux/files/usr/bin/claude",
-      join20(home, "../usr/bin/claude")
+      join21(home, "../usr/bin/claude")
     ];
     for (const path2 of commonPaths) {
-      if (existsSync19(path2)) {
+      if (existsSync20(path2)) {
         return path2;
       }
     }
@@ -100081,21 +100342,22 @@ __export(exports_diag_output, {
   TmuxDiagOutput: () => TmuxDiagOutput,
   OpentUiDiagOutput: () => OpentUiDiagOutput,
   NullDiagOutput: () => NullDiagOutput,
+  MtmDiagOutput: () => MtmDiagOutput,
   LogFileDiagOutput: () => LogFileDiagOutput
 });
 import { createWriteStream as createWriteStream2, mkdirSync as mkdirSync11, writeFileSync as writeFileSync12, unlinkSync as unlinkSync8 } from "fs";
 import { execFileSync } from "child_process";
-import { homedir as homedir18 } from "os";
-import { join as join21 } from "path";
+import { homedir as homedir19 } from "os";
+import { join as join22 } from "path";
 function getClaudishDir() {
-  const dir = join21(homedir18(), ".claudish");
+  const dir = join22(homedir19(), ".claudish");
   try {
     mkdirSync11(dir, { recursive: true });
   } catch {}
   return dir;
 }
 function getDiagLogPath() {
-  return join21(getClaudishDir(), `diag-${process.pid}.log`);
+  return join22(getClaudishDir(), `diag-${process.pid}.log`);
 }
 
 class LogFileDiagOutput {
@@ -100131,22 +100393,27 @@ class LogFileDiagOutput {
   }
 }
 
-class OpentUiDiagOutput {
+class MtmDiagOutput {
   runner;
-  messages = [];
   constructor(runner) {
     this.runner = runner;
   }
   write(msg) {
-    const level = msg.toLowerCase().includes("error") ? "error" : msg.toLowerCase().includes("warn") ? "warn" : "info";
-    this.messages.push({ text: msg, level });
-    if (this.messages.length > 4) {
-      this.messages = this.messages.slice(-4);
-    }
-    this.runner.showDiag(this.messages).catch(() => {});
+    this.runner.write(msg);
+  }
+  cleanup() {}
+}
+
+class OpentUiDiagOutput {
+  inner;
+  constructor(runner) {
+    this.inner = new MtmDiagOutput(runner);
+  }
+  write(msg) {
+    this.inner.write(msg);
   }
   cleanup() {
-    this.runner.hideDiag();
+    this.inner.cleanup();
   }
 }
 
@@ -100162,9 +100429,10 @@ function createDiagOutput(options) {
   if (mode === "off") {
     return new NullDiagOutput;
   }
+  const mtmRunner = options.mtmRunner ?? options.ptyRunner ?? null;
   if (mode === "pty" || mode === "auto") {
-    if (options.ptyRunner) {
-      return new OpentUiDiagOutput(options.ptyRunner);
+    if (mtmRunner) {
+      return new MtmDiagOutput(mtmRunner);
     }
     if (mode === "pty") {
       return new LogFileDiagOutput;
@@ -100196,7 +100464,10 @@ var init_diag_output = __esm(() => {
           args.push("-t", targetPane);
         }
         args.push("tail", "-f", this.logPath);
-        const output = execFileSync("tmux", args, { encoding: "utf-8", stdio: ["pipe", "pipe", "pipe"] });
+        const output = execFileSync("tmux", args, {
+          encoding: "utf-8",
+          stdio: ["pipe", "pipe", "pipe"]
+        });
         this.paneId = output.trim();
       } catch {
         this.paneId = null;
@@ -100216,213 +100487,199 @@ var init_diag_output = __esm(() => {
   };
 });
 
-// src/tui/DiagPanel.tsx
-function DiagPanel({ messages }) {
-  const { width } = useTerminalDimensions();
-  const panelWidth = Math.max(1, width);
-  const separator = "\u2500".repeat(panelWidth);
-  return /* @__PURE__ */ import_jsx_dev_runtime2.jsxDEV("box", {
-    x: 0,
-    y: 0,
-    width: panelWidth,
-    height: 5,
-    backgroundColor: "#1a1a2e",
-    children: [
-      /* @__PURE__ */ import_jsx_dev_runtime2.jsxDEV("text", {
-        x: 0,
-        y: 0,
-        content: separator,
-        color: "#44475a"
-      }, undefined, false, undefined, this),
-      messages.slice(-3).map((msg, i) => {
-        const prefix = LEVEL_PREFIX[msg.level];
-        const color = LEVEL_COLORS[msg.level];
-        const maxTextLen = Math.max(1, panelWidth - prefix.length - 1);
-        const truncated = msg.text.length > maxTextLen ? `${msg.text.slice(0, maxTextLen - 1)}\u2026` : msg.text;
-        return /* @__PURE__ */ import_jsx_dev_runtime2.jsxDEV("text", {
-          x: 0,
-          y: i + 1,
-          content: `${prefix} ${truncated}`,
-          color
-        }, `msg-${i}`, false, undefined, this);
-      }),
-      messages.length < 3 && Array.from({ length: 3 - messages.length }).map((_2, i) => /* @__PURE__ */ import_jsx_dev_runtime2.jsxDEV("text", {
-        x: 0,
-        y: messages.length + i + 1,
-        content: ""
-      }, `empty-${i}`, false, undefined, this)),
-      /* @__PURE__ */ import_jsx_dev_runtime2.jsxDEV("text", {
-        x: 0,
-        y: 4,
-        content: "Press ESC to dismiss",
-        color: "#6272a4"
-      }, undefined, false, undefined, this)
-    ]
-  }, undefined, true, undefined, this);
-}
-var LEVEL_COLORS, LEVEL_PREFIX;
-var init_DiagPanel = __esm(async () => {
-  init_jsx_dev_runtime();
-  await init_react();
-  LEVEL_COLORS = {
-    error: "#ff5555",
-    warn: "#ffb86c",
-    info: "#8be9fd"
-  };
-  LEVEL_PREFIX = {
-    error: "[ERROR]",
-    warn: "[WARN] ",
-    info: "[INFO] "
-  };
-});
-
 // src/pty-diag-runner.ts
 var exports_pty_diag_runner = {};
 __export(exports_pty_diag_runner, {
   tryCreatePtyRunner: () => tryCreatePtyRunner,
-  PtyDiagRunner: () => PtyDiagRunner
+  tryCreateMtmRunner: () => tryCreateMtmRunner,
+  PtyDiagRunner: () => MtmDiagRunner,
+  MtmDiagRunner: () => MtmDiagRunner
 });
-import { writeSync as writeSync3 } from "fs";
+import { spawn as spawn3 } from "child_process";
+import { appendFileSync, createWriteStream as createWriteStream3, existsSync as existsSync21, mkdirSync as mkdirSync12, unlinkSync as unlinkSync9, writeFileSync as writeFileSync13 } from "fs";
+import { homedir as homedir20 } from "os";
+import { dirname as dirname6, join as join23 } from "path";
+import { execSync as execSync3 } from "child_process";
+import { fileURLToPath as fileURLToPath6 } from "url";
 
-class PtyDiagRunner {
-  renderer = null;
-  bunProc = null;
-  messages = [];
-  autoHideTimer = null;
-  reactRoot = null;
-  rawStdinHandler = null;
-  rendererInitializing = false;
-  async run(command, args, env2) {
-    const cols = process.stdout.columns || 80;
-    const rows = process.stdout.rows || 24;
-    this.bunProc = Bun.spawn([command, ...args], {
-      terminal: {
-        cols,
-        rows,
-        data: (_terminal, data) => {
-          const buf = typeof data === "string" ? Buffer.from(data, "binary") : data;
-          writeSync3(1, buf);
-        }
-      },
-      cwd: process.cwd(),
-      env: env2
+class MtmDiagRunner {
+  mtmProc = null;
+  logPath;
+  statusPath;
+  logStream = null;
+  constructor() {
+    const dir = join23(homedir20(), ".claudish");
+    try {
+      mkdirSync12(dir, { recursive: true });
+    } catch {}
+    this.logPath = join23(dir, `diag-${process.pid}.log`);
+    this.statusPath = join23(dir, `status-${process.pid}.txt`);
+    this.logStream = createWriteStream3(this.logPath, { flags: "w" });
+    this.logStream.on("error", () => {});
+    try {
+      writeFileSync13(this.statusPath, renderStatusBar({ model: "", provider: "", errorCount: 0, lastError: "" }) + `
+`);
+    } catch {}
+  }
+  async run(claudeCommand, claudeArgs, env2) {
+    const mtmBin = this.findMtmBinary();
+    const quotedArgs = claudeArgs.map((a) => shellQuote(a)).join(" ");
+    const claudeCmd = `${shellQuote(claudeCommand)} ${quotedArgs}`;
+    const mergedEnv = { ...process.env, ...env2 };
+    this.mtmProc = spawn3(mtmBin, ["-e", claudeCmd, "-S", this.statusPath], {
+      stdio: "inherit",
+      env: mergedEnv
+    });
+    const exitCode = await new Promise((resolve4) => {
+      this.mtmProc.on("exit", (code) => resolve4(code ?? 1));
+      this.mtmProc.on("error", () => resolve4(1));
     });
-    const startTime = Date.now();
-    const GRACE_PERIOD_MS = 2000;
-    this.rawStdinHandler = (chunk) => {
-      if (!this.bunProc?.terminal)
-        return;
-      const str = typeof chunk === "string" ? chunk : chunk.toString("binary");
-      if (Date.now() - startTime < GRACE_PERIOD_MS) {
-        if (str.includes("\x1B"))
-          return;
-      }
-      this.bunProc.terminal.write(str);
-    };
-    process.stdin.on("data", this.rawStdinHandler);
-    const resizeHandler = () => {
-      if (this.bunProc?.terminal) {
-        try {
-          this.bunProc.terminal.resize(process.stdout.columns || 80, process.stdout.rows || 24);
-        } catch {}
-      }
-    };
-    process.on("SIGWINCH", resizeHandler);
-    await this.bunProc.exited;
-    const exitCode = this.bunProc.exitCode ?? 1;
-    process.removeListener("SIGWINCH", resizeHandler);
     this.cleanup();
     return exitCode;
   }
-  async showDiag(messages) {
-    this.messages = messages.slice(-4);
-    if (!this.renderer && !this.rendererInitializing) {
-      this.rendererInitializing = true;
-      try {
-        this.renderer = await createCliRenderer({
-          useAlternateScreen: false,
-          experimental_splitHeight: 5,
-          exitOnCtrlC: false,
-          useMouse: false,
-          useKittyKeyboard: null,
-          targetFps: 10
-        });
-        this.reactRoot = createRoot(this.renderer);
-        this.renderDiagPanel();
-      } catch {
-        this.rendererInitializing = false;
-        return;
-      }
-      this.rendererInitializing = false;
-    } else if (this.renderer) {
-      if (this.renderer.experimental_splitHeight === 0) {
-        this.renderer.experimental_splitHeight = 5;
-      }
-      this.renderDiagPanel();
-    }
-    if (this.autoHideTimer)
-      clearTimeout(this.autoHideTimer);
-    this.autoHideTimer = setTimeout(() => this.hideDiag(), 1e4);
-  }
-  hideDiag() {
-    if (!this.renderer)
+  write(msg) {
+    if (!this.logStream)
       return;
-    if (this.autoHideTimer) {
-      clearTimeout(this.autoHideTimer);
-      this.autoHideTimer = null;
-    }
-    this.renderer.experimental_splitHeight = 0;
+    const timestamp = new Date().toISOString();
+    try {
+      this.logStream.write(`[${timestamp}] ${msg}
+`);
+    } catch {}
+    const parsed = parseLogMessage(msg);
+    if (parsed.isError) {
+      this.errorCount++;
+      this.lastError = parsed.short;
+      if (parsed.provider)
+        this.provider = parsed.provider;
+    }
+    this.refreshStatusBar();
+  }
+  modelName = "";
+  provider = "";
+  lastError = "";
+  errorCount = 0;
+  setModel(name) {
+    this.modelName = name.includes("/") ? name.split("/").pop() : name;
+    if (name.includes("@")) {
+      this.provider = name.split("@")[0];
+    } else if (name.includes("/")) {
+      this.provider = name.split("/")[0];
+    }
+    this.refreshStatusBar();
+  }
+  refreshStatusBar() {
+    const bar = renderStatusBar({
+      model: this.modelName,
+      provider: this.provider,
+      errorCount: this.errorCount,
+      lastError: this.lastError
+    });
+    try {
+      appendFileSync(this.statusPath, bar + `
+`);
+    } catch {}
   }
-  renderDiagPanel() {
-    if (!this.reactRoot)
-      return;
-    this.reactRoot.render(import_react17.createElement(DiagPanel, { messages: this.messages }));
+  getLogPath() {
+    return this.logPath;
   }
   cleanup() {
-    if (this.autoHideTimer) {
-      clearTimeout(this.autoHideTimer);
-      this.autoHideTimer = null;
-    }
-    if (this.rawStdinHandler) {
-      process.stdin.removeListener("data", this.rawStdinHandler);
-      this.rawStdinHandler = null;
-    }
-    if (this.bunProc) {
-      try {
-        this.bunProc.kill();
-      } catch {}
+    if (this.logStream) {
       try {
-        this.bunProc.terminal?.close();
+        this.logStream.end();
       } catch {}
-      this.bunProc = null;
+      this.logStream = null;
     }
-    if (this.renderer && !this.renderer.isDestroyed) {
+    try {
+      unlinkSync9(this.logPath);
+    } catch {}
+    try {
+      unlinkSync9(this.statusPath);
+    } catch {}
+    if (this.mtmProc) {
       try {
-        this.renderer.destroy();
+        this.mtmProc.kill();
       } catch {}
-      this.renderer = null;
+      this.mtmProc = null;
+    }
+  }
+  findMtmBinary() {
+    const thisFile = fileURLToPath6(import.meta.url);
+    const thisDir = dirname6(thisFile);
+    const platform3 = process.platform;
+    const arch = process.arch;
+    const bundledPlatform = join23(thisDir, "..", "..", "native", "mtm", `mtm-${platform3}-${arch}`);
+    if (existsSync21(bundledPlatform))
+      return bundledPlatform;
+    const builtDev = join23(thisDir, "..", "native", "mtm", "mtm");
+    if (existsSync21(builtDev))
+      return builtDev;
+    try {
+      const result = execSync3("which mtm", { encoding: "utf-8" }).trim();
+      if (result)
+        return result;
+    } catch {}
+    throw new Error("mtm binary not found. Build it with: cd packages/cli/native/mtm && make");
+  }
+}
+function shellQuote(s) {
+  return "'" + s.replace(/'/g, "'\\''") + "'";
+}
+function renderStatusBar(state) {
+  const { model, provider, errorCount, lastError } = state;
+  const parts = [];
+  parts.push("M: claudish ");
+  if (model)
+    parts.push(`C: ${model} `);
+  if (provider)
+    parts.push(`D: ${provider} `);
+  if (errorCount > 0) {
+    const errLabel = errorCount === 1 ? " \u26A0 1 error " : ` \u26A0 ${errorCount} errors `;
+    parts.push(`R:${errLabel}`);
+    if (lastError)
+      parts.push(`D: ${lastError} `);
+  } else {
+    parts.push("G: \u25CF ok ");
+  }
+  return parts.join("\t");
+}
+function parseLogMessage(msg) {
+  const providerMatch = msg.match(/\[(\w+)\]/);
+  const provider = providerMatch?.[1];
+  const httpMatch = msg.match(/HTTP (\d{3})/);
+  if (httpMatch) {
+    const jsonMatch = msg.match(/"message"\s*:\s*"([^"]+)"/);
+    if (jsonMatch?.[1]) {
+      const detail = jsonMatch[1].replace(/is not a valid model ID/, "invalid model").replace(/Provider returned error/, "provider error");
+      return { isError: true, short: detail, provider };
+    }
+    const hintMatch = msg.match(/HTTP \d{3}\.\s*(.+?)\.?\s*$/);
+    if (hintMatch?.[1]) {
+      return { isError: true, short: hintMatch[1], provider };
     }
+    return { isError: true, short: `HTTP ${httpMatch[1]}`, provider };
+  }
+  if (msg.includes("[Fallback]")) {
+    const countMatch = msg.match(/(\d+) provider/);
+    return { isError: false, short: `fallback: ${countMatch?.[1] || "?"} providers`, provider };
+  }
+  if (msg.toLowerCase().includes("error")) {
+    const short = msg.replace(/^Error\s*\[\w+\]:\s*/, "").replace(/\.\s*$/, "");
+    return { isError: true, short: short.length > 40 ? short.slice(0, 39) + "\u2026" : short, provider };
   }
+  return { isError: false, short: msg.length > 40 ? msg.slice(0, 39) + "\u2026" : msg };
 }
-async function tryCreatePtyRunner() {
+async function tryCreateMtmRunner() {
   try {
-    if (typeof Bun === "undefined")
-      return null;
-    const test = Bun.spawn(["true"], { terminal: { cols: 1, rows: 1 } });
-    await test.exited;
-    return new PtyDiagRunner;
+    const runner = new MtmDiagRunner;
+    runner.findMtmBinary();
+    return runner;
   } catch {
     return null;
   }
 }
-var import_react17;
-var init_pty_diag_runner = __esm(async () => {
-  await __promiseAll([
-    init_core3(),
-    init_react(),
-    init_DiagPanel()
-  ]);
-  import_react17 = __toESM(require_react(), 1);
+var tryCreatePtyRunner;
+var init_pty_diag_runner = __esm(() => {
+  tryCreatePtyRunner = tryCreateMtmRunner;
 });
 
 // src/port-manager.ts
@@ -104008,9 +104265,9 @@ var init_middleware = __esm(() => {
 });
 
 // src/handlers/shared/token-tracker.ts
-import { mkdirSync as mkdirSync12, writeFileSync as writeFileSync13 } from "fs";
-import { homedir as homedir19 } from "os";
-import { join as join22 } from "path";
+import { mkdirSync as mkdirSync13, writeFileSync as writeFileSync14 } from "fs";
+import { homedir as homedir21 } from "os";
+import { join as join24 } from "path";
 
 class TokenTracker {
   port;
@@ -104124,9 +104381,9 @@ class TokenTracker {
         is_free: isFreeModel,
         is_estimated: isEstimate || false
       };
-      const claudishDir = join22(homedir19(), ".claudish");
-      mkdirSync12(claudishDir, { recursive: true });
-      writeFileSync13(join22(claudishDir, `tokens-${this.port}.json`), JSON.stringify(data), "utf-8");
+      const claudishDir = join24(homedir21(), ".claudish");
+      mkdirSync13(claudishDir, { recursive: true });
+      writeFileSync14(join24(claudishDir, `tokens-${this.port}.json`), JSON.stringify(data), "utf-8");
     } catch (e) {
       log(`[TokenTracker] Error writing token file: ${e}`);
     }
@@ -105095,7 +105352,7 @@ class ComposedHandler {
         if (Array.isArray(msg.content)) {
           for (let partIdx = 0;partIdx < msg.content.length; partIdx++) {
             const part = msg.content[partIdx];
-            if (part.type === "image_url") {
+            if (part.type === "image_url" || part.type === "image" || part.type === "document") {
               imageBlocks.push({ msgIdx, partIdx, block: part });
             }
           }
@@ -105103,22 +105360,36 @@ class ComposedHandler {
       }
       if (imageBlocks.length > 0) {
         log(`[ComposedHandler] Non-vision model received ${imageBlocks.length} image(s), calling vision proxy`);
-        const auth = extractAuthHeaders(c);
-        const descriptions = await describeImages(imageBlocks.map((b2) => b2.block), auth);
-        if (descriptions !== null) {
-          for (let i = 0;i < imageBlocks.length; i++) {
-            const { msgIdx, partIdx } = imageBlocks[i];
+        const openAIImageBlocks = imageBlocks.filter((b2) => b2.block.type === "image_url");
+        let descriptions = null;
+        if (openAIImageBlocks.length > 0) {
+          const auth = extractAuthHeaders(c);
+          descriptions = await describeImages(openAIImageBlocks.map((b2) => b2.block), auth);
+        }
+        if (descriptions !== null && openAIImageBlocks.length > 0) {
+          for (let i = 0;i < openAIImageBlocks.length; i++) {
+            const { msgIdx, partIdx } = openAIImageBlocks[i];
             messages[msgIdx].content[partIdx] = {
               type: "text",
               text: `[Image Description: ${descriptions[i]}]`
             };
           }
           log(`[ComposedHandler] Vision proxy described ${descriptions.length} image(s)`);
+          for (const msg of messages) {
+            if (Array.isArray(msg.content)) {
+              msg.content = msg.content.filter((part) => part.type !== "image" && part.type !== "document");
+              if (msg.content.length === 1 && msg.content[0].type === "text") {
+                msg.content = msg.content[0].text;
+              } else if (msg.content.length === 0) {
+                msg.content = "";
+              }
+            }
+          }
         } else {
-          log(`[ComposedHandler] Vision proxy failed, stripping images`);
+          log(`[ComposedHandler] Stripping image/document blocks (vision not supported)`);
           for (const msg of messages) {
             if (Array.isArray(msg.content)) {
-              msg.content = msg.content.filter((part) => part.type !== "image_url");
+              msg.content = msg.content.filter((part) => part.type !== "image_url" && part.type !== "image" && part.type !== "document");
               if (msg.content.length === 1 && msg.content[0].type === "text") {
                 msg.content = msg.content[0].text;
               } else if (msg.content.length === 0) {
@@ -105548,9 +105819,9 @@ var init_composed_handler = __esm(() => {
 });
 
 // src/services/pricing-cache.ts
-import { readFileSync as readFileSync18, writeFileSync as writeFileSync14, existsSync as existsSync20, mkdirSync as mkdirSync13, statSync as statSync2 } from "fs";
-import { homedir as homedir20 } from "os";
-import { join as join23 } from "path";
+import { readFileSync as readFileSync18, writeFileSync as writeFileSync15, existsSync as existsSync23, mkdirSync as mkdirSync14, statSync as statSync2 } from "fs";
+import { homedir as homedir22 } from "os";
+import { join as join25 } from "path";
 function getDynamicPricingSync(provider, modelName) {
   if (provider === "openrouter") {
     const direct = pricingMap.get(modelName);
@@ -105615,7 +105886,7 @@ async function warmPricingCache() {
 }
 function loadDiskCache() {
   try {
-    if (!existsSync20(CACHE_FILE))
+    if (!existsSync23(CACHE_FILE))
       return false;
     const stat = statSync2(CACHE_FILE);
     const age = Date.now() - stat.mtimeMs;
@@ -105632,12 +105903,12 @@ function loadDiskCache() {
 }
 function saveDiskCache() {
   try {
-    mkdirSync13(CACHE_DIR, { recursive: true });
+    mkdirSync14(CACHE_DIR, { recursive: true });
     const data = {};
     for (const [key, pricing] of pricingMap) {
       data[key] = pricing;
     }
-    writeFileSync14(CACHE_FILE, JSON.stringify(data), "utf-8");
+    writeFileSync15(CACHE_FILE, JSON.stringify(data), "utf-8");
   } catch (error46) {
     log(`[PricingCache] Error saving disk cache: ${error46}`);
   }
@@ -105667,8 +105938,8 @@ var init_pricing_cache = __esm(() => {
   init_model_loader();
   init_remote_provider_types();
   pricingMap = new Map;
-  CACHE_DIR = join23(homedir20(), ".claudish");
-  CACHE_FILE = join23(CACHE_DIR, "pricing-cache.json");
+  CACHE_DIR = join25(homedir22(), ".claudish");
+  CACHE_FILE = join25(CACHE_DIR, "pricing-cache.json");
   CACHE_TTL_MS = 24 * 60 * 60 * 1000;
   PROVIDER_TO_OR_PREFIX = {
     openai: ["openai/"],
@@ -106127,11 +106398,11 @@ class AnthropicProviderTransport {
     }
     if (this.provider.name === "kimi-coding" && !this.apiKey) {
       try {
-        const { existsSync: existsSync21, readFileSync: readFileSync19 } = await import("fs");
-        const { join: join24 } = await import("path");
-        const { homedir: homedir21 } = await import("os");
-        const credPath = join24(homedir21(), ".claudish", "kimi-oauth.json");
-        if (existsSync21(credPath)) {
+        const { existsSync: existsSync24, readFileSync: readFileSync19 } = await import("fs");
+        const { join: join26 } = await import("path");
+        const { homedir: homedir23 } = await import("os");
+        const credPath = join26(homedir23(), ".claudish", "kimi-oauth.json");
+        if (existsSync24(credPath)) {
           const data = JSON.parse(readFileSync19(credPath, "utf-8"));
           if (data.access_token && data.refresh_token) {
             const { KimiOAuth: KimiOAuth2 } = await Promise.resolve().then(() => (init_kimi_oauth(), exports_kimi_oauth));
@@ -106169,6 +106440,7 @@ var init_anthropic_compat = __esm(() => {
 var AnthropicAPIFormat;
 var init_anthropic_api_format = __esm(() => {
   init_base_api_format();
+  init_model_catalog();
   AnthropicAPIFormat = class AnthropicAPIFormat extends BaseAPIFormat {
     providerName;
     constructor(modelId, providerName) {
@@ -106245,23 +106517,13 @@ var init_anthropic_api_format = __esm(() => {
       return "anthropic-sse";
     }
     getContextWindow() {
-      const model = this.modelId.toLowerCase();
-      if (model.includes("kimi-k2.5") || model.includes("kimi-k2-5"))
-        return 262144;
-      if (model.includes("kimi-k2"))
-        return 131000;
-      if (this.providerName === "kimi" || this.providerName === "kimi-coding" || model.includes("kimi")) {
+      const catalogEntry = lookupModel(this.modelId);
+      if (catalogEntry)
+        return catalogEntry.contextWindow;
+      if (this.providerName === "kimi" || this.providerName === "kimi-coding")
         return 131072;
-      }
-      if (model.includes("minimax-01") || model.includes("minimax-m1"))
-        return 1e6;
-      if (model.includes("minimax-m2.7"))
+      if (this.providerName === "minimax" || this.providerName === "minimax-coding")
         return 204800;
-      if (model.includes("minimax-m2"))
-        return 196608;
-      if (this.providerName === "minimax" || this.providerName === "minimax-coding") {
-        return 196608;
-      }
       return 128000;
     }
     supportsVision() {
@@ -106442,10 +106704,10 @@ var init_litellm2 = __esm(() => {
 });
 
 // src/adapters/litellm-api-format.ts
-import { existsSync as existsSync21, readFileSync as readFileSync19 } from "fs";
+import { existsSync as existsSync25, readFileSync as readFileSync19 } from "fs";
 import { createHash as createHash5 } from "crypto";
-import { homedir as homedir21 } from "os";
-import { join as join24 } from "path";
+import { homedir as homedir23 } from "os";
+import { join as join26 } from "path";
 var INLINE_IMAGE_MODEL_PATTERNS, LiteLLMAPIFormat;
 var init_litellm_api_format = __esm(() => {
   init_base_api_format();
@@ -106541,8 +106803,8 @@ var init_litellm_api_format = __esm(() => {
     checkVisionSupport() {
       try {
         const hash2 = createHash5("sha256").update(this.baseUrl).digest("hex").substring(0, 16);
-        const cachePath = join24(homedir21(), ".claudish", `litellm-models-${hash2}.json`);
-        if (!existsSync21(cachePath))
+        const cachePath = join26(homedir23(), ".claudish", `litellm-models-${hash2}.json`);
+        if (!existsSync25(cachePath))
           return true;
         const cacheData = JSON.parse(readFileSync19(cachePath, "utf-8"));
         const model = cacheData.models?.find((m2) => m2.name === this.modelId);
@@ -106561,9 +106823,9 @@ var init_litellm_api_format = __esm(() => {
 // src/auth/vertex-auth.ts
 import { exec as exec4 } from "child_process";
 import { promisify as promisify3 } from "util";
-import { existsSync as existsSync23 } from "fs";
-import { homedir as homedir22 } from "os";
-import { join as join25 } from "path";
+import { existsSync as existsSync26 } from "fs";
+import { homedir as homedir24 } from "os";
+import { join as join27 } from "path";
 
 class VertexAuthManager {
   cachedToken = null;
@@ -106617,8 +106879,8 @@ class VertexAuthManager {
   }
   async tryADC() {
     try {
-      const adcPath = join25(homedir22(), ".config/gcloud/application_default_credentials.json");
-      if (!existsSync23(adcPath)) {
+      const adcPath = join27(homedir24(), ".config/gcloud/application_default_credentials.json");
+      if (!existsSync26(adcPath)) {
         log("[VertexAuth] ADC credentials file not found");
         return null;
       }
@@ -106642,7 +106904,7 @@ class VertexAuthManager {
     if (!credPath) {
       return null;
     }
-    if (!existsSync23(credPath)) {
+    if (!existsSync26(credPath)) {
       throw new Error(`Service account file not found: ${credPath}
 
 Check GOOGLE_APPLICATION_CREDENTIALS path.`);
@@ -106681,8 +106943,8 @@ function validateVertexOAuthConfig() {
 ` + `  export VERTEX_PROJECT='your-gcp-project-id'
 ` + "  export VERTEX_LOCATION='us-central1'  # optional";
   }
-  const adcPath = join25(homedir22(), ".config/gcloud/application_default_credentials.json");
-  const hasADC = existsSync23(adcPath);
+  const adcPath = join27(homedir24(), ".config/gcloud/application_default_credentials.json");
+  const hasADC = existsSync26(adcPath);
   const hasServiceAccount = !!process.env.GOOGLE_APPLICATION_CREDENTIALS;
   if (!hasADC && !hasServiceAccount) {
     return `No Vertex AI credentials found.
@@ -106814,6 +107076,7 @@ var init_provider_profiles = __esm(() => {
   init_ollama_api_format();
   init_litellm2();
   init_litellm_api_format();
+  init_codex_api_format();
   init_vertex_oauth();
   init_base_api_format();
   init_remote_provider_registry();
@@ -106897,6 +107160,18 @@ var init_provider_profiles = __esm(() => {
         log(`[Proxy] Created OpenCode Zen${isGoProvider ? " Go" : ""} (Anthropic composed): ${ctx.modelName}`);
         return handler2;
       }
+      if (ctx.modelName.toLowerCase().startsWith("gpt-")) {
+        const responsesProvider = { ...ctx.provider, apiPath: "/v1/responses" };
+        const transport2 = new OpenAIProviderTransport(responsesProvider, ctx.modelName, zenApiKey);
+        const adapter2 = new CodexAPIFormat(ctx.modelName);
+        const handler2 = new ComposedHandler(transport2, ctx.targetModel, ctx.modelName, ctx.port, {
+          adapter: adapter2,
+          tokenStrategy: "delta-aware",
+          ...ctx.sharedOpts
+        });
+        log(`[Proxy] Created OpenCode Zen${isGoProvider ? " Go" : ""} (Responses API composed): ${ctx.modelName}`);
+        return handler2;
+      }
       const transport = new OpenAIProviderTransport(ctx.provider, ctx.modelName, zenApiKey);
       const adapter = new OpenAIAPIFormat(ctx.modelName);
       const handler = new ComposedHandler(transport, ctx.targetModel, ctx.modelName, ctx.port, {
@@ -107136,6 +107411,7 @@ async function createProxyServer(port, openrouterApiKey, model, monitorMode = fa
     }).catch(() => {});
   }
   warmZenModelCache().then(() => log("[Proxy] Zen model cache pre-warmed for fallback filtering")).catch(() => {});
+  warmZenGoModelCache().then(() => log("[Proxy] Zen Go model cache pre-warmed for fallback filtering")).catch(() => {});
   const customRoutingRules = loadRoutingRules();
   const fallbackHandlerCache = new Map;
   const detectInvocationMode = (target, wasFromModelMap) => {
@@ -107325,14 +107601,14 @@ var init_proxy_server = __esm(() => {
 
 // src/index.ts
 var import_dotenv3 = __toESM(require_main(), 1);
-import { existsSync as existsSync25, readFileSync as readFileSync21 } from "fs";
-import { homedir as homedir23 } from "os";
-import { join as join26 } from "path";
+import { existsSync as existsSync27, readFileSync as readFileSync21 } from "fs";
+import { homedir as homedir25 } from "os";
+import { join as join28 } from "path";
 import_dotenv3.config({ quiet: true });
 function loadStoredApiKeys() {
   try {
-    const configPath = join26(homedir23(), ".claudish", "config.json");
-    if (!existsSync25(configPath))
+    const configPath = join28(homedir25(), ".claudish", "config.json");
+    if (!existsSync27(configPath))
       return;
     const raw2 = readFileSync21(configPath, "utf-8");
     const cfg = JSON.parse(raw2);
@@ -107469,7 +107745,7 @@ async function runCli() {
   } = await Promise.resolve().then(() => (init_provider_resolver(), exports_provider_resolver));
   const { initLogger: initLogger2, getLogFilePath: getLogFilePath2, getAlwaysOnLogPath: getAlwaysOnLogPath2, setDiagOutput: setDiagOutput2 } = await Promise.resolve().then(() => (init_logger(), exports_logger));
   const { createDiagOutput: createDiagOutput2, LogFileDiagOutput: LogFileDiagOutput2 } = await Promise.resolve().then(() => (init_diag_output(), exports_diag_output));
-  const { tryCreatePtyRunner: tryCreatePtyRunner2 } = await init_pty_diag_runner().then(() => exports_pty_diag_runner);
+  const { tryCreateMtmRunner: tryCreateMtmRunner2 } = await Promise.resolve().then(() => (init_pty_diag_runner(), exports_pty_diag_runner));
   const { findAvailablePort: findAvailablePort2 } = await Promise.resolve().then(() => (init_port_manager(), exports_port_manager));
   const { createProxyServer: createProxyServer2 } = await Promise.resolve().then(() => (init_proxy_server(), exports_proxy_server));
   const { checkForUpdates: checkForUpdates2 } = await Promise.resolve().then(() => (init_update_checker(), exports_update_checker));
@@ -107482,6 +107758,43 @@ async function runCli() {
   }
   try {
     const cliConfig = await parseArgs2(process.argv.slice(2));
+    const rawArgs = process.argv.slice(2);
+    const explicitNoAutoApprove = rawArgs.includes("--no-auto-approve");
+    if (cliConfig.autoApprove && !explicitNoAutoApprove) {
+      const { loadConfig: loadConfig2, saveConfig: saveConfig2 } = await Promise.resolve().then(() => (init_profile_config(), exports_profile_config));
+      try {
+        const cfg = loadConfig2();
+        if (!cfg.autoApproveConfirmedAt) {
+          const { createInterface: createInterface4 } = await import("readline");
+          process.stderr.write(`
+[claudish] Auto-approve is enabled by default.
+  This skips Claude Code permission prompts for tools like Bash, Read, Write.
+  You can disable it anytime with: --no-auto-approve
+
+`);
+          const answer = await new Promise((resolve4) => {
+            const rl = createInterface4({ input: process.stdin, output: process.stderr });
+            rl.question("Enable auto-approve? [Y/n] ", (ans) => {
+              rl.close();
+              resolve4(ans.trim().toLowerCase());
+            });
+          });
+          const declined = answer === "n" || answer === "no";
+          if (declined) {
+            cliConfig.autoApprove = false;
+            process.stderr.write(`[claudish] Auto-approve disabled. Use -y to enable per-run.
+
+`);
+          } else {
+            process.stderr.write(`[claudish] Auto-approve confirmed.
+
+`);
+          }
+          cfg.autoApproveConfirmedAt = new Date().toISOString();
+          saveConfig2(cfg);
+        }
+      } catch {}
+    }
     initLogger2(cliConfig.debug, cliConfig.logLevel, cliConfig.noLogs);
     const { initTelemetry: initTelemetry2 } = await Promise.resolve().then(() => (init_telemetry(), exports_telemetry));
     initTelemetry2(cliConfig);
@@ -107587,22 +107900,25 @@ async function runCli() {
       quiet: cliConfig.quiet,
       isInteractive: cliConfig.interactive
     });
-    const needsPty = cliConfig.interactive && (cliConfig.diagMode === "auto" || cliConfig.diagMode === "pty");
-    const ptyRunner = needsPty ? await tryCreatePtyRunner2() : null;
+    const needsMtm = cliConfig.interactive && (cliConfig.diagMode === "auto" || cliConfig.diagMode === "pty");
+    const mtmRunner = needsMtm ? await tryCreateMtmRunner2() : null;
+    if (mtmRunner && explicitModel) {
+      mtmRunner.setModel(explicitModel);
+    }
     const diag = createDiagOutput2({
       interactive: cliConfig.interactive,
-      ptyRunner,
+      mtmRunner,
       diagMode: cliConfig.diagMode
     });
     if (cliConfig.interactive) {
       setDiagOutput2(diag);
-      if (!ptyRunner && !process.env.TMUX && !cliConfig.quiet && diag instanceof LogFileDiagOutput2) {
+      if (!mtmRunner && !process.env.TMUX && !cliConfig.quiet && diag instanceof LogFileDiagOutput2) {
         console.log(`[claudish] Diagnostic log: ${diag.getLogPath()}`);
       }
     }
     let exitCode = 0;
     try {
-      exitCode = await runClaudeWithProxy2(cliConfig, proxy.url, () => diag.cleanup(), ptyRunner);
+      exitCode = await runClaudeWithProxy2(cliConfig, proxy.url, () => diag.cleanup(), mtmRunner);
     } finally {
       setDiagOutput2(null);
       diag.cleanup();