create-better-t-stack 3.22.1 → 3.23.0

package/dist/{src-BEc5W50Y.mjs → src-COTG6r9y.mjs}

@@ -1,6 +1,7 @@
 #!/usr/bin/env node
-import { t as __reExport } from "./chunk-CHc3S52W.mjs";
-import { createRouterClient, os } from "@orpc/server";
+import { n as __reExport, t as __exportAll } from "./chunk-BtN16TXe.mjs";
+import { getAllJsonSchemas } from "@better-t-stack/types/json-schema";
+import { os } from "@orpc/server";
 import { Result, Result as Result$1, TaggedError } from "better-result";
 import { createCli } from "trpc-cli";
 import z from "zod";
@@ -10,7 +11,7 @@ import envPaths from "env-paths";
 import fs from "fs-extra";
 import path from "node:path";
 import { fileURLToPath } from "node:url";
-import { EMBEDDED_TEMPLATES, EMBEDDED_TEMPLATES as EMBEDDED_TEMPLATES$1, GeneratorError, GeneratorError as GeneratorError$1, TEMPLATE_COUNT, VirtualFileSystem, VirtualFileSystem as VirtualFileSystem$1, dependencyVersionMap, generate, generate as generate$1, generateReproducibleCommand, processAddonTemplates, processAddonsDeps } from "@better-t-stack/template-generator";
+import { EMBEDDED_TEMPLATES, EMBEDDED_TEMPLATES as EMBEDDED_TEMPLATES$1, GeneratorError as GeneratorError$1, TEMPLATE_COUNT, VirtualFileSystem, VirtualFileSystem as VirtualFileSystem$1, dependencyVersionMap, generate, generate as generate$1, generateReproducibleCommand, processAddonTemplates, processAddonsDeps } from "@better-t-stack/template-generator";
 import consola, { consola as consola$1 } from "consola";
 import gradient from "gradient-string";
 import { $, execa } from "execa";
@@ -20,7 +21,6 @@ import { AsyncLocalStorage } from "node:async_hooks";
 import { applyEdits, modify, parse } from "jsonc-parser";
 import os$1 from "node:os";
 import { format } from "oxfmt";
