okengine 0.10.2 → 0.11.0

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

@@ -1,5 +1,5 @@
 /**
- * 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";
@@ -70,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 });
   }
@@ -104,10 +106,7 @@ export function applyAiSetup(
     }
   }
 
-  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 };
 }
@@ -118,8 +117,7 @@ export function applyAiSetup(
  */
 export function upsertAiDrivers(source: string, driver: string): string {
   const block = `{
-      local: "${driver}",
-      docker: "${driver === "mock" ? "mock" : driver}",
+      dev: "${driver === "mock" ? "mock" : driver}",
       test: "mock",
       prod: "${driver === "mock" ? "mock" : driver}",
     }`;
@@ -243,15 +241,113 @@ export function renderAiTs(input: AiSetupApplyInput): string {
 }
 
 /**
- * Ensure `src/app.ts` or `src/core/index.ts` imports AI wiring.
+ * 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` },
-    { rel: "src/core.ts", importLine: `import "./ai";\n` },
   ];
   for (const { rel, importLine } of candidates) {
     const path = join(cwd, rel);

package/src/cli/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/cli/ai-setup/index.ts

@@ -202,7 +202,7 @@ function nonInteractiveInput(args: AiSetupCliArgs): AiSetupApplyInput {
     return {
       driver: "openai-compatible",
       baseUrl: process.env.OKE_AI_URL ?? "http://127.0.0.1:8080/v1",
-      chatModel: args.chat ?? "smollm2",
+      chatModel: args.chat ?? "granite3.3:2b",
       visionModel: null,
       embedModel: null,
       image: "ghcr.io/ggml-org/llama.cpp:server-b10290",

package/src/cli/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);
     }

package/src/cli/ai-setup/recommend.test.ts

@@ -150,7 +150,7 @@ describe("llama.cpp catalog", () => {
   });
 
   test("recommendLlamaCppForTier returns a model in that tier", () => {
-    expect(recommendLlamaCppForTier("ultra-fast", 8).id).toBe("smollm2");
+    expect(recommendLlamaCppForTier("ultra-fast", 8).id).toBe("granite3.3:2b");
     expect(recommendLlamaCppForTier("fast", 16).tier).toBe("fast");
   });
 

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

@@ -17,7 +17,7 @@ describe("maybeAskSeed", () => {
       let seeded = false;
       await maybeAskSeed({
         cwd: dir,
-        env: "local",
+        env: "test",
         stdinIsTTY: false,
         confirmFn: async () => true,
         seedFn: async () => {
@@ -39,7 +39,7 @@ describe("maybeAskSeed", () => {
       let calls = 0;
       await maybeAskSeed({
         cwd: dir,
-        env: "local",
+        env: "test",
         stdinIsTTY: true,
         confirmFn: async () => true,
         seedFn: async () => {
@@ -52,7 +52,7 @@ describe("maybeAskSeed", () => {
 
       await maybeAskSeed({
         cwd: dir,
-        env: "local",
+        env: "test",
         stdinIsTTY: true,
         confirmFn: async () => true,
         seedFn: async () => {

package/src/cli/build.ts

@@ -2,9 +2,6 @@
  * `oke build --target edge` — tree-shaken kernel profile.
  */
 
-import { writeFile } from "node:fs/promises";
-import { join } from "node:path";
-
 /** Options for {@link runBuild}. */
 export interface BuildOptions {
   readonly target?: "bun" | "node" | "edge";
@@ -21,26 +18,28 @@ export interface BuildOptions {
   }) => Promise<{ success: boolean; logs: string }>;
   /**
    * Inject `.adopt()` barrel regeneration (tests). Default: real
-   * `generateAdoptBarrel` + write to `<rootDir>/src/flows/generated.ts`.
-   * Returns the unit names written, for the status line.
+   * `generateAdoptBarrel` + atomic write to `<rootDir>/src/flows/generated.ts`
+   * (`generated.ts.tmp` → rename). Returns the unit names written, for the
+   * status line.
    */
   readonly syncAdoptBarrel?: (rootDir: string) => Promise<readonly string[]>;
 }
 
 /**
  * Regenerate `src/flows/generated.ts` from every `src/flows/<unit>/index.ts`
- * unit folder — pre-step for `oke build` (mirrors `oke db`'s `schema.generated.ts`
+ * unit folder — pre-step for `oke build` (mirrors `oke db`'s `schema.drizzle.ts`
  * pre-step). A real file on disk, not a virtual module: identical resolution
  * under `oke dev`'s runtime `import()` and `oke build`'s `Bun.build()`
  * (investigated — a virtual-module Bun plugin does not resolve consistently
- * across those two paths).
+ * across those two paths). Written atomically so a concurrent reader never
+ * sees a torn file.
  *
  * @param rootDir - Project root
  */
 async function defaultSyncAdoptBarrel(rootDir: string): Promise<readonly string[]> {
-  const { generateAdoptBarrel } = await import("../compiler/generate-adopt.ts");
+  const { generateAdoptBarrel, writeAdoptBarrel } = await import("../compiler/generate-adopt.ts");
   const { source, units } = await generateAdoptBarrel({ rootDir });
-  await writeFile(join(rootDir, "src/flows/generated.ts"), source);
+  await writeAdoptBarrel(rootDir, source);
   return units;
 }
 

package/src/cli/db-auto-push.test.ts

