betterstart-cli 0.0.37 → 0.0.38

package/dist/cli.js

@@ -5384,14 +5384,14 @@ function buildStepsConstant(steps) {
 ${entries.join(",\n")}
 ]`;
 }
-function buildComponentSource(p22) {
+function buildComponentSource(p23) {
   const providerOpen = `    <NuqsAdapter>
       <React.Suspense fallback={null}>
-        <${p22.pascal}FormInner />
+        <${p23.pascal}FormInner />
       </React.Suspense>
     </NuqsAdapter>`;
   const exportWrapper = `
-export function ${p22.pascal}Form() {
+export function ${p23.pascal}Form() {
   return (
 ${providerOpen}
   )
@@ -5400,22 +5400,22 @@ ${providerOpen}
   return `'use client'
 
 import { standardSchemaResolver } from '@hookform/resolvers/standard-schema'
-import { ChevronLeft, ChevronRight${p22.hasListFields ? ", Trash2" : ""} } from 'lucide-react'
+import { ChevronLeft, ChevronRight${p23.hasListFields ? ", Trash2" : ""} } from 'lucide-react'
 import { createParser, useQueryState } from 'nuqs'
 import { NuqsAdapter } from 'nuqs/adapters/next/app'
 import * as React from 'react'
-${p22.rhfImport}
+${p23.rhfImport}
 import { z } from 'zod/v3'
-import { create${p22.pascal}Submission } from '@admin/actions/${p22.actionImportPath}'
+import { create${p23.pascal}Submission } from '@admin/actions/${p23.actionImportPath}'
 
 const formSchema = z.object({
-${p22.zodFields}
+${p23.zodFields}
 })
 
 type FormValues = z.infer<typeof formSchema>
 ${buildFieldErrorHelper()}
 
-${p22.stepsConst}
+${p23.stepsConst}
 
 const stepParser = createParser({
   parse(value) {
@@ -5433,7 +5433,7 @@ const stepParser = createParser({
   }
 }).withDefault(0)
 
-function ${p22.pascal}FormInner() {
+function ${p23.pascal}FormInner() {
   const [currentStep, setCurrentStep] = useQueryState('step', stepParser)
   const [submitted, setSubmitted] = React.useState(false)
   const [submitting, startSubmitTransition] = React.useTransition()
@@ -5441,11 +5441,11 @@ function ${p22.pascal}FormInner() {
   const form = useForm<FormValues>({
     resolver: standardSchemaResolver(formSchema),
     defaultValues: {
-${p22.defaults}
+${p23.defaults}
     },
   })
 
-${p22.fieldArraySetup}${p22.watchSetup}
+${p23.fieldArraySetup}${p23.watchSetup}
   async function handleNext() {
     const stepFields = STEPS[currentStep].fields as (keyof FormValues)[]
     const isValid = await form.trigger(stepFields, { shouldFocus: true })
@@ -5461,9 +5461,9 @@ ${p22.fieldArraySetup}${p22.watchSetup}
   function onSubmit(values: FormValues) {
     startSubmitTransition(async () => {
       try {
-        const result = await create${p22.pascal}Submission(values)
+        const result = await create${p23.pascal}Submission(values)
         if (result.success) {
-          ${p22.successHandler}
+          ${p23.successHandler}
         } else {
           form.setError('root', { message: result.error || 'Something went wrong' })
         }
@@ -5477,7 +5477,7 @@ ${p22.fieldArraySetup}${p22.watchSetup}
     return (
       <div className="rounded-sm border p-6 text-center">
         <h3 className="text-lg font-semibold">Thank you!</h3>
-        <p className="mt-2 text-muted-foreground">${p22.successMessage}</p>
+        <p className="mt-2 text-muted-foreground">${p23.successMessage}</p>
       </div>
     )
   }
@@ -5494,7 +5494,7 @@ ${p22.fieldArraySetup}${p22.watchSetup}
 
         {/* Step content */}
         <div key={currentStep} className="animate-in fade-in duration-300 space-y-6">
-${p22.stepContentBlocks}
+${p23.stepContentBlocks}
         </div>
 
         {form.formState.errors.root && (
@@ -5528,7 +5528,7 @@ ${p22.stepContentBlocks}
               onClick={() => form.handleSubmit(onSubmit)()}
               className="inline-flex h-9 items-center justify-center rounded-md bg-primary px-4 py-2 text-sm font-medium text-primary-foreground shadow-xs transition-colors hover:bg-primary/90 disabled:pointer-events-none disabled:opacity-50"
             >
-              {submitting ? 'Submitting...' : ${p22.submitText}}
+              {submitting ? 'Submitting...' : ${p23.submitText}}
             </button>
           )}
         </div>
@@ -19793,23 +19793,32 @@ function eraseClackLine(options = {}) {
   const restore = below > 0 ? `\x1B[${below}B` : "";
   process.stdout.write(`\x1B[${up}A\x1B[${CLACK_LINE_ROWS}M${restore}`);
 }
+var activeSpinners = 0;
+function hasActiveSpinner() {
+  return activeSpinners > 0;
+}
 function spinner2(options) {
-  const inner = p5.spinner(options);
+  const inner = p5.spinner({ ...options, cancelMessage: "Setup cancelled." });
   const guided = options?.withGuide !== false;
   let started = false;
+  const setStarted = (next) => {
+    if (started === next) return;
+    started = next;
+    activeSpinners += next ? 1 : -1;
+  };
   return {
     start: (message = "") => {
-      started = true;
+      setStarted(true);
       inner.start(fitSpinnerMessage(message));
     },
     message: (message = "") => inner.message(fitSpinnerMessage(message)),
     stop: (message = "") => {
-      started = false;
+      setStarted(false);
       inner.stop(message);
     },
     clear: () => {
       if (!started) return;
-      started = false;
+      setStarted(false);
       inner.clear();
       if (guided && process.stdout.isTTY && process.env.CI !== "true") {
         process.stdout.write("\x1B[1A\x1B[2K");
@@ -21826,7 +21835,24 @@ ${validationErrors.map((error) => `  - ${error}`).join("\n")}`
 import { execFileSync as execFileSync5, spawn as spawn4 } from "child_process";
 import fs39 from "fs";
 import path50 from "path";
-import * as p17 from "@clack/prompts";
+import * as p18 from "@clack/prompts";
+
+// core-engine/utils/cancel-guard.ts
+import * as p10 from "@clack/prompts";
+function installSetupCancelGuard() {
+  const onSignal = () => {
+    if (!hasActiveSpinner()) {
+      p10.cancel("Setup cancelled.");
+    }
+    process.exit(0);
+  };
+  process.on("SIGINT", onSignal);
+  process.on("SIGTERM", onSignal);
+  return () => {
+    process.off("SIGINT", onSignal);
+    process.off("SIGTERM", onSignal);
+  };
+}
 
 // core-engine/utils/prompt-theme.ts
 var GREEN_STEP_SUBMIT = "\x1B[32m\u25C7\x1B[39m";
@@ -21913,7 +21939,7 @@ function deferNextPromptCheck() {
 
 // adapters/next/init/prompts/database.ts
 import { execFileSync as execFileSync4 } from "child_process";
-import * as p10 from "@clack/prompts";
+import * as p11 from "@clack/prompts";
 import pc from "picocolors";
 var VERCEL_NEON_URL = "https://vercel.com/dashboard/integrations/checkout/neon";
 async function promptServices(options) {
@@ -21921,7 +21947,7 @@ async function promptServices(options) {
     const url2 = await promptConnectionString();
     return { provider: "manual", url: url2 };
   }
-  const choice = await p10.select({
+  const choice = await p11.select({
     message: "Connect a PostgreSQL Database",
     options: [
       {
@@ -21937,8 +21963,8 @@ async function promptServices(options) {
     ],
     initialValue: "vercel"
   });
-  if (p10.isCancel(choice)) {
-    p10.cancel("Setup cancelled.");
+  if (p11.isCancel(choice)) {
+    p11.cancel("Setup cancelled.");
     process.exit(0);
   }
   if (choice === "vercel") {
@@ -21949,7 +21975,7 @@ async function promptServices(options) {
 }
 function openBrowserVercelNeon() {
   openBrowser(VERCEL_NEON_URL);
-  p10.log.info(
+  p11.log.info(
     `Opening Vercel... Create a Neon Postgres database, then copy the ${pc.cyan("DATABASE_URL")} from the dashboard.`
   );
 }
@@ -21959,12 +21985,12 @@ function openBrowserVercelNeonResource(url) {
     return;
   }
   openBrowser(url);
-  p10.log.info(
+  p11.log.info(
     `Opening Vercel... Copy the Neon ${pc.cyan("DATABASE_URL")} from the database dashboard, then paste it below.`
   );
 }
 async function promptConnectionString() {
-  const input = await p10.text({
+  const input = await p11.text({
     message: "Paste your PostgreSQL connection string",
     placeholder: "postgres://user:pass@host/db",
     validate(val) {
@@ -21978,8 +22004,8 @@ async function promptConnectionString() {
       }
     }
   });
-  if (p10.isCancel(input)) {
-    p10.cancel("Setup cancelled.");
+  if (p11.isCancel(input)) {
+    p11.cancel("Setup cancelled.");
     process.exit(0);
   }
   return input.replace(/^['"]|['"]$/g, "").trim();
@@ -22000,7 +22026,7 @@ function openBrowser(url) {
 
 // adapters/next/init/prompts/plugins.ts
 import { styleText } from "util";
-import * as p11 from "@clack/prompts";
+import * as p12 from "@clack/prompts";
 
 // adapters/next/init/scaffolders/env.ts
 import crypto2 from "crypto";
@@ -22160,7 +22186,7 @@ async function promptPlugins(cwd, options = {}) {
     }
   };
   const storageStep = deferNextPromptCheck();
-  const storage = await p11.select({
+  const storage = await p12.select({
     message: "Choose a file storage",
     options: [
       {
@@ -22179,8 +22205,8 @@ async function promptPlugins(cwd, options = {}) {
     ],
     initialValue: "vercel-blob"
   });
-  if (p11.isCancel(storage)) {
-    p11.cancel("Setup cancelled.");
+  if (p12.isCancel(storage)) {
+    p12.cancel("Setup cancelled.");
     process.exit(0);
   }
   if (storage === "r2") {
@@ -22191,7 +22217,7 @@ async function promptPlugins(cwd, options = {}) {
     const flow = !existingToken && options.provisionVercelBlob ? await options.provisionVercelBlob() : void 0;
     if (flow?.ok && flow.token) {
       persistBlobReadWriteToken(cwd, flow.token);
-      p11.log.success("Saved BLOB_READ_WRITE_TOKEN to .env.local");
+      p12.log.success("Saved BLOB_READ_WRITE_TOKEN to .env.local");
       sections.push({
         header: "Storage (Vercel Blob)",
         vars: [{ key: "BLOB_READ_WRITE_TOKEN", value: flow.token }]
@@ -22199,20 +22225,26 @@ async function promptPlugins(cwd, options = {}) {
       overwriteKeys.add("BLOB_READ_WRITE_TOKEN");
       if (flow.usedTerminalFallback) storageStep.skip();
       else storageStep.confirm();
+    } else if (flow) {
+      p12.log.warn(
+        "Continuing without a Blob token \u2014 add BLOB_READ_WRITE_TOKEN to .env.local from the store on vercel.com/dashboard/stores."
+      );
+      sections.push({
+        header: "Storage (Vercel Blob)",
+        vars: [{ key: "BLOB_READ_WRITE_TOKEN", value: "" }]
+      });
+      storageStep.skip();
     } else {
       if (existingToken) {
-        p11.log.info("Using the existing Vercel Blob token from .env.local");
-      } else if (options.provisionVercelBlob) {
-        p11.log.info("Falling back to a manual Vercel Blob token.");
+        p12.log.info("Using the existing Vercel Blob token from .env.local");
       }
       mergeIntegrationConfig(await collectIntegrationConfig(cwd, ["vercel-blob"]));
-      if (flow) storageStep.skip();
-      else storageStep.confirm();
+      storageStep.confirm();
     }
   } else {
     storageStep.confirm();
   }
-  const selectedPlugins = await p11.multiselect({
+  const selectedPlugins = await p12.multiselect({
     message: "Select presets",
     options: [
       {
@@ -22224,12 +22256,12 @@ async function promptPlugins(cwd, options = {}) {
     required: false,
     initialValues: ["blog"]
   });
-  if (p11.isCancel(selectedPlugins)) {
-    p11.cancel("Setup cancelled.");
+  if (p12.isCancel(selectedPlugins)) {
+    p12.cancel("Setup cancelled.");
     process.exit(0);
   }
   const integrations = [];
-  const setupResend = await p11.confirm({
+  const setupResend = await p12.confirm({
     message: `Do you want to setup resend.com emails?
 ${styleText(
       "dim",
@@ -22237,8 +22269,8 @@ ${styleText(
     )}`,
     initialValue: true
   });
-  if (p11.isCancel(setupResend)) {
-    p11.cancel("Setup cancelled.");
+  if (p12.isCancel(setupResend)) {
+    p12.cancel("Setup cancelled.");
     process.exit(0);
   }
   if (setupResend) {
@@ -22267,10 +22299,10 @@ ${styleText(
 }
 
 // adapters/next/init/prompts/project.ts
-import * as p12 from "@clack/prompts";
+import * as p13 from "@clack/prompts";
 import pc2 from "picocolors";
 async function promptProject(defaultName) {
-  const projectName = await p12.text({
+  const projectName = await p13.text({
     message: [
       "What is your project name?",
       `${pc2.cyan("\u2502")}  ${pc2.dim("If you don't want a directory created with the project name, just press `")}${pc2.bold(
@@ -22289,16 +22321,16 @@ async function promptProject(defaultName) {
       return void 0;
     }
   });
-  if (p12.isCancel(projectName)) {
-    p12.cancel("Setup cancelled.");
+  if (p13.isCancel(projectName)) {
+    p13.cancel("Setup cancelled.");
     process.exit(0);
   }
-  const useSrcDir = await p12.confirm({
+  const useSrcDir = await p13.confirm({
     message: "Use src/ directory?",
     initialValue: false
   });
-  if (p12.isCancel(useSrcDir)) {
-    p12.cancel("Setup cancelled.");
+  if (p13.isCancel(useSrcDir)) {
+    p13.cancel("Setup cancelled.");
     process.exit(0);
   }
   return { projectName: projectName.trim(), useSrcDir };
@@ -24144,11 +24176,11 @@ function scaffoldTsconfig(cwd, config) {
 }
 
 // adapters/next/init/vercel/flow.ts
-import * as p16 from "@clack/prompts";
+import * as p17 from "@clack/prompts";
 import pc6 from "picocolors";
 
 // adapters/next/init/vercel/auth.ts
-import * as p13 from "@clack/prompts";
+import * as p14 from "@clack/prompts";
 import pc3 from "picocolors";
 
 // adapters/next/init/vercel/runner.ts
@@ -24356,7 +24388,7 @@ async function ensureVercelAuth(runner, cwd, options) {
   checkSpinner.clear();
   const signInMessage = `Sign in to Vercel to continue ${pc3.dim("(or press Ctrl-C to enter a connection string manually)")}`;
   const signInRows = clackLogRows(signInMessage);
-  p13.log.info(signInMessage);
+  p14.log.info(signInMessage);
   let streamedRows = 0;
   const login = await runVercel(runner, ["login"], {
     cwd,
@@ -24388,7 +24420,7 @@ function signedInMessage(username) {
 }
 
 // adapters/next/init/vercel/blob.ts
-import * as p14 from "@clack/prompts";
+import * as p15 from "@clack/prompts";
 import pc4 from "picocolors";
 
 // adapters/next/init/vercel/env-pull.ts
@@ -24499,21 +24531,46 @@ function readLinkedProjectJson(cwd) {
 // adapters/next/init/vercel/blob.ts
 var PROVISION_TIMEOUT_MS = 18e4;
 var INTERACTIVE_PROVISION_TIMEOUT_MS = 6e5;
-var MAX_STORE_NAME_ATTEMPTS = 5;
+var MAX_STORE_NAME_ATTEMPTS = 10;
 function blobStoreName(projectName) {
   return sanitizeVercelProjectName(`${projectName}-blob`);
 }
 function isNameTaken(result) {
-  return /already exists|already taken|already in use|name.*taken/i.test(
+  return /already exists|already taken|already in use|name.*taken|conflict|\b409\b/i.test(
     `${result.stdout}
 ${result.stderr}`
   );
 }
+function candidateStoreName(baseName, attempt) {
+  if (attempt < MAX_STORE_NAME_ATTEMPTS) return versionedVercelProjectName(baseName, attempt);
+  const suffix = `-${Date.now().toString(36)}`;
+  return `${baseName.slice(0, 100 - suffix.length)}${suffix}`;
+}
+function isEnvVarConflict(result) {
+  return /already has an existing environment variable/i.test(`${result.stdout}
+${result.stderr}`);
+}
+function createdStoreId(result) {
+  return /Blob store created:[^(]*\((store_[A-Za-z0-9]+)\)/.exec(
+    `${result.stdout}
+${result.stderr}`
+  )?.[1];
+}
+async function deleteOrphanStore(runner, cwd, createResult, env) {
+  const storeId = createdStoreId(createResult);
+  if (!storeId) return;
+  await runVercel(runner, ["blob", "delete-store", storeId, "--yes"], {
+    cwd,
+    mode: "capture",
+    timeoutMs: PROVISION_TIMEOUT_MS,
+    env
+  });
+}
 async function createStoreQuiet(runner, cwd, baseName, env) {
   let result;
   let storeName = baseName;
   for (let attempt = 1; attempt <= MAX_STORE_NAME_ATTEMPTS; attempt++) {
-    storeName = versionedVercelProjectName(baseName, attempt);
+    storeName = candidateStoreName(baseName, attempt);
     result = await runVercel(
       runner,
       ["blob", "create-store", storeName, "--access", "public", "--yes"],
@@ -24526,45 +24583,80 @@ async function createStoreQuiet(runner, cwd, baseName, env) {
 async function provisionBlobStoreInteractive(runner, cwd, options) {
   const quietSpinner = spinner2();
   quietSpinner.start("Creating your Vercel Blob store");
-  const quiet = await createStoreQuiet(runner, cwd, options.name, options.env);
-  if (quiet.result.success) {
-    quietSpinner.message("Retrieving the Blob read-write token");
-    const token2 = await pullBlobToken(runner, cwd, options.env);
-    if (!token2) {
-      quietSpinner.stop("No BLOB_READ_WRITE_TOKEN came back from Vercel");
-      return { storeName: quiet.storeName, failure: "env-pull-empty" };
-    }
+  let terminalFallbackRan = false;
+  let lastResult;
+  const pullToken = async (activeSpinner, storeName) => {
+    const token = await pullBlobToken(runner, cwd, options.env);
+    if (!token) {
+      activeSpinner.stop("No BLOB_READ_WRITE_TOKEN came back from Vercel");
+      return { ...storeName && { storeName }, failure: "env-pull-empty" };
+    }
+    activeSpinner.clear();
+    return {
+      token,
+      ...storeName && { storeName },
+      ...terminalFallbackRan && { usedTerminalFallback: true }
+    };
+  };
+  for (let attempt = 1; attempt <= MAX_STORE_NAME_ATTEMPTS; attempt++) {
+    const storeName = candidateStoreName(options.name, attempt);
+    const result = await runVercel(
+      runner,
+      ["blob", "create-store", storeName, "--access", "public", "--yes"],
+      { cwd, mode: "capture", timeoutMs: PROVISION_TIMEOUT_MS, env: options.env }
+    );
+    lastResult = result;
+    if (result.success) {
+      quietSpinner.message("Retrieving the Blob read-write token");
+      return pullToken(quietSpinner, storeName);
+    }
+    if (isEnvVarConflict(result)) {
+      await deleteOrphanStore(runner, cwd, result, options.env);
+      quietSpinner.message("Retrieving the Blob read-write token");
+      return pullToken(quietSpinner);
+    }
+    if (isNameTaken(result)) continue;
+    if (terminalFallbackRan) break;
+    terminalFallbackRan = true;
     quietSpinner.clear();
-    return { token: token2, storeName: quiet.storeName };
-  }
-  quietSpinner.clear();
-  p14.log.info(
-    `Create your Blob store in the Vercel prompts below ${pc4.dim(
-      "(connect it to all environments)."
-    )}`
-  );
-  const add = await runVercel(
-    runner,
-    ["blob", "create-store", quiet.storeName, "--access", "public"],
-    { cwd, mode: "inherit", timeoutMs: INTERACTIVE_PROVISION_TIMEOUT_MS, env: options.env }
-  );
-  if (!add.success) {
-    return { failure: add.timedOut ? "timeout" : "provision-failed" };
-  }
-  const pullSpinner = spinner2();
-  pullSpinner.start("Retrieving the Blob read-write token");
-  const token = await pullBlobToken(runner, cwd, options.env);
-  if (!token) {
-    pullSpinner.stop("No BLOB_READ_WRITE_TOKEN came back from Vercel");
-    return { storeName: quiet.storeName, failure: "env-pull-empty" };
+    p15.log.info(
+      `Create your Blob store in the Vercel prompts below ${pc4.dim(
+        "(connect it to all environments)."
+      )}`
+    );
+    const add = await runVercel(runner, ["blob", "create-store", storeName, "--access", "public"], {
+      cwd,
+      mode: "inherit",
+      timeoutMs: INTERACTIVE_PROVISION_TIMEOUT_MS,
+      env: options.env
+    });
+    if (add.success) {
+      const pullSpinner = spinner2();
+      pullSpinner.start("Retrieving the Blob read-write token");
+      return pullToken(pullSpinner, storeName);
+    }
+    if (add.timedOut) return { failure: "timeout" };
+    lastResult = add;
+    quietSpinner.start("Creating your Vercel Blob store");
   }
-  pullSpinner.clear();
-  return { token, storeName: quiet.storeName, usedTerminalFallback: true };
+  quietSpinner.stop("Vercel Blob provisioning did not complete");
+  return { failure: lastResult?.timedOut ? "timeout" : "provision-failed" };
 }
 async function provisionBlobStore(runner, cwd, options) {
   const provisionSpinner = spinner2();
   provisionSpinner.start("Creating your Vercel Blob store");
   const { result, storeName } = await createStoreQuiet(runner, cwd, options.name, options.env);
+  if (!result.success && isEnvVarConflict(result)) {
+    await deleteOrphanStore(runner, cwd, result, options.env);
+    provisionSpinner.message("Retrieving the Blob read-write token");
+    const token2 = await pullBlobToken(runner, cwd, options.env);
+    if (!token2) {
+      provisionSpinner.stop("No BLOB_READ_WRITE_TOKEN came back from Vercel");
+      return { failure: "env-pull-empty" };
+    }
+    provisionSpinner.clear();
+    return { token: token2 };
+  }
   if (!result.success) {
     provisionSpinner.stop("Vercel Blob provisioning did not complete");
     const combined = `${result.stdout}
@@ -24793,7 +24885,7 @@ function guardEnvLocal(cwd) {
 }
 
 // adapters/next/init/vercel/neon.ts
-import * as p15 from "@clack/prompts";
+import * as p16 from "@clack/prompts";
 import pc5 from "picocolors";
 var PROVISION_TIMEOUT_MS2 = 18e4;
 var INTERACTIVE_PROVISION_TIMEOUT_MS2 = 6e5;
@@ -24811,7 +24903,7 @@ async function provisionNeonInteractive(runner, cwd, options) {
     return readNeonProvisionInfo(quiet.stdout);
   }
   quietSpinner.clear();
-  p15.log.info(
+  p16.log.info(
     `Create your Neon database in the Vercel prompts below ${pc5.dim(
       "(the Free plan is recommended)."
     )}`
@@ -24885,14 +24977,14 @@ async function runVercelNeonFlow(options) {
     runnerSpinner.clear();
     const auth = await ensureVercelAuth(runner, options.cwd, { env });
     if (!auth.authed) {
-      p16.log.warn(authFailureMessage(auth.reason));
+      p17.log.warn(authFailureMessage(auth.reason));
       return { ok: false };
     }
     const linkLinePrinted = await ensureLinkedProject(runner, options.cwd, options.projectName, env);
     const neon = await provisionNeonForMode(runner, options);
     if (neon.failure) {
-      p16.log.warn(neonFailureMessage(neon.failure));
-      if (neon.detail) p16.log.message(pc6.dim(neon.detail));
+      p17.log.warn(neonFailureMessage(neon.failure));
+      if (neon.detail) p17.log.message(pc6.dim(neon.detail));
       return { ok: false };
     }
     const databaseUrl = await pullNeonDatabaseUrl(runner, options.cwd, env);
@@ -24905,7 +24997,7 @@ async function runVercelNeonFlow(options) {
       dismissSignedInNote
     };
   } catch (error) {
-    p16.log.warn(
+    p17.log.warn(
       `Vercel provisioning failed: ${error instanceof Error ? error.message : String(error)}`
     );
     return { ok: false };
@@ -24923,14 +25015,14 @@ async function runVercelBlobFlow(options) {
     runnerSpinner.clear();
     const auth = await ensureVercelAuth(runner, options.cwd, { env, quietIfAuthed: true });
     if (!auth.authed) {
-      p16.log.warn(authFailureMessage(auth.reason));
+      p17.log.warn(authFailureMessage(auth.reason));
       return { ok: false };
     }
     await ensureLinkedProject(runner, options.cwd, options.projectName, env);
     const blob = await provisionBlobForMode(runner, options);
     if (blob.failure || !blob.token) {
-      p16.log.warn(blobFailureMessage(blob.failure));
-      if (blob.detail) p16.log.message(pc6.dim(blob.detail));
+      p17.log.warn(blobFailureMessage(blob.failure));
+      if (blob.detail) p17.log.message(pc6.dim(blob.detail));
       return { ok: false };
     }
     return {
@@ -24940,7 +25032,7 @@ async function runVercelBlobFlow(options) {
       usedTerminalFallback: blob.usedTerminalFallback
     };
   } catch (error) {
-    p16.log.warn(
+    p17.log.warn(
       `Vercel provisioning failed: ${error instanceof Error ? error.message : String(error)}`
     );
     return { ok: false };
@@ -24958,7 +25050,7 @@ async function runVercelDeployFlow(options) {
     runnerSpinner.clear();
     const auth = await ensureVercelAuth(runner, options.cwd, { env, quietIfAuthed: true });
     if (!auth.authed) {
-      p16.log.warn(authFailureMessage(auth.reason));
+      p17.log.warn(authFailureMessage(auth.reason));
       printManualDeployHint();
       return { ok: false };
     }
@@ -24976,17 +25068,17 @@ async function runVercelDeployFlow(options) {
     let printedWarnings = false;
     for (const key of sync.failed) {
       printedWarnings = true;
-      p16.log.warn(
+      p17.log.warn(
         `Could not set ${pc6.cyan(key)} on Vercel \u2014 add it in the project's environment settings.`
       );
     }
     if (ensureVercelJsonFramework(options.cwd) === "created") {
-      p16.log.success(`Created ${pc6.cyan("vercel.json")} with the Next.js framework preset`);
+      p17.log.success(`Created ${pc6.cyan("vercel.json")} with the Next.js framework preset`);
     }
     const packageGuard = guardProjectForDeploy(options.cwd);
     for (const dep of packageGuard.localSpecDeps) {
       printedWarnings = true;
-      p16.log.warn(
+      p17.log.warn(
         `Dependency ${pc6.cyan(dep)} uses a local spec that cannot install on Vercel \u2014 the remote build may fail.`
       );
     }
@@ -25000,7 +25092,7 @@ async function runVercelDeployFlow(options) {
     }
     if (deploy.failure) {
       deploySpinner.stop(`${pc6.yellow("\u25B2")} ${deployFailureMessage(deploy.failure)}`);
-      if (deploy.detail) p16.log.message(pc6.dim(deploy.detail));
+      if (deploy.detail) p17.log.message(pc6.dim(deploy.detail));
       printManualDeployHint();
       return { ok: false };
     }
@@ -25009,7 +25101,7 @@ async function runVercelDeployFlow(options) {
     deploySpinner.stop(url ? `Deployed ${pc6.cyan(url)}` : "Deployed to Vercel");
     return { ok: true, url, syncedEnvKeys: sync.synced, cleanScreen: !printedWarnings };
   } catch (error) {
-    p16.log.warn(`Vercel deploy failed: ${error instanceof Error ? error.message : String(error)}`);
+    p17.log.warn(`Vercel deploy failed: ${error instanceof Error ? error.message : String(error)}`);
     printManualDeployHint();
     return { ok: false };
   } finally {
@@ -25017,7 +25109,7 @@ async function runVercelDeployFlow(options) {
   }
 }
 function printManualDeployHint() {
-  p16.log.info(`You can deploy manually: ${pc6.cyan("vercel deploy --prod")}`);
+  p17.log.info(`You can deploy manually: ${pc6.cyan("vercel deploy --prod")}`);
 }
 async function ensureLinkedProject(runner, cwd, projectName, env) {
   if (readLinkedProjectId(cwd)) return false;
@@ -25065,11 +25157,11 @@ function authFailureMessage(reason) {
 function blobFailureMessage(reason) {
   switch (reason) {
     case "env-pull-empty":
-      return "Created a Blob store, but no BLOB_READ_WRITE_TOKEN came back \u2014 falling back to manual entry.";
+      return "Created a Blob store, but no BLOB_READ_WRITE_TOKEN came back from Vercel.";
     case "timeout":
-      return "Vercel Blob provisioning timed out \u2014 falling back to manual entry.";
+      return "Vercel Blob provisioning timed out.";
     default:
-      return "Vercel Blob provisioning did not complete \u2014 falling back to manual entry.";
+      return "Vercel Blob provisioning did not complete.";
   }
 }
 function deployFailureMessage(reason) {
@@ -25483,7 +25575,8 @@ function removeExistingAdminPaths(cwd, namespaces) {
 }
 async function runInitCommand(name, options) {
   installPromptCheckmarks();
-  p17.box(
+  const disposeCancelGuard = installSetupCancelGuard();
+  p18.box(
     `
 \u2584   \u2597 \u2597     \u2584\u2596\u2597     \u2597 
 \u2599\u2598\u2588\u258C\u259C\u2598\u259C\u2598\u2588\u258C\u259B\u2598\u259A \u259C\u2598\u2580\u258C\u259B\u2598\u259C\u2598
@@ -25504,13 +25597,13 @@ async function runInitCommand(name, options) {
     try {
       namespace = validateAdminNamespace(options.namespace);
     } catch (error) {
-      p17.log.error(error instanceof Error ? error.message : String(error));
+      p18.log.error(error instanceof Error ? error.message : String(error));
       process.exit(1);
     }
   }
   if (!options.yes && !options.namespace) {
     const defaultDashboardPath = resolveAdminNamespace(DEFAULT_ADMIN_NAMESPACE).routePath;
-    const namespaceInput = await p17.text({
+    const namespaceInput = await p18.text({
       message: "Enter the dashboard path",
       placeholder: `eg. ${defaultDashboardPath}`,
       defaultValue: defaultDashboardPath,
@@ -25523,8 +25616,8 @@ async function runInitCommand(name, options) {
         }
       }
     });
-    if (p17.isCancel(namespaceInput)) {
-      p17.cancel("Setup cancelled.");
+    if (p18.isCancel(namespaceInput)) {
+      p18.cancel("Setup cancelled.");
       process.exit(0);
     }
     namespace = validateAdminDashboardPath(namespaceInput);
@@ -25536,13 +25629,13 @@ async function runInitCommand(name, options) {
   if (project2.isExisting) {
     srcDir = project2.hasSrcDir;
     if (!project2.hasTypeScript) {
-      p17.log.error("TypeScript is required. Please add a tsconfig.json first.");
+      p18.log.error("TypeScript is required. Please add a tsconfig.json first.");
       process.exit(1);
     }
     if (forceMode) {
       const nuked = removeExistingAdminPaths(cwd, await resolveForceInitNamespaces(cwd, namespace));
       if (nuked > 0) {
-        p17.log.warn(`${pc7.yellow("Force mode:")} removed ${nuked} existing admin paths`);
+        p18.log.warn(`${pc7.yellow("Force mode:")} removed ${nuked} existing admin paths`);
       }
       project2 = detectProject(cwd, namespace);
     } else if (project2.conflicts.length > 0) {
@@ -25551,9 +25644,9 @@ async function runInitCommand(name, options) {
         "",
         pc7.dim(`Use ${pc7.bold("--force")} to remove existing admin files before scaffolding.`)
       );
-      p17.note(conflictLines.join("\n"), pc7.yellow("Conflicts"));
+      p18.note(conflictLines.join("\n"), pc7.yellow("Conflicts"));
       if (!options.yes) {
-        const proceed = await p17.confirm({
+        const proceed = await p18.confirm({
           message: [
             `Continue with ${pc7.bold(pc7.cyan("--force"))}?`,
             `${pc7.cyan("\u2502")}  ${pc7.dim("This will force overwrite the existing admin code.")}`,
@@ -25561,8 +25654,8 @@ async function runInitCommand(name, options) {
           ].join("\n"),
           initialValue: true
         });
-        if (p17.isCancel(proceed) || !proceed) {
-          p17.cancel("Setup cancelled.");
+        if (p18.isCancel(proceed) || !proceed) {
+          p18.cancel("Setup cancelled.");
           process.exit(0);
         }
         forceMode = true;
@@ -25571,23 +25664,23 @@ async function runInitCommand(name, options) {
           await resolveForceInitNamespaces(cwd, namespace)
         );
         if (nuked > 0) {
-          p17.log.warn(`${pc7.yellow("Force mode:")} removed ${nuked} existing admin paths`);
+          p18.log.warn(`${pc7.yellow("Force mode:")} removed ${nuked} existing admin paths`);
         }
         project2 = detectProject(cwd, namespace);
       }
     }
   } else {
-    p17.log.info("No Next.js app found \u2014 Running the fresh project mode...");
+    p18.log.info("No Next.js app found \u2014 Running the fresh project mode...");
     let projectPrompt;
     try {
       projectPrompt = options.yes ? resolveNonInteractiveProject(name) : await promptProject(name);
     } catch (error) {
-      p17.log.error(error instanceof Error ? error.message : String(error));
+      p18.log.error(error instanceof Error ? error.message : String(error));
       process.exit(1);
     }
     srcDir = projectPrompt.useSrcDir;
     if (!options.yes) {
-      const pmChoice = await p17.select({
+      const pmChoice = await p18.select({
         message: "Which package manager do you want to use?",
         options: [
           { value: "pnpm", label: "pnpm", hint: "recommended" },
@@ -25596,8 +25689,8 @@ async function runInitCommand(name, options) {
           { value: "bun", label: "bun" }
         ]
       });
-      if (p17.isCancel(pmChoice)) {
-        p17.cancel("Setup cancelled.");
+      if (p18.isCancel(pmChoice)) {
+        p18.cancel("Setup cancelled.");
         process.exit(0);
       }
       pm = pmChoice;
@@ -25631,8 +25724,8 @@ async function runInitCommand(name, options) {
         process.stderr.write(`${createNextAppResult.output.trimEnd()}
 `);
       }
-      p17.log.error(createNextAppResult.error);
-      p17.log.info(
+      p18.log.error(createNextAppResult.error);
+      p18.log.info(
         `You can create the project manually:
   ${pc7.cyan(`npx create-next-app@latest ${projectPrompt.projectName} --typescript --tailwind --app`)}
   Then run ${pc7.cyan("betterstart init")} inside it.`
@@ -25646,11 +25739,11 @@ async function runInitCommand(name, options) {
     );
     if (!hasPackageJson || !hasNextConfig) {
       createNextAppSpinner.stop(`Failed to create Next.js app: ${displayName}`);
-      p17.log.error(
+      p18.log.error(
         "create-next-app completed but the project was not created. This can happen with nested npx calls."
       );
       const manualCmd = `npx create-next-app@latest ${projectPrompt.projectName} --typescript --tailwind --app`;
-      p17.log.info(
+      p18.log.info(
         `Create the project manually:
   ${pc7.cyan(manualCmd)}
   Then run ${pc7.cyan("betterstart init")} inside it.`
@@ -25669,7 +25762,7 @@ async function runInitCommand(name, options) {
   if (options.yes) {
     if (options.databaseUrl) {
       if (!isValidDbUrl(options.databaseUrl)) {
-        p17.log.error(
+        p18.log.error(
           `Invalid database URL. Must start with ${pc7.cyan("postgres://")} or ${pc7.cyan("postgresql://")}`
         );
         process.exit(1);
@@ -25689,24 +25782,24 @@ async function runInitCommand(name, options) {
         databaseUrl = flow.databaseUrl;
         persistDatabaseUrl(cwd, databaseUrl);
       } else if (flow.ok) {
-        p17.log.warn("Created a Neon database, but DATABASE_URL could not be retrieved from Vercel.");
+        p18.log.warn("Created a Neon database, but DATABASE_URL could not be retrieved from Vercel.");
         const resourceUrl = flow.dashboardUrl ?? flow.resourceUrl;
         if (resourceUrl) {
-          p17.log.info(
+          p18.log.info(
             `Open ${pc7.cyan(resourceUrl)} to copy DATABASE_URL, then rerun ${pc7.cyan("betterstart init --database-url <url> --yes")}.`
           );
         } else {
-          p17.log.info(
+          p18.log.info(
             `Rerun ${pc7.cyan("betterstart init --database-url <url> --yes")} with a Postgres connection string.`
           );
         }
       } else {
-        p17.log.warn("Vercel provisioning did not complete; continuing without a database URL.");
+        p18.log.warn("Vercel provisioning did not complete; continuing without a database URL.");
       }
     }
   } else if (existingDbUrl) {
     const masked = maskDbUrl(existingDbUrl);
-    p17.log.info(`Using existing database URL from .env.local ${pc7.dim(`(${masked})`)}`);
+    p18.log.info(`Using existing database URL from .env.local ${pc7.dim(`(${masked})`)}`);
     databaseUrl = existingDbUrl;
   } else {
     const databaseStep = deferNextPromptCheck();
@@ -25732,7 +25825,7 @@ async function runInitCommand(name, options) {
         persistDatabaseUrl(cwd, databaseUrl);
       } else {
         databaseStep.skip();
-        p17.log.info("Falling back to a manual database connection string.");
+        p18.log.info("Falling back to a manual database connection string.");
         openBrowserVercelNeon();
         databaseUrl = await promptConnectionString();
       }
@@ -25774,21 +25867,20 @@ async function runInitCommand(name, options) {
       });
       if (flow.ok && flow.token) {
         persistBlobReadWriteToken(cwd, flow.token);
-        p17.log.success(`Saved BLOB_READ_WRITE_TOKEN to ${pc7.cyan(".env.local")}`);
+        p18.log.success(`Saved BLOB_READ_WRITE_TOKEN to ${pc7.cyan(".env.local")}`);
         collectedIntegrationConfig.sections.push({
           header: "Storage (Vercel Blob)",
           vars: [{ key: "BLOB_READ_WRITE_TOKEN", value: flow.token }]
         });
         collectedIntegrationConfig.overwriteKeys.add("BLOB_READ_WRITE_TOKEN");
-      } else if (!options.yes) {
-        p17.log.info("Falling back to a manual Vercel Blob token.");
-        const collected = await collectIntegrationConfig(cwd, ["vercel-blob"]);
-        collectedIntegrationConfig.sections.push(...collected.sections);
-        for (const key of collected.overwriteKeys) {
-          collectedIntegrationConfig.overwriteKeys.add(key);
-        }
       } else {
-        p17.log.warn("Vercel Blob provisioning did not complete; continuing without a Blob token.");
+        p18.log.warn(
+          "Continuing without a Blob token \u2014 add BLOB_READ_WRITE_TOKEN to .env.local from the store on vercel.com/dashboard/stores."
+        );
+        collectedIntegrationConfig.sections.push({
+          header: "Storage (Vercel Blob)",
+          vars: [{ key: "BLOB_READ_WRITE_TOKEN", value: "" }]
+        });
       }
     }
   } else if (options.yes) {
@@ -25891,7 +25983,7 @@ async function runInitCommand(name, options) {
   });
   s.stop("");
   process.stdout.write("\x1B[2A\x1B[J");
-  p17.note(noteLines.join("\n"), "Scaffolded admin");
+  p18.note(noteLines.join("\n"), "Scaffolded admin");
   const drizzleConfigPath = path50.join(cwd, "drizzle.config.ts");
   if (!dbFiles.includes("drizzle.config.ts") && fs39.existsSync(drizzleConfigPath)) {
     if (forceMode) {
@@ -25901,20 +25993,20 @@ async function runInitCommand(name, options) {
         readNamespacedTemplate("drizzle.config.ts", namespace),
         "utf-8"
       );
-      p17.log.success("Updated drizzle.config.ts");
+      p18.log.success("Updated drizzle.config.ts");
     } else if (!options.yes) {
-      const overwrite = await p17.confirm({
+      const overwrite = await p18.confirm({
         message: "drizzle.config.ts already exists. Overwrite with latest version?",
         initialValue: true
       });
-      if (!p17.isCancel(overwrite) && overwrite) {
+      if (!p18.isCancel(overwrite) && overwrite) {
         const { readNamespacedTemplate } = await import("./template-reader-X6KFP7B3.js");
         fs39.writeFileSync(
           drizzleConfigPath,
           readNamespacedTemplate("drizzle.config.ts", namespace),
           "utf-8"
         );
-        p17.log.success("Updated drizzle.config.ts");
+        p18.log.success("Updated drizzle.config.ts");
       }
     }
   }
@@ -25940,8 +26032,8 @@ async function runInitCommand(name, options) {
     depsInstalled = true;
   } else {
     s.stop("Failed to install dependencies");
-    p17.log.warning(depsResult.error ?? "Unknown error");
-    p17.log.info(
+    p18.log.warning(depsResult.error ?? "Unknown error");
+    p18.log.info(
       `You can install them manually:
   ${pc7.cyan(`${pm} add ${depsResult.dependencies.join(" ")}`)}
   ${pc7.cyan(`${pm} add -D ${depsResult.devDeps.join(" ")}`)}`
@@ -26031,10 +26123,10 @@ async function runInitCommand(name, options) {
       `  ${pc7.yellow("\u25B2")} Local filesystem storage is only for development or self-hosted persistent-disk deployments. Use Vercel Blob or Cloudflare R2 for hosted/serverless production.`
     );
   }
-  p17.note(installLines.join("\n"), "Installed");
+  p18.note(installLines.join("\n"), "Installed");
   let dbPushed = false;
   if (depsResult.success && options.skipMigration && hasDbUrl(cwd)) {
-    p17.log.info(`Skipping database schema push ${pc7.dim("(--skip-migration)")}`);
+    p18.log.info(`Skipping database schema push ${pc7.dim("(--skip-migration)")}`);
   } else if (depsResult.success && hasDbUrl(cwd)) {
     let driverReady = hasDrizzleKitPostgresDriverDependency(cwd);
     if (!driverReady) {
@@ -26049,8 +26141,8 @@ async function runInitCommand(name, options) {
       });
       if (!driverResult.success) {
         s.stop("Database push failed");
-        p17.log.warning(driverResult.error ?? `Failed to install ${DRIZZLE_KIT_POSTGRES_DRIVER_DEP}`);
-        p17.log.info(
+        p18.log.warning(driverResult.error ?? `Failed to install ${DRIZZLE_KIT_POSTGRES_DRIVER_DEP}`);
+        p18.log.info(
           `Install ${DRIZZLE_KIT_POSTGRES_DRIVER_DEP} manually, then run: ${pc7.cyan(drizzlePushCommand(pm))}`
         );
       } else {
@@ -26061,7 +26153,7 @@ async function runInitCommand(name, options) {
     if (driverReady) {
       const useTerminalForDbPush = shouldUseTerminalForDbPush(options);
       if (useTerminalForDbPush) {
-        p17.log.info(`Running ${pc7.cyan("drizzle-kit push --force")}`);
+        p18.log.info(`Running ${pc7.cyan("drizzle-kit push --force")}`);
       } else {
         s.start("Pushing database schema (drizzle-kit push)");
       }
@@ -26070,13 +26162,13 @@ async function runInitCommand(name, options) {
         if (useTerminalForDbPush) {
           const verification = await verifyDatabaseReachable(cwd);
           if (!verification.success) {
-            p17.log.warning(verification.error);
-            p17.log.error("Database was not reachable. Aborting setup.");
+            p18.log.warning(verification.error);
+            p18.log.error("Database was not reachable. Aborting setup.");
             process.exit(1);
           }
         }
         if (useTerminalForDbPush) {
-          p17.log.success("Database schema pushed");
+          p18.log.success("Database schema pushed");
         } else {
           s.stop(`${pc7.green("\u2713")} Database schema pushed`);
         }
@@ -26086,12 +26178,12 @@ async function runInitCommand(name, options) {
           s.stop("Database push failed");
         }
         const pushError = pushResult.error ?? "Unknown error";
-        p17.log.warning(pushError);
+        p18.log.warning(pushError);
         if (isDatabaseReachabilityError(pushError)) {
-          p17.log.error("Database was not reachable. Aborting setup.");
+          p18.log.error("Database was not reachable. Aborting setup.");
           process.exit(1);
         }
-        p17.log.info(`You can run it manually: ${pc7.cyan(drizzlePushCommand(pm))}`);
+        p18.log.info(`You can run it manually: ${pc7.cyan(drizzlePushCommand(pm))}`);
       }
     }
   }
@@ -26100,7 +26192,7 @@ async function runInitCommand(name, options) {
   let seedSuccess = false;
   let adminAccountReady = false;
   if (dbPushed && options.skipAdminCreation) {
-    p17.log.info(
+    p18.log.info(
       `Skipping admin user creation ${pc7.dim(`(use ${betterstartExecCommand(pm, "seed")} later)`)}`
     );
   }
@@ -26110,14 +26202,14 @@ async function runInitCommand(name, options) {
     let replaceExistingAdmin = false;
     const adminCheck = await checkExistingAdmin(cwd, adminDir, authBasePath);
     if (adminCheck.error) {
-      p17.log.warning(`Could not verify existing admin account ${pc7.dim(`(${adminCheck.error})`)}`);
+      p18.log.warning(`Could not verify existing admin account ${pc7.dim(`(${adminCheck.error})`)}`);
       if (isDatabaseReachabilityError(adminCheck.error)) {
-        p17.log.error("Database was not reachable. Aborting setup.");
+        p18.log.error("Database was not reachable. Aborting setup.");
         process.exit(1);
       }
     } else if (adminCheck.existingAdmin) {
       const existingAdminLabel = formatAdminIdentity(adminCheck.existingAdmin);
-      const adminAction = await p17.select({
+      const adminAction = await p18.select({
         message: "Found an already existing admin account. Do you want to replace it or skip?",
         options: [
           {
@@ -26131,34 +26223,34 @@ async function runInitCommand(name, options) {
           }
         ]
       });
-      if (p17.isCancel(adminAction)) {
-        p17.cancel("Setup cancelled.");
+      if (p18.isCancel(adminAction)) {
+        p18.cancel("Setup cancelled.");
         process.exit(0);
       }
       if (adminAction === "skip") {
         adminAccountReady = true;
-        p17.log.info(`Keeping existing admin account ${pc7.dim(`(${existingAdminLabel})`)}`);
+        p18.log.info(`Keeping existing admin account ${pc7.dim(`(${existingAdminLabel})`)}`);
       } else {
         replaceExistingAdmin = true;
       }
     }
     if (!adminAccountReady) {
-      p17.note(
+      p18.note(
         pc7.dim(
           replaceExistingAdmin ? "Replace the existing admin account to access the admin." : "Create your first admin user to access the dashboard."
         ),
         "Admin account"
       );
-      const credentials = await p17.group(
+      const credentials = await p18.group(
         {
-          email: () => p17.text({
+          email: () => p18.text({
             message: "Admin email",
             placeholder: "admin@example.com",
             validate: (v) => {
               if (!v || !v.includes("@")) return "Please enter a valid email";
             }
           }),
-          password: () => p17.password({
+          password: () => p18.password({
             message: "Admin password",
             validate: (v) => {
               if (!v || v.length < 8) return "Password must be at least 8 characters";
@@ -26167,7 +26259,7 @@ async function runInitCommand(name, options) {
         },
         {
           onCancel: () => {
-            p17.cancel("Setup cancelled.");
+            p18.cancel("Setup cancelled.");
             process.exit(0);
           }
         }
@@ -26186,11 +26278,11 @@ async function runInitCommand(name, options) {
       );
       if (seedResult.existingUser) {
         s.stop(`${pc7.yellow("\u25B2")} An account already exists for ${credentials.email}`);
-        const replace = await p17.confirm({
+        const replace = await p18.confirm({
           message: "Replace the existing account with this email?",
           initialValue: false
         });
-        if (!p17.isCancel(replace) && replace) {
+        if (!p18.isCancel(replace) && replace) {
           seedOverwriteMode = "email";
           s.start("Replacing admin user");
           seedResult = await runSeed(
@@ -26211,14 +26303,14 @@ async function runInitCommand(name, options) {
         adminAccountReady = true;
       } else if (seedResult.error) {
         s.stop(`${pc7.red("\u2717")} Failed to create admin user`);
-        p17.note(
+        p18.note(
           `${pc7.red(seedResult.error)}
 
 Run manually: ${pc7.cyan(betterstartExecCommand(pm, "seed"))}`,
           pc7.red("Seed failed")
         );
         if (isDatabaseReachabilityError(seedResult.error)) {
-          p17.log.error("Database was not reachable. Aborting setup.");
+          p18.log.error("Database was not reachable. Aborting setup.");
           process.exit(1);
         }
       }
@@ -26250,16 +26342,16 @@ Run manually: ${pc7.cyan(betterstartExecCommand(pm, "seed"))}`,
     `Files created: ${pc7.cyan(String(totalFiles))}`,
     `Env vars: ${envResult.added.length} added, ${envResult.skipped.length} skipped`
   ];
-  p17.note(summaryLines.join("\n"), "Admin scaffolded successfully");
+  p18.note(summaryLines.join("\n"), "Admin scaffolded successfully");
   if (options.vercel !== false && !options.skipDeploy) {
     const linkedVercelProject = Boolean(readLinkedProjectId(cwd));
     if (!options.yes) {
       const deployStep = deferNextPromptCheck();
-      const deployNow = await p17.confirm({
+      const deployNow = await p18.confirm({
         message: "Deploy to Vercel now?",
         initialValue: linkedVercelProject
       });
-      if (!p17.isCancel(deployNow) && deployNow) {
+      if (!p18.isCancel(deployNow) && deployNow) {
         const deployFlow = await runVercelDeployFlow({ cwd, projectName, env: process.env });
         if (deployFlow.ok && deployFlow.cleanScreen) deployStep.confirm();
         else deployStep.skip();
@@ -26273,17 +26365,18 @@ Run manually: ${pc7.cyan(betterstartExecCommand(pm, "seed"))}`,
         env: process.env
       });
       if (!deployFlow.ok) {
-        p17.log.warn("Vercel deploy did not complete; continuing.");
+        p18.log.warn("Vercel deploy did not complete; continuing.");
       }
     }
   }
   if (!options.yes && !options.skipDevServerStart) {
     const devCmd = runCommand(pm, "dev");
-    const startDev = await p17.confirm({
+    const startDev = await p18.confirm({
       message: "Start the development server?",
       initialValue: true
     });
-    if (!p17.isCancel(startDev) && startDev) {
+    if (!p18.isCancel(startDev) && startDev) {
+      disposeCancelGuard();
       await startManagedDevServer(cwd, devCmd, adminLoginUrl, {
         email: seedSuccess && seedEmail ? seedEmail : void 0,
         password: seedSuccess && seedPassword ? seedPassword : void 0
@@ -26291,7 +26384,8 @@ Run manually: ${pc7.cyan(betterstartExecCommand(pm, "seed"))}`,
       return;
     }
   }
-  p17.outro("Done!");
+  disposeCancelGuard();
+  p18.outro("Done!");
 }
 function isValidDbUrl(url) {
   return url.startsWith("postgres://") || url.startsWith("postgresql://");
@@ -26678,7 +26772,7 @@ function printAdminReadyNote(state) {
     lines.unshift(`Password: ${pc7.cyan(state.adminPassword)}`);
     lines.unshift(`Admin user: ${pc7.cyan(state.adminEmail)}`);
   }
-  p17.note(lines.join("\n"), "Admin ready");
+  p18.note(lines.join("\n"), "Admin ready");
 }
 function shouldSuppressDevServerStartupLine(line) {
   const plain = stripAnsi2(line).trim();
@@ -26790,7 +26884,7 @@ function startManagedDevServer(cwd, devCmd, adminLoginUrl, adminCredentials) {
 
 // adapters/next/commands/list-integrations.ts
 import path51 from "path";
-import * as p18 from "@clack/prompts";
+import * as p19 from "@clack/prompts";
 async function runListIntegrationsCommand(options) {
   const cwd = options.cwd ? path51.resolve(options.cwd) : process.cwd();
   const config = await resolveConfig(cwd);
@@ -26799,15 +26893,15 @@ async function runListIntegrationsCommand(options) {
     const status = installedIntegrations.has(integration.id) ? "installed" : "available";
     return `${integration.id.padEnd(12)} ${status.padEnd(10)} ${integration.kind.padEnd(8)} ${integration.description}`;
   });
-  p18.note(lines.join("\n"), "BetterStart integrations");
-  p18.outro(
+  p19.note(lines.join("\n"), "BetterStart integrations");
+  p19.outro(
     `${installedIntegrations.size} installed, ${lines.length - installedIntegrations.size} available`
   );
 }
 
 // adapters/next/commands/list-plugins.ts
 import path52 from "path";
-import * as p19 from "@clack/prompts";
+import * as p20 from "@clack/prompts";
 async function runListPluginsCommand(options) {
   const cwd = options.cwd ? path52.resolve(options.cwd) : process.cwd();
   const config = await resolveConfig(cwd);
@@ -26816,34 +26910,34 @@ async function runListPluginsCommand(options) {
     const status = installedPlugins.has(plugin.id) ? "installed" : "available";
     return `${plugin.id.padEnd(10)} ${status.padEnd(10)} ${plugin.kind.padEnd(12)} ${plugin.description}`;
   });
-  p19.note(lines.join("\n"), "BetterStart plugins");
-  p19.outro(`${installedPlugins.size} installed, ${lines.length - installedPlugins.size} available`);
+  p20.note(lines.join("\n"), "BetterStart plugins");
+  p20.outro(`${installedPlugins.size} installed, ${lines.length - installedPlugins.size} available`);
 }
 
 // adapters/next/commands/remove.ts
 import path53 from "path";
-import * as p20 from "@clack/prompts";
+import * as p21 from "@clack/prompts";
 async function runRemoveCommand(items, options) {
   const removeIntegrationsMode = Boolean(options.integration);
   if (!removeIntegrationsMode && items.includes("core")) {
-    p20.log.error("The core Admin cannot be removed.");
+    p21.log.error("The core Admin cannot be removed.");
     process.exit(1);
   }
   const pluginIds = items.filter(isPluginId);
   const integrationIds = items.filter(isIntegrationId);
   if (!removeIntegrationsMode && integrationIds.length > 0) {
-    p20.log.error(
+    p21.log.error(
       `Integration IDs require --integration. Run \`betterstart remove --integration ${integrationIds.join(" ")}\`.`
     );
     process.exit(1);
   }
   if (removeIntegrationsMode && pluginIds.length > 0) {
-    p20.log.error(`Plugin IDs cannot be removed with --integration: ${pluginIds.join(", ")}`);
+    p21.log.error(`Plugin IDs cannot be removed with --integration: ${pluginIds.join(", ")}`);
     process.exit(1);
   }
   const invalidItems = removeIntegrationsMode ? items.filter((integrationId) => !isIntegrationId(integrationId)) : items.filter((pluginId) => !isPluginId(pluginId));
   if (invalidItems.length > 0) {
-    p20.log.error(
+    p21.log.error(
       removeIntegrationsMode ? formatUnknownIntegrationMessage(invalidItems) : formatUnknownPluginMessage(invalidItems)
     );
     process.exit(1);
@@ -26852,12 +26946,12 @@ async function runRemoveCommand(items, options) {
   const config = await resolveConfig(cwd);
   const pm = detectPackageManager(cwd);
   if (!options.force) {
-    const confirmed = await p20.confirm({
+    const confirmed = await p21.confirm({
       message: `Remove ${removeIntegrationsMode ? "integration" : "plugin"}${items.length === 1 ? "" : "s"} ${items.join(", ")}?`,
       initialValue: false
     });
-    if (p20.isCancel(confirmed) || !confirmed) {
-      p20.cancel(`${removeIntegrationsMode ? "Integration" : "Plugin"} removal cancelled.`);
+    if (p21.isCancel(confirmed) || !confirmed) {
+      p21.cancel(`${removeIntegrationsMode ? "Integration" : "Plugin"} removal cancelled.`);
       process.exit(0);
     }
   }
@@ -26870,13 +26964,13 @@ async function runRemoveCommand(items, options) {
     });
     writeConfigFile(cwd, result2.config);
     if (result2.removed.length === 0) {
-      p20.outro("No integrations were removed.");
+      p21.outro("No integrations were removed.");
       return;
     }
     if (result2.warnings.length > 0) {
-      p20.note(result2.warnings.join("\n"), "Warnings");
+      p21.note(result2.warnings.join("\n"), "Warnings");
     }
-    p20.outro(
+    p21.outro(
       `Removed integration${result2.removed.length === 1 ? "" : "s"}: ${result2.removed.join(", ")}`
     );
     return;
@@ -26889,13 +26983,13 @@ async function runRemoveCommand(items, options) {
   });
   writeConfigFile(cwd, result.config);
   if (result.removed.length === 0) {
-    p20.outro("No plugins were removed.");
+    p21.outro("No plugins were removed.");
     return;
   }
   if (result.warnings.length > 0) {
-    p20.note(result.warnings.join("\n"), "Warnings");
+    p21.note(result.warnings.join("\n"), "Warnings");
   }
-  p20.outro(`Removed plugin${result.removed.length === 1 ? "" : "s"}: ${result.removed.join(", ")}`);
+  p21.outro(`Removed plugin${result.removed.length === 1 ? "" : "s"}: ${result.removed.join(", ")}`);
 }
 
 // adapters/next/commands/remove-schema.ts
@@ -27045,7 +27139,7 @@ async function runRemoveSchemaCommand(schemaName, options) {
 // adapters/next/commands/uninstall.ts
 import fs42 from "fs";
 import path55 from "path";
-import * as p21 from "@clack/prompts";
+import * as p22 from "@clack/prompts";
 import pc8 from "picocolors";
 
 // adapters/next/commands/uninstall-cleaners.ts
@@ -27267,8 +27361,8 @@ function buildUninstallPlan(cwd, namespaceValue) {
       count: configFiles.length,
       unit: configFiles.length === 1 ? "file" : "files",
       execute() {
-        for (const p22 of configPaths) {
-          if (fs42.existsSync(p22)) fs42.unlinkSync(p22);
+        for (const p23 of configPaths) {
+          if (fs42.existsSync(p23)) fs42.unlinkSync(p23);
         }
       }
     });
@@ -27332,7 +27426,7 @@ function buildUninstallPlan(cwd, namespaceValue) {
 }
 async function runUninstallCommand(options) {
   const cwd = options.cwd ? path55.resolve(options.cwd) : process.cwd();
-  p21.intro(pc8.bgRed(pc8.white(" BetterStart Uninstall ")));
+  p22.intro(pc8.bgRed(pc8.white(" BetterStart Uninstall ")));
   let namespace = DEFAULT_ADMIN_NAMESPACE;
   try {
     const config = await resolveConfig(cwd);
@@ -27341,8 +27435,8 @@ async function runUninstallCommand(options) {
   }
   const steps = buildUninstallPlan(cwd, namespace);
   if (steps.length === 0) {
-    p21.log.success(`${pc8.green("\u2713")} Nothing to remove \u2014 project is already clean.`);
-    p21.outro("Done");
+    p22.log.success(`${pc8.green("\u2713")} Nothing to remove \u2014 project is already clean.`);
+    p22.outro("Done");
     return;
   }
   const planLines = steps.map((step) => {
@@ -27350,14 +27444,14 @@ async function runUninstallCommand(options) {
     const countLabel = pc8.dim(`${step.count} ${step.unit}`);
     return `${pc8.red("\xD7")} ${names}  ${countLabel}`;
   });
-  p21.note(planLines.join("\n"), "Uninstall plan");
+  p22.note(planLines.join("\n"), "Uninstall plan");
   if (!options.force) {
-    const confirmed = await p21.confirm({
+    const confirmed = await p22.confirm({
       message: "Proceed with uninstall?",
       initialValue: false
     });
-    if (p21.isCancel(confirmed) || !confirmed) {
-      p21.cancel("Uninstall cancelled.");
+    if (p22.isCancel(confirmed) || !confirmed) {
+      p22.cancel("Uninstall cancelled.");
       process.exit(0);
     }
   }
@@ -27369,8 +27463,8 @@ async function runUninstallCommand(options) {
   }
   const parts = steps.map((step) => `${step.count} ${step.unit}`);
   s.stop(`Removed ${parts.join(", ")}`);
-  p21.note(pc8.dim("Database tables were NOT dropped \u2014 drop them manually if needed."), "Next steps");
-  p21.outro("Uninstall complete");
+  p22.note(pc8.dim("Database tables were NOT dropped \u2014 drop them manually if needed."), "Next steps");
+  p22.outro("Uninstall complete");
 }
 
 // adapters/next/commands/update-component.ts