create-cronus-stack 0.6.1 → 0.6.3

package/dist/scaffold.js

@@ -148,7 +148,7 @@ function packageJson(projectName, config) {
         add(devDeps, "drizzle-kit", "^0.31.10");
         switch (single(config, "database")) {
             case "db-sqlite":
-                add(deps, "better-sqlite3", "^13.0.3");
+                add(deps, "better-sqlite3", "^12.0.0");
                 add(devDeps, "@types/better-sqlite3", "^9.6.0");
                 break;
             case "db-postgres":
@@ -311,19 +311,95 @@ export default function RootLayout({ children }: { children: ReactNode }) {
 }
 `;
 }
-function pageTsx() {
+function fromAppImport(config, target) {
+    return usesImportAlias(config) ? `@/${target}` : `../${target}`;
+}
+function pageStatusCopy(config) {
+    if (emitsBetterAuth(config) && emitsDrizzle(config)) {
+        return `          {session ? (
+            <p className="max-w-prose text-fg-secondary">
+              Signed in as {session.user?.email}. {itemCount} items in the active workspace.
+            </p>
+          ) : (
+            <p className="max-w-prose text-fg-secondary">
+              Sign in required on this stack. Middleware redirects unsigned-in visitors to /login.
+            </p>
+          )}`;
+    }
+    if (emitsDrizzle(config)) {
+        return `          <p className="max-w-prose text-fg-secondary">
+            {itemCount} items in the database. Read KICKOFF.md before changing frameworks,
+            databases, auth, payments, or design-system rules.
+          </p>`;
+    }
+    return `          <p className="max-w-prose text-fg-secondary">
+            This app was scaffolded from the Cronus Stack Builder. Read KICKOFF.md before changing
+            frameworks, databases, auth, payments, or design-system rules.
+          </p>`;
+}
+function pageTsx(config) {
+    const withDrizzle = emitsDrizzle(config);
+    const withAuth = emitsBetterAuth(config);
+    const extraImports = [
+        withDrizzle && withAuth
+            ? 'import { count, eq } from "drizzle-orm";'
+            : withDrizzle
+                ? 'import { count } from "drizzle-orm";'
+                : undefined,
+        withAuth ? 'import { headers } from "next/headers";' : undefined,
+        withDrizzle ? `import { db } from "${fromAppImport(config, "db")}";` : undefined,
+        withDrizzle && withAuth
+            ? `import { items, member } from "${fromAppImport(config, "db/schema")}";`
+            : withDrizzle
+                ? `import { items } from "${fromAppImport(config, "db/schema")}";`
+                : undefined,
+        withAuth ? `import { auth } from "${fromAppImport(config, "lib/auth")}";` : undefined,
+    ]
+        .filter((line) => line !== undefined)
+        .join("\n");
+    const asyncKw = withDrizzle || withAuth ? "async " : "";
+    let loader = "";
+    if (withDrizzle && withAuth) {
+        loader = `  const session = await auth.api.getSession({ headers: await headers() });
+  let orgId = session?.session?.activeOrganizationId ?? null;
+  if (!orgId && session?.user?.id) {
+    const [row] = await db
+      .select({ organizationId: member.organizationId })
+      .from(member)
+      .where(eq(member.userId, session.user.id))
+      .limit(1);
+    orgId = row?.organizationId ?? null;
+  }
+  const [itemRow] = orgId
+    ? await db.select({ value: count() }).from(items).where(eq(items.workspaceId, orgId))
+    : [{ value: 0 }];
+  const itemCount = new Intl.NumberFormat("en-US").format(Number(itemRow?.value ?? 0));
+
+`;
+    }
+    else if (withDrizzle) {
+        loader = `  const [itemRow] = await db.select({ value: count() }).from(items);
+  const itemCount = new Intl.NumberFormat("en-US").format(Number(itemRow?.value ?? 0));
+
+`;
+    }
+    else if (withAuth) {
+        loader = `  const session = await auth.api.getSession({ headers: await headers() });
+
+`;
+    }
     return `import { Badge } from "@cronus-ui/ui/badge";
 import { Button } from "@cronus-ui/ui/button";
 import { Card, CardContent, CardDescription, CardHeader, CardTitle } from "@cronus-ui/ui/card";
-
+${extraImports ? `${extraImports}\n` : ""}
 const metrics = [
   { label: "Revenue", value: "R$ 48.2k" },
   { label: "Active users", value: "2,318" },
   { label: "NPS", value: "72" },
 ];
 
-export default function Page() {
-  return (
+export default ${asyncKw}function Page() {
+${loader}  return (
     <main className="mx-auto flex min-h-screen w-full max-w-5xl flex-col gap-8 px-6 py-12">
       <header className="flex flex-col gap-4">
         <Badge variant="primary" className="w-fit">
@@ -331,10 +407,7 @@ export default function Page() {
         </Badge>
         <div className="flex flex-col gap-3">
           <h1 className="text-4xl font-semibold tracking-tight text-fg">Your stack is ready</h1>
-          <p className="max-w-prose text-fg-secondary">
-            This app was scaffolded from the Cronus Stack Builder. Read KICKOFF.md before changing
-            frameworks, databases, auth, payments, or design-system rules.
-          </p>
+${pageStatusCopy(config)}
         </div>
         <div className="flex flex-wrap gap-3">
           <Button variant="primary">Start building</Button>
@@ -505,6 +578,23 @@ function kitSkillsFromConfig(config) {
 function drizzleConfig(config) {
     const dialect = sqlDialect(config) ?? "sqlite";
     const fallback = defaultDatabaseUrl(config) ?? "file:./data/app.db";
+    if (dialect === "sqlite") {
+        return `import { mkdirSync } from "node:fs";
+import { dirname } from "node:path";
+import { defineConfig } from "drizzle-kit";
+
+const url = process.env.DATABASE_URL ?? "${fallback}";
+const fileFromUrl = url.startsWith("file:") ? url.slice("file:".length) : url;
+mkdirSync(dirname(fileFromUrl) || ".", { recursive: true });
+
+export default defineConfig({
+  dialect: "sqlite",
+  schema: "./${dbDir(config)}/schema.ts",
+  out: "./drizzle",
+  dbCredentials: { url },
+});
+`;
+    }
     return `import { defineConfig } from "drizzle-kit";
 
 export default defineConfig({
@@ -535,6 +625,7 @@ export const session = sqliteTable("session", {
   updatedAt: integer("updated_at", { mode: "timestamp" }).notNull(),
   ipAddress: text("ip_address"),
   userAgent: text("user_agent"),
+  activeOrganizationId: text("active_organization_id"),
   userId: text("user_id")
     .notNull()
     .references(() => user.id, { onDelete: "cascade" }),
@@ -567,6 +658,42 @@ export const verification = sqliteTable("verification", {
   createdAt: integer("created_at", { mode: "timestamp" }),
   updatedAt: integer("updated_at", { mode: "timestamp" }),
 });
+
+export const organization = sqliteTable("organization", {
+  id: text("id").primaryKey(),
+  name: text("name").notNull(),
+  slug: text("slug").notNull().unique(),
+  logo: text("logo"),
+  metadata: text("metadata"),
+  createdAt: integer("created_at", { mode: "timestamp" }).notNull(),
+});
+
+export const member = sqliteTable("member", {
+  id: text("id").primaryKey(),
+  organizationId: text("organization_id")
+    .notNull()
+    .references(() => organization.id, { onDelete: "cascade" }),
+  userId: text("user_id")
+    .notNull()
+    .references(() => user.id, { onDelete: "cascade" }),
+  role: text("role").notNull(),
+  createdAt: integer("created_at", { mode: "timestamp" }).notNull(),
+});
+
+export const invitation = sqliteTable("invitation", {
+  id: text("id").primaryKey(),
+  organizationId: text("organization_id")
+    .notNull()
+    .references(() => organization.id, { onDelete: "cascade" }),
+  email: text("email").notNull(),
+  role: text("role"),
+  status: text("status").notNull(),
+  expiresAt: integer("expires_at", { mode: "timestamp" }).notNull(),
+  createdAt: integer("created_at", { mode: "timestamp" }).notNull(),
+  inviterId: text("inviter_id")
+    .notNull()
+    .references(() => user.id, { onDelete: "cascade" }),
+});
 `;
 }
 function pgAuthTables() {
@@ -589,6 +716,7 @@ export const session = pgTable("session", {
   updatedAt: timestamp("updated_at").notNull(),
   ipAddress: text("ip_address"),
   userAgent: text("user_agent"),
+  activeOrganizationId: text("active_organization_id"),
   userId: text("user_id")
     .notNull()
     .references(() => user.id, { onDelete: "cascade" }),
@@ -621,6 +749,42 @@ export const verification = pgTable("verification", {
   createdAt: timestamp("created_at"),
   updatedAt: timestamp("updated_at"),
 });
+
+export const organization = pgTable("organization", {
+  id: text("id").primaryKey(),
+  name: text("name").notNull(),
+  slug: text("slug").notNull().unique(),
+  logo: text("logo"),
+  metadata: text("metadata"),
+  createdAt: timestamp("created_at").notNull(),
+});
+
+export const member = pgTable("member", {
+  id: text("id").primaryKey(),
+  organizationId: text("organization_id")
+    .notNull()
+    .references(() => organization.id, { onDelete: "cascade" }),
+  userId: text("user_id")
+    .notNull()
+    .references(() => user.id, { onDelete: "cascade" }),
+  role: text("role").notNull(),
+  createdAt: timestamp("created_at").notNull(),
+});
+
+export const invitation = pgTable("invitation", {
+  id: text("id").primaryKey(),
+  organizationId: text("organization_id")
+    .notNull()
+    .references(() => organization.id, { onDelete: "cascade" }),
+  email: text("email").notNull(),
+  role: text("role"),
+  status: text("status").notNull(),
+  expiresAt: timestamp("expires_at").notNull(),
+  createdAt: timestamp("created_at").notNull(),
+  inviterId: text("inviter_id")
+    .notNull()
+    .references(() => user.id, { onDelete: "cascade" }),
+});
 `;
 }
 function mysqlAuthTables() {
@@ -643,6 +807,7 @@ export const session = mysqlTable("session", {
   updatedAt: timestamp("updated_at").notNull(),
   ipAddress: text("ip_address"),
   userAgent: text("user_agent"),
+  activeOrganizationId: varchar("active_organization_id", { length: 36 }),
   userId: varchar("user_id", { length: 36 })
     .notNull()
     .references(() => user.id, { onDelete: "cascade" }),
@@ -675,6 +840,42 @@ export const verification = mysqlTable("verification", {
   createdAt: timestamp("created_at"),
   updatedAt: timestamp("updated_at"),
 });
+
+export const organization = mysqlTable("organization", {
+  id: varchar("id", { length: 36 }).primaryKey(),
+  name: varchar("name", { length: 255 }).notNull(),
+  slug: varchar("slug", { length: 255 }).notNull().unique(),
+  logo: text("logo"),
+  metadata: text("metadata"),
+  createdAt: timestamp("created_at").notNull(),
+});
+
+export const member = mysqlTable("member", {
+  id: varchar("id", { length: 36 }).primaryKey(),
+  organizationId: varchar("organization_id", { length: 36 })
+    .notNull()
+    .references(() => organization.id, { onDelete: "cascade" }),
+  userId: varchar("user_id", { length: 36 })
+    .notNull()
+    .references(() => user.id, { onDelete: "cascade" }),
+  role: varchar("role", { length: 255 }).notNull(),
+  createdAt: timestamp("created_at").notNull(),
+});
+
+export const invitation = mysqlTable("invitation", {
+  id: varchar("id", { length: 36 }).primaryKey(),
+  organizationId: varchar("organization_id", { length: 36 })
+    .notNull()
+    .references(() => organization.id, { onDelete: "cascade" }),
+  email: varchar("email", { length: 255 }).notNull(),
+  role: varchar("role", { length: 255 }),
+  status: varchar("status", { length: 255 }).notNull(),
+  expiresAt: timestamp("expires_at").notNull(),
+  createdAt: timestamp("created_at").notNull(),
+  inviterId: varchar("inviter_id", { length: 36 })
+    .notNull()
+    .references(() => user.id, { onDelete: "cascade" }),
+});
 `;
 }
 function drizzleSchema(config) {
@@ -684,34 +885,44 @@ function drizzleSchema(config) {
             const imports = withAuth
                 ? 'import { boolean, integer, pgTable, text, timestamp } from "drizzle-orm/pg-core";'
                 : 'import { integer, pgTable, text } from "drizzle-orm/pg-core";';
+            const workspaceCol = withAuth
+                ? `\n  workspaceId: text("workspace_id").references(() => organization.id, { onDelete: "cascade" }),`
+                : "";
             return `${imports}
-
+${withAuth ? pgAuthTables() : ""}
 export const items = pgTable("items", {
   id: integer("id").primaryKey().generatedAlwaysAsIdentity(),
-  title: text("title").notNull(),
+  title: text("title").notNull(),${workspaceCol}
 });
-${withAuth ? pgAuthTables() : ""}`;
+`;
         }
         case "mysql": {
             const imports = withAuth
                 ? 'import { boolean, int, mysqlTable, text, timestamp, varchar } from "drizzle-orm/mysql-core";'
                 : 'import { int, mysqlTable, varchar } from "drizzle-orm/mysql-core";';
+            const workspaceCol = withAuth
+                ? `\n  workspaceId: varchar("workspace_id", { length: 36 }).references(() => organization.id, { onDelete: "cascade" }),`
+                : "";
             return `${imports}
-
+${withAuth ? mysqlAuthTables() : ""}
 export const items = mysqlTable("items", {
   id: int("id").autoincrement().primaryKey(),
-  title: varchar("title", { length: 255 }).notNull(),
+  title: varchar("title", { length: 255 }).notNull(),${workspaceCol}
 });
-${withAuth ? mysqlAuthTables() : ""}`;
+`;
         }
-        default:
+        default: {
+            const workspaceCol = withAuth
+                ? `\n  workspaceId: text("workspace_id").references(() => organization.id, { onDelete: "cascade" }),`
+                : "";
             return `import { integer, sqliteTable, text } from "drizzle-orm/sqlite-core";
-
+${withAuth ? sqliteAuthTables() : ""}
 export const items = sqliteTable("items", {
   id: integer("id").primaryKey({ autoIncrement: true }),
-  title: text("title").notNull(),
+  title: text("title").notNull(),${workspaceCol}
 });
-${withAuth ? sqliteAuthTables() : ""}`;
+`;
+        }
     }
 }
 function drizzleClient(config) {
@@ -759,21 +970,210 @@ function betterAuthServer(config) {
     const schemaImport = dbModuleImport(config, "schema");
     return `import { betterAuth } from "better-auth";
 import { drizzleAdapter } from "better-auth/adapters/drizzle";
+import { nextCookies } from "better-auth/next-js";
+import { organization } from "better-auth/plugins";
+import { and, eq } from "drizzle-orm";
 import { db } from "${dbImport}";
 import * as schema from "${schemaImport}";
+import {
+  invitation as invitationTable,
+  member,
+  organization as organizationTable,
+  user as userTable,
+} from "${schemaImport}";
+
+function newId(): string {
+  return crypto.randomUUID().replaceAll("-", "");
+}
 
 export const auth = betterAuth({
   database: drizzleAdapter(db, { provider: "${provider}", schema }),
-  emailAndPassword: { enabled: true },
+  emailAndPassword: {
+    enabled: true,
+    sendResetPassword: async ({ url }) => {
+      console.info("Password reset URL:", url);
+    },
+  },
+  databaseHooks: {
+    session: {
+      create: {
+        before: async (session) => {
+          const [existing] = await db
+            .select({ organizationId: member.organizationId })
+            .from(member)
+            .where(eq(member.userId, session.userId))
+            .limit(1);
+          if (existing?.organizationId) {
+            return { data: { ...session, activeOrganizationId: existing.organizationId } };
+          }
+          const [owner] = await db
+            .select({ name: userTable.name, email: userTable.email })
+            .from(userTable)
+            .where(eq(userTable.id, session.userId))
+            .limit(1);
+          if (owner?.email) {
+            const [pending] = await db
+              .select({ id: invitationTable.id })
+              .from(invitationTable)
+              .where(
+                and(eq(invitationTable.email, owner.email), eq(invitationTable.status, "pending")),
+              )
+              .limit(1);
+            if (pending) return;
+          }
+          const orgId = newId();
+          const now = new Date();
+          await db.insert(organizationTable).values({
+            id: orgId,
+            name: owner?.name.trim() || "Workspace",
+            slug: \`ws-\${session.userId.slice(0, 16)}\`,
+            createdAt: now,
+          });
+          await db.insert(member).values({
+            id: newId(),
+            organizationId: orgId,
+            userId: session.userId,
+            role: "owner",
+            createdAt: now,
+          });
+          return { data: { ...session, activeOrganizationId: orgId } };
+        },
+      },
+    },
+  },
+  plugins: [
+    organization({
+      sendInvitationEmail: async (data) => {
+        const base = process.env.BETTER_AUTH_URL ?? "http://localhost:3000";
+        console.info(\`Invite \${data.email}: \${base}/accept-invitation?id=\${data.id}\`);
+      },
+    }),
+    nextCookies(),
+  ],
   secret: process.env.BETTER_AUTH_SECRET,
   baseURL: process.env.BETTER_AUTH_URL,
 });
 `;
 }
+function betterAuthMiddleware() {
+    return `import { NextRequest, NextResponse } from "next/server";
+import { getSessionCookie } from "better-auth/cookies";
+
+const AUTH_PAGES = ["/login", "/signup", "/forgot-password"];
+
+function invitationOf(request: NextRequest): string | null {
+  const { pathname, searchParams } = request.nextUrl;
+  return (
+    searchParams.get("invitation") ??
+    (pathname === "/accept-invitation" ? searchParams.get("id") : null)
+  );
+}
+
+export function middleware(request: NextRequest) {
+  const sessionCookie = getSessionCookie(request);
+  const path = request.nextUrl.pathname;
+  const isAuthPage = AUTH_PAGES.includes(path);
+  const invitation = invitationOf(request);
+  if (!sessionCookie && path === "/accept-invitation") {
+    const url = new URL("/signup", request.url);
+    if (invitation) url.searchParams.set("invitation", invitation);
+    return NextResponse.redirect(url);
+  }
+  if (!sessionCookie && !isAuthPage) {
+    const url = new URL("/login", request.url);
+    if (invitation) url.searchParams.set("invitation", invitation);
+    return NextResponse.redirect(url);
+  }
+  if (sessionCookie && isAuthPage) {
+    if (invitation) {
+      return NextResponse.redirect(
+        new URL(\`/accept-invitation?id=\${encodeURIComponent(invitation)}\`, request.url),
+      );
+    }
+    return NextResponse.redirect(new URL("/", request.url));
+  }
+  return NextResponse.next();
+}
+
+export const config = {
+  matcher: ["/((?!api/auth|_next/static|_next/image|favicon.ico|.*\\\\..*).*)"],
+};
+`;
+}
+function acceptInvitationPage(config) {
+    const authClientImport = fromAppImport(config, "lib/auth-client");
+    return `"use client";
+
+import { Suspense, useEffect, useState } from "react";
+import { useRouter, useSearchParams } from "next/navigation";
+import { authClient } from "${authClientImport}";
+
+function AcceptInvitation() {
+  const router = useRouter();
+  const params = useSearchParams();
+  const id = params.get("id") ?? params.get("invitation");
+  const { data: session, isPending } = authClient.useSession();
+  const [error, setError] = useState<string | null>(null);
+
+  useEffect(() => {
+    if (isPending) return;
+    if (!id) {
+      setError("Invitation is missing.");
+      return;
+    }
+    if (!session) {
+      router.replace(\`/signup?invitation=\${encodeURIComponent(id)}\`);
+      return;
+    }
+    let cancelled = false;
+    void (async () => {
+      const { data, error: acceptError } = await authClient.organization.acceptInvitation({
+        invitationId: id,
+      });
+      if (cancelled) return;
+      if (acceptError) {
+        setError(acceptError.message || "Could not accept invitation.");
+        return;
+      }
+      const orgId = data?.invitation?.organizationId ?? data?.member?.organizationId;
+      if (orgId) {
+        await authClient.organization.setActive({ organizationId: orgId });
+      }
+      try {
+        sessionStorage.removeItem("cronus-invitation");
+      } catch {
+        // ignore
+      }
+      window.location.assign("/");
+    })();
+    return () => {
+      cancelled = true;
+    };
+  }, [id, isPending, router, session]);
+
+  return (
+    <main>
+      {error ? <p role="alert">{error}</p> : <p>Accepting invitation…</p>}
+    </main>
+  );
+}
+
+export default function AcceptInvitationPage() {
+  return (
+    <Suspense fallback={<main><p>Accepting invitation…</p></main>}>
+      <AcceptInvitation />
+    </Suspense>
+  );
+}
+`;
+}
 function betterAuthClient() {
-    return `import { createAuthClient } from "better-auth/react";
+    return `import { organizationClient } from "better-auth/client/plugins";
+import { createAuthClient } from "better-auth/react";
 
-export const authClient = createAuthClient();
+export const authClient = createAuthClient({
+  plugins: [organizationClient()],
+});
 `;
 }
 function betterAuthRoute(config) {
@@ -866,7 +1266,7 @@ export function scaffoldStack(options) {
             emit("postcss.config.mjs", 'export default { plugins: { "@tailwindcss/postcss": {} } };\n');
             emit(`${app}/globals.css`, globalsCss(config));
             emit(`${app}/layout.tsx`, layoutTsx(projectName));
-            emit(`${app}/page.tsx`, pageTsx());
+            emit(`${app}/page.tsx`, pageTsx(config));
             emit("cronus-ui.json", `${JSON.stringify({
                 aliases: { ui: "@/components/ui", lib: "@/lib", blocks: "@/components/blocks" },
                 paths: cronusUiPaths(config),
@@ -888,6 +1288,8 @@ export function scaffoldStack(options) {
             emit(`${libDir(config)}/auth.ts`, betterAuthServer(config));
             emit(`${libDir(config)}/auth-client.ts`, betterAuthClient());
             emit(`${app}/api/auth/[...all]/route.ts`, betterAuthRoute(config));
+            emit(single(config, "structure") === "structure-root" ? "middleware.ts" : "src/middleware.ts", betterAuthMiddleware());
+            emit(`${app}/accept-invitation/page.tsx`, acceptInvitationPage(config));
         }
     }
     else {

package/dist/version.d.ts

@@ -1,2 +1,2 @@
-export declare const CREATE_STACK_VERSION = "0.6.1";
+export declare const CREATE_STACK_VERSION = "0.6.3";
 //# sourceMappingURL=version.d.ts.map

package/dist/version.js

@@ -1,2 +1,2 @@
-export const CREATE_STACK_VERSION = "0.6.1";
+export const CREATE_STACK_VERSION = "0.6.3";
 //# sourceMappingURL=version.js.map

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "create-cronus-stack",
-  "version": "0.6.1",
+  "version": "0.6.3",
   "description": "Scaffold a Cronus stack from the Cronus Stack Builder contract: app files, stack.json, KICKOFF.md, and optional AI Kit.",
   "type": "module",
   "license": "MIT",
@@ -44,8 +44,8 @@
     "prepublishOnly": "tsc -p tsconfig.json"
   },
   "dependencies": {
-    "@cronus-ui/ai-kit": "0.6.1",
-    "@cronus-ui/stack": "0.6.1"
+    "@cronus-ui/ai-kit": "0.6.3",
+    "@cronus-ui/stack": "0.6.3"
   },
   "devDependencies": {
     "@types/node": "^22.10.0",