betterstart-cli 0.0.92 → 0.0.94

package/dist/cli.js

@@ -52,6 +52,9 @@ async function loadConfigFile(configPath) {
 function isInteractiveSession() {
   return Boolean(process.stdin.isTTY) && process.env.CI !== "true";
 }
+function isInteractiveTerminalSession() {
+  return isInteractiveSession() && Boolean(process.stdout.isTTY);
+}
 
 // core-engine/commands/runtime.ts
 import { Argument, Command } from "commander";
@@ -120,7 +123,10 @@ function createInitCommand(runtime) {
   ).option("--database-provider <provider>", "Database provider: vercel, railway, or manual").option(
     "--storage-provider <provider>",
     "Storage provider: vercel-blob, railway-bucket, r2, or local"
-  ).option("--deploy-provider <provider>", "Deploy provider: vercel, railway, or none").option("--database-plan <id>", "Neon plan id for a Vercel-provisioned database").option("--railway-workspace <id-or-name>", "Railway workspace for a new project").option("--railway-project <id-or-name>", "Existing Railway project to intentionally reuse").option("--railway-environment <id-or-name>", "Railway environment (default: production)").option("--railway-service <id-or-name>", "Railway app service (default: web)").option(
+  ).option("--deploy-provider <provider>", "Deploy provider: vercel, railway, or none").option(
+    "--use-existing-resources",
+    "Require database/storage credentials from existing project env files; never provision them"
+  ).option("--database-plan <id>", "Neon plan id for a Vercel-provisioned database").option("--railway-workspace <id-or-name>", "Railway workspace for a new project").option("--railway-project <id-or-name>", "Existing Railway project to intentionally reuse").option("--railway-environment <id-or-name>", "Railway environment (default: production)").option("--railway-service <id-or-name>", "Railway app service (default: web)").option(
     "--railway-bucket-region <region>",
     "Railway bucket region: sjc, iad, ams, or sin (default: iad)"
   ).option("--force", "Overwrite all existing Admin files (nuclear option)").addHelpText(
@@ -185,15 +191,18 @@ function createUpdateStylesCommand(runtime) {
 // core-engine/commands/default-action.ts
 var ADD_COMMAND = "add";
 var CREATE_COMMAND = "create";
+var GENERATE_COMMAND = "generate";
 var INIT_COMMAND = "init";
 var REMOVE_COMMAND = "remove";
 var REMOVE_SCHEMA_COMMAND = "remove-schema";
+var UPDATE_COMMAND = "update";
+var ALL_FLAG = "--all";
 var CANCELLED = /* @__PURE__ */ Symbol("cancelled");
 function cancelled(value) {
   return value === CANCELLED;
 }
 async function runDefaultAction(program2, runtime) {
-  if (!isInteractiveSession()) {
+  if (!isInteractiveTerminalSession()) {
     program2.outputHelp();
     return;
   }
@@ -238,6 +247,24 @@ async function promptRequiredArguments(name, runtime, cwd) {
   if (name === ADD_COMMAND || name === REMOVE_COMMAND) {
     return promptInstallables(name, runtime, cwd);
   }
+  if (name === GENERATE_COMMAND) {
+    const schemas = await runtime.listSchemaChoices(cwd);
+    if (schemas.length === 0) {
+      p.log.warn("No schemas to generate.");
+      return CANCELLED;
+    }
+    const target = await p.select({
+      message: "What do you want to generate?",
+      options: [
+        ...schemas.map((value) => ({ value, label: value })),
+        { value: ALL_FLAG, label: "All schemas", hint: "regenerate everything" }
+      ]
+    });
+    return p.isCancel(target) ? CANCELLED : [target];
+  }
+  if (name === UPDATE_COMMAND) {
+    return promptComponents(runtime, cwd);
+  }
   if (name === REMOVE_SCHEMA_COMMAND) {
     const schemas = await runtime.listSchemaChoices(cwd);
     if (schemas.length === 0) {
@@ -252,6 +279,31 @@ async function promptRequiredArguments(name, runtime, cwd) {
   }
   return [];
 }
+async function promptComponents(runtime, cwd) {
+  const scope = await p.select({
+    message: "What do you want to update?",
+    options: [
+      { value: ALL_FLAG, label: "All components", hint: "every installed component" },
+      { value: "pick", label: "Choose components" }
+    ]
+  });
+  if (p.isCancel(scope)) {
+    return CANCELLED;
+  }
+  if (scope === ALL_FLAG) {
+    return [ALL_FLAG];
+  }
+  const components = await runtime.listComponentChoices(cwd);
+  if (components.length === 0) {
+    p.log.warn("No components available to update.");
+    return CANCELLED;
+  }
+  const selected = await p.multiselect({
+    message: "Components to update",
+    options: components.map((value) => ({ value, label: value }))
+  });
+  return p.isCancel(selected) ? CANCELLED : selected;
+}
 async function promptInstallables(name, runtime, cwd) {
   const removing = name === REMOVE_COMMAND;
   const choices = await runtime.listInstallableChoices(cwd);
@@ -1729,6 +1781,21 @@ function spawnAsync(cmd, args, cwd) {
     child.on("error", reject);
   });
 }
+function isUnexpectedPnpmStoreError(error) {
+  return error instanceof Error && error.message.includes("ERR_PNPM_UNEXPECTED_STORE");
+}
+async function runDependencyInstall(pm, args, cwd, recovery) {
+  try {
+    await spawnAsync(pm, args, cwd);
+  } catch (error) {
+    if (pm !== "pnpm" || recovery.attempted || !isUnexpectedPnpmStoreError(error)) {
+      throw error;
+    }
+    recovery.attempted = true;
+    await spawnAsync("pnpm", ["install", "--force"], cwd);
+    await spawnAsync(pm, args, cwd);
+  }
+}
 function unique(values) {
   return Array.from(new Set(values));
 }
@@ -1775,11 +1842,22 @@ async function installDependenciesAsync({
       ensurePnpmAllowedBuilds(cwd, installPlan.pnpmAllowedBuilds ?? []);
       ensurePnpmPackageExtensions(cwd, installPlan.dependencies);
     }
+    const pnpmStoreRecovery = { attempted: false };
     if (installPlan.dependencies.length > 0) {
-      await spawnAsync(pm, buildAddArgs(pm, installPlan.dependencies, false), cwd);
+      await runDependencyInstall(
+        pm,
+        buildAddArgs(pm, installPlan.dependencies, false),
+        cwd,
+        pnpmStoreRecovery
+      );
     }
     if (installPlan.devDependencies.length > 0) {
-      await spawnAsync(pm, buildAddArgs(pm, installPlan.devDependencies, true), cwd);
+      await runDependencyInstall(
+        pm,
+        buildAddArgs(pm, installPlan.devDependencies, true),
+        cwd,
+        pnpmStoreRecovery
+      );
     }
     return {
       dependencies: installPlan.dependencies,
@@ -3240,6 +3318,13 @@ function walkSlot(field, fieldPath, errors) {
 // core-engine/utils/env.ts
 import fs10 from "fs";
 import path12 from "path";
+import { parseEnv } from "util";
+var DEVELOPMENT_ENV_FILES = [
+  ".env.development.local",
+  ".env.local",
+  ".env.development",
+  ".env"
+];
 function readEnvVar(cwd, key) {
   const envPath = path12.join(cwd, ".env.local");
   if (!fs10.existsSync(envPath)) {
@@ -3259,6 +3344,21 @@ function readEnvVar(cwd, key) {
   }
   return void 0;
 }
+function resolveProjectEnvVar(cwd, key) {
+  for (const envFile of DEVELOPMENT_ENV_FILES) {
+    const envPath = path12.join(cwd, envFile);
+    if (!fs10.existsSync(envPath)) continue;
+    try {
+      const value = parseEnv(fs10.readFileSync(envPath, "utf-8"))[key]?.trim();
+      if (value) return { source: envFile, value };
+    } catch {
+    }
+  }
+  return void 0;
+}
+function readProjectEnvVar(cwd, key) {
+  return resolveProjectEnvVar(cwd, key)?.value;
+}
 function parseEnvValue(rawValue) {
   const value = rawValue.trim();
   const quote2 = value[0];
@@ -3645,10 +3745,10 @@ function hasRequiredIntegrationEnv(definition, cwd) {
   const requiredKeys = definition.envSections.flatMap(
     (section) => section.vars.filter((entry) => entry.value === "").map((entry) => entry.key)
   );
-  return requiredKeys.every((key) => Boolean(readEnvVar(cwd, key)));
+  return requiredKeys.every((key) => Boolean(readProjectEnvVar(cwd, key)));
 }
 function readNonEmptyEnvVar(cwd, key) {
-  const value = readEnvVar(cwd, key)?.trim();
+  const value = readProjectEnvVar(cwd, key)?.trim();
   return value ? value : void 0;
 }
 async function resolveTextEnvValue(options) {
@@ -4270,7 +4370,8 @@ async function installIntegrations({
   pm,
   integrationIds,
   interactive,
-  includeBiome
+  includeBiome,
+  dependenciesInstalled = false
 }) {
   const orderedIntegrationIds = resolveIntegrationInstallOrder(integrationIds);
   const installedIntegrationIds = normalizeInstalledIntegrations(config);
@@ -4348,7 +4449,7 @@ async function installIntegrations({
         (dependency) => !currentPlan.devDependencies.includes(dependency)
       )
     };
-    if (dependencyDiff.dependencies.length > 0 || dependencyDiff.devDependencies.length > 0) {
+    if (!dependenciesInstalled && (dependencyDiff.dependencies.length > 0 || dependencyDiff.devDependencies.length > 0)) {
       const result = await installDependenciesAsync({
         cwd,
         pm,
@@ -19395,7 +19496,8 @@ async function installPresets({
   config,
   pm,
   presetIds,
-  includeBiome
+  includeBiome,
+  dependenciesInstalled = false
 }) {
   const orderedPresetIds = resolvePresetInstallOrder(presetIds);
   const installedPresetIds = normalizeInstalledPresets(config);
@@ -19430,7 +19532,7 @@ async function installPresets({
         (dependency) => !currentPlan.devDependencies.includes(dependency)
       )
     };
-    if (dependencyDiff.dependencies.length > 0 || dependencyDiff.devDependencies.length > 0) {
+    if (!dependenciesInstalled && (dependencyDiff.dependencies.length > 0 || dependencyDiff.devDependencies.length > 0)) {
       const result = await installDependenciesAsync({
         cwd,
         pm,
@@ -22785,7 +22887,7 @@ async function promptPresets(cwd, options = {}) {
       mergeIntegrationConfig(await collectIntegrationConfig(cwd, ["railway-bucket"]));
     }
   } else if (storage === "vercel-blob") {
-    const existingToken = readEnvVar(cwd, "BLOB_READ_WRITE_TOKEN")?.trim();
+    const existingToken = readProjectEnvVar(cwd, "BLOB_READ_WRITE_TOKEN")?.trim();
     const flow = !existingToken && options.provisionVercelBlob ? await options.provisionVercelBlob() : void 0;
     if (flow?.ok && flow.token) {
       persistBlobReadWriteToken(cwd, flow.token);
@@ -22898,6 +23000,14 @@ function validateInitProviderFlags(options) {
   if (options.databasePlan && options.databaseProvider && options.databaseProvider !== "vercel") {
     throw new Error("--database-plan can only be used with --database-provider vercel.");
   }
+  if (options.useExistingResources && !options.yes) {
+    throw new Error("--use-existing-resources requires --yes.");
+  }
+  if (options.useExistingResources && options.databaseProvider && options.databaseProvider !== "manual") {
+    throw new Error(
+      "--use-existing-resources requires --database-provider manual for an existing DATABASE_URL."
+    );
+  }
 }
 function resolveFlagStorageProvider(explicitProvider, integrations) {
   const inferred = Array.from(
@@ -25055,8 +25165,16 @@ function scaffoldLayout({ cwd, config }) {
     readTemplate("pages/settings/forms/forms-settings-page-content.tsx")
   );
   write(
-    path43.join(settingsFormsDir, "edit-form-notifications-dialog.tsx"),
-    readTemplate("pages/settings/forms/edit-form-notifications-dialog.tsx")
+    path43.join(settingsFormsDir, "forms-settings-columns.tsx"),
+    readTemplate("pages/settings/forms/forms-settings-columns.tsx")
+  );
+  write(
+    path43.join(settingsFormsDir, "forms-settings-table.tsx"),
+    readTemplate("pages/settings/forms/forms-settings-table.tsx")
+  );
+  write(
+    path43.join(settingsFormsDir, "form-notifications-drawer.tsx"),
+    readTemplate("pages/settings/forms/form-notifications-drawer.tsx")
   );
   const settingsWebhooksDir = path43.join(settingsDir, "webhooks");
   write(
@@ -27436,20 +27554,62 @@ function removeExistingAdminPaths(cwd, namespaces) {
   }
   return removed;
 }
+function writeInitJson(context, payload) {
+  context.restoreStdout?.();
+  context.restoreStdout = void 0;
+  context.written = true;
+  console.log(JSON.stringify(payload, null, 2));
+}
 async function runInitCommand(name, options) {
-  let restoreStdout;
+  const jsonContext = {
+    restoreStdout: options.json ? redirectStdoutToStderr() : void 0,
+    written: false
+  };
+  try {
+    await runInitCommandInternal(name, options, jsonContext);
+  } catch (error) {
+    if (options.json && !jsonContext.written) {
+      const message = error instanceof Error ? error.message : String(error);
+      writeInitJson(jsonContext, {
+        success: false,
+        phase: "initialization",
+        error: {
+          code: "UNEXPECTED_INIT_ERROR",
+          message: redactSecrets(message)
+        }
+      });
+    }
+    throw error;
+  } finally {
+    jsonContext.restoreStdout?.();
+  }
+}
+async function runInitCommandInternal(name, options, jsonContext) {
+  const exitInit = (phase, message, code = "INIT_FAILED") => {
+    if (options.json) {
+      writeInitJson(jsonContext, {
+        success: false,
+        phase,
+        error: {
+          code,
+          message: redactSecrets(message)
+        }
+      });
+    }
+    process.exit(1);
+  };
   if (options.json) {
     if (!options.yes) {
-      p26.log.error("--json requires --yes.");
-      process.exit(1);
+      const message = "--json requires --yes.";
+      p26.log.error(message);
+      exitInit("validation", message, "JSON_REQUIRES_YES");
     }
-    restoreStdout = redirectStdoutToStderr();
   }
   installPromptCheckmarks();
   const disposeCancelGuard = installSetupCancelGuard();
   renderInitBanner();
-  let selectedPresets;
-  let selectedIntegrations;
+  let selectedPresets = [];
+  let selectedIntegrations = [];
   let flagStorageProvider;
   try {
     validateInitProviderFlags(options);
@@ -27461,8 +27621,9 @@ async function runInitCommand(name, options) {
     }
   } catch (error) {
     disposeCancelGuard();
-    p26.log.error(error instanceof Error ? error.message : String(error));
-    process.exit(1);
+    const message = error instanceof Error ? error.message : String(error);
+    p26.log.error(message);
+    exitInit("validation", message, "INVALID_OPTIONS");
   }
   let cwd = process.cwd();
   let projectName = path52.basename(cwd);
@@ -27472,8 +27633,9 @@ async function runInitCommand(name, options) {
     try {
       namespace = validateAdminNamespace(options.namespace);
     } catch (error) {
-      p26.log.error(error instanceof Error ? error.message : String(error));
-      process.exit(1);
+      const message = error instanceof Error ? error.message : String(error);
+      p26.log.error(message);
+      exitInit("validation", message, "INVALID_NAMESPACE");
     }
   }
   let projectPrompt;
@@ -27481,8 +27643,9 @@ async function runInitCommand(name, options) {
     try {
       projectPrompt = options.yes ? resolveNonInteractiveProject(name) : await promptProject(name);
     } catch (error) {
-      p26.log.error(error instanceof Error ? error.message : String(error));
-      process.exit(1);
+      const message = error instanceof Error ? error.message : String(error);
+      p26.log.error(message);
+      exitInit("project", message, "PROJECT_SETUP_FAILED");
     }
   }
   if (!options.yes && !options.namespace) {
@@ -27513,8 +27676,9 @@ async function runInitCommand(name, options) {
   if (project2.isExisting) {
     srcDir = project2.hasSrcDir;
     if (!project2.hasTypeScript) {
-      p26.log.error("TypeScript is required. Please add a tsconfig.json first.");
-      process.exit(1);
+      const message = "TypeScript is required. Please add a tsconfig.json first.";
+      p26.log.error(message);
+      exitInit("project", message, "TYPESCRIPT_REQUIRED");
     }
     if (forceMode) {
       const nuked = removeExistingAdminPaths(cwd, await resolveForceInitNamespaces(cwd, namespace));
@@ -27530,10 +27694,9 @@ async function runInitCommand(name, options) {
       );
       p26.note(conflictLines.join("\n"), pc10.yellow("Conflicts"));
       if (options.yes) {
-        p26.log.error(
-          "Can't continue with --yes while admin files conflict. Re-run with --force to remove them first."
-        );
-        process.exit(1);
+        const message = "Can't continue with --yes while admin files conflict. Re-run with --force to remove them first.";
+        p26.log.error(message);
+        exitInit("project", message, "ADMIN_FILES_CONFLICT");
       }
       const proceed = await p26.confirm({
         message: [
@@ -27608,7 +27771,7 @@ async function runInitCommand(name, options) {
   ${pc10.cyan(`npx create-next-app@latest ${freshProject.projectName} --typescript --tailwind --app`)}
   Then run ${pc10.cyan("betterstart init")} inside it.`
       );
-      process.exit(1);
+      exitInit("project", createNextAppResult.error, "CREATE_NEXT_APP_FAILED");
     }
     cwd = path52.resolve(cwd, freshProject.projectName);
     const hasPackageJson = fs41.existsSync(path52.join(cwd, "package.json"));
@@ -27626,7 +27789,11 @@ async function runInitCommand(name, options) {
   ${pc10.cyan(manualCmd)}
   Then run ${pc10.cyan("betterstart init")} inside it.`
       );
-      process.exit(1);
+      exitInit(
+        "project",
+        "create-next-app completed but the project was not created.",
+        "CREATE_NEXT_APP_INCOMPLETE"
+      );
     }
     createNextAppSpinner.clear();
     project2 = detectProject(cwd, namespace);
@@ -27638,7 +27805,8 @@ async function runInitCommand(name, options) {
   let railwayDatabaseServiceName;
   let railwayBucketResourceName;
   let railwayBucketUrlStyle;
-  const existingDbUrl = readExistingDbUrl(cwd);
+  const existingDatabase = readExistingDbUrl(cwd);
+  const existingDbUrl = existingDatabase?.value;
   const getRailwaySession = () => {
     railwaySessionPromise ??= createRailwaySession({
       cwd,
@@ -27670,24 +27838,28 @@ async function runInitCommand(name, options) {
   try {
     validateResolvedDatabaseProvider(databaseProvider, options);
   } catch (error) {
-    p26.log.error(error instanceof Error ? error.message : String(error));
-    process.exit(1);
+    const message = error instanceof Error ? error.message : String(error);
+    p26.log.error(message);
+    exitInit("providers", message, "INVALID_DATABASE_PROVIDER");
   }
   if (databaseProvider === "manual") {
     const candidate = options.databaseUrl ?? existingDbUrl ?? promptedManualUrl;
     if (candidate && !isValidDbUrl(candidate)) {
-      p26.log.error(
-        `Invalid database URL. Must start with ${pc10.cyan("postgres://")} or ${pc10.cyan("postgresql://")}`
-      );
-      process.exit(1);
+      const message = "Invalid database URL. Must start with postgres:// or postgresql://";
+      p26.log.error(message);
+      exitInit("providers", message, "INVALID_DATABASE_URL");
     }
     if (candidate) {
       databaseUrl = candidate;
       if (existingDbUrl === candidate && !options.databaseUrl) {
         p26.log.info(
-          `Using the existing DATABASE_URL from .env.local ${pc10.dim(`(${maskDbUrl(candidate)})`)}`
+          `Using the existing DATABASE_URL from ${existingDatabase?.source ?? "project env"} ${pc10.dim(`(${maskDbUrl(candidate)})`)}`
         );
       }
+    } else if (options.useExistingResources) {
+      const message = "DATABASE_URL is missing from the project environment files.";
+      p26.log.error(message);
+      exitInit("providers", message, "MISSING_DATABASE_URL");
     } else if (!options.yes) {
       databaseUrl = await promptConnectionString();
     }
@@ -27704,10 +27876,9 @@ async function runInitCommand(name, options) {
       persistDatabaseUrl(cwd, databaseUrl);
       dismissVercelSignedInNote = flow.dismissSignedInNote;
     } else if (options.yes) {
-      p26.log.error(
-        flow.ok ? "Created a Neon database, but DATABASE_URL could not be retrieved from Vercel." : "Vercel database provisioning did not complete."
-      );
-      process.exit(1);
+      const message = flow.ok ? "Created a Neon database, but DATABASE_URL could not be retrieved from Vercel." : "Vercel database provisioning did not complete.";
+      p26.log.error(message);
+      exitInit("providers", message, "DATABASE_PROVISIONING_FAILED");
     } else if (flow.ok) {
       openBrowserVercelNeonResource(flow.dashboardUrl ?? flow.resourceUrl);
       databaseUrl = await promptConnectionString();
@@ -27727,8 +27898,9 @@ async function runInitCommand(name, options) {
     } catch (error) {
       const message = error instanceof Error ? error.message : String(error);
       if (options.yes) {
-        p26.log.error(`Railway database provisioning failed: ${message}`);
-        process.exit(1);
+        const failureMessage = `Railway database provisioning failed: ${message}`;
+        p26.log.error(failureMessage);
+        exitInit("providers", failureMessage, "DATABASE_PROVISIONING_FAILED");
       }
       p26.log.warn(`Railway database provisioning failed: ${message}`);
       p26.log.info("Falling back to a manual database connection string.");
@@ -27773,27 +27945,39 @@ async function runInitCommand(name, options) {
       storage
     };
     if (storage === "r2") {
-      const missingR2Keys = R2_ENV_KEYS.filter((key) => !readEnvVar(cwd, key)?.trim());
+      const missingR2Keys = R2_ENV_KEYS.filter((key) => !readProjectEnvVar(cwd, key)?.trim());
       if (options.yes && missingR2Keys.length > 0) {
-        p26.log.error(
-          `Cloudflare R2 is missing required environment variables: ${missingR2Keys.join(", ")}.`
-        );
-        process.exit(1);
+        const message = `Cloudflare R2 is missing required environment variables: ${missingR2Keys.join(", ")}.`;
+        p26.log.error(message);
+        exitInit("providers", message, "MISSING_STORAGE_CREDENTIALS");
       }
       mergeCollectedIntegrationConfig(await collectIntegrationConfig(cwd, ["r2"]));
     } else if (storage === "railway-bucket") {
       if (hasRailwayBucketConfig(cwd)) {
         mergeCollectedIntegrationConfig(await collectIntegrationConfig(cwd, ["railway-bucket"]));
+      } else if (options.useExistingResources) {
+        const missingKeys = RAILWAY_BUCKET_ENV_KEYS.filter(
+          (key) => !readProjectEnvVar(cwd, key)?.trim()
+        );
+        const message = `Railway Bucket is missing required environment variables: ${missingKeys.join(", ")}.`;
+        p26.log.error(message);
+        exitInit("providers", message, "MISSING_STORAGE_CREDENTIALS");
       } else {
         const flow = await provisionRailwayBucket();
         if (flow.ok && flow.config) {
           mergeCollectedIntegrationConfig(flow.config);
         } else if (options.yes) {
-          p26.log.error("Railway bucket provisioning did not complete.");
-          process.exit(1);
+          const message = "Railway bucket provisioning did not complete.";
+          p26.log.error(message);
+          exitInit("providers", message, "STORAGE_PROVISIONING_FAILED");
         }
       }
-    } else if (storage === "vercel-blob" && !readEnvVar(cwd, "BLOB_READ_WRITE_TOKEN")?.trim()) {
+    } else if (storage === "vercel-blob" && !readProjectEnvVar(cwd, "BLOB_READ_WRITE_TOKEN")?.trim()) {
+      if (options.useExistingResources) {
+        const message = "BLOB_READ_WRITE_TOKEN is missing from the project environment files.";
+        p26.log.error(message);
+        exitInit("providers", message, "MISSING_STORAGE_CREDENTIALS");
+      }
       const flow = await runVercelBlobFlow({
         cwd,
         projectName,
@@ -27808,8 +27992,9 @@ async function runInitCommand(name, options) {
         });
         collectedIntegrationConfig.overwriteKeys.add("BLOB_READ_WRITE_TOKEN");
       } else if (options.yes) {
-        p26.log.error("Vercel Blob provisioning did not complete.");
-        process.exit(1);
+        const message = "Vercel Blob provisioning did not complete.";
+        p26.log.error(message);
+        exitInit("providers", message, "STORAGE_PROVISIONING_FAILED");
       } else {
         p26.log.warn(
           "Continuing without a Blob token \u2014 add BLOB_READ_WRITE_TOKEN to .env.local from the store on vercel.com/dashboard/stores."
@@ -27846,6 +28031,45 @@ async function runInitCommand(name, options) {
   config.paths = config.frameworkConfig.next.paths;
   config.database.migrationsDir = deriveMigrationsDir(namespace);
   const s = spinner2();
+  const coreDependencyPlan = getDependencyPlan(
+    presetSelection.presets,
+    presetSelection.integrations,
+    project2.linter.type === "none"
+  );
+  const cliDependencyPlan = getCliDependencySyncPlan(cwd);
+  s.start("Installing dependencies, This may take a moment");
+  const depsResult = await installDependenciesAsync({
+    cwd,
+    pm,
+    ...isFreshProject && pm === "pnpm" ? { pnpmAllowedBuilds: [...FRESH_PNPM_ALLOWED_BUILDS] } : {},
+    dependencies: Array.from(
+      /* @__PURE__ */ new Set([...coreDependencyPlan.dependencies, ...cliDependencyPlan?.dependencies ?? []])
+    ),
+    devDependencies: Array.from(
+      /* @__PURE__ */ new Set([
+        ...coreDependencyPlan.devDependencies,
+        ...cliDependencyPlan?.devDependencies ?? []
+      ])
+    )
+  });
+  if (depsResult.success) {
+    s.stop("");
+  } else {
+    const message = redactSecrets(depsResult.error ?? "Unknown dependency installation error");
+    s.stop("Failed to install dependencies");
+    p26.log.warn(message);
+    p26.log.info(
+      `You can install them manually:
+  ${pc10.cyan(`${pm} add ${depsResult.dependencies.join(" ")}`)}
+  ${pc10.cyan(`${pm} add -D ${depsResult.devDeps.join(" ")}`)}`
+    );
+    disposeCancelGuard();
+    exitInit(
+      "dependencies",
+      message,
+      message.includes("ERR_PNPM_UNEXPECTED_STORE") ? "PNPM_UNEXPECTED_STORE" : "DEPENDENCY_INSTALL_FAILED"
+    );
+  }
   s.start("Directory structure");
   scaffoldBase({
     cwd,
@@ -27913,36 +28137,6 @@ async function runInitCommand(name, options) {
       }
     }
   }
-  const coreDependencyPlan = getDependencyPlan([], [], project2.linter.type === "none");
-  const cliDependencyPlan = getCliDependencySyncPlan(cwd);
-  s.start("Installing dependencies, This may take a moment");
-  const depsResult = await installDependenciesAsync({
-    cwd,
-    pm,
-    ...isFreshProject && pm === "pnpm" ? { pnpmAllowedBuilds: [...FRESH_PNPM_ALLOWED_BUILDS] } : {},
-    dependencies: Array.from(
-      /* @__PURE__ */ new Set([...coreDependencyPlan.dependencies, ...cliDependencyPlan?.dependencies ?? []])
-    ),
-    devDependencies: Array.from(
-      /* @__PURE__ */ new Set([
-        ...coreDependencyPlan.devDependencies,
-        ...cliDependencyPlan?.devDependencies ?? []
-      ])
-    )
-  });
-  if (depsResult.success) {
-    s.stop("");
-  } else {
-    s.stop("Failed to install dependencies");
-    p26.log.warn(depsResult.error ?? "Unknown error");
-    p26.log.info(
-      `You can install them manually:
-  ${pc10.cyan(`${pm} add ${depsResult.dependencies.join(" ")}`)}
-  ${pc10.cyan(`${pm} add -D ${depsResult.devDeps.join(" ")}`)}`
-    );
-    disposeCancelGuard();
-    process.exit(1);
-  }
   process.stdout.write("\x1B[2A\x1B[J");
   s.start("Generating core schemas");
   const coreSchemasResult = scaffoldCoreSchemas({ cwd, config });
@@ -27956,7 +28150,8 @@ async function runInitCommand(name, options) {
       pm,
       presetIds: presetSelection.presets,
       interactive: !options.yes,
-      includeBiome: project2.linter.type === "none"
+      includeBiome: project2.linter.type === "none",
+      dependenciesInstalled: true
     });
   })() : Promise.resolve({ installed: [], skipped: [], warnings: [], config });
   const resolvedPresetInstallResult = await presetInstallResult;
@@ -27975,7 +28170,8 @@ async function runInitCommand(name, options) {
       // .env.local, so the install runs without prompting (rule: no
       // mid-scaffold input).
       interactive: false,
-      includeBiome: project2.linter.type === "none"
+      includeBiome: project2.linter.type === "none",
+      dependenciesInstalled: true
     });
   })() : Promise.resolve({
     installed: [],
@@ -28051,8 +28247,9 @@ async function runInitCommand(name, options) {
           clearDbSpinner();
           if (!verification.success) {
             p26.log.warn(verification.error);
-            p26.log.error("Database was not reachable. Aborting setup.");
-            process.exit(1);
+            const message = "Database was not reachable. Aborting setup.";
+            p26.log.error(message);
+            exitInit("database", verification.error, "DATABASE_UNREACHABLE");
           }
         } else {
           clearDbSpinner();
@@ -28066,8 +28263,9 @@ async function runInitCommand(name, options) {
         const pushError = pushResult.error ?? "Unknown error";
         p26.log.warn(pushError);
         if (isDatabaseReachabilityError(pushError)) {
-          p26.log.error("Database was not reachable. Aborting setup.");
-          process.exit(1);
+          const message = "Database was not reachable. Aborting setup.";
+          p26.log.error(message);
+          exitInit("database", pushError, "DATABASE_UNREACHABLE");
         }
         p26.log.info(`You can run it manually: ${pc10.cyan(drizzlePushCommand(pm))}`);
       }
@@ -28092,8 +28290,9 @@ async function runInitCommand(name, options) {
     if (adminCheck.error) {
       p26.log.warn(`Could not verify existing admin account ${pc10.dim(`(${adminCheck.error})`)}`);
       if (isDatabaseReachabilityError(adminCheck.error)) {
-        p26.log.error("Database was not reachable. Aborting setup.");
-        process.exit(1);
+        const message = "Database was not reachable. Aborting setup.";
+        p26.log.error(message);
+        exitInit("database", adminCheck.error, "DATABASE_UNREACHABLE");
       }
     } else if (adminCheck.existingAdmin) {
       const existingAdminLabel = formatAdminIdentity(adminCheck.existingAdmin);
@@ -28202,8 +28401,9 @@ Run manually: ${pc10.cyan(betterstartExecCommand(pm, "seed"))}`,
           pc10.red("Seed failed")
         );
         if (isDatabaseReachabilityError(seedResult.error)) {
-          p26.log.error("Database was not reachable. Aborting setup.");
-          process.exit(1);
+          const message = "Database was not reachable. Aborting setup.";
+          p26.log.error(message);
+          exitInit("database", seedResult.error, "DATABASE_UNREACHABLE");
         }
       }
     }
@@ -28244,8 +28444,9 @@ Run manually: ${pc10.cyan(betterstartExecCommand(pm, "seed"))}`,
     deployedUrl = deployFlow.url;
     if (!deployFlow.ok) {
       if (options.yes) {
-        p26.log.error("Vercel deploy did not complete.");
-        process.exit(1);
+        const message = "Vercel deploy did not complete.";
+        p26.log.error(message);
+        exitInit("deployment", message, "DEPLOYMENT_FAILED");
       }
       p26.log.warn("Vercel deploy did not complete; continuing.");
     }
@@ -28267,16 +28468,18 @@ Run manually: ${pc10.cyan(betterstartExecCommand(pm, "seed"))}`,
       if (!deployFlow.ok) {
         if (deployFlow.detail) p26.log.message(pc10.dim(redactSecrets(deployFlow.detail)));
         if (options.yes) {
-          p26.log.error("Railway deploy did not complete.");
-          process.exit(1);
+          const message = "Railway deploy did not complete.";
+          p26.log.error(message);
+          exitInit("deployment", message, "DEPLOYMENT_FAILED");
         }
         p26.log.warn("Railway deploy did not complete; continuing.");
       }
     } catch (error) {
       const message = error instanceof Error ? error.message : String(error);
       if (options.yes) {
-        p26.log.error(`Railway deploy failed: ${message}`);
-        process.exit(1);
+        const failureMessage = `Railway deploy failed: ${message}`;
+        p26.log.error(failureMessage);
+        exitInit("deployment", failureMessage, "DEPLOYMENT_FAILED");
       }
       p26.log.warn(`Railway deploy failed: ${message}`);
     }
@@ -28297,26 +28500,20 @@ Run manually: ${pc10.cyan(betterstartExecCommand(pm, "seed"))}`,
     }
   }
   disposeCancelGuard();
-  if (options.json && restoreStdout) {
-    restoreStdout();
-    console.log(
-      JSON.stringify(
-        {
-          namespace,
-          configPath: CONFIG_FILE_NAME,
-          databaseProvider,
-          storageProvider: presetSelection.storage,
-          deployProvider,
-          presets: presetSelection.presets,
-          integrations: presetSelection.integrations,
-          adminUrl: adminLoginUrl,
-          adminEmail: seedEmail ?? null,
-          deployedUrl: deployedUrl ?? null
-        },
-        null,
-        2
-      )
-    );
+  if (options.json) {
+    writeInitJson(jsonContext, {
+      success: true,
+      namespace,
+      configPath: CONFIG_FILE_NAME,
+      databaseProvider,
+      storageProvider: presetSelection.storage,
+      deployProvider,
+      presets: presetSelection.presets,
+      integrations: presetSelection.integrations,
+      adminUrl: adminLoginUrl,
+      adminEmail: seedEmail ?? null,
+      deployedUrl: deployedUrl ?? null
+    });
     return;
   }
   p26.outro(`Admin ready at ${adminNamespace.routePath}`);
@@ -28325,21 +28522,13 @@ function isValidDbUrl(url) {
   return url.startsWith("postgres://") || url.startsWith("postgresql://");
 }
 function readExistingDbUrl(cwd) {
-  const envPath = path52.join(cwd, ".env.local");
-  if (!fs41.existsSync(envPath)) return void 0;
-  const content = fs41.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() === "DATABASE_URL") {
-      const val = rest.join("=").replace(/^['"]|['"]$/g, "").trim();
-      if (val.length > 0 && !val.startsWith("your_") && val !== "postgresql://..." && isValidDbUrl(val)) {
-        return val;
-      }
-    }
+  const resolved = resolveProjectEnvVar(cwd, "DATABASE_URL");
+  if (!resolved) return void 0;
+  const value = resolved.value.trim();
+  if (value.startsWith("your_") || value === "postgresql://..." || !isValidDbUrl(value)) {
+    return void 0;
   }
-  return void 0;
+  return { ...resolved, value };
 }
 function maskDbUrl(url) {
   try {
@@ -28381,7 +28570,7 @@ var R2_ENV_KEYS = [
   "BETTERSTART_R2_PUBLIC_URL"
 ];
 function hasRailwayBucketConfig(cwd) {
-  return RAILWAY_BUCKET_ENV_KEYS.every((key) => Boolean(readEnvVar(cwd, key)?.trim()));
+  return RAILWAY_BUCKET_ENV_KEYS.every((key) => Boolean(readProjectEnvVar(cwd, key)?.trim()));
 }
 function railwayBucketIntegrationConfig(credentials) {
   return {
@@ -28501,7 +28690,7 @@ main().catch((error) => {
       cwd,
       timeoutMs: 15e3,
       env: {
-        DATABASE_URL: databaseUrl
+        DATABASE_URL: databaseUrl.value
       }
     }
   );
@@ -28914,581 +29103,13 @@ async function runListPresetsCommand(options) {
 }
 
 // adapters/next/commands/menu-choices.ts
-import path55 from "path";
-async function listInstallableChoices(cwd) {
-  const config = await resolveConfigOrExit(cwd);
-  const installedPresets = new Set(config.presets.installed);
-  const installedIntegrations = new Set(config.integrations.installed);
-  return {
-    presets: listAvailablePresets().map((preset) => ({
-      id: preset.id,
-      description: preset.description,
-      installed: installedPresets.has(preset.id)
-    })),
-    integrations: listAvailableIntegrations().map((integration) => ({
-      id: integration.id,
-      description: integration.description,
-      installed: installedIntegrations.has(integration.id)
-    }))
-  };
-}
-async function listSchemaChoices(cwd) {
-  const config = await resolveConfigOrExit(cwd);
-  const paths = resolveProjectPaths(config);
-  return listSchemaNames(path55.join(cwd, ...paths.schemasDir.split("/")));
-}
-
-// adapters/next/commands/remove.ts
 import path56 from "path";
-import * as p29 from "@clack/prompts";
-async function runRemoveCommand(items, options) {
-  const removeIntegrationsMode = Boolean(options.integration);
-  if (!removeIntegrationsMode && items.includes("core")) {
-    p29.log.error("The core Admin cannot be removed.");
-    process.exit(1);
-  }
-  const presetIds = items.filter(isPresetId);
-  const integrationIds = items.filter(isIntegrationId);
-  if (!removeIntegrationsMode && integrationIds.length > 0) {
-    p29.log.error(
-      `Integration IDs require --integration. Run \`betterstart remove --integration ${integrationIds.join(" ")}\`.`
-    );
-    process.exit(1);
-  }
-  if (removeIntegrationsMode && presetIds.length > 0) {
-    p29.log.error(`Preset IDs cannot be removed with --integration: ${presetIds.join(", ")}`);
-    process.exit(1);
-  }
-  const invalidItems = removeIntegrationsMode ? items.filter((integrationId) => !isIntegrationId(integrationId)) : items.filter((presetId) => !isPresetId(presetId));
-  if (invalidItems.length > 0) {
-    p29.log.error(
-      removeIntegrationsMode ? formatUnknownIntegrationMessage(invalidItems) : formatUnknownPresetMessage(invalidItems)
-    );
-    process.exit(1);
-  }
-  const cwd = options.cwd ? path56.resolve(options.cwd) : process.cwd();
-  const config = await resolveConfigOrExit(cwd);
-  const pm = detectPackageManager(cwd);
-  if (!options.force) {
-    const confirmed = await p29.confirm({
-      message: `Remove ${removeIntegrationsMode ? "integration" : "preset"}${items.length === 1 ? "" : "s"} ${items.join(", ")}?`,
-      initialValue: false
-    });
-    if (p29.isCancel(confirmed) || !confirmed) {
-      p29.cancel(`${removeIntegrationsMode ? "Integration" : "Preset"} removal cancelled.`);
-      process.exit(0);
-    }
-  }
-  if (removeIntegrationsMode) {
-    const result2 = await removeIntegrations({
-      cwd,
-      config,
-      pm,
-      integrationIds
-    });
-    writeConfigFile(cwd, result2.config);
-    if (result2.removed.length === 0) {
-      p29.outro("No integrations were removed.");
-      return;
-    }
-    if (result2.warnings.length > 0) {
-      p29.note(result2.warnings.join("\n"), "Warnings");
-    }
-    p29.outro(
-      `Removed integration${result2.removed.length === 1 ? "" : "s"}: ${result2.removed.join(", ")}`
-    );
-    return;
-  }
-  const result = await removePresets({
-    cwd,
-    config,
-    pm,
-    presetIds
-  });
-  writeConfigFile(cwd, result.config);
-  if (result.removed.length === 0) {
-    p29.outro("No presets were removed.");
-    return;
-  }
-  if (result.warnings.length > 0) {
-    p29.note(result.warnings.join("\n"), "Warnings");
-  }
-  p29.outro(`Removed preset${result.removed.length === 1 ? "" : "s"}: ${result.removed.join(", ")}`);
-}
-
-// adapters/next/commands/remove-schema.ts
-import fs42 from "fs";
-import path57 from "path";
-import * as clack3 from "@clack/prompts";
-function removePath2(cwd, filePath) {
-  const fullPath = path57.join(cwd, ...filePath.split("/"));
-  const existed = fs42.existsSync(fullPath);
-  fs42.rmSync(fullPath, { recursive: true, force: true });
-  return existed;
-}
-function cleanupEmptyDirs3(cwd, deletedPaths, configPaths) {
-  const stopRoots = /* @__PURE__ */ new Set([
-    path57.join(cwd, ...configPaths.adminDir.split("/")),
-    path57.join(cwd, ...configPaths.adminNavigationDir.split("/")),
-    path57.join(cwd, ...configPaths.adminWebhookEventsDir.split("/")),
-    path57.join(cwd, ...configPaths.pagesDir.split("/"))
-  ]);
-  for (const deletedPath of deletedPaths) {
-    let current = path57.dirname(path57.join(cwd, ...deletedPath.split("/")));
-    while (!stopRoots.has(current)) {
-      if (!fs42.existsSync(current)) {
-        current = path57.dirname(current);
-        continue;
-      }
-      const entries = fs42.readdirSync(current);
-      if (entries.length > 0) {
-        break;
-      }
-      fs42.rmdirSync(current);
-      current = path57.dirname(current);
-    }
-  }
-}
-function resolveSchemaOwnerForRemoval(cwd, schemaName) {
-  const explicitOwner = getSchemaOwner(cwd, schemaName);
-  if (explicitOwner) {
-    return explicitOwner;
-  }
-  if (schemaName === "settings") {
-    return "core";
-  }
-  return "user";
-}
-async function runRemoveSchemaCommand(schemaName, options) {
-  const owner = resolveSchemaOwnerForRemoval(
-    options.cwd ? path57.resolve(options.cwd) : process.cwd(),
-    schemaName
-  );
-  if (owner === "core") {
-    clack3.log.error(
-      `"${schemaName}" is a core Admin module and cannot be removed with remove-schema.`
-    );
-    process.exit(1);
-  }
-  if (owner.startsWith("preset:")) {
-    clack3.log.error(`"${schemaName}" is owned by ${owner}. Remove the owning preset instead.`);
-    process.exit(1);
-  }
-  const cwd = options.cwd ? path57.resolve(options.cwd) : process.cwd();
-  const config = await resolveConfigOrExit(cwd);
-  const paths = resolveProjectPaths(config);
-  const manifest = loadManifest(cwd, schemaName);
-  if (!snapshotRootExists(cwd)) {
-    clack3.log.error(UNSUPPORTED_PROJECT_STATE_MESSAGE);
-    process.exit(1);
-  }
-  if (!manifest) {
-    clack3.log.error(UNSUPPORTED_PROJECT_STATE_MESSAGE);
-    process.exit(1);
-  }
-  if (!options.force) {
-    if (!isInteractiveSession()) {
-      clack3.log.error(
-        `Removing generated files for ${schemaName} needs confirmation. Re-run with --force.`
-      );
-      process.exit(1);
-    }
-    const confirmed = await clack3.confirm({
-      message: `Remove generated files for ${schemaName}?`,
-      initialValue: false
-    });
-    if (clack3.isCancel(confirmed) || !confirmed) {
-      clack3.cancel("Cancelled.");
-      return;
-    }
-  }
-  const deletedPaths = [];
-  for (const file of [...manifest.files.map((entry) => entry.path), ...manifest.skipped]) {
-    if (removePath2(cwd, file)) {
-      deletedPaths.push(file);
-    }
-  }
-  const loaded = (() => {
-    try {
-      return loadSchema(path57.join(cwd, ...paths.schemasDir.split("/")), schemaName);
-    } catch {
-      return null;
-    }
-  })();
-  const kebabName = toKebabCase(schemaName);
-  if (loaded?.type === "form") {
-    if (removePath2(cwd, `${paths.adminActionsDir}/${schemaName}`)) {
-      deletedPaths.push(`${paths.adminActionsDir}/${schemaName}`);
-    }
-    if (removePath2(cwd, `${paths.pagesDir}/forms/${kebabName}`)) {
-      deletedPaths.push(`${paths.pagesDir}/forms/${kebabName}`);
-    }
-  } else {
-    if (removePath2(cwd, `${paths.adminActionsDir}/${schemaName}`)) {
-      deletedPaths.push(`${paths.adminActionsDir}/${schemaName}`);
-    }
-    if (removePath2(cwd, `${paths.pagesDir}/${schemaName}`)) {
-      deletedPaths.push(`${paths.pagesDir}/${schemaName}`);
-    }
-  }
-  cleanupEmptyDirs3(cwd, deletedPaths, paths);
-  deleteSnapshot(cwd, schemaName);
-  if (hasTombstone(cwd, schemaName)) {
-    clearTombstone(cwd, schemaName);
-  }
-  writeTombstone(cwd, schemaName);
-  await applyGeneratedFiles({
-    cwd,
-    config,
-    scope: BARREL_SCOPE,
-    schemaJson: { name: BARREL_SCOPE },
-    generatedFiles: renderBarrelFiles(cwd, config),
-    force: false,
-    interactive: false
-  });
-  clack3.log.info(
-    `Tombstone written: .betterstart/snapshots/_removed/${schemaName}
-Schema JSON preserved.`
-  );
-  clack3.outro(`Removed generated files for ${schemaName}`);
-}
-
-// adapters/next/commands/uninstall.ts
-import fs44 from "fs";
-import path58 from "path";
-import * as p30 from "@clack/prompts";
-import pc11 from "picocolors";
-
-// adapters/next/commands/uninstall-cleaners.ts
-import fs43 from "fs";
-function stripJsonComments2(input) {
-  let result = "";
-  let i = 0;
-  while (i < input.length) {
-    if (input[i] === '"') {
-      let j = i + 1;
-      while (j < input.length) {
-        if (input[j] === "\\") {
-          j += 2;
-          continue;
-        }
-        if (input[j] === '"') {
-          j++;
-          break;
-        }
-        j++;
-      }
-      result += input.slice(i, j);
-      i = j;
-    } else if (input[i] === "/" && input[i + 1] === "/") {
-      const nl = input.indexOf("\n", i);
-      i = nl === -1 ? input.length : nl;
-    } else if (input[i] === "/" && input[i + 1] === "*") {
-      const end = input.indexOf("*/", i + 2);
-      i = end === -1 ? input.length : end + 2;
-    } else {
-      result += input[i];
-      i++;
-    }
-  }
-  return result;
-}
-function cleanTsconfig(tsconfigPath, aliasRoot = "@admin") {
-  if (!fs43.existsSync(tsconfigPath)) return [];
-  const raw = fs43.readFileSync(tsconfigPath, "utf-8");
-  const stripped = stripJsonComments2(raw).replace(/,\s*([\]}])/g, "$1");
-  let tsconfig;
-  try {
-    tsconfig = JSON.parse(stripped);
-  } catch {
-    return [];
-  }
-  const compilerOptions = tsconfig.compilerOptions ?? {};
-  const paths = compilerOptions.paths ?? {};
-  const removed = [];
-  for (const key of Object.keys(paths)) {
-    if (key.startsWith("@admin/") || key === "@admin/*" || key.startsWith(`${aliasRoot}/`) || key === `${aliasRoot}/*`) {
-      removed.push(key);
-      delete paths[key];
-    }
-  }
-  if (removed.length === 0) return [];
-  if (Object.keys(paths).length === 0) {
-    compilerOptions.paths = void 0;
-  } else {
-    compilerOptions.paths = paths;
-  }
-  tsconfig.compilerOptions = compilerOptions;
-  fs43.writeFileSync(tsconfigPath, `${JSON.stringify(tsconfig, null, 2)}
-`, "utf-8");
-  return removed;
-}
-function cleanCss(cssPath, namespace = "admin") {
-  if (!fs43.existsSync(cssPath)) return [];
-  const content = fs43.readFileSync(cssPath, "utf-8");
-  const lines = content.split("\n");
-  const sourcePattern = new RegExp(`^@source\\s+"[^"]*(?:admin|${namespace})[^"]*";\\s*$`);
-  const removed = [];
-  const kept = [];
-  for (const line of lines) {
-    if (sourcePattern.test(line)) {
-      removed.push(line.trim());
-    } else {
-      kept.push(line);
-    }
-  }
-  if (removed.length === 0) return [];
-  const cleaned = kept.join("\n").replace(/\n{3,}/g, "\n\n");
-  fs43.writeFileSync(cssPath, cleaned, "utf-8");
-  return removed;
-}
-function cleanEnvFile(envPath) {
-  if (!fs43.existsSync(envPath)) return [];
-  const content = fs43.readFileSync(envPath, "utf-8");
-  const lines = content.split("\n");
-  const removed = [];
-  const kept = [];
-  const headerPattern = /^# =+$/;
-  const headerTextPattern = /^# BetterStart Admin$/;
-  for (let i = 0; i < lines.length; i++) {
-    const line = lines[i];
-    const trimmed = line.trim();
-    if (trimmed.match(/^BETTERSTART_\w+=/)) {
-      const key = trimmed.split("=")[0];
-      removed.push(key);
-      continue;
-    }
-    if (headerPattern.test(trimmed)) {
-      const next = lines[i + 1]?.trim();
-      const afterNext = lines[i + 2]?.trim();
-      if (next && headerTextPattern.test(next) && afterNext && headerPattern.test(afterNext)) {
-        i += 2;
-        continue;
-      }
-    }
-    if (trimmed.startsWith("#") && !headerPattern.test(trimmed)) {
-      const nextNonEmpty = findNextNonEmptyLine(lines, i + 1);
-      if (nextNonEmpty?.match(/^BETTERSTART_\w+=/)) {
-        continue;
-      }
-    }
-    kept.push(line);
-  }
-  if (removed.length === 0) return [];
-  const result = kept.join("\n").replace(/\n{3,}/g, "\n\n").trim();
-  if (result === "") {
-    fs43.unlinkSync(envPath);
-  } else {
-    fs43.writeFileSync(envPath, `${result}
-`, "utf-8");
-  }
-  return removed;
-}
-function findNextNonEmptyLine(lines, startIndex) {
-  for (let i = startIndex; i < lines.length; i++) {
-    const trimmed = lines[i].trim();
-    if (trimmed !== "") return trimmed;
-  }
-  return null;
-}
-
-// adapters/next/commands/uninstall.ts
-function findMainCss2(cwd) {
-  const candidates = [
-    "src/app/globals.css",
-    "app/globals.css",
-    "src/app/global.css",
-    "app/global.css",
-    "src/app/app.css",
-    "app/app.css",
-    "src/globals.css",
-    "globals.css"
-  ];
-  for (const candidate of candidates) {
-    const filePath = path58.join(cwd, candidate);
-    if (fs44.existsSync(filePath)) return filePath;
-  }
-  return void 0;
-}
-function isCLICreatedBiome(biomePath) {
-  if (!fs44.existsSync(biomePath)) return false;
-  try {
-    const content = JSON.parse(fs44.readFileSync(biomePath, "utf-8"));
-    return content.$schema?.includes("biomejs.dev") && content.formatter?.indentStyle === "space" && content.javascript?.formatter?.quoteStyle === "single" && Array.isArray(content.files?.ignore) && content.files.ignore.includes(".next");
-  } catch {
-    return false;
-  }
-}
-function buildUninstallPlan(cwd, namespaceValue) {
-  const steps = [];
-  const namespace = resolveAdminNamespace(namespaceValue);
-  const hasSrc = fs44.existsSync(path58.join(cwd, "src"));
-  const appBase = hasSrc ? "src/app" : "app";
-  const dirs = [];
-  const adminDir = path58.join(cwd, namespace.segment);
-  const legacyAdminDir = path58.join(cwd, "admin");
-  const adminRouteGroup = path58.join(cwd, appBase, namespace.routeGroup);
-  const legacyAdminRouteGroup = path58.join(cwd, appBase, "(admin)");
-  if (fs44.existsSync(adminDir)) dirs.push(`${namespace.segment}/`);
-  if (namespace.segment !== "admin" && fs44.existsSync(legacyAdminDir)) dirs.push("admin/");
-  if (fs44.existsSync(adminRouteGroup)) dirs.push(`${appBase}/${namespace.routeGroup}/`);
-  if (namespace.segment !== "admin" && fs44.existsSync(legacyAdminRouteGroup))
-    dirs.push(`${appBase}/(admin)/`);
-  if (dirs.length > 0) {
-    steps.push({
-      label: "Admin directories",
-      items: dirs,
-      count: dirs.length,
-      unit: dirs.length === 1 ? "directory" : "directories",
-      execute() {
-        if (fs44.existsSync(adminDir)) fs44.rmSync(adminDir, { recursive: true, force: true });
-        if (fs44.existsSync(legacyAdminDir))
-          fs44.rmSync(legacyAdminDir, { recursive: true, force: true });
-        if (fs44.existsSync(adminRouteGroup)) {
-          fs44.rmSync(adminRouteGroup, { recursive: true, force: true });
-        }
-        if (fs44.existsSync(legacyAdminRouteGroup)) {
-          fs44.rmSync(legacyAdminRouteGroup, { recursive: true, force: true });
-        }
-      }
-    });
-  }
-  const configFiles = [];
-  const configPaths = [];
-  const candidates = [
-    [CONFIG_FILE_NAME, path58.join(cwd, CONFIG_FILE_NAME)],
-    ["drizzle.config.ts", path58.join(cwd, "drizzle.config.ts")],
-    ["ADMIN.md", path58.join(cwd, "ADMIN.md")]
-  ];
-  for (const [label, fullPath] of candidates) {
-    if (fs44.existsSync(fullPath)) {
-      configFiles.push(label);
-      configPaths.push(fullPath);
-    }
-  }
-  const biomePath = path58.join(cwd, "biome.json");
-  if (isCLICreatedBiome(biomePath)) {
-    configFiles.push("biome.json (CLI-created)");
-    configPaths.push(biomePath);
-  }
-  if (configFiles.length > 0) {
-    steps.push({
-      label: "Config files",
-      items: configFiles,
-      count: configFiles.length,
-      unit: configFiles.length === 1 ? "file" : "files",
-      execute() {
-        for (const p32 of configPaths) {
-          if (fs44.existsSync(p32)) fs44.unlinkSync(p32);
-        }
-      }
-    });
-  }
-  const tsconfigPath = path58.join(cwd, "tsconfig.json");
-  if (fs44.existsSync(tsconfigPath)) {
-    const content = fs44.readFileSync(tsconfigPath, "utf-8");
-    const aliasMatches = [
-      ...content.match(/"@admin\//g) ?? [],
-      ...content.match(new RegExp(`"${namespace.alias}/`, "g")) ?? []
-    ];
-    if (aliasMatches && aliasMatches.length > 0) {
-      const aliasCount = aliasMatches.length;
-      steps.push({
-        label: "tsconfig.json path aliases",
-        items: [`${namespace.alias}/* aliases in tsconfig.json`],
-        count: aliasCount,
-        unit: aliasCount === 1 ? "alias" : "aliases",
-        execute() {
-          cleanTsconfig(tsconfigPath, namespace.alias);
-        }
-      });
-    }
-  }
-  const cssFile = findMainCss2(cwd);
-  if (cssFile) {
-    const cssContent = fs44.readFileSync(cssFile, "utf-8");
-    const sourceLines = cssContent.split("\n").filter(
-      (l) => new RegExp(`^@source\\s+"[^"]*(?:admin|${namespace.segment})[^"]*";\\s*$`).test(l)
-    );
-    if (sourceLines.length > 0) {
-      const relCss = path58.relative(cwd, cssFile);
-      steps.push({
-        label: `CSS @source lines (${relCss})`,
-        items: [`@source lines in ${relCss}`],
-        count: sourceLines.length,
-        unit: sourceLines.length === 1 ? "line" : "lines",
-        execute() {
-          cleanCss(cssFile, namespace.segment);
-        }
-      });
-    }
-  }
-  const envPath = path58.join(cwd, ".env.local");
-  if (fs44.existsSync(envPath)) {
-    const envContent = fs44.readFileSync(envPath, "utf-8");
-    const bsVars = envContent.split("\n").filter((l) => l.trim().match(/^BETTERSTART_\w+=/)).map((l) => l.split("=")[0]);
-    if (bsVars.length > 0) {
-      steps.push({
-        label: ".env.local variables",
-        items: ["BETTERSTART_* vars in .env.local"],
-        count: bsVars.length,
-        unit: bsVars.length === 1 ? "variable" : "variables",
-        execute() {
-          cleanEnvFile(envPath);
-        }
-      });
-    }
-  }
-  return steps;
-}
-async function runUninstallCommand(options) {
-  const cwd = options.cwd ? path58.resolve(options.cwd) : process.cwd();
-  p30.intro(pc11.bgRed(pc11.white(" BetterStart Uninstall ")));
-  let namespace = DEFAULT_ADMIN_NAMESPACE;
-  try {
-    const config = await resolveConfig(cwd);
-    namespace = config.frameworkConfig.next.namespace;
-  } catch {
-  }
-  const steps = buildUninstallPlan(cwd, namespace);
-  if (steps.length === 0) {
-    p30.log.success(`${pc11.green("\u2713")} Nothing to remove \u2014 project is already clean.`);
-    p30.outro("Project already clean");
-    return;
-  }
-  const planLines = steps.map((step) => {
-    const names = step.items.join(" ");
-    const countLabel = pc11.dim(`${step.count} ${step.unit}`);
-    return `${pc11.red("\u2717")} ${names}  ${countLabel}`;
-  });
-  p30.note(planLines.join("\n"), "Uninstall plan");
-  if (!options.force) {
-    const confirmed = await p30.confirm({
-      message: "Proceed with uninstall?",
-      initialValue: false
-    });
-    if (p30.isCancel(confirmed) || !confirmed) {
-      p30.cancel("Uninstall cancelled.");
-      process.exit(0);
-    }
-  }
-  const s = spinner2();
-  s.start(steps[0].label);
-  for (const step of steps) {
-    s.message(step.label);
-    step.execute();
-  }
-  const parts = steps.map((step) => `${step.count} ${step.unit}`);
-  s.stop(`Removed ${parts.join(", ")}`);
-  p30.note(pc11.dim("Database tables were NOT dropped \u2014 drop them manually if needed."), "Next steps");
-  p30.outro("Uninstall complete");
-}
 
 // adapters/next/commands/update-component.ts
 import { execFileSync as execFileSync5 } from "child_process";
-import fs45 from "fs";
-import path59 from "path";
-import * as clack4 from "@clack/prompts";
+import fs42 from "fs";
+import path55 from "path";
+import * as clack3 from "@clack/prompts";
 import fsExtra from "fs-extra";
 var STATIC_CUSTOM_DEPENDENCIES = {
   "content-editor": [
@@ -29738,24 +29359,24 @@ function applyNamespaceToTemplateEntry(entry, config, cwd) {
   };
 }
 function writeNamespacedFile(srcPath, destPath, namespace) {
-  fs45.writeFileSync(
+  fs42.writeFileSync(
     destPath,
-    applyAdminNamespaceToContent(fs45.readFileSync(srcPath, "utf-8"), namespace),
+    applyAdminNamespaceToContent(fs42.readFileSync(srcPath, "utf-8"), namespace),
     "utf-8"
   );
 }
 function copyNamespacedDirectory(srcDir, destDir, namespace) {
-  const entries = fs45.readdirSync(srcDir, { withFileTypes: true });
+  const entries = fs42.readdirSync(srcDir, { withFileTypes: true });
   for (const entry of entries) {
     const namespacedName = applyAdminNamespaceToPath(entry.name, namespace);
-    const srcPath = path59.join(srcDir, entry.name);
-    const destPath = path59.join(destDir, namespacedName);
+    const srcPath = path55.join(srcDir, entry.name);
+    const destPath = path55.join(destDir, namespacedName);
     if (entry.isDirectory()) {
       fsExtra.ensureDirSync(destPath);
       copyNamespacedDirectory(srcPath, destPath, namespace);
       continue;
     }
-    fsExtra.ensureDirSync(path59.dirname(destPath));
+    fsExtra.ensureDirSync(path55.dirname(destPath));
     writeNamespacedFile(srcPath, destPath, namespace);
   }
 }
@@ -29766,10 +29387,10 @@ function hasIntegration(config, integrationId) {
   return config.integrations.installed.includes(integrationId);
 }
 function readProjectPackageJson2(cwd) {
-  const pkgPath = path59.join(cwd, "package.json");
-  if (!fs45.existsSync(pkgPath)) return null;
+  const pkgPath = path55.join(cwd, "package.json");
+  if (!fs42.existsSync(pkgPath)) return null;
   try {
-    return JSON.parse(fs45.readFileSync(pkgPath, "utf-8"));
+    return JSON.parse(fs42.readFileSync(pkgPath, "utf-8"));
   } catch {
     return null;
   }
@@ -30653,13 +30274,38 @@ var TEMPLATE_REGISTRY = {
     relPath: "app/(admin)/admin/(authenticated)/settings/forms/forms-settings-page-content.tsx",
     content: () => readTemplate("pages/settings/forms/forms-settings-page-content.tsx"),
     base: "cwd",
-    dependencies: ["edit-form-notifications-dialog", "use-webhooks"]
+    dependencies: [
+      "form-notifications-drawer",
+      "forms-settings-columns",
+      "forms-settings-table",
+      "page-header",
+      "use-webhooks"
+    ]
+  },
+  "forms-settings-columns": {
+    relPath: "app/(admin)/admin/(authenticated)/settings/forms/forms-settings-columns.tsx",
+    content: () => readTemplate("pages/settings/forms/forms-settings-columns.tsx"),
+    base: "cwd"
+  },
+  "forms-settings-table": {
+    relPath: "app/(admin)/admin/(authenticated)/settings/forms/forms-settings-table.tsx",
+    content: () => readTemplate("pages/settings/forms/forms-settings-table.tsx"),
+    base: "cwd",
+    dependencies: ["data-grid"]
   },
-  "edit-form-notifications-dialog": {
-    relPath: "app/(admin)/admin/(authenticated)/settings/forms/edit-form-notifications-dialog.tsx",
-    content: () => readTemplate("pages/settings/forms/edit-form-notifications-dialog.tsx"),
+  "form-notifications-drawer": {
+    relPath: "app/(admin)/admin/(authenticated)/settings/forms/form-notifications-drawer.tsx",
+    content: () => readTemplate("pages/settings/forms/form-notifications-drawer.tsx"),
     base: "cwd",
-    dependencies: ["form-settings-action"]
+    dependencies: [
+      "button",
+      "card",
+      "drawer",
+      "form",
+      "form-settings-action",
+      "scroll-area",
+      "textarea"
+    ]
   },
   "webhooks-page": {
     relPath: "app/(admin)/admin/(authenticated)/settings/webhooks/page.tsx",
@@ -31277,577 +30923,1151 @@ function getStaticUiComponents() {
 function getStaticUiComponentEntries() {
   return getStaticAssetComponentEntries("ui");
 }
-function getStaticCustomComponents() {
-  return getStaticAssetComponents("custom");
+function getStaticCustomComponents() {
+  return getStaticAssetComponents("custom");
+}
+function getStaticCustomComponentEntries() {
+  return getStaticAssetComponentEntries("custom");
+}
+function getStaticAssetComponents(assetDirectory) {
+  return getStaticAssetComponentEntries(assetDirectory).map((entry) => entry.name);
+}
+function getStaticAssetComponentEntries(assetDirectory) {
+  const assetDir = resolveCliAssetPath("shared-assets", "react-admin", assetDirectory);
+  if (!fs42.existsSync(assetDir)) return [];
+  const components = [];
+  for (const entry of fs42.readdirSync(assetDir, { withFileTypes: true })) {
+    if (entry.isFile() && (entry.name.endsWith(".tsx") || entry.name.endsWith(".ts"))) {
+      components.push({
+        name: entry.name.replace(/\.(tsx|ts)$/, ""),
+        file: entry.name
+      });
+      continue;
+    }
+    if (!entry.isDirectory()) {
+      continue;
+    }
+    const indexFile = ["index.tsx", "index.ts"].find(
+      (file) => fs42.existsSync(path55.join(assetDir, entry.name, file))
+    );
+    if (indexFile) {
+      components.push({
+        name: entry.name,
+        file: path55.join(entry.name, indexFile)
+      });
+    }
+  }
+  return components.sort((a, b) => a.name.localeCompare(b.name));
+}
+function findStaticAssetFile(assetDir, componentName) {
+  if (!fs42.existsSync(assetDir)) return void 0;
+  const isNestedComponentName = /[\\/]/.test(componentName);
+  const nestedComponentName = componentName.split(/[\\/]/).filter(Boolean).join(path55.sep);
+  if (isNestedComponentName && nestedComponentName && !path55.isAbsolute(componentName) && !nestedComponentName.split(path55.sep).includes("..")) {
+    for (const extension of [".tsx", ".ts"]) {
+      const relPath = `${nestedComponentName}${extension}`;
+      const filePath = path55.join(assetDir, relPath);
+      if (fs42.existsSync(filePath) && fs42.statSync(filePath).isFile()) {
+        return relPath;
+      }
+    }
+  }
+  if (!isNestedComponentName && !componentName.includes("..") && !path55.isAbsolute(componentName)) {
+    for (const extension of [".tsx", ".ts"]) {
+      const relPath = path55.join(componentName, `index${extension}`);
+      const filePath = path55.join(assetDir, relPath);
+      if (fs42.existsSync(filePath) && fs42.statSync(filePath).isFile()) {
+        return relPath;
+      }
+    }
+  }
+  return fs42.readdirSync(assetDir, { withFileTypes: true }).find(
+    (entry) => entry.isFile() && (entry.name.endsWith(".tsx") || entry.name.endsWith(".ts")) && entry.name.replace(/\.(tsx|ts)$/, "") === componentName
+  )?.name;
 }
-function getStaticCustomComponentEntries() {
-  return getStaticAssetComponentEntries("custom");
+function getAllComponentNames() {
+  const staticUi = getStaticUiComponents();
+  const staticCustom = getStaticCustomComponents();
+  const templateKeys = Object.keys(TEMPLATE_REGISTRY);
+  return [.../* @__PURE__ */ new Set([...staticUi, ...staticCustom, ...templateKeys, "tiptap"])].sort();
 }
-function getStaticAssetComponents(assetDirectory) {
-  return getStaticAssetComponentEntries(assetDirectory).map((entry) => entry.name);
+function getAllComponentNamesForConfig(config) {
+  const staticUi = getStaticUiComponents();
+  const staticCustom = getStaticCustomComponents();
+  const templateKeys = Object.entries(TEMPLATE_REGISTRY).filter(
+    ([, entry]) => (!entry.requiredPreset || hasPreset(config, entry.requiredPreset)) && (!entry.requiredIntegration || hasIntegration(config, entry.requiredIntegration))
+  ).map(([name]) => name);
+  return [.../* @__PURE__ */ new Set([...staticUi, ...staticCustom, ...templateKeys, "tiptap"])].sort();
 }
-function getStaticAssetComponentEntries(assetDirectory) {
-  const assetDir = resolveCliAssetPath("shared-assets", "react-admin", assetDirectory);
-  if (!fs45.existsSync(assetDir)) return [];
-  const components = [];
-  for (const entry of fs45.readdirSync(assetDir, { withFileTypes: true })) {
-    if (entry.isFile() && (entry.name.endsWith(".tsx") || entry.name.endsWith(".ts"))) {
-      components.push({
-        name: entry.name.replace(/\.(tsx|ts)$/, ""),
-        file: entry.name
+async function runUpdateCommand(components, options) {
+  const cwd = options.cwd ? path55.resolve(options.cwd) : process.cwd();
+  const normalizedOnly = normalizeShadcnPresetOnly(options.only);
+  validateShadcnPresetOptions(components, options);
+  if (options.json && !options.list) {
+    clack3.cancel("--json can only be used with --list.");
+    process.exit(1);
+  }
+  if (options.list) {
+    const uiComponents = getStaticUiComponentEntries();
+    const customComponents = getStaticCustomComponentEntries();
+    const templateKeys = Object.keys(TEMPLATE_REGISTRY).sort();
+    const templatePath = (name) => {
+      const entry = TEMPLATE_REGISTRY[name];
+      return entry.displayPath ?? (typeof entry.relPath === "string" ? entry.relPath : "");
+    };
+    if (options.json) {
+      const items = [
+        ...uiComponents.map((component) => ({
+          name: component.name,
+          path: `components/ui/${component.file}`,
+          kind: "ui"
+        })),
+        ...customComponents.map((component) => ({
+          name: component.name,
+          path: `components/custom/${component.file}`,
+          kind: "custom"
+        })),
+        ...templateKeys.map((name) => ({ name, path: templatePath(name), kind: "template" })),
+        { name: "tiptap", path: "components/custom/content-editor/tiptap-*/", kind: "special" }
+      ];
+      console.log(JSON.stringify(items, null, 2));
+      return;
+    }
+    const all = getAllComponentNames();
+    clack3.intro("Available components");
+    clack3.note(
+      renderTableRows(
+        uiComponents.map((component) => [component.name, `components/ui/${component.file}`])
+      ).join("\n"),
+      `Shadcn UI Components (${uiComponents.length})`
+    );
+    clack3.note(
+      renderTableRows(
+        customComponents.map((component) => [component.name, `components/custom/${component.file}`])
+      ).join("\n"),
+      `Custom Components (${customComponents.length})`
+    );
+    clack3.note(
+      renderTableRows(templateKeys.map((name) => [name, templatePath(name)])).join("\n"),
+      `Template Components (${templateKeys.length})`
+    );
+    clack3.note(
+      renderTableRows([["tiptap", "components/custom/content-editor/tiptap-*/ (all files)"]]).join(
+        "\n"
+      ),
+      "Special"
+    );
+    clack3.outro(`${all.length} components available`);
+    return;
+  }
+  const config = await resolveConfigOrExit(cwd);
+  const admin = path55.resolve(cwd, config.paths.admin);
+  if (!fs42.existsSync(admin)) {
+    clack3.cancel(
+      `Admin directory not found at ${config.paths.admin}. Run 'betterstart init' first.`
+    );
+    process.exit(1);
+  }
+  if (options.shadcnPreset) {
+    runShadcnPresetUpdate({
+      cwd,
+      config,
+      preset: options.shadcnPreset.trim(),
+      only: normalizedOnly
+    });
+    return;
+  }
+  if (!options.all && components.length === 0) {
+    clack3.log.error(
+      "Provide component names or use --all. Run with --list to see available components."
+    );
+    process.exit(1);
+  }
+  clack3.intro("BetterStart Update Components");
+  const toUpdate = options.all ? getAllComponentNamesForConfig(config) : components;
+  const uiDir = resolveCliAssetPath("shared-assets", "react-admin", "ui");
+  const customDir = resolveCliAssetPath("shared-assets", "react-admin", "custom");
+  let updated = 0;
+  let skipped = 0;
+  const updatedTemplateNames = /* @__PURE__ */ new Set();
+  const updatedStaticNames = /* @__PURE__ */ new Set();
+  const requiredPackageDependencies = /* @__PURE__ */ new Set();
+  const pendingWrites = [];
+  function trackPackageDependencies(name) {
+    for (const dependency of COMPONENT_PACKAGE_DEPENDENCIES[name] ?? []) {
+      requiredPackageDependencies.add(dependency);
+    }
+  }
+  function writeTemplateEntry(name, entry) {
+    if (updatedTemplateNames.has(name)) {
+      return false;
+    }
+    if (entry.requiredPreset && !hasPreset(config, entry.requiredPreset)) {
+      clack3.log.warn(`${name} requires the ${entry.requiredPreset} preset and was skipped.`);
+      skipped++;
+      return false;
+    }
+    if (entry.requiredIntegration && !hasIntegration(config, entry.requiredIntegration)) {
+      clack3.log.warn(
+        `${name} requires the ${entry.requiredIntegration} integration and was skipped.`
+      );
+      skipped++;
+      return false;
+    }
+    const { relPath, content } = applyNamespaceToTemplateEntry(entry, config, cwd);
+    const baseDir = entry.base === "cwd" ? cwd : admin;
+    const destPath = path55.join(baseDir, relPath);
+    if (entry.preserveExisting && fs42.existsSync(destPath)) {
+      clack3.log.info(`Preserved ${relPath}`);
+      updatedTemplateNames.add(name);
+      skipped++;
+      return false;
+    }
+    pendingWrites.push({
+      displayPath: relPath,
+      write: () => {
+        fsExtra.ensureDirSync(path55.dirname(destPath));
+        fs42.writeFileSync(destPath, content, "utf-8");
+        clack3.log.success(`Updated ${relPath}`);
+      }
+    });
+    updatedTemplateNames.add(name);
+    trackPackageDependencies(name);
+    updated++;
+    return true;
+  }
+  function writeTemplateEntryWithDependencies(name, entry) {
+    const wroteEntry = writeTemplateEntry(name, entry);
+    if (!wroteEntry) {
+      return false;
+    }
+    for (const dependencyName of entry.dependencies ?? []) {
+      writeNamedDependency(dependencyName);
+    }
+    return true;
+  }
+  function writeStaticAssetEntry(assetDirectory, name) {
+    const key = `${assetDirectory}:${name}`;
+    if (updatedStaticNames.has(key)) {
+      return false;
+    }
+    const assetDir = assetDirectory === "ui" ? uiDir : customDir;
+    const assetFile = findStaticAssetFile(assetDir, name);
+    if (!assetFile) {
+      return false;
+    }
+    const namespace = config.frameworkConfig.next.namespace;
+    const namespacedAssetFile = applyAdminNamespaceToPath(assetFile, namespace);
+    const destPath = path55.join(admin, "components", assetDirectory, namespacedAssetFile);
+    pendingWrites.push({
+      displayPath: `components/${assetDirectory}/${namespacedAssetFile}`,
+      write: () => {
+        fsExtra.ensureDirSync(path55.dirname(destPath));
+        writeNamespacedFile(path55.join(assetDir, assetFile), destPath, namespace);
+        clack3.log.success(`Updated components/${assetDirectory}/${namespacedAssetFile}`);
+      }
+    });
+    if (assetDirectory === "custom") {
+      const assetSubdir = path55.join(assetDir, name);
+      if (fs42.existsSync(assetSubdir) && fs42.statSync(assetSubdir).isDirectory()) {
+        const namespacedName = applyAdminNamespaceToPath(name, namespace);
+        const destSubdir = path55.join(admin, "components", assetDirectory, namespacedName);
+        pendingWrites.push({
+          displayPath: `components/${assetDirectory}/${namespacedName}/ (template files)`,
+          write: () => {
+            fsExtra.ensureDirSync(destSubdir);
+            copyNamespacedDirectory(assetSubdir, destSubdir, namespace);
+            clack3.log.success(
+              `Updated components/${assetDirectory}/${namespacedName}/ (template files)`
+            );
+          }
+        });
+      }
+    }
+    updatedStaticNames.add(key);
+    trackPackageDependencies(name);
+    updated++;
+    if (assetDirectory === "custom") {
+      for (const dependencyName of STATIC_CUSTOM_DEPENDENCIES[name] ?? []) {
+        writeNamedDependency(dependencyName);
+      }
+    }
+    return true;
+  }
+  function writeTiptapTemplates() {
+    const key = "custom:tiptap";
+    if (updatedStaticNames.has(key)) {
+      return true;
+    }
+    const srcBaseDir = resolveCliAssetPath(
+      "shared-assets",
+      "react-admin",
+      "custom",
+      "content-editor"
+    );
+    const namespace = config.frameworkConfig.next.namespace;
+    const destBaseDir = path55.join(admin, "components", "custom", "content-editor");
+    if (!fs42.existsSync(srcBaseDir)) {
+      return false;
+    }
+    const dirsToCopy = [];
+    for (const directory of TIPTAP_CONTENT_EDITOR_DIRECTORIES) {
+      const srcDir = path55.join(srcBaseDir, directory);
+      if (!fs42.existsSync(srcDir)) {
+        continue;
+      }
+      dirsToCopy.push({
+        srcDir,
+        destDir: path55.join(destBaseDir, applyAdminNamespaceToPath(directory, namespace))
       });
+    }
+    if (dirsToCopy.length === 0) {
+      return false;
+    }
+    pendingWrites.push({
+      displayPath: "components/custom/content-editor/tiptap-*/ (template files)",
+      write: () => {
+        for (const { srcDir, destDir } of dirsToCopy) {
+          fsExtra.ensureDirSync(destDir);
+          copyNamespacedDirectory(srcDir, destDir, namespace);
+        }
+        clack3.log.success("Updated components/custom/content-editor/tiptap-*/ (template files)");
+        removeLegacyDirectory(path55.join(admin, "components", "custom", "tiptap"));
+      }
+    });
+    updatedStaticNames.add(key);
+    trackPackageDependencies("tiptap");
+    updated++;
+    for (const dependencyName of TIPTAP_TEMPLATE_DEPENDENCIES) {
+      writeNamedDependency(dependencyName);
+    }
+    return true;
+  }
+  function writeNamedDependency(name) {
+    const entry = TEMPLATE_REGISTRY[name];
+    if (entry) {
+      writeTemplateEntryWithDependencies(name, entry);
+      return;
+    }
+    if (writeStaticAssetEntry("ui", name)) {
+      return;
+    }
+    if (writeStaticAssetEntry("custom", name)) {
+      return;
+    }
+    if (name === "tiptap") {
+      writeTiptapTemplates();
+    }
+  }
+  for (const name of toUpdate) {
+    if (TEMPLATE_REGISTRY[name]) {
+      const entry = TEMPLATE_REGISTRY[name];
+      writeTemplateEntryWithDependencies(name, entry);
       continue;
     }
-    if (!entry.isDirectory()) {
+    if (writeStaticAssetEntry("ui", name)) {
       continue;
     }
-    const indexFile = ["index.tsx", "index.ts"].find(
-      (file) => fs45.existsSync(path59.join(assetDir, entry.name, file))
-    );
-    if (indexFile) {
-      components.push({
-        name: entry.name,
-        file: path59.join(entry.name, indexFile)
-      });
+    if (writeStaticAssetEntry("custom", name)) {
+      continue;
     }
-  }
-  return components.sort((a, b) => a.name.localeCompare(b.name));
-}
-function findStaticAssetFile(assetDir, componentName) {
-  if (!fs45.existsSync(assetDir)) return void 0;
-  const isNestedComponentName = /[\\/]/.test(componentName);
-  const nestedComponentName = componentName.split(/[\\/]/).filter(Boolean).join(path59.sep);
-  if (isNestedComponentName && nestedComponentName && !path59.isAbsolute(componentName) && !nestedComponentName.split(path59.sep).includes("..")) {
-    for (const extension of [".tsx", ".ts"]) {
-      const relPath = `${nestedComponentName}${extension}`;
-      const filePath = path59.join(assetDir, relPath);
-      if (fs45.existsSync(filePath) && fs45.statSync(filePath).isFile()) {
-        return relPath;
+    if (name === "tiptap") {
+      if (!writeTiptapTemplates()) {
+        clack3.log.warn("tiptap templates not found");
+        skipped++;
       }
+      continue;
     }
+    clack3.log.warn(`Unknown component: ${name}`);
+    skipped++;
   }
-  if (!isNestedComponentName && !componentName.includes("..") && !path59.isAbsolute(componentName)) {
-    for (const extension of [".tsx", ".ts"]) {
-      const relPath = path59.join(componentName, `index${extension}`);
-      const filePath = path59.join(assetDir, relPath);
-      if (fs45.existsSync(filePath) && fs45.statSync(filePath).isFile()) {
-        return relPath;
+  if (pendingWrites.length > 0) {
+    const displayPaths = pendingWrites.map((entry) => entry.displayPath);
+    const preview = displayPaths.slice(0, MAX_OVERWRITE_PREVIEW_ROWS);
+    if (displayPaths.length > preview.length) {
+      preview.push(`\u2026 and ${displayPaths.length - preview.length} more`);
+    }
+    clack3.note(
+      preview.join("\n"),
+      `Overwriting ${displayPaths.length} file${displayPaths.length === 1 ? "" : "s"}`
+    );
+    if (!options.yes) {
+      if (!isInteractiveSession()) {
+        clack3.log.error(
+          `Overwriting ${displayPaths.length} file${displayPaths.length === 1 ? "" : "s"} needs confirmation. Re-run with --yes.`
+        );
+        process.exit(1);
+      }
+      const proceed = await clack3.confirm({
+        message: "Overwrite these files with the latest templates?",
+        initialValue: true
+      });
+      if (clack3.isCancel(proceed) || !proceed) {
+        clack3.cancel("Update cancelled.");
+        process.exit(0);
       }
     }
+    for (const entry of pendingWrites) {
+      entry.write();
+    }
   }
-  return fs45.readdirSync(assetDir, { withFileTypes: true }).find(
-    (entry) => entry.isFile() && (entry.name.endsWith(".tsx") || entry.name.endsWith(".ts")) && entry.name.replace(/\.(tsx|ts)$/, "") === componentName
-  )?.name;
-}
-function getAllComponentNames() {
-  const staticUi = getStaticUiComponents();
-  const staticCustom = getStaticCustomComponents();
-  const templateKeys = Object.keys(TEMPLATE_REGISTRY);
-  return [.../* @__PURE__ */ new Set([...staticUi, ...staticCustom, ...templateKeys, "tiptap"])].sort();
+  syncInstalledPresetManifests(cwd, config);
+  syncInstalledIntegrationManifests(cwd, config);
+  const projectPackageJson = readProjectPackageJson2(cwd);
+  const missingPackageDependencies = Array.from(requiredPackageDependencies).filter(
+    (dependency) => !hasDeclaredPackage2(projectPackageJson, dependency)
+  );
+  if (missingPackageDependencies.length > 0) {
+    clack3.log.warn(
+      `Updated components require package dependencies that are not declared: ${missingPackageDependencies.join(", ")}. Run 'pnpm betterstart update-deps' before building.`
+    );
+  }
+  clack3.outro(
+    `Updated ${updated} component${updated !== 1 ? "s" : ""}${skipped > 0 ? `, ${skipped} skipped` : ""}`
+  );
 }
-function getAllComponentNamesForConfig(config) {
-  const staticUi = getStaticUiComponents();
-  const staticCustom = getStaticCustomComponents();
-  const templateKeys = Object.entries(TEMPLATE_REGISTRY).filter(
-    ([, entry]) => (!entry.requiredPreset || hasPreset(config, entry.requiredPreset)) && (!entry.requiredIntegration || hasIntegration(config, entry.requiredIntegration))
-  ).map(([name]) => name);
-  return [.../* @__PURE__ */ new Set([...staticUi, ...staticCustom, ...templateKeys, "tiptap"])].sort();
+function removeLegacyDirectory(dirPath) {
+  if (fs42.existsSync(dirPath)) {
+    fs42.rmSync(dirPath, { recursive: true, force: true });
+  }
 }
-async function runUpdateCommand(components, options) {
-  const cwd = options.cwd ? path59.resolve(options.cwd) : process.cwd();
-  const normalizedOnly = normalizeShadcnPresetOnly(options.only);
-  validateShadcnPresetOptions(components, options);
-  if (options.json && !options.list) {
-    clack4.cancel("--json can only be used with --list.");
+function validateShadcnPresetOptions(components, options) {
+  if (options.only && !options.shadcnPreset) {
+    clack3.cancel("--only can only be used with --shadcn-preset.");
     process.exit(1);
   }
+  if (!options.shadcnPreset) {
+    return;
+  }
   if (options.list) {
-    const uiComponents = getStaticUiComponentEntries();
-    const customComponents = getStaticCustomComponentEntries();
-    const templateKeys = Object.keys(TEMPLATE_REGISTRY).sort();
-    const templatePath = (name) => {
-      const entry = TEMPLATE_REGISTRY[name];
-      return entry.displayPath ?? (typeof entry.relPath === "string" ? entry.relPath : "");
-    };
-    if (options.json) {
-      const items = [
-        ...uiComponents.map((component) => ({
-          name: component.name,
-          path: `components/ui/${component.file}`,
-          kind: "ui"
-        })),
-        ...customComponents.map((component) => ({
-          name: component.name,
-          path: `components/custom/${component.file}`,
-          kind: "custom"
-        })),
-        ...templateKeys.map((name) => ({ name, path: templatePath(name), kind: "template" })),
-        { name: "tiptap", path: "components/custom/content-editor/tiptap-*/", kind: "special" }
-      ];
-      console.log(JSON.stringify(items, null, 2));
-      return;
-    }
-    const all = getAllComponentNames();
-    clack4.intro("Available components");
-    clack4.note(
-      renderTableRows(
-        uiComponents.map((component) => [component.name, `components/ui/${component.file}`])
-      ).join("\n"),
-      `Shadcn UI Components (${uiComponents.length})`
+    clack3.cancel("--list cannot be combined with --shadcn-preset.");
+    process.exit(1);
+  }
+  if (options.all) {
+    clack3.cancel("--all cannot be combined with --shadcn-preset.");
+    process.exit(1);
+  }
+  if (components.length > 0) {
+    clack3.cancel("Component names cannot be combined with --shadcn-preset.");
+    process.exit(1);
+  }
+}
+function normalizeShadcnPresetOnly(value) {
+  if (!value) {
+    return void 0;
+  }
+  const parts = value.split(",").map((part) => part.trim().toLowerCase()).filter(Boolean);
+  if (parts.length !== 1 || parts[0] !== "theme") {
+    clack3.cancel(
+      "Admin-only shadcn preset updates currently support --only theme. Omit --only to apply the full preset."
     );
-    clack4.note(
-      renderTableRows(
-        customComponents.map((component) => [component.name, `components/custom/${component.file}`])
-      ).join("\n"),
-      `Custom Components (${customComponents.length})`
+    process.exit(1);
+  }
+  return "theme";
+}
+function runShadcnPresetUpdate({
+  cwd,
+  config,
+  preset,
+  only
+}) {
+  const namespace = resolveAdminNamespace(config.frameworkConfig.next.namespace);
+  const adminGlobalsPath = path55.join(cwd, config.paths.admin, namespace.globalsFile);
+  const componentsJsonPath = path55.join(cwd, "components.json");
+  const shadcnBackupPath = `${componentsJsonPath}.bak`;
+  const restoreAfterApplyPaths = [
+    componentsJsonPath,
+    shadcnBackupPath,
+    path55.join(cwd, config.paths.admin, "lib", "utils.ts"),
+    ...getHostProjectFilesToRestore(cwd)
+  ];
+  if (!preset) {
+    clack3.cancel("--shadcn-preset requires a preset code, preset name, or preset URL.");
+    process.exit(1);
+  }
+  if (!fs42.existsSync(adminGlobalsPath)) {
+    clack3.cancel(
+      `Admin globals file not found at ${path55.relative(cwd, adminGlobalsPath)}. Run 'betterstart update admin-globals' first.`
     );
-    clack4.note(
-      renderTableRows(templateKeys.map((name) => [name, templatePath(name)])).join("\n"),
-      `Template Components (${templateKeys.length})`
+    process.exit(1);
+  }
+  const shadcnBin = resolveLocalShadcnBin(cwd);
+  const restoreSnapshots = restoreAfterApplyPaths.map((filePath) => ({
+    filePath,
+    snapshot: snapshotFile(filePath)
+  }));
+  clack3.intro("BetterStart Shadcn Preset");
+  clack3.log.info(`Applying preset to ${path55.join(config.paths.admin, "components/ui")}`);
+  let failed = false;
+  try {
+    fs42.writeFileSync(
+      componentsJsonPath,
+      `${JSON.stringify(createAdminShadcnComponentsJson(config), null, 2)}
+`,
+      "utf-8"
     );
-    clack4.note(
-      renderTableRows([["tiptap", "components/custom/content-editor/tiptap-*/ (all files)"]]).join(
-        "\n"
-      ),
-      "Special"
+    const args = ["apply", "--preset", preset, "--cwd", cwd, "--yes"];
+    if (only) {
+      args.push("--only", only);
+    }
+    execFileSync5(shadcnBin, args, { cwd, stdio: "inherit" });
+  } catch {
+    failed = true;
+  } finally {
+    for (const { filePath, snapshot } of restoreSnapshots.reverse()) {
+      restoreFile(filePath, snapshot);
+    }
+  }
+  if (failed) {
+    clack3.cancel("shadcn preset application failed.");
+    process.exit(1);
+  }
+  clack3.outro(
+    only ? `Applied shadcn preset parts (${only}) to the Admin.` : "Applied shadcn preset to Admin UI components and styles."
+  );
+}
+function createAdminShadcnComponentsJson(config) {
+  const adminPath = toPosixPath(config.paths.admin);
+  const namespace = resolveAdminNamespace(config.frameworkConfig.next.namespace);
+  return {
+    $schema: "https://ui.shadcn.com/schema.json",
+    style: "new-york",
+    rsc: true,
+    tsx: true,
+    tailwind: {
+      config: "",
+      css: `${adminPath}/${namespace.globalsFile}`,
+      baseColor: "neutral",
+      cssVariables: true,
+      prefix: ""
+    },
+    iconLibrary: "lucide",
+    aliases: {
+      components: `${namespace.alias}/components`,
+      ui: `${namespace.alias}/components/ui`,
+      hooks: `${namespace.alias}/hooks`,
+      lib: `${namespace.alias}/lib`,
+      utils: `${namespace.alias}/utils/shared/cn`
+    }
+  };
+}
+function toPosixPath(value) {
+  return value.replace(/\\/g, "/");
+}
+function resolveLocalShadcnBin(cwd) {
+  const binName = process.platform === "win32" ? "shadcn.cmd" : "shadcn";
+  const shadcnBin = path55.join(cwd, "node_modules", ".bin", binName);
+  if (!fs42.existsSync(shadcnBin)) {
+    clack3.cancel(
+      `shadcn is not installed in this project. Run 'betterstart update-deps' and try again.`
     );
-    clack4.outro(`${all.length} components available`);
+    process.exit(1);
+  }
+  return shadcnBin;
+}
+function getHostProjectFilesToRestore(cwd) {
+  const hostRelativePaths = [
+    "app/layout.tsx",
+    "app/layout.ts",
+    "app/layout.jsx",
+    "app/layout.js",
+    "src/app/layout.tsx",
+    "src/app/layout.ts",
+    "src/app/layout.jsx",
+    "src/app/layout.js",
+    "app/globals.css",
+    "src/app/globals.css"
+  ];
+  return hostRelativePaths.map((relativePath) => path55.join(cwd, relativePath));
+}
+function snapshotFile(filePath) {
+  if (!fs42.existsSync(filePath)) {
+    return { existed: false };
+  }
+  return { existed: true, content: fs42.readFileSync(filePath, "utf-8") };
+}
+function restoreFile(filePath, snapshot) {
+  if (snapshot.existed) {
+    fs42.writeFileSync(filePath, snapshot.content ?? "", "utf-8");
     return;
   }
+  if (fs42.existsSync(filePath)) {
+    fs42.rmSync(filePath, { force: true });
+  }
+}
+
+// adapters/next/commands/menu-choices.ts
+async function listInstallableChoices(cwd) {
   const config = await resolveConfigOrExit(cwd);
-  const admin = path59.resolve(cwd, config.paths.admin);
-  if (!fs45.existsSync(admin)) {
-    clack4.cancel(
-      `Admin directory not found at ${config.paths.admin}. Run 'betterstart init' first.`
+  const installedPresets = new Set(config.presets.installed);
+  const installedIntegrations = new Set(config.integrations.installed);
+  return {
+    presets: listAvailablePresets().map((preset) => ({
+      id: preset.id,
+      description: preset.description,
+      installed: installedPresets.has(preset.id)
+    })),
+    integrations: listAvailableIntegrations().map((integration) => ({
+      id: integration.id,
+      description: integration.description,
+      installed: installedIntegrations.has(integration.id)
+    }))
+  };
+}
+async function listSchemaChoices(cwd) {
+  const config = await resolveConfigOrExit(cwd);
+  const paths = resolveProjectPaths(config);
+  return listSchemaNames(path56.join(cwd, ...paths.schemasDir.split("/")));
+}
+async function listComponentChoices(cwd) {
+  const config = await resolveConfigOrExit(cwd);
+  return getAllComponentNamesForConfig(config);
+}
+
+// adapters/next/commands/remove.ts
+import path57 from "path";
+import * as p29 from "@clack/prompts";
+async function runRemoveCommand(items, options) {
+  const removeIntegrationsMode = Boolean(options.integration);
+  if (!removeIntegrationsMode && items.includes("core")) {
+    p29.log.error("The core Admin cannot be removed.");
+    process.exit(1);
+  }
+  const presetIds = items.filter(isPresetId);
+  const integrationIds = items.filter(isIntegrationId);
+  if (!removeIntegrationsMode && integrationIds.length > 0) {
+    p29.log.error(
+      `Integration IDs require --integration. Run \`betterstart remove --integration ${integrationIds.join(" ")}\`.`
     );
     process.exit(1);
   }
-  if (options.shadcnPreset) {
-    runShadcnPresetUpdate({
-      cwd,
-      config,
-      preset: options.shadcnPreset.trim(),
-      only: normalizedOnly
-    });
-    return;
+  if (removeIntegrationsMode && presetIds.length > 0) {
+    p29.log.error(`Preset IDs cannot be removed with --integration: ${presetIds.join(", ")}`);
+    process.exit(1);
   }
-  if (!options.all && components.length === 0) {
-    clack4.log.error(
-      "Provide component names or use --all. Run with --list to see available components."
+  const invalidItems = removeIntegrationsMode ? items.filter((integrationId) => !isIntegrationId(integrationId)) : items.filter((presetId) => !isPresetId(presetId));
+  if (invalidItems.length > 0) {
+    p29.log.error(
+      removeIntegrationsMode ? formatUnknownIntegrationMessage(invalidItems) : formatUnknownPresetMessage(invalidItems)
     );
     process.exit(1);
   }
-  clack4.intro("BetterStart Update Components");
-  const toUpdate = options.all ? getAllComponentNamesForConfig(config) : components;
-  const uiDir = resolveCliAssetPath("shared-assets", "react-admin", "ui");
-  const customDir = resolveCliAssetPath("shared-assets", "react-admin", "custom");
-  let updated = 0;
-  let skipped = 0;
-  const updatedTemplateNames = /* @__PURE__ */ new Set();
-  const updatedStaticNames = /* @__PURE__ */ new Set();
-  const requiredPackageDependencies = /* @__PURE__ */ new Set();
-  const pendingWrites = [];
-  function trackPackageDependencies(name) {
-    for (const dependency of COMPONENT_PACKAGE_DEPENDENCIES[name] ?? []) {
-      requiredPackageDependencies.add(dependency);
-    }
-  }
-  function writeTemplateEntry(name, entry) {
-    if (updatedTemplateNames.has(name)) {
-      return false;
-    }
-    if (entry.requiredPreset && !hasPreset(config, entry.requiredPreset)) {
-      clack4.log.warn(`${name} requires the ${entry.requiredPreset} preset and was skipped.`);
-      skipped++;
-      return false;
-    }
-    if (entry.requiredIntegration && !hasIntegration(config, entry.requiredIntegration)) {
-      clack4.log.warn(
-        `${name} requires the ${entry.requiredIntegration} integration and was skipped.`
-      );
-      skipped++;
-      return false;
-    }
-    const { relPath, content } = applyNamespaceToTemplateEntry(entry, config, cwd);
-    const baseDir = entry.base === "cwd" ? cwd : admin;
-    const destPath = path59.join(baseDir, relPath);
-    if (entry.preserveExisting && fs45.existsSync(destPath)) {
-      clack4.log.info(`Preserved ${relPath}`);
-      updatedTemplateNames.add(name);
-      skipped++;
-      return false;
-    }
-    pendingWrites.push({
-      displayPath: relPath,
-      write: () => {
-        fsExtra.ensureDirSync(path59.dirname(destPath));
-        fs45.writeFileSync(destPath, content, "utf-8");
-        clack4.log.success(`Updated ${relPath}`);
-      }
+  const cwd = options.cwd ? path57.resolve(options.cwd) : process.cwd();
+  const config = await resolveConfigOrExit(cwd);
+  const pm = detectPackageManager(cwd);
+  if (!options.force) {
+    const confirmed = await p29.confirm({
+      message: `Remove ${removeIntegrationsMode ? "integration" : "preset"}${items.length === 1 ? "" : "s"} ${items.join(", ")}?`,
+      initialValue: false
     });
-    updatedTemplateNames.add(name);
-    trackPackageDependencies(name);
-    updated++;
-    return true;
-  }
-  function writeTemplateEntryWithDependencies(name, entry) {
-    const wroteEntry = writeTemplateEntry(name, entry);
-    if (!wroteEntry) {
-      return false;
-    }
-    for (const dependencyName of entry.dependencies ?? []) {
-      writeNamedDependency(dependencyName);
+    if (p29.isCancel(confirmed) || !confirmed) {
+      p29.cancel(`${removeIntegrationsMode ? "Integration" : "Preset"} removal cancelled.`);
+      process.exit(0);
     }
-    return true;
   }
-  function writeStaticAssetEntry(assetDirectory, name) {
-    const key = `${assetDirectory}:${name}`;
-    if (updatedStaticNames.has(key)) {
-      return false;
-    }
-    const assetDir = assetDirectory === "ui" ? uiDir : customDir;
-    const assetFile = findStaticAssetFile(assetDir, name);
-    if (!assetFile) {
-      return false;
-    }
-    const namespace = config.frameworkConfig.next.namespace;
-    const namespacedAssetFile = applyAdminNamespaceToPath(assetFile, namespace);
-    const destPath = path59.join(admin, "components", assetDirectory, namespacedAssetFile);
-    pendingWrites.push({
-      displayPath: `components/${assetDirectory}/${namespacedAssetFile}`,
-      write: () => {
-        fsExtra.ensureDirSync(path59.dirname(destPath));
-        writeNamespacedFile(path59.join(assetDir, assetFile), destPath, namespace);
-        clack4.log.success(`Updated components/${assetDirectory}/${namespacedAssetFile}`);
-      }
+  if (removeIntegrationsMode) {
+    const result2 = await removeIntegrations({
+      cwd,
+      config,
+      pm,
+      integrationIds
     });
-    if (assetDirectory === "custom") {
-      const assetSubdir = path59.join(assetDir, name);
-      if (fs45.existsSync(assetSubdir) && fs45.statSync(assetSubdir).isDirectory()) {
-        const namespacedName = applyAdminNamespaceToPath(name, namespace);
-        const destSubdir = path59.join(admin, "components", assetDirectory, namespacedName);
-        pendingWrites.push({
-          displayPath: `components/${assetDirectory}/${namespacedName}/ (template files)`,
-          write: () => {
-            fsExtra.ensureDirSync(destSubdir);
-            copyNamespacedDirectory(assetSubdir, destSubdir, namespace);
-            clack4.log.success(
-              `Updated components/${assetDirectory}/${namespacedName}/ (template files)`
-            );
-          }
-        });
-      }
-    }
-    updatedStaticNames.add(key);
-    trackPackageDependencies(name);
-    updated++;
-    if (assetDirectory === "custom") {
-      for (const dependencyName of STATIC_CUSTOM_DEPENDENCIES[name] ?? []) {
-        writeNamedDependency(dependencyName);
-      }
+    writeConfigFile(cwd, result2.config);
+    if (result2.removed.length === 0) {
+      p29.outro("No integrations were removed.");
+      return;
     }
-    return true;
-  }
-  function writeTiptapTemplates() {
-    const key = "custom:tiptap";
-    if (updatedStaticNames.has(key)) {
-      return true;
+    if (result2.warnings.length > 0) {
+      p29.note(result2.warnings.join("\n"), "Warnings");
     }
-    const srcBaseDir = resolveCliAssetPath(
-      "shared-assets",
-      "react-admin",
-      "custom",
-      "content-editor"
+    p29.outro(
+      `Removed integration${result2.removed.length === 1 ? "" : "s"}: ${result2.removed.join(", ")}`
     );
-    const namespace = config.frameworkConfig.next.namespace;
-    const destBaseDir = path59.join(admin, "components", "custom", "content-editor");
-    if (!fs45.existsSync(srcBaseDir)) {
-      return false;
-    }
-    const dirsToCopy = [];
-    for (const directory of TIPTAP_CONTENT_EDITOR_DIRECTORIES) {
-      const srcDir = path59.join(srcBaseDir, directory);
-      if (!fs45.existsSync(srcDir)) {
+    return;
+  }
+  const result = await removePresets({
+    cwd,
+    config,
+    pm,
+    presetIds
+  });
+  writeConfigFile(cwd, result.config);
+  if (result.removed.length === 0) {
+    p29.outro("No presets were removed.");
+    return;
+  }
+  if (result.warnings.length > 0) {
+    p29.note(result.warnings.join("\n"), "Warnings");
+  }
+  p29.outro(`Removed preset${result.removed.length === 1 ? "" : "s"}: ${result.removed.join(", ")}`);
+}
+
+// adapters/next/commands/remove-schema.ts
+import fs43 from "fs";
+import path58 from "path";
+import * as clack4 from "@clack/prompts";
+function removePath2(cwd, filePath) {
+  const fullPath = path58.join(cwd, ...filePath.split("/"));
+  const existed = fs43.existsSync(fullPath);
+  fs43.rmSync(fullPath, { recursive: true, force: true });
+  return existed;
+}
+function cleanupEmptyDirs3(cwd, deletedPaths, configPaths) {
+  const stopRoots = /* @__PURE__ */ new Set([
+    path58.join(cwd, ...configPaths.adminDir.split("/")),
+    path58.join(cwd, ...configPaths.adminNavigationDir.split("/")),
+    path58.join(cwd, ...configPaths.adminWebhookEventsDir.split("/")),
+    path58.join(cwd, ...configPaths.pagesDir.split("/"))
+  ]);
+  for (const deletedPath of deletedPaths) {
+    let current = path58.dirname(path58.join(cwd, ...deletedPath.split("/")));
+    while (!stopRoots.has(current)) {
+      if (!fs43.existsSync(current)) {
+        current = path58.dirname(current);
         continue;
       }
-      dirsToCopy.push({
-        srcDir,
-        destDir: path59.join(destBaseDir, applyAdminNamespaceToPath(directory, namespace))
-      });
-    }
-    if (dirsToCopy.length === 0) {
-      return false;
-    }
-    pendingWrites.push({
-      displayPath: "components/custom/content-editor/tiptap-*/ (template files)",
-      write: () => {
-        for (const { srcDir, destDir } of dirsToCopy) {
-          fsExtra.ensureDirSync(destDir);
-          copyNamespacedDirectory(srcDir, destDir, namespace);
-        }
-        clack4.log.success("Updated components/custom/content-editor/tiptap-*/ (template files)");
-        removeLegacyDirectory(path59.join(admin, "components", "custom", "tiptap"));
-      }
-    });
-    updatedStaticNames.add(key);
-    trackPackageDependencies("tiptap");
-    updated++;
-    for (const dependencyName of TIPTAP_TEMPLATE_DEPENDENCIES) {
-      writeNamedDependency(dependencyName);
-    }
-    return true;
-  }
-  function writeNamedDependency(name) {
-    const entry = TEMPLATE_REGISTRY[name];
-    if (entry) {
-      writeTemplateEntryWithDependencies(name, entry);
-      return;
+      const entries = fs43.readdirSync(current);
+      if (entries.length > 0) {
+        break;
+      }
+      fs43.rmdirSync(current);
+      current = path58.dirname(current);
     }
-    if (writeStaticAssetEntry("ui", name)) {
-      return;
+  }
+}
+function resolveSchemaOwnerForRemoval(cwd, schemaName) {
+  const explicitOwner = getSchemaOwner(cwd, schemaName);
+  if (explicitOwner) {
+    return explicitOwner;
+  }
+  if (schemaName === "settings") {
+    return "core";
+  }
+  return "user";
+}
+async function runRemoveSchemaCommand(schemaName, options) {
+  const owner = resolveSchemaOwnerForRemoval(
+    options.cwd ? path58.resolve(options.cwd) : process.cwd(),
+    schemaName
+  );
+  if (owner === "core") {
+    clack4.log.error(
+      `"${schemaName}" is a core Admin module and cannot be removed with remove-schema.`
+    );
+    process.exit(1);
+  }
+  if (owner.startsWith("preset:")) {
+    clack4.log.error(`"${schemaName}" is owned by ${owner}. Remove the owning preset instead.`);
+    process.exit(1);
+  }
+  const cwd = options.cwd ? path58.resolve(options.cwd) : process.cwd();
+  const config = await resolveConfigOrExit(cwd);
+  const paths = resolveProjectPaths(config);
+  const manifest = loadManifest(cwd, schemaName);
+  if (!snapshotRootExists(cwd)) {
+    clack4.log.error(UNSUPPORTED_PROJECT_STATE_MESSAGE);
+    process.exit(1);
+  }
+  if (!manifest) {
+    clack4.log.error(UNSUPPORTED_PROJECT_STATE_MESSAGE);
+    process.exit(1);
+  }
+  if (!options.force) {
+    if (!isInteractiveSession()) {
+      clack4.log.error(
+        `Removing generated files for ${schemaName} needs confirmation. Re-run with --force.`
+      );
+      process.exit(1);
     }
-    if (writeStaticAssetEntry("custom", name)) {
+    const confirmed = await clack4.confirm({
+      message: `Remove generated files for ${schemaName}?`,
+      initialValue: false
+    });
+    if (clack4.isCancel(confirmed) || !confirmed) {
+      clack4.cancel("Cancelled.");
       return;
     }
-    if (name === "tiptap") {
-      writeTiptapTemplates();
-    }
   }
-  for (const name of toUpdate) {
-    if (TEMPLATE_REGISTRY[name]) {
-      const entry = TEMPLATE_REGISTRY[name];
-      writeTemplateEntryWithDependencies(name, entry);
-      continue;
-    }
-    if (writeStaticAssetEntry("ui", name)) {
-      continue;
+  const deletedPaths = [];
+  for (const file of [...manifest.files.map((entry) => entry.path), ...manifest.skipped]) {
+    if (removePath2(cwd, file)) {
+      deletedPaths.push(file);
     }
-    if (writeStaticAssetEntry("custom", name)) {
-      continue;
+  }
+  const loaded = (() => {
+    try {
+      return loadSchema(path58.join(cwd, ...paths.schemasDir.split("/")), schemaName);
+    } catch {
+      return null;
     }
-    if (name === "tiptap") {
-      if (!writeTiptapTemplates()) {
-        clack4.log.warn("tiptap templates not found");
-        skipped++;
-      }
-      continue;
+  })();
+  const kebabName = toKebabCase(schemaName);
+  if (loaded?.type === "form") {
+    if (removePath2(cwd, `${paths.adminActionsDir}/${schemaName}`)) {
+      deletedPaths.push(`${paths.adminActionsDir}/${schemaName}`);
     }
-    clack4.log.warn(`Unknown component: ${name}`);
-    skipped++;
-  }
-  if (pendingWrites.length > 0) {
-    const displayPaths = pendingWrites.map((entry) => entry.displayPath);
-    const preview = displayPaths.slice(0, MAX_OVERWRITE_PREVIEW_ROWS);
-    if (displayPaths.length > preview.length) {
-      preview.push(`\u2026 and ${displayPaths.length - preview.length} more`);
+    if (removePath2(cwd, `${paths.pagesDir}/forms/${kebabName}`)) {
+      deletedPaths.push(`${paths.pagesDir}/forms/${kebabName}`);
     }
-    clack4.note(
-      preview.join("\n"),
-      `Overwriting ${displayPaths.length} file${displayPaths.length === 1 ? "" : "s"}`
-    );
-    if (!options.yes) {
-      if (!isInteractiveSession()) {
-        clack4.log.error(
-          `Overwriting ${displayPaths.length} file${displayPaths.length === 1 ? "" : "s"} needs confirmation. Re-run with --yes.`
-        );
-        process.exit(1);
-      }
-      const proceed = await clack4.confirm({
-        message: "Overwrite these files with the latest templates?",
-        initialValue: true
-      });
-      if (clack4.isCancel(proceed) || !proceed) {
-        clack4.cancel("Update cancelled.");
-        process.exit(0);
-      }
+  } else {
+    if (removePath2(cwd, `${paths.adminActionsDir}/${schemaName}`)) {
+      deletedPaths.push(`${paths.adminActionsDir}/${schemaName}`);
     }
-    for (const entry of pendingWrites) {
-      entry.write();
+    if (removePath2(cwd, `${paths.pagesDir}/${schemaName}`)) {
+      deletedPaths.push(`${paths.pagesDir}/${schemaName}`);
     }
   }
-  syncInstalledPresetManifests(cwd, config);
-  syncInstalledIntegrationManifests(cwd, config);
-  const projectPackageJson = readProjectPackageJson2(cwd);
-  const missingPackageDependencies = Array.from(requiredPackageDependencies).filter(
-    (dependency) => !hasDeclaredPackage2(projectPackageJson, dependency)
-  );
-  if (missingPackageDependencies.length > 0) {
-    clack4.log.warn(
-      `Updated components require package dependencies that are not declared: ${missingPackageDependencies.join(", ")}. Run 'pnpm betterstart update-deps' before building.`
-    );
+  cleanupEmptyDirs3(cwd, deletedPaths, paths);
+  deleteSnapshot(cwd, schemaName);
+  if (hasTombstone(cwd, schemaName)) {
+    clearTombstone(cwd, schemaName);
   }
-  clack4.outro(
-    `Updated ${updated} component${updated !== 1 ? "s" : ""}${skipped > 0 ? `, ${skipped} skipped` : ""}`
+  writeTombstone(cwd, schemaName);
+  await applyGeneratedFiles({
+    cwd,
+    config,
+    scope: BARREL_SCOPE,
+    schemaJson: { name: BARREL_SCOPE },
+    generatedFiles: renderBarrelFiles(cwd, config),
+    force: false,
+    interactive: false
+  });
+  clack4.log.info(
+    `Tombstone written: .betterstart/snapshots/_removed/${schemaName}
+Schema JSON preserved.`
   );
+  clack4.outro(`Removed generated files for ${schemaName}`);
 }
-function removeLegacyDirectory(dirPath) {
-  if (fs45.existsSync(dirPath)) {
-    fs45.rmSync(dirPath, { recursive: true, force: true });
+
+// adapters/next/commands/uninstall.ts
+import fs45 from "fs";
+import path59 from "path";
+import * as p30 from "@clack/prompts";
+import pc11 from "picocolors";
+
+// adapters/next/commands/uninstall-cleaners.ts
+import fs44 from "fs";
+function stripJsonComments2(input) {
+  let result = "";
+  let i = 0;
+  while (i < input.length) {
+    if (input[i] === '"') {
+      let j = i + 1;
+      while (j < input.length) {
+        if (input[j] === "\\") {
+          j += 2;
+          continue;
+        }
+        if (input[j] === '"') {
+          j++;
+          break;
+        }
+        j++;
+      }
+      result += input.slice(i, j);
+      i = j;
+    } else if (input[i] === "/" && input[i + 1] === "/") {
+      const nl = input.indexOf("\n", i);
+      i = nl === -1 ? input.length : nl;
+    } else if (input[i] === "/" && input[i + 1] === "*") {
+      const end = input.indexOf("*/", i + 2);
+      i = end === -1 ? input.length : end + 2;
+    } else {
+      result += input[i];
+      i++;
+    }
   }
+  return result;
 }
-function validateShadcnPresetOptions(components, options) {
-  if (options.only && !options.shadcnPreset) {
-    clack4.cancel("--only can only be used with --shadcn-preset.");
-    process.exit(1);
+function cleanTsconfig(tsconfigPath, aliasRoot = "@admin") {
+  if (!fs44.existsSync(tsconfigPath)) return [];
+  const raw = fs44.readFileSync(tsconfigPath, "utf-8");
+  const stripped = stripJsonComments2(raw).replace(/,\s*([\]}])/g, "$1");
+  let tsconfig;
+  try {
+    tsconfig = JSON.parse(stripped);
+  } catch {
+    return [];
   }
-  if (!options.shadcnPreset) {
-    return;
+  const compilerOptions = tsconfig.compilerOptions ?? {};
+  const paths = compilerOptions.paths ?? {};
+  const removed = [];
+  for (const key of Object.keys(paths)) {
+    if (key.startsWith("@admin/") || key === "@admin/*" || key.startsWith(`${aliasRoot}/`) || key === `${aliasRoot}/*`) {
+      removed.push(key);
+      delete paths[key];
+    }
   }
-  if (options.list) {
-    clack4.cancel("--list cannot be combined with --shadcn-preset.");
-    process.exit(1);
+  if (removed.length === 0) return [];
+  if (Object.keys(paths).length === 0) {
+    compilerOptions.paths = void 0;
+  } else {
+    compilerOptions.paths = paths;
   }
-  if (options.all) {
-    clack4.cancel("--all cannot be combined with --shadcn-preset.");
-    process.exit(1);
+  tsconfig.compilerOptions = compilerOptions;
+  fs44.writeFileSync(tsconfigPath, `${JSON.stringify(tsconfig, null, 2)}
+`, "utf-8");
+  return removed;
+}
+function cleanCss(cssPath, namespace = "admin") {
+  if (!fs44.existsSync(cssPath)) return [];
+  const content = fs44.readFileSync(cssPath, "utf-8");
+  const lines = content.split("\n");
+  const sourcePattern = new RegExp(`^@source\\s+"[^"]*(?:admin|${namespace})[^"]*";\\s*$`);
+  const removed = [];
+  const kept = [];
+  for (const line of lines) {
+    if (sourcePattern.test(line)) {
+      removed.push(line.trim());
+    } else {
+      kept.push(line);
+    }
   }
-  if (components.length > 0) {
-    clack4.cancel("Component names cannot be combined with --shadcn-preset.");
-    process.exit(1);
+  if (removed.length === 0) return [];
+  const cleaned = kept.join("\n").replace(/\n{3,}/g, "\n\n");
+  fs44.writeFileSync(cssPath, cleaned, "utf-8");
+  return removed;
+}
+function cleanEnvFile(envPath) {
+  if (!fs44.existsSync(envPath)) return [];
+  const content = fs44.readFileSync(envPath, "utf-8");
+  const lines = content.split("\n");
+  const removed = [];
+  const kept = [];
+  const headerPattern = /^# =+$/;
+  const headerTextPattern = /^# BetterStart Admin$/;
+  for (let i = 0; i < lines.length; i++) {
+    const line = lines[i];
+    const trimmed = line.trim();
+    if (trimmed.match(/^BETTERSTART_\w+=/)) {
+      const key = trimmed.split("=")[0];
+      removed.push(key);
+      continue;
+    }
+    if (headerPattern.test(trimmed)) {
+      const next = lines[i + 1]?.trim();
+      const afterNext = lines[i + 2]?.trim();
+      if (next && headerTextPattern.test(next) && afterNext && headerPattern.test(afterNext)) {
+        i += 2;
+        continue;
+      }
+    }
+    if (trimmed.startsWith("#") && !headerPattern.test(trimmed)) {
+      const nextNonEmpty = findNextNonEmptyLine(lines, i + 1);
+      if (nextNonEmpty?.match(/^BETTERSTART_\w+=/)) {
+        continue;
+      }
+    }
+    kept.push(line);
+  }
+  if (removed.length === 0) return [];
+  const result = kept.join("\n").replace(/\n{3,}/g, "\n\n").trim();
+  if (result === "") {
+    fs44.unlinkSync(envPath);
+  } else {
+    fs44.writeFileSync(envPath, `${result}
+`, "utf-8");
   }
+  return removed;
 }
-function normalizeShadcnPresetOnly(value) {
-  if (!value) {
-    return void 0;
-  }
-  const parts = value.split(",").map((part) => part.trim().toLowerCase()).filter(Boolean);
-  if (parts.length !== 1 || parts[0] !== "theme") {
-    clack4.cancel(
-      "Admin-only shadcn preset updates currently support --only theme. Omit --only to apply the full preset."
-    );
-    process.exit(1);
+function findNextNonEmptyLine(lines, startIndex) {
+  for (let i = startIndex; i < lines.length; i++) {
+    const trimmed = lines[i].trim();
+    if (trimmed !== "") return trimmed;
   }
-  return "theme";
+  return null;
 }
-function runShadcnPresetUpdate({
-  cwd,
-  config,
-  preset,
-  only
-}) {
-  const namespace = resolveAdminNamespace(config.frameworkConfig.next.namespace);
-  const adminGlobalsPath = path59.join(cwd, config.paths.admin, namespace.globalsFile);
-  const componentsJsonPath = path59.join(cwd, "components.json");
-  const shadcnBackupPath = `${componentsJsonPath}.bak`;
-  const restoreAfterApplyPaths = [
-    componentsJsonPath,
-    shadcnBackupPath,
-    path59.join(cwd, config.paths.admin, "lib", "utils.ts"),
-    ...getHostProjectFilesToRestore(cwd)
+
+// adapters/next/commands/uninstall.ts
+function findMainCss2(cwd) {
+  const candidates = [
+    "src/app/globals.css",
+    "app/globals.css",
+    "src/app/global.css",
+    "app/global.css",
+    "src/app/app.css",
+    "app/app.css",
+    "src/globals.css",
+    "globals.css"
   ];
-  if (!preset) {
-    clack4.cancel("--shadcn-preset requires a preset code, preset name, or preset URL.");
-    process.exit(1);
-  }
-  if (!fs45.existsSync(adminGlobalsPath)) {
-    clack4.cancel(
-      `Admin globals file not found at ${path59.relative(cwd, adminGlobalsPath)}. Run 'betterstart update admin-globals' first.`
-    );
-    process.exit(1);
+  for (const candidate of candidates) {
+    const filePath = path59.join(cwd, candidate);
+    if (fs45.existsSync(filePath)) return filePath;
   }
-  const shadcnBin = resolveLocalShadcnBin(cwd);
-  const restoreSnapshots = restoreAfterApplyPaths.map((filePath) => ({
-    filePath,
-    snapshot: snapshotFile(filePath)
-  }));
-  clack4.intro("BetterStart Shadcn Preset");
-  clack4.log.info(`Applying preset to ${path59.join(config.paths.admin, "components/ui")}`);
-  let failed = false;
+  return void 0;
+}
+function isCLICreatedBiome(biomePath) {
+  if (!fs45.existsSync(biomePath)) return false;
   try {
-    fs45.writeFileSync(
-      componentsJsonPath,
-      `${JSON.stringify(createAdminShadcnComponentsJson(config), null, 2)}
-`,
-      "utf-8"
-    );
-    const args = ["apply", "--preset", preset, "--cwd", cwd, "--yes"];
-    if (only) {
-      args.push("--only", only);
-    }
-    execFileSync5(shadcnBin, args, { cwd, stdio: "inherit" });
+    const content = JSON.parse(fs45.readFileSync(biomePath, "utf-8"));
+    return content.$schema?.includes("biomejs.dev") && content.formatter?.indentStyle === "space" && content.javascript?.formatter?.quoteStyle === "single" && Array.isArray(content.files?.ignore) && content.files.ignore.includes(".next");
   } catch {
-    failed = true;
-  } finally {
-    for (const { filePath, snapshot } of restoreSnapshots.reverse()) {
-      restoreFile(filePath, snapshot);
+    return false;
+  }
+}
+function buildUninstallPlan(cwd, namespaceValue) {
+  const steps = [];
+  const namespace = resolveAdminNamespace(namespaceValue);
+  const hasSrc = fs45.existsSync(path59.join(cwd, "src"));
+  const appBase = hasSrc ? "src/app" : "app";
+  const dirs = [];
+  const adminDir = path59.join(cwd, namespace.segment);
+  const legacyAdminDir = path59.join(cwd, "admin");
+  const adminRouteGroup = path59.join(cwd, appBase, namespace.routeGroup);
+  const legacyAdminRouteGroup = path59.join(cwd, appBase, "(admin)");
+  if (fs45.existsSync(adminDir)) dirs.push(`${namespace.segment}/`);
+  if (namespace.segment !== "admin" && fs45.existsSync(legacyAdminDir)) dirs.push("admin/");
+  if (fs45.existsSync(adminRouteGroup)) dirs.push(`${appBase}/${namespace.routeGroup}/`);
+  if (namespace.segment !== "admin" && fs45.existsSync(legacyAdminRouteGroup))
+    dirs.push(`${appBase}/(admin)/`);
+  if (dirs.length > 0) {
+    steps.push({
+      label: "Admin directories",
+      items: dirs,
+      count: dirs.length,
+      unit: dirs.length === 1 ? "directory" : "directories",
+      execute() {
+        if (fs45.existsSync(adminDir)) fs45.rmSync(adminDir, { recursive: true, force: true });
+        if (fs45.existsSync(legacyAdminDir))
+          fs45.rmSync(legacyAdminDir, { recursive: true, force: true });
+        if (fs45.existsSync(adminRouteGroup)) {
+          fs45.rmSync(adminRouteGroup, { recursive: true, force: true });
+        }
+        if (fs45.existsSync(legacyAdminRouteGroup)) {
+          fs45.rmSync(legacyAdminRouteGroup, { recursive: true, force: true });
+        }
+      }
+    });
+  }
+  const configFiles = [];
+  const configPaths = [];
+  const candidates = [
+    [CONFIG_FILE_NAME, path59.join(cwd, CONFIG_FILE_NAME)],
+    ["drizzle.config.ts", path59.join(cwd, "drizzle.config.ts")],
+    ["ADMIN.md", path59.join(cwd, "ADMIN.md")]
+  ];
+  for (const [label, fullPath] of candidates) {
+    if (fs45.existsSync(fullPath)) {
+      configFiles.push(label);
+      configPaths.push(fullPath);
     }
   }
-  if (failed) {
-    clack4.cancel("shadcn preset application failed.");
-    process.exit(1);
+  const biomePath = path59.join(cwd, "biome.json");
+  if (isCLICreatedBiome(biomePath)) {
+    configFiles.push("biome.json (CLI-created)");
+    configPaths.push(biomePath);
   }
-  clack4.outro(
-    only ? `Applied shadcn preset parts (${only}) to the Admin.` : "Applied shadcn preset to Admin UI components and styles."
-  );
-}
-function createAdminShadcnComponentsJson(config) {
-  const adminPath = toPosixPath(config.paths.admin);
-  const namespace = resolveAdminNamespace(config.frameworkConfig.next.namespace);
-  return {
-    $schema: "https://ui.shadcn.com/schema.json",
-    style: "new-york",
-    rsc: true,
-    tsx: true,
-    tailwind: {
-      config: "",
-      css: `${adminPath}/${namespace.globalsFile}`,
-      baseColor: "neutral",
-      cssVariables: true,
-      prefix: ""
-    },
-    iconLibrary: "lucide",
-    aliases: {
-      components: `${namespace.alias}/components`,
-      ui: `${namespace.alias}/components/ui`,
-      hooks: `${namespace.alias}/hooks`,
-      lib: `${namespace.alias}/lib`,
-      utils: `${namespace.alias}/utils/shared/cn`
+  if (configFiles.length > 0) {
+    steps.push({
+      label: "Config files",
+      items: configFiles,
+      count: configFiles.length,
+      unit: configFiles.length === 1 ? "file" : "files",
+      execute() {
+        for (const p32 of configPaths) {
+          if (fs45.existsSync(p32)) fs45.unlinkSync(p32);
+        }
+      }
+    });
+  }
+  const tsconfigPath = path59.join(cwd, "tsconfig.json");
+  if (fs45.existsSync(tsconfigPath)) {
+    const content = fs45.readFileSync(tsconfigPath, "utf-8");
+    const aliasMatches = [
+      ...content.match(/"@admin\//g) ?? [],
+      ...content.match(new RegExp(`"${namespace.alias}/`, "g")) ?? []
+    ];
+    if (aliasMatches && aliasMatches.length > 0) {
+      const aliasCount = aliasMatches.length;
+      steps.push({
+        label: "tsconfig.json path aliases",
+        items: [`${namespace.alias}/* aliases in tsconfig.json`],
+        count: aliasCount,
+        unit: aliasCount === 1 ? "alias" : "aliases",
+        execute() {
+          cleanTsconfig(tsconfigPath, namespace.alias);
+        }
+      });
     }
-  };
-}
-function toPosixPath(value) {
-  return value.replace(/\\/g, "/");
-}
-function resolveLocalShadcnBin(cwd) {
-  const binName = process.platform === "win32" ? "shadcn.cmd" : "shadcn";
-  const shadcnBin = path59.join(cwd, "node_modules", ".bin", binName);
-  if (!fs45.existsSync(shadcnBin)) {
-    clack4.cancel(
-      `shadcn is not installed in this project. Run 'betterstart update-deps' and try again.`
+  }
+  const cssFile = findMainCss2(cwd);
+  if (cssFile) {
+    const cssContent = fs45.readFileSync(cssFile, "utf-8");
+    const sourceLines = cssContent.split("\n").filter(
+      (l) => new RegExp(`^@source\\s+"[^"]*(?:admin|${namespace.segment})[^"]*";\\s*$`).test(l)
     );
-    process.exit(1);
+    if (sourceLines.length > 0) {
+      const relCss = path59.relative(cwd, cssFile);
+      steps.push({
+        label: `CSS @source lines (${relCss})`,
+        items: [`@source lines in ${relCss}`],
+        count: sourceLines.length,
+        unit: sourceLines.length === 1 ? "line" : "lines",
+        execute() {
+          cleanCss(cssFile, namespace.segment);
+        }
+      });
+    }
   }
-  return shadcnBin;
-}
-function getHostProjectFilesToRestore(cwd) {
-  const hostRelativePaths = [
-    "app/layout.tsx",
-    "app/layout.ts",
-    "app/layout.jsx",
-    "app/layout.js",
-    "src/app/layout.tsx",
-    "src/app/layout.ts",
-    "src/app/layout.jsx",
-    "src/app/layout.js",
-    "app/globals.css",
-    "src/app/globals.css"
-  ];
-  return hostRelativePaths.map((relativePath) => path59.join(cwd, relativePath));
-}
-function snapshotFile(filePath) {
-  if (!fs45.existsSync(filePath)) {
-    return { existed: false };
+  const envPath = path59.join(cwd, ".env.local");
+  if (fs45.existsSync(envPath)) {
+    const envContent = fs45.readFileSync(envPath, "utf-8");
+    const bsVars = envContent.split("\n").filter((l) => l.trim().match(/^BETTERSTART_\w+=/)).map((l) => l.split("=")[0]);
+    if (bsVars.length > 0) {
+      steps.push({
+        label: ".env.local variables",
+        items: ["BETTERSTART_* vars in .env.local"],
+        count: bsVars.length,
+        unit: bsVars.length === 1 ? "variable" : "variables",
+        execute() {
+          cleanEnvFile(envPath);
+        }
+      });
+    }
   }
-  return { existed: true, content: fs45.readFileSync(filePath, "utf-8") };
+  return steps;
 }
-function restoreFile(filePath, snapshot) {
-  if (snapshot.existed) {
-    fs45.writeFileSync(filePath, snapshot.content ?? "", "utf-8");
+async function runUninstallCommand(options) {
+  const cwd = options.cwd ? path59.resolve(options.cwd) : process.cwd();
+  p30.intro(pc11.bgRed(pc11.white(" BetterStart Uninstall ")));
+  let namespace = DEFAULT_ADMIN_NAMESPACE;
+  try {
+    const config = await resolveConfig(cwd);
+    namespace = config.frameworkConfig.next.namespace;
+  } catch {
+  }
+  const steps = buildUninstallPlan(cwd, namespace);
+  if (steps.length === 0) {
+    p30.log.success(`${pc11.green("\u2713")} Nothing to remove \u2014 project is already clean.`);
+    p30.outro("Project already clean");
     return;
   }
-  if (fs45.existsSync(filePath)) {
-    fs45.rmSync(filePath, { force: true });
+  const planLines = steps.map((step) => {
+    const names = step.items.join(" ");
+    const countLabel = pc11.dim(`${step.count} ${step.unit}`);
+    return `${pc11.red("\u2717")} ${names}  ${countLabel}`;
+  });
+  p30.note(planLines.join("\n"), "Uninstall plan");
+  if (!options.force) {
+    const confirmed = await p30.confirm({
+      message: "Proceed with uninstall?",
+      initialValue: false
+    });
+    if (p30.isCancel(confirmed) || !confirmed) {
+      p30.cancel("Uninstall cancelled.");
+      process.exit(0);
+    }
+  }
+  const s = spinner2();
+  s.start(steps[0].label);
+  for (const step of steps) {
+    s.message(step.label);
+    step.execute();
   }
+  const parts = steps.map((step) => `${step.count} ${step.unit}`);
+  s.stop(`Removed ${parts.join(", ")}`);
+  p30.note(pc11.dim("Database tables were NOT dropped \u2014 drop them manually if needed."), "Next steps");
+  p30.outro("Uninstall complete");
 }
 
 // adapters/next/commands/update-deps.ts
@@ -31913,6 +32133,7 @@ async function runUpdateStylesCommand(options) {
 
 // adapters/next/commands-runtime.ts
 var nextCommandRuntime = {
+  listComponentChoices,
   listInstallableChoices,
   listSchemaChoices,
   runAdd: runAddCommand,