create-oke 0.11.1 → 0.12.0

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "create-oke",
-  "version": "0.11.1",
+  "version": "0.12.0",
   "description": "Scaffold an okengine app — bunx create-oke@latest <name>",
   "license": "MIT",
   "repository": {

package/src/agents-md.ts

@@ -78,9 +78,10 @@ Mnemonic: O·K·E = 6·5·3.
 \`\`\`bash
 bun install
 oke dev          # or: bun run dev
+bun run web      # Vite SPA (proxies Flows to the app)
 \`\`\`
 
-App \`:6530\` · Console \`:6533\` · MCP \`:6535\`.
+App \`:6530\` · Console \`:6533\` · MCP \`:6535\`. Vite web is \`bun run web\`.
 
 ## Common mistakes
 
@@ -90,6 +91,8 @@ App \`:6530\` · Console \`:6533\` · MCP \`:6535\`.
 - ✅ New capability = new **driver** on an existing element, or a new Flow
 - ❌ Untyped HTTP handlers that skip \`on\` / \`flow\` / contracts
 - ✅ \`on(http.get("/…"), flow(name, { in, out, do }))\`
+- ❌ Returning \`{ items, count }\` from a list \`do\` (nests the pager inside \`data\`)
+- ✅ \`out: z.array(Item)\` + \`fx.json.withQuery(rows, input)\` — or any other \`out\` you declare
 
 ## Learn more
 

package/src/ai-setup/apply.ts

@@ -70,10 +70,8 @@ export function applyAiSetup(
     : existsSync(envExample)
       ? readFileSync(envExample, "utf8")
       : "";
-  // 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.
+  // Driver / URL / model stay commented so `oke dev --docker` can write
+  // the live compose URL into `.env.local` without a leftover pin winning.
   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) {
@@ -146,7 +144,7 @@ export function upsertImage(source: string, key: string, image: string): string
 export type UpsertEnvOptions = {
   /**
    * When true, write `# KEY=value` (opt-in override). Used for AI stack keys
-   * so they do not shadow `docker/.env.docker`.
+   * so `oke dev --docker` can write the live compose URL into `.env.local`.
    */
   readonly comment?: boolean;
 };
