create-better-t-stack 3.41.4 → 3.42.1

package/dist/cli.mjs

@@ -1,5 +1,5 @@
 #!/usr/bin/env node
-import { D as setProcessMode, i as SchemaNameSchema, l as create, m as getSchemaResult, s as add, u as createBtsCli, v as types_exports, y as getLatestCLIVersion } from "./src-C8JXMrWB.mjs";
+import { D as setProcessMode, i as SchemaNameSchema, l as create, m as getSchemaResult, s as add, u as createBtsCli, v as types_exports, y as getLatestCLIVersion } from "./src-C0_lYEa0.mjs";
 import z from "zod";
 import { McpServer } from "@modelcontextprotocol/server";
 import { serveStdio } from "@modelcontextprotocol/server/stdio";

package/dist/index.d.mts

@@ -144,6 +144,7 @@ interface CreateProjectResult {
   projectDirectory: string;
   relativePath: string;
   error?: string;
+  warnings?: string[];
 }
 //#endregion
 //#region src/helpers/core/add-handler.d.ts
@@ -268,20 +269,20 @@ declare const router: import("@trpc/server").TRPCBuiltRouter<{
         mcp?: {
           scope?: "project" | "global" | undefined;
           servers?: ("nx" | "better-auth" | "clerk" | "polar" | "neon" | "planetscale" | "supabase" | "convex" | "better-t-stack" | "context7" | "cloudflare-docs" | "shadcn" | "next-devtools" | "nuxt-docs" | "nuxt-ui-docs" | "svelte-docs" | "astro-docs" | "expo")[] | undefined;
-          agents?: ("cursor" | "vscode" | "zed" | "windsurf" | "codex" | "claude-code" | "opencode" | "gemini-cli" | "goose" | "cline" | "antigravity" | "cline-cli" | "github-copilot-cli" | "grok-build" | "mcporter" | "claude-desktop")[] | undefined;
+          agents?: ("cursor" | "vscode" | "zed" | "windsurf" | "codex" | "claude-code" | "opencode" | "gemini-cli" | "kiro-cli" | "goose" | "cline" | "antigravity" | "cline-cli" | "github-copilot-cli" | "grok-build" | "mcporter" | "claude-desktop" | "fx" | "kilo-code" | "kimi-code")[] | undefined;
         } | undefined;
         skills?: {
           scope?: "project" | "global" | undefined;
-          agents?: ("cursor" | "zed" | "windsurf" | "codex" | "claude-code" | "opencode" | "pi" | "gemini-cli" | "github-copilot" | "kiro-cli" | "droid" | "goose" | "cline" | "continue" | "amp" | "qwen-code" | "crush" | "antigravity" | "universal" | "adal" | "aider-desk" | "antigravity-cli" | "astrbot" | "augment" | "autohand-code" | "bob" | "codearts-agent" | "codebuddy" | "codemaker" | "codestudio" | "command-code" | "cortex" | "deepagents" | "devin" | "dexto" | "eve" | "firebender" | "forgecode" | "grok" | "hermes-agent" | "iflow-cli" | "inference-sh" | "jazz" | "junie" | "kilo" | "kimchi" | "kimi-code-cli" | "kode" | "lingma" | "loaf" | "mcpjam" | "mistral-vibe" | "moxby" | "mux" | "neovate" | "ona" | "clawdbot" | "openclaw" | "openhands" | "pochi" | "promptscript" | "qoder" | "qoder-cn" | "reasonix" | "replit" | "roo" | "rovodev" | "tabnine-cli" | "terramind" | "tinycloud" | "trae" | "trae-cn" | "warp" | "zcode" | "zencoder" | "zenflow")[] | undefined;
+          agents?: ("cursor" | "zed" | "windsurf" | "codex" | "claude-code" | "opencode" | "pi" | "gemini-cli" | "github-copilot" | "kiro-cli" | "droid" | "goose" | "cline" | "continue" | "amp" | "qwen-code" | "crush" | "antigravity" | "universal" | "adal" | "aider-desk" | "antigravity-cli" | "astrbot" | "augment" | "autohand-code" | "bob" | "codearts-agent" | "codebuddy" | "codemaker" | "codestudio" | "command-code" | "cortex" | "deepagents" | "devin" | "dexto" | "eve" | "firebender" | "forgecode" | "grok" | "hermes-agent" | "iflow-cli" | "inference-sh" | "jazz" | "junie" | "kilo" | "kimchi" | "kimi-code-cli" | "kode" | "lingma" | "loaf" | "mcpjam" | "minimax-code" | "mistral-vibe" | "moxby" | "mux" | "neovate" | "ona" | "clawdbot" | "openclaw" | "openhands" | "pochi" | "posit-assistant" | "promptscript" | "qoder" | "qoder-cn" | "reasonix" | "replit" | "roo" | "rovodev" | "tabnine-cli" | "terramind" | "tinycloud" | "trae" | "trae-cn" | "warp" | "zcode" | "zencoder" | "zenflow")[] | undefined;
           selections?: {
-            source: "vercel-labs/agent-skills" | "vercel/ai" | "vercel/turborepo" | "yusukebe/hono-skill" | "vercel-labs/next-skills" | "nuxt/ui" | "heroui-inc/heroui" | "shadcn/ui" | "better-auth/skills" | "clerk/skills" | "neondatabase/agent-skills" | "supabase/agent-skills" | "planetscale/database-skills" | "expo/skills" | "prisma/skills" | "elysiajs/skills" | "waynesutton/convexskills" | "msmps/opentui-skill" | "haydenbleasel/ultracite" | "https://www.evlog.dev";
+            source: "vercel-labs/agent-skills" | "vercel/ai" | "vercel/turborepo" | "yusukebe/hono-skill" | "vercel/next.js" | "nuxt/ui" | "heroui-inc/heroui" | "shadcn/ui" | "better-auth/skills" | "clerk/skills" | "neondatabase/agent-skills" | "supabase/agent-skills" | "planetscale/database-skills" | "expo/skills" | "prisma/skills" | "elysiajs/skills" | "waynesutton/convexskills" | "msmps/opentui-skill" | "haydenbleasel/ultracite" | "https://www.evlog.dev";
             skills: string[];
           }[] | undefined;
         } | undefined;
         ultracite?: {
           linter?: "biome" | "oxlint" | undefined;
-          editors?: ("void" | "cursor" | "vscode" | "zed" | "windsurf" | "antigravity" | "bob" | "codebuddy" | "trae" | "kiro")[] | undefined;
-          agents?: ("codex" | "opencode" | "pi" | "droid" | "goose" | "cline" | "continue" | "amp" | "aider" | "crush" | "vercel" | "universal" | "adal" | "bob" | "deepagents" | "devin" | "firebender" | "junie" | "mcpjam" | "mistral-vibe" | "mux" | "ona" | "openclaw" | "qoder" | "replit" | "warp" | "zencoder" | "claude" | "jules" | "lovable" | "snowflake-cortex" | "kimi-cli" | "copilot" | "firebase-studio" | "open-hands" | "gemini" | "augmentcode" | "kilo-code" | "roo-code" | "qwen" | "amazon-q-cli" | "cursor-cli")[] | undefined;
+          editors?: ("void" | "cursor" | "vscode" | "zed" | "windsurf" | "antigravity" | "universal" | "bob" | "codebuddy" | "trae" | "kiro")[] | undefined;
+          agents?: ("codex" | "opencode" | "pi" | "droid" | "goose" | "cline" | "continue" | "amp" | "aider" | "crush" | "vercel" | "kilo-code" | "universal" | "adal" | "bob" | "deepagents" | "devin" | "firebender" | "junie" | "mcpjam" | "mistral-vibe" | "mux" | "ona" | "openclaw" | "qoder" | "replit" | "warp" | "zencoder" | "claude" | "jules" | "lovable" | "snowflake-cortex" | "kimi-cli" | "copilot" | "firebase-studio" | "open-hands" | "gemini" | "augmentcode" | "roo-code" | "qwen" | "amazon-q-cli" | "cursor-cli")[] | undefined;
           hooks?: ("cursor" | "windsurf" | "codebuddy" | "claude" | "copilot")[] | undefined;
         } | undefined;
       } | undefined;
