@agentskit/cli 0.13.33 → 0.13.35

package/README.md

@@ -20,7 +20,7 @@ Chat with any LLM, scaffold projects, and run agents — all from your terminal.
 ## Verified proof
 
 - Package metadata and tests live under `packages/cli/`.
-- Package guide: https://www.agentskit.io/docs/packages/cli
+- Package guide: https://www.agentskit.io/docs/reference/packages/cli
 - Stability map: [docs/STABILITY.md](../../docs/STABILITY.md)
 
 ## How this fits the ecosystem
@@ -32,14 +32,14 @@ Chat with any LLM, scaffold projects, and run agents — all from your terminal.
 - **Playbook**: learn the production patterns behind this layer at [playbook.agentskit.io](https://playbook.agentskit.io).
 - **AKOS**: run the same concepts with enterprise deployment, governance, and observability at [akos.agentskit.io](https://akos.agentskit.io).
 
-Docs: [package guide](https://www.agentskit.io/docs/packages/cli) · [agent handoff](https://github.com/AgentsKit-io/agentskit/blob/main/llms.txt)
+Docs: [package guide](https://www.agentskit.io/docs/reference/packages/cli) · [agent handoff](https://github.com/AgentsKit-io/agentskit/blob/main/llms.txt)
 
 ## Why cli
 
 - **Zero setup for prototyping** — go from idea to running conversation in under a minute; no boilerplate, no config files to write
 - **Scaffold production-ready projects** — generate a React chat app or terminal agent with the right structure so you skip the boring setup
 - **Script and automate** — pipe inputs, use env vars for keys, and compose with other Unix tools for lightweight agent scripting
-- **Every provider, one command** — switch between OpenAI, Anthropic, Ollama (local), and more with a single flag
+- **Every provider, one command** — switch between OpenAI, Anthropic, Groq, OpenRouter, Ollama (local), and more with a single flag
 
 ## Install
 
@@ -57,6 +57,13 @@ ANTHROPIC_API_KEY=... agentskit chat --provider anthropic --model claude-sonnet-
 # Chat with a local model (no API key needed)
 agentskit chat --provider ollama --model llama3.1
 
+# Chat through DeepSeek, Grok, Kimi, Groq, or OpenRouter
+DEEPSEEK_API_KEY=... agentskit chat --provider deepseek
+XAI_API_KEY=... agentskit chat --provider grok
+KIMI_API_KEY=... agentskit chat --provider kimi
+GROQ_API_KEY=... agentskit chat --provider groq
+OPENROUTER_API_KEY=... agentskit chat --provider openrouter
+
 # Scaffold a new React chat app
 agentskit init --template react --dir my-app
 
@@ -84,8 +91,10 @@ agentskit run --help
 - **Extensibility** — plugins (slash commands, tools, skills, providers, hooks, MCP servers), permission policy with modes, lifecycle hooks (shell or JS), MCP stdio bridge, session rename + fork, `/usage` + `/cost`
 - Provider flags: `--provider`, `--model`, `--system`, `--skill`, `--memory`, `--mode`, `--plugin-dir`
 - Env-var based key injection — works seamlessly in CI and scripts
+- Built-in live providers include OpenAI, Anthropic, Gemini, DeepSeek, Grok, Kimi, Groq, and OpenRouter; Ollama remains local and keyless
+- `agentskit init --provider deepseek|grok|kimi|groq|openrouter` — scaffold a starter already wired to the selected provider
 
-Full reference: [docs/infrastructure/cli](https://www.agentskit.io/docs/infrastructure/cli) · [ARCHITECTURE.md](./ARCHITECTURE.md)
+Full reference: [docs/production/cli](https://www.agentskit.io/docs/production/cli) · [ARCHITECTURE.md](./ARCHITECTURE.md)
 
 ### agentskit doctor
 

package/dist/bin.cjs

@@ -105,12 +105,12 @@ var providers = {
   anthropic: {
     label: "Anthropic",
     envKeys: ["ANTHROPIC_API_KEY"],
-    defaultModel: "claude-3-5-sonnet-latest",
+    defaultModel: "claude-sonnet-4-6",
     factory: (c) => adapters.anthropic(c)
   },
   gemini: {
     label: "Gemini",
-    envKeys: ["GEMINI_API_KEY"],
+    envKeys: ["GEMINI_API_KEY", "GOOGLE_API_KEY", "GOOGLE_GENERATIVE_AI_API_KEY"],
     defaultModel: "gemini-2.5-flash",
     factory: (c) => adapters.gemini(c)
   },
@@ -129,14 +129,26 @@ var providers = {
   grok: {
     label: "xAI Grok",
     envKeys: ["XAI_API_KEY"],
-    requiresModel: true,
+    defaultModel: "grok-4.20-0309-non-reasoning",
     factory: (c) => adapters.grok(c)
   },
   kimi: {
     label: "Kimi",
     envKeys: ["KIMI_API_KEY", "MOONSHOT_API_KEY"],
-    requiresModel: true,
+    defaultModel: "kimi-k2-0711-preview",
     factory: (c) => adapters.kimi(c)
+  },
+  groq: {
+    label: "Groq",
+    envKeys: ["GROQ_API_KEY"],
+    defaultModel: "openai/gpt-oss-120b",
+    factory: (c) => adapters.groq(c)
+  },
+  openrouter: {
+    label: "OpenRouter",
+    envKeys: ["OPENROUTER_API_KEY"],
+    defaultModel: "~anthropic/claude-haiku-latest",
+    factory: (c) => adapters.openrouter(c)
   }
 };
 function createDemoAdapter(provider, model) {
@@ -429,7 +441,7 @@ ${lines.join("\n")}`, "info");
   {
     name: "provider",
     description: "Switch the adapter provider.",
-    usage: "/provider openai|anthropic|gemini|ollama|deepseek|grok|kimi|demo",
+    usage: "/provider openai|anthropic|gemini|ollama|deepseek|grok|kimi|groq|openrouter|demo",
     run(ctx, args) {
       const value = args.trim();
       if (!value) {
@@ -1695,17 +1707,29 @@ function registerRunCommand(program) {
     }
   });
 }
+
+// src/init-providers.ts
 var PROVIDER_IMPORT = {
   openai: "openai",
   anthropic: "anthropic",
   gemini: "gemini",
-  ollama: "ollama"
+  ollama: "ollama",
+  deepseek: "deepseek",
+  grok: "grok",
+  kimi: "kimi",
+  groq: "groq",
+  openrouter: "openrouter"
 };
 var PROVIDER_DEFAULT_MODEL = {
   openai: "gpt-4o-mini",
   anthropic: "claude-sonnet-4-6",
   gemini: "gemini-2.5-flash",
   ollama: "llama3.1",
+  deepseek: "deepseek-chat",
+  grok: "grok-4.20-0309-non-reasoning",
+  kimi: "kimi-k2-0711-preview",
+  groq: "openai/gpt-oss-120b",
+  openrouter: "~anthropic/claude-haiku-latest",
   demo: "demo"
 };
 var PROVIDER_ENV_KEY = {
@@ -1713,8 +1737,15 @@ var PROVIDER_ENV_KEY = {
   anthropic: "ANTHROPIC_API_KEY",
   gemini: "GEMINI_API_KEY",
   ollama: null,
+  deepseek: "DEEPSEEK_API_KEY",
+  grok: "XAI_API_KEY",
+  kimi: "KIMI_API_KEY",
+  groq: "GROQ_API_KEY",
+  openrouter: "OPENROUTER_API_KEY",
   demo: null
 };
+
+// src/init.ts
 function adapterCall(provider, prefix = "process.env") {
   const model = PROVIDER_DEFAULT_MODEL[provider];
   if (provider === "demo") return `demoAdapter()`;
@@ -1722,6 +1753,11 @@ function adapterCall(provider, prefix = "process.env") {
   const envKey = PROVIDER_ENV_KEY[provider];
   return `${PROVIDER_IMPORT[provider]}({ apiKey: ${prefix}.${envKey} ?? '', model: '${model}' })`;
 }
+function denoAdapterCall(provider) {
+  if (provider === "demo") return "demoAdapter()";
+  if (provider === "ollama") return `ollama({ model: '${PROVIDER_DEFAULT_MODEL[provider]}' })`;
+  return `${PROVIDER_IMPORT[provider]}({ apiKey: Deno.env.get('${PROVIDER_ENV_KEY[provider]}') ?? '', model: '${PROVIDER_DEFAULT_MODEL[provider]}' })`;
+}
 function viteAdapterCall(provider) {
   if (provider === "demo") return `demoAdapter()`;
   if (provider === "ollama") return `ollama({ model: '${PROVIDER_DEFAULT_MODEL[provider]}' })`;
@@ -2402,7 +2438,7 @@ function cloudflareWorkersStarter(ctx) {
     "itty-router": "^5.0.0"
   };
   if (ctx.provider !== "demo") deps["@agentskit/adapters"] = "^0.4.0";
-  const adapterCallEdge = ctx.provider === "demo" ? "demoAdapter()" : ctx.provider === "ollama" ? `ollama({ model: '${PROVIDER_DEFAULT_MODEL[ctx.provider]}' })` : `${PROVIDER_IMPORT[ctx.provider]}({ apiKey: env.${PROVIDER_ENV_KEY[ctx.provider]} ?? '', model: '${PROVIDER_DEFAULT_MODEL[ctx.provider]}' })`;
+  const adapterCallEdge = adapterCall(ctx.provider, "env");
   const adapterImport2 = buildAdapterServerImport(ctx.provider);
   const demoSnippet = ctx.provider === "demo" ? demoAdapterSnippet() : "";
   const envKey = PROVIDER_ENV_KEY[ctx.provider];
@@ -2885,7 +2921,7 @@ export const useAuth = () => useContext(AuthCtx)
   };
 }
 function denoDeployStarter(ctx) {
-  const adapterCallEdge = ctx.provider === "demo" ? "demoAdapter()" : ctx.provider === "ollama" ? `ollama({ model: '${PROVIDER_DEFAULT_MODEL[ctx.provider]}' })` : `${PROVIDER_IMPORT[ctx.provider]}({ apiKey: Deno.env.get('${PROVIDER_ENV_KEY[ctx.provider]}') ?? '', model: '${PROVIDER_DEFAULT_MODEL[ctx.provider]}' })`;
+  const adapterCallEdge = denoAdapterCall(ctx.provider);
   const adapterImport2 = ctx.provider === "demo" ? "" : `import { ${PROVIDER_IMPORT[ctx.provider]} } from 'npm:@agentskit/adapters'
 `;
   const demoSnippet = ctx.provider === "demo" ? demoAdapterSnippet() : "";
@@ -3070,8 +3106,8 @@ ${runCmd}
 ## Next steps
 
 - Open the AgentsKit docs at https://www.agentskit.io/docs
-- Add a custom skill: https://www.agentskit.io/docs/concepts/skill
-- Wire up RAG: https://www.agentskit.io/docs/recipes/rag-chat
+- Add a custom skill: https://www.agentskit.io/docs/get-started/concepts/skill
+- Wire up RAG: https://www.agentskit.io/docs/reference/recipes/rag-chat
 
 ## License
 
@@ -3154,7 +3190,12 @@ ${kleur__default.default.bold().green("\u25B2")} ${kleur__default.default.bold("
         { name: "OpenAI", value: "openai" },
         { name: "Anthropic", value: "anthropic" },
         { name: "Gemini", value: "gemini" },
-        { name: "Ollama (local, no key)", value: "ollama" }
+        { name: "Ollama (local, no key)", value: "ollama" },
+        { name: "DeepSeek", value: "deepseek" },
+        { name: "xAI Grok", value: "grok" },
+        { name: "Kimi", value: "kimi" },
+        { name: "Groq", value: "groq" },
+        { name: "OpenRouter", value: "openrouter" }
       ]
     });
     let tools = [];
@@ -3253,7 +3294,7 @@ function printNextSteps(options) {
 
 // src/commands/init.ts
 function registerInitCommand(program) {
-  program.command("init").description("Generate a starter project. Run with no flags for interactive mode.").option("--template <template>", "Starter template (react|nextjs|sveltekit|nuxt|ink|vite-ink|cloudflare-workers|bun|deno-deploy|expo|angular|runtime|multi-agent)").option("--dir <directory>", "Target directory", "agentskit-app").option("--provider <provider>", "LLM provider (openai|anthropic|gemini|ollama|demo)").option("--tools <tools>", "Comma-separated tools (web_search,filesystem,shell)").option("--memory <backend>", "Memory backend (none|file|sqlite)").option("--pm <packageManager>", "Package manager (pnpm|npm|yarn|bun)").option("-y, --yes", "Skip interactive prompts; use flag values + defaults").action(async (rawOptions) => {
+  program.command("init").description("Generate a starter project. Run with no flags for interactive mode.").option("--template <template>", "Starter template (react|nextjs|sveltekit|nuxt|ink|vite-ink|cloudflare-workers|bun|deno-deploy|expo|angular|runtime|multi-agent)").option("--dir <directory>", "Target directory", "agentskit-app").option("--provider <provider>", "LLM provider (openai|anthropic|gemini|ollama|deepseek|grok|kimi|groq|openrouter|demo)").option("--tools <tools>", "Comma-separated tools (web_search,filesystem,shell)").option("--memory <backend>", "Memory backend (none|file|sqlite)").option("--pm <packageManager>", "Package manager (pnpm|npm|yarn|bun)").option("-y, --yes", "Skip interactive prompts; use flag values + defaults").action(async (rawOptions) => {
     const isCi = !process.stdout.isTTY || rawOptions.yes || rawOptions.template;
     let resolved;
     if (isCi) {
@@ -3288,20 +3329,206 @@ function registerInitCommand(program) {
     }
   });
 }
-var PROVIDER_ENV_KEYS = {
-  openai: "OPENAI_API_KEY",
-  anthropic: "ANTHROPIC_API_KEY",
-  gemini: "GEMINI_API_KEY",
-  deepseek: "DEEPSEEK_API_KEY",
-  grok: "XAI_API_KEY",
-  kimi: "KIMI_API_KEY"
-};
-var PROVIDER_REACH_URLS = {
-  openai: "https://api.openai.com/v1/models",
-  anthropic: "https://api.anthropic.com/v1/messages",
-  gemini: "https://generativelanguage.googleapis.com/v1beta/models",
-  ollama: "http://localhost:11434/api/tags"
-};
+
+// src/provider-registry.ts
+var PROVIDER_REGISTRY = [
+  {
+    id: "demo",
+    label: "Demo",
+    runtime: "local",
+    env: { status: "not-required", reason: "Demo adapter does not use provider credentials." },
+    reachability: { status: "unsupported", reason: "Demo adapter has no upstream endpoint." },
+    defaultModel: { status: "known", id: "demo" }
+  },
+  {
+    id: "openai",
+    label: "OpenAI",
+    runtime: "cli",
+    catalogId: "openai",
+    env: { status: "required", keys: ["OPENAI_API_KEY"] },
+    reachability: { status: "supported", url: "https://api.openai.com/v1/models" },
+    defaultModel: { status: "known", id: "gpt-4o-mini" },
+    doctorDefault: true
+  },
+  {
+    id: "anthropic",
+    label: "Anthropic",
+    runtime: "cli",
+    catalogId: "anthropic",
+    env: { status: "required", keys: ["ANTHROPIC_API_KEY"] },
+    reachability: { status: "supported", url: "https://api.anthropic.com/v1/messages" },
+    defaultModel: { status: "known", id: "claude-sonnet-4-6" },
+    doctorDefault: true
+  },
+  {
+    id: "gemini",
+    label: "Gemini",
+    runtime: "cli",
+    catalogId: "google",
+    env: { status: "required", keys: ["GEMINI_API_KEY", "GOOGLE_API_KEY", "GOOGLE_GENERATIVE_AI_API_KEY"] },
+    reachability: { status: "supported", url: "https://generativelanguage.googleapis.com/v1beta/models" },
+    defaultModel: { status: "known", id: "gemini-2.5-flash" },
+    doctorDefault: true
+  },
+  {
+    id: "ollama",
+    label: "Ollama",
+    runtime: "local",
+    env: { status: "not-required", reason: "Ollama runs locally and does not require an API key." },
+    reachability: { status: "supported", url: "http://localhost:11434/api/tags" },
+    defaultModel: { status: "known", id: "llama3.1" },
+    doctorDefault: true
+  },
+  {
+    id: "deepseek",
+    label: "DeepSeek",
+    runtime: "cli",
+    catalogId: "deepseek",
+    env: { status: "required", keys: ["DEEPSEEK_API_KEY"] },
+    reachability: { status: "supported", url: "https://api.deepseek.com/models" },
+    defaultModel: { status: "known", id: "deepseek-chat" }
+  },
+  {
+    id: "grok",
+    label: "xAI Grok",
+    runtime: "cli",
+    catalogId: "xai",
+    env: { status: "required", keys: ["XAI_API_KEY"] },
+    reachability: { status: "supported", url: "https://api.x.ai/v1/models" },
+    defaultModel: { status: "known", id: "grok-4.20-0309-non-reasoning" }
+  },
+  {
+    id: "kimi",
+    label: "Kimi",
+    runtime: "cli",
+    catalogId: "moonshotai",
+    env: { status: "required", keys: ["KIMI_API_KEY", "MOONSHOT_API_KEY"] },
+    reachability: { status: "supported", url: "https://api.moonshot.ai/v1/models" },
+    defaultModel: { status: "known", id: "kimi-k2-0711-preview" }
+  },
+  {
+    id: "groq",
+    label: "Groq",
+    runtime: "cli",
+    catalogId: "groq",
+    env: { status: "required", keys: ["GROQ_API_KEY"] },
+    reachability: { status: "supported", url: "https://api.groq.com/openai/v1/models" },
+    defaultModel: { status: "known", id: "openai/gpt-oss-120b" }
+  },
+  {
+    id: "openrouter",
+    label: "OpenRouter",
+    runtime: "cli",
+    catalogId: "openrouter",
+    env: { status: "required", keys: ["OPENROUTER_API_KEY"] },
+    reachability: { status: "supported", url: "https://openrouter.ai/api/v1/models" },
+    defaultModel: { status: "known", id: "~anthropic/claude-haiku-latest" }
+  },
+  {
+    id: "mistral",
+    label: "Mistral",
+    runtime: "adapter-only",
+    catalogId: "mistral",
+    env: { status: "required", keys: ["MISTRAL_API_KEY"] },
+    reachability: { status: "supported", url: "https://api.mistral.ai/v1/models" },
+    defaultModel: { status: "known", id: "codestral-latest" }
+  },
+  {
+    id: "cohere",
+    label: "Cohere",
+    runtime: "adapter-only",
+    catalogId: "cohere",
+    env: { status: "required", keys: ["COHERE_API_KEY"] },
+    reachability: { status: "supported", url: "https://api.cohere.com/v1/models" },
+    defaultModel: { status: "known", id: "c4ai-aya-expanse-32b" }
+  },
+  {
+    id: "together",
+    label: "Together",
+    runtime: "adapter-only",
+    catalogId: "togetherai",
+    env: { status: "required", keys: ["TOGETHER_API_KEY"] },
+    reachability: { status: "supported", url: "https://api.together.xyz/v1/models" },
+    defaultModel: { status: "known", id: "deepseek-ai/DeepSeek-R1" }
+  },
+  {
+    id: "fireworks",
+    label: "Fireworks",
+    runtime: "adapter-only",
+    catalogId: "fireworks-ai",
+    env: { status: "required", keys: ["FIREWORKS_API_KEY"] },
+    reachability: { status: "supported", url: "https://api.fireworks.ai/inference/v1/models" },
+    defaultModel: { status: "known", id: "accounts/fireworks/models/deepseek-v4-flash" }
+  },
+  {
+    id: "huggingface",
+    label: "Hugging Face",
+    runtime: "adapter-only",
+    catalogId: "huggingface",
+    env: { status: "required", keys: ["HF_TOKEN"] },
+    reachability: { status: "supported", url: "https://router.huggingface.co/v1/models" },
+    defaultModel: { status: "known", id: "deepseek-ai/DeepSeek-R1-0528" }
+  },
+  {
+    id: "lmstudio",
+    label: "LM Studio",
+    runtime: "local",
+    catalogId: "lmstudio",
+    env: { status: "not-required", reason: "LM Studio runs locally and does not require a provider key." },
+    reachability: { status: "supported", url: "http://127.0.0.1:1234/v1/models" },
+    defaultModel: { status: "known", id: "openai/gpt-oss-20b" }
+  },
+  {
+    id: "vllm",
+    label: "vLLM",
+    runtime: "local",
+    env: { status: "not-required", reason: "vLLM is a local server and does not require a provider key." },
+    reachability: { status: "supported", url: "http://localhost:8000/v1/models" },
+    defaultModel: { status: "known", id: "meta-llama/Llama-3.1-8B-Instruct" }
+  },
+  {
+    id: "llamacpp",
+    label: "llama.cpp",
+    runtime: "local",
+    env: { status: "not-required", reason: "llama.cpp is a local server and does not require a provider key." },
+    reachability: { status: "supported", url: "http://localhost:8080/v1/models" },
+    defaultModel: { status: "known", id: "local-model" }
+  },
+  {
+    id: "cerebras",
+    label: "Cerebras",
+    runtime: "adapter-only",
+    catalogId: "cerebras",
+    env: { status: "required", keys: ["CEREBRAS_API_KEY"] },
+    reachability: { status: "supported", url: "https://api.cerebras.ai/v1/models" },
+    defaultModel: { status: "known", id: "gpt-oss-120b" }
+  }
+];
+var DEFAULT_DOCTOR_PROVIDERS = PROVIDER_REGISTRY.filter((entry) => "doctorDefault" in entry && entry.doctorDefault === true).map((entry) => entry.id);
+function getProviderRegistryEntry(provider) {
+  return PROVIDER_REGISTRY.find((entry) => entry.id === provider.toLowerCase());
+}
+function resolveProviderRegistryEntry(provider) {
+  return getProviderRegistryEntry(provider) ?? {
+    id: provider,
+    label: provider,
+    runtime: "adapter-only",
+    env: { status: "unsupported", reason: "Provider is not in the CLI doctor registry." },
+    reachability: { status: "unsupported", reason: "Provider is not in the CLI doctor registry." },
+    defaultModel: { status: "unsupported", reason: "Provider is not in the CLI doctor registry." }
+  };
+}
+
+// src/doctor.ts
+function providerReachabilityFix(entry) {
+  if (entry.id === "ollama") {
+    return "Start Ollama: `ollama serve` (or install from https://ollama.com)";
+  }
+  if (entry.runtime === "local") {
+    return `Start ${entry.label} server and verify its local endpoint`;
+  }
+  return "Check network / firewall / VPN settings";
+}
 async function checkNodeVersion() {
   const major = Number(process.versions.node.split(".")[0]);
   if (Number.isNaN(major)) {
@@ -3380,17 +3607,22 @@ async function checkPackageJson() {
   }
 }
 async function checkProviderEnv(provider) {
-  const envKey = PROVIDER_ENV_KEYS[provider];
-  if (!envKey) {
-    return { status: "skip", name: `${provider} API key`, detail: "No env-key requirement for this provider" };
+  const entry = resolveProviderRegistryEntry(provider);
+  if (entry.env.status === "unsupported") {
+    return { status: "skip", name: `${provider} API key`, detail: entry.env.reason };
+  }
+  if (entry.env.status === "not-required") {
+    return { status: "skip", name: `${provider} API key`, detail: entry.env.reason };
   }
-  const value = process.env[envKey];
+  const envKey = entry.env.keys.find((key) => process.env[key]);
+  const expectedKeys = entry.env.keys.join(" or ");
+  const value = envKey ? process.env[envKey] : void 0;
   if (!value) {
     return {
       status: "skip",
       name: `${provider} API key`,
-      detail: `${envKey} not set`,
-      fix: `export ${envKey}=... (only needed if you use ${provider})`
+      detail: `${expectedKeys} not set`,
+      fix: `export ${entry.env.keys[0]}=... (only needed if you use ${provider})`
     };
   }
   if (value.length < 16) {
@@ -3404,12 +3636,12 @@ async function checkProviderEnv(provider) {
   return { status: "pass", name: `${provider} API key`, detail: `${envKey} set (${value.length} chars)` };
 }
 async function checkProviderReachable(provider, fetchImpl = fetch, timeoutMs = 4e3) {
-  const url = PROVIDER_REACH_URLS[provider];
-  if (!url) {
-    return { status: "skip", name: `${provider} reachable`, detail: "No reachability check configured" };
+  const entry = resolveProviderRegistryEntry(provider);
+  if (entry.reachability.status === "unsupported") {
+    return { status: "skip", name: `${provider} reachable`, detail: entry.reachability.reason };
   }
-  const envKey = PROVIDER_ENV_KEYS[provider];
-  if (envKey && !process.env[envKey]) {
+  const url = entry.reachability.url;
+  if (entry.env.status === "required" && !entry.env.keys.some((key) => process.env[key])) {
     return { status: "skip", name: `${provider} reachable`, detail: "Skipped \u2014 no API key configured" };
   }
   const controller = new AbortController();
@@ -3437,12 +3669,23 @@ async function checkProviderReachable(provider, fetchImpl = fetch, timeoutMs = 4
       status: "fail",
       name: `${provider} reachable`,
       detail: `${url} \u2192 ${reason}`,
-      fix: provider === "ollama" ? "Start Ollama: `ollama serve` (or install from https://ollama.com)" : "Check network / firewall / VPN settings"
+      fix: providerReachabilityFix(entry)
     };
   } finally {
     clearTimeout(timer);
   }
 }
+async function checkProviderDefaultModel(provider) {
+  const entry = resolveProviderRegistryEntry(provider);
+  if (entry.defaultModel.status === "unsupported") {
+    return { status: "skip", name: `${provider} default model`, detail: entry.defaultModel.reason };
+  }
+  return {
+    status: "pass",
+    name: `${provider} default model`,
+    detail: entry.defaultModel.id
+  };
+}
 async function checkConfig() {
   try {
     const config = await loadConfig();
@@ -3463,7 +3706,7 @@ async function checkConfig() {
   }
 }
 async function runDoctor(options = {}) {
-  const providers2 = options.providers ?? ["openai", "anthropic", "gemini", "ollama"];
+  const providers2 = options.providers ?? DEFAULT_DOCTOR_PROVIDERS;
   const fetchImpl = options.fetchImpl ?? fetch;
   const checks = [
     checkNodeVersion(),
@@ -3473,6 +3716,7 @@ async function runDoctor(options = {}) {
   ];
   for (const provider of providers2) {
     checks.push(checkProviderEnv(provider));
+    checks.push(checkProviderDefaultModel(provider));
     if (!options.noNetwork) {
       checks.push(checkProviderReachable(provider, fetchImpl));
     }
@@ -3558,7 +3802,7 @@ function renderReport(report, opts = {}) {
 function registerDoctorCommand(program) {
   program.command("doctor").description("Diagnose your AgentsKit environment.").option("--no-network", "Skip provider reachability checks").option(
     "--providers <providers>",
-    "Comma-separated providers to check (default: openai,anthropic,gemini,ollama)"
+    `Comma-separated providers to check (default: ${DEFAULT_DOCTOR_PROVIDERS.join(",")})`
   ).option("--json", "Emit JSON instead of formatted output").action(async (options) => {
     const providers2 = options.providers ? options.providers.split(",").map((p) => p.trim()).filter(Boolean) : void 0;
     const report = await runDoctor({
@@ -5554,7 +5798,7 @@ async function tryComponentAdd(name, options) {
 function registerAddCommand(program) {
   program.command("add <name>").description(
     'Add a ready-made agent or UI component from the AgentsKit registry (registry.agentskit.io). Auto-detects which: a component is scanned/validated against your project and installed transactionally; an agent is copied into ./agents. You own the code. e.g. `agentskit add docs-chat` (component) or `agentskit add research --run "\u2026"` (agent).'
-  ).option("--out <dir>", "Directory to install into (component: the port dir; agent: ./agents)").option("-f, --force", "Overwrite existing files").option("--registry <url>", "Registry base URL override (component install)").option("--run <task>", "Run the agent on this task right after adding it").option("--provider <provider>", "Provider for --run (openai, anthropic, gemini, ollama, demo)", "demo").option("--model <model>", "Model for --run").option("--api-key <key>", "API key for --run (else read from the provider env var)").action(
+  ).option("--out <dir>", "Directory to install into (component: the port dir; agent: ./agents)").option("-f, --force", "Overwrite existing files").option("--registry <url>", "Registry base URL override (component install)").option("--run <task>", "Run the agent on this task right after adding it").option("--provider <provider>", "Provider for --run (openai, anthropic, gemini, ollama, groq, openrouter, demo)", "demo").option("--model <model>", "Model for --run").option("--api-key <key>", "API key for --run (else read from the provider env var)").action(
     async (agent, options) => {
       try {
         const outcome = await tryComponentAdd(agent, {