create-m5kdev 0.33.0 → 0.34.0

package/templates/minimal-app/apps/server/drizzle/meta/_journal.json.tpl

@@ -22,6 +22,13 @@
       "when": 1786951360347,
       "tag": "0002_concerned_proudstar",
       "breakpoints": true
+    },
+    {
+      "idx": 3,
+      "version": "6",
+      "when": 1787145865079,
+      "tag": "0003_silly_the_liberteens",
+      "breakpoints": true
     }
   ]
-}
+}

package/templates/minimal-app/apps/server/drizzle.config.ts.tpl

@@ -1,33 +1,3 @@
-import * as dotenv from "dotenv";
-import { defineConfig } from "drizzle-kit";
-
-dotenv.config({ path: process.env.DRIZZLE_ENV_PATH || "../shared/.env" });
-
-const url = process.env.TURSO_DATABASE_URL || process.env.DATABASE_URL;
-const authToken = process.env.TURSO_AUTH_TOKEN;
-const schema = process.env.DRIZZLE_SCHEMA_PATH || "./src/schema.ts";
-
-if (!url) {
-  throw new Error("DATABASE_URL or TURSO_DATABASE_URL must be set");
-}
-
-export default defineConfig(
-  url && authToken
-    ? {
-        dialect: "turso",
-        schema,
-        out: "./drizzle",
-        dbCredentials: {
-          url,
-          authToken,
-        },
-      }
-    : {
-        dialect: "sqlite",
-        schema,
-        out: "./drizzle",
-        dbCredentials: {
-          url,
-        },
-      }
-);
+import { defineDrizzleKitConfig } from "@m5kdev/backend/db";
+
+export default defineDrizzleKitConfig({ schema: "./src/schema.ts" });

package/templates/minimal-app/apps/server/package.json.tpl

@@ -13,9 +13,9 @@
     "drizzle:generate": "drizzle-kit generate",
     "drizzle:migrate": "drizzle-kit migrate",
     "drizzle:studio": "drizzle-kit studio",
