bunkit-cli 0.7.0 → 0.8.0

package/dist/index.js

@@ -3773,22 +3773,23 @@ var quotes, getRandomQuote = () => {
 `, createBanner = (version = "0.3.1") => {
   const quote = getRandomQuote();
   const content = [
-    source_default.yellow(logo.trim()),
+    source_default.yellowBright(logo.trim()),
     "",
-    source_default.cyan("\uD83C\uDF5E Bake production-ready apps in seconds"),
-    source_default.dim("Modern \u2022 Fast \u2022 Opinionated"),
+    source_default.bold.cyan("\uD83C\uDF5E Bake production-ready apps in seconds"),
+    source_default.dim("Modern \u2022 Fast \u2022 Opinionated \u2022 Type-Safe"),
     "",
-    source_default.cyan(quote),
+    source_default.italic.cyan(quote),
     "",
-    source_default.dim(`v${version}`)
+    source_default.dim(`Version ${version}`)
   ].join(`
 `);
   return boxen(content, {
-    padding: 1,
+    padding: { top: 1, bottom: 1, left: 2, right: 2 },
     margin: { top: 1, bottom: 1 },
-    borderColor: "gray",
+    borderColor: "cyan",
     borderStyle: "round",
-    dimBorder: true
+    title: "bunkit",
+    titleAlignment: "center"
   });
 }, showBanner = (version) => {
   console.log(createBanner(version));
@@ -22651,7 +22652,10 @@ var init_types2 = __esm(() => {
     features: exports_external.array(exports_external.string()).optional(),
     git: exports_external.boolean().default(true),
     install: exports_external.boolean().default(true),
-    database: exports_external.enum(["postgres-drizzle", "supabase", "sqlite-drizzle", "none"]).optional(),
+    database: exports_external.enum(["postgres-drizzle", "supabase", "supabase-drizzle", "sqlite-drizzle", "none"]).optional(),
+    supabasePreset: exports_external.enum(["full-stack", "auth-only", "database-only", "custom"]).optional(),
+    supabaseFeatures: exports_external.array(exports_external.enum(["auth", "storage", "realtime", "edge-functions", "database"])).optional(),
+    supabaseWithDrizzle: exports_external.boolean().optional(),
     codeQuality: exports_external.enum(["ultracite", "biome"]).default("ultracite"),
     tsStrictness: exports_external.enum(["strict", "moderate", "loose"]).default("strict"),
     uiLibrary: exports_external.enum(["shadcn", "none"]).optional(),
@@ -22813,7 +22817,10 @@ function createTemplateContext(config) {
     pathAliases: config.pathAliases,
     shadcnStyle: config.shadcnStyle,
     shadcnBaseColor: config.shadcnBaseColor,
-    shadcnRadius: config.shadcnRadius
+    shadcnRadius: config.shadcnRadius,
+    supabasePreset: config.supabasePreset,
+    supabaseFeatures: config.supabaseFeatures,
+    supabaseWithDrizzle: config.supabaseWithDrizzle
   };
 }
 var import_fs_extra2;
@@ -24539,14 +24546,13 @@ var Y2 = ({ indicator: t = "dots" } = {}) => {
 
 // src/index.ts
 init_src();
-var import_picocolors7 = __toESM(require_picocolors(), 1);
+var import_picocolors6 = __toESM(require_picocolors(), 1);
 
 // src/commands/init.enhanced.ts
 init_boxen();
 init_source();
 init_dist();
 init_src();
-var import_picocolors4 = __toESM(require_picocolors(), 1);
 
 // ../templates/src/render.ts
 var import_ejs = __toESM(require_ejs(), 1);
@@ -24909,12 +24915,12 @@ services:
       - "3000:3000"
     environment:
       - NODE_ENV=production
-      ${context.database && context.database !== "none" && context.database !== "supabase" ? "- DATABASE_URL=${DATABASE_URL:-postgres://postgres:postgres@db:5432/${context.projectName}}" : ""}
-    ${context.database && context.database !== "none" && context.database !== "supabase" ? `depends_on:
+      ${context.database && context.database !== "none" && context.database !== "supabase" && context.database !== "supabase-drizzle" ? "- DATABASE_URL=${DATABASE_URL:-postgres://postgres:postgres@db:5432/${context.projectName}}" : ""}
+    ${context.database && context.database !== "none" && context.database !== "supabase" && context.database !== "supabase-drizzle" ? `depends_on:
       - db` : ""}
     restart: unless-stopped
 
-  ${context.database && context.database !== "none" && context.database !== "supabase" ? `db:
+  ${context.database && context.database !== "none" && context.database !== "supabase" && context.database !== "supabase-drizzle" ? `db:
     image: ${context.database === "sqlite-drizzle" ? "alpine:latest" : "postgres:16-alpine"}
     ${context.database !== "sqlite-drizzle" ? `environment:
       - POSTGRES_USER=postgres
@@ -25069,7 +25075,7 @@ jobs:
       ${context.preset === "web" || context.preset === "full" ? `- name: Build application
         run: bun run build
         env:
-          ${context.database === "supabase" ? `NEXT_PUBLIC_SUPABASE_URL: \${{ secrets.SUPABASE_URL }}
+          ${context.database === "supabase" || context.database === "supabase-drizzle" ? `NEXT_PUBLIC_SUPABASE_URL: \${{ secrets.SUPABASE_URL }}
           NEXT_PUBLIC_SUPABASE_ANON_KEY: \${{ secrets.SUPABASE_ANON_KEY }}
           ` : ""}NODE_ENV: production` : ""}
 
@@ -26514,7 +26520,114 @@ DATABASE_URL=postgresql://postgres:postgres@localhost:5432/${context.projectName
 `;
   await writeFile(join(projectPath, ".env.example"), envExample);
 }
-async function setupSupabase(projectPath, context, isMonorepo = false) {
+async function setupSupabaseOnly(projectPath, context, isMonorepo = false) {
+  const dbPath = isMonorepo ? join(projectPath, "packages/db") : join(projectPath, "src/db");
+  await ensureDirectory(dbPath);
+  const features = context.supabaseFeatures || ["auth", "storage", "realtime", "database"];
+  const hasAuth = features.includes("auth");
+  const hasStorage = features.includes("storage");
+  const hasRealtime = features.includes("realtime");
+  const hasEdgeFunctions = features.includes("edge-functions");
+  const hasDatabase = features.includes("database");
+  const clientContent = `import { createClient } from '@supabase/supabase-js';
+
+// Supabase client
+export const supabase = createClient(
+  process.env.NEXT_PUBLIC_SUPABASE_URL!,
+  process.env.NEXT_PUBLIC_SUPABASE_ANON_KEY!,
+  {
+    auth: {
+      autoRefreshToken: true,
+      persistSession: true,
+      detectSessionInUrl: true,
+    },
+  }
+);
+
+${hasAuth ? `// Auth helpers
+export const auth = supabase.auth;` : ""}
+
+${hasStorage ? `// Storage helpers
+export const storage = supabase.storage;` : ""}
+
+${hasRealtime ? `// Realtime helpers
+export const realtime = supabase.realtime;` : ""}
+
+${hasEdgeFunctions ? `// Edge Functions helpers
+export const functions = supabase.functions;` : ""}
+
+${hasDatabase ? `// Database helpers (using Supabase client directly)
+export const db = supabase.from;` : ""}
+`;
+  await writeFile(join(dbPath, "index.ts"), clientContent);
+  const examplesContent = `// Supabase usage examples
+import { supabase${hasAuth ? ", auth" : ""}${hasStorage ? ", storage" : ""}${hasRealtime ? ", realtime" : ""}${hasEdgeFunctions ? ", functions" : ""}${hasDatabase ? ", db" : ""} } from './index';
+
+${hasAuth ? `// Auth example
+export async function signUp(email: string, password: string) {
+  const { data, error } = await auth.signUp({
+    email,
+    password,
+  });
+  return { data, error };
+}
+
+export async function signIn(email: string, password: string) {
+  const { data, error } = await auth.signInWithPassword({
+    email,
+    password,
+  });
+  return { data, error };
+}
+
+export async function signOut() {
+  const { error } = await auth.signOut();
+  return { error };
+}` : ""}
+
+${hasStorage ? `// Storage example
+export async function uploadFile(bucket: string, path: string, file: File) {
+  const { data, error } = await storage.from(bucket).upload(path, file);
+  return { data, error };
+}
+
+export function getPublicUrl(bucket: string, path: string) {
+  const { data } = storage.from(bucket).getPublicUrl(path);
+  return data.publicUrl;
+}` : ""}
+
+${hasRealtime ? `// Realtime example
+export function subscribeToChannel(channel: string, callback: (payload: any) => void) {
+  const channelInstance = realtime.channel(channel);
+  channelInstance.on('postgres_changes', { event: '*', schema: 'public', table: '*' }, callback);
+  channelInstance.subscribe();
+  return channelInstance;
+}` : ""}
+
+${hasEdgeFunctions ? `// Edge Functions example
+export async function invokeFunction(functionName: string, body?: any) {
+  const { data, error } = await functions.invoke(functionName, { body });
+  return { data, error };
+}` : ""}
+
+${hasDatabase ? `// Database example (using Supabase client directly)
+export async function getUsers() {
+  const { data, error } = await supabase.from('users').select('*');
+  return { data, error };
+}` : ""}
+`;
+  await writeFile(join(dbPath, "examples.ts"), examplesContent);
+  if (hasEdgeFunctions) {
+    await ensureDirectory(join(projectPath, "supabase/functions"));
+  }
+  const envExample = `# Supabase
+NEXT_PUBLIC_SUPABASE_URL=https://your-project.supabase.co
+NEXT_PUBLIC_SUPABASE_ANON_KEY=your-anon-key
+${hasDatabase ? "DATABASE_URL=postgresql://postgres:[password]@db.your-project.supabase.co:5432/postgres" : ""}
+`;
+  await writeFile(join(projectPath, ".env.example"), envExample);
+}
+async function setupSupabaseDrizzle(projectPath, context, isMonorepo = false) {
   const dbPath = isMonorepo ? join(projectPath, "packages/db") : join(projectPath, "src/db");
   await ensureDirectory(join(dbPath, "schema"));
   const drizzleConfig = `import { defineConfig } from 'drizzle-kit';
@@ -26529,6 +26642,12 @@ export default defineConfig({
 });
 `;
   await writeFile(join(isMonorepo ? join(projectPath, "packages/db") : projectPath, "drizzle.config.ts"), drizzleConfig);
+  const features = context.supabaseFeatures || ["auth", "storage", "realtime", "database"];
+  const hasAuth = features.includes("auth");
+  const hasStorage = features.includes("storage");
+  const hasRealtime = features.includes("realtime");
+  const hasEdgeFunctions = features.includes("edge-functions");
+  const hasDatabase = features.includes("database");
   const clientContent = `import { createClient } from '@supabase/supabase-js';
 import { drizzle } from 'drizzle-orm/postgres-js';
 import postgres from 'postgres';
@@ -26537,14 +26656,95 @@ import * as schema from './schema';
 // Supabase client for auth, storage, realtime
 export const supabase = createClient(
   process.env.NEXT_PUBLIC_SUPABASE_URL!,
-  process.env.NEXT_PUBLIC_SUPABASE_ANON_KEY!
+  process.env.NEXT_PUBLIC_SUPABASE_ANON_KEY!,
+  {
+    auth: {
+      autoRefreshToken: true,
+      persistSession: true,
+      detectSessionInUrl: true,
+    },
+  }
 );
 
+${hasAuth ? `// Auth helpers
+export const auth = supabase.auth;` : ""}
+
+${hasStorage ? `// Storage helpers
+export const storage = supabase.storage;` : ""}
+
+${hasRealtime ? `// Realtime helpers
+export const realtime = supabase.realtime;` : ""}
+
+${hasEdgeFunctions ? `// Edge Functions helpers
+export const functions = supabase.functions;` : ""}
+
 // Drizzle client for type-safe database queries
-const queryClient = postgres(process.env.DATABASE_URL!);
-export const db = drizzle(queryClient, { schema });
+${hasDatabase ? `const queryClient = postgres(process.env.DATABASE_URL!);
+export const db = drizzle(queryClient, { schema });` : "// Database queries via Drizzle ORM"}
 `;
   await writeFile(join(dbPath, "index.ts"), clientContent);
+  const examplesContent = `// Supabase + Drizzle usage examples
+import { supabase${hasAuth ? ", auth" : ""}${hasStorage ? ", storage" : ""}${hasRealtime ? ", realtime" : ""}${hasEdgeFunctions ? ", functions" : ""}, db } from './index';
+import { users } from './schema';
+import { eq } from 'drizzle-orm';
+
+${hasAuth ? `// Auth example
+export async function signUp(email: string, password: string) {
+  const { data, error } = await auth.signUp({
+    email,
+    password,
+  });
+  return { data, error };
+}
+
+export async function signIn(email: string, password: string) {
+  const { data, error } = await auth.signInWithPassword({
+    email,
+    password,
+  });
+  return { data, error };
+}
+
+export async function signOut() {
+  const { error } = await auth.signOut();
+  return { error };
+}` : ""}
+
+${hasStorage ? `// Storage example
+export async function uploadFile(bucket: string, path: string, file: File) {
+  const { data, error } = await storage.from(bucket).upload(path, file);
+  return { data, error };
+}
+
+export function getPublicUrl(bucket: string, path: string) {
+  const { data } = storage.from(bucket).getPublicUrl(path);
+  return data.publicUrl;
+}` : ""}
+
+${hasRealtime ? `// Realtime example
+export function subscribeToChannel(channel: string, callback: (payload: any) => void) {
+  const channelInstance = realtime.channel(channel);
+  channelInstance.on('postgres_changes', { event: '*', schema: 'public', table: '*' }, callback);
+  channelInstance.subscribe();
+  return channelInstance;
+}` : ""}
+
+${hasEdgeFunctions ? `// Edge Functions example
+export async function invokeFunction(functionName: string, body?: any) {
+  const { data, error } = await functions.invoke(functionName, { body });
+  return { data, error };
+}` : ""}
+
+${hasDatabase ? `// Database example (using Drizzle ORM)
+export async function getUsers() {
+  return await db.select().from(users);
+}
+
+export async function getUserById(id: string) {
+  return await db.select().from(users).where(eq(users.id, id));
+}` : ""}
+`;
+  await writeFile(join(dbPath, "examples.ts"), examplesContent);
   const schemaContent = `import { pgTable, text, timestamp, uuid, boolean } from 'drizzle-orm/pg-core';
 
 export const users = pgTable('users', {
@@ -26568,10 +26768,13 @@ export const profiles = pgTable('profiles', {
 `;
   await writeFile(join(dbPath, "schema/index.ts"), schemaContent);
   await ensureDirectory(join(projectPath, "supabase/migrations"));
+  if (hasEdgeFunctions) {
+    await ensureDirectory(join(projectPath, "supabase/functions"));
+  }
   const envExample = `# Supabase
 NEXT_PUBLIC_SUPABASE_URL=https://your-project.supabase.co
 NEXT_PUBLIC_SUPABASE_ANON_KEY=your-anon-key
-DATABASE_URL=postgresql://postgres:[password]@db.your-project.supabase.co:5432/postgres
+${hasDatabase ? "DATABASE_URL=postgresql://postgres:[password]@db.your-project.supabase.co:5432/postgres" : ""}
 `;
   await writeFile(join(projectPath, ".env.example"), envExample);
 }
@@ -26631,6 +26834,10 @@ function getDatabaseDependencies(databaseType) {
         postgres: "^3.4.5"
       };
     case "supabase":
+      return {
+        "@supabase/supabase-js": "^2.48.1"
+      };
+    case "supabase-drizzle":
       return {
         "@supabase/supabase-js": "^2.48.1",
         "drizzle-orm": "^0.38.0",
@@ -26817,7 +27024,9 @@ coverage = true
     if (context.database === "postgres-drizzle") {
       await setupPostgresDrizzle(projectPath, context, false);
     } else if (context.database === "supabase") {
-      await setupSupabase(projectPath, context, false);
+      await setupSupabaseOnly(projectPath, context, false);
+    } else if (context.database === "supabase-drizzle") {
+      await setupSupabaseDrizzle(projectPath, context, false);
     } else if (context.database === "sqlite-drizzle") {
       await setupSQLiteDrizzle(projectPath, context, false);
     }
@@ -27401,14 +27610,21 @@ Built with \u2764\uFE0F using Bun monorepo features
       main: "./src/index.ts",
       types: "./src/index.ts",
       dependencies: context.database === "supabase" ? {
+        "@supabase/supabase-js": "catalog:"
+      } : context.database === "supabase-drizzle" ? {
         "@supabase/supabase-js": "catalog:",
         "drizzle-orm": "catalog:",
         postgres: "catalog:"
-      } : {
+      } : context.database === "postgres-drizzle" ? {
+        "drizzle-orm": "catalog:",
+        postgres: "catalog:"
+      } : context.database === "sqlite-drizzle" ? {
         "drizzle-orm": "catalog:"
-      },
+      } : {},
       devDependencies: {
-        "drizzle-kit": "catalog:",
+        ...context.database === "postgres-drizzle" || context.database === "supabase-drizzle" || context.database === "sqlite-drizzle" ? {
+          "drizzle-kit": "catalog:"
+        } : {},
         "@types/bun": "latest",
         typescript: "catalog:"
       }
@@ -27417,7 +27633,9 @@ Built with \u2764\uFE0F using Bun monorepo features
     if (context.database === "postgres-drizzle") {
       await setupPostgresDrizzle(dbPackagePath, context, true);
     } else if (context.database === "supabase") {
-      await setupSupabase(dbPackagePath, context, true);
+      await setupSupabaseOnly(dbPackagePath, context, true);
+    } else if (context.database === "supabase-drizzle") {
+      await setupSupabaseDrizzle(dbPackagePath, context, true);
     } else if (context.database === "sqlite-drizzle") {
       await setupSQLiteDrizzle(dbPackagePath, context, true);
     }
@@ -27443,7 +27661,7 @@ services:
       - "3000:3000"
     environment:
       - NODE_ENV=production
-      ${context.database === "supabase" ? "- NEXT_PUBLIC_SUPABASE_URL=${SUPABASE_URL}\n      - NEXT_PUBLIC_SUPABASE_ANON_KEY=${SUPABASE_ANON_KEY}" : ""}
+      ${context.database === "supabase" || context.database === "supabase-drizzle" ? "- NEXT_PUBLIC_SUPABASE_URL=${SUPABASE_URL}\n      - NEXT_PUBLIC_SUPABASE_ANON_KEY=${SUPABASE_ANON_KEY}" : ""}
     restart: unless-stopped
 
   platform:
@@ -27454,7 +27672,7 @@ services:
       - "3001:3000"
     environment:
       - NODE_ENV=production
-      ${context.database === "supabase" ? "- NEXT_PUBLIC_SUPABASE_URL=${SUPABASE_URL}\n      - NEXT_PUBLIC_SUPABASE_ANON_KEY=${SUPABASE_ANON_KEY}" : ""}
+      ${context.database === "supabase" || context.database === "supabase-drizzle" ? "- NEXT_PUBLIC_SUPABASE_URL=${SUPABASE_URL}\n      - NEXT_PUBLIC_SUPABASE_ANON_KEY=${SUPABASE_ANON_KEY}" : ""}
     restart: unless-stopped
 
   api:
@@ -27774,7 +27992,7 @@ async function enhancedInitCommand(options = {}) {
       throw new Error("Project name is required in non-interactive mode. " + "Provide it via BUNKIT_PROJECT_NAME env var or --name flag.");
     }
     projectName = await he({
-      message: "\uD83D\uDCE6 What is your project named?",
+      message: "\uD83D\uDCE6 Project name",
       placeholder: "my-awesome-project",
       validate: (value) => {
         const result = validateProjectName(value);
@@ -27798,27 +28016,27 @@ async function enhancedInitCommand(options = {}) {
       throw new Error("Preset is required in non-interactive mode. " + "Provide it via BUNKIT_PRESET env var or --preset flag.");
     }
     preset = await ve({
-      message: "\uD83C\uDFA8 Which preset would you like?",
+      message: "\uD83C\uDFA8 Select project preset",
       options: [
         {
           value: "minimal",
           label: "\u26A1 Minimal",
-          hint: "Single file, clean start - perfect for learning Bun"
+          hint: "Single-file project, clean start - perfect for CLIs and scripts"
         },
         {
           value: "web",
-          label: "\uD83C\uDF10 Web App",
-          hint: "Next.js 16 + React 19 - full-stack web application"
+          label: "\uD83C\uDF10 Web Application",
+          hint: "Next.js 16 + React 19 + Tailwind CSS 4 - production-ready web app"
         },
         {
           value: "api",
           label: "\uD83D\uDE80 API Server",
-          hint: "Hono + Bun.serve() - ultra-fast REST API"
+          hint: "Hono 4 + Bun.serve() - ultra-fast REST API with native HMR"
         },
         {
           value: "full",
           label: "\uD83D\uDCE6 Full-Stack Monorepo",
-          hint: "Web + Platform + API - enterprise SaaS setup"
+          hint: "Web + API + shared packages - enterprise-grade SaaS architecture"
         }
       ]
     });
@@ -27831,27 +28049,32 @@ async function enhancedInitCommand(options = {}) {
   if (!database && (preset === "api" || preset === "full")) {
     if (!isNonInteractive) {
       database = await ve({
-        message: "\uD83D\uDDC4\uFE0F  Database setup?",
+        message: "\uD83D\uDDC4\uFE0F  Database configuration",
         options: [
           {
             value: "postgres-drizzle",
             label: "PostgreSQL + Drizzle ORM",
-            hint: "Production-ready, type-safe SQL database"
+            hint: "Production-ready PostgreSQL with type-safe Drizzle ORM queries"
           },
           {
             value: "supabase",
-            label: "Supabase",
-            hint: "PostgreSQL + Auth + Storage + Realtime - all-in-one"
+            label: "Supabase (Client Only)",
+            hint: "Supabase JS client only - Auth, Storage, Realtime without Drizzle ORM"
+          },
+          {
+            value: "supabase-drizzle",
+            label: "Supabase + Drizzle ORM",
+            hint: "Full Supabase stack with Drizzle ORM for type-safe database queries"
           },
           {
             value: "sqlite-drizzle",
             label: "SQLite + Drizzle ORM",
-            hint: "Local-first, embedded database - perfect for prototypes"
+            hint: "Local-first embedded database - perfect for prototypes and local development"
           },
           {
             value: "none",
             label: "None",
-            hint: "I'll add it later"
+            hint: "Skip database setup - add later if needed"
           }
         ]
       });
@@ -27863,21 +28086,116 @@ async function enhancedInitCommand(options = {}) {
       database = "none";
     }
   }
+  let supabasePreset;
+  let supabaseFeatures;
+  let supabaseWithDrizzle;
+  if (database === "supabase" || database === "supabase-drizzle") {
+    supabaseWithDrizzle = database === "supabase-drizzle";
+    const presetEnv = process.env.BUNKIT_SUPABASE_PRESET;
+    supabasePreset = presetEnv || options.supabasePreset;
+    if (!supabasePreset && !isNonInteractive) {
+      supabasePreset = await ve({
+        message: "\uD83C\uDFAF Supabase configuration preset",
+        options: [
+          {
+            value: "full-stack",
+            label: "Full Stack (Recommended)",
+            hint: "Complete Supabase setup - Auth, Storage, Realtime, and Database"
+          },
+          {
+            value: "auth-only",
+            label: "Auth Only",
+            hint: "Authentication only - perfect for simple apps with external data"
+          },
+          {
+            value: "database-only",
+            label: "Database Only",
+            hint: "PostgreSQL database access only - no Auth, Storage, or Realtime"
+          },
+          {
+            value: "custom",
+            label: "Custom",
+            hint: "Manually select Supabase features to include"
+          }
+        ]
+      });
+      if (pD(supabasePreset)) {
+        xe("Operation cancelled.");
+        process.exit(0);
+      }
+    } else if (!supabasePreset) {
+      supabasePreset = "full-stack";
+    }
+    if (supabasePreset === "full-stack") {
+      supabaseFeatures = ["auth", "storage", "realtime", "database"];
+    } else if (supabasePreset === "auth-only") {
+      supabaseFeatures = ["auth"];
+    } else if (supabasePreset === "database-only") {
+      supabaseFeatures = ["database"];
+    } else {
+      const availableFeaturesEnv = process.env.BUNKIT_SUPABASE_FEATURES;
+      let availableFeatures;
+      if (availableFeaturesEnv) {
+        availableFeatures = availableFeaturesEnv.split(",").map((f) => f.trim());
+      } else if (options.supabaseFeatures) {
+        availableFeatures = Array.isArray(options.supabaseFeatures) ? options.supabaseFeatures : String(options.supabaseFeatures).split(",").map((f) => f.trim());
+      }
+      if (!availableFeatures && !isNonInteractive) {
+        const selectedFeatures = await fe({
+          message: "\u2728 Select Supabase features to include",
+          options: [
+            {
+              value: "auth",
+              label: "Authentication",
+              hint: "User authentication and authorization (sign up, sign in, sessions)"
+            },
+            {
+              value: "storage",
+              label: "Storage",
+              hint: "File storage and CDN for images, documents, and media"
+            },
+            {
+              value: "realtime",
+              label: "Realtime",
+              hint: "Real-time subscriptions and live updates via WebSockets"
+            },
+            {
+              value: "edge-functions",
+              label: "Edge Functions",
+              hint: "Serverless functions deployed at the edge for low latency"
+            },
+            {
+              value: "database",
+              label: "Database",
+              hint: "PostgreSQL database access via Supabase client"
+            }
+          ]
+        });
+        if (pD(selectedFeatures)) {
+          xe("Operation cancelled.");
+          process.exit(0);
+        }
+        supabaseFeatures = selectedFeatures.length > 0 ? selectedFeatures : ["auth", "database"];
+      } else {
+        supabaseFeatures = availableFeatures || ["auth", "database"];
+      }
+    }
+  }
   let codeQuality = getOptionValue("BUNKIT_CODE_QUALITY", options.codeQuality, "ultracite");
   if (!codeQuality) {
     if (!isNonInteractive) {
       codeQuality = await ve({
-        message: "\uD83E\uDD16 Code quality setup?",
+        message: "\uD83E\uDD16 Code quality tool",
         options: [
           {
             value: "ultracite",
             label: "Ultracite (Recommended)",
-            hint: "AI-optimized Biome preset - syncs rules for Cursor, Claude, Windsurf"
+            hint: "AI-optimized Biome preset - syncs rules for Cursor, Claude Code, Windsurf, Zed"
           },
           {
             value: "biome",
             label: "Biome",
-            hint: "Standard Biome with good defaults - fast and reliable"
+            hint: "Standard Biome configuration - fast, reliable, zero-config linting and formatting"
           }
         ]
       });
@@ -27893,22 +28211,22 @@ async function enhancedInitCommand(options = {}) {
   if (!tsStrictness) {
     if (!isNonInteractive) {
       tsStrictness = await ve({
-        message: "\uD83D\uDD12 TypeScript strictness?",
+        message: "\uD83D\uDD12 TypeScript strictness level",
         options: [
           {
             value: "strict",
             label: "Strict (Recommended)",
-            hint: "Maximum type safety - catches bugs early, prevents headaches"
+            hint: "Maximum type safety - catches bugs early, prevents runtime errors"
           },
           {
             value: "moderate",
             label: "Moderate",
-            hint: "Balanced - good safety without being too rigid"
+            hint: "Balanced type checking - good safety without excessive strictness"
           },
           {
             value: "loose",
             label: "Loose",
-            hint: "Minimal checks - quick prototyping, migrate from JavaScript"
+            hint: "Minimal type checking - quick prototyping, easier migration from JavaScript"
           }
         ]
       });
@@ -27924,22 +28242,22 @@ async function enhancedInitCommand(options = {}) {
   if (!cssFramework && (preset === "web" || preset === "full")) {
     if (!isNonInteractive) {
       cssFramework = await ve({
-        message: "\uD83C\uDFA8 CSS framework?",
+        message: "\uD83C\uDFA8 CSS framework",
         options: [
           {
             value: "tailwind",
             label: "Tailwind CSS 4 (Recommended)",
-            hint: "Utility-first, fast, modern - with OKLCH colors and @theme"
+            hint: "Utility-first CSS framework - fast, modern, with OKLCH colors and @theme"
           },
           {
             value: "vanilla",
             label: "Vanilla CSS",
-            hint: "Plain CSS files - full control, no framework"
+            hint: "Plain CSS files - full control, no framework dependencies"
           },
           {
             value: "css-modules",
             label: "CSS Modules",
-            hint: "Scoped CSS - automatic class name generation"
+            hint: "Scoped CSS with automatic class name generation - prevents style conflicts"
           }
         ]
       });
@@ -27955,17 +28273,17 @@ async function enhancedInitCommand(options = {}) {
   if (!uiLibrary && (preset === "web" || preset === "full") && cssFramework === "tailwind") {
     if (!isNonInteractive) {
       uiLibrary = await ve({
-        message: "\uD83E\uDDE9 UI component library?",
+        message: "\uD83E\uDDE9 UI component library",
         options: [
           {
             value: "shadcn",
             label: "shadcn/ui (Recommended)",
-            hint: "64+ components, accessible, customizable - production-ready"
+            hint: "64+ accessible components, fully customizable, production-ready"
           },
           {
             value: "none",
             label: "None",
-            hint: "I'll build my own components"
+            hint: "Skip UI library - build custom components or add later"
           }
         ]
       });
@@ -27981,17 +28299,17 @@ async function enhancedInitCommand(options = {}) {
   if (!shadcnStyle && uiLibrary === "shadcn") {
     if (!isNonInteractive) {
       shadcnStyle = await ve({
-        message: "\uD83C\uDFA8 shadcn/ui style?",
+        message: "\uD83C\uDFA8 shadcn/ui component style",
         options: [
           {
             value: "new-york",
             label: "New York (Recommended)",
-            hint: "Modern, clean design with rounded corners and subtle shadows"
+            hint: "Modern design aesthetic - rounded corners, subtle shadows, clean look"
           },
           {
             value: "default",
             label: "Default",
-            hint: "Classic design with sharper edges and more contrast"
+            hint: "Classic design aesthetic - sharper edges, higher contrast, traditional look"
           }
         ]
       });
@@ -28007,32 +28325,32 @@ async function enhancedInitCommand(options = {}) {
   if (!shadcnBaseColor && uiLibrary === "shadcn") {
     if (!isNonInteractive) {
       shadcnBaseColor = await ve({
-        message: "\uD83C\uDFA8 shadcn/ui base color?",
+        message: "\uD83C\uDFA8 shadcn/ui base color theme",
         options: [
           {
             value: "zinc",
             label: "Zinc (Recommended)",
-            hint: "Neutral gray - versatile and modern"
+            hint: "Neutral gray palette - versatile, modern, works with any accent color"
           },
           {
             value: "neutral",
             label: "Neutral",
-            hint: "Pure neutral - no color cast"
+            hint: "Pure neutral palette - no color cast, perfect grayscale"
           },
           {
             value: "gray",
             label: "Gray",
-            hint: "Warm gray - slightly warmer than zinc"
+            hint: "Warm gray palette - slightly warmer tone than zinc"
           },
           {
             value: "slate",
             label: "Slate",
-            hint: "Cool gray - slightly bluer tone"
+            hint: "Cool gray palette - slightly bluer tone, modern and crisp"
           },
           {
             value: "stone",
             label: "Stone",
-            hint: "Warm beige-gray - earthy and natural"
+            hint: "Warm beige-gray palette - earthy, natural, organic feel"
           }
         ]
       });
@@ -28048,8 +28366,8 @@ async function enhancedInitCommand(options = {}) {
   if (!shadcnRadius && uiLibrary === "shadcn") {
     if (!isNonInteractive) {
       const radiusInput = await he({
-        message: "\uD83D\uDCD0 Border radius?",
-        placeholder: "0.625rem",
+        message: "\uD83D\uDCD0 Component border radius",
+        placeholder: "0.625rem (default)",
         initialValue: "0.625rem",
         validate: (value) => {
           if (!value.trim()) {
@@ -28073,22 +28391,22 @@ async function enhancedInitCommand(options = {}) {
   if (!testing) {
     if (!isNonInteractive) {
       testing = await ve({
-        message: "\uD83E\uDDEA Testing framework?",
+        message: "\uD83E\uDDEA Testing framework",
         options: [
           {
             value: "bun-test",
             label: "Bun Test (Recommended)",
-            hint: "Built-in, fast, Jest-compatible - no extra dependencies"
+            hint: "Built-in testing framework - fast, Jest-compatible, zero configuration"
           },
           {
             value: "vitest",
             label: "Vitest",
-            hint: "Vite-powered, fast, ESM-first - popular in ecosystem"
+            hint: "Vite-powered testing framework - fast, ESM-first, popular ecosystem choice"
           },
           {
             value: "none",
             label: "None",
-            hint: "I'll add testing later"
+            hint: "Skip testing setup - add testing framework later if needed"
           }
         ]
       });
@@ -28104,7 +28422,7 @@ async function enhancedInitCommand(options = {}) {
   if (docker === undefined) {
     if (!isNonInteractive) {
       docker = await ye({
-        message: "\uD83D\uDC33 Add Docker configuration?",
+        message: "\uD83D\uDC33 Include Docker configuration",
         initialValue: false
       });
       if (pD(docker)) {
@@ -28119,7 +28437,7 @@ async function enhancedInitCommand(options = {}) {
   if (cicd === undefined) {
     if (!isNonInteractive) {
       cicd = await ye({
-        message: "\u2699\uFE0F  Add GitHub Actions CI/CD?",
+        message: "\u2699\uFE0F  Include GitHub Actions CI/CD workflow",
         initialValue: false
       });
       if (pD(cicd)) {
@@ -28134,7 +28452,7 @@ async function enhancedInitCommand(options = {}) {
   if (shouldInstall === undefined) {
     if (!isNonInteractive) {
       shouldInstall = await ye({
-        message: "\uD83D\uDCE5 Install dependencies?",
+        message: "\uD83D\uDCE5 Install dependencies after project creation",
         initialValue: true
       });
       if (pD(shouldInstall)) {
@@ -28149,7 +28467,7 @@ async function enhancedInitCommand(options = {}) {
   if (shouldInitGit === undefined) {
     if (!isNonInteractive) {
       shouldInitGit = await ye({
-        message: "\uD83D\uDD27 Initialize git repository?",
+        message: "\uD83D\uDD27 Initialize Git repository",
         initialValue: true
       });
       if (pD(shouldInitGit)) {
@@ -28161,32 +28479,56 @@ async function enhancedInitCommand(options = {}) {
     }
   }
   if (!isNonInteractive) {
-    const summaryLines = [
-      `${source_default.bold("Project:")} ${source_default.cyan(projectName)}`,
+    const configSummary = [
+      "",
+      `${source_default.bold.cyan("\uD83D\uDCE6 Project Configuration")}`,
+      `${source_default.dim("\u2500".repeat(40))}`,
+      `${source_default.bold("Project Name:")} ${source_default.cyan(projectName)}`,
       `${source_default.bold("Preset:")} ${source_default.cyan(preset)}`,
-      database ? `${source_default.bold("Database:")} ${source_default.cyan(database)}` : "",
-      `${source_default.bold("Code Quality:")} ${source_default.cyan(codeQuality)}`,
-      `${source_default.bold("TypeScript:")} ${source_default.cyan(tsStrictness)}`,
-      cssFramework ? `${source_default.bold("CSS:")} ${source_default.cyan(cssFramework)}` : "",
-      uiLibrary ? `${source_default.bold("UI Library:")} ${source_default.cyan(uiLibrary)}` : "",
-      uiLibrary === "shadcn" && shadcnStyle ? `${source_default.bold("shadcn Style:")} ${source_default.cyan(shadcnStyle)}` : "",
-      uiLibrary === "shadcn" && shadcnBaseColor ? `${source_default.bold("shadcn Base Color:")} ${source_default.cyan(shadcnBaseColor)}` : "",
-      uiLibrary === "shadcn" && shadcnRadius ? `${source_default.bold("shadcn Radius:")} ${source_default.cyan(shadcnRadius)}` : "",
-      `${source_default.bold("Testing:")} ${source_default.cyan(testing)}`,
-      docker ? `${source_default.bold("Docker:")} ${source_default.green("\u2713")}` : "",
-      cicd ? `${source_default.bold("CI/CD:")} ${source_default.green("\u2713")}` : ""
-    ].filter(Boolean);
+      "",
+      database && database !== "none" ? [
+        `${source_default.bold.yellow("\uD83D\uDDC4\uFE0F  Database")}`,
+        `  ${source_default.bold("Type:")} ${source_default.cyan(database)}`,
+        (database === "supabase" || database === "supabase-drizzle") && supabasePreset ? `  ${source_default.bold("Preset:")} ${source_default.cyan(supabasePreset)}` : "",
+        (database === "supabase" || database === "supabase-drizzle") && supabaseFeatures ? `  ${source_default.bold("Features:")} ${source_default.cyan(supabaseFeatures.join(", "))}` : ""
+      ].filter(Boolean).join(`
+`) : "",
+      "",
+      `${source_default.bold.yellow("\uD83D\uDEE0\uFE0F  Development Tools")}`,
+      `  ${source_default.bold("Code Quality:")} ${source_default.cyan(codeQuality)}`,
+      `  ${source_default.bold("TypeScript:")} ${source_default.cyan(tsStrictness)}`,
+      `  ${source_default.bold("Testing:")} ${source_default.cyan(testing)}`,
+      "",
+      cssFramework ? [
+        `${source_default.bold.yellow("\uD83C\uDFA8 Styling")}`,
+        `  ${source_default.bold("CSS Framework:")} ${source_default.cyan(cssFramework)}`,
+        uiLibrary ? `  ${source_default.bold("UI Library:")} ${source_default.cyan(uiLibrary)}` : "",
+        uiLibrary === "shadcn" && shadcnStyle ? `  ${source_default.bold("  Style:")} ${source_default.cyan(shadcnStyle)}` : "",
+        uiLibrary === "shadcn" && shadcnBaseColor ? `  ${source_default.bold("  Base Color:")} ${source_default.cyan(shadcnBaseColor)}` : "",
+        uiLibrary === "shadcn" && shadcnRadius ? `  ${source_default.bold("  Radius:")} ${source_default.cyan(shadcnRadius)}` : ""
+      ].filter(Boolean).join(`
+`) : "",
+      "",
+      docker || cicd ? [
+        `${source_default.bold.yellow("\uD83D\uDE80 Deployment")}`,
+        docker ? `  ${source_default.bold("Docker:")} ${source_default.green("\u2713 Enabled")}` : "",
+        cicd ? `  ${source_default.bold("CI/CD:")} ${source_default.green("\u2713 Enabled")}` : ""
+      ].filter(Boolean).join(`
+`) : "",
+      ""
+    ].filter(Boolean).join(`
+`);
     console.log(`
-` + boxen(summaryLines.join(`
-`), {
-      padding: 1,
-      title: "\uD83D\uDCCB Configuration",
+` + boxen(configSummary, {
+      padding: { top: 1, bottom: 1, left: 2, right: 2 },
+      title: "\uD83D\uDCCB Configuration Summary",
       titleAlignment: "left",
       borderColor: "cyan",
-      borderStyle: "round"
+      borderStyle: "round",
+      dimBorder: false
     }));
     const confirm = await ye({
-      message: "Proceed with this configuration?",
+      message: "Confirm project configuration",
       initialValue: true
     });
     if (pD(confirm) || !confirm) {
@@ -28194,8 +28536,9 @@ async function enhancedInitCommand(options = {}) {
       process.exit(0);
     }
   }
+  console.log("");
   const s = Y2();
-  s.start("\uD83D\uDD28 Creating project structure...");
+  s.start(`${source_default.cyan("\uD83D\uDD28")} Creating project structure...`);
   try {
     const config = {
       name: projectName,
@@ -28215,12 +28558,15 @@ async function enhancedInitCommand(options = {}) {
       pathAliases: true,
       shadcnStyle,
       shadcnBaseColor,
-      shadcnRadius
+      shadcnRadius,
+      supabasePreset,
+      supabaseFeatures,
+      supabaseWithDrizzle
     };
     await createProject(config);
     const projectPath = join(process.cwd(), config.path);
     const context = createTemplateContext(config);
-    s.message("\uD83D\uDCDD Generating files...");
+    s.message(`${source_default.cyan("\uD83D\uDCDD")} Generating project files...`);
     switch (preset) {
       case "minimal":
         await buildMinimalPreset(projectPath, context);
@@ -28236,18 +28582,22 @@ async function enhancedInitCommand(options = {}) {
         break;
     }
     if (database && database !== "none") {
-      s.message(`\uD83D\uDDC4\uFE0F  Setting up ${database}...`);
+      const dbName = database === "postgres-drizzle" ? "PostgreSQL + Drizzle ORM" : database === "supabase" ? "Supabase (Client Only)" : database === "supabase-drizzle" ? "Supabase + Drizzle ORM" : database === "sqlite-drizzle" ? "SQLite + Drizzle ORM" : database;
+      s.message(`${source_default.cyan("\uD83D\uDDC4\uFE0F")}  Configuring ${dbName}...`);
+    }
+    if (uiLibrary === "shadcn") {
+      s.message(`${source_default.cyan("\uD83C\uDFA8")}  Setting up shadcn/ui components...`);
     }
     if (codeQuality === "ultracite") {
-      s.message("\uD83E\uDD16 Configuring Ultracite for AI editors...");
+      s.message(`${source_default.cyan("\uD83E\uDD16")}  Configuring Ultracite for AI editors...`);
     }
     if (docker) {
-      s.message("\uD83D\uDC33 Adding Docker configuration...");
+      s.message(`${source_default.cyan("\uD83D\uDC33")}  Adding Docker configuration...`);
     }
     if (cicd) {
-      s.message("\u2699\uFE0F  Adding GitHub Actions...");
+      s.message(`${source_default.cyan("\u2699\uFE0F")}  Adding GitHub Actions CI/CD workflow...`);
     }
-    s.stop("\u2705 Project created!");
+    s.stop(`${source_default.green("\u2705")} Project structure created successfully!`);
     if (shouldInstall && preset !== "full") {
       const additionalDeps = {};
       if (database && database !== "none") {
@@ -28274,7 +28624,8 @@ async function enhancedInitCommand(options = {}) {
       await installDependencies(projectPath);
     }
     if (shouldInstall && uiLibrary === "shadcn" && (preset === "web" || preset === "full")) {
-      s.message("\uD83E\uDDE9 Installing default shadcn/ui components...");
+      const componentSpinner = Y2();
+      componentSpinner.start(`${source_default.cyan("\uD83E\uDDE9")} Installing default shadcn/ui components (button, card)...`);
       try {
         if (preset === "full") {
           await installDefaultShadcnComponents(join(projectPath, "packages/ui"), {
@@ -28285,10 +28636,10 @@ async function enhancedInitCommand(options = {}) {
             silent: true
           });
         }
-        s.message("\u2705 Default components (button, card) installed");
+        componentSpinner.stop(`${source_default.green("\u2705")} Default components installed`);
       } catch (error) {
-        s.message("\u26A0\uFE0F  Could not install default components automatically");
-        s.message("   Install them manually: bunx shadcn@latest add button card");
+        componentSpinner.stop(`${source_default.yellow("\u26A0\uFE0F")}  Could not install automatically`);
+        Me("Install manually: bunx shadcn@latest add button card", "Component Installation");
       }
     }
     const getDevCommand = () => {
@@ -28296,23 +28647,97 @@ async function enhancedInitCommand(options = {}) {
         return "bun dev";
       return "bun run dev";
     };
-    const nextSteps = [
-      `${source_default.cyan("cd")} ${projectName}`,
-      shouldInstall ? "" : `${source_default.cyan("bun install")}`,
-      `${source_default.cyan(getDevCommand())} ${source_default.dim("# Start development")}`
+    const getPresetEmoji = () => {
+      switch (preset) {
+        case "minimal":
+          return "\u26A1";
+        case "web":
+          return "\uD83C\uDF10";
+        case "api":
+          return "\uD83D\uDE80";
+        case "full":
+          return "\uD83D\uDCE6";
+        default:
+          return "\u2728";
+      }
+    };
+    const nextStepsContent = [
+      `${source_default.bold.cyan("\uD83D\uDCC1 Navigate to your project")}`,
+      `${source_default.cyan("cd")} ${source_default.bold(projectName)}`,
+      "",
+      shouldInstall ? "" : [
+        `${source_default.bold.cyan("\uD83D\uDCE6 Install dependencies")}`,
+        `${source_default.cyan("bun install")}`,
+        ""
+      ].join(`
+`),
+      `${source_default.bold.cyan("\uD83D\uDE80 Start development")}`,
+      `${source_default.cyan(getDevCommand())} ${source_default.dim("# Start development server")}`,
+      "",
+      `${source_default.dim("\u2500".repeat(40))}`,
+      `${source_default.bold.yellow("\uD83D\uDCA1 Quick Tips")}`,
+      "",
+      database && database !== "none" ? `  ${source_default.dim("\u2022")} Configure your database connection in ${source_default.cyan(".env")}` : "",
+      uiLibrary === "shadcn" ? `  ${source_default.dim("\u2022")} Add more components: ${source_default.cyan("bunkit add component --all")}` : "",
+      preset === "full" ? `  ${source_default.dim("\u2022")} Add workspaces: ${source_default.cyan("bunkit add workspace")}` : "",
+      preset === "full" ? `  ${source_default.dim("\u2022")} Add packages: ${source_default.cyan("bunkit add package")}` : "",
+      `  ${source_default.dim("\u2022")} Read the ${source_default.cyan("README.md")} for project-specific documentation`,
+      database === "supabase" || database === "supabase-drizzle" ? `  ${source_default.dim("\u2022")} Check ${source_default.cyan("SHADCN.md")} for shadcn/ui usage guide` : ""
     ].filter(Boolean).join(`
 `);
     console.log(`
-` + boxen(nextSteps, {
-      padding: 1,
-      title: "\uD83D\uDE80 Next steps",
+` + boxen(nextStepsContent, {
+      padding: { top: 1, bottom: 1, left: 2, right: 2 },
+      title: `${getPresetEmoji()} Next Steps`,
       titleAlignment: "left",
       borderColor: "green",
-      borderStyle: "round"
+      borderStyle: "round",
+      dimBorder: false
+    }));
+    const projectSummary = [
+      `${source_default.bold.green("\u2728 Project created successfully!")}`,
+      "",
+      `${source_default.dim("Project location:")} ${source_default.cyan(join(process.cwd(), projectName))}`,
+      `${source_default.dim("Preset:")} ${source_default.cyan(preset)}`,
+      database && database !== "none" ? `${source_default.dim("Database:")} ${source_default.cyan(database)}` : "",
+      uiLibrary ? `${source_default.dim("UI Library:")} ${source_default.cyan(uiLibrary)}` : "",
+      "",
+      `${source_default.dim("Happy coding! \uD83C\uDF89")}`
+    ].filter(Boolean).join(`
+`);
+    console.log(`
+` + boxen(projectSummary, {
+      padding: { top: 1, bottom: 1, left: 2, right: 2 },
+      borderColor: "green",
+      borderStyle: "round",
+      dimBorder: true
     }));
   } catch (error) {
-    s.stop("\u274C Failed to create project");
-    xe(`${import_picocolors4.default.red("Error:")} ${error.message}`);
+    s.stop(`${source_default.red("\u274C")} Failed to create project`);
+    const errorMessage = error.message;
+    const errorBox = [
+      `${source_default.bold.red("Error occurred during project creation")}`,
+      "",
+      source_default.red(errorMessage),
+      "",
+      `${source_default.dim("\u2500".repeat(40))}`,
+      `${source_default.bold.yellow("\uD83D\uDCA1 Troubleshooting Tips")}`,
+      "",
+      `  ${source_default.dim("\u2022")} Check if the directory already exists`,
+      `  ${source_default.dim("\u2022")} Ensure you have write permissions`,
+      `  ${source_default.dim("\u2022")} Verify your internet connection (for dependency installation)`,
+      `  ${source_default.dim("\u2022")} Try running with ${source_default.cyan("--no-install")} to skip dependency installation`,
+      "",
+      `${source_default.dim("Need help?")} ${source_default.cyan("https://github.com/Arakiss/bunkit/issues")}`
+    ].join(`
+`);
+    console.log(`
+` + boxen(errorBox, {
+      padding: { top: 1, bottom: 1, left: 2, right: 2 },
+      borderColor: "red",
+      borderStyle: "round"
+    }));
+    xe("Operation cancelled due to error");
     process.exit(1);
   }
 }
@@ -28331,8 +28756,9 @@ async function createCommand2(preset, name, options) {
   if (!validation2.valid) {
     throw new Error(`Invalid project name: ${validation2.error}`);
   }
+  console.log("");
   const s = Y2();
-  s.start(`Creating ${preset} project: ${name}`);
+  s.start(`${source_default.cyan("\uD83D\uDD28")} Creating ${preset} project: ${source_default.bold(name)}`);
   try {
     const config = {
       name,
@@ -28349,11 +28775,11 @@ async function createCommand2(preset, name, options) {
       envExample: true,
       pathAliases: true
     };
-    s.message("\uD83D\uDD28 Creating project structure...");
+    s.message(`${source_default.cyan("\uD83D\uDCC1")} Creating project structure...`);
     await createProject(config);
     const projectPath = join(process.cwd(), config.path);
     const context = createTemplateContext(config);
-    s.message("\uD83D\uDCDD Generating files...");
+    s.message(`${source_default.cyan("\uD83D\uDCDD")} Generating project files...`);
     switch (preset) {
       case "minimal":
         await buildMinimalPreset(projectPath, context);
@@ -28368,22 +28794,65 @@ async function createCommand2(preset, name, options) {
         await buildFullPreset(projectPath, context);
         break;
     }
-    s.stop(`Project ${name} created!`);
-    const nextSteps = [
-      `${source_default.cyan("cd")} ${name}`,
-      source_default.cyan(preset === "web" ? "bun dev" : "bun run dev")
-    ].join(`
+    s.message(`${source_default.cyan("\u2728")} Finalizing setup...`);
+    s.stop(`${source_default.green("\u2705")} Project ${source_default.bold(name)} created successfully!`);
+    const getPresetEmoji = () => {
+      switch (preset) {
+        case "minimal":
+          return "\u26A1";
+        case "web":
+          return "\uD83C\uDF10";
+        case "api":
+          return "\uD83D\uDE80";
+        case "full":
+          return "\uD83D\uDCE6";
+        default:
+          return "\u2728";
+      }
+    };
+    const nextStepsContent = [
+      `${source_default.bold.cyan("\uD83D\uDCC1 Navigate to your project")}`,
+      `${source_default.cyan("cd")} ${source_default.bold(name)}`,
+      "",
+      options.install === false ? [
+        `${source_default.bold.cyan("\uD83D\uDCE6 Install dependencies")}`,
+        `${source_default.cyan("bun install")}`,
+        ""
+      ].join(`
+`) : "",
+      `${source_default.bold.cyan("\uD83D\uDE80 Start development")}`,
+      `${source_default.cyan(preset === "web" ? "bun dev" : "bun run dev")} ${source_default.dim("# Start development server")}`,
+      "",
+      `${source_default.dim("\u2500".repeat(40))}`,
+      `${source_default.bold.yellow("\uD83D\uDCA1 Tip")}`,
+      `  Use ${source_default.cyan("bunkit init")} for full customization options`
+    ].filter(Boolean).join(`
 `);
     console.log(`
-` + boxen(nextSteps, {
-      padding: 1,
-      title: "\uD83D\uDCCB Next steps",
+` + boxen(nextStepsContent, {
+      padding: { top: 1, bottom: 1, left: 2, right: 2 },
+      title: `${getPresetEmoji()} Next Steps`,
       titleAlignment: "left",
-      borderColor: "cyan",
-      borderStyle: "round"
+      borderColor: "green",
+      borderStyle: "round",
+      dimBorder: false
     }));
   } catch (error) {
-    s.stop("\u274C Project creation failed");
+    s.stop(`${source_default.red("\u274C")} Project creation failed`);
+    const errorBox = [
+      `${source_default.bold.red("Error occurred")}`,
+      "",
+      source_default.red(error.message),
+      "",
+      `${source_default.dim("Need help?")} ${source_default.cyan("https://github.com/Arakiss/bunkit/issues")}`
+    ].join(`
+`);
+    console.log(`
+` + boxen(errorBox, {
+      padding: { top: 1, bottom: 1, left: 2, right: 2 },
+      borderColor: "red",
+      borderStyle: "round"
+    }));
     throw error;
   }
 }
@@ -28391,7 +28860,7 @@ async function createCommand2(preset, name, options) {
 // src/commands/add/workspace.ts
 init_dist();
 init_src();
-var import_picocolors5 = __toESM(require_picocolors(), 1);
+var import_picocolors4 = __toESM(require_picocolors(), 1);
 function getWorkspaceDependencies(preset) {
   switch (preset) {
     case "nextjs":
@@ -28474,8 +28943,8 @@ async function addWorkspaceCommand(options = {}) {
     let workspaceName = options.name;
     if (!workspaceName) {
       const nameInput = await he({
-        message: "Workspace name (e.g., apps/admin or packages/email):",
-        placeholder: "apps/dashboard",
+        message: "Workspace name",
+        placeholder: "apps/admin or packages/email",
         validate: (value) => {
           if (!value)
             return "Workspace name is required";
@@ -28503,15 +28972,15 @@ async function addWorkspaceCommand(options = {}) {
     let preset = options.preset;
     if (!preset) {
       const presetChoice = await ve({
-        message: "Choose workspace preset:",
+        message: "Select workspace preset",
         options: [
           {
             value: "nextjs",
-            label: "Next.js",
-            hint: "Next.js 16 + React 19 + Tailwind"
+            label: "Next.js Application",
+            hint: "Next.js 16 + React 19 + Tailwind CSS 4 - production-ready web app"
           },
-          { value: "hono", label: "Hono API", hint: "Fast API with Bun.serve()" },
-          { value: "library", label: "Library", hint: "Shared package" }
+          { value: "hono", label: "Hono API Server", hint: "Hono 4 + Bun.serve() - ultra-fast REST API" },
+          { value: "library", label: "Shared Library", hint: "Reusable package for shared code and components" }
         ]
       });
       if (pD(presetChoice)) {
@@ -28549,18 +29018,18 @@ async function addWorkspaceCommand(options = {}) {
     spinner.stop("Dependencies installed");
     M2.success(`Workspace "${workspaceName}" created successfully!`);
     const devCommand = preset === "nextjs" ? "next dev" : preset === "hono" ? "bun dev" : "bun run build";
-    Me(`${import_picocolors5.default.bold("Next steps:")}
+    Me(`${import_picocolors4.default.bold("Next steps:")}
 
-  ${import_picocolors5.default.cyan(`cd ${workspaceName}`)}
-  ${import_picocolors5.default.cyan(devCommand)}
+  ${import_picocolors4.default.cyan(`cd ${workspaceName}`)}
+  ${import_picocolors4.default.cyan(devCommand)}
 
-${import_picocolors5.default.bold("Workspace info:")}
+${import_picocolors4.default.bold("Workspace info:")}
   Name: ${getWorkspaceName(workspaceName)}
   Type: ${preset}
   Path: ${workspaceName}
 
-${preset === "library" ? `${import_picocolors5.default.bold("Usage in other workspaces:")}
-  import { example } from '${getWorkspaceName(workspaceName)}'` : ""}`, import_picocolors5.default.green("Workspace ready!"));
+${preset === "library" ? `${import_picocolors4.default.bold("Usage in other workspaces:")}
+  import { example } from '${getWorkspaceName(workspaceName)}'` : ""}`, import_picocolors4.default.green("Workspace ready!"));
   } catch (error) {
     spinner.stop("Failed");
     throw error;
@@ -28570,7 +29039,7 @@ ${preset === "library" ? `${import_picocolors5.default.bold("Usage in other work
 // src/commands/add/package.ts
 init_dist();
 init_src();
-var import_picocolors6 = __toESM(require_picocolors(), 1);
+var import_picocolors5 = __toESM(require_picocolors(), 1);
 async function generatePackageFiles(packagePath, packageName, type) {
   const { writeFile: writeFile2 } = await Promise.resolve().then(() => (init_src(), exports_src));
   await ensureDirectory(join(packagePath, "src"));
@@ -28695,8 +29164,8 @@ async function addPackageCommand(options = {}) {
     let packageName = options.name;
     if (!packageName) {
       const nameInput = await he({
-        message: "Package name (e.g., @myapp/email or utils):",
-        placeholder: "@myapp/email",
+        message: "Package name",
+        placeholder: "@myapp/email or utils",
         validate: (value) => {
           if (!value)
             return "Package name is required";
@@ -28733,12 +29202,12 @@ async function addPackageCommand(options = {}) {
     let type = options.type;
     if (!type) {
       const typeChoice = await ve({
-        message: "Choose package type:",
+        message: "Select package type",
         options: [
-          { value: "library", label: "Library", hint: "Shared code/components" },
-          { value: "utils", label: "Utils", hint: "Utility functions" },
-          { value: "types", label: "Types", hint: "TypeScript types" },
-          { value: "config", label: "Config", hint: "Configuration" }
+          { value: "library", label: "Library", hint: "Shared code and components - reusable across workspaces" },
+          { value: "utils", label: "Utilities", hint: "Utility functions and helpers - common operations" },
+          { value: "types", label: "Type Definitions", hint: "Shared TypeScript types and interfaces" },
+          { value: "config", label: "Configuration", hint: "Shared configuration files and settings" }
         ]
       });
       if (pD(typeChoice)) {
@@ -28783,25 +29252,25 @@ async function addPackageCommand(options = {}) {
     await installDependencies(cwd2, {});
     spinner.stop("Dependencies installed");
     M2.success(`Package "${fullPackageName}" created successfully!`);
-    Me(`${import_picocolors6.default.bold("Next steps:")}
+    Me(`${import_picocolors5.default.bold("Next steps:")}
 
-${import_picocolors6.default.bold("1. Use in other workspaces:")}
-   ${import_picocolors6.default.cyan(`import { example } from '${fullPackageName}'`)}
+${import_picocolors5.default.bold("1. Use in other workspaces:")}
+   ${import_picocolors5.default.cyan(`import { example } from '${fullPackageName}'`)}
 
-${import_picocolors6.default.bold("2. Add to workspace dependencies:")}
-   ${import_picocolors6.default.dim("// In apps/web/package.json")}
-   ${import_picocolors6.default.cyan('"dependencies": {')}
-   ${import_picocolors6.default.cyan(`  "${fullPackageName}": "workspace:*"`)}
-   ${import_picocolors6.default.cyan("}")}
+${import_picocolors5.default.bold("2. Add to workspace dependencies:")}
+   ${import_picocolors5.default.dim("// In apps/web/package.json")}
+   ${import_picocolors5.default.cyan('"dependencies": {')}
+   ${import_picocolors5.default.cyan(`  "${fullPackageName}": "workspace:*"`)}
+   ${import_picocolors5.default.cyan("}")}
 
-${import_picocolors6.default.bold("3. Develop the package:")}
-   ${import_picocolors6.default.cyan(`cd ${workspacePath}`)}
-   ${import_picocolors6.default.cyan("# Edit src/index.ts")}
+${import_picocolors5.default.bold("3. Develop the package:")}
+   ${import_picocolors5.default.cyan(`cd ${workspacePath}`)}
+   ${import_picocolors5.default.cyan("# Edit src/index.ts")}
 
-${import_picocolors6.default.bold("Package info:")}
+${import_picocolors5.default.bold("Package info:")}
   Name: ${fullPackageName}
   Type: ${type}
-  Path: ${workspacePath}`, import_picocolors6.default.green("Package ready!"));
+  Path: ${workspacePath}`, import_picocolors5.default.green("Package ready!"));
   } catch (error) {
     spinner.stop("Failed");
     throw error;
@@ -28869,7 +29338,7 @@ async function addComponentCommand(options = {}) {
       "tooltip"
     ];
     const selected = await fe({
-      message: "Select components to install:",
+      message: "Select shadcn/ui components to install",
       options: popularComponents.map((comp) => ({
         value: comp,
         label: comp
@@ -28885,8 +29354,8 @@ async function addComponentCommand(options = {}) {
     components = options.components;
   } else {
     const componentInput = await he({
-      message: "Component name(s) to install?",
-      placeholder: "button, card, input",
+      message: "Component name(s)",
+      placeholder: "button,card,input (comma-separated)",
       validate: (value) => {
         if (!value.trim()) {
           return "Please enter at least one component name";
@@ -28964,30 +29433,68 @@ async function addCommand(feature, options) {
 var packageJson = await Bun.file(new URL("../package.json", import.meta.url)).json();
 var VERSION = packageJson.version;
 var program2 = new Command;
-program2.name("bunkit").description("Bake production-ready apps in seconds").version(VERSION);
-program2.command("init").description("Create a new project with full customization").option("--name <name>", "Project name").option("--preset <preset>", "Preset type (minimal, web, api, full)").option("--database <database>", "Database (postgres-drizzle, supabase, sqlite-drizzle, none)").option("--code-quality <quality>", "Code quality (ultracite, biome)").option("--ts-strictness <strictness>", "TypeScript strictness (strict, moderate, loose)").option("--ui-library <library>", "UI library (shadcn, none)").option("--css-framework <framework>", "CSS framework (tailwind, vanilla, css-modules)").option("--shadcn-style <style>", "shadcn/ui style (new-york, default)").option("--shadcn-base-color <color>", "shadcn/ui base color (neutral, gray, zinc, stone, slate)").option("--shadcn-radius <radius>", "shadcn/ui border radius (e.g., 0.5rem, 8px)").option("--testing <framework>", "Testing framework (bun-test, vitest, none)").option("--docker", "Add Docker configuration").option("--cicd", "Add GitHub Actions CI/CD").option("--no-git", "Skip git initialization").option("--no-install", "Skip dependency installation").option("--non-interactive", "Run without prompts (requires all options)").action(async (options) => {
+program2.name("bunkit").description("Bake production-ready apps in seconds | Modern CLI for Bun-powered projects").version(VERSION).usage("<command> [options]").addHelpText("after", `
+Examples:
+  $ bunkit init                    Create a new project interactively
+  $ bunkit create web 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
+
+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 | web | api | full").option("--database <database>", "Database option: postgres-drizzle | supabase | supabase-drizzle | sqlite-drizzle | none").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)").addHelpText("after", `
+Examples:
+  $ bunkit init                                    Interactive project creation
+  $ bunkit init --name my-app --preset web        Quick web app creation
+  $ bunkit init --preset full --database supabase Full-stack with Supabase
+  
+Presets:
+  minimal  Single-file project, clean start
+  web      Next.js 16 + React 19 web application
+  api      Hono API server with Bun.serve()
+  full     Full-stack monorepo (web + api + packages)
+  `).action(async (options) => {
   showBanner(VERSION);
   try {
     await enhancedInitCommand(options);
-    Se(import_picocolors7.default.green("\u2728 Done! Your project is ready to bake! \uD83C\uDF5E"));
+    Se(import_picocolors6.default.green("\u2728 Done! Your project is ready to bake! \uD83C\uDF5E"));
   } catch (error) {
     M2.error(error.message);
-    Se(import_picocolors7.default.red("\u274C Project creation failed"));
+    Se(import_picocolors6.default.red("\u274C Project creation failed"));
     process.exit(1);
   }
 });
-program2.command("create").argument("<preset>", "Preset type (minimal, web, api, full)").argument("<name>", "Project name").option("--no-git", "Skip git initialization").option("--no-install", "Skip dependency installation").description("Create a new project quickly").action(async (preset, name, options) => {
+program2.command("create").alias("c").argument("<preset>", "Project preset: minimal | web | api | full").argument("<name>", "Project name (kebab-case recommended)").option("--no-git", "Skip Git repository initialization").option("--no-install", "Skip dependency installation after project creation").description("Quick project creation with sensible defaults (non-interactive)").addHelpText("after", `
+Examples:
+  $ bunkit create web my-app          Create Next.js web application
+  $ bunkit create api my-api          Create Hono API server
+  $ bunkit create full my-saas        Create full-stack monorepo
+  $ bunkit create minimal my-tool      Create minimal Bun project
+  
+Note: This command uses sensible defaults. Use 'bunkit init' for full customization.
+  `).action(async (preset, name, options) => {
   showBanner(VERSION);
   try {
     await createCommand2(preset, name, options);
-    Se(import_picocolors7.default.green("\u2728 Done! Your project is ready to bake! \uD83C\uDF5E"));
+    Se(import_picocolors6.default.green("\u2728 Done! Your project is ready to bake! \uD83C\uDF5E"));
   } catch (error) {
     M2.error(error.message);
-    Se(import_picocolors7.default.red("\u274C Project creation failed"));
+    Se(import_picocolors6.default.red("\u274C Project creation failed"));
     process.exit(1);
   }
 });
-program2.command("add").argument("<feature>", "Feature to add (workspace, package, component)").option("--name <name>", "Name for the feature").option("--preset <preset>", "Preset for workspace (nextjs, hono, library)").option("--type <type>", "Type for package (library, utils, types, config)").option("--components <components>", "Component names (comma-separated) for component feature").option("--all", "Show all available components (for component feature)").description("Add workspace, package, or shadcn/ui component to project").action(async (feature, options) => {
+program2.command("add").alias("a").argument("<feature>", "Feature type: workspace | package | component").option("--name <name>", "Feature name (e.g., apps/admin, @myapp/utils, button)").option("--preset <preset>", "Workspace preset: nextjs | hono | library").option("--type <type>", "Package type: library | utils | types | config").option("--components <components>", "Comma-separated component names (e.g., button,card,input)").option("--all", "Show interactive component browser (for component feature)").description("Add workspace, shared package, or shadcn/ui component to existing project").addHelpText("after", `
+Examples:
+  $ bunkit add workspace --name apps/admin --preset nextjs
+  $ bunkit add package --name @myapp/utils --type utils
+  $ bunkit add component --components button,card,input
+  $ bunkit add component --all
+  
+Features:
+  workspace   Add a new workspace to monorepo (app or package)
+  package     Add a shared package to monorepo
+  component   Add shadcn/ui components (requires shadcn/ui setup)
+  `).action(async (feature, options) => {
   showBanner(VERSION);
   try {
     const parsedOptions = {
@@ -28995,10 +29502,9 @@ program2.command("add").argument("<feature>", "Feature to add (workspace, packag
       components: options.components && typeof options.components === "string" ? options.components.split(",").map((c3) => c3.trim()) : options.components
     };
     await addCommand(feature, parsedOptions);
-    Se(import_picocolors7.default.green("\u2728 Feature added successfully! \uD83C\uDF5E"));
   } catch (error) {
     M2.error(error.message);
-    Se(import_picocolors7.default.red("\u274C Feature installation failed"));
+    Se(import_picocolors6.default.red("\u274C Feature installation failed"));
     process.exit(1);
   }
 });