okengine 0.18.5 → 0.19.1

package/src/cli/ai-setup/prompts.ts

@@ -2,48 +2,29 @@
  * Interactive Clack prompts for `oke ai setup` / create-oke AI wizard.
  */
 
-import { isCancel, note, password, select, text } from "@clack/prompts";
+import { isCancel, password, select, text } from "@clack/prompts";
 import {
   CLOUD_PROVIDERS,
-  MODEL_TIERS,
+  aiProviderSelectOptions,
   cloudChatModels,
-  llamaCppModelsForTier,
-  modelsForTier,
   recommendCloudChat,
-  recommendForRole,
-  recommendForTier,
-  recommendLlamaCppForTier,
-  type CatalogModel,
-  type ModelTier,
 } from "./catalog.ts";
 import type { AiSetupApplyInput } from "./apply.ts";
-import { LLAMA_CPP_IMAGE } from "../../docker/recipes/llama-cpp.ts";
-import {
-  detectMachineInfo,
-  detectOllama,
-  detectTotalRamGb,
-  isInstalled,
-  type OllamaDetectResult,
-} from "./detect-ollama.ts";
-import {
-  formatLlamaCppBanner,
-  formatModelRow,
-  formatModelTableHeader,
-  formatOllamaBanner,
-  suggestTierForRam,
-} from "./recommend.ts";
 
-/** Provider menu value. */
+/** Provider menu value (cloud + host-side OpenAI-compatible). */
 export type AiSetupProvider =
-  | "llama-cpp"
-  | "ollama"
-  | "vllm"
-  | "sglang"
+  | "openrouter"
   | "openai"
   | "anthropic"
+  | "groq"
+  | "together"
+  | "deepseek"
+  | "mistral"
+  | "xai"
+  | "deepinfra"
+  | "vercel"
   | "gemini"
   | "lmstudio"
-  | "openrouter"
   | "custom";
 
 /** Sentinel for Back in AI setup selects. */
