create-better-t-stack 3.13.2-pr788.6feedca → 3.14.0

package/dist/{src-DtAyzhjL.mjs → src-BRi63IDG.mjs}

@@ -1,6 +1,6 @@
 #!/usr/bin/env node
 import { t as __reExport } from "./chunk-DPg_XC7m.mjs";
-import { autocompleteMultiselect, cancel, confirm, group, intro, isCancel, log, multiselect, outro, select, spinner, text } from "@clack/prompts";
+import { cancel, confirm, group, intro, isCancel, log, multiselect, outro, select, spinner, text } from "@clack/prompts";
 import { createRouterClient, os } from "@orpc/server";
 import pc from "picocolors";
 import { createCli } from "trpc-cli";
@@ -10,15 +10,13 @@ import fs from "fs-extra";
 import path from "node:path";
 import { fileURLToPath } from "node:url";
 import { EMBEDDED_TEMPLATES, EMBEDDED_TEMPLATES as EMBEDDED_TEMPLATES$1, TEMPLATE_COUNT, VirtualFileSystem, dependencyVersionMap, generateVirtualProject, generateVirtualProject as generateVirtualProject$1 } from "@better-t-stack/template-generator";
-import { ConfirmPrompt, GroupMultiSelectPrompt, MultiSelectPrompt, SelectPrompt, isCancel as isCancel$1 } from "@clack/core";
 import { AsyncLocalStorage } from "node:async_hooks";
+import { ConfirmPrompt, GroupMultiSelectPrompt, MultiSelectPrompt, SelectPrompt, isCancel as isCancel$1 } from "@clack/core";
 import gradient from "gradient-string";
 import { writeTreeToFilesystem } from "@better-t-stack/template-generator/fs-writer";
 import { $, execa } from "execa";
-import { IndentationText, Node, Project, QuoteKind, SyntaxKind } from "ts-morph";
 import * as JSONC from "jsonc-parser";
 import { format } from "oxfmt";
-import { glob } from "tinyglobby";
 import os$1 from "node:os";
 
 //#region src/utils/get-package-manager.ts
@@ -92,6 +90,59 @@ const ADDON_COMPATIBILITY = {
 	none: []
 };
 
+//#endregion
+//#region src/utils/context.ts
+const cliStorage = new AsyncLocalStorage();
+function defaultContext() {
+	return {
+		navigation: {
+			isFirstPrompt: false,
+			lastPromptShownUI: false
+		},
+		silent: false,
+		verbose: false
+	};
+}
+function getContext() {
+	const ctx = cliStorage.getStore();
+	if (!ctx) return defaultContext();
+	return ctx;
+}
+function tryGetContext() {
+	return cliStorage.getStore();
+}
+function isSilent() {
+	return getContext().silent;
+}
+function isFirstPrompt() {
+	return getContext().navigation.isFirstPrompt;
+}
+function didLastPromptShowUI() {
+	return getContext().navigation.lastPromptShownUI;
+}
+function setIsFirstPrompt$1(value) {
+	const ctx = tryGetContext();
+	if (ctx) ctx.navigation.isFirstPrompt = value;
+}
+function setLastPromptShownUI(value) {
+	const ctx = tryGetContext();
+	if (ctx) ctx.navigation.lastPromptShownUI = value;
+}
+async function runWithContextAsync(options, fn) {
+	const ctx = {
+		navigation: {
+			isFirstPrompt: false,
+			lastPromptShownUI: false
+		},
+		silent: options.silent ?? false,
+		verbose: options.verbose ?? false,
+		projectDir: options.projectDir,
+		projectName: options.projectName,
+		packageManager: options.packageManager
+	};
+	return cliStorage.run(ctx, fn);
+}
+
 //#endregion
 //#region src/utils/errors.ts
 var UserCancelledError = class extends Error {
@@ -107,17 +158,20 @@ var CLIError = class extends Error {
 	}
 };
 function exitWithError(message) {
+	if (isSilent()) throw new CLIError(message);
 	consola.error(pc.red(message));
-	throw new CLIError(message);
+	process.exit(1);
 }
 function exitCancelled(message = "Operation cancelled") {
+	if (isSilent()) throw new UserCancelledError(message);
 	cancel(pc.red(message));
-	throw new UserCancelledError(message);
+	process.exit(1);
 }
 function handleError(error, fallbackMessage) {
 	const message = error instanceof Error ? error.message : fallbackMessage || String(error);
+	if (isSilent()) throw error instanceof Error ? error : new Error(message);
 	consola.error(pc.red(message));
-	throw error instanceof Error ? error : new Error(message);
+	process.exit(1);
 }
 
 //#endregion
@@ -263,64 +317,8 @@ function validateExamplesCompatibility(examples, backend, database, frontend, ap
 	}
 }
 
-//#endregion
-//#region src/utils/context.ts
-const cliStorage = new AsyncLocalStorage();
-function defaultContext() {
-	return {
-		navigation: {
-			isFirstPrompt: false,
-			lastPromptShownUI: false
-		},
-		silent: false,
-		verbose: false
-	};
-}
-function getContext() {
-	const ctx = cliStorage.getStore();
-	if (!ctx) return defaultContext();
-	return ctx;
-}
-function tryGetContext() {
-	return cliStorage.getStore();
-}
-function isSilent() {
-	return getContext().silent;
-}
-function isFirstPrompt() {
-	return getContext().navigation.isFirstPrompt;
-}
-function didLastPromptShowUI() {
-	return getContext().navigation.lastPromptShownUI;
-}
-function setIsFirstPrompt$1(value) {
-	const ctx = tryGetContext();
-	if (ctx) ctx.navigation.isFirstPrompt = value;
-}
-function setLastPromptShownUI(value) {
-	const ctx = tryGetContext();
-	if (ctx) ctx.navigation.lastPromptShownUI = value;
-}
-async function runWithContextAsync(options, fn) {
-	const ctx = {
-		navigation: {
-			isFirstPrompt: false,
-			lastPromptShownUI: false
-		},
-		silent: options.silent ?? false,
-		verbose: options.verbose ?? false,
-		projectDir: options.projectDir,
-		projectName: options.projectName,
-		packageManager: options.packageManager
-	};
-	return cliStorage.run(ctx, fn);
-}
-
 //#endregion
 //#region src/utils/navigation.ts
