create-better-t-stack 2.48.3 → 2.49.1-canary.80158905

package/dist/{src-BwIapwZk.js → src-CyG8-I-3.js}

@@ -1,8 +1,9 @@
 #!/usr/bin/env node
 import { autocompleteMultiselect, cancel, confirm, group, groupMultiselect, intro, isCancel, log, multiselect, outro, select, spinner, text } from "@clack/prompts";
+import { createRouterClient, os } from "@orpc/server";
 import pc from "picocolors";
-import { createCli, trpcServer } from "trpc-cli";
-import z from "zod";
+import { createCli } from "trpc-cli";
+import z$1, { z } from "zod";
 import path from "node:path";
 import consola, { consola as consola$1 } from "consola";
 import fs from "fs-extra";
@@ -14,7 +15,7 @@ import { IndentationText, Node, Project, QuoteKind, SyntaxKind } from "ts-morph"
 import { glob } from "tinyglobby";
 import handlebars from "handlebars";
 import { Biome } from "@biomejs/js-api/nodejs";
-import os from "node:os";
+import os$1 from "node:os";
 
 //#region src/utils/get-package-manager.ts
 const getUserPkgManager = () => {
@@ -70,6 +71,7 @@ const dependencyVersionMap = {
 	"drizzle-kit": "^0.31.2",
 	"@planetscale/database": "^1.19.0",
 	"@libsql/client": "^0.15.9",
+	libsql: "^0.5.22",
 	"@neondatabase/serverless": "^1.0.1",
 	pg: "^8.14.1",
 	"@types/pg": "^8.11.11",
@@ -145,7 +147,9 @@ const dependencyVersionMap = {
 	"@cloudflare/workers-types": "^4.20250822.0",
 	alchemy: "^0.67.0",
 	nitropack: "^2.12.4",
-	dotenv: "^17.2.1",
+	dotenv: "^17.2.2",
+	tsdown: "^0.15.5",
+	zod: "^4.1.11",
 	"@polar-sh/better-auth": "^1.1.3",
 	"@polar-sh/sdk": "^0.34.16"
 };
@@ -263,7 +267,7 @@ const AuthSchema = z.enum([
 ]).describe("Authentication provider");
 const PaymentsSchema = z.enum(["polar", "none"]).describe("Payments provider");
 const ProjectNameSchema = z.string().min(1, "Project name cannot be empty").max(255, "Project name must be less than 255 characters").refine((name) => name === "." || !name.startsWith("."), "Project name cannot start with a dot (except for '.')").refine((name) => name === "." || !name.startsWith("-"), "Project name cannot start with a dash").refine((name) => {
-	const invalidChars = [
+	return ![
 		"<",
 		">",
 		":",
@@ -271,8 +275,7 @@ const ProjectNameSchema = z.string().min(1, "Project name cannot be empty").max(
 		"|",
 		"?",
 		"*"
-	];
-	return !invalidChars.some((char) => name.includes(char));
+	].some((char) => name.includes(char));
 }, "Project name contains invalid characters").refine((name) => name.toLowerCase() !== "node_modules", "Project name is reserved").describe("Project name or path");
 const WebDeploySchema = z.enum([
 	"wrangler",
@@ -360,12 +363,11 @@ function validateApiFrontendCompatibility(api, frontends = []) {
 function isFrontendAllowedWithBackend(frontend, backend, auth) {
 	if (backend === "convex" && frontend === "solid") return false;
 	if (auth === "clerk" && backend === "convex") {
-		const incompatibleFrontends = [
+		if ([
 			"nuxt",
 			"svelte",
 			"solid"
-		];
-		if (incompatibleFrontends.includes(frontend)) return false;
+		].includes(frontend)) return false;
 	}
 	return true;
 }
@@ -385,8 +387,7 @@ function isExampleTodoAllowed(backend, database) {
 	return !(backend !== "convex" && backend !== "none" && database === "none");
 }
 function isExampleAIAllowed(_backend, frontends = []) {
-	const includesSolid = frontends.includes("solid");
-	if (includesSolid) return false;
+	if (frontends.includes("solid")) return false;
 	return true;
 }
 function validateWebDeployRequiresWebFrontend(webDeploy, hasWebFrontendFlag) {
@@ -398,8 +399,7 @@ function validateServerDeployRequiresBackend(serverDeploy, backend) {
 function validateAddonCompatibility(addon, frontend, _auth) {
 	const compatibleFrontends = ADDON_COMPATIBILITY[addon];
 	if (compatibleFrontends.length > 0) {
-		const hasCompatibleFrontend = frontend.some((f) => compatibleFrontends.includes(f));
-		if (!hasCompatibleFrontend) {
+		if (!frontend.some((f) => compatibleFrontends.includes(f))) {
 			const frontendList = compatibleFrontends.join(", ");
 			return {
 				isCompatible: false,
@@ -912,7 +912,7 @@ async function getFrontendChoice(frontendOptions, backend, auth) {
 	if (isCancel(frontendTypes)) return exitCancelled("Operation cancelled");
 	const result = [];
 	if (frontendTypes.includes("web")) {
-		const allWebOptions = [
+		const webOptions = [
 			{
 				value: "tanstack-router",
 				label: "TanStack Router",
@@ -948,8 +948,7 @@ async function getFrontendChoice(frontendOptions, backend, auth) {
 				label: "TanStack Start",
 				hint: "SSR, Server Functions, API Routes and more with TanStack Router"
 			}
-		];
-		const webOptions = allWebOptions.filter((option) => isFrontendAllowedWithBackend(option.value, backend, auth));
+		].filter((option) => isFrontendAllowedWithBackend(option.value, backend, auth));
 		const webFramework = await select({
 			message: "Choose web",
 			options: webOptions,
@@ -1069,20 +1068,18 @@ async function getPackageManagerChoice(packageManager) {
 //#region src/prompts/payments.ts
 async function getPaymentsChoice(payments, auth, backend, frontends) {
 	if (payments !== void 0) return payments;
-	const isPolarCompatible = auth === "better-auth" && backend !== "convex" && (frontends?.length === 0 || splitFrontends(frontends).web.length > 0);
-	if (!isPolarCompatible) return "none";
-	const options = [{
-		value: "polar",
-		label: "Polar",
-		hint: "Turn your software into a business. 6 lines of code."
-	}, {
-		value: "none",
-		label: "None",
-		hint: "No payments integration"
-	}];
+	if (!(auth === "better-auth" && backend !== "convex" && (frontends?.length === 0 || splitFrontends(frontends).web.length > 0))) return "none";
 	const response = await select({
 		message: "Select payments provider",
-		options,
+		options: [{
+			value: "polar",
+			label: "Polar",
+			hint: "Turn your software into a business. 6 lines of code."
+		}, {
+			value: "none",
+			label: "None",
+			hint: "No payments integration"
+		}],
 		initialValue: DEFAULT_CONFIG.payments
 	});
 	if (isCancel(response)) return exitCancelled("Operation cancelled");
@@ -1211,12 +1208,11 @@ function getDeploymentDisplay(deployment) {
 async function getDeploymentChoice(deployment, _runtime, _backend, frontend = []) {
 	if (deployment !== void 0) return deployment;
 	if (!hasWebFrontend(frontend)) return "none";
-	const availableDeployments = [
+	const options = [
 		"wrangler",
 		"alchemy",
 		"none"
-	];
-	const options = availableDeployments.map((deploy) => {
+	].map((deploy) => {
 		const { label, hint } = getDeploymentDisplay(deploy);
 		return {
 			value: deploy,
@@ -1322,14 +1318,12 @@ function validateDirectoryName(name) {
 	if (name === ".") return void 0;
 	const result = ProjectNameSchema.safeParse(name);
 	if (!result.success) return result.error.issues[0]?.message || "Invalid project name";
-	return void 0;
 }
 async function getProjectName(initialName) {
 	if (initialName) {
 		if (initialName === ".") return initialName;
 		const finalDirName = path.basename(initialName);
-		const validationError = validateDirectoryName(finalDirName);
-		if (!validationError) {
+		if (!validateDirectoryName(finalDirName)) {
 			const projectDir = path.resolve(process.cwd(), initialName);
 			if (isPathWithinCwd(projectDir)) return initialName;
 			consola.error(pc.red("Project path must be within current directory"));
@@ -1358,7 +1352,6 @@ async function getProjectName(initialName) {
 					const projectDir = path.resolve(process.cwd(), nameToUse);
 					if (!isPathWithinCwd(projectDir)) return "Project path must be within current directory";
 				}
-				return void 0;
 			}
 		});
 		if (isCancel(response)) return exitCancelled("Operation cancelled.");
@@ -1372,8 +1365,7 @@ async function getProjectName(initialName) {
 //#region src/utils/get-latest-cli-version.ts
 const getLatestCLIVersion = () => {
 	const packageJsonPath = path.join(PKG_ROOT, "package.json");
-	const packageJsonContent = fs.readJSONSync(packageJsonPath);
-	return packageJsonContent.version ?? "1.0.0";
+	return fs.readJSONSync(packageJsonPath).version ?? "1.0.0";
 };
 
 //#endregion
@@ -1386,7 +1378,7 @@ const getLatestCLIVersion = () => {
 */
 function isTelemetryEnabled() {
 	const BTS_TELEMETRY_DISABLED = process.env.BTS_TELEMETRY_DISABLED;
-	const BTS_TELEMETRY = "1";
+	const BTS_TELEMETRY = "0";
 	if (BTS_TELEMETRY_DISABLED !== void 0) return BTS_TELEMETRY_DISABLED !== "1";
 	if (BTS_TELEMETRY !== void 0) return BTS_TELEMETRY === "1";
 	return true;
@@ -1394,12 +1386,11 @@ function isTelemetryEnabled() {
 
 //#endregion
 //#region src/utils/analytics.ts
-const POSTHOG_API_KEY = "phc_8ZUxEwwfKMajJLvxz1daGd931dYbQrwKNficBmsdIrs";
-const POSTHOG_HOST = "https://us.i.posthog.com";
+const POSTHOG_API_KEY = "random";
+const POSTHOG_HOST = "random";
 function generateSessionId() {
 	const rand = Math.random().toString(36).slice(2);
-	const now = Date.now().toString(36);
-	return `cli_${now}${rand}`;
+	return `cli_${Date.now().toString(36)}${rand}`;
 }
 async function trackProjectCreation(config, disableAnalytics = false) {
 	if (!isTelemetryEnabled() || disableAnalytics) return;
@@ -1506,9 +1497,7 @@ function generateReproducibleCommand(config) {
 async function handleDirectoryConflict(currentPathInput, silent = false) {
 	while (true) {
 		const resolvedPath = path.resolve(process.cwd(), currentPathInput);
-		const dirExists = await fs.pathExists(resolvedPath);
-		const dirIsNotEmpty = dirExists && (await fs.readdir(resolvedPath)).length > 0;
-		if (!dirIsNotEmpty) return {
+		if (!(await fs.pathExists(resolvedPath) && (await fs.readdir(resolvedPath)).length > 0)) return {
 			finalPathInput: currentPathInput,
 			shouldClearDirectory: false
 		};
@@ -1622,14 +1611,12 @@ const renderTitle = () => {
 	const terminalWidth = process.stdout.columns || 80;
 	const titleLines = TITLE_TEXT.split("\n");
 	const titleWidth = Math.max(...titleLines.map((line) => line.length));
-	if (terminalWidth < titleWidth) {
-		const simplifiedTitle = `
+	if (terminalWidth < titleWidth) console.log(gradient(Object.values(catppuccinTheme)).multiline(`
     ╔══════════════════╗
     ║  Better T Stack  ║
     ╚══════════════════╝
-    `;
-		console.log(gradient(Object.values(catppuccinTheme)).multiline(simplifiedTitle));
-	} else console.log(gradient(Object.values(catppuccinTheme)).multiline(TITLE_TEXT));
+    `));
+	else console.log(gradient(Object.values(catppuccinTheme)).multiline(TITLE_TEXT));
 };
 
 //#endregion
@@ -1755,8 +1742,7 @@ function validateConvexConstraints(config, providedFlags) {
 			"tanstack-start",
 			"next"
 		];
-		const hasSupportedFrontend = config.frontend?.some((f) => supportedFrontends.includes(f));
-		if (!hasSupportedFrontend) exitWithError("Better-Auth with Convex backend is only supported with TanStack Router, TanStack Start, or Next.js frontends. Please use '--auth clerk' or '--auth none'.");
+		if (!config.frontend?.some((f) => supportedFrontends.includes(f))) exitWithError("Better-Auth with Convex backend is only supported with TanStack Router, TanStack Start, or Next.js frontends. Please use '--auth clerk' or '--auth none'.");
 	}
 }
 function validateBackendNoneConstraints(config, providedFlags) {
@@ -1987,8 +1973,7 @@ async function updateBtsConfig(projectDir, updates) {
 	try {
 		const configPath = path.join(projectDir, BTS_CONFIG_FILE);
 		if (!await fs.pathExists(configPath)) return;
-		const configContent = await fs.readFile(configPath, "utf-8");
-		let modifiedContent = configContent;
+		let modifiedContent = await fs.readFile(configPath, "utf-8");
 		for (const [key, value] of Object.entries(updates)) {
 			const editResult = JSONC.modify(modifiedContent, [key], value, { formattingOptions: {
 				tabSize: 2,
@@ -2010,15 +1995,17 @@ const addPackageDependency = async (opts) => {
 	if (!pkgJson.dependencies) pkgJson.dependencies = {};
 	if (!pkgJson.devDependencies) pkgJson.devDependencies = {};
 	for (const pkgName of dependencies) {
-		const version = customDependencies[pkgName] || dependencyVersionMap[pkgName];
+		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 = customDevDependencies[pkgName] || dependencyVersionMap[pkgName];
+		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 });
 };
 
@@ -2078,8 +2065,7 @@ async function setupFumadocs(config) {
 			initialValue: "next-mdx"
 		});
 		if (isCancel(template)) return exitCancelled("Operation cancelled");
-		const templateArg = TEMPLATES[template].value;
-		const commandWithArgs = `create-fumadocs-app@latest fumadocs --template ${templateArg} --src --no-install --pm ${packageManager} --no-eslint --no-git`;
+		const commandWithArgs = `create-fumadocs-app@latest fumadocs --template ${TEMPLATES[template].value} --src --no-install --pm ${packageManager} --no-eslint --no-git`;
 		const fumadocsInitCommand = getPackageExecutionCommand(packageManager, commandWithArgs);
 		await execa(fumadocsInitCommand, {
 			cwd: path.join(projectDir, "apps"),
@@ -2112,27 +2098,26 @@ async function setupRuler(config) {
 			log.error(pc.red("Ruler template directory not found. Please ensure ruler addon is properly installed."));
 			return;
 		}
-		const EDITORS$1 = {
-			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" }
-		};
 		const selectedEditors = await autocompleteMultiselect({
 			message: "Select AI assistants for Ruler",
-			options: Object.entries(EDITORS$1).map(([key, v]) => ({
+			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" }
+			}).map(([key, v]) => ({
 				value: key,
 				label: v.label
 			})),
@@ -2145,8 +2130,7 @@ async function setupRuler(config) {
 			return;
 		}
 		const configFile = path.join(rulerDir, "ruler.toml");
-		const currentConfig = await fs.readFile(configFile, "utf-8");
-		let updatedConfig = currentConfig;
+		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);
@@ -2189,7 +2173,7 @@ async function setupStarlight(config) {
 	const s = spinner();
 	try {
 		s.start("Setting up Starlight docs...");
-		const starlightArgs = [
+		const commandWithArgs = `create-astro@latest ${[
 			"docs",
 			"--template",
 			"starlight",
@@ -2198,9 +2182,7 @@ async function setupStarlight(config) {
 			"tailwind",
 			"--no-git",
 			"--skip-houston"
-		];
-		const starlightArgsString = starlightArgs.join(" ");
-		const commandWithArgs = `create-astro@latest ${starlightArgsString}`;
+		].join(" ")}`;
 		const starlightInitCommand = getPackageExecutionCommand(packageManager, commandWithArgs);
 		await execa(starlightInitCommand, {
 			cwd: path.join(projectDir, "apps"),
@@ -2246,7 +2228,7 @@ async function setupTauri(config) {
 		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 = [
+		const commandWithArgs = `@tauri-apps/cli@latest ${[
 			"init",
 			`--app-name=${path.basename(projectDir)}`,
 			`--window-title=${path.basename(projectDir)}`,
@@ -2254,9 +2236,7 @@ async function setupTauri(config) {
 			`--dev-url=${devUrl}`,
 			`--before-dev-command="${packageManager} run dev"`,
 			`--before-build-command="${packageManager} run build"`
-		];
-		const tauriArgsString = tauriArgs.join(" ");
-		const commandWithArgs = `@tauri-apps/cli@latest ${tauriArgsString}`;
+		].join(" ")}`;
 		const tauriInitCommand = getPackageExecutionCommand(packageManager, commandWithArgs);
 		await execa(tauriInitCommand, {
 			cwd: clientPackageDir,
@@ -2330,8 +2310,7 @@ async function setupUltracite(config, hasHusky) {
 		if (editors.length > 0) ultraciteArgs.push("--editors", ...editors);
 		if (rules.length > 0) ultraciteArgs.push("--rules", ...rules);
 		if (hasHusky) ultraciteArgs.push("--integrations", "husky", "lint-staged");
-		const ultraciteArgsString = ultraciteArgs.join(" ");
-		const commandWithArgs = `ultracite@latest ${ultraciteArgsString} --skip-install`;
+		const commandWithArgs = `ultracite@latest ${ultraciteArgs.join(" ")} --skip-install`;
 		const ultraciteInitCommand = getPackageExecutionCommand(packageManager, commandWithArgs);
 		await execa(ultraciteInitCommand, {
 			cwd: projectDir,
@@ -2371,8 +2350,7 @@ function ensureArrayProperty(obj, name) {
 async function addPwaToViteConfig(viteConfigPath, projectName) {
 	const sourceFile = tsProject.addSourceFileAtPathIfExists(viteConfigPath);
 	if (!sourceFile) throw new Error("vite config not found");
-	const hasImport = sourceFile.getImportDeclarations().some((imp) => imp.getModuleSpecifierValue() === "vite-plugin-pwa");
-	if (!hasImport) sourceFile.insertImportDeclaration(0, {
+	if (!sourceFile.getImportDeclarations().some((imp) => imp.getModuleSpecifierValue() === "vite-plugin-pwa")) sourceFile.insertImportDeclaration(0, {
 		namedImports: ["VitePWA"],
 		moduleSpecifier: "vite-plugin-pwa"
 	});
@@ -2381,12 +2359,10 @@ async function addPwaToViteConfig(viteConfigPath, projectName) {
 		return Node.isIdentifier(expression) && expression.getText() === "defineConfig";
 	});
 	if (!defineCall) throw new Error("Could not find defineConfig call in vite config");
-	const callExpr = defineCall;
-	const configObject = callExpr.getArguments()[0];
+	const configObject = defineCall.getArguments()[0];
 	if (!configObject) throw new Error("defineConfig argument is not an object literal");
 	const pluginsArray = ensureArrayProperty(configObject, "plugins");
-	const alreadyPresent = pluginsArray.getElements().some((el) => el.getText().startsWith("VitePWA("));
-	if (!alreadyPresent) pluginsArray.addElement(`VitePWA({
+	if (!pluginsArray.getElements().some((el) => el.getText().startsWith("VitePWA("))) pluginsArray.addElement(`VitePWA({
   registerType: "autoUpdate",
   manifest: {
     name: "${projectName}",
@@ -2487,12 +2463,11 @@ async function setupHusky(projectDir, linter) {
 	}
 }
 async function setupPwa(projectDir, frontends) {
-	const isCompatibleFrontend = frontends.some((f) => [
+	if (!frontends.some((f) => [
 		"react-router",
 		"tanstack-router",
 		"solid"
-	].includes(f));
-	if (!isCompatibleFrontend) return;
+	].includes(f))) return;
 	const clientPackageDir = getWebAppDir(projectDir, frontends);
 	if (!await fs.pathExists(clientPackageDir)) return;
 	await addPackageDependency({
@@ -2592,8 +2567,7 @@ async function installDependencies({ projectDir, packageManager }) {
 function initializeBiome() {
 	try {
 		const biome = new Biome();
-		const result = biome.openProject("./");
-		const projectKey = result.projectKey;
+		const projectKey = biome.openProject("./").projectKey;
 		biome.applyConfiguration(projectKey, {
 			formatter: {
 				enabled: true,
@@ -2615,27 +2589,25 @@ function initializeBiome() {
 }
 function isSupportedFile(filePath) {
 	const ext = path.extname(filePath).toLowerCase();
-	const supportedExtensions = [
+	return [
 		".js",
 		".jsx",
 		".ts",
 		".tsx",
 		".json",
 		".jsonc"
-	];
-	return supportedExtensions.includes(ext);
+	].includes(ext);
 }
 function shouldSkipFile(filePath) {
 	const basename = path.basename(filePath);
-	const skipPatterns = [
+	return [
 		".hbs",
 		"package-lock.json",
 		"yarn.lock",
 		"pnpm-lock.yaml",
 		"bun.lock",
 		".d.ts"
-	];
-	return skipPatterns.some((pattern) => basename.includes(pattern));
+	].some((pattern) => basename.includes(pattern));
 }
 function formatFileWithBiome(filePath, content) {
 	if (!isSupportedFile(filePath) || shouldSkipFile(filePath)) return null;
@@ -2672,8 +2644,7 @@ async function processTemplate(srcPath, destPath, context) {
 		let content;
 		if (srcPath.endsWith(".hbs")) {
 			const templateContent = await fs.readFile(srcPath, "utf-8");
-			const template = handlebars.compile(templateContent);
-			content = template(context);
+			content = handlebars.compile(templateContent)(context);
 		} else content = await fs.readFile(srcPath, "utf-8");
 		try {
 			const formattedContent = await formatFileWithBiome(destPath, content);
@@ -2804,23 +2775,28 @@ async function setupBackendFramework(projectDir, context) {
 		return;
 	}
 	await fs.ensureDir(serverAppDir);
-	const serverBaseDir = path.join(PKG_ROOT, "templates/backend/server/server-base");
+	const serverBaseDir = path.join(PKG_ROOT, "templates/backend/server/base");
 	if (await fs.pathExists(serverBaseDir)) await processAndCopyFiles("**/*", serverBaseDir, serverAppDir, context);
 	const frameworkSrcDir = path.join(PKG_ROOT, `templates/backend/server/${context.backend}`);
 	if (await fs.pathExists(frameworkSrcDir)) await processAndCopyFiles("**/*", frameworkSrcDir, serverAppDir, context, true);
 	if (context.api !== "none") {
+		const apiPackageDir = path.join(projectDir, "packages/api");
+		await fs.ensureDir(apiPackageDir);
 		const apiServerBaseDir = path.join(PKG_ROOT, `templates/api/${context.api}/server/base`);
-		if (await fs.pathExists(apiServerBaseDir)) await processAndCopyFiles("**/*", apiServerBaseDir, serverAppDir, context, true);
-		const apiServerFrameworkDir = path.join(PKG_ROOT, `templates/api/${context.api}/server/${context.backend}`);
-		if (await fs.pathExists(apiServerFrameworkDir)) await processAndCopyFiles("**/*", apiServerFrameworkDir, serverAppDir, context, true);
+		if (await fs.pathExists(apiServerBaseDir)) await processAndCopyFiles("**/*", apiServerBaseDir, apiPackageDir, context);
+		let apiServerFrameworkDir = "";
+		if (context.backend === "next") apiServerFrameworkDir = path.join(PKG_ROOT, `templates/api/${context.api}/server/${context.backend}`);
+		else apiServerFrameworkDir = path.join(PKG_ROOT, `templates/api/${context.api}/server/rest`);
+		if (await fs.pathExists(apiServerFrameworkDir)) await processAndCopyFiles("**/*", apiServerFrameworkDir, apiPackageDir, context, true);
+	}
+	if (context.database !== "none" && context.orm !== "none") {
+		const dbPackageDir = path.join(projectDir, "packages/db");
+		await fs.ensureDir(dbPackageDir);
+		const dbBaseDir = path.join(PKG_ROOT, "templates/db/base");
+		if (await fs.pathExists(dbBaseDir)) await processAndCopyFiles("**/*", dbBaseDir, dbPackageDir, context);
+		const dbOrmSrcDir = path.join(PKG_ROOT, `templates/db/${context.orm}/${context.database}`);
+		if (await fs.pathExists(dbOrmSrcDir)) await processAndCopyFiles("**/*", dbOrmSrcDir, dbPackageDir, context);
 	}
-}
-async function setupDbOrmTemplates(projectDir, context) {
-	if (context.backend === "convex" || context.orm === "none" || context.database === "none") return;
-	const serverAppDir = path.join(projectDir, "apps/server");
-	await fs.ensureDir(serverAppDir);
-	const dbOrmSrcDir = path.join(PKG_ROOT, `templates/db/${context.orm}/${context.database}`);
-	if (await fs.pathExists(dbOrmSrcDir)) await processAndCopyFiles("**/*", dbOrmSrcDir, serverAppDir, context);
 }
 async function setupAuthTemplate(projectDir, context) {
 	if (!context.auth || context.auth === "none") return;
@@ -2901,20 +2877,24 @@ async function setupAuthTemplate(projectDir, context) {
 		return;
 	}
 	if (serverAppDirExists && context.backend !== "convex") {
+		const authPackageDir = path.join(projectDir, "packages/auth");
+		await fs.ensureDir(authPackageDir);
 		const authServerBaseSrc = path.join(PKG_ROOT, `templates/auth/${authProvider}/server/base`);
-		if (await fs.pathExists(authServerBaseSrc)) await processAndCopyFiles("**/*", authServerBaseSrc, serverAppDir, context);
+		if (await fs.pathExists(authServerBaseSrc)) await processAndCopyFiles("**/*", authServerBaseSrc, authPackageDir, context);
 		if (context.backend === "next") {
 			const authServerNextSrc = path.join(PKG_ROOT, `templates/auth/${authProvider}/server/next`);
-			if (await fs.pathExists(authServerNextSrc)) await processAndCopyFiles("**/*", authServerNextSrc, serverAppDir, context);
+			if (await fs.pathExists(authServerNextSrc)) await processAndCopyFiles("**/*", authServerNextSrc, authPackageDir, context);
 		}
 		if (context.orm !== "none" && context.database !== "none") {
+			const dbPackageDir = path.join(projectDir, "packages/db");
+			await fs.ensureDir(dbPackageDir);
 			const orm = context.orm;
 			const db = context.database;
 			let authDbSrc = "";
 			if (orm === "drizzle") authDbSrc = path.join(PKG_ROOT, `templates/auth/${authProvider}/server/db/drizzle/${db}`);
 			else if (orm === "prisma") authDbSrc = path.join(PKG_ROOT, `templates/auth/${authProvider}/server/db/prisma/${db}`);
 			else if (orm === "mongoose") authDbSrc = path.join(PKG_ROOT, `templates/auth/${authProvider}/server/db/mongoose/${db}`);
-			if (authDbSrc && await fs.pathExists(authDbSrc)) await processAndCopyFiles("**/*", authDbSrc, serverAppDir, context);
+			if (authDbSrc && await fs.pathExists(authDbSrc)) await processAndCopyFiles("**/*", authDbSrc, dbPackageDir, context);
 		}
 	}
 	if ((hasReactWeb || hasNuxtWeb || hasSvelteWeb || hasSolidWeb) && webAppDirExists) {
@@ -2961,8 +2941,10 @@ async function setupPaymentsTemplate(projectDir, context) {
 	const serverAppDirExists = await fs.pathExists(serverAppDir);
 	const webAppDirExists = await fs.pathExists(webAppDir);
 	if (serverAppDirExists && context.backend !== "convex") {
+		const authPackageDir = path.join(projectDir, "packages/auth");
+		await fs.ensureDir(authPackageDir);
 		const paymentsServerSrc = path.join(PKG_ROOT, `templates/payments/${context.payments}/server/base`);
-		if (await fs.pathExists(paymentsServerSrc)) await processAndCopyFiles("**/*", paymentsServerSrc, serverAppDir, context);
+		if (await fs.pathExists(paymentsServerSrc)) await processAndCopyFiles("**/*", paymentsServerSrc, authPackageDir, context);
 	}
 	const hasReactWeb = context.frontend.some((f) => [
 		"tanstack-router",
@@ -3040,15 +3022,21 @@ async function setupExamplesTemplate(projectDir, context) {
 		const exampleBaseDir = path.join(PKG_ROOT, `templates/examples/${example}`);
 		if (serverAppDirExists && context.backend !== "convex" && context.backend !== "none") {
 			const exampleServerSrc = path.join(exampleBaseDir, "server");
-			if (example === "ai" && context.backend === "next") {
-				const aiNextServerSrc = path.join(exampleServerSrc, "next");
-				if (await fs.pathExists(aiNextServerSrc)) await processAndCopyFiles("**/*", aiNextServerSrc, serverAppDir, context, false);
+			if (context.api !== "none") {
+				const apiPackageDir = path.join(projectDir, "packages/api");
+				await fs.ensureDir(apiPackageDir);
+				const exampleOrmBaseSrc = path.join(exampleServerSrc, context.orm, "base");
+				if (await fs.pathExists(exampleOrmBaseSrc)) await processAndCopyFiles("**/*", exampleOrmBaseSrc, apiPackageDir, context, false);
 			}
 			if (context.orm !== "none" && context.database !== "none") {
-				const exampleOrmBaseSrc = path.join(exampleServerSrc, context.orm, "base");
-				if (await fs.pathExists(exampleOrmBaseSrc)) await processAndCopyFiles("**/*", exampleOrmBaseSrc, serverAppDir, context, false);
+				const dbPackageDir = path.join(projectDir, "packages/db");
+				await fs.ensureDir(dbPackageDir);
 				const exampleDbSchemaSrc = path.join(exampleServerSrc, context.orm, context.database);
-				if (await fs.pathExists(exampleDbSchemaSrc)) await processAndCopyFiles("**/*", exampleDbSchemaSrc, serverAppDir, context, false);
+				if (await fs.pathExists(exampleDbSchemaSrc)) await processAndCopyFiles("**/*", exampleDbSchemaSrc, dbPackageDir, context, false);
+			}
+			if (example === "ai" && context.backend === "next") {
+				const aiNextServerSrc = path.join(exampleServerSrc, "next");
+				if (await fs.pathExists(aiNextServerSrc)) await processAndCopyFiles("**/*", aiNextServerSrc, serverAppDir, context, false);
 			}
 		}
 		if (webAppDirExists) {
@@ -3115,9 +3103,9 @@ async function handleExtras(projectDir, context) {
 }
 async function setupDockerComposeTemplates(projectDir, context) {
 	if (context.dbSetup !== "docker" || context.database === "none") return;
-	const serverAppDir = path.join(projectDir, "apps/server");
+	const dbPackageDir = path.join(projectDir, "packages/db");
 	const dockerSrcDir = path.join(PKG_ROOT, `templates/db-setup/docker-compose/${context.database}`);
-	if (await fs.pathExists(dockerSrcDir)) await processAndCopyFiles("**/*", dockerSrcDir, serverAppDir, context);
+	if (await fs.pathExists(dockerSrcDir)) await processAndCopyFiles("**/*", dockerSrcDir, dbPackageDir, context);
 }
 async function setupDeploymentTemplates(projectDir, context) {
 	if (context.webDeploy === "alchemy" || context.serverDeploy === "alchemy") if (context.webDeploy === "alchemy" && context.serverDeploy === "alchemy") {
@@ -3175,8 +3163,7 @@ async function setupDeploymentTemplates(projectDir, context) {
 async function addAddonsToProject(input) {
 	try {
 		const projectDir = input.projectDir || process.cwd();
-		const isBetterTStack = await isBetterTStackProject(projectDir);
-		if (!isBetterTStack) exitWithError("This doesn't appear to be a Better-T-Stack project. Please run this command from the root of a Better-T-Stack project.");
+		if (!await isBetterTStackProject(projectDir)) exitWithError("This doesn't appear to be a Better-T-Stack project. Please run this command from the root of a Better-T-Stack project.");
 		const detectedConfig = await detectProjectConfig(projectDir);
 		if (!detectedConfig) exitWithError("Could not detect the project configuration. Please ensure this is a valid Better-T-Stack project.");
 		const config = {
@@ -3323,15 +3310,13 @@ async function setupNextAlchemyDeploy(projectDir, _packageManager, options) {
 		await fs.writeJson(pkgPath, pkg, { spaces: 2 });
 	}
 	const openNextConfigPath = path.join(webAppDir, "open-next.config.ts");
-	const openNextConfigContent = `import { defineCloudflareConfig } from "@opennextjs/cloudflare";
+	await fs.writeFile(openNextConfigPath, `import { defineCloudflareConfig } from "@opennextjs/cloudflare";
 
 export default defineCloudflareConfig({});
-`;
-	await fs.writeFile(openNextConfigPath, openNextConfigContent);
+`);
 	const gitignorePath = path.join(webAppDir, ".gitignore");
 	if (await fs.pathExists(gitignorePath)) {
-		const gitignoreContent = await fs.readFile(gitignorePath, "utf-8");
-		if (!gitignoreContent.includes("wrangler.jsonc")) await fs.appendFile(gitignorePath, "\nwrangler.jsonc\n");
+		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");
 }
 
@@ -3367,8 +3352,7 @@ async function setupNuxtAlchemyDeploy(projectDir, _packageManager, options) {
 			quoteKind: QuoteKind.Double
 		} });
 		project.addSourceFileAtPath(nuxtConfigPath);
-		const sourceFile = project.getSourceFileOrThrow(nuxtConfigPath);
-		const exportAssignment = sourceFile.getExportAssignment((d) => !d.isExportEquals());
+		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;
@@ -3389,8 +3373,7 @@ async function setupNuxtAlchemyDeploy(projectDir, _packageManager, options) {
 			if (modulesProperty && Node.isPropertyAssignment(modulesProperty)) {
 				const initializer = modulesProperty.getInitializer();
 				if (Node.isArrayLiteralExpression(initializer)) {
-					const hasModule = initializer.getElements().some((el) => el.getText() === "\"nitro-cloudflare-dev\"" || el.getText() === "'nitro-cloudflare-dev'");
-					if (!hasModule) initializer.addElement("\"nitro-cloudflare-dev\"");
+					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",
@@ -3477,8 +3460,7 @@ async function setupSvelteAlchemyDeploy(projectDir, _packageManager, options) {
 		} });
 		project.addSourceFileAtPath(svelteConfigPath);
 		const sourceFile = project.getSourceFileOrThrow(svelteConfigPath);
-		const importDeclarations = sourceFile.getImportDeclarations();
-		const adapterImport = importDeclarations.find((imp) => imp.getModuleSpecifierValue().includes("@sveltejs/adapter"));
+		const adapterImport = sourceFile.getImportDeclarations().find((imp) => imp.getModuleSpecifierValue().includes("@sveltejs/adapter"));
 		if (adapterImport) {
 			adapterImport.setModuleSpecifier("alchemy/cloudflare/sveltekit");
 			adapterImport.removeDefaultImport();
@@ -3604,8 +3586,7 @@ async function setupTanStackStartAlchemyDeploy(projectDir, _packageManager, opti
 			if (pluginsProperty && Node.isPropertyAssignment(pluginsProperty)) {
 				const initializer = pluginsProperty.getInitializer();
 				if (Node.isArrayLiteralExpression(initializer)) {
-					const hasShim = initializer.getElements().some((el) => el.getText().includes("alchemy"));
-					if (!hasShim) initializer.addElement("alchemy()");
+					if (!initializer.getElements().some((el) => el.getText().includes("alchemy"))) initializer.addElement("alchemy()");
 					const tanstackElements = initializer.getElements().filter((el) => el.getText().includes("tanstackStart"));
 					let needsReactPlugin = false;
 					tanstackElements.forEach((element) => {
@@ -3623,8 +3604,7 @@ async function setupTanStackStartAlchemyDeploy(projectDir, _packageManager, opti
 									name: "target",
 									initializer: "\"cloudflare-module\""
 								});
-								const hasCustomViteReactPlugin = !!configObj.getProperty("customViteReactPlugin");
-								if (!hasCustomViteReactPlugin) configObj.addPropertyAssignment({
+								if (!!!configObj.getProperty("customViteReactPlugin")) configObj.addPropertyAssignment({
 									name: "customViteReactPlugin",
 									initializer: "true"
 								});
@@ -3645,7 +3625,7 @@ async function setupTanStackStartAlchemyDeploy(projectDir, _packageManager, opti
 		console.warn("Failed to update vite.config.ts:", error);
 	}
 	const nitroConfigPath = path.join(webAppDir, "nitro.config.ts");
-	const nitroConfigContent = `import { defineNitroConfig } from "nitropack/config";
+	await fs.writeFile(nitroConfigPath, `import { defineNitroConfig } from "nitropack/config";
 
 export default defineNitroConfig({
     preset: "cloudflare-module",
@@ -3653,8 +3633,7 @@ export default defineNitroConfig({
         nodeCompat: true,
     },
 });
-`;
-	await fs.writeFile(nitroConfigPath, nitroConfigContent, "utf-8");
+`, "utf-8");
 }
 
 //#endregion
@@ -3772,8 +3751,7 @@ async function setupNuxtWorkersDeploy(projectDir, packageManager) {
 	if (modulesProp && modulesProp.getKind() === SyntaxKind.PropertyAssignment) {
 		const arrayExpr = modulesProp.getFirstDescendantByKind(SyntaxKind.ArrayLiteralExpression);
 		if (arrayExpr) {
-			const alreadyHas = arrayExpr.getElements().some((el) => el.getText().replace(/['"`]/g, "") === "nitro-cloudflare-dev");
-			if (!alreadyHas) arrayExpr.addElement("'nitro-cloudflare-dev'");
+			if (!arrayExpr.getElements().some((el) => el.getText().replace(/['"`]/g, "") === "nitro-cloudflare-dev")) arrayExpr.addElement("'nitro-cloudflare-dev'");
 		}
 	} else configObj.addPropertyAssignment({
 		name: "modules",
@@ -3808,13 +3786,10 @@ async function setupSvelteWorkersDeploy(projectDir, packageManager) {
 		if (!sourceFile) return;
 		const adapterImport = sourceFile.getImportDeclarations().find((imp) => ["@sveltejs/adapter-auto", "@sveltejs/adapter-node"].includes(imp.getModuleSpecifierValue()));
 		if (adapterImport) adapterImport.setModuleSpecifier("@sveltejs/adapter-cloudflare");
-		else {
-			const alreadyHasCloudflare = sourceFile.getImportDeclarations().some((imp) => imp.getModuleSpecifierValue() === "@sveltejs/adapter-cloudflare");
-			if (!alreadyHasCloudflare) sourceFile.insertImportDeclaration(0, {
-				defaultImport: "adapter",
-				moduleSpecifier: "@sveltejs/adapter-cloudflare"
-			});
-		}
+		else if (!sourceFile.getImportDeclarations().some((imp) => imp.getModuleSpecifierValue() === "@sveltejs/adapter-cloudflare")) sourceFile.insertImportDeclaration(0, {
+			defaultImport: "adapter",
+			moduleSpecifier: "@sveltejs/adapter-cloudflare"
+		});
 		await tsProject.save();
 	}
 }
@@ -3865,8 +3840,7 @@ async function setupTanstackStartWorkersDeploy(projectDir, packageManager) {
 	const tanstackPluginText = "tanstackStart({ target: \"cloudflare-module\", customViteReactPlugin: true })";
 	if (tanstackPluginIndex === -1) pluginsArray.addElement(tanstackPluginText);
 	else pluginsArray.getElements()[tanstackPluginIndex].replaceWithText(tanstackPluginText);
-	const hasReactPlugin = pluginsArray.getElements().some((el) => Node.isCallExpression(el) && el.getExpression().getText() === reactPluginIdentifier);
-	if (!hasReactPlugin) {
+	if (!pluginsArray.getElements().some((el) => Node.isCallExpression(el) && el.getExpression().getText() === reactPluginIdentifier)) {
 		const nextIndex = pluginsArray.getElements().findIndex((el) => el.getText().includes("tanstackStart(")) + 1;
 		if (nextIndex > 0) pluginsArray.insertElement(nextIndex, `${reactPluginIdentifier}()`);
 		else pluginsArray.addElement(`${reactPluginIdentifier}()`);
@@ -3886,8 +3860,7 @@ async function setupWorkersVitePlugin(projectDir) {
 	});
 	const sourceFile = tsProject.addSourceFileAtPathIfExists(viteConfigPath);
 	if (!sourceFile) throw new Error("vite.config.ts not found in web app directory");
-	const hasCloudflareImport = sourceFile.getImportDeclarations().some((imp) => imp.getModuleSpecifierValue() === "@cloudflare/vite-plugin");
-	if (!hasCloudflareImport) sourceFile.insertImportDeclaration(0, {
+	if (!sourceFile.getImportDeclarations().some((imp) => imp.getModuleSpecifierValue() === "@cloudflare/vite-plugin")) sourceFile.insertImportDeclaration(0, {
 		namedImports: ["cloudflare"],
 		moduleSpecifier: "@cloudflare/vite-plugin"
 	});
@@ -3896,12 +3869,10 @@ async function setupWorkersVitePlugin(projectDir) {
 		return Node.isIdentifier(expression) && expression.getText() === "defineConfig";
 	});
 	if (!defineCall) throw new Error("Could not find defineConfig call in vite config");
-	const callExpr = defineCall;
-	const configObject = callExpr.getArguments()[0];
+	const configObject = defineCall.getArguments()[0];
 	if (!configObject) throw new Error("defineConfig argument is not an object literal");
 	const pluginsArray = ensureArrayProperty(configObject, "plugins");
-	const hasCloudflarePlugin = pluginsArray.getElements().some((el) => el.getText().includes("cloudflare("));
-	if (!hasCloudflarePlugin) pluginsArray.addElement("cloudflare()");
+	if (!pluginsArray.getElements().some((el) => el.getText().includes("cloudflare("))) pluginsArray.addElement("cloudflare()");
 	await tsProject.save();
 }
 
@@ -3960,8 +3931,7 @@ async function setupWorkersWebDeploy(projectDir, pkgManager) {
 async function addDeploymentToProject(input) {
 	try {
 		const projectDir = input.projectDir || process.cwd();
-		const isBetterTStack = await isBetterTStackProject(projectDir);
-		if (!isBetterTStack) exitWithError("This doesn't appear to be a Better-T-Stack project. Please run this command from the root of a Better-T-Stack project.");
+		if (!await isBetterTStackProject(projectDir)) exitWithError("This doesn't appear to be a Better-T-Stack project. Please run this command from the root of a Better-T-Stack project.");
 		const detectedConfig = await detectProjectConfig(projectDir);
 		if (!detectedConfig) exitWithError("Could not detect the project configuration. Please ensure this is a valid Better-T-Stack project.");
 		if (input.webDeploy && detectedConfig.webDeploy === input.webDeploy) exitWithError(`${input.webDeploy} web deployment is already configured for this project.`);
@@ -4015,10 +3985,10 @@ async function setupExamples(config) {
 	if (examples.includes("ai")) {
 		const webClientDir = path.join(projectDir, "apps/web");
 		const nativeClientDir = path.join(projectDir, "apps/native");
-		const serverDir = path.join(projectDir, "apps/server");
+		const apiDir = path.join(projectDir, "packages/api");
 		const webClientDirExists = await fs.pathExists(webClientDir);
 		const nativeClientDirExists = await fs.pathExists(nativeClientDir);
-		const serverDirExists = await fs.pathExists(serverDir);
+		const apiDirExists = await fs.pathExists(apiDir);
 		const hasNuxt = frontend.includes("nuxt");
 		const hasSvelte = frontend.includes("svelte");
 		const hasReactWeb = frontend.includes("react-router") || frontend.includes("tanstack-router") || frontend.includes("next") || frontend.includes("tanstack-start");
@@ -4039,9 +4009,9 @@ async function setupExamples(config) {
 			dependencies: ["ai", "@ai-sdk/react"],
 			projectDir: nativeClientDir
 		});
-		if (serverDirExists && backend !== "none") await addPackageDependency({
+		if (apiDirExists && backend !== "none") await addPackageDependency({
 			dependencies: ["ai", "@ai-sdk/google"],
-			projectDir: serverDir
+			projectDir: apiDir
 		});
 	}
 }
@@ -4131,8 +4101,7 @@ function getQueryDependencies(frontend) {
 		"native-unistyles"
 	];
 	const deps = {};
-	const needsReactQuery = frontend.some((f) => reactBasedFrontends.includes(f));
-	if (needsReactQuery) {
+	if (frontend.some((f) => reactBasedFrontends.includes(f))) {
 		const hasReactWeb = frontend.some((f) => f !== "native-nativewind" && f !== "native-unistyles" && reactBasedFrontends.includes(f));
 		const hasNative = frontend.includes("native-nativewind") || frontend.includes("native-unistyles");
 		if (hasReactWeb) deps.web = {
@@ -4158,32 +4127,54 @@ function getConvexDependencies(frontend) {
 	return deps;
 }
 async function setupApi(config) {
-	const { api, projectName, frontend, backend, packageManager, projectDir } = config;
+	const { api, projectName, frontend, backend, packageManager, projectDir, auth } = config;
 	const isConvex = backend === "convex";
 	const webDir = path.join(projectDir, "apps/web");
 	const nativeDir = path.join(projectDir, "apps/native");
 	const serverDir = path.join(projectDir, "apps/server");
 	const webDirExists = await fs.pathExists(webDir);
 	const nativeDirExists = await fs.pathExists(nativeDir);
-	const serverDirExists = await fs.pathExists(serverDir);
+	await fs.pathExists(serverDir);
 	const frontendType = getFrontendType(frontend);
 	if (!isConvex && api !== "none") {
 		const apiDeps = getApiDependencies(api, frontendType);
-		if (serverDirExists && apiDeps.server) {
+		const apiPackageDir = path.join(projectDir, "packages/api");
+		if (apiDeps.server) {
 			await addPackageDependency({
 				dependencies: apiDeps.server.dependencies,
-				projectDir: serverDir
+				projectDir: apiPackageDir
+			});
+			const frameworkDeps = [];
+			if (backend === "hono") frameworkDeps.push("hono");
+			else if (backend === "elysia") frameworkDeps.push("elysia");
+			else if (backend === "express") frameworkDeps.push("express", "@types/express");
+			else if (backend === "fastify") frameworkDeps.push("fastify");
+			if (frameworkDeps.length > 0) await addPackageDependency({
+				dependencies: frameworkDeps,
+				projectDir: apiPackageDir
 			});
 			if (api === "trpc") {
 				if (backend === "hono") await addPackageDependency({
 					dependencies: ["@hono/trpc-server"],
-					projectDir: serverDir
+					projectDir: apiPackageDir
 				});
 				else if (backend === "elysia") await addPackageDependency({
 					dependencies: ["@elysiajs/trpc"],
-					projectDir: serverDir
+					projectDir: apiPackageDir
+				});
+				else if (backend === "express") await addPackageDependency({
+					dependencies: ["@trpc/server"],
+					projectDir: apiPackageDir
+				});
+				else if (backend === "fastify") await addPackageDependency({
+					dependencies: ["@trpc/server"],
+					projectDir: apiPackageDir
 				});
 			}
+			if (auth === "better-auth") await addPackageDependency({
+				dependencies: ["better-auth"],
+				projectDir: apiPackageDir
+			});
 		}
 		if (webDirExists && apiDeps.web) await addPackageDependency({
 			dependencies: apiDeps.web.dependencies,
@@ -4227,7 +4218,7 @@ async function setupApi(config) {
 //#endregion
 //#region src/helpers/core/backend-setup.ts
 async function setupBackendDependencies(config) {
-	const { backend, runtime, api, projectDir } = config;
+	const { backend, runtime, api, auth, examples, projectDir } = config;
 	if (backend === "convex") return;
 	const framework = backend;
 	const serverDir = path.join(projectDir, "apps/server");
@@ -4255,6 +4246,13 @@ async function setupBackendDependencies(config) {
 		dependencies.push("fastify", "@fastify/cors");
 		if (runtime === "node") devDependencies.push("tsx", "@types/node");
 	}
+	if (api === "trpc") {
+		if (framework === "express") dependencies.push("@trpc/server");
+		else if (framework === "fastify") dependencies.push("@trpc/server");
+		else if (runtime === "workers") dependencies.push("@trpc/server");
+	} else if (api === "orpc") dependencies.push("@orpc/server", "@orpc/openapi", "@orpc/zod");
+	if (auth === "better-auth") dependencies.push("better-auth");
+	if (examples.includes("ai")) dependencies.push("ai", "@ai-sdk/google");
 	if (runtime === "bun") devDependencies.push("@types/bun");
 	if (dependencies.length > 0 || devDependencies.length > 0) await addPackageDependency({
 		dependencies,
@@ -4273,7 +4271,7 @@ async function setupAuth(config) {
 	const nativeDir = path.join(projectDir, "apps/native");
 	const clientDirExists = await fs.pathExists(clientDir);
 	const nativeDirExists = await fs.pathExists(nativeDir);
-	const serverDirExists = await fs.pathExists(serverDir);
+	await fs.pathExists(serverDir);
 	try {
 		if (backend === "convex") {
 			if (auth === "clerk" && clientDirExists) {
@@ -4295,8 +4293,7 @@ async function setupAuth(config) {
 			}
 			if (auth === "better-auth") {
 				const convexBackendDir = path.join(projectDir, "packages/backend");
-				const convexBackendDirExists = await fs.pathExists(convexBackendDir);
-				if (convexBackendDirExists) await addPackageDependency({
+				if (await fs.pathExists(convexBackendDir)) await addPackageDependency({
 					dependencies: ["better-auth", "@convex-dev/better-auth"],
 					customDependencies: { "better-auth": "1.3.8" },
 					projectDir: convexBackendDir
@@ -4330,11 +4327,13 @@ async function setupAuth(config) {
 			});
 			return;
 		}
-		if (serverDirExists && auth === "better-auth") await addPackageDependency({
+		const authPackageDir = path.join(projectDir, "packages/auth");
+		const authPackageDirExists = await fs.pathExists(authPackageDir);
+		if (authPackageDirExists && auth === "better-auth") await addPackageDependency({
 			dependencies: ["better-auth"],
-			projectDir: serverDir
+			projectDir: authPackageDir
 		});
-		const hasWebFrontend$1 = frontend.some((f) => [
+		if (frontend.some((f) => [
 			"react-router",
 			"tanstack-router",
 			"tanstack-start",
@@ -4342,8 +4341,7 @@ async function setupAuth(config) {
 			"nuxt",
 			"svelte",
 			"solid"
-		].includes(f));
-		if (hasWebFrontend$1 && clientDirExists) {
+		].includes(f)) && clientDirExists) {
 			if (auth === "better-auth") await addPackageDependency({
 				dependencies: ["better-auth"],
 				projectDir: clientDir
@@ -4355,9 +4353,9 @@ async function setupAuth(config) {
 					dependencies: ["better-auth", "@better-auth/expo"],
 					projectDir: nativeDir
 				});
-				if (serverDirExists) await addPackageDependency({
+				if (authPackageDirExists) await addPackageDependency({
 					dependencies: ["@better-auth/expo"],
-					projectDir: serverDir
+					projectDir: authPackageDir
 				});
 			}
 		}
@@ -4411,8 +4409,7 @@ async function addEnvVariablesToFile(filePath, variables) {
 	let exampleContentToAdd = "";
 	for (const exampleVar of exampleVariables) {
 		const key = exampleVar.split("=")[0];
-		const regex = new RegExp(`^${key}=.*$`, "m");
-		if (!regex.test(exampleEnvContent)) {
+		if (!new RegExp(`^${key}=.*$`, "m").test(exampleEnvContent)) {
 			exampleContentToAdd += `${exampleVar}\n`;
 			exampleModified = true;
 		}
@@ -4432,8 +4429,7 @@ async function setupEnvironmentVariables(config) {
 	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) {
+	if (hasReactRouter || hasTanStackRouter || hasTanStackStart || hasNextJs || hasNuxt || hasSolid || hasSvelte) {
 		const clientDir = path.join(projectDir, "apps/web");
 		if (await fs.pathExists(clientDir)) {
 			let envVarName = "VITE_SERVER_URL";
@@ -4522,15 +4518,12 @@ async function setupEnvironmentVariables(config) {
 			const convexBackendDir = path.join(projectDir, "packages/backend");
 			if (await fs.pathExists(convexBackendDir)) {
 				const envLocalPath = path.join(convexBackendDir, ".env.local");
-				if (!await fs.pathExists(envLocalPath) || !(await fs.readFile(envLocalPath, "utf8")).includes("npx convex env set")) {
-					const convexCommands = `# Set Convex environment variables
+				if (!await fs.pathExists(envLocalPath) || !(await fs.readFile(envLocalPath, "utf8")).includes("npx convex env set")) await fs.appendFile(envLocalPath, `# Set Convex environment variables
 # npx convex env set BETTER_AUTH_SECRET=$(openssl rand -base64 32)
 # npx convex env set SITE_URL http://localhost:3001
 
-`;
-					await fs.appendFile(envLocalPath, convexCommands);
-				}
-				const convexBackendVars = [{
+`);
+				await addEnvVariablesToFile(envLocalPath, [{
 					key: hasNextJs ? "NEXT_PUBLIC_CONVEX_SITE_URL" : "VITE_CONVEX_SITE_URL",
 					value: "",
 					condition: true,
@@ -4539,15 +4532,12 @@ async function setupEnvironmentVariables(config) {
 					key: "SITE_URL",
 					value: "http://localhost:3001",
 					condition: true
-				}];
-				await addEnvVariablesToFile(envLocalPath, convexBackendVars);
+				}]);
 			}
 		}
 		return;
 	}
 	const serverDir = path.join(projectDir, "apps/server");
-	if (!await fs.pathExists(serverDir)) return;
-	const envPath = path.join(serverDir, ".env");
 	let corsOrigin = "http://localhost:3001";
 	if (hasReactRouter || hasSvelte) corsOrigin = "http://localhost:5173";
 	let databaseUrl = null;
@@ -4563,80 +4553,73 @@ async function setupEnvironmentVariables(config) {
 			break;
 		case "sqlite":
 			if (config.runtime === "workers") databaseUrl = "http://127.0.0.1:8080";
-			else databaseUrl = "file:./local.db";
+			else databaseUrl = `file:${path.join(config.projectDir, "apps/server", "local.db")}`;
 			break;
 	}
-	const serverVars = [
-		{
-			key: "CORS_ORIGIN",
-			value: corsOrigin,
-			condition: true
-		},
-		{
-			key: "BETTER_AUTH_SECRET",
-			value: generateAuthSecret(),
-			condition: !!auth
-		},
-		{
-			key: "BETTER_AUTH_URL",
-			value: "http://localhost:3000",
-			condition: !!auth
-		},
-		{
-			key: "DATABASE_URL",
-			value: databaseUrl,
-			condition: database !== "none" && dbSetup === "none"
-		},
-		{
-			key: "GOOGLE_GENERATIVE_AI_API_KEY",
-			value: "",
-			condition: examples?.includes("ai") || false
-		},
-		{
-			key: "POLAR_ACCESS_TOKEN",
-			value: "",
-			condition: config.payments === "polar"
-		},
-		{
-			key: "POLAR_SUCCESS_URL",
-			value: `${corsOrigin}/success?checkout_id={CHECKOUT_ID}`,
-			condition: config.payments === "polar"
-		}
-	];
-	await addEnvVariablesToFile(envPath, serverVars);
+	if (await fs.pathExists(serverDir)) {
+		const serverEnvPath = path.join(serverDir, ".env");
+		const serverVars = [
+			{
+				key: "BETTER_AUTH_SECRET",
+				value: generateAuthSecret(),
+				condition: !!auth
+			},
+			{
+				key: "BETTER_AUTH_URL",
+				value: "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"
+			}
+		];
+		await addEnvVariablesToFile(serverEnvPath, serverVars);
+	}
 	const isUnifiedAlchemy = webDeploy === "alchemy" && serverDeploy === "alchemy";
 	const isIndividualAlchemy = webDeploy === "alchemy" || serverDeploy === "alchemy";
 	if (isUnifiedAlchemy) {
 		const rootEnvPath = path.join(projectDir, ".env");
-		const rootAlchemyVars = [{
+		await addEnvVariablesToFile(rootEnvPath, [{
 			key: "ALCHEMY_PASSWORD",
 			value: "please-change-this",
 			condition: true
-		}];
-		await addEnvVariablesToFile(rootEnvPath, rootAlchemyVars);
+		}]);
 	} else if (isIndividualAlchemy) {
 		if (webDeploy === "alchemy") {
 			const webDir = path.join(projectDir, "apps/web");
-			if (await fs.pathExists(webDir)) {
-				const webAlchemyVars = [{
-					key: "ALCHEMY_PASSWORD",
-					value: "please-change-this",
-					condition: true
-				}];
-				await addEnvVariablesToFile(path.join(webDir, ".env"), webAlchemyVars);
-			}
-		}
-		if (serverDeploy === "alchemy") {
-			const serverDir$1 = path.join(projectDir, "apps/server");
-			if (await fs.pathExists(serverDir$1)) {
-				const serverAlchemyVars = [{
-					key: "ALCHEMY_PASSWORD",
-					value: "please-change-this",
-					condition: true
-				}];
-				await addEnvVariablesToFile(path.join(serverDir$1, ".env"), serverAlchemyVars);
-			}
+			if (await fs.pathExists(webDir)) await addEnvVariablesToFile(path.join(webDir, ".env"), [{
+				key: "ALCHEMY_PASSWORD",
+				value: "please-change-this",
+				condition: true
+			}]);
 		}
+		if (serverDeploy === "alchemy") await addEnvVariablesToFile(path.join(serverDir, ".env"), [{
+			key: "ALCHEMY_PASSWORD",
+			value: "please-change-this",
+			condition: true
+		}]);
 	}
 }
 
@@ -4671,7 +4654,7 @@ async function setupCloudflareD1(config) {
 		const envPath = path.join(projectDir, "apps/server", ".env");
 		const variables = [{
 			key: "DATABASE_URL",
-			value: "file:./local.db",
+			value: `file:${path.join(projectDir, "apps/server", "local.db")}`,
 			condition: true
 		}];
 		try {
@@ -4718,13 +4701,8 @@ function getDatabaseUrl(database, projectName) {
 //#region src/utils/command-exists.ts
 async function commandExists(command) {
 	try {
-		const isWindows = process.platform === "win32";
-		if (isWindows) {
-			const result$1 = await execa("where", [command]);
-			return result$1.exitCode === 0;
-		}
-		const result = await execa("which", [command]);
-		return result.exitCode === 0;
+		if (process.platform === "win32") return (await execa("where", [command])).exitCode === 0;
+		return (await execa("which", [command])).exitCode === 0;
 	} catch {
 		return false;
 	}
@@ -4746,8 +4724,7 @@ async function checkAtlasCLI() {
 }
 async function initMongoDBAtlas(serverDir) {
 	try {
-		const hasAtlas = await checkAtlasCLI();
-		if (!hasAtlas) {
+		if (!await checkAtlasCLI()) {
 			consola.error(pc.red("MongoDB Atlas CLI not found."));
 			log.info(pc.yellow("Please install it from: https://www.mongodb.com/docs/atlas/cli/current/install-atlas-cli/"));
 			return null;
@@ -5152,9 +5129,8 @@ async function setupWithCreateDb(serverDir, packageManager, orm) {
 			consola$1.error("Failed to parse create-db response");
 			return null;
 		}
-		const databaseUrl = orm === "drizzle" ? createDbResponse.directConnectionString : createDbResponse.connectionString;
 		return {
-			databaseUrl,
+			databaseUrl: orm === "drizzle" ? createDbResponse.directConnectionString : createDbResponse.connectionString,
 			claimUrl: createDbResponse.claimUrl
 		};
 	} catch (error) {
@@ -5208,9 +5184,9 @@ async function writeEnvFile$1(projectDir, config) {
 }
 async function addDotenvImportToPrismaConfig(projectDir) {
 	try {
-		const prismaConfigPath = path.join(projectDir, "apps/server/prisma.config.ts");
+		const prismaConfigPath = path.join(projectDir, "packages/db/prisma.config.ts");
 		let content = await fs.readFile(prismaConfigPath, "utf8");
-		content = `import "dotenv/config";\n${content}`;
+		content = `import dotenv from "dotenv";\ndotenv.config({ path: "../../apps/server/.env" });\n${content}`;
 		await fs.writeFile(prismaConfigPath, content);
 	} catch (_error) {
 		consola$1.error("Failed to update prisma.config.ts");
@@ -5226,11 +5202,12 @@ function displayManualSetupInstructions$1() {
 
 DATABASE_URL="your_database_url"`);
 }
-async function addPrismaAccelerateExtension(serverDir) {
+async function addPrismaAccelerateExtension(projectDir) {
 	try {
+		const dbPackageDir = path.join(projectDir, "packages/db");
 		await addPackageDependency({
 			dependencies: ["@prisma/extension-accelerate"],
-			projectDir: serverDir
+			projectDir: dbPackageDir
 		});
 		return true;
 	} catch (_error) {
@@ -5291,7 +5268,7 @@ async function setupPrismaPostgres(config, cliInput) {
 			await writeEnvFile$1(projectDir, prismaConfig);
 			if (orm === "prisma") {
 				await addDotenvImportToPrismaConfig(projectDir);
-				await addPrismaAccelerateExtension(serverDir);
+				await addPrismaAccelerateExtension(projectDir);
 			}
 			const connectionType = orm === "drizzle" ? "direct connection" : "Prisma Accelerate";
 			log.success(pc.green(`Prisma Postgres database configured successfully with ${connectionType}!`));
@@ -5316,7 +5293,7 @@ async function writeSupabaseEnvFile(projectDir, databaseUrl) {
 	try {
 		const envPath = path.join(projectDir, "apps/server", ".env");
 		const dbUrlToUse = databaseUrl || "postgresql://postgres:postgres@127.0.0.1:54322/postgres";
-		const variables = [{
+		await addEnvVariablesToFile(envPath, [{
 			key: "DATABASE_URL",
 			value: dbUrlToUse,
 			condition: true
@@ -5324,8 +5301,7 @@ async function writeSupabaseEnvFile(projectDir, databaseUrl) {
 			key: "DIRECT_URL",
 			value: dbUrlToUse,
 			condition: true
-		}];
-		await addEnvVariablesToFile(envPath, variables);
+		}]);
 		return true;
 	} catch (error) {
 		consola$1.error(pc.red("Failed to update .env file for Supabase."));
@@ -5334,8 +5310,7 @@ async function writeSupabaseEnvFile(projectDir, databaseUrl) {
 	}
 }
 function extractDbUrl(output) {
-	const dbUrlMatch = output.match(/DB URL:\s*(postgresql:\/\/[^\s]+)/);
-	const url = dbUrlMatch?.[1];
+	const url = output.match(/DB URL:\s*(postgresql:\/\/[^\s]+)/)?.[1];
 	if (url) return url;
 	return null;
 }
@@ -5393,18 +5368,18 @@ function displayManualSupabaseInstructions(output) {
 	log.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 \`apps/server\` directory.
-4. Run \`supabase start\` in your project's \`apps/server\` directory.
+3. Run \`supabase init\` in your project's \`packages/db\` directory.
+4. Run \`supabase start\` in your project's \`packages/db\` directory.
 5. Copy the 'DB URL' from the output.${output ? `
 ${pc.bold("Relevant output from `supabase start`:")}
 ${pc.dim(output)}` : ""}
-6. Add the DB URL to the .env file in \`apps/server/.env\` as \`DATABASE_URL\`:
+6. Add the DB URL to the .env file in \`packages/db/.env\` as \`DATABASE_URL\`:
 			${pc.gray("DATABASE_URL=\"your_supabase_db_url\"")}`);
 }
 async function setupSupabase(config, cliInput) {
 	const { projectDir, packageManager } = config;
 	const manualDb = cliInput?.manualDb ?? false;
-	const serverDir = path.join(projectDir, "apps", "server");
+	const serverDir = path.join(projectDir, "packages", "db");
 	try {
 		await fs.ensureDir(serverDir);
 		if (manualDb) {
@@ -5431,8 +5406,7 @@ async function setupSupabase(config, cliInput) {
 			await writeSupabaseEnvFile(projectDir, "");
 			return;
 		}
-		const initialized = await initializeSupabase(serverDir, packageManager);
-		if (!initialized) {
+		if (!await initializeSupabase(serverDir, packageManager)) {
 			displayManualSupabaseInstructions();
 			return;
 		}
@@ -5442,14 +5416,12 @@ async function setupSupabase(config, cliInput) {
 			return;
 		}
 		const dbUrl = extractDbUrl(supabaseOutput);
-		if (dbUrl) {
-			const envUpdated = await writeSupabaseEnvFile(projectDir, dbUrl);
-			if (envUpdated) log.success(pc.green("Supabase local development setup ready!"));
-			else {
-				log.error(pc.red("Supabase setup completed, but failed to update .env automatically."));
-				displayManualSupabaseInstructions(supabaseOutput);
-			}
-		} else {
+		if (dbUrl) if (await writeSupabaseEnvFile(projectDir, dbUrl)) log.success(pc.green("Supabase local development setup ready!"));
+		else {
+			log.error(pc.red("Supabase setup completed, but failed to update .env automatically."));
+			displayManualSupabaseInstructions(supabaseOutput);
+		}
+		else {
 			log.error(pc.yellow("Supabase started, but could not extract DB URL automatically."));
 			displayManualSupabaseInstructions(supabaseOutput);
 		}
@@ -5467,8 +5439,7 @@ async function isTursoInstalled() {
 }
 async function isTursoLoggedIn() {
 	try {
-		const output = await $`turso auth whoami`;
-		return !output.stdout.includes("You are not logged in");
+		return !(await $`turso auth whoami`).stdout.includes("You are not logged in");
 	} catch {
 		return false;
 	}
@@ -5627,10 +5598,9 @@ async function setupTurso(config, cliInput) {
 			return;
 		}
 		setupSpinner.start("Checking Turso CLI availability...");
-		const platform = os.platform();
+		const platform = os$1.platform();
 		const isMac = platform === "darwin";
-		const isWindows = platform === "win32";
-		if (isWindows) {
+		if (platform === "win32") {
 			if (setupSpinner) setupSpinner.stop(pc.yellow("Turso setup not supported on Windows"));
 			log.warn(pc.yellow("Automatic Turso setup is not supported on Windows."));
 			await writeEnvFile(projectDir);
@@ -5638,8 +5608,7 @@ async function setupTurso(config, cliInput) {
 			return;
 		}
 		if (setupSpinner) setupSpinner.stop("Turso CLI availability checked");
-		const isCliInstalled = await isTursoInstalled();
-		if (!isCliInstalled) {
+		if (!await isTursoInstalled()) {
 			const shouldInstall = await confirm({
 				message: "Would you like to install Turso CLI?",
 				initialValue: true
@@ -5652,8 +5621,7 @@ async function setupTurso(config, cliInput) {
 			}
 			await installTursoCLI(isMac);
 		}
-		const isLoggedIn = await isTursoLoggedIn();
-		if (!isLoggedIn) await loginToTurso();
+		if (!await isTursoLoggedIn()) await loginToTurso();
 		const selectedGroup = await selectTursoGroup();
 		let success = false;
 		let dbName = "";
@@ -5694,15 +5662,15 @@ async function setupDatabase(config, cliInput) {
 	const { database, orm, dbSetup, backend, projectDir } = config;
 	if (backend === "convex" || database === "none") {
 		if (backend !== "convex") {
-			const serverDir$1 = path.join(projectDir, "apps/server");
-			const serverDbDir = path.join(serverDir$1, "src/db");
+			const serverDir = path.join(projectDir, "apps/server");
+			const serverDbDir = path.join(serverDir, "src/db");
 			if (await fs.pathExists(serverDbDir)) await fs.remove(serverDbDir);
 		}
 		return;
 	}
 	const s = spinner();
-	const serverDir = path.join(projectDir, "apps/server");
-	if (!await fs.pathExists(serverDir)) return;
+	const dbPackageDir = path.join(projectDir, "packages/db");
+	if (!await fs.pathExists(dbPackageDir)) return;
 	try {
 		if (orm === "prisma") if (database === "mysql" && dbSetup === "planetscale") await addPackageDependency({
 			dependencies: [
@@ -5711,23 +5679,27 @@ async function setupDatabase(config, cliInput) {
 				"@planetscale/database"
 			],
 			devDependencies: ["prisma"],
-			projectDir: serverDir
+			projectDir: dbPackageDir
 		});
 		else if (database === "sqlite" && dbSetup === "turso") await addPackageDependency({
 			dependencies: ["@prisma/client", "@prisma/adapter-libsql"],
 			devDependencies: ["prisma"],
-			projectDir: serverDir
+			projectDir: dbPackageDir
 		});
 		else await addPackageDependency({
 			dependencies: ["@prisma/client"],
 			devDependencies: ["prisma"],
-			projectDir: serverDir
+			projectDir: dbPackageDir
 		});
 		else if (orm === "drizzle") {
 			if (database === "sqlite") await addPackageDependency({
-				dependencies: ["drizzle-orm", "@libsql/client"],
+				dependencies: [
+					"drizzle-orm",
+					"@libsql/client",
+					"libsql"
+				],
 				devDependencies: ["drizzle-kit"],
-				projectDir: serverDir
+				projectDir: dbPackageDir
 			});
 			else if (database === "postgres") if (dbSetup === "neon") await addPackageDependency({
 				dependencies: [
@@ -5736,32 +5708,32 @@ async function setupDatabase(config, cliInput) {
 					"ws"
 				],
 				devDependencies: ["drizzle-kit", "@types/ws"],
-				projectDir: serverDir
+				projectDir: dbPackageDir
 			});
 			else if (dbSetup === "planetscale") await addPackageDependency({
 				dependencies: ["drizzle-orm", "pg"],
 				devDependencies: ["drizzle-kit", "@types/pg"],
-				projectDir: serverDir
+				projectDir: dbPackageDir
 			});
 			else await addPackageDependency({
 				dependencies: ["drizzle-orm", "pg"],
 				devDependencies: ["drizzle-kit", "@types/pg"],
-				projectDir: serverDir
+				projectDir: dbPackageDir
 			});
 			else if (database === "mysql") if (dbSetup === "planetscale") await addPackageDependency({
 				dependencies: ["drizzle-orm", "@planetscale/database"],
 				devDependencies: ["drizzle-kit"],
-				projectDir: serverDir
+				projectDir: dbPackageDir
 			});
 			else await addPackageDependency({
 				dependencies: ["drizzle-orm", "mysql2"],
 				devDependencies: ["drizzle-kit"],
-				projectDir: serverDir
+				projectDir: dbPackageDir
 			});
 		} else if (orm === "mongoose") await addPackageDependency({
 			dependencies: ["mongoose"],
 			devDependencies: [],
-			projectDir: serverDir
+			projectDir: dbPackageDir
 		});
 		if (dbSetup === "docker") await setupDockerCompose(config);
 		else if (database === "sqlite" && dbSetup === "turso") await setupTurso(config, cliInput);
@@ -5910,8 +5882,7 @@ function generateStackDescription(frontend, backend, api, isConvex) {
 	const hasSvelte = frontend.includes("svelte");
 	const hasNuxt = frontend.includes("nuxt");
 	const hasSolid = frontend.includes("solid");
-	const hasFrontendNone = frontend.length === 0 || frontend.includes("none");
-	if (!hasFrontendNone) {
+	if (!(frontend.length === 0 || frontend.includes("none"))) {
 		if (hasTanstackRouter) parts.push("React, TanStack Router");
 		else if (hasReactRouter) parts.push("React, React Router");
 		else if (hasNext) parts.push("Next.js");
@@ -5967,8 +5938,7 @@ function generateProjectStructure(projectName, frontend, backend, addons, isConv
 			structure.push(`│   ├── web/         # Frontend application (${frontendType})`);
 		}
 	}
-	const hasNative = frontend.includes("native-nativewind") || frontend.includes("native-unistyles");
-	if (hasNative) structure.push("│   ├── native/      # Mobile application (React Native, Expo)");
+	if (frontend.includes("native-nativewind") || frontend.includes("native-unistyles")) structure.push("│   ├── native/      # Mobile application (React Native, Expo)");
 	if (addons.includes("starlight")) structure.push("│   ├── docs/        # Documentation site (Astro Starlight)");
 	if (isConvex) {
 		structure.push("├── packages/");
@@ -6129,7 +6099,7 @@ SERVER_URL={your-production-server-domain}
 CORS_ORIGIN={your-production-web-domain}
 BETTER_AUTH_URL={your-production-server-domain}
 \`\`\`
-- In \`apps/server/lib/auth.ts\`, uncomment the \`session.cookieCache\` and \`advanced.crossSubDomainCookies\` sections and replace \`<your-workers-subdomain>\` with your actual workers subdomain. These settings are required to ensure cookies are transferred properly between your web and server domains.
+- In \`apps/server/src/lib/auth.ts\`, uncomment the \`session.cookieCache\` and \`advanced.crossSubDomainCookies\` sections and replace \`<your-workers-subdomain>\` with your actual workers subdomain. These settings are required to ensure cookies are transferred properly between your web and server domains.
 `;
 }
 function generateDeploymentCommands(packageManagerRunCmd, webDeploy, serverDeploy) {
@@ -6152,12 +6122,11 @@ function generateDeploymentCommands(packageManagerRunCmd, webDeploy, serverDeplo
 //#region src/helpers/core/git.ts
 async function initializeGit(projectDir, useGit) {
 	if (!useGit) return;
-	const gitVersionResult = await $({
+	if ((await $({
 		cwd: projectDir,
 		reject: false,
 		stderr: "pipe"
-	})`git --version`;
-	if (gitVersionResult.exitCode !== 0) {
+	})`git --version`).exitCode !== 0) {
 		log.warn(pc.yellow("Git is not installed"));
 		return;
 	}
@@ -6187,7 +6156,7 @@ async function setupPayments(config) {
 			projectDir: serverDir
 		});
 		if (clientDirExists) {
-			const hasWebFrontend$1 = frontend.some((f) => [
+			if (frontend.some((f) => [
 				"react-router",
 				"tanstack-router",
 				"tanstack-start",
@@ -6195,8 +6164,7 @@ async function setupPayments(config) {
 				"nuxt",
 				"svelte",
 				"solid"
-			].includes(f));
-			if (hasWebFrontend$1) await addPackageDependency({
+			].includes(f))) await addPackageDependency({
 				dependencies: ["@polar-sh/better-auth"],
 				projectDir: clientDir
 			});
@@ -6237,15 +6205,13 @@ function getDockerInstallInstructions(platform, database) {
 	return `${pc.yellow("IMPORTANT:")} Docker required for ${databaseName}. Install for ${platformName}:\n${pc.blue(installUrl)}`;
 }
 async function getDockerStatus(database) {
-	const platform = os.platform();
-	const installed = await isDockerInstalled();
-	if (!installed) return {
+	const platform = os$1.platform();
+	if (!await isDockerInstalled()) return {
 		installed: false,
 		running: false,
 		message: getDockerInstallInstructions(platform, database)
 	};
-	const running = await isDockerRunning();
-	if (!running) return {
+	if (!await isDockerRunning()) return {
 		installed: true,
 		running: false,
 		message: `${pc.yellow("IMPORTANT:")} Docker is installed but not running.`
@@ -6424,12 +6390,66 @@ function getAlchemyDeployInstructions(runCmd, webDeploy, serverDeploy) {
 	return instructions.length ? `\n${instructions.join("\n")}` : "";
 }
 
+//#endregion
+//#region src/helpers/core/workspace-setup.ts
+async function setupWorkspaceDependencies(projectDir, options) {
+	const projectName = options.projectName;
+	const workspaceVersion = options.packageManager === "npm" ? "*" : "workspace:*";
+	const commonDeps = ["dotenv", "zod"];
+	const commonDevDeps = ["tsdown"];
+	const dbPackageDir = path.join(projectDir, "packages/db");
+	if (await fs.pathExists(dbPackageDir)) await addPackageDependency({
+		dependencies: commonDeps,
+		devDependencies: commonDevDeps,
+		projectDir: dbPackageDir
+	});
+	const authPackageDir = path.join(projectDir, "packages/auth");
+	if (await fs.pathExists(authPackageDir)) await addPackageDependency({
+		dependencies: commonDeps,
+		devDependencies: commonDevDeps,
+		customDependencies: { [`@${projectName}/db`]: workspaceVersion },
+		projectDir: authPackageDir
+	});
+	const apiPackageDir = path.join(projectDir, "packages/api");
+	if (await fs.pathExists(apiPackageDir)) await addPackageDependency({
+		dependencies: commonDeps,
+		devDependencies: commonDevDeps,
+		customDependencies: {
+			[`@${projectName}/auth`]: workspaceVersion,
+			[`@${projectName}/db`]: workspaceVersion
+		},
+		projectDir: apiPackageDir
+	});
+	const serverPackageDir = path.join(projectDir, "apps/server");
+	if (await fs.pathExists(serverPackageDir)) await addPackageDependency({
+		dependencies: commonDeps,
+		devDependencies: commonDevDeps,
+		customDependencies: {
+			[`@${projectName}/api`]: workspaceVersion,
+			[`@${projectName}/auth`]: workspaceVersion,
+			[`@${projectName}/db`]: workspaceVersion
+		},
+		projectDir: serverPackageDir
+	});
+	if (options.api && options.api !== "none") {
+		const webPackageDir = path.join(projectDir, "apps/web");
+		if (await fs.pathExists(webPackageDir)) await addPackageDependency({
+			customDependencies: { [`@${projectName}/api`]: workspaceVersion },
+			projectDir: webPackageDir
+		});
+	}
+}
+
 //#endregion
 //#region src/helpers/core/project-config.ts
 async function updatePackageConfigurations(projectDir, options) {
 	await updateRootPackageJson(projectDir, options);
-	if (options.backend !== "convex") await updateServerPackageJson(projectDir, options);
-	else await updateConvexPackageJson(projectDir, options);
+	if (options.backend !== "convex") {
+		await updateServerPackageJson(projectDir, options);
+		await updateAuthPackageJson(projectDir, options);
+		await updateApiPackageJson(projectDir, options);
+		await setupWorkspaceDependencies(projectDir, options);
+	} else await updateConvexPackageJson(projectDir, options);
 }
 async function updateRootPackageJson(projectDir, options) {
 	const rootPackageJsonPath = path.join(projectDir, "package.json");
@@ -6439,6 +6459,7 @@ async function updateRootPackageJson(projectDir, options) {
 	if (!packageJson.scripts) packageJson.scripts = {};
 	const scripts = packageJson.scripts;
 	const backendPackageName = options.backend === "convex" ? `@${options.projectName}/backend` : "server";
+	const dbPackageName = `@${options.projectName}/db`;
 	let serverDevScript = "";
 	if (options.addons.includes("turborepo")) serverDevScript = `turbo -F ${backendPackageName} dev`;
 	else if (options.packageManager === "bun") serverDevScript = `bun run --filter ${backendPackageName} dev`;
@@ -6458,14 +6479,14 @@ async function updateRootPackageJson(projectDir, options) {
 		scripts["dev:server"] = serverDevScript;
 		if (options.backend === "convex") scripts["dev:setup"] = `turbo -F ${backendPackageName} dev:setup`;
 		if (needsDbScripts) {
-			scripts["db:push"] = `turbo -F ${backendPackageName} db:push`;
-			if (!(options.dbSetup === "d1" && options.serverDeploy === "alchemy")) scripts["db:studio"] = `turbo -F ${backendPackageName} db:studio`;
+			scripts["db:push"] = `turbo -F ${dbPackageName} db:push`;
+			if (!(options.dbSetup === "d1" && options.serverDeploy === "alchemy")) scripts["db:studio"] = `turbo -F ${dbPackageName} db:studio`;
 			if (options.orm === "prisma") {
-				scripts["db:generate"] = `turbo -F ${backendPackageName} db:generate`;
-				scripts["db:migrate"] = `turbo -F ${backendPackageName} db:migrate`;
+				scripts["db:generate"] = `turbo -F ${dbPackageName} db:generate`;
+				scripts["db:migrate"] = `turbo -F ${dbPackageName} db:migrate`;
 			} else if (options.orm === "drizzle") {
-				scripts["db:generate"] = `turbo -F ${backendPackageName} db:generate`;
-				if (!(options.dbSetup === "d1" && options.serverDeploy === "alchemy")) scripts["db:migrate"] = `turbo -F ${backendPackageName} db:migrate`;
+				scripts["db:generate"] = `turbo -F ${dbPackageName} db:generate`;
+				if (!(options.dbSetup === "d1" && options.serverDeploy === "alchemy")) scripts["db:migrate"] = `turbo -F ${dbPackageName} db:migrate`;
 			}
 		}
 		if (options.dbSetup === "docker") {
@@ -6483,14 +6504,14 @@ async function updateRootPackageJson(projectDir, options) {
 		scripts["dev:server"] = serverDevScript;
 		if (options.backend === "convex") scripts["dev:setup"] = `pnpm --filter ${backendPackageName} dev:setup`;
 		if (needsDbScripts) {
-			scripts["db:push"] = `pnpm --filter ${backendPackageName} db:push`;
-			if (!(options.dbSetup === "d1" && options.serverDeploy === "alchemy")) scripts["db:studio"] = `pnpm --filter ${backendPackageName} db:studio`;
+			scripts["db:push"] = `pnpm --filter ${dbPackageName} db:push`;
+			if (!(options.dbSetup === "d1" && options.serverDeploy === "alchemy")) scripts["db:studio"] = `pnpm --filter ${dbPackageName} db:studio`;
 			if (options.orm === "prisma") {
-				scripts["db:generate"] = `pnpm --filter ${backendPackageName} db:generate`;
-				scripts["db:migrate"] = `pnpm --filter ${backendPackageName} db:migrate`;
+				scripts["db:generate"] = `pnpm --filter ${dbPackageName} db:generate`;
+				scripts["db:migrate"] = `pnpm --filter ${dbPackageName} db:migrate`;
 			} else if (options.orm === "drizzle") {
-				scripts["db:generate"] = `pnpm --filter ${backendPackageName} db:generate`;
-				if (!(options.dbSetup === "d1" && options.serverDeploy === "alchemy")) scripts["db:migrate"] = `pnpm --filter ${backendPackageName} db:migrate`;
+				scripts["db:generate"] = `pnpm --filter ${dbPackageName} db:generate`;
+				if (!(options.dbSetup === "d1" && options.serverDeploy === "alchemy")) scripts["db:migrate"] = `pnpm --filter ${dbPackageName} db:migrate`;
 			}
 		}
 		if (options.dbSetup === "docker") {
@@ -6508,14 +6529,14 @@ async function updateRootPackageJson(projectDir, options) {
 		scripts["dev:server"] = serverDevScript;
 		if (options.backend === "convex") scripts["dev:setup"] = `npm run dev:setup --workspace ${backendPackageName}`;
 		if (needsDbScripts) {
-			scripts["db:push"] = `npm run db:push --workspace ${backendPackageName}`;
-			if (!(options.dbSetup === "d1" && options.serverDeploy === "alchemy")) scripts["db:studio"] = `npm run db:studio --workspace ${backendPackageName}`;
+			scripts["db:push"] = `npm run db:push --workspace ${dbPackageName}`;
+			if (!(options.dbSetup === "d1" && options.serverDeploy === "alchemy")) scripts["db:studio"] = `npm run db:studio --workspace ${dbPackageName}`;
 			if (options.orm === "prisma") {
-				scripts["db:generate"] = `npm run db:generate --workspace ${backendPackageName}`;
-				scripts["db:migrate"] = `npm run db:migrate --workspace ${backendPackageName}`;
+				scripts["db:generate"] = `npm run db:generate --workspace ${dbPackageName}`;
+				scripts["db:migrate"] = `npm run db:migrate --workspace ${dbPackageName}`;
 			} else if (options.orm === "drizzle") {
-				scripts["db:generate"] = `npm run db:generate --workspace ${backendPackageName}`;
-				if (!(options.dbSetup === "d1" && options.serverDeploy === "alchemy")) scripts["db:migrate"] = `npm run db:migrate --workspace ${backendPackageName}`;
+				scripts["db:generate"] = `npm run db:generate --workspace ${dbPackageName}`;
+				if (!(options.dbSetup === "d1" && options.serverDeploy === "alchemy")) scripts["db:migrate"] = `npm run db:migrate --workspace ${dbPackageName}`;
 			}
 		}
 		if (options.dbSetup === "docker") {
@@ -6533,14 +6554,14 @@ async function updateRootPackageJson(projectDir, options) {
 		scripts["dev:server"] = serverDevScript;
 		if (options.backend === "convex") scripts["dev:setup"] = `bun run --filter ${backendPackageName} dev:setup`;
 		if (needsDbScripts) {
-			scripts["db:push"] = `bun run --filter ${backendPackageName} db:push`;
-			if (!(options.dbSetup === "d1" && options.serverDeploy === "alchemy")) scripts["db:studio"] = `bun run --filter ${backendPackageName} db:studio`;
+			scripts["db:push"] = `bun run --filter ${dbPackageName} db:push`;
+			if (!(options.dbSetup === "d1" && options.serverDeploy === "alchemy")) scripts["db:studio"] = `bun run --filter ${dbPackageName} db:studio`;
 			if (options.orm === "prisma") {
-				scripts["db:generate"] = `bun run --filter ${backendPackageName} db:generate`;
-				scripts["db:migrate"] = `bun run --filter ${backendPackageName} db:migrate`;
+				scripts["db:generate"] = `bun run --filter ${dbPackageName} db:generate`;
+				scripts["db:migrate"] = `bun run --filter ${dbPackageName} db:migrate`;
 			} else if (options.orm === "drizzle") {
-				scripts["db:generate"] = `bun run --filter ${backendPackageName} db:generate`;
-				if (!(options.dbSetup === "d1" && options.serverDeploy === "alchemy")) scripts["db:migrate"] = `bun run --filter ${backendPackageName} db:migrate`;
+				scripts["db:generate"] = `bun run --filter ${dbPackageName} db:generate`;
+				if (!(options.dbSetup === "d1" && options.serverDeploy === "alchemy")) scripts["db:migrate"] = `bun run --filter ${dbPackageName} db:migrate`;
 			}
 		}
 		if (options.dbSetup === "docker") {
@@ -6560,8 +6581,7 @@ async function updateRootPackageJson(projectDir, options) {
 	const workspaces = packageJson.workspaces;
 	if (options.backend === "convex") {
 		if (!workspaces.includes("packages/*")) workspaces.push("packages/*");
-		const needsAppsDir = options.frontend.length > 0 || options.addons.includes("starlight");
-		if (needsAppsDir && !workspaces.includes("apps/*")) workspaces.push("apps/*");
+		if ((options.frontend.length > 0 || options.addons.includes("starlight")) && !workspaces.includes("apps/*")) workspaces.push("apps/*");
 	} else {
 		if (!workspaces.includes("apps/*")) workspaces.push("apps/*");
 		if (!workspaces.includes("packages/*")) workspaces.push("packages/*");
@@ -6574,6 +6594,22 @@ async function updateServerPackageJson(projectDir, options) {
 	const serverPackageJson = await fs.readJson(serverPackageJsonPath);
 	if (!serverPackageJson.scripts) serverPackageJson.scripts = {};
 	const scripts = serverPackageJson.scripts;
+	if (options.dbSetup === "docker") {
+		scripts["db:start"] = "docker compose up -d";
+		scripts["db:watch"] = "docker compose up";
+		scripts["db:stop"] = "docker compose stop";
+		scripts["db:down"] = "docker compose down";
+	}
+	await fs.writeJson(serverPackageJsonPath, serverPackageJson, { spaces: 2 });
+	await updateDbPackageJson(projectDir, options);
+}
+async function updateDbPackageJson(projectDir, options) {
+	const dbPackageJsonPath = path.join(projectDir, "packages/db/package.json");
+	if (!await fs.pathExists(dbPackageJsonPath)) return;
+	const dbPackageJson = await fs.readJson(dbPackageJsonPath);
+	dbPackageJson.name = `@${options.projectName}/db`;
+	if (!dbPackageJson.scripts) dbPackageJson.scripts = {};
+	const scripts = dbPackageJson.scripts;
 	if (options.database !== "none") {
 		if (options.database === "sqlite" && options.orm === "drizzle" && options.dbSetup !== "d1") scripts["db:local"] = "turso dev --db-file local.db";
 		if (options.orm === "prisma") {
@@ -6588,13 +6624,21 @@ async function updateServerPackageJson(projectDir, options) {
 			if (!(options.dbSetup === "d1" && options.serverDeploy === "alchemy")) scripts["db:migrate"] = "drizzle-kit migrate";
 		}
 	}
-	if (options.dbSetup === "docker") {
-		scripts["db:start"] = "docker compose up -d";
-		scripts["db:watch"] = "docker compose up";
-		scripts["db:stop"] = "docker compose stop";
-		scripts["db:down"] = "docker compose down";
-	}
-	await fs.writeJson(serverPackageJsonPath, serverPackageJson, { spaces: 2 });
+	await fs.writeJson(dbPackageJsonPath, dbPackageJson, { spaces: 2 });
+}
+async function updateAuthPackageJson(projectDir, options) {
+	const authPackageJsonPath = path.join(projectDir, "packages/auth/package.json");
+	if (!await fs.pathExists(authPackageJsonPath)) return;
+	const authPackageJson = await fs.readJson(authPackageJsonPath);
+	authPackageJson.name = `@${options.projectName}/auth`;
+	await fs.writeJson(authPackageJsonPath, authPackageJson, { spaces: 2 });
+}
+async function updateApiPackageJson(projectDir, options) {
+	const apiPackageJsonPath = path.join(projectDir, "packages/api/package.json");
+	if (!await fs.pathExists(apiPackageJsonPath)) return;
+	const apiPackageJson = await fs.readJson(apiPackageJsonPath);
+	apiPackageJson.name = `@${options.projectName}/api`;
+	await fs.writeJson(apiPackageJsonPath, apiPackageJson, { spaces: 2 });
 }
 async function updateConvexPackageJson(projectDir, options) {
 	const convexPackageJsonPath = path.join(projectDir, "packages/backend/package.json");
@@ -6615,10 +6659,7 @@ async function createProject(options, cliInput) {
 		await copyBaseTemplate(projectDir, options);
 		await setupFrontendTemplates(projectDir, options);
 		await setupBackendFramework(projectDir, options);
-		if (!isConvex) {
-			await setupDbOrmTemplates(projectDir, options);
-			await setupDockerComposeTemplates(projectDir, options);
-		}
+		if (!isConvex) await setupDockerComposeTemplates(projectDir, options);
 		await setupAuthTemplate(projectDir, options);
 		if (options.payments && options.payments !== "none") await setupPaymentsTemplate(projectDir, options);
 		if (options.examples.length > 0 && options.examples[0] !== "none") await setupExamplesTemplate(projectDir, options);
@@ -6781,9 +6822,7 @@ async function handleDirectoryConflictProgrammatically(currentPathInput, strateg
 		finalPathInput: currentPathInput,
 		shouldClearDirectory: false
 	};
-	const dirContents = await fs.readdir(currentPath);
-	const isNotEmpty = dirContents.length > 0;
-	if (!isNotEmpty) return {
+	if (!((await fs.readdir(currentPath)).length > 0)) return {
 		finalPathInput: currentPathInput,
 		shouldClearDirectory: false
 	};
@@ -6945,26 +6984,25 @@ function displaySponsorsBox(sponsors$1) {
 
 //#endregion
 //#region src/index.ts
-const t = trpcServer.initTRPC.create();
-const router = t.router({
-	init: t.procedure.meta({
+const router = os.router({
+	init: os.meta({
 		description: "Create a new Better-T-Stack project",
 		default: true,
 		negateBooleans: true
-	}).input(z.tuple([ProjectNameSchema.optional(), z.object({
-		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"),
-		verbose: z.boolean().optional().default(false).describe("Show detailed result information"),
+	}).input(z$1.tuple([ProjectNameSchema.optional(), z$1.object({
+		yes: z$1.boolean().optional().default(false).describe("Use default configuration"),
+		yolo: z$1.boolean().optional().default(false).describe("(WARNING - NOT RECOMMENDED) Bypass validations and compatibility checks"),
+		verbose: z$1.boolean().optional().default(false).describe("Show detailed result information"),
 		database: DatabaseSchema.optional(),
 		orm: ORMSchema.optional(),
 		auth: AuthSchema.optional(),
 		payments: PaymentsSchema.optional(),
-		frontend: z.array(FrontendSchema).optional(),
-		addons: z.array(AddonsSchema).optional(),
-		examples: z.array(ExamplesSchema).optional(),
-		git: z.boolean().optional(),
+		frontend: z$1.array(FrontendSchema).optional(),
+		addons: z$1.array(AddonsSchema).optional(),
+		examples: z$1.array(ExamplesSchema).optional(),
+		git: z$1.boolean().optional(),
 		packageManager: PackageManagerSchema.optional(),
-		install: z.boolean().optional(),
+		install: z$1.boolean().optional(),
 		dbSetup: DatabaseSetupSchema.optional(),
 		backend: BackendSchema.optional(),
 		runtime: RuntimeSchema.optional(),
@@ -6972,10 +7010,10 @@ const router = t.router({
 		webDeploy: WebDeploySchema.optional(),
 		serverDeploy: ServerDeploySchema.optional(),
 		directoryConflict: 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")
-	})])).mutation(async ({ input }) => {
+		renderTitle: z$1.boolean().optional(),
+		disableAnalytics: z$1.boolean().optional().default(false).describe("Disable analytics"),
+		manualDb: z$1.boolean().optional().default(false).describe("Skip automatic/manual database setup prompt and use manual setup")
+	})])).handler(async ({ input }) => {
 		const [projectName, options] = input;
 		const combinedInput = {
 			projectName,
@@ -6984,18 +7022,18 @@ const router = t.router({
 		const result = await createProjectHandler(combinedInput);
 		if (options.verbose) return result;
 	}),
-	add: t.procedure.meta({ description: "Add addons or deployment configurations to an existing Better-T-Stack project" }).input(z.tuple([z.object({
-		addons: z.array(AddonsSchema).optional().default([]),
+	add: os.meta({ description: "Add addons or deployment configurations to an existing Better-T-Stack project" }).input(z$1.tuple([z$1.object({
+		addons: z$1.array(AddonsSchema).optional().default([]),
 		webDeploy: WebDeploySchema.optional(),
 		serverDeploy: ServerDeploySchema.optional(),
-		projectDir: z.string().optional(),
-		install: z.boolean().optional().default(false).describe("Install dependencies after adding addons or deployment"),
+		projectDir: z$1.string().optional(),
+		install: z$1.boolean().optional().default(false).describe("Install dependencies after adding addons or deployment"),
 		packageManager: PackageManagerSchema.optional()
-	})])).mutation(async ({ input }) => {
+	})])).handler(async ({ input }) => {
 		const [options] = input;
 		await addAddonsHandler(options);
 	}),
-	sponsors: t.procedure.meta({ description: "Show Better-T-Stack sponsors" }).mutation(async () => {
+	sponsors: os.meta({ description: "Show Better-T-Stack sponsors" }).handler(async () => {
 		try {
 			renderTitle();
 			intro(pc.magenta("Better-T-Stack Sponsors"));
@@ -7005,7 +7043,7 @@ const router = t.router({
 			handleError(error, "Failed to display sponsors");
 		}
 	}),
-	docs: t.procedure.meta({ description: "Open Better-T-Stack documentation" }).mutation(async () => {
+	docs: os.meta({ description: "Open Better-T-Stack documentation" }).handler(async () => {
 		const DOCS_URL = "https://better-t-stack.dev/docs";
 		try {
 			await openUrl(DOCS_URL);
@@ -7014,7 +7052,7 @@ const router = t.router({
 			log.message(`Please visit ${DOCS_URL}`);
 		}
 	}),
-	builder: t.procedure.meta({ description: "Open the web-based stack builder" }).mutation(async () => {
+	builder: os.meta({ description: "Open the web-based stack builder" }).handler(async () => {
 		const BUILDER_URL = "https://better-t-stack.dev/new";
 		try {
 			await openUrl(BUILDER_URL);
@@ -7024,7 +7062,7 @@ const router = t.router({
 		}
 	})
 });
-const caller = t.createCallerFactory(router)({});
+const caller = createRouterClient(router, { context: {} });
 function createBtsCli() {
 	return createCli({
 		router,
@@ -7066,9 +7104,8 @@ function createBtsCli() {
 * ```
 */
 async function init(projectName, options) {
-	const opts = options ?? {};
 	const programmaticOpts = {
-		...opts,
+		...options ?? {},
 		verbose: true
 	};
 	const prev = process.env.BTS_PROGRAMMATIC;