@@ -18,6 +18,9 @@ describe("isDomainSchemaWatchPath", () => {
   });
 
   test("ignores emit output (avoids push ↔ generated feedback loop)", () => {
+    expect(isDomainSchemaWatchPath("src/db/schema.drizzle.ts")).toBe(false);
+    expect(isDomainSchemaWatchPath("schema.drizzle.ts")).toBe(false);
+    expect(isDomainSchemaWatchPath("flows/notes/schema.drizzle.tsx")).toBe(false);
     expect(isDomainSchemaWatchPath("src/schema.generated.ts")).toBe(false);
     expect(isDomainSchemaWatchPath("schema.generated.ts")).toBe(false);
     expect(isDomainSchemaWatchPath("flows/notes/schema.generated.tsx")).toBe(false);
@@ -35,12 +38,12 @@ describe("isDomainSchemaWatchPath", () => {
 });
 
 describe("resolveDevAutoPush", () => {
-  test("default on for local", () => {
+  test("default on", () => {
     expect(resolveDevAutoPush({})).toBe(true);
   });
 
-  test("off for docker", () => {
-    expect(resolveDevAutoPush({ docker: true })).toBe(false);
+  test("docker flag ignored (always-compose)", () => {
+    expect(resolveDevAutoPush({ docker: true })).toBe(true);
   });
 
   test("off for --no-db-push", () => {

package/src/cli/db-auto-push.ts

@@ -1,5 +1,5 @@
 /**
- * Debounced domain-schema auto-push for `oke dev` (local mode).
+ * Debounced domain-schema auto-push for `oke dev`.
  */
 
 import { basename } from "node:path";
@@ -11,7 +11,7 @@ export const DB_AUTO_PUSH_DEBOUNCE_MS = 300;
  * Whether a watched path should trigger `oke db push`.
  *
  * Inputs only: declaration / drizzle config / app entry. Never the emit
- * output (`schema.generated.ts`) — push rewrites that file every run, so
+ * output (`schema.drizzle.ts`) — push rewrites that file every run, so
  * watching it loops `oke db push` forever under `oke dev`.
  *
  * @param filename - Relative path from the watcher (may be undefined)
@@ -21,13 +21,14 @@ export function isDomainSchemaWatchPath(filename: string | null | undefined): bo
   const normalized = filename.replace(/\\/g, "/");
   const base = basename(normalized);
   // Emit output — never a watch trigger (feedback loop with `oke db push`).
+  if (base === "schema.drizzle.ts" || base === "schema.drizzle.tsx") return false;
   if (base === "schema.generated.ts" || base === "schema.generated.tsx") return false;
   if (base === "schema.ts" || base === "schema.tsx") return true;
   if (base === "schema.decl.ts" || base === "schema.decl.tsx") return true;
   if (base === "drizzle.config.ts" || base === "drizzle.config.js") return true;
   // App entry / plugins — `.plug()` table contributions feed emit.
   if (base === "app.ts" || base === "app.tsx") return true;
-  // Nested domain schemas commonly live under src/**/schema.ts (not .generated).
+  // Nested domain schemas commonly live under src/**/schema.ts (not emit output).
   if (/(^|\/)schema(\.decl)?\.tsx?$/.test(normalized)) return true;
   return false;
 }
@@ -35,14 +36,15 @@ export function isDomainSchemaWatchPath(filename: string | null | undefined): bo
 /**
  * Resolve whether auto-push is enabled for this `oke dev` session.
  *
- * @param options - Explicit CLI opt-out, config, docker mode
+ * @param options - Explicit CLI opt-out / config (`docker` ignored — kept for call-site compat)
  */
 export function resolveDevAutoPush(options: {
   readonly noDbPush?: boolean;
+  /** @deprecated Ignored — `oke dev` is always Docker Compose. */
   readonly docker?: boolean;
   readonly configAutoPush?: boolean;
 }): boolean {
-  if (options.docker) return false;
+  void options.docker;
   if (options.noDbPush) return false;
   return options.configAutoPush !== false;
 }

package/src/cli/db-seed.ts

@@ -97,18 +97,17 @@ export function redactConnectionTarget(raw: string): string {
  * Human-readable DB target from drizzle overlay.
  *
  * @param overlay - Resolved drizzle-kit env overlay
- * @param dialect - sqlite | postgresql
+ * @param dialect - postgresql (only supported kit dialect)
  */
 export function formatSeedTarget(
   overlay: Readonly<Record<string, string>>,
   dialect: string,
 ): string {
-  if (dialect === "postgresql" || overlay.DATABASE_URL) {
-    const url = overlay.DATABASE_URL ?? "(DATABASE_URL unset)";
-    return `postgresql ${redactConnectionTarget(url)}`;
+  if (overlay.OKE_PGLITE_URL && !overlay.DATABASE_URL) {
+    return `pglite ${redactConnectionTarget(overlay.OKE_PGLITE_URL)}`;
   }
-  const url = overlay.OKE_SQLITE_URL ?? "file:.oke/app.sqlite";
-  return `sqlite ${redactConnectionTarget(url)}`;
+  const url = overlay.DATABASE_URL ?? "(DATABASE_URL unset)";
+  return `${dialect === "postgresql" ? "postgresql" : dialect} ${redactConnectionTarget(url)}`;
 }
 
 /**
@@ -218,7 +217,7 @@ export async function bootSeedFx(
   entry?: string,
   config?: OkeConfig | null,
 ): Promise<{ readonly fx: Fx; readonly stop: () => Promise<void> }> {
-  if (env === "docker") {
+  if (env === "dev") {
     await applyComposeEnvToProcess(cwd);
     if (process.env.OKE_DOCKER === undefined) process.env.OKE_DOCKER = "1";
   }
@@ -272,7 +271,7 @@ export async function runSeed(options: SeedOptions = {}): Promise<number> {
   }
   write(`oke db seed: env ${env} → ${targetLabel}\n`);
 
-  if (env === "docker" || env === "prod") {
+  if (env === "dev" || env === "prod") {
     if (options.force !== true) {
       const tty = options.stdinIsTTY ?? Boolean(process.stdin.isTTY);
       const confirm =