-    "drizzle:sync": "tsx --env-file=../shared/.env drizzle/sync.ts",
-    "drizzle:seed": "tsx --env-file=../shared/.env drizzle/seed.ts",
-    "drizzle:reset": "tsx --env-file=../shared/.env drizzle/reset.ts"
+    "drizzle:sync": "tsx --env-file=../shared/.env db.ts sync",
+    "drizzle:seed": "tsx --env-file=../shared/.env db.ts seed",
+    "drizzle:reset": "tsx --env-file=../shared/.env db.ts reset"
   },
   "dependencies": {
     "{{PACKAGE_SCOPE}}/email": "workspace:*",
@@ -23,6 +23,8 @@
     "@libsql/client": "catalog:m5kdev",
     "@m5kdev/backend": "catalog:m5kdev",
     "@m5kdev/commons": "catalog:m5kdev",
+    "@mastra/core": "catalog:m5kdev",
+    "@openrouter/ai-sdk-provider": "catalog:m5kdev",
     "@opentelemetry/api": "catalog:m5kdev",
     "@trpc/server": "catalog:m5kdev",
     "better-auth": "catalog:m5kdev",

package/templates/minimal-app/apps/server/src/app.ts.tpl

@@ -1,10 +1,21 @@
 import { createBackendApp } from "@m5kdev/backend/app";
 import { shutdownTelemetry } from "@m5kdev/backend/lib/otel";
+// m5k:ai:start
+import { AIModule } from "@m5kdev/backend/modules/ai/ai.module";
+// m5k:ai:end
 import { createBetterAuth } from "@m5kdev/backend/modules/auth/auth.lib";
 import { AuthModule } from "@m5kdev/backend/modules/auth/auth.module";
 import { EmailModule } from "@m5kdev/backend/modules/email/email.module";
 import { EmailPreviewModule } from "@m5kdev/backend/modules/email/email.preview.module";
+// m5k:files:start
+import { FileModule } from "@m5kdev/backend/modules/file/file.module";
+// m5k:files:end
+// m5k:notifications:start
+import { NotificationModule } from "@m5kdev/backend/modules/notification/notification.module";
+// m5k:notifications:end
+// m5k:workflows:start
 import { WorkflowModule } from "@m5kdev/backend/modules/workflow/workflow.module";
+// m5k:workflows:end
 import { templates } from "{{PACKAGE_SCOPE}}/email";
 import { emailResources } from "{{PACKAGE_SCOPE}}/email/resources";
 import {
@@ -12,6 +23,12 @@ import {
   APP_NAME,
   APP_ROLES_CONFIG,
 } from "{{PACKAGE_SCOPE}}/shared/modules/app/app.constants";
+// m5k:ai:start
+import { mastra, openrouter } from "./modules/conversation/conversation.mastra";
+// m5k:ai:end
+// m5k:workflows:start
+import { DemoWorkflowModule } from "./modules/demo-workflow/demo-workflow.module";
+// m5k:workflows:end
 import { PostsModule } from "./modules/posts/posts.module";
 // m5k:test-harness:start
 import { TestHarnessModule } from "./modules/test-harness/test-harness.module";
@@ -23,7 +40,9 @@ const serverUrl = process.env.VITE_SERVER_URL ?? "http://localhost:8080";
 const databaseUrl = process.env.DATABASE_URL ?? "file:./local.db";
 const syncUrl = process.env.TURSO_DATABASE_URL;
 const authToken = process.env.TURSO_AUTH_TOKEN;
+// m5k:workflows:start
 const redisUrl = process.env.REDIS_URL ?? "redis://127.0.0.1:6379";
+// m5k:workflows:end
 const resendApiKey = process.env.RESEND_API_KEY;
 const enableWaitlist = process.env.VITE_ENABLE_WAITLIST === "true";
 
@@ -57,10 +76,13 @@ export const builtBackendApp = createBackendApp(
     i18n: {
       resources: emailResources,
     },
+    spa: { root: "./client" },
+    // m5k:workflows:start
     redis: {
       url: redisUrl,
       options: { maxRetriesPerRequest: null },
     },
+    // m5k:workflows:end
     resend: resendApiKey ? { apiKey: resendApiKey } : undefined,
     email: {
       mode: resendApiKey ? "send" : "store",
@@ -93,6 +115,15 @@ export const builtBackendApp = createBackendApp(
   [
     new EmailModule(templates as never),
     new AuthModule(),
+    // m5k:ai:start
+    new AIModule({
+      libs: { mastra, openrouter },
+    }),
+    // m5k:ai:end
+    // m5k:files:start
+    new FileModule(),
+    // m5k:files:end
+    // m5k:workflows:start
     new WorkflowModule({
       queues: {
         fast: { concurrency: 5 },
@@ -104,6 +135,11 @@ export const builtBackendApp = createBackendApp(
       },
       reconcile: { enabled: true },
     }),
+    new DemoWorkflowModule(),
+    // m5k:workflows:end
+    // m5k:notifications:start
+    new NotificationModule(),
+    // m5k:notifications:end
     new PostsModule(),
     new EmailPreviewModule({ allowDelete: process.env.NODE_ENV !== "production" }),
     // m5k:test-harness:start

package/templates/minimal-app/apps/server/src/modules/conversation/conversation.mastra.ts.tpl

@@ -0,0 +1,26 @@
+import { Mastra } from "@mastra/core";
+import { Agent } from "@mastra/core/agent";
+import { createOpenRouter } from "@openrouter/ai-sdk-provider";
+import { STARTER_ASSISTANT_AGENT_ID } from "{{PACKAGE_SCOPE}}/shared/modules/conversation/conversation.constants";
+
+/** Cheap OpenRouter chat model for the starter Conversation example. */
+const STARTER_CHAT_MODEL = "google/gemini-2.5-flash";
+
+export const openrouter = createOpenRouter({
+  apiKey: process.env.OPENROUTER_API_KEY ?? "",
+});
+
+const assistant = new Agent({
+  id: STARTER_ASSISTANT_AGENT_ID,
+  name: "Assistant",
+  instructions: "You are a helpful assistant for this starter app. Keep answers concise.",
+  model: openrouter.chat(STARTER_CHAT_MODEL, {
+    usage: { include: true },
+  }),
+});
+
+export const mastra = new Mastra({
+  agents: {
+    [STARTER_ASSISTANT_AGENT_ID]: assistant,
+  },
+});

package/templates/minimal-app/apps/server/src/modules/demo-workflow/demo-workflow.module.ts.tpl

@@ -0,0 +1,47 @@
+import { createBackendRouterMap } from "@m5kdev/backend/app";
+import {
+  BaseModule,
+  type ModuleServicesContext,
+  type ModuleTRPCContext,
+  type TableMap,
+} from "@m5kdev/backend/modules/base/base.module";
+import type { WorkflowModule } from "@m5kdev/backend/modules/workflow/workflow.module";
+import { DemoWorkflowService } from "./demo-workflow.service";
+import { createDemoWorkflowTRPC } from "./demo-workflow.trpc";
+
+type DemoWorkflowModuleDeps = { workflow: WorkflowModule };
+type DemoWorkflowModuleServices = {
+  demoWorkflow: DemoWorkflowService;
+};
+type DemoWorkflowModuleRouters = {
+  demoWorkflow: ReturnType<typeof createDemoWorkflowTRPC>;
+};
+
+export class DemoWorkflowModule extends BaseModule<
+  DemoWorkflowModuleDeps,
+  TableMap,
+  Record<string, never>,
+  DemoWorkflowModuleServices,
+  DemoWorkflowModuleRouters
+> {
+  readonly id = "demo-workflow";
+  override readonly dependsOn = ["workflow"] as const;
+
+  override services({
+    deps,
+  }: ModuleServicesContext<DemoWorkflowModuleDeps, Record<string, never>>) {
+    return {
+      demoWorkflow: new DemoWorkflowService({ workflow: deps.workflow.services.workflow }),
+    };
+  }
+
+  override trpc({
+    trpc,
+    services,
+  }: ModuleTRPCContext<DemoWorkflowModuleDeps, DemoWorkflowModuleServices>) {
+    return createBackendRouterMap(
+      "demoWorkflow",
+      createDemoWorkflowTRPC(trpc, services.demoWorkflow)
+    );
+  }
+}

package/templates/minimal-app/apps/server/src/modules/demo-workflow/demo-workflow.service.ts.tpl

@@ -0,0 +1,43 @@
+import type { ServerResultAsync } from "@m5kdev/backend/modules/base/base.dto";
+import { BaseService } from "@m5kdev/backend/modules/base/base.service";
+import type { WorkflowService } from "@m5kdev/backend/modules/workflow/workflow.service";
+import type { FireAndForgetJobDefinition } from "@m5kdev/backend/modules/workflow/workflow.types";
+import type { Context } from "@m5kdev/backend/utils/trpc";
+import { workflowTriggerOutputSchema } from "@m5kdev/commons/modules/workflow/workflow.schema";
+import { ok } from "neverthrow";
+
+const DEMO_PING_JOB_NAME = "demo.ping";
+
+interface DemoPingJobPayload {
+  readonly userId: string;
+}
+
+export class DemoWorkflowService extends BaseService<
+  Record<string, never>,
+  { workflow: WorkflowService },
+  Context
+> {
+  readonly demoPingJob: FireAndForgetJobDefinition<DemoPingJobPayload>;
+
+  constructor(services: { workflow: WorkflowService }) {
+    super({}, services);
+
+    this.demoPingJob = this.service.workflow
+      .job<DemoPingJobPayload>({
+        name: DEMO_PING_JOB_NAME,
+        queue: "fast",
+        meta: (payload) => ({ userId: payload.userId }),
+      })
+      .handle(async () => {
+        // Completes immediately so the Starter webapp can observe a finished run.
+      });
+  }
+
+  readonly runDemo = this.procedure("runDemo")
+    .output(workflowTriggerOutputSchema)
+    .requireAuth()
+    .handle(async ({ ctx }): ServerResultAsync<{ jobId: string }> => {
+      const jobId = await this.demoPingJob.trigger({ userId: ctx.actor.userId });
+      return ok({ jobId });
+    });
+}

package/templates/minimal-app/apps/server/src/modules/demo-workflow/demo-workflow.trpc.ts.tpl

@@ -0,0 +1,16 @@
+import { handleTRPCResult, type TRPCMethods } from "@m5kdev/backend/utils/trpc";
+import { workflowTriggerOutputSchema } from "@m5kdev/commons/modules/workflow/workflow.schema";
+import type { DemoWorkflowService } from "./demo-workflow.service";
+
+export function createDemoWorkflowTRPC(
+  { router, privateProcedure }: TRPCMethods,
+  demoWorkflowService: DemoWorkflowService
+) {
+  return router({
+    run: privateProcedure
+      .output(workflowTriggerOutputSchema)
+      .mutation(async ({ ctx }) =>
+        handleTRPCResult(await demoWorkflowService.runDemo(undefined, ctx))
+      ),
+  });
+}

package/templates/minimal-app/apps/server/src/modules/posts/posts.db.ts.tpl

@@ -1,28 +1,28 @@
-import { members, organizations, teams, users } from "@m5kdev/backend/modules/auth/auth.db";
-import { integer, sqliteTable as table, text } from "drizzle-orm/sqlite-core";
-import { v4 as uuidv4 } from "uuid";
-
-export const posts = table("posts", {
-  id: text("id").primaryKey().$default(uuidv4),
-  authorUserId: text("author_user_id").references(() => users.id, {
-    onDelete: "set null",
-  }),
-  memberId: text("member_id").references(() => members.id, {
-    onDelete: "set null",
-  }),
-  organizationId: text("organization_id").references(() => organizations.id, {
-    onDelete: "set null",
-  }),
-  teamId: text("team_id").references(() => teams.id, { onDelete: "set null" }),
-  title: text("title").notNull(),
-  slug: text("slug").notNull().unique(),
-  excerpt: text("excerpt"),
-  content: text("content").notNull(),
-  status: text("status").$type<"draft" | "published">().notNull().default("draft"),
-  publishedAt: integer("published_at", { mode: "timestamp" }),
-  createdAt: integer("created_at", { mode: "timestamp" })
-    .notNull()
-    .$default(() => new Date()),
-  updatedAt: integer("updated_at", { mode: "timestamp" }),
-  deletedAt: integer("deleted_at", { mode: "timestamp" }),
-});
+import { members, organizations, teams, users } from "@m5kdev/backend/modules/auth/auth.db";
+import { integer, sqliteTable as table, text } from "drizzle-orm/sqlite-core";
+import { v4 as uuidv4 } from "uuid";
+
+export const posts = table("posts", {
+  id: text("id").primaryKey().$default(uuidv4),
+  authorUserId: text("author_user_id").references(() => users.id, {
+    onDelete: "set null",
+  }),
+  memberId: text("member_id").references(() => members.id, {
+    onDelete: "set null",
+  }),
+  organizationId: text("organization_id").references(() => organizations.id, {
+    onDelete: "set null",
+  }),
+  teamId: text("team_id").references(() => teams.id, { onDelete: "set null" }),
+  title: text("title").notNull(),
+  slug: text("slug").notNull().unique(),
+  excerpt: text("excerpt"),
+  content: text("content").notNull(),
+  status: text("status").$type<"draft" | "published">().notNull().default("draft"),
+  publishedAt: integer("published_at", { mode: "timestamp" }),
+  createdAt: integer("created_at", { mode: "timestamp" })
+    .notNull()
+    .$default(() => new Date()),
+  updatedAt: integer("updated_at", { mode: "timestamp" }),
+  deletedAt: integer("deleted_at", { mode: "timestamp" }),
+});

package/templates/minimal-app/apps/server/src/modules/posts/posts.grants.ts.tpl

@@ -1,28 +1,28 @@
-import { flattenNestedGrants } from "@m5kdev/backend/modules/base/base.grants";
-
-export const postsGrants = flattenNestedGrants({
-  cash: {
-    user: {
-      admin: {
-        read: "all",
-        write: "all",
-        delete: "all",
-        publish: "all",
-      },
-    },
-    organization: {
-      owner: {
-        read: "org",
-        write: "org",
-        delete: "org",
-        publish: "org",
-      },
-      member: {
-        read: "own",
-        write: "own",
-        delete: "own",
-        publish: "own",
-      },
-    },
-  },
-});
+import { flattenNestedGrants } from "@m5kdev/backend/modules/base/base.grants";
+
+export const postsGrants = flattenNestedGrants({
+  cash: {
+    user: {
+      admin: {
+        read: "all",
+        write: "all",
+        delete: "all",
+        publish: "all",
+      },
+    },
+    organization: {
+      owner: {
+        read: "org",
+        write: "org",
+        delete: "org",
+        publish: "org",
+      },
+      member: {
+        read: "own",
+        write: "own",
+        delete: "own",
+        publish: "own",
+      },
+    },
+  },
+});

package/templates/minimal-app/apps/server/src/modules/posts/posts.module.ts.tpl

@@ -1,54 +1,54 @@
-import { createBackendRouterMap } from "@m5kdev/backend/app";
-import {
-  BaseModule,
-  type ModuleRepositoriesContext,
-  type ModuleServicesContext,
-  type ModuleTRPCContext,
-} from "@m5kdev/backend/modules/base/base.module";
-import type * as postsTables from "./posts.db";
-import { postsGrants } from "./posts.grants";
-import { PostsRepository } from "./posts.repository";
-import { PostsService } from "./posts.service";
-import { createPostsTRPC } from "./posts.trpc";
-
-type PostsModuleTables = typeof postsTables;
-type PostsModuleRepositories = {
-  posts: PostsRepository;
-};
-type PostsModuleServices = {
-  posts: PostsService;
-};
-type PostsModuleRouters = {
-  posts: ReturnType<typeof createPostsTRPC>;
-};
-
-export class PostsModule extends BaseModule<
-  never,
-  PostsModuleTables,
-  PostsModuleRepositories,
-  PostsModuleServices,
-  PostsModuleRouters
-> {
-  readonly id = "posts";
-  override readonly dbDependsOn = ["auth"] as const;
-
-  override repositories({ db }: ModuleRepositoriesContext<never, PostsModuleTables>) {
-    return {
-      posts: new PostsRepository({
-        orm: db.orm,
-        schema: db.schema,
-        table: db.schema.posts,
-      }),
-    };
-  }
-
-  override services({ repositories }: ModuleServicesContext<never, PostsModuleRepositories>) {
-    return {
-      posts: new PostsService({ posts: repositories.posts }, {}, postsGrants),
-    };
-  }
-
-  override trpc({ trpc, services }: ModuleTRPCContext<never, PostsModuleServices>) {
-    return createBackendRouterMap("posts", createPostsTRPC(trpc, services.posts));
-  }
-}
+import { createBackendRouterMap } from "@m5kdev/backend/app";
+import {
+  BaseModule,
+  type ModuleRepositoriesContext,
+  type ModuleServicesContext,
+  type ModuleTRPCContext,
+} from "@m5kdev/backend/modules/base/base.module";
+import type * as postsTables from "./posts.db";
+import { postsGrants } from "./posts.grants";
+import { PostsRepository } from "./posts.repository";
+import { PostsService } from "./posts.service";
+import { createPostsTRPC } from "./posts.trpc";
+
+type PostsModuleTables = typeof postsTables;
+type PostsModuleRepositories = {
+  posts: PostsRepository;
+};
+type PostsModuleServices = {
+  posts: PostsService;
+};
+type PostsModuleRouters = {
+  posts: ReturnType<typeof createPostsTRPC>;
+};
+
+export class PostsModule extends BaseModule<
+  never,
+  PostsModuleTables,
+  PostsModuleRepositories,
+  PostsModuleServices,
+  PostsModuleRouters
+> {
+  readonly id = "posts";
+  override readonly dbDependsOn = ["auth"] as const;
+
+  override repositories({ db }: ModuleRepositoriesContext<never, PostsModuleTables>) {
+    return {
+      posts: new PostsRepository({
+        orm: db.orm,
+        schema: db.schema,
+        table: db.schema.posts,
+      }),
+    };
+  }
+
+  override services({ repositories }: ModuleServicesContext<never, PostsModuleRepositories>) {
+    return {
+      posts: new PostsService({ posts: repositories.posts }, {}, postsGrants),
+    };
+  }
+
+  override trpc({ trpc, services }: ModuleTRPCContext<never, PostsModuleServices>) {
+    return createBackendRouterMap("posts", createPostsTRPC(trpc, services.posts));
+  }
+}

package/templates/minimal-app/apps/server/src/modules/posts/posts.repository.ts.tpl

@@ -1,67 +1,67 @@
-import { BaseTableRepository } from "@m5kdev/backend/modules/base/base.repository";
-
-import { and, eq, isNull, ne } from "drizzle-orm";
-import type { LibSQLDatabase } from "drizzle-orm/libsql";
-import { err, ok } from "neverthrow";
-import { z } from "zod";
-import { posts } from "./posts.db";
-import { postSchemas } from "./posts.dto";
-
-const schema = { posts };
-type Schema = typeof schema;
-type Orm = LibSQLDatabase<Schema>;
-
-export class PostsRepository extends BaseTableRepository<
-  Orm,
-  Schema,
-  Record<string, never>,
-  Schema["posts"]
-> {
-  findBySlug = this.query("findBySlug")
-    .input(
-      z.object({
-        slug: z.string(),
-        excludeId: z.string().optional(),
-      })
-    )
-    .output(postSchemas.output.found)
-    .handle(async ({ excludeId, slug }) => {
-      const whereClause = excludeId
-        ? and(eq(this.table.slug, slug), ne(this.table.id, excludeId), isNull(this.table.deletedAt))
-        : and(eq(this.table.slug, slug), isNull(this.table.deletedAt));
-
-      const result = await this.throwableQuery(() =>
-        this.orm.select().from(this.table).where(whereClause).limit(1)
-      );
-      if (result.isErr()) return err(result.error);
-      const [row] = result.value;
-      return ok(row);
-    });
-
-  resolveUniqueSlug = this.query("resolveUniqueSlug")
-    .input(
-      z.object({
-        candidate: z.string(),
-        excludeId: z.string().optional(),
-      })
-    )
-    .output(z.string())
-    .handle(async ({ candidate, excludeId }) => {
-      let slug = candidate;
-      let suffix = 2;
-
-      while (true) {
-        const existing = await this.findBySlug({ slug, excludeId });
-        if (existing.isErr()) {
-          return err(existing.error);
-        }
-
-        if (!existing.value) {
-          return ok(slug);
-        }
-
-        slug = `${candidate}-${suffix}`;
-        suffix += 1;
-      }
-    });
-}
+import { BaseTableRepository } from "@m5kdev/backend/modules/base/base.repository";
+
+import { and, eq, isNull, ne } from "drizzle-orm";
+import type { LibSQLDatabase } from "drizzle-orm/libsql";
+import { err, ok } from "neverthrow";
+import { z } from "zod";
+import { posts } from "./posts.db";
+import { postSchemas } from "./posts.dto";
+
+const schema = { posts };
+type Schema = typeof schema;
+type Orm = LibSQLDatabase<Schema>;
+
+export class PostsRepository extends BaseTableRepository<
+  Orm,
+  Schema,
+  Record<string, never>,
+  Schema["posts"]
+> {
+  findBySlug = this.query("findBySlug")
+    .input(
+      z.object({
+        slug: z.string(),
+        excludeId: z.string().optional(),
+      })
+    )
+    .output(postSchemas.output.found)
+    .handle(async ({ excludeId, slug }) => {
+      const whereClause = excludeId
+        ? and(eq(this.table.slug, slug), ne(this.table.id, excludeId), isNull(this.table.deletedAt))
+        : and(eq(this.table.slug, slug), isNull(this.table.deletedAt));
+
+      const result = await this.throwableQuery(() =>
+        this.orm.select().from(this.table).where(whereClause).limit(1)
+      );
+      if (result.isErr()) return err(result.error);
+      const [row] = result.value;
+      return ok(row);
+    });
+
+  resolveUniqueSlug = this.query("resolveUniqueSlug")
+    .input(
+      z.object({
+        candidate: z.string(),
+        excludeId: z.string().optional(),
+      })
+    )
+    .output(z.string())
+    .handle(async ({ candidate, excludeId }) => {
+      let slug = candidate;
+      let suffix = 2;
+
+      while (true) {
+        const existing = await this.findBySlug({ slug, excludeId });
+        if (existing.isErr()) {
+          return err(existing.error);
+        }
+
+        if (!existing.value) {
+          return ok(slug);
+        }
+
+        slug = `${candidate}-${suffix}`;
+        suffix += 1;
+      }
+    });
+}