create-better-t-stack 3.39.2 → 3.40.0

package/README.md

@@ -43,7 +43,7 @@ generated commands.
 | Category                 | Options                                                                                                                                                                                                                                                                                                                                                                                                                                   |
 | ------------------------ | ----------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------- |
 | **TypeScript**           | End-to-end type safety across all parts of your application                                                                                                                                                                                                                                                                                                                                                                               |
-| **Frontend**             | • React with TanStack Router<br>• React with React Router<br>• React with TanStack Start (SSR)<br>• Next.js<br>• SvelteKit<br>• Nuxt (Vue)<br>• SolidStart v2 (SSR)<br>• Astro<br>• React Native bare Expo<br>• React Native with NativeWind (via Expo)<br>• React Native with Unistyles (via Expo)<br>• None                                                                                                                             |
+| **Frontend**             | • React with TanStack Router<br>• React with React Router<br>• React with TanStack Start (SSR)<br>• Next.js<br>• SvelteKit<br>• Nuxt (Vue)<br>• Solid (SSR)<br>• Astro<br>• React Native bare Expo<br>• React Native with NativeWind (via Expo)<br>• React Native with Unistyles (via Expo)<br>• None                                                                                                                                     |
 | **Backend**              | • Hono<br>• Express<br>• Elysia<br>• Fastify<br>• Self (fullstack inside the web app)<br>• Convex<br>• None                                                                                                                                                                                                                                                                                                                               |
 | **API Layer**            | • tRPC (type-safe APIs)<br>• oRPC (OpenAPI-compatible type-safe APIs)<br>• None                                                                                                                                                                                                                                                                                                                                                           |
 | **Runtime**              | • Bun<br>• Node.js<br>• Cloudflare Workers<br>• None                                                                                                                                                                                                                                                                                                                                                                                      |
@@ -259,8 +259,8 @@ npx create-better-t-stack --frontend none --backend hono --api trpc --database n
 - **Cloudflare D1 setup**: Requires `sqlite` and either `--runtime workers --server-deploy cloudflare` or `--backend self --web-deploy cloudflare`. For `backend self`, D1 is supported on `next`, `tanstack-start`, `nuxt`, `svelte`, `solid`, and `astro`.
 - **Addons 'none'**: Skips all addons.
 - **Examples 'none'**: Skips all example implementations (todo, AI chat).
-- **Nuxt, Svelte, SolidStart, and Astro** frontends are only compatible with the oRPC API layer
-- **PWA support** requires TanStack Router, React Router, Next.js, or SolidStart
+- **Nuxt, Svelte, Solid, and Astro** frontends are only compatible with the oRPC API layer
+- **PWA support** requires TanStack Router, React Router, Next.js, or Solid
 - **Tauri desktop app** requires TanStack Router, React Router, TanStack Start, Next.js, Nuxt, SvelteKit, or Astro
 - **Electrobun desktop app** requires TanStack Router, React Router, TanStack Start, Next.js, Nuxt, SvelteKit, or Astro. Desktop packaging uses static web assets, so SSR-first frontends need a static/export build before desktop builds will work.
 - **AI example** is not compatible with Solid or Astro. With Convex backend, it also excludes Nuxt and Svelte.

package/dist/cli.mjs

@@ -1,5 +1,5 @@
 #!/usr/bin/env node
-import { _ as types_exports, i as SchemaNameSchema, l as create, m as getSchemaResult, s as add, u as createBtsCli, v as getLatestCLIVersion } from "./src-BYgmfow5.mjs";
+import { _ as types_exports, i as SchemaNameSchema, l as create, m as getSchemaResult, s as add, u as createBtsCli, v as getLatestCLIVersion } from "./src-DjuxSWWY.mjs";
 import z from "zod";
 import { McpServer } from "@modelcontextprotocol/sdk/server/mcp.js";
 import { StdioServerTransport } from "@modelcontextprotocol/sdk/server/stdio.js";

package/dist/index.d.mts

