@nextsparkjs/cli 0.1.0-beta.11 → 0.1.0-beta.111

package/dist/cli.js

@@ -7,12 +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 chalk20 from "chalk";
+import { readFileSync as readFileSync11 } from "fs";
 
 // src/commands/dev.ts
 import { spawn } from "child_process";
@@ -21,7 +22,7 @@ import ora from "ora";
 
 // src/utils/paths.ts
 import { existsSync } from "fs";
-import { resolve, dirname } from "path";
+import { resolve, join, dirname } from "path";
 import { fileURLToPath } from "url";
 var __filename = fileURLToPath(import.meta.url);
 var __dirname = dirname(__filename);
@@ -51,6 +52,16 @@ function isMonorepoMode() {
   const npmCorePath = resolve(cwd, "node_modules", "@nextsparkjs", "core");
   return !existsSync(npmCorePath);
 }
+function getAIWorkflowDir() {
+  const cwd = process.cwd();
+  const nmPath = join(cwd, "node_modules", "@nextsparkjs", "ai-workflow");
+  if (existsSync(nmPath)) return nmPath;
+  const webNmPath = join(cwd, "web", "node_modules", "@nextsparkjs", "ai-workflow");
+  if (existsSync(webNmPath)) return webNmPath;
+  const monoPath = join(cwd, "packages", "ai-workflow");
+  if (existsSync(monoPath)) return monoPath;
+  return null;
+}
 
 // src/commands/dev.ts
 async function devCommand(options) {
@@ -81,6 +92,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
@@ -118,11 +130,11 @@ async function devCommand(options) {
 // src/commands/build.ts
 import { spawn as spawn2 } from "child_process";
 import { existsSync as existsSync2, readFileSync } from "fs";
-import { join } from "path";
+import { join as join2 } from "path";
 import chalk2 from "chalk";
 import ora2 from "ora";
 function loadProjectEnv(projectRoot) {
-  const envPath = join(projectRoot, ".env");
+  const envPath = join2(projectRoot, ".env");
   const envVars = {};
   if (existsSync2(envPath)) {
     const content = readFileSync(envPath, "utf-8");
@@ -180,6 +192,7 @@ async function buildCommand(options) {
     const buildProcess = spawn2("npx", ["next", "build"], {
       cwd: projectRoot,
       stdio: "inherit",
+      shell: true,
       env: {
         ...projectEnv,
         ...process.env,
@@ -214,11 +227,11 @@ Build failed with exit code ${code}`));
 // src/commands/generate.ts
 import { spawn as spawn3 } from "child_process";
 import { existsSync as existsSync3, readFileSync as readFileSync2 } from "fs";
-import { join as join2 } from "path";
+import { join as join3 } from "path";
 import chalk3 from "chalk";
 import ora3 from "ora";
 function loadProjectEnv2(projectRoot) {
-  const envPath = join2(projectRoot, ".env");
+  const envPath = join3(projectRoot, ".env");
   const envVars = {};
   if (existsSync3(envPath)) {
     const content = readFileSync2(envPath, "utf-8");
@@ -298,11 +311,11 @@ Registry generation failed with exit code ${code}`));
 // src/commands/registry.ts
 import { spawn as spawn4 } from "child_process";
 import { existsSync as existsSync4, readFileSync as readFileSync3 } from "fs";
-import { join as join3 } from "path";
+import { join as join4 } from "path";
 import chalk4 from "chalk";
 import ora4 from "ora";
 function loadProjectEnv3(projectRoot) {
-  const envPath = join3(projectRoot, ".env");
+  const envPath = join4(projectRoot, ".env");
   const envVars = {};
   if (existsSync4(envPath)) {
     const content = readFileSync3(envPath, "utf-8");
@@ -424,32 +437,32 @@ Watcher exited with code ${code}`));
 
 // src/commands/init.ts
 import { existsSync as existsSync8, mkdirSync as mkdirSync2, writeFileSync as writeFileSync2, readFileSync as readFileSync7 } from "fs";
-import { join as join8 } from "path";
+import { join as join9 } from "path";
 import chalk12 from "chalk";
 import ora8 from "ora";
 
 // src/wizard/index.ts
 import chalk11 from "chalk";
 import ora7 from "ora";
-import { confirm as confirm5 } from "@inquirer/prompts";
+import { confirm as confirm5, select as select7 } from "@inquirer/prompts";
 import { execSync } from "child_process";
 import { existsSync as existsSync7, readdirSync } from "fs";
-import { join as join7 } from "path";
+import { join as join8 } 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";
+import { dirname as dirname2, join as join5 } from "path";
 var __filename2 = fileURLToPath2(import.meta.url);
 var __dirname2 = dirname2(__filename2);
 function getCliVersion() {
   const possiblePaths = [
-    join4(__dirname2, "../package.json"),
+    join5(__dirname2, "../package.json"),
     // from dist/
-    join4(__dirname2, "../../package.json"),
+    join5(__dirname2, "../../package.json"),
     // from dist/wizard/ or src/wizard/
-    join4(__dirname2, "../../../package.json")
+    join5(__dirname2, "../../../package.json")
     // fallback
   ];
   for (const packageJsonPath of possiblePaths) {
@@ -485,6 +498,9 @@ function showSection(title, step, totalSteps) {
   console.log(chalk5.gray("  " + "-".repeat(40)));
   console.log("");
 }
+function showSuccess(message) {
+  console.log(chalk5.green(`  \u2713 ${message}`));
+}
 function showWarning(message) {
   console.log(chalk5.yellow(`  \u26A0 ${message}`));
 }
@@ -528,7 +544,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",
@@ -551,8 +567,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 = {
@@ -600,8 +651,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"
@@ -632,7 +683,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,
@@ -640,7 +691,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,
@@ -656,7 +707,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})`,
@@ -672,7 +723,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)",
@@ -691,8 +742,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"
@@ -704,7 +755,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,
@@ -756,7 +807,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("");
@@ -793,7 +844,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("");
@@ -813,7 +864,24 @@ async function promptContentFeaturesConfig(mode = "interactive", totalSteps = 9)
 }
 
 // src/wizard/prompts/auth-config.ts
-import { checkbox as checkbox5 } from "@inquirer/prompts";
+import { checkbox as checkbox5, input as input2, select as select5 } from "@inquirer/prompts";
+var REGISTRATION_MODE_OPTIONS = [
+  {
+    name: "Open (anyone can register)",
+    value: "open",
+    description: "Email+password and Google OAuth signup available to everyone"
+  },
+  {
+    name: "Domain-Restricted (Google OAuth only for specific domains)",
+    value: "domain-restricted",
+    description: "Only Google OAuth for allowed email domains (e.g., @yourcompany.com)"
+  },
+  {
+    name: "Invitation-Only (registration via invite link)",
+    value: "invitation-only",
+    description: "Users can only register when invited by an existing user"
+  }
+];
 var AUTH_METHOD_OPTIONS = [
   {
     name: "Email & Password",
@@ -838,19 +906,50 @@ var SECURITY_OPTIONS = [
 ];
 function getDefaultAuthConfig() {
   return {
+    registrationMode: "open",
     emailPassword: true,
     googleOAuth: false,
     emailVerification: true
   };
 }
 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({
-    message: "Which authentication methods do you want to enable?",
-    choices: AUTH_METHOD_OPTIONS
+  const registrationMode = await select5({
+    message: "How should new users register?",
+    choices: REGISTRATION_MODE_OPTIONS,
+    default: "open"
   });
+  console.log("");
+  let emailPassword = true;
+  let googleOAuth = false;
+  let allowedDomains;
+  if (registrationMode === "domain-restricted") {
+    googleOAuth = true;
+    emailPassword = false;
+    showInfo("Domain-restricted mode: Google OAuth enabled, email login hidden on login page.");
+    console.log("");
+    const domainsInput = await input2({
+      message: "Allowed email domains (comma-separated, e.g. yourcompany.com, partner.org):",
+      validate: (value) => {
+        if (!value.trim()) return "At least one domain is required for domain-restricted mode";
+        const domains = value.split(",").map((d) => d.trim()).filter(Boolean);
+        const invalid = domains.find((d) => !d.includes("."));
+        if (invalid) return `Invalid domain: "${invalid}" (must contain a dot)`;
+        return true;
+      }
+    });
+    allowedDomains = domainsInput.split(",").map((d) => d.trim().toLowerCase()).filter(Boolean);
+    console.log("");
+  } else {
+    const selectedMethods = await checkbox5({
+      message: "Which authentication methods do you want to enable?",
+      choices: AUTH_METHOD_OPTIONS
+    });
+    emailPassword = selectedMethods.includes("emailPassword");
+    googleOAuth = selectedMethods.includes("googleOAuth");
+  }
   let selectedSecurity = ["emailVerification"];
   if (mode === "expert") {
     console.log("");
@@ -862,9 +961,11 @@ async function promptAuthConfig(mode = "interactive", totalSteps = 8) {
     });
   }
   const auth = {
-    emailPassword: selectedMethods.includes("emailPassword"),
-    googleOAuth: selectedMethods.includes("googleOAuth"),
-    emailVerification: selectedSecurity.includes("emailVerification")
+    registrationMode,
+    emailPassword,
+    googleOAuth,
+    emailVerification: selectedSecurity.includes("emailVerification"),
+    allowedDomains
   };
   return { auth };
 }
@@ -928,7 +1029,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("");
@@ -980,7 +1081,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("");
@@ -1007,7 +1108,7 @@ async function promptDevConfig(mode = "interactive", totalSteps = 8) {
 }
 
 // src/wizard/prompts/theme-selection.ts
-import { select as select4 } from "@inquirer/prompts";
+import { select as select6 } from "@inquirer/prompts";
 import chalk6 from "chalk";
 async function promptThemeSelection() {
   console.log("");
@@ -1017,7 +1118,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 select6({
     message: "Which reference theme would you like to install?",
     choices: [
       {
@@ -1103,24 +1204,26 @@ function getRequiredPlugins(theme) {
 }
 
 // src/wizard/prompts/env-config.ts
-import { confirm as confirm3, input as input2 } from "@inquirer/prompts";
+import { confirm as confirm3, input as input3 } from "@inquirer/prompts";
 
 // src/wizard/prompts/git-config.ts
-import { confirm as confirm4, input as input3 } from "@inquirer/prompts";
+import { confirm as confirm4, input as input4 } 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,
@@ -1132,17 +1235,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,
@@ -1154,17 +1259,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,
@@ -1177,9 +1284,9 @@ async function runExpertPrompts() {
 }
 
 // src/wizard/generators/index.ts
-import fs7 from "fs-extra";
-import path5 from "path";
-import { fileURLToPath as fileURLToPath5 } 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";
@@ -1188,22 +1295,22 @@ 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(__dirname3, "../../../../../core/templates"),
-      path.resolve(__dirname3, "../../../../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");
@@ -1478,6 +1585,33 @@ async function updateMigrations(config2) {
     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) {
@@ -1494,29 +1628,32 @@ function getTargetThemesDir2() {
   return path2.resolve(process.cwd(), "contents", "themes");
 }
 async function updateAuthConfig(config2) {
-  const authConfigPath = path2.join(
+  const appConfigPath = path2.join(
     getTargetThemesDir2(),
     config2.projectSlug,
     "config",
-    "auth.config.ts"
+    "app.config.ts"
   );
-  if (!await fs2.pathExists(authConfigPath)) {
+  if (!await fs2.pathExists(appConfigPath)) {
     return;
   }
-  let content = await fs2.readFile(authConfigPath, "utf-8");
+  let content = await fs2.readFile(appConfigPath, "utf-8");
   content = content.replace(
-    /(emailPassword:\s*{[^}]*enabled:\s*)(?:true|false)/gs,
-    `$1${config2.auth.emailPassword}`
+    /(mode:\s*)'open'(\s*as\s*const)/,
+    `$1'${config2.auth.registrationMode}'$2`
   );
   content = content.replace(
-    /(google:\s*{[^}]*enabled:\s*)(?:true|false)/gs,
+    /(google:\s*{\s*enabled:\s*)(?:true|false)/s,
     `$1${config2.auth.googleOAuth}`
   );
-  content = content.replace(
-    /(emailVerification:\s*)(?:true|false)/g,
-    `$1${config2.auth.emailVerification}`
-  );
-  await fs2.writeFile(authConfigPath, content, "utf-8");
+  if (config2.auth.registrationMode === "domain-restricted") {
+    const domains = config2.auth.allowedDomains?.length ? config2.auth.allowedDomains.map((d) => `'${d}'`).join(", ") : "'yourcompany.com'";
+    content = content.replace(
+      /\/\/\s*allowedDomains:\s*\['yourcompany\.com'\],\s*\/\/\s*Only for 'domain-restricted' mode/,
+      `allowedDomains: [${domains}],`
+    );
+  }
+  await fs2.writeFile(appConfigPath, content, "utf-8");
 }
 async function updateDashboardUIConfig(config2) {
   const dashboardConfigPath = path2.join(
@@ -1607,6 +1744,44 @@ async function updatePermissionsConfig(config2) {
   });
   await fs2.writeFile(permissionsConfigPath, content, "utf-8");
 }
+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(),
@@ -1724,6 +1899,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";
@@ -1822,22 +2009,22 @@ 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(__dirname4, "../../../../../core/templates"),
-      path4.resolve(__dirname4, "../../../../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");
@@ -1895,7 +2082,7 @@ async function copyContentFeatures(config2) {
 
 // src/wizard/generators/theme-plugins-installer.ts
 import { existsSync as existsSync6, cpSync, mkdirSync, readFileSync as readFileSync6, writeFileSync } from "fs";
-import { join as join6, resolve as resolve2 } from "path";
+import { join as join7, resolve as resolve2 } from "path";
 import chalk9 from "chalk";
 import ora6 from "ora";
 
@@ -1903,12 +2090,12 @@ import ora6 from "ora";
 import chalk8 from "chalk";
 import ora5 from "ora";
 import { existsSync as existsSync5, readFileSync as readFileSync5 } from "fs";
-import { join as join5 } from "path";
+import { join as join6 } from "path";
 async function addTheme(packageSpec, options = {}) {
   const spinner = ora5(`Adding theme ${packageSpec}`).start();
   let cleanup = null;
   try {
-    const contentsDir = join5(process.cwd(), "contents");
+    const contentsDir = join6(process.cwd(), "contents");
     if (!existsSync5(contentsDir)) {
       spinner.fail('contents/ directory not found. Run "nextspark init" first.');
       return;
@@ -1971,14 +2158,14 @@ async function addTheme(packageSpec, options = {}) {
 }
 function checkPluginExists(pluginName) {
   const name = pluginName.replace(/^@[^/]+\//, "").replace(/^nextspark-plugin-/, "").replace(/^plugin-/, "");
-  return existsSync5(join5(process.cwd(), "contents", "plugins", name));
+  return existsSync5(join6(process.cwd(), "contents", "plugins", name));
 }
 function getCoreVersion() {
-  const pkgPath = join5(process.cwd(), "node_modules", "@nextsparkjs", "core", "package.json");
+  const pkgPath = join6(process.cwd(), "node_modules", "@nextsparkjs", "core", "package.json");
   if (existsSync5(pkgPath)) {
     try {
-      const pkg = JSON.parse(readFileSync5(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";
     }
@@ -2015,20 +2202,20 @@ var THEME_REQUIRED_PLUGINS2 = {
 };
 function isMonorepoMode2() {
   const possiblePaths = [
-    join6(process.cwd(), "pnpm-workspace.yaml"),
-    join6(process.cwd(), "..", "pnpm-workspace.yaml"),
-    join6(process.cwd(), "..", "..", "pnpm-workspace.yaml")
+    join7(process.cwd(), "pnpm-workspace.yaml"),
+    join7(process.cwd(), "..", "pnpm-workspace.yaml"),
+    join7(process.cwd(), "..", "..", "pnpm-workspace.yaml")
   ];
   return possiblePaths.some((p) => existsSync6(p));
 }
 function getMonorepoRoot() {
   const possibleRoots = [
     process.cwd(),
-    join6(process.cwd(), ".."),
-    join6(process.cwd(), "..", "..")
+    join7(process.cwd(), ".."),
+    join7(process.cwd(), "..", "..")
   ];
   for (const root of possibleRoots) {
-    if (existsSync6(join6(root, "pnpm-workspace.yaml"))) {
+    if (existsSync6(join7(root, "pnpm-workspace.yaml"))) {
       return resolve2(root);
     }
   }
@@ -2038,15 +2225,15 @@ function getLocalPackageDir(type, name) {
   const monorepoRoot = getMonorepoRoot();
   if (!monorepoRoot) return null;
   const baseDir = type === "theme" ? "themes" : "plugins";
-  const packageDir = join6(monorepoRoot, baseDir, name);
-  if (existsSync6(packageDir) && existsSync6(join6(packageDir, "package.json"))) {
+  const packageDir = join7(monorepoRoot, baseDir, name);
+  if (existsSync6(packageDir) && existsSync6(join7(packageDir, "package.json"))) {
     return packageDir;
   }
   return null;
 }
 async function copyLocalTheme(name, sourceDir) {
-  const targetDir = join6(process.cwd(), "contents", "themes", name);
-  const themesDir = join6(process.cwd(), "contents", "themes");
+  const targetDir = join7(process.cwd(), "contents", "themes", name);
+  const themesDir = join7(process.cwd(), "contents", "themes");
   if (!existsSync6(themesDir)) {
     mkdirSync(themesDir, { recursive: true });
   }
@@ -2059,8 +2246,8 @@ async function copyLocalTheme(name, sourceDir) {
   return true;
 }
 async function copyLocalPlugin(name, sourceDir) {
-  const targetDir = join6(process.cwd(), "contents", "plugins", name);
-  const pluginsDir = join6(process.cwd(), "contents", "plugins");
+  const targetDir = join7(process.cwd(), "contents", "plugins", name);
+  const pluginsDir = join7(process.cwd(), "contents", "plugins");
   if (!existsSync6(pluginsDir)) {
     mkdirSync(pluginsDir, { recursive: true });
   }
@@ -2073,7 +2260,7 @@ async function copyLocalPlugin(name, sourceDir) {
   return true;
 }
 async function updateTsConfigPaths(name, type) {
-  const tsconfigPath = join6(process.cwd(), "tsconfig.json");
+  const tsconfigPath = join7(process.cwd(), "tsconfig.json");
   if (!existsSync6(tsconfigPath)) {
     return;
   }
@@ -2118,7 +2305,7 @@ async function installTheme2(theme) {
     prefixText: "  "
   }).start();
   try {
-    const targetDir = join6(process.cwd(), "contents", "themes", theme);
+    const targetDir = join7(process.cwd(), "contents", "themes", theme);
     if (existsSync6(targetDir)) {
       spinner.info(chalk9.gray(`Reference theme ${theme} already exists`));
       return true;
@@ -2171,7 +2358,7 @@ async function installPlugins(plugins) {
       prefixText: "  "
     }).start();
     try {
-      const pluginDir = join6(process.cwd(), "contents", "plugins", plugin);
+      const pluginDir = join7(process.cwd(), "contents", "plugins", plugin);
       if (existsSync6(pluginDir)) {
         spinner.info(chalk9.gray(`Plugin ${plugin} already installed`));
         continue;
@@ -2231,62 +2418,608 @@ 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",
+  "assets",
+  "babel.config.js",
+  "metro.config.js",
+  "tailwind.config.js",
+  "tsconfig.json",
+  "jest.config.js",
+  "eas.json"
+];
+var VERSIONS = {
+  // NextSpark packages - use 'latest' for consistency with web packages
+  NEXTSPARK_MOBILE: "latest",
+  NEXTSPARK_UI: "latest",
+  // 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 __filename5 = fileURLToPath5(import.meta.url);
-var __dirname5 = path5.dirname(__filename5);
-function getTemplatesDir3() {
-  try {
-    const corePkgPath = __require.resolve("@nextsparkjs/core/package.json");
-    return path5.join(path5.dirname(corePkgPath), "templates");
-  } catch {
-    const possiblePaths = [
-      path5.resolve(__dirname5, "../../../../../core/templates"),
-      path5.resolve(__dirname5, "../../../../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(config2) {
-  const packageJsonPath = path5.resolve(process.cwd(), "package.json");
+  const packageJsonPath = path7.resolve(process.cwd(), "package.json");
   let packageJson;
-  if (!await fs7.pathExists(packageJsonPath)) {
+  if (!await fs8.pathExists(packageJsonPath)) {
     packageJson = {
-      name: config2.projectSlug,
+      name: isMonorepoProject(config2) ? "web" : config2.projectSlug,
       version: "0.1.0",
       private: true,
       scripts: {},
@@ -2294,7 +3027,7 @@ async function updatePackageJson(config2) {
       devDependencies: {}
     };
   } else {
-    packageJson = await fs7.readJson(packageJsonPath);
+    packageJson = await fs8.readJson(packageJsonPath);
   }
   packageJson.scripts = packageJson.scripts || {};
   const scriptsToAdd = {
@@ -2305,9 +3038,11 @@ async function updatePackageJson(config2) {
     "build:registries": "nextspark registry:build",
     "db:migrate": "nextspark db:migrate",
     "db:seed": "nextspark db:seed",
-    "test:theme": `jest --config contents/themes/${config2.projectSlug}/tests/jest/jest.config.ts`,
-    "cy:open": `cypress open --config-file contents/themes/${config2.projectSlug}/tests/cypress.config.ts`,
-    "cy:run": `cypress run --config-file contents/themes/${config2.projectSlug}/tests/cypress.config.ts`,
+    "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`
   };
@@ -2319,8 +3054,8 @@ async function updatePackageJson(config2) {
   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",
@@ -2351,7 +3086,9 @@ async function updatePackageJson(config2) {
     "slugify": "^1.6.6"
   };
   for (const [name, version] of Object.entries(depsToAdd)) {
-    if (!packageJson.dependencies[name]) {
+    if (name.startsWith("@nextsparkjs/")) {
+      packageJson.dependencies[name] = version;
+    } else if (!packageJson.dependencies[name]) {
       packageJson.dependencies[name] = version;
     }
   }
@@ -2379,24 +3116,28 @@ async function updatePackageJson(config2) {
     "@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]) {
+    if (name.startsWith("@nextsparkjs/")) {
+      packageJson.devDependencies[name] = version;
+    } else 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(config2) {
-  const gitignorePath = path5.resolve(process.cwd(), ".gitignore");
+  const gitignorePath = path7.resolve(process.cwd(), ".gitignore");
   const entriesToAdd = `
 # NextSpark
 .nextspark/
@@ -2414,40 +3155,66 @@ 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());
+    await fs8.writeFile(gitignorePath, entriesToAdd.trim());
   }
 }
 async function generateProject(config2) {
-  await copyProjectFiles();
-  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 updatePermissionsConfig(config2);
-  await updateDashboardConfig(config2);
-  await updateAuthConfig(config2);
-  await updateDashboardUIConfig(config2);
-  await updateDevToolsConfig(config2);
-  await processI18n(config2);
-  await updatePackageJson(config2);
-  await updateGitignore(config2);
-  await generateEnvExample(config2);
-  await updateReadme(config2);
-  await copyEnvExampleToEnv();
+  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 fs8.ensureDir(path7.join(process.cwd(), "contents", "plugins"));
+    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",
@@ -2466,6 +3233,7 @@ var SAAS_PRESET = {
     blog: false
   },
   auth: {
+    registrationMode: "open",
     emailPassword: true,
     googleOAuth: true,
     emailVerification: true
@@ -2486,6 +3254,7 @@ var SAAS_PRESET = {
   }
 };
 var BLOG_PRESET = {
+  projectType: "web",
   teamMode: "single-user",
   teamRoles: ["owner"],
   defaultLocale: "en",
@@ -2504,6 +3273,7 @@ var BLOG_PRESET = {
     blog: true
   },
   auth: {
+    registrationMode: "invitation-only",
     emailPassword: true,
     googleOAuth: false,
     emailVerification: false
@@ -2524,6 +3294,7 @@ var BLOG_PRESET = {
   }
 };
 var CRM_PRESET = {
+  projectType: "web",
   teamMode: "single-tenant",
   teamRoles: ["owner", "admin", "member"],
   defaultLocale: "en",
@@ -2542,6 +3313,7 @@ var CRM_PRESET = {
     blog: false
   },
   auth: {
+    registrationMode: "invitation-only",
     emailPassword: true,
     googleOAuth: true,
     emailVerification: true
@@ -2578,11 +3350,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 }
   };
 }
 
@@ -2637,7 +3411,7 @@ function getFileTree(config2) {
   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`);
@@ -2765,24 +3539,6 @@ 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 config2;
     if (options.preset) {
       config2 = await runPresetMode(options.preset, options);
@@ -2800,6 +3556,22 @@ async function runWizard(options = { mode: "interactive" }) {
           break;
       }
     }
+    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) {
@@ -2814,13 +3586,20 @@ 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...",
@@ -2836,14 +3615,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) {
@@ -2855,22 +3639,25 @@ async function runWizard(options = { mode: "interactive" }) {
       prefixText: "  "
     }).start();
     try {
-      const projectRoot = process.cwd();
-      const registryScript = join7(projectRoot, "node_modules/@nextsparkjs/core/scripts/build/registry.mjs");
+      const registryScript = join8(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(config2, selectedTheme);
+    const aiChoice = await promptAIWorkflowSetup(config2);
+    showNextSteps(config2, selectedTheme, aiChoice);
   } catch (error) {
     if (error instanceof Error) {
       if (error.message.includes("User force closed")) {
@@ -2910,7 +3697,7 @@ async function runPresetMode(presetName, options) {
     console.log("");
     projectInfo = await promptProjectInfo();
   }
-  const config2 = applyPreset(projectInfo, presetName);
+  const config2 = applyPreset(projectInfo, presetName, options.type);
   return config2;
 }
 function showConfigSummary(config2) {
@@ -2923,6 +3710,7 @@ function showConfigSummary(config2) {
   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(config2.teamMode)}`));
@@ -2941,7 +3729,8 @@ function showConfigSummary(config2) {
   console.log(chalk11.gray(`    Enabled: ${chalk11.white(enabledFeatures.join(", ") || "None")}`));
   console.log("");
   console.log(chalk11.white("  Authentication:"));
-  const enabledAuth = Object.entries(config2.auth).filter(([_, enabled]) => enabled).map(([method]) => formatAuthMethod(method));
+  console.log(chalk11.gray(`    Registration: ${chalk11.white(formatRegistrationMode(config2.auth.registrationMode))}`));
+  const enabledAuth = Object.entries(config2.auth).filter(([key, enabled]) => key !== "registrationMode" && enabled).map(([method]) => formatAuthMethod(method));
   console.log(chalk11.gray(`    Methods: ${chalk11.white(enabledAuth.join(", ") || "None")}`));
   console.log("");
   console.log(chalk11.white("  Dashboard:"));
@@ -2952,6 +3741,14 @@ function showConfigSummary(config2) {
   const enabledDevTools = Object.entries(config2.dev).filter(([_, enabled]) => enabled).map(([tool]) => formatDevTool(tool));
   console.log(chalk11.gray(`    Enabled: ${chalk11.white(enabledDevTools.join(", ") || "None")}`));
 }
+function formatRegistrationMode(mode) {
+  const mapping = {
+    "open": "Open (anyone can register)",
+    "domain-restricted": "Domain-Restricted (Google OAuth only)",
+    "invitation-only": "Invitation-Only"
+  };
+  return mapping[mode] || mode;
+}
 function formatAuthMethod(method) {
   const mapping = {
     emailPassword: "Email/Password",
@@ -2976,7 +3773,9 @@ function formatDevTool(tool) {
   };
   return mapping[tool] || tool;
 }
-function showNextSteps(config2, referenceTheme = null) {
+function showNextSteps(config2, referenceTheme = null, aiChoice = "skip") {
+  const isMonorepo = config2.projectType === "web-mobile";
+  const aiSetupDone = aiChoice === "claude";
   console.log("");
   console.log(chalk11.cyan("  " + "=".repeat(60)));
   console.log(chalk11.bold.green("  \u2728 NextSpark project ready!"));
@@ -2984,12 +3783,13 @@ function showNextSteps(config2, referenceTheme = null) {
   console.log("");
   console.log(chalk11.bold.white("  Next steps:"));
   console.log("");
-  console.log(chalk11.white("  1. Configure your .env file:"));
-  console.log(chalk11.gray("     Edit these values in .env:"));
+  const envPath = isMonorepo ? "web/.env" : ".env";
+  console.log(chalk11.white("  1. Configure your environment:"));
+  console.log(chalk11.gray(`     Edit ${envPath} with your credentials:`));
   console.log("");
   console.log(chalk11.yellow("     DATABASE_URL"));
   console.log(chalk11.gray("     PostgreSQL connection string"));
-  console.log(chalk11.dim("     Example: postgresql://user:pass@localhost:5432/mydb"));
+  console.log(chalk11.gray(`     Recommended: ${chalk11.cyan("https://supabase.com")} | ${chalk11.cyan("https://neon.com")}`));
   console.log("");
   console.log(chalk11.yellow("     BETTER_AUTH_SECRET"));
   console.log(chalk11.gray("     Generate with:"));
@@ -3001,15 +3801,85 @@ function showNextSteps(config2, referenceTheme = null) {
   console.log(chalk11.white("  3. Start the development server:"));
   console.log(chalk11.cyan("     pnpm dev"));
   console.log("");
-  console.log(chalk11.gray("  " + "-".repeat(60)));
-  console.log(chalk11.gray(`  Theme: ${chalk11.white(`contents/themes/${config2.projectSlug}/`)}`));
-  console.log(chalk11.gray(`  Active theme: ${chalk11.green(`NEXT_PUBLIC_ACTIVE_THEME=${config2.projectSlug}`)}`));
+  let nextStep = 4;
+  if (isMonorepo) {
+    console.log(chalk11.white(`  ${nextStep}. (Optional) Start the mobile app:`));
+    console.log(chalk11.cyan("     pnpm dev:mobile"));
+    console.log(chalk11.gray("     Or: cd mobile && pnpm start"));
+    console.log("");
+    nextStep++;
+  }
+  if (aiSetupDone) {
+    console.log(chalk11.white(`  ${nextStep}. Start building with AI:`));
+    console.log(chalk11.gray("     Open Claude Code in your project and run:"));
+    console.log(chalk11.cyan("     /how-to:start"));
+    console.log("");
+  } else {
+    console.log(chalk11.white(`  ${nextStep}. (Optional) Setup AI workflows:`));
+    console.log(chalk11.cyan("     nextspark setup:ai"));
+    console.log("");
+  }
+  console.log(chalk11.gray("  " + "-".repeat(60)));
+  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(chalk11.gray(`  Docs: ${chalk11.cyan("https://nextspark.dev/docs")}`));
   console.log("");
 }
+async function promptAIWorkflowSetup(config2) {
+  console.log("");
+  const choice = await select7({
+    message: "Setup AI-assisted development workflows?",
+    choices: [
+      { name: "Claude Code (Recommended)", value: "claude" },
+      { name: "Cursor (Coming soon)", value: "cursor" },
+      { name: "Antigravity (Coming soon)", value: "antigravity" },
+      { name: "Skip for now", value: "skip" }
+    ]
+  });
+  if (choice === "skip") {
+    return "skip";
+  }
+  if (choice === "cursor" || choice === "antigravity") {
+    showInfo(`${choice} support is coming soon. For now, use Claude Code.`);
+    return "skip";
+  }
+  const projectRoot = process.cwd();
+  const isMonorepo = isMonorepoProject(config2);
+  try {
+    execSync("pnpm add -D -w @nextsparkjs/ai-workflow", {
+      cwd: projectRoot,
+      stdio: "inherit"
+    });
+    let setupScript = join8(projectRoot, "node_modules", "@nextsparkjs", "ai-workflow", "scripts", "setup.mjs");
+    if (!existsSync7(setupScript) && isMonorepo) {
+      setupScript = join8(projectRoot, "web", "node_modules", "@nextsparkjs", "ai-workflow", "scripts", "setup.mjs");
+    }
+    if (existsSync7(setupScript)) {
+      execSync(`node "${setupScript}" ${choice}`, {
+        cwd: projectRoot,
+        stdio: "inherit"
+      });
+      showSuccess("AI workflow setup complete!");
+    } else {
+      showWarning('AI workflow package installed but setup script not found. Run "nextspark setup:ai" manually.');
+    }
+  } catch (error) {
+    showError('Failed to install AI workflow package. Run "nextspark setup:ai" later.');
+    return "skip";
+  }
+  return choice;
+}
 function findLocalCoreTarball() {
   const cwd = process.cwd();
   try {
@@ -3018,14 +3888,14 @@ function findLocalCoreTarball() {
       (f) => f.includes("nextsparkjs-core") && f.endsWith(".tgz")
     );
     if (coreTarball) {
-      return join7(cwd, coreTarball);
+      return join8(cwd, coreTarball);
     }
   } catch {
   }
   return null;
 }
 function isCoreInstalled() {
-  const corePath = join7(process.cwd(), "node_modules", "@nextsparkjs", "core");
+  const corePath = join8(process.cwd(), "node_modules", "@nextsparkjs", "core");
   return existsSync7(corePath);
 }
 async function installCore() {
@@ -3043,8 +3913,8 @@ async function installCore() {
       packageSpec = localTarball;
       spinner.text = "Installing @nextsparkjs/core from local tarball...";
     }
-    const useYarn = existsSync7(join7(process.cwd(), "yarn.lock"));
-    const usePnpm = existsSync7(join7(process.cwd(), "pnpm-lock.yaml"));
+    const useYarn = existsSync7(join8(process.cwd(), "yarn.lock"));
+    const usePnpm = existsSync7(join8(process.cwd(), "pnpm-lock.yaml"));
     let installCmd;
     if (usePnpm) {
       installCmd = `pnpm add ${packageSpec}`;
@@ -3053,8 +3923,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!"));
@@ -3068,17 +3939,64 @@ async function installCore() {
     return false;
   }
 }
-async function copyNpmrc() {
-  const npmrcPath = join7(process.cwd(), ".npmrc");
-  if (existsSync7(npmrcPath)) {
-    return;
+function isMobileInstalled() {
+  const mobilePath = join8(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 join8(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(join8(process.cwd(), "yarn.lock"));
+    const usePnpm = existsSync7(join8(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
@@ -3093,10 +4011,10 @@ function parsePlugins(pluginsStr) {
 }
 function hasExistingProject() {
   const projectRoot = process.cwd();
-  return existsSync8(join8(projectRoot, "contents")) || existsSync8(join8(projectRoot, ".nextspark"));
+  return existsSync8(join9(projectRoot, "contents")) || existsSync8(join9(projectRoot, ".nextspark"));
 }
 function generateInitialRegistries(registriesDir) {
-  writeFileSync2(join8(registriesDir, "block-registry.ts"), `// Auto-generated by nextspark init
+  writeFileSync2(join9(registriesDir, "block-registry.ts"), `// Auto-generated by nextspark init
 import type { ComponentType } from 'react'
 
 export const BLOCK_REGISTRY: Record<string, {
@@ -3109,26 +4027,26 @@ export const BLOCK_REGISTRY: Record<string, {
 
 export const BLOCK_COMPONENTS: Record<string, React.LazyExoticComponent<ComponentType<any>>> = {}
 `);
-  writeFileSync2(join8(registriesDir, "theme-registry.ts"), `// Auto-generated by nextspark init
+  writeFileSync2(join9(registriesDir, "theme-registry.ts"), `// Auto-generated by nextspark init
 export const THEME_REGISTRY: Record<string, unknown> = {}
 `);
-  writeFileSync2(join8(registriesDir, "entity-registry.ts"), `// Auto-generated by nextspark init
+  writeFileSync2(join9(registriesDir, "entity-registry.ts"), `// Auto-generated by nextspark init
 export const ENTITY_REGISTRY: Record<string, unknown> = {}
 `);
-  writeFileSync2(join8(registriesDir, "entity-registry.client.ts"), `// Auto-generated by nextspark init
+  writeFileSync2(join9(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(join8(registriesDir, "billing-registry.ts"), `// Auto-generated by nextspark init
+  writeFileSync2(join9(registriesDir, "billing-registry.ts"), `// Auto-generated by nextspark init
 export const BILLING_REGISTRY = { plans: [], features: [] }
 `);
-  writeFileSync2(join8(registriesDir, "plugin-registry.ts"), `// Auto-generated by nextspark init
+  writeFileSync2(join9(registriesDir, "plugin-registry.ts"), `// Auto-generated by nextspark init
 export const PLUGIN_REGISTRY: Record<string, unknown> = {}
 `);
-  writeFileSync2(join8(registriesDir, "testing-registry.ts"), `// Auto-generated by nextspark init
+  writeFileSync2(join9(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> = {}
@@ -3136,11 +4054,11 @@ export const COVERAGE_SUMMARY = { total: 0, covered: 0 }
 export type FlowEntry = unknown
 export type FeatureEntry = unknown
 `);
-  writeFileSync2(join8(registriesDir, "docs-registry.ts"), `// Auto-generated by nextspark init
+  writeFileSync2(join9(registriesDir, "docs-registry.ts"), `// Auto-generated by nextspark init
 export const DOCS_REGISTRY = { sections: [], pages: [] }
 export type DocSectionMeta = { title: string; slug: string }
 `);
-  writeFileSync2(join8(registriesDir, "index.ts"), `// Auto-generated by nextspark init
+  writeFileSync2(join9(registriesDir, "index.ts"), `// Auto-generated by nextspark init
 export * from './block-registry'
 export * from './theme-registry'
 export * from './entity-registry'
@@ -3155,15 +4073,15 @@ async function simpleInit(options) {
   const spinner = ora8("Initializing NextSpark project...").start();
   const projectRoot = process.cwd();
   try {
-    const nextspark = join8(projectRoot, ".nextspark");
-    const registriesDir = join8(nextspark, "registries");
+    const nextspark = join9(projectRoot, ".nextspark");
+    const registriesDir = join9(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 = join8(projectRoot, "tsconfig.json");
+    const tsconfigPath = join9(projectRoot, "tsconfig.json");
     if (existsSync8(tsconfigPath)) {
       spinner.text = "Updating tsconfig.json paths...";
       const tsconfig = JSON.parse(readFileSync7(tsconfigPath, "utf-8"));
@@ -3175,7 +4093,7 @@ async function simpleInit(options) {
       };
       writeFileSync2(tsconfigPath, JSON.stringify(tsconfig, null, 2));
     }
-    const envExample = join8(projectRoot, ".env.example");
+    const envExample = join9(projectRoot, ".env.example");
     if (!existsSync8(envExample)) {
       const envContent = `# NextSpark Configuration
 DATABASE_URL="postgresql://user:password@localhost:5432/db"
@@ -3218,25 +4136,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 join10 } 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 = join10(projectRoot, "node_modules", "@nextsparkjs", "mobile");
+  if (existsSync9(npmPath)) {
+    return npmPath;
+  }
+  const monoPath = join10(projectRoot, "packages", "mobile");
+  if (existsSync9(monoPath)) {
+    return monoPath;
+  }
+  const parentNpmPath = join10(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 = join10(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 = join10(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 = join10(mobileDir, "package.json.template");
+    const pkgPath = join10(mobileDir, "package.json");
+    if (existsSync9(pkgTemplatePath)) {
+      renameSync(pkgTemplatePath, pkgPath);
+      const pkg2 = JSON.parse(readFileSync8(pkgPath, "utf-8"));
+      const rootPkgPath = join10(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",
@@ -3244,7 +4270,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",
@@ -3254,7 +4280,7 @@ async function checkDependencies() {
   }
   let packageJson;
   try {
-    packageJson = await fs8.readJson(packageJsonPath);
+    packageJson = await fs9.readJson(packageJsonPath);
   } catch {
     return {
       name: "Dependencies",
@@ -3271,14 +4297,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",
@@ -3303,8 +4329,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",
@@ -3315,13 +4341,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);
@@ -3329,14 +4355,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");
@@ -3344,14 +4370,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}`);
         }
@@ -3384,8 +4410,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");
@@ -3408,25 +4434,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",
@@ -3467,22 +4493,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 {
@@ -3495,8 +4521,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);
     }
   }
@@ -3505,32 +4531,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);
@@ -3554,11 +4580,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 {
       }
@@ -3595,25 +4621,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) {
@@ -3621,11 +4647,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("");
@@ -3667,7 +4693,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);
   });
 }
@@ -3678,7 +4704,447 @@ 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 join11 } from "path";
+import chalk16 from "chalk";
+import ora10 from "ora";
+function loadProjectEnv4(projectRoot) {
+  const envPath = join11(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 = join11(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 join12, 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 = join12(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 = join12(source, file);
+    const targetPath = join12(target, file);
+    copyFile(sourcePath, targetPath);
+  }
+}
+function getCoreVersion2(coreDir) {
+  try {
+    const pkgPath = join12(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 = join12(coreDir, "templates", "app");
+    const appDir = join12(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 = join12(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 = join12(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 = join12(templatesDir, file);
+        const targetPath = join12(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 = join12(coreDir, "templates");
+      let rootUpdated = 0;
+      let rootCreated = 0;
+      for (const file of ROOT_TEMPLATE_FILES) {
+        const sourcePath = join12(rootTemplatesDir, file);
+        const targetPath = join12(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/commands/setup-ai.ts
+import { existsSync as existsSync12 } from "fs";
+import { join as join13 } from "path";
+import { execSync as execSync3 } from "child_process";
+import chalk18 from "chalk";
+import ora12 from "ora";
+var VALID_EDITORS = ["claude", "cursor", "antigravity", "all"];
+async function setupAICommand(options) {
+  const editor = options.editor || "claude";
+  if (!VALID_EDITORS.includes(editor)) {
+    console.log(chalk18.red(`  Unknown editor: ${editor}`));
+    console.log(chalk18.gray(`  Available: ${VALID_EDITORS.join(", ")}`));
+    process.exit(1);
+  }
+  console.log("");
+  console.log(chalk18.cyan("  AI Workflow Setup"));
+  console.log(chalk18.gray("  " + "-".repeat(40)));
+  console.log("");
+  const pkgPath = getAIWorkflowDir();
+  if (!pkgPath) {
+    console.log(chalk18.red("  @nextsparkjs/ai-workflow package not found."));
+    console.log("");
+    console.log(chalk18.gray("  Install it first:"));
+    console.log(chalk18.cyan("    pnpm add -D -w @nextsparkjs/ai-workflow"));
+    console.log("");
+    process.exit(1);
+  }
+  const setupScript = join13(pkgPath, "scripts", "setup.mjs");
+  if (!existsSync12(setupScript)) {
+    console.log(chalk18.red("  Setup script not found in ai-workflow package."));
+    console.log(chalk18.gray(`  Expected: ${setupScript}`));
+    process.exit(1);
+  }
+  const spinner = ora12({
+    text: `Setting up AI workflow for ${editor}...`,
+    prefixText: "  "
+  }).start();
+  try {
+    spinner.stop();
+    execSync3(`node "${setupScript}" ${editor}`, {
+      cwd: process.cwd(),
+      stdio: "inherit"
+    });
+  } catch (error) {
+    console.log("");
+    console.log(chalk18.red("  AI workflow setup failed."));
+    if (error instanceof Error) {
+      console.log(chalk18.gray(`  ${error.message}`));
+    }
+    process.exit(1);
+  }
+}
+
+// src/commands/sync-ai.ts
+import { existsSync as existsSync13 } from "fs";
+import { join as join14 } from "path";
+import { execSync as execSync4 } from "child_process";
+import chalk19 from "chalk";
+import ora13 from "ora";
+var VALID_EDITORS2 = ["claude", "cursor", "antigravity", "all"];
+async function syncAICommand(options) {
+  const editor = options.editor || "claude";
+  if (!VALID_EDITORS2.includes(editor)) {
+    console.log(chalk19.red(`  Unknown editor: ${editor}`));
+    console.log(chalk19.gray(`  Available: ${VALID_EDITORS2.join(", ")}`));
+    process.exit(1);
+  }
+  console.log("");
+  console.log(chalk19.cyan("  AI Workflow Sync"));
+  console.log(chalk19.gray("  " + "-".repeat(40)));
+  console.log("");
+  const editorDir = editor === "cursor" ? ".cursor" : ".claude";
+  const editorDirPath = join14(process.cwd(), editorDir);
+  if (!existsSync13(editorDirPath)) {
+    console.log(chalk19.red(`  No ${editorDir}/ directory found.`));
+    console.log("");
+    console.log(chalk19.gray("  AI workflow must be set up first. Run:"));
+    console.log(chalk19.cyan("    nextspark setup:ai --editor " + editor));
+    console.log("");
+    process.exit(1);
+  }
+  const pkgPath = getAIWorkflowDir();
+  if (!pkgPath) {
+    console.log(chalk19.red("  @nextsparkjs/ai-workflow package not found."));
+    console.log("");
+    console.log(chalk19.gray("  Install it first:"));
+    console.log(chalk19.cyan("    pnpm add -D -w @nextsparkjs/ai-workflow"));
+    console.log("");
+    process.exit(1);
+  }
+  const setupScript = join14(pkgPath, "scripts", "setup.mjs");
+  if (!existsSync13(setupScript)) {
+    console.log(chalk19.red("  Setup script not found in ai-workflow package."));
+    console.log(chalk19.gray(`  Expected: ${setupScript}`));
+    process.exit(1);
+  }
+  if (!options.force) {
+    console.log(chalk19.yellow("  This will sync AI workflow files from @nextsparkjs/ai-workflow."));
+    console.log(chalk19.gray("  Framework files will be overwritten. Custom files will be preserved."));
+    console.log(chalk19.gray("  Config JSON files will never be overwritten.\n"));
+    try {
+      const { confirm: confirm6 } = await import("@inquirer/prompts");
+      const confirmed = await confirm6({
+        message: "Proceed with sync?",
+        default: true
+      });
+      if (!confirmed) {
+        console.log(chalk19.yellow("\n  Sync cancelled.\n"));
+        process.exit(0);
+      }
+    } catch {
+      console.error(chalk19.red("\n  Failed to load confirmation prompt. Use --force to skip.\n"));
+      process.exit(1);
+    }
+  }
+  const spinner = ora13({
+    text: `Syncing AI workflow for ${editor}...`,
+    prefixText: "  "
+  }).start();
+  try {
+    spinner.stop();
+    execSync4(`node "${setupScript}" ${editor}`, {
+      cwd: process.cwd(),
+      stdio: "inherit"
+    });
+  } catch (error) {
+    console.log("");
+    console.log(chalk19.red("  AI workflow sync failed."));
+    if (error instanceof Error) {
+      console.log(chalk19.gray(`  ${error.message}`));
     }
     process.exit(1);
   }
@@ -3686,8 +5152,9 @@ async function doctorCommand() {
 
 // 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.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);
@@ -3696,12 +5163,21 @@ 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.command("setup:ai").description("Setup AI workflow for your editor (Claude Code, Cursor, Antigravity)").option("-e, --editor <editor>", "Editor to setup (claude, cursor, antigravity, all)", "claude").action(setupAICommand);
+program.command("sync:ai").description("Sync AI workflow files from @nextsparkjs/ai-workflow").option("-e, --editor <editor>", "Editor to sync (claude, cursor, antigravity, all)", "claude").option("-f, --force", "Skip confirmation prompt").action(syncAICommand);
 program.showHelpAfterError();
 program.configureOutput({
-  writeErr: (str) => process.stderr.write(chalk15.red(str))
+  writeErr: (str) => process.stderr.write(chalk20.red(str))
 });
 program.parse();