@betterstart/cli 0.1.27 → 0.1.28

package/dist/cli.js

@@ -6561,29 +6561,29 @@ function updateNavigation(schema, cwd, cmsDir, options = {}) {
     icon: schema.icon
   };
   if (schema.navGroup) {
-    let group = items.find((item) => item.label === schema.navGroup?.label);
-    if (!group) {
-      group = {
+    let group2 = items.find((item) => item.label === schema.navGroup?.label);
+    if (!group2) {
+      group2 = {
         label: schema.navGroup.label,
         href: "#",
         icon: schema.navGroup.icon,
         children: []
       };
-      items.push(group);
+      items.push(group2);
     }
-    if (!group.children) {
-      group.children = [];
+    if (!group2.children) {
+      group2.children = [];
     }
-    const existingChild = group.children.findIndex((c) => c.href === entityHref);
+    const existingChild = group2.children.findIndex((c) => c.href === entityHref);
     if (existingChild >= 0) {
       if (options.force) {
-        group.children[existingChild] = newItem;
+        group2.children[existingChild] = newItem;
       } else {
         return { files: [] };
       }
     } else {
-      group.children.push(newItem);
-      group.children.sort((a, b) => a.label.localeCompare(b.label));
+      group2.children.push(newItem);
+      group2.children.sort((a, b) => a.label.localeCompare(b.label));
     }
     if (schema.navGroup.icon && !iconImports.includes(schema.navGroup.icon)) {
       iconImports.push(schema.navGroup.icon);
@@ -7972,14 +7972,6 @@ function openBrowser(url) {
 // src/init/prompts/features.ts
 import * as p2 from "@clack/prompts";
 async function promptFeatures(presetOverride) {
-  const includeEmail = await p2.confirm({
-    message: "Include email system? (Resend + React Email)",
-    initialValue: true
-  });
-  if (p2.isCancel(includeEmail)) {
-    p2.cancel("Setup cancelled.");
-    process.exit(0);
-  }
   let preset;
   if (presetOverride && isValidPreset(presetOverride)) {
     preset = presetOverride;
@@ -7999,7 +7991,7 @@ async function promptFeatures(presetOverride) {
     }
     preset = selected;
   }
-  return { includeEmail, preset };
+  return { includeEmail: true, preset };
 }
 function isValidPreset(value) {
   return value === "blank" || value === "blog" || value === "full";
@@ -13633,13 +13625,13 @@ var seedCommand = new Command2("seed").description("Create the initial admin use
       }
     });
   });
-  const spinner4 = clack.spinner();
-  spinner4.start("Creating admin user...");
+  const spinner5 = clack.spinner();
+  spinner5.start("Creating admin user...");
   try {
     const result = await runSeed2(false);
     if (result.code === 2) {
       const existingName = result.stdout.split("\n").find((l) => l.startsWith("EXISTING_USER:"))?.replace("EXISTING_USER:", "")?.trim() || "unknown";
-      spinner4.stop(`Account already exists for ${email}`);
+      spinner5.stop(`Account already exists for ${email}`);
       const overwrite = await clack.confirm({
         message: `An admin account (${existingName}) already exists with this email. Replace it?`
       });
@@ -13651,14 +13643,14 @@ var seedCommand = new Command2("seed").description("Create the initial admin use
         }
         process.exit(0);
       }
-      spinner4.start("Replacing admin user...");
+      spinner5.start("Replacing admin user...");
       await runSeed2(true);
-      spinner4.stop("Admin user replaced");
+      spinner5.stop("Admin user replaced");
     } else {
-      spinner4.stop("Admin user created");
+      spinner5.stop("Admin user created");
     }
   } catch (err) {
-    spinner4.stop("Failed to create admin user");
+    spinner5.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:");
@@ -13691,21 +13683,19 @@ var initCommand = new Command3("init").description("Scaffold CMS into a new or e
     let isFreshProject = false;
     let srcDir;
     if (project.isExisting) {
-      p4.log.info(`Existing Next.js project detected`);
-      p4.log.info(`Package manager: ${pc2.cyan(pm)}`);
+      p4.log.info(`Next.js project detected ${pc2.dim("\xB7")} ${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}`);
-        }
+        const conflictLines = project.conflicts.map((c) => `${pc2.yellow("\u25B2")} ${c}`);
+        conflictLines.push("", pc2.dim("Existing files will not be overwritten."));
+        p4.note(conflictLines.join("\n"), pc2.yellow("Conflicts"));
         if (!options.yes) {
           const proceed = await p4.confirm({
-            message: "Continue anyway? (existing files will NOT be overwritten)",
+            message: "Continue anyway?",
             initialValue: true
           });
           if (p4.isCancel(proceed) || !proceed) {
@@ -13814,30 +13804,62 @@ var initCommand = new Command3("init").description("Scaffold CMS into a new or e
       ...getDefaultConfig(srcDir),
       features: { email: features.includeEmail }
     };
+    const results = [];
     const s = p4.spinner();
-    s.start("Creating CMS directory structure...");
+    s.start("Directory structure");
     const baseFiles = scaffoldBase({ cwd, config });
-    s.stop(`Created ${baseFiles.length} files`);
-    s.start("Configuring TypeScript path aliases...");
+    results.push({ label: "Directory structure", result: `${baseFiles.length} files` });
+    s.message("TypeScript aliases");
     const tsResult = scaffoldTsconfig(cwd);
-    s.stop(`Added ${tsResult.added.length} path aliases`);
-    s.start("Configuring Tailwind CSS...");
+    results.push({
+      label: "TypeScript aliases",
+      result: tsResult.added.length > 0 ? `${tsResult.added.length} paths` : "already set"
+    });
+    s.message("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...");
+    results.push({
+      label: "Tailwind CSS",
+      result: twResult.appended ? "updated" : twResult.file ? "already set" : "no CSS file"
+    });
+    s.message("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 envCount = envResult.added.length + envResult.updated.length;
+    results.push({
+      label: "Environment variables",
+      result: envCount > 0 ? `${envCount} vars` : "already set"
+    });
+    s.message("Database");
     const dbFiles = scaffoldDatabase({ cwd, config });
-    s.stop(`Created ${dbFiles.length} database files`);
+    results.push({ label: "Database", result: `${dbFiles.length} files` });
+    s.message("Authentication");
+    const authFiles = scaffoldAuth({ cwd, config });
+    results.push({ label: "Authentication", result: `${authFiles.length} files` });
+    s.message("Components");
+    const compFiles = scaffoldComponents({ cwd, config });
+    results.push({ label: "Components", result: `${compFiles.length} files` });
+    s.message("Pages & layouts");
+    const layoutFiles = scaffoldLayout({ cwd, config });
+    results.push({ label: "Pages & layouts", result: `${layoutFiles.length} files` });
+    s.message("API routes");
+    const apiFiles = scaffoldApiRoutes({ cwd, config });
+    results.push({ label: "API routes", result: `${apiFiles.length} routes` });
+    s.message("Linter");
+    let linterResult;
+    if (project.linter.type === "none") {
+      const biomeResult = scaffoldBiome(cwd, project.linter);
+      linterResult = biomeResult.installed ? "biome (new)" : "none";
+    } else {
+      linterResult = project.linter.type;
+    }
+    results.push({ label: "Linter", result: linterResult });
+    const maxLabel = Math.max(...results.map((r) => r.label.length));
+    const noteLines = results.map((r) => {
+      const padded = r.label.padEnd(maxLabel + 3);
+      return `${pc2.green("\u2713")} ${padded}${pc2.dim(r.result)}`;
+    });
+    s.stop("");
+    process.stdout.write("\x1B[2A\x1B[J");
+    p4.note(noteLines.join("\n"), "Scaffolded CMS");
     const drizzleConfigPath = path37.join(cwd, "drizzle.config.ts");
     if (!dbFiles.includes("drizzle.config.ts") && fs32.existsSync(drizzleConfigPath)) {
       if (!options.yes) {
@@ -13852,42 +13874,17 @@ var initCommand = new Command3("init").description("Scaffold CMS into a new or e
         }
       }
     }
-    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)...");
+    s.start("Installing dependencies (this may take a minute)");
     const depsResult = await installDependenciesAsync({
       cwd,
       pm,
       includeEmail: features.includeEmail,
       includeBiome: project.linter.type === "none"
     });
+    let depsInstalled = false;
     if (depsResult.success) {
-      s.stop(
-        `Installed ${depsResult.coreDeps.length} deps + ${depsResult.devDeps.length} dev deps`
-      );
+      s.stop("");
+      depsInstalled = true;
     } else {
       s.stop("Failed to install dependencies");
       p4.log.warning(depsResult.error ?? "Unknown error");
@@ -13897,24 +13894,59 @@ var initCommand = new Command3("init").description("Scaffold CMS into a new or e
   ${pc2.cyan(`${pm} add -D ${depsResult.devDeps.join(" ")}`)}`
       );
     }
-    s.start(`Applying ${features.preset} preset...`);
+    if (depsInstalled) {
+      process.stdout.write("\x1B[2A\x1B[J");
+    }
+    s.start(`Applying ${features.preset} preset`);
     const presetResult = scaffoldPreset({ cwd, config, preset: features.preset });
+    {
+      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
+      });
+    }
+    s.stop("");
+    process.stdout.write("\x1B[2A\x1B[J");
+    const installLines = [];
+    if (depsInstalled) {
+      installLines.push(
+        `${pc2.green("\u2713")} Dependencies        ${pc2.dim(`${depsResult.coreDeps.length} deps + ${depsResult.devDeps.length} dev deps`)}`
+      );
+    }
     if (presetResult.errors.length > 0) {
-      s.stop(`Preset applied with ${presetResult.errors.length} warning(s)`);
+      installLines.push(
+        `${pc2.yellow("\u25B2")} Preset              ${pc2.dim(`${features.preset} \u2014 ${presetResult.errors.length} warning(s)`)}`
+      );
       for (const err of presetResult.errors) {
-        p4.log.warning(`  ${err}`);
+        installLines.push(`  ${pc2.dim(err)}`);
       }
     } else {
-      s.stop(
-        `Created ${presetResult.schemas.length} schemas, generated ${presetResult.generatedFiles.length} files`
+      installLines.push(
+        `${pc2.green("\u2713")} Preset              ${pc2.dim(`${features.preset} \u2014 ${presetResult.schemas.length} schemas, ${presetResult.generatedFiles.length} files`)}`
       );
     }
+    p4.note(installLines.join("\n"), "Installed");
     let dbPushed = false;
     if (depsResult.success && hasDbUrl(cwd)) {
-      s.start("Pushing database schema (drizzle-kit push)...");
+      s.start("Pushing database schema (drizzle-kit push)");
       const pushResult = await runDrizzlePush(cwd);
       if (pushResult.success) {
-        s.stop("Database schema pushed");
+        s.stop(`${pc2.green("\u2713")} Database schema pushed`);
         dbPushed = true;
       } else {
         s.stop("Database push failed");
@@ -13926,66 +13958,62 @@ var initCommand = new Command3("init").description("Scaffold CMS into a new or e
     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";
+      p4.note(pc2.dim("Create your first admin user to access the CMS."), "Admin account");
+      const credentials = await p4.group(
+        {
+          email: () => p4.text({
+            message: "Admin email",
+            placeholder: "admin@example.com",
+            validate: (v) => {
+              if (!v || !v.includes("@")) return "Please enter a valid email";
+            }
+          }),
+          password: () => p4.password({
+            message: "Admin password",
+            validate: (v) => {
+              if (!v || v.length < 8) return "Password must be at least 8 characters";
+            }
+          })
+        },
+        {
+          onCancel: () => {
+            p4.cancel("Setup cancelled.");
+            process.exit(0);
+          }
         }
-      });
-      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";
+      );
+      seedEmail = credentials.email;
+      seedPassword = credentials.password;
+      s.start("Creating admin user");
+      let seedResult = await runSeed(cwd, config.paths?.cms ?? "./cms", credentials.email, credentials.password);
+      if (seedResult.existingUser) {
+        s.stop(`${pc2.yellow("\u25B2")} Admin user already exists (${seedResult.existingUser})`);
+        const replace = await p4.confirm({
+          message: "Replace existing admin user?",
+          initialValue: false
+        });
+        if (!p4.isCancel(replace) && replace) {
+          s.start("Replacing admin user");
+          seedResult = await runSeed(cwd, config.paths?.cms ?? "./cms", credentials.email, credentials.password, true);
+        } else {
+          seedSuccess = true;
         }
-      });
-      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");
+        s.stop(`${pc2.green("\u2713")} 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")}`);
-      }
-    }
-    s.start("Generating documentation...");
-    {
-      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", ""));
-        }
+      } else if (!seedSuccess && seedResult.error) {
+        s.stop(`${pc2.red("\u2717")} Failed to create admin user`);
+        p4.note(
+          `${pc2.red(seedResult.error)}
+
+Run manually: ${pc2.cyan("npx betterstart seed")}`,
+          pc2.red("Seed failed")
+        );
       }
-      regenerateCmsDoc(cwd, config, {
-        preset: features.preset,
-        schemas: entityNames,
-        forms: formNames
-      });
     }
-    s.stop("Generated CMS.md");
     if (isFreshProject) {
-      s.start("Creating initial git commit...");
+      s.start("Creating initial git commit");
       try {
         execFileSync4("git", ["init"], { cwd, stdio: "pipe" });
         execFileSync4("git", ["add", "."], { cwd, stdio: "pipe" });
@@ -14001,7 +14029,6 @@ var initCommand = new Command3("init").description("Scaffold CMS into a new or e
     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`
     ];
@@ -14091,26 +14118,14 @@ function hasDbUrl(cwd) {
   }
   return false;
 }
-async function runSeed(cwd, cmsDir, email, password3) {
+function runSeed(cwd, cmsDir, email, password3, overwrite = false) {
   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 {
-    const tsxBin = path37.join(cwd, "node_modules", ".bin", "tsx");
-    execFileSync4(tsxBin, [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 {
+  const cleanup = () => {
     try {
       fs32.unlinkSync(seedPath);
       if (fs32.existsSync(scriptsDir) && fs32.readdirSync(scriptsDir).length === 0) {
@@ -14118,7 +14133,71 @@ async function runSeed(cwd, cmsDir, email, password3) {
       }
     } catch {
     }
-  }
+  };
+  return new Promise((resolve) => {
+    const tsxBin = path37.join(cwd, "node_modules", ".bin", "tsx");
+    const child = spawn2(tsxBin, [seedPath], {
+      cwd,
+      stdio: "pipe",
+      env: {
+        ...process.env,
+        SEED_EMAIL: email,
+        SEED_PASSWORD: password3,
+        SEED_NAME: "Admin",
+        ...overwrite ? { SEED_OVERWRITE: "true" } : {}
+      }
+    });
+    let stdout = "";
+    let stderr = "";
+    child.stdout?.on("data", (chunk) => {
+      stdout += chunk.toString();
+    });
+    child.stderr?.on("data", (chunk) => {
+      stderr += chunk.toString();
+    });
+    const timeout = setTimeout(() => {
+      child.kill();
+      cleanup();
+      resolve({ success: false, error: "Seed timed out after 30 seconds" });
+    }, 3e4);
+    child.on("close", (code) => {
+      clearTimeout(timeout);
+      cleanup();
+      if (code === 0) {
+        resolve({ success: true, error: null });
+      } else if (code === 2) {
+        const name = stdout.match(/EXISTING_USER:(.+)/)?.[1]?.trim();
+        resolve({ success: false, error: null, existingUser: name ?? email });
+      } else {
+        resolve({ success: false, error: parseSeedError(stdout, stderr) });
+      }
+    });
+    child.on("error", (err) => {
+      clearTimeout(timeout);
+      cleanup();
+      resolve({ success: false, error: parseSeedError("", err.message) });
+    });
+  });
+}
+function parseSeedError(stdout, stderr) {
+  const combined = `${stdout}
+${stderr}`;
+  const seedFailed = combined.match(/Seed failed:\s*(.+)/)?.[1]?.trim();
+  if (seedFailed) return seedFailed;
+  if (combined.includes("Failed to create user")) return "Auth API failed to create user";
+  if (combined.includes("ECONNREFUSED") || combined.includes("connection refused"))
+    return "Could not connect to database";
+  if (combined.includes("BETTERSTART_DATABASE_URL"))
+    return "Database URL is missing or invalid";
+  if (combined.includes("password authentication failed"))
+    return "Database authentication failed \u2014 check your connection string";
+  if (combined.includes("does not exist") && combined.includes("relation"))
+    return "Database tables not found \u2014 run npx drizzle-kit push first";
+  if (combined.includes("MODULE_NOT_FOUND") || combined.includes("Cannot find module"))
+    return "Missing dependencies \u2014 run your package manager install first";
+  const firstLine = stderr.split("\n").map((l) => l.trim()).find((l) => l.length > 0 && !l.startsWith("at ") && !l.startsWith("node:"));
+  if (firstLine) return firstLine;
+  return "Unknown error \u2014 run npx betterstart seed for details";
 }
 function runDrizzlePush(cwd) {
   return new Promise((resolve) => {
@@ -14573,6 +14652,8 @@ function buildUninstallPlan(cwd) {
     steps.push({
       label: "CMS directories",
       items: dirs,
+      count: dirs.length,
+      unit: dirs.length === 1 ? "directory" : "directories",
       execute() {
         if (fs35.existsSync(cmsDir)) fs35.rmSync(cmsDir, { recursive: true, force: true });
         if (fs35.existsSync(cmsRouteGroup)) fs35.rmSync(cmsRouteGroup, { recursive: true, force: true });
@@ -14601,6 +14682,8 @@ function buildUninstallPlan(cwd) {
     steps.push({
       label: "Config files",
       items: configFiles,
+      count: configFiles.length,
+      unit: configFiles.length === 1 ? "file" : "files",
       execute() {
         for (const p6 of configPaths) {
           if (fs35.existsSync(p6)) fs35.unlinkSync(p6);
@@ -14611,10 +14694,14 @@ function buildUninstallPlan(cwd) {
   const tsconfigPath = path40.join(cwd, "tsconfig.json");
   if (fs35.existsSync(tsconfigPath)) {
     const content = fs35.readFileSync(tsconfigPath, "utf-8");
-    if (content.includes("@cms/")) {
+    const aliasMatches = content.match(/"@cms\//g);
+    if (aliasMatches && aliasMatches.length > 0) {
+      const aliasCount = aliasMatches.length;
       steps.push({
         label: "tsconfig.json path aliases",
-        items: ["Remove all @cms/* paths from compilerOptions.paths"],
+        items: [`@cms/* aliases in tsconfig.json`],
+        count: aliasCount,
+        unit: aliasCount === 1 ? "alias" : "aliases",
         execute() {
           cleanTsconfig(tsconfigPath);
         }
@@ -14624,12 +14711,14 @@ function buildUninstallPlan(cwd) {
   const cssFile = findMainCss2(cwd);
   if (cssFile) {
     const cssContent = fs35.readFileSync(cssFile, "utf-8");
-    const sourcePattern = /^@source\s+"[^"]*cms[^"]*";\s*$/m;
-    if (sourcePattern.test(cssContent)) {
+    const sourceLines = cssContent.split("\n").filter((l) => /^@source\s+"[^"]*cms[^"]*";\s*$/.test(l));
+    if (sourceLines.length > 0) {
       const relCss = path40.relative(cwd, cssFile);
       steps.push({
         label: `CSS @source lines (${relCss})`,
-        items: ["Remove @source lines referencing cms/"],
+        items: [`@source lines in ${relCss}`],
+        count: sourceLines.length,
+        unit: sourceLines.length === 1 ? "line" : "lines",
         execute() {
           cleanCss(cssFile);
         }
@@ -14643,7 +14732,9 @@ function buildUninstallPlan(cwd) {
     if (bsVars.length > 0) {
       steps.push({
         label: ".env.local variables",
-        items: bsVars,
+        items: ["BETTERSTART_* vars in .env.local"],
+        count: bsVars.length,
+        unit: bsVars.length === 1 ? "variable" : "variables",
         execute() {
           cleanEnvFile(envPath);
         }
@@ -14657,21 +14748,19 @@ var uninstallCommand = new Command6("uninstall").description("Remove all CMS fil
   p5.intro(pc3.bgRed(pc3.white(" BetterStart Uninstall ")));
   const steps = buildUninstallPlan(cwd);
   if (steps.length === 0) {
-    p5.log.info("Nothing to remove \u2014 project is already clean.");
+    p5.log.success(pc3.green("\u2713") + " Nothing to remove \u2014 project is already clean.");
     p5.outro("Done");
     return;
   }
-  p5.log.warn("The following will be removed/modified:\n");
-  for (const step of steps) {
-    p5.log.message(`  ${pc3.bold(step.label)}`);
-    for (const item of step.items) {
-      p5.log.message(`    ${pc3.red("\xD7")} ${pc3.dim(item)}`);
-    }
-    p5.log.message("");
-  }
+  const planLines = steps.map((step) => {
+    const names = step.items.join(" ");
+    const countLabel = pc3.dim(`${step.count} ${step.unit}`);
+    return `${pc3.red("\xD7")} ${names}  ${countLabel}`;
+  });
+  p5.note(planLines.join("\n"), "Uninstall plan");
   if (!options.force) {
     const confirmed = await p5.confirm({
-      message: `Proceed with uninstall? (${steps.length} ${steps.length === 1 ? "area" : "areas"})`,
+      message: "Proceed with uninstall?",
       initialValue: false
     });
     if (p5.isCancel(confirmed) || !confirmed) {
@@ -14679,29 +14768,19 @@ var uninstallCommand = new Command6("uninstall").description("Remove all CMS fil
       process.exit(0);
     }
   }
-  let completedCount = 0;
+  const s = p5.spinner();
+  s.start(steps[0].label);
   for (const step of steps) {
+    s.message(step.label);
     step.execute();
-    completedCount++;
-    p5.log.success(`Removed: ${step.label}`);
-  }
-  p5.log.message("");
-  if (completedCount === 0) {
-    p5.log.info("No changes were made.");
-  } else {
-    p5.note(
-      pc3.dim("Database tables were NOT dropped \u2014 drop them manually if needed."),
-      "Next steps"
-    );
   }
-  if (findMainCss2(cwd)) {
-    p5.log.info(
-      pc3.dim(
-        "Note: @theme tokens were left in your CSS \u2014 they're harmless and may be shared with your own styles."
-      )
-    );
-  }
-  p5.outro(completedCount > 0 ? "Uninstall complete" : "Done");
+  const parts = steps.map((step) => `${step.count} ${step.unit}`);
+  s.stop(`Removed ${parts.join(", ")}`);
+  p5.note(
+    pc3.dim("Database tables were NOT dropped \u2014 drop them manually if needed."),
+    "Next steps"
+  );
+  p5.outro("Uninstall complete");
 });
 
 // src/commands/update-styles.ts