@austinthesing/magic-shell 0.2.18 → 0.2.19

package/dist/index.js

@@ -2116,15 +2116,6 @@ import { cwd as getCwd } from "process";
 
 // src/lib/types.ts
 var OPENROUTER_MODELS = [
-  {
-    id: "minimax/minimax-m2.5:free",
-    name: "MiniMax M2.5 Free",
-    description: "Free MiniMax model for trying out open-source generation",
-    category: "smart",
-    provider: "openrouter",
-    contextLength: 196608,
-    free: true
-  },
   {
     id: "xiaomi/mimo-v2.5",
     name: "MiMo V2.5",
@@ -2157,6 +2148,38 @@ var OPENROUTER_MODELS = [
     provider: "openrouter",
     contextLength: 202752
   },
+  {
+    id: "openai/gpt-latest",
+    name: "OpenAI GPT Latest",
+    description: "OpenRouter alias that redirects to the latest OpenAI GPT model",
+    category: "smart",
+    provider: "openrouter",
+    contextLength: 1050000
+  },
+  {
+    id: "openai/gpt-5.5",
+    name: "GPT 5.5",
+    description: "OpenAI's latest flagship GPT model",
+    category: "smart",
+    provider: "openrouter",
+    contextLength: 1050000
+  },
+  {
+    id: "anthropic/claude-sonnet-latest",
+    name: "Claude Sonnet Latest",
+    description: "OpenRouter alias that redirects to the latest Claude Sonnet model",
+    category: "smart",
+    provider: "openrouter",
+    contextLength: 1e6
+  },
+  {
+    id: "anthropic/claude-sonnet-4.6",
+    name: "Claude Sonnet 4.6",
+    description: "Anthropic's latest Sonnet model",
+    category: "smart",
+    provider: "openrouter",
+    contextLength: 1e6
+  },
   {
     id: "moonshotai/kimi-k2.6",
     name: "Kimi K2.6",
@@ -2189,6 +2212,30 @@ var OPENROUTER_MODELS = [
     provider: "openrouter",
     contextLength: 196608
   },
+  {
+    id: "anthropic/claude-opus-latest",
+    name: "Claude Opus Latest",
+    description: "OpenRouter alias that redirects to the latest Claude Opus model",
+    category: "reasoning",
+    provider: "openrouter",
+    contextLength: 1e6
+  },
+  {
+    id: "anthropic/claude-opus-4.7",
+    name: "Claude Opus 4.7",
+    description: "Anthropic's latest Opus model",
+    category: "reasoning",
+    provider: "openrouter",
+    contextLength: 1e6
+  },
+  {
+    id: "openai/gpt-5.5-pro",
+    name: "GPT 5.5 Pro",
+    description: "OpenAI's latest high-capability reasoning model",
+    category: "reasoning",
+    provider: "openrouter",
+    contextLength: 1050000
+  },
   {
     id: "moonshotai/kimi-k2-thinking",
     name: "Kimi K2 Thinking",
@@ -2198,16 +2245,109 @@ var OPENROUTER_MODELS = [
     contextLength: 262144
   }
 ];
-var OPENCODE_ZEN_MODELS = [
+var VERCEL_AI_GATEWAY_MODELS = [
+  {
+    id: "openai/gpt-latest",
+    name: "OpenAI GPT Latest",
+    description: "Vercel AI Gateway alias that redirects to the latest OpenAI GPT model",
+    category: "smart",
+    provider: "vercel-ai-gateway",
+    contextLength: 1050000
+  },
   {
-    id: "minimax-m2.5-free",
-    name: "MiniMax M2.5 Free",
-    description: "MiniMax's free model (limited time)",
+    id: "openai/gpt-5.5",
+    name: "GPT 5.5",
+    description: "OpenAI's latest flagship GPT model",
+    category: "smart",
+    provider: "vercel-ai-gateway",
+    contextLength: 1050000
+  },
+  {
+    id: "anthropic/claude-sonnet-4.6",
+    name: "Claude Sonnet 4.6",
+    description: "Anthropic's latest Sonnet model",
+    category: "smart",
+    provider: "vercel-ai-gateway",
+    contextLength: 1e6
+  },
+  {
+    id: "anthropic/claude-opus-4.7",
+    name: "Claude Opus 4.7",
+    description: "Anthropic's latest Opus model",
+    category: "reasoning",
+    provider: "vercel-ai-gateway",
+    contextLength: 1e6
+  },
+  {
+    id: "openai/gpt-5.5-pro",
+    name: "GPT 5.5 Pro",
+    description: "OpenAI's latest high-capability reasoning model",
+    category: "reasoning",
+    provider: "vercel-ai-gateway",
+    contextLength: 1050000
+  }
+];
+var CLOUDFLARE_AI_GATEWAY_MODELS = [
+  {
+    id: "openai/gpt-5.5",
+    name: "GPT 5.5",
+    description: "OpenAI's latest flagship GPT model through Cloudflare AI Gateway",
+    category: "smart",
+    provider: "cloudflare-ai-gateway",
+    contextLength: 1050000
+  },
+  {
+    id: "anthropic/claude-sonnet-4-6",
+    name: "Claude Sonnet 4.6",
+    description: "Anthropic's latest Sonnet model through Cloudflare AI Gateway",
+    category: "smart",
+    provider: "cloudflare-ai-gateway",
+    contextLength: 1e6
+  },
+  {
+    id: "anthropic/claude-opus-4-7",
+    name: "Claude Opus 4.7",
+    description: "Anthropic's latest Opus model through Cloudflare AI Gateway",
+    category: "reasoning",
+    provider: "cloudflare-ai-gateway",
+    contextLength: 1e6
+  },
+  {
+    id: "workers-ai/@cf/meta/llama-3.3-70b-instruct-fp8-fast",
+    name: "Workers AI Llama 3.3 70B Fast",
+    description: "Cloudflare Workers AI fast Llama model routed through AI Gateway",
+    category: "smart",
+    provider: "cloudflare-ai-gateway",
+    contextLength: 24000
+  }
+];
+var WORKERS_AI_MODELS = [
+  {
+    id: "@cf/meta/llama-3.3-70b-instruct-fp8-fast",
+    name: "Llama 3.3 70B Fast",
+    description: "Cloudflare Workers AI fast Llama instruct model",
+    category: "smart",
+    provider: "workers-ai",
+    contextLength: 24000
+  },
+  {
+    id: "@cf/meta/llama-3.1-8b-instruct",
+    name: "Llama 3.1 8B Instruct",
+    description: "Cloudflare Workers AI lightweight Llama instruct model",
     category: "fast",
-    provider: "opencode-zen",
-    contextLength: 196608,
-    free: true
+    provider: "workers-ai",
+    contextLength: 8000
   },
+  {
+    id: "@cf/openai/gpt-oss-120b",
+    name: "GPT OSS 120B",
+    description: "OpenAI open-weight model hosted by Cloudflare Workers AI",
+    category: "reasoning",
+    provider: "workers-ai",
+    contextLength: 32000
+  }
+];
+var OPENCODE_ZEN_MODELS = [
   {
     id: "kimi-k2.6-free",
     name: "Kimi K2.6 Free",
@@ -2234,23 +2374,6 @@ var OPENCODE_ZEN_MODELS = [
     provider: "opencode-zen",
     contextLength: 1048576
   },
-  {
-    id: "gpt-5-nano",
-    name: "GPT 5 Nano",
-    description: "OpenAI's fastest GPT model (free)",
-    category: "fast",
-    provider: "opencode-zen",
-    contextLength: 200000,
-    free: true
-  },
-  {
-    id: "claude-3-5-haiku",
-    name: "Claude Haiku 3.5",
-    description: "Anthropic's fast and efficient model",
-    category: "fast",
-    provider: "opencode-zen",
-    contextLength: 200000
-  },
   {
     id: "claude-haiku-4-5",
     name: "Claude Haiku 4.5",
@@ -2268,84 +2391,68 @@ var OPENCODE_ZEN_MODELS = [
     contextLength: 200000
   },
   {
-    id: "gpt-5.1-codex-mini",
-    name: "GPT 5.1 Codex Mini",
-    description: "OpenAI's fast codex model",
+    id: "gpt-5.4-mini",
+    name: "GPT 5.4 Mini",
+    description: "OpenAI's latest fast GPT mini model",
     category: "fast",
     provider: "opencode-zen",
-    contextLength: 200000
+    contextLength: 400000
   },
   {
-    id: "deepseek-v4-flash",
-    name: "DeepSeek V4 Flash",
-    description: "DeepSeek's latest fast open-source model",
+    id: "gpt-5.4-nano",
+    name: "GPT 5.4 Nano",
+    description: "OpenAI's latest lightweight GPT model",
     category: "fast",
     provider: "opencode-zen",
-    contextLength: 1048576
+    contextLength: 400000
   },
   {
-    id: "claude-sonnet-4",
-    name: "Claude Sonnet 4",
-    description: "Anthropic's balanced model for complex tasks",
+    id: "claude-sonnet-4-6",
+    name: "Claude Sonnet 4.6",
+    description: "Anthropic's latest Sonnet model",
     category: "smart",
     provider: "opencode-zen",
-    contextLength: 200000
+    contextLength: 1e6
   },
   {
-    id: "gemini-3-pro",
-    name: "Gemini 3 Pro",
+    id: "gemini-3.1-pro",
+    name: "Gemini 3.1 Pro",
     description: "Google's high-end Gemini model",
     category: "smart",
     provider: "opencode-zen",
     contextLength: 200000
   },
   {
-    id: "gpt-5.2",
-    name: "GPT 5.2",
-    description: "OpenAI's flagship GPT model",
+    id: "gpt-5.5",
+    name: "GPT 5.5",
+    description: "OpenAI's latest flagship GPT model",
     category: "smart",
     provider: "opencode-zen",
-    contextLength: 200000
+    contextLength: 1050000
   },
   {
-    id: "gpt-5.2-codex",
-    name: "GPT 5.2 Codex",
-    description: "OpenAI's coding-focused GPT model",
+    id: "gpt-5.5-pro",
+    name: "GPT 5.5 Pro",
+    description: "OpenAI's latest high-capability reasoning model",
     category: "smart",
     provider: "opencode-zen",
-    contextLength: 200000
+    contextLength: 1050000
   },
   {
-    id: "gpt-5.1",
-    name: "GPT 5.1",
-    description: "OpenAI's balanced GPT model",
+    id: "gpt-5.3-codex",
+    name: "GPT 5.3 Codex",
+    description: "OpenAI's latest coding-focused GPT model",
     category: "smart",
     provider: "opencode-zen",
-    contextLength: 200000
+    contextLength: 400000
   },
   {
-    id: "gpt-5.1-codex",
-    name: "GPT 5.1 Codex",
-    description: "OpenAI's coding model",
+    id: "gpt-5.3-codex-spark",
+    name: "GPT 5.3 Codex Spark",
+    description: "OpenAI's latest fast coding-focused GPT model",
     category: "smart",
     provider: "opencode-zen",
-    contextLength: 200000
-  },
-  {
-    id: "gpt-5",
-    name: "GPT 5",
-    description: "OpenAI's prior generation GPT model",
-    category: "smart",
-    provider: "opencode-zen",
-    contextLength: 200000
-  },
-  {
-    id: "gpt-5-codex",
-    name: "GPT 5 Codex",
-    description: "OpenAI's prior generation codex model",
-    category: "smart",
-    provider: "opencode-zen",
-    contextLength: 200000
+    contextLength: 400000
   },
   {
     id: "minimax-m2.7",
@@ -2388,44 +2495,12 @@ var OPENCODE_ZEN_MODELS = [
     contextLength: 202752
   },
   {
-    id: "claude-sonnet-4-5",
-    name: "Claude Sonnet 4.5",
-    description: "Anthropic's hybrid reasoning model",
+    id: "claude-opus-4-7",
+    name: "Claude Opus 4.7",
+    description: "Anthropic's latest Opus model",
     category: "reasoning",
     provider: "opencode-zen",
-    contextLength: 200000
-  },
-  {
-    id: "claude-opus-4-6",
-    name: "Claude Opus 4.6",
-    description: "Anthropic's newest Opus model",
-    category: "reasoning",
-    provider: "opencode-zen",
-    contextLength: 200000
-  },
-  {
-    id: "claude-opus-4-5",
-    name: "Claude Opus 4.5",
-    description: "Anthropic's most capable model",
-    category: "reasoning",
-    provider: "opencode-zen",
-    contextLength: 200000
-  },
-  {
-    id: "claude-opus-4-1",
-    name: "Claude Opus 4.1",
-    description: "Anthropic's powerful reasoning model",
-    category: "reasoning",
-    provider: "opencode-zen",
-    contextLength: 200000
-  },
-  {
-    id: "gpt-5.1-codex-max",
-    name: "GPT 5.1 Codex Max",
-    description: "OpenAI's largest coding model",
-    category: "reasoning",
-    provider: "opencode-zen",
-    contextLength: 200000
+    contextLength: 1e6
   },
   {
     id: "kimi-k2-thinking",
@@ -2436,7 +2511,45 @@ var OPENCODE_ZEN_MODELS = [
     contextLength: 262144
   }
 ];
-var ALL_MODELS = [...OPENCODE_ZEN_MODELS, ...OPENROUTER_MODELS];
+var ALL_MODELS = [
+  ...OPENCODE_ZEN_MODELS,
+  ...OPENROUTER_MODELS,
+  ...VERCEL_AI_GATEWAY_MODELS,
+  ...CLOUDFLARE_AI_GATEWAY_MODELS,
+  ...WORKERS_AI_MODELS
+];
+function getProviderModels(provider) {
+  switch (provider) {
+    case "opencode-zen":
+      return OPENCODE_ZEN_MODELS;
+    case "openrouter":
+      return OPENROUTER_MODELS;
+    case "vercel-ai-gateway":
+      return VERCEL_AI_GATEWAY_MODELS;
+    case "cloudflare-ai-gateway":
+      return CLOUDFLARE_AI_GATEWAY_MODELS;
+    case "workers-ai":
+      return WORKERS_AI_MODELS;
+    case "custom":
+      return [];
+  }
+}
+function getProviderDisplayName(provider) {
+  switch (provider) {
+    case "opencode-zen":
+      return "OpenCode Zen";
+    case "openrouter":
+      return "OpenRouter";
+    case "vercel-ai-gateway":
+      return "Vercel AI Gateway";
+    case "cloudflare-ai-gateway":
+      return "Cloudflare AI Gateway";
+    case "workers-ai":
+      return "Cloudflare Workers AI";
+    case "custom":
+      return "Custom";
+  }
+}
 
 // src/lib/config.ts
 import { homedir } from "os";
@@ -2804,10 +2917,18 @@ var CONFIG_FILE = join(CONFIG_DIR, "config.json");
 var HISTORY_FILE = join(CONFIG_DIR, "history.json");
 var KEYCHAIN_OPENROUTER = "openrouter-api-key";
 var KEYCHAIN_OPENCODE_ZEN = "opencode-zen-api-key";
+var KEYCHAIN_VERCEL_AI_GATEWAY = "vercel-ai-gateway-api-key";
+var KEYCHAIN_CLOUDFLARE_AI_GATEWAY = "cloudflare-ai-gateway-api-key";
+var KEYCHAIN_WORKERS_AI = "workers-ai-api-key";
 var DEFAULT_CONFIG = {
   provider: "opencode-zen",
   openrouterApiKey: "",
   opencodeZenApiKey: "",
+  vercelAiGatewayApiKey: "",
+  cloudflareAiGatewayApiKey: "",
+  workersAiApiKey: "",
+  cloudflareAccountId: "",
+  cloudflareAiGatewayId: "default",
   defaultModel: "kimi-k2.6-free",
   safetyLevel: "moderate",
   dryRunByDefault: false,
@@ -2847,6 +2968,9 @@ function saveConfig(config) {
   if (isSecureStorageAvailable()) {
     configToSave.openrouterApiKey = "";
     configToSave.opencodeZenApiKey = "";
+    configToSave.vercelAiGatewayApiKey = "";
+    configToSave.cloudflareAiGatewayApiKey = "";
+    configToSave.workersAiApiKey = "";
   }
   writeFileSync(CONFIG_FILE, JSON.stringify(configToSave, null, 2));
 }
@@ -2859,28 +2983,83 @@ async function getApiKey(provider) {
     const envKey = process.env.OPENCODE_ZEN_API_KEY;
     if (envKey)
       return envKey;
+  } else if (provider === "vercel-ai-gateway") {
+    const envKey = process.env.AI_GATEWAY_API_KEY || process.env.VERCEL_AI_GATEWAY_API_KEY;
+    if (envKey)
+      return envKey;
+  } else if (provider === "cloudflare-ai-gateway") {
+    const envKey = process.env.CLOUDFLARE_AI_GATEWAY_API_KEY || process.env.CF_AIG_TOKEN;
+    if (envKey)
+      return envKey;
+  } else if (provider === "workers-ai") {
+    const envKey = process.env.CLOUDFLARE_API_TOKEN || process.env.CLOUDFLARE_API_KEY;
+    if (envKey)
+      return envKey;
   }
-  const keychainKey = provider === "openrouter" ? KEYCHAIN_OPENROUTER : KEYCHAIN_OPENCODE_ZEN;
+  const keychainKey = getKeychainKey(provider);
   const secureKey = await getSecret(keychainKey);
   if (secureKey)
     return secureKey;
   const config = loadConfig();
-  return provider === "openrouter" ? config.openrouterApiKey : config.opencodeZenApiKey;
+  switch (provider) {
+    case "openrouter":
+      return config.openrouterApiKey;
+    case "opencode-zen":
+      return config.opencodeZenApiKey;
+    case "vercel-ai-gateway":
+      return config.vercelAiGatewayApiKey || "";
+    case "cloudflare-ai-gateway":
+      return config.cloudflareAiGatewayApiKey || "";
+    case "workers-ai":
+      return config.workersAiApiKey || "";
+    case "custom":
+      return "";
+  }
 }
 async function setApiKey(provider, key) {
   const config = loadConfig();
   config.provider = provider;
-  const keychainKey = provider === "openrouter" ? KEYCHAIN_OPENROUTER : KEYCHAIN_OPENCODE_ZEN;
+  const keychainKey = getKeychainKey(provider);
   const stored = await setSecret(keychainKey, key);
   if (!stored) {
-    if (provider === "openrouter") {
-      config.openrouterApiKey = key;
-    } else {
-      config.opencodeZenApiKey = key;
+    switch (provider) {
+      case "openrouter":
+        config.openrouterApiKey = key;
+        break;
+      case "opencode-zen":
+        config.opencodeZenApiKey = key;
+        break;
+      case "vercel-ai-gateway":
+        config.vercelAiGatewayApiKey = key;
+        break;
+      case "cloudflare-ai-gateway":
+        config.cloudflareAiGatewayApiKey = key;
+        break;
+      case "workers-ai":
+        config.workersAiApiKey = key;
+        break;
+      case "custom":
+        break;
     }
   }
   saveConfig(config);
 }
+function getKeychainKey(provider) {
+  switch (provider) {
+    case "openrouter":
+      return KEYCHAIN_OPENROUTER;
+    case "opencode-zen":
+      return KEYCHAIN_OPENCODE_ZEN;
+    case "vercel-ai-gateway":
+      return KEYCHAIN_VERCEL_AI_GATEWAY;
+    case "cloudflare-ai-gateway":
+      return KEYCHAIN_CLOUDFLARE_AI_GATEWAY;
+    case "workers-ai":
+      return KEYCHAIN_WORKERS_AI;
+    case "custom":
+      return "custom-api-key";
+  }
+}
 function loadHistory() {
   ensureConfigDir();
   if (!existsSync(HISTORY_FILE)) {
@@ -41183,15 +41362,6 @@ var defaultDownload2 = createDownload();
 
 // src/lib/types.ts
 var OPENROUTER_MODELS2 = [
-  {
-    id: "minimax/minimax-m2.5:free",
-    name: "MiniMax M2.5 Free",
-    description: "Free MiniMax model for trying out open-source generation",
-    category: "smart",
-    provider: "openrouter",
-    contextLength: 196608,
-    free: true
-  },
   {
     id: "xiaomi/mimo-v2.5",
     name: "MiMo V2.5",
@@ -41224,6 +41394,38 @@ var OPENROUTER_MODELS2 = [
     provider: "openrouter",
     contextLength: 202752
   },
+  {
+    id: "openai/gpt-latest",
+    name: "OpenAI GPT Latest",
+    description: "OpenRouter alias that redirects to the latest OpenAI GPT model",
+    category: "smart",
+    provider: "openrouter",
+    contextLength: 1050000
+  },
+  {
+    id: "openai/gpt-5.5",
+    name: "GPT 5.5",
+    description: "OpenAI's latest flagship GPT model",
+    category: "smart",
+    provider: "openrouter",
+    contextLength: 1050000
+  },
+  {
+    id: "anthropic/claude-sonnet-latest",
+    name: "Claude Sonnet Latest",
+    description: "OpenRouter alias that redirects to the latest Claude Sonnet model",
+    category: "smart",
+    provider: "openrouter",
+    contextLength: 1e6
+  },
+  {
+    id: "anthropic/claude-sonnet-4.6",
+    name: "Claude Sonnet 4.6",
+    description: "Anthropic's latest Sonnet model",
+    category: "smart",
+    provider: "openrouter",
+    contextLength: 1e6
+  },
   {
     id: "moonshotai/kimi-k2.6",
     name: "Kimi K2.6",
@@ -41256,6 +41458,30 @@ var OPENROUTER_MODELS2 = [
     provider: "openrouter",
     contextLength: 196608
   },
+  {
+    id: "anthropic/claude-opus-latest",
+    name: "Claude Opus Latest",
+    description: "OpenRouter alias that redirects to the latest Claude Opus model",
+    category: "reasoning",
+    provider: "openrouter",
+    contextLength: 1e6
+  },
+  {
+    id: "anthropic/claude-opus-4.7",
+    name: "Claude Opus 4.7",
+    description: "Anthropic's latest Opus model",
+    category: "reasoning",
+    provider: "openrouter",
+    contextLength: 1e6
+  },
+  {
+    id: "openai/gpt-5.5-pro",
+    name: "GPT 5.5 Pro",
+    description: "OpenAI's latest high-capability reasoning model",
+    category: "reasoning",
+    provider: "openrouter",
+    contextLength: 1050000
+  },
   {
     id: "moonshotai/kimi-k2-thinking",
     name: "Kimi K2 Thinking",
@@ -41265,16 +41491,109 @@ var OPENROUTER_MODELS2 = [
     contextLength: 262144
   }
 ];
-var OPENCODE_ZEN_MODELS2 = [
+var VERCEL_AI_GATEWAY_MODELS2 = [
   {
-    id: "minimax-m2.5-free",
-    name: "MiniMax M2.5 Free",
-    description: "MiniMax's free model (limited time)",
+    id: "openai/gpt-latest",
+    name: "OpenAI GPT Latest",
+    description: "Vercel AI Gateway alias that redirects to the latest OpenAI GPT model",
+    category: "smart",
+    provider: "vercel-ai-gateway",
+    contextLength: 1050000
+  },
+  {
+    id: "openai/gpt-5.5",
+    name: "GPT 5.5",
+    description: "OpenAI's latest flagship GPT model",
+    category: "smart",
+    provider: "vercel-ai-gateway",
+    contextLength: 1050000
+  },
+  {
+    id: "anthropic/claude-sonnet-4.6",
+    name: "Claude Sonnet 4.6",
+    description: "Anthropic's latest Sonnet model",
+    category: "smart",
+    provider: "vercel-ai-gateway",
+    contextLength: 1e6
+  },
+  {
+    id: "anthropic/claude-opus-4.7",
+    name: "Claude Opus 4.7",
+    description: "Anthropic's latest Opus model",
+    category: "reasoning",
+    provider: "vercel-ai-gateway",
+    contextLength: 1e6
+  },
+  {
+    id: "openai/gpt-5.5-pro",
+    name: "GPT 5.5 Pro",
+    description: "OpenAI's latest high-capability reasoning model",
+    category: "reasoning",
+    provider: "vercel-ai-gateway",
+    contextLength: 1050000
+  }
+];
+var CLOUDFLARE_AI_GATEWAY_MODELS2 = [
+  {
+    id: "openai/gpt-5.5",
+    name: "GPT 5.5",
+    description: "OpenAI's latest flagship GPT model through Cloudflare AI Gateway",
+    category: "smart",
+    provider: "cloudflare-ai-gateway",
+    contextLength: 1050000
+  },
+  {
+    id: "anthropic/claude-sonnet-4-6",
+    name: "Claude Sonnet 4.6",
+    description: "Anthropic's latest Sonnet model through Cloudflare AI Gateway",
+    category: "smart",
+    provider: "cloudflare-ai-gateway",
+    contextLength: 1e6
+  },
+  {
+    id: "anthropic/claude-opus-4-7",
+    name: "Claude Opus 4.7",
+    description: "Anthropic's latest Opus model through Cloudflare AI Gateway",
+    category: "reasoning",
+    provider: "cloudflare-ai-gateway",
+    contextLength: 1e6
+  },
+  {
+    id: "workers-ai/@cf/meta/llama-3.3-70b-instruct-fp8-fast",
+    name: "Workers AI Llama 3.3 70B Fast",
+    description: "Cloudflare Workers AI fast Llama model routed through AI Gateway",
+    category: "smart",
+    provider: "cloudflare-ai-gateway",
+    contextLength: 24000
+  }
+];
+var WORKERS_AI_MODELS2 = [
+  {
+    id: "@cf/meta/llama-3.3-70b-instruct-fp8-fast",
+    name: "Llama 3.3 70B Fast",
+    description: "Cloudflare Workers AI fast Llama instruct model",
+    category: "smart",
+    provider: "workers-ai",
+    contextLength: 24000
+  },
+  {
+    id: "@cf/meta/llama-3.1-8b-instruct",
+    name: "Llama 3.1 8B Instruct",
+    description: "Cloudflare Workers AI lightweight Llama instruct model",
     category: "fast",
-    provider: "opencode-zen",
-    contextLength: 196608,
-    free: true
+    provider: "workers-ai",
+    contextLength: 8000
   },
+  {
+    id: "@cf/openai/gpt-oss-120b",
+    name: "GPT OSS 120B",
+    description: "OpenAI open-weight model hosted by Cloudflare Workers AI",
+    category: "reasoning",
+    provider: "workers-ai",
+    contextLength: 32000
+  }
+];
+var OPENCODE_ZEN_MODELS2 = [
   {
     id: "kimi-k2.6-free",
     name: "Kimi K2.6 Free",
@@ -41301,23 +41620,6 @@ var OPENCODE_ZEN_MODELS2 = [
     provider: "opencode-zen",
     contextLength: 1048576
   },
-  {
-    id: "gpt-5-nano",
-    name: "GPT 5 Nano",
-    description: "OpenAI's fastest GPT model (free)",
-    category: "fast",
-    provider: "opencode-zen",
-    contextLength: 200000,
-    free: true
-  },
-  {
-    id: "claude-3-5-haiku",
-    name: "Claude Haiku 3.5",
-    description: "Anthropic's fast and efficient model",
-    category: "fast",
-    provider: "opencode-zen",
-    contextLength: 200000
-  },
   {
     id: "claude-haiku-4-5",
     name: "Claude Haiku 4.5",
@@ -41335,84 +41637,68 @@ var OPENCODE_ZEN_MODELS2 = [
     contextLength: 200000
   },
   {
-    id: "gpt-5.1-codex-mini",
-    name: "GPT 5.1 Codex Mini",
-    description: "OpenAI's fast codex model",
+    id: "gpt-5.4-mini",
+    name: "GPT 5.4 Mini",
+    description: "OpenAI's latest fast GPT mini model",
     category: "fast",
     provider: "opencode-zen",
-    contextLength: 200000
+    contextLength: 400000
   },
   {
-    id: "deepseek-v4-flash",
-    name: "DeepSeek V4 Flash",
-    description: "DeepSeek's latest fast open-source model",
+    id: "gpt-5.4-nano",
+    name: "GPT 5.4 Nano",
+    description: "OpenAI's latest lightweight GPT model",
     category: "fast",
     provider: "opencode-zen",
-    contextLength: 1048576
+    contextLength: 400000
   },
   {
-    id: "claude-sonnet-4",
-    name: "Claude Sonnet 4",
-    description: "Anthropic's balanced model for complex tasks",
+    id: "claude-sonnet-4-6",
+    name: "Claude Sonnet 4.6",
+    description: "Anthropic's latest Sonnet model",
     category: "smart",
     provider: "opencode-zen",
-    contextLength: 200000
+    contextLength: 1e6
   },
   {
-    id: "gemini-3-pro",
-    name: "Gemini 3 Pro",
+    id: "gemini-3.1-pro",
+    name: "Gemini 3.1 Pro",
     description: "Google's high-end Gemini model",
     category: "smart",
     provider: "opencode-zen",
     contextLength: 200000
   },
   {
-    id: "gpt-5.2",
-    name: "GPT 5.2",
-    description: "OpenAI's flagship GPT model",
+    id: "gpt-5.5",
+    name: "GPT 5.5",
+    description: "OpenAI's latest flagship GPT model",
     category: "smart",
     provider: "opencode-zen",
-    contextLength: 200000
+    contextLength: 1050000
   },
   {
-    id: "gpt-5.2-codex",
-    name: "GPT 5.2 Codex",
-    description: "OpenAI's coding-focused GPT model",
+    id: "gpt-5.5-pro",
+    name: "GPT 5.5 Pro",
+    description: "OpenAI's latest high-capability reasoning model",
     category: "smart",
     provider: "opencode-zen",
-    contextLength: 200000
+    contextLength: 1050000
   },
   {
-    id: "gpt-5.1",
-    name: "GPT 5.1",
-    description: "OpenAI's balanced GPT model",
+    id: "gpt-5.3-codex",
+    name: "GPT 5.3 Codex",
+    description: "OpenAI's latest coding-focused GPT model",
     category: "smart",
     provider: "opencode-zen",
-    contextLength: 200000
+    contextLength: 400000
   },
   {
-    id: "gpt-5.1-codex",
-    name: "GPT 5.1 Codex",
-    description: "OpenAI's coding model",
+    id: "gpt-5.3-codex-spark",
+    name: "GPT 5.3 Codex Spark",
+    description: "OpenAI's latest fast coding-focused GPT model",
     category: "smart",
     provider: "opencode-zen",
-    contextLength: 200000
-  },
-  {
-    id: "gpt-5",
-    name: "GPT 5",
-    description: "OpenAI's prior generation GPT model",
-    category: "smart",
-    provider: "opencode-zen",
-    contextLength: 200000
-  },
-  {
-    id: "gpt-5-codex",
-    name: "GPT 5 Codex",
-    description: "OpenAI's prior generation codex model",
-    category: "smart",
-    provider: "opencode-zen",
-    contextLength: 200000
+    contextLength: 400000
   },
   {
     id: "minimax-m2.7",
@@ -41455,44 +41741,12 @@ var OPENCODE_ZEN_MODELS2 = [
     contextLength: 202752
   },
   {
-    id: "claude-sonnet-4-5",
-    name: "Claude Sonnet 4.5",
-    description: "Anthropic's hybrid reasoning model",
+    id: "claude-opus-4-7",
+    name: "Claude Opus 4.7",
+    description: "Anthropic's latest Opus model",
     category: "reasoning",
     provider: "opencode-zen",
-    contextLength: 200000
-  },
-  {
-    id: "claude-opus-4-6",
-    name: "Claude Opus 4.6",
-    description: "Anthropic's newest Opus model",
-    category: "reasoning",
-    provider: "opencode-zen",
-    contextLength: 200000
-  },
-  {
-    id: "claude-opus-4-5",
-    name: "Claude Opus 4.5",
-    description: "Anthropic's most capable model",
-    category: "reasoning",
-    provider: "opencode-zen",
-    contextLength: 200000
-  },
-  {
-    id: "claude-opus-4-1",
-    name: "Claude Opus 4.1",
-    description: "Anthropic's powerful reasoning model",
-    category: "reasoning",
-    provider: "opencode-zen",
-    contextLength: 200000
-  },
-  {
-    id: "gpt-5.1-codex-max",
-    name: "GPT 5.1 Codex Max",
-    description: "OpenAI's largest coding model",
-    category: "reasoning",
-    provider: "opencode-zen",
-    contextLength: 200000
+    contextLength: 1e6
   },
   {
     id: "kimi-k2-thinking",
@@ -41503,22 +41757,257 @@ var OPENCODE_ZEN_MODELS2 = [
     contextLength: 262144
   }
 ];
-var ALL_MODELS2 = [...OPENCODE_ZEN_MODELS2, ...OPENROUTER_MODELS2];
+var ALL_MODELS2 = [
+  ...OPENCODE_ZEN_MODELS2,
+  ...OPENROUTER_MODELS2,
+  ...VERCEL_AI_GATEWAY_MODELS2,
+  ...CLOUDFLARE_AI_GATEWAY_MODELS2,
+  ...WORKERS_AI_MODELS2
+];
+function getProviderModels2(provider) {
+  switch (provider) {
+    case "opencode-zen":
+      return OPENCODE_ZEN_MODELS2;
+    case "openrouter":
+      return OPENROUTER_MODELS2;
+    case "vercel-ai-gateway":
+      return VERCEL_AI_GATEWAY_MODELS2;
+    case "cloudflare-ai-gateway":
+      return CLOUDFLARE_AI_GATEWAY_MODELS2;
+    case "workers-ai":
+      return WORKERS_AI_MODELS2;
+    case "custom":
+      return [];
+  }
+}
+function getProviderDisplayName2(provider) {
+  switch (provider) {
+    case "opencode-zen":
+      return "OpenCode Zen";
+    case "openrouter":
+      return "OpenRouter";
+    case "vercel-ai-gateway":
+      return "Vercel AI Gateway";
+    case "cloudflare-ai-gateway":
+      return "Cloudflare AI Gateway";
+    case "workers-ai":
+      return "Cloudflare Workers AI";
+    case "custom":
+      return "Custom";
+  }
+}
 function isCustomModel(model) {
   return "baseUrl" in model;
 }
 
+// src/lib/config.ts
+import { homedir as homedir2 } from "os";
+import { join as join2 } from "path";
+import { existsSync as existsSync2, readFileSync as readFileSync2, writeFileSync as writeFileSync2, mkdirSync as mkdirSync2 } from "fs";
+var CONFIG_DIR2 = join2(homedir2(), ".magic-shell");
+var CONFIG_FILE2 = join2(CONFIG_DIR2, "config.json");
+var HISTORY_FILE2 = join2(CONFIG_DIR2, "history.json");
+var KEYCHAIN_OPENROUTER2 = "openrouter-api-key";
+var KEYCHAIN_OPENCODE_ZEN2 = "opencode-zen-api-key";
+var KEYCHAIN_VERCEL_AI_GATEWAY2 = "vercel-ai-gateway-api-key";
+var KEYCHAIN_CLOUDFLARE_AI_GATEWAY2 = "cloudflare-ai-gateway-api-key";
+var KEYCHAIN_WORKERS_AI2 = "workers-ai-api-key";
+var DEFAULT_CONFIG2 = {
+  provider: "opencode-zen",
+  openrouterApiKey: "",
+  opencodeZenApiKey: "",
+  vercelAiGatewayApiKey: "",
+  cloudflareAiGatewayApiKey: "",
+  workersAiApiKey: "",
+  cloudflareAccountId: "",
+  cloudflareAiGatewayId: "default",
+  defaultModel: "kimi-k2.6-free",
+  safetyLevel: "moderate",
+  dryRunByDefault: false,
+  blockedCommands: [
+    ":(){ :|:& };:",
+    "> /dev/sda",
+    "mkfs",
+    "dd if=/dev/zero",
+    "chmod -R 777 /",
+    "chown -R"
+  ],
+  confirmedDangerousPatterns: [],
+  repoContext: false,
+  customModels: []
+};
+function ensureConfigDir2() {
+  if (!existsSync2(CONFIG_DIR2)) {
+    mkdirSync2(CONFIG_DIR2, { recursive: true });
+  }
+}
+function loadConfig2() {
+  ensureConfigDir2();
+  if (!existsSync2(CONFIG_FILE2)) {
+    return { ...DEFAULT_CONFIG2 };
+  }
+  try {
+    const data = readFileSync2(CONFIG_FILE2, "utf-8");
+    const loaded = JSON.parse(data);
+    return { ...DEFAULT_CONFIG2, ...loaded };
+  } catch {
+    return { ...DEFAULT_CONFIG2 };
+  }
+}
+function saveConfig2(config2) {
+  ensureConfigDir2();
+  const configToSave = { ...config2 };
+  if (isSecureStorageAvailable()) {
+    configToSave.openrouterApiKey = "";
+    configToSave.opencodeZenApiKey = "";
+    configToSave.vercelAiGatewayApiKey = "";
+    configToSave.cloudflareAiGatewayApiKey = "";
+    configToSave.workersAiApiKey = "";
+  }
+  writeFileSync2(CONFIG_FILE2, JSON.stringify(configToSave, null, 2));
+}
+async function getApiKey2(provider) {
+  if (provider === "openrouter") {
+    const envKey = process.env.OPENROUTER_API_KEY;
+    if (envKey)
+      return envKey;
+  } else if (provider === "opencode-zen") {
+    const envKey = process.env.OPENCODE_ZEN_API_KEY;
+    if (envKey)
+      return envKey;
+  } else if (provider === "vercel-ai-gateway") {
+    const envKey = process.env.AI_GATEWAY_API_KEY || process.env.VERCEL_AI_GATEWAY_API_KEY;
+    if (envKey)
+      return envKey;
+  } else if (provider === "cloudflare-ai-gateway") {
+    const envKey = process.env.CLOUDFLARE_AI_GATEWAY_API_KEY || process.env.CF_AIG_TOKEN;
+    if (envKey)
+      return envKey;
+  } else if (provider === "workers-ai") {
+    const envKey = process.env.CLOUDFLARE_API_TOKEN || process.env.CLOUDFLARE_API_KEY;
+    if (envKey)
+      return envKey;
+  }
+  const keychainKey = getKeychainKey2(provider);
+  const secureKey = await getSecret(keychainKey);
+  if (secureKey)
+    return secureKey;
+  const config2 = loadConfig2();
+  switch (provider) {
+    case "openrouter":
+      return config2.openrouterApiKey;
+    case "opencode-zen":
+      return config2.opencodeZenApiKey;
+    case "vercel-ai-gateway":
+      return config2.vercelAiGatewayApiKey || "";
+    case "cloudflare-ai-gateway":
+      return config2.cloudflareAiGatewayApiKey || "";
+    case "workers-ai":
+      return config2.workersAiApiKey || "";
+    case "custom":
+      return "";
+  }
+}
+async function setApiKey2(provider, key) {
+  const config2 = loadConfig2();
+  config2.provider = provider;
+  const keychainKey = getKeychainKey2(provider);
+  const stored = await setSecret(keychainKey, key);
+  if (!stored) {
+    switch (provider) {
+      case "openrouter":
+        config2.openrouterApiKey = key;
+        break;
+      case "opencode-zen":
+        config2.opencodeZenApiKey = key;
+        break;
+      case "vercel-ai-gateway":
+        config2.vercelAiGatewayApiKey = key;
+        break;
+      case "cloudflare-ai-gateway":
+        config2.cloudflareAiGatewayApiKey = key;
+        break;
+      case "workers-ai":
+        config2.workersAiApiKey = key;
+        break;
+      case "custom":
+        break;
+    }
+  }
+  saveConfig2(config2);
+}
+function getKeychainKey2(provider) {
+  switch (provider) {
+    case "openrouter":
+      return KEYCHAIN_OPENROUTER2;
+    case "opencode-zen":
+      return KEYCHAIN_OPENCODE_ZEN2;
+    case "vercel-ai-gateway":
+      return KEYCHAIN_VERCEL_AI_GATEWAY2;
+    case "cloudflare-ai-gateway":
+      return KEYCHAIN_CLOUDFLARE_AI_GATEWAY2;
+    case "workers-ai":
+      return KEYCHAIN_WORKERS_AI2;
+    case "custom":
+      return "custom-api-key";
+  }
+}
+function loadHistory2() {
+  ensureConfigDir2();
+  if (!existsSync2(HISTORY_FILE2)) {
+    return [];
+  }
+  try {
+    const data = readFileSync2(HISTORY_FILE2, "utf-8");
+    return JSON.parse(data);
+  } catch {
+    return [];
+  }
+}
+function saveHistory(history) {
+  ensureConfigDir2();
+  const trimmed = history.slice(-100);
+  writeFileSync2(HISTORY_FILE2, JSON.stringify(trimmed, null, 2));
+}
+function addToHistory(entry) {
+  const history = loadHistory2();
+  history.push(entry);
+  saveHistory(history);
+}
+function getCustomModels2() {
+  const config2 = loadConfig2();
+  return config2.customModels || [];
+}
+async function getCustomModel2(id) {
+  const customModels = getCustomModels2();
+  const model = customModels.find((m) => m.id === id);
+  if (!model) {
+    return;
+  }
+  const keychainKey = `customModel:${model.id}:apiKey`;
+  try {
+    const apiKey = await getSecret(keychainKey);
+    return apiKey ? { ...model, apiKey } : model;
+  } catch (error40) {
+    if (process.env.DEBUG_API === "1") {
+      const message = error40 instanceof Error ? error40.message : String(error40);
+      console.error(`[DEBUG] Custom model keychain get error: ${message}`);
+    }
+    return model;
+  }
+}
+
 // src/lib/shell.ts
 import { execSync } from "child_process";
-import { existsSync as existsSync2 } from "fs";
-import { homedir as homedir2 } from "os";
+import { existsSync as existsSync3 } from "fs";
+import { homedir as homedir3 } from "os";
 function detectShell() {
   const platform = detectPlatform();
   const isWSL = detectWSL();
   const shellPath = getShellPath();
   const shell2 = parseShellType(shellPath);
   const terminalEmulator = detectTerminalEmulator();
-  const homeDir = homedir2();
+  const homeDir = homedir3();
   return {
     shell: shell2,
     shellPath,
@@ -41548,7 +42037,7 @@ function detectWSL() {
     if (release.includes("microsoft") || release.includes("wsl")) {
       return true;
     }
-    if (existsSync2("/proc/sys/fs/binfmt_misc/WSLInterop")) {
+    if (existsSync3("/proc/sys/fs/binfmt_misc/WSLInterop")) {
       return true;
     }
     return false;
@@ -41708,34 +42197,34 @@ function getPlatformPaths(platform) {
 }
 
 // src/lib/repo-context.ts
-import { existsSync as existsSync3, readFileSync as readFileSync2 } from "fs";
-import { join as join2 } from "path";
+import { existsSync as existsSync4, readFileSync as readFileSync3 } from "fs";
+import { join as join3 } from "path";
 function detectRepoContext(cwd) {
   const context2 = {
     type: "unknown"
   };
   let detected = false;
-  if (existsSync3(join2(cwd, ".git"))) {
+  if (existsSync4(join3(cwd, ".git"))) {
     context2.hasGit = true;
     detected = true;
   }
-  if (existsSync3(join2(cwd, "Dockerfile")) || existsSync3(join2(cwd, "docker-compose.yml")) || existsSync3(join2(cwd, "docker-compose.yaml"))) {
+  if (existsSync4(join3(cwd, "Dockerfile")) || existsSync4(join3(cwd, "docker-compose.yml")) || existsSync4(join3(cwd, "docker-compose.yaml"))) {
     context2.hasDocker = true;
     detected = true;
   }
-  const packageJsonPath = join2(cwd, "package.json");
-  if (existsSync3(packageJsonPath)) {
+  const packageJsonPath = join3(cwd, "package.json");
+  if (existsSync4(packageJsonPath)) {
     detected = true;
     context2.type = "node";
     try {
-      const packageJson = JSON.parse(readFileSync2(packageJsonPath, "utf-8"));
-      if (existsSync3(join2(cwd, "bun.lockb")) || existsSync3(join2(cwd, "bun.lock"))) {
+      const packageJson = JSON.parse(readFileSync3(packageJsonPath, "utf-8"));
+      if (existsSync4(join3(cwd, "bun.lockb")) || existsSync4(join3(cwd, "bun.lock"))) {
         context2.packageManager = "bun";
-      } else if (existsSync3(join2(cwd, "pnpm-lock.yaml"))) {
+      } else if (existsSync4(join3(cwd, "pnpm-lock.yaml"))) {
         context2.packageManager = "pnpm";
-      } else if (existsSync3(join2(cwd, "yarn.lock"))) {
+      } else if (existsSync4(join3(cwd, "yarn.lock"))) {
         context2.packageManager = "yarn";
-      } else if (existsSync3(join2(cwd, "package-lock.json"))) {
+      } else if (existsSync4(join3(cwd, "package-lock.json"))) {
         context2.packageManager = "npm";
       } else if (packageJson.packageManager) {
         const pm = packageJson.packageManager.split("@")[0];
@@ -41746,13 +42235,13 @@ function detectRepoContext(cwd) {
       }
     } catch {}
   }
-  const makefilePath = join2(cwd, "Makefile");
-  if (existsSync3(makefilePath)) {
+  const makefilePath = join3(cwd, "Makefile");
+  if (existsSync4(makefilePath)) {
     detected = true;
     if (context2.type === "unknown")
       context2.type = "make";
     try {
-      const makefile = readFileSync2(makefilePath, "utf-8");
+      const makefile = readFileSync3(makefilePath, "utf-8");
       const targetRegex = /^([a-zA-Z_][a-zA-Z0-9_-]*)\s*:/gm;
       const targets = [];
       let match;
@@ -41766,17 +42255,17 @@ function detectRepoContext(cwd) {
       }
     } catch {}
   }
-  if (existsSync3(join2(cwd, "Cargo.toml"))) {
+  if (existsSync4(join3(cwd, "Cargo.toml"))) {
     detected = true;
     context2.type = "rust";
     context2.cargoCommands = ["build", "run", "test", "check", "clippy", "fmt", "doc"];
   }
-  if (existsSync3(join2(cwd, "pyproject.toml")) || existsSync3(join2(cwd, "setup.py")) || existsSync3(join2(cwd, "requirements.txt"))) {
+  if (existsSync4(join3(cwd, "pyproject.toml")) || existsSync4(join3(cwd, "setup.py")) || existsSync4(join3(cwd, "requirements.txt"))) {
     detected = true;
     if (context2.type === "unknown")
       context2.type = "python";
   }
-  if (existsSync3(join2(cwd, "go.mod"))) {
+  if (existsSync4(join3(cwd, "go.mod"))) {
     detected = true;
     if (context2.type === "unknown")
       context2.type = "go";
@@ -41814,9 +42303,6 @@ function formatRepoContext(context2) {
 
 // src/lib/api.ts
 function getZenApiType(modelId) {
-  if (modelId === "minimax-m2.5-free") {
-    return "anthropic";
-  }
   if (modelId.startsWith("gpt-")) {
     return "openai-responses";
   }
@@ -41946,6 +42432,81 @@ async function callOpenRouter(apiKey, modelId, systemPrompt, userInput) {
   }
   return data.choices[0]?.message?.content?.trim() || "";
 }
+async function callOpenAICompatibleFetch(baseURL, apiKey, modelId, systemPrompt, userInput, headers = {}, includeAuthorization = true) {
+  const requestHeaders = {
+    "Content-Type": "application/json",
+    ...headers
+  };
+  if (includeAuthorization) {
+    requestHeaders.Authorization = `Bearer ${apiKey}`;
+  }
+  const response = await fetch(`${baseURL.replace(/\/$/, "")}/chat/completions`, {
+    method: "POST",
+    headers: requestHeaders,
+    body: JSON.stringify({
+      model: modelId,
+      messages: [
+        { role: "system", content: systemPrompt },
+        { role: "user", content: userInput }
+      ],
+      max_tokens: 500,
+      temperature: 0.1,
+      stream: false
+    })
+  });
+  if (!response.ok) {
+    const errorText = await response.text();
+    let errorMessage = `API request failed: ${response.status}`;
+    try {
+      const errorData = JSON.parse(errorText);
+      if (errorData.error?.message) {
+        errorMessage = errorData.error.message;
+      } else if (errorData.errors?.[0]?.message) {
+        errorMessage = errorData.errors[0].message;
+      }
+    } catch {}
+    throw new Error(errorMessage);
+  }
+  const data = await response.json();
+  if (data.error) {
+    throw new Error(data.error.message);
+  }
+  if (data.errors?.[0]?.message) {
+    throw new Error(data.errors[0].message);
+  }
+  const choices = data.choices || data.result?.choices;
+  return choices?.[0]?.message?.content?.trim() || "";
+}
+function getCloudflareAccountId(config2) {
+  return config2.cloudflareAccountId || process.env.CLOUDFLARE_ACCOUNT_ID || process.env.CF_ACCOUNT_ID || "";
+}
+function getCloudflareGatewayId(config2) {
+  return config2.cloudflareAiGatewayId || process.env.CLOUDFLARE_AI_GATEWAY_ID || process.env.CF_AIG_GATEWAY_ID || "default";
+}
+async function callGatewayProvider(provider, apiKey, modelId, systemPrompt, userInput) {
+  const config2 = loadConfig2();
+  switch (provider) {
+    case "vercel-ai-gateway":
+      return await callOpenAICompatibleFetch("https://ai-gateway.vercel.sh/v1", apiKey, modelId, systemPrompt, userInput);
+    case "cloudflare-ai-gateway": {
+      const accountId = getCloudflareAccountId(config2);
+      if (!accountId) {
+        throw new Error("Cloudflare account ID is required. Set cloudflareAccountId in config or CLOUDFLARE_ACCOUNT_ID.");
+      }
+      const gatewayId = getCloudflareGatewayId(config2);
+      return await callOpenAICompatibleFetch(`https://gateway.ai.cloudflare.com/v1/${accountId}/${gatewayId}/compat`, apiKey, modelId, systemPrompt, userInput, { "cf-aig-authorization": `Bearer ${apiKey}` }, false);
+    }
+    case "workers-ai": {
+      const accountId = getCloudflareAccountId(config2);
+      if (!accountId) {
+        throw new Error("Cloudflare account ID is required. Set cloudflareAccountId in config or CLOUDFLARE_ACCOUNT_ID.");
+      }
+      return await callOpenAICompatibleFetch(`https://api.cloudflare.com/client/v4/accounts/${accountId}/ai/v1`, apiKey, modelId, systemPrompt, userInput);
+    }
+    default:
+      throw new Error(`Unsupported gateway provider: ${provider}`);
+  }
+}
 var DEBUG_API = process.env.DEBUG_API === "1";
 async function generateZenText(model, systemPrompt, userInput) {
   const { text: text2 } = await generateText({
@@ -42072,6 +42633,8 @@ async function translateToCommand(apiKey, model, userInput, cwd, history = [], r
     rawCommand = await callCustomModel(model, systemPrompt, userInput);
   } else if (model.provider === "openrouter") {
     rawCommand = await callOpenRouter(apiKey, model.id, systemPrompt, userInput);
+  } else if (model.provider === "vercel-ai-gateway" || model.provider === "cloudflare-ai-gateway" || model.provider === "workers-ai") {
+    rawCommand = await callGatewayProvider(model.provider, apiKey, model.id, systemPrompt, userInput);
   } else {
     const apiType = getZenApiType(model.id);
     switch (apiType) {
@@ -42096,137 +42659,6 @@ async function translateToCommand(apiKey, model, userInput, cwd, history = [], r
   return cleaned;
 }
 
-// src/lib/config.ts
-import { homedir as homedir3 } from "os";
-import { join as join3 } from "path";
-import { existsSync as existsSync4, readFileSync as readFileSync3, writeFileSync as writeFileSync2, mkdirSync as mkdirSync2 } from "fs";
-var CONFIG_DIR2 = join3(homedir3(), ".magic-shell");
-var CONFIG_FILE2 = join3(CONFIG_DIR2, "config.json");
-var HISTORY_FILE2 = join3(CONFIG_DIR2, "history.json");
-var KEYCHAIN_OPENROUTER2 = "openrouter-api-key";
-var KEYCHAIN_OPENCODE_ZEN2 = "opencode-zen-api-key";
-var DEFAULT_CONFIG2 = {
-  provider: "opencode-zen",
-  openrouterApiKey: "",
-  opencodeZenApiKey: "",
-  defaultModel: "kimi-k2.6-free",
-  safetyLevel: "moderate",
-  dryRunByDefault: false,
-  blockedCommands: [
-    ":(){ :|:& };:",
-    "> /dev/sda",
-    "mkfs",
-    "dd if=/dev/zero",
-    "chmod -R 777 /",
-    "chown -R"
-  ],
-  confirmedDangerousPatterns: [],
-  repoContext: false,
-  customModels: []
-};
-function ensureConfigDir2() {
-  if (!existsSync4(CONFIG_DIR2)) {
-    mkdirSync2(CONFIG_DIR2, { recursive: true });
-  }
-}
-function loadConfig2() {
-  ensureConfigDir2();
-  if (!existsSync4(CONFIG_FILE2)) {
-    return { ...DEFAULT_CONFIG2 };
-  }
-  try {
-    const data = readFileSync3(CONFIG_FILE2, "utf-8");
-    const loaded = JSON.parse(data);
-    return { ...DEFAULT_CONFIG2, ...loaded };
-  } catch {
-    return { ...DEFAULT_CONFIG2 };
-  }
-}
-function saveConfig2(config2) {
-  ensureConfigDir2();
-  const configToSave = { ...config2 };
-  if (isSecureStorageAvailable()) {
-    configToSave.openrouterApiKey = "";
-    configToSave.opencodeZenApiKey = "";
-  }
-  writeFileSync2(CONFIG_FILE2, JSON.stringify(configToSave, null, 2));
-}
-async function getApiKey2(provider) {
-  if (provider === "openrouter") {
-    const envKey = process.env.OPENROUTER_API_KEY;
-    if (envKey)
-      return envKey;
-  } else if (provider === "opencode-zen") {
-    const envKey = process.env.OPENCODE_ZEN_API_KEY;
-    if (envKey)
-      return envKey;
-  }
-  const keychainKey = provider === "openrouter" ? KEYCHAIN_OPENROUTER2 : KEYCHAIN_OPENCODE_ZEN2;
-  const secureKey = await getSecret(keychainKey);
-  if (secureKey)
-    return secureKey;
-  const config2 = loadConfig2();
-  return provider === "openrouter" ? config2.openrouterApiKey : config2.opencodeZenApiKey;
-}
-async function setApiKey2(provider, key) {
-  const config2 = loadConfig2();
-  config2.provider = provider;
-  const keychainKey = provider === "openrouter" ? KEYCHAIN_OPENROUTER2 : KEYCHAIN_OPENCODE_ZEN2;
-  const stored = await setSecret(keychainKey, key);
-  if (!stored) {
-    if (provider === "openrouter") {
-      config2.openrouterApiKey = key;
-    } else {
-      config2.opencodeZenApiKey = key;
-    }
-  }
-  saveConfig2(config2);
-}
-function loadHistory2() {
-  ensureConfigDir2();
-  if (!existsSync4(HISTORY_FILE2)) {
-    return [];
-  }
-  try {
-    const data = readFileSync3(HISTORY_FILE2, "utf-8");
-    return JSON.parse(data);
-  } catch {
-    return [];
-  }
-}
-function saveHistory(history) {
-  ensureConfigDir2();
-  const trimmed = history.slice(-100);
-  writeFileSync2(HISTORY_FILE2, JSON.stringify(trimmed, null, 2));
-}
-function addToHistory(entry) {
-  const history = loadHistory2();
-  history.push(entry);
-  saveHistory(history);
-}
-function getCustomModels2() {
-  const config2 = loadConfig2();
-  return config2.customModels || [];
-}
-async function getCustomModel2(id) {
-  const customModels = getCustomModels2();
-  const model = customModels.find((m) => m.id === id);
-  if (!model) {
-    return;
-  }
-  const keychainKey = `customModel:${model.id}:apiKey`;
-  try {
-    const apiKey = await getSecret(keychainKey);
-    return apiKey ? { ...model, apiKey } : model;
-  } catch (error40) {
-    if (process.env.DEBUG_API === "1") {
-      const message = error40 instanceof Error ? error40.message : String(error40);
-      console.error(`[DEBUG] Custom model keychain get error: ${message}`);
-    }
-    return model;
-  }
-}
-
 // src/lib/theme.ts
 var opencode = {
   name: "opencode",
@@ -42595,7 +43027,7 @@ ${colors.bold}USAGE${colors.reset}
   msh --add-model          Add custom model (LM Studio, Ollama, etc.)
   msh --list-custom        List custom models
   msh --remove-model <id>  Remove custom model
-  msh --provider <name>    Set provider (opencode-zen or openrouter)
+  msh --provider <name>    Set provider
   msh --themes             List available themes
   msh --theme <name>       Set color theme
   msh --repo-context       Enable project context detection
@@ -42630,6 +43062,10 @@ ${colors.bold}THEMES${colors.reset}
 ${colors.bold}ENVIRONMENT${colors.reset}
   OPENCODE_ZEN_API_KEY     API key for OpenCode Zen
   OPENROUTER_API_KEY       API key for OpenRouter
+  AI_GATEWAY_API_KEY       API key for Vercel AI Gateway
+  CLOUDFLARE_API_TOKEN     API token for Cloudflare Workers AI
+  CLOUDFLARE_ACCOUNT_ID    Account ID for Cloudflare providers
+  CLOUDFLARE_AI_GATEWAY_API_KEY API key/token for Cloudflare AI Gateway
 
 ${colors.bold}CONFIG${colors.reset}
   ~/.magic-shell/config.json
@@ -42675,6 +43111,24 @@ ${colors.bold}OpenRouter Models${colors.reset}
       console.log(`    ${colors.dim}${model.description}${colors.reset}`);
     }
   }
+  const providerSections = [
+    ["Vercel AI Gateway Models", VERCEL_AI_GATEWAY_MODELS, "vercel-ai-gateway"],
+    ["Cloudflare AI Gateway Models", CLOUDFLARE_AI_GATEWAY_MODELS, "cloudflare-ai-gateway"],
+    ["Cloudflare Workers AI Models", WORKERS_AI_MODELS, "workers-ai"]
+  ];
+  for (const [title, models, provider] of providerSections) {
+    console.log(`
+${colors.bold}${title}${colors.reset}
+`);
+    const sortedModels = [...models].sort((a, b) => a.name.localeCompare(b.name));
+    for (const model of sortedModels) {
+      const isCurrent = config2.provider === provider && config2.defaultModel === model.id;
+      const marker21 = isCurrent ? colors.success + "\u2192 " : "  ";
+      const category = colors.dim + `[${model.category}]` + colors.reset;
+      console.log(`${marker21}${model.id} ${category}`);
+      console.log(`    ${colors.dim}${model.description}${colors.reset}`);
+    }
+  }
   if (customModels.length > 0) {
     console.log(`
 ${colors.bold}Custom Models${colors.reset} ${colors.info}(custom)${colors.reset}
@@ -42698,8 +43152,8 @@ function validateApiKey(key, provider) {
   if (trimmed.length < 20) {
     return "API key seems too short (expected at least 20 characters)";
   }
-  if (!trimmed.startsWith("sk-")) {
-    const providerName = provider === "opencode-zen" ? "OpenCode Zen" : "OpenRouter";
+  if ((provider === "opencode-zen" || provider === "openrouter") && !trimmed.startsWith("sk-")) {
+    const providerName = getProviderDisplayName(provider);
     return `${providerName} API keys typically start with 'sk-'`;
   }
   if (trimmed.includes(" ")) {
@@ -42711,6 +43165,22 @@ function validateApiKey(key, provider) {
   }
   return null;
 }
+function getApiKeyUrl(provider) {
+  switch (provider) {
+    case "opencode-zen":
+      return "https://opencode.ai/auth";
+    case "openrouter":
+      return "https://openrouter.ai/keys";
+    case "vercel-ai-gateway":
+      return "https://vercel.com/docs/ai-gateway";
+    case "cloudflare-ai-gateway":
+      return "https://developers.cloudflare.com/ai-gateway/";
+    case "workers-ai":
+      return "https://dash.cloudflare.com/profile/api-tokens";
+    case "custom":
+      return "";
+  }
+}
 async function setup() {
   const readline = await import("readline");
   const rl = readline.createInterface({
@@ -42728,9 +43198,18 @@ ${colors.bold}${colors.cyan}Magic Shell Setup${colors.reset}
   console.log("Select provider:");
   console.log("  1. OpenCode Zen (recommended, has free models)");
   console.log("  2. OpenRouter");
+  console.log("  3. Vercel AI Gateway");
+  console.log("  4. Cloudflare AI Gateway");
+  console.log("  5. Cloudflare Workers AI");
   const providerChoice = await question(`
 Choice [1]: `);
-  const provider = providerChoice === "2" ? "openrouter" : "opencode-zen";
+  const providerChoices = {
+    "2": "openrouter",
+    "3": "vercel-ai-gateway",
+    "4": "cloudflare-ai-gateway",
+    "5": "workers-ai"
+  };
+  const provider = providerChoices[providerChoice] || "opencode-zen";
   const existingKey = await getApiKey(provider);
   if (existingKey) {
     const useExisting = await question(`
@@ -42738,7 +43217,7 @@ API key already configured. Keep it? [Y/n]: `);
     if (useExisting.toLowerCase() !== "n") {
       console.log(`${colors.green}\u2713 Using existing API key${colors.reset}`);
     } else {
-      const url2 = provider === "opencode-zen" ? "https://opencode.ai/auth" : "https://openrouter.ai/keys";
+      const url2 = getApiKeyUrl(provider);
       console.log(`
 Get your API key from: ${colors.cyan}${url2}${colors.reset}`);
       let validKey = false;
@@ -42762,7 +43241,7 @@ Get your API key from: ${colors.cyan}${url2}${colors.reset}`);
       }
     }
   } else {
-    const url2 = provider === "opencode-zen" ? "https://opencode.ai/auth" : "https://openrouter.ai/keys";
+    const url2 = getApiKeyUrl(provider);
     console.log(`
 Get your API key from: ${colors.cyan}${url2}${colors.reset}`);
     let validKey = false;
@@ -42786,7 +43265,20 @@ Get your API key from: ${colors.cyan}${url2}${colors.reset}`);
       validKey = true;
     }
   }
-  const models = provider === "opencode-zen" ? OPENCODE_ZEN_MODELS : OPENROUTER_MODELS;
+  const config2 = loadConfig();
+  if (provider === "cloudflare-ai-gateway" || provider === "workers-ai") {
+    const existingAccountId = config2.cloudflareAccountId || process.env.CLOUDFLARE_ACCOUNT_ID || "";
+    if (!existingAccountId) {
+      const accountId = await question(`
+Cloudflare account ID: `);
+      config2.cloudflareAccountId = accountId.trim();
+    }
+  }
+  if (provider === "cloudflare-ai-gateway") {
+    const gatewayId = await question(`Cloudflare AI Gateway ID [${config2.cloudflareAiGatewayId || "default"}]: `);
+    config2.cloudflareAiGatewayId = gatewayId.trim() || config2.cloudflareAiGatewayId || "default";
+  }
+  const models = getProviderModels(provider);
   const freeModels = models.filter((m) => m.free);
   console.log(`
 Recommended models:`);
@@ -42799,13 +43291,12 @@ Recommended models:`);
 Choice [1]: `);
   const modelIndex = parseInt(modelChoice || "1") - 1;
   const selectedModel = displayModels[modelIndex] || displayModels[0];
-  const config2 = loadConfig();
   config2.provider = provider;
   config2.defaultModel = selectedModel.id;
   saveConfig(config2);
   console.log(`
 ${colors.green}\u2713 Setup complete!${colors.reset}`);
-  console.log(`  Provider: ${provider === "opencode-zen" ? "OpenCode Zen" : "OpenRouter"}`);
+  console.log(`  Provider: ${getProviderDisplayName(provider)}`);
   console.log(`  Model: ${selectedModel.name}`);
   console.log(`
 Try: ${colors.cyan}msh "list all files"${colors.reset}
@@ -42949,7 +43440,8 @@ async function translate(query, options) {
   const apiKey = await getApiKey(config2.provider);
   const customModel = await getCustomModel(config2.defaultModel);
   const builtInModel = ALL_MODELS.find((m) => m.id === config2.defaultModel);
-  const model = customModel || builtInModel || (config2.provider === "opencode-zen" ? OPENCODE_ZEN_MODELS[0] : OPENROUTER_MODELS[0]);
+  const fallbackModels = getProviderModels(config2.provider);
+  const model = customModel || builtInModel || fallbackModels[0] || OPENCODE_ZEN_MODELS[0];
   if (!customModel && !apiKey) {
     console.error(`${colors.red}Error: No API key configured.${colors.reset}`);
     console.error(`Run: ${colors.cyan}msh --setup${colors.reset}`);
@@ -43128,14 +43620,15 @@ ${colors.bold}Custom Models${colors.reset}
   }
   if (args[0] === "--provider" && args[1]) {
     const provider = args[1];
-    if (provider !== "opencode-zen" && provider !== "openrouter") {
+    const validProviders = ["opencode-zen", "openrouter", "vercel-ai-gateway", "cloudflare-ai-gateway", "workers-ai"];
+    if (!validProviders.includes(provider)) {
       console.error(`${colors.error}Unknown provider: ${provider}${colors.reset}`);
-      console.error(`Valid providers: opencode-zen, openrouter`);
+      console.error(`Valid providers: ${validProviders.join(", ")}`);
       process.exit(1);
     }
     const config2 = loadConfig();
     config2.provider = provider;
-    const models = provider === "opencode-zen" ? OPENCODE_ZEN_MODELS : OPENROUTER_MODELS;
+    const models = getProviderModels(provider);
     const firstAvailable = models.find((m) => !m.disabled) || models[0];
     config2.defaultModel = firstAvailable.id;
     saveConfig(config2);