bunkit-cli 1.3.3 → 1.4.0

package/dist/index.js

@@ -14851,39 +14851,89 @@ var init_monorepo = __esm(() => {
   init_fs();
 });
 
+// ../core/src/presets/custom.ts
+function getPresetsDir() {
+  return join(process.env.HOME || process.env.USERPROFILE || ".", ".bunkit");
+}
+function getPresetsFile() {
+  return join(getPresetsDir(), "presets.json");
+}
+async function loadCustomPresets() {
+  try {
+    const presetsDir = getPresetsDir();
+    await ensureDirectory(presetsDir);
+    const content = await readFile(getPresetsFile());
+    return JSON.parse(content);
+  } catch (_error) {
+    return {};
+  }
+}
+async function saveCustomPreset(preset) {
+  await ensureDirectory(getPresetsDir());
+  const presets = await loadCustomPresets();
+  const existing = presets[preset.name];
+  presets[preset.name] = {
+    ...preset,
+    createdAt: existing?.createdAt || new Date().toISOString(),
+    updatedAt: new Date().toISOString()
+  };
+  await writeFile(getPresetsFile(), JSON.stringify(presets, null, 2));
+}
+async function deleteCustomPreset(name) {
+  const presets = await loadCustomPresets();
+  if (!presets[name]) {
+    return false;
+  }
+  delete presets[name];
+  await writeFile(getPresetsFile(), JSON.stringify(presets, null, 2));
+  return true;
+}
+async function getCustomPreset(name) {
+  const presets = await loadCustomPresets();
+  return presets[name] || null;
+}
+async function listCustomPresets() {
+  const presets = await loadCustomPresets();
+  return Object.values(presets);
+}
+var init_custom2 = __esm(() => {
+  init_dist();
+  init_fs();
+});
+
 // ../core/src/presets/registry.ts
 class PresetRegistry {
   static aliasMap = null;
   static getAliasMap() {
-    if (!this.aliasMap) {
-      this.aliasMap = new Map;
+    if (!PresetRegistry.aliasMap) {
+      PresetRegistry.aliasMap = new Map;
       for (const [name, definition] of Object.entries(PRESET_DEFINITIONS)) {
-        this.aliasMap.set(name, name);
+        PresetRegistry.aliasMap.set(name, name);
         for (const alias of definition.aliases) {
-          this.aliasMap.set(alias, name);
+          PresetRegistry.aliasMap.set(alias, name);
         }
       }
     }
-    return this.aliasMap;
+    return PresetRegistry.aliasMap;
   }
   static normalize(input) {
-    const map = this.getAliasMap();
+    const map = PresetRegistry.getAliasMap();
     return map.get(input) || null;
   }
   static get(input) {
-    const normalized = this.normalize(input);
+    const normalized = PresetRegistry.normalize(input);
     if (!normalized)
       return null;
     return PRESET_DEFINITIONS[normalized];
   }
   static hasCapability(input, capability) {
-    const preset = this.get(input);
+    const preset = PresetRegistry.get(input);
     if (!preset)
       return false;
     return preset.capabilities[capability];
   }
   static isMonorepo(input) {
-    return this.hasCapability(input, "isMonorepo");
+    return PresetRegistry.hasCapability(input, "isMonorepo");
   }
   static getSelectOptions() {
     return Object.values(PRESET_DEFINITIONS).map((preset) => ({
@@ -14896,10 +14946,10 @@ class PresetRegistry {
     return Object.values(PRESET_DEFINITIONS).filter((preset) => preset.capabilities[capability]);
   }
   static isValid(input) {
-    return this.normalize(input) !== null;
+    return PresetRegistry.normalize(input) !== null;
   }
   static getAllValidNames() {
-    return Array.from(this.getAliasMap().keys());
+    return Array.from(PresetRegistry.getAliasMap().keys());
   }
 }
 var PRESET_DEFINITIONS;
@@ -15097,14 +15147,14 @@ var init_registry = __esm(() => {
         autoprefixer: "^10.4.23",
         "radix-ui": "^1.4.3",
         "@radix-ui/react-slot": "^1.2.4",
-        "@base-ui/react": "^1.0.0",
-        shadcn: "^3.6.2",
+        "@base-ui/react": "^1.2.0",
+        shadcn: "^3.8.5",
         "class-variance-authority": "^0.7.1",
         clsx: "^2.1.1",
         "tailwind-merge": "^3.4.0",
         "tw-animate-css": "^1.4.0",
-        "@phosphor-icons/react": "^2.1.10",
         "iconoir-react": "^7.11.0",
+        "@phosphor-icons/react": "^2.1.10",
         ultracite: "^6.4.2",
         "@biomejs/biome": "^2.3.10",
         vitest: "^4.0.16",
@@ -15158,14 +15208,14 @@ var init_registry = __esm(() => {
         autoprefixer: "^10.4.23",
         "radix-ui": "^1.4.3",
         "@radix-ui/react-slot": "^1.2.4",
-        "@base-ui/react": "^1.0.0",
-        shadcn: "^3.6.2",
+        "@base-ui/react": "^1.2.0",
+        shadcn: "^3.8.5",
         "class-variance-authority": "^0.7.1",
         clsx: "^2.1.1",
         "tailwind-merge": "^3.4.0",
         "tw-animate-css": "^1.4.0",
-        "@phosphor-icons/react": "^2.1.10",
         "iconoir-react": "^7.11.0",
+        "@phosphor-icons/react": "^2.1.10",
         ultracite: "^6.4.2",
         "@biomejs/biome": "^2.3.10",
         vitest: "^4.0.16",
@@ -15221,14 +15271,14 @@ var init_registry = __esm(() => {
         autoprefixer: "^10.4.23",
         "radix-ui": "^1.4.3",
         "@radix-ui/react-slot": "^1.2.4",
-        "@base-ui/react": "^1.0.0",
-        shadcn: "^3.6.2",
+        "@base-ui/react": "^1.2.0",
+        shadcn: "^3.8.5",
         "class-variance-authority": "^0.7.1",
         clsx: "^2.1.1",
         "tailwind-merge": "^3.4.0",
         "tw-animate-css": "^1.4.0",
-        "@phosphor-icons/react": "^2.1.10",
         "iconoir-react": "^7.11.0",
+        "@phosphor-icons/react": "^2.1.10",
         ultracite: "^6.4.2",
         "@biomejs/biome": "^2.3.10",
         vitest: "^4.0.16",
@@ -15240,60 +15290,10 @@ var init_registry = __esm(() => {
   };
 });
 
-// ../core/src/presets/custom.ts
-function getPresetsDir() {
-  return join(process.env.HOME || process.env.USERPROFILE || ".", ".bunkit");
-}
-function getPresetsFile() {
-  return join(getPresetsDir(), "presets.json");
-}
-async function loadCustomPresets() {
-  try {
-    const presetsDir = getPresetsDir();
-    await ensureDirectory(presetsDir);
-    const content = await readFile(getPresetsFile());
-    return JSON.parse(content);
-  } catch (_error) {
-    return {};
-  }
-}
-async function saveCustomPreset(preset) {
-  await ensureDirectory(getPresetsDir());
-  const presets = await loadCustomPresets();
-  const existing = presets[preset.name];
-  presets[preset.name] = {
-    ...preset,
-    createdAt: existing?.createdAt || new Date().toISOString(),
-    updatedAt: new Date().toISOString()
-  };
-  await writeFile(getPresetsFile(), JSON.stringify(presets, null, 2));
-}
-async function deleteCustomPreset(name) {
-  const presets = await loadCustomPresets();
-  if (!presets[name]) {
-    return false;
-  }
-  delete presets[name];
-  await writeFile(getPresetsFile(), JSON.stringify(presets, null, 2));
-  return true;
-}
-async function getCustomPreset(name) {
-  const presets = await loadCustomPresets();
-  return presets[name] || null;
-}
-async function listCustomPresets() {
-  const presets = await loadCustomPresets();
-  return Object.values(presets);
-}
-var init_custom2 = __esm(() => {
-  init_dist();
-  init_fs();
-});
-
 // ../core/src/presets/index.ts
 var init_presets = __esm(() => {
-  init_registry();
   init_custom2();
+  init_registry();
 });
 
 // ../core/src/project.ts
@@ -15465,6 +15465,7 @@ function createTemplateContext(config) {
     shadcnMenuAccent: config.shadcnMenuAccent,
     shadcnMenuColor: config.shadcnMenuColor,
     shadcnRadius: config.shadcnRadius,
+    shadcnRtl: config.shadcnRtl,
     supabasePreset: config.supabasePreset,
     supabaseFeatures: config.supabaseFeatures,
     supabaseWithDrizzle: config.supabaseWithDrizzle
@@ -19444,6 +19445,17 @@ var init_zod = __esm(() => {
 });
 
 // ../core/src/types.ts
+function inferShadcnBase(style) {
+  if (style?.startsWith("base-")) {
+    return "base-ui";
+  }
+  return "radix";
+}
+function isModernShadcnStyle(style) {
+  if (!style)
+    return false;
+  return style.startsWith("radix-") || style.startsWith("base-");
+}
 var ProjectConfigSchema, FeatureConfigSchema;
 var init_types2 = __esm(() => {
   init_zod();
@@ -19490,13 +19502,27 @@ var init_types2 = __esm(() => {
     tsStrictness: exports_external.enum(["strict", "moderate", "loose"]).default("strict"),
     uiLibrary: exports_external.enum(["shadcn", "none"]).optional(),
     cssFramework: exports_external.enum(["tailwind", "vanilla", "css-modules"]).optional(),
-    shadcnStyle: exports_external.enum(["radix-maia", "radix-vega", "radix-nova", "radix-lyra", "radix-mira", "new-york", "default"]).optional(),
+    shadcnStyle: exports_external.enum([
+      "radix-maia",
+      "radix-vega",
+      "radix-nova",
+      "radix-lyra",
+      "radix-mira",
+      "base-maia",
+      "base-vega",
+      "base-nova",
+      "base-lyra",
+      "base-mira",
+      "new-york",
+      "default"
+    ]).optional(),
     shadcnBase: exports_external.enum(["radix", "base-ui"]).optional(),
     shadcnBaseColor: exports_external.enum(["neutral", "gray", "zinc", "stone", "slate"]).optional(),
     shadcnIconLibrary: exports_external.enum(["phosphor", "lucide", "iconoir"]).optional(),
     shadcnMenuAccent: exports_external.enum(["subtle", "bold"]).optional(),
     shadcnMenuColor: exports_external.enum(["default", "muted"]).optional(),
     shadcnRadius: exports_external.string().optional(),
+    shadcnRtl: exports_external.boolean().optional(),
     testing: exports_external.enum(["bun-test", "vitest", "none"]).default("bun-test"),
     docker: exports_external.boolean().default(false),
     cicd: exports_external.boolean().default(false),
@@ -19571,6 +19597,7 @@ __export(exports_src, {
   logger: () => logger,
   loadCustomPresets: () => loadCustomPresets,
   listCustomPresets: () => listCustomPresets,
+  isModernShadcnStyle: () => isModernShadcnStyle,
   isGitRepository: () => isGitRepository,
   isGitAvailable: () => isGitAvailable,
   isDirectoryEmpty: () => isDirectoryEmpty,
@@ -19578,6 +19605,7 @@ __export(exports_src, {
   installDevDependencies: () => installDevDependencies,
   installDependencies: () => installDependencies,
   initGit: () => initGit,
+  inferShadcnBase: () => inferShadcnBase,
   getWorkspaceName: () => getWorkspaceName,
   getRootPackageJson: () => getRootPackageJson,
   getProjectName: () => getProjectName,
@@ -21850,11 +21878,13 @@ async function writeMonorepoRootPackageJson(projectPath, projectName, catalog, o
   });
 }
 async function writeNextjsAppPackageJson(appPath, scopeName, appName, options = {}) {
+  const iconLibrary = options.shadcnIconLibrary || "iconoir";
+  const iconPackageName = iconLibrary === "iconoir" ? "iconoir-react" : iconLibrary === "phosphor" ? "@phosphor-icons/react" : "lucide-react";
   const dependencies = {
     react: "catalog:",
     "react-dom": "catalog:",
     next: "catalog:",
-    "iconoir-react": "catalog:"
+    [iconPackageName]: "catalog:"
   };
   if (options.usesTypes) {
     dependencies[`@${scopeName}/types`] = "workspace:*";
@@ -21916,7 +21946,23 @@ async function writeHonoApiPackageJson(appPath, scopeName, options = {}) {
     }
   });
 }
-async function writeUiPackageJson(packagePath, scopeName) {
+async function writeUiPackageJson(packagePath, scopeName, options = {}) {
+  const shadcnBase = options.shadcnBase || "radix";
+  const iconLibrary = options.shadcnIconLibrary || "iconoir";
+  const uiFoundationDeps = {};
+  if (shadcnBase === "base-ui") {
+    uiFoundationDeps["@base-ui/react"] = "catalog:";
+  } else {
+    uiFoundationDeps["radix-ui"] = "catalog:";
+  }
+  const iconDeps = {};
+  if (iconLibrary === "iconoir") {
+    iconDeps["iconoir-react"] = "catalog:";
+  } else if (iconLibrary === "phosphor") {
+    iconDeps["@phosphor-icons/react"] = "catalog:";
+  } else {
+    iconDeps["lucide-react"] = "catalog:";
+  }
   await writePackageJson(packagePath, {
     name: `@${scopeName}/ui`,
     version: "0.0.0",
@@ -21936,13 +21982,11 @@ async function writeUiPackageJson(packagePath, scopeName) {
       lint: "tsc --noEmit"
     },
     dependencies: {
-      "radix-ui": "catalog:",
-      "@radix-ui/react-slot": "catalog:",
+      ...uiFoundationDeps,
       "class-variance-authority": "catalog:",
       clsx: "catalog:",
       "tailwind-merge": "catalog:",
-      "@phosphor-icons/react": "catalog:",
-      "iconoir-react": "catalog:",
+      ...iconDeps,
       "tw-animate-css": "catalog:",
       shadcn: "catalog:",
       tailwindcss: "catalog:",
@@ -28715,9 +28759,10 @@ function generateModernThemeCSS(baseColor, customRadius) {
 async function setupShadcnWeb(projectPath, context) {
   await ensureDirectory(join(projectPath, "src/components/ui"));
   await ensureDirectory(join(projectPath, "src/lib"));
-  const style = context.shadcnStyle || "new-york";
+  const style = context.shadcnStyle || "radix-maia";
   const baseColor = context.shadcnBaseColor || "zinc";
   const radius = context.shadcnRadius || "0.625rem";
+  const iconLibrary = context.shadcnIconLibrary || "iconoir";
   const componentsJson = {
     $schema: "https://ui.shadcn.com/schema.json",
     style,
@@ -28729,7 +28774,7 @@ async function setupShadcnWeb(projectPath, context) {
       baseColor,
       cssVariables: true
     },
-    iconLibrary: "lucide",
+    iconLibrary,
     aliases: {
       components: "@/components",
       utils: "@/lib/utils",
@@ -28738,6 +28783,9 @@ async function setupShadcnWeb(projectPath, context) {
       hooks: "@/hooks"
     }
   };
+  if (context.shadcnRtl) {
+    componentsJson.rtl = true;
+  }
   await writeFile(join(projectPath, "components.json"), JSON.stringify(componentsJson, null, 2));
   const utilsContent = `import { clsx, type ClassValue } from 'clsx';
 import { twMerge } from 'tailwind-merge';
@@ -28755,20 +28803,36 @@ export function cn(...inputs: ClassValue[]) {
   if (!packageJson.dependencies) {
     packageJson.dependencies = {};
   }
-  packageJson.dependencies["@radix-ui/react-slot"] = "catalog:";
+  const shadcnBase = inferShadcnBase(context.shadcnStyle);
+  if (shadcnBase === "base-ui") {
+    packageJson.dependencies["@base-ui/react"] = "catalog:";
+  } else {
+    packageJson.dependencies["radix-ui"] = "catalog:";
+  }
   packageJson.dependencies["class-variance-authority"] = "catalog:";
   packageJson.dependencies.clsx = "catalog:";
   packageJson.dependencies["tailwind-merge"] = "catalog:";
-  packageJson.dependencies["lucide-react"] = "catalog:";
+  const iconPackageName = iconLibrary === "iconoir" ? "iconoir-react" : iconLibrary === "phosphor" ? "@phosphor-icons/react" : "lucide-react";
+  packageJson.dependencies[iconPackageName] = "catalog:";
   if (!packageJson.catalog) {
     packageJson.catalog = {};
   }
-  packageJson.catalog["@radix-ui/react-slot"] = "^1.2.4";
+  if (shadcnBase === "base-ui") {
+    packageJson.catalog["@base-ui/react"] = "^1.2.0";
+  } else {
+    packageJson.catalog["radix-ui"] = "^1.4.3";
+  }
   packageJson.catalog["class-variance-authority"] = "^0.7.1";
   packageJson.catalog.clsx = "^2.1.1";
   packageJson.catalog["tailwind-merge"] = "^3.4.0";
-  packageJson.catalog["lucide-react"] = "^0.562.0";
   packageJson.catalog["tw-animate-css"] = "^1.2.9";
+  if (iconLibrary === "iconoir") {
+    packageJson.catalog["iconoir-react"] = "^7.11.0";
+  } else if (iconLibrary === "phosphor") {
+    packageJson.catalog["@phosphor-icons/react"] = "^2.1.10";
+  } else {
+    packageJson.catalog["lucide-react"] = "^0.562.0";
+  }
   await writeFile(packageJsonPath, JSON.stringify(packageJson, null, 2));
   const globalsCssPath = join(projectPath, "src/app/globals.css");
   let globalsCss = "";
@@ -28795,9 +28859,11 @@ ${shadcnCss}`;
 async function setupShadcnMonorepo(projectPath, context) {
   const packageName = context.packageName || context.projectName.toLowerCase().replace(/\s+/g, "-");
   const uiPackageName = `@${packageName}/ui`;
-  const style = context.shadcnStyle || "new-york";
+  const style = context.shadcnStyle || "radix-maia";
   const baseColor = context.shadcnBaseColor || "zinc";
   const radius = context.shadcnRadius || "0.625rem";
+  const iconLibrary = context.shadcnIconLibrary || "iconoir";
+  const shadcnBase = inferShadcnBase(context.shadcnStyle);
   await ensureDirectory(join(projectPath, "packages/ui/src/components"));
   await ensureDirectory(join(projectPath, "packages/ui/src/lib"));
   await ensureDirectory(join(projectPath, "packages/ui/src/hooks"));
@@ -28819,11 +28885,11 @@ async function setupShadcnMonorepo(projectPath, context) {
       "./components/ui/*": "./src/components/ui/*/index.ts"
     },
     dependencies: {
-      "@radix-ui/react-slot": "catalog:",
+      ...shadcnBase === "base-ui" ? { "@base-ui/react": "catalog:" } : { "radix-ui": "catalog:" },
       "class-variance-authority": "catalog:",
       clsx: "catalog:",
       "tailwind-merge": "catalog:",
-      "lucide-react": "catalog:",
+      ...iconLibrary === "iconoir" ? { "iconoir-react": "catalog:" } : iconLibrary === "phosphor" ? { "@phosphor-icons/react": "catalog:" } : { "lucide-react": "catalog:" },
       tailwindcss: "catalog:",
       "@tailwindcss/postcss": "catalog:"
     },
@@ -28845,7 +28911,7 @@ async function setupShadcnMonorepo(projectPath, context) {
       baseColor,
       cssVariables: true
     },
-    iconLibrary: "lucide",
+    iconLibrary,
     aliases: {
       components: "./src/components",
       ui: "./src/components/ui",
@@ -28854,6 +28920,9 @@ async function setupShadcnMonorepo(projectPath, context) {
       lib: "@/lib"
     }
   };
+  if (context.shadcnRtl) {
+    uiComponentsJson.rtl = true;
+  }
   await writeFile(join(projectPath, "packages/ui/components.json"), JSON.stringify(uiComponentsJson, null, 2));
   const uiUtilsContent = `import { clsx, type ClassValue } from 'clsx';
 import { twMerge } from 'tailwind-merge';
@@ -28943,7 +29012,7 @@ export default config;
         baseColor,
         cssVariables: true
       },
-      iconLibrary: "lucide",
+      iconLibrary,
       aliases: {
         components: "@/components",
         hooks: "@/hooks",
@@ -28952,6 +29021,9 @@ export default config;
         ui: "@workspace/ui/components/ui"
       }
     };
+    if (context.shadcnRtl) {
+      appComponentsJson.rtl = true;
+    }
     await writeFile(join(appPath, "components.json"), JSON.stringify(appComponentsJson, null, 2));
     const layoutPath = join(appPath, "src/app/layout.tsx");
     if (await fileExists(layoutPath)) {
@@ -29047,16 +29119,26 @@ export default nextConfig;
     rootPackageJson.catalog = {};
   }
   const shadcnDependencies = {
-    "@radix-ui/react-slot": "^1.2.4",
     "class-variance-authority": "^0.7.1",
     clsx: "^2.1.1",
     "tailwind-merge": "^3.4.0",
-    "lucide-react": "^0.562.0",
     "tw-animate-css": "^1.2.9",
     "@types/react": "^19.2.7",
     "@types/react-dom": "^19.2.3",
     typescript: "^5.9.3"
   };
+  if (shadcnBase === "base-ui") {
+    shadcnDependencies["@base-ui/react"] = "^1.2.0";
+  } else {
+    shadcnDependencies["radix-ui"] = "^1.4.3";
+  }
+  if (iconLibrary === "iconoir") {
+    shadcnDependencies["iconoir-react"] = "^7.11.0";
+  } else if (iconLibrary === "phosphor") {
+    shadcnDependencies["@phosphor-icons/react"] = "^2.1.10";
+  } else {
+    shadcnDependencies["lucide-react"] = "^0.562.0";
+  }
   Object.assign(rootPackageJson.catalog, shadcnDependencies);
   await writeFile(rootPackageJsonPath, JSON.stringify(rootPackageJson, null, 2));
   await createShadcnDocs(join(projectPath, "packages/ui"), true, context);
@@ -29451,11 +29533,15 @@ async function buildEnterprisePreset(projectPath, context) {
       autoprefixer: "^10.4.23",
       postcss: "^8.5.6",
       "@tailwindcss/postcss": "^4.1.18",
+      "radix-ui": "^1.4.3",
       "@radix-ui/react-slot": "^1.2.4",
+      "@base-ui/react": "^1.2.0",
+      shadcn: "^3.8.5",
       "class-variance-authority": "^0.7.1",
       clsx: "^2.1.1",
       "tailwind-merge": "^3.4.0",
       "iconoir-react": "^7.11.0",
+      "@phosphor-icons/react": "^2.1.10",
       "lucide-react": "^0.562.0",
       "tw-animate-css": "^1.2.9",
       "@biomejs/biome": "^2.3.10",
@@ -29628,9 +29714,11 @@ async function buildEnterprisePreset(projectPath, context) {
     const enterpriseContext = {
       ...context,
       uiLibrary: "shadcn",
-      shadcnStyle: context.shadcnStyle || "new-york",
+      shadcnStyle: context.shadcnStyle || "radix-maia",
       shadcnBaseColor: context.shadcnBaseColor || "zinc",
-      shadcnRadius: context.shadcnRadius || "0.625rem"
+      shadcnRadius: context.shadcnRadius || "0.625rem",
+      shadcnIconLibrary: context.shadcnIconLibrary || "iconoir",
+      shadcnRtl: context.shadcnRtl
     };
     await setupShadcnMonorepo(projectPath, enterpriseContext);
   }
@@ -29791,11 +29879,15 @@ async function buildFullPreset(projectPath, context) {
       autoprefixer: "^10.4.23",
       postcss: "^8.5.6",
       "@tailwindcss/postcss": "^4.1.18",
+      "radix-ui": "^1.4.3",
       "@radix-ui/react-slot": "^1.2.4",
+      "@base-ui/react": "^1.2.0",
+      shadcn: "^3.8.5",
       "class-variance-authority": "^0.7.1",
       clsx: "^2.1.1",
       "tailwind-merge": "^3.4.0",
       "iconoir-react": "^7.11.0",
+      "@phosphor-icons/react": "^2.1.10",
       "lucide-react": "^0.562.0",
       "tw-animate-css": "^1.2.9",
       ...context.codeQuality === "biome" ? { "@biomejs/biome": "^2.3.10" } : {},
@@ -30589,1046 +30681,1023 @@ networks:
     const fullContext = {
       ...context,
       uiLibrary: "shadcn",
-      shadcnStyle: context.shadcnStyle || "new-york",
+      shadcnStyle: context.shadcnStyle || "radix-maia",
       shadcnBaseColor: context.shadcnBaseColor || "zinc",
-      shadcnRadius: context.shadcnRadius || "0.625rem"
+      shadcnRadius: context.shadcnRadius || "0.625rem",
+      shadcnIconLibrary: context.shadcnIconLibrary || "iconoir",
+      shadcnRtl: context.shadcnRtl
     };
     await setupShadcnMonorepo(projectPath, fullContext);
   }
   await setupTooling(projectPath, context);
   await setupVSCodeDebug(projectPath, context, "full");
 }
-// ../templates/src/builders/minimal.ts
+// ../templates/src/builders/full-v2.ts
 init_src();
 init_dist();
-async function buildMinimalPreset(projectPath, context) {
-  const indexContent = `console.log('Hello from ${context.projectName}! \uD83C\uDF5E');
-
-// Your code here
-const greet = (name: string): void => {
-  console.log(\`Welcome, \${name}!\`);
-};
+init_package_json();
 
-greet('Bun');
-`;
-  await writeFile(join(projectPath, "src/index.ts"), indexContent);
-  const tsconfigContent = {
+// ../templates/src/shared/ui-package.ts
+init_src();
+init_dist();
+init_package_json();
+async function buildUiPackage(packagesPath, options) {
+  const uiPath = join(packagesPath, "ui");
+  await ensureDirectory(join(uiPath, "src/components"));
+  await ensureDirectory(join(uiPath, "src/hooks"));
+  await ensureDirectory(join(uiPath, "src/lib"));
+  await ensureDirectory(join(uiPath, "src/styles"));
+  const style = options.shadcnStyle || "radix-maia";
+  const useModernStyle = isModernShadcnStyle(style);
+  const shadcnBase = options.shadcnBase || inferShadcnBase(style);
+  const iconLibrary = options.shadcnIconLibrary || "iconoir";
+  await writeUiPackageJson(uiPath, options.scopeName, {
+    shadcnBase,
+    shadcnIconLibrary: iconLibrary
+  });
+  await writeFile(join(uiPath, "tsconfig.json"), JSON.stringify({
+    extends: "../../tooling/typescript/library.json",
     compilerOptions: {
-      lib: ["ESNext"],
-      target: "ESNext",
-      module: "ESNext",
-      moduleDetection: "force",
       jsx: "react-jsx",
-      allowJs: true,
-      moduleResolution: "bundler",
-      allowImportingTsExtensions: true,
-      verbatimModuleSyntax: true,
-      noEmit: true,
-      strict: true,
-      skipLibCheck: true,
-      noFallthroughCasesInSwitch: true,
-      noUnusedLocals: false,
-      noUnusedParameters: false,
-      noPropertyAccessFromIndexSignature: false,
-      types: ["bun-types"]
+      rootDir: "./src",
+      outDir: "./dist",
+      baseUrl: ".",
+      paths: {
+        "@/*": ["./src/*"]
+      }
+    },
+    include: ["src/**/*"],
+    exclude: ["node_modules"]
+  }, null, 2));
+  const componentsJson = {
+    $schema: "https://ui.shadcn.com/schema.json",
+    style,
+    rsc: true,
+    tsx: true,
+    tailwind: {
+      config: "",
+      css: "./src/styles/globals.css",
+      baseColor: options.shadcnBaseColor || "zinc",
+      cssVariables: true,
+      prefix: ""
+    },
+    iconLibrary,
+    aliases: {
+      components: "@/components",
+      utils: "@/lib/utils",
+      ui: "@/components/ui",
+      lib: "@/lib",
+      hooks: "@/hooks"
     }
   };
-  await writeFile(join(projectPath, "tsconfig.json"), JSON.stringify(tsconfigContent, null, 2));
-  const bunfigContent = generateBunfigContent(context);
-  await writeFile(join(projectPath, "bunfig.toml"), bunfigContent);
-  if (context.codeQuality === "ultracite") {
-    await setupUltracite(projectPath, context);
-  } else {
-    await setupBiome(projectPath, context);
+  if (useModernStyle) {
+    componentsJson.menuColor = options.shadcnMenuColor || "default";
+    componentsJson.menuAccent = options.shadcnMenuAccent || "subtle";
+    componentsJson.registries = {};
   }
-  await setupVSCodeDebug(projectPath, context, "minimal");
-  await generateMinimalReadme(projectPath, context);
-}
-// ../templates/src/builders/monorepo-bun.ts
-init_src();
-init_dist();
-var databaseSetupMap6 = {
-  "postgres-drizzle": setupPostgresDrizzle,
-  "postgres-prisma": setupPostgresPrisma,
-  "mysql-drizzle": setupMySQLDrizzle,
-  "mysql-prisma": setupMySQLPrisma,
-  supabase: setupSupabaseOnly,
-  "supabase-drizzle": setupSupabaseDrizzle,
-  "supabase-prisma": setupSupabasePrisma,
-  "sqlite-drizzle": setupSQLiteDrizzle,
-  "sqlite-prisma": setupSQLitePrisma,
-  none: async () => {}
-};
-async function buildMonorepoBunPreset(projectPath, context) {
-  await ensureDirectory(join(projectPath, "apps/web"));
-  await ensureDirectory(join(projectPath, "apps/api"));
-  await ensureDirectory(join(projectPath, "packages/types"));
-  await ensureDirectory(join(projectPath, "packages/utils"));
-  if (context.database && context.database !== "none") {
-    await ensureDirectory(join(projectPath, "packages/db"));
+  if (options.shadcnRtl) {
+    componentsJson.rtl = true;
   }
-  const rootPackageJson = {
-    name: `${context.packageName}-monorepo`,
-    version: "0.0.0",
-    private: true,
-    workspaces: ["apps/*", "packages/*"],
-    scripts: {
-      dev: 'bun run --filter "*" dev',
-      build: 'bun run --filter "*" build',
-      lint: context.codeQuality === "biome" ? "biome check ." : "ultracite check .",
-      format: context.codeQuality === "biome" ? "biome check --write ." : "ultracite fix .",
-      test: "bun test",
-      "dev:web": 'bun run --filter "@*/web" dev',
-      "dev:api": 'bun run --filter "@*/api" dev',
-      debug: "bun --inspect apps/api/src/index.ts",
-      "debug:brk": "bun --inspect-brk apps/api/src/index.ts",
-      "debug:wait": "bun --inspect-wait apps/api/src/index.ts"
-    },
-    devDependencies: {
-      "@types/bun": "latest",
-      typescript: "catalog:",
-      ...context.codeQuality === "biome" ? { "@biomejs/biome": "catalog:" } : {}
-    },
-    catalog: {
-      react: "^19.2.3",
-      "react-dom": "^19.2.3",
-      "drizzle-orm": "^0.45.1",
-      "drizzle-kit": "^0.31.8",
-      postgres: "^3.4.7",
-      "@supabase/supabase-js": "^2.88.0",
-      "@prisma/client": "^7.2.0",
-      prisma: "^7.2.0",
-      mysql2: "^3.16.0",
-      "better-auth": "^1.4.7",
-      "next-auth": "^4.24.13",
-      "@auth/drizzle-adapter": "^1.11.1",
-      tailwindcss: "^4.1.18",
-      autoprefixer: "^10.4.23",
-      postcss: "^8.5.6",
-      typescript: "^5.9.3",
-      "@types/react": "^19.2.7",
-      "@types/react-dom": "^19.2.3",
-      "@types/node": "^25.0.3"
-    }
-  };
-  await writeFile(join(projectPath, "package.json"), JSON.stringify(rootPackageJson, null, 2));
-  const apiPath = join(projectPath, "apps/api");
-  await setupBunServeNative(apiPath, context, true);
-  const apiPackageJson = {
-    name: `@${context.packageName}/api`,
-    version: "0.0.0",
-    private: true,
-    scripts: {
-      dev: "bun run --hot src/index.ts",
-      start: "bun run src/index.ts",
-      debug: "bun --inspect src/index.ts",
-      "debug:brk": "bun --inspect-brk src/index.ts",
-      "debug:wait": "bun --inspect-wait src/index.ts"
-    },
-    dependencies: {
-      [`@${context.packageName}/types`]: "workspace:*"
-    },
-    devDependencies: {
-      "@types/bun": "latest",
-      typescript: "catalog:"
-    }
-  };
-  await writeFile(join(apiPath, "package.json"), JSON.stringify(apiPackageJson, null, 2));
-  const webPath = join(projectPath, "apps/web");
-  await setupBunFullstack(webPath, context);
-  const webPackageJson = {
-    name: `@${context.packageName}/web`,
-    version: "0.0.0",
-    private: true,
-    scripts: {
-      dev: "bun run --hot src/index.ts",
-      build: "bun build src/index.ts --outdir ./dist --target bun",
-      start: "bun run dist/index.js",
-      debug: "bun --inspect src/index.ts",
-      "debug:brk": "bun --inspect-brk src/index.ts",
-      "debug:wait": "bun --inspect-wait src/index.ts"
-    },
-    dependencies: {
-      react: "catalog:",
-      "react-dom": "catalog:",
-      [`@${context.packageName}/types`]: "workspace:*"
-    },
-    devDependencies: {
-      "@types/react": "catalog:",
-      "@types/react-dom": "catalog:",
-      "@types/bun": "latest",
-      typescript: "catalog:"
-    }
-  };
-  await writeFile(join(webPath, "package.json"), JSON.stringify(webPackageJson, null, 2));
-  if (context.database && context.database !== "none") {
-    await databaseSetupMap6[context.database](join(projectPath, "packages/db"), context, true);
-  }
-  if (context.redis) {
-    await setupRedis(join(projectPath, "packages"), context, true);
-  }
-  if (context.auth === "better-auth") {
-    await setupBetterAuth(join(projectPath, "packages"), context, true);
-  } else if (context.auth === "nextauth") {
-    await setupNextAuth(join(projectPath, "packages"), context, true);
-  }
-  if (context.useBunSecrets) {
-    await setupBunSecrets(join(projectPath, "packages"), context, true);
-  }
-  if (context.codeQuality === "biome") {
-    await setupBiome(projectPath, context);
+  await writeFile(join(uiPath, "components.json"), JSON.stringify(componentsJson, null, 2));
+  await writeFile(join(uiPath, "postcss.config.mjs"), `export default {
+  plugins: {
+    '@tailwindcss/postcss': {},
+  },
+};
+`);
+  const appsToScan = options.appsToScan || ["web", "platform"];
+  const appSourcePaths = appsToScan.map((app) => `@source "../../../apps/${app}/src/**/*.{ts,tsx}";`);
+  const baseColor = options.shadcnBaseColor || "zinc";
+  const customRadius = options.shadcnRadius || "0.625rem";
+  let globalsCss;
+  if (useModernStyle) {
+    const modernThemeCSS = generateModernThemeCSS(baseColor, customRadius);
+    const shadcnImport = shadcnBase === "base-ui" ? "" : `
+@import "shadcn/tailwind.css";`;
+    globalsCss = `@import "tailwindcss";
+@import "tw-animate-css";${shadcnImport}
+${appSourcePaths.join(`
+`)}
+@source "../**/*.{ts,tsx}";
+
+@custom-variant dark (&:is(.dark *));
+
+${modernThemeCSS}
+`;
   } else {
-    await setupUltracite(projectPath, context);
-  }
-  if (context.docker) {
-    await setupDocker(projectPath, context);
-  }
-  if (context.cicd) {
-    await setupGitHubActions(projectPath, context);
+    const theme = themes[baseColor] || themes.zinc;
+    const themeCSS = generateThemeCSS(theme, customRadius);
+    globalsCss = `@import "tailwindcss";
+${appSourcePaths.join(`
+`)}
+@source "../**/*.{ts,tsx}";
+
+${themeCSS}
+`;
   }
-  await setupTooling(projectPath, context);
-  await setupVSCodeDebug(projectPath, context, "full");
-  const bunfigContent = generateBunfigContent(context);
-  await writeFile(join(projectPath, "bunfig.toml"), bunfigContent);
-  const typesPackageJson = {
-    name: `@${context.packageName}/types`,
-    version: "0.0.0",
-    private: true,
-    main: "./index.ts",
-    types: "./index.ts",
-    scripts: {},
-    devDependencies: {
-      typescript: "catalog:"
-    }
-  };
-  await ensureDirectory(join(projectPath, "packages/types"));
-  await writeFile(join(projectPath, "packages/types/package.json"), JSON.stringify(typesPackageJson, null, 2));
-  const typesIndex = `// Shared types across the monorepo
+  await writeFile(join(uiPath, "src/styles/globals.css"), globalsCss);
+  await writeFile(join(uiPath, "src/lib/utils.ts"), `import { clsx, type ClassValue } from 'clsx';
+import { twMerge } from 'tailwind-merge';
+
+export function cn(...inputs: ClassValue[]) {
+  return twMerge(clsx(inputs));
+}
+`);
+  await writeFile(join(uiPath, "src/components/index.ts"), `/**
+ * UI Components
+ *
+ * Add shadcn/ui components using:
+ * bunx shadcn@latest add button card dialog ...
+ *
+ * Then export them here for use across apps.
+ */
+
+// Export components as they are added
+// Example: export { Button } from './ui/button';
+
+// Empty export to make this a valid ES module
+export {};
+`);
+  await writeFile(join(uiPath, "src/hooks/index.ts"), `/**
+ * Shared Hooks
+ *
+ * Custom React hooks shared across apps.
+ */
+
+// Export hooks as they are added
+// Example: export { useMediaQuery } from './use-media-query';
+
+// Empty export to make this a valid ES module
+export {};
+`);
+  await writeFile(join(uiPath, "src/index.ts"), `/**
+ * @${options.scopeName}/ui - Shared UI Components
+ *
+ * This package provides:
+ * - shadcn/ui components (add with: bunx shadcn@latest add <component>)
+ * - Tailwind CSS v4 configuration
+ * - Shared hooks and utilities
+ *
+ * Usage in apps:
+ * - Import globals.css: import '@${options.scopeName}/ui/globals.css';
+ * - Import components: import { Button } from '@${options.scopeName}/ui/components';
+ * - Import utils: import { cn } from '@${options.scopeName}/ui/lib/utils';
+ */
+
+export * from './lib/utils';
+export * from './hooks';
+export * from './components';
+`);
+}
+async function buildTypesPackage(packagesPath, scopeName) {
+  const typesPath = join(packagesPath, "types");
+  await ensureDirectory(join(typesPath, "src"));
+  const { writeTypesPackageJson: writeTypesPackageJson2 } = await Promise.resolve().then(() => (init_package_json(), exports_package_json));
+  await writeTypesPackageJson2(typesPath, scopeName);
+  await writeFile(join(typesPath, "tsconfig.json"), JSON.stringify({
+    extends: "../../tooling/typescript/library.json",
+    compilerOptions: {
+      rootDir: "./src",
+      outDir: "./dist"
+    },
+    include: ["src/**/*"],
+    exclude: ["node_modules"]
+  }, null, 2));
+  await writeFile(join(typesPath, "src/index.ts"), `/**
+ * @${scopeName}/types - Shared TypeScript Types
+ *
+ * Define types that are shared across multiple packages/apps here.
+ */
+
+// Example types - replace with your actual types
+
 export interface User {
-  id: number;
-  name: string;
+  id: string;
   email: string;
+  name?: string;
   createdAt: Date;
+  updatedAt: Date;
 }
 
-export interface ApiResponse<T = unknown> {
+export interface ApiResponse<T> {
   success: boolean;
   data?: T;
-  error?: string;
-  timestamp: string;
-}
-`;
-  await writeFile(join(projectPath, "packages/types/index.ts"), typesIndex);
-  const utilsPackageJson = {
-    name: `@${context.packageName}/utils`,
-    version: "0.0.0",
-    private: true,
-    main: "./index.ts",
-    types: "./index.ts",
-    scripts: {},
-    dependencies: {},
-    devDependencies: {
-      typescript: "catalog:"
-    }
+  error?: {
+    code: string;
+    message: string;
   };
-  await ensureDirectory(join(projectPath, "packages/utils"));
-  await writeFile(join(projectPath, "packages/utils/package.json"), JSON.stringify(utilsPackageJson, null, 2));
-  const utilsIndex = `// Shared utilities across the monorepo
-export function formatDate(date: Date): string {
-  return date.toISOString();
 }
 
-export function capitalize(str: string): string {
-  return str.charAt(0).toUpperCase() + str.slice(1);
+export interface PaginatedResponse<T> extends ApiResponse<T[]> {
+  pagination: {
+    page: number;
+    perPage: number;
+    total: number;
+    totalPages: number;
+  };
 }
-`;
-  await writeFile(join(projectPath, "packages/utils/index.ts"), utilsIndex);
-  await generateMonorepoReadme(projectPath, context, "bun");
-  const tsconfigContent = {
-    extends: "./tooling/typescript/base.json",
-    compilerOptions: {},
-    include: ["apps/*/src/**/*", "packages/*/**/*"],
+`);
+}
+async function buildUtilsPackage(packagesPath, scopeName) {
+  const utilsPath = join(packagesPath, "utils");
+  await ensureDirectory(join(utilsPath, "src"));
+  const { writeUtilsPackageJson: writeUtilsPackageJson2 } = await Promise.resolve().then(() => (init_package_json(), exports_package_json));
+  await writeUtilsPackageJson2(utilsPath, scopeName);
+  await writeFile(join(utilsPath, "tsconfig.json"), JSON.stringify({
+    extends: "../../tooling/typescript/library.json",
+    compilerOptions: {
+      rootDir: "./src",
+      outDir: "./dist"
+    },
+    include: ["src/**/*"],
     exclude: ["node_modules"]
+  }, null, 2));
+  await writeFile(join(utilsPath, "src/index.ts"), `/**
+ * @${scopeName}/utils - Shared Utilities
+ *
+ * Utility functions shared across packages and apps.
+ */
+
+/**
+ * Format a date to a human-readable string
+ */
+export function formatDate(date: Date | string, locale = 'en-US'): string {
+  const d = typeof date === 'string' ? new Date(date) : date;
+  return d.toLocaleDateString(locale, {
+    year: 'numeric',
+    month: 'long',
+    day: 'numeric',
+  });
+}
+
+/**
+ * Format a number as currency
+ */
+export function formatCurrency(
+  amount: number,
+  currency = 'USD',
+  locale = 'en-US'
+): string {
+  return new Intl.NumberFormat(locale, {
+    style: 'currency',
+    currency,
+  }).format(amount);
+}
+
+/**
+ * Sleep for a specified number of milliseconds
+ */
+export function sleep(ms: number): Promise<void> {
+  return new Promise((resolve) => setTimeout(resolve, ms));
+}
+
+/**
+ * Safely parse JSON with a fallback value
+ */
+export function safeJsonParse<T>(json: string, fallback: T): T {
+  try {
+    return JSON.parse(json) as T;
+  } catch {
+    return fallback;
+  }
+}
+
+/**
+ * Generate a random ID
+ */
+export function generateId(length = 12): string {
+  const chars = 'ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789';
+  let result = '';
+  for (let i = 0; i < length; i++) {
+    result += chars.charAt(Math.floor(Math.random() * chars.length));
+  }
+  return result;
+}
+
+/**
+ * Debounce a function
+ */
+export function debounce<T extends (...args: unknown[]) => unknown>(
+  func: T,
+  wait: number
+): (...args: Parameters<T>) => void {
+  let timeout: ReturnType<typeof setTimeout> | null = null;
+  return (...args: Parameters<T>) => {
+    if (timeout) clearTimeout(timeout);
+    timeout = setTimeout(() => func(...args), wait);
   };
-  await writeFile(join(projectPath, "tsconfig.json"), JSON.stringify(tsconfigContent, null, 2));
 }
-// ../templates/src/builders/web.ts
-init_src();
-init_dist();
-async function buildWebPreset(projectPath, context) {
-  await ensureDirectory(join(projectPath, "src/app"));
-  await ensureDirectory(join(projectPath, "public"));
-  const layoutContent = `import type { Metadata } from 'next'
-import './globals.css'
+
+/**
+ * Check if running on server
+ * Uses a type-safe approach that works without DOM types
+ */
+export function isServer(): boolean {
+  return !(typeof window !== 'undefined' && window.document);
+}
+
+/**
+ * Check if running on client
+ * Uses a type-safe approach that works without DOM types
+ */
+export function isClient(): boolean {
+  return typeof window !== 'undefined' && !!window.document;
+}
+
+// Declare window for environments without DOM types
+declare const window: { document?: unknown } | undefined;
+`);
+}
+
+// ../templates/src/builders/full-v2.ts
+async function buildFullPresetV2(projectPath, context) {
+  const preset = PresetRegistry.get("nextjs-monorepo");
+  if (!preset) {
+    throw new Error("nextjs-monorepo preset not found in registry");
+  }
+  const scopeName = context.packageName;
+  const directories = [
+    "apps/web/src/app",
+    "apps/web/src/components",
+    "apps/web/src/lib",
+    "apps/platform/src/app",
+    "apps/platform/src/components",
+    "apps/platform/src/lib",
+    "apps/api/src/routes",
+    "apps/api/src/middleware",
+    "packages/ui",
+    "packages/types",
+    "packages/utils",
+    "tooling/typescript"
+  ];
+  for (const dir of directories) {
+    await ensureDirectory(join(projectPath, dir));
+  }
+  const catalog = preset.catalogEntries || {};
+  await writeMonorepoRootPackageJson(projectPath, scopeName, catalog, {
+    hasWeb: true,
+    hasPlatform: true,
+    hasApi: true,
+    codeQuality: context.codeQuality === "biome" ? "biome" : "ultracite"
+  });
+  await writeFile(join(projectPath, "bunfig.toml"), generateBunfigContent(context));
+  await writeNextjsAppPackageJson(join(projectPath, "apps/web"), scopeName, "web", {
+    usesUi: true,
+    usesTypes: true,
+    shadcnIconLibrary: context.shadcnIconLibrary || "iconoir"
+  });
+  await writeFile(join(projectPath, "apps/web/src/app/layout.tsx"), `import type { Metadata } from 'next';
+import '@${scopeName}/ui/globals.css';
 
 export const metadata: Metadata = {
   title: '${context.projectName}',
-  description: 'Built with bunkit \uD83C\uDF5E',
-}
+  description: 'Enterprise SaaS built with bunkit',
+};
 
 export default function RootLayout({
   children,
 }: {
-  children: React.ReactNode
+  children: React.ReactNode;
 }) {
   return (
     <html lang="en">
-      <body>{children}</body>
+      <body className="antialiased">{children}</body>
     </html>
-  )
+  );
 }
-`;
-  await writeFile(join(projectPath, "src/app/layout.tsx"), layoutContent);
-  const pageContent = `export default function Home() {
+`);
+  await writeFile(join(projectPath, "apps/web/src/app/page.tsx"), `import { Home, Rocket, Book } from 'iconoir-react';
+
+export default function HomePage() {
   return (
-    <main className="min-h-screen flex items-center justify-center">
-      <div className="text-center">
-        <h1 className="text-4xl font-bold mb-4">
-          Welcome to ${context.projectName} \uD83C\uDF5E
+    <main className="min-h-screen flex items-center justify-center bg-gradient-to-br from-background to-muted">
+      <div className="text-center space-y-8 p-8 max-w-3xl">
+        <div className="flex justify-center">
+          <Home className="w-16 h-16 text-primary" />
+        </div>
+        <h1 className="text-5xl font-bold tracking-tight">
+          Welcome to ${context.projectName}
         </h1>
-        <p className="text-gray-600">
-          Built with Next.js 16, React 19, and bunkit
+        <p className="text-xl text-muted-foreground">
+          Enterprise-grade SaaS built with Next.js 16, React 19, Hono, and Bun
         </p>
+        <div className="flex gap-4 justify-center pt-4">
+          <a
+            href="/dashboard"
+            className="inline-flex items-center gap-2 px-6 py-3 bg-primary text-primary-foreground rounded-lg hover:bg-primary/90 transition font-medium"
+          >
+            <Rocket className="w-5 h-5" />
+            Get Started
+          </a>
+          <a
+            href="/docs"
+            className="inline-flex items-center gap-2 px-6 py-3 bg-secondary text-secondary-foreground rounded-lg hover:bg-secondary/90 transition font-medium"
+          >
+            <Book className="w-5 h-5" />
+            Documentation
+          </a>
+        </div>
       </div>
     </main>
-  )
+  );
 }
-
-// Next.js 16 Note:
-// When you add dynamic routes with params, make your component async and await params:
-// export default async function Page({ params }: { params: Promise<{ slug: string }> }) {
-//   const { slug } = await params;
-//   return <div>{slug}</div>;
-// }
-`;
-  await writeFile(join(projectPath, "src/app/page.tsx"), pageContent);
-  const globalsCssContent = `@import "tailwindcss";
-`;
-  await writeFile(join(projectPath, "src/app/globals.css"), globalsCssContent);
-  const nextConfigContent = `import type { NextConfig } from 'next';
+`);
+  await writeFile(join(projectPath, "apps/web/next.config.ts"), `import type { NextConfig } from 'next';
 
 const nextConfig: NextConfig = {
-  /* config options here */
+  transpilePackages: ['@${scopeName}/ui'],
 };
 
 export default nextConfig;
-`;
-  await writeFile(join(projectPath, "next.config.ts"), nextConfigContent);
-  const tailwindConfigContent = `import type { Config } from 'tailwindcss';
-
-const config: Config = {
-  content: ['./src/**/*.{js,ts,jsx,tsx,mdx}'],
-  theme: {
-    extend: {},
-  },
-  plugins: [],
-};
-
-export default config;
-`;
-  await writeFile(join(projectPath, "tailwind.config.ts"), tailwindConfigContent);
-  const getTsCompilerOptions = () => {
-    const baseOptions = {
-      target: "ES2017",
-      lib: ["dom", "dom.iterable", "esnext"],
-      allowJs: true,
-      skipLibCheck: true,
-      noEmit: true,
-      esModuleInterop: true,
-      module: "esnext",
-      moduleResolution: "bundler",
-      resolveJsonModule: true,
-      isolatedModules: true,
-      jsx: "react-jsx",
-      incremental: true,
-      plugins: [{ name: "next" }],
-      paths: context.pathAliases ? { "@/*": ["./src/*"] } : undefined
-    };
-    if (context.tsStrictness === "strict") {
-      return {
-        ...baseOptions,
-        strict: true,
-        noUnusedLocals: true,
-        noUnusedParameters: true,
-        noFallthroughCasesInSwitch: true,
-        noImplicitReturns: true
-      };
-    }
-    if (context.tsStrictness === "moderate") {
-      return {
-        ...baseOptions,
-        strict: true,
-        noUnusedLocals: false,
-        noUnusedParameters: false
-      };
-    }
-    return {
-      ...baseOptions,
-      strict: false,
-      noImplicitAny: false
-    };
-  };
-  const tsconfigContent = {
-    compilerOptions: getTsCompilerOptions(),
-    include: ["next-env.d.ts", "**/*.ts", "**/*.tsx", ".next/dev/types/**/*.ts"],
-    exclude: ["node_modules"]
-  };
-  await writeFile(join(projectPath, "tsconfig.json"), JSON.stringify(tsconfigContent, null, 2));
-  const bunfigContent = generateBunfigContent(context);
-  await writeFile(join(projectPath, "bunfig.toml"), bunfigContent);
-  if (context.codeQuality === "ultracite") {
-    await setupUltracite(projectPath, context);
-  } else {
-    await setupBiome(projectPath, context);
-  }
-  if (context.docker) {
-    await setupDocker(projectPath, context);
-  }
-  if (context.cicd) {
-    await setupGitHubActions(projectPath, context);
-  }
-  if (context.uiLibrary === "shadcn" && context.cssFramework === "tailwind") {
-    await setupShadcnWeb(projectPath, context);
-  }
-  await setupVSCodeDebug(projectPath, context, "web");
-  const packageJsonPath = join(projectPath, "package.json");
-  const existingPackageJson = JSON.parse(await Bun.file(packageJsonPath).text());
-  existingPackageJson.dependencies = {
-    react: "^19.2.3",
-    "react-dom": "^19.2.3",
-    next: "^16.0.10",
-    ...existingPackageJson.dependencies
-  };
-  existingPackageJson.devDependencies = {
-    ...existingPackageJson.devDependencies,
-    "@types/react": "^19.2.7",
-    "@types/react-dom": "^19.2.3",
-    "@types/node": "^25.0.3"
-  };
-  if (!existingPackageJson.scripts) {
-    existingPackageJson.scripts = {};
-  }
-  if (!existingPackageJson.scripts.dev) {
-    existingPackageJson.scripts.dev = "bun run --bun next dev --turbopack";
-  }
-  if (!existingPackageJson.scripts.build) {
-    existingPackageJson.scripts.build = "bun run --bun next build";
-  }
-  if (!existingPackageJson.scripts.start) {
-    existingPackageJson.scripts.start = "bun run --bun next start";
-  }
-  if (!existingPackageJson.scripts.debug) {
-    existingPackageJson.scripts.debug = "bun --inspect node_modules/.bin/next dev --turbopack";
-  }
-  if (!existingPackageJson.scripts["debug:brk"]) {
-    existingPackageJson.scripts["debug:brk"] = "bun --inspect-brk node_modules/.bin/next dev --turbopack";
-  }
-  if (!existingPackageJson.scripts["debug:wait"]) {
-    existingPackageJson.scripts["debug:wait"] = "bun --inspect-wait node_modules/.bin/next dev --turbopack";
-  }
-  await writeFile(packageJsonPath, JSON.stringify(existingPackageJson, null, 2));
-  await generateNextjsReadme(projectPath, context);
-}
-// ../templates/src/builders/full-v2.ts
-init_src();
-init_dist();
-init_package_json();
-
-// ../templates/src/shared/ui-package.ts
-init_src();
-init_dist();
-init_package_json();
-function isModernStyle(style) {
-  return style === "radix-maia" || style === "radix-vega" || style === "radix-nova" || style === "radix-lyra" || style === "radix-mira";
-}
-async function buildUiPackage(packagesPath, options) {
-  const uiPath = join(packagesPath, "ui");
-  await ensureDirectory(join(uiPath, "src/components"));
-  await ensureDirectory(join(uiPath, "src/hooks"));
-  await ensureDirectory(join(uiPath, "src/lib"));
-  await ensureDirectory(join(uiPath, "src/styles"));
-  await writeUiPackageJson(uiPath, options.scopeName);
-  await writeFile(join(uiPath, "tsconfig.json"), JSON.stringify({
-    extends: "../../tooling/typescript/library.json",
+`);
+  await writeFile(join(projectPath, "apps/web/tsconfig.json"), JSON.stringify({
+    extends: "../../tooling/typescript/nextjs.json",
     compilerOptions: {
-      jsx: "react-jsx",
-      rootDir: "./src",
-      outDir: "./dist",
-      baseUrl: ".",
       paths: {
         "@/*": ["./src/*"]
       }
     },
-    include: ["src/**/*"],
+    include: ["next-env.d.ts", "**/*.ts", "**/*.tsx", ".next/types/**/*.ts"],
     exclude: ["node_modules"]
   }, null, 2));
-  const style = options.shadcnStyle || "radix-maia";
-  const useModernStyle = isModernStyle(style);
-  const iconLibrary = options.shadcnIconLibrary || (useModernStyle ? "phosphor" : "iconoir");
-  const componentsJson = {
-    $schema: "https://ui.shadcn.com/schema.json",
-    style,
-    rsc: true,
-    tsx: true,
-    tailwind: {
-      config: "",
-      css: "./src/styles/globals.css",
-      baseColor: options.shadcnBaseColor || "zinc",
-      cssVariables: true,
-      prefix: ""
-    },
-    iconLibrary,
-    aliases: {
-      components: "@/components",
-      utils: "@/lib/utils",
-      ui: "@/components/ui",
-      lib: "@/lib",
-      hooks: "@/hooks"
-    }
-  };
-  if (useModernStyle) {
-    componentsJson.menuColor = options.shadcnMenuColor || "default";
-    componentsJson.menuAccent = options.shadcnMenuAccent || "subtle";
-    componentsJson.registries = {};
-  }
-  await writeFile(join(uiPath, "components.json"), JSON.stringify(componentsJson, null, 2));
-  await writeFile(join(uiPath, "postcss.config.mjs"), `export default {
+  await writeFile(join(projectPath, "apps/web/postcss.config.mjs"), `export default {
   plugins: {
     '@tailwindcss/postcss': {},
   },
 };
 `);
-  const appsToScan = options.appsToScan || ["web", "platform"];
-  const appSourcePaths = appsToScan.map((app) => `@source "../../../apps/${app}/src/**/*.{ts,tsx}";`);
-  const baseColor = options.shadcnBaseColor || "zinc";
-  const customRadius = options.shadcnRadius || "0.625rem";
-  let globalsCss;
-  if (useModernStyle) {
-    const modernThemeCSS = generateModernThemeCSS(baseColor, customRadius);
-    globalsCss = `@import "tailwindcss";
-@import "tw-animate-css";
-@import "shadcn/tailwind.css";
-${appSourcePaths.join(`
-`)}
-@source "../**/*.{ts,tsx}";
+  await writeNextjsAppPackageJson(join(projectPath, "apps/platform"), scopeName, "platform", {
+    usesUi: true,
+    usesTypes: true,
+    shadcnIconLibrary: context.shadcnIconLibrary || "iconoir"
+  });
+  await writeFile(join(projectPath, "apps/platform/src/app/layout.tsx"), `import type { Metadata } from 'next';
+import '@${scopeName}/ui/globals.css';
 
-@custom-variant dark (&:is(.dark *));
+export const metadata: Metadata = {
+  title: '${context.projectName} - Admin',
+  description: 'Admin dashboard for ${context.projectName}',
+};
 
-${modernThemeCSS}
-`;
-  } else {
-    const theme = themes[baseColor] || themes.zinc;
-    const themeCSS = generateThemeCSS(theme, customRadius);
-    globalsCss = `@import "tailwindcss";
-${appSourcePaths.join(`
-`)}
-@source "../**/*.{ts,tsx}";
+export default function RootLayout({
+  children,
+}: {
+  children: React.ReactNode;
+}) {
+  return (
+    <html lang="en">
+      <body className="antialiased">{children}</body>
+    </html>
+  );
+}
+`);
+  await writeFile(join(projectPath, "apps/platform/src/app/page.tsx"), `import { ViewGrid, User, Dollar, GraphUp } from 'iconoir-react';
 
-${themeCSS}
-`;
-  }
-  await writeFile(join(uiPath, "src/styles/globals.css"), globalsCss);
-  await writeFile(join(uiPath, "src/lib/utils.ts"), `import { clsx, type ClassValue } from 'clsx';
-import { twMerge } from 'tailwind-merge';
+export default function DashboardPage() {
+  return (
+    <main className="min-h-screen bg-background">
+      <div className="max-w-7xl mx-auto py-12 px-4">
+        <header className="mb-8 flex items-center gap-3">
+          <ViewGrid className="w-8 h-8 text-primary" />
+          <div>
+            <h1 className="text-3xl font-bold">Admin Dashboard</h1>
+            <p className="text-muted-foreground">
+              Manage your ${context.projectName} platform
+            </p>
+          </div>
+        </header>
 
-export function cn(...inputs: ClassValue[]) {
-  return twMerge(clsx(inputs));
+        <div className="grid grid-cols-1 md:grid-cols-3 gap-6">
+          <div className="bg-card p-6 rounded-lg border shadow-sm">
+            <div className="flex items-center gap-3 mb-2">
+              <User className="w-5 h-5 text-blue-500" />
+              <h2 className="text-lg font-semibold">Users</h2>
+            </div>
+            <p className="text-3xl font-bold">1,234</p>
+          </div>
+          <div className="bg-card p-6 rounded-lg border shadow-sm">
+            <div className="flex items-center gap-3 mb-2">
+              <Dollar className="w-5 h-5 text-green-500" />
+              <h2 className="text-lg font-semibold">Revenue</h2>
+            </div>
+            <p className="text-3xl font-bold">$12,345</p>
+          </div>
+          <div className="bg-card p-6 rounded-lg border shadow-sm">
+            <div className="flex items-center gap-3 mb-2">
+              <GraphUp className="w-5 h-5 text-purple-500" />
+              <h2 className="text-lg font-semibold">Active</h2>
+            </div>
+            <p className="text-3xl font-bold">567</p>
+          </div>
+        </div>
+      </div>
+    </main>
+  );
 }
 `);
-  await writeFile(join(uiPath, "src/components/index.ts"), `/**
- * UI Components
- *
- * Add shadcn/ui components using:
- * bunx shadcn@latest add button card dialog ...
- *
- * Then export them here for use across apps.
- */
+  await writeFile(join(projectPath, "apps/platform/next.config.ts"), `import type { NextConfig } from 'next';
 
-// Export components as they are added
-// Example: export { Button } from './ui/button';
-
-// Empty export to make this a valid ES module
-export {};
-`);
-  await writeFile(join(uiPath, "src/hooks/index.ts"), `/**
- * Shared Hooks
- *
- * Custom React hooks shared across apps.
- */
-
-// Export hooks as they are added
-// Example: export { useMediaQuery } from './use-media-query';
-
-// Empty export to make this a valid ES module
-export {};
-`);
-  await writeFile(join(uiPath, "src/index.ts"), `/**
- * @${options.scopeName}/ui - Shared UI Components
- *
- * This package provides:
- * - shadcn/ui components (add with: bunx shadcn@latest add <component>)
- * - Tailwind CSS v4 configuration
- * - Shared hooks and utilities
- *
- * Usage in apps:
- * - Import globals.css: import '@${options.scopeName}/ui/globals.css';
- * - Import components: import { Button } from '@${options.scopeName}/ui/components';
- * - Import utils: import { cn } from '@${options.scopeName}/ui/lib/utils';
- */
+const nextConfig: NextConfig = {
+  transpilePackages: ['@${scopeName}/ui'],
+};
 
-export * from './lib/utils';
-export * from './hooks';
-export * from './components';
+export default nextConfig;
 `);
-}
-async function buildTypesPackage(packagesPath, scopeName) {
-  const typesPath = join(packagesPath, "types");
-  await ensureDirectory(join(typesPath, "src"));
-  const { writeTypesPackageJson: writeTypesPackageJson2 } = await Promise.resolve().then(() => (init_package_json(), exports_package_json));
-  await writeTypesPackageJson2(typesPath, scopeName);
-  await writeFile(join(typesPath, "tsconfig.json"), JSON.stringify({
-    extends: "../../tooling/typescript/library.json",
+  await writeFile(join(projectPath, "apps/platform/tsconfig.json"), JSON.stringify({
+    extends: "../../tooling/typescript/nextjs.json",
     compilerOptions: {
-      rootDir: "./src",
-      outDir: "./dist"
+      paths: {
+        "@/*": ["./src/*"]
+      }
     },
-    include: ["src/**/*"],
+    include: ["next-env.d.ts", "**/*.ts", "**/*.tsx", ".next/types/**/*.ts"],
     exclude: ["node_modules"]
   }, null, 2));
-  await writeFile(join(typesPath, "src/index.ts"), `/**
- * @${scopeName}/types - Shared TypeScript Types
- *
- * Define types that are shared across multiple packages/apps here.
- */
+  await writeFile(join(projectPath, "apps/platform/postcss.config.mjs"), `export default {
+  plugins: {
+    '@tailwindcss/postcss': {},
+  },
+};
+`);
+  await writeHonoApiPackageJson(join(projectPath, "apps/api"), scopeName, {
+    usesTypes: true
+  });
+  await writeFile(join(projectPath, "apps/api/src/index.ts"), `import { Hono } from 'hono';
+import { logger } from 'hono/logger';
+import { cors } from 'hono/cors';
 
-// Example types - replace with your actual types
+const app = new Hono();
 
-export interface User {
-  id: string;
-  email: string;
-  name?: string;
-  createdAt: Date;
-  updatedAt: Date;
-}
+// Middleware
+app.use('*', logger());
+app.use('*', cors());
 
-export interface ApiResponse<T> {
-  success: boolean;
-  data?: T;
-  error?: {
-    code: string;
-    message: string;
-  };
-}
+// Routes
+app.get('/', (context) => {
+  return context.json({
+    name: '${context.projectName} API',
+    version: '1.0.0',
+    timestamp: new Date().toISOString(),
+  });
+});
 
-export interface PaginatedResponse<T> extends ApiResponse<T[]> {
-  pagination: {
-    page: number;
-    perPage: number;
-    total: number;
-    totalPages: number;
-  };
-}
+app.get('/health', (context) => {
+  return context.json({ status: 'ok' });
+});
+
+app.get('/api/users', (context) => {
+  return context.json({
+    users: [
+      { id: '1', email: 'john@example.com', name: 'John Doe' },
+      { id: '2', email: 'jane@example.com', name: 'Jane Smith' },
+    ],
+  });
+});
+
+// 404 handler
+app.notFound((context) => {
+  return context.json({ error: 'Not found' }, 404);
+});
+
+// Error handler
+app.onError((error, context) => {
+  console.error('Error:', error);
+  return context.json({ error: 'Internal server error' }, 500);
+});
+
+// Start server with HMR
+const server = Bun.serve({
+  fetch: app.fetch,
+  port: 3002,
+  development: {
+    hmr: true,
+  },
+});
+
+console.log(\`\uD83D\uDE80 ${context.projectName} API running on \${server.url}\`);
+
+export default app;
 `);
-}
-async function buildUtilsPackage(packagesPath, scopeName) {
-  const utilsPath = join(packagesPath, "utils");
-  await ensureDirectory(join(utilsPath, "src"));
-  const { writeUtilsPackageJson: writeUtilsPackageJson2 } = await Promise.resolve().then(() => (init_package_json(), exports_package_json));
-  await writeUtilsPackageJson2(utilsPath, scopeName);
-  await writeFile(join(utilsPath, "tsconfig.json"), JSON.stringify({
-    extends: "../../tooling/typescript/library.json",
+  await writeFile(join(projectPath, "apps/api/tsconfig.json"), JSON.stringify({
+    extends: "../../tooling/typescript/api.json",
     compilerOptions: {
-      rootDir: "./src",
-      outDir: "./dist"
+      types: ["bun-types"]
     },
     include: ["src/**/*"],
     exclude: ["node_modules"]
   }, null, 2));
-  await writeFile(join(utilsPath, "src/index.ts"), `/**
- * @${scopeName}/utils - Shared Utilities
- *
- * Utility functions shared across packages and apps.
- */
-
-/**
- * Format a date to a human-readable string
- */
-export function formatDate(date: Date | string, locale = 'en-US'): string {
-  const d = typeof date === 'string' ? new Date(date) : date;
-  return d.toLocaleDateString(locale, {
-    year: 'numeric',
-    month: 'long',
-    day: 'numeric',
+  await buildUiPackage(join(projectPath, "packages"), {
+    scopeName,
+    shadcnStyle: context.shadcnStyle || "radix-maia",
+    shadcnBase: context.shadcnBase || "radix",
+    shadcnBaseColor: context.shadcnBaseColor || "zinc",
+    shadcnIconLibrary: context.shadcnIconLibrary || "iconoir",
+    shadcnMenuAccent: context.shadcnMenuAccent || "subtle",
+    shadcnMenuColor: context.shadcnMenuColor || "default",
+    shadcnRadius: context.shadcnRadius || "0.625rem",
+    shadcnRtl: context.shadcnRtl,
+    appsToScan: ["web", "platform"]
   });
+  await buildTypesPackage(join(projectPath, "packages"), scopeName);
+  await buildUtilsPackage(join(projectPath, "packages"), scopeName);
+  await setupTooling(projectPath, context);
+  await writeFile(join(projectPath, "tsconfig.json"), JSON.stringify({
+    extends: "./tooling/typescript/base.json",
+    include: ["apps/*/src/**/*", "packages/*/src/**/*"],
+    exclude: ["node_modules", "**/node_modules", "**/.next"]
+  }, null, 2));
+  if (context.codeQuality === "ultracite") {
+    await setupUltracite(projectPath, context);
+  } else {
+    await setupBiome(projectPath, context);
+  }
+  if (context.docker) {
+    await setupDocker(projectPath, context);
+  }
+  if (context.cicd) {
+    await setupGitHubActions(projectPath, context);
+  }
+  await setupVSCodeDebug(projectPath, context, "full");
+  await generateMonorepoReadme(projectPath, context, "nextjs");
 }
+// ../templates/src/builders/minimal.ts
+init_src();
+init_dist();
+async function buildMinimalPreset(projectPath, context) {
+  const indexContent = `console.log('Hello from ${context.projectName}! \uD83C\uDF5E');
 
-/**
- * Format a number as currency
- */
-export function formatCurrency(
-  amount: number,
-  currency = 'USD',
-  locale = 'en-US'
-): string {
-  return new Intl.NumberFormat(locale, {
-    style: 'currency',
-    currency,
-  }).format(amount);
-}
-
-/**
- * Sleep for a specified number of milliseconds
- */
-export function sleep(ms: number): Promise<void> {
-  return new Promise((resolve) => setTimeout(resolve, ms));
-}
+// Your code here
+const greet = (name: string): void => {
+  console.log(\`Welcome, \${name}!\`);
+};
 
-/**
- * Safely parse JSON with a fallback value
- */
-export function safeJsonParse<T>(json: string, fallback: T): T {
-  try {
-    return JSON.parse(json) as T;
-  } catch {
-    return fallback;
+greet('Bun');
+`;
+  await writeFile(join(projectPath, "src/index.ts"), indexContent);
+  const tsconfigContent = {
+    compilerOptions: {
+      lib: ["ESNext"],
+      target: "ESNext",
+      module: "ESNext",
+      moduleDetection: "force",
+      jsx: "react-jsx",
+      allowJs: true,
+      moduleResolution: "bundler",
+      allowImportingTsExtensions: true,
+      verbatimModuleSyntax: true,
+      noEmit: true,
+      strict: true,
+      skipLibCheck: true,
+      noFallthroughCasesInSwitch: true,
+      noUnusedLocals: false,
+      noUnusedParameters: false,
+      noPropertyAccessFromIndexSignature: false,
+      types: ["bun-types"]
+    }
+  };
+  await writeFile(join(projectPath, "tsconfig.json"), JSON.stringify(tsconfigContent, null, 2));
+  const bunfigContent = generateBunfigContent(context);
+  await writeFile(join(projectPath, "bunfig.toml"), bunfigContent);
+  if (context.codeQuality === "ultracite") {
+    await setupUltracite(projectPath, context);
+  } else {
+    await setupBiome(projectPath, context);
   }
+  await setupVSCodeDebug(projectPath, context, "minimal");
+  await generateMinimalReadme(projectPath, context);
 }
-
-/**
- * Generate a random ID
- */
-export function generateId(length = 12): string {
-  const chars = 'ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789';
-  let result = '';
-  for (let i = 0; i < length; i++) {
-    result += chars.charAt(Math.floor(Math.random() * chars.length));
+// ../templates/src/builders/monorepo-bun.ts
+init_src();
+init_dist();
+var databaseSetupMap6 = {
+  "postgres-drizzle": setupPostgresDrizzle,
+  "postgres-prisma": setupPostgresPrisma,
+  "mysql-drizzle": setupMySQLDrizzle,
+  "mysql-prisma": setupMySQLPrisma,
+  supabase: setupSupabaseOnly,
+  "supabase-drizzle": setupSupabaseDrizzle,
+  "supabase-prisma": setupSupabasePrisma,
+  "sqlite-drizzle": setupSQLiteDrizzle,
+  "sqlite-prisma": setupSQLitePrisma,
+  none: async () => {}
+};
+async function buildMonorepoBunPreset(projectPath, context) {
+  await ensureDirectory(join(projectPath, "apps/web"));
+  await ensureDirectory(join(projectPath, "apps/api"));
+  await ensureDirectory(join(projectPath, "packages/types"));
+  await ensureDirectory(join(projectPath, "packages/utils"));
+  if (context.database && context.database !== "none") {
+    await ensureDirectory(join(projectPath, "packages/db"));
   }
-  return result;
-}
-
-/**
- * Debounce a function
- */
-export function debounce<T extends (...args: unknown[]) => unknown>(
-  func: T,
-  wait: number
-): (...args: Parameters<T>) => void {
-  let timeout: ReturnType<typeof setTimeout> | null = null;
-  return (...args: Parameters<T>) => {
-    if (timeout) clearTimeout(timeout);
-    timeout = setTimeout(() => func(...args), wait);
+  const rootPackageJson = {
+    name: `${context.packageName}-monorepo`,
+    version: "0.0.0",
+    private: true,
+    workspaces: ["apps/*", "packages/*"],
+    scripts: {
+      dev: 'bun run --filter "*" dev',
+      build: 'bun run --filter "*" build',
+      lint: context.codeQuality === "biome" ? "biome check ." : "ultracite check .",
+      format: context.codeQuality === "biome" ? "biome check --write ." : "ultracite fix .",
+      test: "bun test",
+      "dev:web": 'bun run --filter "@*/web" dev',
+      "dev:api": 'bun run --filter "@*/api" dev',
+      debug: "bun --inspect apps/api/src/index.ts",
+      "debug:brk": "bun --inspect-brk apps/api/src/index.ts",
+      "debug:wait": "bun --inspect-wait apps/api/src/index.ts"
+    },
+    devDependencies: {
+      "@types/bun": "latest",
+      typescript: "catalog:",
+      ...context.codeQuality === "biome" ? { "@biomejs/biome": "catalog:" } : {}
+    },
+    catalog: {
+      react: "^19.2.3",
+      "react-dom": "^19.2.3",
+      "drizzle-orm": "^0.45.1",
+      "drizzle-kit": "^0.31.8",
+      postgres: "^3.4.7",
+      "@supabase/supabase-js": "^2.88.0",
+      "@prisma/client": "^7.2.0",
+      prisma: "^7.2.0",
+      mysql2: "^3.16.0",
+      "better-auth": "^1.4.7",
+      "next-auth": "^4.24.13",
+      "@auth/drizzle-adapter": "^1.11.1",
+      tailwindcss: "^4.1.18",
+      autoprefixer: "^10.4.23",
+      postcss: "^8.5.6",
+      typescript: "^5.9.3",
+      "@types/react": "^19.2.7",
+      "@types/react-dom": "^19.2.3",
+      "@types/node": "^25.0.3"
+    }
   };
-}
-
-/**
- * Check if running on server
- * Uses a type-safe approach that works without DOM types
- */
-export function isServer(): boolean {
-  return !(typeof window !== 'undefined' && window.document);
-}
-
-/**
- * Check if running on client
- * Uses a type-safe approach that works without DOM types
- */
-export function isClient(): boolean {
-  return typeof window !== 'undefined' && !!window.document;
-}
-
-// Declare window for environments without DOM types
-declare const window: { document?: unknown } | undefined;
-`);
-}
-
-// ../templates/src/builders/full-v2.ts
-async function buildFullPresetV2(projectPath, context) {
-  const preset = PresetRegistry.get("nextjs-monorepo");
-  if (!preset) {
-    throw new Error("nextjs-monorepo preset not found in registry");
+  await writeFile(join(projectPath, "package.json"), JSON.stringify(rootPackageJson, null, 2));
+  const apiPath = join(projectPath, "apps/api");
+  await setupBunServeNative(apiPath, context, true);
+  const apiPackageJson = {
+    name: `@${context.packageName}/api`,
+    version: "0.0.0",
+    private: true,
+    scripts: {
+      dev: "bun run --hot src/index.ts",
+      start: "bun run src/index.ts",
+      debug: "bun --inspect src/index.ts",
+      "debug:brk": "bun --inspect-brk src/index.ts",
+      "debug:wait": "bun --inspect-wait src/index.ts"
+    },
+    dependencies: {
+      [`@${context.packageName}/types`]: "workspace:*"
+    },
+    devDependencies: {
+      "@types/bun": "latest",
+      typescript: "catalog:"
+    }
+  };
+  await writeFile(join(apiPath, "package.json"), JSON.stringify(apiPackageJson, null, 2));
+  const webPath = join(projectPath, "apps/web");
+  await setupBunFullstack(webPath, context);
+  const webPackageJson = {
+    name: `@${context.packageName}/web`,
+    version: "0.0.0",
+    private: true,
+    scripts: {
+      dev: "bun run --hot src/index.ts",
+      build: "bun build src/index.ts --outdir ./dist --target bun",
+      start: "bun run dist/index.js",
+      debug: "bun --inspect src/index.ts",
+      "debug:brk": "bun --inspect-brk src/index.ts",
+      "debug:wait": "bun --inspect-wait src/index.ts"
+    },
+    dependencies: {
+      react: "catalog:",
+      "react-dom": "catalog:",
+      [`@${context.packageName}/types`]: "workspace:*"
+    },
+    devDependencies: {
+      "@types/react": "catalog:",
+      "@types/react-dom": "catalog:",
+      "@types/bun": "latest",
+      typescript: "catalog:"
+    }
+  };
+  await writeFile(join(webPath, "package.json"), JSON.stringify(webPackageJson, null, 2));
+  if (context.database && context.database !== "none") {
+    await databaseSetupMap6[context.database](join(projectPath, "packages/db"), context, true);
   }
-  const scopeName = context.packageName;
-  const directories = [
-    "apps/web/src/app",
-    "apps/web/src/components",
-    "apps/web/src/lib",
-    "apps/platform/src/app",
-    "apps/platform/src/components",
-    "apps/platform/src/lib",
-    "apps/api/src/routes",
-    "apps/api/src/middleware",
-    "packages/ui",
-    "packages/types",
-    "packages/utils",
-    "tooling/typescript"
-  ];
-  for (const dir of directories) {
-    await ensureDirectory(join(projectPath, dir));
+  if (context.redis) {
+    await setupRedis(join(projectPath, "packages"), context, true);
   }
-  const catalog = preset.catalogEntries || {};
-  await writeMonorepoRootPackageJson(projectPath, scopeName, catalog, {
-    hasWeb: true,
-    hasPlatform: true,
-    hasApi: true,
-    codeQuality: context.codeQuality === "biome" ? "biome" : "ultracite"
-  });
-  await writeFile(join(projectPath, "bunfig.toml"), generateBunfigContent(context));
-  await writeNextjsAppPackageJson(join(projectPath, "apps/web"), scopeName, "web", { usesUi: true, usesTypes: true });
-  await writeFile(join(projectPath, "apps/web/src/app/layout.tsx"), `import type { Metadata } from 'next';
-import '@${scopeName}/ui/globals.css';
-
-export const metadata: Metadata = {
-  title: '${context.projectName}',
-  description: 'Enterprise SaaS built with bunkit',
-};
-
-export default function RootLayout({
-  children,
-}: {
-  children: React.ReactNode;
-}) {
-  return (
-    <html lang="en">
-      <body className="antialiased">{children}</body>
-    </html>
-  );
+  if (context.auth === "better-auth") {
+    await setupBetterAuth(join(projectPath, "packages"), context, true);
+  } else if (context.auth === "nextauth") {
+    await setupNextAuth(join(projectPath, "packages"), context, true);
+  }
+  if (context.useBunSecrets) {
+    await setupBunSecrets(join(projectPath, "packages"), context, true);
+  }
+  if (context.codeQuality === "biome") {
+    await setupBiome(projectPath, context);
+  } else {
+    await setupUltracite(projectPath, context);
+  }
+  if (context.docker) {
+    await setupDocker(projectPath, context);
+  }
+  if (context.cicd) {
+    await setupGitHubActions(projectPath, context);
+  }
+  await setupTooling(projectPath, context);
+  await setupVSCodeDebug(projectPath, context, "full");
+  const bunfigContent = generateBunfigContent(context);
+  await writeFile(join(projectPath, "bunfig.toml"), bunfigContent);
+  const typesPackageJson = {
+    name: `@${context.packageName}/types`,
+    version: "0.0.0",
+    private: true,
+    main: "./index.ts",
+    types: "./index.ts",
+    scripts: {},
+    devDependencies: {
+      typescript: "catalog:"
+    }
+  };
+  await ensureDirectory(join(projectPath, "packages/types"));
+  await writeFile(join(projectPath, "packages/types/package.json"), JSON.stringify(typesPackageJson, null, 2));
+  const typesIndex = `// Shared types across the monorepo
+export interface User {
+  id: number;
+  name: string;
+  email: string;
+  createdAt: Date;
 }
-`);
-  await writeFile(join(projectPath, "apps/web/src/app/page.tsx"), `import { Home, Rocket, Book } from 'iconoir-react';
 
-export default function HomePage() {
-  return (
-    <main className="min-h-screen flex items-center justify-center bg-gradient-to-br from-background to-muted">
-      <div className="text-center space-y-8 p-8 max-w-3xl">
-        <div className="flex justify-center">
-          <Home className="w-16 h-16 text-primary" />
-        </div>
-        <h1 className="text-5xl font-bold tracking-tight">
-          Welcome to ${context.projectName}
-        </h1>
-        <p className="text-xl text-muted-foreground">
-          Enterprise-grade SaaS built with Next.js 16, React 19, Hono, and Bun
-        </p>
-        <div className="flex gap-4 justify-center pt-4">
-          <a
-            href="/dashboard"
-            className="inline-flex items-center gap-2 px-6 py-3 bg-primary text-primary-foreground rounded-lg hover:bg-primary/90 transition font-medium"
-          >
-            <Rocket className="w-5 h-5" />
-            Get Started
-          </a>
-          <a
-            href="/docs"
-            className="inline-flex items-center gap-2 px-6 py-3 bg-secondary text-secondary-foreground rounded-lg hover:bg-secondary/90 transition font-medium"
-          >
-            <Book className="w-5 h-5" />
-            Documentation
-          </a>
-        </div>
-      </div>
-    </main>
-  );
+export interface ApiResponse<T = unknown> {
+  success: boolean;
+  data?: T;
+  error?: string;
+  timestamp: string;
+}
+`;
+  await writeFile(join(projectPath, "packages/types/index.ts"), typesIndex);
+  const utilsPackageJson = {
+    name: `@${context.packageName}/utils`,
+    version: "0.0.0",
+    private: true,
+    main: "./index.ts",
+    types: "./index.ts",
+    scripts: {},
+    dependencies: {},
+    devDependencies: {
+      typescript: "catalog:"
+    }
+  };
+  await ensureDirectory(join(projectPath, "packages/utils"));
+  await writeFile(join(projectPath, "packages/utils/package.json"), JSON.stringify(utilsPackageJson, null, 2));
+  const utilsIndex = `// Shared utilities across the monorepo
+export function formatDate(date: Date): string {
+  return date.toISOString();
 }
-`);
-  await writeFile(join(projectPath, "apps/web/next.config.ts"), `import type { NextConfig } from 'next';
-
-const nextConfig: NextConfig = {
-  transpilePackages: ['@${scopeName}/ui'],
-};
 
-export default nextConfig;
-`);
-  await writeFile(join(projectPath, "apps/web/tsconfig.json"), JSON.stringify({
-    extends: "../../tooling/typescript/nextjs.json",
-    compilerOptions: {
-      paths: {
-        "@/*": ["./src/*"]
-      }
-    },
-    include: ["next-env.d.ts", "**/*.ts", "**/*.tsx", ".next/types/**/*.ts"],
+export function capitalize(str: string): string {
+  return str.charAt(0).toUpperCase() + str.slice(1);
+}
+`;
+  await writeFile(join(projectPath, "packages/utils/index.ts"), utilsIndex);
+  await generateMonorepoReadme(projectPath, context, "bun");
+  const tsconfigContent = {
+    extends: "./tooling/typescript/base.json",
+    compilerOptions: {},
+    include: ["apps/*/src/**/*", "packages/*/**/*"],
     exclude: ["node_modules"]
-  }, null, 2));
-  await writeFile(join(projectPath, "apps/web/postcss.config.mjs"), `export default {
-  plugins: {
-    '@tailwindcss/postcss': {},
-  },
-};
-`);
-  await writeNextjsAppPackageJson(join(projectPath, "apps/platform"), scopeName, "platform", { usesUi: true, usesTypes: true });
-  await writeFile(join(projectPath, "apps/platform/src/app/layout.tsx"), `import type { Metadata } from 'next';
-import '@${scopeName}/ui/globals.css';
+  };
+  await writeFile(join(projectPath, "tsconfig.json"), JSON.stringify(tsconfigContent, null, 2));
+}
+// ../templates/src/builders/web.ts
+init_src();
+init_dist();
+async function buildWebPreset(projectPath, context) {
+  await ensureDirectory(join(projectPath, "src/app"));
+  await ensureDirectory(join(projectPath, "public"));
+  const layoutContent = `import type { Metadata } from 'next'
+import './globals.css'
 
 export const metadata: Metadata = {
-  title: '${context.projectName} - Admin',
-  description: 'Admin dashboard for ${context.projectName}',
-};
+  title: '${context.projectName}',
+  description: 'Built with bunkit \uD83C\uDF5E',
+}
 
 export default function RootLayout({
   children,
 }: {
-  children: React.ReactNode;
+  children: React.ReactNode
 }) {
   return (
     <html lang="en">
-      <body className="antialiased">{children}</body>
+      <body>{children}</body>
     </html>
-  );
+  )
 }
-`);
-  await writeFile(join(projectPath, "apps/platform/src/app/page.tsx"), `import { ViewGrid, User, Dollar, GraphUp } from 'iconoir-react';
-
-export default function DashboardPage() {
+`;
+  await writeFile(join(projectPath, "src/app/layout.tsx"), layoutContent);
+  const pageContent = `export default function Home() {
   return (
-    <main className="min-h-screen bg-background">
-      <div className="max-w-7xl mx-auto py-12 px-4">
-        <header className="mb-8 flex items-center gap-3">
-          <ViewGrid className="w-8 h-8 text-primary" />
-          <div>
-            <h1 className="text-3xl font-bold">Admin Dashboard</h1>
-            <p className="text-muted-foreground">
-              Manage your ${context.projectName} platform
-            </p>
-          </div>
-        </header>
-
-        <div className="grid grid-cols-1 md:grid-cols-3 gap-6">
-          <div className="bg-card p-6 rounded-lg border shadow-sm">
-            <div className="flex items-center gap-3 mb-2">
-              <User className="w-5 h-5 text-blue-500" />
-              <h2 className="text-lg font-semibold">Users</h2>
-            </div>
-            <p className="text-3xl font-bold">1,234</p>
-          </div>
-          <div className="bg-card p-6 rounded-lg border shadow-sm">
-            <div className="flex items-center gap-3 mb-2">
-              <Dollar className="w-5 h-5 text-green-500" />
-              <h2 className="text-lg font-semibold">Revenue</h2>
-            </div>
-            <p className="text-3xl font-bold">$12,345</p>
-          </div>
-          <div className="bg-card p-6 rounded-lg border shadow-sm">
-            <div className="flex items-center gap-3 mb-2">
-              <GraphUp className="w-5 h-5 text-purple-500" />
-              <h2 className="text-lg font-semibold">Active</h2>
-            </div>
-            <p className="text-3xl font-bold">567</p>
-          </div>
-        </div>
+    <main className="min-h-screen flex items-center justify-center">
+      <div className="text-center">
+        <h1 className="text-4xl font-bold mb-4">
+          Welcome to ${context.projectName} \uD83C\uDF5E
+        </h1>
+        <p className="text-gray-600">
+          Built with Next.js 16, React 19, and bunkit
+        </p>
       </div>
     </main>
-  );
-}
-`);
-  await writeFile(join(projectPath, "apps/platform/next.config.ts"), `import type { NextConfig } from 'next';
-
-const nextConfig: NextConfig = {
-  transpilePackages: ['@${scopeName}/ui'],
-};
-
-export default nextConfig;
-`);
-  await writeFile(join(projectPath, "apps/platform/tsconfig.json"), JSON.stringify({
-    extends: "../../tooling/typescript/nextjs.json",
-    compilerOptions: {
-      paths: {
-        "@/*": ["./src/*"]
-      }
-    },
-    include: ["next-env.d.ts", "**/*.ts", "**/*.tsx", ".next/types/**/*.ts"],
-    exclude: ["node_modules"]
-  }, null, 2));
-  await writeFile(join(projectPath, "apps/platform/postcss.config.mjs"), `export default {
-  plugins: {
-    '@tailwindcss/postcss': {},
-  },
-};
-`);
-  await writeHonoApiPackageJson(join(projectPath, "apps/api"), scopeName, {
-    usesTypes: true
-  });
-  await writeFile(join(projectPath, "apps/api/src/index.ts"), `import { Hono } from 'hono';
-import { logger } from 'hono/logger';
-import { cors } from 'hono/cors';
-
-const app = new Hono();
-
-// Middleware
-app.use('*', logger());
-app.use('*', cors());
-
-// Routes
-app.get('/', (context) => {
-  return context.json({
-    name: '${context.projectName} API',
-    version: '1.0.0',
-    timestamp: new Date().toISOString(),
-  });
-});
-
-app.get('/health', (context) => {
-  return context.json({ status: 'ok' });
-});
-
-app.get('/api/users', (context) => {
-  return context.json({
-    users: [
-      { id: '1', email: 'john@example.com', name: 'John Doe' },
-      { id: '2', email: 'jane@example.com', name: 'Jane Smith' },
-    ],
-  });
-});
+  )
+}
 
-// 404 handler
-app.notFound((context) => {
-  return context.json({ error: 'Not found' }, 404);
-});
+// Next.js 16 Note:
+// When you add dynamic routes with params, make your component async and await params:
+// export default async function Page({ params }: { params: Promise<{ slug: string }> }) {
+//   const { slug } = await params;
+//   return <div>{slug}</div>;
+// }
+`;
+  await writeFile(join(projectPath, "src/app/page.tsx"), pageContent);
+  const globalsCssContent = `@import "tailwindcss";
+`;
+  await writeFile(join(projectPath, "src/app/globals.css"), globalsCssContent);
+  const nextConfigContent = `import type { NextConfig } from 'next';
 
-// Error handler
-app.onError((error, context) => {
-  console.error('Error:', error);
-  return context.json({ error: 'Internal server error' }, 500);
-});
+const nextConfig: NextConfig = {
+  /* config options here */
+};
 
-// Start server with HMR
-const server = Bun.serve({
-  fetch: app.fetch,
-  port: 3002,
-  development: {
-    hmr: true,
-  },
-});
+export default nextConfig;
+`;
+  await writeFile(join(projectPath, "next.config.ts"), nextConfigContent);
+  const tailwindConfigContent = `import type { Config } from 'tailwindcss';
 
-console.log(\`\uD83D\uDE80 ${context.projectName} API running on \${server.url}\`);
+const config: Config = {
+  content: ['./src/**/*.{js,ts,jsx,tsx,mdx}'],
+  theme: {
+    extend: {},
+  },
+  plugins: [],
+};
 
-export default app;
-`);
-  await writeFile(join(projectPath, "apps/api/tsconfig.json"), JSON.stringify({
-    extends: "../../tooling/typescript/api.json",
-    compilerOptions: {
-      types: ["bun-types"]
-    },
-    include: ["src/**/*"],
+export default config;
+`;
+  await writeFile(join(projectPath, "tailwind.config.ts"), tailwindConfigContent);
+  const getTsCompilerOptions = () => {
+    const baseOptions = {
+      target: "ES2017",
+      lib: ["dom", "dom.iterable", "esnext"],
+      allowJs: true,
+      skipLibCheck: true,
+      noEmit: true,
+      esModuleInterop: true,
+      module: "esnext",
+      moduleResolution: "bundler",
+      resolveJsonModule: true,
+      isolatedModules: true,
+      jsx: "react-jsx",
+      incremental: true,
+      plugins: [{ name: "next" }],
+      paths: context.pathAliases ? { "@/*": ["./src/*"] } : undefined
+    };
+    if (context.tsStrictness === "strict") {
+      return {
+        ...baseOptions,
+        strict: true,
+        noUnusedLocals: true,
+        noUnusedParameters: true,
+        noFallthroughCasesInSwitch: true,
+        noImplicitReturns: true
+      };
+    }
+    if (context.tsStrictness === "moderate") {
+      return {
+        ...baseOptions,
+        strict: true,
+        noUnusedLocals: false,
+        noUnusedParameters: false
+      };
+    }
+    return {
+      ...baseOptions,
+      strict: false,
+      noImplicitAny: false
+    };
+  };
+  const tsconfigContent = {
+    compilerOptions: getTsCompilerOptions(),
+    include: ["next-env.d.ts", "**/*.ts", "**/*.tsx", ".next/dev/types/**/*.ts"],
     exclude: ["node_modules"]
-  }, null, 2));
-  await buildUiPackage(join(projectPath, "packages"), {
-    scopeName,
-    shadcnStyle: context.shadcnStyle || "radix-maia",
-    shadcnBase: context.shadcnBase || "radix",
-    shadcnBaseColor: context.shadcnBaseColor || "zinc",
-    shadcnIconLibrary: context.shadcnIconLibrary || "phosphor",
-    shadcnMenuAccent: context.shadcnMenuAccent || "subtle",
-    shadcnMenuColor: context.shadcnMenuColor || "default",
-    shadcnRadius: context.shadcnRadius || "0.625rem",
-    appsToScan: ["web", "platform"]
-  });
-  await buildTypesPackage(join(projectPath, "packages"), scopeName);
-  await buildUtilsPackage(join(projectPath, "packages"), scopeName);
-  await setupTooling(projectPath, context);
-  await writeFile(join(projectPath, "tsconfig.json"), JSON.stringify({
-    extends: "./tooling/typescript/base.json",
-    include: ["apps/*/src/**/*", "packages/*/src/**/*"],
-    exclude: ["node_modules", "**/node_modules", "**/.next"]
-  }, null, 2));
+  };
+  await writeFile(join(projectPath, "tsconfig.json"), JSON.stringify(tsconfigContent, null, 2));
+  const bunfigContent = generateBunfigContent(context);
+  await writeFile(join(projectPath, "bunfig.toml"), bunfigContent);
   if (context.codeQuality === "ultracite") {
     await setupUltracite(projectPath, context);
   } else {
@@ -31640,13 +31709,52 @@ export default app;
   if (context.cicd) {
     await setupGitHubActions(projectPath, context);
   }
-  await setupVSCodeDebug(projectPath, context, "full");
-  await generateMonorepoReadme(projectPath, context, "nextjs");
+  if (context.uiLibrary === "shadcn" && context.cssFramework === "tailwind") {
+    await setupShadcnWeb(projectPath, context);
+  }
+  await setupVSCodeDebug(projectPath, context, "web");
+  const packageJsonPath = join(projectPath, "package.json");
+  const existingPackageJson = JSON.parse(await Bun.file(packageJsonPath).text());
+  existingPackageJson.dependencies = {
+    react: "^19.2.3",
+    "react-dom": "^19.2.3",
+    next: "^16.0.10",
+    ...existingPackageJson.dependencies
+  };
+  existingPackageJson.devDependencies = {
+    ...existingPackageJson.devDependencies,
+    "@types/react": "^19.2.7",
+    "@types/react-dom": "^19.2.3",
+    "@types/node": "^25.0.3"
+  };
+  if (!existingPackageJson.scripts) {
+    existingPackageJson.scripts = {};
+  }
+  if (!existingPackageJson.scripts.dev) {
+    existingPackageJson.scripts.dev = "bun run --bun next dev --turbopack";
+  }
+  if (!existingPackageJson.scripts.build) {
+    existingPackageJson.scripts.build = "bun run --bun next build";
+  }
+  if (!existingPackageJson.scripts.start) {
+    existingPackageJson.scripts.start = "bun run --bun next start";
+  }
+  if (!existingPackageJson.scripts.debug) {
+    existingPackageJson.scripts.debug = "bun --inspect node_modules/.bin/next dev --turbopack";
+  }
+  if (!existingPackageJson.scripts["debug:brk"]) {
+    existingPackageJson.scripts["debug:brk"] = "bun --inspect-brk node_modules/.bin/next dev --turbopack";
+  }
+  if (!existingPackageJson.scripts["debug:wait"]) {
+    existingPackageJson.scripts["debug:wait"] = "bun --inspect-wait node_modules/.bin/next dev --turbopack";
+  }
+  await writeFile(packageJsonPath, JSON.stringify(existingPackageJson, null, 2));
+  await generateNextjsReadme(projectPath, context);
 }
-// ../templates/src/shared/index.ts
-init_package_json();
 // ../templates/src/render.ts
 var import_ejs = __toESM(require_ejs(), 1);
+// ../templates/src/shared/index.ts
+init_package_json();
 // src/commands/add/component.ts
 init_dist();
 async function getPackageName(cwd2) {
@@ -33117,29 +33225,54 @@ async function enhancedInitCommand(options = {}) {
         options: [
           {
             value: "radix-maia",
-            label: "Maia (Recommended)",
+            label: "Maia \u2014 Radix (Recommended)",
             hint: "Modern, clean design with soft shadows and refined aesthetics"
           },
           {
             value: "radix-vega",
-            label: "Vega",
+            label: "Vega \u2014 Radix",
             hint: "Bold, vibrant design with stronger colors and contrast"
           },
           {
             value: "radix-nova",
-            label: "Nova",
+            label: "Nova \u2014 Radix",
             hint: "Minimalist design with subtle accents and clean lines"
           },
           {
             value: "radix-lyra",
-            label: "Lyra",
+            label: "Lyra \u2014 Radix",
             hint: "Elegant design with refined typography and spacing"
           },
           {
             value: "radix-mira",
-            label: "Mira",
+            label: "Mira \u2014 Radix",
             hint: "Playful design with rounded elements and soft colors"
           },
+          {
+            value: "base-maia",
+            label: "Maia \u2014 Base UI",
+            hint: "Clean design using Base UI primitives (alternative to Radix)"
+          },
+          {
+            value: "base-vega",
+            label: "Vega \u2014 Base UI",
+            hint: "Bold design using Base UI primitives"
+          },
+          {
+            value: "base-nova",
+            label: "Nova \u2014 Base UI",
+            hint: "Minimalist design using Base UI primitives"
+          },
+          {
+            value: "base-lyra",
+            label: "Lyra \u2014 Base UI",
+            hint: "Elegant design using Base UI primitives"
+          },
+          {
+            value: "base-mira",
+            label: "Mira \u2014 Base UI",
+            hint: "Playful design using Base UI primitives"
+          },
           {
             value: "new-york",
             label: "New York (Legacy)",
@@ -33227,21 +33360,21 @@ async function enhancedInitCommand(options = {}) {
     }
   }
   let shadcnIconLibrary = getOptionValue("BUNKIT_SHADCN_ICON_LIBRARY", options.shadcnIconLibrary);
-  const isModernShadcnStyle = shadcnStyle === "radix-maia" || shadcnStyle === "radix-vega" || shadcnStyle === "radix-nova" || shadcnStyle === "radix-lyra" || shadcnStyle === "radix-mira";
+  const isModernStyle = shadcnStyle?.startsWith("radix-") || shadcnStyle?.startsWith("base-");
   if (!shadcnIconLibrary && uiLibrary === "shadcn") {
     if (!isNonInteractive) {
       shadcnIconLibrary = await ve({
         message: "\uD83D\uDD23 Icon library",
         options: [
           {
-            value: "phosphor",
-            label: isModernShadcnStyle ? "Phosphor Icons (Recommended)" : "Phosphor Icons",
-            hint: "Modern icon library with consistent design - default for new shadcn/ui styles"
+            value: "iconoir",
+            label: "Iconoir (Recommended)",
+            hint: "bunkit default - 1600+ lightweight, tree-shakeable icons"
           },
           {
-            value: "iconoir",
-            label: !isModernShadcnStyle ? "Iconoir (Recommended)" : "Iconoir",
-            hint: "Lightweight icons with great variety - alternative choice"
+            value: "phosphor",
+            label: "Phosphor Icons",
+            hint: "Modern icon library with consistent design - shadcn/ui default for new styles"
           },
           {
             value: "lucide",
@@ -33255,39 +33388,19 @@ async function enhancedInitCommand(options = {}) {
         process.exit(0);
       }
     } else {
-      shadcnIconLibrary = isModernShadcnStyle ? "phosphor" : "iconoir";
+      shadcnIconLibrary = "iconoir";
     }
   }
   let shadcnBase = getOptionValue("BUNKIT_SHADCN_BASE", options.shadcnBase);
-  if (!shadcnBase && uiLibrary === "shadcn" && isModernShadcnStyle) {
-    if (!isNonInteractive) {
-      shadcnBase = await ve({
-        message: "\uD83E\uDDF1 Component foundation",
-        options: [
-          {
-            value: "radix",
-            label: "Radix UI (Recommended)",
-            hint: "Battle-tested accessibility primitives - industry standard"
-          },
-          {
-            value: "base-ui",
-            label: "Base UI",
-            hint: "Modern alternative with similar API - newer, experimental"
-          }
-        ]
-      });
-      if (pD(shadcnBase)) {
-        xe("Operation cancelled.");
-        process.exit(0);
-      }
+  if (!shadcnBase && uiLibrary === "shadcn") {
+    if (shadcnStyle?.startsWith("base-")) {
+      shadcnBase = "base-ui";
     } else {
       shadcnBase = "radix";
     }
-  } else if (!shadcnBase) {
-    shadcnBase = "radix";
   }
   let shadcnMenuAccent = getOptionValue("BUNKIT_SHADCN_MENU_ACCENT", options.shadcnMenuAccent);
-  if (!shadcnMenuAccent && uiLibrary === "shadcn" && isModernShadcnStyle) {
+  if (!shadcnMenuAccent && uiLibrary === "shadcn" && isModernStyle) {
     if (!isNonInteractive) {
       shadcnMenuAccent = await ve({
         message: "\u2728 Menu accent style",
@@ -33315,7 +33428,7 @@ async function enhancedInitCommand(options = {}) {
     shadcnMenuAccent = "subtle";
   }
   let shadcnMenuColor = getOptionValue("BUNKIT_SHADCN_MENU_COLOR", options.shadcnMenuColor);
-  if (!shadcnMenuColor && uiLibrary === "shadcn" && isModernShadcnStyle) {
+  if (!shadcnMenuColor && uiLibrary === "shadcn" && isModernStyle) {
     if (!isNonInteractive) {
       shadcnMenuColor = await ve({
         message: "\uD83C\uDFAF Menu color scheme",
@@ -33342,6 +33455,21 @@ async function enhancedInitCommand(options = {}) {
   } else if (!shadcnMenuColor) {
     shadcnMenuColor = "default";
   }
+  let shadcnRtl = getOptionValue("BUNKIT_SHADCN_RTL", options.shadcnRtl, false);
+  if (shadcnRtl === undefined && uiLibrary === "shadcn" && isModernStyle) {
+    if (!isNonInteractive) {
+      shadcnRtl = await ye({
+        message: "\uD83D\uDD04 Enable RTL (right-to-left) support",
+        initialValue: false
+      });
+      if (pD(shadcnRtl)) {
+        xe("Operation cancelled.");
+        process.exit(0);
+      }
+    } else {
+      shadcnRtl = false;
+    }
+  }
   let testing = getOptionValue("BUNKIT_TESTING", options.testing, "bun-test");
   if (!testing) {
     if (!isNonInteractive) {
@@ -33588,6 +33716,7 @@ async function enhancedInitCommand(options = {}) {
       shadcnMenuAccent,
       shadcnMenuColor,
       shadcnRadius,
+      shadcnRtl: shadcnRtl || false,
       supabasePreset,
       supabaseFeatures,
       supabaseWithDrizzle
@@ -33797,6 +33926,130 @@ async function enhancedInitCommand(options = {}) {
   }
 }
 
+// src/commands/migrate.ts
+import { existsSync as existsSync3 } from "fs";
+init_source();
+init_dist();
+var VALID_MIGRATIONS = ["radix", "rtl", "icons"];
+var MIGRATION_DESCRIPTIONS = {
+  radix: "Migrate to unified radix-ui package (replaces @radix-ui/react-* packages)",
+  rtl: "Enable RTL (right-to-left) support in shadcn/ui components",
+  icons: "Migrate icon library (e.g., lucide to iconoir or phosphor)"
+};
+function detectShadcnRoot(projectPath) {
+  const monorepoPath = join(projectPath, "packages/ui");
+  if (existsSync3(join(monorepoPath, "components.json"))) {
+    return monorepoPath;
+  }
+  if (existsSync3(join(projectPath, "components.json"))) {
+    return projectPath;
+  }
+  return null;
+}
+async function runBunInstall(projectPath) {
+  const installSpinner = Y2();
+  installSpinner.start("Resolving dependencies (bun install)...");
+  try {
+    const installProcess = Bun.spawn(["bun", "install"], {
+      cwd: projectPath,
+      stdout: "pipe",
+      stderr: "pipe"
+    });
+    await installProcess.exited;
+    if (installProcess.exitCode !== 0) {
+      const stderr = await new Response(installProcess.stderr).text();
+      installSpinner.stop(source_default.red("Failed to install dependencies"));
+      Me(stderr, "Error Details");
+      return false;
+    }
+    installSpinner.stop(source_default.green("Dependencies resolved"));
+    return true;
+  } catch (error) {
+    installSpinner.stop(source_default.red("Failed to install dependencies"));
+    Me(String(error), "Error Details");
+    return false;
+  }
+}
+async function runShadcnMigrate(shadcnRoot, migrationType) {
+  const migrateSpinner = Y2();
+  migrateSpinner.start(`Running shadcn migrate ${migrationType}...`);
+  try {
+    const migrateProcess = Bun.spawn(["bunx", "shadcn@latest", "migrate", migrationType], {
+      cwd: shadcnRoot,
+      stdout: "pipe",
+      stderr: "pipe"
+    });
+    await migrateProcess.exited;
+    if (migrateProcess.exitCode !== 0) {
+      const stderr = await new Response(migrateProcess.stderr).text();
+      migrateSpinner.stop(source_default.red(`Migration failed: ${migrationType}`));
+      Me(stderr, "Error Details");
+      return false;
+    }
+    migrateSpinner.stop(source_default.green(`Migration complete: ${migrationType}`));
+    return true;
+  } catch (error) {
+    migrateSpinner.stop(source_default.red(`Migration failed: ${migrationType}`));
+    Me(String(error), "Error Details");
+    return false;
+  }
+}
+function showPostMigrationAdvice(migrationType, isMonorepo) {
+  const advice = [];
+  switch (migrationType) {
+    case "radix":
+      advice.push("The unified radix-ui package replaces individual @radix-ui/react-* packages.", "Old packages can be removed from your package.json.", isMonorepo ? "Check packages/ui/package.json and root catalog for cleanup." : "Check package.json for cleanup.", "", "Run: bun install   (to update lockfile)");
+      break;
+    case "rtl":
+      advice.push("RTL support has been added to your components.", "Class names have been transformed for RTL compatibility.", 'components.json now includes "rtl": true.', "", 'Set dir="rtl" on your <html> element to activate RTL layout.');
+      break;
+    case "icons":
+      advice.push("Icon imports have been updated in your components.", "Check components.json to verify the iconLibrary field.", "", "You may need to install the new icon package:", "  bun add iconoir-react       (bunkit default)", "  bun add @phosphor-icons/react", "  bun add lucide-react");
+      break;
+  }
+  if (advice.length > 0) {
+    Me(advice.join(`
+`), "Post-Migration");
+  }
+}
+async function migrateCommand(migrationType) {
+  if (!migrationType) {
+    migrationType = await ve({
+      message: "Select migration type",
+      options: VALID_MIGRATIONS.map((migration2) => ({
+        value: migration2,
+        label: migration2,
+        hint: MIGRATION_DESCRIPTIONS[migration2]
+      }))
+    });
+    if (pD(migrationType)) {
+      xe("Operation cancelled.");
+      process.exit(0);
+    }
+  }
+  if (!VALID_MIGRATIONS.includes(migrationType)) {
+    throw new Error(`Invalid migration type: "${migrationType}". ` + `Valid types: ${VALID_MIGRATIONS.join(", ")}`);
+  }
+  const migration = migrationType;
+  const projectPath = process.cwd();
+  const shadcnRoot = detectShadcnRoot(projectPath);
+  if (!shadcnRoot) {
+    throw new Error("Could not find components.json. " + "Run this command from a project with shadcn/ui configured, " + "or from a monorepo root with packages/ui/components.json.");
+  }
+  const isMonorepo = shadcnRoot !== projectPath;
+  M2.info(`${source_default.bold("Migration:")} ${migration} \u2014 ${MIGRATION_DESCRIPTIONS[migration]}`);
+  M2.info(`${source_default.bold("Location:")} ${isMonorepo ? "packages/ui (monorepo)" : "(project root)"}`);
+  const installSuccess = await runBunInstall(projectPath);
+  if (!installSuccess) {
+    throw new Error("Failed to resolve dependencies. Fix the errors above and try again.");
+  }
+  const migrateSuccess = await runShadcnMigrate(shadcnRoot, migration);
+  if (!migrateSuccess) {
+    throw new Error(`Migration "${migration}" failed. Check the errors above.`);
+  }
+  showPostMigrationAdvice(migration, isMonorepo);
+}
+
 // src/commands/preset.ts
 init_src();
 init_boxen();
@@ -33910,12 +34163,13 @@ Examples:
   $ bunkit create nextjs my-app   Create a Next.js web application
   $ bunkit add workspace           Add a new workspace to monorepo
   $ bunkit add component --all     Browse and add shadcn/ui components
+  $ bunkit migrate radix           Migrate to unified radix-ui package
   $ bunkit catalog add zod ^3.24.1 Add package to dependency catalog
   $ bunkit preset list             List all custom presets
 
 For more information, visit: https://github.com/Arakiss/bunkit
   `);
-program2.command("init").description("Create a new project with full customization options").alias("i").option("--name <name>", "Project name (kebab-case recommended, e.g., my-awesome-app)").option("--preset <preset>", "Project preset: minimal | nextjs | hono-api | bun-api | bun-fullstack | nextjs-monorepo | bun-monorepo | enterprise-monorepo").option("--database <database>", "Database option: postgres-drizzle | postgres-prisma | mysql-drizzle | mysql-prisma | supabase | supabase-drizzle | supabase-prisma | sqlite-drizzle | sqlite-prisma | none").option("--auth <auth>", "Authentication system: better-auth | nextauth | supabase | none").option("--redis", "Enable Redis cache/session store").option("--use-bun-secrets", "Use Bun.secrets API instead of .env files").option("--supabase-preset <preset>", "Supabase configuration preset: full-stack | auth-only | database-only | custom").option("--supabase-features <features>", "Comma-separated Supabase features: auth,storage,realtime,edge-functions,database").option("--code-quality <tool>", "Code quality tool: ultracite | biome").option("--ts-strictness <level>", "TypeScript strictness level: strict | moderate | loose").option("--ui-library <library>", "UI component library: shadcn | none").option("--css-framework <framework>", "CSS framework: tailwind | vanilla | css-modules").option("--shadcn-style <style>", "shadcn/ui style: radix-maia | radix-vega | radix-nova | radix-lyra | radix-mira | new-york | default").option("--shadcn-base <base>", "shadcn/ui component foundation: radix | base-ui").option("--shadcn-base-color <color>", "shadcn/ui base color theme: zinc | slate | stone | gray | neutral").option("--shadcn-icon-library <library>", "shadcn/ui icon library: phosphor | lucide | iconoir").option("--shadcn-menu-accent <accent>", "shadcn/ui menu accent style: subtle | bold").option("--shadcn-menu-color <color>", "shadcn/ui menu color: default | muted").option("--shadcn-radius <radius>", "shadcn/ui border radius (CSS value, e.g., 0.5rem, 0.625rem)").option("--testing <framework>", "Testing framework: bun-test | vitest | none").option("--docker", "Include Docker configuration files").option("--cicd", "Include GitHub Actions CI/CD workflow").option("--no-git", "Skip Git repository initialization").option("--no-install", "Skip dependency installation after project creation").option("--non-interactive", "Run in non-interactive mode (requires all options via flags)").option("--save-preset <name>", "Save current configuration as a custom preset").option("--load-preset <name>", "Load configuration from a custom preset").addHelpText("after", `
+program2.command("init").description("Create a new project with full customization options").alias("i").option("--name <name>", "Project name (kebab-case recommended, e.g., my-awesome-app)").option("--preset <preset>", "Project preset: minimal | nextjs | hono-api | bun-api | bun-fullstack | nextjs-monorepo | bun-monorepo | enterprise-monorepo").option("--database <database>", "Database option: postgres-drizzle | postgres-prisma | mysql-drizzle | mysql-prisma | supabase | supabase-drizzle | supabase-prisma | sqlite-drizzle | sqlite-prisma | none").option("--auth <auth>", "Authentication system: better-auth | nextauth | supabase | none").option("--redis", "Enable Redis cache/session store").option("--use-bun-secrets", "Use Bun.secrets API instead of .env files").option("--supabase-preset <preset>", "Supabase configuration preset: full-stack | auth-only | database-only | custom").option("--supabase-features <features>", "Comma-separated Supabase features: auth,storage,realtime,edge-functions,database").option("--code-quality <tool>", "Code quality tool: ultracite | biome").option("--ts-strictness <level>", "TypeScript strictness level: strict | moderate | loose").option("--ui-library <library>", "UI component library: shadcn | none").option("--css-framework <framework>", "CSS framework: tailwind | vanilla | css-modules").option("--shadcn-style <style>", "shadcn/ui style: radix-maia | radix-vega | radix-nova | radix-lyra | radix-mira | base-maia | base-vega | base-nova | base-lyra | base-mira | new-york | default").option("--shadcn-base <base>", "shadcn/ui component foundation: radix | base-ui").option("--shadcn-base-color <color>", "shadcn/ui base color theme: zinc | slate | stone | gray | neutral").option("--shadcn-icon-library <library>", "shadcn/ui icon library: phosphor | lucide | iconoir").option("--shadcn-menu-accent <accent>", "shadcn/ui menu accent style: subtle | bold").option("--shadcn-menu-color <color>", "shadcn/ui menu color: default | muted").option("--shadcn-radius <radius>", "shadcn/ui border radius (CSS value, e.g., 0.5rem, 0.625rem)").option("--shadcn-rtl", "Enable RTL (right-to-left) support for shadcn/ui components").option("--testing <framework>", "Testing framework: bun-test | vitest | none").option("--docker", "Include Docker configuration files").option("--cicd", "Include GitHub Actions CI/CD workflow").option("--no-git", "Skip Git repository initialization").option("--no-install", "Skip dependency installation after project creation").option("--non-interactive", "Run in non-interactive mode (requires all options via flags)").option("--save-preset <name>", "Save current configuration as a custom preset").option("--load-preset <name>", "Load configuration from a custom preset").addHelpText("after", `
 Examples:
   $ bunkit init                                    Interactive project creation
   $ bunkit init --name my-app --preset nextjs     Quick web app creation
@@ -34035,6 +34289,28 @@ Features:
     process.exit(1);
   }
 });
+program2.command("migrate").argument("[type]", "Migration type: radix | rtl | icons").description("Run shadcn/ui migrations (unified radix-ui, RTL, icon library)").addHelpText("after", `
+Examples:
+  $ bunkit migrate             Interactive migration selection
+  $ bunkit migrate radix       Migrate to unified radix-ui package
+  $ bunkit migrate rtl         Enable RTL support in components
+  $ bunkit migrate icons       Migrate icon library
+
+Migrations:
+  radix    Replace @radix-ui/react-* packages with unified radix-ui
+  rtl      Add RTL class transforms to installed components
+  icons    Migrate between icon libraries (lucide, iconoir, phosphor)
+  `).action(async (migrationType) => {
+  showBanner(VERSION);
+  try {
+    await migrateCommand(migrationType);
+    Se(import_picocolors7.default.green("Migration completed successfully!"));
+  } catch (error) {
+    M2.error(error.message);
+    Se(import_picocolors7.default.red("Migration failed"));
+    process.exit(1);
+  }
+});
 var catalogCmd = new Command("catalog").alias("cat").description("Manage dependency catalog for version synchronization").addHelpText("after", `
 Subcommands:
   add <package> [version]   Add package to catalog