@@ -382,20 +383,20 @@ declare const router: import("@trpc/server").TRPCBuiltRouter<{
         mcp?: {
           scope?: "project" | "global" | undefined;
           servers?: ("nx" | "better-auth" | "clerk" | "polar" | "neon" | "planetscale" | "supabase" | "convex" | "better-t-stack" | "context7" | "cloudflare-docs" | "shadcn" | "next-devtools" | "nuxt-docs" | "nuxt-ui-docs" | "svelte-docs" | "astro-docs" | "expo")[] | undefined;
-          agents?: ("cursor" | "vscode" | "zed" | "windsurf" | "codex" | "claude-code" | "opencode" | "gemini-cli" | "goose" | "cline" | "antigravity" | "cline-cli" | "github-copilot-cli" | "grok-build" | "mcporter" | "claude-desktop")[] | undefined;
+          agents?: ("cursor" | "vscode" | "zed" | "windsurf" | "codex" | "claude-code" | "opencode" | "gemini-cli" | "kiro-cli" | "goose" | "cline" | "antigravity" | "cline-cli" | "github-copilot-cli" | "grok-build" | "mcporter" | "claude-desktop" | "fx" | "kilo-code" | "kimi-code")[] | undefined;
         } | undefined;
         skills?: {
           scope?: "project" | "global" | undefined;
-          agents?: ("cursor" | "zed" | "windsurf" | "codex" | "claude-code" | "opencode" | "pi" | "gemini-cli" | "github-copilot" | "kiro-cli" | "droid" | "goose" | "cline" | "continue" | "amp" | "qwen-code" | "crush" | "antigravity" | "universal" | "adal" | "aider-desk" | "antigravity-cli" | "astrbot" | "augment" | "autohand-code" | "bob" | "codearts-agent" | "codebuddy" | "codemaker" | "codestudio" | "command-code" | "cortex" | "deepagents" | "devin" | "dexto" | "eve" | "firebender" | "forgecode" | "grok" | "hermes-agent" | "iflow-cli" | "inference-sh" | "jazz" | "junie" | "kilo" | "kimchi" | "kimi-code-cli" | "kode" | "lingma" | "loaf" | "mcpjam" | "mistral-vibe" | "moxby" | "mux" | "neovate" | "ona" | "clawdbot" | "openclaw" | "openhands" | "pochi" | "promptscript" | "qoder" | "qoder-cn" | "reasonix" | "replit" | "roo" | "rovodev" | "tabnine-cli" | "terramind" | "tinycloud" | "trae" | "trae-cn" | "warp" | "zcode" | "zencoder" | "zenflow")[] | undefined;
+          agents?: ("cursor" | "zed" | "windsurf" | "codex" | "claude-code" | "opencode" | "pi" | "gemini-cli" | "github-copilot" | "kiro-cli" | "droid" | "goose" | "cline" | "continue" | "amp" | "qwen-code" | "crush" | "antigravity" | "universal" | "adal" | "aider-desk" | "antigravity-cli" | "astrbot" | "augment" | "autohand-code" | "bob" | "codearts-agent" | "codebuddy" | "codemaker" | "codestudio" | "command-code" | "cortex" | "deepagents" | "devin" | "dexto" | "eve" | "firebender" | "forgecode" | "grok" | "hermes-agent" | "iflow-cli" | "inference-sh" | "jazz" | "junie" | "kilo" | "kimchi" | "kimi-code-cli" | "kode" | "lingma" | "loaf" | "mcpjam" | "minimax-code" | "mistral-vibe" | "moxby" | "mux" | "neovate" | "ona" | "clawdbot" | "openclaw" | "openhands" | "pochi" | "posit-assistant" | "promptscript" | "qoder" | "qoder-cn" | "reasonix" | "replit" | "roo" | "rovodev" | "tabnine-cli" | "terramind" | "tinycloud" | "trae" | "trae-cn" | "warp" | "zcode" | "zencoder" | "zenflow")[] | undefined;
           selections?: {
-            source: "vercel-labs/agent-skills" | "vercel/ai" | "vercel/turborepo" | "yusukebe/hono-skill" | "vercel-labs/next-skills" | "nuxt/ui" | "heroui-inc/heroui" | "shadcn/ui" | "better-auth/skills" | "clerk/skills" | "neondatabase/agent-skills" | "supabase/agent-skills" | "planetscale/database-skills" | "expo/skills" | "prisma/skills" | "elysiajs/skills" | "waynesutton/convexskills" | "msmps/opentui-skill" | "haydenbleasel/ultracite" | "https://www.evlog.dev";
+            source: "vercel-labs/agent-skills" | "vercel/ai" | "vercel/turborepo" | "yusukebe/hono-skill" | "vercel/next.js" | "nuxt/ui" | "heroui-inc/heroui" | "shadcn/ui" | "better-auth/skills" | "clerk/skills" | "neondatabase/agent-skills" | "supabase/agent-skills" | "planetscale/database-skills" | "expo/skills" | "prisma/skills" | "elysiajs/skills" | "waynesutton/convexskills" | "msmps/opentui-skill" | "haydenbleasel/ultracite" | "https://www.evlog.dev";
             skills: string[];
           }[] | undefined;
         } | undefined;
         ultracite?: {
           linter?: "biome" | "oxlint" | undefined;
-          editors?: ("void" | "cursor" | "vscode" | "zed" | "windsurf" | "antigravity" | "bob" | "codebuddy" | "trae" | "kiro")[] | undefined;
-          agents?: ("codex" | "opencode" | "pi" | "droid" | "goose" | "cline" | "continue" | "amp" | "aider" | "crush" | "vercel" | "universal" | "adal" | "bob" | "deepagents" | "devin" | "firebender" | "junie" | "mcpjam" | "mistral-vibe" | "mux" | "ona" | "openclaw" | "qoder" | "replit" | "warp" | "zencoder" | "claude" | "jules" | "lovable" | "snowflake-cortex" | "kimi-cli" | "copilot" | "firebase-studio" | "open-hands" | "gemini" | "augmentcode" | "kilo-code" | "roo-code" | "qwen" | "amazon-q-cli" | "cursor-cli")[] | undefined;
+          editors?: ("void" | "cursor" | "vscode" | "zed" | "windsurf" | "antigravity" | "universal" | "bob" | "codebuddy" | "trae" | "kiro")[] | undefined;
+          agents?: ("codex" | "opencode" | "pi" | "droid" | "goose" | "cline" | "continue" | "amp" | "aider" | "crush" | "vercel" | "kilo-code" | "universal" | "adal" | "bob" | "deepagents" | "devin" | "firebender" | "junie" | "mcpjam" | "mistral-vibe" | "mux" | "ona" | "openclaw" | "qoder" | "replit" | "warp" | "zencoder" | "claude" | "jules" | "lovable" | "snowflake-cortex" | "kimi-cli" | "copilot" | "firebase-studio" | "open-hands" | "gemini" | "augmentcode" | "roo-code" | "qwen" | "amazon-q-cli" | "cursor-cli")[] | undefined;
           hooks?: ("cursor" | "windsurf" | "codebuddy" | "claude" | "copilot")[] | undefined;
         } | undefined;
       } | undefined;

package/dist/index.mjs

@@ -1,3 +1,3 @@
 #!/usr/bin/env node
-import { C as DirectoryConflictError, E as ValidationError, S as DatabaseSetupError, T as UserCancelledError, _ as ProjectLauncherSchema, a as TEMPLATE_COUNT, b as CLIError, c as builder, d as createVirtual, f as docs, g as sponsors, h as router, i as SchemaNameSchema, l as create, m as getSchemaResult, n as GeneratorError, o as VirtualFileSystem, p as generate, r as Result, s as add, t as EMBEDDED_TEMPLATES, u as createBtsCli, w as ProjectCreationError, x as CompatibilityError } from "./src-C8JXMrWB.mjs";
+import { C as DirectoryConflictError, E as ValidationError, S as DatabaseSetupError, T as UserCancelledError, _ as ProjectLauncherSchema, a as TEMPLATE_COUNT, b as CLIError, c as builder, d as createVirtual, f as docs, g as sponsors, h as router, i as SchemaNameSchema, l as create, m as getSchemaResult, n as GeneratorError, o as VirtualFileSystem, p as generate, r as Result, s as add, t as EMBEDDED_TEMPLATES, u as createBtsCli, w as ProjectCreationError, x as CompatibilityError } from "./src-C0_lYEa0.mjs";
 export { CLIError, CompatibilityError, DatabaseSetupError, DirectoryConflictError, EMBEDDED_TEMPLATES, GeneratorError, ProjectCreationError, ProjectLauncherSchema, Result, SchemaNameSchema, TEMPLATE_COUNT, UserCancelledError, ValidationError, VirtualFileSystem, add, builder, create, createBtsCli, createVirtual, docs, generate, getSchemaResult, router, sponsors };

package/dist/{src-C8JXMrWB.mjs → src-C0_lYEa0.mjs}

@@ -320,14 +320,153 @@ async function runWithContextAsync(options, fn) {
 	return cliStorage.run(createContext(options), fn);
 }
 //#endregion
