create-oke 0.10.1 → 0.10.3

package/package.json

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

package/src/agents-md.ts

@@ -89,7 +89,7 @@ App \`:6530\` · Console \`:6533\` · MCP \`:6535\`.
 - ❌ Inventing a ninth “element” or a parallel handler stack beside Flows
 - ✅ New capability = new **driver** on an existing element, or a new Flow
 - ❌ Untyped HTTP handlers that skip \`on\` / \`flow\` / contracts
-- ✅ \`on(http.get("/…"), flow({ in, out, do }))\`
+- ✅ \`on(http.get("/…"), flow(name, { in, out, do }))\`
 
 ## Learn more
 

package/src/ai-setup/apply.ts

@@ -5,6 +5,7 @@
 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 = {
@@ -127,24 +128,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}. */

package/src/cli.test.ts

@@ -261,8 +261,8 @@ describe("interactive branches", () => {
       expect(code).toBe(0);
       expect(readFileSync(join(dir, ".oke", "mode"), "utf8").trim()).toBe("docker");
       const notes = readFileSync(join(dir, "src", "flows", "notes", "index.ts"), "utf8");
-      expect(notes).toContain('name: "notes.digest"');
-      expect(notes).toContain('name: "notes.attach"');
+      expect(notes).toContain('flow("notes.digest"');
+      expect(notes).toContain('flow("notes.attach"');
     } finally {
       rmSync(dir, { recursive: true, force: true });
     }
@@ -564,8 +564,10 @@ describe("scaffold structure", () => {
         const appTs = readFileSync(join(result.targetDir, "src/app.ts"), "utf8");
         expect(appTs).not.toMatch(/Object\.assign/);
         expect(appTs).not.toMatch(/env:\s*["']test["']/);
-        expect(appTs).toMatch(/stores:\s*\[/);
-        expect(appTs).toMatch(/oke\(\{[\s\S]*stores:/);
+        // stores/secrets/signals/channel.templates auto-register — the
+        // minimal `oke({ name: "notes" })` shape carries no explicit arrays.
+        expect(appTs).not.toMatch(/stores:\s*\[/);
+        expect(appTs).toMatch(/oke\(\{\s*name:\s*["']notes["']\s*\}\)/);
         const pkg = JSON.parse(readFileSync(join(result.targetDir, "package.json"), "utf8")) as {
           name: string;
           dependencies: { okengine: string };
@@ -610,8 +612,8 @@ describe("scaffold structure", () => {
         expect(result.files).toContain(path);
       }
       const notes = readFileSync(join(result.targetDir, "src/flows/notes/index.ts"), "utf8");
-      expect(notes).toContain('name: "notes.create"');
-      expect(notes).not.toContain('name: "notes.digest"');
+      expect(notes).toContain('flow("notes.create"');
+      expect(notes).not.toContain('flow("notes.digest"');
       const all = result.files
         .filter((f) => f.endsWith(".ts") || f.endsWith(".md"))
         .map((f) => readFileSync(join(result.targetDir, f), "utf8"))

package/src/transform.test.ts

@@ -21,7 +21,11 @@ function evalConfig(source: string): {
     ai?: unknown;
     channel?: { ai?: unknown; email?: unknown };
   };
-  images?: Record<string, string>;
+  images?: {
+    store?: Record<string, string>;
+    channel?: Record<string, string>;
+    ai?: string;
+  };
 } {
   const body = source
     .replace(/^import\s+[\s\S]*?from\s+["'][^"']+["'];?\s*/m, "")
@@ -60,7 +64,7 @@ describe("applyCreateAnswers images", () => {
     expect(next).not.toMatch(/images:\s*\{[^}]*\blocal:\s*"/s);
     expect(next).not.toMatch(/images:\s*\{[^}]*\bdocker:\s*"/s);
     expect(next).not.toMatch(/images:\s*\{[^}]*:\s*"libsql"/s);
-    expect(next).toContain('"store.sql": "postgres:18-alpine"');
+    expect(next).toMatch(/images:\s*\{\s*store:\s*\{[^}]*\bsql: "postgres:18-alpine"/s);
   });
 
   test("index meilisearch pins store.index image without comment leakage", () => {
@@ -68,7 +72,7 @@ describe("applyCreateAnswers images", () => {
       templateConfig(),
       defaultsWithIndex("meilisearch", "meilisearch"),
     );
-    expect(next).toContain('"store.index": "getmeili/meilisearch:v1.37"');
+    expect(next).toMatch(/images:\s*\{\s*store:\s*\{[^}]*\bindex: "getmeili\/meilisearch:v1.37"/s);
     expect(next).not.toMatch(/images:\s*\{[^}]*\btest:\s*"memory"/s);
   });
 });

package/src/transform.ts

@@ -298,8 +298,11 @@ ${close}}`;
 /** Env-column keys that must never appear under `images`. */
 const IMAGE_ENV_COLUMNS = new Set(["local", "docker", "test", "prod"]);
 