@@ -186,7 +186,7 @@ declare const router: import("@trpc/server").TRPCBuiltRouter<{
       disableAnalytics?: boolean | undefined;
       manualDb?: boolean | undefined;
       dbSetupOptions?: {
-        mode?: "manual" | "auto" | undefined;
+        mode?: "manual" | "auto" | "alchemy" | undefined;
         neon?: {
           method?: "neon" | "neon-new" | "neondb" | "neonctl" | undefined;
           projectName?: string | undefined;
@@ -249,7 +249,7 @@ declare const router: import("@trpc/server").TRPCBuiltRouter<{
         } | undefined;
       } | undefined;
       dbSetupOptions?: {
-        mode?: "manual" | "auto" | undefined;
+        mode?: "manual" | "auto" | "alchemy" | undefined;
         neon?: {
           method?: "neon" | "neon-new" | "neondb" | "neonctl" | undefined;
           projectName?: string | undefined;

package/dist/index.mjs

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

package/dist/{src-BYgmfow5.mjs → src-DjuxSWWY.mjs}

@@ -32,7 +32,7 @@ const VALUE_LABELS = {
 	next: "Next.js",
 	nuxt: "Nuxt",
 	svelte: "SvelteKit",
-	solid: "SolidStart",
+	solid: "Solid",
 	astro: "Astro",
 	"native-bare": "Expo (bare)",
 	"native-uniwind": "Expo + Uniwind",
@@ -88,6 +88,9 @@ const VALUE_LABELS = {
 	docker: "Docker",
 	cloudflare: "Cloudflare",
 	vercel: "Vercel",
+	alchemy: "Alchemy",
+	auto: "Automatic",
+	manual: "Manual",
 	npm: "npm",
 	pnpm: "pnpm"
 };
@@ -132,7 +135,8 @@ function getConfigSections(config) {
 		section("Data", [
 			["Database", config.database],
 			["ORM", config.orm],
-			["Setup", config.dbSetup]
+			["Setup", config.dbSetup],
+			["Provisioning", config.dbSetupOptions?.mode]
 		]),
 		section("Product", [
 			["Auth", config.auth],
@@ -964,11 +968,11 @@ function validateSelfBackendCompatibility(providedFlags, options, config) {
 	const frontends = config.frontend || options.frontend || [];
 	if (backend === "self") {
 		const { web, native } = splitFrontends(frontends);
-		if (!(web.length === 1 && FULLSTACK_FRONTENDS$1.includes(web[0]))) return validationErr$1("Backend 'self' (fullstack) currently only supports Next.js, TanStack Start, Nuxt, SvelteKit, SolidStart, and Astro frontends. Please use --frontend next, --frontend tanstack-start, --frontend nuxt, --frontend svelte, --frontend solid, or --frontend astro.");
+		if (!(web.length === 1 && FULLSTACK_FRONTENDS$1.includes(web[0]))) return validationErr$1("Backend 'self' (fullstack) currently only supports Next.js, TanStack Start, Nuxt, SvelteKit, Solid, and Astro frontends. Please use --frontend next, --frontend tanstack-start, --frontend nuxt, --frontend svelte, --frontend solid, or --frontend astro.");
 		if (native.length > 1) return validationErr$1("Cannot select multiple native frameworks. Choose only one of: native-bare, native-uniwind, native-unistyles");
 	}
 	const hasFullstackFrontend = frontends.some((f) => FULLSTACK_FRONTENDS$1.includes(f));
-	if (providedFlags.has("backend") && !hasFullstackFrontend && backend === "self") return validationErr$1("Backend 'self' (fullstack) currently only supports Next.js, TanStack Start, Nuxt, SvelteKit, SolidStart, and Astro frontends. Please use --frontend next, --frontend tanstack-start, --frontend nuxt, --frontend svelte, --frontend solid, --frontend astro, or choose a different backend.");
+	if (providedFlags.has("backend") && !hasFullstackFrontend && backend === "self") return validationErr$1("Backend 'self' (fullstack) currently only supports Next.js, TanStack Start, Nuxt, SvelteKit, Solid, and Astro frontends. Please use --frontend next, --frontend tanstack-start, --frontend nuxt, --frontend svelte, --frontend solid, --frontend astro, or choose a different backend.");
 	return Result.ok(void 0);
 }
 function validateWorkersCompatibility(providedFlags, options, config) {
@@ -1074,7 +1078,7 @@ function supportsPrismaWebDeploy(frontend) {
 }
 function validatePrismaWebDeploy(webDeploy, frontend) {
 	if (webDeploy !== "prisma" || !frontend) return Result.ok(void 0);
-	if (!supportsPrismaWebDeploy(frontend)) return validationErr$1("'--web-deploy prisma' requires a supported server frontend. Choose Next.js, Nuxt, Astro, React Router, TanStack Start, SvelteKit, or SolidStart. TanStack Router is a static SPA, while Prisma Compute requires an executable server artifact.");
+	if (!supportsPrismaWebDeploy(frontend)) return validationErr$1("'--web-deploy prisma' requires a supported server frontend. Choose Next.js, Nuxt, Astro, React Router, TanStack Start, SvelteKit, or Solid. TanStack Router is a static SPA, while Prisma Compute requires an executable server artifact.");
 	return Result.ok(void 0);
 }
 function validateCloudflareWebDeployKnownIssues(config) {
@@ -1763,7 +1767,7 @@ function getNodeToolingRequirements(config) {
 			addNodeRequirement(requirements, "^22.19.0 || ^24.11.0 || >=26.0.0", "Nuxt 4");
 			break;
 		case "solid":
-			addNodeRequirement(requirements, ">=24.0.0", "SolidStart 2");
+			addNodeRequirement(requirements, ">=24.0.0", "Solid");
 			break;
 		case "react-router":
 			addNodeRequirement(requirements, ">=22.22.0", "React Router 8");
@@ -4888,6 +4892,54 @@ async function addHandlerInternal(input) {
 	});
 }
 //#endregion
+//#region src/helpers/core/db-setup-options.ts
+function withDbSetupMode(dbSetupOptions, mode) {
+	const resolved = { ...dbSetupOptions };
+	if (mode === void 0) delete resolved.mode;
+	else resolved.mode = mode;
+	return Object.keys(resolved).length === 0 ? void 0 : resolved;
+}
+const REMOTE_PROVISIONING_DB_SETUPS = [
+	"turso",
+	"neon",
+	"prisma-postgres",
+	"supabase",
+	"mongodb-atlas"
+];
+function requiresProvisioningGuardrails(dbSetup) {
+	return REMOTE_PROVISIONING_DB_SETUPS.includes(dbSetup);
+}
+function resolveDbSetupMode(dbSetup, cliOptions = {}) {
+	if (dbSetup === "none") return;
+	const explicitMode = cliOptions.dbSetupOptions?.mode;
+	if (explicitMode) return explicitMode;
+	if (cliOptions.manualDb === true) return "manual";
+	if (isSilent() && requiresProvisioningGuardrails(dbSetup)) return "manual";
+}
+function mergeResolvedDbSetupOptions(dbSetup, dbSetupOptions, cliOptions = {}) {
+	if (dbSetup === "none") return;
+	const resolvedMode = resolveDbSetupMode(dbSetup, {
+		...cliOptions,
+		dbSetupOptions: dbSetupOptions ?? cliOptions.dbSetupOptions
+	});
+	if (!dbSetupOptions && !resolvedMode) return;
+	return {
+		...dbSetupOptions,
+		mode: resolvedMode
+	};
+}
+function resolveProjectDbSetupOptions(config, cliOptions = {}) {
+	const dbSetupOptions = config.dbSetupOptions ?? cliOptions.dbSetupOptions;
+	if (!(dbSetupOptions?.mode ?? (cliOptions.manualDb === true ? "manual" : void 0)) && (0, types_exports.supportsAlchemyManagedDatabase)(config)) return {
+		...dbSetupOptions,
+		mode: "alchemy"
+	};
+	return mergeResolvedDbSetupOptions(config.dbSetup, dbSetupOptions, {
+		...cliOptions,
+		dbSetupOptions
+	});
+}
+//#endregion
 //#region src/prompts/api.ts
 async function getApiChoice(Api, frontend, backend, previousValue) {
 	if (backend === "convex" || backend === "none") return "none";
@@ -5164,6 +5216,47 @@ async function getDBSetupChoice(databaseType, dbSetup, _orm, backend, runtime, p
 	if (isCancel$1(response)) throw new UserCancelledError({ message: "Operation cancelled" });
 	return response;
 }
+const providerLabels = {
+	neon: "Neon",
+	planetscale: "PlanetScale",
+	"prisma-postgres": "Prisma Postgres"
+};
+async function getDbProvisioningChoice(mode, dbSetup, backend, webDeploy, serverDeploy, previousValue) {
+	if (!dbSetup || !backend || !webDeploy || !serverDeploy) return mode;
+	if (!(0, types_exports.supportsAlchemyManagedDatabase)({
+		backend,
+		dbSetup,
+		webDeploy,
+		serverDeploy
+	})) return mode === "alchemy" ? void 0 : mode;
+	if (mode !== void 0) return mode;
+	const provider = providerLabels[dbSetup];
+	if (!provider) return void 0;
+	const options = [
+		{
+			value: "alchemy",
+			label: "Alchemy",
+			hint: `Provision ${provider} during deploy and inject its credentials`
+		},
+		...dbSetup === "neon" || dbSetup === "prisma-postgres" ? [{
+			value: "auto",
+			label: "Automatic",
+			hint: `Set up ${provider} now and write its connection credentials`
+		}] : [],
+		{
+			value: "manual",
+			label: "Manual",
+			hint: `Use an existing ${provider} database and configure credentials yourself`
+		}
+	];
+	const response = await navigableSelect({
+		message: `How should ${provider} be provisioned?`,
+		options,
+		initialValue: preferValidInitial(options, previousValue, "alchemy")
+	});
+	if (isCancel$1(response)) throw new UserCancelledError({ message: "Operation cancelled" });
+	return response;
+}
 //#endregion
 //#region src/prompts/examples.ts
 async function getExamplesChoice(examples, database, frontends, backend, api, previousValue) {
@@ -5431,6 +5524,20 @@ function validateDatabaseSetup(config, providedFlags) {
 	}
 	return Result.ok(void 0);
 }
+function validateDatabaseProvisioningMode(config) {
+	if (config.dbSetup === "planetscale" && config.dbSetupOptions?.mode === "auto") return validationErr("PlanetScale does not support automatic database setup. Use dbSetupOptions.mode 'alchemy' or 'manual'.");
+	if (config.dbSetupOptions?.mode !== "alchemy") return Result.ok(void 0);
+	const { backend, dbSetup, webDeploy, serverDeploy } = config;
+	if (!backend || !dbSetup || !webDeploy || !serverDeploy) return Result.ok(void 0);
+	if (!(0, types_exports.supportsAlchemyManagedDatabase)({
+		backend,
+		dbSetup,
+		webDeploy,
+		serverDeploy,
+		dbSetupOptions: config.dbSetupOptions
+	})) return validationErr("Alchemy database provisioning requires Neon, PlanetScale, or Prisma Postgres and an Alchemy deployment target for the app that consumes the database.");
+	return Result.ok(void 0);
+}
 function validateConvexConstraints(config, providedFlags) {
 	const { backend } = config;
 	if (backend !== "convex") return Result.ok(void 0);
@@ -5515,6 +5622,7 @@ function validateFullConfig(config, providedFlags, options) {
 	return Result.gen(function* () {
 		yield* validateDatabaseOrmAuth(config, providedFlags);
 		yield* validateDatabaseSetup(config, providedFlags);
+		yield* validateDatabaseProvisioningMode(config);
 		yield* validateConvexConstraints(config, providedFlags);
 		yield* validateBackendNoneConstraints(config, providedFlags);
 		yield* validateSelfBackendConstraints(config, providedFlags);
@@ -5827,6 +5935,7 @@ async function gatherConfig(flags, projectName, projectDir, relativePath, option
 		examples: ({ results, previousAnswer }) => getExamplesChoice(flags.examples, results.database, results.frontend, results.backend, results.api, previousAnswer),
 		webDeploy: ({ results, previousAnswer }) => getDeploymentChoice(flags.webDeploy, results.runtime, results.backend, results.frontend, results.dbSetup, results.database, results.orm, results.addons, previousAnswer),
 		serverDeploy: ({ results, previousAnswer }) => getServerDeploymentChoice(flags.serverDeploy, results.runtime, results.backend, results.webDeploy, previousAnswer),
+		dbSetupMode: ({ results, previousAnswer }) => getDbProvisioningChoice(flags.dbSetupOptions?.mode ?? (options.manualDb === true ? "manual" : void 0), results.dbSetup, results.backend, results.webDeploy, results.serverDeploy, previousAnswer),
 		git: ({ previousAnswer }) => getGitChoice(flags.git, previousAnswer),
 		packageManager: ({ previousAnswer }) => getPackageManagerChoice(flags.packageManager, previousAnswer),
 		install: ({ previousAnswer }) => getinstallChoice(flags.install, previousAnswer)
@@ -5864,6 +5973,7 @@ async function gatherConfig(flags, projectName, projectDir, relativePath, option
 				prompts: [
 					"webDeploy",
 					"serverDeploy",
+					"dbSetupMode",
 					"git",
 					"packageManager",
 					"install"
@@ -5879,7 +5989,7 @@ async function gatherConfig(flags, projectName, projectDir, relativePath, option
 		projectDir,
 		relativePath,
 		addonOptions: flags.addonOptions,
-		dbSetupOptions: flags.dbSetupOptions,
+		dbSetupOptions: withDbSetupMode(flags.dbSetupOptions, result.dbSetupMode),
 		frontend: result.frontend,
 		backend: result.backend,
 		runtime: result.runtime,
@@ -6570,37 +6680,6 @@ async function commandExists(command) {
 	return result.isOk() ? result.value : false;
 }
 //#endregion
-//#region src/helpers/core/db-setup-options.ts
-const REMOTE_PROVISIONING_DB_SETUPS = [
-	"turso",
-	"neon",
-	"prisma-postgres",
-	"supabase",
-	"mongodb-atlas"
-];
-function requiresProvisioningGuardrails(dbSetup) {
-	return REMOTE_PROVISIONING_DB_SETUPS.includes(dbSetup);
-}
-function resolveDbSetupMode(dbSetup, cliOptions = {}) {
-	if (dbSetup === "none") return;
-	const explicitMode = cliOptions.dbSetupOptions?.mode;
-	if (explicitMode) return explicitMode;
-	if (cliOptions.manualDb === true) return "manual";
-	if (isSilent() && requiresProvisioningGuardrails(dbSetup)) return "manual";
-}
-function mergeResolvedDbSetupOptions(dbSetup, dbSetupOptions, cliOptions = {}) {
-	if (dbSetup === "none") return;
-	const resolvedMode = resolveDbSetupMode(dbSetup, {
-		...cliOptions,
-		dbSetupOptions: dbSetupOptions ?? cliOptions.dbSetupOptions
-	});
-	if (!dbSetupOptions && !resolvedMode) return;
-	return {
-		...dbSetupOptions,
-		mode: resolvedMode
-	};
-}
-//#endregion
 //#region src/helpers/database-providers/mongodb-atlas-setup.ts
 async function checkAtlasCLI() {
 	const exists = await commandExists("atlas");
@@ -7893,7 +7972,7 @@ function getDesktopStaticBuildNote(frontend) {
 	return `${pc.yellow("NOTE:")} Desktop builds package static web assets.\n   ${staticBuildFrontends.get(staticBuildFrontend)} needs a static/export web build before desktop packaging will work.`;
 }
 async function displayPostInstallInstructions(config) {
-	const { api, database, relativePath, packageManager, depsInstalled, orm, addons, runtime, frontend, backend, dbSetup, webDeploy, serverDeploy } = config;
+	const { api, database, relativePath, packageManager, depsInstalled, orm, addons, runtime, frontend, backend, dbSetup, webDeploy, serverDeploy, dbSetupOptions } = config;
 	const isConvex = backend === "convex";
 	const isBackendSelf = backend === "self";
 	const runCmd = packageManager === "npm" ? "npm run" : packageManager === "pnpm" ? "pnpm run" : "bun run";
@@ -7903,7 +7982,7 @@ async function displayPostInstallInstructions(config) {
 	const hasVitePlus = addons?.includes("vite-plus");
 	const hasVitePlusNativeHooks = hasVitePlus && !hasHusky && !hasLefthook;
 	const hasGitHooksOrLinting = addons?.includes("husky") || addons?.includes("biome") || addons?.includes("lefthook") || addons?.includes("oxlint") || hasVitePlus;
-	const databaseInstructions = !isConvex && database !== "none" ? await getDatabaseInstructions(database, orm, runCmd, runtime, dbSetup, webDeploy, serverDeploy, backend) : "";
+	const databaseInstructions = !isConvex && database !== "none" ? await getDatabaseInstructions(database, orm, runCmd, runtime, dbSetup, webDeploy, serverDeploy, backend, dbSetupOptions) : "";
 	const tauriInstructions = addons?.includes("tauri") ? getTauriInstructions(runCmd, frontend) : "";
 	const electrobunInstructions = addons?.includes("electrobun") ? getElectrobunInstructions(runCmd, frontend) : "";
 	const huskyInstructions = hasHusky ? getHuskyInstructions(runCmd) : "";
@@ -7914,7 +7993,7 @@ async function displayPostInstallInstructions(config) {
 	const pwaInstructions = addons?.includes("pwa") && frontend?.includes("react-router") ? getPwaInstructions() : "";
 	const starlightInstructions = addons?.includes("starlight") ? getStarlightInstructions(runCmd) : "";
 	const clerkInstructions = config.auth === "clerk" ? getClerkInstructions(frontend || [], backend, api) : "";
-	const alchemyDeployInstructions = getAlchemyDeployInstructions(runCmd, webDeploy, serverDeploy, backend);
+	const alchemyDeployInstructions = getAlchemyDeployInstructions(runCmd, webDeploy, serverDeploy, backend, config.auth, frontend || []);
 	const hasWeb = frontend?.some((f) => types_exports.webFrontends.includes(f));
 	const hasNative = frontend?.includes("native-bare") || frontend?.includes("native-uniwind") || frontend?.includes("native-unistyles");
 	const hasReactRouter = frontend?.includes("react-router");
@@ -8038,7 +8117,7 @@ function getLefthookInstructions(packageManager) {
 function getVitePlusNativeHooksInstructions(runCmd) {
 	return `${pc.bold("Vite+ native Git hooks:")}\n${pc.cyan("•")} Optional hook setup: ${`${runCmd} hooks:setup`}\n${pc.dim("   (runs vp config; hooks install into .vite-hooks and use vp staged)")}\n`;
 }
-async function getDatabaseInstructions(database, orm, runCmd, _runtime, dbSetup, webDeploy, serverDeploy, backend) {
+async function getDatabaseInstructions(database, orm, runCmd, _runtime, dbSetup, webDeploy, serverDeploy, backend, dbSetupOptions) {
 	const notes = [];
 	const commands = [];
 	const isD1Alchemy = dbSetup === "d1" && (serverDeploy === "cloudflare" || backend === "self" && webDeploy === "cloudflare");
@@ -8046,7 +8125,8 @@ async function getDatabaseInstructions(database, orm, runCmd, _runtime, dbSetup,
 		backend,
 		dbSetup,
 		webDeploy,
-		serverDeploy
+		serverDeploy,
+		dbSetupOptions
 	});
 	if (dbSetup === "docker") {
 		const dockerStatus = await getDockerStatus(database);
@@ -8210,7 +8290,7 @@ function getPolarInstructions(backend, packageManager) {
 	const envPath = backend === "self" ? "apps/web/.env" : "apps/server/.env";
 	return `${pc.bold("Polar Payments Setup:")}\n${pc.cyan("•")} Get access token & product ID from ${pc.underline("https://sandbox.polar.sh/")}\n${pc.cyan("•")} Set POLAR_ACCESS_TOKEN in ${envPath}`;
 }
-function getAlchemyDeployInstructions(runCmd, webDeploy, serverDeploy, backend) {
+function getAlchemyDeployInstructions(runCmd, webDeploy, serverDeploy, backend, auth, frontend) {
 	const instructions = [];
 	const isBackendSelf = backend === "self";
 	const hasAlchemyWeb = (0, types_exports.isAlchemyDeployTarget)(webDeploy);
@@ -8219,7 +8299,12 @@ function getAlchemyDeployInstructions(runCmd, webDeploy, serverDeploy, backend)
 	if (hasAlchemyWeb || hasAlchemyServer) {
 		const targetParts = [...hasAlchemyWeb ? [`web on ${webDeploy === "cloudflare" ? "Cloudflare" : "Prisma"}`] : [], ...hasAlchemyServer && !isBackendSelf ? [`server on ${serverDeploy === "cloudflare" ? "Cloudflare" : "Prisma"}`] : []];
 		const deployScript = webDeploy === "vercel" ? "deploy:server" : serverDeploy === "vercel" ? "deploy:web" : "deploy";
-		instructions.push(`${pc.bold(`Deploy with Alchemy (${targetParts.join(" + ")}):`)}\n${pc.cyan("•")} Configure provider login: ${`cd packages/infra && ${alchemyExec} alchemy login --configure`}\n${pc.cyan("•")} Dev: ${`${runCmd} dev`}\n${pc.cyan("•")} Deploy: ${`${runCmd} ${deployScript}`}\n${pc.cyan("•")} Destroy: ${`${runCmd} destroy`}`);
+		const originSteps = [];
+		const hasWeb = frontend.some((value) => types_exports.webFrontends.includes(value));
+		if (!isBackendSelf && hasAlchemyServer && hasWeb) originSteps.push(`${pc.cyan("•")} Required after the first deploy: set CORS_ORIGIN in apps/server/.env to the deployed web origin, then deploy again`);
+		if (auth === "better-auth" && isBackendSelf && webDeploy === "prisma") originSteps.push(`${pc.cyan("•")} After the first deploy, set BETTER_AUTH_URL in apps/web/.env to the returned web URL, then deploy again`);
+		else if (auth === "better-auth" && !isBackendSelf && serverDeploy === "prisma") originSteps.push(`${pc.cyan("•")} After the first deploy, set BETTER_AUTH_URL in apps/server/.env to the returned server URL, then deploy again`);
+		instructions.push(`${pc.bold(`Deploy with Alchemy (${targetParts.join(" + ")}):`)}\n${pc.cyan("•")} Configure provider login: ${`cd packages/infra && ${alchemyExec} alchemy login --configure`}\n${pc.cyan("•")} Dev: ${`${runCmd} dev`}\n${pc.cyan("•")} Deploy: ${`${runCmd} ${deployScript}`}\n${originSteps.join("\n")}${originSteps.length > 0 ? "\n" : ""}${pc.cyan("•")} Destroy: ${`${runCmd} destroy`}`);
 	}
 	if (webDeploy === "docker" || serverDeploy === "docker") {
 		const dockerTargets = webDeploy === "docker" && serverDeploy === "docker" ? "web + server" : webDeploy === "docker" ? "web" : "server";
@@ -8466,7 +8551,10 @@ async function createProjectHandlerInternal(input, startTime, timeScaffolded) {
 			const isTemplateSetup = input.template && input.template !== "none";
 			if (!isSilent() && !isTemplateSetup && Object.keys(otherFlags).length > 0) log.info(pc.dim("Command-line options applied."));
 			config = yield* Result.await(Result.tryPromise({
-				try: async () => gatherConfig(flagConfig, finalBaseName, finalResolvedPath, finalPathInput, { skipCompatibilityChecks: cliInput.yolo }),
+				try: async () => gatherConfig(flagConfig, finalBaseName, finalResolvedPath, finalPathInput, {
+					skipCompatibilityChecks: cliInput.yolo,
+					manualDb: cliInput.manualDb ?? input.manualDb
+				}),
 				catch: (cause) => {
 					if (cause instanceof UserCancelledError) return cause;
 					return new CLIError({
@@ -8476,7 +8564,7 @@ async function createProjectHandlerInternal(input, startTime, timeScaffolded) {
 				}
 			}));
 		}
-		const effectiveDbSetupOptions = mergeResolvedDbSetupOptions(config.dbSetup, config.dbSetupOptions, {
+		const effectiveDbSetupOptions = resolveProjectDbSetupOptions(config, {
 			manualDb: cliInput.manualDb ?? input.manualDb,
 			dbSetupOptions: cliInput.dbSetupOptions ?? input.dbSetupOptions
 		});

package/package.json

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