create-oke 0.9.1 → 0.10.0

package/src/customize-flow.ts

@@ -18,6 +18,10 @@ import {
   TEMPLATE_TEST,
   VAULT_CHOICES,
   AI_PROVIDERS,
+  LLAMA_CPP_IMAGE,
+  OLLAMA_IMAGE,
+  SGLANG_IMAGE,
+  VLLM_IMAGE,
   aiDriverForProvider,
   customizeFacetsFor,
   pinsDockerReady,
@@ -43,12 +47,12 @@ export type SidePins = {
   sql?: string;
   kv?: string;
   files?: string;
+  /** Driver id, or `"none"` / unset for no store.index. */
   index?: string | null;
   signal?: string;
   clock?: string;
   vault?: string;
   email?: string;
-  enableIndex?: boolean;
 };
 
 /**
@@ -62,6 +66,15 @@ export function pinsFromSides(local: string, docker: string, test: string): EnvD
   return { local, docker, test, prod: docker };
 }
 
+/**
+ * Whether a side pin enables store.index.
+ *
+ * @param value - Picked driver or none
+ */
+function indexEnabled(value: string | null | undefined): value is string {
+  return typeof value === "string" && value !== "none";
+}
+
 /**
  * Fill missing side from template defaults.
  *
@@ -92,17 +105,13 @@ export function assembleDriverDefaults(
     dockerSrc.files ?? TEMPLATE_DOCKER_PROD.files,
     TEMPLATE_TEST.files,
   );
-  const enableIndex = Boolean(
-    (side === "local" ? picked.enableIndex : other?.enableIndex) ||
-    (side === "docker" ? picked.enableIndex : other?.enableIndex),
-  );
   const indexLocal = localSrc.index;
   const indexDocker = dockerSrc.index;
   const index =
-    enableIndex || indexLocal != null || indexDocker != null
+    indexEnabled(indexLocal) || indexEnabled(indexDocker)
       ? pinsFromSides(
-          typeof indexLocal === "string" ? indexLocal : "memory",
-          typeof indexDocker === "string" ? indexDocker : "meilisearch",
+          indexEnabled(indexLocal) ? indexLocal : "memory",
+          indexEnabled(indexDocker) ? indexDocker : "meilisearch",
           "memory",
         )
       : null;
@@ -135,6 +144,55 @@ export function assembleDriverDefaults(
   };
 }
 
+/**
+ * Balanced llama.cpp defaults for "AI setup → Recommended" (no quiz).
+ * Lightest local footprint; curated Docker Hub `ai/` model via docker-repo.
+ */
+export function recommendedAiApply(): AiSetupApplyInput {
+  return {
+    driver: "openai-compatible",
+    baseUrl: process.env.OKE_AI_URL ?? "http://127.0.0.1:8080/v1",
+    chatModel: "smollm2",
+    visionModel: null,
+    embedModel: null,
+    image: LLAMA_CPP_IMAGE,
+  };
+}
+
+/**
+ * Attach the compose image pin for a local/self-hosted AI provider menu id.
+ *
+ * @param input - Apply input from prompts
+ * @param provider - Menu provider id
+ */
+export function withLocalAiImage(input: AiSetupApplyInput, provider: string): AiSetupApplyInput {
+  if (provider === "llama-cpp") {
+    return {
+      ...input,
+      image: LLAMA_CPP_IMAGE,
+      baseUrl: input.baseUrl ?? "http://127.0.0.1:8080/v1",
+    };
+  }
+  if (provider === "ollama") {
+    return { ...input, image: OLLAMA_IMAGE };
+  }
+  if (provider === "vllm") {
+    return {
+      ...input,
+      image: VLLM_IMAGE,
+      baseUrl: input.baseUrl ?? "http://127.0.0.1:8000/v1",
+    };
+  }
+  if (provider === "sglang") {
+    return {
+      ...input,
+      image: SGLANG_IMAGE,
+      baseUrl: input.baseUrl ?? "http://127.0.0.1:30000/v1",
+    };
+  }
+  return input;
+}
+
 /**
  * Customize drivers for one template.
  *
@@ -148,12 +206,12 @@ export async function askCustomizeFlow(
     [
       {
         value: "local",
-        label: "◻  Local",
+        label: "Local",
         hint: "oke mode local — sqlite / memory / fs …",
       },
       {
         value: "docker",
-        label: "▣  Docker",
+        label: "Docker",
         hint: "oke mode docker — postgres / redis / s3 …",
       },
     ],
@@ -197,44 +255,82 @@ export async function askCustomizeFlow(
   let aiPref: CreateDefaults["ai"] = { enabled: false, provider: null, driver: null };
   let aiApply: AiSetupApplyInput | null = null;
 
-  const wantAi = await selectWithBack(
-    "Configure AI?",
-    [
-      { value: "yes", label: "✓  Yes" },
-      { value: "no", label: "✗  No" },
-    ],
-    "no",
-    { allowBack: true },
-  );
-  if (wantAi === null) return null;
-  if (wantAi !== WIZARD_BACK && wantAi === "yes") {
-    const options = AI_PROVIDERS.map((p) => ({ value: p.value, label: p.label }));
-    const localProviderValue = await selectWithBack(
-      alsoOther || primary === "local" ? "AI Provider — local" : "AI Provider",
-      options,
-      "ollama",
+  aiSetup: for (;;) {
+    const aiSetup = await selectWithBack(
+      "AI setup",
+      [
+        {
+          value: "recommended",
+          label: "Recommended",
+          hint: "llama.cpp · lightest local footprint",
+        },
+        {
+          value: "customize",
+          label: "Customize",
+          hint: "pick provider & models",
+        },
+        {
+          value: "off",
+          label: "Off",
+          hint: "no AI drivers",
+        },
+      ],
+      "recommended",
       { allowBack: true },
     );
-    if (localProviderValue === null) return null;
-    if (localProviderValue !== WIZARD_BACK) {
+    if (aiSetup === null) return null;
+    if (aiSetup === WIZARD_BACK) {
+      // Back from AI → leave AI off (same as Off) and finish customize.
+      break;
+    }
+    if (aiSetup === "off") break;
+    if (aiSetup === "recommended") {
+      aiPins =
+        primary === "local" && !alsoOther
+          ? pinsLocalOnly("openai-compatible", "openai-compatible", "mock")
+          : pinsDockerReady("openai-compatible", "openai-compatible", "mock");
+      aiApply = recommendedAiApply();
+      aiPref = aiPrefWithModels(
+        {
+          enabled: true,
+          provider: "llama-cpp",
+          driver: "openai-compatible",
+        },
+        aiApply,
+      );
+      break;
+    }
+
+    // customize — local provider, optional docker provider, then model wizard
+    const options = AI_PROVIDERS.map((p) => ({ value: p.value, label: p.label }));
+    providers: for (;;) {
+      const askDockerAi = primary === "docker" || alsoOther;
+      const localProviderValue = await selectWithBack(
+        askDockerAi || primary === "local" ? "AI Provider — local" : "AI Provider",
+        options,
+        "llama-cpp",
+        { allowBack: true },
+      );
+      if (localProviderValue === null) return null;
+      if (localProviderValue === WIZARD_BACK) continue aiSetup;
+
       const localProvider = localProviderValue as AiProviderId;
       const localDriver = aiDriverForProvider(localProvider);
       let dockerDriver = localDriver === "mock" ? "mock" : localDriver;
+      let dockerProvider: AiProviderId = localProvider;
 
-      if (primary === "docker" || alsoOther) {
+      if (askDockerAi) {
         const dockerProviderValue = await selectWithBack(
           "AI Provider — docker",
           options,
-          "ollama",
-          {
-            allowBack: true,
-          },
+          "llama-cpp",
+          { allowBack: true },
         );
         if (dockerProviderValue === null) return null;
-        if (dockerProviderValue !== WIZARD_BACK) {
-          dockerDriver = aiDriverForProvider(dockerProviderValue);
-          if (dockerDriver === "mock") dockerDriver = "mock";
-        }
+        if (dockerProviderValue === WIZARD_BACK) continue providers;
+        dockerProvider = dockerProviderValue as AiProviderId;
+        dockerDriver = aiDriverForProvider(dockerProvider);
+        if (dockerDriver === "mock") dockerDriver = "mock";
       }
 
       aiPins =
@@ -250,7 +346,7 @@ export async function askCustomizeFlow(
       if (setupProvider !== "mock") {
         const picked = await askAiSetup({ provider: setupProvider });
         if (picked === null) return null;
-        aiApply = picked;
+        aiApply = withLocalAiImage(picked, askDockerAi ? dockerProvider : localProvider);
       } else {
         aiApply = { driver: "mock" };
       }
@@ -263,6 +359,7 @@ export async function askCustomizeFlow(
         },
         aiApply,
       );
+      break aiSetup;
     }
   }
 
@@ -288,17 +385,11 @@ async function walkFacetsForSide(
   let i = 0;
   while (i < facets.length) {
     const facet = facets[i]!;
-    if (facet === "index" && !out.enableIndex) {
-      out.index = null;
-      i++;
-      continue;
-    }
     const result = await askOneFacet(facet, side, out);
     if (result === null) return null;
     if (result === WIZARD_BACK) {
       if (i === 0) return WIZARD_BACK;
       i--;
-      while (i > 0 && facets[i] === "index" && !out.enableIndex) i--;
       continue;
     }
     i++;
@@ -343,27 +434,11 @@ async function askOneFacet(
       state.files = v;
       return true;
     }
-    case "enableIndex": {
-      const value = await selectWithBack(
-        `Enable store.index (search)? — ${suffix}`,
-        [
-          { value: "yes", label: "✓  Yes" },
-          { value: "no", label: "✗  No" },
-        ],
-        state.enableIndex ? "yes" : "no",
-        { allowBack: true },
-      );
-      if (value === null) return null;
-      if (value === WIZARD_BACK) return WIZARD_BACK;
-      state.enableIndex = value === "yes";
-      if (!state.enableIndex) state.index = null;
-      return true;
-    }
     case "index": {
       const v = await askSideChoice(
         `store.index — ${suffix}`,
         INDEX_CHOICES,
-        side === "local" ? "memory" : "meilisearch",
+        side === "local" ? "none" : "meilisearch",
       );
       if (v === null || v === WIZARD_BACK) return v;
       state.index = v;

package/src/drivers-catalog.ts

@@ -68,6 +68,7 @@ export const FILES_CHOICES: readonly DriverChoice[] = [
 ];
 
 export const INDEX_CHOICES: readonly DriverChoice[] = [
+  { value: "none", label: "none" },
   { value: "memory", label: "memory" },
   { value: "pgvector", label: "pgvector" },
   { value: "libsql", label: "libsql" },
@@ -99,24 +100,41 @@ export const VAULT_CHOICES: readonly DriverChoice[] = [
   { value: "memory", label: "memory" },
 ];
 
+/** Email driver ids for `drivers.channel.email` (SMS/WhatsApp/push are other mediums). */
 export const EMAIL_CHOICES: readonly DriverChoice[] = [
   { value: "console", label: "console" },
   { value: "smtp", label: "smtp" },
   { value: "resend", label: "resend" },
   { value: "sndr", label: "sndr" },
-  { value: "taqnyat-mail", label: "taqnyat-mail" },
+  /** Protocol id is `taqnyat-mail`; menu label stays short in the email facet. */
+  { value: "taqnyat-mail", label: "taqnyat" },
 ];
 
+/**
+ * Pinned local-inference images — must match `src/docker/recipes/*` pins.
+ * Never `latest` (GGUF-parser CVE floors: llama.cpp ≥ b8146, Ollama ≥ 0.17.1).
+ */
+export const LLAMA_CPP_IMAGE = "ghcr.io/ggml-org/llama.cpp:server-b10290";
+/** @see LLAMA_CPP_IMAGE */
+export const OLLAMA_IMAGE = "ollama/ollama:0.32.6";
+/** @see LLAMA_CPP_IMAGE */
+export const VLLM_IMAGE = "vllm/vllm-openai:v0.26.0";
+/** @see LLAMA_CPP_IMAGE */
+export const SGLANG_IMAGE = "lmsysorg/sglang:v0.5.16-runtime";
+
 /** AI menu providers → protocol driver. */
 export const AI_PROVIDERS = [
-  { value: "ollama", label: "◎  Ollama (Local)", driver: "ollama" },
-  { value: "openai", label: "◈  OpenAI", driver: "openai-compatible" },
-  { value: "anthropic", label: "◉  Anthropic", driver: "anthropic" },
-  { value: "gemini", label: "◇  Gemini", driver: "openai-compatible" },
-  { value: "lmstudio", label: "▣  LM Studio", driver: "openai-compatible" },
-  { value: "openrouter", label: "⇄  OpenRouter", driver: "openai-compatible" },
-  { value: "custom", label: "⋯  Custom OpenAI Compatible", driver: "openai-compatible" },
-  { value: "mock", label: "◌  Mock (dev only)", driver: "mock" },
+  { value: "llama-cpp", label: "llama.cpp (Local)", driver: "openai-compatible" },
+  { value: "ollama", label: "Ollama (Local)", driver: "ollama" },
+  { value: "vllm", label: "vLLM (self-hosted GPU)", driver: "openai-compatible" },
+  { value: "sglang", label: "SGLang (self-hosted GPU)", driver: "openai-compatible" },
+  { value: "openai", label: "OpenAI", driver: "openai-compatible" },
+  { value: "anthropic", label: "Anthropic", driver: "anthropic" },
+  { value: "gemini", label: "Gemini", driver: "openai-compatible" },
+  { value: "lmstudio", label: "LM Studio", driver: "openai-compatible" },
+  { value: "openrouter", label: "OpenRouter", driver: "openai-compatible" },
+  { value: "custom", label: "Custom OpenAI Compatible", driver: "openai-compatible" },
+  { value: "mock", label: "Mock (dev only)", driver: "mock" },
 ] as const;
 
 export type AiProviderId = (typeof AI_PROVIDERS)[number]["value"];
@@ -187,7 +205,6 @@ export type CustomizeFacetId =
   | "sql"
   | "kv"
   | "files"
-  | "enableIndex"
   | "index"
   | "signal"
   | "clock"
@@ -201,7 +218,7 @@ export type CustomizeFacetId =
  */
 export function customizeFacetsFor(template: TemplateId): readonly CustomizeFacetId[] {
   if (template === "standard") return ["sql"];
-  return ["sql", "kv", "files", "enableIndex", "index", "signal", "clock", "vault", "email"];
+  return ["sql", "kv", "files", "index", "signal", "clock", "vault", "email"];
 }
 
 /**
@@ -223,5 +240,5 @@ export const DEFAULT_IMAGES: Readonly<Record<string, string>> = {
   "channel.email": "axllent/mailpit:v1.22.3",
   vault: "openbao/openbao:2.6.1",
   "store.index": "getmeili/meilisearch:v1.37",
-  ai: "ollama/ollama:latest",
+  ai: LLAMA_CPP_IMAGE,
 };

package/src/local-okengine.test.ts

@@ -0,0 +1,59 @@
+/**
+ * Local okengine staging for monorepo create-oke.
+ */
+
+import { describe, expect, test } from "bun:test";
+import { existsSync, lstatSync, readFileSync } from "node:fs";
+import { join } from "node:path";
+import { localOkengineStageDir, materializeLocalOkengineDependency } from "./local-okengine.ts";
+import { resolveLocalOkengineRoot } from "./templates.ts";
+import { resolveOkengineDependency } from "./transform.ts";
+
+describe("materializeLocalOkengineDependency", () => {
+  test("stages publish-shaped package without workspaces or devDependencies", () => {
+    const root = resolveLocalOkengineRoot();
+    expect(root).not.toBeNull();
+    if (!root) return;
+
+    const dep = materializeLocalOkengineDependency(root);
+    const stage = localOkengineStageDir();
+    expect(dep).toBe(`file:${stage}`);
+
+    const pkg = JSON.parse(readFileSync(join(stage, "package.json"), "utf8")) as {
+      name: string;
+      dependencies?: Record<string, string>;
+      devDependencies?: unknown;
+      workspaces?: unknown;
+      peerDependencies?: Record<string, string>;
+      exports?: Record<string, string>;
+    };
+    expect(pkg.name).toBe("okengine");
+    expect(pkg.devDependencies).toBeUndefined();
+    expect(pkg.workspaces).toBeUndefined();
+    expect(pkg.peerDependencies).toBeUndefined();
+    expect(pkg.dependencies?.["oxc-parser"]).toBeDefined();
+    // Peers folded into dependencies so the out-of-tree stage can resolve them.
+    expect(pkg.dependencies?.["drizzle-orm"]).toBe("1.0.0-rc.4");
+    expect(pkg.dependencies?.["drizzle-kit"]).toBe("1.0.0-rc.4");
+    expect(pkg.dependencies?.["zod"]).toBeDefined();
+    expect(pkg.exports?.["./config"]).toBe("./src/config/index.ts");
+
+    // Real copies — Bun file: install drops directory symlinks.
+    const src = join(stage, "src");
+    expect(existsSync(src)).toBe(true);
+    expect(lstatSync(src).isSymbolicLink()).toBe(false);
+    expect(existsSync(join(stage, "src/config/index.ts"))).toBe(true);
+    expect(existsSync(join(stage, "node_modules", "zod"))).toBe(true);
+    expect(existsSync(join(stage, "node_modules", "drizzle-kit", "cli.mjs"))).toBe(true);
+  });
+
+  test("resolveOkengineDependency uses the staged file: path locally", () => {
+    const root = resolveLocalOkengineRoot();
+    expect(root).not.toBeNull();
+    if (!root) return;
+
+    const dep = resolveOkengineDependency(root);
+    expect(dep).toBe(`file:${localOkengineStageDir()}`);
+    expect(dep).not.toBe(`file:${root}`);
+  });
+});

package/src/local-okengine.ts

@@ -0,0 +1,137 @@
+/**
+ * Consumer-facing `file:` package for local / monorepo create-oke.
+ *
+ * Linking the monorepo root pulls `workspaces` + `devDependencies` into the
+ * scaffold (Console UI, drizzle-zod, …). Bun then warns that RC
+ * `drizzle-orm` fails drizzle-zod’s `>=0.36` peer. Stage a publish-shaped
+ * tree instead:
+ *
+ * 1. Copy `files` (Bun’s `file:` install drops directory symlinks).
+ * 2. Install dependencies **in the stage** — Bun keeps `package.json` as a
+ *    symlink into `~/.oke/...`, so the package root is outside the app and
+ *    resolution never sees the app’s `node_modules` (peers like `zod` must
+ *    live next to the stage too).
+ */
+
+import { cpSync, existsSync, mkdirSync, readFileSync, rmSync, writeFileSync } from "node:fs";
+import { homedir } from "node:os";
+import { dirname, join, resolve } from "node:path";
+
+/** Fields kept on the staged consumer package.json. */
+type ConsumerOkenginePackageJson = {
+  readonly name: string;
+  readonly version: string;
+  readonly description?: string;
+  readonly license?: string;
+  readonly repository?: unknown;
+  readonly bin?: unknown;
+  readonly files?: readonly string[];
+  readonly type?: string;
+  readonly sideEffects?: boolean | string[];
+  readonly exports?: unknown;
+  readonly dependencies?: Record<string, string>;
+  readonly peerDependencies?: Record<string, string>;
+  readonly peerDependenciesMeta?: Record<string, unknown>;
+  readonly engines?: unknown;
+};
+
+/**
+ * Directory under `~/.oke` where the consumer-facing local package is staged.
+ *
+ * @returns Absolute stage root
+ */
+export function localOkengineStageDir(): string {
+  return join(homedir(), ".oke", "create-oke", "okengine");
+}
+
+/**
+ * Build (or refresh) a publish-shaped okengine package and return its
+ * installable `file:` dependency string.
+ *
+ * @param localOkengineRoot - Absolute monorepo / package root
+ */
+export function materializeLocalOkengineDependency(localOkengineRoot: string): string {
+  const root = resolve(localOkengineRoot);
+  const pkgPath = join(root, "package.json");
+  if (!existsSync(pkgPath)) {
+    throw new Error(`create-oke: okengine package.json missing at ${pkgPath}`);
+  }
+
+  const raw = JSON.parse(readFileSync(pkgPath, "utf8")) as Record<string, unknown>;
+  if (raw["name"] !== "okengine") {
+    throw new Error(`create-oke: expected package name "okengine" at ${pkgPath}`);
+  }
+
+  const deps = isStringRecord(raw["dependencies"]) ? { ...raw["dependencies"] } : {};
+  const peers = isStringRecord(raw["peerDependencies"]) ? raw["peerDependencies"] : {};
+  const pins = {
+    ...(isStringRecord(raw["devDependencies"]) ? raw["devDependencies"] : {}),
+    ...deps,
+  };
+  // Peers are provided by the app at publish time; for a file: stage whose
+  // package root sits outside the app, install them beside the stage too.
+  // Prefer monorepo pin versions over peer ranges (`>=1.0.0-rc.0` can resolve
+  // a broken drizzle-kit channel build without `drizzle-kit/cli`).
+  const stagePeers = Object.fromEntries(
+    Object.entries(peers).map(([name, range]) => [name, pins[name] ?? range]),
+  );
+  const stageDependencies = { ...deps, ...stagePeers };
+
+  const consumer: ConsumerOkenginePackageJson = {
+    name: "okengine",
+    version: String(raw["version"] ?? "0.0.0"),
+    ...(typeof raw["description"] === "string" ? { description: raw["description"] } : {}),
+    ...(typeof raw["license"] === "string" ? { license: raw["license"] } : {}),
+    ...(raw["repository"] !== undefined ? { repository: raw["repository"] } : {}),
+    ...(raw["bin"] !== undefined ? { bin: raw["bin"] } : {}),
+    ...(Array.isArray(raw["files"]) ? { files: raw["files"] as string[] } : {}),
+    ...(typeof raw["type"] === "string" ? { type: raw["type"] } : {}),
+    ...(raw["sideEffects"] !== undefined
+      ? { sideEffects: raw["sideEffects"] as boolean | string[] }
+      : {}),
+    ...(raw["exports"] !== undefined ? { exports: raw["exports"] } : {}),
+    ...(Object.keys(stageDependencies).length > 0 ? { dependencies: stageDependencies } : {}),
+    ...(raw["engines"] !== undefined ? { engines: raw["engines"] } : {}),
+  };
+
+  const stage = localOkengineStageDir();
+  rmSync(stage, { recursive: true, force: true });
+  mkdirSync(stage, { recursive: true });
+  writeFileSync(join(stage, "package.json"), `${JSON.stringify(consumer, null, 2)}\n`, "utf8");
+
+  const entries =
+    consumer.files && consumer.files.length > 0
+      ? consumer.files
+      : ["src", "manifest.v1.schema.json", "AGENTS.md", "README.md"];
+
+  for (const rel of entries) {
+    const from = join(root, rel);
+    if (!existsSync(from)) continue;
+    const to = join(stage, rel);
+    mkdirSync(dirname(to), { recursive: true });
+    cpSync(from, to, { recursive: true, dereference: true });
+  }
+
+  const install = Bun.spawnSync({
+    cmd: ["bun", "install"],
+    cwd: stage,
+    stdout: "pipe",
+    stderr: "pipe",
+  });
+  if (install.exitCode !== 0) {
+    const err = new TextDecoder().decode(install.stderr).trim();
+    throw new Error(
+      `create-oke: bun install failed in local okengine stage${err ? `\n${err}` : ""}`,
+    );
+  }
+
+  return `file:${stage}`;
+}
+
+/**
+ * @param value - Unknown record candidate
+ */
+function isStringRecord(value: unknown): value is Record<string, string> {
+  if (value === null || typeof value !== "object" || Array.isArray(value)) return false;
+  return Object.values(value).every((v) => typeof v === "string");
+}

package/src/scaffold.ts

@@ -175,7 +175,7 @@ export function scaffold(options: ScaffoldOptions): ScaffoldResult {
 /**
  * For postgres, pin `store.sql` local/docker/prod in `oke.config.ts`.
  *
- * The default template ships abstract `src/schema.decl.ts` — dialect is
+ * The default template ships abstract `src/db/schema.decl.ts` — dialect is
  * emitted from the active `store.sql` driver, so there is no hand-written
  * `sqliteTable`/`pgTable` source to rewrite. `sqlite` keeps the template
  * dual-mode config (`local: sqlite` · `docker`/`prod: postgres`) untouched.