-/** Known compose role keys written into `images`. */
-const IMAGE_ROLE_KEY = /^(?:store\.(?:sql|kv|files|index)|channel\.email|vault|ai|pgdog)$/;
+/** Known compose role keys written into `images` (dotted, post-flatten). */
+const IMAGE_ROLE_KEY = /^(?:store\.(?:sql|kv|files|index)|channel\.email|vault|ai|pgdog|proxy)$/;
+
+/** `images` sub-object keys that nest role facets (mirrors `drivers` nesting). */
+const IMAGE_NEST_KEYS = ["store", "channel"] as const;
 
 /**
  * Keep `images` in sync with chosen docker drivers.
@@ -374,43 +377,111 @@ function aiImageForDefaults(defaults: CreateDefaults): string {
 }
 
 /**
- * Parse role→image pins from an `images` block.
+ * Locate the `images: { … }` block by brace depth (not the first `}`) so
+ * nested `store: { … }` / `channel: { … }` sub-blocks don't close the match
+ * early.
+ *
+ * @param source - Config source
+ */
+export function findImagesBlock(source: string): {
+  readonly start: number;
+  readonly bodyStart: number;
+  readonly bodyEnd: number;
+  readonly end: number;
+} | null {
+  const m = /images:\s*\{/.exec(source);
+  if (!m) return null;
+  const start = m.index;
+  const openIdx = start + m[0].length - 1;
+  let depth = 0;
+  for (let i = openIdx; i < source.length; i++) {
+    const ch = source[i];
+    if (ch === "{") depth++;
+    else if (ch === "}") {
+      depth--;
+      if (depth === 0) return { start, bodyStart: openIdx + 1, bodyEnd: i, end: i + 1 };
+    }
+  }
+  return null;
+}
+
+/**
+ * Parse dotted role→image pins from an `images` block, flattening one level
+ * of `store` / `channel` nesting (mirrors {@link flattenImagesConfig} in
+ * `okengine/config`).
  *
  * Skips `//` comment lines and rejects env-column keys (`local`/`docker`/…).
  *
  * @param source - Config source
  */
-function extractImages(source: string): Record<string, string> {
-  const m = /images:\s*\{([\s\S]*?)\n\s*\},/.exec(source);
-  if (!m) return {};
+export function extractImages(source: string): Record<string, string> {
+  const block = findImagesBlock(source);
+  if (!block) return {};
   const out: Record<string, string> = {};
-  for (const line of m[1]!.split("\n")) {
-    const trimmed = line.trim();
-    if (!trimmed || trimmed.startsWith("//")) continue;
-    const hit = /["']?([\w.]+)["']?\s*:\s*"([^"]+)"/.exec(trimmed);
+  let context: (typeof IMAGE_NEST_KEYS)[number] | null = null;
+  for (const raw of source.slice(block.bodyStart, block.bodyEnd).split("\n")) {
+    const line = raw.trim();
+    if (!line || line.startsWith("//")) continue;
+    const nestOpen = /^(store|channel):\s*\{\s*$/.exec(line);
+    if (nestOpen) {
+      context = nestOpen[1] as (typeof IMAGE_NEST_KEYS)[number];
+      continue;
+    }
+    if (line === "}," || line === "}") {
+      context = null;
+      continue;
+    }
+    const hit = /^["']?([\w.]+)["']?\s*:\s*"([^"]+)"/.exec(line);
     if (!hit) continue;
-    const key = hit[1]!;
-    if (IMAGE_ENV_COLUMNS.has(key) || !IMAGE_ROLE_KEY.test(key)) continue;
+    const rawKey = hit[1]!;
+    if (IMAGE_ENV_COLUMNS.has(rawKey)) continue;
+    const key = context ? `${context}.${rawKey}` : rawKey;
+    if (!IMAGE_ROLE_KEY.test(key)) continue;
     out[key] = hit[2]!;
   }
   return out;
 }
 
+/**
+ * Render dotted role→image pins back into a nested `images: { … }` literal —
+ * `store.*` / `channel.*` under their sub-object, everything else flat.
+ *
+ * @param images - Dotted role → image
+ */
+function formatImagesBlock(images: Record<string, string>): string {
+  const store: Array<[string, string]> = [];
+  const channel: Array<[string, string]> = [];
+  const flat: Array<[string, string]> = [];
+  for (const [key, value] of Object.entries(images)) {
+    if (key.startsWith("store.")) store.push([key.slice("store.".length), value]);
+    else if (key.startsWith("channel.")) channel.push([key.slice("channel.".length), value]);
+    else flat.push([key, value]);
+  }
+  const lines: string[] = [];
+  if (store.length > 0) {
+    lines.push("    store: {");
+    for (const [k, v] of store) lines.push(`      ${k}: "${v}",`);
+    lines.push("    },");
+  }
+  if (channel.length > 0) {
+    lines.push("    channel: {");
+    for (const [k, v] of channel) lines.push(`      ${k}: "${v}",`);
+    lines.push("    },");
+  }
+  for (const [k, v] of flat) lines.push(`    ${k}: "${v}",`);
+  return `images: {\n${lines.join("\n")}\n  }`;
+}
+
 /**
  * @param source - Config source
- * @param images - Role → image
+ * @param images - Dotted role → image
  */
-function replaceImagesBlock(source: string, images: Record<string, string>): string {
-  const lines = Object.entries(images).map(([k, v]) => {
-    const key = k.includes(".") ? `"${k}"` : k;
-    return `    ${key}: "${v}",`;
-  });
-  const block = `images: {\n${lines.join("\n")}\n  }`;
-  const re = /images:\s*\{[\s\S]*?\n\s*\}/;
-  if (!re.test(source)) {
+export function replaceImagesBlock(source: string, images: Record<string, string>): string {
+  const block = findImagesBlock(source);
+  if (!block) {
     throw new Error("create-oke: oke.config.ts missing images block");
   }
-  return source.replace(re, block);
+  return `${source.slice(0, block.start)}${formatImagesBlock(images)}${source.slice(block.end)}`;
 }
 
 /**

package/templates/advanced/oke.config.ts

@@ -29,13 +29,12 @@ export default defineConfig({
         test: "memory",
         prod: "s3",
       },
-      // Opt in via create-oke customize or uncomment:
-      // index: {
-      //   local: "memory",
-      //   docker: "meilisearch",
-      //   test: "memory",
-      //   prod: "meilisearch",
-      // },
+      index: {
+        local: "memory",
+        docker: "meilisearch",
+        test: "memory",
+        prod: "meilisearch",
+      },
     },
     signal: {
       local: "memory",
@@ -49,7 +48,6 @@ export default defineConfig({
       test: "frozen",
       prod: "postgres",
     },
-    // Durable-flow journal (durable: true runs) — shared + leased in docker/prod.
     journal: {
       local: "memory",
       docker: "postgres",
@@ -73,13 +71,17 @@ export default defineConfig({
     // Opt in: create-oke --ai / oke ai setup writes drivers.ai + src/core/ai.ts
   },
   images: {
-    "store.sql": "postgres:18-alpine",
-    pgdog: "ghcr.io/pgdogdev/pgdog:v0.1.51",
-    "store.kv": "redis:8-alpine",
-    "store.files": "rustfs/rustfs:1.0.0-beta.11",
-    "channel.email": "axllent/mailpit:v1.22.3",
+    store: {
+      sql: "postgres:18-alpine",
+      kv: "redis:8-alpine",
+      files: "rustfs/rustfs:1.0.0-beta.11",
+      // index: "getmeili/meilisearch:v1.37",
+    },
+    channel: {
+      email: "axllent/mailpit:v1.22.3",
+    },
     vault: "openbao/openbao:2.6.1",
-    // "store.index": "getmeili/meilisearch:v1.37",
+    pgdog: "ghcr.io/pgdogdev/pgdog:v0.1.51",
     // ai: "ghcr.io/ggml-org/llama.cpp:server-b10290", // or ollama/ollama:0.32.6
   },
   i18n: { locales: ["en", "ar"], default: "en", dir: { ar: "rtl" } },

package/templates/advanced/src/app.ts

@@ -1,18 +1,15 @@
-import { db, files, noteCreatedMail, webhookSecret } from "./core";
+import "./core";
 import "./locales/en";
 import "./locales/ar";
 
 import { oke } from "okengine";
-import * as main from "./flows/main";
-import * as notes from "./flows/notes";
-import { noteCreated } from "./flows/notes/signals";
+import * as routes from "./flows/generated";
 
-export const app = oke({
-  name: "notes",
-  stores: [db, files],
-  secrets: [webhookSecret],
-  signals: [noteCreated],
-  channel: { templates: [noteCreatedMail] },
-}).adopt({ main, notes });
+// stores (store.sql/store.files) · secrets (vault.secret) · signals (signal())
+// · channel templates (channel.<medium>().template()) auto-register from
+// `./core` (and `./flows/notes/signals`) — no explicit arrays needed.
+// `./flows/generated` is a real file, regenerated by `oke dev` / `oke build`
+// from every `src/flows/<unit>/index.ts` folder — never edit it by hand.
+export const app = oke({ name: "notes" }).adopt(routes);
 
 export type App = typeof app;

package/templates/advanced/src/core/store.ts

@@ -1,5 +1,5 @@
 import { store } from "okengine";
-import * as schema from "../db/schema.decl";
+import * as schema from "@/db/schema.decl";
 
 /** App SQL store — tables from {@link schema}. */
 export const db = store.sql("app", { schema });

package/templates/advanced/src/flows/generated.ts

@@ -0,0 +1,4 @@
+// AUTO-GENERATED by `oke dev` / `oke build` — do not edit by hand.
+// Regenerated from every `src/flows/<unit>/index.ts` unit folder.
+export * as main from "./main/index.ts";
+export * as notes from "./notes/index.ts";

package/templates/advanced/src/flows/main/index.ts

@@ -4,9 +4,7 @@ import { z } from "zod";
 /** First-run welcome — visit :6530/ after `oke dev`. */
 export const root = on(
   http.get("/").gate(gate.public),
-  flow({
-    name: "main.root",
-    unit: "main",
+  flow("main.root", {
     out: z.object({
       ok: z.literal(true),
       app: z.string(),
@@ -25,9 +23,7 @@ export const root = on(
 /** Liveness for probes and `bun test`. */
 export const health = on(
   http.get("/health").gate(gate.public),
-  flow({
-    name: "main.health",
-    unit: "main",
+  flow("main.health", {
     out: z.object({ ok: z.literal(true) }),
     do: () => ({ ok: true as const }),
   }),

package/templates/advanced/src/flows/notes/index.ts

@@ -1,8 +1,8 @@
 import { on, flow, http, every, gate, fail } from "okengine";
 import { eq, isNull } from "drizzle-orm";
 
-import { db, files, noteCreatedMail, webhookSecret } from "../../core";
-import { notes } from "../../db/schema.decl";
+import { db, files, noteCreatedMail, webhookSecret } from "@/core";
+import { notes } from "@/db/schema.decl";
 import {
   NoteAttachIn,
   NoteAttachOut,
@@ -23,9 +23,7 @@ import "./signals";
 /** List active (non-archived) notes, newest first. */
 export const list = on(
   http.get("/notes").gate(gate.public),
-  flow({
-    name: "notes.list",
-    unit: "notes",
+  flow("notes.list", {
     out: NoteListOut,
     effects: { reads: ["sql:app"] },
     do: async (_input, fx) => {
@@ -47,9 +45,7 @@ export const list = on(
 /** Create a note, emit `note-created`, touch vault. */
 export const create = on(
   http.post("/notes").gate(gate.public),
-  flow({
-    name: "notes.create",
-    unit: "notes",
+  flow("notes.create", {
     in: NoteCreateIn,
     out: NoteOut,
     effects: {
@@ -84,9 +80,7 @@ export const create = on(
 /** Fetch one note by id. */
 export const get = on(
   http.get("/notes/:id").gate(gate.public),
-  flow({
-    name: "notes.get",
-    unit: "notes",
+  flow("notes.get", {
     in: NoteIdIn,
     out: NoteOut,
     errors: { NotFound },
@@ -108,9 +102,7 @@ export const get = on(
 /** Soft-archive a note. */
 export const archive = on(
   http.post("/notes/:id/archive").gate(gate.public),
-  flow({
-    name: "notes.archive",
-    unit: "notes",
+  flow("notes.archive", {
     in: NoteIdIn,
     out: NoteOut,
     errors: { NotFound },
@@ -138,9 +130,7 @@ export const archive = on(
 /** On create → send the note-created email template. */
 export const onCreated = on(
   noteCreated,
-  flow({
-    name: "notes.onCreated",
-    unit: "notes",
+  flow("notes.onCreated", {
     effects: { sends: ["note-created"] },
     do: async (payload, fx) => {
       await fx.send(noteCreatedMail, {
@@ -154,9 +144,7 @@ export const onCreated = on(
 /** Store a text attachment next to a note (`files:uploads`). */
 export const attach = on(
   http.post("/notes/:id/attach").gate(gate.public),
-  flow({
-    name: "notes.attach",
-    unit: "notes",
+  flow("notes.attach", {
     in: NoteAttachIn,
     out: NoteAttachOut,
     errors: { NotFound },
@@ -174,9 +162,7 @@ export const attach = on(
 /** Daily count of active notes (frozen under test drivers). */
 export const digest = on(
   every("1d"),
-  flow({
-    name: "notes.digest",
-    unit: "notes",
+  flow("notes.digest", {
     out: NoteDigestOut,
     effects: { reads: ["sql:app"] },
     do: async (_input, fx) => {
@@ -192,9 +178,7 @@ export const digest = on(
  */
 export const summarize = on(
   http.post("/notes/:id/summarize").gate(gate.public),
-  flow({
-    name: "notes.summarize",
-    unit: "notes",
+  flow("notes.summarize", {
     in: NoteSummarizeIn,
     out: NoteSummarizeOut,
     errors: { NotFound },

package/templates/advanced/tsconfig.json

@@ -6,6 +6,9 @@
     "moduleDetection": "force",
     "types": ["bun"],
     "moduleResolution": "bundler",
+    "paths": {
+      "@/*": ["./src/*"]
+    },
     "allowImportingTsExtensions": true,
     "verbatimModuleSyntax": true,
     "noEmit": true,

package/templates/standard/oke.config.ts

@@ -42,7 +42,6 @@ export default defineConfig({
       test: "frozen",
       prod: "postgres",
     },
-    // Durable-flow journal (durable: true runs) — shared + leased in docker/prod.
     journal: {
       local: "memory",
       docker: "postgres",
@@ -65,12 +64,16 @@ export default defineConfig({
     },
   },
   images: {
-    "store.sql": "postgres:18-alpine",
-    pgdog: "ghcr.io/pgdogdev/pgdog:v0.1.51",
-    "store.kv": "redis:8-alpine",
-    "store.files": "rustfs/rustfs:1.0.0-beta.11",
-    "channel.email": "axllent/mailpit:v1.22.3",
+    store: {
+      sql: "postgres:18-alpine",
+      kv: "redis:8-alpine",
+      files: "rustfs/rustfs:1.0.0-beta.11",
+    },
+    channel: {
+      email: "axllent/mailpit:v1.22.3",
+    },
     vault: "openbao/openbao:2.6.1",
+    pgdog: "ghcr.io/pgdogdev/pgdog:v0.1.51",
   },
   i18n: { locales: ["en", "ar"], default: "en", dir: { ar: "rtl" } },
 });

package/templates/standard/src/app.ts

@@ -1,18 +1,15 @@
-import { db, noteCreatedMail, webhookSecret } from "./core";
+import "./core";
 import "./locales/en";
 import "./locales/ar";
 
 import { oke } from "okengine";
-import * as main from "./flows/main";
-import * as notes from "./flows/notes";
-import { noteCreated } from "./flows/notes/signals";
+import * as routes from "./flows/generated";
 
-export const app = oke({
-  name: "notes",
-  stores: [db],
-  secrets: [webhookSecret],
-  signals: [noteCreated],
-  channel: { templates: [noteCreatedMail] },
-}).adopt({ main, notes });
+// stores (store.sql) · secrets (vault.secret) · signals (signal()) · channel
+// templates (channel.<medium>().template()) auto-register from `./core`
+// (and `./flows/notes/signals`) — no explicit arrays needed.
+// `./flows/generated` is a real file, regenerated by `oke dev` / `oke build`
+// from every `src/flows/<unit>/index.ts` folder — never edit it by hand.
+export const app = oke({ name: "notes" }).adopt(routes);
 
 export type App = typeof app;

package/templates/standard/src/core/store.ts

@@ -1,5 +1,5 @@
 import { store } from "okengine";
-import * as schema from "../db/schema.decl";
+import * as schema from "@/db/schema.decl";
 
 /** App SQL store — tables from {@link schema}. */
 export const db = store.sql("app", { schema });

package/templates/standard/src/flows/generated.ts

@@ -0,0 +1,4 @@
+// AUTO-GENERATED by `oke dev` / `oke build` — do not edit by hand.
+// Regenerated from every `src/flows/<unit>/index.ts` unit folder.
+export * as main from "./main/index.ts";
+export * as notes from "./notes/index.ts";

package/templates/standard/src/flows/main/index.ts

@@ -4,9 +4,7 @@ import { z } from "zod";
 /** First-run welcome — visit :6530/ after `oke dev`. */
 export const root = on(
   http.get("/").gate(gate.public),
-  flow({
-    name: "main.root",
-    unit: "main",
+  flow("main.root", {
     out: z.object({
       ok: z.literal(true),
       app: z.string(),
@@ -25,9 +23,7 @@ export const root = on(
 /** Liveness for probes and `bun test`. */
 export const health = on(
   http.get("/health").gate(gate.public),
-  flow({
-    name: "main.health",
-    unit: "main",
+  flow("main.health", {
     out: z.object({ ok: z.literal(true) }),
     do: () => ({ ok: true as const }),
   }),

package/templates/standard/src/flows/notes/index.ts

@@ -1,8 +1,8 @@
 import { on, flow, http, gate, fail } from "okengine";
 import { eq, isNull } from "drizzle-orm";
 
-import { db, noteCreatedMail, webhookSecret } from "../../core";
-import { notes } from "../../db/schema.decl";
+import { db, noteCreatedMail, webhookSecret } from "@/core";
+import { notes } from "@/db/schema.decl";
 import { NoteCreateIn, NoteIdIn, NoteListOut, NoteOut, NotFound } from "./shapes";
 import { noteCreated } from "./signals";
 
@@ -12,9 +12,7 @@ import "./signals";
 /** List active (non-archived) notes, newest first. */
 export const list = on(
   http.get("/notes").gate(gate.public),
-  flow({
-    name: "notes.list",
-    unit: "notes",
+  flow("notes.list", {
     out: NoteListOut,
     effects: { reads: ["sql:app"] },
     do: async (_input, fx) => {
@@ -36,9 +34,7 @@ export const list = on(
 /** Create a note, emit `note-created`, touch vault. */
 export const create = on(
   http.post("/notes").gate(gate.public),
-  flow({
-    name: "notes.create",
-    unit: "notes",
+  flow("notes.create", {
     in: NoteCreateIn,
     out: NoteOut,
     effects: {
@@ -73,9 +69,7 @@ export const create = on(
 /** Fetch one note by id. */
 export const get = on(
   http.get("/notes/:id").gate(gate.public),
-  flow({
-    name: "notes.get",
-    unit: "notes",
+  flow("notes.get", {
     in: NoteIdIn,
     out: NoteOut,
     errors: { NotFound },
@@ -97,9 +91,7 @@ export const get = on(
 /** Soft-archive a note. */
 export const archive = on(
   http.post("/notes/:id/archive").gate(gate.public),
-  flow({
-    name: "notes.archive",
-    unit: "notes",
+  flow("notes.archive", {
     in: NoteIdIn,
     out: NoteOut,
     errors: { NotFound },
@@ -127,9 +119,7 @@ export const archive = on(
 /** On create → send the note-created email template. */
 export const onCreated = on(
   noteCreated,
-  flow({
-    name: "notes.onCreated",
-    unit: "notes",
+  flow("notes.onCreated", {
     effects: { sends: ["note-created"] },
     do: async (payload, fx) => {
       await fx.send(noteCreatedMail, {

package/templates/standard/tsconfig.json

@@ -6,6 +6,9 @@
     "moduleDetection": "force",
     "types": ["bun"],
     "moduleResolution": "bundler",
+    "paths": {
+      "@/*": ["./src/*"]
+    },
     "allowImportingTsExtensions": true,
     "verbatimModuleSyntax": true,
     "noEmit": true,