-/**
-* Navigation symbols and utilities for prompt navigation
-*/
 const GO_BACK_SYMBOL = Symbol("clack:goBack");
 function isGoBack(value) {
 	return value === GO_BACK_SYMBOL;
@@ -616,29 +614,29 @@ function getAddonDisplay(addon) {
 	};
 }
 const ADDON_GROUPS = {
-	Documentation: ["starlight", "fumadocs"],
-	Linting: [
+	Tooling: [
+		"turborepo",
 		"biome",
 		"oxlint",
-		"ultracite"
+		"ultracite",
+		"husky"
 	],
-	Other: [
-		"ruler",
+	Documentation: ["starlight", "fumadocs"],
+	Extensions: [
 		"pwa",
 		"tauri",
-		"husky",
 		"opentui",
 		"wxt",
-		"turborepo"
+		"ruler"
 	]
 };
 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: [],
-		Linting: [],
-		Other: []
+		Extensions: []
 	};
 	const frontendsArray = frontends || [];
 	for (const addon of allAddons) {
@@ -650,9 +648,9 @@ async function getAddonsChoice(addons, frontends, auth) {
 			label,
 			hint
 		};
-		if (ADDON_GROUPS.Documentation.includes(addon)) groupedOptions.Documentation.push(option);
-		else if (ADDON_GROUPS.Linting.includes(addon)) groupedOptions.Linting.push(option);
-		else if (ADDON_GROUPS.Other.includes(addon)) groupedOptions.Other.push(option);
+		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);
 	}
 	Object.keys(groupedOptions).forEach((group$1) => {
 		if (groupedOptions[group$1].length === 0) delete groupedOptions[group$1];
@@ -1444,7 +1442,7 @@ const getLatestCLIVersion = () => {
 */
 function isTelemetryEnabled() {
 	const BTS_TELEMETRY_DISABLED = process.env.BTS_TELEMETRY_DISABLED;
-	const BTS_TELEMETRY = "0";
+	const BTS_TELEMETRY = "1";
 	if (BTS_TELEMETRY_DISABLED !== void 0) return BTS_TELEMETRY_DISABLED !== "1";
 	if (BTS_TELEMETRY !== void 0) return BTS_TELEMETRY === "1";
 	return true;
@@ -1452,7 +1450,16 @@ function isTelemetryEnabled() {
 
 //#endregion
 //#region src/utils/analytics.ts
-async function sendConvexEvent(payload) {}
+const CONVEX_INGEST_URL = "https://striped-seahorse-863.convex.site/api/analytics/ingest";
+async function sendConvexEvent(payload) {
+	try {
+		await fetch(CONVEX_INGEST_URL, {
+			method: "POST",
+			headers: { "Content-Type": "application/json" },
+			body: JSON.stringify(payload)
+		});
+	} catch {}
+}
 async function trackProjectCreation(config, disableAnalytics = false) {
 	if (!isTelemetryEnabled() || disableAnalytics) return;
 	const { projectName: _projectName, projectDir: _projectDir, relativePath: _relativePath, ...safeConfig } = config;
@@ -2029,63 +2036,6 @@ function validateConfigCompatibility(config, providedFlags, options) {
 	else validateConfigForProgrammaticUse(config);
 }
 
-//#endregion
-//#region src/utils/ts-morph.ts
-const tsProject = new Project({
-	useInMemoryFileSystem: false,
-	skipAddingFilesFromTsConfig: true,
-	manipulationSettings: {
-		quoteKind: QuoteKind.Single,
-		indentationText: IndentationText.TwoSpaces
-	}
-});
-function ensureArrayProperty(obj, name) {
-	return obj.getProperty(name)?.getFirstDescendantByKind(SyntaxKind.ArrayLiteralExpression) ?? obj.addPropertyAssignment({
-		name,
-		initializer: "[]"
-	}).getFirstDescendantByKindOrThrow(SyntaxKind.ArrayLiteralExpression);
-}
-
-//#endregion
-//#region src/utils/better-auth-plugin-setup.ts
-async function setupBetterAuthPlugins(projectDir, config) {
-	const authIndexPath = `${projectDir}/packages/auth/src/index.ts`;
-	const authIndexFile = tsProject.addSourceFileAtPath(authIndexPath);
-	if (!authIndexFile) return;
-	const pluginsToAdd = [];
-	const importsToAdd = [];
-	if (config.backend === "self" && config.frontend?.includes("tanstack-start")) {
-		pluginsToAdd.push("tanstackStartCookies()");
-		importsToAdd.push("import { tanstackStartCookies } from \"better-auth/tanstack-start\";");
-	}
-	if (config.backend === "self" && config.frontend?.includes("next")) {
-		pluginsToAdd.push("nextCookies()");
-		importsToAdd.push("import { nextCookies } from \"better-auth/next-js\";");
-	}
-	if (config.frontend?.includes("native-bare") || config.frontend?.includes("native-uniwind") || config.frontend?.includes("native-unistyles")) {
-		pluginsToAdd.push("expo()");
-		importsToAdd.push("import { expo } from \"@better-auth/expo\";");
-	}
-	if (pluginsToAdd.length === 0) return;
-	importsToAdd.forEach((importStatement) => {
-		if (!authIndexFile.getImportDeclaration((declaration) => declaration.getModuleSpecifierValue().includes(importStatement.split("\"")[1]))) authIndexFile.insertImportDeclaration(0, {
-			moduleSpecifier: importStatement.split("\"")[1],
-			namedImports: [importStatement.split("{")[1].split("}")[0].trim()]
-		});
-	});
-	const betterAuthCall = authIndexFile.getDescendantsOfKind(SyntaxKind.CallExpression).find((call) => call.getExpression().getText() === "betterAuth");
-	if (betterAuthCall) {
-		const configObject = betterAuthCall.getArguments()[0];
-		if (configObject && configObject.getKind() === SyntaxKind.ObjectLiteralExpression) {
-			const pluginsArray = ensureArrayProperty(configObject.asKindOrThrow(SyntaxKind.ObjectLiteralExpression), "plugins");
-			pluginsToAdd.forEach((plugin) => {
-				pluginsArray.addElement(plugin);
-			});
-		}
-	}
-	authIndexFile.save();
-}
-
 //#endregion
 //#region src/utils/bts-config.ts
 const BTS_CONFIG_FILE = "bts.jsonc";
@@ -2148,7 +2098,7 @@ const formatOptions = {
 	experimentalSortPackageJson: true,
 	experimentalSortImports: { order: "asc" }
 };
-async function formatFile(filePath, content) {
+async function formatCode(filePath, content) {
 	try {
 		const result = await format(path.basename(filePath), content, formatOptions);
 		if (result.errors && result.errors.length > 0) return null;
@@ -2157,45 +2107,47 @@ async function formatFile(filePath, content) {
 		return null;
 	}
 }
-/**
-* Format all files in a project directory using oxfmt
-*/
-async function formatProjectFiles(projectDir) {
-	const files = await glob(["**/*.{ts,tsx,js,jsx,json,mjs,cjs}"], {
-		cwd: projectDir,
-		absolute: true,
-		ignore: [
-			"**/node_modules/**",
-			"**/dist/**",
-			"**/.git/**"
-		]
-	});
-	await Promise.all(files.map(async (filePath) => {
-		try {
-			const content = await fs.readFile(filePath, "utf-8");
-			const formatted = await formatFile(filePath, content);
-			if (formatted && formatted !== content) await fs.writeFile(filePath, formatted, "utf-8");
-		} catch {}
-	}));
+async function formatProject(projectDir) {
+	async function formatDirectory(dir) {
+		const entries = await fs.readdir(dir, { withFileTypes: true });
+		await Promise.all(entries.map(async (entry) => {
+			const fullPath = path.join(dir, entry.name);
+			if (entry.isDirectory()) await formatDirectory(fullPath);
+			else if (entry.isFile()) try {
+				const content = await fs.readFile(fullPath, "utf-8");
+				const formatted = await formatCode(fullPath, content);
+				if (formatted && formatted !== content) await fs.writeFile(fullPath, formatted, "utf-8");
+			} catch {}
+		}));
+	}
+	await formatDirectory(projectDir);
 }
 
 //#endregion
-//#region src/utils/package-runner.ts
-/**
-* Returns the appropriate command for running a package without installing it globally,
-* based on the selected package manager.
-*
-* @param packageManager - The selected package manager (e.g., 'npm', 'yarn', 'pnpm', 'bun').
-* @param commandWithArgs - The command to run, including arguments (e.g., "prisma generate --schema=./prisma/schema.prisma").
-* @returns The full command string (e.g., "npx prisma generate --schema=./prisma/schema.prisma").
-*/
-function getPackageExecutionCommand(packageManager, commandWithArgs) {
-	switch (packageManager) {
-		case "pnpm": return `pnpm dlx ${commandWithArgs}`;
-		case "bun": return `bunx ${commandWithArgs}`;
-		default: return `npx ${commandWithArgs}`;
+//#region src/utils/add-package-deps.ts
+const addPackageDependency = async (opts) => {
+	const { dependencies = [], devDependencies = [], customDependencies = {}, customDevDependencies = {}, projectDir } = opts;
+	const pkgJsonPath = path.join(projectDir, "package.json");
+	const pkgJson = await fs.readJson(pkgJsonPath);
+	if (!pkgJson.dependencies) pkgJson.dependencies = {};
+	if (!pkgJson.devDependencies) pkgJson.devDependencies = {};
+	for (const pkgName of dependencies) {
+		const version = dependencyVersionMap[pkgName];
+		if (version) pkgJson.dependencies[pkgName] = version;
+		else console.warn(`Warning: Dependency ${pkgName} not found in version map.`);
 	}
-}
+	for (const pkgName of devDependencies) {
+		const version = dependencyVersionMap[pkgName];
+		if (version) pkgJson.devDependencies[pkgName] = version;
+		else console.warn(`Warning: Dev dependency ${pkgName} not found in version map.`);
+	}
+	for (const [pkgName, version] of Object.entries(customDependencies)) pkgJson.dependencies[pkgName] = version;
+	for (const [pkgName, version] of Object.entries(customDevDependencies)) pkgJson.devDependencies[pkgName] = version;
+	await fs.writeJson(pkgJsonPath, pkgJson, { spaces: 2 });
+};
+
+//#endregion
+//#region src/utils/package-runner.ts
 /**
 * Returns the command and arguments as an array for use with execa's $ template syntax.
 * This avoids the need for shell: true and provides better escaping.
@@ -2305,15 +2257,23 @@ async function setupFumadocs(config) {
 
 //#endregion
 //#region src/helpers/addons/oxlint-setup.ts
-/**
-* Oxlint setup - CLI-only operations
-* NOTE: Dependencies are handled by template-generator's addons-deps.ts processor
-* This file only handles external CLI initialization (oxlint --init, oxfmt --init)
-*/
 async function setupOxlint(projectDir, packageManager) {
+	await addPackageDependency({
+		devDependencies: ["oxlint", "oxfmt"],
+		projectDir
+	});
+	const packageJsonPath = path.join(projectDir, "package.json");
+	if (await fs.pathExists(packageJsonPath)) {
+		const packageJson = await fs.readJson(packageJsonPath);
+		packageJson.scripts = {
+			...packageJson.scripts,
+			check: "oxlint && oxfmt --write"
+		};
+		await fs.writeJson(packageJsonPath, packageJson, { spaces: 2 });
+	}
 	const s = spinner();
-	s.start("Initializing oxlint and oxfmt...");
 	const oxlintArgs = getPackageExecutionArgs(packageManager, "oxlint@latest --init");
+	s.start("Initializing oxlint and oxfmt...");
 	await $({
 		cwd: projectDir,
 		env: { CI: "true" }
@@ -2326,94 +2286,6 @@ async function setupOxlint(projectDir, packageManager) {
 	s.stop("oxlint and oxfmt initialized successfully!");
 }
 
-//#endregion
-//#region src/helpers/addons/ruler-setup.ts
-async function setupRuler(config) {
-	const { packageManager, projectDir } = config;
-	try {
-		log.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."));
-			return;
-		}
-		const selectedEditors = await autocompleteMultiselect({
-			message: "Select AI assistants for Ruler",
-			options: Object.entries({
-				amp: { label: "AMP" },
-				copilot: { label: "GitHub Copilot" },
-				claude: { label: "Claude Code" },
-				codex: { label: "OpenAI Codex CLI" },
-				cursor: { label: "Cursor" },
-				windsurf: { label: "Windsurf" },
-				cline: { label: "Cline" },
-				aider: { label: "Aider" },
-				firebase: { label: "Firebase Studio" },
-				"gemini-cli": { label: "Gemini CLI" },
-				junie: { label: "Junie" },
-				kilocode: { label: "Kilo Code" },
-				opencode: { label: "OpenCode" },
-				crush: { label: "Crush" },
-				zed: { label: "Zed" },
-				qwen: { label: "Qwen" },
-				amazonqcli: { label: "Amazon Q CLI" },
-				augmentcode: { label: "AugmentCode" },
-				firebender: { label: "Firebender" },
-				goose: { label: "Goose" },
-				jules: { label: "Jules" },
-				kiro: { label: "Kiro" },
-				openhands: { label: "Open Hands" },
-				roo: { label: "RooCode" },
-				trae: { label: "Trae AI" },
-				warp: { label: "Warp" }
-			}).map(([key, v]) => ({
-				value: key,
-				label: v.label
-			})),
-			required: false
-		});
-		if (isCancel(selectedEditors)) return exitCancelled("Operation cancelled");
-		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")}`));
-			return;
-		}
-		const configFile = path.join(rulerDir, "ruler.toml");
-		let updatedConfig = await fs.readFile(configFile, "utf-8");
-		const defaultAgentsLine = `default_agents = [${selectedEditors.map((editor) => `"${editor}"`).join(", ")}]`;
-		updatedConfig = updatedConfig.replace(/default_agents = \[\]/, defaultAgentsLine);
-		await fs.writeFile(configFile, updatedConfig);
-		await addRulerScriptToPackageJson(projectDir, packageManager);
-		const s = spinner();
-		s.start("Applying rules with Ruler...");
-		try {
-			const rulerApplyArgs = getPackageExecutionArgs(packageManager, `@intellectronica/ruler@latest apply --agents ${selectedEditors.join(",")} --local-only`);
-			await $({
-				cwd: projectDir,
-				env: { CI: "true" }
-			})`${rulerApplyArgs}`;
-			s.stop("Applied rules with Ruler");
-		} catch {
-			s.stop(pc.red("Failed to apply rules"));
-		}
-	} catch (error) {
-		log.error(pc.red("Failed to set up Ruler"));
-		if (error instanceof Error) console.error(pc.red(error.message));
-	}
-}
-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");
-		return;
-	}
-	const packageJson = await fs.readJson(rootPackageJsonPath);
-	if (!packageJson.scripts) packageJson.scripts = {};
-	const rulerApplyCommand = getPackageExecutionCommand(packageManager, "@intellectronica/ruler@latest apply --local-only");
-	packageJson.scripts["ruler:apply"] = rulerApplyCommand;
-	await fs.writeJson(rootPackageJsonPath, packageJson, { spaces: 2 });
-}
-
 //#endregion
 //#region src/helpers/addons/starlight-setup.ts
 async function setupStarlight(config) {
@@ -2529,38 +2401,57 @@ async function setupTui(config) {
 
 //#endregion
 //#region src/helpers/addons/ultracite-setup.ts
-/**
-* Ultracite setup - CLI-only operations
-* NOTE: Dependencies (husky, lint-staged) are handled by template-generator's addons-deps.ts
-* This file handles interactive prompts and external CLI initialization
-*/
+const LINTERS = {
+	biome: {
+		label: "Biome",
+		hint: "Fast formatter and linter"
+	},
+	eslint: {
+		label: "ESLint",
+		hint: "Traditional JavaScript linter"
+	},
+	oxlint: {
+		label: "Oxlint",
+		hint: "Oxidation compiler linter"
+	}
+};
 const EDITORS = {
-	vscode: { label: "VSCode / Cursor / Windsurf" },
+	vscode: { label: "VS Code" },
+	cursor: { label: "Cursor" },
+	windsurf: { label: "Windsurf" },
+	antigravity: { label: "Antigravity" },
+	kiro: { label: "Kiro" },
+	trae: { label: "Trae" },
+	void: { label: "Void" },
 	zed: { label: "Zed" }
 };
 const AGENTS = {
-	"vscode-copilot": { label: "VS Code Copilot" },
-	cursor: { label: "Cursor" },
-	windsurf: { label: "Windsurf" },
-	zed: { label: "Zed" },
 	claude: { label: "Claude" },
 	codex: { label: "Codex" },
-	kiro: { label: "Kiro" },
+	jules: { label: "Jules" },
+	copilot: { label: "GitHub Copilot" },
 	cline: { label: "Cline" },
 	amp: { label: "Amp" },
 	aider: { label: "Aider" },
 	"firebase-studio": { label: "Firebase Studio" },
 	"open-hands": { label: "Open Hands" },
-	"gemini-cli": { label: "Gemini CLI" },
+	gemini: { label: "Gemini" },
 	junie: { label: "Junie" },
 	augmentcode: { label: "AugmentCode" },
 	"kilo-code": { label: "Kilo Code" },
 	goose: { label: "Goose" },
-	"roo-code": { label: "Roo Code" }
+	"roo-code": { label: "Roo Code" },
+	warp: { label: "Warp" },
+	droid: { label: "Droid" },
+	opencode: { label: "OpenCode" },
+	crush: { label: "Crush" },
+	qwen: { label: "Qwen" },
+	"amazon-q-cli": { label: "Amazon Q CLI" },
+	firebender: { label: "Firebender" }
 };
 const HOOKS = {
 	cursor: { label: "Cursor" },
-	claude: { label: "Claude" }
+	windsurf: { label: "Windsurf" }
 };
 function getFrameworksFromFrontend(frontend) {
 	const frameworkMap = {
@@ -2584,6 +2475,15 @@ async function setupUltracite(config, hasHusky) {
 	try {
 		log.info("Setting up Ultracite...");
 		const result = await group({
+			linter: () => select({
+				message: "Choose linter/formatter",
+				options: Object.entries(LINTERS).map(([key, linter$1]) => ({
+					value: key,
+					label: linter$1.label,
+					hint: linter$1.hint
+				})),
+				initialValue: "biome"
+			}),
 			editors: () => multiselect({
 				message: "Choose editors",
 				options: Object.entries(EDITORS).map(([key, editor]) => ({
@@ -2592,7 +2492,7 @@ async function setupUltracite(config, hasHusky) {
 				})),
 				required: true
 			}),
-			agents: () => autocompleteMultiselect({
+			agents: () => multiselect({
 				message: "Choose agents",
 				options: Object.entries(AGENTS).map(([key, agent]) => ({
 					value: key,
@@ -2600,7 +2500,7 @@ async function setupUltracite(config, hasHusky) {
 				})),
 				required: true
 			}),
-			hooks: () => autocompleteMultiselect({
+			hooks: () => multiselect({
 				message: "Choose hooks",
 				options: Object.entries(HOOKS).map(([key, hook]) => ({
 					value: key,
@@ -2610,6 +2510,7 @@ async function setupUltracite(config, hasHusky) {
 		}, { onCancel: () => {
 			exitCancelled("Operation cancelled");
 		} });
+		const linter = result.linter;
 		const editors = result.editors;
 		const agents = result.agents;
 		const hooks = result.hooks;
@@ -2617,7 +2518,9 @@ async function setupUltracite(config, hasHusky) {
 		const ultraciteArgs = [
 			"init",
 			"--pm",
-			packageManager
+			packageManager,
+			"--linter",
+			linter
 		];
 		if (frameworks.length > 0) ultraciteArgs.push("--frameworks", ...frameworks);
 		if (editors.length > 0) ultraciteArgs.push("--editors", ...editors);
@@ -2702,360 +2605,96 @@ async function setupWxt(config) {
 
 //#endregion
 //#region src/helpers/addons/addons-setup.ts
-async function setupAddons(config, isAddCommand = false) {
-	const { addons, frontend, projectDir, packageManager } = config;
+async function setupAddons(config) {
+	const { addons, frontend, projectDir } = config;
 	const hasReactWebFrontend = frontend.includes("react-router") || frontend.includes("tanstack-router") || frontend.includes("next");
 	const hasNuxtFrontend = frontend.includes("nuxt");
 	const hasSvelteFrontend = frontend.includes("svelte");
 	const hasSolidFrontend = frontend.includes("solid");
 	const hasNextFrontend = frontend.includes("next");
-	if (addons.includes("turborepo") && isAddCommand) log.info(`${pc.yellow("Update your package.json scripts:")}
-
-${pc.dim("Replace:")} ${pc.yellow("\"pnpm -r dev\"")} ${pc.dim("→")} ${pc.green("\"turbo dev\"")}
-${pc.dim("Replace:")} ${pc.yellow("\"pnpm --filter web dev\"")} ${pc.dim("→")} ${pc.green("\"turbo -F web dev\"")}
-
-${pc.cyan("Docs:")} ${pc.underline("https://turborepo.com/docs")}
-		`);
 	if (addons.includes("tauri") && (hasReactWebFrontend || hasNuxtFrontend || hasSvelteFrontend || hasSolidFrontend || hasNextFrontend)) await setupTauri(config);
 	const hasUltracite = addons.includes("ultracite");
+	const hasBiome = addons.includes("biome");
 	const hasHusky = addons.includes("husky");
 	const hasOxlint = addons.includes("oxlint");
-	if (hasUltracite) await setupUltracite(config, hasHusky);
-	if (hasOxlint) await setupOxlint(projectDir, packageManager);
+	if (!hasUltracite) {
+		if (hasBiome) await setupBiome(projectDir);
+		if (hasOxlint) await setupOxlint(projectDir, config.packageManager);
+		if (hasHusky) {
+			let linter;
+			if (hasOxlint) linter = "oxlint";
+			else if (hasBiome) linter = "biome";
+			await setupHusky(projectDir, linter);
+		}
+	}
 	if (addons.includes("starlight")) await setupStarlight(config);
-	if (addons.includes("ruler")) await setupRuler(config);
 	if (addons.includes("fumadocs")) await setupFumadocs(config);
 	if (addons.includes("opentui")) await setupTui(config);
 	if (addons.includes("wxt")) await setupWxt(config);
+	if (hasUltracite) await setupUltracite(config, hasHusky);
 }
-
-//#endregion
-//#region src/helpers/addons/examples-setup.ts
-async function setupExamples(_config) {}
-
-//#endregion
-//#region src/utils/add-package-deps.ts
-const addPackageDependency = async (opts) => {
-	const { dependencies = [], devDependencies = [], customDependencies = {}, customDevDependencies = {}, projectDir } = opts;
-	const pkgJsonPath = path.join(projectDir, "package.json");
-	const pkgJson = await fs.readJson(pkgJsonPath);
-	if (!pkgJson.dependencies) pkgJson.dependencies = {};
-	if (!pkgJson.devDependencies) pkgJson.devDependencies = {};
-	for (const pkgName of dependencies) {
-		const version = dependencyVersionMap[pkgName];
-		if (version) pkgJson.dependencies[pkgName] = version;
-		else console.warn(`Warning: Dependency ${pkgName} not found in version map.`);
+async function setupBiome(projectDir) {
+	await addPackageDependency({
+		devDependencies: ["@biomejs/biome"],
+		projectDir
+	});
+	const packageJsonPath = path.join(projectDir, "package.json");
+	if (await fs.pathExists(packageJsonPath)) {
+		const packageJson = await fs.readJson(packageJsonPath);
+		packageJson.scripts = {
+			...packageJson.scripts,
+			check: "biome check --write ."
+		};
+		await fs.writeJson(packageJsonPath, packageJson, { spaces: 2 });
 	}
-	for (const pkgName of devDependencies) {
-		const version = dependencyVersionMap[pkgName];
-		if (version) pkgJson.devDependencies[pkgName] = version;
-		else console.warn(`Warning: Dev dependency ${pkgName} not found in version map.`);
+}
+async function setupHusky(projectDir, linter) {
+	await addPackageDependency({
+		devDependencies: ["husky", "lint-staged"],
+		projectDir
+	});
+	const packageJsonPath = path.join(projectDir, "package.json");
+	if (await fs.pathExists(packageJsonPath)) {
+		const packageJson = await fs.readJson(packageJsonPath);
+		packageJson.scripts = {
+			...packageJson.scripts,
+			prepare: "husky"
+		};
+		if (linter === "oxlint") packageJson["lint-staged"] = { "*": ["oxlint", "oxfmt --write"] };
+		else if (linter === "biome") packageJson["lint-staged"] = { "*.{js,ts,cjs,mjs,d.cts,d.mts,jsx,tsx,json,jsonc}": ["biome check --write ."] };
+		else packageJson["lint-staged"] = { "**/*.{js,mjs,cjs,jsx,ts,mts,cts,tsx,vue,astro,svelte}": "" };
+		await fs.writeJson(packageJsonPath, packageJson, { spaces: 2 });
 	}
-	for (const [pkgName, version] of Object.entries(customDependencies)) pkgJson.dependencies[pkgName] = version;
-	for (const [pkgName, version] of Object.entries(customDevDependencies)) pkgJson.devDependencies[pkgName] = version;
-	await fs.writeJson(pkgJsonPath, pkgJson, { spaces: 2 });
-};
-
-//#endregion
-//#region src/helpers/core/auth-setup.ts
-function generateAuthSecret(length = 32) {
-	const characters = "ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789";
-	let result = "";
-	const charactersLength = 62;
-	for (let i = 0; i < length; i++) result += characters.charAt(Math.floor(Math.random() * charactersLength));
-	return result;
 }
 
 //#endregion
-//#region src/helpers/core/env-setup.ts
-function getClientServerVar(frontend, backend) {
-	const hasNextJs = frontend.includes("next");
-	const hasNuxt = frontend.includes("nuxt");
-	const hasSvelte = frontend.includes("svelte");
-	const hasTanstackStart = frontend.includes("tanstack-start");
-	if (backend === "self") return {
-		key: "",
-		value: "",
-		write: false
-	};
-	let key = "VITE_SERVER_URL";
-	if (hasNextJs) key = "NEXT_PUBLIC_SERVER_URL";
-	else if (hasNuxt) key = "NUXT_PUBLIC_SERVER_URL";
-	else if (hasSvelte) key = "PUBLIC_SERVER_URL";
-	else if (hasTanstackStart) key = "VITE_SERVER_URL";
-	return {
-		key,
-		value: "http://localhost:3000",
-		write: true
-	};
-}
-function getConvexVar(frontend) {
-	const hasNextJs = frontend.includes("next");
-	const hasNuxt = frontend.includes("nuxt");
-	const hasSvelte = frontend.includes("svelte");
-	const hasTanstackStart = frontend.includes("tanstack-start");
-	if (hasNextJs) return "NEXT_PUBLIC_CONVEX_URL";
-	if (hasNuxt) return "NUXT_PUBLIC_CONVEX_URL";
-	if (hasSvelte) return "PUBLIC_CONVEX_URL";
-	if (hasTanstackStart) return "VITE_CONVEX_URL";
-	return "VITE_CONVEX_URL";
-}
-async function addEnvVariablesToFile(filePath, variables) {
-	await fs.ensureDir(path.dirname(filePath));
-	let envContent = "";
-	if (await fs.pathExists(filePath)) envContent = await fs.readFile(filePath, "utf8");
-	let modified = false;
-	let contentToAdd = "";
-	const exampleVariables = [];
-	for (const { key, value, condition, comment } of variables) if (condition) {
-		const regex = new RegExp(`^${key}=.*$`, "m");
-		const valueToWrite = value ?? "";
-		exampleVariables.push(`${key}=`);
-		if (regex.test(envContent)) {
-			const existingMatch = envContent.match(regex);
-			if (existingMatch && existingMatch[0] !== `${key}=${valueToWrite}`) {
-				envContent = envContent.replace(regex, `${key}=${valueToWrite}`);
-				modified = true;
-			}
-		} else {
-			if (comment) contentToAdd += `# ${comment}\n`;
-			contentToAdd += `${key}=${valueToWrite}\n`;
-			modified = true;
-		}
-	}
-	if (contentToAdd) {
-		if (envContent.length > 0 && !envContent.endsWith("\n")) envContent += "\n";
-		envContent += contentToAdd;
-	}
-	if (modified) await fs.writeFile(filePath, envContent.trimEnd());
-	const exampleFilePath = filePath.replace(/\.env$/, ".env.example");
-	let exampleEnvContent = "";
-	if (await fs.pathExists(exampleFilePath)) exampleEnvContent = await fs.readFile(exampleFilePath, "utf8");
-	let exampleModified = false;
-	let exampleContentToAdd = "";
-	for (const exampleVar of exampleVariables) {
-		const key = exampleVar.split("=")[0];
-		if (!new RegExp(`^${key}=.*$`, "m").test(exampleEnvContent)) {
-			exampleContentToAdd += `${exampleVar}\n`;
-			exampleModified = true;
-		}
-	}
-	if (exampleContentToAdd) {
-		if (exampleEnvContent.length > 0 && !exampleEnvContent.endsWith("\n")) exampleEnvContent += "\n";
-		exampleEnvContent += exampleContentToAdd;
-	}
-	if (exampleModified || !await fs.pathExists(exampleFilePath)) await fs.writeFile(exampleFilePath, exampleEnvContent.trimEnd());
-}
-async function setupEnvironmentVariables(config) {
-	const { backend, frontend, database, auth, examples, dbSetup, projectDir, webDeploy, serverDeploy } = config;
-	const hasReactRouter = frontend.includes("react-router");
-	const hasTanStackRouter = frontend.includes("tanstack-router");
-	const hasTanStackStart = frontend.includes("tanstack-start");
-	const hasNextJs = frontend.includes("next");
-	const hasNuxt = frontend.includes("nuxt");
-	const hasSvelte = frontend.includes("svelte");
-	const hasSolid = frontend.includes("solid");
-	const hasWebFrontend$1 = hasReactRouter || hasTanStackRouter || hasTanStackStart || hasNextJs || hasNuxt || hasSolid || hasSvelte;
-	if (hasWebFrontend$1) {
-		const clientDir = path.join(projectDir, "apps/web");
-		if (await fs.pathExists(clientDir)) {
-			const baseVar = getClientServerVar(frontend, backend);
-			const clientVars = [{
-				key: backend === "convex" ? getConvexVar(frontend) : baseVar.key,
-				value: backend === "convex" ? "https://<YOUR_CONVEX_URL>" : baseVar.value,
-				condition: backend === "convex" ? true : baseVar.write
-			}];
-			if (backend === "convex" && auth === "clerk") {
-				if (hasNextJs) clientVars.push({
-					key: "NEXT_PUBLIC_CLERK_FRONTEND_API_URL",
-					value: "",
-					condition: true
-				}, {
-					key: "NEXT_PUBLIC_CLERK_PUBLISHABLE_KEY",
-					value: "",
-					condition: true
-				}, {
-					key: "CLERK_SECRET_KEY",
-					value: "",
-					condition: true
-				});
-				else if (hasReactRouter || hasTanStackRouter || hasTanStackStart) {
-					clientVars.push({
-						key: "VITE_CLERK_PUBLISHABLE_KEY",
-						value: "",
-						condition: true
-					});
-					if (hasTanStackStart) clientVars.push({
-						key: "CLERK_SECRET_KEY",
-						value: "",
-						condition: true
-					});
-				}
-			}
-			if (backend === "convex" && auth === "better-auth") {
-				if (hasNextJs) clientVars.push({
-					key: "NEXT_PUBLIC_CONVEX_SITE_URL",
-					value: "https://<YOUR_CONVEX_URL>",
-					condition: true
-				});
-				else if (hasReactRouter || hasTanStackRouter || hasTanStackStart) clientVars.push({
-					key: "VITE_CONVEX_SITE_URL",
-					value: "https://<YOUR_CONVEX_URL>",
-					condition: true
-				});
-			}
-			await addEnvVariablesToFile(path.join(clientDir, ".env"), clientVars);
-		}
-	}
-	if (frontend.includes("native-bare") || frontend.includes("native-uniwind") || frontend.includes("native-unistyles")) {
-		const nativeDir = path.join(projectDir, "apps/native");
-		if (await fs.pathExists(nativeDir)) {
-			let envVarName = "EXPO_PUBLIC_SERVER_URL";
-			let serverUrl = "http://localhost:3000";
-			if (backend === "self") serverUrl = "http://localhost:3001";
-			if (backend === "convex") {
-				envVarName = "EXPO_PUBLIC_CONVEX_URL";
-				serverUrl = "https://<YOUR_CONVEX_URL>";
-			}
-			const nativeVars = [{
-				key: envVarName,
-				value: serverUrl,
-				condition: true
-			}];
-			if (backend === "convex" && auth === "clerk") nativeVars.push({
-				key: "EXPO_PUBLIC_CLERK_PUBLISHABLE_KEY",
-				value: "",
-				condition: true
-			});
-			if (backend === "convex" && auth === "better-auth") nativeVars.push({
-				key: "EXPO_PUBLIC_CONVEX_SITE_URL",
-				value: "https://<YOUR_CONVEX_URL>",
-				condition: true
-			});
-			await addEnvVariablesToFile(path.join(nativeDir, ".env"), nativeVars);
-		}
-	}
-	if (backend === "convex") {
-		const convexBackendDir = path.join(projectDir, "packages/backend");
-		if (await fs.pathExists(convexBackendDir)) {
-			const envLocalPath = path.join(convexBackendDir, ".env.local");
-			let commentBlocks = "";
-			if (examples?.includes("ai")) commentBlocks += `# Set Google AI API key for AI agent
-# npx convex env set GOOGLE_GENERATIVE_AI_API_KEY=your_google_api_key
-
-`;
-			if (auth === "better-auth") commentBlocks += `# Set Convex environment variables
-# npx convex env set BETTER_AUTH_SECRET=$(openssl rand -base64 32)
-${hasWebFrontend$1 ? "# npx convex env set SITE_URL http://localhost:3001\n" : ""}`;
-			if (commentBlocks) {
-				let existingContent = "";
-				if (await fs.pathExists(envLocalPath)) existingContent = await fs.readFile(envLocalPath, "utf8");
-				await fs.writeFile(envLocalPath, commentBlocks + existingContent);
-			}
-			const convexBackendVars = [];
-			if (examples?.includes("ai")) convexBackendVars.push({
-				key: "GOOGLE_GENERATIVE_AI_API_KEY",
-				value: "",
-				condition: true,
-				comment: "Google AI API key for AI agent"
-			});
-			if (auth === "better-auth") {
-				const hasNative = frontend.includes("native-bare") || frontend.includes("native-uniwind") || frontend.includes("native-unistyles");
-				const hasWeb = hasWebFrontend$1;
-				if (hasNative) convexBackendVars.push({
-					key: "EXPO_PUBLIC_CONVEX_SITE_URL",
-					value: "",
-					condition: true,
-					comment: "Same as CONVEX_URL but ends in .site"
-				});
-				if (hasWeb) convexBackendVars.push({
-					key: hasNextJs ? "NEXT_PUBLIC_CONVEX_SITE_URL" : "VITE_CONVEX_SITE_URL",
-					value: "",
-					condition: true,
-					comment: "Same as CONVEX_URL but ends in .site"
-				}, {
-					key: "SITE_URL",
-					value: "http://localhost:3001",
-					condition: true,
-					comment: "Web app URL for authentication"
-				});
-			}
-			if (convexBackendVars.length > 0) await addEnvVariablesToFile(envLocalPath, convexBackendVars);
-		}
-		return;
-	}
-	const serverDir = path.join(projectDir, "apps/server");
-	let corsOrigin = "http://localhost:3001";
-	if (backend === "self") corsOrigin = "http://localhost:3001";
-	else if (hasReactRouter || hasSvelte) corsOrigin = "http://localhost:5173";
-	let databaseUrl = null;
-	if (database !== "none" && dbSetup === "none") switch (database) {
-		case "postgres":
-			databaseUrl = "postgresql://postgres:password@localhost:5432/postgres";
-			break;
-		case "mysql":
-			databaseUrl = "mysql://root:password@localhost:3306/mydb";
-			break;
-		case "mongodb":
-			databaseUrl = "mongodb://localhost:27017/mydatabase";
+//#region src/utils/env-utils.ts
+async function addEnvVariablesToFile(envPath, variables) {
+	let content = "";
+	if (fs.existsSync(envPath)) content = await fs.readFile(envPath, "utf-8");
+	else await fs.ensureFile(envPath);
+	const existingLines = content.split("\n");
+	const newLines = [];
+	const keysToAdd = /* @__PURE__ */ new Map();
+	for (const variable of variables) {
+		if (variable.condition === false || !variable.key) continue;
+		keysToAdd.set(variable.key, variable.value);
+	}
+	let foundKeys = /* @__PURE__ */ new Set();
+	for (const line of existingLines) {
+		const trimmedLine = line.trim();
+		let lineProcessed = false;
+		for (const [key, value] of keysToAdd) if (trimmedLine.startsWith(`${key}=`)) {
+			newLines.push(`${key}=${value}`);
+			foundKeys.add(key);
+			lineProcessed = true;
 			break;
-		case "sqlite":
-			if (config.runtime === "workers" || webDeploy === "cloudflare" || serverDeploy === "cloudflare") databaseUrl = "http://127.0.0.1:8080";
-			else {
-				const dbAppDir = backend === "self" ? "apps/web" : "apps/server";
-				databaseUrl = `file:${path.join(config.projectDir, dbAppDir, "local.db")}`;
-			}
-			break;
-	}
-	const serverVars = [
-		{
-			key: "BETTER_AUTH_SECRET",
-			value: generateAuthSecret(),
-			condition: !!auth
-		},
-		{
-			key: "BETTER_AUTH_URL",
-			value: backend === "self" ? "http://localhost:3001" : "http://localhost:3000",
-			condition: !!auth
-		},
-		{
-			key: "POLAR_ACCESS_TOKEN",
-			value: "",
-			condition: config.payments === "polar"
-		},
-		{
-			key: "POLAR_SUCCESS_URL",
-			value: `${corsOrigin}/success?checkout_id={CHECKOUT_ID}`,
-			condition: config.payments === "polar"
-		},
-		{
-			key: "CORS_ORIGIN",
-			value: corsOrigin,
-			condition: true
-		},
-		{
-			key: "GOOGLE_GENERATIVE_AI_API_KEY",
-			value: "",
-			condition: examples?.includes("ai") || false
-		},
-		{
-			key: "DATABASE_URL",
-			value: databaseUrl,
-			condition: database !== "none" && dbSetup === "none"
 		}
-	];
-	if (backend === "self") {
-		const webDir = path.join(projectDir, "apps/web");
-		if (await fs.pathExists(webDir)) await addEnvVariablesToFile(path.join(webDir, ".env"), serverVars);
-	} else if (await fs.pathExists(serverDir)) await addEnvVariablesToFile(path.join(serverDir, ".env"), serverVars);
-	if (webDeploy === "cloudflare" && serverDeploy === "cloudflare" || webDeploy === "cloudflare" || serverDeploy === "cloudflare") {
-		const infraDir = path.join(projectDir, "packages/infra");
-		if (await fs.pathExists(infraDir)) await addEnvVariablesToFile(path.join(infraDir, ".env"), [{
-			key: "ALCHEMY_PASSWORD",
-			value: "please-change-this",
-			condition: true
-		}]);
+		if (!lineProcessed) newLines.push(line);
 	}
+	for (const [key, value] of keysToAdd) if (!foundKeys.has(key)) newLines.push(`${key}=${value}`);
+	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
@@ -4007,314 +3646,6 @@ async function setupDatabase(config, cliInput) {
 	}
 }
 
-//#endregion
-//#region src/helpers/deployment/alchemy/alchemy-next-setup.ts
-/**
-* Alchemy Next.js setup - CLI-only operations
-* NOTE: Dependencies are handled by template-generator's deploy-deps.ts
-* This only modifies config files for "add deploy" command
-*/
-async function setupNextAlchemyDeploy(projectDir, _packageManager, _options) {
-	const webAppDir = path.join(projectDir, "apps/web");
-	if (!await fs.pathExists(webAppDir)) return;
-	const openNextConfigPath = path.join(webAppDir, "open-next.config.ts");
-	await fs.writeFile(openNextConfigPath, `import { defineCloudflareConfig } from "@opennextjs/cloudflare";
-
-export default defineCloudflareConfig({});
-`);
-	const gitignorePath = path.join(webAppDir, ".gitignore");
-	if (await fs.pathExists(gitignorePath)) {
-		if (!(await fs.readFile(gitignorePath, "utf-8")).includes("wrangler.jsonc")) await fs.appendFile(gitignorePath, "\nwrangler.jsonc\n");
-	} else await fs.writeFile(gitignorePath, "wrangler.jsonc\n");
-}
-
-//#endregion
-//#region src/helpers/deployment/alchemy/alchemy-nuxt-setup.ts
-/**
-* Alchemy Nuxt setup - CLI-only operations
-* NOTE: Dependencies are handled by template-generator's deploy-deps.ts
-* This only modifies config files for "add deploy" command
-*/
-async function setupNuxtAlchemyDeploy(projectDir, _packageManager, _options) {
-	const webAppDir = path.join(projectDir, "apps/web");
-	if (!await fs.pathExists(webAppDir)) return;
-	const nuxtConfigPath = path.join(webAppDir, "nuxt.config.ts");
-	if (!await fs.pathExists(nuxtConfigPath)) return;
-	try {
-		const project = new Project({ manipulationSettings: {
-			indentationText: IndentationText.TwoSpaces,
-			quoteKind: QuoteKind.Double
-		} });
-		project.addSourceFileAtPath(nuxtConfigPath);
-		const exportAssignment = project.getSourceFileOrThrow(nuxtConfigPath).getExportAssignment((d) => !d.isExportEquals());
-		if (!exportAssignment) return;
-		const defineConfigCall = exportAssignment.getExpression();
-		if (!Node.isCallExpression(defineConfigCall) || defineConfigCall.getExpression().getText() !== "defineNuxtConfig") return;
-		let configObject = defineConfigCall.getArguments()[0];
-		if (!configObject) configObject = defineConfigCall.addArgument("{}");
-		if (Node.isObjectLiteralExpression(configObject)) {
-			if (!configObject.getProperty("nitro")) configObject.addPropertyAssignment({
-				name: "nitro",
-				initializer: `{
-    preset: "cloudflare_module",
-    cloudflare: {
-      deployConfig: true,
-      nodeCompat: true
-    }
-  }`
-			});
-			const modulesProperty = configObject.getProperty("modules");
-			if (modulesProperty && Node.isPropertyAssignment(modulesProperty)) {
-				const initializer = modulesProperty.getInitializer();
-				if (Node.isArrayLiteralExpression(initializer)) {
-					if (!initializer.getElements().some((el) => el.getText() === "\"nitro-cloudflare-dev\"" || el.getText() === "'nitro-cloudflare-dev'")) initializer.addElement("\"nitro-cloudflare-dev\"");
-				}
-			} else if (!modulesProperty) configObject.addPropertyAssignment({
-				name: "modules",
-				initializer: "[\"nitro-cloudflare-dev\"]"
-			});
-		}
-		await project.save();
-	} catch (error) {
-		console.warn("Failed to update nuxt.config.ts:", error);
-	}
-}
-
-//#endregion
-//#region src/helpers/deployment/alchemy/alchemy-svelte-setup.ts
-/**
-* Alchemy Svelte setup - CLI-only operations
-* NOTE: Dependencies are handled by template-generator's deploy-deps.ts
-* This only modifies config files for "add deploy" command
-*/
-async function setupSvelteAlchemyDeploy(projectDir, _packageManager, _options) {
-	const webAppDir = path.join(projectDir, "apps/web");
-	if (!await fs.pathExists(webAppDir)) return;
-	const svelteConfigPath = path.join(webAppDir, "svelte.config.js");
-	if (!await fs.pathExists(svelteConfigPath)) return;
-	try {
-		const project = new Project({ manipulationSettings: {
-			indentationText: IndentationText.TwoSpaces,
-			quoteKind: QuoteKind.Single
-		} });
-		project.addSourceFileAtPath(svelteConfigPath);
-		const sourceFile = project.getSourceFileOrThrow(svelteConfigPath);
-		const adapterImport = sourceFile.getImportDeclarations().find((imp) => imp.getModuleSpecifierValue().includes("@sveltejs/adapter"));
-		if (adapterImport) {
-			adapterImport.setModuleSpecifier("alchemy/cloudflare/sveltekit");
-			adapterImport.removeDefaultImport();
-			adapterImport.setDefaultImport("alchemy");
-		} else sourceFile.insertImportDeclaration(0, {
-			moduleSpecifier: "alchemy/cloudflare/sveltekit",
-			defaultImport: "alchemy"
-		});
-		const configVariable = sourceFile.getVariableDeclaration("config");
-		if (configVariable) {
-			const initializer = configVariable.getInitializer();
-			if (Node.isObjectLiteralExpression(initializer)) updateAdapterInConfig(initializer);
-		}
-		await project.save();
-	} catch (error) {
-		console.warn("Failed to update svelte.config.js:", error);
-	}
-}
-function updateAdapterInConfig(configObject) {
-	if (!Node.isObjectLiteralExpression(configObject)) return;
-	const kitProperty = configObject.getProperty("kit");
-	if (kitProperty && Node.isPropertyAssignment(kitProperty)) {
-		const kitInitializer = kitProperty.getInitializer();
-		if (Node.isObjectLiteralExpression(kitInitializer)) {
-			const adapterProperty = kitInitializer.getProperty("adapter");
-			if (adapterProperty && Node.isPropertyAssignment(adapterProperty)) {
-				const initializer = adapterProperty.getInitializer();
-				if (Node.isCallExpression(initializer)) {
-					const expression = initializer.getExpression();
-					if (Node.isIdentifier(expression) && expression.getText() === "adapter") expression.replaceWithText("alchemy");
-				}
-			}
-		}
-	}
-}
-
-//#endregion
-//#region src/helpers/deployment/alchemy/alchemy-tanstack-start-setup.ts
-/**
-* Alchemy TanStack Start setup - CLI-only operations
-* NOTE: Dependencies are handled by template-generator's deploy-deps.ts
-* This only modifies vite.config.ts for "add deploy" command
-*/
-async function setupTanStackStartAlchemyDeploy(projectDir, _packageManager, _options) {
-	const webAppDir = path.join(projectDir, "apps/web");
-	if (!await fs.pathExists(webAppDir)) return;
-	const viteConfigPath = path.join(webAppDir, "vite.config.ts");
-	if (await fs.pathExists(viteConfigPath)) try {
-		const project = new Project({ manipulationSettings: {
-			indentationText: IndentationText.TwoSpaces,
-			quoteKind: QuoteKind.Double
-		} });
-		project.addSourceFileAtPath(viteConfigPath);
-		const sourceFile = project.getSourceFileOrThrow(viteConfigPath);
-		const alchemyImport = sourceFile.getImportDeclaration("alchemy/cloudflare/tanstack-start");
-		if (!alchemyImport) sourceFile.addImportDeclaration({
-			moduleSpecifier: "alchemy/cloudflare/tanstack-start",
-			defaultImport: "alchemy"
-		});
-		else alchemyImport.setModuleSpecifier("alchemy/cloudflare/tanstack-start");
-		const exportAssignment = sourceFile.getExportAssignment((d) => !d.isExportEquals());
-		if (!exportAssignment) return;
-		const defineConfigCall = exportAssignment.getExpression();
-		if (!Node.isCallExpression(defineConfigCall) || defineConfigCall.getExpression().getText() !== "defineConfig") return;
-		let configObject = defineConfigCall.getArguments()[0];
-		if (!configObject) configObject = defineConfigCall.addArgument("{}");
-		if (Node.isObjectLiteralExpression(configObject)) {
-			const pluginsProperty = configObject.getProperty("plugins");
-			if (pluginsProperty && Node.isPropertyAssignment(pluginsProperty)) {
-				const initializer = pluginsProperty.getInitializer();
-				if (Node.isArrayLiteralExpression(initializer)) {
-					if (!initializer.getElements().some((el) => el.getText().includes("alchemy("))) initializer.addElement("alchemy()");
-				}
-			} else configObject.addPropertyAssignment({
-				name: "plugins",
-				initializer: "[alchemy()]"
-			});
-		}
-		await project.save();
-	} catch (error) {
-		console.warn("Failed to update vite.config.ts:", error);
-	}
-}
-
-//#endregion
-//#region src/helpers/deployment/alchemy/alchemy-vite-setup.ts
-/**
-* Alchemy setup for Vite-based frontends (React Router, Solid, TanStack Router)
-* NOTE: Dependencies are handled by template-generator's deploy-deps.ts
-* These frontends don't need config modifications - templates already have correct setup
-*/
-async function setupReactRouterAlchemyDeploy(projectDir, _packageManager, _options) {
-	const webAppDir = path.join(projectDir, "apps/web");
-	if (!await fs.pathExists(webAppDir)) return;
-}
-async function setupSolidAlchemyDeploy(projectDir, _packageManager, _options) {
-	const webAppDir = path.join(projectDir, "apps/web");
-	if (!await fs.pathExists(webAppDir)) return;
-}
-async function setupTanStackRouterAlchemyDeploy(projectDir, _packageManager, _options) {
-	const webAppDir = path.join(projectDir, "apps/web");
-	if (!await fs.pathExists(webAppDir)) return;
-}
-
-//#endregion
-//#region src/helpers/deployment/alchemy/alchemy-combined-setup.ts
-function getInfraFilter(packageManager, hasTurborepo, infraWorkspace) {
-	if (hasTurborepo) return (script) => `turbo -F ${infraWorkspace} ${script}`;
-	switch (packageManager) {
-		case "pnpm": return (script) => `pnpm --filter ${infraWorkspace} ${script}`;
-		case "npm": return (script) => `npm run ${script} --workspace ${infraWorkspace}`;
-		case "bun": return (script) => `bun run --filter ${infraWorkspace} ${script}`;
-	}
-}
-async function setupCombinedAlchemyDeploy(projectDir, packageManager, config) {
-	await setupInfraScripts(projectDir, packageManager, config);
-	const frontend = config.frontend;
-	const isNext = frontend.includes("next");
-	const isNuxt = frontend.includes("nuxt");
-	const isSvelte = frontend.includes("svelte");
-	const isTanstackRouter = frontend.includes("tanstack-router");
-	const isTanstackStart = frontend.includes("tanstack-start");
-	const isReactRouter = frontend.includes("react-router");
-	const isSolid = frontend.includes("solid");
-	if (isNext) await setupNextAlchemyDeploy(projectDir, packageManager, { skipAppScripts: true });
-	else if (isNuxt) await setupNuxtAlchemyDeploy(projectDir, packageManager, { skipAppScripts: true });
-	else if (isSvelte) await setupSvelteAlchemyDeploy(projectDir, packageManager, { skipAppScripts: true });
-	else if (isTanstackStart) await setupTanStackStartAlchemyDeploy(projectDir, packageManager, { skipAppScripts: true });
-	else if (isTanstackRouter) await setupTanStackRouterAlchemyDeploy(projectDir, packageManager, { skipAppScripts: true });
-	else if (isReactRouter) await setupReactRouterAlchemyDeploy(projectDir, packageManager, { skipAppScripts: true });
-	else if (isSolid) await setupSolidAlchemyDeploy(projectDir, packageManager, { skipAppScripts: true });
-}
-async function setupInfraScripts(projectDir, packageManager, config) {
-	const projectName = config.projectName;
-	const hasTurborepo = config.addons.includes("turborepo");
-	const infraWorkspace = `@${projectName}/infra`;
-	const rootPkgPath = path.join(projectDir, "package.json");
-	if (await fs.pathExists(rootPkgPath)) {
-		const pkg = await fs.readJson(rootPkgPath);
-		const filter = getInfraFilter(packageManager, hasTurborepo, infraWorkspace);
-		pkg.scripts = {
-			...pkg.scripts,
-			deploy: filter("deploy"),
-			destroy: filter("destroy")
-		};
-		await fs.writeJson(rootPkgPath, pkg, { spaces: 2 });
-	}
-	if (config.serverDeploy === "cloudflare") {
-		const serverPkgPath = path.join(projectDir, "apps/server/package.json");
-		if (await fs.pathExists(serverPkgPath)) {
-			const serverPkg = await fs.readJson(serverPkgPath);
-			if (serverPkg.scripts?.dev) {
-				serverPkg.scripts["dev:bare"] = serverPkg.scripts.dev;
-				delete serverPkg.scripts.dev;
-				await fs.writeJson(serverPkgPath, serverPkg, { spaces: 2 });
-			}
-		}
-	}
-	if (config.webDeploy === "cloudflare") {
-		const webPkgPath = path.join(projectDir, "apps/web/package.json");
-		if (await fs.pathExists(webPkgPath)) {
-			const webPkg = await fs.readJson(webPkgPath);
-			if (webPkg.scripts?.dev) {
-				webPkg.scripts["dev:bare"] = webPkg.scripts.dev;
-				delete webPkg.scripts.dev;
-				await fs.writeJson(webPkgPath, webPkg, { spaces: 2 });
-			}
-		}
-	}
-}
-
-//#endregion
-//#region src/helpers/deployment/server-deploy-setup.ts
-/**
-* Server deploy setup - CLI-only operations
-* NOTE: Dependencies are handled by template-generator's deploy-deps.ts processor
-* This file only handles external CLI calls for "add deploy" command
-*/
-async function setupServerDeploy(config) {
-	const { serverDeploy, webDeploy, projectDir, packageManager } = config;
-	if (serverDeploy === "none") return;
-	if (serverDeploy === "cloudflare" && webDeploy === "cloudflare") return;
-	const serverDir = path.join(projectDir, "apps/server");
-	if (!await fs.pathExists(serverDir)) return;
-	if (serverDeploy === "cloudflare") await setupInfraScripts(projectDir, packageManager, config);
-}
-
-//#endregion
-//#region src/helpers/deployment/web-deploy-setup.ts
-async function setupWebDeploy(config) {
-	const { webDeploy, serverDeploy, frontend, projectDir } = config;
-	const { packageManager } = config;
-	if (webDeploy === "none") return;
-	if (webDeploy !== "cloudflare") return;
-	if (webDeploy === "cloudflare" && serverDeploy === "cloudflare") {
-		await setupCombinedAlchemyDeploy(projectDir, packageManager, config);
-		return;
-	}
-	await setupInfraScripts(projectDir, packageManager, config);
-	const isNext = frontend.includes("next");
-	const isNuxt = frontend.includes("nuxt");
-	const isSvelte = frontend.includes("svelte");
-	const isTanstackRouter = frontend.includes("tanstack-router");
-	const isTanstackStart = frontend.includes("tanstack-start");
-	const isReactRouter = frontend.includes("react-router");
-	const isSolid = frontend.includes("solid");
-	if (isNext) await setupNextAlchemyDeploy(projectDir, packageManager);
-	else if (isNuxt) await setupNuxtAlchemyDeploy(projectDir, packageManager);
-	else if (isSvelte) await setupSvelteAlchemyDeploy(projectDir, packageManager);
-	else if (isTanstackStart) await setupTanStackStartAlchemyDeploy(projectDir, packageManager);
-	else if (isTanstackRouter) await setupTanStackRouterAlchemyDeploy(projectDir, packageManager);
-	else if (isReactRouter) await setupReactRouterAlchemyDeploy(projectDir, packageManager);
-	else if (isSolid) await setupSolidAlchemyDeploy(projectDir, packageManager);
-}
-
 //#endregion
 //#region src/helpers/core/git.ts
 async function initializeGit(projectDir, useGit) {
@@ -4582,19 +3913,11 @@ async function createProject(options, cliInput = {}) {
 		});
 		if (!result.success || !result.tree) throw new Error(result.error || "Failed to generate project templates");
 		await writeTreeToFilesystem(result.tree, projectDir);
-		await formatProjectFiles(projectDir);
 		await setPackageManagerVersion(projectDir, options.packageManager);
 		if (!isConvex && options.database !== "none") await setupDatabase(options, cliInput);
-		if (options.examples.length > 0 && options.examples[0] !== "none") await /* @__PURE__ */ setupExamples(options);
 		if (options.addons.length > 0 && options.addons[0] !== "none") await setupAddons(options);
-		if (options.auth === "better-auth" && !isConvex) {
-			const authPackageDir = `${projectDir}/packages/auth`;
-			if (await fs.pathExists(authPackageDir)) await setupBetterAuthPlugins(projectDir, options);
-		}
-		await setupEnvironmentVariables(options);
-		await setupWebDeploy(options);
-		await setupServerDeploy(options);
 		await writeBtsConfig(options);
+		await formatProject(projectDir);
 		if (!isSilent()) log.success("Project template successfully scaffolded!");
 		if (options.install) await installDependencies({
 			projectDir,