@nextsparkjs/cli 0.1.0-beta.5 → 0.1.0-beta.51

package/dist/cli.js

@@ -10,8 +10,9 @@ import {
 } from "./chunk-ALB2C27N.js";
 
 // src/cli.ts
+import { config } from "dotenv";
 import { Command } from "commander";
-import chalk15 from "chalk";
+import chalk16 from "chalk";
 
 // src/commands/dev.ts
 import { spawn } from "child_process";
@@ -61,8 +62,8 @@ async function devCommand(options) {
     spinner.succeed(`Core found at: ${coreDir} (${mode} mode)`);
     const processes = [];
     if (options.registry) {
-      console.log(chalk.blue("\n[Registry] Starting registry watcher..."));
-      const registryProcess = spawn("node", ["scripts/registry-watch.js"], {
+      console.log(chalk.blue("\n[Registry] Starting registry builder with watch mode..."));
+      const registryProcess = spawn("node", ["scripts/build/registry.mjs", "--watch"], {
         cwd: coreDir,
         stdio: "inherit",
         env: {
@@ -80,6 +81,7 @@ async function devCommand(options) {
     const devProcess = spawn("npx", ["next", "dev", "-p", options.port], {
       cwd: projectRoot,
       stdio: "inherit",
+      shell: true,
       env: {
         ...process.env,
         NEXTSPARK_CORE_DIR: coreDir
@@ -179,6 +181,7 @@ async function buildCommand(options) {
     const buildProcess = spawn2("npx", ["next", "build"], {
       cwd: projectRoot,
       stdio: "inherit",
+      shell: true,
       env: {
         ...projectEnv,
         ...process.env,
@@ -422,8 +425,8 @@ Watcher exited with code ${code}`));
 }
 
 // src/commands/init.ts
-import { existsSync as existsSync8, mkdirSync as mkdirSync2, writeFileSync as writeFileSync2, readFileSync as readFileSync6 } from "fs";
-import { join as join7 } from "path";
+import { existsSync as existsSync8, mkdirSync as mkdirSync2, writeFileSync as writeFileSync2, readFileSync as readFileSync7 } from "fs";
+import { join as join8 } from "path";
 import chalk12 from "chalk";
 import ora8 from "ora";
 
@@ -433,10 +436,35 @@ import ora7 from "ora";
 import { confirm as confirm5 } from "@inquirer/prompts";
 import { execSync } from "child_process";
 import { existsSync as existsSync7, readdirSync } from "fs";
-import { join as join6 } from "path";
+import { join as join7 } from "path";
 
 // src/wizard/banner.ts
 import chalk5 from "chalk";
+import { readFileSync as readFileSync4 } from "fs";
+import { fileURLToPath as fileURLToPath2 } from "url";
+import { dirname as dirname2, join as join4 } from "path";
+var __filename2 = fileURLToPath2(import.meta.url);
+var __dirname2 = dirname2(__filename2);
+function getCliVersion() {
+  const possiblePaths = [
+    join4(__dirname2, "../package.json"),
+    // from dist/
+    join4(__dirname2, "../../package.json"),
+    // from dist/wizard/ or src/wizard/
+    join4(__dirname2, "../../../package.json")
+    // fallback
+  ];
+  for (const packageJsonPath of possiblePaths) {
+    try {
+      const packageJson = JSON.parse(readFileSync4(packageJsonPath, "utf-8"));
+      if (packageJson.name === "@nextsparkjs/cli" && packageJson.version) {
+        return packageJson.version;
+      }
+    } catch {
+    }
+  }
+  return "unknown";
+}
 var BANNER = `
     _   __          __  _____                  __
    / | / /__  _  __/ /_/ ___/____  ____ ______/ /__
@@ -446,9 +474,11 @@ var BANNER = `
                          /_/
 `;
 function showBanner() {
+  const version = getCliVersion();
   console.log(chalk5.cyan(BANNER));
   console.log(chalk5.bold.white("  Welcome to NextSpark - The Complete SaaS Framework for Next.js"));
-  console.log(chalk5.gray("  Create production-ready SaaS applications in minutes\n"));
+  console.log(chalk5.gray(`  Version ${version} - Create production-ready SaaS applications in minutes
+`));
   console.log(chalk5.gray("  " + "=".repeat(60) + "\n"));
 }
 function showSection(title, step, totalSteps) {
@@ -1151,22 +1181,22 @@ async function runExpertPrompts() {
 // src/wizard/generators/index.ts
 import fs7 from "fs-extra";
 import path5 from "path";
-import { fileURLToPath as fileURLToPath4 } from "url";
+import { fileURLToPath as fileURLToPath5 } from "url";
 
 // src/wizard/generators/theme-renamer.ts
 import fs from "fs-extra";
 import path from "path";
-import { fileURLToPath as fileURLToPath2 } from "url";
-var __filename2 = fileURLToPath2(import.meta.url);
-var __dirname2 = path.dirname(__filename2);
+import { fileURLToPath as fileURLToPath3 } from "url";
+var __filename3 = fileURLToPath3(import.meta.url);
+var __dirname3 = path.dirname(__filename3);
 function getTemplatesDir() {
   try {
     const corePkgPath = __require.resolve("@nextsparkjs/core/package.json");
     return path.join(path.dirname(corePkgPath), "templates");
   } catch {
     const possiblePaths = [
-      path.resolve(__dirname2, "../../../../../core/templates"),
-      path.resolve(__dirname2, "../../../../core/templates"),
+      path.resolve(__dirname3, "../../../../../core/templates"),
+      path.resolve(__dirname3, "../../../../core/templates"),
       path.resolve(process.cwd(), "node_modules/@nextsparkjs/core/templates")
     ];
     for (const p of possiblePaths) {
@@ -1180,11 +1210,11 @@ function getTemplatesDir() {
 function getTargetThemesDir() {
   return path.resolve(process.cwd(), "contents", "themes");
 }
-async function copyStarterTheme(config) {
+async function copyStarterTheme(config2) {
   const templatesDir = getTemplatesDir();
   const starterThemePath = path.join(templatesDir, "contents", "themes", "starter");
   const targetThemesDir = getTargetThemesDir();
-  const newThemePath = path.join(targetThemesDir, config.projectSlug);
+  const newThemePath = path.join(targetThemesDir, config2.projectSlug);
   if (!await fs.pathExists(starterThemePath)) {
     throw new Error(`Starter theme not found at: ${starterThemePath}`);
   }
@@ -1194,99 +1224,97 @@ async function copyStarterTheme(config) {
   await fs.ensureDir(targetThemesDir);
   await fs.copy(starterThemePath, newThemePath);
 }
-async function updateThemeConfig(config) {
-  const themeConfigPath = path.join(getTargetThemesDir(), config.projectSlug, "config", "theme.config.ts");
+async function updateThemeConfig(config2) {
+  const themeConfigPath = path.join(getTargetThemesDir(), config2.projectSlug, "config", "theme.config.ts");
   if (!await fs.pathExists(themeConfigPath)) {
     throw new Error(`theme.config.ts not found at: ${themeConfigPath}`);
   }
   let content = await fs.readFile(themeConfigPath, "utf-8");
   content = content.replace(
     /name:\s*['"]starter['"]/g,
-    `name: '${config.projectSlug}'`
+    `name: '${config2.projectSlug}'`
   );
   content = content.replace(
     /displayName:\s*['"]Starter['"]/g,
-    `displayName: '${config.projectName}'`
+    `displayName: '${config2.projectName}'`
   );
   content = content.replace(
     /description:\s*['"]Minimal starter theme for NextSpark['"]/g,
-    `description: '${config.projectDescription}'`
+    `description: '${config2.projectDescription}'`
   );
   content = content.replace(
     /export const starterThemeConfig/g,
-    `export const ${toCamelCase(config.projectSlug)}ThemeConfig`
+    `export const ${toCamelCase(config2.projectSlug)}ThemeConfig`
   );
   content = content.replace(
     /export default starterThemeConfig/g,
-    `export default ${toCamelCase(config.projectSlug)}ThemeConfig`
+    `export default ${toCamelCase(config2.projectSlug)}ThemeConfig`
   );
   await fs.writeFile(themeConfigPath, content, "utf-8");
 }
-async function updateDevConfig(config) {
-  const devConfigPath = path.join(getTargetThemesDir(), config.projectSlug, "config", "dev.config.ts");
+async function updateDevConfig(config2) {
+  const devConfigPath = path.join(getTargetThemesDir(), config2.projectSlug, "config", "dev.config.ts");
   if (!await fs.pathExists(devConfigPath)) {
     return;
   }
   let content = await fs.readFile(devConfigPath, "utf-8");
-  content = content.replace(/@starter\.dev/g, `@${config.projectSlug}.dev`);
-  content = content.replace(/STARTER THEME/g, `${config.projectName.toUpperCase()}`);
-  content = content.replace(/Starter Theme/g, config.projectName);
-  content = content.replace(/Starter Team/g, `${config.projectName} Team`);
+  content = content.replace(/STARTER THEME/g, `${config2.projectName.toUpperCase()}`);
+  content = content.replace(/Starter Theme/g, config2.projectName);
   await fs.writeFile(devConfigPath, content, "utf-8");
 }
-async function updateAppConfig(config) {
-  const appConfigPath = path.join(getTargetThemesDir(), config.projectSlug, "config", "app.config.ts");
+async function updateAppConfig(config2) {
+  const appConfigPath = path.join(getTargetThemesDir(), config2.projectSlug, "config", "app.config.ts");
   if (!await fs.pathExists(appConfigPath)) {
     throw new Error(`app.config.ts not found at: ${appConfigPath}`);
   }
   let content = await fs.readFile(appConfigPath, "utf-8");
   content = content.replace(
     /name:\s*['"]Starter['"]/g,
-    `name: '${config.projectName}'`
+    `name: '${config2.projectName}'`
   );
   content = content.replace(
     /mode:\s*['"]multi-tenant['"]\s*as\s*const/g,
-    `mode: '${config.teamMode}' as const`
+    `mode: '${config2.teamMode}' as const`
   );
-  const localesArray = config.supportedLocales.map((l) => `'${l}'`).join(", ");
+  const localesArray = config2.supportedLocales.map((l) => `'${l}'`).join(", ");
   content = content.replace(
     /supportedLocales:\s*\[.*?\]/g,
     `supportedLocales: [${localesArray}]`
   );
   content = content.replace(
     /defaultLocale:\s*['"]en['"]\s*as\s*const/g,
-    `defaultLocale: '${config.defaultLocale}' as const`
+    `defaultLocale: '${config2.defaultLocale}' as const`
   );
   content = content.replace(
     /label:\s*['"]Starter['"]/g,
-    `label: '${config.projectName}'`
+    `label: '${config2.projectName}'`
   );
   await fs.writeFile(appConfigPath, content, "utf-8");
 }
-async function updateRolesConfig(config) {
-  const appConfigPath = path.join(getTargetThemesDir(), config.projectSlug, "config", "app.config.ts");
+async function updateRolesConfig(config2) {
+  const appConfigPath = path.join(getTargetThemesDir(), config2.projectSlug, "config", "app.config.ts");
   if (!await fs.pathExists(appConfigPath)) {
     return;
   }
   let content = await fs.readFile(appConfigPath, "utf-8");
-  const rolesArray = config.teamRoles.map((r) => `'${r}'`).join(", ");
+  const rolesArray = config2.teamRoles.map((r) => `'${r}'`).join(", ");
   content = content.replace(
     /availableTeamRoles:\s*\[.*?\]/g,
     `availableTeamRoles: [${rolesArray}]`
   );
   await fs.writeFile(appConfigPath, content, "utf-8");
 }
-async function updateBillingConfig(config) {
-  const billingConfigPath = path.join(getTargetThemesDir(), config.projectSlug, "config", "billing.config.ts");
+async function updateBillingConfig(config2) {
+  const billingConfigPath = path.join(getTargetThemesDir(), config2.projectSlug, "config", "billing.config.ts");
   if (!await fs.pathExists(billingConfigPath)) {
     return;
   }
   let content = await fs.readFile(billingConfigPath, "utf-8");
   content = content.replace(
     /currency:\s*['"]usd['"]/g,
-    `currency: '${config.currency}'`
+    `currency: '${config2.currency}'`
   );
-  const plansContent = generateBillingPlans(config.billingModel, config.currency);
+  const plansContent = generateBillingPlans(config2.billingModel, config2.currency);
   content = content.replace(
     /plans:\s*\[[\s\S]*?\],\s*\n\s*\/\/ ===+\s*\n\s*\/\/ ACTION MAPPINGS/,
     `plans: ${plansContent},
@@ -1436,8 +1464,8 @@ function generateBillingPlans(billingModel, currency) {
     },
   ]`;
 }
-async function updateMigrations(config) {
-  const migrationsDir = path.join(getTargetThemesDir(), config.projectSlug, "migrations");
+async function updateMigrations(config2) {
+  const migrationsDir = path.join(getTargetThemesDir(), config2.projectSlug, "migrations");
   if (!await fs.pathExists(migrationsDir)) {
     return;
   }
@@ -1446,12 +1474,39 @@ async function updateMigrations(config) {
   for (const file of sqlFiles) {
     const filePath = path.join(migrationsDir, file);
     let content = await fs.readFile(filePath, "utf-8");
-    content = content.replace(/@starter\.dev/g, `@${config.projectSlug}.dev`);
-    content = content.replace(/Starter Theme/g, config.projectName);
-    content = content.replace(/starter theme/g, config.projectSlug);
+    content = content.replace(/@starter\.dev/g, `@${config2.projectSlug}.dev`);
+    content = content.replace(/Starter Theme/g, config2.projectName);
+    content = content.replace(/starter theme/g, config2.projectSlug);
     await fs.writeFile(filePath, content, "utf-8");
   }
 }
+async function updateTestFiles(config2) {
+  const testsDir = path.join(getTargetThemesDir(), config2.projectSlug, "tests");
+  if (!await fs.pathExists(testsDir)) {
+    return;
+  }
+  const processDir = async (dir) => {
+    const items = await fs.readdir(dir);
+    for (const item of items) {
+      const itemPath = path.join(dir, item);
+      const stat = await fs.stat(itemPath);
+      if (stat.isDirectory()) {
+        await processDir(itemPath);
+      } else if (item.endsWith(".ts") || item.endsWith(".tsx")) {
+        let content = await fs.readFile(itemPath, "utf-8");
+        const hasChanges = content.includes("@/contents/themes/starter/");
+        if (hasChanges) {
+          content = content.replace(
+            /@\/contents\/themes\/starter\//g,
+            `@/contents/themes/${config2.projectSlug}/`
+          );
+          await fs.writeFile(itemPath, content, "utf-8");
+        }
+      }
+    }
+  };
+  await processDir(testsDir);
+}
 function toCamelCase(str) {
   return str.split("-").map((word, index) => {
     if (index === 0) {
@@ -1467,10 +1522,10 @@ import path2 from "path";
 function getTargetThemesDir2() {
   return path2.resolve(process.cwd(), "contents", "themes");
 }
-async function updateAuthConfig(config) {
+async function updateAuthConfig(config2) {
   const authConfigPath = path2.join(
     getTargetThemesDir2(),
-    config.projectSlug,
+    config2.projectSlug,
     "config",
     "auth.config.ts"
   );
@@ -1480,22 +1535,22 @@ async function updateAuthConfig(config) {
   let content = await fs2.readFile(authConfigPath, "utf-8");
   content = content.replace(
     /(emailPassword:\s*{[^}]*enabled:\s*)(?:true|false)/gs,
-    `$1${config.auth.emailPassword}`
+    `$1${config2.auth.emailPassword}`
   );
   content = content.replace(
     /(google:\s*{[^}]*enabled:\s*)(?:true|false)/gs,
-    `$1${config.auth.googleOAuth}`
+    `$1${config2.auth.googleOAuth}`
   );
   content = content.replace(
     /(emailVerification:\s*)(?:true|false)/g,
-    `$1${config.auth.emailVerification}`
+    `$1${config2.auth.emailVerification}`
   );
   await fs2.writeFile(authConfigPath, content, "utf-8");
 }
-async function updateDashboardUIConfig(config) {
+async function updateDashboardUIConfig(config2) {
   const dashboardConfigPath = path2.join(
     getTargetThemesDir2(),
-    config.projectSlug,
+    config2.projectSlug,
     "config",
     "dashboard.config.ts"
   );
@@ -1505,42 +1560,42 @@ async function updateDashboardUIConfig(config) {
   let content = await fs2.readFile(dashboardConfigPath, "utf-8");
   content = content.replace(
     /(search:\s*{[^}]*enabled:\s*)(?:true|false)/gs,
-    `$1${config.dashboard.search}`
+    `$1${config2.dashboard.search}`
   );
   content = content.replace(
     /(notifications:\s*{[^}]*enabled:\s*)(?:true|false)/gs,
-    `$1${config.dashboard.notifications}`
+    `$1${config2.dashboard.notifications}`
   );
   content = content.replace(
     /(themeToggle:\s*{[^}]*enabled:\s*)(?:true|false)/gs,
-    `$1${config.dashboard.themeToggle}`
+    `$1${config2.dashboard.themeToggle}`
   );
   content = content.replace(
     /(support:\s*{[^}]*enabled:\s*)(?:true|false)/gs,
-    `$1${config.dashboard.support}`
+    `$1${config2.dashboard.support}`
   );
   content = content.replace(
     /(quickCreate:\s*{[^}]*enabled:\s*)(?:true|false)/gs,
-    `$1${config.dashboard.quickCreate}`
+    `$1${config2.dashboard.quickCreate}`
   );
   content = content.replace(
     /(adminAccess:\s*{[^}]*enabled:\s*)(?:true|false)/gs,
-    `$1${config.dashboard.superadminAccess}`
+    `$1${config2.dashboard.superadminAccess}`
   );
   content = content.replace(
     /(devtoolsAccess:\s*{[^}]*enabled:\s*)(?:true|false)/gs,
-    `$1${config.dashboard.devtoolsAccess}`
+    `$1${config2.dashboard.devtoolsAccess}`
   );
   content = content.replace(
     /(defaultCollapsed:\s*)(?:true|false)/g,
-    `$1${config.dashboard.sidebarCollapsed}`
+    `$1${config2.dashboard.sidebarCollapsed}`
   );
   await fs2.writeFile(dashboardConfigPath, content, "utf-8");
 }
-async function updateDevToolsConfig(config) {
+async function updateDevToolsConfig(config2) {
   const devConfigPath = path2.join(
     getTargetThemesDir2(),
-    config.projectSlug,
+    config2.projectSlug,
     "config",
     "dev.config.ts"
   );
@@ -1550,18 +1605,18 @@ async function updateDevToolsConfig(config) {
   let content = await fs2.readFile(devConfigPath, "utf-8");
   content = content.replace(
     /(devKeyring:\s*{[^}]*enabled:\s*)(?:true|false)/gs,
-    `$1${config.dev.devKeyring}`
+    `$1${config2.dev.devKeyring}`
   );
   content = content.replace(
     /(debugMode:\s*)(?:true|false)/g,
-    `$1${config.dev.debugMode}`
+    `$1${config2.dev.debugMode}`
   );
   await fs2.writeFile(devConfigPath, content, "utf-8");
 }
-async function updatePermissionsConfig(config) {
+async function updatePermissionsConfig(config2) {
   const permissionsConfigPath = path2.join(
     getTargetThemesDir2(),
-    config.projectSlug,
+    config2.projectSlug,
     "config",
     "permissions.config.ts"
   );
@@ -1569,7 +1624,7 @@ async function updatePermissionsConfig(config) {
     return;
   }
   let content = await fs2.readFile(permissionsConfigPath, "utf-8");
-  const availableRoles = config.teamRoles;
+  const availableRoles = config2.teamRoles;
   const roleArrayPattern = /roles:\s*\[(.*?)\]/g;
   content = content.replace(roleArrayPattern, (match, rolesStr) => {
     const currentRoles = rolesStr.split(",").map((r) => r.trim().replace(/['"]/g, "")).filter((r) => r.length > 0);
@@ -1581,10 +1636,48 @@ async function updatePermissionsConfig(config) {
   });
   await fs2.writeFile(permissionsConfigPath, content, "utf-8");
 }
-async function updateDashboardConfig(config) {
+async function updateEntityPermissions(config2) {
+  const permissionsConfigPath = path2.join(
+    getTargetThemesDir2(),
+    config2.projectSlug,
+    "config",
+    "permissions.config.ts"
+  );
+  if (!await fs2.pathExists(permissionsConfigPath)) {
+    return;
+  }
+  let content = await fs2.readFile(permissionsConfigPath, "utf-8");
+  if (config2.contentFeatures.pages) {
+    content = uncommentPermissionBlock(content, "PAGES");
+  }
+  if (config2.contentFeatures.blog) {
+    content = uncommentPermissionBlock(content, "POSTS");
+  }
+  await fs2.writeFile(permissionsConfigPath, content, "utf-8");
+}
+function uncommentPermissionBlock(content, markerName) {
+  const startMarker = `// __${markerName}_PERMISSIONS_START__`;
+  const endMarker = `// __${markerName}_PERMISSIONS_END__`;
+  const startIndex = content.indexOf(startMarker);
+  const endIndex = content.indexOf(endMarker);
+  if (startIndex === -1 || endIndex === -1) {
+    return content;
+  }
+  const beforeBlock = content.slice(0, startIndex);
+  const block = content.slice(startIndex + startMarker.length, endIndex);
+  const afterBlock = content.slice(endIndex + endMarker.length);
+  const uncommentedBlock = block.split("\n").map((line) => {
+    if (line.match(/^\s*\/\/\s+/)) {
+      return line.replace(/^(\s*)\/\/\s*/, "$1");
+    }
+    return line;
+  }).join("\n");
+  return beforeBlock + uncommentedBlock + afterBlock;
+}
+async function updateDashboardConfig(config2) {
   const dashboardConfigPath = path2.join(
     getTargetThemesDir2(),
-    config.projectSlug,
+    config2.projectSlug,
     "config",
     "dashboard.config.ts"
   );
@@ -1592,19 +1685,19 @@ async function updateDashboardConfig(config) {
     return;
   }
   let content = await fs2.readFile(dashboardConfigPath, "utf-8");
-  if (!config.features.analytics) {
+  if (!config2.features.analytics) {
     content = content.replace(
       /(id:\s*['"]analytics['"].*?enabled:\s*)true/gs,
       "$1false"
     );
   }
-  if (!config.features.billing) {
+  if (!config2.features.billing) {
     content = content.replace(
       /(id:\s*['"]billing['"].*?enabled:\s*)true/gs,
       "$1false"
     );
   }
-  if (config.teamMode === "single-user") {
+  if (config2.teamMode === "single-user") {
     content = content.replace(
       /(id:\s*['"]team['"].*?enabled:\s*)true/gs,
       "$1false"
@@ -1616,10 +1709,10 @@ async function updateDashboardConfig(config) {
   }
   await fs2.writeFile(dashboardConfigPath, content, "utf-8");
 }
-async function generateEnvExample(config) {
+async function generateEnvExample(config2) {
   const envExamplePath = path2.resolve(process.cwd(), ".env.example");
   let oauthSection = "";
-  if (config.auth.googleOAuth) {
+  if (config2.auth.googleOAuth) {
     oauthSection = `# =============================================================================
 # OAUTH PROVIDERS
 # =============================================================================
@@ -1635,7 +1728,7 @@ GOOGLE_CLIENT_SECRET="your-google-client-secret"
 `;
   }
   const envContent = `# NextSpark Environment Configuration
-# Generated for: ${config.projectName}
+# Generated for: ${config2.projectName}
 
 # =============================================================================
 # DATABASE
@@ -1651,7 +1744,7 @@ BETTER_AUTH_SECRET="your-secret-key-here"
 # =============================================================================
 # THEME
 # =============================================================================
-NEXT_PUBLIC_ACTIVE_THEME="${config.projectSlug}"
+NEXT_PUBLIC_ACTIVE_THEME="${config2.projectSlug}"
 
 # =============================================================================
 # APPLICATION
@@ -1659,7 +1752,7 @@ NEXT_PUBLIC_ACTIVE_THEME="${config.projectSlug}"
 NEXT_PUBLIC_APP_URL="http://localhost:3000"
 NODE_ENV="development"
 
-${config.features.billing ? `# =============================================================================
+${config2.features.billing ? `# =============================================================================
 # STRIPE (Billing)
 # =============================================================================
 STRIPE_SECRET_KEY="sk_test_..."
@@ -1677,19 +1770,39 @@ ${oauthSection}`;
     await fs2.writeFile(envExamplePath, envContent, "utf-8");
   }
 }
-async function updateReadme(config) {
-  const readmePath = path2.join(getTargetThemesDir2(), config.projectSlug, "README.md");
+async function updateReadme(config2) {
+  const readmePath = path2.join(getTargetThemesDir2(), config2.projectSlug, "README.md");
   if (!await fs2.pathExists(readmePath)) {
     return;
   }
   let content = await fs2.readFile(readmePath, "utf-8");
-  content = content.replace(/# Starter Theme/g, `# ${config.projectName}`);
+  content = content.replace(/# Starter Theme/g, `# ${config2.projectName}`);
   content = content.replace(
     /Minimal starter theme for NextSpark/g,
-    config.projectDescription
+    config2.projectDescription
   );
   await fs2.writeFile(readmePath, content, "utf-8");
 }
+async function copyEnvExampleToEnv() {
+  const projectRoot = process.cwd();
+  const envExamplePath = path2.resolve(projectRoot, ".env.example");
+  const envPath = path2.resolve(projectRoot, ".env");
+  if (await fs2.pathExists(envExamplePath) && !await fs2.pathExists(envPath)) {
+    await fs2.copy(envExamplePath, envPath);
+  }
+}
+async function updateGlobalsCss(config2) {
+  const globalsCssPath = path2.resolve(process.cwd(), "app", "globals.css");
+  if (!await fs2.pathExists(globalsCssPath)) {
+    return;
+  }
+  let content = await fs2.readFile(globalsCssPath, "utf-8");
+  content = content.replace(
+    /@import\s+["']\.\.\/contents\/themes\/[^/]+\/styles\/globals\.css["'];?/,
+    `@import "../contents/themes/${config2.projectSlug}/styles/globals.css";`
+  );
+  await fs2.writeFile(globalsCssPath, content, "utf-8");
+}
 
 // src/wizard/generators/messages-generator.ts
 import fs3 from "fs-extra";
@@ -1697,8 +1810,8 @@ import path3 from "path";
 function getTargetThemesDir3() {
   return path3.resolve(process.cwd(), "contents", "themes");
 }
-async function removeUnusedLanguages(config) {
-  const messagesDir = path3.join(getTargetThemesDir3(), config.projectSlug, "messages");
+async function removeUnusedLanguages(config2) {
+  const messagesDir = path3.join(getTargetThemesDir3(), config2.projectSlug, "messages");
   if (!await fs3.pathExists(messagesDir)) {
     return;
   }
@@ -1708,13 +1821,13 @@ async function removeUnusedLanguages(config) {
     return fs3.statSync(folderPath).isDirectory() && Object.keys(AVAILABLE_LOCALES).includes(f);
   });
   for (const folder of languageFolders) {
-    if (!config.supportedLocales.includes(folder)) {
+    if (!config2.supportedLocales.includes(folder)) {
       await fs3.remove(path3.join(messagesDir, folder));
     }
   }
 }
-async function removeUnusedEntityMessages(config) {
-  const entitiesDir = path3.join(getTargetThemesDir3(), config.projectSlug, "entities");
+async function removeUnusedEntityMessages(config2) {
+  const entitiesDir = path3.join(getTargetThemesDir3(), config2.projectSlug, "entities");
   if (!await fs3.pathExists(entitiesDir)) {
     return;
   }
@@ -1727,45 +1840,45 @@ async function removeUnusedEntityMessages(config) {
     const files = await fs3.readdir(messagesDir);
     for (const file of files) {
       const locale = path3.basename(file, ".json");
-      if (Object.keys(AVAILABLE_LOCALES).includes(locale) && !config.supportedLocales.includes(locale)) {
+      if (Object.keys(AVAILABLE_LOCALES).includes(locale) && !config2.supportedLocales.includes(locale)) {
         await fs3.remove(path3.join(messagesDir, file));
       }
     }
   }
 }
-async function ensureLanguageFolders(config) {
-  const messagesDir = path3.join(getTargetThemesDir3(), config.projectSlug, "messages");
+async function ensureLanguageFolders(config2) {
+  const messagesDir = path3.join(getTargetThemesDir3(), config2.projectSlug, "messages");
   if (!await fs3.pathExists(messagesDir)) {
     return;
   }
-  const defaultLocaleDir = path3.join(messagesDir, config.defaultLocale);
+  const defaultLocaleDir = path3.join(messagesDir, config2.defaultLocale);
   if (!await fs3.pathExists(defaultLocaleDir)) {
     const enDir = path3.join(messagesDir, "en");
     if (await fs3.pathExists(enDir)) {
       await fs3.copy(enDir, defaultLocaleDir);
     }
   }
-  for (const locale of config.supportedLocales) {
+  for (const locale of config2.supportedLocales) {
     const localeDir = path3.join(messagesDir, locale);
     if (!await fs3.pathExists(localeDir) && await fs3.pathExists(defaultLocaleDir)) {
       await fs3.copy(defaultLocaleDir, localeDir);
     }
   }
 }
-async function updateMessageFiles(config) {
-  const messagesDir = path3.join(getTargetThemesDir3(), config.projectSlug, "messages");
+async function updateMessageFiles(config2) {
+  const messagesDir = path3.join(getTargetThemesDir3(), config2.projectSlug, "messages");
   if (!await fs3.pathExists(messagesDir)) {
     return;
   }
-  for (const locale of config.supportedLocales) {
+  for (const locale of config2.supportedLocales) {
     const commonPath = path3.join(messagesDir, locale, "common.json");
     if (await fs3.pathExists(commonPath)) {
       try {
         const content = await fs3.readJson(commonPath);
         if (content.app) {
-          content.app.name = config.projectName;
+          content.app.name = config2.projectName;
           if (content.app.description) {
-            content.app.description = config.projectDescription;
+            content.app.description = config2.projectDescription;
           }
         }
         await fs3.writeJson(commonPath, content, { spaces: 2 });
@@ -1774,27 +1887,27 @@ async function updateMessageFiles(config) {
     }
   }
 }
-async function processI18n(config) {
-  await removeUnusedLanguages(config);
-  await removeUnusedEntityMessages(config);
-  await ensureLanguageFolders(config);
-  await updateMessageFiles(config);
+async function processI18n(config2) {
+  await removeUnusedLanguages(config2);
+  await removeUnusedEntityMessages(config2);
+  await ensureLanguageFolders(config2);
+  await updateMessageFiles(config2);
 }
 
 // src/wizard/generators/content-features-generator.ts
 import fs4 from "fs-extra";
 import path4 from "path";
-import { fileURLToPath as fileURLToPath3 } from "url";
-var __filename3 = fileURLToPath3(import.meta.url);
-var __dirname3 = path4.dirname(__filename3);
+import { fileURLToPath as fileURLToPath4 } from "url";
+var __filename4 = fileURLToPath4(import.meta.url);
+var __dirname4 = path4.dirname(__filename4);
 function getTemplatesDir2() {
   try {
     const corePkgPath = __require.resolve("@nextsparkjs/core/package.json");
     return path4.join(path4.dirname(corePkgPath), "templates");
   } catch {
     const possiblePaths = [
-      path4.resolve(__dirname3, "../../../../../core/templates"),
-      path4.resolve(__dirname3, "../../../../core/templates"),
+      path4.resolve(__dirname4, "../../../../../core/templates"),
+      path4.resolve(__dirname4, "../../../../core/templates"),
       path4.resolve(process.cwd(), "node_modules/@nextsparkjs/core/templates")
     ];
     for (const p of possiblePaths) {
@@ -1811,20 +1924,27 @@ function getFeaturesDir() {
 function getTargetThemeDir(projectSlug) {
   return path4.resolve(process.cwd(), "contents", "themes", projectSlug);
 }
-async function copyPagesFeature(config) {
+async function copyPagesFeature(config2) {
   const featuresDir = getFeaturesDir();
-  const targetThemeDir = getTargetThemeDir(config.projectSlug);
+  const targetThemeDir = getTargetThemeDir(config2.projectSlug);
   const sourcePagesEntity = path4.join(featuresDir, "pages", "entities", "pages");
   const targetEntitiesDir = path4.join(targetThemeDir, "entities", "pages");
-  if (!await fs4.pathExists(sourcePagesEntity)) {
+  if (await fs4.pathExists(sourcePagesEntity)) {
+    await fs4.copy(sourcePagesEntity, targetEntitiesDir);
+  } else {
     console.warn(`Warning: Pages entity not found at: ${sourcePagesEntity}`);
-    return;
   }
-  await fs4.copy(sourcePagesEntity, targetEntitiesDir);
+  const sourceHeroBlock = path4.join(featuresDir, "pages", "blocks", "hero");
+  const targetHeroBlock = path4.join(targetThemeDir, "blocks", "hero");
+  if (await fs4.pathExists(sourceHeroBlock)) {
+    await fs4.copy(sourceHeroBlock, targetHeroBlock);
+  } else {
+    console.warn(`Warning: Hero block not found at: ${sourceHeroBlock}`);
+  }
 }
-async function copyBlogFeature(config) {
+async function copyBlogFeature(config2) {
   const featuresDir = getFeaturesDir();
-  const targetThemeDir = getTargetThemeDir(config.projectSlug);
+  const targetThemeDir = getTargetThemeDir(config2.projectSlug);
   const sourcePostsEntity = path4.join(featuresDir, "blog", "entities", "posts");
   const targetPostsEntity = path4.join(targetThemeDir, "entities", "posts");
   if (await fs4.pathExists(sourcePostsEntity)) {
@@ -1840,34 +1960,34 @@ async function copyBlogFeature(config) {
     console.warn(`Warning: Post-content block not found at: ${sourcePostContentBlock}`);
   }
 }
-async function copyContentFeatures(config) {
-  if (!config.contentFeatures.pages && !config.contentFeatures.blog) {
+async function copyContentFeatures(config2) {
+  if (!config2.contentFeatures.pages && !config2.contentFeatures.blog) {
     return;
   }
-  if (config.contentFeatures.pages) {
-    await copyPagesFeature(config);
+  if (config2.contentFeatures.pages) {
+    await copyPagesFeature(config2);
   }
-  if (config.contentFeatures.blog) {
-    await copyBlogFeature(config);
+  if (config2.contentFeatures.blog) {
+    await copyBlogFeature(config2);
   }
 }
 
 // src/wizard/generators/theme-plugins-installer.ts
-import { existsSync as existsSync6, cpSync, mkdirSync, readFileSync as readFileSync5, writeFileSync } from "fs";
-import { join as join5, resolve as resolve2 } from "path";
+import { existsSync as existsSync6, cpSync, mkdirSync, readFileSync as readFileSync6, writeFileSync } from "fs";
+import { join as join6, resolve as resolve2 } from "path";
 import chalk9 from "chalk";
 import ora6 from "ora";
 
 // src/commands/add-theme.ts
 import chalk8 from "chalk";
 import ora5 from "ora";
-import { existsSync as existsSync5, readFileSync as readFileSync4 } from "fs";
-import { join as join4 } from "path";
+import { existsSync as existsSync5, readFileSync as readFileSync5 } from "fs";
+import { join as join5 } from "path";
 async function addTheme(packageSpec, options = {}) {
   const spinner = ora5(`Adding theme ${packageSpec}`).start();
   let cleanup = null;
   try {
-    const contentsDir = join4(process.cwd(), "contents");
+    const contentsDir = join5(process.cwd(), "contents");
     if (!existsSync5(contentsDir)) {
       spinner.fail('contents/ directory not found. Run "nextspark init" first.');
       return;
@@ -1930,13 +2050,13 @@ async function addTheme(packageSpec, options = {}) {
 }
 function checkPluginExists(pluginName) {
   const name = pluginName.replace(/^@[^/]+\//, "").replace(/^nextspark-plugin-/, "").replace(/^plugin-/, "");
-  return existsSync5(join4(process.cwd(), "contents", "plugins", name));
+  return existsSync5(join5(process.cwd(), "contents", "plugins", name));
 }
 function getCoreVersion() {
-  const pkgPath = join4(process.cwd(), "node_modules", "@nextsparkjs", "core", "package.json");
+  const pkgPath = join5(process.cwd(), "node_modules", "@nextsparkjs", "core", "package.json");
   if (existsSync5(pkgPath)) {
     try {
-      const pkg = JSON.parse(readFileSync4(pkgPath, "utf-8"));
+      const pkg = JSON.parse(readFileSync5(pkgPath, "utf-8"));
       return pkg.version || "0.0.0";
     } catch {
       return "0.0.0";
@@ -1974,20 +2094,20 @@ var THEME_REQUIRED_PLUGINS2 = {
 };
 function isMonorepoMode2() {
   const possiblePaths = [
-    join5(process.cwd(), "pnpm-workspace.yaml"),
-    join5(process.cwd(), "..", "pnpm-workspace.yaml"),
-    join5(process.cwd(), "..", "..", "pnpm-workspace.yaml")
+    join6(process.cwd(), "pnpm-workspace.yaml"),
+    join6(process.cwd(), "..", "pnpm-workspace.yaml"),
+    join6(process.cwd(), "..", "..", "pnpm-workspace.yaml")
   ];
   return possiblePaths.some((p) => existsSync6(p));
 }
 function getMonorepoRoot() {
   const possibleRoots = [
     process.cwd(),
-    join5(process.cwd(), ".."),
-    join5(process.cwd(), "..", "..")
+    join6(process.cwd(), ".."),
+    join6(process.cwd(), "..", "..")
   ];
   for (const root of possibleRoots) {
-    if (existsSync6(join5(root, "pnpm-workspace.yaml"))) {
+    if (existsSync6(join6(root, "pnpm-workspace.yaml"))) {
       return resolve2(root);
     }
   }
@@ -1997,15 +2117,15 @@ function getLocalPackageDir(type, name) {
   const monorepoRoot = getMonorepoRoot();
   if (!monorepoRoot) return null;
   const baseDir = type === "theme" ? "themes" : "plugins";
-  const packageDir = join5(monorepoRoot, baseDir, name);
-  if (existsSync6(packageDir) && existsSync6(join5(packageDir, "package.json"))) {
+  const packageDir = join6(monorepoRoot, baseDir, name);
+  if (existsSync6(packageDir) && existsSync6(join6(packageDir, "package.json"))) {
     return packageDir;
   }
   return null;
 }
 async function copyLocalTheme(name, sourceDir) {
-  const targetDir = join5(process.cwd(), "contents", "themes", name);
-  const themesDir = join5(process.cwd(), "contents", "themes");
+  const targetDir = join6(process.cwd(), "contents", "themes", name);
+  const themesDir = join6(process.cwd(), "contents", "themes");
   if (!existsSync6(themesDir)) {
     mkdirSync(themesDir, { recursive: true });
   }
@@ -2018,8 +2138,8 @@ async function copyLocalTheme(name, sourceDir) {
   return true;
 }
 async function copyLocalPlugin(name, sourceDir) {
-  const targetDir = join5(process.cwd(), "contents", "plugins", name);
-  const pluginsDir = join5(process.cwd(), "contents", "plugins");
+  const targetDir = join6(process.cwd(), "contents", "plugins", name);
+  const pluginsDir = join6(process.cwd(), "contents", "plugins");
   if (!existsSync6(pluginsDir)) {
     mkdirSync(pluginsDir, { recursive: true });
   }
@@ -2032,12 +2152,12 @@ async function copyLocalPlugin(name, sourceDir) {
   return true;
 }
 async function updateTsConfigPaths(name, type) {
-  const tsconfigPath = join5(process.cwd(), "tsconfig.json");
+  const tsconfigPath = join6(process.cwd(), "tsconfig.json");
   if (!existsSync6(tsconfigPath)) {
     return;
   }
   try {
-    const content = readFileSync5(tsconfigPath, "utf-8");
+    const content = readFileSync6(tsconfigPath, "utf-8");
     const tsconfig = JSON.parse(content);
     if (!tsconfig.compilerOptions) {
       tsconfig.compilerOptions = {};
@@ -2077,7 +2197,7 @@ async function installTheme2(theme) {
     prefixText: "  "
   }).start();
   try {
-    const targetDir = join5(process.cwd(), "contents", "themes", theme);
+    const targetDir = join6(process.cwd(), "contents", "themes", theme);
     if (existsSync6(targetDir)) {
       spinner.info(chalk9.gray(`Reference theme ${theme} already exists`));
       return true;
@@ -2130,7 +2250,7 @@ async function installPlugins(plugins) {
       prefixText: "  "
     }).start();
     try {
-      const pluginDir = join5(process.cwd(), "contents", "plugins", plugin);
+      const pluginDir = join6(process.cwd(), "contents", "plugins", plugin);
       if (existsSync6(pluginDir)) {
         spinner.info(chalk9.gray(`Plugin ${plugin} already installed`));
         continue;
@@ -2195,16 +2315,16 @@ import fs5 from "fs-extra";
 import fs6 from "fs-extra";
 
 // src/wizard/generators/index.ts
-var __filename4 = fileURLToPath4(import.meta.url);
-var __dirname4 = path5.dirname(__filename4);
+var __filename5 = fileURLToPath5(import.meta.url);
+var __dirname5 = path5.dirname(__filename5);
 function getTemplatesDir3() {
   try {
     const corePkgPath = __require.resolve("@nextsparkjs/core/package.json");
     return path5.join(path5.dirname(corePkgPath), "templates");
   } catch {
     const possiblePaths = [
-      path5.resolve(__dirname4, "../../../../../core/templates"),
-      path5.resolve(__dirname4, "../../../../core/templates"),
+      path5.resolve(__dirname5, "../../../../../core/templates"),
+      path5.resolve(__dirname5, "../../../../core/templates"),
       path5.resolve(process.cwd(), "node_modules/@nextsparkjs/core/templates")
     ];
     for (const p of possiblePaths) {
@@ -2228,7 +2348,8 @@ async function copyProjectFiles() {
     { src: "npmrc", dest: ".npmrc", force: false },
     { src: "tsconfig.cypress.json", dest: "tsconfig.cypress.json", force: false },
     { src: "cypress.d.ts", dest: "cypress.d.ts", force: false },
-    { src: "eslint.config.mjs", dest: "eslint.config.mjs", force: false }
+    { src: "eslint.config.mjs", dest: "eslint.config.mjs", force: false },
+    { src: "scripts/cy-run-prod.cjs", dest: "scripts/cy-run-prod.cjs", force: false }
   ];
   for (const item of itemsToCopy) {
     const srcPath = path5.join(templatesDir, item.src);
@@ -2240,12 +2361,12 @@ async function copyProjectFiles() {
     }
   }
 }
-async function updatePackageJson(config) {
+async function updatePackageJson(config2) {
   const packageJsonPath = path5.resolve(process.cwd(), "package.json");
   let packageJson;
   if (!await fs7.pathExists(packageJsonPath)) {
     packageJson = {
-      name: config.projectSlug,
+      name: config2.projectSlug,
       version: "0.1.0",
       private: true,
       scripts: {},
@@ -2264,11 +2385,13 @@ async function updatePackageJson(config) {
     "build:registries": "nextspark registry:build",
     "db:migrate": "nextspark db:migrate",
     "db:seed": "nextspark db:seed",
-    "test:theme": `jest --config contents/themes/${config.projectSlug}/tests/jest/jest.config.ts`,
-    "cy:open": `cypress open --config-file contents/themes/${config.projectSlug}/tests/cypress.config.ts`,
-    "cy:run": `cypress run --config-file contents/themes/${config.projectSlug}/tests/cypress.config.ts`,
-    "allure:generate": `allure generate contents/themes/${config.projectSlug}/tests/cypress/allure-results --clean -o contents/themes/${config.projectSlug}/tests/cypress/allure-report`,
-    "allure:open": `allure open contents/themes/${config.projectSlug}/tests/cypress/allure-report`
+    "test": "node node_modules/@nextsparkjs/core/scripts/test/jest-theme.mjs",
+    "cy:open": "node node_modules/@nextsparkjs/core/scripts/test/cy.mjs open",
+    "cy:run": "node node_modules/@nextsparkjs/core/scripts/test/cy.mjs run",
+    "cy:tags": "node node_modules/@nextsparkjs/core/scripts/test/cy.mjs tags",
+    "cy:run:prod": "node scripts/cy-run-prod.cjs",
+    "allure:generate": `allure generate contents/themes/${config2.projectSlug}/tests/cypress/allure-results --clean -o contents/themes/${config2.projectSlug}/tests/cypress/allure-report`,
+    "allure:open": `allure open contents/themes/${config2.projectSlug}/tests/cypress/allure-report`
   };
   for (const [name, command] of Object.entries(scriptsToAdd)) {
     if (!packageJson.scripts[name]) {
@@ -2278,8 +2401,8 @@ async function updatePackageJson(config) {
   packageJson.dependencies = packageJson.dependencies || {};
   const depsToAdd = {
     // NextSpark
-    "@nextsparkjs/core": "^0.1.0-beta.4",
-    "@nextsparkjs/cli": "^0.1.0-beta.4",
+    "@nextsparkjs/core": "latest",
+    "@nextsparkjs/cli": "latest",
     // Next.js + React
     "next": "^15.1.0",
     "react": "^19.0.0",
@@ -2338,14 +2461,16 @@ async function updatePackageJson(config) {
     "@testing-library/react": "^16.3.0",
     "jest-environment-jsdom": "^29.7.0",
     // Cypress
-    "cypress": "^14.0.0",
+    "cypress": "^15.8.2",
     "@testing-library/cypress": "^10.0.2",
     "@cypress/webpack-preprocessor": "^6.0.2",
-    "@cypress/grep": "^4.1.0",
+    "@cypress/grep": "^5.0.1",
     "ts-loader": "^9.5.1",
     "webpack": "^5.97.0",
     "allure-cypress": "^3.0.0",
-    "allure-commandline": "^2.27.0"
+    "allure-commandline": "^2.27.0",
+    // NextSpark Testing
+    "@nextsparkjs/testing": "latest"
   };
   for (const [name, version] of Object.entries(devDepsToAdd)) {
     if (!packageJson.devDependencies[name]) {
@@ -2354,7 +2479,7 @@ async function updatePackageJson(config) {
   }
   await fs7.writeJson(packageJsonPath, packageJson, { spaces: 2 });
 }
-async function updateGitignore(config) {
+async function updateGitignore(config2) {
   const gitignorePath = path5.resolve(process.cwd(), ".gitignore");
   const entriesToAdd = `
 # NextSpark
@@ -2382,26 +2507,30 @@ contents/themes/*/tests/jest/coverage
     await fs7.writeFile(gitignorePath, entriesToAdd.trim());
   }
 }
-async function generateProject(config) {
+async function generateProject(config2) {
   await copyProjectFiles();
-  await copyStarterTheme(config);
-  await copyContentFeatures(config);
-  await updateThemeConfig(config);
-  await updateDevConfig(config);
-  await updateAppConfig(config);
-  await updateBillingConfig(config);
-  await updateRolesConfig(config);
-  await updateMigrations(config);
-  await updatePermissionsConfig(config);
-  await updateDashboardConfig(config);
-  await updateAuthConfig(config);
-  await updateDashboardUIConfig(config);
-  await updateDevToolsConfig(config);
-  await processI18n(config);
-  await updatePackageJson(config);
-  await updateGitignore(config);
-  await generateEnvExample(config);
-  await updateReadme(config);
+  await updateGlobalsCss(config2);
+  await copyStarterTheme(config2);
+  await copyContentFeatures(config2);
+  await updateThemeConfig(config2);
+  await updateDevConfig(config2);
+  await updateAppConfig(config2);
+  await updateBillingConfig(config2);
+  await updateRolesConfig(config2);
+  await updateMigrations(config2);
+  await updateTestFiles(config2);
+  await updatePermissionsConfig(config2);
+  await updateEntityPermissions(config2);
+  await updateDashboardConfig(config2);
+  await updateAuthConfig(config2);
+  await updateDashboardUIConfig(config2);
+  await updateDevToolsConfig(config2);
+  await processI18n(config2);
+  await updatePackageJson(config2);
+  await updateGitignore(config2);
+  await generateEnvExample(config2);
+  await updateReadme(config2);
+  await copyEnvExampleToEnv();
 }
 
 // src/wizard/presets.ts
@@ -2564,9 +2693,9 @@ var BOX = {
   bottomRight: "\u2518"
   // bottom-right corner
 };
-function getFileTree(config) {
+function getFileTree(config2) {
   const files = [];
-  const themeDir = `contents/themes/${config.projectSlug}`;
+  const themeDir = `contents/themes/${config2.projectSlug}`;
   files.push(`${themeDir}/config/app.config.ts`);
   files.push(`${themeDir}/config/billing.config.ts`);
   files.push(`${themeDir}/config/dashboard.config.ts`);
@@ -2582,7 +2711,7 @@ function getFileTree(config) {
   files.push(`${themeDir}/blocks/hero/block.tsx`);
   files.push(`${themeDir}/blocks/hero/schema.ts`);
   files.push(`${themeDir}/blocks/hero/styles.ts`);
-  for (const locale of config.supportedLocales) {
+  for (const locale of config2.supportedLocales) {
     files.push(`${themeDir}/messages/${locale}/common.json`);
     files.push(`${themeDir}/messages/${locale}/auth.json`);
     files.push(`${themeDir}/messages/${locale}/dashboard.json`);
@@ -2595,7 +2724,7 @@ function getFileTree(config) {
   files.push(`${themeDir}/styles/theme.css`);
   files.push(`${themeDir}/styles/components.css`);
   files.push(`${themeDir}/tests/cypress.config.ts`);
-  files.push(`${themeDir}/tests/jest/jest.config.ts`);
+  files.push(`${themeDir}/tests/jest/jest.config.cjs`);
   files.push(`${themeDir}/tests/cypress/e2e/auth.cy.ts`);
   files.push(`${themeDir}/tests/cypress/e2e/dashboard.cy.ts`);
   files.push(`${themeDir}/tests/jest/components/hero.test.tsx`);
@@ -2633,10 +2762,10 @@ function groupFilesByCategory(files) {
 function formatFilePath(file, themeDir) {
   return file.replace(`${themeDir}/`, "");
 }
-function showConfigPreview(config) {
-  const files = getFileTree(config);
+function showConfigPreview(config2) {
+  const files = getFileTree(config2);
   const groups = groupFilesByCategory(files);
-  const themeDir = `contents/themes/${config.projectSlug}`;
+  const themeDir = `contents/themes/${config2.projectSlug}`;
   console.log("");
   console.log(chalk10.cyan.bold("  Theme Preview"));
   console.log(chalk10.gray("  " + "=".repeat(50)));
@@ -2698,8 +2827,8 @@ function showConfigPreview(config) {
   }
   console.log("");
   console.log(chalk10.gray("    Locales configured:"));
-  for (const locale of config.supportedLocales) {
-    const isDefault = locale === config.defaultLocale;
+  for (const locale of config2.supportedLocales) {
+    const isDefault = locale === config2.defaultLocale;
     const suffix = isDefault ? chalk10.cyan(" (default)") : "";
     console.log(chalk10.gray(`      - `) + chalk10.white(locale) + suffix);
   }
@@ -2741,25 +2870,25 @@ async function runWizard(options = { mode: "interactive" }) {
         selectedPlugins = getRequiredPlugins(selectedTheme);
       }
     }
-    let config;
+    let config2;
     if (options.preset) {
-      config = await runPresetMode(options.preset, options);
+      config2 = await runPresetMode(options.preset, options);
     } else {
       switch (options.mode) {
         case "quick":
-          config = await runQuickPrompts();
+          config2 = await runQuickPrompts();
           break;
         case "expert":
-          config = await runExpertPrompts();
+          config2 = await runExpertPrompts();
           break;
         case "interactive":
         default:
-          config = await runAllPrompts();
+          config2 = await runAllPrompts();
           break;
       }
     }
-    showConfigSummary(config);
-    showConfigPreview(config);
+    showConfigSummary(config2);
+    showConfigPreview(config2);
     if (!options.yes) {
       console.log("");
       const proceed = await confirm5({
@@ -2785,7 +2914,7 @@ async function runWizard(options = { mode: "interactive" }) {
       prefixText: "  "
     }).start();
     try {
-      await generateProject(config);
+      await generateProject(config2);
       spinner.succeed("Project generated successfully!");
     } catch (error) {
       spinner.fail("Failed to generate project");
@@ -2794,7 +2923,41 @@ async function runWizard(options = { mode: "interactive" }) {
     if (selectedTheme || selectedPlugins.length > 0) {
       await installThemeAndPlugins(selectedTheme, selectedPlugins);
     }
-    showNextSteps(config, selectedTheme);
+    const installSpinner = ora7({
+      text: "Installing dependencies...",
+      prefixText: "  "
+    }).start();
+    try {
+      execSync("pnpm install --force", {
+        cwd: process.cwd(),
+        stdio: "pipe"
+      });
+      installSpinner.succeed("Dependencies installed!");
+    } catch (error) {
+      installSpinner.fail("Failed to install dependencies");
+      console.log(chalk11.yellow('  Run "pnpm install" manually to install dependencies'));
+    }
+    const registrySpinner = ora7({
+      text: "Building registries...",
+      prefixText: "  "
+    }).start();
+    try {
+      const projectRoot = process.cwd();
+      const registryScript = join7(projectRoot, "node_modules/@nextsparkjs/core/scripts/build/registry.mjs");
+      execSync(`node "${registryScript}" --build`, {
+        cwd: projectRoot,
+        stdio: "pipe",
+        env: {
+          ...process.env,
+          NEXTSPARK_PROJECT_ROOT: projectRoot
+        }
+      });
+      registrySpinner.succeed("Registries built!");
+    } catch (error) {
+      registrySpinner.fail("Failed to build registries");
+      console.log(chalk11.yellow('  Registries will be built automatically when you run "pnpm dev"'));
+    }
+    showNextSteps(config2, selectedTheme);
   } catch (error) {
     if (error instanceof Error) {
       if (error.message.includes("User force closed")) {
@@ -2834,46 +2997,46 @@ async function runPresetMode(presetName, options) {
     console.log("");
     projectInfo = await promptProjectInfo();
   }
-  const config = applyPreset(projectInfo, presetName);
-  return config;
+  const config2 = applyPreset(projectInfo, presetName);
+  return config2;
 }
-function showConfigSummary(config) {
+function showConfigSummary(config2) {
   console.log("");
   console.log(chalk11.cyan("  " + "=".repeat(60)));
   console.log(chalk11.bold.white("  Configuration Summary"));
   console.log(chalk11.cyan("  " + "=".repeat(60)));
   console.log("");
   console.log(chalk11.white("  Project:"));
-  console.log(chalk11.gray(`    Name: ${chalk11.white(config.projectName)}`));
-  console.log(chalk11.gray(`    Slug: ${chalk11.white(config.projectSlug)}`));
-  console.log(chalk11.gray(`    Description: ${chalk11.white(config.projectDescription)}`));
+  console.log(chalk11.gray(`    Name: ${chalk11.white(config2.projectName)}`));
+  console.log(chalk11.gray(`    Slug: ${chalk11.white(config2.projectSlug)}`));
+  console.log(chalk11.gray(`    Description: ${chalk11.white(config2.projectDescription)}`));
   console.log("");
   console.log(chalk11.white("  Team Mode:"));
-  console.log(chalk11.gray(`    Mode: ${chalk11.white(config.teamMode)}`));
-  console.log(chalk11.gray(`    Roles: ${chalk11.white(config.teamRoles.join(", "))}`));
+  console.log(chalk11.gray(`    Mode: ${chalk11.white(config2.teamMode)}`));
+  console.log(chalk11.gray(`    Roles: ${chalk11.white(config2.teamRoles.join(", "))}`));
   console.log("");
   console.log(chalk11.white("  Internationalization:"));
-  console.log(chalk11.gray(`    Default: ${chalk11.white(config.defaultLocale)}`));
-  console.log(chalk11.gray(`    Languages: ${chalk11.white(config.supportedLocales.join(", "))}`));
+  console.log(chalk11.gray(`    Default: ${chalk11.white(config2.defaultLocale)}`));
+  console.log(chalk11.gray(`    Languages: ${chalk11.white(config2.supportedLocales.join(", "))}`));
   console.log("");
   console.log(chalk11.white("  Billing:"));
-  console.log(chalk11.gray(`    Model: ${chalk11.white(config.billingModel)}`));
-  console.log(chalk11.gray(`    Currency: ${chalk11.white(config.currency.toUpperCase())}`));
+  console.log(chalk11.gray(`    Model: ${chalk11.white(config2.billingModel)}`));
+  console.log(chalk11.gray(`    Currency: ${chalk11.white(config2.currency.toUpperCase())}`));
   console.log("");
   console.log(chalk11.white("  Features:"));
-  const enabledFeatures = Object.entries(config.features).filter(([_, enabled]) => enabled).map(([feature]) => feature);
+  const enabledFeatures = Object.entries(config2.features).filter(([_, enabled]) => enabled).map(([feature]) => feature);
   console.log(chalk11.gray(`    Enabled: ${chalk11.white(enabledFeatures.join(", ") || "None")}`));
   console.log("");
   console.log(chalk11.white("  Authentication:"));
-  const enabledAuth = Object.entries(config.auth).filter(([_, enabled]) => enabled).map(([method]) => formatAuthMethod(method));
+  const enabledAuth = Object.entries(config2.auth).filter(([_, enabled]) => enabled).map(([method]) => formatAuthMethod(method));
   console.log(chalk11.gray(`    Methods: ${chalk11.white(enabledAuth.join(", ") || "None")}`));
   console.log("");
   console.log(chalk11.white("  Dashboard:"));
-  const enabledDashboard = Object.entries(config.dashboard).filter(([_, enabled]) => enabled).map(([feature]) => formatDashboardFeature(feature));
+  const enabledDashboard = Object.entries(config2.dashboard).filter(([_, enabled]) => enabled).map(([feature]) => formatDashboardFeature(feature));
   console.log(chalk11.gray(`    Features: ${chalk11.white(enabledDashboard.join(", ") || "None")}`));
   console.log("");
   console.log(chalk11.white("  Dev Tools:"));
-  const enabledDevTools = Object.entries(config.dev).filter(([_, enabled]) => enabled).map(([tool]) => formatDevTool(tool));
+  const enabledDevTools = Object.entries(config2.dev).filter(([_, enabled]) => enabled).map(([tool]) => formatDevTool(tool));
   console.log(chalk11.gray(`    Enabled: ${chalk11.white(enabledDevTools.join(", ") || "None")}`));
 }
 function formatAuthMethod(method) {
@@ -2900,38 +3063,38 @@ function formatDevTool(tool) {
   };
   return mapping[tool] || tool;
 }
-function showNextSteps(config, referenceTheme = null) {
+function showNextSteps(config2, referenceTheme = null) {
   console.log("");
   console.log(chalk11.cyan("  " + "=".repeat(60)));
-  console.log(chalk11.bold.green("  \u2728 NextSpark project created successfully!"));
+  console.log(chalk11.bold.green("  \u2728 NextSpark project ready!"));
   console.log(chalk11.cyan("  " + "=".repeat(60)));
   console.log("");
   console.log(chalk11.bold.white("  Next steps:"));
   console.log("");
-  console.log(chalk11.white("  1. Install dependencies:"));
-  console.log(chalk11.cyan("     pnpm install"));
+  console.log(chalk11.white("  1. Configure your .env file:"));
+  console.log(chalk11.gray("     Edit these values in .env:"));
   console.log("");
-  console.log(chalk11.white("  2. Set up your environment:"));
-  console.log(chalk11.gray("     Copy .env.example to .env and configure:"));
-  console.log(chalk11.yellow("     - DATABASE_URL"));
-  console.log(chalk11.yellow("     - BETTER_AUTH_SECRET"));
-  console.log(chalk11.yellow(`     - NEXT_PUBLIC_ACTIVE_THEME=${config.projectSlug}`));
+  console.log(chalk11.yellow("     DATABASE_URL"));
+  console.log(chalk11.gray("     PostgreSQL connection string"));
+  console.log(chalk11.dim("     Example: postgresql://user:pass@localhost:5432/mydb"));
   console.log("");
-  console.log(chalk11.white("  3. Generate registries:"));
-  console.log(chalk11.cyan("     pnpm build:registries"));
+  console.log(chalk11.yellow("     BETTER_AUTH_SECRET"));
+  console.log(chalk11.gray("     Generate with:"));
+  console.log(chalk11.cyan("     openssl rand -base64 32"));
   console.log("");
-  console.log(chalk11.white("  4. Run database migrations:"));
+  console.log(chalk11.white("  2. Run database migrations:"));
   console.log(chalk11.cyan("     pnpm db:migrate"));
   console.log("");
-  console.log(chalk11.white("  5. Start the development server:"));
+  console.log(chalk11.white("  3. Start the development server:"));
   console.log(chalk11.cyan("     pnpm dev"));
   console.log("");
   console.log(chalk11.gray("  " + "-".repeat(60)));
-  console.log(chalk11.gray(`  Your theme: ${chalk11.white(`contents/themes/${config.projectSlug}/`)}`));
+  console.log(chalk11.gray(`  Theme: ${chalk11.white(`contents/themes/${config2.projectSlug}/`)}`));
+  console.log(chalk11.gray(`  Active theme: ${chalk11.green(`NEXT_PUBLIC_ACTIVE_THEME=${config2.projectSlug}`)}`));
   if (referenceTheme) {
-    console.log(chalk11.gray(`  Reference theme: ${chalk11.white(`contents/themes/${referenceTheme}/`)}`));
+    console.log(chalk11.gray(`  Reference: ${chalk11.white(`contents/themes/${referenceTheme}/`)}`));
   }
-  console.log(chalk11.gray("  Documentation: https://nextspark.dev/docs"));
+  console.log(chalk11.gray("  Docs: https://nextspark.dev/docs"));
   console.log("");
 }
 function findLocalCoreTarball() {
@@ -2942,14 +3105,14 @@ function findLocalCoreTarball() {
       (f) => f.includes("nextsparkjs-core") && f.endsWith(".tgz")
     );
     if (coreTarball) {
-      return join6(cwd, coreTarball);
+      return join7(cwd, coreTarball);
     }
   } catch {
   }
   return null;
 }
 function isCoreInstalled() {
-  const corePath = join6(process.cwd(), "node_modules", "@nextsparkjs", "core");
+  const corePath = join7(process.cwd(), "node_modules", "@nextsparkjs", "core");
   return existsSync7(corePath);
 }
 async function installCore() {
@@ -2967,8 +3130,8 @@ async function installCore() {
       packageSpec = localTarball;
       spinner.text = "Installing @nextsparkjs/core from local tarball...";
     }
-    const useYarn = existsSync7(join6(process.cwd(), "yarn.lock"));
-    const usePnpm = existsSync7(join6(process.cwd(), "pnpm-lock.yaml"));
+    const useYarn = existsSync7(join7(process.cwd(), "yarn.lock"));
+    const usePnpm = existsSync7(join7(process.cwd(), "pnpm-lock.yaml"));
     let installCmd;
     if (usePnpm) {
       installCmd = `pnpm add ${packageSpec}`;
@@ -2993,7 +3156,7 @@ async function installCore() {
   }
 }
 async function copyNpmrc() {
-  const npmrcPath = join6(process.cwd(), ".npmrc");
+  const npmrcPath = join7(process.cwd(), ".npmrc");
   if (existsSync7(npmrcPath)) {
     return;
   }
@@ -3017,10 +3180,10 @@ function parsePlugins(pluginsStr) {
 }
 function hasExistingProject() {
   const projectRoot = process.cwd();
-  return existsSync8(join7(projectRoot, "contents")) || existsSync8(join7(projectRoot, ".nextspark"));
+  return existsSync8(join8(projectRoot, "contents")) || existsSync8(join8(projectRoot, ".nextspark"));
 }
 function generateInitialRegistries(registriesDir) {
-  writeFileSync2(join7(registriesDir, "block-registry.ts"), `// Auto-generated by nextspark init
+  writeFileSync2(join8(registriesDir, "block-registry.ts"), `// Auto-generated by nextspark init
 import type { ComponentType } from 'react'
 
 export const BLOCK_REGISTRY: Record<string, {
@@ -3033,26 +3196,26 @@ export const BLOCK_REGISTRY: Record<string, {
 
 export const BLOCK_COMPONENTS: Record<string, React.LazyExoticComponent<ComponentType<any>>> = {}
 `);
-  writeFileSync2(join7(registriesDir, "theme-registry.ts"), `// Auto-generated by nextspark init
+  writeFileSync2(join8(registriesDir, "theme-registry.ts"), `// Auto-generated by nextspark init
 export const THEME_REGISTRY: Record<string, unknown> = {}
 `);
-  writeFileSync2(join7(registriesDir, "entity-registry.ts"), `// Auto-generated by nextspark init
+  writeFileSync2(join8(registriesDir, "entity-registry.ts"), `// Auto-generated by nextspark init
 export const ENTITY_REGISTRY: Record<string, unknown> = {}
 `);
-  writeFileSync2(join7(registriesDir, "entity-registry.client.ts"), `// Auto-generated by nextspark init
+  writeFileSync2(join8(registriesDir, "entity-registry.client.ts"), `// Auto-generated by nextspark init
 export const CLIENT_ENTITY_REGISTRY: Record<string, unknown> = {}
 export function parseChildEntity(path: string) { return null }
 export function getEntityApiPath(entity: string) { return \`/api/\${entity}\` }
 export function clientMetaSystemAdapter() { return {} }
 export type ClientEntityConfig = Record<string, unknown>
 `);
-  writeFileSync2(join7(registriesDir, "billing-registry.ts"), `// Auto-generated by nextspark init
+  writeFileSync2(join8(registriesDir, "billing-registry.ts"), `// Auto-generated by nextspark init
 export const BILLING_REGISTRY = { plans: [], features: [] }
 `);
-  writeFileSync2(join7(registriesDir, "plugin-registry.ts"), `// Auto-generated by nextspark init
+  writeFileSync2(join8(registriesDir, "plugin-registry.ts"), `// Auto-generated by nextspark init
 export const PLUGIN_REGISTRY: Record<string, unknown> = {}
 `);
-  writeFileSync2(join7(registriesDir, "testing-registry.ts"), `// Auto-generated by nextspark init
+  writeFileSync2(join8(registriesDir, "testing-registry.ts"), `// Auto-generated by nextspark init
 export const FLOW_REGISTRY: Record<string, unknown> = {}
 export const FEATURE_REGISTRY: Record<string, unknown> = {}
 export const TAGS_REGISTRY: Record<string, unknown> = {}
@@ -3060,11 +3223,11 @@ export const COVERAGE_SUMMARY = { total: 0, covered: 0 }
 export type FlowEntry = unknown
 export type FeatureEntry = unknown
 `);
-  writeFileSync2(join7(registriesDir, "docs-registry.ts"), `// Auto-generated by nextspark init
+  writeFileSync2(join8(registriesDir, "docs-registry.ts"), `// Auto-generated by nextspark init
 export const DOCS_REGISTRY = { sections: [], pages: [] }
 export type DocSectionMeta = { title: string; slug: string }
 `);
-  writeFileSync2(join7(registriesDir, "index.ts"), `// Auto-generated by nextspark init
+  writeFileSync2(join8(registriesDir, "index.ts"), `// Auto-generated by nextspark init
 export * from './block-registry'
 export * from './theme-registry'
 export * from './entity-registry'
@@ -3079,18 +3242,18 @@ async function simpleInit(options) {
   const spinner = ora8("Initializing NextSpark project...").start();
   const projectRoot = process.cwd();
   try {
-    const nextspark = join7(projectRoot, ".nextspark");
-    const registriesDir = join7(nextspark, "registries");
+    const nextspark = join8(projectRoot, ".nextspark");
+    const registriesDir = join8(nextspark, "registries");
     if (!existsSync8(registriesDir) || options.force) {
       mkdirSync2(registriesDir, { recursive: true });
       spinner.text = "Creating .nextspark/registries/";
       generateInitialRegistries(registriesDir);
       spinner.text = "Generated initial registries";
     }
-    const tsconfigPath = join7(projectRoot, "tsconfig.json");
+    const tsconfigPath = join8(projectRoot, "tsconfig.json");
     if (existsSync8(tsconfigPath)) {
       spinner.text = "Updating tsconfig.json paths...";
-      const tsconfig = JSON.parse(readFileSync6(tsconfigPath, "utf-8"));
+      const tsconfig = JSON.parse(readFileSync7(tsconfigPath, "utf-8"));
       tsconfig.compilerOptions = tsconfig.compilerOptions || {};
       tsconfig.compilerOptions.paths = {
         ...tsconfig.compilerOptions.paths,
@@ -3099,7 +3262,7 @@ async function simpleInit(options) {
       };
       writeFileSync2(tsconfigPath, JSON.stringify(tsconfig, null, 2));
     }
-    const envExample = join7(projectRoot, ".env.example");
+    const envExample = join8(projectRoot, ".env.example");
     if (!existsSync8(envExample)) {
       const envContent = `# NextSpark Configuration
 DATABASE_URL="postgresql://user:password@localhost:5432/db"
@@ -3608,10 +3771,101 @@ async function doctorCommand() {
   }
 }
 
+// src/commands/db.ts
+import { spawn as spawn5 } from "child_process";
+import { existsSync as existsSync9, readFileSync as readFileSync8 } from "fs";
+import { join as join9 } from "path";
+import chalk15 from "chalk";
+import ora9 from "ora";
+function loadProjectEnv4(projectRoot) {
+  const envPath = join9(projectRoot, ".env");
+  const envVars = {};
+  if (existsSync9(envPath)) {
+    const content = readFileSync8(envPath, "utf-8");
+    for (const line of content.split("\n")) {
+      const trimmed = line.trim();
+      if (trimmed && !trimmed.startsWith("#")) {
+        const [key, ...valueParts] = trimmed.split("=");
+        if (key && valueParts.length > 0) {
+          let value = valueParts.join("=");
+          if (value.startsWith('"') && value.endsWith('"') || value.startsWith("'") && value.endsWith("'")) {
+            value = value.slice(1, -1);
+          }
+          envVars[key] = value;
+        }
+      }
+    }
+  }
+  return envVars;
+}
+async function dbMigrateCommand() {
+  const spinner = ora9("Preparing to run migrations...").start();
+  try {
+    const coreDir = getCoreDir();
+    const projectRoot = getProjectRoot();
+    const migrationsScript = join9(coreDir, "scripts", "db", "run-migrations.mjs");
+    if (!existsSync9(migrationsScript)) {
+      spinner.fail("Migrations script not found");
+      console.error(chalk15.red(`Expected script at: ${migrationsScript}`));
+      process.exit(1);
+    }
+    spinner.succeed("Core package found");
+    const projectEnv = loadProjectEnv4(projectRoot);
+    if (!projectEnv.DATABASE_URL) {
+      spinner.fail("DATABASE_URL not found in .env file");
+      console.error(chalk15.red("Please configure DATABASE_URL in your .env file"));
+      process.exit(1);
+    }
+    if (!projectEnv.NEXT_PUBLIC_ACTIVE_THEME) {
+      spinner.fail("NEXT_PUBLIC_ACTIVE_THEME not found in .env file");
+      console.error(chalk15.red("Please configure NEXT_PUBLIC_ACTIVE_THEME in your .env file"));
+      process.exit(1);
+    }
+    spinner.start("Running database migrations...");
+    const migrateProcess = spawn5("node", [migrationsScript], {
+      cwd: projectRoot,
+      stdio: "inherit",
+      env: {
+        ...projectEnv,
+        ...process.env,
+        NEXTSPARK_PROJECT_ROOT: projectRoot,
+        NEXTSPARK_CORE_DIR: coreDir
+      }
+    });
+    migrateProcess.on("error", (err) => {
+      spinner.fail("Migration failed");
+      console.error(chalk15.red(err.message));
+      process.exit(1);
+    });
+    migrateProcess.on("close", (code) => {
+      if (code === 0) {
+        console.log(chalk15.green("\n\u2705 Migrations completed successfully!"));
+        process.exit(0);
+      } else {
+        console.error(chalk15.red(`
+\u274C Migrations failed with exit code ${code}`));
+        process.exit(code ?? 1);
+      }
+    });
+  } catch (error) {
+    spinner.fail("Migration preparation failed");
+    if (error instanceof Error) {
+      console.error(chalk15.red(error.message));
+    }
+    process.exit(1);
+  }
+}
+async function dbSeedCommand() {
+  console.log(chalk15.cyan("\u2139\uFE0F  Sample data is included as part of the migration process."));
+  console.log(chalk15.cyan("   Running db:migrate to apply all migrations including sample data...\n"));
+  await dbMigrateCommand();
+}
+
 // src/cli.ts
+config();
 var program = new Command();
 program.name("nextspark").description("NextSpark CLI - Professional SaaS Boilerplate").version("0.1.0-beta.4");
-program.command("dev").description("Start development server with registry watcher").option("-p, --port <port>", "Port to run the dev server on", "3000").option("--no-registry", "Disable registry watcher").action(devCommand);
+program.command("dev").description("Start development server with registry watcher").option("-p, --port <port>", "Port to run the dev server on", process.env.PORT || "3000").option("--no-registry", "Disable registry watcher").action(devCommand);
 program.command("build").description("Build for production").option("--no-registry", "Skip registry generation before build").action(buildCommand);
 program.command("generate").description("Generate all registries").option("-w, --watch", "Watch for changes").action(generateCommand);
 var registry = program.command("registry").description("Registry management commands");
@@ -3623,8 +3877,13 @@ program.command("init").description("Initialize NextSpark project").option("-f,
 program.command("add:plugin <package>").description("Add a plugin to your project").option("-v, --version <version>", "Specific version to install").option("-f, --force", "Overwrite if already exists").option("--skip-postinstall", "Skip postinstall hooks").option("--no-deps", "Skip installing dependencies").option("--dry-run", "Show what would be done without making changes").action(addPluginCommand);
 program.command("add:theme <package>").description("Add a theme to your project").option("-v, --version <version>", "Specific version to install").option("-f, --force", "Overwrite if already exists").option("--skip-postinstall", "Skip postinstall hooks").option("--no-deps", "Skip installing dependencies").option("--dry-run", "Show what would be done without making changes").action(addThemeCommand);
 program.command("doctor").description("Run health check on NextSpark project").action(doctorCommand);
+var db = program.command("db").description("Database management commands");
+db.command("migrate").description("Run database migrations").action(dbMigrateCommand);
+db.command("seed").description("Seed database with sample data").action(dbSeedCommand);
+program.command("db:migrate").description("Run database migrations (alias)").action(dbMigrateCommand);
+program.command("db:seed").description("Seed database with sample data (alias)").action(dbSeedCommand);
 program.showHelpAfterError();
 program.configureOutput({
-  writeErr: (str) => process.stderr.write(chalk15.red(str))
+  writeErr: (str) => process.stderr.write(chalk16.red(str))
 });
 program.parse();