create-oke 0.10.2 → 0.11.0

package/README.md

@@ -50,8 +50,8 @@ model selection runs in the wizard **before** `bun install` (writes `.env.local`
 
 Store-bearing scaffolds ship `drizzle.config.ts` and `.env.example`. Local
 `oke dev` auto-runs `oke db push` on schema change and asks once whether to
-seed; use `oke mode docker` / `oke dev --docker` for compose infra (OpenBao
-tokens and stack passwords are generated and preserved per project). Both
+seed; compose stack passwords are generated and preserved per project
+(built-in vault needs no extra container). Both
 templates include `.github/workflows/ci.yml` (typecheck + `bun test` on push/PR).
 
 Every scaffold writes an `AGENTS.md` so coding agents know the OKE contract

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "create-oke",
-  "version": "0.10.2",
+  "version": "0.11.0",
   "description": "Scaffold an okengine app — bunx create-oke@latest <name>",
   "license": "MIT",
   "repository": {
@@ -22,7 +22,7 @@
   },
   "scripts": {
     "typecheck": "tsc --noEmit",
-    "test": "bun test"
+    "test": "bun test src"
   },
   "dependencies": {
     "@clack/prompts": "^1.7.0"

package/src/ai-setup/apply.ts

@@ -1,10 +1,11 @@
 /**
- * Write AI driver config, env, and `src/core/ai.ts` for `oke ai setup`.
+ * Write AI driver config, env, and AI models into `src/core.ts` for `oke ai setup`.
  */
 
 import { existsSync, mkdirSync, readFileSync, writeFileSync } from "node:fs";
 import { dirname, join } from "node:path";
 import { OLLAMA_IMAGE } from "../drivers-catalog.ts";
+import { extractImages, findImagesBlock, replaceImagesBlock } from "../transform.ts";
 
 /** Choices applied to the project. */
 export type AiSetupApplyInput = {
@@ -69,13 +70,15 @@ export function applyAiSetup(
     : existsSync(envExample)
       ? readFileSync(envExample, "utf8")
       : "";
-  // Driver / URL stay commented so docker mode can hydrate `OKE_AI_URL` from
-  // `docker/.env.docker` without being shadowed. The selected chat model is
-  // written active — `oke dev` seeds it into stack controls / `LLAMA_ARG_DOCKER_REPO`
-  // (commented-only left the compose default `smollm2` forever).
+  // Driver / URL / model stay commented so docker mode can hydrate from
+  // `docker/.env.docker` without being shadowed. The chosen model is still
+  // written into `.env.local` as a hint (and into `.env.docker` when present);
+  // `loadExistingStackControls` seeds commented `OKE_AI_MODEL` on first boot.
   env = upsertEnv(env, "OKE_AI_DRIVER", input.driver, { comment: true });
   if (input.baseUrl) env = upsertEnv(env, "OKE_AI_URL", input.baseUrl, { comment: true });
-  if (input.chatModel) env = upsertEnv(env, "OKE_AI_MODEL", input.chatModel);
+  if (input.chatModel) {
+    env = upsertEnv(env, "OKE_AI_MODEL", input.chatModel, { comment: true });
+  }
   if (input.visionModel) {
     env = upsertEnv(env, "OKE_AI_VISION_MODEL", input.visionModel, { comment: true });
   }
@@ -91,10 +94,7 @@ export function applyAiSetup(
   }
   writeFileSync(envPath, env.endsWith("\n") ? env : `${env}\n`, "utf8");
 
-  const aiTsPath = join(cwd, "src", "core", "ai.ts");
-  mkdirSync(dirname(aiTsPath), { recursive: true });
-  writeFileSync(aiTsPath, renderAiTs(input), "utf8");
-  ensureAiImported(cwd);
+  const aiTsPath = writeAiModels(cwd, input);
 
   return { configPath, envPath, aiTsPath };
 }
@@ -104,11 +104,11 @@ export function applyAiSetup(
  * @param driver - AI driver id
  */
 export function upsertAiDrivers(source: string, driver: string): string {
+  const runtime = driver === "mock" ? "mock" : driver;
   const block = `{
-      local: "${driver}",
-      docker: "${driver === "mock" ? "mock" : driver}",
+      dev: "${runtime}",
       test: "mock",
-      prod: "${driver === "mock" ? "mock" : driver}",
+      prod: "${runtime}",
     }`;
   // Top-level drivers.ai only (4-space indent) — never nest under channel.email.
   const aiRe = /^( {4})ai:\s*\{[\s\S]*?\n\1\}/m;
@@ -127,24 +127,19 @@ export function upsertAiDrivers(source: string, driver: string): string {
 }
 
 /**
+ * Set one dotted role's image pin, preserving every other pin (including
+ * `store.*` / `channel.*` nesting) via {@link extractImages} /
+ * {@link replaceImagesBlock} — a parse/set/render round-trip rather than a
+ * single-line regex, so nested sub-objects are never corrupted.
+ *
  * @param source - Config source
- * @param key - Image role
+ * @param key - Image role (dotted for `store.*` / `channel.*`, flat otherwise)
  * @param image - Image ref
  */
 export function upsertImage(source: string, key: string, image: string): string {
-  const keyLit = key.includes(".") ? `"${key}"` : key;
-  const line = `    ${keyLit}: "${image}",`;
-  const imagesRe = /images:\s*\{([\s\S]*?)\n\s*\}/;
-  const m = imagesRe.exec(source);
-  if (!m) return source;
-  const body = m[1]!;
-  if (new RegExp(`${keyLit}\\s*:`).test(body) || new RegExp(`"${key}"\\s*:`).test(body)) {
-    return source.replace(
-      new RegExp(`(["']?${key.replace(".", "\\.")}["']?\\s*:\\s*)"[^"]*"`),
-      `$1"${image}"`,
-    );
-  }
-  return source.replace(imagesRe, `images: {${body}\n${line}\n  }`);
+  if (!findImagesBlock(source)) return source;
+  const images = { ...extractImages(source), [key]: image };
+  return replaceImagesBlock(source, images);
 }
 
 /** Options for {@link upsertEnv}. */
@@ -230,16 +225,113 @@ export function renderAiTs(input: AiSetupApplyInput): string {
 }
 
 /**
- * Ensure `src/app.ts` or `src/core/index.ts` imports `./core/ai` / `./ai`.
+ * Write AI model declarations into `src/core.ts` (preferred) or legacy `src/core/ai.ts`.
+ *
+ * @param cwd - Project root
+ * @param input - Setup choices
+ * @returns Path written
+ */
+function writeAiModels(cwd: string, input: AiSetupApplyInput): string {
+  const rendered = renderAiTs(input);
+  const coreTsPath = join(cwd, "src", "core.ts");
+  const legacyIndex = join(cwd, "src", "core", "index.ts");
+
+  // Folder layout still in the wild — keep writing a sidecar.
+  if (!existsSync(coreTsPath) && existsSync(legacyIndex)) {
+    const aiTsPath = join(cwd, "src", "core", "ai.ts");
+    mkdirSync(dirname(aiTsPath), { recursive: true });
+    writeFileSync(aiTsPath, rendered, "utf8");
+    ensureLegacyAiImported(cwd);
+    return aiTsPath;
+  }
+
+  mkdirSync(dirname(coreTsPath), { recursive: true });
+  if (existsSync(coreTsPath)) {
+    const existing = readFileSync(coreTsPath, "utf8");
+    if (hasAiModels(existing)) {
+      return coreTsPath;
+    }
+    writeFileSync(coreTsPath, mergeAiIntoCore(existing, rendered), "utf8");
+  } else {
+    writeFileSync(coreTsPath, rendered, "utf8");
+  }
+  ensureCoreImported(cwd);
+  return coreTsPath;
+}
+
+/**
+ * @param source - Existing TypeScript
+ */
+function hasAiModels(source: string): boolean {
+  return (
+    /\bai\.model\s*\(/.test(source) ||
+    /from\s+["']\.\/(?:core\/)?ai["']/.test(source) ||
+    /import\s+["']\.\/(?:core\/)?ai["']/.test(source)
+  );
+}
+
+/**
+ * Merge rendered AI module into an existing `src/core.ts`.
+ *
+ * @param existing - Current core.ts
+ * @param rendered - Output of {@link renderAiTs}
+ */
+export function mergeAiIntoCore(existing: string, rendered: string): string {
+  const body = rendered.replace(/^import\s*\{\s*ai\s*\}\s*from\s*["']okengine["'];\s*\n*/m, "");
+  const next = ensureNamedOkengineImport(existing, "ai");
+  return `${next.trimEnd()}\n\n${body.trimStart()}`;
+}
+
+/**
+ * Ensure a named binding is imported from `"okengine"`.
+ *
+ * @param source - Module source
+ * @param name - Binding to add
+ */
+export function ensureNamedOkengineImport(source: string, name: string): string {
+  const re = /import\s*\{([^}]*)\}\s*from\s*["']okengine["']\s*;/;
+  const m = re.exec(source);
+  if (!m) {
+    return `import { ${name} } from "okengine";\n${source}`;
+  }
+  const names = m[1]!
+    .split(",")
+    .map((s) => s.trim())
+    .filter(Boolean);
+  if (names.includes(name)) return source;
+  const sorted = [...names, name].sort((a, b) => a.localeCompare(b));
+  return source.replace(re, `import { ${sorted.join(", ")} } from "okengine";`);
+}
+
+/**
+ * Ensure `src/app.ts` loads `@/core` / `./core` so merged AI registers.
+ *
+ * @param cwd - Project root
+ */
+function ensureCoreImported(cwd: string): void {
+  const appPath = join(cwd, "src", "app.ts");
+  if (!existsSync(appPath)) return;
+  const src = readFileSync(appPath, "utf8");
+  if (
+    /from\s+["']@\/core["']/.test(src) ||
+    /import\s+["']@\/core["']/.test(src) ||
+    /from\s+["']\.\/core(?:\.ts)?["']/.test(src) ||
+    /import\s+["']\.\/core(?:\.ts)?["']/.test(src)
+  ) {
+    return;
+  }
+  writeFileSync(appPath, `import "@/core";\n${src}`, "utf8");
+}
+
+/**
+ * Legacy `src/core/*` layout — side-effect import the AI sidecar.
  *
  * @param cwd - Project root
  */
-function ensureAiImported(cwd: string): void {
+function ensureLegacyAiImported(cwd: string): void {
   const candidates: ReadonlyArray<{ readonly rel: string; readonly importLine: string }> = [
     { rel: "src/app.ts", importLine: `import "./core/ai";\n` },
     { rel: "src/core/index.ts", importLine: `import "./ai";\n` },
-    // Legacy layout
-    { rel: "src/core.ts", importLine: `import "./ai";\n` },
   ];
   for (const { rel, importLine } of candidates) {
     const path = join(cwd, rel);

package/src/ai-setup/catalog.ts

@@ -788,9 +788,8 @@ export const LLAMA_CPP_CHAT_MODELS: readonly CatalogModel[] = [
   {
     id: "smollm2",
     label: "SmolLM2",
-    hint: "Default · lightest",
+    hint: "Lightest",
     role: "chat",
-    recommended: true,
     ramGb: 1,
     tier: "ultra-fast",
     modalities: ["text"],
@@ -951,8 +950,9 @@ export const LLAMA_CPP_CHAT_MODELS: readonly CatalogModel[] = [
   {
     id: "granite3.3:2b",
     label: "Granite 3.3 2B",
-    hint: "IBM 2B",
+    hint: "Default · IBM 2B",
     role: "chat",
+    recommended: true,
     ramGb: 2,
     tier: "ultra-fast",
     modalities: ["text", "code"],

package/src/ai-setup/from-pref.ts

@@ -68,7 +68,7 @@ export function nonInteractiveAiApply(provider: string): AiSetupApplyInput {
     return {
       driver: "openai-compatible",
       baseUrl: process.env.OKE_AI_URL ?? "http://127.0.0.1:8080/v1",
-      chatModel: "smollm2",
+      chatModel: "granite3.3:2b",
       visionModel: null,
       embedModel: null,
       image: LLAMA_CPP_IMAGE,

package/src/ai-setup/prompts.ts

@@ -154,7 +154,7 @@ async function askLlamaCppPath(options: {
     if (mode === null) return null;
 
     if (mode === "manual") {
-      const id = await askOtherModelId("smollm2");
+      const id = await askOtherModelId("granite3.3:2b");
       if (id === null) return null;
       return finishLlamaCpp(id);
     }