+//#region src/utils/glyphs.ts
+const unicode = process.platform !== "win32";
+const S_STEP_ACTIVE = unicode ? "◆" : "*";
+const S_STEP_CANCEL = unicode ? "■" : "x";
+const S_STEP_ERROR = unicode ? "▲" : "x";
+const S_STEP_SUBMIT = unicode ? "◇" : "o";
+const S_STEP_BACK = unicode ? "↶" : "<";
+const S_BAR = unicode ? "│" : "|";
+const S_BAR_END = unicode ? "└" : "—";
+const S_RADIO_ACTIVE = unicode ? "●" : ">";
+const S_RADIO_INACTIVE = unicode ? "○" : " ";
+const S_CHECKBOX_ACTIVE = unicode ? "◻" : "[•]";
+const S_CHECKBOX_SELECTED = unicode ? "◼" : "[+]";
+const S_CHECKBOX_INACTIVE = unicode ? "◻" : "[ ]";
+const SPINNER_FRAMES = unicode ? [
+	"◒",
+	"◐",
+	"◓",
+	"◑"
+] : [
+	"•",
+	"o",
+	"O",
+	"0"
+];
+//#endregion
+//#region src/utils/interrupt.ts
+let stepInterrupted = false;
+let anyStepInterrupted = false;
+let controller = null;
+let listener = null;
+/**
+* Once files are on disk, Ctrl-C should only stop the step that is running. Holding a SIGINT
+* listener keeps the CLI alive; the terminal's signal already ends the subprocess. Each
+* optional step starts with startInterruptibleStep() so a cancel applies to that step only.
+*/
+function beginInterruptibleScope() {
+	endInterruptibleScope();
+	stepInterrupted = false;
+	anyStepInterrupted = false;
+	listener = () => {
+		stepInterrupted = true;
+		anyStepInterrupted = true;
+		controller?.abort();
+	};
+	process.on("SIGINT", listener);
+}
+function endInterruptibleScope() {
+	if (listener) process.off("SIGINT", listener);
+	listener = null;
+	controller = null;
+}
+function startInterruptibleStep() {
+	stepInterrupted = false;
+	controller = listener ? new AbortController() : null;
+}
+/** True if the user pressed Ctrl-C during the current step. */
+function wasInterrupted() {
+	return stepInterrupted;
+}
+function wasAnyStepInterrupted() {
+	return anyStepInterrupted;
+}
+function getInterruptSignal() {
+	return controller?.signal;
+}
+//#endregion
 //#region src/utils/terminal-output.ts
 const noopSpinner = {
 	start() {},
 	stop() {},
 	message() {}
 };
