bunkit-cli 1.2.1 → 1.3.1

package/dist/index.js

@@ -14851,7 +14851,396 @@ var init_monorepo = __esm(() => {
   init_fs();
 });
 
-// ../core/src/presets.ts
+// ../core/src/presets/registry.ts
+class PresetRegistry {
+  static aliasMap = null;
+  static getAliasMap() {
+    if (!this.aliasMap) {
+      this.aliasMap = new Map;
+      for (const [name, definition] of Object.entries(PRESET_DEFINITIONS)) {
+        this.aliasMap.set(name, name);
+        for (const alias of definition.aliases) {
+          this.aliasMap.set(alias, name);
+        }
+      }
+    }
+    return this.aliasMap;
+  }
+  static normalize(input) {
+    const map = this.getAliasMap();
+    return map.get(input) || null;
+  }
+  static get(input) {
+    const normalized = this.normalize(input);
+    if (!normalized)
+      return null;
+    return PRESET_DEFINITIONS[normalized];
+  }
+  static hasCapability(input, capability) {
+    const preset = this.get(input);
+    if (!preset)
+      return false;
+    return preset.capabilities[capability];
+  }
+  static isMonorepo(input) {
+    return this.hasCapability(input, "isMonorepo");
+  }
+  static getSelectOptions() {
+    return Object.values(PRESET_DEFINITIONS).map((preset) => ({
+      value: preset.name,
+      label: `${preset.emoji} ${preset.displayName}`,
+      hint: preset.hint
+    }));
+  }
+  static getPresetsWithCapability(capability) {
+    return Object.values(PRESET_DEFINITIONS).filter((preset) => preset.capabilities[capability]);
+  }
+  static isValid(input) {
+    return this.normalize(input) !== null;
+  }
+  static getAllValidNames() {
+    return Array.from(this.getAliasMap().keys());
+  }
+}
+var PRESET_DEFINITIONS;
+var init_registry = __esm(() => {
+  PRESET_DEFINITIONS = {
+    minimal: {
+      name: "minimal",
+      displayName: "Minimal",
+      description: "Single-file Bun project",
+      hint: "Single-file Bun project - perfect for CLIs and scripts",
+      emoji: "\u26A1",
+      aliases: [],
+      capabilities: {
+        database: false,
+        cssFramework: false,
+        uiLibrary: false,
+        auth: false,
+        redis: false,
+        docker: true,
+        cicd: true,
+        isMonorepo: false,
+        hasApi: false,
+        hasWeb: false
+      },
+      devCommand: "bun run dev",
+      rootDependencies: {},
+      rootDevDependencies: {
+        "@types/bun": "latest",
+        typescript: "^5.9.3"
+      }
+    },
+    nextjs: {
+      name: "nextjs",
+      displayName: "Next.js Application",
+      description: "Next.js 16 + React 19 + Tailwind CSS 4",
+      hint: "Next.js 16 + React 19 + Tailwind CSS 4 - production-ready web app (single repo)",
+      emoji: "\uD83C\uDF10",
+      aliases: ["web"],
+      capabilities: {
+        database: true,
+        cssFramework: true,
+        uiLibrary: true,
+        auth: true,
+        redis: false,
+        docker: true,
+        cicd: true,
+        isMonorepo: false,
+        hasApi: false,
+        hasWeb: true
+      },
+      devCommand: "bun dev",
+      rootDependencies: {
+        react: "^19.2.3",
+        "react-dom": "^19.2.3",
+        next: "^16.0.10"
+      },
+      rootDevDependencies: {
+        "@types/bun": "latest",
+        "@types/react": "^19.2.7",
+        "@types/react-dom": "^19.2.3",
+        "@types/node": "^25.0.3",
+        typescript: "^5.9.3",
+        tailwindcss: "^4.1.18",
+        "@tailwindcss/postcss": "^4.1.18",
+        postcss: "^8.5.6"
+      }
+    },
+    "hono-api": {
+      name: "hono-api",
+      displayName: "Hono API Server",
+      description: "Hono 4 + Bun.serve()",
+      hint: "Hono 4 + Bun.serve() - full-featured API with middleware ecosystem (single repo)",
+      emoji: "\uD83D\uDE80",
+      aliases: ["api"],
+      capabilities: {
+        database: true,
+        cssFramework: false,
+        uiLibrary: false,
+        auth: true,
+        redis: true,
+        docker: true,
+        cicd: true,
+        isMonorepo: false,
+        hasApi: true,
+        hasWeb: false
+      },
+      devCommand: "bun run dev",
+      rootDependencies: {
+        hono: "^4.11.1"
+      },
+      rootDevDependencies: {
+        "@types/bun": "latest",
+        typescript: "^5.9.3"
+      }
+    },
+    "bun-api": {
+      name: "bun-api",
+      displayName: "Bun Native API",
+      description: "Bun.serve() native routing",
+      hint: "Bun.serve() native routing - ultra-fast API with zero dependencies (single repo)",
+      emoji: "\u26A1",
+      aliases: [],
+      capabilities: {
+        database: true,
+        cssFramework: false,
+        uiLibrary: false,
+        auth: true,
+        redis: true,
+        docker: true,
+        cicd: true,
+        isMonorepo: false,
+        hasApi: true,
+        hasWeb: false
+      },
+      devCommand: "bun run dev",
+      rootDependencies: {},
+      rootDevDependencies: {
+        "@types/bun": "latest",
+        typescript: "^5.9.3"
+      }
+    },
+    "bun-fullstack": {
+      name: "bun-fullstack",
+      displayName: "Bun Full-Stack",
+      description: "Bun.serve() + HTML imports",
+      hint: "Bun.serve() + HTML imports - full-stack app without Next.js (single repo)",
+      emoji: "\uD83D\uDD25",
+      aliases: [],
+      capabilities: {
+        database: true,
+        cssFramework: true,
+        uiLibrary: true,
+        auth: true,
+        redis: true,
+        docker: true,
+        cicd: true,
+        isMonorepo: false,
+        hasApi: true,
+        hasWeb: true
+      },
+      devCommand: "bun run dev",
+      rootDependencies: {},
+      rootDevDependencies: {
+        "@types/bun": "latest",
+        typescript: "^5.9.3",
+        tailwindcss: "^4.1.18",
+        "@tailwindcss/postcss": "^4.1.18",
+        postcss: "^8.5.6"
+      }
+    },
+    "nextjs-monorepo": {
+      name: "nextjs-monorepo",
+      displayName: "Next.js Monorepo",
+      description: "Next.js + Hono + shared packages",
+      hint: "Next.js + Hono + shared packages - enterprise SaaS architecture",
+      emoji: "\uD83D\uDCE6",
+      aliases: ["full", "monorepo-nextjs"],
+      capabilities: {
+        database: true,
+        cssFramework: true,
+        uiLibrary: true,
+        auth: true,
+        redis: true,
+        docker: true,
+        cicd: true,
+        isMonorepo: true,
+        hasApi: true,
+        hasWeb: true
+      },
+      workspaceStructure: {
+        apps: ["web", "platform", "api"],
+        packages: ["ui", "types", "utils"],
+        tooling: ["typescript"]
+      },
+      devCommand: "bun dev",
+      rootDependencies: {},
+      rootDevDependencies: {
+        "@types/bun": "latest",
+        typescript: "catalog:"
+      },
+      catalogEntries: {
+        react: "^19.2.3",
+        "react-dom": "^19.2.3",
+        next: "^16.0.10",
+        "@types/react": "^19.2.7",
+        "@types/react-dom": "^19.2.3",
+        hono: "^4.11.1",
+        "drizzle-orm": "^0.45.1",
+        "drizzle-kit": "^0.31.8",
+        postgres: "^3.4.7",
+        "@supabase/supabase-js": "^2.88.0",
+        tailwindcss: "^4.1.18",
+        "@tailwindcss/postcss": "^4.1.18",
+        postcss: "^8.5.6",
+        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",
+        "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",
+        ultracite: "^6.4.2",
+        "@biomejs/biome": "^2.3.10",
+        vitest: "^4.0.16",
+        "@vitest/ui": "^4.0.16",
+        "@types/node": "^25.0.3",
+        typescript: "^5.9.3"
+      }
+    },
+    "bun-monorepo": {
+      name: "bun-monorepo",
+      displayName: "Bun Monorepo",
+      description: "Full-stack monorepo with Bun.serve()",
+      hint: "Full-stack monorepo with Bun.serve() - no Next.js",
+      emoji: "\uD83D\uDD25",
+      aliases: ["monorepo-bun"],
+      capabilities: {
+        database: true,
+        cssFramework: true,
+        uiLibrary: true,
+        auth: true,
+        redis: true,
+        docker: true,
+        cicd: true,
+        isMonorepo: true,
+        hasApi: true,
+        hasWeb: true
+      },
+      workspaceStructure: {
+        apps: ["web", "api"],
+        packages: ["ui", "types", "utils"],
+        tooling: ["typescript"]
+      },
+      devCommand: "bun dev",
+      rootDependencies: {},
+      rootDevDependencies: {
+        "@types/bun": "latest",
+        typescript: "catalog:"
+      },
+      catalogEntries: {
+        react: "^19.2.3",
+        "react-dom": "^19.2.3",
+        "@types/react": "^19.2.7",
+        "@types/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",
+        tailwindcss: "^4.1.18",
+        "@tailwindcss/postcss": "^4.1.18",
+        postcss: "^8.5.6",
+        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",
+        "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",
+        ultracite: "^6.4.2",
+        "@biomejs/biome": "^2.3.10",
+        vitest: "^4.0.16",
+        "@vitest/ui": "^4.0.16",
+        "@types/node": "^25.0.3",
+        typescript: "^5.9.3"
+      }
+    },
+    "enterprise-monorepo": {
+      name: "enterprise-monorepo",
+      displayName: "Enterprise Monorepo",
+      description: "Multiple Next.js apps + services",
+      hint: "Multiple Next.js apps + services - platform, app, service-identity",
+      emoji: "\uD83C\uDFE2",
+      aliases: [],
+      capabilities: {
+        database: true,
+        cssFramework: true,
+        uiLibrary: true,
+        auth: true,
+        redis: true,
+        docker: true,
+        cicd: true,
+        isMonorepo: true,
+        hasApi: true,
+        hasWeb: true
+      },
+      workspaceStructure: {
+        apps: ["web", "platform", "admin", "api", "service-identity"],
+        packages: ["ui", "types", "utils", "db", "auth"],
+        tooling: ["typescript", "testing"]
+      },
+      devCommand: "bun dev",
+      rootDependencies: {},
+      rootDevDependencies: {
+        "@types/bun": "latest",
+        typescript: "catalog:"
+      },
+      catalogEntries: {
+        react: "^19.2.3",
+        "react-dom": "^19.2.3",
+        next: "^16.0.10",
+        "@types/react": "^19.2.7",
+        "@types/react-dom": "^19.2.3",
+        hono: "^4.11.1",
+        "drizzle-orm": "^0.45.1",
+        "drizzle-kit": "^0.31.8",
+        postgres: "^3.4.7",
+        "@supabase/supabase-js": "^2.88.0",
+        tailwindcss: "^4.1.18",
+        "@tailwindcss/postcss": "^4.1.18",
+        postcss: "^8.5.6",
+        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",
+        "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",
+        ultracite: "^6.4.2",
+        "@biomejs/biome": "^2.3.10",
+        vitest: "^4.0.16",
+        "@vitest/ui": "^4.0.16",
+        "@types/node": "^25.0.3",
+        typescript: "^5.9.3"
+      }
+    }
+  };
+});
+
+// ../core/src/presets/custom.ts
 function getPresetsDir() {
   return join(process.env.HOME || process.env.USERPROFILE || ".", ".bunkit");
 }