@@ -53,14 +34,12 @@ type Back = typeof BACK;
 /**
  * Run the interactive AI setup prompts.
  *
- * @param options - Preselected provider / seams
+ * @param options - Preselected provider
  * @returns Apply input or null on cancel
  */
 export async function askAiSetup(
   options: {
     readonly provider?: string;
-    readonly detect?: () => Promise<OllamaDetectResult>;
-    readonly ramGb?: number | null;
   } = {},
 ): Promise<AiSetupApplyInput | null> {
   const rawProvider = options.provider?.trim() ?? "";
@@ -70,346 +49,16 @@ export async function askAiSetup(
   if (!provider) {
     const value = await select({
       message: "AI Provider",
-      options: [
-        {
-          value: "llama-cpp",
-          label: "llama.cpp (Local)",
-          hint: "default · Docker Hub ai/ · recommend for your RAM",
-        },
-        {
-          value: "ollama",
-          label: "Ollama (Local)",
-          hint: "detect models · recommend for your RAM",
-        },
-        {
-          value: "vllm",
-          label: "vLLM (self-hosted GPU)",
-          hint: "multi-user / production concurrency",
-        },
-        {
-          value: "sglang",
-          label: "SGLang (self-hosted GPU)",
-          hint: "structured / agent workloads",
-        },
-        { value: "openai", label: "OpenAI" },
-        { value: "anthropic", label: "Anthropic" },
-        { value: "gemini", label: "Gemini", hint: "OpenAI-compatible proxy URL" },
-        { value: "lmstudio", label: "LM Studio" },
-        { value: "openrouter", label: "OpenRouter" },
-        { value: "custom", label: "Custom OpenAI Compatible" },
-      ],
+      options: [...aiProviderSelectOptions()],
+      initialValue: "openrouter",
     });
     if (isCancel(value)) return null;
     provider = String(value) as AiSetupProvider;
   }
 
-  if (provider === "llama-cpp") {
-    return askLlamaCppPath({
-      ramGb: options.ramGb === undefined ? detectTotalRamGb() : options.ramGb,
-    });
-  }
-  if (provider === "ollama") {
-    return askOllamaPath({
-      detect: options.detect ?? detectOllama,
-      ramGb: options.ramGb === undefined ? detectTotalRamGb() : options.ramGb,
-    });
-  }
-  if (provider === "vllm" || provider === "sglang") {
-    return askSelfHostedGpuPath(provider);
-  }
-
   return askCloudPath(provider);
 }
 
-/**
- * llama.cpp path — banner → Select model (tier) / Manual (Docker Hub `ai/`).
- *
- * @param options - RAM override
- */
-async function askLlamaCppPath(options: {
-  readonly ramGb: number | null;
-}): Promise<AiSetupApplyInput | null> {
-  const machine = detectMachineInfo();
-  const ramGb = options.ramGb ?? machine.ramGb;
-  note(formatLlamaCppBanner({ ...machine, ramGb }), "llama.cpp");
-
-  mode: for (;;) {
-    const mode = await selectWithBack(
-      "How do you want to pick models?",
-      [
-        {
-          value: "select",
-          label: "Select model",
-          hint: "Ultra Fast  ·  Fast  ·  Balanced  ·  Smart",
-        },
-        {
-          value: "manual",
-          label: "Manual model",
-          hint: "type any Docker Hub ai/ model id",
-        },
-      ],
-      "select",
-      false,
-    );
-    if (mode === null) return null;
-
-    if (mode === "manual") {
-      const id = await askOtherModelId("granite3.3:2b");
-      if (id === null) return null;
-      return finishLlamaCpp(id);
-    }
-
-    tier: for (;;) {
-      const tierPick = await selectWithBack(
-        "Select model",
-        MODEL_TIERS.map((t) => ({
-          value: t.value,
-          label: t.label,
-          hint: t.hint,
-        })),
-        suggestTierForRam(ramGb),
-        true,
-      );
-      if (tierPick === null) return null;
-      if (tierPick === BACK) continue mode;
-
-      const tier = tierPick as ModelTier;
-      const recommended = recommendLlamaCppForTier(tier, ramGb);
-
-      how: for (;;) {
-        const how = await selectWithBack(
-          MODEL_TIERS.find((t) => t.value === tier)?.label ?? tier,
-          [
-            {
-              value: "recommended",
-              label: "Use recommended",
-              hint: formatModelRow(recommended),
-            },
-            {
-              value: "manual",
-              label: "Select manually",
-              hint: "up to 20 models in this tier",
-            },
-          ],
-          "recommended",
-          true,
-        );
-        if (how === null) return null;
-        if (how === BACK) continue tier;
-
-        if (how === "recommended") {
-          return finishLlamaCpp(recommended.id, recommended);
-        }
-
-        const list = llamaCppModelsForTier(tier);
-        note(formatModelTableHeader(), "Select model");
-        const picked = await selectWithBack(
-          "Pick a model",
-          list.map((m) => ({
-            value: m.id,
-            label: formatModelRow(m),
-            hint: m.hint,
-          })),
-          recommended.id,
-          true,
-        );
-        if (picked === null) return null;
-        if (picked === BACK) continue how;
-        const model = list.find((m) => m.id === picked);
-        return finishLlamaCpp(picked, model);
-      }
-    }
-  }
-}
-
-/**
- * Build apply input for llama.cpp — OpenAI-compatible + curated image pin.
- *
- * @param chatId - Docker Hub `ai/` model id (org prefix optional)
- * @param catalog - Optional catalog row (modalities)
- */
-function finishLlamaCpp(chatId: string, catalog?: CatalogModel): AiSetupApplyInput {
-  const id = chatId.replace(/^ai\//, "");
-  return {
-    driver: "openai-compatible",
-    baseUrl: process.env.OKE_AI_URL ?? "http://127.0.0.1:8080/v1",
-    chatModel: id,
-    visionModel: catalog?.modalities.includes("vision") ? id : null,
-    embedModel: null,
-    image: LLAMA_CPP_IMAGE,
-  };
-}
-
-/**
- * vLLM / SGLang — Hugging Face model path for self-hosted GPU inference.
- *
- * @param provider - vllm | sglang
- */
-async function askSelfHostedGpuPath(
-  provider: "vllm" | "sglang",
-): Promise<AiSetupApplyInput | null> {
-  const port = provider === "vllm" ? 8000 : 30000;
-  const image =
-    provider === "vllm" ? "vllm/vllm-openai:v0.27.1" : "lmsysorg/sglang:v0.5.17-runtime";
-  const model = await text({
-    message: "Hugging Face model id",
-    placeholder: "Qwen/Qwen3-0.6B",
-    initialValue: "Qwen/Qwen3-0.6B",
-    validate: (v) => {
-      if (!v?.trim()) return "Model id required";
-      return undefined;
-    },
-  });
-  if (isCancel(model)) return null;
-  return {
-    driver: "openai-compatible",
-    baseUrl: process.env.OKE_AI_URL ?? `http://127.0.0.1:${port}/v1`,
-    chatModel: String(model).trim(),
-    visionModel: null,
-    embedModel: null,
-    image,
-  };
-}
-
-/**
- * Ollama path — banner → Select model (tier) / Manual model.
- *
- * @param options - Detect / RAM
- */
-async function askOllamaPath(options: {
-  readonly detect: () => Promise<OllamaDetectResult>;
-  readonly ramGb: number | null;
-}): Promise<AiSetupApplyInput | null> {
-  const detected = await options.detect();
-  const machine = detectMachineInfo();
-  const ramGb = options.ramGb ?? machine.ramGb;
-  const detectedIds =
-    detected.installed.length > 0
-      ? detected.installed.slice(0, 12)
-      : detected.curatedInstalled.map((m) => m.id);
-
-  note(formatOllamaBanner({ ...machine, ramGb }, detectedIds), "Ollama");
-
-  mode: for (;;) {
-    const mode = await selectWithBack(
-      "How do you want to pick models?",
-      [
-        {
-          value: "select",
-          label: "Select model",
-          hint: "Ultra Fast  ·  Fast  ·  Balanced  ·  Smart",
-        },
-        {
-          value: "manual",
-          label: "Manual model",
-          hint: "type any Ollama model id",
-        },
-      ],
-      "select",
-      false,
-    );
-    if (mode === null) return null;
-
-    if (mode === "manual") {
-      const id = await askOtherModelId("gemma4:e4b");
-      if (id === null) return null;
-      return finishOllama(id, detected);
-    }
-
-    tier: for (;;) {
-      const tierPick = await selectWithBack(
-        "Select model",
-        MODEL_TIERS.map((t) => ({
-          value: t.value,
-          label: t.label,
-          hint: t.hint,
-        })),
-        suggestTierForRam(ramGb),
-        true,
-      );
-      if (tierPick === null) return null;
-      if (tierPick === BACK) continue mode;
-
-      const tier = tierPick as ModelTier;
-      const recommended = recommendForTier(tier, ramGb);
-
-      how: for (;;) {
-        const how = await selectWithBack(
-          MODEL_TIERS.find((t) => t.value === tier)?.label ?? tier,
-          [
-            {
-              value: "recommended",
-              label: "Use recommended",
-              hint: formatModelRow(recommended),
-            },
-            {
-              value: "manual",
-              label: "Select manually",
-              hint: "up to 10 models in this tier",
-            },
-          ],
-          "recommended",
-          true,
-        );
-        if (how === null) return null;
-        if (how === BACK) continue tier;
-
-        if (how === "recommended") {
-          return finishOllama(recommended.id, detected, recommended);
-        }
-
-        const list = modelsForTier(tier);
-        note(formatModelTableHeader(), "Select model");
-        const picked = await selectWithBack(
-          "Pick a model",
-          list.map((m) => ({
-            value: m.id,
-            label: formatModelRow(m),
-            hint: isInstalled(m.id, detected.installed) ? "installed" : m.hint,
-          })),
-          recommended.id,
-          true,
-        );
-        if (picked === null) return null;
-        if (picked === BACK) continue how;
-        const model = list.find((m) => m.id === picked);
-        return finishOllama(picked, detected, model);
-      }
-    }
-  }
-}
-
-/**
- * Build apply input for Ollama — embed default, optional silent pull.
- *
- * @param chatId - Chat model id
- * @param detected - Detect result
- * @param catalog - Optional catalog row (modalities)
- */
-async function finishOllama(
-  chatId: string,
-  detected: OllamaDetectResult,
-  catalog?: CatalogModel,
-): Promise<AiSetupApplyInput> {
-  const embed = recommendForRole("embed");
-  const visionModel = catalog?.modalities.includes("vision") ? chatId : null;
-
-  const needed = [chatId, embed.id].filter(
-    (id) => detected.available && !isInstalled(id, detected.installed),
-  );
-  if (needed.length > 0 && detected.available) {
-    await pullModels(needed, detected.baseUrl);
-  }
-
-  return {
-    driver: "ollama",
-    baseUrl: detected.baseUrl,
-    chatModel: chatId,
-    visionModel,
-    embedModel: embed.id,
-  };
-}
-
 /**
  * Cloud / openai-compatible path — API token → Select model / Manual.
  *
@@ -417,26 +66,30 @@ async function finishOllama(
  */
 async function askCloudPath(provider: AiSetupProvider): Promise<AiSetupApplyInput | null> {
   const meta = CLOUD_PROVIDERS.find((p) => p.value === provider);
-  const driver = meta?.driver ?? "openai-compatible";
-
-  let baseUrl: string | undefined = meta?.baseUrl;
-  if (provider === "custom" || provider === "gemini" || !baseUrl) {
-    if (provider !== "anthropic") {
-      const urlValue = await text({
-        message:
-          provider === "gemini"
-            ? "OpenAI-compatible base URL for Gemini"
-            : "OpenAI-compatible base URL",
-        placeholder: baseUrl ?? "https://api.example.com/v1",
-        initialValue: baseUrl ?? "",
-      });
-      if (isCancel(urlValue)) return null;
-      const trimmed = String(urlValue).trim();
-      baseUrl = trimmed.length > 0 ? trimmed : undefined;
-    }
+  if (!meta) {
+    throw new Error(`oke ai setup: unknown cloud provider "${provider}"`);
+  }
+  const driver = meta.driver;
+  const declProvider = meta.provider ?? meta.value;
+
+  let baseUrl: string | undefined = meta.baseUrl;
+  const needsUrlPrompt =
+    meta.promptBaseUrl === true || (baseUrl === undefined && driver !== "anthropic");
+  if (needsUrlPrompt) {
+    const urlValue = await text({
+      message: "OpenAI-compatible base URL",
+      placeholder: baseUrl ?? "https://api.example.com/v1",
+      initialValue: baseUrl ?? "",
+      validate: (v) => {
+        if (!v?.trim()) return "Base URL is required for this provider";
+        return undefined;
+      },
+    });
+    if (isCancel(urlValue)) return null;
+    baseUrl = String(urlValue).trim();
   }
 
-  const apiKeyEnv = meta?.apiKeyEnv;
+  const apiKeyEnv = meta.apiKeyEnv;
   let apiKey: string | undefined;
   if (apiKeyEnv) {
     const token = await password({
@@ -450,14 +103,34 @@ async function askCloudPath(provider: AiSetupProvider): Promise<AiSetupApplyInpu
     apiKey = String(token).trim();
   }
 
+  const finish = (chatModel: string): AiSetupApplyInput => {
+    // Registry openai-compat: omit baseUrl so ai.model auto-resolves.
+    const omitBase =
+      meta.baseUrl !== undefined && !meta.promptBaseUrl && driver === "openai-compatible";
+    return {
+      driver,
+      provider: declProvider,
+      ...(omitBase || baseUrl === undefined ? {} : { baseUrl }),
+      chatModel,
+      visionModel: null,
+      embedModel: null,
+      ...(apiKeyEnv ? { apiKeyEnv, ...(apiKey ? { apiKey } : {}) } : {}),
+    };
+  };
+
   for (;;) {
+    const models = cloudChatModels(provider);
+    const selectHint =
+      provider === "openrouter"
+        ? "routers + popular models"
+        : `up to ${Math.min(10, Math.max(models.length, 1))} curated models`;
     const mode = await selectWithBack(
       "How do you want to pick models?",
       [
         {
           value: "select",
           label: "Select model",
-          hint: "up to 10 latest curated models",
+          hint: selectHint,
         },
         {
           value: "manual",
@@ -473,28 +146,13 @@ async function askCloudPath(provider: AiSetupProvider): Promise<AiSetupApplyInpu
     if (mode === "manual") {
       const id = await askOtherModelId(recommendCloudChat(provider));
       if (id === null) return null;
-      return {
-        driver,
-        ...(baseUrl !== undefined ? { baseUrl } : {}),
-        chatModel: id,
-        visionModel: null,
-        embedModel: null,
-        ...(apiKeyEnv ? { apiKeyEnv, ...(apiKey ? { apiKey } : {}) } : {}),
-      };
+      return finish(id);
     }
 
-    const models = cloudChatModels(provider);
     if (models.length === 0) {
       const id = await askOtherModelId(recommendCloudChat(provider));
       if (id === null) return null;
-      return {
-        driver,
-        ...(baseUrl !== undefined ? { baseUrl } : {}),
-        chatModel: id,
-        visionModel: null,
-        embedModel: null,
-        ...(apiKeyEnv ? { apiKeyEnv, ...(apiKey ? { apiKey } : {}) } : {}),
-      };
+      return finish(id);
     }
 
     const initial = recommendCloudChat(provider);
@@ -511,14 +169,7 @@ async function askCloudPath(provider: AiSetupProvider): Promise<AiSetupApplyInpu
     if (chat === null) return null;
     if (chat === BACK) continue;
 
-    return {
-      driver,
-      ...(baseUrl !== undefined ? { baseUrl } : {}),
-      chatModel: chat,
-      visionModel: null,
-      embedModel: null,
-      ...(apiKeyEnv ? { apiKeyEnv, ...(apiKey ? { apiKey } : {}) } : {}),
-    };
+    return finish(chat);
   }
 }
 
@@ -557,37 +208,3 @@ async function askOtherModelId(placeholder: string): Promise<string | null> {
   if (isCancel(value)) return null;
   return String(value).trim();
 }
-
-/**
- * Pull each model via the Ollama HTTP API (`POST /api/pull`).
- *
- * @param models - Model ids
- * @param baseUrl - Ollama server base URL
- */
-async function pullModels(models: readonly string[], baseUrl: string): Promise<void> {
-  const base = baseUrl.replace(/\/+$/, "");
-  for (const id of models) {
-    console.log(`ollama: pulling ${id} via ${base}/api/pull…`);
-    try {
-      const tags = await fetch(`${base}/api/tags`);
-      if (!tags.ok) {
-        throw new Error(`GET ${base}/api/tags → ${tags.status}`);
-      }
-      const res = await fetch(`${base}/api/pull`, {
-        method: "POST",
-        headers: { "content-type": "application/json" },
-        body: JSON.stringify({ model: id, stream: false }),
-      });
-      if (!res.ok) {
-        const body = await res.text().catch(() => "");
-        throw new Error(
-          `POST ${base}/api/pull → ${res.status}${body ? ` ${body.slice(0, 120)}` : ""}`,
-        );
-      }
-      await res.arrayBuffer();
-    } catch (err) {
-      const msg = err instanceof Error ? err.message : String(err);
-      console.error(`oke ai setup: pull ${id} failed (continuing) — ${msg}`);
-    }
-  }
-}

package/src/cli/ask-seed.test.ts

@@ -0,0 +1,96 @@
+/**
+ * Tests for the one-shot seed prompt after `oke db push`.
+ */
+
+import { mkdtempSync, mkdirSync, writeFileSync, rmSync, existsSync } from "node:fs";
+import { tmpdir } from "node:os";
+import { join } from "node:path";
+import { describe, expect, test } from "bun:test";
+import { maybeAskSeed } from "./ask-seed.ts";
+import { PROJECT_STATE_REL } from "./project-state.ts";
+
+describe("maybeAskSeed", () => {
+  test("skips when non-TTY", async () => {
+    const dir = mkdtempSync(join(tmpdir(), "ask-seed-"));
+    try {
+      mkdirSync(join(dir, "src", "db", "seed"), { recursive: true });
+      writeFileSync(join(dir, "src", "db", "seed", "index.ts"), "export default {};\n");
+      let seeded = false;
+      await maybeAskSeed({
+        cwd: dir,
+        env: "test",
+        stdinIsTTY: false,
+        confirmFn: async () => true,
+        seedFn: async () => {
+          seeded = true;
+          return 0;
+        },
+      });
+      expect(seeded).toBe(false);
+    } finally {
+      rmSync(dir, { recursive: true, force: true });
+    }
+  });
+
+  test("re-asks when the seed identity changes", async () => {
+    const dir = mkdtempSync(join(tmpdir(), "ask-seed-"));
+    try {
+      mkdirSync(join(dir, "src", "db", "seed"), { recursive: true });
+      writeFileSync(join(dir, "src", "db", "seed", "index.ts"), "export default {};\n");
+      mkdirSync(join(dir, ".oke"), { recursive: true });
+      writeFileSync(
+        join(dir, PROJECT_STATE_REL),
+        `${JSON.stringify({ seededAt: "2026-01-01T00:00:00.000Z", seed: "notes" }, null, 2)}\n`,
+      );
+      let calls = 0;
+      await maybeAskSeed({
+        cwd: dir,
+        env: "test",
+        stdinIsTTY: true,
+        confirmFn: async () => true,
+        seedFn: async () => {
+          calls += 1;
+          return 0;
+        },
+      });
+      expect(calls).toBe(1);
+    } finally {
+      rmSync(dir, { recursive: true, force: true });
+    }
+  });
+
+  test("asks once then writes .oke/state.json seededAt", async () => {
+    const dir = mkdtempSync(join(tmpdir(), "ask-seed-"));
+    try {
+      mkdirSync(join(dir, "src", "db", "seed"), { recursive: true });
+      writeFileSync(join(dir, "src", "db", "seed", "index.ts"), "export default {};\n");
+      let calls = 0;
+      await maybeAskSeed({
+        cwd: dir,
+        env: "test",
+        stdinIsTTY: true,
+        confirmFn: async () => true,
+        seedFn: async () => {
+          calls += 1;
+          return 0;
+        },
+      });
+      expect(calls).toBe(1);
+      expect(existsSync(join(dir, PROJECT_STATE_REL))).toBe(true);
+
+      await maybeAskSeed({
+        cwd: dir,
+        env: "test",
+        stdinIsTTY: true,
+        confirmFn: async () => true,
+        seedFn: async () => {
+          calls += 1;
+          return 0;
+        },
+      });
+      expect(calls).toBe(1);
+    } finally {
+      rmSync(dir, { recursive: true, force: true });
+    }
+  });
+});