create-better-t-stack 3.32.0 → 3.33.0

package/README.md

@@ -68,8 +68,8 @@ Options:
   --install                       Install dependencies
   --no-install                    Skip installing dependencies
   --db-setup <setup>              Database setup (turso, d1, neon, supabase, prisma-postgres, planetscale, mongodb-atlas, docker, none)
-  --web-deploy <setup>            Web deployment (cloudflare, none)
-  --server-deploy <setup>         Server deployment (cloudflare, none)
+  --web-deploy <setup>            Web deployment (cloudflare, docker, none)
+  --server-deploy <setup>         Server deployment (cloudflare, docker, none)
   --backend <framework>           Backend framework (hono, express, fastify, elysia, convex, self, none)
   --runtime <runtime>             Runtime (bun, node, workers, none)
   --api <type>                    API type (trpc, orpc, none)
@@ -223,6 +223,12 @@ Create a self-hosted fullstack project on Cloudflare with D1:
 npx create-better-t-stack --backend self --frontend next --api trpc --database sqlite --orm drizzle --db-setup d1 --web-deploy cloudflare
 ```
 
+Create a self-hosted project that ships as Docker containers (web + server + database via Docker Compose):
+
+```bash
+npx create-better-t-stack --frontend tanstack-router --backend hono --runtime bun --database postgres --orm drizzle --db-setup docker --web-deploy docker --server-deploy docker
+```
+
 Create a minimal API-only project:
 
 ```bash

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-BZV4gWGl.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-_FzI_58B.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

@@ -184,8 +184,8 @@ declare const router: _$_trpc_server0.TRPCBuiltRouter<{
       backend?: "none" | "hono" | "express" | "fastify" | "elysia" | "convex" | "self" | undefined;
       runtime?: "none" | "bun" | "node" | "workers" | undefined;
       api?: "none" | "trpc" | "orpc" | undefined;
-      webDeploy?: "none" | "cloudflare" | undefined;
-      serverDeploy?: "none" | "cloudflare" | undefined;
+      webDeploy?: "none" | "docker" | "cloudflare" | undefined;
+      serverDeploy?: "none" | "docker" | "cloudflare" | undefined;
       directoryConflict?: "merge" | "overwrite" | "increment" | "error" | undefined;
       renderTitle?: boolean | undefined;
       disableAnalytics?: boolean | undefined;
@@ -283,8 +283,8 @@ declare const router: _$_trpc_server0.TRPCBuiltRouter<{
       backend?: "none" | "hono" | "express" | "fastify" | "elysia" | "convex" | "self" | undefined;
       runtime?: "none" | "bun" | "node" | "workers" | undefined;
       api?: "none" | "trpc" | "orpc" | undefined;
-      webDeploy?: "none" | "cloudflare" | undefined;
-      serverDeploy?: "none" | "cloudflare" | undefined;
+      webDeploy?: "none" | "docker" | "cloudflare" | undefined;
+      serverDeploy?: "none" | "docker" | "cloudflare" | undefined;
       directoryConflict?: "merge" | "overwrite" | "increment" | "error" | undefined;
       renderTitle?: boolean | undefined;
       disableAnalytics?: boolean | undefined;
@@ -363,8 +363,8 @@ declare const router: _$_trpc_server0.TRPCBuiltRouter<{
           hooks?: ("cursor" | "windsurf" | "codebuddy" | "claude" | "copilot")[] | undefined;
         } | undefined;
       } | undefined;
-      webDeploy?: "none" | "cloudflare" | undefined;
-      serverDeploy?: "none" | "cloudflare" | undefined;
+      webDeploy?: "none" | "docker" | "cloudflare" | undefined;
+      serverDeploy?: "none" | "docker" | "cloudflare" | undefined;
       projectDir?: string | undefined;
       install?: boolean | undefined;
       packageManager?: "bun" | "npm" | "pnpm" | 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-BZV4gWGl.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-_FzI_58B.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-BZV4gWGl.mjs → src-_FzI_58B.mjs}

@@ -875,6 +875,12 @@ function validateServerDeployRequiresBackend(serverDeploy, backend) {
 	if (serverDeploy && serverDeploy !== "none" && (!backend || backend === "none")) return validationErr$1("'--server-deploy' requires a backend. Please select a backend or set '--server-deploy none'.");
 	return Result.ok(void 0);
 }