-
 //#region src/utils/get-package-manager.ts
 const getUserPkgManager = () => {
 	const userAgent = process.env.npm_config_user_agent;
@@ -28,7 +28,6 @@ const getUserPkgManager = () => {
 	if (userAgent?.startsWith("bun")) return "bun";
 	return "npm";
 };
-
 //#endregion
 //#region src/constants.ts
 const __filename = fileURLToPath(import.meta.url);
@@ -83,6 +82,7 @@ const ADDON_COMPATIBILITY = {
 	husky: [],
 	lefthook: [],
 	turborepo: [],
+	nx: [],
 	starlight: [],
 	ultracite: [],
 	ruler: [],
@@ -94,7 +94,6 @@ const ADDON_COMPATIBILITY = {
 	skills: [],
 	none: []
 };
-
 //#endregion
 //#region src/utils/errors.ts
 /**
@@ -183,14 +182,14 @@ function displayError(error) {
 	if (UserCancelledError.is(error)) cancel(pc.red(error.message));
 	else consola.error(pc.red(error.message));
 }
-
 //#endregion
 //#region src/utils/get-latest-cli-version.ts
 function getLatestCLIVersionResult() {
 	const packageJsonPath = path.join(PKG_ROOT, "package.json");
 	return Result.try({
 		try: () => {
-			return fs.readJSONSync(packageJsonPath).version;
+			const packageJsonContent = fs.readJSONSync(packageJsonPath);
+			return String(packageJsonContent.version ?? "1.0.0");
 		},
 		catch: (e) => new CLIError({
 			message: `Failed to read CLI version from package.json: ${e instanceof Error ? e.message : String(e)}`,
@@ -201,7 +200,6 @@ function getLatestCLIVersionResult() {
 function getLatestCLIVersion() {
 	return getLatestCLIVersionResult().unwrapOr("1.0.0");
 }
-
 //#endregion
 //#region src/utils/project-history.ts
 const paths = envPaths("better-t-stack", { suffix: "" });
@@ -314,7 +312,6 @@ async function clearHistory() {
 		})
 	});
 }
-
 //#endregion
 //#region src/utils/render-title.ts
 const TITLE_TEXT = `
@@ -351,7 +348,6 @@ const renderTitle = () => {
 	if (terminalWidth < Math.max(...titleLines.map((line) => line.length))) console.log(gradient(Object.values(catppuccinTheme)).multiline(`Better T Stack`));
 	else console.log(gradient(Object.values(catppuccinTheme)).multiline(TITLE_TEXT));
 };
-
 //#endregion
 //#region src/commands/history.ts
 function formatStackSummary(entry) {
@@ -410,7 +406,6 @@ async function historyHandler(input) {
 		log.message("");
 	}
 }
-
 //#endregion
 //#region src/utils/open-url.ts
 async function openUrl(url) {
@@ -426,7 +421,6 @@ async function openUrl(url) {
 	}
 	await $({ stdio: "ignore" })`xdg-open ${url}`;
 }
-
 //#endregion
 //#region src/utils/sponsors.ts
 const SPONSORS_JSON_URL = "https://sponsors.better-t-stack.dev/sponsors.json";
@@ -590,7 +584,6 @@ function normalizeSponsorFetchError(error) {
 		cause: error
 	});
 }
-
 //#endregion
 //#region src/commands/meta.ts
 const DOCS_URL = "https://better-t-stack.dev/docs";
@@ -619,13 +612,11 @@ async function openDocsCommand() {
 async function openBuilderCommand() {
 	await openExternalUrl(BUILDER_URL, "Opened builder in your default browser.");
 }
-
 //#endregion
 //#region src/types.ts
-var types_exports = {};
+var types_exports = /* @__PURE__ */ __exportAll({});
 import * as import__better_t_stack_types from "@better-t-stack/types";
 __reExport(types_exports, import__better_t_stack_types);
-
 //#endregion
 //#region src/utils/compatibility.ts
 const WEB_FRAMEWORKS = [
@@ -638,7 +629,6 @@ const WEB_FRAMEWORKS = [
 	"solid",
 	"astro"
 ];
-
 //#endregion
 //#region src/utils/compatibility-rules.ts
 function validationErr$1(message) {
@@ -761,6 +751,7 @@ function getCompatibleAddons(allAddons, frontend, existingAddons = [], auth) {
 	});
 }
 function validateAddonsAgainstFrontends(addons = [], frontends = [], auth) {
+	if (addons.includes("turborepo") && addons.includes("nx")) return validationErr$1("Cannot combine 'turborepo' and 'nx' addons. Choose one monorepo tool.");
 	for (const addon of addons) {
 		if (addon === "none") continue;
 		const { isCompatible, reason } = validateAddonCompatibility(addon, frontends, auth);
@@ -793,7 +784,6 @@ function validateExamplesCompatibility(examples, backend, database, frontend, ap
 	}
 	return Result.ok(void 0);
 }
-
 //#endregion
 //#region src/utils/context.ts
 const cliStorage = new AsyncLocalStorage();
@@ -846,14 +836,12 @@ async function runWithContextAsync(options, fn) {
 	};
 	return cliStorage.run(ctx, fn);
 }
-
 //#endregion
 //#region src/utils/navigation.ts
 const GO_BACK_SYMBOL = Symbol("clack:goBack");
 function isGoBack(value) {
 	return value === GO_BACK_SYMBOL;
 }
-
 //#endregion
 //#region src/prompts/navigable.ts
 /**
@@ -892,6 +880,9 @@ function getHint() {
 function getMultiHint() {
 	return isFirstPrompt() ? KEYBOARD_HINT_MULTI_FIRST : KEYBOARD_HINT_MULTI;
 }
+function normalizeValidationMessage(validationMessage) {
+	return validationMessage instanceof Error ? validationMessage.message : validationMessage;
+}
 async function runWithNavigation(prompt) {
 	let goBack = false;
 	prompt.on("key", (char) => {
@@ -950,6 +941,7 @@ async function navigableMultiselect(opts) {
 		required,
 		validate(selected) {
 			if (required && (selected === void 0 || selected.length === 0)) return `Please select at least one option.\n${pc.reset(pc.dim(`Press ${pc.gray(pc.bgWhite(pc.inverse(" space ")))} to select, ${pc.gray(pc.bgWhite(pc.inverse(" enter ")))} to submit`))}`;
+			return normalizeValidationMessage(opts.validate?.(selected));
 		},
 		render() {
 			const title = `${pc.gray(S_BAR)}\n${symbol(this.state)}  ${opts.message}\n`;
@@ -1033,6 +1025,7 @@ async function navigableGroupMultiselect(opts) {
 		selectableGroups: true,
 		validate(selected) {
 			if (required && (selected === void 0 || selected.length === 0)) return `Please select at least one option.\n${pc.reset(pc.dim(`Press ${pc.gray(pc.bgWhite(pc.inverse(" space ")))} to select, ${pc.gray(pc.bgWhite(pc.inverse(" enter ")))} to submit`))}`;
+			return normalizeValidationMessage(opts.validate?.(selected));
 		},
 		render() {
 			const title = `${pc.gray(S_BAR)}\n${symbol(this.state)}  ${opts.message}\n`;
@@ -1079,7 +1072,6 @@ async function navigableGroupMultiselect(opts) {
 		}
 	}));
 }
-
 //#endregion
 //#region src/prompts/addons.ts
 function getAddonDisplay(addon) {
@@ -1090,6 +1082,10 @@ function getAddonDisplay(addon) {
 			label = "Turborepo";
 			hint = "High-performance build system";
 			break;
+		case "nx":
+			label = "Nx";
+			hint = "Smart monorepo orchestration and task graph";
+			break;
 		case "pwa":
 			label = "PWA";
 			hint = "Make your app installable and work offline";
@@ -1144,7 +1140,7 @@ function getAddonDisplay(addon) {
 			break;
 		case "mcp":
 			label = "MCP";
-			hint = "Install MCP servers (docs, databases, SaaS) via add-mcp";
+			hint = "Install MCP servers, including Better T Stack, via add-mcp";
 			break;
 		default:
 			label = addon;
@@ -1156,8 +1152,8 @@ function getAddonDisplay(addon) {
 	};
 }
 const ADDON_GROUPS = {
-	Tooling: [
-		"turborepo",
+	"Monorepo & Tasks": ["turborepo", "nx"],
+	"Code Quality": [
 		"biome",
 		"oxlint",
 		"ultracite",
@@ -1165,100 +1161,91 @@ const ADDON_GROUPS = {
 		"lefthook"
 	],
 	Documentation: ["starlight", "fumadocs"],
-	Extensions: [
+	"Platform Extensions": [
 		"pwa",
 		"tauri",
 		"opentui",
 		"wxt"
 	],
-	AI: [
+	"AI & Agent Tools": [
 		"ruler",
 		"skills",
 		"mcp"
 	]
 };
+function createGroupedOptions() {
+	return Object.fromEntries(Object.keys(ADDON_GROUPS).map((group) => [group, []]));
+}
+function addOptionToGroup(groupedOptions, option) {
+	for (const [group, addons] of Object.entries(ADDON_GROUPS)) if (addons.includes(option.value)) {
+		groupedOptions[group]?.push(option);
+		return;
+	}
+}
+function sortAndPruneGroupedOptions(groupedOptions) {
+	Object.keys(groupedOptions).forEach((group) => {
+		if (groupedOptions[group].length === 0) {
+			delete groupedOptions[group];
+			return;
+		}
+		const groupOrder = ADDON_GROUPS[group] || [];
+		groupedOptions[group].sort((a, b) => {
+			return groupOrder.indexOf(a.value) - groupOrder.indexOf(b.value);
+		});
+	});
+}
+function validateAddonSelection(selected) {
+	if (selected?.includes("turborepo") && selected.includes("nx")) return "Choose either Turborepo or Nx as your monorepo tool, not both.";
+}
 async function getAddonsChoice(addons, frontends, auth) {
 	if (addons !== void 0) return addons;
 	const allAddons = types_exports.AddonsSchema.options.filter((addon) => addon !== "none");
-	const groupedOptions = {
-		Tooling: [],
-		Documentation: [],
-		Extensions: [],
-		AI: []
-	};
+	const groupedOptions = createGroupedOptions();
 	const frontendsArray = frontends || [];
 	for (const addon of allAddons) {
 		const { isCompatible } = validateAddonCompatibility(addon, frontendsArray, auth);
 		if (!isCompatible) continue;
 		const { label, hint } = getAddonDisplay(addon);
-		const option = {
+		addOptionToGroup(groupedOptions, {
 			value: addon,
 			label,
 			hint
-		};
-		if (ADDON_GROUPS.Tooling.includes(addon)) groupedOptions.Tooling.push(option);
-		else if (ADDON_GROUPS.Documentation.includes(addon)) groupedOptions.Documentation.push(option);
-		else if (ADDON_GROUPS.Extensions.includes(addon)) groupedOptions.Extensions.push(option);
-		else if (ADDON_GROUPS.AI.includes(addon)) groupedOptions.AI.push(option);
+		});
 	}
-	Object.keys(groupedOptions).forEach((group) => {
-		if (groupedOptions[group].length === 0) delete groupedOptions[group];
-		else {
-			const groupOrder = ADDON_GROUPS[group] || [];
-			groupedOptions[group].sort((a, b) => {
-				return groupOrder.indexOf(a.value) - groupOrder.indexOf(b.value);
-			});
-		}
-	});
+	sortAndPruneGroupedOptions(groupedOptions);
 	const response = await navigableGroupMultiselect({
 		message: "Select addons",
 		options: groupedOptions,
 		initialValues: DEFAULT_CONFIG.addons.filter((addonValue) => Object.values(groupedOptions).some((options) => options.some((opt) => opt.value === addonValue))),
-		required: false
+		required: false,
+		validate: validateAddonSelection
 	});
 	if (isCancel$1(response)) throw new UserCancelledError({ message: "Operation cancelled" });
 	return response;
 }
 async function getAddonsToAdd(frontend, existingAddons = [], auth) {
-	const groupedOptions = {
-		Tooling: [],
-		Documentation: [],
-		Extensions: [],
-		AI: []
-	};
+	const groupedOptions = createGroupedOptions();
 	const frontendArray = frontend || [];
 	const compatibleAddons = getCompatibleAddons(types_exports.AddonsSchema.options.filter((addon) => addon !== "none"), frontendArray, existingAddons, auth);
 	for (const addon of compatibleAddons) {
 		const { label, hint } = getAddonDisplay(addon);
-		const option = {
+		addOptionToGroup(groupedOptions, {
 			value: addon,
 			label,
 			hint
-		};
-		if (ADDON_GROUPS.Tooling.includes(addon)) groupedOptions.Tooling.push(option);
-		else if (ADDON_GROUPS.Documentation.includes(addon)) groupedOptions.Documentation.push(option);
-		else if (ADDON_GROUPS.Extensions.includes(addon)) groupedOptions.Extensions.push(option);
-		else if (ADDON_GROUPS.AI.includes(addon)) groupedOptions.AI.push(option);
+		});
 	}
-	Object.keys(groupedOptions).forEach((group) => {
-		if (groupedOptions[group].length === 0) delete groupedOptions[group];
-		else {
-			const groupOrder = ADDON_GROUPS[group] || [];
-			groupedOptions[group].sort((a, b) => {
-				return groupOrder.indexOf(a.value) - groupOrder.indexOf(b.value);
-			});
-		}
-	});
+	sortAndPruneGroupedOptions(groupedOptions);
 	if (Object.keys(groupedOptions).length === 0) return [];
 	const response = await navigableGroupMultiselect({
 		message: "Select addons to add",
 		options: groupedOptions,
-		required: false
+		required: false,
+		validate: validateAddonSelection
 	});
 	if (isCancel$1(response)) throw new UserCancelledError({ message: "Operation cancelled" });
 	return response;
 }
-
 //#endregion
 //#region src/utils/bts-config.ts
 const BTS_CONFIG_FILE = "bts.jsonc";
@@ -1289,7 +1276,26 @@ async function updateBtsConfig(projectDir, updates) {
 		await fs.writeFile(configPath, content, "utf-8");
 	} catch {}
 }
-
+//#endregion
+//#region src/utils/input-hardening.ts
+function hasControlCharacters(value) {
+	for (const char of value) {
+		const charCode = char.charCodeAt(0);
+		if (charCode < 32 || charCode === 127) return true;
+	}
+	return false;
+}
+function hardeningError(field, value, message) {
+	return Result.err(new ValidationError({
+		field,
+		value,
+		message
+	}));
+}
+function validateAgentSafePathInput(value, field) {
+	if (hasControlCharacters(value)) return hardeningError(field, value, `Invalid ${field}: control characters are not allowed.`);
+	return Result.ok(void 0);
+}
 //#endregion
 //#region src/utils/add-package-deps.ts
 const addPackageDependency = async (opts) => {
@@ -1312,13 +1318,11 @@ const addPackageDependency = async (opts) => {
 	for (const [pkgName, version] of Object.entries(customDevDependencies)) pkgJson.devDependencies[pkgName] = version;
 	await fs.writeJson(pkgJsonPath, pkgJson, { spaces: 2 });
 };
-
 //#endregion
 //#region src/utils/external-commands.ts
 function shouldSkipExternalCommands() {
 	return process.env.BTS_SKIP_EXTERNAL_COMMANDS === "1" || process.env.BTS_TEST_MODE === "1";
 }
-
 //#endregion
 //#region src/utils/package-runner.ts
 function splitCommandArgs(commandWithArgs) {
@@ -1413,7 +1417,33 @@ function getPackageRunnerPrefix(packageManager) {
 		default: return ["npx"];
 	}
 }
-
+//#endregion
+//#region src/utils/terminal-output.ts
+const noopSpinner = {
+	start() {},
+	stop() {},
+	message() {}
+};
+function createSpinner() {
+	return isSilent() ? noopSpinner : spinner();
+}
+const cliLog = {
+	info(message) {
+		if (!isSilent()) log.info(message);
+	},
+	warn(message) {
+		if (!isSilent()) log.warn(message);
+	},
+	success(message) {
+		if (!isSilent()) log.success(message);
+	},
+	error(message) {
+		if (!isSilent()) log.error(message);
+	},
+	message(message) {
+		if (!isSilent()) log.message(message);
+	}
+};
 //#endregion
 //#region src/helpers/addons/fumadocs-setup.ts
 const TEMPLATES$2 = {
@@ -1453,22 +1483,31 @@ const TEMPLATES$2 = {
 		value: "tanstack-start-spa"
 	}
 };
+const DEFAULT_TEMPLATE$2 = "next-mdx";
+const DEFAULT_DEV_PORT$1 = 4e3;
 async function setupFumadocs(config) {
 	if (shouldSkipExternalCommands()) return Result.ok(void 0);
 	const { packageManager, projectDir } = config;
-	log.info("Setting up Fumadocs...");
-	const template = await select({
-		message: "Choose a template",
-		options: Object.entries(TEMPLATES$2).map(([key, template]) => ({
-			value: key,
-			label: template.label,
-			hint: template.hint
-		})),
-		initialValue: "next-mdx"
-	});
-	if (isCancel(template)) return userCancelled("Operation cancelled");
+	cliLog.info("Setting up Fumadocs...");
+	const configuredOptions = config.addonOptions?.fumadocs;
+	let template = configuredOptions?.template;
+	if (!template) if (isSilent()) template = DEFAULT_TEMPLATE$2;
+	else {
+		const selectedTemplate = await select({
+			message: "Choose a template",
+			options: Object.entries(TEMPLATES$2).map(([key, templateOption]) => ({
+				value: key,
+				label: templateOption.label,
+				hint: templateOption.hint
+			})),
+			initialValue: DEFAULT_TEMPLATE$2
+		});
+		if (isCancel(selectedTemplate)) return userCancelled("Operation cancelled");
+		template = selectedTemplate;
+	}
 	const templateArg = TEMPLATES$2[template].value;
 	const isNextTemplate = template.startsWith("next-");
+	const devPort = configuredOptions?.devPort ?? DEFAULT_DEV_PORT$1;
 	const options = [
 		`--template ${templateArg}`,
 		`--pm ${packageManager}`,
@@ -1479,7 +1518,7 @@ async function setupFumadocs(config) {
 	const args = getPackageExecutionArgs(packageManager, `create-fumadocs-app@latest fumadocs ${options.join(" ")}`);
 	const appsDir = path.join(projectDir, "apps");
 	await fs.ensureDir(appsDir);
-	const s = spinner();
+	const s = createSpinner();
 	s.start("Running Fumadocs create command...");
 	const result = await Result.tryPromise({
 		try: async () => {
@@ -1492,7 +1531,7 @@ async function setupFumadocs(config) {
 			if (await fs.pathExists(packageJsonPath)) {
 				const packageJson = await fs.readJson(packageJsonPath);
 				packageJson.name = "fumadocs";
-				if (packageJson.scripts?.dev) packageJson.scripts.dev = `${packageJson.scripts.dev} --port=4000`;
+				if (packageJson.scripts?.dev) packageJson.scripts.dev = `${packageJson.scripts.dev} --port=${devPort}`;
 				await fs.writeJson(packageJsonPath, packageJson, { spaces: 2 });
 			}
 		},
@@ -1509,10 +1548,24 @@ async function setupFumadocs(config) {
 	s.stop("Fumadocs setup complete!");
 	return Result.ok(void 0);
 }
-
 //#endregion
 //#region src/helpers/addons/mcp-setup.ts
 const MCP_AGENTS = [
+	{
+		value: "antigravity",
+		label: "Antigravity",
+		scope: "global"
+	},
+	{
+		value: "cline",
+		label: "Cline VSCode Extension",
+		scope: "global"
+	},
+	{
+		value: "cline-cli",
+		label: "Cline CLI",
+		scope: "global"
+	},
 	{
 		value: "cursor",
 		label: "Cursor",
@@ -1538,6 +1591,16 @@ const MCP_AGENTS = [
 		label: "Gemini CLI",
 		scope: "both"
 	},
+	{
+		value: "github-copilot-cli",
+		label: "GitHub Copilot CLI",
+		scope: "both"
+	},
+	{
+		value: "mcporter",
+		label: "MCPorter",
+		scope: "both"
+	},
 	{
 		value: "vscode",
 		label: "VS Code (GitHub Copilot)",
@@ -1559,6 +1622,12 @@ const MCP_AGENTS = [
 		scope: "global"
 	}
 ];
+const DEFAULT_SCOPE$1 = "project";
+const DEFAULT_AGENTS$2 = [
+	"cursor",
+	"claude-code",
+	"vscode"
+];
 function uniqueValues$1(values) {
 	return Array.from(new Set(values));
 }
@@ -1568,105 +1637,138 @@ function hasReactBasedFrontend$1(frontend) {
 function hasNativeFrontend$1(frontend) {
 	return frontend.includes("native-bare") || frontend.includes("native-uniwind") || frontend.includes("native-unistyles");
 }
-function getRecommendedMcpServers(config) {
-	const servers = [];
-	servers.push({
-		key: "context7",
-		label: "Context7",
-		name: "context7",
-		target: "@upstash/context7-mcp"
-	});
-	if (config.runtime === "workers" || config.webDeploy === "cloudflare" || config.serverDeploy === "cloudflare") servers.push({
-		key: "cloudflare-docs",
-		label: "Cloudflare Docs",
-		name: "cloudflare-docs",
-		target: "https://docs.mcp.cloudflare.com/sse",
-		transport: "sse"
-	});
-	if (config.backend === "convex") servers.push({
-		key: "convex",
-		label: "Convex",
-		name: "convex",
-		target: "npx -y convex@latest mcp start"
-	});
-	if (hasReactBasedFrontend$1(config.frontend)) servers.push({
-		key: "shadcn",
-		label: "shadcn/ui",
-		name: "shadcn",
-		target: "npx -y shadcn@latest mcp"
-	});
-	if (config.frontend.includes("next")) servers.push({
-		key: "next-devtools",
-		label: "Next Devtools",
-		name: "next-devtools",
-		target: "npx -y next-devtools-mcp@latest"
-	});
-	if (config.frontend.includes("nuxt")) servers.push({
-		key: "nuxt-docs",
-		label: "Nuxt Docs",
-		name: "nuxt",
-		target: "https://nuxt.com/mcp"
-	}, {
-		key: "nuxt-ui-docs",
-		label: "Nuxt UI Docs",
-		name: "nuxt-ui",
-		target: "https://ui.nuxt.com/mcp"
-	});
-	if (config.frontend.includes("svelte")) servers.push({
-		key: "svelte-docs",
-		label: "Svelte Docs",
-		name: "svelte",
-		target: "https://mcp.svelte.dev/mcp"
-	});
-	if (config.frontend.includes("astro")) servers.push({
-		key: "astro-docs",
-		label: "Astro Docs",
-		name: "astro-docs",
-		target: "https://mcp.docs.astro.build/mcp"
-	});
-	if (config.dbSetup === "planetscale") servers.push({
-		key: "planetscale",
-		label: "PlanetScale",
-		name: "planetscale",
-		target: "https://mcp.pscale.dev/mcp/planetscale"
-	});
-	if (config.dbSetup === "neon") servers.push({
-		key: "neon",
-		label: "Neon",
-		name: "neon",
-		target: "https://mcp.neon.tech/mcp"
-	});
-	if (config.dbSetup === "supabase") servers.push({
-		key: "supabase",
-		label: "Supabase",
-		name: "supabase",
-		target: "https://mcp.supabase.com/mcp"
-	});
-	if (config.auth === "better-auth") servers.push({
-		key: "better-auth",
-		label: "Better Auth",
-		name: "better-auth",
-		target: "https://mcp.inkeep.com/better-auth/mcp"
-	});
-	if (config.auth === "clerk") servers.push({
-		key: "clerk",
-		label: "Clerk",
-		name: "clerk",
-		target: "https://mcp.clerk.com/mcp"
-	});
-	if (hasNativeFrontend$1(config.frontend)) servers.push({
-		key: "expo",
-		label: "Expo",
-		name: "expo-mcp",
-		target: "https://mcp.expo.dev/mcp"
-	});
-	if (config.payments === "polar") servers.push({
-		key: "polar",
-		label: "Polar",
-		name: "polar",
-		target: "https://mcp.polar.sh/mcp/polar-mcp"
-	});
-	return servers;
+function getAllMcpServers(config) {
+	return [
+		{
+			key: "better-t-stack",
+			label: "Better T Stack",
+			name: "better-t-stack",
+			target: getPackageExecutionCommand(config.packageManager, "create-better-t-stack@latest mcp")
+		},
+		{
+			key: "context7",
+			label: "Context7",
+			name: "context7",
+			target: "@upstash/context7-mcp"
+		},
+		{
+			key: "nx",
+			label: "Nx Workspace",
+			name: "nx",
+			target: "npx nx mcp ."
+		},
+		{
+			key: "cloudflare-docs",
+			label: "Cloudflare Docs",
+			name: "cloudflare-docs",
+			target: "https://docs.mcp.cloudflare.com/sse",
+			transport: "sse"
+		},
+		{
+			key: "convex",
+			label: "Convex",
+			name: "convex",
+			target: "npx -y convex@latest mcp start"
+		},
+		{
+			key: "shadcn",
+			label: "shadcn/ui",
+			name: "shadcn",
+			target: "npx -y shadcn@latest mcp"
+		},
+		{
+			key: "next-devtools",
+			label: "Next Devtools",
+			name: "next-devtools",
+			target: "npx -y next-devtools-mcp@latest"
+		},
+		{
+			key: "nuxt-docs",
+			label: "Nuxt Docs",
+			name: "nuxt",
+			target: "https://nuxt.com/mcp"
+		},
+		{
+			key: "nuxt-ui-docs",
+			label: "Nuxt UI Docs",
+			name: "nuxt-ui",
+			target: "https://ui.nuxt.com/mcp"
+		},
+		{
+			key: "svelte-docs",
+			label: "Svelte Docs",
+			name: "svelte",
+			target: "https://mcp.svelte.dev/mcp"
+		},
+		{
+			key: "astro-docs",
+			label: "Astro Docs",
+			name: "astro-docs",
+			target: "https://mcp.docs.astro.build/mcp"
+		},
+		{
+			key: "planetscale",
+			label: "PlanetScale",
+			name: "planetscale",
+			target: "https://mcp.pscale.dev/mcp/planetscale"
+		},
+		{
+			key: "neon",
+			label: "Neon",
+			name: "neon",
+			target: "https://mcp.neon.tech/mcp"
+		},
+		{
+			key: "supabase",
+			label: "Supabase",
+			name: "supabase",
+			target: "https://mcp.supabase.com/mcp"
+		},
+		{
+			key: "better-auth",
+			label: "Better Auth",
+			name: "better-auth",
+			target: "https://mcp.inkeep.com/better-auth/mcp"
+		},
+		{
+			key: "clerk",
+			label: "Clerk",
+			name: "clerk",
+			target: "https://mcp.clerk.com/mcp"
+		},
+		{
+			key: "expo",
+			label: "Expo",
+			name: "expo-mcp",
+			target: "https://mcp.expo.dev/mcp"
+		},
+		{
+			key: "polar",
+			label: "Polar",
+			name: "polar",
+			target: "https://mcp.polar.sh/mcp/polar-mcp"
+		}
+	];
+}
+function getRecommendedMcpServers(config, scope) {
+	const serversByKey = new Map(getAllMcpServers(config).map((server) => [server.key, server]));
+	const recommendedServerKeys = ["better-t-stack", "context7"];
+	if (scope === "project" && config.addons.includes("nx")) recommendedServerKeys.push("nx");
+	if (config.runtime === "workers" || config.webDeploy === "cloudflare" || config.serverDeploy === "cloudflare") recommendedServerKeys.push("cloudflare-docs");
+	if (config.backend === "convex") recommendedServerKeys.push("convex");
+	if (hasReactBasedFrontend$1(config.frontend)) recommendedServerKeys.push("shadcn");
+	if (config.frontend.includes("next")) recommendedServerKeys.push("next-devtools");
+	if (config.frontend.includes("nuxt")) recommendedServerKeys.push("nuxt-docs", "nuxt-ui-docs");
+	if (config.frontend.includes("svelte")) recommendedServerKeys.push("svelte-docs");
+	if (config.frontend.includes("astro")) recommendedServerKeys.push("astro-docs");
+	if (config.dbSetup === "planetscale") recommendedServerKeys.push("planetscale");
+	if (config.dbSetup === "neon") recommendedServerKeys.push("neon");
+	if (config.dbSetup === "supabase") recommendedServerKeys.push("supabase");
+	if (config.auth === "better-auth") recommendedServerKeys.push("better-auth");
+	if (config.auth === "clerk") recommendedServerKeys.push("clerk");
+	if (hasNativeFrontend$1(config.frontend)) recommendedServerKeys.push("expo");
+	if (config.payments === "polar") recommendedServerKeys.push("polar");
+	return uniqueValues$1(recommendedServerKeys).map((serverKey) => serversByKey.get(serverKey)).filter((server) => server !== void 0);
 }
 function filterAgentsForScope(scope) {
 	return MCP_AGENTS.filter((a) => a.scope === "both" || a.scope === scope);
@@ -1674,67 +1776,83 @@ function filterAgentsForScope(scope) {
 async function setupMcp(config) {
 	if (shouldSkipExternalCommands()) return Result.ok(void 0);
 	const { packageManager, projectDir } = config;
-	log.info("Setting up MCP servers...");
-	const scope = await select({
-		message: "Where should MCP servers be installed?",
-		options: [{
-			value: "project",
-			label: "Project",
-			hint: "Writes to project config files (recommended for teams)"
-		}, {
-			value: "global",
-			label: "Global",
-			hint: "Writes to user-level config files (personal machine)"
-		}],
-		initialValue: "project"
-	});
-	if (isCancel(scope)) return Result.err(new UserCancelledError({ message: "Operation cancelled" }));
-	const recommendedServers = getRecommendedMcpServers(config);
+	cliLog.info("Setting up MCP servers...");
+	let scope = config.addonOptions?.mcp?.scope;
+	if (!scope) if (isSilent()) scope = DEFAULT_SCOPE$1;
+	else {
+		const selectedScope = await select({
+			message: "Where should MCP servers be installed?",
+			options: [{
+				value: "project",
+				label: "Project",
+				hint: "Writes to project config files (recommended for teams)"
+			}, {
+				value: "global",
+				label: "Global",
+				hint: "Writes to user-level config files (personal machine)"
+			}],
+			initialValue: DEFAULT_SCOPE$1
+		});
+		if (isCancel(selectedScope)) return Result.err(new UserCancelledError({ message: "Operation cancelled" }));
+		scope = selectedScope;
+	}
+	const recommendedServers = getRecommendedMcpServers(config, scope);
 	if (recommendedServers.length === 0) return Result.ok(void 0);
+	const allServersByKey = new Map(getAllMcpServers(config).map((server) => [server.key, server]));
 	const serverOptions = recommendedServers.map((s) => ({
 		value: s.key,
 		label: s.label,
 		hint: s.target
 	}));
-	const selectedServerKeys = await multiselect({
-		message: "Select MCP servers to install",
-		options: serverOptions,
-		required: false,
-		initialValues: serverOptions.map((o) => o.value)
-	});
-	if (isCancel(selectedServerKeys)) return Result.err(new UserCancelledError({ message: "Operation cancelled" }));
+	const configuredServerKeys = config.addonOptions?.mcp?.servers;
+	const availableServerKeys = new Set(allServersByKey.keys());
+	let selectedServerKeys = configuredServerKeys?.filter((serverKey) => availableServerKeys.has(serverKey)) ?? [];
+	if (selectedServerKeys.length === 0 && configuredServerKeys === void 0) if (isSilent()) selectedServerKeys = serverOptions.map((o) => o.value);
+	else {
+		const promptedServerKeys = await multiselect({
+			message: "Select MCP servers to install",
+			options: serverOptions,
+			required: false,
+			initialValues: serverOptions.map((o) => o.value)
+		});
+		if (isCancel(promptedServerKeys)) return Result.err(new UserCancelledError({ message: "Operation cancelled" }));
+		selectedServerKeys = [...promptedServerKeys];
+	}
 	if (selectedServerKeys.length === 0) return Result.ok(void 0);
 	const agentOptions = filterAgentsForScope(scope).map((a) => ({
 		value: a.value,
 		label: a.label
 	}));
-	const selectedAgents = await multiselect({
-		message: "Select agents to install MCP servers to",
-		options: agentOptions,
-		required: false,
-		initialValues: uniqueValues$1([
-			"cursor",
-			"claude-code",
-			"vscode"
-		].filter((a) => agentOptions.some((o) => o.value === a)))
-	});
-	if (isCancel(selectedAgents)) return Result.err(new UserCancelledError({ message: "Operation cancelled" }));
+	const defaultAgents = uniqueValues$1(DEFAULT_AGENTS$2.filter((agent) => agentOptions.some((option) => option.value === agent)));
+	const configuredAgents = config.addonOptions?.mcp?.agents;
+	let selectedAgents = configuredAgents?.filter((agent) => agentOptions.some((option) => option.value === agent)) ?? [];
+	if (selectedAgents.length === 0 && configuredAgents === void 0) if (isSilent()) selectedAgents = defaultAgents;
+	else {
+		const promptedAgents = await multiselect({
+			message: "Select agents to install MCP servers to",
+			options: agentOptions,
+			required: false,
+			initialValues: defaultAgents
+		});
+		if (isCancel(promptedAgents)) return Result.err(new UserCancelledError({ message: "Operation cancelled" }));
+		selectedAgents = [...promptedAgents];
+	}
 	if (selectedAgents.length === 0) return Result.ok(void 0);
-	const serversByKey = new Map(recommendedServers.map((s) => [s.key, s]));
 	const selectedServers = [];
 	for (const key of selectedServerKeys) {
-		const server = serversByKey.get(key);
+		const server = allServersByKey.get(key);
 		if (server) selectedServers.push(server);
 	}
 	if (selectedServers.length === 0) return Result.ok(void 0);
-	const installSpinner = spinner();
+	const installSpinner = createSpinner();
 	installSpinner.start("Installing MCP servers...");
 	const runner = getPackageRunnerPrefix(packageManager);
 	const globalFlags = scope === "global" ? ["-g"] : [];
+	let successfulInstalls = 0;
 	for (const server of selectedServers) {
 		const transportFlags = server.transport ? ["-t", server.transport] : [];
 		const headerFlags = (server.headers ?? []).flatMap((h) => ["--header", h]);
-		const agentFlags = selectedAgents.flatMap((a) => ["-a", a]);
+		const agentFlags = selectedAgents.flatMap((agent) => ["-a", agent]);
 		const args = [
 			...runner,
 			"add-mcp@latest",
@@ -1759,12 +1877,22 @@ async function setupMcp(config) {
 				message: `Failed to install MCP server '${server.name}': ${e instanceof Error ? e.message : String(e)}`,
 				cause: e
 			})
-		})).isErr()) log.warn(pc.yellow(`Warning: Could not install MCP server '${server.name}'`));
+		})).isErr()) {
+			cliLog.warn(pc.yellow(`Warning: Could not install MCP server '${server.name}'`));
+			continue;
+		}
+		successfulInstalls += 1;
+	}
+	if (successfulInstalls === 0) {
+		installSpinner.stop(pc.red("Failed to install MCP servers"));
+		return Result.err(new AddonSetupError({
+			addon: "mcp",
+			message: `Failed to install all requested MCP servers: ${selectedServers.map((server) => server.name).join(", ")}`
+		}));
 	}
-	installSpinner.stop("MCP servers installed");
+	installSpinner.stop(successfulInstalls === selectedServers.length ? "MCP servers installed" : "MCP servers installed with warnings");
 	return Result.ok(void 0);
 }
-
 //#endregion
 //#region src/helpers/addons/oxlint-setup.ts
 async function setupOxlint(projectDir, packageManager) {
@@ -1784,9 +1912,9 @@ async function setupOxlint(projectDir, packageManager) {
 				await fs.writeJson(packageJsonPath, packageJson, { spaces: 2 });
 			}
 			if (shouldSkipExternalCommands()) return;
-			const s = spinner();
-			s.start("Initializing oxlint and oxfmt...");
+			const s = createSpinner();
 			try {
+				s.start("Initializing oxlint and oxfmt...");
 				const oxlintArgs = getPackageExecutionArgs(packageManager, "oxlint@latest --init");
 				await $({
 					cwd: projectDir,
@@ -1810,62 +1938,75 @@ async function setupOxlint(projectDir, packageManager) {
 		})
 	});
 }
-
 //#endregion
 //#region src/helpers/addons/ruler-setup.ts
+const DEFAULT_ASSISTANTS = [
+	"agentsmd",
+	"claude",
+	"codex",
+	"cursor"
+];
 async function setupRuler(config) {
 	if (shouldSkipExternalCommands()) return Result.ok(void 0);
 	const { packageManager, projectDir } = config;
-	log.info("Setting up Ruler...");
+	cliLog.info("Setting up Ruler...");
 	const rulerDir = path.join(projectDir, ".ruler");
 	if (!await fs.pathExists(rulerDir)) {
-		log.error(pc.red("Ruler template directory not found. Please ensure ruler addon is properly installed."));
+		cliLog.error(pc.red("Ruler template directory not found. Please ensure ruler addon is properly installed."));
 		return Result.ok(void 0);
 	}
-	const selectedEditors = await autocompleteMultiselect({
-		message: "Select AI assistants for Ruler",
-		options: Object.entries({
-			agentsmd: { label: "Agents.md" },
-			aider: { label: "Aider" },
-			amazonqcli: { label: "Amazon Q CLI" },
-			amp: { label: "AMP" },
-			antigravity: { label: "Antigravity" },
-			augmentcode: { label: "AugmentCode" },
-			claude: { label: "Claude Code" },
-			cline: { label: "Cline" },
-			codex: { label: "OpenAI Codex CLI" },
-			copilot: { label: "GitHub Copilot" },
-			crush: { label: "Crush" },
-			cursor: { label: "Cursor" },
-			factory: { label: "Factory" },
-			firebase: { label: "Firebase Studio" },
-			firebender: { label: "Firebender" },
-			"gemini-cli": { label: "Gemini CLI" },
-			goose: { label: "Goose" },
-			jules: { label: "Jules" },
-			junie: { label: "Junie" },
-			kilocode: { label: "Kilo Code" },
-			kiro: { label: "Kiro" },
-			mistral: { label: "Mistral" },
-			opencode: { label: "OpenCode" },
-			openhands: { label: "Open Hands" },
-			pi: { label: "Pi" },
-			qwen: { label: "Qwen" },
-			roo: { label: "RooCode" },
-			trae: { label: "Trae AI" },
-			warp: { label: "Warp" },
-			windsurf: { label: "Windsurf" },
-			zed: { label: "Zed" }
-		}).map(([key, v]) => ({
-			value: key,
-			label: v.label
-		})),
-		required: false
-	});
-	if (isCancel(selectedEditors)) return userCancelled("Operation cancelled");
+	const EDITORS = {
+		agentsmd: { label: "Agents.md" },
+		aider: { label: "Aider" },
+		amazonqcli: { label: "Amazon Q CLI" },
+		amp: { label: "AMP" },
+		antigravity: { label: "Antigravity" },
+		augmentcode: { label: "AugmentCode" },
+		claude: { label: "Claude Code" },
+		cline: { label: "Cline" },
+		codex: { label: "OpenAI Codex CLI" },
+		copilot: { label: "GitHub Copilot" },
+		crush: { label: "Crush" },
+		cursor: { label: "Cursor" },
+		factory: { label: "Factory" },
+		firebase: { label: "Firebase Studio" },
+		firebender: { label: "Firebender" },
+		"gemini-cli": { label: "Gemini CLI" },
+		goose: { label: "Goose" },
+		"jetbrains-ai": { label: "JetBrains AI" },
+		jules: { label: "Jules" },
+		junie: { label: "Junie" },
+		kilocode: { label: "Kilo Code" },
+		kiro: { label: "Kiro" },
+		mistral: { label: "Mistral" },
+		opencode: { label: "OpenCode" },
+		openhands: { label: "Open Hands" },
+		pi: { label: "Pi" },
+		qwen: { label: "Qwen" },
+		roo: { label: "RooCode" },
+		trae: { label: "Trae AI" },
+		warp: { label: "Warp" },
+		windsurf: { label: "Windsurf" },
+		zed: { label: "Zed" }
+	};
+	const configuredAssistants = config.addonOptions?.ruler?.assistants;
+	let selectedEditors = configuredAssistants ? [...configuredAssistants] : [];
+	if (selectedEditors.length === 0 && configuredAssistants === void 0) if (isSilent()) selectedEditors = [...DEFAULT_ASSISTANTS];
+	else {
+		const promptSelection = await autocompleteMultiselect({
+			message: "Select AI assistants for Ruler",
+			options: Object.entries(EDITORS).map(([key, v]) => ({
+				value: key,
+				label: v.label
+			})),
+			required: false
+		});
+		if (isCancel(promptSelection)) return userCancelled("Operation cancelled");
+		selectedEditors = [...promptSelection];
+	}
 	if (selectedEditors.length === 0) {
-		log.info("No AI assistants selected. To apply rules later, run:");
-		log.info(pc.cyan(`${getPackageExecutionCommand(packageManager, "@intellectronica/ruler@latest apply --local-only")}`));
+		cliLog.info("No AI assistants selected. To apply rules later, run:");
+		cliLog.info(pc.cyan(`${getPackageExecutionCommand(packageManager, "@intellectronica/ruler@latest apply --local-only")}`));
 		return Result.ok(void 0);
 	}
 	const configFile = path.join(rulerDir, "ruler.toml");
@@ -1874,7 +2015,7 @@ async function setupRuler(config) {
 	updatedConfig = updatedConfig.replace(/default_agents = \[\]/, defaultAgentsLine);
 	await fs.writeFile(configFile, updatedConfig);
 	await addRulerScriptToPackageJson(projectDir, packageManager);
-	const s = spinner();
+	const s = createSpinner();
 	s.start("Applying rules with Ruler...");
 	const applyResult = await Result.tryPromise({
 		try: async () => {
@@ -1900,7 +2041,7 @@ async function setupRuler(config) {
 async function addRulerScriptToPackageJson(projectDir, packageManager) {
 	const rootPackageJsonPath = path.join(projectDir, "package.json");
 	if (!await fs.pathExists(rootPackageJsonPath)) {
-		log.warn("Root package.json not found, skipping ruler:apply script addition");
+		cliLog.warn("Root package.json not found, skipping ruler:apply script addition");
 		return;
 	}
 	const packageJson = await fs.readJson(rootPackageJsonPath);
@@ -1909,7 +2050,6 @@ async function addRulerScriptToPackageJson(projectDir, packageManager) {
 	packageJson.scripts["ruler:apply"] = rulerApplyCommand;
 	await fs.writeJson(rootPackageJsonPath, packageJson, { spaces: 2 });
 }
-
 //#endregion
 //#region src/helpers/addons/skills-setup.ts
 const SKILL_SOURCES = {
@@ -1920,6 +2060,7 @@ const SKILL_SOURCES = {
 	"vercel-labs/next-skills": { label: "Next.js Best Practices" },
 	"nuxt/ui": { label: "Nuxt UI" },
 	"heroui-inc/heroui": { label: "HeroUI Native" },
+	"shadcn/ui": { label: "shadcn/ui" },
 	"better-auth/skills": { label: "Better Auth" },
 	"clerk/skills": { label: "Clerk" },
 	"neondatabase/agent-skills": { label: "Neon Database" },
@@ -2034,6 +2175,12 @@ const AVAILABLE_AGENTS = [
 		label: "MCPJam"
 	}
 ];
+const DEFAULT_SCOPE = "project";
+const DEFAULT_AGENTS$1 = [
+	"cursor",
+	"claude-code",
+	"github-copilot"
+];
 function hasReactBasedFrontend(frontend) {
 	return frontend.includes("react-router") || frontend.includes("tanstack-router") || frontend.includes("tanstack-start") || frontend.includes("next");
 }
@@ -2043,7 +2190,10 @@ function hasNativeFrontend(frontend) {
 function getRecommendedSourceKeys(config) {
 	const sources = [];
 	const { frontend, backend, dbSetup, auth, examples, addons, orm } = config;
-	if (hasReactBasedFrontend(frontend)) sources.push("vercel-labs/agent-skills");
+	if (hasReactBasedFrontend(frontend)) {
+		sources.push("vercel-labs/agent-skills");
+		sources.push("shadcn/ui");
+	}
 	if (frontend.includes("next")) sources.push("vercel-labs/next-skills");
 	if (frontend.includes("nuxt")) sources.push("nuxt/ui");
 	if (frontend.includes("native-uniwind")) sources.push("heroui-inc/heroui");
@@ -2079,6 +2229,7 @@ const CURATED_SKILLS_BY_SOURCE = {
 	"vercel-labs/next-skills": () => ["next-best-practices", "next-cache-components"],
 	"nuxt/ui": () => ["nuxt-ui"],
 	"heroui-inc/heroui": () => ["heroui-native"],
+	"shadcn/ui": () => ["shadcn"],
 	"better-auth/skills": () => ["better-auth-best-practices"],
 	"clerk/skills": (config) => {
 		const skills = [
@@ -2145,11 +2296,15 @@ async function setupSkills(config) {
 	const btsConfig = await readBtsConfig(projectDir);
 	const fullConfig = btsConfig ? {
 		...config,
-		addons: btsConfig.addons ?? config.addons
+		addons: btsConfig.addons ?? config.addons,
+		addonOptions: btsConfig.addonOptions ?? config.addonOptions
 	} : config;
 	const recommendedSourceKeys = getRecommendedSourceKeys(fullConfig);
-	if (recommendedSourceKeys.length === 0) return Result.ok(void 0);
-	const skillOptions = uniqueValues(recommendedSourceKeys).flatMap((sourceKey) => {
+	const skillsOptions = fullConfig.addonOptions?.skills;
+	const configuredSourceKeys = uniqueValues((skillsOptions?.selections ?? []).map((selection) => selection.source));
+	const sourceKeys = uniqueValues([...recommendedSourceKeys, ...configuredSourceKeys]);
+	if (sourceKeys.length === 0) return Result.ok(void 0);
+	const skillOptions = sourceKeys.flatMap((sourceKey) => {
 		const source = SKILL_SOURCES[sourceKey];
 		return getCuratedSkillNamesForSourceKey(sourceKey, fullConfig).map((skillName) => ({
 			value: `${sourceKey}::${skillName}`,
@@ -2158,39 +2313,54 @@ async function setupSkills(config) {
 		}));
 	});
 	if (skillOptions.length === 0) return Result.ok(void 0);
-	const scope = await select({
-		message: "Where should skills be installed?",
-		options: [{
-			value: "project",
-			label: "Project",
-			hint: "Writes to project config files (recommended for teams)"
-		}, {
-			value: "global",
-			label: "Global",
-			hint: "Writes to user-level config files (personal machine)"
-		}],
-		initialValue: "project"
-	});
-	if (isCancel(scope)) return Result.err(new UserCancelledError({ message: "Operation cancelled" }));
-	const selectedSkills = await multiselect({
-		message: "Select skills to install",
-		options: skillOptions,
-		required: false,
-		initialValues: skillOptions.map((opt) => opt.value)
-	});
-	if (isCancel(selectedSkills)) return Result.err(new UserCancelledError({ message: "Operation cancelled" }));
+	let scope = skillsOptions?.scope;
+	if (!scope) if (isSilent()) scope = DEFAULT_SCOPE;
+	else {
+		const selectedScope = await select({
+			message: "Where should skills be installed?",
+			options: [{
+				value: "project",
+				label: "Project",
+				hint: "Writes to project config files (recommended for teams)"
+			}, {
+				value: "global",
+				label: "Global",
+				hint: "Writes to user-level config files (personal machine)"
+			}],
+			initialValue: DEFAULT_SCOPE
+		});
+		if (isCancel(selectedScope)) return Result.err(new UserCancelledError({ message: "Operation cancelled" }));
+		scope = selectedScope;
+	}
+	const allSkillValues = skillOptions.map((opt) => opt.value);
+	const configuredSelections = skillsOptions?.selections;
+	let selectedSkills;
+	if (configuredSelections !== void 0) selectedSkills = configuredSelections.flatMap((selection) => selection.skills.map((skill) => `${selection.source}::${skill}`));
+	else if (isSilent()) selectedSkills = allSkillValues;
+	else {
+		const promptedSkills = await multiselect({
+			message: "Select skills to install",
+			options: skillOptions,
+			required: false,
+			initialValues: allSkillValues
+		});
+		if (isCancel(promptedSkills)) return Result.err(new UserCancelledError({ message: "Operation cancelled" }));
+		selectedSkills = promptedSkills;
+	}
 	if (selectedSkills.length === 0) return Result.ok(void 0);
-	const selectedAgents = await multiselect({
-		message: "Select agents to install skills to",
-		options: AVAILABLE_AGENTS,
-		required: false,
-		initialValues: [
-			"cursor",
-			"claude-code",
-			"github-copilot"
-		]
-	});
-	if (isCancel(selectedAgents)) return Result.err(new UserCancelledError({ message: "Operation cancelled" }));
+	const configuredAgents = skillsOptions?.agents;
+	let selectedAgents = configuredAgents ? [...configuredAgents] : [];
+	if (selectedAgents.length === 0 && configuredAgents === void 0) if (isSilent()) selectedAgents = [...DEFAULT_AGENTS$1];
+	else {
+		const promptedAgents = await multiselect({
+			message: "Select agents to install skills to",
+			options: AVAILABLE_AGENTS,
+			required: false,
+			initialValues: [...DEFAULT_AGENTS$1]
+		});
+		if (isCancel(promptedAgents)) return Result.err(new UserCancelledError({ message: "Operation cancelled" }));
+		selectedAgents = [...promptedAgents];
+	}
 	if (selectedAgents.length === 0) return Result.ok(void 0);
 	const skillsBySource = {};
 	for (const skillKey of selectedSkills) {
@@ -2198,42 +2368,50 @@ async function setupSkills(config) {
 		if (!skillsBySource[source]) skillsBySource[source] = [];
 		skillsBySource[source].push(skillName);
 	}
-	const installSpinner = spinner();
+	const installSpinner = createSpinner();
 	installSpinner.start("Installing skills...");
-	const agentFlags = selectedAgents.map((a) => `-a ${a}`).join(" ");
-	const globalFlag = scope === "global" ? "-g" : "";
-	for (const [source, skills] of Object.entries(skillsBySource)) {
-		const skillFlags = skills.map((s) => `-s ${s}`).join(" ");
-		if ((await Result.tryPromise({
-			try: async () => {
-				const args = getPackageExecutionArgs(packageManager, `skills@latest add ${source} ${globalFlag} ${skillFlags} ${agentFlags} -y`);
-				await $({
-					cwd: projectDir,
-					env: { CI: "true" }
-				})`${args}`;
-			},
-			catch: (e) => new AddonSetupError({
-				addon: "skills",
-				message: `Failed to install skills from ${source}: ${e instanceof Error ? e.message : String(e)}`,
-				cause: e
-			})
-		})).isErr()) log.warn(pc.yellow(`Warning: Could not install skills from ${source}`));
-	}
+	const runner = getPackageRunnerPrefix(packageManager);
+	const globalFlags = scope === "global" ? ["-g"] : [];
+	for (const [source, skills] of Object.entries(skillsBySource)) if ((await Result.tryPromise({
+		try: async () => {
+			const args = [
+				...runner,
+				"skills@latest",
+				"add",
+				source,
+				...globalFlags,
+				"--skill",
+				...skills,
+				"--agent",
+				...selectedAgents,
+				"-y"
+			];
+			await $({
+				cwd: projectDir,
+				env: { CI: "true" }
+			})`${args}`;
+		},
+		catch: (e) => new AddonSetupError({
+			addon: "skills",
+			message: `Failed to install skills from ${source}: ${e instanceof Error ? e.message : String(e)}`,
+			cause: e
+		})
+	})).isErr()) cliLog.warn(pc.yellow(`Warning: Could not install skills from ${source}`));
 	installSpinner.stop("Skills installed");
 	return Result.ok(void 0);
 }
-
 //#endregion
 //#region src/helpers/addons/starlight-setup.ts
 async function setupStarlight(config) {
 	if (shouldSkipExternalCommands()) return Result.ok(void 0);
 	const { packageManager, projectDir } = config;
-	const s = spinner();
+	const s = createSpinner();
 	s.start("Setting up Starlight docs...");
 	const args = getPackageExecutionArgs(packageManager, `create-astro@latest ${[
 		"docs",
 		"--template",
 		"starlight",
+		"--yes",
 		"--no-install",
 		"--add",
 		"tailwind",
@@ -2262,39 +2440,53 @@ async function setupStarlight(config) {
 	s.stop("Starlight docs setup successfully!");
 	return Result.ok(void 0);
 }
-
 //#endregion
 //#region src/helpers/addons/tauri-setup.ts
-async function setupTauri(config) {
-	if (shouldSkipExternalCommands()) return Result.ok(void 0);
+function buildTauriInitArgs(config) {
 	const { packageManager, frontend, projectDir } = config;
-	const s = spinner();
-	const clientPackageDir = path.join(projectDir, "apps/web");
-	if (!await fs.pathExists(clientPackageDir)) return Result.ok(void 0);
-	s.start("Setting up Tauri desktop app support...");
 	const hasReactRouter = frontend.includes("react-router");
 	const hasNuxt = frontend.includes("nuxt");
 	const hasSvelte = frontend.includes("svelte");
 	const hasNext = frontend.includes("next");
 	const devUrl = hasReactRouter || hasSvelte ? "http://localhost:5173" : hasNext ? "http://localhost:3001" : "http://localhost:3001";
 	const frontendDist = hasNuxt ? "../.output/public" : hasSvelte ? "../build" : hasNext ? "../.next" : hasReactRouter ? "../build/client" : "../dist";
-	const tauriArgs = [
+	return [
+		...getPackageRunnerPrefix(packageManager),
 		"@tauri-apps/cli@latest",
 		"init",
-		`--app-name=${path.basename(projectDir)}`,
-		`--window-title=${path.basename(projectDir)}`,
-		`--frontend-dist=${frontendDist}`,
-		`--dev-url=${devUrl}`,
-		`--before-dev-command=${packageManager} run dev`,
-		`--before-build-command=${packageManager} run build`
+		"--ci",
+		"--app-name",
+		path.basename(projectDir),
+		"--window-title",
+		path.basename(projectDir),
+		"--frontend-dist",
+		frontendDist,
+		"--dev-url",
+		devUrl,
+		"--before-dev-command",
+		`${packageManager} run dev`,
+		"--before-build-command",
+		`${packageManager} run build`
 	];
-	const prefix = getPackageRunnerPrefix(packageManager);
+}
+async function setupTauri(config) {
+	if (shouldSkipExternalCommands()) return Result.ok(void 0);
+	const { packageManager, frontend, projectDir } = config;
+	const s = createSpinner();
+	const clientPackageDir = path.join(projectDir, "apps/web");
+	if (!await fs.pathExists(clientPackageDir)) return Result.ok(void 0);
+	s.start("Setting up Tauri desktop app support...");
+	const [command, ...args] = buildTauriInitArgs({
+		packageManager,
+		frontend,
+		projectDir
+	});
 	const result = await Result.tryPromise({
 		try: async () => {
-			await $({
+			await execa(command, args, {
 				cwd: clientPackageDir,
 				env: { CI: "true" }
-			})`${[...prefix, ...tauriArgs]}`;
+			});
 		},
 		catch: (e) => new AddonSetupError({
 			addon: "tauri",
@@ -2309,7 +2501,6 @@ async function setupTauri(config) {
 	s.stop("Tauri desktop app support configured successfully!");
 	return Result.ok(void 0);
 }
-
 //#endregion
 //#region src/helpers/addons/tui-setup.ts
 const TEMPLATES$1 = {
@@ -2326,20 +2517,36 @@ const TEMPLATES$1 = {
 		hint: "SolidJS-based OpenTUI template"
 	}
 };
+const DEFAULT_TEMPLATE$1 = "core";
+const TUI_LOCKFILES = [
+	"bun.lock",
+	"package-lock.json",
+	"pnpm-lock.yaml",
+	"yarn.lock"
+];
+function resolveTuiTemplate(config) {
+	const configuredTemplate = config.addonOptions?.opentui?.template;
+	if (configuredTemplate) return configuredTemplate;
+	if (isSilent()) return DEFAULT_TEMPLATE$1;
+}
 async function setupTui(config) {
 	if (shouldSkipExternalCommands()) return Result.ok(void 0);
 	const { packageManager, projectDir } = config;
-	log.info("Setting up OpenTUI...");
-	const template = await select({
-		message: "Choose a template",
-		options: Object.entries(TEMPLATES$1).map(([key, template]) => ({
-			value: key,
-			label: template.label,
-			hint: template.hint
-		})),
-		initialValue: "core"
-	});
-	if (isCancel(template)) return userCancelled("Operation cancelled");
+	cliLog.info("Setting up OpenTUI...");
+	let template = resolveTuiTemplate(config);
+	if (!template) {
+		const selectedTemplate = await select({
+			message: "Choose a template",
+			options: Object.entries(TEMPLATES$1).map(([key, templateOption]) => ({
+				value: key,
+				label: templateOption.label,
+				hint: templateOption.hint
+			})),
+			initialValue: DEFAULT_TEMPLATE$1
+		});
+		if (isCancel(selectedTemplate)) return userCancelled("Operation cancelled");
+		template = selectedTemplate;
+	}
 	const args = getPackageExecutionArgs(packageManager, `create-tui@latest --template ${template} --no-git --no-install tui`);
 	const appsDir = path.join(projectDir, "apps");
 	const ensureDirResult = await Result.tryPromise({
@@ -2351,7 +2558,7 @@ async function setupTui(config) {
 		})
 	});
 	if (ensureDirResult.isErr()) return ensureDirResult;
-	const s = spinner();
+	const s = createSpinner();
 	s.start("Running OpenTUI create command...");
 	const initResult = await Result.tryPromise({
 		try: async () => {
@@ -2370,13 +2577,50 @@ async function setupTui(config) {
 		}
 	});
 	if (initResult.isErr()) {
-		log.error(pc.red("Failed to set up OpenTUI"));
+		cliLog.error(pc.red("Failed to set up OpenTUI"));
 		return initResult;
 	}
+	const postProcessResult = await postProcessTuiWorkspace(path.join(appsDir, "tui"));
+	if (postProcessResult.isErr()) {
+		s.stop(pc.yellow("OpenTUI setup completed with warnings"));
+		cliLog.warn(pc.yellow("OpenTUI setup completed but workspace normalization had warnings"));
+		return postProcessResult;
+	}
 	s.stop("OpenTUI setup complete!");
 	return Result.ok(void 0);
 }
-
+async function postProcessTuiWorkspace(tuiDir) {
+	const packageJsonPath = path.join(tuiDir, "package.json");
+	const packageJsonResult = await Result.tryPromise({
+		try: async () => {
+			const packageJson = await fs.readJson(packageJsonPath);
+			packageJson.scripts = packageJson.scripts || {};
+			if (!packageJson.scripts["check-types"]) packageJson.scripts["check-types"] = "tsc --noEmit";
+			await fs.writeJson(packageJsonPath, packageJson, { spaces: 2 });
+		},
+		catch: (e) => new AddonSetupError({
+			addon: "tui",
+			message: `Failed to normalize OpenTUI package.json: ${e instanceof Error ? e.message : String(e)}`,
+			cause: e
+		})
+	});
+	if (packageJsonResult.isErr()) return packageJsonResult;
+	for (const lockfile of TUI_LOCKFILES) {
+		const lockfilePath = path.join(tuiDir, lockfile);
+		const removeLockfileResult = await Result.tryPromise({
+			try: async () => {
+				if (await fs.pathExists(lockfilePath)) await fs.remove(lockfilePath);
+			},
+			catch: (e) => new AddonSetupError({
+				addon: "tui",
+				message: `Failed to remove nested OpenTUI lockfile '${lockfile}': ${e instanceof Error ? e.message : String(e)}`,
+				cause: e
+			})
+		});
+		if (removeLockfileResult.isErr()) return removeLockfileResult;
+	}
+	return Result.ok(void 0);
+}
 //#endregion
 //#region src/helpers/addons/ultracite-setup.ts
 const LINTERS = {
@@ -2435,6 +2679,10 @@ const HOOKS = {
 	windsurf: { label: "Windsurf" },
 	claude: { label: "Claude" }
 };
+const DEFAULT_LINTER = "biome";
+const DEFAULT_EDITORS = ["vscode", "cursor"];
+const DEFAULT_AGENTS = ["claude", "codex"];
+const DEFAULT_HOOKS = [];
 function getFrameworksFromFrontend(frontend) {
 	const frameworkMap = {
 		"tanstack-router": "react",
@@ -2452,70 +2700,7 @@ function getFrameworksFromFrontend(frontend) {
 	for (const f of frontend) if (f !== "none" && frameworkMap[f]) frameworks.add(frameworkMap[f]);
 	return Array.from(frameworks);
 }
-async function setupUltracite(config, gitHooks) {
-	if (shouldSkipExternalCommands()) return Result.ok(void 0);
-	const { packageManager, projectDir, frontend } = config;
-	log.info("Setting up Ultracite...");
-	let result;
-	const groupResult = await Result.tryPromise({
-		try: async () => {
-			return await group({
-				linter: () => select({
-					message: "Choose linter/formatter",
-					options: Object.entries(LINTERS).map(([key, linter]) => ({
-						value: key,
-						label: linter.label,
-						hint: linter.hint
-					})),
-					initialValue: "biome"
-				}),
-				editors: () => multiselect({
-					message: "Choose editors",
-					options: Object.entries(EDITORS).map(([key, editor]) => ({
-						value: key,
-						label: editor.label
-					})),
-					required: true
-				}),
-				agents: () => multiselect({
-					message: "Choose agents",
-					options: Object.entries(AGENTS).map(([key, agent]) => ({
-						value: key,
-						label: agent.label
-					})),
-					required: true
-				}),
-				hooks: () => multiselect({
-					message: "Choose hooks",
-					options: Object.entries(HOOKS).map(([key, hook]) => ({
-						value: key,
-						label: hook.label
-					}))
-				})
-			}, { onCancel: () => {
-				throw new UserCancelledError({ message: "Operation cancelled" });
-			} });
-		},
-		catch: (e) => {
-			if (e instanceof UserCancelledError) return e;
-			return new AddonSetupError({
-				addon: "ultracite",
-				message: `Failed to get user preferences: ${e instanceof Error ? e.message : String(e)}`,
-				cause: e
-			});
-		}
-	});
-	if (groupResult.isErr()) {
-		if (UserCancelledError.is(groupResult.error)) return userCancelled(groupResult.error.message);
-		log.error(pc.red("Failed to set up Ultracite"));
-		return groupResult;
-	}
-	result = groupResult.value;
-	const linter = result.linter;
-	const editors = result.editors;
-	const agents = result.agents;
-	const hooks = result.hooks;
-	const frameworks = getFrameworksFromFrontend(frontend);
+function buildUltraciteInitArgs({ packageManager, linter, frameworks, editors, agents, hooks, gitHooks }) {
 	const ultraciteArgs = [
 		"init",
 		"--pm",
@@ -2528,12 +2713,105 @@ async function setupUltracite(config, gitHooks) {
 	if (agents.length > 0) ultraciteArgs.push("--agents", ...agents);
 	if (hooks.length > 0) ultraciteArgs.push("--hooks", ...hooks);
 	if (gitHooks.length > 0) {
-		const integrations = [...gitHooks];
-		if (gitHooks.includes("husky")) integrations.push("lint-staged");
+		const integrations = gitHooks.includes("husky") ? [...new Set([...gitHooks, "lint-staged"])] : gitHooks;
 		ultraciteArgs.push("--integrations", ...integrations);
 	}
-	const args = getPackageExecutionArgs(packageManager, `ultracite@latest ${ultraciteArgs.join(" ")} --skip-install`);
-	const s = spinner();
+	return [
+		...getPackageRunnerPrefix(packageManager),
+		"ultracite@latest",
+		...ultraciteArgs,
+		"--skip-install",
+		"--quiet"
+	];
+}
+async function setupUltracite(config, gitHooks) {
+	if (shouldSkipExternalCommands()) return Result.ok(void 0);
+	const { packageManager, projectDir, frontend } = config;
+	cliLog.info("Setting up Ultracite...");
+	const configuredOptions = config.addonOptions?.ultracite;
+	let linter = configuredOptions?.linter;
+	let editors = configuredOptions?.editors;
+	let agents = configuredOptions?.agents;
+	let hooks = configuredOptions?.hooks;
+	if (!linter || !editors || !agents || !hooks) if (isSilent()) {
+		linter = linter ?? DEFAULT_LINTER;
+		editors = editors ?? [...DEFAULT_EDITORS];
+		agents = agents ?? [...DEFAULT_AGENTS];
+		hooks = hooks ?? [...DEFAULT_HOOKS];
+	} else {
+		const groupResult = await Result.tryPromise({
+			try: async () => {
+				return await group({
+					linter: () => select({
+						message: "Choose linter/formatter",
+						options: Object.entries(LINTERS).map(([key, linterOption]) => ({
+							value: key,
+							label: linterOption.label,
+							hint: linterOption.hint
+						})),
+						initialValue: linter ?? DEFAULT_LINTER
+					}),
+					editors: () => multiselect({
+						message: "Choose editors",
+						required: false,
+						options: Object.entries(EDITORS).map(([key, editor]) => ({
+							value: key,
+							label: editor.label
+						})),
+						initialValues: editors ?? [...DEFAULT_EDITORS]
+					}),
+					agents: () => multiselect({
+						message: "Choose agents",
+						required: false,
+						options: Object.entries(AGENTS).map(([key, agent]) => ({
+							value: key,
+							label: agent.label
+						})),
+						initialValues: agents ?? [...DEFAULT_AGENTS]
+					}),
+					hooks: () => multiselect({
+						message: "Choose hooks",
+						required: false,
+						options: Object.entries(HOOKS).map(([key, hook]) => ({
+							value: key,
+							label: hook.label
+						})),
+						initialValues: hooks ?? [...DEFAULT_HOOKS]
+					})
+				}, { onCancel: () => {
+					throw new UserCancelledError({ message: "Operation cancelled" });
+				} });
+			},
+			catch: (e) => {
+				if (e instanceof UserCancelledError) return e;
+				return new AddonSetupError({
+					addon: "ultracite",
+					message: `Failed to get user preferences: ${e instanceof Error ? e.message : String(e)}`,
+					cause: e
+				});
+			}
+		});
+		if (groupResult.isErr()) {
+			if (UserCancelledError.is(groupResult.error)) return userCancelled(groupResult.error.message);
+			cliLog.error(pc.red("Failed to set up Ultracite"));
+			return groupResult;
+		}
+		linter = groupResult.value.linter;
+		editors = groupResult.value.editors;
+		agents = groupResult.value.agents;
+		hooks = groupResult.value.hooks;
+	}
+	const frameworks = getFrameworksFromFrontend(frontend);
+	const args = buildUltraciteInitArgs({
+		packageManager,
+		linter,
+		frameworks,
+		editors,
+		agents,
+		hooks,
+		gitHooks
+	});
+	const s = createSpinner();
 	s.start("Running Ultracite init command...");
 	const initResult = await Result.tryPromise({
 		try: async () => {
@@ -2552,13 +2830,12 @@ async function setupUltracite(config, gitHooks) {
 		}
 	});
 	if (initResult.isErr()) {
-		log.error(pc.red("Failed to set up Ultracite"));
+		cliLog.error(pc.red("Failed to set up Ultracite"));
 		return initResult;
 	}
 	s.stop("Ultracite setup successfully!");
 	return Result.ok(void 0);
 }
-
 //#endregion
 //#region src/helpers/addons/wxt-setup.ts
 const TEMPLATES = {
@@ -2583,20 +2860,29 @@ const TEMPLATES = {
 		hint: "Svelte template"
 	}
 };
+const DEFAULT_TEMPLATE = "react";
+const DEFAULT_DEV_PORT = 5555;
 async function setupWxt(config) {
 	if (shouldSkipExternalCommands()) return Result.ok(void 0);
 	const { packageManager, projectDir } = config;
-	log.info("Setting up WXT...");
-	const template = await select({
-		message: "Choose a template",
-		options: Object.entries(TEMPLATES).map(([key, template]) => ({
-			value: key,
-			label: template.label,
-			hint: template.hint
-		})),
-		initialValue: "react"
-	});
-	if (isCancel(template)) return userCancelled("Operation cancelled");
+	cliLog.info("Setting up WXT...");
+	const configuredOptions = config.addonOptions?.wxt;
+	let template = configuredOptions?.template;
+	if (!template) if (isSilent()) template = DEFAULT_TEMPLATE;
+	else {
+		const selectedTemplate = await select({
+			message: "Choose a template",
+			options: Object.entries(TEMPLATES).map(([key, templateOption]) => ({
+				value: key,
+				label: templateOption.label,
+				hint: templateOption.hint
+			})),
+			initialValue: DEFAULT_TEMPLATE
+		});
+		if (isCancel(selectedTemplate)) return userCancelled("Operation cancelled");
+		template = selectedTemplate;
+	}
+	const devPort = configuredOptions?.devPort ?? DEFAULT_DEV_PORT;
 	const args = getPackageExecutionArgs(packageManager, `wxt@latest init extension --template ${template} --pm ${packageManager}`);
 	const appsDir = path.join(projectDir, "apps");
 	const ensureDirResult = await Result.tryPromise({
@@ -2608,7 +2894,7 @@ async function setupWxt(config) {
 		})
 	});
 	if (ensureDirResult.isErr()) return ensureDirResult;
-	const s = spinner();
+	const s = createSpinner();
 	s.start("Running WXT init command...");
 	const initResult = await Result.tryPromise({
 		try: async () => {
@@ -2627,7 +2913,7 @@ async function setupWxt(config) {
 		}
 	});
 	if (initResult.isErr()) {
-		log.error(pc.red("Failed to set up WXT"));
+		cliLog.error(pc.red("Failed to set up WXT"));
 		return initResult;
 	}
 	const extensionDir = path.join(projectDir, "apps", "extension");
@@ -2637,7 +2923,7 @@ async function setupWxt(config) {
 			if (await fs.pathExists(packageJsonPath)) {
 				const packageJson = await fs.readJson(packageJsonPath);
 				packageJson.name = "extension";
-				if (packageJson.scripts?.dev) packageJson.scripts.dev = `${packageJson.scripts.dev} --port 5555`;
+				if (packageJson.scripts?.dev) packageJson.scripts.dev = `${packageJson.scripts.dev} --port ${devPort}`;
 				await fs.writeJson(packageJsonPath, packageJson, { spaces: 2 });
 			}
 		},
@@ -2646,11 +2932,10 @@ async function setupWxt(config) {
 			message: `Failed to update package.json: ${e instanceof Error ? e.message : String(e)}`,
 			cause: e
 		})
-	})).isErr()) log.warn(pc.yellow("WXT setup completed but failed to update package.json"));
+	})).isErr()) cliLog.warn(pc.yellow("WXT setup completed but failed to update package.json"));
 	s.stop("WXT setup complete!");
 	return Result.ok(void 0);
 }
-
 //#endregion
 //#region src/helpers/addons/addons-setup.ts
 async function runSetup(setupFn) {
@@ -2747,7 +3032,6 @@ async function setupLefthook(projectDir) {
 		projectDir
 	});
 }
-
 //#endregion
 //#region src/helpers/core/detect-project-config.ts
 async function detectProjectConfig(projectDir) {
@@ -2757,6 +3041,8 @@ async function detectProjectConfig(projectDir) {
 			if (btsConfig) return {
 				projectDir,
 				projectName: path.basename(projectDir),
+				addonOptions: btsConfig.addonOptions,
+				dbSetupOptions: btsConfig.dbSetupOptions,
 				database: btsConfig.database,
 				orm: btsConfig.orm,
 				backend: btsConfig.backend,
@@ -2778,12 +3064,11 @@ async function detectProjectConfig(projectDir) {
 	});
 	return result.isOk() ? result.value : null;
 }
-
 //#endregion
 //#region src/helpers/core/install-dependencies.ts
 async function installDependencies({ projectDir, packageManager }) {
 	if (shouldSkipExternalCommands()) return Result.ok(void 0);
-	const s = spinner();
+	const s = createSpinner();
 	s.start(`Running ${packageManager} install...`);
 	const result = await Result.tryPromise({
 		try: async () => {
@@ -2802,9 +3087,21 @@ async function installDependencies({ projectDir, packageManager }) {
 	else s.stop(pc.red("Failed to install dependencies"));
 	return result;
 }
-
 //#endregion
 //#region src/helpers/core/add-handler.ts
+function mergeAddonOptions(existingAddonOptions, nextAddonOptions) {
+	if (!existingAddonOptions && !nextAddonOptions) return;
+	const mergedAddonOptions = { ...existingAddonOptions };
+	if (nextAddonOptions) for (const addonKey of Object.keys(nextAddonOptions)) {
+		const existingOptionsForAddon = existingAddonOptions?.[addonKey];
+		const nextOptionsForAddon = nextAddonOptions[addonKey];
+		mergedAddonOptions[addonKey] = existingOptionsForAddon && nextOptionsForAddon ? {
+			...existingOptionsForAddon,
+			...nextOptionsForAddon
+		} : nextOptionsForAddon;
+	}
+	return Object.keys(mergedAddonOptions).length > 0 ? mergedAddonOptions : void 0;
+}
 async function addHandler(input, options = {}) {
 	const { silent = false } = options;
 	return runWithContextAsync({ silent }, async () => {
@@ -2832,6 +3129,11 @@ async function addHandler(input, options = {}) {
 }
 async function addHandlerInternal(input) {
 	const projectDir = input.projectDir || process.cwd();
+	const hardeningResult = validateAgentSafePathInput(projectDir, "projectDir");
+	if (hardeningResult.isErr()) return Result.err(new CLIError({
+		message: hardeningResult.error.message,
+		cause: hardeningResult.error
+	}));
 	if (!isSilent()) {
 		renderTitle();
 		intro(pc.magenta("Add addons to your Better-T-Stack project"));
@@ -2850,7 +3152,8 @@ async function addHandlerInternal(input) {
 				projectDir
 			});
 		}
-	} else {
+	} else if (isSilent()) return Result.err(new CLIError({ message: "Addons are required in silent mode. Provide them via add() or add-json." }));
+	else {
 		const promptResult = await Result.tryPromise({
 			try: () => getAddonsToAdd(existingConfig.frontend, existingConfig.addons, existingConfig.auth),
 			catch: (e) => {
@@ -2878,10 +3181,12 @@ async function addHandlerInternal(input) {
 	}
 	if (!isSilent()) log.info(pc.cyan(`Adding addons: ${addonsToAdd.join(", ")}`));
 	const updatedAddons = [...existingConfig.addons, ...addonsToAdd];
+	const mergedAddonOptions = mergeAddonOptions(existingConfig.addonOptions, input.addonOptions);
 	const config = {
 		projectName: existingConfig.projectName,
 		projectDir,
 		relativePath: ".",
+		addonOptions: mergedAddonOptions,
 		database: existingConfig.database,
 		orm: existingConfig.orm,
 		backend: existingConfig.backend,
@@ -2910,12 +3215,27 @@ async function addHandlerInternal(input) {
 	}
 	await processAddonTemplates(vfs, EMBEDDED_TEMPLATES, config);
 	processAddonsDeps(vfs, config);
-	const writeResult = await writeTree({
+	const tree = {
 		root: vfs.toTree(""),
 		fileCount: vfs.getFileCount(),
 		directoryCount: vfs.getDirectoryCount(),
 		config
-	}, projectDir);
+	};
+	if (input.dryRun) {
+		if (!isSilent()) {
+			log.success(pc.green("Dry run validation passed. No addon files were written."));
+			log.info(pc.dim(`Planned addon files: ${vfs.getFileCount()}`));
+			outro(pc.magenta("Dry run complete."));
+		}
+		return Result.ok({
+			success: true,
+			addedAddons: addonsToAdd,
+			projectDir,
+			dryRun: true,
+			plannedFileCount: vfs.getFileCount()
+		});
+	}
+	const writeResult = await writeTree(tree, projectDir);
 	if (writeResult.isErr()) return Result.err(new CLIError({ message: `Failed to write addon files: ${writeResult.error.message}` }));
 	if (vfs.getFileCount() > 0 && !isSilent()) log.info(pc.dim(`Wrote ${vfs.getFileCount()} addon files`));
 	const setupResult = await Result.tryPromise({
@@ -2929,7 +3249,10 @@ async function addHandlerInternal(input) {
 		}
 	});
 	if (setupResult.isErr()) return Result.err(setupResult.error);
-	await updateBtsConfig(projectDir, { addons: updatedAddons });
+	await updateBtsConfig(projectDir, {
+		addons: updatedAddons,
+		addonOptions: config.addonOptions
+	});
 	if (input.install) {
 		if (!isSilent()) log.info(pc.dim("Installing dependencies..."));
 		await installDependencies({
@@ -2945,10 +3268,10 @@ async function addHandlerInternal(input) {
 	return Result.ok({
 		success: true,
 		addedAddons: addonsToAdd,
-		projectDir
+		projectDir,
+		plannedFileCount: vfs.getFileCount()
 	});
 }
-
 //#endregion
 //#region src/prompts/api.ts
 async function getApiChoice(Api, frontend, backend) {
@@ -2976,7 +3299,6 @@ async function getApiChoice(Api, frontend, backend) {
 	if (isCancel$1(apiType)) throw new UserCancelledError({ message: "Operation cancelled" });
 	return apiType;
 }
-
 //#endregion
 //#region src/prompts/auth.ts
 async function getAuthChoice(auth, backend, frontend) {
@@ -3040,7 +3362,6 @@ async function getAuthChoice(auth, backend, frontend) {
 	if (isCancel$1(response)) throw new UserCancelledError({ message: "Operation cancelled" });
 	return response;
 }
-
 //#endregion
 //#region src/prompts/backend.ts
 const FULLSTACK_FRONTENDS = [
@@ -3094,7 +3415,6 @@ async function getBackendFrameworkChoice(backendFramework, frontends) {
 	if (isCancel$1(response)) throw new UserCancelledError({ message: "Operation cancelled" });
 	return response;
 }
-
 //#endregion
 //#region src/prompts/database.ts
 async function getDatabaseChoice(database, backend, runtime) {
@@ -3135,7 +3455,6 @@ async function getDatabaseChoice(database, backend, runtime) {
 	if (isCancel$1(response)) throw new UserCancelledError({ message: "Operation cancelled" });
 	return response;
 }
-
 //#endregion
 //#region src/prompts/database-setup.ts
 async function getDBSetupChoice(databaseType, dbSetup, _orm, backend, runtime) {
@@ -3235,7 +3554,6 @@ async function getDBSetupChoice(databaseType, dbSetup, _orm, backend, runtime) {
 	if (isCancel$1(response)) throw new UserCancelledError({ message: "Operation cancelled" });
 	return response;
 }
-
 //#endregion
 //#region src/prompts/examples.ts
 async function getExamplesChoice(examples, database, frontends, backend, api) {
@@ -3263,7 +3581,6 @@ async function getExamplesChoice(examples, database, frontends, backend, api) {
 	if (isCancel$1(response)) throw new UserCancelledError({ message: "Operation cancelled" });
 	return response;
 }
-
 //#endregion
 //#region src/prompts/frontend.ts
 async function getFrontendChoice(frontendOptions, backend, auth) {
@@ -3381,7 +3698,6 @@ async function getFrontendChoice(frontendOptions, backend, auth) {
 		return result;
 	}
 }
-
 //#endregion
 //#region src/prompts/git.ts
 async function getGitChoice(git) {
@@ -3393,7 +3709,6 @@ async function getGitChoice(git) {
 	if (isCancel$1(response)) throw new UserCancelledError({ message: "Operation cancelled" });
 	return response;
 }
-
 //#endregion
 //#region src/prompts/install.ts
 async function getinstallChoice(install) {
@@ -3405,7 +3720,6 @@ async function getinstallChoice(install) {
 	if (isCancel$1(response)) throw new UserCancelledError({ message: "Operation cancelled" });
 	return response;
 }
-
 //#endregion
 //#region src/prompts/navigable-group.ts
 /**
@@ -3462,7 +3776,6 @@ async function navigableGroup(prompts, opts) {
 	setIsFirstPrompt$1(false);
 	return results;
 }
-
 //#endregion
 //#region src/prompts/orm.ts
 const ormOptions = {
@@ -3494,7 +3807,6 @@ async function getORMChoice(orm, hasDatabase, database, backend, runtime) {
 	if (isCancel$1(response)) throw new UserCancelledError({ message: "Operation cancelled" });
 	return response;
 }
-
 //#endregion
 //#region src/prompts/package-manager.ts
 async function getPackageManagerChoice(packageManager) {
@@ -3523,7 +3835,6 @@ async function getPackageManagerChoice(packageManager) {
 	if (isCancel$1(response)) throw new UserCancelledError({ message: "Operation cancelled" });
 	return response;
 }
-
 //#endregion
 //#region src/prompts/payments.ts
 async function getPaymentsChoice(payments, auth, backend, frontends) {
@@ -3546,7 +3857,6 @@ async function getPaymentsChoice(payments, auth, backend, frontends) {
 	if (isCancel$1(response)) throw new UserCancelledError({ message: "Operation cancelled" });
 	return response;
 }
-
 //#endregion
 //#region src/prompts/runtime.ts
 async function getRuntimeChoice(runtime, backend) {
@@ -3574,7 +3884,6 @@ async function getRuntimeChoice(runtime, backend) {
 	if (isCancel$1(response)) throw new UserCancelledError({ message: "Operation cancelled" });
 	return response;
 }
-
 //#endregion
 //#region src/prompts/server-deploy.ts
 async function getServerDeploymentChoice(deployment, runtime, backend, _webDeploy) {
@@ -3584,7 +3893,6 @@ async function getServerDeploymentChoice(deployment, runtime, backend, _webDeplo
 	if (runtime === "workers") return "cloudflare";
 	return "none";
 }
-
 //#endregion
 //#region src/prompts/web-deploy.ts
 function hasWebFrontend(frontends) {
@@ -3618,7 +3926,6 @@ async function getDeploymentChoice(deployment, _runtime, _backend, frontend = []
 	if (isCancel$1(response)) throw new UserCancelledError({ message: "Operation cancelled" });
 	return response;
 }
-
 //#endregion
 //#region src/prompts/config-prompts.ts
 async function gatherConfig(flags, projectName, projectDir, relativePath) {
@@ -3626,6 +3933,8 @@ async function gatherConfig(flags, projectName, projectDir, relativePath) {
 		projectName,
 		projectDir,
 		relativePath,
+		addonOptions: flags.addonOptions,
+		dbSetupOptions: flags.dbSetupOptions,
 		frontend: flags.frontend ?? [...DEFAULT_CONFIG.frontend],
 		backend: flags.backend ?? DEFAULT_CONFIG.backend,
 		runtime: flags.runtime ?? DEFAULT_CONFIG.runtime,
@@ -3667,6 +3976,8 @@ async function gatherConfig(flags, projectName, projectDir, relativePath) {
 		projectName,
 		projectDir,
 		relativePath,
+		addonOptions: flags.addonOptions,
+		dbSetupOptions: flags.dbSetupOptions,
 		frontend: result.frontend,
 		backend: result.backend,
 		runtime: result.runtime,
@@ -3685,7 +3996,6 @@ async function gatherConfig(flags, projectName, projectDir, relativePath) {
 		serverDeploy: result.serverDeploy
 	};
 }
-
 //#endregion
 //#region src/prompts/project-name.ts
 function isPathWithinCwd$1(targetPath) {
@@ -3735,7 +4045,6 @@ async function getProjectName(initialName) {
 	}
 	return projectPath;
 }
-
 //#endregion
 //#region src/utils/telemetry.ts
 /**
@@ -3751,7 +4060,6 @@ function isTelemetryEnabled() {
 	if (BTS_TELEMETRY !== void 0) return BTS_TELEMETRY === "1";
 	return true;
 }
-
 //#endregion
 //#region src/utils/analytics.ts
 const CONVEX_INGEST_URL = "https://striped-seahorse-863.convex.site/api/analytics/ingest";
@@ -3778,7 +4086,6 @@ async function trackProjectCreation(config, disableAnalytics = false) {
 		catch: () => void 0
 	});
 }
-
 //#endregion
 //#region src/utils/display-config.ts
 function displayConfig(config) {
@@ -3821,7 +4128,6 @@ function displayConfig(config) {
 	if (configDisplay.length === 0) return pc.yellow("No configuration selected.");
 	return configDisplay.join("\n");
 }
-
 //#endregion
 //#region src/utils/project-directory.ts
 async function handleDirectoryConflict(currentPathInput) {
@@ -3909,10 +4215,11 @@ async function setupProjectDirectory(finalPathInput, shouldClearDirectory) {
 		finalBaseName
 	};
 }
-
 //#endregion
 //#region src/utils/project-name-validation.ts
 function validateProjectName(name) {
+	const hardeningResult = validateAgentSafePathInput(name, "projectName");
+	if (hardeningResult.isErr()) return Result.err(hardeningResult.error);
 	const result = types_exports.ProjectNameSchema.safeParse(name);
 	if (!result.success) return Result.err(new ValidationError({
 		field: "projectName",
@@ -3922,13 +4229,20 @@ function validateProjectName(name) {
 	return Result.ok(void 0);
 }
 function extractAndValidateProjectName(projectName, projectDirectory) {
+	if (projectName) {
+		const projectNameInputResult = validateAgentSafePathInput(projectName, "projectName");
+		if (projectNameInputResult.isErr()) return Result.err(projectNameInputResult.error);
+	}
+	if (projectDirectory) {
+		const projectDirInputResult = validateAgentSafePathInput(projectDirectory, "projectDirectory");
+		if (projectDirInputResult.isErr()) return Result.err(projectDirInputResult.error);
+	}
 	const derivedName = projectName || (projectDirectory ? path.basename(path.resolve(process.cwd(), projectDirectory)) : "");
 	if (!derivedName) return Result.ok("");
 	const validationResult = validateProjectName(projectName ? path.basename(projectName) : derivedName);
 	if (validationResult.isErr()) return Result.err(validationResult.error);
 	return Result.ok(projectName || derivedName);
 }
-
 //#endregion
 //#region src/utils/templates.ts
 const TEMPLATE_PRESETS = {
@@ -4009,7 +4323,6 @@ function getTemplateDescription(template) {
 		none: "No template - Full customization"
 	}[template] || "";
 }
-
 //#endregion
 //#region src/utils/config-processing.ts
 function processArrayOption(options) {
@@ -4025,6 +4338,8 @@ function deriveProjectName(projectName, projectDirectory) {
 function processFlags(options, projectName) {
 	const config = {};
 	if (options.api) config.api = options.api;
+	if (options.addonOptions) config.addonOptions = options.addonOptions;
+	if (options.dbSetupOptions) config.dbSetupOptions = options.dbSetupOptions;
 	if (options.backend) config.backend = options.backend;
 	if (options.database) config.database = options.database;
 	if (options.orm) config.orm = options.orm;
@@ -4061,7 +4376,6 @@ function validateArrayOptions(options) {
 	if (examplesResult.isErr()) return examplesResult;
 	return Result.ok(void 0);
 }
-
 //#endregion
 //#region src/utils/config-validation.ts
 function validationErr(message) {
@@ -4244,7 +4558,6 @@ function validateConfigForProgrammaticUse(config) {
 		return Result.ok(void 0);
 	});
 }
-
 //#endregion
 //#region src/validation.ts
 const CORE_STACK_FLAGS = new Set([
@@ -4304,7 +4617,6 @@ function validateConfigCompatibility(config, providedFlags, options) {
 	if (options && providedFlags) return validateFullConfig(config, providedFlags, options);
 	else return validateConfigForProgrammaticUse(config);
 }
-
 //#endregion
 //#region src/utils/file-formatter.ts
 const formatOptions = {
@@ -4349,7 +4661,6 @@ async function formatProject(projectDir) {
 		})
 	});
 }
-
 //#endregion
 //#region src/utils/env-utils.ts
 async function addEnvVariablesToFile(envPath, variables) {
@@ -4379,7 +4690,6 @@ async function addEnvVariablesToFile(envPath, variables) {
 	if (newLines.length > 0 && newLines[newLines.length - 1] === "") newLines.pop();
 	if (foundKeys.size > 0 || keysToAdd.size > foundKeys.size) await fs.writeFile(envPath, newLines.join("\n") + "\n");
 }
-
 //#endregion
 //#region src/helpers/database-providers/d1-setup.ts
 async function setupCloudflareD1(config) {
@@ -4405,7 +4715,6 @@ async function setupCloudflareD1(config) {
 		})
 	});
 }
-
 //#endregion
 //#region src/helpers/database-providers/docker-compose-setup.ts
 async function setupDockerCompose(config) {
@@ -4439,7 +4748,6 @@ function getDatabaseUrl(database, projectName) {
 		default: return "";
 	}
 }
-
 //#endregion
 //#region src/utils/command-exists.ts
 async function commandExists(command) {
@@ -4452,28 +4760,58 @@ async function commandExists(command) {
 	});
 	return result.isOk() ? result.value : false;
 }
-
+//#endregion
+//#region src/helpers/core/db-setup-options.ts
+const REMOTE_PROVISIONING_DB_SETUPS = [
+	"turso",
+	"neon",
+	"prisma-postgres",
+	"supabase",
+	"mongodb-atlas"
+];
+function requiresProvisioningGuardrails(dbSetup) {
+	return REMOTE_PROVISIONING_DB_SETUPS.includes(dbSetup);
+}
+function resolveDbSetupMode(dbSetup, cliOptions = {}) {
+	if (dbSetup === "none") return;
+	const explicitMode = cliOptions.dbSetupOptions?.mode;
+	if (explicitMode) return explicitMode;
+	if (cliOptions.manualDb === true) return "manual";
+	if (isSilent() && requiresProvisioningGuardrails(dbSetup)) return "manual";
+}
+function mergeResolvedDbSetupOptions(dbSetup, dbSetupOptions, cliOptions = {}) {
+	if (dbSetup === "none") return;
+	const resolvedMode = resolveDbSetupMode(dbSetup, {
+		...cliOptions,
+		dbSetupOptions: dbSetupOptions ?? cliOptions.dbSetupOptions
+	});
+	if (!dbSetupOptions && !resolvedMode) return;
+	return {
+		...dbSetupOptions,
+		...resolvedMode ? { mode: resolvedMode } : {}
+	};
+}
 //#endregion
 //#region src/helpers/database-providers/mongodb-atlas-setup.ts
 async function checkAtlasCLI() {
 	const exists = await commandExists("atlas");
-	if (exists) log.info("MongoDB Atlas CLI found");
-	else log.warn(pc.yellow("MongoDB Atlas CLI not found"));
+	if (exists) cliLog.info("MongoDB Atlas CLI found");
+	else cliLog.warn(pc.yellow("MongoDB Atlas CLI not found"));
 	return exists;
 }
 async function initMongoDBAtlas(serverDir) {
 	if (!await checkAtlasCLI()) {
-		log.info(pc.yellow("Please install it from: https://www.mongodb.com/docs/atlas/cli/current/install-atlas-cli/"));
+		cliLog.info(pc.yellow("Please install it from: https://www.mongodb.com/docs/atlas/cli/current/install-atlas-cli/"));
 		return databaseSetupError("mongodb-atlas", "MongoDB Atlas CLI not found");
 	}
-	log.info("Running MongoDB Atlas setup...");
+	cliLog.info("Running MongoDB Atlas setup...");
 	const deployResult = await Result.tryPromise({
 		try: async () => {
 			await $({
 				cwd: serverDir,
 				stdio: "inherit"
 			})`atlas deployments setup`;
-			log.success("MongoDB Atlas deployment ready");
+			cliLog.success("MongoDB Atlas deployment ready");
 		},
 		catch: (e) => new DatabaseSetupError({
 			provider: "mongodb-atlas",
@@ -4514,7 +4852,7 @@ async function writeEnvFile$3(projectDir, backend, config) {
 	});
 }
 function displayManualSetupInstructions$3() {
-	log.info(`
+	cliLog.info(`
 ${pc.green("MongoDB Atlas Manual Setup Instructions:")}
 
 1. Install Atlas CLI:
@@ -4532,7 +4870,10 @@ ${pc.green("MongoDB Atlas Manual Setup Instructions:")}
 }
 async function setupMongoDBAtlas(config, cliInput) {
 	const { projectDir, backend } = config;
-	const manualDb = cliInput?.manualDb ?? false;
+	const setupMode = resolveDbSetupMode("mongodb-atlas", {
+		manualDb: cliInput?.manualDb,
+		dbSetupOptions: cliInput?.dbSetupOptions ?? config.dbSetupOptions
+	});
 	const serverDir = path.join(projectDir, "packages/db");
 	const ensureDirResult = await Result.tryPromise({
 		try: () => fs.ensureDir(serverDir),
@@ -4543,29 +4884,40 @@ async function setupMongoDBAtlas(config, cliInput) {
 		})
 	});
 	if (ensureDirResult.isErr()) return ensureDirResult;
-	if (manualDb) {
-		log.info("MongoDB Atlas manual setup selected");
+	if (setupMode === "manual") {
+		cliLog.info("MongoDB Atlas manual setup selected");
 		const envResult = await writeEnvFile$3(projectDir, backend);
 		if (envResult.isErr()) return envResult;
 		displayManualSetupInstructions$3();
 		return Result.ok(void 0);
 	}
-	const mode = await select({
-		message: "MongoDB Atlas setup: choose mode",
-		options: [{
-			label: "Automatic",
-			value: "auto",
-			hint: "Automated setup with provider CLI, sets .env"
-		}, {
-			label: "Manual",
-			value: "manual",
-			hint: "Manual setup, add env vars yourself"
-		}],
-		initialValue: "auto"
-	});
-	if (isCancel(mode)) return userCancelled("Operation cancelled");
+	let mode = setupMode;
+	if (!mode) {
+		if (isSilent()) {
+			cliLog.warn(pc.yellow("MongoDB Atlas automatic setup requires interactive input. Falling back to manual setup."));
+			const envResult = await writeEnvFile$3(projectDir, backend);
+			if (envResult.isErr()) return envResult;
+			displayManualSetupInstructions$3();
+			return Result.ok(void 0);
+		}
+		const promptedMode = await select({
+			message: "MongoDB Atlas setup: choose mode",
+			options: [{
+				label: "Automatic",
+				value: "auto",
+				hint: "Automated setup with provider CLI, sets .env"
+			}, {
+				label: "Manual",
+				value: "manual",
+				hint: "Manual setup, add env vars yourself"
+			}],
+			initialValue: "auto"
+		});
+		if (isCancel(promptedMode)) return userCancelled("Operation cancelled");
+		mode = promptedMode;
+	}
 	if (mode === "manual") {
-		log.info("MongoDB Atlas manual setup selected");
+		cliLog.info("MongoDB Atlas manual setup selected");
 		const envResult = await writeEnvFile$3(projectDir, backend);
 		if (envResult.isErr()) return envResult;
 		displayManualSetupInstructions$3();
@@ -4575,17 +4927,16 @@ async function setupMongoDBAtlas(config, cliInput) {
 	if (mongoConfigResult.isOk()) {
 		const envResult = await writeEnvFile$3(projectDir, backend, mongoConfigResult.value);
 		if (envResult.isErr()) return envResult;
-		log.success(pc.green("MongoDB Atlas setup complete! Connection saved to .env file."));
+		cliLog.success(pc.green("MongoDB Atlas setup complete! Connection saved to .env file."));
 		return Result.ok(void 0);
 	}
 	if (UserCancelledError.is(mongoConfigResult.error)) return mongoConfigResult;
-	log.warn(pc.yellow("Falling back to local MongoDB configuration"));
+	cliLog.warn(pc.yellow("Falling back to local MongoDB configuration"));
 	const envResult = await writeEnvFile$3(projectDir, backend);
 	if (envResult.isErr()) return envResult;
 	displayManualSetupInstructions$3();
 	return Result.ok(void 0);
 }
-
 //#endregion
 //#region src/helpers/database-providers/neon-setup.ts
 const NEON_REGIONS = [
@@ -4623,7 +4974,7 @@ const NEON_REGIONS = [
 	}
 ];
 async function executeNeonCommand(packageManager, commandArgsString, spinnerText) {
-	const s = spinner();
+	const s = createSpinner();
 	const args = getPackageExecutionArgs(packageManager, commandArgsString);
 	if (spinnerText) s.start(spinnerText);
 	return Result.tryPromise({
@@ -4686,7 +5037,7 @@ async function writeEnvFile$2(projectDir, backend, config) {
 	});
 }
 async function setupWithNeonDb(projectDir, packageManager, backend) {
-	const s = spinner();
+	const s = createSpinner();
 	s.start("Creating Neon database using get-db...");
 	const targetApp = backend === "self" ? "apps/web" : "apps/server";
 	const targetDir = path.join(projectDir, targetApp);
@@ -4719,7 +5070,7 @@ async function setupWithNeonDb(projectDir, packageManager, backend) {
 	});
 }
 function displayManualSetupInstructions$2(target) {
-	log.info(`Manual Neon PostgreSQL Setup Instructions:
+	cliLog.info(`Manual Neon PostgreSQL Setup Instructions:
 
 1. Get Neon with Better T Stack referral: https://get.neon.com/sbA3tIe
 2. Create a new project from the dashboard
@@ -4730,80 +5081,105 @@ DATABASE_URL="your_connection_string"`);
 }
 async function setupNeonPostgres(config, cliInput) {
 	const { packageManager, projectDir, backend } = config;
-	const manualDb = cliInput?.manualDb ?? false;
+	const setupMode = resolveDbSetupMode("neon", {
+		manualDb: cliInput?.manualDb,
+		dbSetupOptions: cliInput?.dbSetupOptions ?? config.dbSetupOptions
+	});
 	const target = backend === "self" ? "apps/web" : "apps/server";
-	if (manualDb) {
+	if (setupMode === "manual") {
 		const envResult = await writeEnvFile$2(projectDir, backend);
 		if (envResult.isErr()) return envResult;
 		displayManualSetupInstructions$2(target);
 		return Result.ok(void 0);
 	}
-	const mode = await select({
-		message: "Neon setup: choose mode",
-		options: [{
-			label: "Automatic",
-			value: "auto",
-			hint: "Automated setup with provider CLI, sets .env"
-		}, {
-			label: "Manual",
-			value: "manual",
-			hint: "Manual setup, add env vars yourself"
-		}],
-		initialValue: "auto"
-	});
-	if (isCancel(mode)) return userCancelled("Operation cancelled");
-	if (mode === "manual") {
+	let selectedMode = setupMode;
+	if (!selectedMode) if (isSilent()) selectedMode = "manual";
+	else {
+		const promptedMode = await select({
+			message: "Neon setup: choose mode",
+			options: [{
+				label: "Automatic",
+				value: "auto",
+				hint: "Automated setup with provider CLI, sets .env"
+			}, {
+				label: "Manual",
+				value: "manual",
+				hint: "Manual setup, add env vars yourself"
+			}],
+			initialValue: "auto"
+		});
+		if (isCancel(promptedMode)) return userCancelled("Operation cancelled");
+		selectedMode = promptedMode;
+	}
+	if (selectedMode === "manual") {
 		const envResult = await writeEnvFile$2(projectDir, backend);
 		if (envResult.isErr()) return envResult;
 		displayManualSetupInstructions$2(target);
 		return Result.ok(void 0);
 	}
-	const setupMethod = await select({
-		message: "Choose your Neon setup method:",
-		options: [{
-			label: "Quick setup with get-db",
-			value: "neondb",
-			hint: "fastest, no auth required"
-		}, {
-			label: "Custom setup with neonctl",
-			value: "neonctl",
-			hint: "More control - choose project name and region"
-		}],
-		initialValue: "neondb"
-	});
-	if (isCancel(setupMethod)) return userCancelled("Operation cancelled");
+	let setupMethod = cliInput?.dbSetupOptions?.neon?.method ?? config.dbSetupOptions?.neon?.method;
+	if (!setupMethod) if (isSilent()) setupMethod = "neondb";
+	else {
+		const promptedSetupMethod = await select({
+			message: "Choose your Neon setup method:",
+			options: [{
+				label: "Quick setup with get-db",
+				value: "neondb",
+				hint: "fastest, no auth required"
+			}, {
+				label: "Custom setup with neonctl",
+				value: "neonctl",
+				hint: "More control - choose project name and region"
+			}],
+			initialValue: "neondb"
+		});
+		if (isCancel(promptedSetupMethod)) return userCancelled("Operation cancelled");
+		setupMethod = promptedSetupMethod;
+	}
 	if (setupMethod === "neondb") {
 		const neonDbResult = await setupWithNeonDb(projectDir, packageManager, backend);
 		if (neonDbResult.isErr()) {
-			log.error(pc.red(neonDbResult.error.message));
+			cliLog.error(pc.red(neonDbResult.error.message));
 			const envResult = await writeEnvFile$2(projectDir, backend);
 			if (envResult.isErr()) return envResult;
 			displayManualSetupInstructions$2(target);
-		} else log.info(`Get Neon with Better T Stack referral: ${pc.cyan("https://get.neon.com/sbA3tIe")}`);
-		return neonDbResult;
+			return Result.ok(void 0);
+		}
+		cliLog.info(`Get Neon with Better T Stack referral: ${pc.cyan("https://get.neon.com/sbA3tIe")}`);
+		return Result.ok(void 0);
 	}
 	const suggestedProjectName = path.basename(projectDir);
-	const projectName = await text({
-		message: "Enter a name for your Neon project:",
-		defaultValue: suggestedProjectName,
-		initialValue: suggestedProjectName
-	});
-	if (isCancel(projectName)) return userCancelled("Operation cancelled");
-	const regionId = await select({
-		message: "Select a region for your Neon project:",
-		options: NEON_REGIONS,
-		initialValue: NEON_REGIONS[0].value
-	});
-	if (isCancel(regionId)) return userCancelled("Operation cancelled");
+	let projectName = cliInput?.dbSetupOptions?.neon?.projectName ?? config.dbSetupOptions?.neon?.projectName;
+	if (!projectName) if (isSilent()) projectName = suggestedProjectName;
+	else {
+		const promptedProjectName = await text({
+			message: "Enter a name for your Neon project:",
+			defaultValue: suggestedProjectName,
+			initialValue: suggestedProjectName
+		});
+		if (isCancel(promptedProjectName)) return userCancelled("Operation cancelled");
+		projectName = promptedProjectName;
+	}
+	let regionId = cliInput?.dbSetupOptions?.neon?.regionId ?? config.dbSetupOptions?.neon?.regionId;
+	if (!regionId) if (isSilent()) regionId = NEON_REGIONS[0].value;
+	else {
+		const promptedRegionId = await select({
+			message: "Select a region for your Neon project:",
+			options: NEON_REGIONS,
+			initialValue: NEON_REGIONS[0].value
+		});
+		if (isCancel(promptedRegionId)) return userCancelled("Operation cancelled");
+		regionId = promptedRegionId;
+	}
 	const neonConfigResult = await createNeonProject(projectName, regionId, packageManager);
 	if (neonConfigResult.isErr()) {
-		log.error(pc.red(neonConfigResult.error.message));
+		cliLog.error(pc.red(neonConfigResult.error.message));
 		const envResult = await writeEnvFile$2(projectDir, backend);
 		if (envResult.isErr()) return envResult;
 		displayManualSetupInstructions$2(target);
 		return Result.ok(void 0);
 	}
-	const finalSpinner = spinner();
+	const finalSpinner = createSpinner();
 	finalSpinner.start("Configuring database connection");
 	const envResult = await writeEnvFile$2(projectDir, backend, neonConfigResult.value);
 	if (envResult.isErr()) {
@@ -4811,10 +5187,9 @@ async function setupNeonPostgres(config, cliInput) {
 		return envResult;
 	}
 	finalSpinner.stop("Neon database configured!");
-	log.info(`Get Neon with Better T Stack referral: ${pc.cyan("https://get.neon.com/sbA3tIe")}`);
+	cliLog.info(`Get Neon with Better T Stack referral: ${pc.cyan("https://get.neon.com/sbA3tIe")}`);
 	return Result.ok(void 0);
 }
-
 //#endregion
 //#region src/helpers/database-providers/planetscale-setup.ts
 async function setupPlanetScale(config) {
@@ -4885,7 +5260,6 @@ async function setupPlanetScale(config) {
 		})
 	});
 }
-
 //#endregion
 //#region src/helpers/database-providers/prisma-postgres-setup.ts
 const AVAILABLE_REGIONS = [
@@ -4914,16 +5288,31 @@ const AVAILABLE_REGIONS = [
 		label: "US West (N. California)"
 	}
 ];
-async function setupWithCreateDb(serverDir, packageManager) {
-	log.info("Starting Prisma Postgres setup with create-db.");
-	const selectedRegion = await select({
-		message: "Select your preferred region:",
-		options: AVAILABLE_REGIONS,
-		initialValue: "ap-southeast-1"
-	});
-	if (isCancel(selectedRegion)) return userCancelled("Operation cancelled");
-	const createDbArgs = getPackageExecutionArgs(packageManager, `create-db@latest --json --region ${selectedRegion} --user-agent "aman/better-t-stack"`);
-	const s = spinner();
+const CREATE_DB_USER_AGENT = "aman/better-t-stack";
+async function setupWithCreateDb(serverDir, packageManager, regionId) {
+	cliLog.info("Starting Prisma Postgres setup with create-db.");
+	let selectedRegion = regionId;
+	if (!selectedRegion) if (isSilent()) selectedRegion = "ap-southeast-1";
+	else {
+		const promptedRegion = await select({
+			message: "Select your preferred region:",
+			options: AVAILABLE_REGIONS,
+			initialValue: "ap-southeast-1"
+		});
+		if (isCancel(promptedRegion)) return userCancelled("Operation cancelled");
+		selectedRegion = promptedRegion;
+	}
+	const createDbArgs = [
+		...getPackageRunnerPrefix(packageManager),
+		"create-db@latest",
+		"create",
+		"--json",
+		"--region",
+		selectedRegion,
+		"--user-agent",
+		CREATE_DB_USER_AGENT
+	];
+	const s = createSpinner();
 	s.start("Creating Prisma Postgres database...");
 	const execResult = await Result.tryPromise({
 		try: async () => {
@@ -4981,7 +5370,7 @@ async function writeEnvFile$1(projectDir, backend, config) {
 	});
 }
 function displayManualSetupInstructions$1(target) {
-	log.info(`Manual Prisma PostgreSQL Setup Instructions:
+	cliLog.info(`Manual Prisma PostgreSQL Setup Instructions:
 
 1. Visit https://console.prisma.io and create an account
 2. Create a new PostgreSQL database from the dashboard
@@ -4992,7 +5381,10 @@ DATABASE_URL="your_database_url"`);
 }
 async function setupPrismaPostgres(config, cliInput) {
 	const { packageManager, projectDir, backend } = config;
-	const manualDb = cliInput?.manualDb ?? false;
+	const setupMode = resolveDbSetupMode("prisma-postgres", {
+		manualDb: cliInput?.manualDb,
+		dbSetupOptions: cliInput?.dbSetupOptions ?? config.dbSetupOptions
+	});
 	const dbDir = path.join(projectDir, "packages/db");
 	const target = backend === "self" ? "apps/web" : "apps/server";
 	const ensureDirResult = await Result.tryPromise({
@@ -5004,49 +5396,53 @@ async function setupPrismaPostgres(config, cliInput) {
 		})
 	});
 	if (ensureDirResult.isErr()) return ensureDirResult;
-	if (manualDb) {
+	if (setupMode === "manual") {
 		const envResult = await writeEnvFile$1(projectDir, backend);
 		if (envResult.isErr()) return envResult;
 		displayManualSetupInstructions$1(target);
 		return Result.ok(void 0);
 	}
-	const setupMode = await select({
-		message: "Prisma Postgres setup: choose mode",
-		options: [{
-			label: "Automatic (create-db)",
-			value: "auto",
-			hint: "Provision a database via Prisma's create-db CLI"
-		}, {
-			label: "Manual",
-			value: "manual",
-			hint: "Add your own DATABASE_URL later"
-		}],
-		initialValue: "auto"
-	});
-	if (isCancel(setupMode)) return userCancelled("Operation cancelled");
-	if (setupMode === "manual") {
+	let selectedSetupMode = setupMode;
+	if (!selectedSetupMode) if (isSilent()) selectedSetupMode = "manual";
+	else {
+		const promptedSetupMode = await select({
+			message: "Prisma Postgres setup: choose mode",
+			options: [{
+				label: "Automatic (create-db)",
+				value: "auto",
+				hint: "Provision a database via Prisma's create-db CLI"
+			}, {
+				label: "Manual",
+				value: "manual",
+				hint: "Add your own DATABASE_URL later"
+			}],
+			initialValue: "auto"
+		});
+		if (isCancel(promptedSetupMode)) return userCancelled("Operation cancelled");
+		selectedSetupMode = promptedSetupMode;
+	}
+	if (selectedSetupMode === "manual") {
 		const envResult = await writeEnvFile$1(projectDir, backend);
 		if (envResult.isErr()) return envResult;
 		displayManualSetupInstructions$1(target);
 		return Result.ok(void 0);
 	}
-	const prismaConfigResult = await setupWithCreateDb(dbDir, packageManager);
+	const prismaConfigResult = await setupWithCreateDb(dbDir, packageManager, cliInput?.dbSetupOptions?.prismaPostgres?.regionId ?? config.dbSetupOptions?.prismaPostgres?.regionId);
 	if (prismaConfigResult.isErr()) {
 		if (UserCancelledError.is(prismaConfigResult.error)) return prismaConfigResult;
-		log.error(pc.red(prismaConfigResult.error.message));
+		cliLog.error(pc.red(prismaConfigResult.error.message));
 		const envResult = await writeEnvFile$1(projectDir, backend);
 		if (envResult.isErr()) return envResult;
 		displayManualSetupInstructions$1(target);
-		log.info("Setup completed with manual configuration required.");
+		cliLog.info("Setup completed with manual configuration required.");
 		return Result.ok(void 0);
 	}
 	const envResult = await writeEnvFile$1(projectDir, backend, prismaConfigResult.value);
 	if (envResult.isErr()) return envResult;
-	log.success(pc.green("Prisma Postgres database configured successfully!"));
-	if (prismaConfigResult.value.claimUrl) log.info(pc.blue(`Claim URL saved to .env: ${prismaConfigResult.value.claimUrl}`));
+	cliLog.success(pc.green("Prisma Postgres database configured successfully!"));
+	if (prismaConfigResult.value.claimUrl) cliLog.info(pc.blue(`Claim URL saved to .env: ${prismaConfigResult.value.claimUrl}`));
 	return Result.ok(void 0);
 }
-
 //#endregion
 //#region src/helpers/database-providers/supabase-setup.ts
 async function writeSupabaseEnvFile(projectDir, backend, databaseUrl) {
@@ -5076,7 +5472,7 @@ function extractDbUrl(output) {
 	return output.match(/DB URL:\s*(postgresql:\/\/[^\s]+)/)?.[1] ?? null;
 }
 async function initializeSupabase(serverDir, packageManager) {
-	log.info("Initializing Supabase project...");
+	cliLog.info("Initializing Supabase project...");
 	return Result.tryPromise({
 		try: async () => {
 			const supabaseInitArgs = getPackageExecutionArgs(packageManager, "supabase init");
@@ -5084,7 +5480,7 @@ async function initializeSupabase(serverDir, packageManager) {
 				cwd: serverDir,
 				stdio: "inherit"
 			});
-			log.success("Supabase project initialized");
+			cliLog.success("Supabase project initialized");
 		},
 		catch: (e) => {
 			const error = e;
@@ -5097,7 +5493,7 @@ async function initializeSupabase(serverDir, packageManager) {
 	});
 }
 async function startSupabase(serverDir, packageManager) {
-	log.info("Starting Supabase services (this may take a moment)...");
+	cliLog.info("Starting Supabase services (this may take a moment)...");
 	const supabaseStartArgs = getPackageExecutionArgs(packageManager, "supabase start");
 	return Result.tryPromise({
 		try: async () => {
@@ -5105,7 +5501,7 @@ async function startSupabase(serverDir, packageManager) {
 			let stdoutData = "";
 			if (subprocess.stdout) subprocess.stdout.on("data", (data) => {
 				const text = data.toString();
-				process.stdout.write(text);
+				if (!isSilent()) process.stdout.write(text);
 				stdoutData += text;
 			});
 			if (subprocess.stderr) subprocess.stderr.pipe(process.stderr);
@@ -5123,8 +5519,8 @@ async function startSupabase(serverDir, packageManager) {
 		}
 	});
 }
-function displayManualSupabaseInstructions(output) {
-	log.info(`"Manual Supabase Setup Instructions:"
+function displayManualSupabaseInstructions(targetApp, output) {
+	cliLog.info(`"Manual Supabase Setup Instructions:"
 1. Ensure Docker is installed and running.
 2. Install the Supabase CLI (e.g., \`npm install -g supabase\`).
 3. Run \`supabase init\` in your project's \`packages/db\` directory.
@@ -5132,12 +5528,16 @@ function displayManualSupabaseInstructions(output) {
 5. Copy the 'DB 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 \`packages/db/.env\` as \`DATABASE_URL\`:
+6. Add the DB URL to the .env file in \`${targetApp}/.env\` as \`DATABASE_URL\`:
 			${pc.gray("DATABASE_URL=\"your_supabase_db_url\"")}`);
 }
 async function setupSupabase(config, cliInput) {
 	const { projectDir, packageManager, backend } = config;
-	const manualDb = cliInput?.manualDb ?? false;
+	const targetApp = backend === "self" ? "apps/web" : "apps/server";
+	const setupMode = resolveDbSetupMode("supabase", {
+		manualDb: cliInput?.manualDb,
+		dbSetupOptions: cliInput?.dbSetupOptions ?? config.dbSetupOptions
+	});
 	const serverDir = path.join(projectDir, "packages", "db");
 	const ensureDirResult = await Result.tryPromise({
 		try: () => fs.ensureDir(serverDir),
@@ -5148,56 +5548,60 @@ async function setupSupabase(config, cliInput) {
 		})
 	});
 	if (ensureDirResult.isErr()) return ensureDirResult;
-	if (manualDb) {
-		displayManualSupabaseInstructions();
+	if (setupMode === "manual") {
+		displayManualSupabaseInstructions(targetApp);
 		return writeSupabaseEnvFile(projectDir, backend, "");
 	}
-	const mode = await select({
-		message: "Supabase setup: choose mode",
-		options: [{
-			label: "Automatic",
-			value: "auto",
-			hint: "Automated setup with provider CLI, sets .env"
-		}, {
-			label: "Manual",
-			value: "manual",
-			hint: "Manual setup, add env vars yourself"
-		}],
-		initialValue: "auto"
-	});
-	if (isCancel(mode)) return userCancelled("Operation cancelled");
+	let mode = setupMode;
+	if (!mode) if (isSilent()) mode = "manual";
+	else {
+		const promptedMode = await select({
+			message: "Supabase setup: choose mode",
+			options: [{
+				label: "Automatic",
+				value: "auto",
+				hint: "Automated setup with provider CLI, sets .env"
+			}, {
+				label: "Manual",
+				value: "manual",
+				hint: "Manual setup, add env vars yourself"
+			}],
+			initialValue: "auto"
+		});
+		if (isCancel(promptedMode)) return userCancelled("Operation cancelled");
+		mode = promptedMode;
+	}
 	if (mode === "manual") {
-		displayManualSupabaseInstructions();
+		displayManualSupabaseInstructions(targetApp);
 		return writeSupabaseEnvFile(projectDir, backend, "");
 	}
 	const initResult = await initializeSupabase(serverDir, packageManager);
 	if (initResult.isErr()) {
-		log.error(pc.red(initResult.error.message));
-		displayManualSupabaseInstructions();
+		cliLog.error(pc.red(initResult.error.message));
+		displayManualSupabaseInstructions(targetApp);
 		return writeSupabaseEnvFile(projectDir, backend, "");
 	}
 	const startResult = await startSupabase(serverDir, packageManager);
 	if (startResult.isErr()) {
-		log.error(pc.red(startResult.error.message));
-		displayManualSupabaseInstructions();
+		cliLog.error(pc.red(startResult.error.message));
+		displayManualSupabaseInstructions(targetApp);
 		return writeSupabaseEnvFile(projectDir, backend, "");
 	}
 	const supabaseOutput = startResult.value;
 	const dbUrl = extractDbUrl(supabaseOutput);
 	if (dbUrl) {
 		const envResult = await writeSupabaseEnvFile(projectDir, backend, dbUrl);
-		if (envResult.isOk()) log.success(pc.green("Supabase local development setup ready!"));
+		if (envResult.isOk()) cliLog.success(pc.green("Supabase local development setup ready!"));
 		else {
-			log.error(pc.red("Supabase setup completed, but failed to update .env automatically."));
-			displayManualSupabaseInstructions(supabaseOutput);
+			cliLog.error(pc.red("Supabase setup completed, but failed to update .env automatically."));
+			displayManualSupabaseInstructions(targetApp, supabaseOutput);
 		}
 		return envResult;
 	}
-	log.error(pc.yellow("Supabase started, but could not extract DB URL automatically."));
-	displayManualSupabaseInstructions(supabaseOutput);
+	cliLog.error(pc.yellow("Supabase started, but could not extract DB URL automatically."));
+	displayManualSupabaseInstructions(targetApp, supabaseOutput);
 	return databaseSetupError("supabase", "Could not extract database URL from Supabase output. Please configure manually.");
 }
-
 //#endregion
 //#region src/helpers/database-providers/turso-setup.ts
 async function isTursoInstalled() {
@@ -5213,7 +5617,7 @@ async function isTursoLoggedIn() {
 	return result.isOk() ? result.value : false;
 }
 async function loginToTurso() {
-	const s = spinner();
+	const s = createSpinner();
 	s.start("Logging in to Turso...");
 	return Result.tryPromise({
 		try: async () => {
@@ -5231,7 +5635,7 @@ async function loginToTurso() {
 	});
 }
 async function installTursoCLI(isMac) {
-	const s = spinner();
+	const s = createSpinner();
 	s.start("Installing Turso CLI...");
 	return Result.tryPromise({
 		try: async () => {
@@ -5255,7 +5659,7 @@ async function installTursoCLI(isMac) {
 	});
 }
 async function getTursoGroups() {
-	const s = spinner();
+	const s = createSpinner();
 	s.start("Fetching Turso groups...");
 	const result = await Result.tryPromise({
 		try: async () => {
@@ -5288,7 +5692,7 @@ async function selectTursoGroup() {
 	const groups = await getTursoGroups();
 	if (groups.length === 0) return Result.ok(null);
 	if (groups.length === 1) {
-		log.info(`Using the only available group: ${pc.blue(groups[0].name)}`);
+		cliLog.info(`Using the only available group: ${pc.blue(groups[0].name)}`);
 		return Result.ok(groups[0].name);
 	}
 	const selectedGroup = await select({
@@ -5302,7 +5706,7 @@ async function selectTursoGroup() {
 	return Result.ok(selectedGroup);
 }
 async function createTursoDatabase(dbName, groupName) {
-	const s = spinner();
+	const s = createSpinner();
 	s.start(`Creating Turso database "${dbName}"${groupName ? ` in group "${groupName}"` : ""}...`);
 	const createResult = await Result.tryPromise({
 		try: async () => {
@@ -5368,45 +5772,54 @@ async function writeEnvFile(projectDir, backend, config) {
 		})
 	});
 }
-function displayManualSetupInstructions() {
-	log.info(`Manual Turso Setup Instructions:
+function displayManualSetupInstructions(targetApp) {
+	cliLog.info(`Manual Turso Setup Instructions:
 
 1. Visit https://turso.tech and create an account
 2. Create a new database from the dashboard
 3. Get your database URL and authentication token
-4. Add these credentials to the .env file in apps/server/.env
+4. Add these credentials to the .env file in ${targetApp}/.env
 
 DATABASE_URL=your_database_url
 DATABASE_AUTH_TOKEN=your_auth_token`);
 }
 async function setupTurso(config, cliInput) {
 	const { projectDir, backend } = config;
-	const manualDb = cliInput?.manualDb ?? false;
-	const setupSpinner = spinner();
-	if (manualDb) {
+	const targetApp = backend === "self" ? "apps/web" : "apps/server";
+	const setupMode = resolveDbSetupMode("turso", {
+		manualDb: cliInput?.manualDb,
+		dbSetupOptions: cliInput?.dbSetupOptions ?? config.dbSetupOptions
+	});
+	const setupSpinner = createSpinner();
+	if (setupMode === "manual") {
 		const envResult = await writeEnvFile(projectDir, backend);
 		if (envResult.isErr()) return envResult;
-		displayManualSetupInstructions();
+		displayManualSetupInstructions(targetApp);
 		return Result.ok(void 0);
 	}
-	const mode = await select({
-		message: "Turso setup: choose mode",
-		options: [{
-			label: "Automatic",
-			value: "auto",
-			hint: "Automated setup with provider CLI, sets .env"
-		}, {
-			label: "Manual",
-			value: "manual",
-			hint: "Manual setup, add env vars yourself"
-		}],
-		initialValue: "auto"
-	});
-	if (isCancel(mode)) return userCancelled("Operation cancelled");
+	let mode = setupMode;
+	if (!mode) if (isSilent()) mode = "manual";
+	else {
+		const promptedMode = await select({
+			message: "Turso setup: choose mode",
+			options: [{
+				label: "Automatic",
+				value: "auto",
+				hint: "Automated setup with provider CLI, sets .env"
+			}, {
+				label: "Manual",
+				value: "manual",
+				hint: "Manual setup, add env vars yourself"
+			}],
+			initialValue: "auto"
+		});
+		if (isCancel(promptedMode)) return userCancelled("Operation cancelled");
+		mode = promptedMode;
+	}
 	if (mode === "manual") {
 		const envResult = await writeEnvFile(projectDir, backend);
 		if (envResult.isErr()) return envResult;
-		displayManualSetupInstructions();
+		displayManualSetupInstructions(targetApp);
 		return Result.ok(void 0);
 	}
 	setupSpinner.start("Checking Turso CLI availability...");
@@ -5414,48 +5827,79 @@ async function setupTurso(config, cliInput) {
 	const isMac = platform === "darwin";
 	if (platform === "win32") {
 		setupSpinner.stop(pc.yellow("Turso setup not supported on Windows"));
-		log.warn(pc.yellow("Automatic Turso setup is not supported on Windows."));
+		cliLog.warn(pc.yellow("Automatic Turso setup is not supported on Windows."));
 		const envResult = await writeEnvFile(projectDir, backend);
 		if (envResult.isErr()) return envResult;
-		displayManualSetupInstructions();
+		displayManualSetupInstructions(targetApp);
 		return Result.ok(void 0);
 	}
 	setupSpinner.stop("Turso CLI availability checked");
 	if (!await isTursoInstalled()) {
-		const shouldInstall = await confirm({
-			message: "Would you like to install Turso CLI?",
-			initialValue: true
-		});
-		if (isCancel(shouldInstall)) return userCancelled("Operation cancelled");
+		let shouldInstall = cliInput?.dbSetupOptions?.turso?.installCli;
+		if (shouldInstall === void 0) if (isSilent()) shouldInstall = false;
+		else {
+			const promptedInstall = await confirm({
+				message: "Would you like to install Turso CLI?",
+				initialValue: true
+			});
+			if (isCancel(promptedInstall)) return userCancelled("Operation cancelled");
+			shouldInstall = promptedInstall;
+		}
 		if (!shouldInstall) {
 			const envResult = await writeEnvFile(projectDir, backend);
 			if (envResult.isErr()) return envResult;
-			displayManualSetupInstructions();
+			displayManualSetupInstructions(targetApp);
 			return Result.ok(void 0);
 		}
 		const installResult = await installTursoCLI(isMac);
 		if (installResult.isErr()) {
-			log.error(pc.red(installResult.error.message));
+			cliLog.error(pc.red(installResult.error.message));
 			const envResult = await writeEnvFile(projectDir, backend);
 			if (envResult.isErr()) return envResult;
-			displayManualSetupInstructions();
+			displayManualSetupInstructions(targetApp);
 			return Result.ok(void 0);
 		}
 	}
 	if (!await isTursoLoggedIn()) {
+		if (isSilent()) {
+			cliLog.warn(pc.yellow("Turso CLI is not logged in. Falling back to manual setup."));
+			const envResult = await writeEnvFile(projectDir, backend);
+			if (envResult.isErr()) return envResult;
+			displayManualSetupInstructions(targetApp);
+			return Result.ok(void 0);
+		}
 		const loginResult = await loginToTurso();
 		if (loginResult.isErr()) {
-			log.error(pc.red(loginResult.error.message));
+			cliLog.error(pc.red(loginResult.error.message));
+			const envResult = await writeEnvFile(projectDir, backend);
+			if (envResult.isErr()) return envResult;
+			displayManualSetupInstructions(targetApp);
+			return Result.ok(void 0);
+		}
+	}
+	let selectedGroup = cliInput?.dbSetupOptions?.turso?.groupName ?? config.dbSetupOptions?.turso?.groupName ?? null;
+	if (!selectedGroup) if (isSilent()) selectedGroup = (await getTursoGroups())[0]?.name ?? null;
+	else {
+		const groupResult = await selectTursoGroup();
+		if (groupResult.isErr()) return groupResult;
+		selectedGroup = groupResult.value;
+	}
+	let suggestedName = cliInput?.dbSetupOptions?.turso?.databaseName ?? config.dbSetupOptions?.turso?.databaseName ?? path.basename(projectDir);
+	if (isSilent()) {
+		const createResult = await createTursoDatabase(suggestedName, selectedGroup);
+		if (createResult.isErr()) {
+			cliLog.error(pc.red(createResult.error.message));
 			const envResult = await writeEnvFile(projectDir, backend);
 			if (envResult.isErr()) return envResult;
-			displayManualSetupInstructions();
+			displayManualSetupInstructions(targetApp);
+			cliLog.success("Setup completed with manual configuration required.");
 			return Result.ok(void 0);
 		}
+		const envResult = await writeEnvFile(projectDir, backend, createResult.value);
+		if (envResult.isErr()) return envResult;
+		cliLog.success("Turso database setup completed successfully!");
+		return Result.ok(void 0);
 	}
-	const groupResult = await selectTursoGroup();
-	if (groupResult.isErr()) return groupResult;
-	const selectedGroup = groupResult.value;
-	let suggestedName = path.basename(projectDir);
 	while (true) {
 		const dbNameResponse = await text({
 			message: "Enter a name for your database:",
@@ -5468,24 +5912,23 @@ async function setupTurso(config, cliInput) {
 		const createResult = await createTursoDatabase(dbName, selectedGroup);
 		if (createResult.isErr()) {
 			if (createResult.error.message === "DATABASE_EXISTS") {
-				log.warn(pc.yellow(`Database "${pc.red(dbName)}" already exists`));
+				cliLog.warn(pc.yellow(`Database "${pc.red(dbName)}" already exists`));
 				suggestedName = `${dbName}-${Math.floor(Math.random() * 1e3)}`;
 				continue;
 			}
-			log.error(pc.red(createResult.error.message));
+			cliLog.error(pc.red(createResult.error.message));
 			const envResult = await writeEnvFile(projectDir, backend);
 			if (envResult.isErr()) return envResult;
-			displayManualSetupInstructions();
-			log.success("Setup completed with manual configuration required.");
+			displayManualSetupInstructions(targetApp);
+			cliLog.success("Setup completed with manual configuration required.");
 			return Result.ok(void 0);
 		}
 		const envResult = await writeEnvFile(projectDir, backend, createResult.value);
 		if (envResult.isErr()) return envResult;
-		log.success("Turso database setup completed successfully!");
+		cliLog.success("Turso database setup completed successfully!");
 		return Result.ok(void 0);
 	}
 }
-
 //#endregion
 //#region src/helpers/core/db-setup.ts
 async function setupDatabase(config, cliInput) {
@@ -5506,18 +5949,21 @@ async function setupDatabase(config, cliInput) {
 			consola.error(pc.red(result.error.message));
 		}
 	}
+	const resolvedCliInput = {
+		...cliInput,
+		dbSetupOptions: mergeResolvedDbSetupOptions(dbSetup, config.dbSetupOptions, cliInput)
+	};
 	if (dbSetup === "docker") await runSetup(() => setupDockerCompose(config));
-	else if (database === "sqlite" && dbSetup === "turso") await runSetup(() => setupTurso(config, cliInput));
+	else if (database === "sqlite" && dbSetup === "turso") await runSetup(() => setupTurso(config, resolvedCliInput));
 	else if (database === "sqlite" && dbSetup === "d1") await runSetup(() => setupCloudflareD1(config));
 	else if (database === "postgres") {
-		if (dbSetup === "prisma-postgres") await runSetup(() => setupPrismaPostgres(config, cliInput));
-		else if (dbSetup === "neon") await runSetup(() => setupNeonPostgres(config, cliInput));
+		if (dbSetup === "prisma-postgres") await runSetup(() => setupPrismaPostgres(config, resolvedCliInput));
+		else if (dbSetup === "neon") await runSetup(() => setupNeonPostgres(config, resolvedCliInput));
 		else if (dbSetup === "planetscale") await runSetup(() => setupPlanetScale(config));
-		else if (dbSetup === "supabase") await runSetup(() => setupSupabase(config, cliInput));
+		else if (dbSetup === "supabase") await runSetup(() => setupSupabase(config, resolvedCliInput));
 	} else if (database === "mysql" && dbSetup === "planetscale") await runSetup(() => setupPlanetScale(config));
-	else if (database === "mongodb" && dbSetup === "mongodb-atlas") await runSetup(() => setupMongoDBAtlas(config, cliInput));
+	else if (database === "mongodb" && dbSetup === "mongodb-atlas") await runSetup(() => setupMongoDBAtlas(config, resolvedCliInput));
 }
-
 //#endregion
 //#region src/helpers/core/git.ts
 async function initializeGit(projectDir, useGit) {
@@ -5527,7 +5973,7 @@ async function initializeGit(projectDir, useGit) {
 		reject: false,
 		stderr: "pipe"
 	})`git --version`).exitCode !== 0) {
-		log.warn(pc.yellow("Git is not installed"));
+		cliLog.warn(pc.yellow("Git is not installed"));
 		return Result.ok(void 0);
 	}
 	const result = await $({
@@ -5551,7 +5997,6 @@ async function initializeGit(projectDir, useGit) {
 		})
 	});
 }
-
 //#endregion
 //#region src/utils/docker-utils.ts
 async function isDockerInstalled() {
@@ -5603,7 +6048,6 @@ async function getDockerStatus(database) {
 		running: true
 	};
 }
-
 //#endregion
 //#region src/helpers/core/post-installation.ts
 async function displayPostInstallInstructions(config) {
@@ -5784,7 +6228,6 @@ function getAlchemyDeployInstructions(runCmd, webDeploy, serverDeploy, backend)
 	else if (webDeploy === "cloudflare" && (serverDeploy === "cloudflare" || isBackendSelf)) instructions.push(`${pc.bold("Deploy with Cloudflare (Alchemy):")}\n${pc.cyan("•")} Dev: ${`${runCmd} dev`}\n${pc.cyan("•")} Deploy: ${`${runCmd} deploy`}\n${pc.cyan("•")} Destroy: ${`${runCmd} destroy`}`);
 	return instructions.length ? `\n${instructions.join("\n")}` : "";
 }
-
 //#endregion
 //#region src/helpers/core/create-project.ts
 /**
@@ -5872,7 +6315,6 @@ async function setPackageManagerVersion(projectDir, packageManager) {
 		})
 	});
 }
-
 //#endregion
 //#region src/helpers/core/command-handlers.ts
 /**
@@ -5955,21 +6397,32 @@ async function createProjectHandlerInternal(input, startTime, timeScaffolded) {
 				});
 			}
 		}));
+		yield* validateResolvedProjectPathInput(currentPathInput);
 		let finalPathInput;
 		let shouldClearDirectory;
 		const conflictResult = yield* Result.await(handleDirectoryConflictResult(currentPathInput, input.directoryConflict));
 		finalPathInput = conflictResult.finalPathInput;
 		shouldClearDirectory = conflictResult.shouldClearDirectory;
-		const { finalResolvedPath, finalBaseName } = yield* Result.await(Result.tryPromise({
-			try: async () => setupProjectDirectory(finalPathInput, shouldClearDirectory),
-			catch: (e) => {
-				if (e instanceof UserCancelledError) return e;
-				return new CLIError({
-					message: e instanceof Error ? e.message : String(e),
-					cause: e
-				});
-			}
-		}));
+		yield* validateResolvedProjectPathInput(finalPathInput);
+		let finalResolvedPath;
+		let finalBaseName;
+		if (input.dryRun) {
+			finalResolvedPath = finalPathInput === "." ? process.cwd() : path.resolve(process.cwd(), finalPathInput);
+			finalBaseName = path.basename(finalResolvedPath);
+		} else {
+			const setupResult = yield* Result.await(Result.tryPromise({
+				try: async () => setupProjectDirectory(finalPathInput, shouldClearDirectory),
+				catch: (e) => {
+					if (e instanceof UserCancelledError) return e;
+					return new CLIError({
+						message: e instanceof Error ? e.message : String(e),
+						cause: e
+					});
+				}
+			}));
+			finalResolvedPath = setupResult.finalResolvedPath;
+			finalBaseName = setupResult.finalBaseName;
+		}
 		const originalInput = {
 			...input,
 			projectDirectory: input.projectName
@@ -6043,8 +6496,38 @@ async function createProjectHandlerInternal(input, startTime, timeScaffolded) {
 				}
 			}));
 		}
-		yield* Result.await(createProject(config, { manualDb: cliInput.manualDb ?? input.manualDb }));
+		const effectiveDbSetupOptions = mergeResolvedDbSetupOptions(config.dbSetup, config.dbSetupOptions, {
+			manualDb: cliInput.manualDb ?? input.manualDb,
+			dbSetupOptions: cliInput.dbSetupOptions ?? input.dbSetupOptions
+		});
+		if (effectiveDbSetupOptions) config = {
+			...config,
+			dbSetupOptions: effectiveDbSetupOptions
+		};
 		const reproducibleCommand = generateReproducibleCommand(config);
+		if (input.dryRun) {
+			const elapsedTimeMs = Date.now() - startTime;
+			if (!isSilent()) {
+				if (shouldClearDirectory) log.warn(pc.yellow(`Dry run: directory "${finalPathInput}" would be cleared due to overwrite strategy.`));
+				log.success(pc.green("Dry run validation passed. No files were written."));
+				log.message(pc.dim(`Target directory: ${finalResolvedPath}`));
+				log.message(pc.dim(`Run without --dry-run to create the project.`));
+				outro(pc.magenta("Dry run complete."));
+			}
+			return Result.ok({
+				success: true,
+				projectConfig: config,
+				reproducibleCommand,
+				timeScaffolded,
+				elapsedTimeMs,
+				projectDirectory: config.projectDir,
+				relativePath: config.relativePath
+			});
+		}
+		yield* Result.await(createProject(config, {
+			manualDb: cliInput.manualDb ?? input.manualDb,
+			dbSetupOptions: effectiveDbSetupOptions
+		}));
 		if (!isSilent()) log.success(pc.blue(`You can reproduce this setup with the following command:\n${reproducibleCommand}`));
 		await trackProjectCreation(config, input.disableAnalytics);
 		const historyResult = await addToHistory(config, reproducibleCommand);
@@ -6070,16 +6553,24 @@ function isPathWithinCwd(targetPath) {
 	const rel = path.relative(process.cwd(), resolved);
 	return !rel.startsWith("..") && !path.isAbsolute(rel);
 }
-async function resolveProjectNameForSilent(input) {
-	const defaultConfig = getDefaultConfig();
-	const candidate = (input.projectName?.trim() || void 0) ?? defaultConfig.relativePath;
-	if (candidate === ".") return Result.ok(candidate);
+function validateResolvedProjectPathInput(candidate) {
+	const hardeningResult = validateAgentSafePathInput(candidate, "projectName");
+	if (hardeningResult.isErr()) return Result.err(new CLIError({
+		message: hardeningResult.error.message,
+		cause: hardeningResult.error
+	}));
+	if (candidate === ".") return Result.ok(void 0);
 	const validationResult = validateProjectName(path.basename(candidate));
 	if (validationResult.isErr()) return Result.err(new CLIError({
 		message: validationResult.error.message,
 		cause: validationResult.error
 	}));
 	if (!isPathWithinCwd(candidate)) return Result.err(new CLIError({ message: "Project path must be within current directory" }));
+	return Result.ok(void 0);
+}
+async function resolveProjectNameForSilent(input) {
+	const defaultConfig = getDefaultConfig();
+	const candidate = (input.projectName?.trim() || void 0) ?? defaultConfig.relativePath;
 	return Result.ok(candidate);
 }
 async function handleDirectoryConflictResult(currentPathInput, strategy) {
@@ -6132,9 +6623,51 @@ async function handleDirectoryConflictProgrammatically(currentPathInput, strateg
 		default: return Result.err(new DirectoryConflictError({ directory: currentPathInput }));
 	}
 }
-
 //#endregion
 //#region src/index.ts
+const SchemaNameSchema = z.enum([
+	"all",
+	"cli",
+	"database",
+	"orm",
+	"backend",
+	"runtime",
+	"frontend",
+	"addons",
+	"examples",
+	"packageManager",
+	"databaseSetup",
+	"api",
+	"auth",
+	"payments",
+	"webDeploy",
+	"serverDeploy",
+	"directoryConflict",
+	"template",
+	"addonOptions",
+	"dbSetupOptions",
+	"createInput",
+	"addInput",
+	"projectConfig",
+	"betterTStackConfig",
+	"initResult"
+]).default("all");
+function getCliSchemaJson() {
+	return createCli({
+		router,
+		name: "create-better-t-stack",
+		version: getLatestCLIVersion()
+	}).toJSON();
+}
+function getSchemaResult(name) {
+	const schemas = getAllJsonSchemas();
+	if (name === "all") return {
+		cli: getCliSchemaJson(),
+		schemas
+	};
+	if (name === "cli") return getCliSchemaJson();
+	return schemas[name];
+}
 const router = os.router({
 	create: os.meta({
 		description: "Create a new Better-T-Stack project",
@@ -6144,6 +6677,7 @@ const router = os.router({
 		template: types_exports.TemplateSchema.optional().describe("Use a predefined template"),
 		yes: z.boolean().optional().default(false).describe("Use default configuration"),
 		yolo: z.boolean().optional().default(false).describe("(WARNING - NOT RECOMMENDED) Bypass validations and compatibility checks"),
+		dryRun: z.boolean().optional().default(false).describe("Validate setup without writing files"),
 		verbose: z.boolean().optional().default(false).describe("Show detailed result information"),
 		database: types_exports.DatabaseSchema.optional(),
 		orm: types_exports.ORMSchema.optional(),
@@ -6164,15 +6698,26 @@ const router = os.router({
 		directoryConflict: types_exports.DirectoryConflictSchema.optional(),
 		renderTitle: z.boolean().optional(),
 		disableAnalytics: z.boolean().optional().default(false).describe("Disable analytics"),
-		manualDb: z.boolean().optional().default(false).describe("Skip automatic/manual database setup prompt and use manual setup")
+		manualDb: z.boolean().optional().default(false).describe("Skip automatic/manual database setup prompt and use manual setup"),
+		dbSetupOptions: types_exports.DbSetupOptionsSchema.optional().describe("Structured database setup options")
 	})])).handler(async ({ input }) => {
 		const [projectName, options] = input;
 		const result = await createProjectHandler({
 			projectName,
 			...options
 		});
-		if (options.verbose) return result;
+		if (options.verbose || options.dryRun) return result;
+	}),
+	createJson: os.meta({
+		description: "Create a project from a raw JSON payload (agent-friendly)",
+		jsonInput: true
+	}).input(types_exports.CreateInputSchema).handler(async ({ input }) => {
+		const result = await createProjectHandler(input, { silent: true });
+		if (!result) throw new UserCancelledError({ message: "Operation cancelled" });
+		if (!result.success) throw new CLIError({ message: result.error || "Unknown error occurred" });
+		return result;
 	}),
+	schema: os.meta({ description: "Show runtime CLI and input schemas as JSON" }).input(z.object({ name: SchemaNameSchema.describe("Schema name to inspect") })).handler(({ input }) => getSchemaResult(input.name)),
 	sponsors: os.meta({ description: "Show Better-T-Stack sponsors" }).handler(showSponsorsCommand),
 	docs: os.meta({ description: "Open Better-T-Stack documentation" }).handler(openDocsCommand),
 	builder: os.meta({ description: "Open the web-based stack builder" }).handler(openBuilderCommand),
@@ -6184,6 +6729,15 @@ const router = os.router({
 	})).handler(async ({ input }) => {
 		await addHandler(input);
 	}),
+	addJson: os.meta({
+		description: "Add addons from a raw JSON payload (agent-friendly)",
+		jsonInput: true
+	}).input(types_exports.AddInputSchema).handler(async ({ input }) => {
+		const result = await addHandler(input, { silent: true });
+		if (!result) throw new UserCancelledError({ message: "Operation cancelled" });
+		if (!result.success) throw new CLIError({ message: result.error || "Unknown error occurred" });
+		return result;
+	}),
 	history: os.meta({ description: "Show project creation history" }).input(z.object({
 		limit: z.number().optional().default(10).describe("Number of entries to show"),
 		clear: z.boolean().optional().default(false).describe("Clear all history"),
@@ -6192,7 +6746,6 @@ const router = os.router({
 		await historyHandler(input);
 	})
 });
-const caller = createRouterClient(router, { context: {} });
 function createBtsCli() {
 	return createCli({
 		router,
@@ -6253,13 +6806,13 @@ async function create(projectName, options) {
 	});
 }
 async function sponsors() {
-	return caller.sponsors();
+	return showSponsorsCommand();
 }
 async function docs() {
-	return caller.docs();
+	return openDocsCommand();
 }
 async function builder() {
-	return caller.builder();
+	return openBuilderCommand();
 }
 /**
 * Programmatic API to generate a project in-memory (virtual filesystem).
@@ -6290,6 +6843,8 @@ async function createVirtual(options) {
 			projectName: options.projectName || "my-project",
 			projectDir: "/virtual",
 			relativePath: "./virtual",
+			addonOptions: options.addonOptions,
+			dbSetupOptions: options.dbSetupOptions,
 			database: options.database || "none",
 			orm: options.orm || "none",
 			backend: options.backend || "hono",
@@ -6330,6 +6885,5 @@ async function createVirtual(options) {
 async function add(options = {}) {
 	return addHandler(options, { silent: true });
 }
-
 //#endregion
-export { DatabaseSetupError as _, VirtualFileSystem$1 as a, UserCancelledError as b, create as c, docs as d, generate$1 as f, CompatibilityError as g, CLIError as h, TEMPLATE_COUNT as i, createBtsCli as l, sponsors as m, GeneratorError$1 as n, add as o, router as p, Result$1 as r, builder as s, EMBEDDED_TEMPLATES$1 as t, createVirtual as u, DirectoryConflictError as v, ValidationError as x, ProjectCreationError as y };
+export { ProjectCreationError as C, DirectoryConflictError as S, ValidationError as T, types_exports as _, TEMPLATE_COUNT as a, CompatibilityError as b, builder as c, createVirtual as d, docs as f, sponsors as g, router as h, SchemaNameSchema as i, create as l, getSchemaResult as m, GeneratorError$1 as n, VirtualFileSystem$1 as o, generate$1 as p, Result$1 as r, add as s, EMBEDDED_TEMPLATES$1 as t, createBtsCli as u, getLatestCLIVersion as v, UserCancelledError as w, DatabaseSetupError as x, CLIError as y };