@@ -14896,11 +15285,17 @@ async function listCustomPresets() {
   const presets = await loadCustomPresets();
   return Object.values(presets);
 }
-var init_presets = __esm(() => {
+var init_custom2 = __esm(() => {
   init_dist();
   init_fs();
 });
 
+// ../core/src/presets/index.ts
+var init_presets = __esm(() => {
+  init_registry();
+  init_custom2();
+});
+
 // ../core/src/project.ts
 async function createProject(config) {
   const projectPath = join(process.cwd(), config.path);
@@ -15064,7 +15459,11 @@ function createTemplateContext(config) {
     envExample: config.envExample,
     pathAliases: config.pathAliases,
     shadcnStyle: config.shadcnStyle,
+    shadcnBase: config.shadcnBase,
     shadcnBaseColor: config.shadcnBaseColor,
+    shadcnIconLibrary: config.shadcnIconLibrary,
+    shadcnMenuAccent: config.shadcnMenuAccent,
+    shadcnMenuColor: config.shadcnMenuColor,
     shadcnRadius: config.shadcnRadius,
     supabasePreset: config.supabasePreset,
     supabaseFeatures: config.supabaseFeatures,
@@ -19091,8 +19490,12 @@ 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(["new-york", "default"]).optional(),
+    shadcnStyle: exports_external.enum(["radix-maia", "radix-vega", "radix-nova", "radix-lyra", "radix-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(),
     testing: exports_external.enum(["bun-test", "vitest", "none"]).default("bun-test"),
     docker: exports_external.boolean().default(false),
@@ -19195,6 +19598,8 @@ __export(exports_src, {
   addWorkspaceToRoot: () => addWorkspaceToRoot,
   addToCatalog: () => addToCatalog,
   ProjectConfigSchema: () => ProjectConfigSchema,
+  PresetRegistry: () => PresetRegistry,
+  PRESET_DEFINITIONS: () => PRESET_DEFINITIONS,
   FeatureConfigSchema: () => FeatureConfigSchema
 });
 var init_src = __esm(() => {
@@ -21360,6 +21765,240 @@ var require_commander = __commonJS((exports) => {
   exports.InvalidOptionArgumentError = InvalidArgumentError;
 });
 
+// ../templates/src/shared/package-json.ts
+var exports_package_json = {};
+__export(exports_package_json, {
+  writeUtilsPackageJson: () => writeUtilsPackageJson,
+  writeUiPackageJson: () => writeUiPackageJson,
+  writeTypesPackageJson: () => writeTypesPackageJson,
+  writePackageJson: () => writePackageJson,
+  writeNextjsAppPackageJson: () => writeNextjsAppPackageJson,
+  writeMonorepoRootPackageJson: () => writeMonorepoRootPackageJson,
+  writeHonoApiPackageJson: () => writeHonoApiPackageJson
+});
+async function writePackageJson(directory, options) {
+  const packageJson = {
+    name: options.name,
+    version: options.version ?? "0.0.0"
+  };
+  if (options.private !== undefined) {
+    packageJson.private = options.private;
+  }
+  if (options.description) {
+    packageJson.description = options.description;
+  }
+  if (options.main) {
+    packageJson.main = options.main;
+  }
+  if (options.types) {
+    packageJson.types = options.types;
+  }
+  if (options.exports) {
+    packageJson.exports = options.exports;
+  }
+  if (options.workspaces) {
+    packageJson.workspaces = options.workspaces;
+  }
+  if (options.scripts && Object.keys(options.scripts).length > 0) {
+    packageJson.scripts = options.scripts;
+  }
+  if (options.dependencies && Object.keys(options.dependencies).length > 0) {
+    packageJson.dependencies = options.dependencies;
+  }
+  if (options.devDependencies && Object.keys(options.devDependencies).length > 0) {
+    packageJson.devDependencies = options.devDependencies;
+  }
+  if (options.peerDependencies && Object.keys(options.peerDependencies).length > 0) {
+    packageJson.peerDependencies = options.peerDependencies;
+  }
+  if (options.catalog && Object.keys(options.catalog).length > 0) {
+    packageJson.catalog = options.catalog;
+  }
+  await writeFile(join(directory, "package.json"), JSON.stringify(packageJson, null, 2));
+}
+async function writeMonorepoRootPackageJson(projectPath, projectName, catalog, options = {}) {
+  const scripts = {
+    dev: 'bun run --filter "*" dev',
+    build: 'bun run --filter "*" build',
+    lint: options.codeQuality === "ultracite" ? "ultracite check ." : "biome check .",
+    format: options.codeQuality === "ultracite" ? "ultracite fix ." : "biome format --write .",
+    test: "bun test"
+  };
+  if (options.hasWeb) {
+    scripts["dev:web"] = 'bun run --filter "@*/web" dev';
+  }
+  if (options.hasPlatform) {
+    scripts["dev:platform"] = 'bun run --filter "@*/platform" dev';
+  }
+  if (options.hasApi) {
+    scripts["dev:api"] = 'bun run --filter "@*/api" dev';
+    scripts.debug = "bun --inspect apps/api/src/index.ts";
+    scripts["debug:brk"] = "bun --inspect-brk apps/api/src/index.ts";
+    scripts["debug:wait"] = "bun --inspect-wait apps/api/src/index.ts";
+  }
+  await writePackageJson(projectPath, {
+    name: `${projectName}-monorepo`,
+    version: "0.0.0",
+    private: true,
+    workspaces: ["apps/*", "packages/*"],
+    scripts,
+    devDependencies: {
+      "@types/bun": "latest",
+      typescript: "catalog:"
+    },
+    catalog
+  });
+}
+async function writeNextjsAppPackageJson(appPath, scopeName, appName, options = {}) {
+  const dependencies = {
+    react: "catalog:",
+    "react-dom": "catalog:",
+    next: "catalog:",
+    "iconoir-react": "catalog:"
+  };
+  if (options.usesTypes) {
+    dependencies[`@${scopeName}/types`] = "workspace:*";
+  }
+  if (options.usesUi) {
+    dependencies[`@${scopeName}/ui`] = "workspace:*";
+  }
+  const devDependencies = {
+    "@types/react": "catalog:",
+    "@types/react-dom": "catalog:",
+    "@types/node": "catalog:",
+    typescript: "catalog:",
+    tailwindcss: "catalog:",
+    "@tailwindcss/postcss": "catalog:",
+    postcss: "catalog:"
+  };
+  await writePackageJson(appPath, {
+    name: `@${scopeName}/${appName}`,
+    version: "0.0.0",
+    private: true,
+    scripts: {
+      dev: "next dev",
+      build: "next build",
+      start: "next start",
+      debug: "bun --inspect node_modules/.bin/next dev",
+      "debug:brk": "bun --inspect-brk node_modules/.bin/next dev",
+      "debug:wait": "bun --inspect-wait node_modules/.bin/next dev"
+    },
+    dependencies,
+    devDependencies
+  });
+}
+async function writeHonoApiPackageJson(appPath, scopeName, options = {}) {
+  const dependencies = {
+    hono: "catalog:"
+  };
+  if (options.usesTypes) {
+    dependencies[`@${scopeName}/types`] = "workspace:*";
+  }
+  if (options.usesDb) {
+    dependencies[`@${scopeName}/db`] = "workspace:*";
+  }
+  await writePackageJson(appPath, {
+    name: `@${scopeName}/api`,
+    version: "0.0.0",
+    private: true,
+    scripts: {
+      dev: "bun --hot src/index.ts",
+      build: "bun build src/index.ts --outdir dist --target bun",
+      start: "bun 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,
+    devDependencies: {
+      "@types/bun": "latest",
+      typescript: "catalog:"
+    }
+  });
+}
+async function writeUiPackageJson(packagePath, scopeName) {
+  await writePackageJson(packagePath, {
+    name: `@${scopeName}/ui`,
+    version: "0.0.0",
+    private: true,
+    main: "./src/index.ts",
+    types: "./src/index.ts",
+    exports: {
+      ".": "./src/index.ts",
+      "./components": "./src/components/index.ts",
+      "./lib/utils": "./src/lib/utils.ts",
+      "./hooks": "./src/hooks/index.ts",
+      "./globals.css": "./src/styles/globals.css",
+      "./postcss.config": "./postcss.config.mjs"
+    },
+    scripts: {
+      build: "tsc --noEmit",
+      lint: "tsc --noEmit"
+    },
+    dependencies: {
+      "@radix-ui/react-slot": "catalog:",
+      "class-variance-authority": "catalog:",
+      clsx: "catalog:",
+      "tailwind-merge": "catalog:",
+      "iconoir-react": "catalog:",
+      tailwindcss: "catalog:",
+      "@tailwindcss/postcss": "catalog:",
+      postcss: "catalog:"
+    },
+    devDependencies: {
+      "@types/react": "catalog:",
+      "@types/react-dom": "catalog:",
+      typescript: "catalog:"
+    },
+    peerDependencies: {
+      react: "^19.0.0",
+      "react-dom": "^19.0.0"
+    }
+  });
+}
+async function writeTypesPackageJson(packagePath, scopeName) {
+  await writePackageJson(packagePath, {
+    name: `@${scopeName}/types`,
+    version: "0.0.0",
+    private: true,
+    main: "./src/index.ts",
+    types: "./src/index.ts",
+    exports: {
+      ".": "./src/index.ts"
+    },
+    scripts: {
+      build: "tsc --noEmit",
+      lint: "tsc --noEmit"
+    },
+    devDependencies: {
+      typescript: "catalog:"
+    }
+  });
+}
+async function writeUtilsPackageJson(packagePath, scopeName) {
+  await writePackageJson(packagePath, {
+    name: `@${scopeName}/utils`,
+    version: "0.0.0",
+    private: true,
+    main: "./src/index.ts",
+    types: "./src/index.ts",
+    exports: {
+      ".": "./src/index.ts"
+    },
+    scripts: {
+      build: "tsc --noEmit",
+      lint: "tsc --noEmit"
+    },
+    devDependencies: {
+      typescript: "catalog:"
+    }
+  });
+}
+var init_package_json = __esm(() => {
+  init_src();
+  init_dist();
+});
+
 // ../../node_modules/.bun/ejs@3.1.10/node_modules/ejs/lib/utils.js
 var require_utils5 = __commonJS((exports) => {
   var regExpChars = /[|\\{}()[\]^$+*?.]/g;
@@ -27823,12 +28462,7 @@ var themes = {
 };
 function generateThemeCSS(theme, customRadius) {
   const radius = customRadius || theme.light.radius;
-  return `@import "tailwindcss";
-@source "../../../apps/**/*.{ts,tsx}";
-@source "../../../components/**/*.{ts,tsx}";
-@source "../**/*.{ts,tsx}";
-
-:root {
+  return `:root {
   --radius: ${radius};
   --background: ${theme.light.background};
   --foreground: ${theme.light.foreground};
@@ -27947,58 +28581,183 @@ function generateThemeCSS(theme, customRadius) {
 }
 `;
 }
-
-// ../templates/src/generators/shadcn.ts
-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 baseColor = context.shadcnBaseColor || "zinc";
-  const radius = context.shadcnRadius || "0.625rem";
-  const componentsJson = {
-    $schema: "https://ui.shadcn.com/schema.json",
-    style,
-    rsc: true,
-    tsx: true,
-    tailwind: {
-      config: "",
-      css: "src/app/globals.css",
-      baseColor,
-      cssVariables: true
-    },
-    iconLibrary: "lucide",
-    aliases: {
-      components: "@/components",
-      utils: "@/lib/utils",
-      ui: "@/components/ui",
-      lib: "@/lib",
-      hooks: "@/hooks"
-    }
-  };
-  await writeFile(join(projectPath, "components.json"), JSON.stringify(componentsJson, null, 2));
-  const utilsContent = `import { clsx, type ClassValue } from 'clsx';
-import { twMerge } from 'tailwind-merge';
-
-export function cn(...inputs: ClassValue[]) {
-  return twMerge(clsx(inputs));
+function generateModernThemeCSS(baseColor, customRadius) {
+  const theme = themes[baseColor] || themes.zinc;
+  const radius = customRadius || "0.625rem";
+  return `@theme inline {
+  --color-background: var(--background);
+  --color-foreground: var(--foreground);
+  --font-sans: var(--font-sans);
+  --font-mono: var(--font-geist-mono);
+  --color-sidebar-ring: var(--sidebar-ring);
+  --color-sidebar-border: var(--sidebar-border);
+  --color-sidebar-accent-foreground: var(--sidebar-accent-foreground);
+  --color-sidebar-accent: var(--sidebar-accent);
+  --color-sidebar-primary-foreground: var(--sidebar-primary-foreground);
+  --color-sidebar-primary: var(--sidebar-primary);
+  --color-sidebar-foreground: var(--sidebar-foreground);
+  --color-sidebar: var(--sidebar);
+  --color-chart-5: var(--chart-5);
+  --color-chart-4: var(--chart-4);
+  --color-chart-3: var(--chart-3);
+  --color-chart-2: var(--chart-2);
+  --color-chart-1: var(--chart-1);
+  --color-ring: var(--ring);
+  --color-input: var(--input);
+  --color-border: var(--border);
+  --color-destructive: var(--destructive);
+  --color-accent-foreground: var(--accent-foreground);
+  --color-accent: var(--accent);
+  --color-muted-foreground: var(--muted-foreground);
+  --color-muted: var(--muted);
+  --color-secondary-foreground: var(--secondary-foreground);
+  --color-secondary: var(--secondary);
+  --color-primary-foreground: var(--primary-foreground);
+  --color-primary: var(--primary);
+  --color-popover-foreground: var(--popover-foreground);
+  --color-popover: var(--popover);
+  --color-card-foreground: var(--card-foreground);
+  --color-card: var(--card);
+  --radius-sm: calc(var(--radius) - 4px);
+  --radius-md: calc(var(--radius) - 2px);
+  --radius-lg: var(--radius);
+  --radius-xl: calc(var(--radius) + 4px);
+  --radius-2xl: calc(var(--radius) + 8px);
+  --radius-3xl: calc(var(--radius) + 12px);
+  --radius-4xl: calc(var(--radius) + 16px);
 }
-`;
-  await writeFile(join(projectPath, "src/lib/utils.ts"), utilsContent);
-  const packageJsonPath = join(projectPath, "package.json");
-  let packageJson = {};
-  try {
-    packageJson = JSON.parse(await Bun.file(packageJsonPath).text());
-  } catch {}
-  if (!packageJson.dependencies) {
-    packageJson.dependencies = {};
-  }
-  packageJson.dependencies["@radix-ui/react-slot"] = "catalog:";
-  packageJson.dependencies["class-variance-authority"] = "catalog:";
-  packageJson.dependencies.clsx = "catalog:";
-  packageJson.dependencies["tailwind-merge"] = "catalog:";
-  packageJson.dependencies["lucide-react"] = "catalog:";
-  if (!packageJson.catalog) {
-    packageJson.catalog = {};
+
+:root {
+  --background: ${theme.light.background};
+  --foreground: ${theme.light.foreground};
+  --card: ${theme.light.card};
+  --card-foreground: ${theme.light.cardForeground};
+  --popover: ${theme.light.popover};
+  --popover-foreground: ${theme.light.popoverForeground};
+  --primary: ${theme.light.primary};
+  --primary-foreground: ${theme.light.primaryForeground};
+  --secondary: ${theme.light.secondary};
+  --secondary-foreground: ${theme.light.secondaryForeground};
+  --muted: ${theme.light.muted};
+  --muted-foreground: ${theme.light.mutedForeground};
+  --accent: ${theme.light.accent};
+  --accent-foreground: ${theme.light.accentForeground};
+  --destructive: ${theme.light.destructive};
+  --border: ${theme.light.border};
+  --input: ${theme.light.input};
+  --ring: ${theme.light.ring};
+  --chart-1: ${theme.light.chart1};
+  --chart-2: ${theme.light.chart2};
+  --chart-3: ${theme.light.chart3};
+  --chart-4: ${theme.light.chart4};
+  --chart-5: ${theme.light.chart5};
+  --radius: ${radius};
+  --sidebar: ${theme.light.sidebar};
+  --sidebar-foreground: ${theme.light.sidebarForeground};
+  --sidebar-primary: ${theme.light.sidebarPrimary};
+  --sidebar-primary-foreground: ${theme.light.sidebarPrimaryForeground};
+  --sidebar-accent: ${theme.light.sidebarAccent};
+  --sidebar-accent-foreground: ${theme.light.sidebarAccentForeground};
+  --sidebar-border: ${theme.light.sidebarBorder};
+  --sidebar-ring: ${theme.light.sidebarRing};
+}
+
+.dark {
+  --background: ${theme.dark.background};
+  --foreground: ${theme.dark.foreground};
+  --card: ${theme.dark.card};
+  --card-foreground: ${theme.dark.cardForeground};
+  --popover: ${theme.dark.popover};
+  --popover-foreground: ${theme.dark.popoverForeground};
+  --primary: ${theme.dark.primary};
+  --primary-foreground: ${theme.dark.primaryForeground};
+  --secondary: ${theme.dark.secondary};
+  --secondary-foreground: ${theme.dark.secondaryForeground};
+  --muted: ${theme.dark.muted};
+  --muted-foreground: ${theme.dark.mutedForeground};
+  --accent: ${theme.dark.accent};
+  --accent-foreground: ${theme.dark.accentForeground};
+  --destructive: ${theme.dark.destructive};
+  --border: ${theme.dark.border};
+  --input: ${theme.dark.input};
+  --ring: ${theme.dark.ring};
+  --chart-1: ${theme.dark.chart1};
+  --chart-2: ${theme.dark.chart2};
+  --chart-3: ${theme.dark.chart3};
+  --chart-4: ${theme.dark.chart4};
+  --chart-5: ${theme.dark.chart5};
+  --sidebar: ${theme.dark.sidebar};
+  --sidebar-foreground: ${theme.dark.sidebarForeground};
+  --sidebar-primary: ${theme.dark.sidebarPrimary};
+  --sidebar-primary-foreground: ${theme.dark.sidebarPrimaryForeground};
+  --sidebar-accent: ${theme.dark.sidebarAccent};
+  --sidebar-accent-foreground: ${theme.dark.sidebarAccentForeground};
+  --sidebar-border: ${theme.dark.sidebarBorder};
+  --sidebar-ring: ${theme.dark.sidebarRing};
+}
+
+@layer base {
+  * {
+    @apply border-border outline-ring/50;
+  }
+  body {
+    @apply bg-background text-foreground;
+  }
+}
+`;
+}
+
+// ../templates/src/generators/shadcn.ts
+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 baseColor = context.shadcnBaseColor || "zinc";
+  const radius = context.shadcnRadius || "0.625rem";
+  const componentsJson = {
+    $schema: "https://ui.shadcn.com/schema.json",
+    style,
+    rsc: true,
+    tsx: true,
+    tailwind: {
+      config: "",
+      css: "src/app/globals.css",
+      baseColor,
+      cssVariables: true
+    },
+    iconLibrary: "lucide",
+    aliases: {
+      components: "@/components",
+      utils: "@/lib/utils",
+      ui: "@/components/ui",
+      lib: "@/lib",
+      hooks: "@/hooks"
+    }
+  };
+  await writeFile(join(projectPath, "components.json"), JSON.stringify(componentsJson, null, 2));
+  const utilsContent = `import { clsx, type ClassValue } from 'clsx';
+import { twMerge } from 'tailwind-merge';
+
+export function cn(...inputs: ClassValue[]) {
+  return twMerge(clsx(inputs));
+}
+`;
+  await writeFile(join(projectPath, "src/lib/utils.ts"), utilsContent);
+  const packageJsonPath = join(projectPath, "package.json");
+  let packageJson = {};
+  try {
+    packageJson = JSON.parse(await Bun.file(packageJsonPath).text());
+  } catch {}
+  if (!packageJson.dependencies) {
+    packageJson.dependencies = {};
+  }
+  packageJson.dependencies["@radix-ui/react-slot"] = "catalog:";
+  packageJson.dependencies["class-variance-authority"] = "catalog:";
+  packageJson.dependencies.clsx = "catalog:";
+  packageJson.dependencies["tailwind-merge"] = "catalog:";
+  packageJson.dependencies["lucide-react"] = "catalog:";
+  if (!packageJson.catalog) {
+    packageJson.catalog = {};
   }
   packageJson.catalog["@radix-ui/react-slot"] = "^1.2.4";
   packageJson.catalog["class-variance-authority"] = "^0.7.1";
@@ -30266,91 +31025,707 @@ export default config;
   await writeFile(packageJsonPath, JSON.stringify(existingPackageJson, null, 2));
   await generateNextjsReadme(projectPath, context);
 }
-// ../templates/src/render.ts
-var import_ejs = __toESM(require_ejs(), 1);
-// src/commands/add/component.ts
+// ../templates/src/builders/full-v2.ts
+init_src();
 init_dist();
-async function getPackageName(cwd2) {
-  try {
-    const packageJsonPath = join(cwd2, "package.json");
-    if (existsSync(packageJsonPath)) {
-      const packageJson = JSON.parse(await Bun.file(packageJsonPath).text());
-      const name = packageJson.name;
-      if (name?.endsWith("-monorepo")) {
-        return name.replace("-monorepo", "");
+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",
+    compilerOptions: {
+      jsx: "react-jsx",
+      rootDir: "./src",
+      outDir: "./dist",
+      baseUrl: ".",
+      paths: {
+        "@/*": ["./src/*"]
       }
-      return name || null;
+    },
+    include: ["src/**/*"],
+    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: "./src/components",
+      utils: "./src/lib/utils",
+      ui: "./src/components/ui",
+      lib: "./src/lib",
+      hooks: "./src/hooks"
     }
-  } catch {}
-  return null;
-}
-async function addComponentCommand(options = {}) {
-  const cwd2 = options.cwd || process.cwd();
-  const spinner = Y2();
-  const componentsJsonPath = join(cwd2, "components.json");
-  const isMonorepo = existsSync(join(cwd2, "packages/ui/components.json"));
-  if (!existsSync(componentsJsonPath) && !isMonorepo) {
-    M2.error("shadcn/ui is not configured in this project.");
-    M2.info("Run `bunkit init` with --ui-library shadcn to set up shadcn/ui first.");
-    process.exit(1);
+  };
+  if (useModernStyle) {
+    componentsJson.menuColor = options.shadcnMenuColor || "default";
+    componentsJson.menuAccent = options.shadcnMenuAccent || "subtle";
+    componentsJson.registries = {};
   }
-  const targetPath = isMonorepo ? join(cwd2, "packages/ui") : cwd2;
-  const targetComponentsJson = join(targetPath, "components.json");
-  if (!existsSync(targetComponentsJson)) {
-    M2.error(`shadcn/ui is not configured in ${isMonorepo ? "packages/ui" : "this project"}.`);
-    M2.info("Run `bunkit init` with --ui-library shadcn to set up shadcn/ui first.");
-    process.exit(1);
+  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);
+    globalsCss = `@import "tailwindcss";
+@import "tw-animate-css";
+@import "shadcn/tailwind.css";
+${appSourcePaths.join(`
+`)}
+@source "../**/*.{ts,tsx}";
+
+@custom-variant dark (&:is(.dark *));
+
+${modernThemeCSS}
+`;
+  } else {
+    const theme = themes[baseColor] || themes.zinc;
+    const themeCSS = generateThemeCSS(theme, customRadius);
+    globalsCss = `@import "tailwindcss";
+${appSourcePaths.join(`
+`)}
+@source "../**/*.{ts,tsx}";
+
+${themeCSS}
+`;
   }
-  let components = [];
-  if (options.all) {
-    const popularComponents = [
-      "button",
-      "card",
-      "input",
-      "label",
-      "textarea",
-      "select",
-      "checkbox",
-      "radio-group",
-      "switch",
-      "dialog",
-      "dropdown-menu",
-      "alert",
-      "badge",
-      "avatar",
-      "separator",
-      "skeleton",
-      "tabs",
-      "accordion",
-      "alert-dialog",
-      "aspect-ratio",
-      "breadcrumb",
-      "calendar",
-      "carousel",
-      "chart",
-      "collapsible",
-      "command",
-      "context-menu",
-      "drawer",
-      "form",
-      "hover-card",
-      "menubar",
-      "navigation-menu",
-      "popover",
-      "progress",
-      "scroll-area",
-      "sheet",
-      "slider",
-      "sonner",
-      "table",
-      "toast",
-      "toggle",
-      "tooltip"
-    ];
-    const selected = await fe({
-      message: "Select shadcn/ui components to install",
-      options: popularComponents.map((comp) => ({
-        value: comp,
+  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: string;
+  email: string;
+  name?: string;
+  createdAt: Date;
+  updatedAt: Date;
+}
+
+export interface ApiResponse<T> {
+  success: boolean;
+  data?: T;
+  error?: {
+    code: string;
+    message: string;
+  };
+}
+
+export interface PaginatedResponse<T> extends ApiResponse<T[]> {
+  pagination: {
+    page: number;
+    perPage: number;
+    total: number;
+    totalPages: number;
+  };
+}
+`);
+}
+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);
+  };
+}
+
+/**
+ * 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 });
+  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>
+  );
+}
+`);
+  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>
+  );
+}
+`);
+  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"],
+    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';
+
+export const metadata: Metadata = {
+  title: '${context.projectName} - Admin',
+  description: 'Admin dashboard for ${context.projectName}',
+};
+
+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';
+
+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>
+
+        <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(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);
+});
+
+// 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;
+`);
+  await writeFile(join(projectPath, "apps/api/tsconfig.json"), JSON.stringify({
+    extends: "../../tooling/typescript/api.json",
+    compilerOptions: {
+      types: ["bun-types"]
+    },
+    include: ["src/**/*"],
+    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));
+  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/shared/index.ts
+init_package_json();
+// ../templates/src/render.ts
+var import_ejs = __toESM(require_ejs(), 1);
+// src/commands/add/component.ts
+init_dist();
+async function getPackageName(cwd2) {
+  try {
+    const packageJsonPath = join(cwd2, "package.json");
+    if (existsSync(packageJsonPath)) {
+      const packageJson = JSON.parse(await Bun.file(packageJsonPath).text());
+      const name = packageJson.name;
+      if (name?.endsWith("-monorepo")) {
+        return name.replace("-monorepo", "");
+      }
+      return name || null;
+    }
+  } catch {}
+  return null;
+}
+async function addComponentCommand(options = {}) {
+  const cwd2 = options.cwd || process.cwd();
+  const spinner = Y2();
+  const componentsJsonPath = join(cwd2, "components.json");
+  const isMonorepo = existsSync(join(cwd2, "packages/ui/components.json"));
+  if (!existsSync(componentsJsonPath) && !isMonorepo) {
+    M2.error("shadcn/ui is not configured in this project.");
+    M2.info("Run `bunkit init` with --ui-library shadcn to set up shadcn/ui first.");
+    process.exit(1);
+  }
+  const targetPath = isMonorepo ? join(cwd2, "packages/ui") : cwd2;
+  const targetComponentsJson = join(targetPath, "components.json");
+  if (!existsSync(targetComponentsJson)) {
+    M2.error(`shadcn/ui is not configured in ${isMonorepo ? "packages/ui" : "this project"}.`);
+    M2.info("Run `bunkit init` with --ui-library shadcn to set up shadcn/ui first.");
+    process.exit(1);
+  }
+  let components = [];
+  if (options.all) {
+    const popularComponents = [
+      "button",
+      "card",
+      "input",
+      "label",
+      "textarea",
+      "select",
+      "checkbox",
+      "radio-group",
+      "switch",
+      "dialog",
+      "dropdown-menu",
+      "alert",
+      "badge",
+      "avatar",
+      "separator",
+      "skeleton",
+      "tabs",
+      "accordion",
+      "alert-dialog",
+      "aspect-ratio",
+      "breadcrumb",
+      "calendar",
+      "carousel",
+      "chart",
+      "collapsible",
+      "command",
+      "context-menu",
+      "drawer",
+      "form",
+      "hover-card",
+      "menubar",
+      "navigation-menu",
+      "popover",
+      "progress",
+      "scroll-area",
+      "sheet",
+      "slider",
+      "sonner",
+      "table",
+      "toast",
+      "toggle",
+      "tooltip"
+    ];
+    const selected = await fe({
+      message: "Select shadcn/ui components to install",
+      options: popularComponents.map((comp) => ({
+        value: comp,
         label: comp
       })),
       required: true
@@ -31734,17 +33109,42 @@ async function enhancedInitCommand(options = {}) {
   if (!shadcnStyle && uiLibrary === "shadcn") {
     if (!isNonInteractive) {
       shadcnStyle = await ve({
-        message: "\uD83C\uDFA8 shadcn/ui component style",
+        message: "\uD83C\uDFA8 shadcn/ui visual style",
         options: [
+          {
+            value: "radix-maia",
+            label: "Maia (Recommended)",
+            hint: "Modern, clean design with soft shadows and refined aesthetics"
+          },
+          {
+            value: "radix-vega",
+            label: "Vega",
+            hint: "Bold, vibrant design with stronger colors and contrast"
+          },
+          {
+            value: "radix-nova",
+            label: "Nova",
+            hint: "Minimalist design with subtle accents and clean lines"
+          },
+          {
+            value: "radix-lyra",
+            label: "Lyra",
+            hint: "Elegant design with refined typography and spacing"
+          },
+          {
+            value: "radix-mira",
+            label: "Mira",
+            hint: "Playful design with rounded elements and soft colors"
+          },
           {
             value: "new-york",
-            label: "New York (Recommended)",
-            hint: "Modern design aesthetic - rounded corners, subtle shadows, clean look"
+            label: "New York (Legacy)",
+            hint: "Classic modern aesthetic - rounded corners, subtle shadows"
           },
           {
             value: "default",
-            label: "Default",
-            hint: "Classic design aesthetic - sharper edges, higher contrast, traditional look"
+            label: "Default (Legacy)",
+            hint: "Classic design - sharper edges, higher contrast"
           }
         ]
       });
@@ -31753,7 +33153,7 @@ async function enhancedInitCommand(options = {}) {
         process.exit(0);
       }
     } else {
-      shadcnStyle = "new-york";
+      shadcnStyle = "radix-maia";
     }
   }
   let shadcnBaseColor = getOptionValue("BUNKIT_SHADCN_BASE_COLOR", options.shadcnBaseColor);
@@ -31822,6 +33222,122 @@ async function enhancedInitCommand(options = {}) {
       shadcnRadius = "0.625rem";
     }
   }
+  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";
+  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: !isModernShadcnStyle ? "Iconoir (Recommended)" : "Iconoir",
+            hint: "Lightweight icons with great variety - alternative choice"
+          },
+          {
+            value: "lucide",
+            label: "Lucide",
+            hint: "Classic choice - based on Feather icons, widely used"
+          }
+        ]
+      });
+      if (pD(shadcnIconLibrary)) {
+        xe("Operation cancelled.");
+        process.exit(0);
+      }
+    } else {
+      shadcnIconLibrary = isModernShadcnStyle ? "phosphor" : "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);
+      }
+    } else {
+      shadcnBase = "radix";
+    }
+  } else if (!shadcnBase) {
+    shadcnBase = "radix";
+  }
+  let shadcnMenuAccent = getOptionValue("BUNKIT_SHADCN_MENU_ACCENT", options.shadcnMenuAccent);
+  if (!shadcnMenuAccent && uiLibrary === "shadcn" && isModernShadcnStyle) {
+    if (!isNonInteractive) {
+      shadcnMenuAccent = await ve({
+        message: "\u2728 Menu accent style",
+        options: [
+          {
+            value: "subtle",
+            label: "Subtle (Recommended)",
+            hint: "Soft accent colors - elegant and understated"
+          },
+          {
+            value: "bold",
+            label: "Bold",
+            hint: "Strong accent colors - vibrant and eye-catching"
+          }
+        ]
+      });
+      if (pD(shadcnMenuAccent)) {
+        xe("Operation cancelled.");
+        process.exit(0);
+      }
+    } else {
+      shadcnMenuAccent = "subtle";
+    }
+  } else if (!shadcnMenuAccent) {
+    shadcnMenuAccent = "subtle";
+  }
+  let shadcnMenuColor = getOptionValue("BUNKIT_SHADCN_MENU_COLOR", options.shadcnMenuColor);
+  if (!shadcnMenuColor && uiLibrary === "shadcn" && isModernShadcnStyle) {
+    if (!isNonInteractive) {
+      shadcnMenuColor = await ve({
+        message: "\uD83C\uDFAF Menu color scheme",
+        options: [
+          {
+            value: "default",
+            label: "Default (Recommended)",
+            hint: "Standard menu colors - balanced and consistent"
+          },
+          {
+            value: "muted",
+            label: "Muted",
+            hint: "Subdued menu colors - softer and more subtle"
+          }
+        ]
+      });
+      if (pD(shadcnMenuColor)) {
+        xe("Operation cancelled.");
+        process.exit(0);
+      }
+    } else {
+      shadcnMenuColor = "default";
+    }
+  } else if (!shadcnMenuColor) {
+    shadcnMenuColor = "default";
+  }
   let testing = getOptionValue("BUNKIT_TESTING", options.testing, "bun-test");
   if (!testing) {
     if (!isNonInteractive) {
@@ -32062,7 +33578,11 @@ async function enhancedInitCommand(options = {}) {
       envExample: true,
       pathAliases: true,
       shadcnStyle,
+      shadcnBase,
       shadcnBaseColor,
+      shadcnIconLibrary,
+      shadcnMenuAccent,
+      shadcnMenuColor,
       shadcnRadius,
       supabasePreset,
       supabaseFeatures,
@@ -32093,7 +33613,7 @@ async function enhancedInitCommand(options = {}) {
       case "full":
       case "monorepo-nextjs":
       case "nextjs-monorepo":
-        await buildFullPreset(projectPath, context);
+        await buildFullPresetV2(projectPath, context);
         break;
       case "monorepo-bun":
       case "bun-monorepo":
@@ -32391,7 +33911,7 @@ Examples:
 
 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 component style: new-york | default").option("--shadcn-base-color <color>", "shadcn/ui base color theme: neutral | gray | zinc | stone | slate").option("--shadcn-radius <radius>", "shadcn/ui border radius (CSS value, e.g., 0.5rem, 8px)").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 | 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", `
 Examples:
   $ bunkit init                                    Interactive project creation
   $ bunkit init --name my-app --preset nextjs     Quick web app creation