+function validateDockerServerDeploy(serverDeploy, backend, runtime) {
+	if (serverDeploy !== "docker") return Result.ok(void 0);
+	if (backend === "convex" || backend === "self") return validationErr$1("'--server-deploy docker' requires a separate server backend (hono, express, fastify, elysia). For a fullstack 'self' backend, use '--web-deploy docker' instead.");
+	if (runtime === "workers") return validationErr$1("'--server-deploy docker' is not compatible with '--runtime workers'. Use '--runtime bun' or '--runtime node', or choose '--server-deploy cloudflare'.");
+	return Result.ok(void 0);
+}
 function validateAddonCompatibility(addon, frontend, _auth, backend, runtime) {
 	if (addon === "evlog" && !supportsEvlogAddon(frontend, backend, runtime)) return {
 		isCompatible: false,
@@ -985,7 +991,7 @@ function normalizeValidationMessage(validationMessage) {
 async function runWithNavigation(prompt) {
 	let goBack = false;
 	prompt.on("key", (char) => {
-		if (char === "b" && !isFirstPrompt()) {
+		if ((char === "b" || char === "B") && !isFirstPrompt()) {
 			goBack = true;
 			prompt.state = "cancel";
 		}
@@ -1171,6 +1177,10 @@ async function navigableGroupMultiselect(opts) {
 		}
 	}));
 }
+/** Use the remembered answer as the initial value only while it is still selectable. */
+function preferValidInitial(options, previous, fallback) {
+	return previous !== void 0 && options.some((o) => o.value === previous) ? previous : fallback;
+}
 //#endregion
 //#region src/prompts/addons.ts
 function getAddonDisplay(addon) {
@@ -1310,7 +1320,7 @@ function validateAddonSelection(selected) {
 		"vite-plus"
 	].includes(addon)) ?? []).length > 1) return "Choose Turborepo, Nx, or Vite+ as your task runner, not more than one.";
 }
