@nextsparkjs/cli 0.1.0-beta.8 → 0.1.0-beta.80

package/dist/cli.js

@@ -7,11 +7,13 @@ import {
   installTheme,
   runPostinstall,
   validateTheme
-} from "./chunk-ALB2C27N.js";
+} from "./chunk-DXL5CEZD.js";
 
 // src/cli.ts
+import { config } from "dotenv";
 import { Command } from "commander";
-import chalk15 from "chalk";
+import chalk18 from "chalk";
+import { readFileSync as readFileSync11 } from "fs";
 
 // src/commands/dev.ts
 import { spawn } from "child_process";
@@ -80,6 +82,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 +182,7 @@ async function buildCommand(options) {
     const buildProcess = spawn2("npx", ["next", "build"], {
       cwd: projectRoot,
       stdio: "inherit",
+      shell: true,
       env: {
         ...projectEnv,
         ...process.env,
@@ -422,8 +426,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 +437,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 +475,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) {
@@ -500,7 +531,7 @@ function validateSlug(slug) {
   return true;
 }
 async function promptProjectInfo() {
-  showSection("Project Information", 1, 5);
+  showSection("Project Information", 2, 10);
   const projectName = await input({
     message: "What is your project name?",
     default: "My SaaS App",
@@ -523,8 +554,43 @@ async function promptProjectInfo() {
   };
 }
 
+// src/wizard/prompts/project-type.ts
+import { select } from "@inquirer/prompts";
+var PROJECT_TYPE_OPTIONS = [
+  {
+    name: "Web only",
+    value: "web",
+    description: "Next.js web application with NextSpark. Standard flat project structure."
+  },
+  {
+    name: "Web + Mobile",
+    value: "web-mobile",
+    description: "Monorepo with Next.js web app and Expo mobile app sharing the same backend."
+  }
+];
+async function promptProjectType() {
+  showSection("Project Type", 1, 10);
+  const projectType = await select({
+    message: "What type of project do you want to create?",
+    choices: PROJECT_TYPE_OPTIONS,
+    default: "web"
+  });
+  const selectedOption = PROJECT_TYPE_OPTIONS.find((o) => o.value === projectType);
+  if (selectedOption) {
+    showInfo(selectedOption.description);
+  }
+  if (projectType === "web-mobile") {
+    console.log("");
+    showInfo("Your project will be a pnpm monorepo with web/ and mobile/ directories.");
+    showInfo("The mobile app will use Expo and share the same backend API.");
+  }
+  return {
+    projectType
+  };
+}
+
 // src/wizard/prompts/team-config.ts
-import { select, checkbox } from "@inquirer/prompts";
+import { select as select2, checkbox } from "@inquirer/prompts";
 
 // src/wizard/types.ts
 var AVAILABLE_LOCALES = {
@@ -572,8 +638,8 @@ var ROLE_OPTIONS = [
   { name: "Viewer (Read-only access)", value: "viewer", checked: true }
 ];
 async function promptTeamConfig() {
-  showSection("Team Configuration", 2, 5);
-  const teamMode = await select({
+  showSection("Team Configuration", 3, 10);
+  const teamMode = await select2({
     message: "What team mode do you need?",
     choices: TEAM_MODE_OPTIONS,
     default: "multi-tenant"
@@ -604,7 +670,7 @@ async function promptTeamConfig() {
 }
 
 // src/wizard/prompts/i18n-config.ts
-import { select as select2, checkbox as checkbox2 } from "@inquirer/prompts";
+import { select as select3, checkbox as checkbox2 } from "@inquirer/prompts";
 var LOCALE_OPTIONS = Object.entries(AVAILABLE_LOCALES).map(([value, name]) => ({
   name: `${name} (${value})`,
   value,
@@ -612,7 +678,7 @@ var LOCALE_OPTIONS = Object.entries(AVAILABLE_LOCALES).map(([value, name]) => ({
   // English selected by default
 }));
 async function promptI18nConfig() {
-  showSection("Internationalization", 3, 5);
+  showSection("Internationalization", 4, 10);
   const supportedLocales = await checkbox2({
     message: "Which languages do you want to support?",
     choices: LOCALE_OPTIONS,
@@ -628,7 +694,7 @@ async function promptI18nConfig() {
     showInfo(`Default language set to ${AVAILABLE_LOCALES[defaultLocale]}`);
   } else {
     console.log("");
-    defaultLocale = await select2({
+    defaultLocale = await select3({
       message: "Which should be the default language?",
       choices: supportedLocales.map((locale) => ({
         name: `${AVAILABLE_LOCALES[locale]} (${locale})`,
@@ -644,7 +710,7 @@ async function promptI18nConfig() {
 }
 
 // src/wizard/prompts/billing-config.ts
-import { select as select3 } from "@inquirer/prompts";
+import { select as select4 } from "@inquirer/prompts";
 var BILLING_MODEL_OPTIONS = [
   {
     name: "Free (No payments)",
@@ -663,8 +729,8 @@ var BILLING_MODEL_OPTIONS = [
   }
 ];
 async function promptBillingConfig() {
-  showSection("Billing Configuration", 4, 5);
-  const billingModel = await select3({
+  showSection("Billing Configuration", 5, 10);
+  const billingModel = await select4({
     message: "What billing model do you want to use?",
     choices: BILLING_MODEL_OPTIONS,
     default: "freemium"
@@ -676,7 +742,7 @@ async function promptBillingConfig() {
   let currency = "usd";
   if (billingModel !== "free") {
     console.log("");
-    currency = await select3({
+    currency = await select4({
       message: "What currency will you use?",
       choices: CURRENCIES.map((c) => ({
         name: c.label,
@@ -728,7 +794,7 @@ var FEATURE_OPTIONS = [
   }
 ];
 async function promptFeaturesConfig() {
-  showSection("Features", 5, 5);
+  showSection("Features", 6, 10);
   showInfo("Select the features you want to include in your project.");
   showInfo("You can add or remove features later by editing your config files.");
   console.log("");
@@ -765,7 +831,7 @@ var CONTENT_FEATURE_OPTIONS = [
   }
 ];
 async function promptContentFeaturesConfig(mode = "interactive", totalSteps = 9) {
-  showSection("Content Features", 6, totalSteps);
+  showSection("Content Features", 7, totalSteps);
   showInfo("Enable optional content features for your project.");
   showInfo("These features add entities and blocks for building pages and blog posts.");
   console.log("");
@@ -816,7 +882,7 @@ function getDefaultAuthConfig() {
   };
 }
 async function promptAuthConfig(mode = "interactive", totalSteps = 8) {
-  showSection("Authentication", 6, totalSteps);
+  showSection("Authentication", 8, totalSteps);
   showInfo("Configure how users will authenticate to your application.");
   console.log("");
   const selectedMethods = await checkbox5({
@@ -900,7 +966,7 @@ function getDefaultDashboardConfig() {
   };
 }
 async function promptDashboardConfig(mode = "interactive", totalSteps = 8) {
-  showSection("Dashboard", 7, totalSteps);
+  showSection("Dashboard", 9, totalSteps);
   showInfo("Configure your dashboard user interface.");
   showInfo("These settings can be changed later in your theme config.");
   console.log("");
@@ -952,7 +1018,7 @@ function getDefaultDevConfig() {
   };
 }
 async function promptDevConfig(mode = "interactive", totalSteps = 8) {
-  showSection("Development Tools", 8, totalSteps);
+  showSection("Development Tools", 10, totalSteps);
   showInfo("Configure development and debugging tools.");
   showWarning("These tools are disabled in production builds.");
   console.log("");
@@ -979,7 +1045,7 @@ async function promptDevConfig(mode = "interactive", totalSteps = 8) {
 }
 
 // src/wizard/prompts/theme-selection.ts
-import { select as select4 } from "@inquirer/prompts";
+import { select as select5 } from "@inquirer/prompts";
 import chalk6 from "chalk";
 async function promptThemeSelection() {
   console.log("");
@@ -989,7 +1055,7 @@ async function promptThemeSelection() {
   console.log(chalk6.gray("  A reference theme provides a complete example to learn from."));
   console.log(chalk6.gray("  Your custom theme (based on starter) will be your active theme."));
   console.log("");
-  const theme = await select4({
+  const theme = await select5({
     message: "Which reference theme would you like to install?",
     choices: [
       {
@@ -1082,17 +1148,19 @@ import { confirm as confirm4, input as input3 } from "@inquirer/prompts";
 
 // src/wizard/prompts/index.ts
 async function runAllPrompts() {
+  const projectTypeConfig = await promptProjectType();
   const projectInfo = await promptProjectInfo();
   const teamConfig = await promptTeamConfig();
   const i18nConfig = await promptI18nConfig();
   const billingConfig = await promptBillingConfig();
   const featuresConfig = await promptFeaturesConfig();
-  const contentFeaturesConfig = await promptContentFeaturesConfig("interactive", 9);
-  const authConfig = await promptAuthConfig("interactive", 9);
-  const dashboardConfig = await promptDashboardConfig("interactive", 9);
-  const devConfig = await promptDevConfig("interactive", 9);
+  const contentFeaturesConfig = await promptContentFeaturesConfig("interactive", 10);
+  const authConfig = await promptAuthConfig("interactive", 10);
+  const dashboardConfig = await promptDashboardConfig("interactive", 10);
+  const devConfig = await promptDevConfig("interactive", 10);
   return {
     ...projectInfo,
+    ...projectTypeConfig,
     ...teamConfig,
     ...i18nConfig,
     ...billingConfig,
@@ -1104,17 +1172,19 @@ async function runAllPrompts() {
   };
 }
 async function runQuickPrompts() {
+  const projectTypeConfig = await promptProjectType();
   const projectInfo = await promptProjectInfo();
   const teamConfig = await promptTeamConfig();
   const i18nConfig = await promptI18nConfig();
   const billingConfig = await promptBillingConfig();
   const featuresConfig = await promptFeaturesConfig();
-  const contentFeaturesConfig = await promptContentFeaturesConfig("quick", 9);
+  const contentFeaturesConfig = await promptContentFeaturesConfig("quick", 10);
   const authConfig = { auth: getDefaultAuthConfig() };
   const dashboardConfig = { dashboard: getDefaultDashboardConfig() };
   const devConfig = { dev: getDefaultDevConfig() };
   return {
     ...projectInfo,
+    ...projectTypeConfig,
     ...teamConfig,
     ...i18nConfig,
     ...billingConfig,
@@ -1126,17 +1196,19 @@ async function runQuickPrompts() {
   };
 }
 async function runExpertPrompts() {
+  const projectTypeConfig = await promptProjectType();
   const projectInfo = await promptProjectInfo();
   const teamConfig = await promptTeamConfig();
   const i18nConfig = await promptI18nConfig();
   const billingConfig = await promptBillingConfig();
   const featuresConfig = await promptFeaturesConfig();
-  const contentFeaturesConfig = await promptContentFeaturesConfig("expert", 9);
-  const authConfig = await promptAuthConfig("expert", 9);
-  const dashboardConfig = await promptDashboardConfig("expert", 9);
-  const devConfig = await promptDevConfig("expert", 9);
+  const contentFeaturesConfig = await promptContentFeaturesConfig("expert", 10);
+  const authConfig = await promptAuthConfig("expert", 10);
+  const dashboardConfig = await promptDashboardConfig("expert", 10);
+  const devConfig = await promptDevConfig("expert", 10);
   return {
     ...projectInfo,
+    ...projectTypeConfig,
     ...teamConfig,
     ...i18nConfig,
     ...billingConfig,
@@ -1149,42 +1221,42 @@ async function runExpertPrompts() {
 }
 
 // src/wizard/generators/index.ts
-import fs7 from "fs-extra";
-import path5 from "path";
-import { fileURLToPath as fileURLToPath4 } from "url";
+import fs8 from "fs-extra";
+import path7 from "path";
+import { fileURLToPath as fileURLToPath7 } 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(process.cwd(), "node_modules/@nextsparkjs/core/templates")
-    ];
-    for (const p of possiblePaths) {
-      if (fs.existsSync(p)) {
-        return p;
-      }
+  const rootDir = process.cwd();
+  const possiblePaths = [
+    // From project root node_modules (most common for installed packages)
+    path.resolve(rootDir, "node_modules/@nextsparkjs/core/templates"),
+    // From CLI dist folder for development
+    path.resolve(__dirname3, "../../core/templates"),
+    // Legacy paths for different build structures
+    path.resolve(__dirname3, "../../../../../core/templates"),
+    path.resolve(__dirname3, "../../../../core/templates")
+  ];
+  for (const p of possiblePaths) {
+    if (fs.existsSync(p)) {
+      return p;
     }
-    throw new Error("Could not find @nextsparkjs/core templates directory");
   }
+  throw new Error(`Could not find @nextsparkjs/core templates directory. Searched: ${possiblePaths.join(", ")}`);
 }
 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 +1266,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 +1506,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 +1516,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 +1564,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 +1577,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 +1602,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 +1647,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 +1666,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 +1678,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 +1727,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 +1751,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 +1770,7 @@ GOOGLE_CLIENT_SECRET="your-google-client-secret"
 `;
   }
   const envContent = `# NextSpark Environment Configuration
-# Generated for: ${config.projectName}
+# Generated for: ${config2.projectName}
 
 # =============================================================================
 # DATABASE
@@ -1651,7 +1786,7 @@ BETTER_AUTH_SECRET="your-secret-key-here"
 # =============================================================================
 # THEME
 # =============================================================================
-NEXT_PUBLIC_ACTIVE_THEME="${config.projectSlug}"
+NEXT_PUBLIC_ACTIVE_THEME="${config2.projectSlug}"
 
 # =============================================================================
 # APPLICATION
@@ -1659,7 +1794,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,16 +1812,16 @@ ${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");
 }
@@ -1698,6 +1833,18 @@ async function copyEnvExampleToEnv() {
     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";
@@ -1705,8 +1852,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;
   }
@@ -1716,13 +1863,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;
   }
@@ -1735,45 +1882,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 });
@@ -1782,36 +1929,36 @@ 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(process.cwd(), "node_modules/@nextsparkjs/core/templates")
-    ];
-    for (const p of possiblePaths) {
-      if (fs4.existsSync(p)) {
-        return p;
-      }
+  const rootDir = process.cwd();
+  const possiblePaths = [
+    // From project root node_modules (most common for installed packages)
+    path4.resolve(rootDir, "node_modules/@nextsparkjs/core/templates"),
+    // From CLI dist folder for development
+    path4.resolve(__dirname4, "../../core/templates"),
+    // Legacy paths for different build structures
+    path4.resolve(__dirname4, "../../../../../core/templates"),
+    path4.resolve(__dirname4, "../../../../core/templates")
+  ];
+  for (const p of possiblePaths) {
+    if (fs4.existsSync(p)) {
+      return p;
     }
-    throw new Error("Could not find @nextsparkjs/core templates directory");
   }
+  throw new Error(`Could not find @nextsparkjs/core templates directory. Searched: ${possiblePaths.join(", ")}`);
 }
 function getFeaturesDir() {
   return path4.join(getTemplatesDir2(), "features");
@@ -1819,20 +1966,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)) {
@@ -1848,34 +2002,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;
@@ -1938,14 +2092,14 @@ 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"));
-      return pkg.version || "0.0.0";
+      const pkg2 = JSON.parse(readFileSync5(pkgPath, "utf-8"));
+      return pkg2.version || "0.0.0";
     } catch {
       return "0.0.0";
     }
@@ -1982,20 +2136,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);
     }
   }
@@ -2005,15 +2159,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 });
   }
@@ -2026,8 +2180,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 });
   }
@@ -2040,12 +2194,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 = {};
@@ -2085,7 +2239,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;
@@ -2138,7 +2292,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;
@@ -2198,62 +2352,607 @@ async function installThemeAndPlugins(theme, plugins) {
 
 // src/wizard/generators/env-setup.ts
 import fs5 from "fs-extra";
+import path5 from "path";
+import { fileURLToPath as fileURLToPath5 } from "url";
+var __filename5 = fileURLToPath5(import.meta.url);
+var __dirname5 = path5.dirname(__filename5);
+var ENV_TEMPLATE_PATH = path5.resolve(__dirname5, "../../../templates/env.template");
 
 // src/wizard/generators/git-init.ts
 import fs6 from "fs-extra";
 
+// src/wizard/generators/monorepo-generator.ts
+import fs7 from "fs-extra";
+import path6 from "path";
+import { fileURLToPath as fileURLToPath6 } from "url";
+var __filename6 = fileURLToPath6(import.meta.url);
+var __dirname6 = path6.dirname(__filename6);
+var DIRS = {
+  WEB: "web",
+  MOBILE: "mobile",
+  ASSETS: "assets"
+};
+var FILES = {
+  PNPM_WORKSPACE: "pnpm-workspace.yaml",
+  NPMRC: ".npmrc",
+  GITIGNORE: ".gitignore",
+  TSCONFIG: "tsconfig.json",
+  PACKAGE_JSON: "package.json",
+  README: "README.md",
+  APP_CONFIG: "app.config.ts"
+};
+var REQUIRED_MOBILE_TEMPLATE_FILES = [
+  "app",
+  "src",
+  "babel.config.js",
+  "metro.config.js"
+];
+var MOBILE_TEMPLATE_FILES = [
+  "app",
+  "src",
+  "babel.config.js",
+  "metro.config.js",
+  "tailwind.config.js",
+  "tsconfig.json",
+  "jest.config.js",
+  "eas.json"
+];
+var VERSIONS = {
+  // NextSpark packages
+  NEXTSPARK_MOBILE: "^0.1.0-beta.1",
+  NEXTSPARK_UI: "^0.1.0-beta.1",
+  // Core dependencies
+  TANSTACK_QUERY: "^5.62.0",
+  EXPO: "^54.0.0",
+  REACT: "19.1.0",
+  REACT_NATIVE: "0.81.5",
+  TYPESCRIPT: "^5.3.0",
+  // Expo modules (use ~ for patch compatibility)
+  EXPO_CONSTANTS: "~18.0.13",
+  EXPO_LINKING: "~8.0.11",
+  EXPO_ROUTER: "~6.0.22",
+  EXPO_SECURE_STORE: "~15.0.8",
+  EXPO_STATUS_BAR: "~3.0.9",
+  // React Native modules
+  RN_GESTURE_HANDLER: "~2.28.0",
+  RN_REANIMATED: "~4.1.1",
+  RN_SAFE_AREA: "~5.6.0",
+  RN_SCREENS: "~4.16.0",
+  RN_SVG: "15.12.1",
+  RN_WEB: "^0.21.0",
+  // Styling
+  NATIVEWIND: "^4.2.1",
+  TAILWINDCSS: "^3",
+  TAILWIND_MERGE: "^3.4.0",
+  LUCIDE_RN: "^0.563.0",
+  // Dev dependencies
+  BABEL_CORE: "^7.25.0",
+  JEST: "^29.7.0",
+  JEST_EXPO: "^54.0.16",
+  TESTING_LIBRARY_JEST_NATIVE: "^5.4.3",
+  TESTING_LIBRARY_RN: "^13.3.3"
+};
+function getMobileTemplatesDir() {
+  const possiblePaths = [
+    // From CWD node_modules (installed package)
+    path6.resolve(process.cwd(), "node_modules/@nextsparkjs/mobile/templates"),
+    // From CLI dist folder: ../../mobile/templates (development)
+    path6.resolve(__dirname6, "../../mobile/templates"),
+    // Legacy paths for different build structures
+    path6.resolve(__dirname6, "../../../../../mobile/templates"),
+    path6.resolve(__dirname6, "../../../../mobile/templates")
+  ];
+  for (const p of possiblePaths) {
+    if (fs7.existsSync(p)) {
+      return p;
+    }
+  }
+  const searchedPaths = possiblePaths.map((p) => `  - ${p}`).join("\n");
+  throw new Error(
+    `Could not find @nextsparkjs/mobile templates directory.
+
+Searched paths:
+${searchedPaths}
+
+To fix this, ensure @nextsparkjs/mobile is installed:
+  pnpm add @nextsparkjs/mobile
+
+If you're developing locally, make sure the mobile package is built:
+  cd packages/mobile && pnpm build`
+  );
+}
+async function validateMobileTemplate(templateDir) {
+  const missing = [];
+  for (const file of REQUIRED_MOBILE_TEMPLATE_FILES) {
+    const filePath = path6.join(templateDir, file);
+    if (!await fs7.pathExists(filePath)) {
+      missing.push(file);
+    }
+  }
+  if (missing.length > 0) {
+    throw new Error(
+      `Mobile template is incomplete. Missing required files:
+` + missing.map((f) => `  - ${f}`).join("\n") + `
+
+Template location: ${templateDir}
+Please ensure @nextsparkjs/mobile is properly installed and built.`
+    );
+  }
+}
+function slugToBundleId(slug) {
+  return slug.toLowerCase().replace(/[^a-z0-9]+/g, ".").replace(/^\.+|\.+$/g, "").replace(/\.{2,}/g, ".");
+}
+async function createRootPackageJson(targetDir, config2) {
+  const rootPkg = {
+    name: config2.projectSlug,
+    version: "0.1.0",
+    private: true,
+    scripts: {
+      // Web commands
+      "dev": `pnpm --filter ${DIRS.WEB} dev`,
+      "build": `pnpm --filter ${DIRS.WEB} build`,
+      "start": `pnpm --filter ${DIRS.WEB} start`,
+      "lint": "pnpm -r lint",
+      // Mobile commands
+      "dev:mobile": `pnpm --filter ${DIRS.MOBILE} start`,
+      "ios": `pnpm --filter ${DIRS.MOBILE} ios`,
+      "android": `pnpm --filter ${DIRS.MOBILE} android`,
+      // Shared commands
+      "typecheck": "pnpm -r typecheck",
+      "test": "pnpm -r test",
+      // Web-specific CLI commands (run from root)
+      "db:migrate": `pnpm --filter ${DIRS.WEB} db:migrate`,
+      "db:seed": `pnpm --filter ${DIRS.WEB} db:seed`,
+      "build:registries": `pnpm --filter ${DIRS.WEB} build:registries`
+    },
+    devDependencies: {
+      "typescript": VERSIONS.TYPESCRIPT
+    }
+  };
+  await fs7.writeJson(path6.join(targetDir, FILES.PACKAGE_JSON), rootPkg, { spaces: 2 });
+}
+async function createPnpmWorkspace(targetDir) {
+  const workspaceContent = `packages:
+  - '${DIRS.WEB}'
+  - '${DIRS.MOBILE}'
+`;
+  await fs7.writeFile(path6.join(targetDir, FILES.PNPM_WORKSPACE), workspaceContent);
+}
+async function createNpmrc(targetDir) {
+  const npmrcContent = `# Enable proper hoisting for monorepo
+public-hoist-pattern[]=*@nextsparkjs/*
+public-hoist-pattern[]=*expo*
+public-hoist-pattern[]=*react-native*
+shamefully-hoist=true
+`;
+  await fs7.writeFile(path6.join(targetDir, FILES.NPMRC), npmrcContent);
+}
+async function createGitignore(targetDir) {
+  const gitignoreContent = `# Dependencies
+node_modules/
+
+# Build outputs
+.next/
+dist/
+out/
+build/
+.expo/
+
+# NextSpark
+.nextspark/
+
+# Environment
+.env
+.env.local
+.env.*.local
+
+# IDE
+.idea/
+.vscode/
+*.swp
+*.swo
+
+# OS
+.DS_Store
+Thumbs.db
+
+# Testing
+coverage/
+.nyc_output/
+
+# Cypress (theme-based in web/)
+${DIRS.WEB}/contents/themes/*/tests/cypress/videos
+${DIRS.WEB}/contents/themes/*/tests/cypress/screenshots
+${DIRS.WEB}/contents/themes/*/tests/cypress/allure-results
+${DIRS.WEB}/contents/themes/*/tests/cypress/allure-report
+
+# Jest (theme-based in web/)
+${DIRS.WEB}/contents/themes/*/tests/jest/coverage
+
+# Mobile specific
+${DIRS.MOBILE}/.expo/
+*.jks
+*.p8
+*.p12
+*.key
+*.mobileprovision
+*.orig.*
+web-build/
+`;
+  await fs7.writeFile(path6.join(targetDir, FILES.GITIGNORE), gitignoreContent);
+}
+async function createRootTsConfig(targetDir) {
+  const tsConfig = {
+    compilerOptions: {
+      target: "ES2022",
+      module: "ESNext",
+      moduleResolution: "bundler",
+      strict: true,
+      skipLibCheck: true,
+      esModuleInterop: true
+    },
+    references: [
+      { path: `./${DIRS.WEB}` },
+      { path: `./${DIRS.MOBILE}` }
+    ]
+  };
+  await fs7.writeJson(path6.join(targetDir, FILES.TSCONFIG), tsConfig, { spaces: 2 });
+}
+async function copyMobileTemplate(targetDir, config2) {
+  const mobileTemplatesDir = getMobileTemplatesDir();
+  await validateMobileTemplate(mobileTemplatesDir);
+  const mobileDir = path6.join(targetDir, DIRS.MOBILE);
+  await fs7.ensureDir(mobileDir);
+  for (const item of MOBILE_TEMPLATE_FILES) {
+    const srcPath = path6.join(mobileTemplatesDir, item);
+    const destPath = path6.join(mobileDir, item);
+    if (await fs7.pathExists(srcPath)) {
+      await fs7.copy(srcPath, destPath);
+    }
+  }
+  await createMobilePackageJson(mobileDir, config2);
+  await createMobileAppConfig(mobileDir, config2);
+  await createMobileAssets(mobileDir, config2);
+}
+async function createMobilePackageJson(mobileDir, config2) {
+  const mobileSlug = `${config2.projectSlug}-mobile`;
+  const packageJson = {
+    name: mobileSlug,
+    version: "0.1.0",
+    private: true,
+    main: "expo-router/entry",
+    scripts: {
+      start: "expo start",
+      android: "expo start --android",
+      ios: "expo start --ios",
+      web: "expo start --web",
+      lint: "eslint .",
+      typecheck: "tsc --noEmit",
+      test: "jest",
+      "test:watch": "jest --watch",
+      "test:coverage": "jest --coverage"
+    },
+    dependencies: {
+      "@nextsparkjs/mobile": VERSIONS.NEXTSPARK_MOBILE,
+      "@nextsparkjs/ui": VERSIONS.NEXTSPARK_UI,
+      "@tanstack/react-query": VERSIONS.TANSTACK_QUERY,
+      "expo": VERSIONS.EXPO,
+      "expo-constants": VERSIONS.EXPO_CONSTANTS,
+      "expo-linking": VERSIONS.EXPO_LINKING,
+      "expo-router": VERSIONS.EXPO_ROUTER,
+      "expo-secure-store": VERSIONS.EXPO_SECURE_STORE,
+      "expo-status-bar": VERSIONS.EXPO_STATUS_BAR,
+      "lucide-react-native": VERSIONS.LUCIDE_RN,
+      "nativewind": VERSIONS.NATIVEWIND,
+      "react": VERSIONS.REACT,
+      "react-dom": VERSIONS.REACT,
+      "react-native": VERSIONS.REACT_NATIVE,
+      "react-native-web": VERSIONS.RN_WEB,
+      "react-native-gesture-handler": VERSIONS.RN_GESTURE_HANDLER,
+      "react-native-reanimated": VERSIONS.RN_REANIMATED,
+      "react-native-safe-area-context": VERSIONS.RN_SAFE_AREA,
+      "react-native-screens": VERSIONS.RN_SCREENS,
+      "react-native-svg": VERSIONS.RN_SVG,
+      "tailwind-merge": VERSIONS.TAILWIND_MERGE,
+      "tailwindcss": VERSIONS.TAILWINDCSS
+    },
+    devDependencies: {
+      "@babel/core": VERSIONS.BABEL_CORE,
+      "@testing-library/jest-native": VERSIONS.TESTING_LIBRARY_JEST_NATIVE,
+      "@testing-library/react-native": VERSIONS.TESTING_LIBRARY_RN,
+      "@types/jest": "^29.5.0",
+      "@types/react": "^19",
+      "jest": VERSIONS.JEST,
+      "jest-expo": VERSIONS.JEST_EXPO,
+      "react-test-renderer": VERSIONS.REACT,
+      "typescript": VERSIONS.TYPESCRIPT
+    }
+  };
+  await fs7.writeJson(path6.join(mobileDir, FILES.PACKAGE_JSON), packageJson, { spaces: 2 });
+}
+async function createMobileAppConfig(mobileDir, config2) {
+  const bundleId = slugToBundleId(config2.projectSlug);
+  const appConfigContent = `import { ExpoConfig, ConfigContext } from 'expo/config'
+
+export default ({ config }: ConfigContext): ExpoConfig => ({
+  ...config,
+  name: '${config2.projectName}',
+  slug: '${config2.projectSlug}',
+  version: '1.0.0',
+  orientation: 'portrait',
+  icon: './${DIRS.ASSETS}/icon.png',
+  userInterfaceStyle: 'automatic',
+  splash: {
+    image: './${DIRS.ASSETS}/splash.png',
+    resizeMode: 'contain',
+    backgroundColor: '#ffffff',
+  },
+  assetBundlePatterns: ['**/*'],
+  ios: {
+    supportsTablet: true,
+    bundleIdentifier: 'com.${bundleId}.app',
+  },
+  android: {
+    adaptiveIcon: {
+      foregroundImage: './${DIRS.ASSETS}/adaptive-icon.png',
+      backgroundColor: '#ffffff',
+    },
+    package: 'com.${bundleId}.app',
+  },
+  web: {
+    favicon: './${DIRS.ASSETS}/favicon.png',
+  },
+  extra: {
+    // API URL - Configure for your environment
+    // Development: point to your local web app (e.g., http://localhost:3000)
+    // Production: set via EAS environment variables
+    apiUrl: process.env.EXPO_PUBLIC_API_URL,
+  },
+  plugins: ['expo-router', 'expo-secure-store'],
+  scheme: '${config2.projectSlug}',
+})
+`;
+  await fs7.writeFile(path6.join(mobileDir, FILES.APP_CONFIG), appConfigContent);
+}
+async function createMobileAssets(mobileDir, config2) {
+  const assetsDir = path6.join(mobileDir, DIRS.ASSETS);
+  await fs7.ensureDir(assetsDir);
+  await fs7.writeFile(
+    path6.join(assetsDir, ".gitkeep"),
+    "# Placeholder - replace with your app icons and splash screens\n"
+  );
+  const assetsReadme = `# Mobile App Assets for ${config2.projectName}
+
+This directory contains your mobile app icons and splash screens.
+
+## Required Files
+
+| File | Size | Description |
+|------|------|-------------|
+| \`icon.png\` | 1024x1024px | Main app icon (iOS & Android) |
+| \`splash.png\` | 1284x2778px | Splash screen image |
+| \`adaptive-icon.png\` | 1024x1024px | Android adaptive icon (foreground) |
+| \`favicon.png\` | 48x48px | Web favicon |
+
+## How to Generate
+
+### Option 1: Expo Asset Generator (Recommended)
+
+1. Create a 1024x1024px icon image
+2. Use Expo's icon generator:
+   \`\`\`bash
+   npx expo-optimize
+   \`\`\`
+
+### Option 2: Online Tools
+
+- [Expo Icon Generator](https://docs.expo.dev/develop/user-interface/app-icons/)
+- [App Icon Generator](https://appicon.co/)
+- [Figma App Icon Template](https://www.figma.com/community/file/824894885635013116)
+
+### Option 3: Manual Creation
+
+Create each file at the specified sizes above. Use PNG format with transparency for icons.
+
+## Tips
+
+- Use a simple, recognizable design that works at small sizes
+- Test your icon on both light and dark backgrounds
+- Avoid text in the icon (it becomes illegible at small sizes)
+- Keep important content within the "safe zone" (center 80%)
+
+## Resources
+
+- [Expo App Icons Documentation](https://docs.expo.dev/develop/user-interface/app-icons/)
+- [iOS Human Interface Guidelines](https://developer.apple.com/design/human-interface-guidelines/app-icons)
+- [Android Adaptive Icons](https://developer.android.com/develop/ui/views/launch/icon_design_adaptive)
+`;
+  await fs7.writeFile(path6.join(assetsDir, "README.md"), assetsReadme);
+}
+async function createMonorepoReadme(targetDir, config2) {
+  const readmeContent = `# ${config2.projectName}
+
+${config2.projectDescription}
+
+## Project Structure
+
+This is a monorepo containing both web and mobile applications:
+
+\`\`\`
+${config2.projectSlug}/
+\u251C\u2500\u2500 ${DIRS.WEB}/                    # Next.js web application
+\u2502   \u251C\u2500\u2500 app/                # Next.js App Router
+\u2502   \u251C\u2500\u2500 contents/           # Themes and plugins
+\u2502   \u2514\u2500\u2500 package.json
+\u251C\u2500\u2500 ${DIRS.MOBILE}/                 # Expo mobile application
+\u2502   \u251C\u2500\u2500 app/                # Expo Router screens
+\u2502   \u251C\u2500\u2500 src/                # Mobile-specific code
+\u2502   \u2514\u2500\u2500 package.json
+\u251C\u2500\u2500 package.json            # Root monorepo
+\u2514\u2500\u2500 ${FILES.PNPM_WORKSPACE}
+\`\`\`
+
+## Getting Started
+
+### Prerequisites
+
+- Node.js 20+
+- pnpm 9+
+- For mobile: Expo CLI (\`npm install -g expo-cli\`)
+
+### Installation
+
+\`\`\`bash
+# Install all dependencies
+pnpm install
+
+# Set up environment variables
+cp ${DIRS.WEB}/.env.example ${DIRS.WEB}/.env
+# Edit ${DIRS.WEB}/.env with your configuration
+\`\`\`
+
+### Development
+
+**Web Application:**
+\`\`\`bash
+# From root directory
+pnpm dev
+
+# Or from web directory
+cd ${DIRS.WEB} && pnpm dev
+\`\`\`
+
+**Mobile Application:**
+\`\`\`bash
+# From root directory
+pnpm dev:mobile
+
+# Or from mobile directory
+cd ${DIRS.MOBILE} && pnpm start
+\`\`\`
+
+### Running Tests
+
+\`\`\`bash
+# Run all tests
+pnpm test
+
+# Run web tests only
+pnpm --filter ${DIRS.WEB} test
+
+# Run mobile tests only
+pnpm --filter ${DIRS.MOBILE} test
+\`\`\`
+
+## Mobile App Configuration
+
+The mobile app connects to your web API. Configure the API URL:
+
+- **Development:** The mobile app will auto-detect your local server
+- **Production:** Set \`EXPO_PUBLIC_API_URL\` in your EAS environment
+
+## Building for Production
+
+**Web:**
+\`\`\`bash
+pnpm build
+\`\`\`
+
+**Mobile:**
+\`\`\`bash
+cd ${DIRS.MOBILE}
+eas build --platform ios
+eas build --platform android
+\`\`\`
+
+## Learn More
+
+- [NextSpark Documentation](https://nextspark.dev/docs)
+- [Expo Documentation](https://docs.expo.dev)
+- [Next.js Documentation](https://nextjs.org/docs)
+`;
+  await fs7.writeFile(path6.join(targetDir, FILES.README), readmeContent);
+}
+async function generateMonorepoStructure(targetDir, config2) {
+  await createRootPackageJson(targetDir, config2);
+  await createPnpmWorkspace(targetDir);
+  await createNpmrc(targetDir);
+  await createGitignore(targetDir);
+  await createRootTsConfig(targetDir);
+  await createMonorepoReadme(targetDir, config2);
+  const webDir = path6.join(targetDir, DIRS.WEB);
+  await fs7.ensureDir(webDir);
+  await copyMobileTemplate(targetDir, config2);
+}
+function isMonorepoProject(config2) {
+  return config2.projectType === "web-mobile";
+}
+function getWebDir(targetDir, config2) {
+  return config2.projectType === "web-mobile" ? path6.join(targetDir, DIRS.WEB) : targetDir;
+}
+
 // src/wizard/generators/index.ts
-var __filename4 = fileURLToPath4(import.meta.url);
-var __dirname4 = path5.dirname(__filename4);
-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(process.cwd(), "node_modules/@nextsparkjs/core/templates")
-    ];
-    for (const p of possiblePaths) {
-      if (fs7.existsSync(p)) {
-        return p;
-      }
+var __filename7 = fileURLToPath7(import.meta.url);
+var __dirname7 = path7.dirname(__filename7);
+function getTemplatesDir3(projectRoot) {
+  const rootDir = projectRoot || process.cwd();
+  const possiblePaths = [
+    // From project root node_modules (most common for installed packages)
+    path7.resolve(rootDir, "node_modules/@nextsparkjs/core/templates"),
+    // From CLI dist folder for development
+    path7.resolve(__dirname7, "../../core/templates"),
+    // Legacy paths for different build structures
+    path7.resolve(__dirname7, "../../../../../core/templates"),
+    path7.resolve(__dirname7, "../../../../core/templates")
+  ];
+  for (const p of possiblePaths) {
+    if (fs8.existsSync(p)) {
+      return p;
     }
-    throw new Error("Could not find @nextsparkjs/core templates directory");
   }
+  throw new Error(`Could not find @nextsparkjs/core templates directory. Searched: ${possiblePaths.join(", ")}`);
 }
+var cachedTemplatesDir = null;
 async function copyProjectFiles() {
-  const templatesDir = getTemplatesDir3();
+  if (!cachedTemplatesDir) {
+    throw new Error("Templates directory not cached. Call cacheTemplatesDir() first.");
+  }
+  const templatesDir = cachedTemplatesDir;
   const projectDir = process.cwd();
   const itemsToCopy = [
     { src: "app", dest: "app", force: true },
     { src: "public", dest: "public", force: true },
+    { src: "proxy.ts", dest: "proxy.ts", force: true },
+    // Next.js 16+ proxy (formerly middleware.ts)
     { src: "next.config.mjs", dest: "next.config.mjs", force: true },
     { src: "tsconfig.json", dest: "tsconfig.json", force: true },
     { src: "postcss.config.mjs", dest: "postcss.config.mjs", force: true },
     { src: "i18n.ts", dest: "i18n.ts", force: true },
-    { src: "npmrc", dest: ".npmrc", force: false },
+    { src: "pnpm-workspace.yaml", dest: "pnpm-workspace.yaml", force: true },
+    // Enable workspace for themes/plugins - REQUIRED
+    // Note: .npmrc is NOT copied for web-only projects (not needed, pnpm default hoisting works fine)
+    // For monorepo projects, monorepo-generator.ts creates a specific .npmrc with expo/react-native patterns
     { 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);
-    const destPath = path5.join(projectDir, item.dest);
-    if (await fs7.pathExists(srcPath)) {
-      if (item.force || !await fs7.pathExists(destPath)) {
-        await fs7.copy(srcPath, destPath);
+    const srcPath = path7.join(templatesDir, item.src);
+    const destPath = path7.join(projectDir, item.dest);
+    if (await fs8.pathExists(srcPath)) {
+      if (item.force || !await fs8.pathExists(destPath)) {
+        await fs8.copy(srcPath, destPath);
       }
     }
   }
 }
-async function updatePackageJson(config) {
-  const packageJsonPath = path5.resolve(process.cwd(), "package.json");
+async function updatePackageJson(config2) {
+  const packageJsonPath = path7.resolve(process.cwd(), "package.json");
   let packageJson;
-  if (!await fs7.pathExists(packageJsonPath)) {
+  if (!await fs8.pathExists(packageJsonPath)) {
     packageJson = {
-      name: config.projectSlug,
+      name: config2.projectSlug,
       version: "0.1.0",
       private: true,
       scripts: {},
@@ -2261,7 +2960,7 @@ async function updatePackageJson(config) {
       devDependencies: {}
     };
   } else {
-    packageJson = await fs7.readJson(packageJsonPath);
+    packageJson = await fs8.readJson(packageJsonPath);
   }
   packageJson.scripts = packageJson.scripts || {};
   const scriptsToAdd = {
@@ -2272,11 +2971,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]) {
@@ -2286,8 +2987,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",
@@ -2346,24 +3047,26 @@ 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]) {
       packageJson.devDependencies[name] = version;
     }
   }
-  await fs7.writeJson(packageJsonPath, packageJson, { spaces: 2 });
+  await fs8.writeJson(packageJsonPath, packageJson, { spaces: 2 });
 }
-async function updateGitignore(config) {
-  const gitignorePath = path5.resolve(process.cwd(), ".gitignore");
+async function updateGitignore(config2) {
+  const gitignorePath = path7.resolve(process.cwd(), ".gitignore");
   const entriesToAdd = `
 # NextSpark
 .nextspark/
@@ -2381,40 +3084,65 @@ contents/themes/*/tests/jest/coverage
 .env
 .env.local
 `;
-  if (await fs7.pathExists(gitignorePath)) {
-    const currentContent = await fs7.readFile(gitignorePath, "utf-8");
+  if (await fs8.pathExists(gitignorePath)) {
+    const currentContent = await fs8.readFile(gitignorePath, "utf-8");
     if (!currentContent.includes(".nextspark/")) {
-      await fs7.appendFile(gitignorePath, entriesToAdd);
+      await fs8.appendFile(gitignorePath, entriesToAdd);
     }
   } else {
-    await fs7.writeFile(gitignorePath, entriesToAdd.trim());
-  }
-}
-async function generateProject(config) {
-  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 copyEnvExampleToEnv();
+    await fs8.writeFile(gitignorePath, entriesToAdd.trim());
+  }
+}
+async function generateProject(config2) {
+  const projectDir = process.cwd();
+  cachedTemplatesDir = getTemplatesDir3(projectDir);
+  const webDir = getWebDir(projectDir, config2);
+  if (isMonorepoProject(config2)) {
+    await generateMonorepoStructure(projectDir, config2);
+  }
+  const originalCwd = process.cwd();
+  if (isMonorepoProject(config2)) {
+    process.chdir(webDir);
+  }
+  try {
+    await copyProjectFiles();
+    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);
+    if (!isMonorepoProject(config2)) {
+      await updateGitignore(config2);
+    }
+    await generateEnvExample(config2);
+    if (!isMonorepoProject(config2)) {
+      await updateReadme(config2);
+    }
+    await copyEnvExampleToEnv();
+  } finally {
+    if (isMonorepoProject(config2)) {
+      process.chdir(originalCwd);
+    }
+    cachedTemplatesDir = null;
+  }
 }
 
 // src/wizard/presets.ts
 var SAAS_PRESET = {
+  projectType: "web",
   teamMode: "multi-tenant",
   teamRoles: ["owner", "admin", "member", "viewer"],
   defaultLocale: "en",
@@ -2453,6 +3181,7 @@ var SAAS_PRESET = {
   }
 };
 var BLOG_PRESET = {
+  projectType: "web",
   teamMode: "single-user",
   teamRoles: ["owner"],
   defaultLocale: "en",
@@ -2491,6 +3220,7 @@ var BLOG_PRESET = {
   }
 };
 var CRM_PRESET = {
+  projectType: "web",
   teamMode: "single-tenant",
   teamRoles: ["owner", "admin", "member"],
   defaultLocale: "en",
@@ -2545,11 +3275,13 @@ function getPreset(name) {
   }
   return preset;
 }
-function applyPreset(projectInfo, presetName) {
+function applyPreset(projectInfo, presetName, typeOverride) {
   const preset = getPreset(presetName);
   return {
     ...projectInfo,
-    ...preset
+    ...preset,
+    // Apply type override if provided
+    ...typeOverride && { projectType: typeOverride }
   };
 }
 
@@ -2573,9 +3305,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`);
@@ -2591,7 +3323,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`);
@@ -2604,7 +3336,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`);
@@ -2642,10 +3374,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)));
@@ -2707,8 +3439,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);
   }
@@ -2732,43 +3464,41 @@ async function runWizard(options = { mode: "interactive" }) {
   try {
     let selectedTheme = null;
     let selectedPlugins = [];
-    if (!options.preset) {
-      if (options.theme !== void 0) {
-        selectedTheme = options.theme === "none" ? null : options.theme;
-        showInfo(`Reference theme: ${selectedTheme || "None"}`);
-      } else if (options.mode !== "quick") {
-        selectedTheme = await promptThemeSelection();
-      }
-      if (options.plugins !== void 0) {
-        selectedPlugins = options.plugins;
-        if (selectedPlugins.length > 0) {
-          showInfo(`Selected plugins: ${selectedPlugins.join(", ")}`);
-        }
-      } else if (options.mode !== "quick" && !options.yes) {
-        selectedPlugins = await promptPluginsSelection(selectedTheme);
-      } else if (selectedTheme) {
-        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);
+    if (options.theme !== void 0) {
+      selectedTheme = options.theme === "none" ? null : options.theme;
+      showInfo(`Reference theme: ${selectedTheme || "None"}`);
+    } else if (!options.preset && options.mode !== "quick") {
+      selectedTheme = await promptThemeSelection();
+    }
+    if (options.plugins !== void 0) {
+      selectedPlugins = options.plugins;
+      if (selectedPlugins.length > 0) {
+        showInfo(`Selected plugins: ${selectedPlugins.join(", ")}`);
+      }
+    } else if (!options.preset && options.mode !== "quick" && !options.yes) {
+      selectedPlugins = await promptPluginsSelection(selectedTheme);
+    } else if (selectedTheme) {
+      selectedPlugins = getRequiredPlugins(selectedTheme);
+    }
+    showConfigSummary(config2);
+    showConfigPreview(config2);
     if (!options.yes) {
       console.log("");
       const proceed = await confirm5({
@@ -2781,20 +3511,27 @@ async function runWizard(options = { mode: "interactive" }) {
         process.exit(0);
       }
     }
-    await copyNpmrc();
     console.log("");
     const coreInstalled = await installCore();
     if (!coreInstalled) {
       showError("Failed to install @nextsparkjs/core. Cannot generate project.");
       process.exit(1);
     }
+    if (config2.projectType === "web-mobile") {
+      console.log("");
+      const mobileInstalled = await installMobile();
+      if (!mobileInstalled) {
+        showError("Failed to install @nextsparkjs/mobile. Cannot generate monorepo project.");
+        process.exit(1);
+      }
+    }
     console.log("");
     const spinner = ora7({
       text: "Generating your NextSpark project...",
       prefixText: "  "
     }).start();
     try {
-      await generateProject(config);
+      await generateProject(config2);
       spinner.succeed("Project generated successfully!");
     } catch (error) {
       spinner.fail("Failed to generate project");
@@ -2803,14 +3540,19 @@ async function runWizard(options = { mode: "interactive" }) {
     if (selectedTheme || selectedPlugins.length > 0) {
       await installThemeAndPlugins(selectedTheme, selectedPlugins);
     }
+    const projectRoot = process.cwd();
+    const webDir = getWebDir(projectRoot, config2);
+    const isMonorepo = isMonorepoProject(config2);
     const installSpinner = ora7({
-      text: "Installing dependencies...",
+      text: isMonorepo ? "Installing dependencies (monorepo)..." : "Installing dependencies...",
       prefixText: "  "
     }).start();
     try {
+      installSpinner.stop();
       execSync("pnpm install --force", {
-        cwd: process.cwd(),
-        stdio: "pipe"
+        cwd: projectRoot,
+        // Always install from root (works for both flat and monorepo)
+        stdio: "inherit"
       });
       installSpinner.succeed("Dependencies installed!");
     } catch (error) {
@@ -2822,22 +3564,24 @@ async function runWizard(options = { mode: "interactive" }) {
       prefixText: "  "
     }).start();
     try {
-      const projectRoot = process.cwd();
-      const registryScript = join6(projectRoot, "node_modules/@nextsparkjs/core/scripts/build/registry.mjs");
+      const registryScript = join7(webDir, "node_modules/@nextsparkjs/core/scripts/build/registry.mjs");
+      registrySpinner.stop();
       execSync(`node "${registryScript}" --build`, {
-        cwd: projectRoot,
-        stdio: "pipe",
+        cwd: webDir,
+        // Run from web directory
+        stdio: "inherit",
         env: {
           ...process.env,
-          NEXTSPARK_PROJECT_ROOT: projectRoot
+          NEXTSPARK_PROJECT_ROOT: webDir
         }
       });
       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"'));
+      const devCmd = isMonorepo ? "pnpm dev" : "pnpm dev";
+      console.log(chalk11.yellow(`  Registries will be built automatically when you run "${devCmd}"`));
     }
-    showNextSteps(config, selectedTheme);
+    showNextSteps(config2, selectedTheme);
   } catch (error) {
     if (error instanceof Error) {
       if (error.message.includes("User force closed")) {
@@ -2877,46 +3621,47 @@ async function runPresetMode(presetName, options) {
     console.log("");
     projectInfo = await promptProjectInfo();
   }
-  const config = applyPreset(projectInfo, presetName);
-  return config;
+  const config2 = applyPreset(projectInfo, presetName, options.type);
+  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(chalk11.gray(`    Type: ${chalk11.white(config2.projectType === "web-mobile" ? "Web + Mobile (Monorepo)" : "Web only")}`));
   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) {
@@ -2943,7 +3688,8 @@ function formatDevTool(tool) {
   };
   return mapping[tool] || tool;
 }
-function showNextSteps(config, referenceTheme = null) {
+function showNextSteps(config2, referenceTheme = null) {
+  const isMonorepo = config2.projectType === "web-mobile";
   console.log("");
   console.log(chalk11.cyan("  " + "=".repeat(60)));
   console.log(chalk11.bold.green("  \u2728 NextSpark project ready!"));
@@ -2951,8 +3697,9 @@ function showNextSteps(config, referenceTheme = null) {
   console.log("");
   console.log(chalk11.bold.white("  Next steps:"));
   console.log("");
+  const envPath = isMonorepo ? "web/.env" : ".env";
   console.log(chalk11.white("  1. Configure your .env file:"));
-  console.log(chalk11.gray("     Edit these values in .env:"));
+  console.log(chalk11.gray(`     Edit these values in ${envPath}:`));
   console.log("");
   console.log(chalk11.yellow("     DATABASE_URL"));
   console.log(chalk11.gray("     PostgreSQL connection string"));
@@ -2968,11 +3715,25 @@ function showNextSteps(config, referenceTheme = null) {
   console.log(chalk11.white("  3. Start the development server:"));
   console.log(chalk11.cyan("     pnpm dev"));
   console.log("");
+  if (isMonorepo) {
+    console.log(chalk11.white("  4. (Optional) Start the mobile app:"));
+    console.log(chalk11.cyan("     pnpm dev:mobile"));
+    console.log(chalk11.gray("     Or: cd mobile && pnpm start"));
+    console.log("");
+  }
   console.log(chalk11.gray("  " + "-".repeat(60)));
-  console.log(chalk11.gray(`  Theme: ${chalk11.white(`contents/themes/${config.projectSlug}/`)}`));
-  console.log(chalk11.gray(`  Active theme: ${chalk11.green(`NEXT_PUBLIC_ACTIVE_THEME=${config.projectSlug}`)}`));
+  if (isMonorepo) {
+    console.log(chalk11.gray(`  Structure: ${chalk11.white("Monorepo (web/ + mobile/)")}`));
+    console.log(chalk11.gray(`  Web theme: ${chalk11.white(`web/contents/themes/${config2.projectSlug}/`)}`));
+    console.log(chalk11.gray(`  Mobile app: ${chalk11.white("mobile/")}`));
+    console.log(chalk11.gray(`  Active theme: ${chalk11.green(`NEXT_PUBLIC_ACTIVE_THEME=${config2.projectSlug}`)}`));
+  } else {
+    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: ${chalk11.white(`contents/themes/${referenceTheme}/`)}`));
+    const refPath = isMonorepo ? `web/contents/themes/${referenceTheme}/` : `contents/themes/${referenceTheme}/`;
+    console.log(chalk11.gray(`  Reference: ${chalk11.white(refPath)}`));
   }
   console.log(chalk11.gray("  Docs: https://nextspark.dev/docs"));
   console.log("");
@@ -2985,14 +3746,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() {
@@ -3010,8 +3771,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}`;
@@ -3020,8 +3781,9 @@ async function installCore() {
     } else {
       installCmd = `npm install ${packageSpec}`;
     }
+    spinner.stop();
     execSync(installCmd, {
-      stdio: "pipe",
+      stdio: "inherit",
       cwd: process.cwd()
     });
     spinner.succeed(chalk11.green("@nextsparkjs/core installed successfully!"));
@@ -3035,17 +3797,64 @@ async function installCore() {
     return false;
   }
 }
-async function copyNpmrc() {
-  const npmrcPath = join6(process.cwd(), ".npmrc");
-  if (existsSync7(npmrcPath)) {
-    return;
+function isMobileInstalled() {
+  const mobilePath = join7(process.cwd(), "node_modules", "@nextsparkjs", "mobile");
+  return existsSync7(mobilePath);
+}
+function findLocalMobileTarball() {
+  const cwd = process.cwd();
+  try {
+    const files = readdirSync(cwd);
+    const mobileTarball = files.find(
+      (f) => f.includes("nextsparkjs-mobile") && f.endsWith(".tgz")
+    );
+    if (mobileTarball) {
+      return join7(cwd, mobileTarball);
+    }
+  } catch {
+  }
+  return null;
+}
+async function installMobile() {
+  if (isMobileInstalled()) {
+    return true;
+  }
+  const spinner = ora7({
+    text: "Installing @nextsparkjs/mobile...",
+    prefixText: "  "
+  }).start();
+  try {
+    const localTarball = findLocalMobileTarball();
+    let packageSpec = "@nextsparkjs/mobile";
+    if (localTarball) {
+      packageSpec = localTarball;
+      spinner.text = "Installing @nextsparkjs/mobile from local tarball...";
+    }
+    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}`;
+    } else if (useYarn) {
+      installCmd = `yarn add ${packageSpec}`;
+    } else {
+      installCmd = `npm install ${packageSpec}`;
+    }
+    spinner.stop();
+    execSync(installCmd, {
+      stdio: "inherit",
+      cwd: process.cwd()
+    });
+    spinner.succeed(chalk11.green("@nextsparkjs/mobile installed successfully!"));
+    return true;
+  } catch (error) {
+    spinner.fail(chalk11.red("Failed to install @nextsparkjs/mobile"));
+    if (error instanceof Error) {
+      console.log(chalk11.red(`  Error: ${error.message}`));
+    }
+    console.log(chalk11.gray("  Hint: Make sure the package is available (npm registry or local tarball)"));
+    return false;
   }
-  const npmrcContent = `# Hoist @nextsparkjs/core dependencies so they're accessible from the project
-# This is required for pnpm to make peer dependencies available
-public-hoist-pattern[]=*
-`;
-  const { writeFileSync: writeFileSync3 } = await import("fs");
-  writeFileSync3(npmrcPath, npmrcContent);
 }
 
 // src/commands/init.ts
@@ -3060,10 +3869,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, {
@@ -3076,26 +3885,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> = {}
@@ -3103,11 +3912,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'
@@ -3122,18 +3931,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,
@@ -3142,7 +3951,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"
@@ -3185,25 +3994,133 @@ async function initCommand(options) {
     yes: options.yes,
     name: options.name,
     slug: options.slug,
-    description: options.description
+    description: options.description,
+    type: options.type
   };
   await runWizard(wizardOptions);
 }
 
+// src/commands/add-mobile.ts
+import { existsSync as existsSync9, cpSync as cpSync2, readFileSync as readFileSync8, writeFileSync as writeFileSync3, renameSync, mkdirSync as mkdirSync3 } from "fs";
+import { join as join9 } from "path";
+import chalk13 from "chalk";
+import ora9 from "ora";
+import { execSync as execSync2 } from "child_process";
+function findMobileCoreDir() {
+  const projectRoot = process.cwd();
+  const npmPath = join9(projectRoot, "node_modules", "@nextsparkjs", "mobile");
+  if (existsSync9(npmPath)) {
+    return npmPath;
+  }
+  const monoPath = join9(projectRoot, "packages", "mobile");
+  if (existsSync9(monoPath)) {
+    return monoPath;
+  }
+  const parentNpmPath = join9(projectRoot, "..", "node_modules", "@nextsparkjs", "mobile");
+  if (existsSync9(parentNpmPath)) {
+    return parentNpmPath;
+  }
+  throw new Error(
+    "Could not find @nextsparkjs/mobile package.\nRun: npm install @nextsparkjs/mobile"
+  );
+}
+async function addMobileCommand(options = {}) {
+  const projectRoot = process.cwd();
+  const mobileDir = join9(projectRoot, "mobile");
+  console.log();
+  console.log(chalk13.bold("Adding NextSpark Mobile App"));
+  console.log();
+  if (existsSync9(mobileDir) && !options.force) {
+    console.log(chalk13.red("Error: Mobile app already exists at mobile/"));
+    console.log(chalk13.gray("Use --force to overwrite"));
+    process.exit(1);
+  }
+  let mobileCoreDir;
+  try {
+    mobileCoreDir = findMobileCoreDir();
+  } catch (error) {
+    console.log(chalk13.red(error.message));
+    process.exit(1);
+  }
+  const templatesDir = join9(mobileCoreDir, "templates");
+  if (!existsSync9(templatesDir)) {
+    console.log(chalk13.red("Error: Could not find mobile templates"));
+    console.log(chalk13.gray(`Expected at: ${templatesDir}`));
+    process.exit(1);
+  }
+  const copySpinner = ora9("Copying mobile app template...").start();
+  try {
+    mkdirSync3(mobileDir, { recursive: true });
+    cpSync2(templatesDir, mobileDir, { recursive: true });
+    const pkgTemplatePath = join9(mobileDir, "package.json.template");
+    const pkgPath = join9(mobileDir, "package.json");
+    if (existsSync9(pkgTemplatePath)) {
+      renameSync(pkgTemplatePath, pkgPath);
+      const pkg2 = JSON.parse(readFileSync8(pkgPath, "utf-8"));
+      const rootPkgPath = join9(projectRoot, "package.json");
+      if (existsSync9(rootPkgPath)) {
+        const rootPkg = JSON.parse(readFileSync8(rootPkgPath, "utf-8"));
+        const rawName = rootPkg.name || "my-project";
+        if (rawName.startsWith("@")) {
+          const scopeMatch = rawName.match(/^@[\w-]+/);
+          const scope = scopeMatch ? scopeMatch[0] : "";
+          const projectName = rawName.replace(/^@[\w-]+\//, "");
+          pkg2.name = `${scope}/${projectName}-mobile`;
+        } else {
+          pkg2.name = `${rawName}-mobile`;
+        }
+      }
+      writeFileSync3(pkgPath, JSON.stringify(pkg2, null, 2));
+    }
+    copySpinner.succeed("Mobile app template copied");
+  } catch (error) {
+    copySpinner.fail("Failed to copy templates");
+    console.log(chalk13.red(error.message));
+    process.exit(1);
+  }
+  if (!options.skipInstall) {
+    const installSpinner = ora9("Installing dependencies...").start();
+    try {
+      execSync2("npm install", {
+        cwd: mobileDir,
+        stdio: "pipe",
+        timeout: 3e5
+        // 5 minutes
+      });
+      installSpinner.succeed("Dependencies installed");
+    } catch (error) {
+      installSpinner.fail("Failed to install dependencies");
+      console.log(chalk13.yellow("  Run `npm install` in mobile/ manually"));
+    }
+  }
+  console.log();
+  console.log(chalk13.green.bold("  Mobile app created successfully!"));
+  console.log();
+  console.log(chalk13.bold("  Next steps:"));
+  console.log();
+  console.log(`  ${chalk13.cyan("1.")} cd mobile`);
+  console.log(`  ${chalk13.cyan("2.")} Update ${chalk13.bold("app.config.ts")} with your app name and bundle ID`);
+  console.log(`  ${chalk13.cyan("3.")} Add your entities in ${chalk13.bold("src/entities/")}`);
+  console.log(`  ${chalk13.cyan("4.")} npm start`);
+  console.log();
+  console.log(chalk13.gray("  Documentation: https://nextspark.dev/docs/mobile"));
+  console.log();
+}
+
 // src/commands/doctor.ts
-import chalk14 from "chalk";
+import chalk15 from "chalk";
 
 // src/doctor/index.ts
-import chalk13 from "chalk";
+import chalk14 from "chalk";
 
 // src/doctor/checks/dependencies.ts
-import fs8 from "fs-extra";
-import path6 from "path";
+import fs9 from "fs-extra";
+import path8 from "path";
 async function checkDependencies() {
   const cwd = process.cwd();
-  const nodeModulesPath = path6.join(cwd, "node_modules");
-  const packageJsonPath = path6.join(cwd, "package.json");
-  if (!await fs8.pathExists(packageJsonPath)) {
+  const nodeModulesPath = path8.join(cwd, "node_modules");
+  const packageJsonPath = path8.join(cwd, "package.json");
+  if (!await fs9.pathExists(packageJsonPath)) {
     return {
       name: "Dependencies",
       status: "fail",
@@ -3211,7 +4128,7 @@ async function checkDependencies() {
       fix: "Ensure you are in a NextSpark project directory"
     };
   }
-  if (!await fs8.pathExists(nodeModulesPath)) {
+  if (!await fs9.pathExists(nodeModulesPath)) {
     return {
       name: "Dependencies",
       status: "fail",
@@ -3221,7 +4138,7 @@ async function checkDependencies() {
   }
   let packageJson;
   try {
-    packageJson = await fs8.readJson(packageJsonPath);
+    packageJson = await fs9.readJson(packageJsonPath);
   } catch {
     return {
       name: "Dependencies",
@@ -3238,14 +4155,14 @@ async function checkDependencies() {
   const criticalDeps = ["next", "react", "react-dom"];
   for (const dep of criticalDeps) {
     if (allDependencies[dep]) {
-      const depPath = path6.join(nodeModulesPath, dep);
-      if (!await fs8.pathExists(depPath)) {
+      const depPath = path8.join(nodeModulesPath, dep);
+      if (!await fs9.pathExists(depPath)) {
         missingDeps.push(dep);
       }
     }
   }
-  const nextsparksCorePath = path6.join(nodeModulesPath, "@nextsparkjs", "core");
-  const hasNextSparkCore = await fs8.pathExists(nextsparksCorePath);
+  const nextsparksCorePath = path8.join(nodeModulesPath, "@nextsparkjs", "core");
+  const hasNextSparkCore = await fs9.pathExists(nextsparksCorePath);
   if (missingDeps.length > 0) {
     return {
       name: "Dependencies",
@@ -3270,8 +4187,8 @@ async function checkDependencies() {
 }
 
 // src/doctor/checks/config.ts
-import fs9 from "fs-extra";
-import path7 from "path";
+import fs10 from "fs-extra";
+import path9 from "path";
 var REQUIRED_CONFIG_FILES = [
   "next.config.ts",
   "tailwind.config.ts",
@@ -3282,13 +4199,13 @@ async function checkConfigs() {
   const missingFiles = [];
   const invalidFiles = [];
   for (const file of REQUIRED_CONFIG_FILES) {
-    const filePath = path7.join(cwd, file);
+    const filePath = path9.join(cwd, file);
     if (file.endsWith(".ts")) {
-      const jsPath = path7.join(cwd, file.replace(".ts", ".js"));
-      const mjsPath = path7.join(cwd, file.replace(".ts", ".mjs"));
-      const tsExists = await fs9.pathExists(filePath);
-      const jsExists = await fs9.pathExists(jsPath);
-      const mjsExists = await fs9.pathExists(mjsPath);
+      const jsPath = path9.join(cwd, file.replace(".ts", ".js"));
+      const mjsPath = path9.join(cwd, file.replace(".ts", ".mjs"));
+      const tsExists = await fs10.pathExists(filePath);
+      const jsExists = await fs10.pathExists(jsPath);
+      const mjsExists = await fs10.pathExists(mjsPath);
       if (!tsExists && !jsExists && !mjsExists) {
         if (!file.includes("next.config") && !file.includes("tailwind.config")) {
           missingFiles.push(file);
@@ -3296,14 +4213,14 @@ async function checkConfigs() {
       }
       continue;
     }
-    if (!await fs9.pathExists(filePath)) {
+    if (!await fs10.pathExists(filePath)) {
       missingFiles.push(file);
     }
   }
-  const tsconfigPath = path7.join(cwd, "tsconfig.json");
-  if (await fs9.pathExists(tsconfigPath)) {
+  const tsconfigPath = path9.join(cwd, "tsconfig.json");
+  if (await fs10.pathExists(tsconfigPath)) {
     try {
-      const content = await fs9.readFile(tsconfigPath, "utf-8");
+      const content = await fs10.readFile(tsconfigPath, "utf-8");
       JSON.parse(content);
     } catch {
       invalidFiles.push("tsconfig.json");
@@ -3311,14 +4228,14 @@ async function checkConfigs() {
   } else {
     missingFiles.push("tsconfig.json");
   }
-  const configDir = path7.join(cwd, "config");
-  if (await fs9.pathExists(configDir)) {
-    const configFiles = await fs9.readdir(configDir);
+  const configDir = path9.join(cwd, "config");
+  if (await fs10.pathExists(configDir)) {
+    const configFiles = await fs10.readdir(configDir);
     const tsConfigFiles = configFiles.filter((f) => f.endsWith(".ts"));
     for (const file of tsConfigFiles) {
-      const filePath = path7.join(configDir, file);
+      const filePath = path9.join(configDir, file);
       try {
-        const content = await fs9.readFile(filePath, "utf-8");
+        const content = await fs10.readFile(filePath, "utf-8");
         if (content.trim().length === 0) {
           invalidFiles.push(`config/${file}`);
         }
@@ -3351,8 +4268,8 @@ async function checkConfigs() {
 }
 
 // src/doctor/checks/database.ts
-import fs10 from "fs-extra";
-import path8 from "path";
+import fs11 from "fs-extra";
+import path10 from "path";
 function parseEnvFile(content) {
   const result = {};
   const lines = content.split("\n");
@@ -3375,25 +4292,25 @@ function parseEnvFile(content) {
 }
 async function checkDatabase() {
   const cwd = process.cwd();
-  const envPath = path8.join(cwd, ".env");
-  const envLocalPath = path8.join(cwd, ".env.local");
+  const envPath = path10.join(cwd, ".env");
+  const envLocalPath = path10.join(cwd, ".env.local");
   let envVars = {};
-  if (await fs10.pathExists(envLocalPath)) {
+  if (await fs11.pathExists(envLocalPath)) {
     try {
-      const content = await fs10.readFile(envLocalPath, "utf-8");
+      const content = await fs11.readFile(envLocalPath, "utf-8");
       envVars = { ...envVars, ...parseEnvFile(content) };
     } catch {
     }
   }
-  if (await fs10.pathExists(envPath)) {
+  if (await fs11.pathExists(envPath)) {
     try {
-      const content = await fs10.readFile(envPath, "utf-8");
+      const content = await fs11.readFile(envPath, "utf-8");
       envVars = { ...envVars, ...parseEnvFile(content) };
     } catch {
     }
   }
   const databaseUrl = envVars["DATABASE_URL"] || process.env.DATABASE_URL;
-  if (!await fs10.pathExists(envPath) && !await fs10.pathExists(envLocalPath)) {
+  if (!await fs11.pathExists(envPath) && !await fs11.pathExists(envLocalPath)) {
     return {
       name: "Database",
       status: "warn",
@@ -3434,22 +4351,22 @@ async function checkDatabase() {
 }
 
 // src/doctor/checks/imports.ts
-import fs11 from "fs-extra";
-import path9 from "path";
+import fs12 from "fs-extra";
+import path11 from "path";
 async function checkCorePackage(cwd) {
-  const nodeModulesPath = path9.join(cwd, "node_modules", "@nextsparkjs", "core");
-  if (!await fs11.pathExists(nodeModulesPath)) {
+  const nodeModulesPath = path11.join(cwd, "node_modules", "@nextsparkjs", "core");
+  if (!await fs12.pathExists(nodeModulesPath)) {
     return { accessible: false, reason: "@nextsparkjs/core not found in node_modules" };
   }
-  const packageJsonPath = path9.join(nodeModulesPath, "package.json");
-  if (!await fs11.pathExists(packageJsonPath)) {
+  const packageJsonPath = path11.join(nodeModulesPath, "package.json");
+  if (!await fs12.pathExists(packageJsonPath)) {
     return { accessible: false, reason: "@nextsparkjs/core package.json not found" };
   }
   try {
-    const packageJson = await fs11.readJson(packageJsonPath);
+    const packageJson = await fs12.readJson(packageJsonPath);
     const mainEntry = packageJson.main || packageJson.module || "./dist/index.js";
-    const mainPath = path9.join(nodeModulesPath, mainEntry);
-    if (!await fs11.pathExists(mainPath)) {
+    const mainPath = path11.join(nodeModulesPath, mainEntry);
+    if (!await fs12.pathExists(mainPath)) {
       return { accessible: false, reason: "@nextsparkjs/core entry point not found" };
     }
   } catch {
@@ -3462,8 +4379,8 @@ async function scanForBrokenImports(cwd) {
   const srcDirs = ["src", "app", "pages", "components", "lib"];
   const existingDirs = [];
   for (const dir of srcDirs) {
-    const dirPath = path9.join(cwd, dir);
-    if (await fs11.pathExists(dirPath)) {
+    const dirPath = path11.join(cwd, dir);
+    if (await fs12.pathExists(dirPath)) {
       existingDirs.push(dirPath);
     }
   }
@@ -3472,32 +4389,32 @@ async function scanForBrokenImports(cwd) {
   for (const dir of existingDirs) {
     if (filesScanned >= maxFilesToScan) break;
     try {
-      const files = await fs11.readdir(dir, { withFileTypes: true });
+      const files = await fs12.readdir(dir, { withFileTypes: true });
       for (const file of files) {
         if (filesScanned >= maxFilesToScan) break;
         if (file.isFile() && (file.name.endsWith(".ts") || file.name.endsWith(".tsx"))) {
-          const filePath = path9.join(dir, file.name);
+          const filePath = path11.join(dir, file.name);
           try {
-            const content = await fs11.readFile(filePath, "utf-8");
+            const content = await fs12.readFile(filePath, "utf-8");
             const importMatches = content.match(/from ['"](@?[^'"]+)['"]/g);
             if (importMatches) {
               for (const match of importMatches) {
                 const importPath = match.replace(/from ['"]/g, "").replace(/['"]/g, "");
                 if (importPath.startsWith(".")) {
-                  const absoluteImportPath = path9.resolve(path9.dirname(filePath), importPath);
+                  const absoluteImportPath = path11.resolve(path11.dirname(filePath), importPath);
                   const possiblePaths = [
                     absoluteImportPath,
                     `${absoluteImportPath}.ts`,
                     `${absoluteImportPath}.tsx`,
                     `${absoluteImportPath}.js`,
                     `${absoluteImportPath}.jsx`,
-                    path9.join(absoluteImportPath, "index.ts"),
-                    path9.join(absoluteImportPath, "index.tsx"),
-                    path9.join(absoluteImportPath, "index.js")
+                    path11.join(absoluteImportPath, "index.ts"),
+                    path11.join(absoluteImportPath, "index.tsx"),
+                    path11.join(absoluteImportPath, "index.js")
                   ];
                   const exists = await Promise.any(
                     possiblePaths.map(async (p) => {
-                      if (await fs11.pathExists(p)) return true;
+                      if (await fs12.pathExists(p)) return true;
                       throw new Error("Not found");
                     })
                   ).catch(() => false);
@@ -3521,11 +4438,11 @@ async function checkImports() {
   const cwd = process.cwd();
   const coreCheck = await checkCorePackage(cwd);
   if (!coreCheck.accessible) {
-    const packageJsonPath = path9.join(cwd, "package.json");
+    const packageJsonPath = path11.join(cwd, "package.json");
     let hasCoreDep = false;
-    if (await fs11.pathExists(packageJsonPath)) {
+    if (await fs12.pathExists(packageJsonPath)) {
       try {
-        const packageJson = await fs11.readJson(packageJsonPath);
+        const packageJson = await fs12.readJson(packageJsonPath);
         hasCoreDep = !!(packageJson.dependencies?.["@nextsparkjs/core"] || packageJson.devDependencies?.["@nextsparkjs/core"]);
       } catch {
       }
@@ -3562,25 +4479,25 @@ async function checkImports() {
 
 // src/doctor/index.ts
 var STATUS_ICONS = {
-  pass: chalk13.green("\u2713"),
-  warn: chalk13.yellow("\u26A0"),
-  fail: chalk13.red("\u2717")
+  pass: chalk14.green("\u2713"),
+  warn: chalk14.yellow("\u26A0"),
+  fail: chalk14.red("\u2717")
 };
 function formatResult(result) {
   const icon = STATUS_ICONS[result.status];
-  const nameColor = result.status === "fail" ? chalk13.red : result.status === "warn" ? chalk13.yellow : chalk13.white;
+  const nameColor = result.status === "fail" ? chalk14.red : result.status === "warn" ? chalk14.yellow : chalk14.white;
   const name = nameColor(result.name.padEnd(18));
-  const message = chalk13.gray(result.message);
+  const message = chalk14.gray(result.message);
   let output = `${icon} ${name} ${message}`;
   if (result.fix && result.status !== "pass") {
     output += `
-${" ".repeat(22)}${chalk13.cyan("\u2192")} ${chalk13.cyan(result.fix)}`;
+${" ".repeat(22)}${chalk14.cyan("\u2192")} ${chalk14.cyan(result.fix)}`;
   }
   return output;
 }
 function showHeader() {
   console.log("");
-  console.log(chalk13.cyan("\u{1FA7A} NextSpark Health Check"));
+  console.log(chalk14.cyan("\u{1FA7A} NextSpark Health Check"));
   console.log("");
 }
 function showSummary(results) {
@@ -3588,11 +4505,11 @@ function showSummary(results) {
   const warnings = results.filter((r) => r.status === "warn").length;
   const failed = results.filter((r) => r.status === "fail").length;
   console.log("");
-  console.log(chalk13.gray("-".repeat(50)));
+  console.log(chalk14.gray("-".repeat(50)));
   const summary = [
-    chalk13.green(`${passed} passed`),
-    warnings > 0 ? chalk13.yellow(`${warnings} warning${warnings > 1 ? "s" : ""}`) : null,
-    failed > 0 ? chalk13.red(`${failed} failed`) : null
+    chalk14.green(`${passed} passed`),
+    warnings > 0 ? chalk14.yellow(`${warnings} warning${warnings > 1 ? "s" : ""}`) : null,
+    failed > 0 ? chalk14.red(`${failed} failed`) : null
   ].filter(Boolean).join(", ");
   console.log(`Summary: ${summary}`);
   console.log("");
@@ -3634,7 +4551,7 @@ async function runDoctorCommand() {
 var isDirectExecution = process.argv[1]?.includes("doctor") || process.argv.includes("doctor");
 if (isDirectExecution && typeof __require !== "undefined") {
   runDoctorCommand().catch((error) => {
-    console.error(chalk13.red("An unexpected error occurred:"), error.message);
+    console.error(chalk14.red("An unexpected error occurred:"), error.message);
     process.exit(1);
   });
 }
@@ -3645,16 +4562,323 @@ async function doctorCommand() {
     await runDoctorCommand();
   } catch (error) {
     if (error instanceof Error) {
-      console.error(chalk14.red(`Error: ${error.message}`));
+      console.error(chalk15.red(`Error: ${error.message}`));
+    }
+    process.exit(1);
+  }
+}
+
+// src/commands/db.ts
+import { spawn as spawn5 } from "child_process";
+import { existsSync as existsSync10, readFileSync as readFileSync9 } from "fs";
+import { join as join10 } from "path";
+import chalk16 from "chalk";
+import ora10 from "ora";
+function loadProjectEnv4(projectRoot) {
+  const envPath = join10(projectRoot, ".env");
+  const envVars = {};
+  if (existsSync10(envPath)) {
+    const content = readFileSync9(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 = ora10("Preparing to run migrations...").start();
+  try {
+    const coreDir = getCoreDir();
+    const projectRoot = getProjectRoot();
+    const migrationsScript = join10(coreDir, "scripts", "db", "run-migrations.mjs");
+    if (!existsSync10(migrationsScript)) {
+      spinner.fail("Migrations script not found");
+      console.error(chalk16.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(chalk16.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(chalk16.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(chalk16.red(err.message));
+      process.exit(1);
+    });
+    migrateProcess.on("close", (code) => {
+      if (code === 0) {
+        console.log(chalk16.green("\n\u2705 Migrations completed successfully!"));
+        process.exit(0);
+      } else {
+        console.error(chalk16.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(chalk16.red(error.message));
+    }
+    process.exit(1);
+  }
+}
+async function dbSeedCommand() {
+  console.log(chalk16.cyan("\u2139\uFE0F  Sample data is included as part of the migration process."));
+  console.log(chalk16.cyan("   Running db:migrate to apply all migrations including sample data...\n"));
+  await dbMigrateCommand();
+}
+
+// src/commands/sync-app.ts
+import { existsSync as existsSync11, readdirSync as readdirSync2, mkdirSync as mkdirSync4, copyFileSync, readFileSync as readFileSync10 } from "fs";
+import { join as join11, dirname as dirname4, relative } from "path";
+import chalk17 from "chalk";
+import ora11 from "ora";
+var EXCLUDED_TEMPLATE_PATTERNS = ["(templates)"];
+var ROOT_TEMPLATE_FILES = [
+  "proxy.ts",
+  // Next.js 16+ proxy (formerly middleware.ts) - required for auth/permission validation
+  "next.config.mjs",
+  // Required for webpack aliases, transpilePackages, security headers
+  "tsconfig.json",
+  // Required for proper path aliases and test file exclusions
+  "i18n.ts"
+  // Required for next-intl configuration
+];
+var MAX_VERBOSE_FILES = 10;
+var MAX_SUMMARY_FILES = 5;
+function getAllFiles(dir, baseDir = dir) {
+  const files = [];
+  if (!existsSync11(dir)) {
+    return files;
+  }
+  const entries = readdirSync2(dir, { withFileTypes: true });
+  for (const entry of entries) {
+    const fullPath = join11(dir, entry.name);
+    const relativePath = relative(baseDir, fullPath);
+    if (entry.isDirectory()) {
+      files.push(...getAllFiles(fullPath, baseDir));
+    } else if (entry.isFile()) {
+      if (entry.name !== ".DS_Store" && entry.name !== "README.md") {
+        files.push(relativePath);
+      }
+    }
+  }
+  return files;
+}
+function copyFile(source, target) {
+  const targetDir = dirname4(target);
+  if (!existsSync11(targetDir)) {
+    mkdirSync4(targetDir, { recursive: true });
+  }
+  copyFileSync(source, target);
+}
+function backupDirectory(source, target) {
+  if (!existsSync11(source)) {
+    return;
+  }
+  const files = getAllFiles(source);
+  for (const file of files) {
+    const sourcePath = join11(source, file);
+    const targetPath = join11(target, file);
+    copyFile(sourcePath, targetPath);
+  }
+}
+function getCoreVersion2(coreDir) {
+  try {
+    const pkgPath = join11(coreDir, "package.json");
+    const pkg2 = JSON.parse(readFileSync10(pkgPath, "utf-8"));
+    return pkg2.version || "unknown";
+  } catch {
+    return "unknown";
+  }
+}
+async function syncAppCommand(options) {
+  const spinner = ora11({ text: "Preparing sync...", isSilent: options.dryRun }).start();
+  try {
+    const coreDir = getCoreDir();
+    const projectRoot = getProjectRoot();
+    const coreVersion = getCoreVersion2(coreDir);
+    const templatesDir = join11(coreDir, "templates", "app");
+    const appDir = join11(projectRoot, "app");
+    if (!existsSync11(templatesDir)) {
+      spinner.fail("Templates directory not found in @nextsparkjs/core");
+      console.error(chalk17.red(`
+  Expected path: ${templatesDir}`));
+      process.exit(1);
+    }
+    if (!existsSync11(appDir)) {
+      spinner.fail("No /app directory found");
+      console.error(chalk17.red("\n  This project does not have an /app folder."));
+      console.error(chalk17.yellow('  Run "nextspark init" first to initialize your project.\n'));
+      process.exit(1);
+    }
+    spinner.text = "Scanning template files...";
+    const templateFiles = getAllFiles(templatesDir).filter((f) => !EXCLUDED_TEMPLATE_PATTERNS.some((pattern) => f.startsWith(pattern)));
+    const existingAppFiles = getAllFiles(appDir);
+    const customFiles = existingAppFiles.filter((f) => !templateFiles.includes(f));
+    const filesToUpdate = templateFiles;
+    spinner.succeed("Scan complete");
+    console.log(chalk17.cyan(`
+  Syncing /app with @nextsparkjs/core@${coreVersion}...
+`));
+    if (options.dryRun) {
+      console.log(chalk17.yellow("  [DRY RUN] No changes will be made\n"));
+    }
+    if (options.verbose) {
+      console.log(chalk17.gray("  Files to sync:"));
+      for (const file of filesToUpdate) {
+        const targetPath = join11(appDir, file);
+        const status = existsSync11(targetPath) ? chalk17.yellow("update") : chalk17.green("create");
+        console.log(chalk17.gray(`    ${status} ${file}`));
+      }
+      console.log();
+    }
+    console.log(chalk17.white(`  Template files: ${filesToUpdate.length}`));
+    console.log(chalk17.white(`  Custom files preserved: ${customFiles.length}`));
+    if (customFiles.length > 0 && options.verbose) {
+      console.log(chalk17.gray("\n  Custom files (will be preserved):"));
+      for (const file of customFiles.slice(0, MAX_VERBOSE_FILES)) {
+        console.log(chalk17.gray(`    - ${file}`));
+      }
+      if (customFiles.length > MAX_VERBOSE_FILES) {
+        console.log(chalk17.gray(`    ... and ${customFiles.length - MAX_VERBOSE_FILES} more`));
+      }
+    }
+    if (!options.force && !options.dryRun) {
+      console.log(chalk17.yellow(`
+  This will overwrite ${filesToUpdate.length} core template files.`));
+      console.log(chalk17.gray("  Run with --dry-run to preview changes, or --force to skip this prompt.\n"));
+      try {
+        const { confirm: confirm6 } = await import("@inquirer/prompts");
+        const confirmed = await confirm6({
+          message: "Proceed with sync?",
+          default: true
+        });
+        if (!confirmed) {
+          console.log(chalk17.yellow("\n  Sync cancelled.\n"));
+          process.exit(0);
+        }
+      } catch (promptError) {
+        console.error(chalk17.red("\n  Failed to load confirmation prompt. Use --force to skip.\n"));
+        process.exit(1);
+      }
+    }
+    if (options.backup && !options.dryRun) {
+      const backupDir = join11(projectRoot, `app.backup.v${coreVersion}.${Date.now()}`);
+      spinner.start("Creating backup...");
+      backupDirectory(appDir, backupDir);
+      spinner.succeed(`Backup created: ${relative(projectRoot, backupDir)}`);
+    }
+    if (!options.dryRun) {
+      spinner.start("Syncing files...");
+      let updated = 0;
+      let created = 0;
+      for (const file of filesToUpdate) {
+        const sourcePath = join11(templatesDir, file);
+        const targetPath = join11(appDir, file);
+        const isNew = !existsSync11(targetPath);
+        copyFile(sourcePath, targetPath);
+        if (isNew) {
+          created++;
+        } else {
+          updated++;
+        }
+        if (options.verbose) {
+          spinner.text = `Syncing: ${file}`;
+        }
+      }
+      spinner.succeed(`Synced ${filesToUpdate.length} files (${updated} updated, ${created} created)`);
+      const rootTemplatesDir = join11(coreDir, "templates");
+      let rootUpdated = 0;
+      let rootCreated = 0;
+      for (const file of ROOT_TEMPLATE_FILES) {
+        const sourcePath = join11(rootTemplatesDir, file);
+        const targetPath = join11(projectRoot, file);
+        if (existsSync11(sourcePath)) {
+          const isNew = !existsSync11(targetPath);
+          copyFile(sourcePath, targetPath);
+          if (isNew) {
+            rootCreated++;
+            if (options.verbose) {
+              console.log(chalk17.green(`  + Created: ${file}`));
+            }
+          } else {
+            rootUpdated++;
+            if (options.verbose) {
+              console.log(chalk17.yellow(`  ~ Updated: ${file}`));
+            }
+          }
+        }
+      }
+      if (rootUpdated + rootCreated > 0) {
+        console.log(chalk17.gray(`  Root files: ${rootUpdated} updated, ${rootCreated} created`));
+      }
+    }
+    console.log(chalk17.green("\n  \u2705 Sync complete!\n"));
+    if (customFiles.length > 0) {
+      console.log(chalk17.gray(`  Preserved ${customFiles.length} custom file(s):`));
+      for (const file of customFiles.slice(0, MAX_SUMMARY_FILES)) {
+        console.log(chalk17.gray(`    - app/${file}`));
+      }
+      if (customFiles.length > MAX_SUMMARY_FILES) {
+        console.log(chalk17.gray(`    ... and ${customFiles.length - MAX_SUMMARY_FILES} more
+`));
+      } else {
+        console.log();
+      }
+    }
+  } catch (error) {
+    spinner.fail("Sync failed");
+    if (error instanceof Error) {
+      console.error(chalk17.red(`
+  Error: ${error.message}
+`));
+      if (options.verbose && error.stack) {
+        console.error(chalk17.gray(`  Stack trace:
+${error.stack}
+`));
+      }
     }
     process.exit(1);
   }
 }
 
 // src/cli.ts
+config();
+var pkg = JSON.parse(readFileSync11(new URL("../package.json", import.meta.url), "utf-8"));
 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.name("nextspark").description("NextSpark CLI - Professional SaaS Boilerplate").version(pkg.version);
+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");
@@ -3662,12 +4886,19 @@ registry.command("build").description("Build all registries").action(registryBui
 registry.command("watch").description("Watch and rebuild registries on changes").action(registryWatchCommand);
 program.command("registry:build").description("Build all registries (alias)").action(registryBuildCommand);
 program.command("registry:watch").description("Watch and rebuild registries (alias)").action(registryWatchCommand);
-program.command("init").description("Initialize NextSpark project").option("-f, --force", "Overwrite existing configuration").option("--wizard", "Run full project wizard").option("--quick", "Quick wizard mode (essential steps only)").option("--expert", "Expert wizard mode (all options)").option("--preset <name>", "Use preset configuration (saas, blog, crm)").option("--theme <name>", "Pre-select theme (default, blog, crm, productivity, none)").option("--plugins <list>", "Pre-select plugins (comma-separated)").option("-y, --yes", "Skip confirmations").option("--registries-only", "Only create registries (no wizard)").option("--name <name>", "Project name (non-interactive mode)").option("--slug <slug>", "Project slug (non-interactive mode)").option("--description <desc>", "Project description (non-interactive mode)").action(initCommand);
+program.command("init").description("Initialize NextSpark project").option("-f, --force", "Overwrite existing configuration").option("--wizard", "Run full project wizard").option("--quick", "Quick wizard mode (essential steps only)").option("--expert", "Expert wizard mode (all options)").option("--preset <name>", "Use preset configuration (saas, blog, crm)").option("--theme <name>", "Pre-select theme (default, blog, crm, productivity, none)").option("--plugins <list>", "Pre-select plugins (comma-separated)").option("-y, --yes", "Skip confirmations").option("--registries-only", "Only create registries (no wizard)").option("--name <name>", "Project name (non-interactive mode)").option("--slug <slug>", "Project slug (non-interactive mode)").option("--description <desc>", "Project description (non-interactive mode)").option("--type <type>", "Project type: web or web-mobile (non-interactive mode)").action(initCommand);
 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("add:mobile").description("Add mobile app to your project").option("-f, --force", "Overwrite if already exists").option("--skip-install", "Skip npm install").action(addMobileCommand);
 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.command("sync:app").description("Sync /app folder with @nextsparkjs/core templates").option("--dry-run", "Preview changes without applying").option("-f, --force", "Skip confirmation prompt").option("--backup", "Backup existing files before overwriting").option("-v, --verbose", "Show detailed file operations").action(syncAppCommand);
 program.showHelpAfterError();
 program.configureOutput({
-  writeErr: (str) => process.stderr.write(chalk15.red(str))
+  writeErr: (str) => process.stderr.write(chalk18.red(str))
 });
 program.parse();