kairn-cli 1.9.1 → 1.10.0

package/dist/cli.js

@@ -4,7 +4,7 @@ import chalk14 from "chalk";
 
 // src/commands/init.ts
 import { Command } from "commander";
-import { password, select } from "@inquirer/prompts";
+import { input, password, select } from "@inquirer/prompts";
 import chalk3 from "chalk";
 import Anthropic from "@anthropic-ai/sdk";
 import OpenAI from "openai";
@@ -62,6 +62,114 @@ async function saveConfig(config) {
   await fs.writeFile(CONFIG_PATH, JSON.stringify(config, null, 2), "utf-8");
 }
 
+// src/providers.ts
+var PROVIDER_CONFIGS = {
+  anthropic: {
+    name: "Anthropic",
+    verifyModel: "claude-haiku-4-5-20251001",
+    cheapModel: "claude-haiku-4-5-20251001"
+  },
+  openai: {
+    name: "OpenAI",
+    verifyModel: "gpt-4.1-nano",
+    cheapModel: "gpt-4.1-nano"
+  },
+  google: {
+    name: "Google Gemini",
+    baseURL: "https://generativelanguage.googleapis.com/v1beta/openai/",
+    verifyModel: "gemini-2.5-flash",
+    cheapModel: "gemini-2.5-flash"
+  },
+  xai: {
+    name: "xAI (Grok)",
+    baseURL: "https://api.x.ai/v1",
+    verifyModel: "grok-4-1-fast-non-reasoning",
+    cheapModel: "grok-4-1-fast-non-reasoning"
+  },
+  deepseek: {
+    name: "DeepSeek",
+    baseURL: "https://api.deepseek.com",
+    verifyModel: "deepseek-chat",
+    cheapModel: "deepseek-chat"
+  },
+  mistral: {
+    name: "Mistral",
+    baseURL: "https://api.mistral.ai/v1",
+    verifyModel: "mistral-small-latest",
+    cheapModel: "mistral-small-latest"
+  },
+  groq: {
+    name: "Groq (open-source models)",
+    baseURL: "https://api.groq.com/openai/v1",
+    verifyModel: "meta-llama/llama-4-scout-17b-16e-instruct",
+    cheapModel: "meta-llama/llama-4-scout-17b-16e-instruct"
+  }
+};
+var PROVIDER_MODELS = {
+  anthropic: [
+    { name: "Claude Sonnet 4.6 (recommended)", value: "claude-sonnet-4-6" },
+    { name: "Claude Opus 4.6 (highest quality)", value: "claude-opus-4-6" },
+    { name: "Claude Haiku 4.5 (fastest, cheapest)", value: "claude-haiku-4-5-20251001" }
+  ],
+  openai: [
+    { name: "GPT-4.1 (recommended \u2014 smartest non-reasoning)", value: "gpt-4.1" },
+    { name: "GPT-4.1 mini (faster, cheaper)", value: "gpt-4.1-mini" },
+    { name: "o4-mini (reasoning, cost-efficient)", value: "o4-mini" },
+    { name: "GPT-5 mini (frontier)", value: "gpt-5-mini" }
+  ],
+  google: [
+    { name: "Gemini 2.5 Flash (recommended \u2014 best value)", value: "gemini-2.5-flash" },
+    { name: "Gemini 3 Flash (newest frontier)", value: "gemini-3-flash" },
+    { name: "Gemini 2.5 Pro (highest quality)", value: "gemini-2.5-pro" },
+    { name: "Gemini 3.1 Pro Preview (most advanced)", value: "gemini-3.1-pro-preview" }
+  ],
+  xai: [
+    { name: "Grok 4.1 Fast (recommended \u2014 $0.20/M, very fast)", value: "grok-4-1-fast-non-reasoning" },
+    { name: "Grok 4.20 (frontier quality, 2M context)", value: "grok-4.20-0309-non-reasoning" }
+  ],
+  deepseek: [
+    { name: "DeepSeek V3.2 Chat (recommended \u2014 cheapest good model)", value: "deepseek-chat" },
+    { name: "DeepSeek V3.2 Reasoner (with chain-of-thought)", value: "deepseek-reasoner" }
+  ],
+  mistral: [
+    { name: "Mistral Large 3 (recommended \u2014 open-weight flagship)", value: "mistral-large-latest" },
+    { name: "Codestral (code-optimized, 256K context)", value: "codestral-latest" },
+    { name: "Mistral Small 4 (cheapest)", value: "mistral-small-latest" }
+  ],
+  groq: [
+    { name: "Llama 4 Maverick (recommended \u2014 free, fast)", value: "meta-llama/llama-4-maverick-17b-128e-instruct" },
+    { name: "Llama 4 Scout (free, fast)", value: "meta-llama/llama-4-scout-17b-16e-instruct" },
+    { name: "DeepSeek R1 70B (free reasoning)", value: "deepseek-r1-distill-llama-70b" },
+    { name: "Qwen 3 32B (free, multilingual)", value: "qwen/qwen3-32b" }
+  ]
+};
+var PROVIDER_CHOICES = [
+  { name: "Anthropic (Claude) \u2014 recommended", value: "anthropic" },
+  { name: "OpenAI (GPT)", value: "openai" },
+  { name: "Google (Gemini)", value: "google" },
+  { name: "xAI (Grok)", value: "xai" },
+  { name: "DeepSeek \u2014 cheapest", value: "deepseek" },
+  { name: "Mistral \u2014 open-weight", value: "mistral" },
+  { name: "Groq \u2014 free tier, open-source models", value: "groq" },
+  { name: "Other (OpenAI-compatible endpoint)", value: "other" }
+];
+function getProviderName(provider) {
+  if (provider === "other") return "Custom endpoint";
+  return PROVIDER_CONFIGS[provider].name;
+}
+function getBaseURL(provider, customBaseURL) {
+  if (provider === "other") return customBaseURL;
+  return PROVIDER_CONFIGS[provider]?.baseURL;
+}
+function getCheapModel(provider, fallbackModel) {
+  if (provider === "other") return fallbackModel;
+  return PROVIDER_CONFIGS[provider].cheapModel;
+}
+function getVerifyModel(provider, fallbackModel) {
+  if (provider === "other") return fallbackModel;
+  return PROVIDER_CONFIGS[provider].verifyModel;
+}
+
 // src/ui.ts
 import chalk from "chalk";
 var maroon = chalk.rgb(139, 0, 0);
