@betterstart/cli 0.1.6 → 0.1.8

package/dist/cli.js

@@ -897,8 +897,8 @@ function toPascalCase3(str) {
   return str.split(/[-_\s]+/).map((w) => w.charAt(0).toUpperCase() + w.slice(1).toLowerCase()).join("");
 }
 function toCamelCase(str) {
-  const p4 = toPascalCase3(str);
-  return p4.charAt(0).toLowerCase() + p4.slice(1);
+  const p5 = toPascalCase3(str);
+  return p5.charAt(0).toLowerCase() + p5.slice(1);
 }
 function toKebabCase(str) {
   return str.replace(/([a-z])([A-Z])/g, "$1-$2").replace(/[\s_]+/g, "-").toLowerCase();
@@ -989,7 +989,7 @@ function generateFormAdminPages(schema, cwd, pagesDir, options) {
   const adminDir = path4.join(cwd, pagesDir, "forms", kebab);
   if (!fs4.existsSync(adminDir)) fs4.mkdirSync(adminDir, { recursive: true });
   const files = [];
-  const rel = (p4) => path4.relative(cwd, p4);
+  const rel = (p5) => path4.relative(cwd, p5);
   const pagePath = path4.join(adminDir, "page.tsx");
   if (!fs4.existsSync(pagePath) || options.force) {
     fs4.writeFileSync(pagePath, generatePage(pascal, kebab), "utf-8");
@@ -1812,9 +1812,26 @@ import path5 from "path";
 function parseNavigationFile(content) {
   const iconImportMatch = content.match(/import\s*\{([^}]+)\}\s*from\s*['"]lucide-react['"]/);
   const iconImports = iconImportMatch ? iconImportMatch[1].split(",").map((s) => s.trim()).filter((s) => s && s !== "LucideIcon") : [];
-  const match = content.match(/export const cmsNavigation[^=]*=\s*\[([\s\S]*?)\]\s*(?:as const)?/);
-  if (!match) return { items: [], iconImports };
-  return { items: parseItemsBlock(match[1]), iconImports };
+  const arrayBlock = extractTopLevelArray(content);
+  if (!arrayBlock) return { items: [], iconImports };
+  return { items: parseItemsBlock(arrayBlock), iconImports };
+}
+function extractTopLevelArray(content) {
+  const marker = content.indexOf("cmsNavigation");
+  if (marker === -1) return null;
+  const eqSign = content.indexOf("=", marker);
+  if (eqSign === -1) return null;
+  const openBracket = content.indexOf("[", eqSign);
+  if (openBracket === -1) return null;
+  let depth = 0;
+  for (let i = openBracket; i < content.length; i++) {
+    if (content[i] === "[") depth++;
+    if (content[i] === "]") depth--;
+    if (depth === 0) {
+      return content.slice(openBracket + 1, i);
+    }
+  }
+  return null;
 }
 function parseItemsBlock(block) {
   const items = [];
@@ -1940,20 +1957,9 @@ function updateFormNavigation(schema, cwd, cmsDir, options = {}) {
     formsGroup.children.sort((a, b) => a.label.localeCompare(b.label));
   }
   const dashboard = items.find((item) => item.href === "/cms");
-  const forms = items.find((item) => item.label === "Forms");
-  const users = items.find((item) => item.label === "Users");
-  const settings = items.find((item) => item.label === "Settings");
-  const others = items.filter(
-    (item) => item.href !== "/cms" && item.label !== "Forms" && item.label !== "Users" && item.label !== "Settings"
-  );
+  const others = items.filter((item) => item.href !== "/cms");
   others.sort((a, b) => a.label.localeCompare(b.label));
-  items = [
-    ...dashboard ? [dashboard] : [],
-    ...others,
-    ...forms ? [forms] : [],
-    ...users ? [users] : [],
-    ...settings ? [settings] : []
-  ];
+  items = [...dashboard ? [dashboard] : [], ...others];
   for (const icon of ["FileInput", "Inbox"]) {
     if (!iconImports.includes(icon)) {
       iconImports.push(icon);
@@ -1971,8 +1977,8 @@ function toPascalCase4(str) {
   return str.split(/[-_\s]+/).map((w) => w.charAt(0).toUpperCase() + w.slice(1).toLowerCase()).join("");
 }
 function toCamelCase2(str) {
-  const p4 = toPascalCase4(str);
-  return p4.charAt(0).toLowerCase() + p4.slice(1);
+  const p5 = toPascalCase4(str);
+  return p5.charAt(0).toLowerCase() + p5.slice(1);
 }
 function toKebabCase3(str) {
   return str.replace(/([a-z])([A-Z])/g, "$1-$2").replace(/[\s_]+/g, "-").toLowerCase();
@@ -2687,8 +2693,8 @@ function toPascalCase5(str) {
   return str.split(/[-_\s]+/).map((w) => w.charAt(0).toUpperCase() + w.slice(1).toLowerCase()).join("");
 }
 function toCamelCase3(str) {
-  const p4 = toPascalCase5(str);
-  return p4.charAt(0).toLowerCase() + p4.slice(1);
+  const p5 = toPascalCase5(str);
+  return p5.charAt(0).toLowerCase() + p5.slice(1);
 }
 function singularize2(str) {
   if (str.endsWith("ies")) return `${str.slice(0, -3)}y`;
@@ -3074,7 +3080,7 @@ ${autoSlugUpdate}
     for (const [key, value] of Object.entries(updateData)) {
       if (key === 'published') { processedData[key] = value; continue }
       const field = fieldMeta.find(f => f.name === key)
-      if (!field) { processedData[key] = value; continue }
+      if (!field) continue
       if (field.type === 'list') {
         processedData[key] = value || []
       } else if (!field.required && ['date', 'timestamp', 'time', 'string', 'varchar', 'text', 'select'].includes(field.type)) {
@@ -3251,7 +3257,7 @@ export async function upsert${Singular}(input: Upsert${Singular}Input): Promise<
     const processedData: Record<string, unknown> = {}
     for (const [key, value] of Object.entries(input)) {
       const field = fieldMeta.find(f => f.name === key)
-      if (!field) { processedData[key] = value; continue }
+      if (!field) continue
       if (field.type === 'list') {
         processedData[key] = value || []
       } else if (!field.required && ['date', 'timestamp', 'time', 'string', 'varchar', 'text', 'select'].includes(field.type)) {
@@ -3411,8 +3417,8 @@ function toPascalCase6(str) {
   return str.split(/[-_\s]+/).map((w) => w.charAt(0).toUpperCase() + w.slice(1).toLowerCase()).join("");
 }
 function toCamelCase4(str) {
-  const p4 = toPascalCase6(str);
-  return p4.charAt(0).toLowerCase() + p4.slice(1);
+  const p5 = toPascalCase6(str);
+  return p5.charAt(0).toLowerCase() + p5.slice(1);
 }
 function singularize3(str) {
   if (str.endsWith("ies")) return `${str.slice(0, -3)}y`;
@@ -4554,8 +4560,8 @@ function toPascalCase9(str) {
   return str.split(/[-_\s]+/).map((w) => w.charAt(0).toUpperCase() + w.slice(1).toLowerCase()).join("");
 }
 function toCamelCase5(str) {
-  const p4 = toPascalCase9(str);
-  return p4.charAt(0).toLowerCase() + p4.slice(1);
+  const p5 = toPascalCase9(str);
+  return p5.charAt(0).toLowerCase() + p5.slice(1);
 }
 function singularize6(str) {
   if (str.endsWith("ies")) return `${str.slice(0, -3)}y`;
@@ -4787,8 +4793,8 @@ function toPascalCase10(str) {
   return str.split(/[-_\s]+/).map((w) => w.charAt(0).toUpperCase() + w.slice(1).toLowerCase()).join("");
 }
 function toCamelCase6(str) {
-  const p4 = toPascalCase10(str);
-  return p4.charAt(0).toLowerCase() + p4.slice(1);
+  const p5 = toPascalCase10(str);
+  return p5.charAt(0).toLowerCase() + p5.slice(1);
 }
 function singularize7(str) {
   if (str.endsWith("ies")) return `${str.slice(0, -3)}y`;
@@ -5039,6 +5045,7 @@ function generateFieldJSXCore(field, indent = "          ") {
   const fieldType = getFormFieldType(field);
   const label = field.label || field.name;
   const hintJSX = field.hint ? `${indent}      <FormDescription>${field.hint}</FormDescription>` : "";
+  const listHintJSX = field.hint ? `${indent}      <p className="text-[0.8rem] text-muted-foreground">${field.hint}</p>` : "";
   if (field.type === "group" && field.fields) {
     const columns = field.columns || 1;
     const gridClass = columns > 1 ? `grid-cols-${columns}` : "grid-cols-1";
@@ -5498,7 +5505,7 @@ ${indent}  )}
 ${indent}  {${field.name}FieldArray.fields.length > 0 && (
 ${indent}    <div className="space-y-5">
 ${indent}      <div className="flex items-center justify-between">
-${indent}        <FormLabel className="text-base">${label}</FormLabel>
+${indent}        <Label className="text-base">${label}</Label>
 ${indent}        <Button
 ${indent}          type="button"
 ${indent}          variant="outline"
@@ -5513,7 +5520,7 @@ ${indent}          <Plus className="size-3" />
 ${indent}          Add ${singularLabel}
 ${indent}        </Button>
 ${indent}      </div>
-${hintJSX ? `${hintJSX}
+${listHintJSX ? `${listHintJSX}
 ` : ""}${indent}      <Accordion
 ${indent}        type="single"
 ${indent}        collapsible
@@ -5807,6 +5814,7 @@ ${tabsContent}
   AccordionTrigger
 } from '@cms/components/ui/accordion'`);
     if (!hasSeparator) uiImports.push("import { Separator } from '@cms/components/ui/separator'");
+    uiImports.push("import { Label } from '@cms/components/ui/label'");
   }
   const lucideIcons = [];
   if (hasRelationship) lucideIcons.push("Check", "ChevronsUpDown");
@@ -6134,6 +6142,7 @@ ${tabsContent}
   AccordionTrigger
 } from '@cms/components/ui/accordion'`);
     if (!hasSeparator) uiImports.push("import { Separator } from '@cms/components/ui/separator'");
+    uiImports.push("import { Label } from '@cms/components/ui/label'");
   }
   const lucideIcons = [];
   if (hasRelationship) lucideIcons.push("Check", "ChevronsUpDown");
@@ -6406,11 +6415,28 @@ import path15 from "path";
 function parseNavigationFile2(content) {
   const iconImportMatch = content.match(/import\s*\{([^}]+)\}\s*from\s*['"]lucide-react['"]/);
   const iconImports = iconImportMatch ? iconImportMatch[1].split(",").map((s) => s.trim()).filter((s) => s && s !== "LucideIcon") : [];
-  const match = content.match(/export const cmsNavigation[^=]*=\s*\[([\s\S]*?)\]\s*(?:as const)?/);
-  if (!match) return { items: [], iconImports };
-  const items = parseItemsBlock2(match[1]);
+  const arrayBlock = extractTopLevelArray2(content);
+  if (!arrayBlock) return { items: [], iconImports };
+  const items = parseItemsBlock2(arrayBlock);
   return { items, iconImports };
 }
+function extractTopLevelArray2(content) {
+  const marker = content.indexOf("cmsNavigation");
+  if (marker === -1) return null;
+  const eqSign = content.indexOf("=", marker);
+  if (eqSign === -1) return null;
+  const openBracket = content.indexOf("[", eqSign);
+  if (openBracket === -1) return null;
+  let depth = 0;
+  for (let i = openBracket; i < content.length; i++) {
+    if (content[i] === "[") depth++;
+    if (content[i] === "]") depth--;
+    if (depth === 0) {
+      return content.slice(openBracket + 1, i);
+    }
+  }
+  return null;
+}
 function parseItemsBlock2(block) {
   const items = [];
   let depth = 0;
@@ -6497,6 +6523,9 @@ function appendItem2(lines, item, indent, isLast) {
 }
 function updateNavigation(schema, cwd, cmsDir, options = {}) {
   const navFilePath = path15.join(cwd, cmsDir, "data", "navigation.ts");
+  if (schema.name === "settings") {
+    return { files: [] };
+  }
   let items = [];
   let iconImports = [];
   if (fs15.existsSync(navFilePath)) {
@@ -6506,38 +6535,59 @@ function updateNavigation(schema, cwd, cmsDir, options = {}) {
     iconImports = parsed.iconImports;
   }
   const entityHref = `/cms/${schema.name}`;
-  const existingIndex = items.findIndex((item) => item.href === entityHref);
   const newItem = {
     label: schema.label,
     href: entityHref,
     icon: schema.icon
   };
-  if (existingIndex >= 0) {
-    if (options.force) {
-      items[existingIndex] = newItem;
+  if (schema.navGroup) {
+    let group = items.find((item) => item.label === schema.navGroup?.label);
+    if (!group) {
+      group = {
+        label: schema.navGroup.label,
+        href: "#",
+        icon: schema.navGroup.icon,
+        children: []
+      };
+      items.push(group);
+    }
+    if (!group.children) {
+      group.children = [];
+    }
+    const existingChild = group.children.findIndex((c) => c.href === entityHref);
+    if (existingChild >= 0) {
+      if (options.force) {
+        group.children[existingChild] = newItem;
+      } else {
+        return { files: [] };
+      }
     } else {
-      return { files: [] };
+      group.children.push(newItem);
+      group.children.sort((a, b) => a.label.localeCompare(b.label));
+    }
+    if (schema.navGroup.icon && !iconImports.includes(schema.navGroup.icon)) {
+      iconImports.push(schema.navGroup.icon);
     }
   } else {
-    const dashboard = items.find((item) => item.href === "/cms");
-    const users = items.find((item) => item.label === "Users");
-    const settings = items.find((item) => item.label === "Settings");
-    const others = items.filter(
-      (item) => item.href !== "/cms" && item.label !== "Users" && item.label !== "Settings"
-    );
-    others.push(newItem);
-    others.sort((a, b) => a.label.localeCompare(b.label));
-    items = [
-      ...dashboard ? [dashboard] : [],
-      ...others,
-      ...users ? [users] : [],
-      ...settings ? [settings] : []
-    ];
+    const existingIndex = items.findIndex((item) => item.href === entityHref);
+    if (existingIndex >= 0) {
+      if (options.force) {
+        items[existingIndex] = newItem;
+      } else {
+        return { files: [] };
+      }
+    } else {
+      items.push(newItem);
+    }
   }
+  const dashboard = items.find((item) => item.href === "/cms");
+  const others = items.filter((item) => item.href !== "/cms");
+  others.sort((a, b) => a.label.localeCompare(b.label));
+  items = [...dashboard ? [dashboard] : [], ...others];
   if (schema.icon && !iconImports.includes(schema.icon)) {
     iconImports.push(schema.icon);
-    iconImports.sort();
   }
+  iconImports.sort();
   const dir = path15.dirname(navFilePath);
   if (!fs15.existsSync(dir)) {
     fs15.mkdirSync(dir, { recursive: true });
@@ -6770,7 +6820,7 @@ ${filterLogic}` : ""}`;
               className="w-[200px] justify-between"
             >
               {${f.field} || '${f.label}'}
-              <ChevronsUpDown className="ml-2 h-4 w-4 shrink-0 opacity-50" />
+              <ChevronsUpDown className="ml-2 size-4 shrink-0 opacity-50" />
             </Button>
           </PopoverTrigger>
           <PopoverContent className="w-[200px] p-0">
@@ -6791,7 +6841,7 @@ ${filterLogic}` : ""}`;
                   >
                     <Check
                       className={cn(
-                        'mr-2 h-4 w-4',
+                        'mr-2 size-4',
                         ${f.field} === '' ? 'opacity-100' : 'opacity-0'
                       )}
                     />
@@ -6810,7 +6860,7 @@ ${filterLogic}` : ""}`;
                     >
                       <Check
                         className={cn(
-                          'mr-2 h-4 w-4',
+                          'mr-2 size-4',
                           ${f.field} === option ? 'opacity-100' : 'opacity-0'
                         )}
                       />
@@ -6973,8 +7023,8 @@ function toPascalCase16(str) {
   return str.split(/[-_\s]+/).map((w) => w.charAt(0).toUpperCase() + w.slice(1).toLowerCase()).join("");
 }
 function toCamelCase7(str) {
-  const p4 = toPascalCase16(str);
-  return p4.charAt(0).toLowerCase() + p4.slice(1);
+  const p5 = toPascalCase16(str);
+  return p5.charAt(0).toLowerCase() + p5.slice(1);
 }
 function singularize12(str) {
   if (str.endsWith("ies")) return `${str.slice(0, -3)}y`;
@@ -7568,6 +7618,18 @@ function detectPackageManager(cwd) {
   }
   return "npm";
 }
+function runCommand(pm, script) {
+  switch (pm) {
+    case "pnpm":
+      return `pnpm ${script}`;
+    case "yarn":
+      return `yarn ${script}`;
+    case "bun":
+      return `bun run ${script}`;
+    default:
+      return `npm run ${script}`;
+  }
+}
 
 // src/generators/post-generate.ts
 function loadEnvFile(cwd) {
@@ -7786,29 +7848,107 @@ var generateCommand = new Command("generate").alias("g").description("Generate e
 );
 
 // src/commands/init.ts
-import { execFileSync as execFileSync3, spawn as spawn2 } from "child_process";
-import fs31 from "fs";
-import path36 from "path";
-import * as p3 from "@clack/prompts";
-import { Command as Command2 } from "commander";
+import { execFileSync as execFileSync4, spawn as spawn2 } from "child_process";
+import fs32 from "fs";
+import path37 from "path";
+import * as p4 from "@clack/prompts";
+import { Command as Command3 } from "commander";
+import pc2 from "picocolors";
+
+// src/init/prompts/database.ts
+import { execFileSync as execFileSync3 } from "child_process";
+import * as p from "@clack/prompts";
 import pc from "picocolors";
+var VERCEL_NEON_URL = "https://vercel.com/dashboard/integrations/checkout/neon";
+async function promptDatabase() {
+  while (true) {
+    const choice = await p.select({
+      message: "How would you like to connect your database?",
+      options: [
+        {
+          value: "vercel-neon",
+          label: "Vercel (Neon)",
+          hint: "opens browser to create a free Postgres database"
+        },
+        {
+          value: "supabase",
+          label: "Supabase",
+          hint: "coming soon"
+        },
+        {
+          value: "manual",
+          label: "Enter connection string manually"
+        }
+      ]
+    });
+    if (p.isCancel(choice)) {
+      p.cancel("Setup cancelled.");
+      process.exit(0);
+    }
+    if (choice === "supabase") {
+      p.log.warning("Supabase support is coming soon. Please choose another option.");
+      continue;
+    }
+    if (choice === "vercel-neon") {
+      openBrowser(VERCEL_NEON_URL);
+      p.log.info(
+        `Opening Vercel\u2026 Create a Neon Postgres database, then copy the ${pc.cyan("DATABASE_URL")} from the dashboard.`
+      );
+    }
+    const url = await promptConnectionString();
+    return { url };
+  }
+}
+async function promptConnectionString() {
+  const input = await p.text({
+    message: "Paste your database connection string",
+    placeholder: "postgres://user:pass@host/db",
+    validate(val) {
+      if (!val.trim()) {
+        return "A connection string is required to continue";
+      }
+      const stripped = val.replace(/^['"]|['"]$/g, "");
+      if (!stripped.startsWith("postgres://") && !stripped.startsWith("postgresql://")) {
+        return "Must start with postgres:// or postgresql://";
+      }
+    }
+  });
+  if (p.isCancel(input)) {
+    p.cancel("Setup cancelled.");
+    process.exit(0);
+  }
+  return input.replace(/^['"]|['"]$/g, "").trim();
+}
+function openBrowser(url) {
+  try {
+    const platform = process.platform;
+    if (platform === "darwin") {
+      execFileSync3("open", [url], { stdio: "ignore" });
+    } else if (platform === "win32") {
+      execFileSync3("cmd", ["/c", "start", url], { stdio: "ignore" });
+    } else {
+      execFileSync3("xdg-open", [url], { stdio: "ignore" });
+    }
+  } catch {
+  }
+}
 
 // src/init/prompts/features.ts
-import * as p from "@clack/prompts";
+import * as p2 from "@clack/prompts";
 async function promptFeatures(presetOverride) {
-  const includeEmail = await p.confirm({
+  const includeEmail = await p2.confirm({
     message: "Include email system? (Resend + React Email)",
     initialValue: true
   });
-  if (p.isCancel(includeEmail)) {
-    p.cancel("Setup cancelled.");
+  if (p2.isCancel(includeEmail)) {
+    p2.cancel("Setup cancelled.");
     process.exit(0);
   }
   let preset;
   if (presetOverride && isValidPreset(presetOverride)) {
     preset = presetOverride;
   } else {
-    const selected = await p.select({
+    const selected = await p2.select({
       message: "Select a preset:",
       options: [
         { value: "blog", label: "Blog", hint: "Posts + Categories (recommended)" },
@@ -7817,8 +7957,8 @@ async function promptFeatures(presetOverride) {
       ],
       initialValue: "blog"
     });
-    if (p.isCancel(selected)) {
-      p.cancel("Setup cancelled.");
+    if (p2.isCancel(selected)) {
+      p2.cancel("Setup cancelled.");
       process.exit(0);
     }
     preset = selected;
@@ -7830,9 +7970,9 @@ function isValidPreset(value) {
 }
 
 // src/init/prompts/project.ts
-import * as p2 from "@clack/prompts";
+import * as p3 from "@clack/prompts";
 async function promptProject(defaultName) {
-  const projectName = await p2.text({
+  const projectName = await p3.text({
     message: "What is your project name?",
     placeholder: defaultName ?? "my-app",
     defaultValue: defaultName ?? "my-app",
@@ -7844,16 +7984,16 @@ async function promptProject(defaultName) {
       return void 0;
     }
   });
-  if (p2.isCancel(projectName)) {
-    p2.cancel("Setup cancelled.");
+  if (p3.isCancel(projectName)) {
+    p3.cancel("Setup cancelled.");
     process.exit(0);
   }
-  const useSrcDir = await p2.confirm({
+  const useSrcDir = await p3.confirm({
     message: "Use src/ directory?",
     initialValue: true
   });
-  if (p2.isCancel(useSrcDir)) {
-    p2.cancel("Setup cancelled.");
+  if (p3.isCancel(useSrcDir)) {
+    p3.cancel("Setup cancelled.");
     process.exit(0);
   }
   return { projectName: projectName.trim(), useSrcDir };
@@ -8390,8 +8530,139 @@ function scaffoldBiome(cwd, linter) {
 }
 
 // src/init/scaffolders/components.ts
+import path29 from "path";
+import fs26 from "fs-extra";
+
+// src/utils/detect.ts
+import fs25 from "fs";
 import path28 from "path";
-import fs25 from "fs-extra";
+var NEXT_CONFIG_FILES = ["next.config.ts", "next.config.js", "next.config.mjs"];
+function detectProjectName(cwd) {
+  const pkgPath = path28.join(cwd, "package.json");
+  if (fs25.existsSync(pkgPath)) {
+    try {
+      const pkg = JSON.parse(fs25.readFileSync(pkgPath, "utf-8"));
+      if (typeof pkg.name === "string" && pkg.name.length > 0) {
+        return formatProjectName(pkg.name);
+      }
+    } catch {
+    }
+  }
+  return formatProjectName(path28.basename(cwd));
+}
+function formatProjectName(name) {
+  const base = name.includes("/") ? name.split("/").pop() : name;
+  return base.replace(/[-_]+/g, " ").replace(/\b\w/g, (c) => c.toUpperCase()).trim();
+}
+function detectProject(cwd) {
+  const isExisting = NEXT_CONFIG_FILES.some((f) => fs25.existsSync(path28.join(cwd, f)));
+  const hasSrcDir = fs25.existsSync(path28.join(cwd, "src"));
+  const hasTypeScript = fs25.existsSync(path28.join(cwd, "tsconfig.json")) || fs25.existsSync(path28.join(cwd, "tsconfig.app.json"));
+  const hasTailwind = detectTailwind(cwd);
+  const linter = detectLinter(cwd);
+  const conflicts = [];
+  if (isExisting) {
+    if (fs25.existsSync(path28.join(cwd, "cms"))) {
+      conflicts.push("cms/ directory already exists");
+    }
+    if (fs25.existsSync(path28.join(cwd, "cms.config.ts"))) {
+      conflicts.push("cms.config.ts already exists");
+    }
+    const appBase = hasSrcDir ? "src/app" : "app";
+    if (fs25.existsSync(path28.join(cwd, appBase, "(cms)"))) {
+      conflicts.push(`${appBase}/(cms)/ route group already exists`);
+    }
+    if (hasTsconfigCmsAliases(cwd)) {
+      conflicts.push("@cms/* path aliases already exist in tsconfig.json");
+    }
+    if (hasEnvBetterstartVars(cwd)) {
+      conflicts.push("BETTERSTART_* variables already exist in .env.local");
+    }
+  }
+  return { isExisting, hasSrcDir, hasTypeScript, hasTailwind, linter, conflicts };
+}
+var BIOME_CONFIG_FILES = ["biome.json", "biome.jsonc"];
+var ESLINT_CONFIG_FILES = [
+  "eslint.config.js",
+  "eslint.config.mjs",
+  "eslint.config.cjs",
+  "eslint.config.ts",
+  ".eslintrc.json",
+  ".eslintrc.js",
+  ".eslintrc.cjs",
+  ".eslintrc.yml",
+  ".eslintrc.yaml",
+  ".eslintrc"
+];
+function detectLinter(cwd) {
+  for (const f of BIOME_CONFIG_FILES) {
+    if (fs25.existsSync(path28.join(cwd, f))) {
+      return { type: "biome", configFile: f };
+    }
+  }
+  for (const f of ESLINT_CONFIG_FILES) {
+    if (fs25.existsSync(path28.join(cwd, f))) {
+      return { type: "eslint", configFile: f };
+    }
+  }
+  const pkgPath = path28.join(cwd, "package.json");
+  if (fs25.existsSync(pkgPath)) {
+    try {
+      const pkg = JSON.parse(fs25.readFileSync(pkgPath, "utf-8"));
+      if (pkg.eslintConfig) {
+        return { type: "eslint", configFile: "package.json (eslintConfig)" };
+      }
+    } catch {
+    }
+  }
+  return { type: "none", configFile: null };
+}
+function detectTailwind(cwd) {
+  const cssFiles = ["globals.css", "app.css", "index.css"].flatMap((f) => [
+    path28.join(cwd, "src", "app", f),
+    path28.join(cwd, "app", f),
+    path28.join(cwd, "src", f),
+    path28.join(cwd, f)
+  ]);
+  for (const cssFile of cssFiles) {
+    if (fs25.existsSync(cssFile)) {
+      const content = fs25.readFileSync(cssFile, "utf-8");
+      if (content.includes('@import "tailwindcss"') || content.includes("@import 'tailwindcss'") || content.includes("@theme")) {
+        return true;
+      }
+    }
+  }
+  const postcssFiles = ["postcss.config.js", "postcss.config.mjs", "postcss.config.cjs"];
+  for (const f of postcssFiles) {
+    if (fs25.existsSync(path28.join(cwd, f))) {
+      const content = fs25.readFileSync(path28.join(cwd, f), "utf-8");
+      if (content.includes("tailwindcss") || content.includes("@tailwindcss")) {
+        return true;
+      }
+    }
+  }
+  return false;
+}
+function hasTsconfigCmsAliases(cwd) {
+  const tsconfigPath = path28.join(cwd, "tsconfig.json");
+  if (!fs25.existsSync(tsconfigPath)) return false;
+  try {
+    const content = fs25.readFileSync(tsconfigPath, "utf-8");
+    return content.includes("@cms/");
+  } catch {
+    return false;
+  }
+}
+function hasEnvBetterstartVars(cwd) {
+  const envPath = path28.join(cwd, ".env.local");
+  if (!fs25.existsSync(envPath)) return false;
+  try {
+    const content = fs25.readFileSync(envPath, "utf-8");
+    return content.includes("BETTERSTART_");
+  } catch {
+    return false;
+  }
+}
 
 // src/init/templates/components/cms-globals.ts
 function cmsGlobalsCssTemplate() {
@@ -8507,6 +8778,12 @@ function cmsGlobalsCssTemplate() {
   --shadow-2xl: 0px 1px 3px 0px hsl(0 0% 0% / 0.05);
 }
 
+.cms-root {
+  --font-sans: var(--font-geist-sans, sans-serif);
+  --font-mono: var(--font-geist-mono, monospace);
+  font-family: var(--font-sans);
+}
+
 @theme inline {
   --color-background: var(--background);
   --color-foreground: var(--foreground);
@@ -8565,7 +8842,7 @@ function cmsGlobalsCssTemplate() {
     @apply border-border outline-ring/50;
   }
   body {
-    @apply bg-background text-foreground;
+    @apply bg-background text-foreground antialiased;
   }
 }
 
@@ -8986,6 +9263,7 @@ export function ReorderControls({
 function cmsHeaderTemplate() {
   return `'use client'
 
+import { CmsSearch } from '@cms/components/layout/cms-search'
 import { Button } from '@cms/components/ui/button'
 import { SidebarTrigger, useSidebar } from '@cms/components/ui/sidebar'
 import { useTheme } from '@cms/hooks/use-cms-theme'
@@ -8998,16 +9276,21 @@ export function CmsHeader() {
   return (
     <header className="flex h-14 shrink-0 items-center gap-2 border-b border-border w-full sticky top-0 z-50 bg-sidebar">
       <div className="flex items-center px-5 gap-1 flex-1 w-full justify-between">
-        {state === 'collapsed' && <SidebarTrigger />}
-        <Button
-          variant="ghost"
-          size="icon"
-          onClick={() => setTheme(theme === 'dark' ? 'light' : 'dark')}
-        >
-          <Sun className="h-4 w-4 rotate-0 scale-100 transition-all dark:-rotate-90 dark:scale-0" />
-          <Moon className="absolute h-4 w-4 rotate-90 scale-0 transition-all dark:rotate-0 dark:scale-100" />
-          <span className="sr-only">Toggle theme</span>
-        </Button>
+        <div className="flex items-center gap-2 w-full">
+          {state === 'collapsed' && <SidebarTrigger />}
+          <CmsSearch />
+        </div>
+        <div className="flex items-center gap-2 ml-auto">
+          <Button
+            variant="ghost"
+            size="icon"
+            onClick={() => setTheme(theme === 'dark' ? 'light' : 'dark')}
+          >
+            <Sun className="size-4 rotate-0 scale-100 transition-all dark:-rotate-90 dark:scale-0" />
+            <Moon className="absolute size-4 rotate-90 scale-0 transition-all dark:rotate-0 dark:scale-100" />
+            <span className="sr-only">Toggle theme</span>
+          </Button>
+        </div>
       </div>
     </header>
   )
@@ -9053,9 +9336,40 @@ export function CmsProviders({ children }: { children: React.ReactNode }) {
 `;
 }
 
+// src/init/templates/components/layout/cms-search.ts
+function cmsSearchTemplate() {
+  return `import { Button } from '@cms/components/ui/button'
+import { Command, Search } from 'lucide-react'
+
+export const CmsSearch = () => {
+  return (
+    <div className="flex items-center gap-2 relative w-full max-w-[240px]">
+      <Button
+        variant="outline"
+        className="w-full text-left items-center pr-1! rounded-full"
+        size="sm"
+      >
+        <Search className="shrink-0 size-3.5 -ml-0.5 text-muted-foreground" strokeWidth={2} />
+        <span className="w-full font-medium text-xs pt-px text-muted-foreground leading-0">
+          Find...
+        </span>
+        <div className="flex items-center gap-1 py-0.5 border rounded-full corner-squircle px-2 border-border bg-background">
+          <Command className="size-3! text-muted-foreground" strokeWidth={1.5} />
+          <span className="font-mono text-xs font-medium">K</span>
+        </div>
+      </Button>
+    </div>
+  )
+}
+
+CmsSearch.displayName = 'CmsSearch'
+`;
+}
+
 // src/init/templates/components/layout/cms-sidebar.ts
 function cmsSidebarTemplate() {
-  return `import { getSession } from '@cms/auth/middleware'
+  return `import { getSetting } from '@/cms/lib/actions/settings'
+import { getSession } from '@cms/auth/middleware'
 import { Avatar, AvatarFallback, AvatarImage } from '@cms/components/ui/avatar'
 import {
   Collapsible,
@@ -9076,20 +9390,21 @@ import {
   SidebarRail,
   SidebarTrigger,
 } from '@cms/components/ui/sidebar'
+import { cms } from '@cms/data/cms'
 import { type CmsNavigationItem, cmsNavigation } from '@cms/data/navigation'
-import { ChevronRight } from 'lucide-react'
+import { ChevronRight, Settings, Users } from 'lucide-react'
 import Link from 'next/link'
 
 function NavItem({ item }: { item: CmsNavigationItem }) {
   if (item.children && item.children.length > 0) {
     return (
-      <Collapsible asChild defaultOpen className="group/collapsible">
+      <Collapsible asChild defaultOpen className="group/collapsible border-y border-border py-2 px-2">
         <SidebarMenuItem>
           <CollapsibleTrigger asChild>
             <SidebarMenuButton>
-              {item.icon && <item.icon className="h-4 w-4" />}
+              {item.icon && <item.icon className="size-3.5!" />}
               <span>{item.label}</span>
-              <ChevronRight className="ml-auto h-4 w-4 transition-transform duration-200 group-data-[state=open]/collapsible:rotate-90" />
+              <ChevronRight className="ml-auto size-3.5! transition-transform duration-200 group-data-[state=open]/collapsible:rotate-90" />
             </SidebarMenuButton>
           </CollapsibleTrigger>
           <CollapsibleContent>
@@ -9098,7 +9413,7 @@ function NavItem({ item }: { item: CmsNavigationItem }) {
                 <SidebarMenuSubItem key={child.href}>
                   <SidebarMenuSubButton asChild>
                     <Link href={child.href}>
-                      {child.icon && <child.icon className="h-4 w-4" />}
+                      {child.icon && <child.icon className="size-3.5!" />}
                       <span>{child.label}</span>
                     </Link>
                   </SidebarMenuSubButton>
@@ -9112,10 +9427,10 @@ function NavItem({ item }: { item: CmsNavigationItem }) {
   }
 
   return (
-    <SidebarMenuItem>
+    <SidebarMenuItem className="px-2">
       <SidebarMenuButton asChild>
         <Link href={item.href}>
-          {item.icon && <item.icon className="h-4 w-4" />}
+          {item.icon && <item.icon className="size-3.5!" />}
           <span>{item.label}</span>
         </Link>
       </SidebarMenuButton>
@@ -9125,32 +9440,51 @@ function NavItem({ item }: { item: CmsNavigationItem }) {
 
 export async function CmsSidebar(props: React.ComponentProps<typeof Sidebar>) {
   const session = await getSession()
+  const settings = await getSetting()
   const user = session?.user ?? null
 
   return (
     <Sidebar collapsible="icon" {...props}>
       <SidebarHeader className="border-b border-border h-14 items-center flex w-full">
         <div className="flex items-center gap-2 w-full relative h-full">
-          <div className="flex items-center gap-2 w-full">
-            <Avatar className="size-8">
-              <AvatarImage src={user?.image ?? ''} />
+          <Link href="/cms" className="flex items-center gap-2 w-full">
+            <Avatar className="size-6.5">
+              <AvatarImage src={'/favicon.ico'} />
               <AvatarFallback className="text-sm font-semibold">
-                {user?.name?.charAt(0)}
+                {settings?.siteName?.charAt(0) ?? cms.name?.charAt(0)}
               </AvatarFallback>
             </Avatar>
             <div className="flex items-center gap-1 w-full group-data-[collapsible=icon]:hidden">
-              <span className="text-base font-bold">CMS</span>
+              <span className="text-sm font-semibold line-clamp-1">{settings?.siteName ?? cms.name}</span>
             </div>
-          </div>
+          </Link>
           <SidebarTrigger className="hidden md:flex" />
         </div>
       </SidebarHeader>
-      <SidebarContent>
-        <SidebarMenu className="p-2 gap-1">
+      <SidebarContent className="gap-2">
+        <SidebarMenu className="py-2 gap-2">
           {cmsNavigation.map((item) => (
             <NavItem key={item.href + item.label} item={item} />
           ))}
         </SidebarMenu>
+        <SidebarMenu className="py-2 mt-auto border-t border-border px-2">
+          <SidebarMenuItem>
+            <SidebarMenuButton asChild>
+              <Link href="/cms/users">
+                <Users className="size-3.5!" />
+                <span>Users</span>
+              </Link>
+            </SidebarMenuButton>
+          </SidebarMenuItem>
+          <SidebarMenuItem>
+            <SidebarMenuButton asChild>
+              <Link href="/cms/settings">
+                <Settings className="size-3.5!" />
+                <span>Settings</span>
+              </Link>
+            </SidebarMenuButton>
+          </SidebarMenuItem>
+        </SidebarMenu>
       </SidebarContent>
       <SidebarFooter>
         {user && (
@@ -9315,9 +9649,17 @@ export function BooleanBadge({ value, trueLabel = 'Yes', falseLabel = 'No' }: {
 `;
 }
 
+// src/init/templates/data/cms.ts
+function cmsDataTemplate(projectName) {
+  return `export const cms = {
+  name: '${projectName}',
+}
+`;
+}
+
 // src/init/templates/data/navigation.ts
 function navigationDataTemplate() {
-  return `import { House, Settings, Users } from 'lucide-react'
+  return `import { House } from 'lucide-react'
 import type { LucideIcon } from 'lucide-react'
 
 export interface CmsNavigationItem {
@@ -9332,16 +9674,6 @@ export const cmsNavigation: CmsNavigationItem[] = [
     label: 'Dashboard',
     href: '/cms',
     icon: House
-  },
-  {
-    label: 'Users',
-    href: '/cms/users',
-    icon: Users
-  },
-  {
-    label: 'Settings',
-    href: '/cms/settings',
-    icon: Settings
   }
 ]
 `;
@@ -10114,6 +10446,11 @@ export interface UpdateUserRoleResult {
   error?: string
 }
 
+export interface DeleteUserResult {
+  success: boolean
+  error?: string
+}
+
 /**
  * Create a new user via Better Auth's built-in API
  */
@@ -10206,6 +10543,21 @@ export async function updateUserRole(
     }
   }
 }
+
+/**
+ * Delete a user
+ */
+export async function deleteUser(userId: string): Promise<DeleteUserResult> {
+  try {
+    await db.delete(user).where(eq(user.id, userId))
+    return { success: true }
+  } catch (error) {
+    return {
+      success: false,
+      error: error instanceof Error ? error.message : 'Failed to delete user',
+    }
+  }
+}
 `;
 }
 
@@ -10926,18 +11278,19 @@ export function sendWebhook(
 
 // src/init/scaffolders/components.ts
 function scaffoldComponents({ cwd, config }) {
-  const cms = path28.resolve(cwd, config.paths.cms);
+  const cms = path29.resolve(cwd, config.paths.cms);
   const created = [];
   function write(relPath, content) {
-    const fullPath = path28.join(cms, relPath);
+    const fullPath = path29.join(cms, relPath);
     if (safeWriteFile(fullPath, content)) {
-      created.push(path28.join(config.paths.cms, relPath));
+      created.push(path29.join(config.paths.cms, relPath));
     }
   }
   write("cms-globals.css", cmsGlobalsCssTemplate());
   write("components/layout/cms-providers.tsx", cmsProvidersTemplate());
   write("components/layout/cms-sidebar.tsx", cmsSidebarTemplate());
   write("components/layout/cms-header.tsx", cmsHeaderTemplate());
+  write("components/layout/cms-search.tsx", cmsSearchTemplate());
   write("components/shared/page-header.tsx", pageHeaderTemplate());
   write("components/shared/delete-dialog.tsx", deleteDialogTemplate());
   write("components/shared/status-badge.tsx", statusBadgeTemplate());
@@ -10960,6 +11313,8 @@ function scaffoldComponents({ cwd, config }) {
   write("hooks/use-local-storage.ts", useLocalStorageHookTemplate());
   write("hooks/use-cms-theme.tsx", useCmsThemeTemplate());
   write("hooks/use-users.ts", useUsersHookTemplate());
+  const projectName = detectProjectName(cwd);
+  write("data/cms.ts", cmsDataTemplate(projectName));
   write("data/navigation.ts", navigationDataTemplate());
   write("lib/r2.ts", r2ClientTemplate());
   write("lib/actions/form-settings.ts", formSettingsActionTemplate());
@@ -10974,18 +11329,18 @@ function scaffoldComponents({ cwd, config }) {
 }
 function copyUiTemplates(cwd, config) {
   const created = [];
-  const destDir = path28.resolve(cwd, config.paths.cms, "components", "ui");
+  const destDir = path29.resolve(cwd, config.paths.cms, "components", "ui");
   const cliRoot = findCliRoot();
-  const srcDir = path28.join(cliRoot, "templates", "ui");
-  if (!fs25.existsSync(srcDir)) {
+  const srcDir = path29.join(cliRoot, "templates", "ui");
+  if (!fs26.existsSync(srcDir)) {
     return created;
   }
-  const files = fs25.readdirSync(srcDir).filter((f) => f.endsWith(".tsx") || f.endsWith(".ts"));
+  const files = fs26.readdirSync(srcDir).filter((f) => f.endsWith(".tsx") || f.endsWith(".ts"));
   for (const file of files) {
-    const destPath = path28.join(destDir, file);
-    if (!fs25.existsSync(destPath)) {
-      fs25.copyFileSync(path28.join(srcDir, file), destPath);
-      created.push(path28.join(config.paths.cms, "components", "ui", file));
+    const destPath = path29.join(destDir, file);
+    if (!fs26.existsSync(destPath)) {
+      fs26.copyFileSync(path29.join(srcDir, file), destPath);
+      created.push(path29.join(config.paths.cms, "components", "ui", file));
     }
   }
   return created;
@@ -10993,25 +11348,25 @@ function copyUiTemplates(cwd, config) {
 function copyTiptapTemplates(cwd, config) {
   const created = [];
   const cliRoot = findCliRoot();
-  const srcDir = path28.join(cliRoot, "templates", "tiptap");
-  const destDir = path28.resolve(cwd, config.paths.cms, "components", "ui", "tiptap");
-  if (!fs25.existsSync(srcDir)) {
+  const srcDir = path29.join(cliRoot, "templates", "tiptap");
+  const destDir = path29.resolve(cwd, config.paths.cms, "components", "ui", "tiptap");
+  if (!fs26.existsSync(srcDir)) {
     return created;
   }
   copyDirRecursive(srcDir, destDir, config.paths.cms, created);
   return created;
 }
 function copyDirRecursive(src, dest, cmsPrefix, created) {
-  fs25.ensureDirSync(dest);
-  const entries = fs25.readdirSync(src, { withFileTypes: true });
+  fs26.ensureDirSync(dest);
+  const entries = fs26.readdirSync(src, { withFileTypes: true });
   for (const entry of entries) {
-    const srcPath = path28.join(src, entry.name);
-    const destPath = path28.join(dest, entry.name);
+    const srcPath = path29.join(src, entry.name);
+    const destPath = path29.join(dest, entry.name);
     if (entry.isDirectory()) {
       copyDirRecursive(srcPath, destPath, cmsPrefix, created);
-    } else if (!fs25.existsSync(destPath)) {
-      fs25.copyFileSync(srcPath, destPath);
-      const relFromCms = path28.relative(path28.resolve(dest, "..", "..", "..", ".."), destPath);
+    } else if (!fs26.existsSync(destPath)) {
+      fs26.copyFileSync(srcPath, destPath);
+      const relFromCms = path29.relative(path29.resolve(dest, "..", "..", "..", ".."), destPath);
       created.push(relFromCms);
     }
   }
@@ -11019,35 +11374,35 @@ function copyDirRecursive(src, dest, cmsPrefix, created) {
 function copySchemaMetaschema(cwd, config) {
   const created = [];
   const cliRoot = findCliRoot();
-  const srcPath = path28.join(cliRoot, "templates", "schema.json");
-  const destPath = path28.resolve(cwd, config.paths.schemas, "schema.json");
-  if (fs25.existsSync(srcPath) && !fs25.existsSync(destPath)) {
-    fs25.ensureDirSync(path28.dirname(destPath));
-    fs25.copyFileSync(srcPath, destPath);
-    created.push(path28.join(config.paths.schemas, "schema.json"));
+  const srcPath = path29.join(cliRoot, "templates", "schema.json");
+  const destPath = path29.resolve(cwd, config.paths.schemas, "schema.json");
+  if (fs26.existsSync(srcPath) && !fs26.existsSync(destPath)) {
+    fs26.ensureDirSync(path29.dirname(destPath));
+    fs26.copyFileSync(srcPath, destPath);
+    created.push(path29.join(config.paths.schemas, "schema.json"));
   }
   return created;
 }
 function findCliRoot() {
   let dir = new URL(".", import.meta.url).pathname;
   for (let i = 0; i < 5; i++) {
-    const pkgPath = path28.join(dir, "package.json");
-    if (fs25.existsSync(pkgPath)) {
+    const pkgPath = path29.join(dir, "package.json");
+    if (fs26.existsSync(pkgPath)) {
       try {
-        const pkg = JSON.parse(fs25.readFileSync(pkgPath, "utf-8"));
+        const pkg = JSON.parse(fs26.readFileSync(pkgPath, "utf-8"));
         if (pkg.name === "@betterstart/cli") {
           return dir;
         }
       } catch {
       }
     }
-    dir = path28.dirname(dir);
+    dir = path29.dirname(dir);
   }
-  return path28.resolve(new URL(".", import.meta.url).pathname, "..", "..");
+  return path29.resolve(new URL(".", import.meta.url).pathname, "..", "..");
 }
 
 // src/init/scaffolders/database.ts
-import path29 from "path";
+import path30 from "path";
 
 // src/init/templates/db/client.ts
 function dbClientTemplate() {
@@ -11176,16 +11531,16 @@ export const formSettings = pgTable(
 // src/init/scaffolders/database.ts
 function scaffoldDatabase({ cwd, config }) {
   const created = [];
-  const dbDir = path29.resolve(cwd, config.paths.cms, "db");
+  const dbDir = path30.resolve(cwd, config.paths.cms, "db");
   function write(filename, content) {
-    const fullPath = path29.join(dbDir, filename);
+    const fullPath = path30.join(dbDir, filename);
     if (safeWriteFile(fullPath, content)) {
-      created.push(path29.join(config.paths.cms, "db", filename));
+      created.push(path30.join(config.paths.cms, "db", filename));
     }
   }
   write("client.ts", dbClientTemplate());
   write("schema.ts", dbSchemaTemplate());
-  const drizzleConfigPath = path29.resolve(cwd, "drizzle.config.ts");
+  const drizzleConfigPath = path30.resolve(cwd, "drizzle.config.ts");
   if (safeWriteFile(drizzleConfigPath, drizzleConfigTemplate())) {
     created.push("drizzle.config.ts");
   }
@@ -11348,25 +11703,41 @@ async function installDependenciesAsync({
   }
 }
 
+// src/init/scaffolders/env.ts
+import crypto from "crypto";
+
 // src/utils/env.ts
-import fs26 from "fs";
-import path30 from "path";
-function appendEnvVars(cwd, sections) {
-  const envPath = path30.join(cwd, ".env.local");
-  const existing = fs26.existsSync(envPath) ? fs26.readFileSync(envPath, "utf-8") : "";
+import fs27 from "fs";
+import path31 from "path";
+function appendEnvVars(cwd, sections, overwrite) {
+  const envPath = path31.join(cwd, ".env.local");
+  let existing = fs27.existsSync(envPath) ? fs27.readFileSync(envPath, "utf-8") : "";
   const existingKeys = new Set(
     existing.split("\n").filter((line) => line.trim() && !line.trim().startsWith("#")).map((line) => line.split("=")[0]?.trim()).filter(Boolean)
   );
   const added = [];
   const skipped = [];
+  const updated = [];
   const lines = [];
+  if (overwrite) {
+    for (const section of sections) {
+      for (const v of section.vars) {
+        if (overwrite.has(v.key) && existingKeys.has(v.key)) {
+          const pattern = new RegExp(`^${v.key}=.*$`, "m");
+          const replacement = v.comment ? `${v.key}="${v.value}"  # ${v.comment}` : `${v.key}="${v.value}"`;
+          existing = existing.replace(pattern, replacement);
+          updated.push(v.key);
+        }
+      }
+    }
+  }
   if (existing.trim()) {
     lines.push("");
   }
   for (const section of sections) {
     const sectionVars = section.vars.filter((v) => {
       if (existingKeys.has(v.key)) {
-        skipped.push(v.key);
+        if (!updated.includes(v.key)) skipped.push(v.key);
         return false;
       }
       added.push(v.key);
@@ -11380,26 +11751,27 @@ function appendEnvVars(cwd, sections) {
     }
     lines.push("");
   }
-  if (added.length > 0) {
+  if (added.length > 0 || updated.length > 0) {
     const header = existing.trim() ? "" : "# ============================================\n# BetterStart CMS\n# ============================================\n";
     const content = existing.trim() ? `${existing.trimEnd()}
 ${lines.join("\n")}` : header + lines.join("\n");
-    fs26.writeFileSync(envPath, content);
+    fs27.writeFileSync(envPath, content);
   }
-  return { added, skipped };
+  return { added, skipped, updated };
 }
 
 // src/init/scaffolders/env.ts
-function getCoreEnvSections() {
+function getCoreEnvSections(databaseUrl) {
+  const authSecret = crypto.randomBytes(32).toString("base64");
   return [
     {
       header: "Database (Neon)",
-      vars: [{ key: "BETTERSTART_DATABASE_URL", value: "postgresql://..." }]
+      vars: [{ key: "BETTERSTART_DATABASE_URL", value: databaseUrl ?? "postgresql://..." }]
     },
     {
       header: "Authentication",
       vars: [
-        { key: "BETTERSTART_AUTH_SECRET", value: "", comment: "openssl rand -base64 32" },
+        { key: "BETTERSTART_AUTH_SECRET", value: authSecret },
         { key: "BETTERSTART_AUTH_URL", value: "http://localhost:3000" },
         { key: "BETTERSTART_AUTH_BASE_PATH", value: "/api/cms/auth" }
       ]
@@ -11426,15 +11798,16 @@ function getEmailEnvSection() {
   };
 }
 function scaffoldEnv(cwd, options) {
-  const sections = getCoreEnvSections();
+  const sections = getCoreEnvSections(options.databaseUrl);
   if (options.includeEmail) {
     sections.push(getEmailEnvSection());
   }
-  return appendEnvVars(cwd, sections);
+  const overwrite = options.databaseUrl ? /* @__PURE__ */ new Set(["BETTERSTART_DATABASE_URL"]) : void 0;
+  return appendEnvVars(cwd, sections, overwrite);
 }
 
 // src/init/scaffolders/layout.ts
-import path31 from "path";
+import path32 from "path";
 
 // src/init/templates/pages/authenticated-layout.ts
 function authenticatedLayoutTemplate() {
@@ -11930,23 +12303,38 @@ export function EditRoleDialog({
 function usersColumnsTemplate() {
   return `'use client'
 
+import React from 'react'
 import {
   Avatar,
   AvatarFallback
 } from '@cms/components/ui/avatar'
-import { Badge } from '@cms/components/ui/badge'
-import { Button } from '@cms/components/ui/button'
 import {
-  DropdownMenu,
-  DropdownMenuContent,
-  DropdownMenuItem,
+  AlertDialog,
+  AlertDialogAction,
+  AlertDialogCancel,
+  AlertDialogContent,
+  AlertDialogDescription,
+  AlertDialogFooter,
+  AlertDialogHeader,
+  AlertDialogTitle,
+  AlertDialogTrigger,
+} from '@cms/components/ui/alert-dialog'
+import { Badge } from '@cms/components/ui/badge'
+import { Button } from '@cms/components/ui/button'
+import {
+  DropdownMenu,
+  DropdownMenuContent,
+  DropdownMenuItem,
   DropdownMenuLabel,
   DropdownMenuSeparator,
   DropdownMenuTrigger
 } from '@cms/components/ui/dropdown-menu'
 import type { UserData } from '@cms/types/auth'
 import type { ColumnDef } from '@tanstack/react-table'
-import { ArrowUpDown, Edit, MoreHorizontal } from 'lucide-react'
+import { useQueryClient } from '@tanstack/react-query'
+import { ArrowUpDown, Edit, MoreHorizontal, Trash } from 'lucide-react'
+import { toast } from 'sonner'
+import { deleteUser } from '@cms/actions/users'
 import { EditRoleDialog } from './edit-role-dialog'
 
 function getInitials(nameOrEmail: string): string {
@@ -11960,6 +12348,77 @@ function getInitials(nameOrEmail: string): string {
     .join('')
 }
 
+function DeleteUserAction({
+  userId,
+  userName,
+  isCurrentUser,
+}: {
+  userId: string
+  userName: string
+  isCurrentUser: boolean
+}) {
+  const [open, setOpen] = React.useState(false)
+  const [isPending, startTransition] = React.useTransition()
+  const queryClient = useQueryClient()
+
+  if (isCurrentUser) return null
+
+  const handleDelete = () => {
+    startTransition(async () => {
+      try {
+        const result = await deleteUser(userId)
+
+        if (result.success) {
+          toast.success('User deleted successfully')
+          queryClient.refetchQueries({ queryKey: ['users'] })
+          setOpen(false)
+        } else {
+          toast.error(result.error || 'Failed to delete user')
+        }
+      } catch (error) {
+        toast.error('An error occurred')
+        console.error(error)
+      }
+    })
+  }
+
+  return (
+    <AlertDialog open={open} onOpenChange={setOpen}>
+      <AlertDialogTrigger asChild>
+        <DropdownMenuItem
+          className="text-destructive"
+          onSelect={(e) => e.preventDefault()}
+        >
+          <Trash className="size-4 mr-2" />
+          Delete user
+        </DropdownMenuItem>
+      </AlertDialogTrigger>
+      <AlertDialogContent>
+        <AlertDialogHeader>
+          <AlertDialogTitle>Are you sure?</AlertDialogTitle>
+          <AlertDialogDescription>
+            This action cannot be undone. This will permanently delete{' '}
+            <strong>{userName}</strong> and all of their data.
+          </AlertDialogDescription>
+        </AlertDialogHeader>
+        <AlertDialogFooter>
+          <AlertDialogCancel disabled={isPending}>Cancel</AlertDialogCancel>
+          <AlertDialogAction
+            onClick={(e) => {
+              e.preventDefault()
+              handleDelete()
+            }}
+            disabled={isPending}
+            className="bg-destructive text-destructive-foreground hover:bg-destructive/90"
+          >
+            {isPending ? 'Deleting...' : 'Delete'}
+          </AlertDialogAction>
+        </AlertDialogFooter>
+      </AlertDialogContent>
+    </AlertDialog>
+  )
+}
+
 export const columns: ColumnDef<UserData>[] = [
   {
     accessorKey: 'email',
@@ -12058,30 +12517,37 @@ export const columns: ColumnDef<UserData>[] = [
   },
   {
     id: 'actions',
-    cell: ({ row }) => (
-      <div className="flex justify-end">
-        <DropdownMenu>
-          <DropdownMenuTrigger asChild>
-            <Button variant="ghost" className="size-8 p-0">
-              <span className="sr-only">Open menu</span>
-              <MoreHorizontal className="size-4" />
-            </Button>
-          </DropdownMenuTrigger>
-          <DropdownMenuContent align="end">
-            <DropdownMenuLabel>Actions</DropdownMenuLabel>
-            <DropdownMenuItem
-              onClick={() => navigator.clipboard.writeText(row.original.id)}
-            >
-              Copy user ID
-            </DropdownMenuItem>
-            <DropdownMenuSeparator />
-            <DropdownMenuItem className="text-destructive">
-              Delete user
-            </DropdownMenuItem>
-          </DropdownMenuContent>
-        </DropdownMenu>
-      </div>
-    )
+    cell: ({ row, table }) => {
+      const currentUser = table.options.meta?.currentUser
+      const isCurrentUser = currentUser?.email === row.original.email
+
+      return (
+        <div className="flex justify-end">
+          <DropdownMenu>
+            <DropdownMenuTrigger asChild>
+              <Button variant="ghost" className="size-8 p-0">
+                <span className="sr-only">Open menu</span>
+                <MoreHorizontal className="size-4" />
+              </Button>
+            </DropdownMenuTrigger>
+            <DropdownMenuContent align="end">
+              <DropdownMenuLabel>Actions</DropdownMenuLabel>
+              <DropdownMenuItem
+                onClick={() => navigator.clipboard.writeText(row.original.id)}
+              >
+                Copy user ID
+              </DropdownMenuItem>
+              <DropdownMenuSeparator />
+              <DeleteUserAction
+                userId={row.original.id}
+                userName={row.original.name}
+                isCurrentUser={isCurrentUser}
+              />
+            </DropdownMenuContent>
+          </DropdownMenu>
+        </div>
+      )
+    }
   }
 ]
 `;
@@ -12100,7 +12566,7 @@ export default function UsersPage() {
       <div className="flex items-center justify-between bg-card px-6 py-4 border-b">
         <PageHeader
           title="Users"
-          description="Manage and view all registered users"
+          description="Manage all CMS users"
         >
           <CreateUserDialog />
         </PageHeader>
@@ -12260,30 +12726,30 @@ export function UsersTable<TValue>({ columns }: UsersTableProps<TValue>) {
 function scaffoldLayout({ cwd, config }) {
   const created = [];
   function write(relPath, content) {
-    const fullPath = path31.resolve(cwd, relPath);
-    ensureDir(path31.dirname(fullPath));
+    const fullPath = path32.resolve(cwd, relPath);
+    ensureDir(path32.dirname(fullPath));
     if (safeWriteFile(fullPath, content)) {
       created.push(relPath);
     }
   }
-  const cmsDir = path31.dirname(config.paths.pages);
-  write(path31.join(cmsDir, "layout.tsx"), cmsLayoutTemplate());
-  write(path31.join(config.paths.pages, "layout.tsx"), authenticatedLayoutTemplate());
-  write(path31.join(config.paths.login, "page.tsx"), loginPageTemplate());
-  write(path31.join(config.paths.login, "login-form.tsx"), loginFormTemplate());
-  write(path31.join(config.paths.pages, "page.tsx"), dashboardPageTemplate());
-  const usersDir = path31.join(config.paths.pages, "users");
-  write(path31.join(usersDir, "page.tsx"), usersPageTemplate());
-  write(path31.join(usersDir, "users-table.tsx"), usersTableTemplate());
-  write(path31.join(usersDir, "columns.tsx"), usersColumnsTemplate());
-  write(path31.join(usersDir, "create-user-dialog.tsx"), createUserDialogTemplate());
-  write(path31.join(usersDir, "edit-role-dialog.tsx"), editRoleDialogTemplate());
+  const cmsDir = path32.dirname(config.paths.pages);
+  write(path32.join(cmsDir, "layout.tsx"), cmsLayoutTemplate());
+  write(path32.join(config.paths.pages, "layout.tsx"), authenticatedLayoutTemplate());
+  write(path32.join(config.paths.login, "page.tsx"), loginPageTemplate());
+  write(path32.join(config.paths.login, "login-form.tsx"), loginFormTemplate());
+  write(path32.join(config.paths.pages, "page.tsx"), dashboardPageTemplate());
+  const usersDir = path32.join(config.paths.pages, "users");
+  write(path32.join(usersDir, "page.tsx"), usersPageTemplate());
+  write(path32.join(usersDir, "users-table.tsx"), usersTableTemplate());
+  write(path32.join(usersDir, "columns.tsx"), usersColumnsTemplate());
+  write(path32.join(usersDir, "create-user-dialog.tsx"), createUserDialogTemplate());
+  write(path32.join(usersDir, "edit-role-dialog.tsx"), editRoleDialogTemplate());
   return created;
 }
 
 // src/init/scaffolders/preset.ts
-import fs27 from "fs";
-import path32 from "path";
+import fs28 from "fs";
+import path33 from "path";
 
 // src/init/templates/presets/blog-categories.ts
 function blogCategoriesSchema() {
@@ -12293,6 +12759,7 @@ function blogCategoriesSchema() {
       label: "Categories",
       description: "Organize posts with categories",
       icon: "Tag",
+      navGroup: { label: "Blog", icon: "BookOpen" },
       fields: [
         {
           name: "name",
@@ -12374,6 +12841,7 @@ function blogPostsSchema() {
       label: "Posts",
       description: "Manage blog posts and articles",
       icon: "FileText",
+      navGroup: { label: "Blog", icon: "BookOpen" },
       fields: [
         {
           name: "title",
@@ -12469,17 +12937,11 @@ function defaultSettingsSchema() {
       description: "General site settings",
       icon: "Settings",
       fields: [
-        { name: "siteName", type: "string", label: "Site Name", required: true },
+        { name: "siteName", type: "string", label: "Site Name", default: "BetterStart" },
         { name: "tagline", type: "string", label: "Tagline" },
         { name: "separator1", type: "separator" },
         { name: "logo", type: "image", label: "Logo" },
-        { name: "favicon", type: "image", label: "Favicon" },
-        { name: "separator2", type: "separator" },
-        { name: "contactEmail", type: "string", label: "Contact Email" },
-        { name: "socialTwitter", type: "string", label: "Twitter / X URL" },
-        { name: "socialInstagram", type: "string", label: "Instagram URL" },
-        { name: "socialLinkedin", type: "string", label: "LinkedIn URL" },
-        { name: "socialGithub", type: "string", label: "GitHub URL" }
+        { name: "favicon", type: "image", label: "Favicon" }
       ]
     },
     null,
@@ -12691,15 +13153,15 @@ function scaffoldPreset({
     generatedFiles: [],
     errors: []
   };
-  const schemasDir = path32.join(cwd, config.paths?.schemas ?? "./cms/schemas");
+  const schemasDir = path33.join(cwd, config.paths?.schemas ?? "./cms/schemas");
   const presetSchemas = getPresetSchemas(preset);
   for (const ps of presetSchemas) {
-    const filePath = path32.join(schemasDir, ps.filename);
-    const dir = path32.dirname(filePath);
-    if (!fs27.existsSync(dir)) {
-      fs27.mkdirSync(dir, { recursive: true });
+    const filePath = path33.join(schemasDir, ps.filename);
+    const dir = path33.dirname(filePath);
+    if (!fs28.existsSync(dir)) {
+      fs28.mkdirSync(dir, { recursive: true });
     }
-    fs27.writeFileSync(filePath, ps.content, "utf-8");
+    fs28.writeFileSync(filePath, ps.content, "utf-8");
     result.schemas.push(ps.filename);
   }
   for (const ps of presetSchemas) {
@@ -12734,8 +13196,8 @@ function scaffoldPreset({
 }
 
 // src/init/scaffolders/tailwind.ts
-import fs28 from "fs";
-import path33 from "path";
+import fs29 from "fs";
+import path34 from "path";
 var SOURCE_LINES = ['@source "../cms/**/*.{ts,tsx}";', '@source "./(cms)/**/*.{ts,tsx}";'];
 var SOURCE_LINES_SRC = ['@source "../../cms/**/*.{ts,tsx}";', '@source "./(cms)/**/*.{ts,tsx}";'];
 var CMS_THEME_BLOCK = `
@@ -12790,8 +13252,8 @@ function findMainCss(cwd) {
     "globals.css"
   ];
   for (const candidate of candidates) {
-    const filePath = path33.join(cwd, candidate);
-    if (fs28.existsSync(filePath)) {
+    const filePath = path34.join(cwd, candidate);
+    if (fs29.existsSync(filePath)) {
       return filePath;
     }
   }
@@ -12802,7 +13264,7 @@ function scaffoldTailwind(cwd, hasSrcDir) {
   if (!cssFile) {
     return { file: null, appended: false };
   }
-  let content = fs28.readFileSync(cssFile, "utf-8");
+  let content = fs29.readFileSync(cssFile, "utf-8");
   let changed = false;
   const sourceLines = hasSrcDir ? SOURCE_LINES_SRC : SOURCE_LINES;
   const missingLines = sourceLines.filter((sl) => !content.includes(sl));
@@ -12854,14 +13316,14 @@ ${CMS_THEME_BLOCK}
     }
   }
   if (changed) {
-    fs28.writeFileSync(cssFile, content, "utf-8");
+    fs29.writeFileSync(cssFile, content, "utf-8");
   }
   return { file: cssFile, appended: changed };
 }
 
 // src/init/scaffolders/tsconfig.ts
-import fs29 from "fs";
-import path34 from "path";
+import fs30 from "fs";
+import path35 from "path";
 function stripJsonComments(input) {
   let result = "";
   let i = 0;
@@ -12911,14 +13373,14 @@ var CMS_PATH_ALIASES = {
   "@cms/cache/*": ["./cms/lib/cache/*"]
 };
 function scaffoldTsconfig(cwd) {
-  const tsconfigPath = path34.join(cwd, "tsconfig.json");
+  const tsconfigPath = path35.join(cwd, "tsconfig.json");
   const added = [];
   const skipped = [];
-  if (!fs29.existsSync(tsconfigPath)) {
+  if (!fs30.existsSync(tsconfigPath)) {
     skipped.push("tsconfig.json not found");
     return { added, skipped };
   }
-  const raw = fs29.readFileSync(tsconfigPath, "utf-8");
+  const raw = fs30.readFileSync(tsconfigPath, "utf-8");
   const stripped = stripJsonComments(raw).replace(/,\s*([\]}])/g, "$1");
   let tsconfig;
   try {
@@ -12939,350 +13401,567 @@ function scaffoldTsconfig(cwd) {
   }
   compilerOptions.paths = paths;
   tsconfig.compilerOptions = compilerOptions;
-  fs29.writeFileSync(tsconfigPath, `${JSON.stringify(tsconfig, null, 2)}
+  fs30.writeFileSync(tsconfigPath, `${JSON.stringify(tsconfig, null, 2)}
 `, "utf-8");
   return { added, skipped };
 }
 
-// src/utils/detect.ts
-import fs30 from "fs";
-import path35 from "path";
-var NEXT_CONFIG_FILES = ["next.config.ts", "next.config.js", "next.config.mjs"];
-function detectProject(cwd) {
-  const isExisting = NEXT_CONFIG_FILES.some((f) => fs30.existsSync(path35.join(cwd, f)));
-  const hasSrcDir = fs30.existsSync(path35.join(cwd, "src"));
-  const hasTypeScript = fs30.existsSync(path35.join(cwd, "tsconfig.json")) || fs30.existsSync(path35.join(cwd, "tsconfig.app.json"));
-  const hasTailwind = detectTailwind(cwd);
-  const linter = detectLinter(cwd);
-  const conflicts = [];
-  if (isExisting) {
-    if (fs30.existsSync(path35.join(cwd, "cms"))) {
-      conflicts.push("cms/ directory already exists");
-    }
-    if (fs30.existsSync(path35.join(cwd, "cms.config.ts"))) {
-      conflicts.push("cms.config.ts already exists");
-    }
-    const appBase = hasSrcDir ? "src/app" : "app";
-    if (fs30.existsSync(path35.join(cwd, appBase, "(cms)"))) {
-      conflicts.push(`${appBase}/(cms)/ route group already exists`);
-    }
-    if (hasTsconfigCmsAliases(cwd)) {
-      conflicts.push("@cms/* path aliases already exist in tsconfig.json");
-    }
-    if (hasEnvBetterstartVars(cwd)) {
-      conflicts.push("BETTERSTART_* variables already exist in .env.local");
-    }
+// src/commands/seed.ts
+import fs31 from "fs";
+import path36 from "path";
+import * as clack from "@clack/prompts";
+import { Command as Command2 } from "commander";
+function buildSeedScript() {
+  return `/**
+ * BetterStart CMS \u2014 Seed Script
+ * Creates the initial admin user
+ * AUTO-GENERATED \u2014 safe to delete after running
+ */
+
+import { loadEnvConfig } from '@next/env'
+loadEnvConfig(process.cwd())
+
+import { neon } from '@neondatabase/serverless'
+import { drizzle } from 'drizzle-orm/neon-http'
+import { eq } from 'drizzle-orm'
+import * as schema from '../db/schema'
+import { betterAuth } from 'better-auth'
+import { drizzleAdapter } from 'better-auth/adapters/drizzle'
+
+// Inline DB connection (mirrors cms/db/client.ts)
+const sql = neon(process.env.BETTERSTART_DATABASE_URL!)
+const db = drizzle({ client: sql, schema })
+
+// Inline auth setup (mirrors cms/lib/auth/auth.ts)
+const auth = betterAuth({
+  secret: process.env.BETTERSTART_AUTH_SECRET,
+  baseURL: process.env.BETTERSTART_AUTH_URL,
+  basePath: process.env.BETTERSTART_AUTH_BASE_PATH || '/api/cms/auth',
+  database: drizzleAdapter(db, {
+    provider: 'pg',
+    schema: {
+      user: schema.user,
+      session: schema.session,
+      account: schema.account,
+      verification: schema.verification,
+    },
+  }),
+  emailAndPassword: { enabled: true, minPasswordLength: 8 },
+  user: {
+    additionalFields: {
+      role: { type: 'string', required: false, defaultValue: 'member', input: false },
+    },
+  },
+})
+
+const EMAIL = process.env.SEED_EMAIL!
+const PASSWORD = process.env.SEED_PASSWORD!
+const NAME = process.env.SEED_NAME || 'Admin'
+
+async function main() {
+  console.log('\\n  Creating admin user...')
+  console.log(\`  Email: \${EMAIL}\\n\`)
+
+  const result = await auth.api.signUpEmail({
+    body: { email: EMAIL, password: PASSWORD, name: NAME },
+  })
+
+  if (!result?.user) {
+    console.error('  Failed to create user.')
+    process.exit(1)
   }
-  return { isExisting, hasSrcDir, hasTypeScript, hasTailwind, linter, conflicts };
+
+  await db
+    .update(schema.user)
+    .set({ role: 'admin' })
+    .where(eq(schema.user.id, result.user.id))
+
+  console.log(\`  Admin user created: \${EMAIL}\`)
+  console.log('  Role: admin\\n')
+  process.exit(0)
 }
-var BIOME_CONFIG_FILES = ["biome.json", "biome.jsonc"];
-var ESLINT_CONFIG_FILES = [
-  "eslint.config.js",
-  "eslint.config.mjs",
-  "eslint.config.cjs",
-  "eslint.config.ts",
-  ".eslintrc.json",
-  ".eslintrc.js",
-  ".eslintrc.cjs",
-  ".eslintrc.yml",
-  ".eslintrc.yaml",
-  ".eslintrc"
-];
-function detectLinter(cwd) {
-  for (const f of BIOME_CONFIG_FILES) {
-    if (fs30.existsSync(path35.join(cwd, f))) {
-      return { type: "biome", configFile: f };
-    }
+
+main().catch((err) => {
+  console.error('  Seed failed:', err.message || err)
+  process.exit(1)
+})
+`;
+}
+var seedCommand = new Command2("seed").description("Create the initial admin user").option("--cwd <path>", "Project root path").action(async (options) => {
+  const cwd = options.cwd ? path36.resolve(options.cwd) : process.cwd();
+  clack.intro("BetterStart Seed");
+  let config;
+  try {
+    config = await resolveConfig(cwd);
+  } catch (err) {
+    clack.cancel(`Error loading config: ${err instanceof Error ? err.message : String(err)}`);
+    process.exit(1);
   }
-  for (const f of ESLINT_CONFIG_FILES) {
-    if (fs30.existsSync(path35.join(cwd, f))) {
-      return { type: "eslint", configFile: f };
+  const cmsDir = config.paths?.cms ?? "./cms";
+  const email = await clack.text({
+    message: "Admin email",
+    placeholder: "admin@example.com",
+    validate: (v) => {
+      if (!v || !v.includes("@")) return "Please enter a valid email";
     }
+  });
+  if (clack.isCancel(email)) {
+    clack.cancel("Cancelled.");
+    process.exit(0);
   }
-  const pkgPath = path35.join(cwd, "package.json");
-  if (fs30.existsSync(pkgPath)) {
-    try {
-      const pkg = JSON.parse(fs30.readFileSync(pkgPath, "utf-8"));
-      if (pkg.eslintConfig) {
-        return { type: "eslint", configFile: "package.json (eslintConfig)" };
-      }
-    } catch {
+  const password3 = await clack.password({
+    message: "Admin password",
+    validate: (v) => {
+      if (!v || v.length < 8) return "Password must be at least 8 characters";
     }
+  });
+  if (clack.isCancel(password3)) {
+    clack.cancel("Cancelled.");
+    process.exit(0);
   }
-  return { type: "none", configFile: null };
-}
-function detectTailwind(cwd) {
-  const cssFiles = ["globals.css", "app.css", "index.css"].flatMap((f) => [
-    path35.join(cwd, "src", "app", f),
-    path35.join(cwd, "app", f),
-    path35.join(cwd, "src", f),
-    path35.join(cwd, f)
-  ]);
-  for (const cssFile of cssFiles) {
-    if (fs30.existsSync(cssFile)) {
-      const content = fs30.readFileSync(cssFile, "utf-8");
-      if (content.includes('@import "tailwindcss"') || content.includes("@import 'tailwindcss'") || content.includes("@theme")) {
-        return true;
-      }
-    }
+  const name = await clack.text({
+    message: "Admin name",
+    placeholder: "Admin",
+    defaultValue: "Admin"
+  });
+  if (clack.isCancel(name)) {
+    clack.cancel("Cancelled.");
+    process.exit(0);
   }
-  const postcssFiles = ["postcss.config.js", "postcss.config.mjs", "postcss.config.cjs"];
-  for (const f of postcssFiles) {
-    if (fs30.existsSync(path35.join(cwd, f))) {
-      const content = fs30.readFileSync(path35.join(cwd, f), "utf-8");
-      if (content.includes("tailwindcss") || content.includes("@tailwindcss")) {
-        return true;
-      }
-    }
+  const scriptsDir = path36.join(cwd, cmsDir, "scripts");
+  const seedPath = path36.join(scriptsDir, "seed.ts");
+  if (!fs31.existsSync(scriptsDir)) {
+    fs31.mkdirSync(scriptsDir, { recursive: true });
   }
-  return false;
-}
-function hasTsconfigCmsAliases(cwd) {
-  const tsconfigPath = path35.join(cwd, "tsconfig.json");
-  if (!fs30.existsSync(tsconfigPath)) return false;
+  fs31.writeFileSync(seedPath, buildSeedScript(), "utf-8");
+  const spinner3 = clack.spinner();
+  spinner3.start("Creating admin user...");
   try {
-    const content = fs30.readFileSync(tsconfigPath, "utf-8");
-    return content.includes("@cms/");
-  } catch {
-    return false;
+    const { execFileSync: execFileSync5 } = await import("child_process");
+    execFileSync5("npx", ["tsx", seedPath], {
+      cwd,
+      stdio: "pipe",
+      env: {
+        ...process.env,
+        SEED_EMAIL: email,
+        SEED_PASSWORD: password3,
+        SEED_NAME: name || "Admin"
+      }
+    });
+    spinner3.stop("Admin user created");
+  } catch (err) {
+    spinner3.stop("Failed to create admin user");
+    const errMsg = err instanceof Error ? err.message : String(err);
+    clack.log.error(errMsg);
+    clack.log.info("You can run the seed script manually:");
+    clack.log.info(
+      `  SEED_EMAIL="${email}" SEED_PASSWORD="..." npx tsx ${path36.relative(cwd, seedPath)}`
+    );
+    clack.outro("");
+    process.exit(1);
   }
-}
-function hasEnvBetterstartVars(cwd) {
-  const envPath = path35.join(cwd, ".env.local");
-  if (!fs30.existsSync(envPath)) return false;
   try {
-    const content = fs30.readFileSync(envPath, "utf-8");
-    return content.includes("BETTERSTART_");
+    fs31.unlinkSync(seedPath);
+    if (fs31.existsSync(scriptsDir) && fs31.readdirSync(scriptsDir).length === 0) {
+      fs31.rmdirSync(scriptsDir);
+    }
   } catch {
-    return false;
   }
-}
+  clack.outro(`Admin user ready: ${email}`);
+});
 
 // src/commands/init.ts
-var initCommand = new Command2("init").description("Scaffold CMS into a new or existing Next.js project").argument("[name]", "Project name (creates new directory if fresh project)").option("--preset <preset>", "Starter preset: blank, blog, or full", "blog").option("-y, --yes", "Skip all prompts (accept defaults)").action(async (name, options) => {
-  p3.intro(pc.bgCyan(pc.black(" BetterStart CMS ")));
-  let cwd = process.cwd();
-  let project = detectProject(cwd);
-  let pm = detectPackageManager(cwd);
-  p3.log.info(`Package manager: ${pc.cyan(pm)}`);
-  let srcDir;
-  if (project.isExisting) {
-    p3.log.info(`Existing Next.js project detected`);
-    srcDir = project.hasSrcDir;
-    if (!project.hasTypeScript) {
-      p3.log.error("TypeScript is required. Please add a tsconfig.json first.");
-      process.exit(1);
-    }
-    if (project.conflicts.length > 0) {
-      p3.log.error("Conflicts detected:");
-      for (const conflict of project.conflicts) {
-        p3.log.warning(`  - ${conflict}`);
+var initCommand = new Command3("init").description("Scaffold CMS into a new or existing Next.js project").argument("[name]", "Project name (creates new directory if fresh project)").option("--preset <preset>", "Starter preset: blank, blog, or full", "blog").option("-y, --yes", "Skip all prompts (accept defaults)").option(
+  "--database-url <url>",
+  "PostgreSQL database connection string (postgres:// or postgresql://)"
+).action(
+  async (name, options) => {
+    p4.intro(pc2.bgCyan(pc2.black(" BetterStart CMS ")));
+    let cwd = process.cwd();
+    let project = detectProject(cwd);
+    let pm = detectPackageManager(cwd);
+    let srcDir;
+    if (project.isExisting) {
+      p4.log.info(`Existing Next.js project detected`);
+      p4.log.info(`Package manager: ${pc2.cyan(pm)}`);
+      srcDir = project.hasSrcDir;
+      if (!project.hasTypeScript) {
+        p4.log.error("TypeScript is required. Please add a tsconfig.json first.");
+        process.exit(1);
       }
+      if (project.conflicts.length > 0) {
+        p4.log.error("Conflicts detected:");
+        for (const conflict of project.conflicts) {
+          p4.log.warning(`  - ${conflict}`);
+        }
+        if (!options.yes) {
+          const proceed = await p4.confirm({
+            message: "Continue anyway? (existing files will NOT be overwritten)",
+            initialValue: true
+          });
+          if (p4.isCancel(proceed) || !proceed) {
+            p4.cancel("Setup cancelled.");
+            process.exit(0);
+          }
+        }
+      }
+    } else {
+      p4.log.info("No Next.js project found \u2014 fresh project mode");
+      const projectPrompt = await promptProject(name);
+      srcDir = projectPrompt.useSrcDir;
       if (!options.yes) {
-        const proceed = await p3.confirm({
-          message: "Continue anyway? (existing files will NOT be overwritten)",
-          initialValue: true
+        const pmChoice = await p4.select({
+          message: "Which package manager do you want to use?",
+          options: [
+            { value: "pnpm", label: "pnpm", hint: "recommended" },
+            { value: "npm", label: "npm" },
+            { value: "yarn", label: "yarn" },
+            { value: "bun", label: "bun" }
+          ]
         });
-        if (p3.isCancel(proceed) || !proceed) {
-          p3.cancel("Setup cancelled.");
+        if (p4.isCancel(pmChoice)) {
+          p4.cancel("Setup cancelled.");
           process.exit(0);
         }
+        pm = pmChoice;
+      }
+      const cnaSpinner = p4.spinner();
+      cnaSpinner.start(`Creating Next.js app: ${projectPrompt.projectName}...`);
+      try {
+        const cnaArgs = [
+          "create-next-app@latest",
+          projectPrompt.projectName,
+          "--typescript",
+          "--tailwind",
+          "--app",
+          "--no-git",
+          "--no-import-alias",
+          "--turbopack",
+          `--use-${pm}`
+        ];
+        if (srcDir) cnaArgs.push("--src-dir");
+        else cnaArgs.push("--no-src-dir");
+        execFileSync4("npx", cnaArgs, {
+          cwd,
+          stdio: "pipe",
+          timeout: 12e4
+        });
+        cnaSpinner.stop(`Created ${projectPrompt.projectName}`);
+      } catch (err) {
+        cnaSpinner.stop("Failed to create Next.js app");
+        p4.log.error(err instanceof Error ? err.message : "create-next-app failed");
+        p4.log.info(
+          `You can create the project manually:
+  ${pc2.cyan(`npx create-next-app@latest ${projectPrompt.projectName} --typescript --tailwind --app`)}
+  Then run ${pc2.cyan("betterstart init")} inside it.`
+        );
+        process.exit(1);
       }
+      cwd = path37.resolve(cwd, projectPrompt.projectName);
+      project = detectProject(cwd);
+    }
+    const features = options.yes ? { includeEmail: true, preset: options.preset } : await promptFeatures(options.preset);
+    let databaseUrl;
+    const existingDbUrl = readExistingDbUrl(cwd);
+    if (options.yes) {
+      if (options.databaseUrl) {
+        if (!isValidDbUrl(options.databaseUrl)) {
+          p4.log.error(
+            `Invalid database URL. Must start with ${pc2.cyan("postgres://")} or ${pc2.cyan("postgresql://")}`
+          );
+          process.exit(1);
+        }
+        databaseUrl = options.databaseUrl;
+      } else if (existingDbUrl) {
+        databaseUrl = existingDbUrl;
+      }
+    } else if (existingDbUrl) {
+      const masked = maskDbUrl(existingDbUrl);
+      p4.log.info(`Using existing database URL from .env.local ${pc2.dim(`(${masked})`)}`);
+      databaseUrl = existingDbUrl;
+    } else {
+      const dbResult = await promptDatabase();
+      databaseUrl = dbResult.url;
     }
-  } else {
-    p3.log.info("No Next.js project found \u2014 fresh project mode");
-    const projectPrompt = await promptProject(name);
-    srcDir = projectPrompt.useSrcDir;
-    const cnaSpinner = p3.spinner();
-    cnaSpinner.start(`Creating Next.js app: ${projectPrompt.projectName}...`);
-    try {
-      const cnaArgs = [
-        "create-next-app@latest",
-        projectPrompt.projectName,
-        "--typescript",
-        "--tailwind",
-        "--app",
-        "--no-git",
-        "--no-import-alias",
-        "--turbopack"
-      ];
-      if (srcDir) cnaArgs.push("--src-dir");
-      else cnaArgs.push("--no-src-dir");
-      execFileSync3("npx", cnaArgs, {
-        cwd,
-        stdio: "pipe",
-        timeout: 12e4
-      });
-      cnaSpinner.stop(`Created ${projectPrompt.projectName}`);
-    } catch (err) {
-      cnaSpinner.stop("Failed to create Next.js app");
-      p3.log.error(err instanceof Error ? err.message : "create-next-app failed");
-      p3.log.info(
-        `You can create the project manually:
-  ${pc.cyan(`npx create-next-app@latest ${projectPrompt.projectName} --typescript --tailwind --app`)}
-  Then run ${pc.cyan("betterstart init")} inside it.`
+    const config = {
+      ...getDefaultConfig(srcDir),
+      features: { email: features.includeEmail }
+    };
+    const s = p4.spinner();
+    s.start("Creating CMS directory structure...");
+    const baseFiles = scaffoldBase({ cwd, config });
+    s.stop(`Created ${baseFiles.length} files`);
+    s.start("Configuring TypeScript path aliases...");
+    const tsResult = scaffoldTsconfig(cwd);
+    s.stop(`Added ${tsResult.added.length} path aliases`);
+    s.start("Configuring Tailwind CSS...");
+    const twResult = scaffoldTailwind(cwd, srcDir);
+    if (twResult.appended) {
+      s.stop(`Updated ${twResult.file}`);
+    } else if (twResult.file) {
+      s.stop("Tailwind already configured for CMS");
+    } else {
+      s.stop("No CSS file found (will configure later)");
+    }
+    s.start("Setting up environment variables...");
+    const envResult = scaffoldEnv(cwd, { includeEmail: features.includeEmail, databaseUrl });
+    const envParts = [`Added ${envResult.added.length}`];
+    if (envResult.updated.length > 0) envParts.push(`updated ${envResult.updated.length}`);
+    s.stop(`${envParts.join(", ")} env vars in .env.local`);
+    s.start("Setting up database...");
+    const dbFiles = scaffoldDatabase({ cwd, config });
+    s.stop(`Created ${dbFiles.length} database files`);
+    s.start("Setting up authentication...");
+    const authFiles = scaffoldAuth({ cwd, config });
+    s.stop(`Created ${authFiles.length} auth files`);
+    s.start("Copying CMS components...");
+    const compFiles = scaffoldComponents({ cwd, config });
+    s.stop(`Created ${compFiles.length} component files`);
+    s.start("Creating CMS pages and layouts...");
+    const layoutFiles = scaffoldLayout({ cwd, config });
+    s.stop(`Created ${layoutFiles.length} page files`);
+    s.start("Creating API routes...");
+    const apiFiles = scaffoldApiRoutes({ cwd, config });
+    s.stop(`Created ${apiFiles.length} API routes`);
+    s.start("Checking for linter...");
+    if (project.linter.type === "none") {
+      s.stop("No linter found");
+      s.start("Setting up Biome linter...");
+      const biomeResult = scaffoldBiome(cwd, project.linter);
+      if (biomeResult.installed) {
+        s.stop("Created biome.json");
+      } else {
+        s.stop(`Biome skipped: ${biomeResult.skippedReason}`);
+      }
+    } else {
+      s.stop(`Linter: ${pc2.cyan(project.linter.type)} (${project.linter.configFile})`);
+    }
+    s.start("Installing dependencies (this may take a minute)...");
+    const depsResult = await installDependenciesAsync({
+      cwd,
+      pm,
+      includeEmail: features.includeEmail,
+      includeBiome: project.linter.type === "none"
+    });
+    if (depsResult.success) {
+      s.stop(
+        `Installed ${depsResult.coreDeps.length} deps + ${depsResult.devDeps.length} dev deps`
+      );
+    } else {
+      s.stop("Failed to install dependencies");
+      p4.log.warning(depsResult.error ?? "Unknown error");
+      p4.log.info(
+        `You can install them manually:
+  ${pc2.cyan(`${pm} add ${depsResult.coreDeps.join(" ")}`)}
+  ${pc2.cyan(`${pm} add -D ${depsResult.devDeps.join(" ")}`)}`
       );
-      process.exit(1);
     }
-    cwd = path36.resolve(cwd, projectPrompt.projectName);
-    project = detectProject(cwd);
-    pm = detectPackageManager(cwd);
-  }
-  const features = options.yes ? { includeEmail: true, preset: options.preset } : await promptFeatures(options.preset);
-  const config = {
-    ...getDefaultConfig(srcDir),
-    features: { email: features.includeEmail }
-  };
-  const s = p3.spinner();
-  s.start("Creating CMS directory structure...");
-  const baseFiles = scaffoldBase({ cwd, config });
-  s.stop(`Created ${baseFiles.length} files`);
-  s.start("Configuring TypeScript path aliases...");
-  const tsResult = scaffoldTsconfig(cwd);
-  s.stop(`Added ${tsResult.added.length} path aliases`);
-  s.start("Configuring Tailwind CSS...");
-  const twResult = scaffoldTailwind(cwd, srcDir);
-  if (twResult.appended) {
-    s.stop(`Updated ${twResult.file}`);
-  } else if (twResult.file) {
-    s.stop("Tailwind already configured for CMS");
-  } else {
-    s.stop("No CSS file found (will configure later)");
-  }
-  s.start("Setting up environment variables...");
-  const envResult = scaffoldEnv(cwd, { includeEmail: features.includeEmail });
-  s.stop(`Added ${envResult.added.length} env vars to .env.local`);
-  s.start("Setting up database...");
-  const dbFiles = scaffoldDatabase({ cwd, config });
-  s.stop(`Created ${dbFiles.length} database files`);
-  s.start("Setting up authentication...");
-  const authFiles = scaffoldAuth({ cwd, config });
-  s.stop(`Created ${authFiles.length} auth files`);
-  s.start("Copying CMS components...");
-  const compFiles = scaffoldComponents({ cwd, config });
-  s.stop(`Created ${compFiles.length} component files`);
-  s.start("Creating CMS pages and layouts...");
-  const layoutFiles = scaffoldLayout({ cwd, config });
-  s.stop(`Created ${layoutFiles.length} page files`);
-  s.start("Creating API routes...");
-  const apiFiles = scaffoldApiRoutes({ cwd, config });
-  s.stop(`Created ${apiFiles.length} API routes`);
-  s.start("Checking for linter...");
-  if (project.linter.type === "none") {
-    s.stop("No linter found");
-    s.start("Setting up Biome linter...");
-    const biomeResult = scaffoldBiome(cwd, project.linter);
-    if (biomeResult.installed) {
-      s.stop("Created biome.json");
+    s.start(`Applying ${features.preset} preset...`);
+    const presetResult = scaffoldPreset({ cwd, config, preset: features.preset });
+    if (presetResult.errors.length > 0) {
+      s.stop(`Preset applied with ${presetResult.errors.length} warning(s)`);
+      for (const err of presetResult.errors) {
+        p4.log.warning(`  ${err}`);
+      }
     } else {
-      s.stop(`Biome skipped: ${biomeResult.skippedReason}`);
+      s.stop(
+        `Created ${presetResult.schemas.length} schemas, generated ${presetResult.generatedFiles.length} files`
+      );
     }
-  } else {
-    s.stop(`Linter: ${pc.cyan(project.linter.type)} (${project.linter.configFile})`);
-  }
-  s.start("Installing dependencies (this may take a minute)...");
-  const depsResult = await installDependenciesAsync({
-    cwd,
-    pm,
-    includeEmail: features.includeEmail,
-    includeBiome: project.linter.type === "none"
-  });
-  if (depsResult.success) {
-    s.stop(`Installed ${depsResult.coreDeps.length} deps + ${depsResult.devDeps.length} dev deps`);
-  } else {
-    s.stop("Failed to install dependencies");
-    p3.log.warning(depsResult.error ?? "Unknown error");
-    p3.log.info(
-      `You can install them manually:
-  ${pc.cyan(`${pm} add ${depsResult.coreDeps.join(" ")}`)}
-  ${pc.cyan(`${pm} add -D ${depsResult.devDeps.join(" ")}`)}`
-    );
-  }
-  s.start(`Applying ${features.preset} preset...`);
-  const presetResult = scaffoldPreset({ cwd, config, preset: features.preset });
-  if (presetResult.errors.length > 0) {
-    s.stop(`Preset applied with ${presetResult.errors.length} warning(s)`);
-    for (const err of presetResult.errors) {
-      p3.log.warning(`  ${err}`);
+    let dbPushed = false;
+    if (depsResult.success && hasDbUrl(cwd)) {
+      s.start("Pushing database schema (drizzle-kit push)...");
+      const pushResult = await runDrizzlePush(cwd);
+      if (pushResult.success) {
+        s.stop("Database schema pushed");
+        dbPushed = true;
+      } else {
+        s.stop("Database push failed");
+        p4.log.warning(pushResult.error ?? "Unknown error");
+        p4.log.info(`You can run it manually: ${pc2.cyan("npx drizzle-kit push")}`);
+      }
+    }
+    let seedEmail;
+    let seedPassword;
+    let seedSuccess = false;
+    if (dbPushed && !options.yes) {
+      p4.log.step("Create your admin account");
+      const email = await p4.text({
+        message: "Admin email",
+        placeholder: "admin@example.com",
+        validate: (v) => {
+          if (!v || !v.includes("@")) return "Please enter a valid email";
+        }
+      });
+      if (p4.isCancel(email)) {
+        p4.cancel("Setup cancelled.");
+        process.exit(0);
+      }
+      const password3 = await p4.password({
+        message: "Admin password",
+        validate: (v) => {
+          if (!v || v.length < 8) return "Password must be at least 8 characters";
+        }
+      });
+      if (p4.isCancel(password3)) {
+        p4.cancel("Setup cancelled.");
+        process.exit(0);
+      }
+      seedEmail = email;
+      seedPassword = password3;
+      s.start("Creating admin user...");
+      const seedResult = await runSeed(cwd, config.paths?.cms ?? "./cms", email, password3);
+      if (seedResult.success) {
+        s.stop("Admin user created");
+        seedSuccess = true;
+      } else {
+        s.stop("Failed to create admin user");
+        p4.log.warning(seedResult.error ?? "Unknown error");
+        p4.log.info(`You can run it manually: ${pc2.cyan("npx betterstart seed")}`);
+      }
     }
-  } else {
-    s.stop(
-      `Created ${presetResult.schemas.length} schemas, generated ${presetResult.generatedFiles.length} files`
-    );
-  }
-  if (depsResult.success && hasDbUrl(cwd)) {
-    s.start("Pushing database schema (drizzle-kit push)...");
-    const pushResult = await runDrizzlePush(cwd);
-    if (pushResult.success) {
-      s.stop("Database schema pushed");
-    } else {
-      s.stop("Database push failed");
-      p3.log.warning(pushResult.error ?? "Unknown error");
-      p3.log.info(`You can run it manually: ${pc.cyan("npx drizzle-kit push")}`);
+    {
+      const entityNames = [];
+      const formNames = [];
+      const schemasDir = path37.join(cwd, config.paths.schemas);
+      const formsDir = path37.join(schemasDir, "forms");
+      if (fs32.existsSync(schemasDir)) {
+        for (const f of fs32.readdirSync(schemasDir)) {
+          if (f.endsWith(".json")) entityNames.push(f.replace(".json", ""));
+        }
+      }
+      if (fs32.existsSync(formsDir)) {
+        for (const f of fs32.readdirSync(formsDir)) {
+          if (f.endsWith(".json")) formNames.push(f.replace(".json", ""));
+        }
+      }
+      regenerateCmsDoc(cwd, config, {
+        preset: features.preset,
+        schemas: entityNames,
+        forms: formNames
+      });
     }
-  }
-  {
-    const entityNames = [];
-    const formNames = [];
-    const schemasDir = path36.join(cwd, config.paths.schemas);
-    const formsDir = path36.join(schemasDir, "forms");
-    if (fs31.existsSync(schemasDir)) {
-      for (const f of fs31.readdirSync(schemasDir)) {
-        if (f.endsWith(".json")) entityNames.push(f.replace(".json", ""));
+    const totalFiles = baseFiles.length + dbFiles.length + authFiles.length + compFiles.length + layoutFiles.length + apiFiles.length;
+    const summaryLines = [
+      `Preset: ${pc2.cyan(features.preset)}`,
+      `Email: ${features.includeEmail ? pc2.green("yes") : pc2.dim("no")}`,
+      `Files created: ${pc2.cyan(String(totalFiles))}`,
+      `Env vars: ${envResult.added.length} added, ${envResult.skipped.length} skipped`
+    ];
+    if (seedSuccess && seedEmail && seedPassword) {
+      summaryLines.push(
+        "",
+        `Admin: ${pc2.cyan(seedEmail)}`,
+        `Password: ${pc2.cyan(seedPassword)}`,
+        `CMS: ${pc2.cyan("http://localhost:3000/cms/login")}`
+      );
+    }
+    const nextSteps = [];
+    let step = 1;
+    const envStepLabel = databaseUrl ? `Fill in remaining values in ${pc2.cyan(".env.local")}` : `Fill in values in ${pc2.cyan(".env.local")}`;
+    nextSteps.push(`  ${step++}. ${envStepLabel}`);
+    if (!dbPushed) {
+      nextSteps.push(`  ${step++}. Run ${pc2.cyan("npx drizzle-kit push")} to sync the database`);
+    }
+    if (!seedSuccess) {
+      nextSteps.push(
+        `  ${step++}. Run ${pc2.cyan("npx betterstart seed")} to create an admin user`
+      );
+    }
+    nextSteps.push(`  ${step++}. Run ${pc2.cyan("pnpm run dev")} to start the development server`);
+    nextSteps.push(
+      `  ${step++}. Run ${pc2.cyan("npx betterstart generate <schema>")} to create content types`
+    );
+    summaryLines.push("", "Next steps:", ...nextSteps);
+    p4.note(summaryLines.join("\n"), "CMS scaffolded successfully");
+    if (!options.yes) {
+      const devCmd = runCommand(pm, "dev");
+      const startDev = await p4.confirm({
+        message: "Start the development server?",
+        initialValue: true
+      });
+      if (!p4.isCancel(startDev) && startDev) {
+        p4.outro(`Starting ${pc2.cyan(devCmd)}...`);
+        const [bin, ...args] = devCmd.split(" ");
+        spawn2(bin, args, { cwd, stdio: "inherit" });
+        return;
       }
     }
-    if (fs31.existsSync(formsDir)) {
-      for (const f of fs31.readdirSync(formsDir)) {
-        if (f.endsWith(".json")) formNames.push(f.replace(".json", ""));
+    p4.outro("Done!");
+  }
+);
+function isValidDbUrl(url) {
+  return url.startsWith("postgres://") || url.startsWith("postgresql://");
+}
+function readExistingDbUrl(cwd) {
+  const envPath = path37.join(cwd, ".env.local");
+  if (!fs32.existsSync(envPath)) return void 0;
+  const content = fs32.readFileSync(envPath, "utf-8");
+  for (const line of content.split("\n")) {
+    const trimmed = line.trim();
+    if (trimmed.startsWith("#") || !trimmed.includes("=")) continue;
+    const [key, ...rest] = trimmed.split("=");
+    if (key?.trim() === "BETTERSTART_DATABASE_URL") {
+      const val = rest.join("=").replace(/^['"]|['"]$/g, "").trim();
+      if (val.length > 0 && !val.startsWith("your_") && val !== "postgresql://..." && isValidDbUrl(val)) {
+        return val;
       }
     }
-    regenerateCmsDoc(cwd, config, {
-      preset: features.preset,
-      schemas: entityNames,
-      forms: formNames
-    });
   }
-  const totalFiles = baseFiles.length + dbFiles.length + authFiles.length + compFiles.length + layoutFiles.length + apiFiles.length;
-  const dbPushed = depsResult.success && hasDbUrl(cwd);
-  const nextSteps = [];
-  let step = 1;
-  nextSteps.push(`  ${step++}. Fill in values in ${pc.cyan(".env.local")}`);
-  if (!dbPushed) {
-    nextSteps.push(`  ${step++}. Run ${pc.cyan("npx drizzle-kit push")} to sync the database`);
-  }
-  nextSteps.push(`  ${step++}. Run ${pc.cyan("npx betterstart seed")} to create an admin user`);
-  nextSteps.push(
-    `  ${step++}. Run ${pc.cyan("npx betterstart generate <schema>")} to create content types`
-  );
-  p3.note(
-    [
-      `Preset: ${pc.cyan(features.preset)}`,
-      `Email: ${features.includeEmail ? pc.green("yes") : pc.dim("no")}`,
-      `Files created: ${pc.cyan(String(totalFiles))}`,
-      `Env vars: ${envResult.added.length} added, ${envResult.skipped.length} skipped`,
-      "",
-      "Next steps:",
-      ...nextSteps
-    ].join("\n"),
-    "CMS scaffolded successfully"
-  );
-  p3.outro("Done!");
-});
+  return void 0;
+}
+function maskDbUrl(url) {
+  try {
+    const parsed = new URL(url);
+    return `${parsed.protocol}//${parsed.host}/***`;
+  } catch {
+    return "postgres://***";
+  }
+}
 function hasDbUrl(cwd) {
-  const envPath = path36.join(cwd, ".env.local");
-  if (!fs31.existsSync(envPath)) return false;
-  const content = fs31.readFileSync(envPath, "utf-8");
+  const envPath = path37.join(cwd, ".env.local");
+  if (!fs32.existsSync(envPath)) return false;
+  const content = fs32.readFileSync(envPath, "utf-8");
   for (const line of content.split("\n")) {
     const trimmed = line.trim();
     if (trimmed.startsWith("#") || !trimmed.includes("=")) continue;
     const [key, ...rest] = trimmed.split("=");
     if (key?.trim() === "BETTERSTART_DATABASE_URL") {
       const val = rest.join("=").trim();
-      return val.length > 0 && !val.startsWith("your_") && !val.startsWith('"your_');
+      const unquoted = val.replace(/^['"]|['"]$/g, "");
+      return unquoted.length > 0 && !unquoted.startsWith("your_") && unquoted !== "postgresql://...";
     }
   }
   return false;
 }
+async function runSeed(cwd, cmsDir, email, password3) {
+  const scriptsDir = path37.join(cwd, cmsDir, "scripts");
+  const seedPath = path37.join(scriptsDir, "seed.ts");
+  if (!fs32.existsSync(scriptsDir)) {
+    fs32.mkdirSync(scriptsDir, { recursive: true });
+  }
+  fs32.writeFileSync(seedPath, buildSeedScript(), "utf-8");
+  try {
+    execFileSync4("npx", ["tsx", seedPath], {
+      cwd,
+      stdio: "pipe",
+      timeout: 3e4,
+      env: { ...process.env, SEED_EMAIL: email, SEED_PASSWORD: password3, SEED_NAME: "Admin" }
+    });
+    return { success: true, error: null };
+  } catch (err) {
+    const msg = err instanceof Error ? err.message : String(err);
+    return { success: false, error: msg };
+  } finally {
+    try {
+      fs32.unlinkSync(seedPath);
+      if (fs32.existsSync(scriptsDir) && fs32.readdirSync(scriptsDir).length === 0) {
+        fs32.rmdirSync(scriptsDir);
+      }
+    } catch {
+    }
+  }
+}
 function runDrizzlePush(cwd) {
   return new Promise((resolve) => {
     const child = spawn2("npx", ["drizzle-kit", "push", "--force"], {
@@ -13305,16 +13984,16 @@ function runDrizzlePush(cwd) {
 }
 
 // src/commands/remove.ts
-import fs32 from "fs";
-import path37 from "path";
+import fs33 from "fs";
+import path38 from "path";
 import readline from "readline";
-import { Command as Command3 } from "commander";
+import { Command as Command4 } from "commander";
 function toPascalCase17(str) {
   return str.split(/[-_\s]+/).map((w) => w.charAt(0).toUpperCase() + w.slice(1).toLowerCase()).join("");
 }
 function toCamelCase8(str) {
-  const p4 = toPascalCase17(str);
-  return p4.charAt(0).toLowerCase() + p4.slice(1);
+  const p5 = toPascalCase17(str);
+  return p5.charAt(0).toLowerCase() + p5.slice(1);
 }
 function singularize13(str) {
   if (str.endsWith("ies")) return `${str.slice(0, -3)}y`;
@@ -13356,8 +14035,8 @@ function findTableEnd2(content, startIndex) {
   return content.length;
 }
 function removeTableFromSchema(schemaFilePath, name) {
-  if (!fs32.existsSync(schemaFilePath)) return false;
-  let content = fs32.readFileSync(schemaFilePath, "utf-8");
+  if (!fs33.existsSync(schemaFilePath)) return false;
+  let content = fs33.readFileSync(schemaFilePath, "utf-8");
   const variableName = toCamelCase8(name);
   let changed = false;
   if (content.includes(`export const ${variableName} =`)) {
@@ -13385,13 +14064,13 @@ function removeTableFromSchema(schemaFilePath, name) {
   }
   if (changed) {
     content = content.replace(/\n{3,}/g, "\n\n");
-    fs32.writeFileSync(schemaFilePath, content, "utf-8");
+    fs33.writeFileSync(schemaFilePath, content, "utf-8");
   }
   return changed;
 }
 function removeFromNavigation(navFilePath, name) {
-  if (!fs32.existsSync(navFilePath)) return false;
-  const content = fs32.readFileSync(navFilePath, "utf-8");
+  if (!fs33.existsSync(navFilePath)) return false;
+  const content = fs33.readFileSync(navFilePath, "utf-8");
   const href = `/cms/${name}`;
   if (!content.includes(`'${href}'`)) return false;
   const lines = content.split("\n");
@@ -13422,7 +14101,7 @@ function removeFromNavigation(navFilePath, name) {
   if (startLine === -1 || endLine === -1) return false;
   lines.splice(startLine, endLine - startLine + 1);
   const updated = lines.join("\n").replace(/,\s*,/g, ",").replace(/\[\s*,/, "[");
-  fs32.writeFileSync(navFilePath, updated, "utf-8");
+  fs33.writeFileSync(navFilePath, updated, "utf-8");
   return true;
 }
 async function promptConfirm(message) {
@@ -13437,8 +14116,8 @@ async function promptConfirm(message) {
     });
   });
 }
-var removeCommand = new Command3("remove").alias("rm").description("Remove all generated files for an entity or form").argument("<schema>", "Schema name to remove (e.g. posts, categories, contact)").option("-f, --force", "Skip confirmation prompt", false).option("--cwd <path>", "Project root path").action(async (schemaName, options) => {
-  const cwd = options.cwd ? path37.resolve(options.cwd) : process.cwd();
+var removeCommand = new Command4("remove").alias("rm").description("Remove all generated files for an entity or form").argument("<schema>", "Schema name to remove (e.g. posts, categories, contact)").option("-f, --force", "Skip confirmation prompt", false).option("--cwd <path>", "Project root path").action(async (schemaName, options) => {
+  const cwd = options.cwd ? path38.resolve(options.cwd) : process.cwd();
   console.log("\n  BetterStart Remove\n");
   let config;
   try {
@@ -13451,34 +14130,34 @@ var removeCommand = new Command3("remove").alias("rm").description("Remove all g
   const pagesDir = config.paths?.pages ?? "./src/app/(cms)/cms/(authenticated)";
   const kebabName = toKebabCase9(schemaName);
   const targets = [];
-  const entityPagesDir = path37.join(cwd, pagesDir, schemaName);
-  if (fs32.existsSync(entityPagesDir)) {
+  const entityPagesDir = path38.join(cwd, pagesDir, schemaName);
+  if (fs33.existsSync(entityPagesDir)) {
     targets.push({
       path: entityPagesDir,
-      label: `${path37.join(pagesDir, schemaName)}/`,
+      label: `${path38.join(pagesDir, schemaName)}/`,
       isDir: true
     });
   }
-  const actionsFile = path37.join(cwd, cmsDir, "lib", "actions", `${kebabName}.ts`);
-  if (fs32.existsSync(actionsFile)) {
+  const actionsFile = path38.join(cwd, cmsDir, "lib", "actions", `${kebabName}.ts`);
+  if (fs33.existsSync(actionsFile)) {
     targets.push({
       path: actionsFile,
-      label: path37.join(cmsDir, "lib", "actions", `${kebabName}.ts`),
+      label: path38.join(cmsDir, "lib", "actions", `${kebabName}.ts`),
       isDir: false
     });
   }
-  const hookFile = path37.join(cwd, cmsDir, "hooks", `use-${kebabName}.ts`);
-  if (fs32.existsSync(hookFile)) {
+  const hookFile = path38.join(cwd, cmsDir, "hooks", `use-${kebabName}.ts`);
+  if (fs33.existsSync(hookFile)) {
     targets.push({
       path: hookFile,
-      label: path37.join(cmsDir, "hooks", `use-${kebabName}.ts`),
+      label: path38.join(cmsDir, "hooks", `use-${kebabName}.ts`),
       isDir: false
     });
   }
-  const schemaFilePath = path37.join(cwd, cmsDir, "db", "schema.ts");
-  const hasTable = fs32.existsSync(schemaFilePath) && fs32.readFileSync(schemaFilePath, "utf-8").includes(`export const ${toCamelCase8(schemaName)} =`);
-  const navFilePath = path37.join(cwd, cmsDir, "data", "navigation.ts");
-  const hasNavEntry = fs32.existsSync(navFilePath) && fs32.readFileSync(navFilePath, "utf-8").includes(`'/cms/${schemaName}'`);
+  const schemaFilePath = path38.join(cwd, cmsDir, "db", "schema.ts");
+  const hasTable = fs33.existsSync(schemaFilePath) && fs33.readFileSync(schemaFilePath, "utf-8").includes(`export const ${toCamelCase8(schemaName)} =`);
+  const navFilePath = path38.join(cwd, cmsDir, "data", "navigation.ts");
+  const hasNavEntry = fs33.existsSync(navFilePath) && fs33.readFileSync(navFilePath, "utf-8").includes(`'/cms/${schemaName}'`);
   if (targets.length === 0 && !hasTable && !hasNavEntry) {
     console.log(`  No generated files found for: ${schemaName}`);
     return;
@@ -13488,10 +14167,10 @@ var removeCommand = new Command3("remove").alias("rm").description("Remove all g
     console.log(`    ${t.isDir ? "[dir]" : "     "} ${t.label}`);
   }
   if (hasTable) {
-    console.log(`    [edit] ${path37.join(cmsDir, "db", "schema.ts")} (remove table)`);
+    console.log(`    [edit] ${path38.join(cmsDir, "db", "schema.ts")} (remove table)`);
   }
   if (hasNavEntry) {
-    console.log(`    [edit] ${path37.join(cmsDir, "data", "navigation.ts")} (remove entry)`);
+    console.log(`    [edit] ${path38.join(cmsDir, "data", "navigation.ts")} (remove entry)`);
   }
   if (!options.force) {
     console.log("");
@@ -13504,19 +14183,19 @@ var removeCommand = new Command3("remove").alias("rm").description("Remove all g
   console.log("");
   for (const t of targets) {
     if (t.isDir) {
-      fs32.rmSync(t.path, { recursive: true, force: true });
+      fs33.rmSync(t.path, { recursive: true, force: true });
     } else {
-      fs32.unlinkSync(t.path);
+      fs33.unlinkSync(t.path);
     }
     console.log(`  Removed: ${t.label}`);
   }
   if (hasTable) {
     removeTableFromSchema(schemaFilePath, schemaName);
-    console.log(`  Cleaned: ${path37.join(cmsDir, "db", "schema.ts")}`);
+    console.log(`  Cleaned: ${path38.join(cmsDir, "db", "schema.ts")}`);
   }
   if (hasNavEntry) {
     removeFromNavigation(navFilePath, schemaName);
-    console.log(`  Cleaned: ${path37.join(cmsDir, "data", "navigation.ts")}`);
+    console.log(`  Cleaned: ${path38.join(cmsDir, "data", "navigation.ts")}`);
   }
   console.log("\n  Removal complete!");
   console.log("\n  Note: You may need to manually:");
@@ -13526,170 +14205,6 @@ var removeCommand = new Command3("remove").alias("rm").description("Remove all g
   console.log("");
 });
 
-// src/commands/seed.ts
-import fs33 from "fs";
-import path38 from "path";
-import * as clack from "@clack/prompts";
-import { Command as Command4 } from "commander";
-function buildSeedScript() {
-  return `/**
- * BetterStart CMS \u2014 Seed Script
- * Creates the initial admin user
- * AUTO-GENERATED \u2014 safe to delete after running
- */
-
-import { loadEnvConfig } from '@next/env'
-loadEnvConfig(process.cwd())
-
-import { neon } from '@neondatabase/serverless'
-import { drizzle } from 'drizzle-orm/neon-http'
-import { eq } from 'drizzle-orm'
-import * as schema from '../db/schema'
-import { betterAuth } from 'better-auth'
-import { drizzleAdapter } from 'better-auth/adapters/drizzle'
-
-// Inline DB connection (mirrors cms/db/client.ts)
-const sql = neon(process.env.BETTERSTART_DATABASE_URL!)
-const db = drizzle({ client: sql, schema })
-
-// Inline auth setup (mirrors cms/lib/auth/auth.ts)
-const auth = betterAuth({
-  secret: process.env.BETTERSTART_AUTH_SECRET,
-  baseURL: process.env.BETTERSTART_AUTH_URL,
-  basePath: process.env.BETTERSTART_AUTH_BASE_PATH || '/api/cms/auth',
-  database: drizzleAdapter(db, {
-    provider: 'pg',
-    schema: {
-      user: schema.user,
-      session: schema.session,
-      account: schema.account,
-      verification: schema.verification,
-    },
-  }),
-  emailAndPassword: { enabled: true, minPasswordLength: 8 },
-  user: {
-    additionalFields: {
-      role: { type: 'string', required: false, defaultValue: 'member', input: false },
-    },
-  },
-})
-
-const EMAIL = process.env.SEED_EMAIL!
-const PASSWORD = process.env.SEED_PASSWORD!
-const NAME = process.env.SEED_NAME || 'Admin'
-
-async function main() {
-  console.log('\\n  Creating admin user...')
-  console.log(\`  Email: \${EMAIL}\\n\`)
-
-  const result = await auth.api.signUpEmail({
-    body: { email: EMAIL, password: PASSWORD, name: NAME },
-  })
-
-  if (!result?.user) {
-    console.error('  Failed to create user.')
-    process.exit(1)
-  }
-
-  await db
-    .update(schema.user)
-    .set({ role: 'admin' })
-    .where(eq(schema.user.id, result.user.id))
-
-  console.log(\`  Admin user created: \${EMAIL}\`)
-  console.log('  Role: admin\\n')
-  process.exit(0)
-}
-
-main().catch((err) => {
-  console.error('  Seed failed:', err.message || err)
-  process.exit(1)
-})
-`;
-}
-var seedCommand = new Command4("seed").description("Create the initial admin user").option("--cwd <path>", "Project root path").action(async (options) => {
-  const cwd = options.cwd ? path38.resolve(options.cwd) : process.cwd();
-  clack.intro("BetterStart Seed");
-  let config;
-  try {
-    config = await resolveConfig(cwd);
-  } catch (err) {
-    clack.cancel(`Error loading config: ${err instanceof Error ? err.message : String(err)}`);
-    process.exit(1);
-  }
-  const cmsDir = config.paths?.cms ?? "./cms";
-  const email = await clack.text({
-    message: "Admin email",
-    placeholder: "admin@example.com",
-    validate: (v) => {
-      if (!v || !v.includes("@")) return "Please enter a valid email";
-    }
-  });
-  if (clack.isCancel(email)) {
-    clack.cancel("Cancelled.");
-    process.exit(0);
-  }
-  const password2 = await clack.password({
-    message: "Admin password",
-    validate: (v) => {
-      if (!v || v.length < 8) return "Password must be at least 8 characters";
-    }
-  });
-  if (clack.isCancel(password2)) {
-    clack.cancel("Cancelled.");
-    process.exit(0);
-  }
-  const name = await clack.text({
-    message: "Admin name",
-    placeholder: "Admin",
-    defaultValue: "Admin"
-  });
-  if (clack.isCancel(name)) {
-    clack.cancel("Cancelled.");
-    process.exit(0);
-  }
-  const scriptsDir = path38.join(cwd, cmsDir, "scripts");
-  const seedPath = path38.join(scriptsDir, "seed.ts");
-  if (!fs33.existsSync(scriptsDir)) {
-    fs33.mkdirSync(scriptsDir, { recursive: true });
-  }
-  fs33.writeFileSync(seedPath, buildSeedScript(), "utf-8");
-  const spinner3 = clack.spinner();
-  spinner3.start("Creating admin user...");
-  try {
-    const { execFileSync: execFileSync4 } = await import("child_process");
-    execFileSync4("npx", ["tsx", seedPath], {
-      cwd,
-      stdio: "pipe",
-      env: {
-        ...process.env,
-        SEED_EMAIL: email,
-        SEED_PASSWORD: password2,
-        SEED_NAME: name || "Admin"
-      }
-    });
-    spinner3.stop("Admin user created");
-  } catch (err) {
-    spinner3.stop("Failed to create admin user");
-    const errMsg = err instanceof Error ? err.message : String(err);
-    clack.log.error(errMsg);
-    clack.log.info("You can run the seed script manually:");
-    clack.log.info(
-      `  SEED_EMAIL="${email}" SEED_PASSWORD="..." npx tsx ${path38.relative(cwd, seedPath)}`
-    );
-    clack.outro("");
-    process.exit(1);
-  }
-  try {
-    fs33.unlinkSync(seedPath);
-    if (fs33.existsSync(scriptsDir) && fs33.readdirSync(scriptsDir).length === 0) {
-      fs33.rmdirSync(scriptsDir);
-    }
-  } catch {
-  }
-  clack.outro(`Admin user ready: ${email}`);
-});
-
 // src/cli.ts
 var program = new Command5();
 program.name("betterstart").description("Scaffold a full-featured CMS into any Next.js 16 application").version("0.1.0");