@@ -192,9 +190,27 @@ export function renderAiTs(input: AiSetupApplyInput): string {
   const lines = [
     `import { ai } from "okengine";`,
     ``,
+    `/** Cloud OpenAI-compatible binding (OpenAI / Groq / OpenRouter / …). */`,
     `export const smart = ai.model("smart", {`,
     `  provider: "${provider}",`,
-    `  model: process.env.OKE_AI_MODEL ?? "${chat}",`,
+    `  model: process.env.OKE_AI_CLOUD_MODEL ?? process.env.OKE_AI_MODEL ?? "${chat}",`,
+    `  baseUrl: process.env.OPENAI_BASE_URL?.trim() || "https://api.openai.com/v1",`,
+    `  ...(process.env.OPENAI_API_KEY?.trim()`,
+    `    ? { apiKey: process.env.OPENAI_API_KEY.trim() }`,
+    `    : {}),`,
+    `});`,
+    ``,
+    `/** Local inference binding (docker llama.cpp / Ollama via \`OKE_AI_URL\`). */`,
+    `export const local = ai.model("local", {`,
+    `  provider: "${provider === "ollama" ? "ollama" : "openai-compatible"}",`,
+    `  model: process.env.OKE_AI_LOCAL_MODEL ?? "${chat}",`,
+    `  ...(process.env.OKE_AI_URL?.trim() ? { baseUrl: process.env.OKE_AI_URL.trim() } : {}),`,
+    `});`,
+    ``,
+    `/** Advanced Notes summarize — used by \`notes.summarize\` via \`fx.ask\`. */`,
+    `export const summarizeNote = smart.prompt("summarize-note", {`,
+    `  via: ["smart", "local"],`,
+    `  timeout: "30s",`,
     `});`,
   ];
 
@@ -249,6 +265,10 @@ function writeAiModels(cwd: string, input: AiSetupApplyInput): string {
   if (existsSync(coreTsPath)) {
     const existing = readFileSync(coreTsPath, "utf8");
     if (hasAiModels(existing)) {
+      const withPrompt = ensureSummarizeNotePrompt(existing);
+      if (withPrompt !== existing) {
+        writeFileSync(coreTsPath, withPrompt, "utf8");
+      }
       return coreTsPath;
     }
     writeFileSync(coreTsPath, mergeAiIntoCore(existing, rendered), "utf8");
@@ -270,6 +290,44 @@ function hasAiModels(source: string): boolean {
   );
 }
 
+/**
+ * Append the advanced Notes `summarize-note` prompt when a `smart` model
+ * exists but the prompt was never declared (common after older `--ai` runs).
+ *
+ * @param source - Existing `src/core.ts` (or AI sidecar) source
+ */
+export function ensureSummarizeNotePrompt(source: string): string {
+  let next = source;
+  if (
+    !/\bai\.model\s*\(\s*["']local["']/.test(next) &&
+    /\bai\.model\s*\(\s*["']smart["']/.test(next)
+  ) {
+    next = `${next.trimEnd()}
+
+/** Local inference binding (docker llama.cpp / Ollama via \`OKE_AI_URL\`). */
+export const local = ai.model("local", {
+  provider: "openai-compatible",
+  model: process.env.OKE_AI_LOCAL_MODEL ?? "granite3.3:2b",
+  ...(process.env.OKE_AI_URL?.trim() ? { baseUrl: process.env.OKE_AI_URL.trim() } : {}),
+});
+`;
+  }
+  if (/summarize-note/.test(next) || /summarizeNote/.test(next)) {
+    return next;
+  }
+  if (!/\bai\.model\s*\(\s*["']smart["']/.test(next)) {
+    return next;
+  }
+  const prompt = `
+/** Advanced Notes summarize — used by \`notes.summarize\` via \`fx.ask\`. */
+export const summarizeNote = smart.prompt("summarize-note", {
+  via: ["smart", "local"],
+  timeout: "30s",
+});
+`;
+  return `${next.trimEnd()}\n${prompt}\n`;
+}
+
 /**
  * Merge rendered AI module into an existing `src/core.ts`.
  *

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

@@ -3,7 +3,7 @@
  */
 
 import type { CreateAiPref } from "../create-defaults.ts";
-import { LLAMA_CPP_IMAGE } from "../drivers-catalog.ts";
+import { LLAMA_CPP_IMAGE, OLLAMA_IMAGE, SGLANG_IMAGE, VLLM_IMAGE } from "../drivers-catalog.ts";
 import type { AiSetupApplyInput } from "./apply.ts";
 
 /**
@@ -81,7 +81,7 @@ export function nonInteractiveAiApply(provider: string): AiSetupApplyInput {
       chatModel: "gemma4:e4b",
       visionModel: "qwen3-vl:4b",
       embedModel: "nomic-embed-text",
-      image: "ollama/ollama:0.32.6",
+      image: OLLAMA_IMAGE,
     };
   }
   if (provider === "vllm") {
@@ -91,7 +91,7 @@ export function nonInteractiveAiApply(provider: string): AiSetupApplyInput {
       chatModel: "Qwen/Qwen3-0.6B",
       visionModel: null,
       embedModel: null,
-      image: "vllm/vllm-openai:v0.26.0",
+      image: VLLM_IMAGE,
     };
   }
   if (provider === "sglang") {
@@ -101,7 +101,7 @@ export function nonInteractiveAiApply(provider: string): AiSetupApplyInput {
       chatModel: "Qwen/Qwen3-0.6B",
       visionModel: null,
       embedModel: null,
-      image: "lmsysorg/sglang:v0.5.16-runtime",
+      image: SGLANG_IMAGE,
     };
   }
   if (provider === "anthropic") {

package/src/ai-setup/prompts.ts

@@ -250,7 +250,7 @@ async function askSelfHostedGpuPath(
 ): Promise<AiSetupApplyInput | null> {
   const port = provider === "vllm" ? 8000 : 30000;
   const image =
-    provider === "vllm" ? "vllm/vllm-openai:v0.26.0" : "lmsysorg/sglang:v0.5.16-runtime";
+    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",

package/src/cli.test.ts

@@ -27,6 +27,8 @@ import {
   shouldPrompt,
   sourceFromArgs,
   withBackOption,
+  withLocalesPgDog,
+  withWizardExtras,
   type InteractiveAnswers,
 } from "./cli.ts";
 import {
@@ -46,6 +48,62 @@ import {
   transformPackageJson,
 } from "./transform.ts";
 
+describe("withWizardExtras / withLocalesPgDog", () => {
+  test("updates session defaults (reuse / customize)", () => {
+    const session = recommendedDefaults("docker-ready", "advanced");
+    const next = withWizardExtras({
+      template: "advanced",
+      locales: ["ar"],
+      pgdog: true,
+      proxy: "nginx",
+      session,
+      previous: null,
+    });
+    expect(next.template).toBe("advanced");
+    expect(next.locales).toEqual(["ar"]);
+    expect(next.pgdog).toBe(true);
+    expect(next.proxy).toBe("nginx");
+    expect(next.drivers.store.sql.dev).toBe(session.drivers.store.sql.dev);
+  });
+
+  test("updates previous settings when recommended has no session", () => {
+    const previous = {
+      ...recommendedDefaults("docker-ready", "advanced"),
+      locales: [] as const,
+      pgdog: false,
+      proxy: "none" as const,
+    };
+    const next = withLocalesPgDog({
+      template: "advanced",
+      locales: ["ar", "fr"],
+      pgdog: true,
+      proxy: "traefik",
+      session: undefined,
+      previous,
+    });
+    expect(next.locales).toEqual(["ar", "fr"]);
+    expect(next.pgdog).toBe(true);
+    expect(next.proxy).toBe("traefik");
+    expect(next.drivers).toEqual(previous.drivers);
+  });
+
+  test("falls back to recommended pins when nothing is saved", () => {
+    const next = withWizardExtras({
+      template: "standard",
+      locales: ["ar"],
+      pgdog: true,
+      proxy: "caddy",
+      session: undefined,
+      previous: null,
+    });
+    expect(next.template).toBe("standard");
+    expect(next.locales).toEqual(["ar"]);
+    expect(next.pgdog).toBe(true);
+    expect(next.proxy).toBe("caddy");
+    expect(next.profile).toBe("docker-ready");
+  });
+});
+
 describe("defaultsBranchOptions", () => {
   test("hides reuse when no previous settings exist", () => {
     const values = defaultsBranchOptions(false).map((o) => o.value);
@@ -130,6 +188,15 @@ describe("parseArgs flags", () => {
     expect(() => parseArgs(["x", "--pgdog", "--no-pgdog"])).toThrow(/pgdog/);
   });
 
+  test("accepts --proxy / --no-proxy", () => {
+    expect(parseArgs(["x", "--proxy", "caddy"]).proxy).toBe("caddy");
+    expect(parseArgs(["x", "--proxy=nginx"]).proxy).toBe("nginx");
+    expect(parseArgs(["x", "--no-proxy"]).proxy).toBe("none");
+    expect(parseArgs(["x"]).proxy).toBeUndefined();
+    expect(() => parseArgs(["x", "--proxy", "nope"])).toThrow(/proxy/);
+    expect(() => parseArgs(["x", "--proxy", "caddy", "--no-proxy"])).toThrow(/proxy/);
+  });
+
   test("rejects --install with --no-install", () => {
     expect(() => parseArgs(["x", "--install", "--no-install"])).toThrow(/install/);
   });
@@ -154,6 +221,7 @@ function recommendedAnswers(overrides: Partial<InteractiveAnswers> = {}): Intera
     aiApply: null,
     locales: [],
     pgdog: false,
+    proxy: "none",
     ...overrides,
   };
 }
@@ -349,6 +417,7 @@ describe("interactive branches", () => {
       ai: { enabled: false, provider: null, driver: null },
       locales: [],
       pgdog: false,
+      proxy: "none",
     });
 
     const dir = mkdtempSync(join(tmpdir(), "oke-custom-app-"));
@@ -448,6 +517,23 @@ describe("transformConfigForSqlDriver", () => {
   });
 });
 
+describe("template Vite web", () => {
+  test("proxies API paths and never steals GET / from the SPA", () => {
+    for (const id of TEMPLATES) {
+      const config = readFileSync(join(resolveTemplateDir(id), "web/vite.config.ts"), "utf8");
+      expect(config).toContain('"/health"');
+      expect(config).toContain('"/notes"');
+      expect(config).toContain('"/_oke"');
+      expect(config).toContain("127.0.0.1:6530");
+      expect(config).not.toMatch(/proxy:\s*\{[^}]*["']\/["']/);
+      expect(config).not.toContain("cors: true");
+      expect(config).not.toContain("5173");
+      expect(config).toContain('from "vite"');
+      expect(config).toContain("@vitejs/plugin-react");
+    }
+  });
+});
+
 describe("shouldSkipTemplatePath", () => {
   test("skips node_modules, locks, and monorepo docker test", () => {
     expect(shouldSkipTemplatePath("node_modules/okengine/package.json")).toBe(true);
@@ -524,22 +610,32 @@ describe("scaffold structure", () => {
         expect(appTs).not.toMatch(/Object\.assign/);
         expect(appTs).not.toMatch(/env:\s*["']test["']/);
         expect(appTs).not.toMatch(/stores:\s*\[/);
-        expect(appTs).toMatch(/oke\(\{\s*name:\s*["']notes["']\s*\}\)/);
+        expect(appTs).toMatch(/oke\(\{\s*name:\s*["']notes["']/);
         const pkg = JSON.parse(readFileSync(join(result.targetDir, "package.json"), "utf8")) as {
           name: string;
-          dependencies: { okengine: string };
-          scripts: { typecheck?: string; test?: string };
+          dependencies: { okengine: string; "@duckdb/node-api"?: string };
+          trustedDependencies?: readonly string[];
+          scripts: { typecheck?: string; test?: string; web?: string; "web:build"?: string };
           devDependencies: {
             typescript?: string;
+            vite?: string;
             "@electric-sql/pglite"?: string;
             "@electric-sql/pglite-pgvector"?: string;
           };
         };
         expect(pkg.name).toBe(`app-${id}`);
         expect(pkg.dependencies.okengine).not.toMatch(/^file:\.\./);
-        expect(pkg.scripts.typecheck).toBe("tsc --noEmit");
+        expect(pkg.dependencies["@duckdb/node-api"]).toBe("^1.5.5-r.2");
+        expect(pkg.trustedDependencies).toContain("@duckdb/node-api");
+        expect(pkg.scripts.typecheck).toContain("tsc --noEmit");
+        expect(pkg.scripts.typecheck).toContain("tsc -b -p web/tsconfig.json");
+        expect(pkg.scripts.web).toContain("vite --config web/vite.config.ts");
+        expect(pkg.scripts["web:build"]).toContain("tsc -b -p web/tsconfig.json");
         expect(pkg.scripts.test).toBe("oke test");
+        expect(result.files).toContain("web/vite.config.ts");
+        expect(result.files).toContain("web/src/client.ts");
         expect(pkg.devDependencies.typescript).toBeTruthy();
+        expect(pkg.devDependencies.vite).toBe("^8.2.0");
         expect(pkg.devDependencies["@electric-sql/pglite"]).toBe("^0.5.4");
         expect(pkg.devDependencies["@electric-sql/pglite-pgvector"]).toBe("^0.0.5");
         const drizzle = readFileSync(join(result.targetDir, "drizzle.config.ts"), "utf8");
@@ -582,6 +678,7 @@ describe("scaffold structure", () => {
       }
       const notes = readFileSync(join(result.targetDir, "src/flows/notes/index.ts"), "utf8");
       expect(notes).toContain('flow("notes.create"');
+      expect(notes).toContain("fx.json.withQuery");
       expect(notes).not.toContain('flow("notes.digest"');
       expect(existsSync(join(result.targetDir, "src/locales/ar.ts"))).toBe(false);
       expect(readFileSync(join(result.targetDir, "oke.config.ts"), "utf8")).toContain(
@@ -665,6 +762,37 @@ describe("scaffold structure", () => {
     }
   });
 
+  test("proxy opt-in pins images.proxy and emits companion config", async () => {
+    const dir = mkdtempSync(join(tmpdir(), "create-oke-proxy-"));
+    try {
+      const caddy = await scaffold({
+        targetDir: join(dir, "with-caddy"),
+        name: "with-caddy",
+        source: { kind: "template", id: "standard" },
+        proxy: "caddy",
+      });
+      expect(caddy.proxy).toBe("caddy");
+      expect(readFileSync(join(caddy.targetDir, "oke.config.ts"), "utf8")).toMatch(
+        /proxy:\s*"caddy:2-alpine"/,
+      );
+      expect(existsSync(join(caddy.targetDir, "docker/Caddyfile"))).toBe(true);
+
+      const nginx = await scaffold({
+        targetDir: join(dir, "with-nginx"),
+        name: "with-nginx",
+        source: { kind: "template", id: "standard" },
+        proxy: "nginx",
+      });
+      expect(nginx.proxy).toBe("nginx");
+      expect(readFileSync(join(nginx.targetDir, "oke.config.ts"), "utf8")).toMatch(
+        /proxy:\s*"nginx:1\.31-alpine"/,
+      );
+      expect(existsSync(join(nginx.targetDir, "docker/nginx.conf"))).toBe(true);
+    } finally {
+      rmSync(dir, { recursive: true, force: true });
+    }
+  });
+
   test("--sql postgres pins store.sql (abstract schema stays dialect-agnostic)", async () => {
     const dir = mkdtempSync(join(tmpdir(), "create-oke-sql-pg-"));
     try {
@@ -799,16 +927,10 @@ describe("non-TTY CLI", () => {
       expect(existsSync(join(target, "AGENTS.md"))).toBe(true);
       const result = {
         targetDir: target,
-        name: "flag-app",
-        source: { kind: "template" as const, id: "standard" as const },
         label: "standard",
-        okengineDependency: "x",
-        files: [],
-        sqlDriver: "postgres" as const,
-        locales: [],
-        pgdog: false,
       };
       expect(nextStepsText(result)).toContain("oke dev");
+      expect(nextStepsText(result)).toContain("bun run web");
       expect(nextStepsText(result)).toContain("bun install");
       expect(nextStepsText(result)).toContain("oke.omqkhafi.dev");
     } finally {