@@ -234,62 +342,28 @@ async function installSeedTemplates() {
     console.log(ui.success(`${installed} template${installed === 1 ? "" : "s"} installed`));
   }
 }
-var PROVIDER_MODELS = {
-  anthropic: {
-    name: "Anthropic",
-    models: [
-      { name: "Claude Sonnet 4.6 (recommended \u2014 fast, smart)", value: "claude-sonnet-4-6" },
-      { name: "Claude Opus 4.6 (highest quality)", value: "claude-opus-4-6" },
-      { name: "Claude Haiku 4.5 (fastest, cheapest)", value: "claude-haiku-4-5-20251001" }
-    ]
-  },
-  openai: {
-    name: "OpenAI",
-    models: [
-      { name: "GPT-4o (recommended)", value: "gpt-4o" },
-      { name: "GPT-4o mini (faster, cheaper)", value: "gpt-4o-mini" },
-      { name: "o3 (reasoning)", value: "o3" }
-    ]
-  },
-  google: {
-    name: "Google Gemini",
-    models: [
-      { name: "Gemini 2.5 Flash (recommended)", value: "gemini-2.5-flash-preview-05-20" },
-      { name: "Gemini 2.5 Pro (highest quality)", value: "gemini-2.5-pro-preview-05-06" }
-    ]
-  }
-};
-async function verifyKey(provider, apiKey, model) {
+async function verifyKey(provider, apiKey, baseURL, model) {
   try {
     if (provider === "anthropic") {
-      const client = new Anthropic({ apiKey });
-      await client.messages.create({
-        model: "claude-haiku-4-5-20251001",
-        max_tokens: 10,
-        messages: [{ role: "user", content: "ping" }]
-      });
-      return true;
-    } else if (provider === "openai") {
-      const client = new OpenAI({ apiKey });
-      await client.chat.completions.create({
-        model: "gpt-4o-mini",
-        max_tokens: 10,
-        messages: [{ role: "user", content: "ping" }]
-      });
-      return true;
-    } else if (provider === "google") {
-      const client = new OpenAI({
-        apiKey,
-        baseURL: "https://generativelanguage.googleapis.com/v1beta/openai/"
-      });
-      await client.chat.completions.create({
-        model: "gemini-2.5-flash-preview-05-20",
+      const client2 = new Anthropic({ apiKey });
+      await client2.messages.create({
+        model: getVerifyModel(provider, model || "claude-haiku-4-5-20251001"),
         max_tokens: 10,
         messages: [{ role: "user", content: "ping" }]
       });
       return true;
     }
-    return false;
+    const verifyModel = provider === "other" ? model || "test" : getVerifyModel(provider, model || "");
+    const resolvedBaseURL = getBaseURL(provider, baseURL);
+    const clientOptions = { apiKey };
+    if (resolvedBaseURL) clientOptions.baseURL = resolvedBaseURL;
+    const client = new OpenAI(clientOptions);
+    await client.chat.completions.create({
+      model: verifyModel,
+      max_tokens: 10,
+      messages: [{ role: "user", content: "ping" }]
+    });
+    return true;
   } catch {
     return false;
   }
@@ -311,42 +385,52 @@ var initCommand = new Command("init").description("Set up Kairn with your API ke
   }
   const provider = await select({
     message: "LLM provider",
-    choices: [
-      { name: "Anthropic (Claude) \u2014 recommended", value: "anthropic" },
-      { name: "OpenAI (GPT)", value: "openai" },
-      { name: "Google (Gemini)", value: "google" }
-    ]
-  });
-  const providerInfo = PROVIDER_MODELS[provider];
-  const model = await select({
-    message: "Compilation model",
-    choices: providerInfo.models
+    choices: PROVIDER_CHOICES
   });
+  let model;
+  let baseURL;
+  let providerDisplayName;
+  if (provider === "other") {
+    providerDisplayName = "Custom endpoint";
+    baseURL = await input({ message: "Base URL" });
+    model = await input({ message: "Model name" });
+  } else {
+    providerDisplayName = getProviderName(provider);
+    model = await select({
+      message: "Compilation model",
+      choices: PROVIDER_MODELS[provider]
+    });
+  }
   const apiKey = await password({
-    message: `${providerInfo.name} API key`,
+    message: `${providerDisplayName} API key${provider === "other" ? " (Enter to skip)" : ""}`,
     mask: "*"
   });
-  if (!apiKey) {
+  if (!apiKey && provider !== "other") {
     console.log(ui.error("No API key provided. Aborting."));
     process.exit(1);
   }
-  console.log(chalk3.dim("\n  Verifying API key..."));
-  const valid = await verifyKey(provider, apiKey, model);
-  if (!valid) {
-    console.log(ui.error("Invalid API key. Check your key and try again."));
-    process.exit(1);
+  if (apiKey) {
+    console.log(chalk3.dim("\n  Verifying API key..."));
+    const valid = await verifyKey(provider, apiKey, baseURL, model);
+    if (!valid) {
+      console.log(ui.error("Invalid API key. Check your key and try again."));
+      process.exit(1);
+    }
+    console.log(ui.success("API key verified"));
+  } else {
+    console.log(ui.warn("No API key \u2014 skipping verification"));
   }
-  console.log(ui.success("API key verified"));
   const config = {
     provider,
-    api_key: apiKey,
+    api_key: apiKey || "",
     model,
+    ...baseURL ? { base_url: baseURL } : {},
     default_runtime: "claude-code",
     created_at: (/* @__PURE__ */ new Date()).toISOString()
   };
   await saveConfig(config);
   console.log(ui.success(`Config saved to ${chalk3.dim(getConfigPath())}`));
-  console.log(ui.kv("Provider", providerInfo.name));
+  console.log(ui.kv("Provider", providerDisplayName));
   console.log(ui.kv("Model", model));
   await installSeedTemplates();
   const hasClaude = detectClaudeCode();
@@ -364,7 +448,7 @@ var initCommand = new Command("init").description("Set up Kairn with your API ke
 
 // src/commands/describe.ts
 import { Command as Command2 } from "commander";
-import { input, confirm, select as select2 } from "@inquirer/prompts";
+import { input as input2, confirm, select as select2 } from "@inquirer/prompts";
 import chalk5 from "chalk";
 import ora from "ora";
 
@@ -845,10 +929,11 @@ function classifyError(err, provider) {
   return `${provider} API error: ${msg}`;
 }
 async function callLLM(config, userMessage) {
+  const providerName = getProviderName(config.provider);
   if (config.provider === "anthropic") {
-    const client = new Anthropic2({ apiKey: config.api_key });
+    const client2 = new Anthropic2({ apiKey: config.api_key });
     try {
-      const response = await client.messages.create({
+      const response = await client2.messages.create({
         model: config.model,
         max_tokens: 8192,
         system: SYSTEM_PROMPT,
@@ -859,35 +944,31 @@ async function callLLM(config, userMessage) {
         throw new Error("No text response from compiler LLM");
       }
       return textBlock.text;
-    } catch (err) {
-      throw new Error(classifyError(err, "Anthropic"));
-    }
-  } else if (config.provider === "openai" || config.provider === "google") {
-    const providerName = config.provider === "google" ? "Google" : "OpenAI";
-    const clientOptions = { apiKey: config.api_key };
-    if (config.provider === "google") {
-      clientOptions.baseURL = "https://generativelanguage.googleapis.com/v1beta/openai/";
-    }
-    const client = new OpenAI2(clientOptions);
-    try {
-      const response = await client.chat.completions.create({
-        model: config.model,
-        max_tokens: 8192,
-        messages: [
-          { role: "system", content: SYSTEM_PROMPT },
-          { role: "user", content: userMessage }
-        ]
-      });
-      const text = response.choices[0]?.message?.content;
-      if (!text) {
-        throw new Error("No text response from compiler LLM");
-      }
-      return text;
     } catch (err) {
       throw new Error(classifyError(err, providerName));
     }
   }
-  throw new Error(`Unsupported provider: ${config.provider}. Run \`kairn init\` to reconfigure.`);
+  const resolvedBaseURL = getBaseURL(config.provider, config.base_url);
+  const clientOptions = { apiKey: config.api_key };
+  if (resolvedBaseURL) clientOptions.baseURL = resolvedBaseURL;
+  const client = new OpenAI2(clientOptions);
+  try {
+    const response = await client.chat.completions.create({
+      model: config.model,
+      max_tokens: 8192,
+      messages: [
+        { role: "system", content: SYSTEM_PROMPT },
+        { role: "user", content: userMessage }
+      ]
+    });
+    const text = response.choices[0]?.message?.content;
+    if (!text) {
+      throw new Error("No text response from compiler LLM");
+    }
+    return text;
+  } catch (err) {
+    throw new Error(classifyError(err, providerName));
+  }
 }
 function validateSpec(spec, onProgress) {
   const warnings = [];
@@ -939,9 +1020,7 @@ async function generateClarifications(intent, onProgress) {
   }
   onProgress?.("Analyzing your request...");
   const clarificationConfig = { ...config };
-  if (config.provider === "anthropic") {
-    clarificationConfig.model = "claude-haiku-4-5-20251001";
-  }
+  clarificationConfig.model = getCheapModel(config.provider, config.model);
   const response = await callLLM(clarificationConfig, CLARIFICATION_PROMPT + "\n\nUser description: " + intent);
   try {
     let cleaned = response.trim();
@@ -1653,7 +1732,7 @@ var describeCommand = new Command2("describe").description("Describe your workfl
     );
     process.exit(1);
   }
-  const intentRaw = intentArg || await input({
+  const intentRaw = intentArg || await input2({
     message: "What do you want your agent to do?"
   });
   if (!intentRaw.trim()) {
@@ -1673,7 +1752,7 @@ var describeCommand = new Command2("describe").description("Describe your workfl
     if (clarifications.length > 0) {
       const answers = [];
       for (const c of clarifications) {
-        const answer = await input({
+        const answer = await input2({
           message: c.question,
           default: c.suggestion
         });
@@ -2425,7 +2504,7 @@ var optimizeCommand = new Command6("optimize").description("Scan an existing pro
       console.log(ui.file(file));
     }
     if (hasEnvVars) {
-      await collectAndWriteKeys(summary.envSetup, targetDir, { quick: options.quick });
+      await collectAndWriteKeys(summary.envSetup, targetDir);
       console.log("");
     }
     if (summary.pluginCommands.length > 0) {
@@ -2619,7 +2698,7 @@ var doctorCommand = new Command7("doctor").description(
 // src/commands/registry.ts
 import { Command as Command8 } from "commander";
 import chalk11 from "chalk";
-import { input as input2, select as select3 } from "@inquirer/prompts";
+import { input as input3, select as select3 } from "@inquirer/prompts";
 var listCommand2 = new Command8("list").description("List tools in the registry").option("--category <cat>", "Filter by category").option("--user-only", "Show only user-defined tools").action(async (options) => {
   printCompactBanner();
   let all;
@@ -2679,7 +2758,7 @@ var listCommand2 = new Command8("list").description("List tools in the registry"
 var addCommand = new Command8("add").description("Add a tool to the user registry").action(async () => {
   let id;
   try {
-    id = await input2({
+    id = await input3({
       message: "Tool ID (kebab-case)",
       validate: (v) => {
         if (!v) return "ID is required";
@@ -2687,8 +2766,8 @@ var addCommand = new Command8("add").description("Add a tool to the user registr
         return true;
       }
     });
-    const name = await input2({ message: "Display name" });
-    const description = await input2({ message: "Description" });
+    const name = await input3({ message: "Display name" });
+    const description = await input3({ message: "Description" });
     const category = await select3({
       message: "Category",
       choices: [
@@ -2732,8 +2811,8 @@ var addCommand = new Command8("add").description("Add a tool to the user registr
     if (auth === "api_key" || auth === "connection_string") {
       let addMore = true;
       while (addMore) {
-        const varName = await input2({ message: "Env var name" });
-        const varDesc = await input2({ message: "Env var description" });
+        const varName = await input3({ message: "Env var name" });
+        const varDesc = await input3({ message: "Env var description" });
         env_vars.push({ name: varName, description: varDesc });
         const another = await select3({
           message: "Add another env var?",
@@ -2745,14 +2824,14 @@ var addCommand = new Command8("add").description("Add a tool to the user registr
         addMore = another;
       }
     }
-    const signup_url_raw = await input2({ message: "Signup URL (optional, press enter to skip)" });
+    const signup_url_raw = await input3({ message: "Signup URL (optional, press enter to skip)" });
     const signup_url = signup_url_raw.trim() || void 0;
-    const best_for_raw = await input2({ message: "Best-for tags, comma-separated" });
+    const best_for_raw = await input3({ message: "Best-for tags, comma-separated" });
     const best_for = best_for_raw.split(",").map((s) => s.trim()).filter(Boolean);
     const install = {};
     if (type === "mcp_server") {
-      const command = await input2({ message: "MCP command" });
-      const args_raw = await input2({ message: "MCP args, comma-separated (leave blank for none)" });
+      const command = await input3({ message: "MCP command" });
+      const args_raw = await input3({ message: "MCP args, comma-separated (leave blank for none)" });
       const args = args_raw.split(",").map((s) => s.trim()).filter(Boolean);
       install.mcp_config = { command, args };
     }