-async function getAddonsChoice(addons, frontends, auth, backend, runtime) {
+async function getAddonsChoice(addons, frontends, auth, backend, runtime, previousValue) {
 	if (addons !== void 0) return addons;
 	const allAddons = types_exports.AddonsSchema.options.filter((addon) => addon !== "none");
 	const groupedOptions = createGroupedOptions();
@@ -1329,7 +1339,7 @@ async function getAddonsChoice(addons, frontends, auth, backend, runtime) {
 	const response = await navigableGroupMultiselect({
 		message: "Select addons",
 		options: groupedOptions,
-		initialValues: DEFAULT_CONFIG.addons.filter((addonValue) => Object.values(groupedOptions).some((options) => options.some((opt) => opt.value === addonValue))),
+		initialValues: (previousValue ?? DEFAULT_CONFIG.addons).filter((addonValue) => Object.values(groupedOptions).some((options) => options.some((opt) => opt.value === addonValue))),
 		required: false,
 		validate: validateAddonSelection
 	});
@@ -1974,26 +1984,36 @@ async function setupEvlog(config) {
 /**
 * Define a group of prompts that supports going back to previous prompts.
 * Returns a result object with all the values, or handles cancel/go-back navigation.
+* When navigating back, the discarded answers are replayed to the prompts as
+* `previousAnswer` so they can preselect what the user chose before.
 */
 async function navigableGroup(prompts, opts) {
 	const results = {};
+	const previousAnswers = {};
 	const promptNames = Object.keys(prompts);
 	let currentIndex = 0;
 	let goingBack = false;
+	const stepBack = () => {
+		const prevName = promptNames[currentIndex - 1];
+		previousAnswers[prevName] = results[prevName];
+		delete results[prevName];
+		currentIndex--;
+	};
 	while (currentIndex < promptNames.length) {
 		const name = promptNames[currentIndex];
 		const prompt = prompts[name];
 		setIsFirstPrompt$1(currentIndex === 0);
 		setLastPromptShownUI(false);
-		const result = await prompt({ results })?.catch((e) => {
+		const result = await prompt({
+			results,
+			previousAnswer: previousAnswers[name]
+		})?.catch((e) => {
 			throw e;
 		});
 		if (isGoBack(result)) {
 			goingBack = true;
 			if (currentIndex > 0) {
-				const prevName = promptNames[currentIndex - 1];
-				delete results[prevName];
-				currentIndex--;
+				stepBack();
 				continue;
 			}
 			goingBack = false;
@@ -2009,9 +2029,7 @@ async function navigableGroup(prompts, opts) {
 		}
 		if (goingBack && !didLastPromptShowUI()) {
 			if (currentIndex > 0) {
-				const prevName = promptNames[currentIndex - 1];
-				delete results[prevName];
-				currentIndex--;
+				stepBack();
 				continue;
 			}
 		}
@@ -4045,7 +4063,7 @@ async function addHandlerInternal(input) {
 }
 //#endregion
 //#region src/prompts/api.ts
-async function getApiChoice(Api, frontend, backend) {
+async function getApiChoice(Api, frontend, backend, previousValue) {
 	if (backend === "convex" || backend === "none") return "none";
 	const allowed = allowedApisForFrontends(frontend ?? []);
 	if (Api) {
@@ -4069,7 +4087,7 @@ async function getApiChoice(Api, frontend, backend) {
 	const apiType = await navigableSelect({
 		message: "Select API type",
 		options: apiOptions,
-		initialValue: apiOptions[0].value
+		initialValue: preferValidInitial(apiOptions, previousValue, apiOptions[0].value)
 	});
 	if (isCancel$1(apiType)) throw new UserCancelledError({ message: "Operation cancelled" });
 	return apiType;
@@ -4095,7 +4113,7 @@ function getAvailableAuthProviders(backend, frontend = []) {
 	if (options.length === 0) return ["none"];
 	return [...options, "none"];
 }
-async function getAuthChoice(auth, backend, frontend = []) {
+async function getAuthChoice(auth, backend, frontend = [], previousValue) {
 	if (auth !== void 0) return auth;
 	const availableProviders = getAvailableAuthProviders(backend, frontend);
 	if (availableProviders.length === 1 && availableProviders[0] === "none") return "none";
@@ -4121,7 +4139,7 @@ async function getAuthChoice(auth, backend, frontend = []) {
 	const response = await navigableSelect({
 		message: "Select authentication provider",
 		options,
-		initialValue: options.some((option) => option.value === DEFAULT_CONFIG.auth) ? DEFAULT_CONFIG.auth : "none"
+		initialValue: preferValidInitial(options, previousValue, options.some((option) => option.value === DEFAULT_CONFIG.auth) ? DEFAULT_CONFIG.auth : "none")
 	});
 	if (isCancel$1(response)) throw new UserCancelledError({ message: "Operation cancelled" });
 	return response;
@@ -4135,7 +4153,7 @@ const FULLSTACK_FRONTENDS = [
 	"svelte",
 	"astro"
 ];
-async function getBackendFrameworkChoice(backendFramework, frontends) {
+async function getBackendFrameworkChoice(backendFramework, frontends, previousValue) {
 	if (backendFramework !== void 0) return backendFramework;
 	const hasIncompatibleFrontend = frontends?.some((f) => f === "solid" || f === "astro");
 	const hasFullstackFrontend = frontends?.some((f) => FULLSTACK_FRONTENDS.includes(f));
@@ -4175,14 +4193,14 @@ async function getBackendFrameworkChoice(backendFramework, frontends) {
 	const response = await navigableSelect({
 		message: "Select backend",
 		options: backendOptions,
-		initialValue: hasFullstackFrontend ? "self" : DEFAULT_CONFIG.backend
+		initialValue: preferValidInitial(backendOptions, previousValue, hasFullstackFrontend ? "self" : DEFAULT_CONFIG.backend)
 	});
 	if (isCancel$1(response)) throw new UserCancelledError({ message: "Operation cancelled" });
 	return response;
 }
 //#endregion
 //#region src/prompts/database.ts
-async function getDatabaseChoice(database, backend, runtime) {
+async function getDatabaseChoice(database, backend, runtime, previousValue) {
 	if (backend === "convex" || backend === "none") return "none";
 	if (database !== void 0) return database;
 	const databaseOptions = [
@@ -4215,14 +4233,14 @@ async function getDatabaseChoice(database, backend, runtime) {
 	const response = await navigableSelect({
 		message: "Select database",
 		options: databaseOptions,
-		initialValue: DEFAULT_CONFIG.database
+		initialValue: preferValidInitial(databaseOptions, previousValue, DEFAULT_CONFIG.database)
 	});
 	if (isCancel$1(response)) throw new UserCancelledError({ message: "Operation cancelled" });
 	return response;
 }
 //#endregion
 //#region src/prompts/database-setup.ts
-async function getDBSetupChoice(databaseType, dbSetup, _orm, backend, runtime) {
+async function getDBSetupChoice(databaseType, dbSetup, _orm, backend, runtime, previousValue) {
 	if (backend === "convex") return "none";
 	if (dbSetup !== void 0) return dbSetup;
 	if (databaseType === "none") return "none";
@@ -4314,14 +4332,14 @@ async function getDBSetupChoice(databaseType, dbSetup, _orm, backend, runtime) {
 	const response = await navigableSelect({
 		message: `Select ${databaseType} setup option`,
 		options,
-		initialValue: "none"
+		initialValue: preferValidInitial(options, previousValue, "none")
 	});
 	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) {
+async function getExamplesChoice(examples, database, frontends, backend, api, previousValue) {
 	if (examples !== void 0) return examples;
 	if (backend === "none") return [];
 	let response = [];
@@ -4341,15 +4359,27 @@ async function getExamplesChoice(examples, database, frontends, backend, api) {
 		message: "Include examples",
 		options,
 		required: false,
-		initialValues: DEFAULT_CONFIG.examples?.filter((ex) => options.some((o) => o.value === ex))
+		initialValues: (previousValue ?? DEFAULT_CONFIG.examples)?.filter((ex) => options.some((o) => o.value === ex))
 	});
 	if (isCancel$1(response)) throw new UserCancelledError({ message: "Operation cancelled" });
 	return response;
 }
 //#endregion
 //#region src/prompts/frontend.ts
-async function getFrontendChoice(frontendOptions, backend, auth) {
+const WEB_FRONTEND_VALUES = [
+	"tanstack-router",
+	"react-router",
+	"next",
+	"nuxt",
+	"svelte",
+	"solid",
+	"astro",
+	"tanstack-start"
+];
+async function getFrontendChoice(frontendOptions, backend, auth, previousValue) {
 	if (frontendOptions !== void 0) return frontendOptions;
+	const previousWeb = previousValue?.find((f) => WEB_FRONTEND_VALUES.includes(f));
+	const previousNative = previousValue?.find((f) => f.startsWith("native-"));
 	while (true) {
 		const wasFirstPrompt = isFirstPrompt();
 		const frontendTypes = await navigableMultiselect({
@@ -4364,7 +4394,7 @@ async function getFrontendChoice(frontendOptions, backend, auth) {
 				hint: "Create a React Native/Expo app"
 			}],
 			required: false,
-			initialValues: ["web"]
+			initialValues: previousValue ? [...previousWeb ? ["web"] : [], ...previousNative ? ["native"] : []] : ["web"]
 		});
 		if (isGoBack(frontendTypes)) return GO_BACK_SYMBOL;
 		if (isCancel$1(frontendTypes)) throw new UserCancelledError({ message: "Operation cancelled" });
@@ -4372,51 +4402,52 @@ async function getFrontendChoice(frontendOptions, backend, auth) {
 		const result = [];
 		let shouldRestart = false;
 		if (frontendTypes.includes("web")) {
+			const webOptions = [
+				{
+					value: "tanstack-router",
+					label: "TanStack Router",
+					hint: "Modern and scalable routing for React Applications"
+				},
+				{
+					value: "react-router",
+					label: "React Router",
+					hint: "A user‑obsessed, standards‑focused, multi‑strategy router"
+				},
+				{
+					value: "next",
+					label: "Next.js",
+					hint: "The React Framework for the Web"
+				},
+				{
+					value: "nuxt",
+					label: "Nuxt",
+					hint: "The Progressive Web Framework for Vue.js"
+				},
+				{
+					value: "svelte",
+					label: "Svelte",
+					hint: "web development for the rest of us"
+				},
+				{
+					value: "solid",
+					label: "Solid",
+					hint: "Simple and performant reactivity for building user interfaces"
+				},
+				{
+					value: "astro",
+					label: "Astro",
+					hint: "The web framework for content-driven websites"
+				},
+				{
+					value: "tanstack-start",
+					label: "TanStack Start",
+					hint: "SSR, Server Functions, API Routes and more with TanStack Router"
+				}
+			].filter((option) => isFrontendAllowedWithBackend(option.value, backend, auth));
 			const webFramework = await navigableSelect({
 				message: "Choose web",
-				options: [
-					{
-						value: "tanstack-router",
-						label: "TanStack Router",
-						hint: "Modern and scalable routing for React Applications"
-					},
-					{
-						value: "react-router",
-						label: "React Router",
-						hint: "A user‑obsessed, standards‑focused, multi‑strategy router"
-					},
-					{
-						value: "next",
-						label: "Next.js",
-						hint: "The React Framework for the Web"
-					},
-					{
-						value: "nuxt",
-						label: "Nuxt",
-						hint: "The Progressive Web Framework for Vue.js"
-					},
-					{
-						value: "svelte",
-						label: "Svelte",
-						hint: "web development for the rest of us"
-					},
-					{
-						value: "solid",
-						label: "Solid",
-						hint: "Simple and performant reactivity for building user interfaces"
-					},
-					{
-						value: "astro",
-						label: "Astro",
-						hint: "The web framework for content-driven websites"
-					},
-					{
-						value: "tanstack-start",
-						label: "TanStack Start",
-						hint: "SSR, Server Functions, API Routes and more with TanStack Router"
-					}
-				].filter((option) => isFrontendAllowedWithBackend(option.value, backend, auth)),
-				initialValue: DEFAULT_CONFIG.frontend[0]
+				options: webOptions,
+				initialValue: preferValidInitial(webOptions, previousWeb, DEFAULT_CONFIG.frontend[0])
 			});
 			if (isGoBack(webFramework)) shouldRestart = true;
 			else if (isCancel$1(webFramework)) throw new UserCancelledError({ message: "Operation cancelled" });
@@ -4446,7 +4477,7 @@ async function getFrontendChoice(frontendOptions, backend, auth) {
 						hint: "Consistent styling for React Native"
 					}
 				],
-				initialValue: "native-bare"
+				initialValue: previousNative ?? "native-bare"
 			});
 			if (isGoBack(nativeFramework)) if (frontendTypes.includes("web")) shouldRestart = true;
 			else {
@@ -4465,22 +4496,22 @@ async function getFrontendChoice(frontendOptions, backend, auth) {
 }
 //#endregion
 //#region src/prompts/git.ts
-async function getGitChoice(git) {
+async function getGitChoice(git, previousValue) {
 	if (git !== void 0) return git;
 	const response = await navigableConfirm({
 		message: "Initialize git repository?",
-		initialValue: DEFAULT_CONFIG.git
+		initialValue: previousValue ?? DEFAULT_CONFIG.git
 	});
 	if (isCancel$1(response)) throw new UserCancelledError({ message: "Operation cancelled" });
 	return response;
 }
 //#endregion
 //#region src/prompts/install.ts
-async function getinstallChoice(install) {
+async function getinstallChoice(install, previousValue) {
 	if (install !== void 0) return install;
 	const response = await navigableConfirm({
 		message: "Install dependencies?",
-		initialValue: DEFAULT_CONFIG.install
+		initialValue: previousValue ?? DEFAULT_CONFIG.install
 	});
 	if (isCancel$1(response)) throw new UserCancelledError({ message: "Operation cancelled" });
 	return response;
@@ -4664,6 +4695,7 @@ function validateFullConfig(config, providedFlags, options) {
 		yield* validateFrontendConstraints(config, providedFlags);
 		yield* validateApiConstraints(config, options);
 		yield* validateServerDeployRequiresBackend(config.serverDeploy, config.backend);
+		yield* validateDockerServerDeploy(config.serverDeploy, config.backend, config.runtime);
 		yield* validateSelfBackendCompatibility(providedFlags, options, config);
 		yield* validateWorkersCompatibility(providedFlags, options, config);
 		if (config.runtime === "workers" && config.serverDeploy === "none") yield* validationErr("Cloudflare Workers runtime requires a server deployment. Please choose 'cloudflare' for --server-deploy.");
@@ -4707,7 +4739,7 @@ const ormOptions = {
 		hint: "Lightweight and performant TypeScript ORM"
 	}
 };
-async function getORMChoice(orm, hasDatabase, database, backend, runtime) {
+async function getORMChoice(orm, hasDatabase, database, backend, runtime, previousValue) {
 	if (backend === "convex") return "none";
 	if (!hasDatabase) return "none";
 	if (orm !== void 0) {
@@ -4715,18 +4747,20 @@ async function getORMChoice(orm, hasDatabase, database, backend, runtime) {
 		if (compat.isErr()) throw compat.error;
 		return orm;
 	}
+	const options = database === "mongodb" ? [ormOptions.prisma, ormOptions.mongoose] : [ormOptions.drizzle, ormOptions.prisma];
 	const response = await navigableSelect({
 		message: "Select ORM",
-		options: database === "mongodb" ? [ormOptions.prisma, ormOptions.mongoose] : [ormOptions.drizzle, ormOptions.prisma],
-		initialValue: database === "mongodb" ? "prisma" : runtime === "workers" ? "drizzle" : DEFAULT_CONFIG.orm
+		options,
+		initialValue: preferValidInitial(options, previousValue, database === "mongodb" ? "prisma" : runtime === "workers" ? "drizzle" : DEFAULT_CONFIG.orm)
 	});
 	if (isCancel$1(response)) throw new UserCancelledError({ message: "Operation cancelled" });
 	return response;
 }
 //#endregion
 //#region src/prompts/package-manager.ts
-async function getPackageManagerChoice(packageManager) {
+async function getPackageManagerChoice(packageManager, previousValue) {
 	if (packageManager !== void 0) return packageManager;
+	const detectedPackageManager = getUserPkgManager();
 	const response = await navigableSelect({
 		message: "Choose package manager",
 		options: [
@@ -4746,36 +4780,37 @@ async function getPackageManagerChoice(packageManager) {
 				hint: "All-in-one JavaScript runtime & toolkit"
 			}
 		],
-		initialValue: getUserPkgManager()
+		initialValue: previousValue ?? detectedPackageManager
 	});
 	if (isCancel$1(response)) throw new UserCancelledError({ message: "Operation cancelled" });
 	return response;
 }
 //#endregion
 //#region src/prompts/payments.ts
-async function getPaymentsChoice(payments, auth, backend, _frontends) {
+async function getPaymentsChoice(payments, auth, backend, _frontends, previousValue) {
 	if (payments !== void 0) return payments;
 	if (backend === "none") return "none";
 	if (!(auth === "better-auth")) 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"
+	}];
 	const response = await navigableSelect({
 		message: "Select payments provider",
-		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
+		options,
+		initialValue: preferValidInitial(options, previousValue, DEFAULT_CONFIG.payments)
 	});
 	if (isCancel$1(response)) throw new UserCancelledError({ message: "Operation cancelled" });
 	return response;
 }
 //#endregion
 //#region src/prompts/runtime.ts
-async function getRuntimeChoice(runtime, backend) {
+async function getRuntimeChoice(runtime, backend, previousValue) {
 	if (backend === "convex" || backend === "none" || backend === "self") return "none";
 	if (runtime !== void 0) return runtime;
 	const runtimeOptions = [{
@@ -4795,19 +4830,56 @@ async function getRuntimeChoice(runtime, backend) {
 	const response = await navigableSelect({
 		message: "Select runtime",
 		options: runtimeOptions,
-		initialValue: DEFAULT_CONFIG.runtime
+		initialValue: preferValidInitial(runtimeOptions, previousValue, DEFAULT_CONFIG.runtime)
 	});
 	if (isCancel$1(response)) throw new UserCancelledError({ message: "Operation cancelled" });
 	return response;
 }
 //#endregion
 //#region src/prompts/server-deploy.ts
-async function getServerDeploymentChoice(deployment, runtime, backend, _webDeploy) {
+const SERVER_APP_BACKENDS = [
+	"hono",
+	"express",
+	"fastify",
+	"elysia"
+];
+function getDeploymentDisplay$1(deployment) {
+	if (deployment === "cloudflare") return {
+		label: "Cloudflare",
+		hint: "Deploy to Cloudflare Workers using Alchemy"
+	};
+	if (deployment === "docker") return {
+		label: "Docker",
+		hint: "Self-host with a Dockerfile and docker-compose.yml"
+	};
+	return {
+		label: deployment,
+		hint: `Add ${deployment} deployment`
+	};
+}
+async function getServerDeploymentChoice(deployment, runtime, backend, _webDeploy, previousValue) {
 	if (deployment !== void 0) return deployment;
-	if (backend === "none" || backend === "convex") return "none";
-	if (backend !== "hono") return "none";
+	if (!backend || !SERVER_APP_BACKENDS.includes(backend)) return "none";
 	if (runtime === "workers") return "cloudflare";
-	return "none";
+	if (runtime !== "bun" && runtime !== "node") return "none";
+	const options = ["docker", "none"].map((deploy) => {
+		const { label, hint } = deploy === "none" ? {
+			label: "None",
+			hint: "Skip deployment setup"
+		} : getDeploymentDisplay$1(deploy);
+		return {
+			value: deploy,
+			label,
+			hint
+		};
+	});
+	const response = await navigableSelect({
+		message: "Select server deployment",
+		options,
+		initialValue: preferValidInitial(options, previousValue, DEFAULT_CONFIG.serverDeploy)
+	});
+	if (isCancel$1(response)) throw new UserCancelledError({ message: "Operation cancelled" });
+	return response;
 }
 //#endregion
 //#region src/prompts/web-deploy.ts
@@ -4819,26 +4891,35 @@ function getDeploymentDisplay(deployment) {
 		label: "Cloudflare",
 		hint: "Deploy to Cloudflare Workers using Alchemy"
 	};
+	if (deployment === "docker") return {
+		label: "Docker",
+		hint: "Self-host with a Dockerfile and docker-compose.yml"
+	};
 	return {
 		label: deployment,
 		hint: `Add ${deployment} deployment`
 	};
 }
-async function getDeploymentChoice(deployment, _runtime, backend, frontend = [], dbSetup) {
+async function getDeploymentChoice(deployment, _runtime, backend, frontend = [], dbSetup, previousValue) {
 	if (deployment !== void 0) return deployment;
 	if (!hasWebFrontend(frontend)) return "none";
 	if (backend === "self" && dbSetup === "d1") return "cloudflare";
+	const options = [
+		"cloudflare",
+		"docker",
+		"none"
+	].map((deploy) => {
+		const { label, hint } = getDeploymentDisplay(deploy);
+		return {
+			value: deploy,
+			label,
+			hint
+		};
+	});
 	const response = await navigableSelect({
 		message: "Select web deployment",
-		options: ["cloudflare", "none"].map((deploy) => {
-			const { label, hint } = getDeploymentDisplay(deploy);
-			return {
-				value: deploy,
-				label,
-				hint
-			};
-		}),
-		initialValue: DEFAULT_CONFIG.webDeploy
+		options,
+		initialValue: preferValidInitial(options, previousValue, DEFAULT_CONFIG.webDeploy)
 	});
 	if (isCancel$1(response)) throw new UserCancelledError({ message: "Operation cancelled" });
 	return response;
@@ -4870,22 +4951,22 @@ async function gatherConfig(flags, projectName, projectDir, relativePath) {
 		serverDeploy: flags.serverDeploy ?? DEFAULT_CONFIG.serverDeploy
 	};
 	const result = await navigableGroup({
-		frontend: () => getFrontendChoice(flags.frontend, flags.backend, flags.auth),
-		backend: ({ results }) => getBackendFrameworkChoice(flags.backend, results.frontend),
-		runtime: ({ results }) => getRuntimeChoice(flags.runtime, results.backend),
-		database: ({ results }) => getDatabaseChoice(flags.database, results.backend, results.runtime),
-		orm: ({ results }) => getORMChoice(flags.orm, results.database !== "none", results.database, results.backend, results.runtime),
-		api: ({ results }) => getApiChoice(flags.api, results.frontend, results.backend),
-		auth: ({ results }) => getAuthChoice(flags.auth, results.backend, results.frontend),
-		payments: ({ results }) => getPaymentsChoice(flags.payments, results.auth, results.backend, results.frontend),
-		addons: ({ results }) => getAddonsChoice(flags.addons, results.frontend, results.auth, results.backend, results.runtime),
-		examples: ({ results }) => getExamplesChoice(flags.examples, results.database, results.frontend, results.backend, results.api),
-		dbSetup: ({ results }) => getDBSetupChoice(results.database ?? "none", flags.dbSetup, results.orm, results.backend, results.runtime),
-		webDeploy: ({ results }) => getDeploymentChoice(flags.webDeploy, results.runtime, results.backend, results.frontend, results.dbSetup),
-		serverDeploy: ({ results }) => getServerDeploymentChoice(flags.serverDeploy, results.runtime, results.backend, results.webDeploy),
-		git: () => getGitChoice(flags.git),
-		packageManager: () => getPackageManagerChoice(flags.packageManager),
-		install: () => getinstallChoice(flags.install)
+		frontend: ({ previousAnswer }) => getFrontendChoice(flags.frontend, flags.backend, flags.auth, previousAnswer),
+		backend: ({ results, previousAnswer }) => getBackendFrameworkChoice(flags.backend, results.frontend, previousAnswer),
+		runtime: ({ results, previousAnswer }) => getRuntimeChoice(flags.runtime, results.backend, previousAnswer),
+		database: ({ results, previousAnswer }) => getDatabaseChoice(flags.database, results.backend, results.runtime, previousAnswer),
+		orm: ({ results, previousAnswer }) => getORMChoice(flags.orm, results.database !== "none", results.database, results.backend, results.runtime, previousAnswer),
+		api: ({ results, previousAnswer }) => getApiChoice(flags.api, results.frontend, results.backend, previousAnswer),
+		auth: ({ results, previousAnswer }) => getAuthChoice(flags.auth, results.backend, results.frontend, previousAnswer),
+		payments: ({ results, previousAnswer }) => getPaymentsChoice(flags.payments, results.auth, results.backend, results.frontend, previousAnswer),
+		addons: ({ results, previousAnswer }) => getAddonsChoice(flags.addons, results.frontend, results.auth, results.backend, results.runtime, previousAnswer),
+		examples: ({ results, previousAnswer }) => getExamplesChoice(flags.examples, results.database, results.frontend, results.backend, results.api, previousAnswer),
+		dbSetup: ({ results, previousAnswer }) => getDBSetupChoice(results.database ?? "none", flags.dbSetup, results.orm, results.backend, results.runtime, previousAnswer),
+		webDeploy: ({ results, previousAnswer }) => getDeploymentChoice(flags.webDeploy, results.runtime, results.backend, results.frontend, results.dbSetup, previousAnswer),
+		serverDeploy: ({ results, previousAnswer }) => getServerDeploymentChoice(flags.serverDeploy, results.runtime, results.backend, results.webDeploy, previousAnswer),
+		git: ({ previousAnswer }) => getGitChoice(flags.git, previousAnswer),
+		packageManager: ({ previousAnswer }) => getPackageManagerChoice(flags.packageManager, previousAnswer),
+		install: ({ previousAnswer }) => getinstallChoice(flags.install, previousAnswer)
 	}, { onCancel: () => {
 		throw new UserCancelledError({ message: "Operation cancelled" });
 	} });
@@ -7057,6 +7138,10 @@ function getAlchemyDeployInstructions(runCmd, webDeploy, serverDeploy, backend)
 	if (webDeploy === "cloudflare" && serverDeploy !== "cloudflare" && !isBackendSelf) instructions.push(`${pc.bold("Deploy web with Cloudflare (Alchemy):")}\n${pc.cyan("•")} Dev: ${`${runCmd} dev`}\n${pc.cyan("•")} Deploy: ${`${runCmd} deploy`}\n${pc.cyan("•")} Destroy: ${`${runCmd} destroy`}`);
 	else if (serverDeploy === "cloudflare" && webDeploy !== "cloudflare" && !isBackendSelf) instructions.push(`${pc.bold("Deploy server with Cloudflare (Alchemy):")}\n${pc.cyan("•")} Dev: ${`${runCmd} dev`}\n${pc.cyan("•")} Deploy: ${`${runCmd} deploy`}\n${pc.cyan("•")} Destroy: ${`${runCmd} destroy`}`);
 	else if (webDeploy === "cloudflare" && (serverDeploy === "cloudflare" || isBackendSelf)) instructions.push(`${pc.bold("Deploy with Cloudflare (Alchemy):")}\n${pc.cyan("•")} Dev: ${`${runCmd} dev`}\n${pc.cyan("•")} Deploy: ${`${runCmd} deploy`}\n${pc.cyan("•")} Destroy: ${`${runCmd} destroy`}`);
+	if (webDeploy === "docker" || serverDeploy === "docker") {
+		const dockerTargets = webDeploy === "docker" && serverDeploy === "docker" ? "web + server" : webDeploy === "docker" ? "web" : "server";
+		instructions.push(`${pc.bold(`Deploy ${dockerTargets} with Docker Compose:`)}\n${pc.cyan("•")} Start: ${`${runCmd} docker:up`}\n${pc.cyan("•")} Logs: ${`${runCmd} docker:logs`}\n${pc.cyan("•")} Stop: ${`${runCmd} docker:down`}\n${pc.cyan("•")} Config: docker-compose.yml`);
+	}
 	return instructions.length ? `\n${instructions.join("\n")}` : "";
 }
 //#endregion

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "create-better-t-stack",
-  "version": "3.32.0",
+  "version": "3.33.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,10 +69,10 @@
     "prepublishOnly": "npm run build"
   },
   "dependencies": {
-    "@better-t-stack/template-generator": "^3.32.0",
-    "@better-t-stack/types": "^3.32.0",
-    "@clack/core": "^1.3.1",
-    "@clack/prompts": "^1.4.0",
+    "@better-t-stack/template-generator": "^3.33.0",
+    "@better-t-stack/types": "^3.33.0",
+    "@clack/core": "^1.4.1",
+    "@clack/prompts": "^1.5.1",
     "@modelcontextprotocol/sdk": "1.29.0",
     "@trpc/server": "^11.17.0",
     "better-result": "^2.9.2",