+const FRAME_MS = 80;
+const HIDE_CURSOR = "\x1B[?25l";
+const SHOW_CURSOR = "\x1B[?25h";
+const CLEAR_LINE = "\r\x1B[2K";
+let cursorHidden = false;
+let restoreCursorOnExit = false;
+function hideCursor() {
+	if (cursorHidden) return;
+	cursorHidden = true;
+	process.stdout.write(HIDE_CURSOR);
+	if (!restoreCursorOnExit) {
+		restoreCursorOnExit = true;
+		process.once("exit", () => {
+			if (cursorHidden) process.stdout.write(SHOW_CURSOR);
+		});
+	}
+}
+function showCursor() {
+	if (!cursorHidden) return;
+	cursorHidden = false;
+	process.stdout.write(SHOW_CURSOR);
+}
+/**
+* The clack spinner puts stdin in raw mode and exits the process on Ctrl-C from its own
+* keypress handler. This one never touches stdin, so Ctrl-C stays a SIGINT and the
+* interrupt scope decides what happens.
+*/
+function createTerminalSpinner() {
+	const out = process.stdout;
+	const animate = out.isTTY && !process.env.CI;
+	let text = "";
+	let active = false;
+	let interruptedBefore = false;
+	let frame = 0;
+	let dots = 0;
+	let timer;
+	const render = () => {
+		const suffix = ".".repeat(Math.floor(dots)).slice(0, 3);
+		out.write(`${CLEAR_LINE}${pc.magenta(SPINNER_FRAMES[frame])}  ${text}${suffix}`);
+		frame = (frame + 1) % SPINNER_FRAMES.length;
+		dots = dots < 4 ? dots + .125 : 0;
+	};
+	const setText = (message) => {
+		text = message.replace(/\.+$/, "");
+	};
+	return {
+		start(message) {
+			if (active) return;
+			active = true;
+			interruptedBefore = wasInterrupted();
+			setText(message);
+			out.write(`${pc.gray(S_BAR)}\n`);
+			if (animate) {
+				hideCursor();
+				render();
+				timer = setInterval(render, FRAME_MS);
+			} else out.write(`${pc.magenta(SPINNER_FRAMES[0])}  ${text}\n`);
+		},
+		message: setText,
+		stop(message) {
+			if (!active) return;
+			active = false;
+			if (timer) clearInterval(timer);
+			if (animate) {
+				out.write(CLEAR_LINE);
+				showCursor();
+			}
+			const cancelled = wasInterrupted() && !interruptedBefore;
+			out.write(cancelled ? `${pc.yellow(S_STEP_CANCEL)}  ${text} (cancelled)\n` : `${pc.green(S_STEP_SUBMIT)}  ${message || text}\n`);
+		}
+	};
+}
 function createSpinner() {
-	return isSilent() ? noopSpinner : spinner();
+	return isSilent() ? noopSpinner : createTerminalSpinner();
 }
 const baseConsola = createConsola({
 	...consola.options,
@@ -346,8 +485,9 @@ const cliLog = {
 	success(message) {
 		if (!isSilent()) log.success(message);
 	},
+	/** Silent after a Ctrl-C in the current step: the cancelled line already said it. */
 	error(message) {
-		if (!isSilent()) log.error(message);
+		if (!isSilent() && !wasInterrupted()) log.error(message);
 	},
 	message(message) {
 		if (!isSilent()) log.message(message);
@@ -355,7 +495,7 @@ const cliLog = {
 };
 const cliConsola = {
 	error(message) {
-		if (!isSilent()) baseConsola.error(message);
+		if (!isSilent() && !wasInterrupted()) baseConsola.error(message);
 	},
 	warn(message) {
 		if (!isSilent()) baseConsola.warn(message);
@@ -931,7 +1071,7 @@ const WEB_FRAMEWORKS = [
 ];
 //#endregion
 //#region src/utils/compatibility-rules.ts
-const TASK_RUNNER_ADDONS$1 = [
+const TASK_RUNNER_ADDONS = [
 	"turborepo",
 	"nx",
 	"vite-plus"
@@ -1178,13 +1318,13 @@ function getCompatibleAddons(allAddons, frontend, existingAddons = [], auth, bac
 	return allAddons.filter((addon) => {
 		if (existingAddons.includes(addon)) return false;
 		if (addon === "none") return false;
-		if (TASK_RUNNER_ADDONS$1.includes(addon) && existingAddons.some((existingAddon) => TASK_RUNNER_ADDONS$1.includes(existingAddon))) return false;
+		if (TASK_RUNNER_ADDONS.includes(addon) && existingAddons.some((existingAddon) => TASK_RUNNER_ADDONS.includes(existingAddon))) return false;
 		const { isCompatible } = validateAddonCompatibility(addon, frontend, auth, backend, runtime);
 		return isCompatible;
 	});
 }
 function validateAddonsAgainstFrontends(addons = [], frontends = [], auth, backend, runtime) {
-	if (addons.filter((addon) => TASK_RUNNER_ADDONS$1.includes(addon)).length > 1) return validationErr$1("Cannot combine 'turborepo', 'nx', and 'vite-plus' addons. Choose one task runner.");
+	if (addons.filter((addon) => TASK_RUNNER_ADDONS.includes(addon)).length > 1) return validationErr$1("Cannot combine 'turborepo', 'nx', and 'vite-plus' addons. Choose one task runner.");
 	for (const addon of addons) {
 		if (addon === "none") continue;
 		const { isCompatible, reason } = validateAddonCompatibility(addon, frontends, auth, backend, runtime);
@@ -1234,19 +1374,6 @@ function isGoBack(value) {
 }
 //#endregion
 //#region src/prompts/navigable.ts
-const unicode = process.platform !== "win32";
-const S_STEP_ACTIVE = unicode ? "◆" : "*";
-const S_STEP_CANCEL = unicode ? "■" : "x";
-const S_STEP_ERROR = unicode ? "▲" : "x";
-const S_STEP_SUBMIT = unicode ? "◇" : "o";
-const S_STEP_BACK = unicode ? "↶" : "<";
-const S_BAR = unicode ? "│" : "|";
-const S_BAR_END = unicode ? "└" : "—";
-const S_RADIO_ACTIVE = unicode ? "●" : ">";
-const S_RADIO_INACTIVE = unicode ? "○" : " ";
-const S_CHECKBOX_ACTIVE = unicode ? "◻" : "[•]";
-const S_CHECKBOX_SELECTED = unicode ? "◼" : "[+]";
-const S_CHECKBOX_INACTIVE = unicode ? "◻" : "[ ]";
 const promptsNavigatingBack = /* @__PURE__ */ new WeakSet();
 function keycap(label) {
 	return pc.inverse(` ${label} `);
@@ -1438,28 +1565,46 @@ async function navigableConfirm(opts) {
 		}
 	}));
 }
+/** Keeps at most one value per exclusive set, preferring what was just selected. */
+function resolveExclusiveSelection(previous, next, exclusive) {
+	let resolved = [...next];
+	for (const set of exclusive) {
+		const added = resolved.find((value) => set.includes(value) && !previous.includes(value));
+		if (added === void 0) continue;
+		resolved = resolved.filter((value) => !set.includes(value) || value === added);
+	}
+	return resolved;
+}
 async function navigableGroupMultiselect(opts) {
 	const required = opts.required ?? true;
+	const exclusive = opts.exclusive ?? [];
+	const exclusiveValues = new Set(exclusive.flat());
+	const exclusiveGroups = new Set(Object.entries(opts.options).filter(([, items]) => exclusive.some((set) => items.length > 1 && items.every((item) => set.includes(item.value)))).map(([group]) => group));
 	const opt = (option, state, options = []) => {
-		const label = option.label ?? String(option.value);
 		const isItem = option.group !== true && option.group !== false;
+		const chooseOne = option.group === true && exclusiveGroups.has(String(option.value));
+		const label = `${option.label ?? String(option.value)}${chooseOne ? pc.dim(" (choose one)") : ""}`;
 		const next = isItem && (options[options.indexOf(option) + 1] ?? { group: true });
 		const isLast = isItem && next && next.group === true;
 		const prefix = isItem ? `${isLast ? S_BAR_END : S_BAR} ` : "";
-		if (state === "active") return `${pc.dim(prefix)}${pc.cyan(S_CHECKBOX_ACTIVE)} ${label}${option.hint ? ` ${pc.dim(`(${option.hint})`)}` : ""}`;
+		const radio = isItem && exclusiveValues.has(option.value);
+		const activeBox = radio ? S_RADIO_INACTIVE : S_CHECKBOX_ACTIVE;
+		const selectedBox = radio ? S_RADIO_ACTIVE : S_CHECKBOX_SELECTED;
+		const inactiveBox = radio ? S_RADIO_INACTIVE : S_CHECKBOX_INACTIVE;
+		if (state === "active") return `${pc.dim(prefix)}${pc.cyan(activeBox)} ${label}${option.hint ? ` ${pc.dim(`(${option.hint})`)}` : ""}`;
 		if (state === "group-active") return `${prefix}${pc.cyan(S_CHECKBOX_ACTIVE)} ${pc.dim(label)}`;
 		if (state === "group-active-selected") return `${prefix}${pc.green(S_CHECKBOX_SELECTED)} ${pc.dim(label)}`;
 		if (state === "selected") {
-			const selectedCheckbox = isItem ? pc.green(S_CHECKBOX_SELECTED) : "";
+			const selectedCheckbox = isItem ? pc.green(selectedBox) : "";
 			return `${pc.dim(prefix)}${selectedCheckbox} ${pc.dim(label)}${option.hint ? ` ${pc.dim(`(${option.hint})`)}` : ""}`;
 		}
 		if (state === "cancelled") return `${pc.strikethrough(pc.dim(label))}`;
-		if (state === "active-selected") return `${pc.dim(prefix)}${pc.green(S_CHECKBOX_SELECTED)} ${label}${option.hint ? ` ${pc.dim(`(${option.hint})`)}` : ""}`;
+		if (state === "active-selected") return `${pc.dim(prefix)}${pc.green(selectedBox)} ${label}${option.hint ? ` ${pc.dim(`(${option.hint})`)}` : ""}`;
 		if (state === "submitted") return `${pc.dim(label)}`;
-		const unselectedCheckbox = isItem ? pc.dim(S_CHECKBOX_INACTIVE) : "";
+		const unselectedCheckbox = isItem ? pc.dim(inactiveBox) : "";
 		return `${pc.dim(prefix)}${unselectedCheckbox} ${pc.dim(label)}`;
 	};
-	return runWithNavigation(new GroupMultiSelectPrompt({
+	const prompt = new GroupMultiSelectPrompt({
 		options: opts.options,
 		initialValues: opts.initialValues,
 		cursorAt: opts.cursorAt,
@@ -1518,7 +1663,15 @@ async function navigableGroupMultiselect(opts) {
 				}
 			}
 		}
-	}));
+	});
+	if (exclusive.length > 0) {
+		let previous = [...opts.initialValues ?? []];
+		prompt.on("cursor", (key) => {
+			if (key === "space") prompt.value = resolveExclusiveSelection(previous, prompt.value ?? [], exclusive);
+			previous = [...prompt.value ?? []];
+		});
+	}
+	return runWithNavigation(prompt);
 }
 /** Use the remembered answer as the initial value only while it is still selectable. */
 function preferValidInitial(options, previous, fallback) {
@@ -1657,11 +1810,7 @@ function sortAndPruneGroupedOptions(groupedOptions) {
 	});
 }
 function validateAddonSelection(selected) {
-	if ((selected?.filter((addon) => [
-		"turborepo",
-		"nx",
-		"vite-plus"
-	].includes(addon)) ?? []).length > 1) return "Choose Turborepo, Nx, or Vite+ as your task runner, not more than one.";
+	if ((selected?.filter((addon) => TASK_RUNNER_ADDONS.includes(addon)) ?? []).length > 1) return "Choose Turborepo, Nx, or Vite+ as your task runner, not more than one.";
 }
 async function getAddonsChoice(addons, frontends, auth, backend, runtime, previousValue) {
 	if (addons !== void 0) return addons;
@@ -1684,6 +1833,7 @@ async function getAddonsChoice(addons, frontends, auth, backend, runtime, previo
 		options: groupedOptions,
 		initialValues: (previousValue ?? DEFAULT_CONFIG.addons).filter((addonValue) => Object.values(groupedOptions).some((options) => options.some((opt) => opt.value === addonValue))),
 		required: false,
+		exclusive: [TASK_RUNNER_ADDONS],
 		validate: validateAddonSelection
 	});
 	if (isCancel$1(response)) throw new UserCancelledError({ message: "Operation cancelled" });
@@ -1707,6 +1857,7 @@ async function getAddonsToAdd(config) {
 		message: "Select addons to add",
 		options: groupedOptions,
 		required: false,
+		exclusive: [TASK_RUNNER_ADDONS],
 		validate: validateAddonSelection
 	});
 	if (isCancel$1(response)) throw new UserCancelledError({ message: "Operation cancelled" });
@@ -1939,13 +2090,22 @@ function getNodeToolingRequirements(config) {
 	if (config.webDeploy === "cloudflare" || config.serverDeploy === "cloudflare") addNodeRequirement(requirements, ">=22.0.0", "Wrangler 4");
 	return requirements;
 }
-function getLocalVersionRequirements(config, hostRuntime) {
-	const requirements = [{
-		tool: config.packageManager,
-		range: PACKAGE_MANAGER_VERSION_RANGES[config.packageManager],
-		reason: PACKAGE_MANAGER_REASONS[config.packageManager]
-	}];
+function getHostRuntime() {
+	return process.versions.bun ? "bun" : "node";
+}
+/** Requirements that do not depend on the chosen stack, so they can run before any prompt. */
+function getBaselineRequirements(packageManager, hostRuntime) {
+	const requirements = [];
+	if (packageManager) requirements.push({
+		tool: packageManager,
+		range: PACKAGE_MANAGER_VERSION_RANGES[packageManager],
+		reason: PACKAGE_MANAGER_REASONS[packageManager]
+	});
 	if (hostRuntime === "node") addNodeRequirement(requirements, ">=22.0.0", "create-better-t-stack");
+	return requirements;
+}
+function getLocalVersionRequirements(config, hostRuntime) {
+	const requirements = getBaselineRequirements(config.packageManager, hostRuntime);
 	if (config.packageManager !== "bun") requirements.push(...getNodeToolingRequirements(config));
 	else if (config.runtime === "node") addNodeRequirement(requirements, ">=22.0.0", "the selected Node.js server runtime");
 	return requirements;
@@ -1959,7 +2119,11 @@ function formatRequirementError(requirement, rawVersion) {
 	return null;
 }
 function validateLocalToolVersions(config, versions, hostRuntime) {
-	const requirements = getLocalVersionRequirements(config, hostRuntime);
+	return validateRequirements(getLocalVersionRequirements(config, hostRuntime), versions);
+}
+const STACK_REQUIREMENTS_HEADLINE = "Your local toolchain does not meet this stack's requirements:";
+const BASELINE_REQUIREMENTS_HEADLINE = "Your local toolchain does not meet create-better-t-stack's requirements:";
+function validateRequirements(requirements, versions, headline = STACK_REQUIREMENTS_HEADLINE) {
 	const failures = requirements.map((requirement) => formatRequirementError(requirement, versions[requirement.tool])).filter((failure) => failure !== null);
 	if (failures.length === 0) return Result.ok(void 0);
 	const upgradeInstructions = /* @__PURE__ */ new Set();
@@ -1969,7 +2133,7 @@ function validateLocalToolVersions(config, versions, hostRuntime) {
 		else upgradeInstructions.add(PACKAGE_MANAGER_UPGRADE_INSTRUCTIONS[requirement.tool]);
 	}
 	return Result.err(new CLIError({ message: [
-		"Your local toolchain does not meet this stack's requirements:",
+		headline,
 		...failures.map((failure) => `- ${failure}`),
 		"",
 		...upgradeInstructions
@@ -1996,12 +2160,35 @@ async function readToolVersion(tool) {
 	});
 	return result.isOk() ? result.value : null;
 }
-async function checkLocalRequirements(config) {
-	const hostRuntime = process.versions.bun ? "bun" : "node";
+async function readLocalToolVersions(packageManager, hostRuntime, needsNode) {
 	const versions = {};
-	const packageManagerVersion = await readToolVersion(config.packageManager);
-	if (packageManagerVersion) versions[config.packageManager] = packageManagerVersion;
-	if (getLocalVersionRequirements(config, hostRuntime).some((requirement) => requirement.tool === "node")) versions.node = hostRuntime === "node" ? process.versions.node : await readToolVersion("node") ?? void 0;
+	if (packageManager) {
+		const packageManagerVersion = await readToolVersion(packageManager);
+		if (packageManagerVersion) versions[packageManager] = packageManagerVersion;
+	}
+	if (needsNode) versions.node = hostRuntime === "node" ? process.versions.node : await readToolVersion("node") ?? void 0;
+	return versions;
+}
+/**
+* Pre-prompt check. An inferred package manager can still be changed at its prompt, so it only
+* warns; an explicit one and the host Node.js version are fatal.
+*/
+async function checkBaselineRequirements(packageManager, packageManagerIsExplicit) {
+	if (shouldSkipExternalCommands()) return Result.ok({ warnings: [] });
+	const hostRuntime = getHostRuntime();
+	const requirements = getBaselineRequirements(packageManager, hostRuntime);
+	const versions = await readLocalToolVersions(packageManager, hostRuntime, requirements.some((requirement) => requirement.tool === "node"));
+	const fatal = requirements.filter((requirement) => requirement.tool === "node" || packageManagerIsExplicit);
+	const fatalResult = validateRequirements(fatal, versions, BASELINE_REQUIREMENTS_HEADLINE);
+	if (fatalResult.isErr()) return Result.err(fatalResult.error);
+	const advisoryResult = validateRequirements(requirements.filter((requirement) => !fatal.includes(requirement)), versions, BASELINE_REQUIREMENTS_HEADLINE);
+	if (advisoryResult.isErr()) return Result.ok({ warnings: [`${advisoryResult.error.message}\nYou can also choose a different package manager at the package manager step.`] });
+	return Result.ok({ warnings: [] });
+}
+async function checkLocalRequirements(config) {
+	const hostRuntime = getHostRuntime();
+	const versions = await readLocalToolVersions(config.packageManager, hostRuntime, !shouldSkipExternalCommands() && getLocalVersionRequirements(config, hostRuntime).some((requirement) => requirement.tool === "node"));
+	const packageManagerVersion = versions[config.packageManager];
 	if (!shouldSkipExternalCommands()) {
 		const validationResult = validateLocalToolVersions(config, versions, hostRuntime);
 		if (validationResult.isErr()) return Result.err(validationResult.error);
@@ -2034,6 +2221,22 @@ const addPackageDependency = async (opts) => {
 	await fs.writeJson(pkgJsonPath, pkgJson, { spaces: 2 });
 };
 //#endregion
+//#region src/utils/optional-step.ts
+/**
+* Runs a setup step after the files are on disk. A failure is reported and the run continues;
+* a cancellation (prompt or Ctrl-C) is only a warning.
+*/
+async function runOptionalStep(step, cancelledMessage) {
+	startInterruptibleStep();
+	const result = await step();
+	if (result.isOk()) return;
+	if (UserCancelledError.is(result.error) || wasInterrupted()) {
+		cliLog.warn(pc.yellow(cancelledMessage));
+		return;
+	}
+	cliConsola.error(pc.red(result.error.message));
+}
+//#endregion
 //#region src/helpers/addons/evlog-setup.ts
 const evlogBackends = [
 	"hono",
@@ -2871,7 +3074,7 @@ const TEMPLATES$2 = {
 const DEFAULT_TEMPLATE$2 = "next-mdx";
 const DEFAULT_DEV_PORT$1 = 4e3;
 function aiChatDisabledForTemplate(template) {
-	return template === "next-mdx-static" || template.endsWith("-spa");
+	return template === "next-mdx-static" || template === "astro" || template.endsWith("-spa");
 }
 function getFumadocsLinter(addons) {
 	if (addons.includes("oxlint")) return "oxlint";
@@ -3115,6 +3318,26 @@ const MCP_AGENTS = [
 		value: "goose",
 		label: "Goose",
 		scope: "global"
+	},
+	{
+		value: "fx",
+		label: "fx",
+		scope: "global"
+	},
+	{
+		value: "kilo-code",
+		label: "Kilo Code",
+		scope: "both"
+	},
+	{
+		value: "kimi-code",
+		label: "Kimi Code",
+		scope: "both"
+	},
+	{
+		value: "kiro-cli",
+		label: "Kiro CLI",
+		scope: "both"
 	}
 ];
 const DEFAULT_SCOPE$1 = "project";
@@ -3156,8 +3379,7 @@ function getAllMcpServers(config) {
 			key: "cloudflare-docs",
 			label: "Cloudflare Docs",
 			name: "cloudflare-docs",
-			target: "https://docs.mcp.cloudflare.com/sse",
-			transport: "sse"
+			target: "https://docs.mcp.cloudflare.com/mcp"
 		},
 		{
 			key: "convex",
@@ -3223,7 +3445,7 @@ function getAllMcpServers(config) {
 			key: "better-auth",
 			label: "Better Auth",
 			name: "better-auth",
-			target: "https://mcp.inkeep.com/better-auth/mcp"
+			target: "https://mcp.better-auth.com/mcp"
 		},
 		{
 			key: "clerk",
@@ -3457,7 +3679,7 @@ const SKILL_SOURCES = {
 	"vercel/ai": { label: "Vercel AI SDK" },
 	"vercel/turborepo": { label: "Turborepo" },
 	"yusukebe/hono-skill": { label: "Hono Backend" },
-	"vercel-labs/next-skills": { label: "Next.js Best Practices" },
+	"vercel/next.js": { label: "Next.js" },
 	"nuxt/ui": { label: "Nuxt UI" },
 	"heroui-inc/heroui": { label: "HeroUI Native" },
 	"shadcn/ui": { label: "shadcn/ui" },
@@ -3655,6 +3877,10 @@ const SKILLS_CLI_AGENT_OPTIONS = [
 		value: "mcpjam",
 		label: "MCPJam"
 	},
+	{
+		value: "minimax-code",
+		label: "MiniMax Code"
+	},
 	{
 		value: "mistral-vibe",
 		label: "Mistral Vibe"
@@ -3695,6 +3921,10 @@ const SKILLS_CLI_AGENT_OPTIONS = [
 		value: "pochi",
 		label: "Pochi"
 	},
+	{
+		value: "posit-assistant",
+		label: "Posit Assistant"
+	},
 	{
 		value: "promptscript",
 		label: "PromptScript"
@@ -3834,7 +4064,7 @@ function getRecommendedSourceKeys(config) {
 		sources.push("shadcn/ui");
 	}
 	if ((webDeploy === "vercel" || serverDeploy === "vercel") && !sources.includes("vercel-labs/agent-skills")) sources.push("vercel-labs/agent-skills");
-	if (frontend.includes("next")) sources.push("vercel-labs/next-skills");
+	if (frontend.includes("next")) sources.push("vercel/next.js");
 	if (frontend.includes("nuxt")) sources.push("nuxt/ui");
 	if (frontend.includes("native-uniwind")) sources.push("heroui-inc/heroui");
 	if (hasNativeFrontend(frontend)) sources.push("expo/skills");
@@ -3865,11 +4095,20 @@ const CURATED_SKILLS_BY_SOURCE = {
 	"vercel/ai": () => ["ai-sdk"],
 	"vercel/turborepo": () => ["turborepo"],
 	"yusukebe/hono-skill": () => ["hono"],
-	"vercel-labs/next-skills": () => ["next-best-practices", "next-cache-components"],
+	"vercel/next.js": () => [
+		"next-dev-loop",
+		"next-cache-components-adoption",
+		"next-cache-components-optimizer",
+		"next-partial-prefetching-adoption"
+	],
 	"nuxt/ui": () => ["nuxt-ui"],
 	"heroui-inc/heroui": () => ["heroui-native"],
 	"shadcn/ui": () => ["shadcn"],
-	"better-auth/skills": () => ["better-auth-best-practices"],
+	"better-auth/skills": () => [
+		"better-auth-best-practices",
+		"better-auth-security-best-practices",
+		"email-and-password-best-practices"
+	],
 	"clerk/skills": (config) => {
 		const skills = [
 			"clerk",
@@ -3880,6 +4119,12 @@ const CURATED_SKILLS_BY_SOURCE = {
 			"clerk-orgs"
 		];
 		if (config.frontend.includes("next")) skills.push("clerk-nextjs-patterns");
+		if (config.frontend.includes("react-router")) skills.push("clerk-react-router-patterns");
+		if (config.frontend.includes("tanstack-start")) skills.push("clerk-tanstack-patterns");
+		if (config.frontend.includes("tanstack-router")) skills.push("clerk-react-patterns");
+		if (config.frontend.includes("nuxt")) skills.push("clerk-nuxt-patterns");
+		if (config.frontend.includes("astro")) skills.push("clerk-astro-patterns");
+		if (hasNativeFrontend(config.frontend)) skills.push("clerk-expo");
 		return skills;
 	},
 	"neondatabase/agent-skills": () => ["neon-postgres"],
@@ -3892,11 +4137,13 @@ const CURATED_SKILLS_BY_SOURCE = {
 	},
 	"expo/skills": (config) => {
 		const skills = [
+			"expo-overview",
+			"expo-router",
 			"expo-dev-client",
-			"building-native-ui",
-			"native-data-fetching",
-			"expo-deployment",
-			"expo-cicd-workflows"
+			"expo-native-ui",
+			"expo-data-fetching",
+			"eas-app-stores",
+			"eas-workflows"
 		];
 		if (config.frontend.includes("native-uniwind")) skills.push("expo-tailwind-setup");
 		return skills;
@@ -4068,7 +4315,8 @@ async function setupStarlight(config) {
 		"--yes",
 		"--no-install",
 		"--no-git",
-		"--skip-houston"
+		"--skip-houston",
+		"--no-ai"
 	].join(" ")}`);
 	const appsDir = path.join(projectDir, "apps");
 	await fs.ensureDir(appsDir);
@@ -4349,7 +4597,7 @@ const HOOKS = {
 	claude: { label: "Claude Code" },
 	copilot: { label: "GitHub Copilot" }
 };
-const ULTRACITE_VERSION = "7.9.4";
+const ULTRACITE_VERSION = "7.10.7";
 const DEFAULT_LINTER = "biome";
 const DEFAULT_EDITORS = ["vscode"];
 const DEFAULT_AGENTS = ["universal"];
@@ -4432,13 +4680,20 @@ async function setupUltracite(config, gitHooks) {
 				return navigableMultiselect({
 					message: "Which editors do you want to configure (recommended)?",
 					required: false,
-					options: [{
-						value: "vscode",
-						label: "VSCode / Cursor / Windsurf"
-					}, {
-						value: "zed",
-						label: "Zed"
-					}]
+					options: [
+						{
+							value: "vscode",
+							label: "VSCode / Cursor / Windsurf"
+						},
+						{
+							value: "zed",
+							label: "Zed"
+						},
+						{
+							value: "universal",
+							label: "Universal (.vscode/settings.json)"
+						}
+					]
 				});
 			},
 			agents: async () => {
@@ -4612,24 +4867,15 @@ async function setupWxt(config) {
 }
 //#endregion
 //#region src/helpers/addons/addons-setup.ts
-async function runSetup(setupFn) {
-	const result = await setupFn();
-	if (result.isErr()) {
-		if (UserCancelledError.is(result.error)) throw result.error;
-		cliConsola.error(pc.red(result.error.message));
-	}
-}
-async function runAddonStep(addon, step) {
-	const result = await Result.tryPromise({
-		try: async () => step(),
-		catch: (e) => new AddonSetupError({
-			addon,
-			message: `Failed to set up ${addon}: ${e instanceof Error ? e.message : String(e)}`,
-			cause: e
-		})
-	});
-	if (result.isErr()) cliConsola.error(pc.red(result.error.message));
-}
+const runSetup = (setupFn) => runOptionalStep(setupFn, "Addon setup cancelled.");
+const runAddonStep = (addon, step) => runOptionalStep(() => Result.tryPromise({
+	try: async () => step(),
+	catch: (e) => new AddonSetupError({
+		addon,
+		message: `Failed to set up ${addon}: ${e instanceof Error ? e.message : String(e)}`,
+		cause: e
+	})
+}), `${addon} setup cancelled.`);
 async function setupAddons(config) {
 	const { addons, frontend, projectDir } = config;
 	const hasWebFrontend = frontend.some((value) => types_exports.desktopWebFrontends.includes(value));
@@ -4739,15 +4985,19 @@ async function detectProjectConfig(projectDir) {
 }
 //#endregion
 //#region src/helpers/core/install-dependencies.ts
+const FORCE_KILL_AFTER_MS = 2e3;
 async function installDependencies({ projectDir, packageManager }) {
-	if (shouldSkipExternalCommands()) return Result.ok(void 0);
+	if (shouldSkipExternalCommands()) return Result.ok("installed");
+	startInterruptibleStep();
 	const s = createSpinner();
 	s.start(`Running ${packageManager} install...`);
 	const result = await Result.tryPromise({
 		try: async () => {
 			await $({
 				cwd: projectDir,
-				stderr: "inherit"
+				stderr: "inherit",
+				cancelSignal: getInterruptSignal(),
+				forceKillAfterDelay: FORCE_KILL_AFTER_MS
 			})`${packageManager} install`;
 		},
 		catch: (e) => new ProjectCreationError({
@@ -4756,9 +5006,16 @@ async function installDependencies({ projectDir, packageManager }) {
 			cause: e
 		})
 	});
-	if (result.isOk()) s.stop("Dependencies installed");
-	else s.stop(pc.red("Failed to install dependencies"));
-	return result;
+	if (wasInterrupted()) {
+		s.stop();
+		return Result.ok("cancelled");
+	}
+	if (result.isOk()) {
+		s.stop("Dependencies installed");
+		return Result.ok("installed");
+	}
+	s.stop(pc.red("Failed to install dependencies"));
+	return Result.err(result.error);
 }
 //#endregion
 //#region src/helpers/core/add-handler.ts
@@ -4786,11 +5043,6 @@ const HOOK_LINTER_ADDONS = [
 	"oxlint",
 	"vite-plus"
 ];
-const TASK_RUNNER_ADDONS = [
-	"turborepo",
-	"nx",
-	"vite-plus"
-];
 const fileExistsErrorSchema = z.object({ code: z.literal("EEXIST") });
 const configPackageScopeSchema = z.object({ name: z.string().regex(/^@[a-z0-9](?:[a-z0-9._-]*[a-z0-9])?\/config$/) }).transform(({ name }) => name.slice(0, -7));
 const rootTypescriptVersionSchema = z.object({ devDependencies: z.object({ typescript: z.string().min(1) }) }).transform(({ devDependencies }) => devDependencies.typescript);
@@ -4903,7 +5155,12 @@ async function addHandler(input, options = {}) {
 		mode,
 		analyticsDisabled: input.disableAnalytics
 	}, async () => {
-		const result = await addHandlerInternal(input);
+		let result;
+		try {
+			result = await addHandlerInternal(input);
+		} finally {
+			endInterruptibleScope();
+		}
 		await reportAddOutcome(input, result);
 		if (result.isOk()) return result.value;
 		const error = result.error;
@@ -5106,6 +5363,7 @@ async function addHandlerInternal(input) {
 		return Result.err(new CLIError({ message: `Failed to write files: ${writeResult.error.message}` }));
 	}
 	if (vfs.getFileCount() > 0 && !isSilent()) log.info(pc.dim(`Wrote ${vfs.getFileCount()} files`));
+	beginInterruptibleScope();
 	const setupResult = await Result.tryPromise({
 		try: async () => {
 			if (addonsToAdd.length > 0) await setupAddons({
@@ -6839,7 +7097,9 @@ const PROJECT_LAUNCHERS = [
 		}]
 	}
 ];
-async function detectProjectLaunchers(projectDir, detectCommand = commandExists, platform = process.platform) {
+async function detectProjectLaunchers(projectDir, options = {}) {
+	const detectCommand = options.detectCommand ?? commandExists;
+	const platform = options.platform ?? process.platform;
 	const supportedDefinitions = PROJECT_LAUNCHERS.filter(({ platforms }) => platforms === void 0 || platforms.includes(platform));
 	const commandsFor = (launcher) => launcher.commandsByPlatform?.[platform] ?? launcher.commands;
 	const commands = [...new Set(supportedDefinitions.flatMap(commandsFor))];
@@ -6862,7 +7122,8 @@ async function detectProjectLaunchers(projectDir, detectCommand = commandExists,
 async function getProjectLauncherChoice(requestedLauncher, projectDir, options = {}) {
 	if (requestedLauncher === "none") return Result.ok(void 0);
 	if (!requestedLauncher && options.prompt === false) return Result.ok(void 0);
-	const availableLaunchers = await detectProjectLaunchers(projectDir, options.detectCommand, options.platform);
+	const { prompt: _prompt, ...detectOptions } = options;
+	const availableLaunchers = await detectProjectLaunchers(projectDir, detectOptions);
 	if (requestedLauncher) {
 		const launcher = availableLaunchers.find(({ id }) => id === requestedLauncher);
 		if (launcher) return Result.ok(launcher);
@@ -7150,12 +7411,14 @@ async function formatCode(filePath, content) {
 	});
 	return result.isOk() ? result.value : null;
 }
-async function formatProject(projectDir) {
+async function formatProject(projectDir, signal) {
 	return Result.tryPromise({
 		try: async () => {
 			async function formatDirectory(dir) {
+				if (signal?.aborted) return;
 				const entries = await fs.readdir(dir, { withFileTypes: true });
 				await Promise.all(entries.map(async (entry) => {
+					if (signal?.aborted) return;
 					const fullPath = path.join(dir, entry.name);
 					if (entry.isDirectory()) await formatDirectory(fullPath);
 					else if (entry.isFile()) await Result.tryPromise({
@@ -7957,8 +8220,19 @@ async function writeSupabaseEnvFile(projectDir, backend, databaseUrl) {
 		})
 	});
 }
-function extractDbUrl(output) {
-	return output.match(/DB URL:\s*(postgresql:\/\/[^\s]+)/)?.[1] ?? null;
+function extractDbUrl(statusEnv) {
+	return statusEnv.match(/^DB_URL="(postgresql:\/\/[^"]+)"$/m)?.[1] ?? null;
+}
+async function readSupabaseStatus(serverDir, packageManager) {
+	const statusArgs = getPackageExecutionArgs(packageManager, "supabase status --agent no -o env");
+	const result = await Result.tryPromise({
+		try: async () => {
+			const { stdout } = await execa(statusArgs[0], statusArgs.slice(1), { cwd: serverDir });
+			return stdout;
+		},
+		catch: () => ""
+	});
+	return result.isOk() ? result.value : "";
 }
 async function initializeSupabase(serverDir, packageManager) {
 	cliLog.info("Initializing Supabase project...");
@@ -7983,7 +8257,7 @@ async function initializeSupabase(serverDir, packageManager) {
 }
 async function startSupabase(serverDir, packageManager) {
 	cliLog.info("Starting Supabase services (this may take a moment)...");
-	const supabaseStartArgs = getPackageExecutionArgs(packageManager, "supabase start");
+	const supabaseStartArgs = getPackageExecutionArgs(packageManager, "supabase start --agent no");
 	return Result.tryPromise({
 		try: async () => {
 			const subprocess = execa(supabaseStartArgs[0], supabaseStartArgs.slice(1), { cwd: serverDir });
@@ -8014,10 +8288,10 @@ function displayManualSupabaseInstructions(targetApp, output) {
 2. Install the Supabase CLI (e.g., \`npm install -g supabase\`).
 3. Run \`supabase init\` in your project's \`packages/db\` directory.
 4. Run \`supabase start\` in your project's \`packages/db\` directory.
-5. Copy the 'DB URL' from the output.${output ? `
+5. Copy the database URL from the output.${output ? `
 ${pc.bold("Relevant output from `supabase start`:")}
 ${pc.dim(output)}` : ""}
-6. Add the DB URL to the .env file in \`${targetApp}/.env\` as \`DATABASE_URL\`:
+6. Add the database URL to the .env file in \`${targetApp}/.env\` as \`DATABASE_URL\`:
 			${pc.gray("DATABASE_URL=\"your_supabase_db_url\"")}`);
 }
 async function setupSupabase(config, cliInput) {
@@ -8077,7 +8351,7 @@ async function setupSupabase(config, cliInput) {
 		return writeSupabaseEnvFile(projectDir, backend, "");
 	}
 	const supabaseOutput = startResult.value;
-	const dbUrl = extractDbUrl(supabaseOutput);
+	const dbUrl = extractDbUrl(await readSupabaseStatus(serverDir, packageManager));
 	if (dbUrl) {
 		const envResult = await writeSupabaseEnvFile(projectDir, backend, dbUrl);
 		if (envResult.isOk()) cliLog.success(pc.green("Supabase local development setup ready!"));
@@ -8206,7 +8480,7 @@ async function createTursoDatabase(dbName, groupName) {
 		catch: (e) => {
 			const error = e;
 			s.stop(pc.red(`Failed to create database "${dbName}"`));
-			if (error.message?.includes("already exists")) return new DatabaseSetupError({
+			if (error.message?.includes("already exists") || error.message?.includes("is not available")) return new DatabaseSetupError({
 				provider: "turso",
 				message: "DATABASE_EXISTS",
 				cause: e
@@ -8437,13 +8711,7 @@ async function setupDatabase(config, cliInput) {
 	const dbPackageDir = path.join(projectDir, "packages/db");
 	if (!await fs.pathExists(dbPackageDir)) return;
 	if (usesAlchemyManagedDatabase(config)) return;
-	async function runSetup(setupFn) {
-		const result = await setupFn();
-		if (result.isErr()) {
-			if (UserCancelledError.is(result.error)) throw result.error;
-			cliConsola.error(pc.red(result.error.message));
-		}
-	}
+	const runSetup = (setupFn) => runOptionalStep(setupFn, "Database setup cancelled. Configure the connection manually.");
 	const resolvedCliInput = {
 		...cliInput,
 		dbSetupOptions: mergeResolvedDbSetupOptions(dbSetup, config.dbSetupOptions, cliInput)
@@ -8461,29 +8729,44 @@ async function setupDatabase(config, cliInput) {
 }
 //#endregion
 //#region src/helpers/core/git.ts
-async function initializeGit(projectDir, useGit) {
+async function initializeGit(projectDir, useGit, signal) {
 	if (!useGit) return Result.ok(void 0);
-	if ((await $({
+	const cancelled = () => Result.err(new ProjectCreationError({
+		phase: "git-initialization",
+		message: "Git initialization cancelled"
+	}));
+	const gitVersionResult = await $({
 		cwd: projectDir,
 		reject: false,
-		stderr: "pipe"
-	})`git --version`).exitCode !== 0) {
+		stderr: "pipe",
+		cancelSignal: signal
+	})`git --version`;
+	if (signal?.aborted) return cancelled();
+	if (gitVersionResult.exitCode !== 0) {
 		cliLog.warn(pc.yellow("Git is not installed"));
 		return Result.ok(void 0);
 	}
 	const result = await $({
 		cwd: projectDir,
 		reject: false,
-		stderr: "pipe"
+		stderr: "pipe",
+		cancelSignal: signal
 	})`git init`;
+	if (signal?.aborted) return cancelled();
 	if (result.exitCode !== 0) return Result.err(new ProjectCreationError({
 		phase: "git-initialization",
 		message: `Git initialization failed: ${result.stderr}`
 	}));
 	return Result.tryPromise({
 		try: async () => {
-			await $({ cwd: projectDir })`git add -A`;
-			await $({ cwd: projectDir })`git commit -m ${"initial commit"}`;
+			await $({
+				cwd: projectDir,
+				cancelSignal: signal
+			})`git add -A`;
+			await $({
+				cwd: projectDir,
+				cancelSignal: signal
+			})`git commit -m ${"initial commit"}`;
 		},
 		catch: (e) => new ProjectCreationError({
 			phase: "git-initialization",
@@ -8791,7 +9074,7 @@ function getTauriInstructions(runCmd, frontend) {
 }
 function getElectrobunInstructions(runCmd, frontend) {
 	const staticBuildNote = getDesktopStaticBuildNote(frontend);
-	return `\n${pc.bold("Desktop app with Electrobun:")}\n${pc.cyan("•")} Start desktop app with HMR: ${`${runCmd} dev:desktop`}\n${pc.cyan("•")} Build stable desktop app (DMG/App): ${`${runCmd} build:desktop`}\n${pc.cyan("•")} Build canary desktop app: ${`${runCmd} build:desktop:canary`}\n${pc.yellow("NOTE:")} Electrobun wraps your web frontend in a desktop shell.\n   See: https://framework.blackboard.sh/electrobun/${staticBuildNote ? `\n${staticBuildNote}` : ""}`;
+	return `\n${pc.bold("Desktop app with Electrobun:")}\n${pc.cyan("•")} Start desktop app with HMR (runs the whole stack): ${`${runCmd} dev:desktop`}\n${pc.cyan("•")} Build stable desktop app (DMG/App): ${`${runCmd} build:desktop`}\n${pc.cyan("•")} Build canary desktop app: ${`${runCmd} build:desktop:canary`}\n${pc.yellow("NOTE:")} Electrobun wraps your web frontend in a desktop shell.\n   The first desktop command downloads Hutch and the Electrobun toolchain.\n   Packaged builds bake the API URL from apps/web/.env, so point it at a reachable server first.\n   See: https://framework.blackboard.sh/electrobun/${staticBuildNote ? `\n${staticBuildNote}` : ""}`;
 }
 function getPwaInstructions() {
 	return `\n${pc.bold("PWA with React Router v7:")}\n${pc.yellow("NOTE:")} There is a known compatibility issue between VitePWA\n   and React Router v7. See:\n   https://github.com/vite-pwa/vite-plugin-pwa/issues/809`;
@@ -8910,7 +9193,8 @@ function getAlchemyDeployInstructions(runCmd, webDeploy, serverDeploy, backend,
 //#region src/helpers/core/create-project.ts
 /**
 * Creates a new project with the given configuration.
-* Returns a Result with the project directory path on success, or an error on failure.
+* A failed dependency install is returned in the outcome instead of failing, since the project
+* is already on disk by then.
 */
 async function createProject(options, cliInput) {
 	return Result.gen(async function* () {
@@ -8939,34 +9223,57 @@ async function createProject(options, cliInput) {
 			cause: e
 		}))));
 		yield* Result.await(setPackageManagerVersion(projectDir, options.packageManager, cliInput.packageManagerVersion));
-		if (!isConvex && options.database !== "none") yield* Result.await(Result.tryPromise({
-			try: () => setupDatabase(options, cliInput),
-			catch: (e) => new ProjectCreationError({
-				phase: "database-setup",
-				message: `Failed to setup database: ${e instanceof Error ? e.message : String(e)}`,
-				cause: e
-			})
-		}));
-		if (options.addons.length > 0 && options.addons[0] !== "none") yield* Result.await(Result.tryPromise({
-			try: () => setupAddons(options),
-			catch: (e) => new ProjectCreationError({
-				phase: "addons-setup",
-				message: `Failed to setup addons: ${e instanceof Error ? e.message : String(e)}`,
-				cause: e
-			})
-		}));
-		yield* Result.await(formatProject(projectDir));
-		if (!isSilent()) log.success("Project scaffolded");
-		if (options.install) yield* Result.await(installDependencies({
+		beginInterruptibleScope();
+		try {
+			return yield* runPostScaffoldSteps(options, cliInput, projectDir, isConvex);
+		} finally {
+			endInterruptibleScope();
+		}
+	});
+}
+async function* runPostScaffoldSteps(options, cliInput, projectDir, isConvex) {
+	if (!isConvex && options.database !== "none") yield* Result.await(Result.tryPromise({
+		try: () => setupDatabase(options, cliInput),
+		catch: (e) => new ProjectCreationError({
+			phase: "database-setup",
+			message: `Failed to setup database: ${e instanceof Error ? e.message : String(e)}`,
+			cause: e
+		})
+	}));
+	if (options.addons.length > 0 && options.addons[0] !== "none") yield* Result.await(Result.tryPromise({
+		try: () => setupAddons(options),
+		catch: (e) => new ProjectCreationError({
+			phase: "addons-setup",
+			message: `Failed to setup addons: ${e instanceof Error ? e.message : String(e)}`,
+			cause: e
+		})
+	}));
+	startInterruptibleStep();
+	yield* Result.await(formatProject(projectDir, getInterruptSignal()));
+	if (wasInterrupted()) cliLog.warn(pc.yellow("Formatting cancelled."));
+	if (!isSilent()) log.success("Project scaffolded");
+	let install = "skipped";
+	let installError = null;
+	if (options.install) {
+		const installResult = await installDependencies({
 			projectDir,
 			packageManager: options.packageManager
-		}));
-		yield* Result.await(initializeGit(projectDir, options.git));
-		if (!isSilent()) await displayPostInstallInstructions({
-			...options,
-			depsInstalled: options.install
 		});
-		return Result.ok(projectDir);
+		if (installResult.isErr()) {
+			install = "failed";
+			installError = installResult.error;
+		} else install = installResult.value;
+	}
+	await runOptionalStep(() => initializeGit(projectDir, options.git, getInterruptSignal()), "Git initialization cancelled.");
+	if (!isSilent()) await displayPostInstallInstructions({
+		...options,
+		depsInstalled: install === "installed"
+	});
+	return Result.ok({
+		projectDir,
+		install,
+		installError,
+		interrupted: wasAnyStepInterrupted()
 	});
 }
 async function setPackageManagerVersion(projectDir, packageManager, version) {
@@ -9077,6 +9384,10 @@ async function createProjectHandlerInternal(input, startTime, timeScaffolded) {
 		if (!isSilent() && input.renderTitle !== false) renderTitle();
 		if (!isSilent()) intro(pc.magenta("Configure your new project"));
 		if (!isSilent() && input.yolo) log.warn(pc.yellow("YOLO mode enabled — compatibility checks are disabled."));
+		if (!isSilent()) {
+			const baseline = yield* Result.await(checkBaselineRequirements(input.packageManager ?? getUserPkgManager(), input.packageManager !== void 0));
+			for (const warning of baseline.warnings) log.warn(pc.yellow(warning));
+		}
 		let currentPathInput;
 		if (isSilent()) currentPathInput = yield* Result.await(resolveProjectNameForSilent(input));
 		else if (input.yes && input.projectName) currentPathInput = input.projectName;
@@ -9222,12 +9533,27 @@ async function createProjectHandlerInternal(input, startTime, timeScaffolded) {
 				relativePath: config.relativePath
 			});
 		}
-		yield* Result.await(createProject(config, {
+		const created = yield* Result.await(createProject(config, {
 			manualDb: cliInput.manualDb ?? input.manualDb,
 			dbSetupOptions: effectiveDbSetupOptions,
 			packageManagerVersion: localRequirements.packageManagerVersion
 		}));
-		await trackProjectCreation(config, input.disableAnalytics, resolveInvocationMode(input.yes));
+		const mode = resolveInvocationMode(input.yes);
+		await trackProjectCreation(config, input.disableAnalytics, mode);
+		const warnings = [];
+		if (created.interrupted) warnings.push("One or more setup steps were cancelled.");
+		if (created.installError) {
+			warnings.push(created.installError.message);
+			await reportDiagnostic("cli_failed", {
+				command: "create",
+				mode,
+				stage: "dependency-installation",
+				error: errorClass(created.installError),
+				reason: scrubReason(created.installError),
+				packageManager: config.packageManager,
+				backend: config.backend
+			});
+		}
 		const historyResult = await addToHistory(config, reproducibleCommand);
 		if (historyResult.isErr() && !isSilent()) {
 			log.warn(pc.yellow(historyResult.error.message));
@@ -9258,7 +9584,8 @@ async function createProjectHandlerInternal(input, startTime, timeScaffolded) {
 			timeScaffolded,
 			elapsedTimeMs,
 			projectDirectory: config.projectDir,
-			relativePath: config.relativePath
+			relativePath: config.relativePath,
+			warnings: warnings.length > 0 ? warnings : void 0
 		});
 	});
 }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "create-better-t-stack",
-  "version": "3.41.4",
+  "version": "3.42.1",
   "description": "A modern CLI tool for scaffolding end-to-end type-safe TypeScript projects with best practices and customizable configurations",
   "keywords": [
     "better-auth",
@@ -69,8 +69,8 @@
     "prepublishOnly": "npm run build"
   },
   "dependencies": {
-    "@better-t-stack/template-generator": "^3.41.4",
-    "@better-t-stack/types": "^3.41.4",
+    "@better-t-stack/template-generator": "^3.42.1",
+    "@better-t-stack/types": "^3.42.1",
     "@clack/core": "^1.4.3",
     "@clack/prompts": "^1.7.0",
     "@modelcontextprotocol/server": "2.0.0",