create-better-fullstack 2.1.5 → 2.1.6

package/dist/{run-BYse4yJy.mjs → run-D80ZtSO8.mjs}

@@ -1,11 +1,13 @@
 #!/usr/bin/env node
-import { A as types_exports, D as getGraphSummary, E as getGraphPart, S as getUserPkgManager, T as getGraphBackendUrl, _ as writeBtsConfig, a as handleError, b as DEFAULT_UI_LIBRARY_BY_FRONTEND, c as isSilent, d as setLastPromptShownUI, f as buildBtsConfigForPersistence, h as readBtsConfigFromFile, i as exitWithError, k as hasGraphPart, l as runWithContextAsync, n as UserCancelledError, o as didLastPromptShowUI, r as exitCancelled, s as isFirstPrompt, t as CLIError, u as setIsFirstPrompt, v as getLatestCLIVersion, w as getGraphBackendDeployInstructions, x as getDefaultConfig, y as DEFAULT_CONFIG } from "./errors-Cyol8zbN.mjs";
+import { c as DEFAULT_CONFIG, d as getUserPkgManager, g as getGraphSummary, h as getGraphPart, i as readBtsConfigFromFile, l as DEFAULT_UI_LIBRARY_BY_FRONTEND, m as getGraphBackendUrl, o as writeBtsConfig, p as getGraphBackendDeployInstructions, s as getLatestCLIVersion, t as buildBtsConfigForPersistence, u as getDefaultConfig, v as hasGraphPart, y as types_exports } from "./bts-config-BceXPcpI.mjs";
 import { t as renderTitle } from "./render-title-zvyKC1ej.mjs";
-import { i as canPromptInteractively, n as getPackageExecutionArgs, r as addPackageDependency, t as setupAddons } from "./addons-setup-CyrP1IV-.mjs";
-import { _ as CreateCommandInputSchema, a as allowedApisForFrontends$1, c as getCompatibleUILibraries$1, d as isExampleChatSdkAllowed$1, f as isFrontendAllowedWithBackend$1, h as splitFrontends$1, i as validateFullConfig, l as hasWebStyling$1, m as requiresChatSdkVercelAI, n as formatProject, p as isWebFrontend$1, r as validateConfigForProgrammaticUse, s as getCompatibleCSSFrameworks$1, u as isExampleAIAllowed$1, v as CreateCommandOptionsSchema } from "./file-formatter-B3dsev2l.mjs";
-import { _ as isGoBack, a as runMavenTests, c as applyDependencyVersionChannel, d as isCancel$1, f as navigableConfirm, g as GO_BACK_SYMBOL, h as setIsFirstPrompt$1, i as runGradleTests, l as getAddonsChoice, m as navigableSelect, n as runCargoBuild, o as runMixCompile, p as navigableMultiselect, r as runGoModTidy, s as runUvSync, t as installDependencies } from "./install-dependencies-CgNh-aOy.mjs";
-import { n as commandExists, t as runGeneratedChecks } from "./generated-checks-C8hn9w2i.mjs";
-import { n as getTemplateDescription, r as generateReproducibleCommand, t as getTemplateConfig } from "./templates-CnTOtKjm.mjs";
+import { a as handleError, c as isSilent, d as setLastPromptShownUI, i as exitWithError, l as runWithContextAsync, n as UserCancelledError, o as didLastPromptShowUI, r as exitCancelled, s as isFirstPrompt, t as CLIError, u as setIsFirstPrompt } from "./errors-ns_o2OKg.mjs";
+import { i as canPromptInteractively, n as getPackageExecutionArgs, r as addPackageDependency, t as setupAddons } from "./addons-setup-C_lxdJqU.mjs";
+import { _ as CreateCommandInputSchema, a as allowedApisForFrontends$1, c as getCompatibleUILibraries$1, d as isExampleChatSdkAllowed$1, f as isFrontendAllowedWithBackend$1, h as splitFrontends$1, i as validateFullConfig, l as hasWebStyling$1, m as requiresChatSdkVercelAI, n as formatProject, p as isWebFrontend$1, r as validateConfigForProgrammaticUse, s as getCompatibleCSSFrameworks$1, u as isExampleAIAllowed$1, v as CreateCommandOptionsSchema } from "./file-formatter-XU6ti05V.mjs";
+import { _ as isGoBack, a as runMavenTests, c as applyDependencyVersionChannel, d as isCancel$1, f as navigableConfirm, g as GO_BACK_SYMBOL, h as setIsFirstPrompt$1, i as runGradleTests, l as getAddonsChoice, m as navigableSelect, n as runCargoBuild, o as runMixCompile, p as navigableMultiselect, r as runGoModTidy, s as runUvSync, t as installDependencies } from "./install-dependencies-DHoYa3P-.mjs";
+import { n as commandExists, t as runGeneratedChecks } from "./generated-checks-Dt4Xqp1x.mjs";
+import { a as getTemplateConfig, i as validateArrayOptions, n as getProvidedFlags, o as getTemplateDescription, r as processFlags, s as generateReproducibleCommand, t as applyEffectBackendDefaults } from "./config-processing-B_1wTe3g.mjs";
+import { r as recordScaffoldManifest } from "./scaffold-manifest-GV1fbhpD.mjs";
 import { cancel, confirm, intro, isCancel, log, outro, select, spinner, text } from "@clack/prompts";
 import { createRouterClient, os } from "@orpc/server";
 import pc from "picocolors";
@@ -17,7 +19,6 @@ import path from "node:path";
 import { formatStackPartSpec, getLocalWebDevPort } from "@better-fullstack/types";
 import consola, { consola as consola$1 } from "consola";
 import { $, execa } from "execa";
-import { cliInputToProjectConfigPartial } from "@better-fullstack/types/stack-translation";
 import os$1 from "node:os";
 
 //#region src/utils/project-history.ts
@@ -792,6 +793,11 @@ const BACKEND_PROMPT_OPTIONS = [
 		label: "feTS",
 		hint: "TypeScript HTTP Framework with e2e type-safety"
 	},
+	{
+		value: "effect",
+		label: "Effect",
+		hint: "Effect-first service backend with layers and schema"
+	},
 	{
 		value: "nestjs",
 		label: "NestJS",
@@ -833,6 +839,7 @@ function resolveBackendPrompt(context = {}) {
 		"fastify",
 		"elysia",
 		"fets",
+		"effect",
 		"nestjs",
 		"adonisjs",
 		"nitro",
@@ -870,15 +877,24 @@ async function getBackendFrameworkChoice(backendFramework, frontends) {
 
 //#endregion
 //#region src/prompts/caching.ts
-const CACHING_PROMPT_OPTIONS = [{
-	value: "upstash-redis",
-	label: "Upstash Redis",
-	hint: "Serverless Redis with REST API for edge and serverless"
-}, {
-	value: "none",
-	label: "None",
-	hint: "Skip caching layer setup"
-}];
+const CACHING_PROMPT_OPTIONS = [
+	{
+		value: "upstash-redis",
+		label: "Upstash Redis",
+		hint: "Serverless Redis with REST API for edge and serverless"
+	},
+	{
+		value: "redis",
+		label: "Redis",
+		hint: "Self-hosted Redis via ioredis (TCP) — full command surface"
+	},
+	{
+		value: "none",
+		label: "None",
+		hint: "Skip caching layer setup"
+	}
+];
+const NON_TS_CACHING_PROMPT_OPTIONS = CACHING_PROMPT_OPTIONS.filter((option) => option.value !== "redis");
 function resolveCachingPrompt(context = {}) {
 	if (context.ecosystem === "react-native" || context.ecosystem === "elixir") return {
 		shouldPrompt: false,
@@ -889,12 +905,12 @@ function resolveCachingPrompt(context = {}) {
 	if (context.ecosystem && context.ecosystem !== "typescript") return context.caching !== void 0 ? {
 		shouldPrompt: false,
 		mode: "single",
-		options: CACHING_PROMPT_OPTIONS,
+		options: NON_TS_CACHING_PROMPT_OPTIONS,
 		autoValue: context.caching
 	} : {
 		shouldPrompt: true,
 		mode: "single",
-		options: CACHING_PROMPT_OPTIONS,
+		options: NON_TS_CACHING_PROMPT_OPTIONS,
 		initialValue: "none"
 	};
 	if (context.backend === "none" || context.backend === "convex") return {
@@ -1968,22 +1984,22 @@ async function getEcosystemChoice(ecosystem) {
 async function getEffectChoice(effect) {
 	if (effect !== void 0) return effect;
 	const response = await navigableSelect({
-		message: "Select Effect ecosystem",
+		message: "Select Effect services",
 		options: [
 			{
 				value: "effect",
-				label: "Effect (core)",
-				hint: "Powerful effect system for TypeScript"
+				label: "Effect Core",
+				hint: "Add Effect services and layers to the selected stack"
 			},
 			{
 				value: "effect-full",
-				label: "Effect Full",
-				hint: "Full Effect ecosystem with schema validation, platform abstractions, and SQL"
+				label: "Effect Platform + SQL",
+				hint: "Core plus Platform, browser/server adapters, SQL, and Vitest integration"
 			},
 			{
 				value: "none",
 				label: "None",
-				hint: "No Effect ecosystem"
+				hint: "No additional Effect services"
 			}
 		],
 		initialValue: "none"
@@ -2135,6 +2151,11 @@ async function getFileStorageChoice(fileStorage, backend) {
 				label: "Cloudinary",
 				hint: "Image and media storage with transformations"
 			},
+			{
+				value: "supabase-storage",
+				label: "Supabase Storage",
+				hint: "S3-compatible object storage with signed URLs and RLS"
+			},
 			{
 				value: "none",
 				label: "None",
@@ -2515,6 +2536,11 @@ const GO_WEB_FRAMEWORK_PROMPT_OPTIONS = [
 		label: "Chi",
 		hint: "Lightweight, zero-dependency router built on net/http"
 	},
+	{
+		value: "stdlib",
+		label: "net/http",
+		hint: "Go 1.22+ standard-library routing (ServeMux), zero dependencies"
+	},
 	{
 		value: "none",
 		label: "None",
@@ -2537,6 +2563,11 @@ const GO_ORM_PROMPT_OPTIONS = [
 		label: "Ent",
 		hint: "Code-first ORM by Meta with graph traversal API, 15k+ stars"
 	},
+	{
+		value: "bun",
+		label: "Bun",
+		hint: "SQL-first Go ORM by uptrace with a lightweight query builder"
+	},
 	{
 		value: "none",
 		label: "None",
@@ -2913,10 +2944,19 @@ const PARAGLIDE_FRONTENDS = new Set([
 async function getI18nChoice(i18n, frontend) {
 	if (i18n !== void 0) return i18n;
 	const hasNext = frontend?.includes("next") ?? false;
+	const hasParaglideFrontend = frontend?.some((f) => PARAGLIDE_FRONTENDS.has(f)) ?? false;
+	const hasIntlayerFrontend = frontend?.some((f) => [
+		"next",
+		"vinext",
+		"tanstack-router",
+		"tanstack-start",
+		"react-router",
+		"react-vite"
+	].includes(f)) ?? false;
 	const response = await navigableSelect({
 		message: "Select internationalization (i18n) library",
 		options: [
-			...frontend?.some((f) => PARAGLIDE_FRONTENDS.has(f)) ?? false ? [{
+			...hasParaglideFrontend ? [{
 				value: "paraglide",
 				label: "Paraglide",
 				hint: "Type-safe, compiler-based i18n for modern web frontends"
@@ -2931,6 +2971,11 @@ async function getI18nChoice(i18n, frontend) {
 				label: "next-intl",
 				hint: "Lightweight i18n for Next.js with App Router support"
 			}] : [],
+			...hasIntlayerFrontend ? [{
+				value: "intlayer",
+				label: "Intlayer",
+				hint: "Component-level, type-safe i18n for React, Next.js, and Vite"
+			}] : [],
 			{
 				value: "none",
 				label: "None",
@@ -3032,12 +3077,26 @@ const JAVA_WEB_FRAMEWORK_PROMPT_OPTIONS = [
 		label: "Quarkus",
 		hint: "Cloud-native Java framework optimized for fast startup and lower memory use"
 	},
+	{
+		value: "micronaut",
+		label: "Micronaut",
+		hint: "Modern JVM framework with compile-time DI/AOP and fast startup, low memory"
+	},
 	{
 		value: "none",
 		label: "None",
 		hint: "No Java web framework"
 	}
 ];
+const JAVA_LANGUAGE_PROMPT_OPTIONS = [{
+	value: "java",
+	label: "Java",
+	hint: "Classic Java sources (default)"
+}, {
+	value: "kotlin",
+	label: "Kotlin",
+	hint: "Idiomatic Kotlin sources (Spring Boot only)"
+}];
 const JAVA_BUILD_TOOL_PROMPT_OPTIONS = [
 	{
 		value: "maven",
@@ -3257,6 +3316,20 @@ async function getJavaWebFrameworkChoice(javaWebFramework) {
 	if (isCancel$1(response)) return exitCancelled("Operation cancelled");
 	return response;
 }
+function resolveJavaLanguagePrompt(javaLanguage) {
+	return createStaticSinglePromptResolution(JAVA_LANGUAGE_PROMPT_OPTIONS, "java", javaLanguage);
+}
+async function getJavaLanguageChoice(javaLanguage) {
+	const resolution = resolveJavaLanguagePrompt(javaLanguage);
+	if (!resolution.shouldPrompt) return resolution.autoValue ?? "java";
+	const response = await navigableSelect({
+		message: "Select JVM language",
+		options: resolution.options,
+		initialValue: resolution.initialValue
+	});
+	if (isCancel$1(response)) return exitCancelled("Operation cancelled");
+	return response;
+}
 function resolveJavaBuildToolPrompt(javaBuildTool) {
 	return createStaticSinglePromptResolution(JAVA_BUILD_TOOL_PROMPT_OPTIONS, "maven", javaBuildTool);
 }
@@ -3331,24 +3404,45 @@ async function getJavaTestingLibrariesChoice(javaTestingLibraries) {
 	if (response.includes("none")) return [];
 	return response;
 }
-const JAVA_API_PROMPT_OPTIONS = [{
-	value: "spring-graphql",
-	label: "Spring for GraphQL",
-	hint: "GraphQL schema + annotated controllers on Spring Boot"
-}, {
-	value: "none",
-	label: "None",
-	hint: "REST controllers only"
-}];
-const JAVA_LOGGING_PROMPT_OPTIONS = [{
-	value: "logback",
-	label: "Logback",
-	hint: "Spring Boot default logger with explicit logback-spring.xml"
-}, {
-	value: "none",
-	label: "None",
-	hint: "Spring Boot logging defaults"
-}];
+const JAVA_API_PROMPT_OPTIONS = [
+	{
+		value: "spring-graphql",
+		label: "Spring for GraphQL",
+		hint: "GraphQL schema + annotated controllers on Spring Boot"
+	},
+	{
+		value: "openapi-generator",
+		label: "OpenAPI Generator",
+		hint: "Generate Spring API interfaces + models from an OpenAPI spec at build time"
+	},
+	{
+		value: "grpc",
+		label: "gRPC",
+		hint: "grpc-java service (protoc codegen) started alongside Spring Boot"
+	},
+	{
+		value: "none",
+		label: "None",
+		hint: "REST controllers only"
+	}
+];
+const JAVA_LOGGING_PROMPT_OPTIONS = [
+	{
+		value: "logback",
+		label: "Logback",
+		hint: "Spring Boot default logger with explicit logback-spring.xml"
+	},
+	{
+		value: "log4j2",
+		label: "Log4j2",
+		hint: "High-performance Apache logging with async loggers (Spring Boot, Micronaut, plain Java)"
+	},
+	{
+		value: "none",
+		label: "None",
+		hint: "Spring Boot logging defaults"
+	}
+];
 function resolveJavaApiPrompt(javaApi) {
 	return createStaticSinglePromptResolution(JAVA_API_PROMPT_OPTIONS, "none", javaApi);
 }
@@ -4211,6 +4305,16 @@ const RUST_WEB_FRAMEWORK_PROMPT_OPTIONS = [
 		label: "Rocket",
 		hint: "Convention-over-configuration web framework, 25k+ stars"
 	},
+	{
+		value: "poem",
+		label: "Poem",
+		hint: "Full-featured, fast web framework built on Tokio and hyper"
+	},
+	{
+		value: "loco",
+		label: "Loco",
+		hint: "The Rails of Rust: opinionated full-stack framework (runs DB-free too)"
+	},
 	{
 		value: "none",
 		label: "None",
@@ -5903,6 +6007,42 @@ async function getORMChoice(orm, hasDatabase, database, backend, runtime) {
 	return response;
 }
 
+//#endregion
+//#region src/prompts/workspace-shape.ts
+const SINGLE_APP_WEB_FRONTENDS = new Set(["next", "tanstack-start"]);
+/**
+* The flat single-app layout only makes sense for a "thin self" app: backend
+* `self` with exactly one Next.js or TanStack Start web frontend. For anything
+* else we never prompt and resolve to `monorepo` (the compatibility engine and
+* generator also normalize non-qualifying stacks back to monorepo).
+*/
+function stackCanUseSingleApp(backend, frontend) {
+	if (backend !== "self") return false;
+	const webFrontends = frontend.filter((f) => f && f !== "none");
+	if (webFrontends.length !== 1) return false;
+	return SINGLE_APP_WEB_FRONTENDS.has(webFrontends[0]);
+}
+async function getWorkspaceShapeChoice(workspaceShape, backend, frontend) {
+	if (!stackCanUseSingleApp(backend, frontend ?? [])) return "monorepo";
+	if (workspaceShape !== void 0) return workspaceShape;
+	if (!canPromptInteractively()) return "monorepo";
+	const response = await navigableSelect({
+		message: "Choose workspace layout",
+		options: [{
+			value: "monorepo",
+			label: "Monorepo",
+			hint: "apps/* + packages/* workspaces (recommended)"
+		}, {
+			value: "single-app",
+			label: "Single app",
+			hint: "Flat app at the repo root (no workspaces)"
+		}],
+		initialValue: "monorepo"
+	});
+	if (isCancel$1(response)) return exitCancelled("Operation cancelled");
+	return response;
+}
+
 //#endregion
 //#region src/prompts/payments.ts
 function resolvePaymentsPrompt(context = {}) {
@@ -5912,13 +6052,30 @@ function resolvePaymentsPrompt(context = {}) {
 		options: [],
 		autoValue: context.payments
 	};
-	if (context.backend === "none") return {
-		shouldPrompt: false,
-		mode: "single",
-		options: [],
-		autoValue: "none"
-	};
 	const isPolarCompatible = (context.auth === "better-auth" || context.auth === "better-auth-organizations") && (context.frontends?.length === 0 || splitFrontends$1(context.frontends).web.length > 0);
+	const isRevenueCatCompatible = (context.frontends ?? []).some((frontend) => frontend === "native-bare" || frontend === "native-uniwind" || frontend === "native-unistyles");
+	if (context.backend === "none") {
+		if (isRevenueCatCompatible) return {
+			shouldPrompt: true,
+			mode: "single",
+			options: [{
+				value: "revenuecat",
+				label: "RevenueCat",
+				hint: "In-app subscriptions and cross-platform monetization for mobile."
+			}, {
+				value: "none",
+				label: "None",
+				hint: "No payments integration"
+			}],
+			initialValue: DEFAULT_CONFIG.payments
+		};
+		return {
+			shouldPrompt: false,
+			mode: "single",
+			options: [],
+			autoValue: "none"
+		};
+	}
 	const options = [];
 	if (isPolarCompatible) options.push({
 		value: "polar",
@@ -5941,11 +6098,28 @@ function resolvePaymentsPrompt(context = {}) {
 		value: "dodo",
 		label: "Dodo Payments",
 		hint: "Simple payment infrastructure for developers."
+	}, {
+		value: "creem",
+		label: "Creem",
+		hint: "Cheapest merchant-of-record payments & billing, with a Better Auth plugin."
+	}, {
+		value: "autumn",
+		label: "Autumn",
+		hint: "Usage-based pricing & billing for SaaS and AI apps."
+	}, {
+		value: "commet",
+		label: "Commet",
+		hint: "All-in-one plan-first billing for SaaS and AI products."
 	}, {
 		value: "none",
 		label: "None",
 		hint: "No payments integration"
 	});
+	if (isRevenueCatCompatible) options.push({
+		value: "revenuecat",
+		label: "RevenueCat",
+		hint: "In-app subscriptions and cross-platform monetization for mobile."
+	});
 	return {
 		shouldPrompt: true,
 		mode: "single",
@@ -6185,6 +6359,24 @@ const SEARCH_PROMPT_OPTIONS = [
 	}
 ];
 const NON_TYPESCRIPT_SEARCH_PROMPT_OPTIONS = SEARCH_PROMPT_OPTIONS.filter((option) => option.value === "meilisearch" || option.value === "none");
+const PYTHON_SEARCH_PROMPT_OPTIONS = SEARCH_PROMPT_OPTIONS.filter((option) => option.value === "meilisearch" || option.value === "elasticsearch" || option.value === "none");
+const GO_SEARCH_PROMPT_OPTIONS = [
+	{
+		value: "meilisearch",
+		label: "Meilisearch",
+		hint: "Lightning-fast search engine with typo tolerance"
+	},
+	{
+		value: "bleve",
+		label: "Bleve",
+		hint: "Embedded, server-less full-text search for Go (no external service)"
+	},
+	{
+		value: "none",
+		label: "None",
+		hint: "Skip search engine setup"
+	}
+];
 function resolveSearchPrompt(context = {}) {
 	if (context.ecosystem === "react-native" || context.ecosystem === "elixir") return {
 		shouldPrompt: false,
@@ -6192,7 +6384,7 @@ function resolveSearchPrompt(context = {}) {
 		options: [],
 		autoValue: "none"
 	};
-	const options = context.ecosystem && context.ecosystem !== "typescript" ? NON_TYPESCRIPT_SEARCH_PROMPT_OPTIONS : SEARCH_PROMPT_OPTIONS;
+	const options = context.ecosystem === "go" ? GO_SEARCH_PROMPT_OPTIONS : context.ecosystem === "python" ? PYTHON_SEARCH_PROMPT_OPTIONS : context.ecosystem && context.ecosystem !== "typescript" ? NON_TYPESCRIPT_SEARCH_PROMPT_OPTIONS : SEARCH_PROMPT_OPTIONS;
 	if ((!context.ecosystem || context.ecosystem === "typescript") && (context.backend === "none" || context.backend === "convex")) return {
 		shouldPrompt: false,
 		mode: "single",
@@ -6578,7 +6770,7 @@ async function gatherConfig(flags, projectName, projectDir, relativePath) {
 			return Promise.resolve("none");
 		},
 		payments: ({ results }) => {
-			if (results.ecosystem !== "typescript") return Promise.resolve("none");
+			if (results.ecosystem !== "typescript" && results.ecosystem !== "react-native") return Promise.resolve("none");
 			return getPaymentsChoice(flags.payments, results.auth, results.backend, results.frontend);
 		},
 		email: ({ results }) => {
@@ -6587,6 +6779,7 @@ async function gatherConfig(flags, projectName, projectDir, relativePath) {
 		},
 		effect: ({ results }) => {
 			if (results.ecosystem !== "typescript") return Promise.resolve("none");
+			if (results.backend === "effect" && flags.effect === void 0) return Promise.resolve("effect-full");
 			return getEffectChoice(flags.effect);
 		},
 		addons: ({ results }) => {
@@ -6619,6 +6812,7 @@ async function gatherConfig(flags, projectName, projectDir, relativePath) {
 		},
 		validation: ({ results }) => {
 			if (results.ecosystem !== "typescript") return Promise.resolve("none");
+			if (results.backend === "effect" && flags.validation === void 0) return Promise.resolve("effect-schema");
 			return getValidationChoice(flags.validation);
 		},
 		forms: ({ results }) => {
@@ -6895,6 +7089,13 @@ async function gatherConfig(flags, projectName, projectDir, relativePath) {
 			if (results.ecosystem !== "java") return Promise.resolve("none");
 			return getJavaWebFrameworkChoice(flags.javaWebFramework);
 		},
+		javaLanguage: ({ results }) => {
+			if (results.ecosystem !== "java") return Promise.resolve("java");
+			if (results.javaWebFramework !== "spring-boot") return Promise.resolve("java");
+			if (flags.javaLanguage !== void 0) return getJavaLanguageChoice(flags.javaLanguage);
+			if (flags.javaWebFramework !== void 0) return Promise.resolve("java");
+			return getJavaLanguageChoice(flags.javaLanguage);
+		},
 		javaBuildTool: ({ results }) => {
 			if (results.ecosystem !== "java") return Promise.resolve("none");
 			return getJavaBuildToolChoice(flags.javaBuildTool);
@@ -7046,6 +7247,7 @@ async function gatherConfig(flags, projectName, projectDir, relativePath) {
 		},
 		aiDocs: () => getAiDocsChoice(flags.aiDocs),
 		git: () => getGitChoice(flags.git),
+		workspaceShape: ({ results }) => getWorkspaceShapeChoice(flags.workspaceShape, results.backend, results.frontend),
 		packageManager: ({ results }) => {
 			if (results.ecosystem === "rust" || results.ecosystem === "python" || results.ecosystem === "go" || results.ecosystem === "java" || results.ecosystem === "dotnet" || results.ecosystem === "elixir") return Promise.resolve(flags.packageManager ?? getUserPkgManager());
 			return getPackageManagerChoice(flags.packageManager);
@@ -7073,6 +7275,7 @@ async function gatherConfig(flags, projectName, projectDir, relativePath) {
 		examples: result.examples,
 		git: result.git,
 		packageManager: result.packageManager,
+		workspaceShape: result.workspaceShape,
 		install: result.install,
 		dbSetup: result.dbSetup,
 		api: result.api,
@@ -7147,6 +7350,7 @@ async function gatherConfig(flags, projectName, projectDir, relativePath) {
 		goConfig: result.goConfig,
 		goObservability: result.goObservability,
 		javaWebFramework: result.javaWebFramework,
+		javaLanguage: result.javaLanguage,
 		javaBuildTool: result.javaBuildTool,
 		javaOrm: result.javaOrm,
 		javaAuth: result.javaAuth,
@@ -7585,35 +7789,6 @@ async function setupProjectDirectory(finalPathInput, shouldClearDirectory) {
 	};
 }
 
-//#endregion
-//#region src/utils/config-processing.ts
-function deriveProjectName(projectName, projectDirectory) {
-	if (projectName) return projectName;
-	if (projectDirectory) return path.basename(path.resolve(process.cwd(), projectDirectory));
-	return "";
-}
-function processFlags(options, projectName) {
-	const derivedName = deriveProjectName(projectName, options.projectDirectory);
-	return cliInputToProjectConfigPartial(options, projectName || derivedName);
-}
-function getProvidedFlags(options) {
-	return new Set(Object.keys(options).filter((key) => options[key] !== void 0));
-}
-function validateNoneExclusivity(options, optionName) {
-	if (!options || options.length === 0) return;
-	if (options.includes("none") && options.length > 1) throw new Error(`Cannot combine 'none' with other ${optionName}.`);
-}
-function validateArrayOptions(options) {
-	validateNoneExclusivity(options.frontend, "frontend options");
-	validateNoneExclusivity(options.addons, "addons");
-	validateNoneExclusivity(options.examples, "examples");
-	validateNoneExclusivity(options.aiDocs, "ai docs");
-	validateNoneExclusivity(options.rustLibraries, "rust libraries");
-	validateNoneExclusivity(options.pythonAi, "python ai libraries");
-	validateNoneExclusivity(options.javaLibraries, "java libraries");
-	validateNoneExclusivity(options.javaTestingLibraries, "java testing libraries");
-}
-
 //#endregion
 //#region src/validation.ts
 const CORE_STACK_FLAGS = new Set([
@@ -7658,6 +7833,7 @@ function extractAndValidateProjectName(projectName, projectDirectory, throwOnErr
 function processAndValidateFlags(options, providedFlags, projectName) {
 	if (options.yolo) {
 		const cfg = processFlags(options, projectName);
+		applyEffectBackendDefaults(cfg, getProvidedFlags(options));
 		const validatedProjectName$1 = extractAndValidateProjectName(projectName, options.projectDirectory, true);
 		if (validatedProjectName$1) cfg.projectName = validatedProjectName$1;
 		return cfg;
@@ -7669,6 +7845,7 @@ function processAndValidateFlags(options, providedFlags, projectName) {
 		exitWithError(error instanceof Error ? error.message : String(error));
 	}
 	const config = processFlags(options, projectName);
+	applyEffectBackendDefaults(config, providedFlags);
 	const validatedProjectName = extractAndValidateProjectName(projectName, options.projectDirectory, false);
 	if (validatedProjectName) config.projectName = validatedProjectName;
 	validateFullConfig(config, providedFlags, options);
@@ -7683,7 +7860,9 @@ function processProvidedFlagsWithoutValidation(options, projectName) {
 			exitWithError(error instanceof Error ? error.message : String(error));
 		}
 	}
+	const providedFlags = getProvidedFlags(options);
 	const config = processFlags(options, projectName);
+	applyEffectBackendDefaults(config, providedFlags);
 	const validatedProjectName = extractAndValidateProjectName(projectName, options.projectDirectory, true);
 	if (validatedProjectName) config.projectName = validatedProjectName;
 	return config;
@@ -8955,6 +9134,7 @@ async function displayPostInstallInstructions(config) {
 	const clerkInstructions = config.auth === "clerk" ? getClerkInstructions(config.backend, config.frontend ?? []) : "";
 	const authSetupInstructions = getAuthSetupInstructions(config.auth, backend, config.frontend ?? []);
 	const polarInstructions = config.payments === "polar" ? getPolarInstructions(backend, packageManager) : "";
+	const revenueCatInstructions = config.payments === "revenuecat" ? getRevenueCatInstructions(backend, packageManager) : "";
 	const paymentSetupInstructions = getPaymentSetupInstructions(config.payments, backend);
 	const alchemyDeployInstructions = getAlchemyDeployInstructions(runCmd, webDeploy, serverDeploy, backend);
 	const vercelDeployInstructions = getVercelDeployInstructions(webDeploy, serverDeploy, backend);
@@ -9032,6 +9212,7 @@ async function displayPostInstallInstructions(config) {
 	if (authSetupInstructions) output += `\n${authSetupInstructions.trim()}\n`;
 	if (betterAuthConvexInstructions) output += `\n${betterAuthConvexInstructions.trim()}\n`;
 	if (polarInstructions) output += `\n${polarInstructions.trim()}\n`;
+	if (revenueCatInstructions) output += `\n${revenueCatInstructions.trim()}\n`;
 	if (paymentSetupInstructions) output += `\n${paymentSetupInstructions.trim()}\n`;
 	if (noOrmWarning) output += `\n${noOrmWarning.trim()}\n`;
 	if (bunWebNativeWarning) output += `\n${bunWebNativeWarning.trim()}\n`;
@@ -9152,6 +9333,9 @@ function getPaymentSetupInstructions(payments, backend) {
 	if (payments === "lemon-squeezy") return `${pc.bold("Lemon Squeezy Setup:")}\n${pc.cyan("•")} Get API key from ${pc.underline("https://app.lemonsqueezy.com/settings/api")}\n${pc.cyan("•")} Set ${pc.white("LEMONSQUEEZY_API_KEY")} and ${pc.white("LEMONSQUEEZY_STORE_ID")} in ${pc.white(envPath)}`;
 	if (payments === "paddle") return `${pc.bold("Paddle Setup:")}\n${pc.cyan("•")} Get API keys from ${pc.underline("https://vendors.paddle.com")}\n${pc.cyan("•")} Set ${pc.white("PADDLE_API_KEY")} and ${pc.white("PADDLE_WEBHOOK_SECRET")} in ${pc.white(envPath)}`;
 	if (payments === "dodo") return `${pc.bold("Dodo Payments Setup:")}\n${pc.cyan("•")} Get API key from ${pc.underline("https://app.dodopayments.com")}\n${pc.cyan("•")} Set ${pc.white("DODO_PAYMENTS_API_KEY")} and ${pc.white("DODO_PAYMENTS_WEBHOOK_SECRET")} in ${pc.white(envPath)}`;
+	if (payments === "creem") return `${pc.bold("Creem Setup:")}\n${pc.cyan("•")} Get your API key from ${pc.underline("https://docs.creem.io")} (Developers > API Keys)\n${pc.cyan("•")} Set ${pc.white("CREEM_API_KEY")}, ${pc.white("CREEM_WEBHOOK_SECRET")}, and ${pc.white("CREEM_ENVIRONMENT")} (test|prod) in ${pc.white(envPath)}`;
+	if (payments === "autumn") return `${pc.bold("Autumn Setup:")}\n${pc.cyan("•")} Sign up at ${pc.underline("https://useautumn.com")} and connect Stripe\n${pc.cyan("•")} Set ${pc.white("AUTUMN_SECRET_KEY")} in ${pc.white(envPath)} and mount handleAutumnRequest at ${pc.white("/api/autumn/*")}\n${pc.cyan("•")} Define plans/features with ${pc.white("npx atmn@latest")} (Autumn is webhookless)`;
+	if (payments === "commet") return `${pc.bold("Commet Setup:")}\n${pc.cyan("•")} Get your API key from ${pc.underline("https://commet.co")} (Settings > API Keys)\n${pc.cyan("•")} Set ${pc.white("COMMET_API_KEY")} and ${pc.white("COMMET_WEBHOOK_SECRET")} in ${pc.white(envPath)}`;
 	return "";
 }
 function getBetterAuthConvexInstructions(hasWeb, webPort, packageManager) {
@@ -9166,6 +9350,14 @@ 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 getRevenueCatInstructions(backend, packageManager) {
+	const base = `${pc.bold("RevenueCat Payments Setup:")}\n${pc.cyan("•")} Create a project, entitlement, and offering in ${pc.underline("https://app.revenuecat.com/")}\n${pc.cyan("•")} Set the public SDK keys in ${pc.white("apps/native/.env")}:\n${pc.white("   EXPO_PUBLIC_REVENUECAT_IOS_KEY=appl_your_ios_key")}\n${pc.white("   EXPO_PUBLIC_REVENUECAT_ANDROID_KEY=goog_your_android_key")}\n${pc.white("   EXPO_PUBLIC_REVENUECAT_ENTITLEMENT_ID=pro")}`;
+	if (backend === "convex") {
+		const cmd = packageManager === "npm" ? "npx" : packageManager;
+		return `${base}\n${pc.cyan("•")} Set the webhook secret (min 32 chars) from ${pc.white("packages/backend")}:\n${pc.white("   cd packages/backend")}\n${pc.white(`   ${cmd} convex env set REVENUECAT_WEBHOOK_AUTH your_webhook_secret`)}\n${pc.cyan("•")} Configure a RevenueCat webhook to ${pc.white("https://<your-convex-site-url>/webhooks/revenuecat")} using the same value as the Authorization header`;
+	}
+	return base;
+}
 function getAlchemyDeployInstructions(runCmd, webDeploy, serverDeploy, backend) {
 	const instructions = [];
 	const isBackendSelf = backend === "self";
@@ -9596,6 +9788,7 @@ async function createProject(options, cliInput = {}) {
 		await applyDependencyVersionChannel(projectDir, options.versionChannel);
 		await writeBtsConfig(options);
 		await formatProject(projectDir);
+		await recordScaffoldManifest(projectDir);
 		if (!isSilent()) log.success("Project template successfully scaffolded!");
 		if (options.install && (options.ecosystem === "typescript" || options.ecosystem === "react-native")) {
 			const result$1 = await installDependencies({
@@ -10204,8 +10397,12 @@ const AddCommandInputSchema = CreateCommandOptionsSchema.omit({
 	directoryConflict: true,
 	renderTitle: true,
 	disableAnalytics: true,
-	manualDb: true
-}).extend({ projectDir: z.string().optional().describe("Project directory (defaults to current)") });
+	manualDb: true,
+	workspaceShape: true
+}).extend({
+	projectDir: z.string().optional().describe("Project directory (defaults to current)"),
+	acknowledgeArchitectureChange: z.boolean().optional().describe("Acknowledge that this update replaces an existing database/orm/auth/api/backend/runtime choice (data/schema migration required)")
+});
 const ProjectCheckInputSchema = z.tuple([z.string().optional().describe("Project directory to diagnose (defaults to current directory)"), z.object({
 	skipChecks: z.boolean().optional().default(false).describe("Skip the ecosystem build/type checks (config + deps + env only)"),
 	json: z.boolean().optional().default(false).describe("Output the diagnosis as JSON")
@@ -10251,7 +10448,7 @@ const router = os.router({
 		}
 	}),
 	add: os.meta({ description: "Add addons, deploy targets, or stack capabilities to an existing Better Fullstack project using its bts.jsonc config" }).input(AddCommandInputSchema).handler(async ({ input }) => {
-		const { addHandler } = await import("./add-handler-BNSL6HdM.mjs");
+		const { addHandler } = await import("./add-handler-CuPmSJRM.mjs");
 		await addHandler(input);
 	}),
 	history: os.meta({ description: "Show history of scaffolded projects with reproducible commands" }).input(z.object({
@@ -10279,7 +10476,7 @@ const router = os.router({
 		ecosystem: z.string().optional().describe("Filter by ecosystem (effect, tanstack, prisma, etc.)"),
 		"list-ecosystems": z.boolean().default(false).describe("List available ecosystems")
 	})).handler(async ({ input }) => {
-		const { updateDepsHandler, showEcosystems } = await import("./update-deps-D5OG0KmJ.mjs");
+		const { updateDepsHandler, showEcosystems } = await import("./update-deps-DLZAuT3V.mjs");
 		if (input["list-ecosystems"]) {
 			showEcosystems();
 			return;
@@ -10291,13 +10488,63 @@ const router = os.router({
 			ecosystem: input.ecosystem
 		});
 	}),
+	gen: os.meta({ description: "Generate in-project code for an existing Better Fullstack project (e.g. `gen resource <name>` / `gen route <name>` for a new trpc/orpc API resource router)" }).input(z.tuple([
+		z.enum(["resource", "route"]).describe("What to generate: resource (alias: route)"),
+		z.string().describe("Name of the resource/route (e.g. post)"),
+		z.object({
+			dir: z.string().optional().describe("Project directory (defaults to current)"),
+			dryRun: z.boolean().default(false).describe("Print the planned changes without writing any files")
+		})
+	])).handler(async ({ input }) => {
+		const [kind, name, options] = input;
+		const { genCommand } = await import("./gen-DWx3Xu_K.mjs");
+		await genCommand({
+			kind,
+			name,
+			dir: options.dir,
+			dryRun: options.dryRun
+		});
+	}),
+	registry: os.meta({ description: "Manage community/private capability packs for an existing Better Fullstack project (`registry add <source>` installs a pack from a local path or file:// URL; `registry list` shows installed packs)" }).input(z.tuple([
+		z.enum(["add", "list"]).optional().default("list").describe("Action to perform: add (install a pack) or list (default)"),
+		z.string().optional().describe("Pack source: a local path or file:// URL (required for `add`)"),
+		z.object({
+			projectDir: z.string().optional().describe("Project directory (defaults to current)"),
+			json: z.boolean().optional().default(false).describe("Output the result as JSON"),
+			dryRun: z.boolean().optional().default(false).describe("Preview the install without writing any files")
+		})
+	])).handler(async ({ input }) => {
+		const [action, source, options] = input;
+		const { registryHandler } = await import("./registry-CxeEOPot.mjs");
+		await registryHandler({
+			action,
+			source,
+			projectDir: options.projectDir,
+			json: options.json,
+			dryRun: options.dryRun
+		});
+	}),
+	update: os.meta({ description: "Re-apply the current bundled templates to an existing Better Fullstack project, classifying template drift vs. your local edits from the bts.lock.json scaffold baseline. Default is a dry-run plan; `--apply` writes safe drift patches + new files. Distinct from the maintainer `update-deps` command." }).input(z.tuple([z.string().optional().describe("Project directory to update (defaults to current directory)"), z.object({
+		dryRun: z.boolean().optional().default(false).describe("Preview the plan without writing (default behavior)"),
+		apply: z.boolean().optional().default(false).describe("Write safe template-drift patches and new files, refreshing the baseline"),
+		check: z.boolean().optional().default(false).describe("Exit non-zero when actionable template drift exists (CI gate)"),
+		json: z.boolean().optional().default(false).describe("Output the plan as JSON"),
+		recordBaseline: z.boolean().optional().default(false).describe("Adopt the current on-disk state as the scaffold baseline (for projects created before the update engine)")
+	})])).handler(async ({ input }) => {
+		const [projectDir, options] = input;
+		const { updateCommand } = await import("./update-C9_x2yBF.mjs");
+		await updateCommand({
+			projectDir,
+			...options
+		});
+	}),
 	mcp: os.meta({ description: "Start the Better Fullstack MCP server so AI agents can inspect the schema, plan stacks, and scaffold projects over stdio" }).handler(async () => {
 		log.message("MCP server is started via the 'mcp' subcommand intercepted in cli.ts.");
 		log.message("Run: create-better-fullstack mcp");
 	}),
 	doctor: os.meta({ description: "Diagnose a scaffolded Better Fullstack project: verify its bts.jsonc, installed dependencies, required env vars, and run ecosystem build/type checks" }).input(ProjectCheckInputSchema).handler(async ({ input }) => {
 		const [projectDir, options] = input;
-		const { doctorCommand } = await import("./doctor-DBoq7bZ9.mjs");
+		const { doctorCommand } = await import("./doctor-DucDyWfl.mjs");
 		await doctorCommand({
 			projectDir,
 			...options
@@ -10305,11 +10552,28 @@ const router = os.router({
 	}),
 	check: os.meta({ description: "Check a scaffolded Better Fullstack project for config, dependency, env, and generated build/type drift" }).input(ProjectCheckInputSchema).handler(async ({ input }) => {
 		const [projectDir, options] = input;
-		const { doctorCommand } = await import("./doctor-DBoq7bZ9.mjs");
+		const { doctorCommand } = await import("./doctor-DucDyWfl.mjs");
 		await doctorCommand({
 			projectDir,
 			...options
 		});
+	}),
+	recommend: os.meta({ description: "Recommend a stack from a natural-language brief (prompt-to-stack): prints the suggested config, the rationale, and a ready-to-run create command" }).input(z.object({
+		brief: z.string().min(1).describe("Natural-language description, e.g. \"a SaaS with Postgres, auth and payments\""),
+		ecosystem: z.string().optional().describe("Force an ecosystem (typescript, react-native, rust, go, python, java, ...)"),
+		json: z.boolean().default(false).describe("Output the recommendation as JSON")
+	})).handler(async ({ input }) => {
+		const { recommendStackFromBrief } = await import("./mcp-D9O5zgAA.mjs");
+		const result = recommendStackFromBrief(input.brief, input.ecosystem);
+		if (input.json) {
+			log.message(JSON.stringify(result, null, 2));
+			return;
+		}
+		log.message("Recommended stack:");
+		for (const line of result.rationale) log.message(`  • ${line}`);
+		log.message(`\nConfig: ${JSON.stringify(result.input)}`);
+		if (result.matchedPreset) log.message(`Nearest preset: ${result.matchedPreset}`);
+		log.message("\nReview, then scaffold with: create-better-fullstack create <name> [flags]");
 	})
 });
 const caller = createRouterClient(router, { context: {} });
@@ -10375,7 +10639,7 @@ async function builder() {
 	return caller.builder();
 }
 async function add(input) {
-	const { addHandler } = await import("./add-handler-BNSL6HdM.mjs");
+	const { addHandler } = await import("./add-handler-CuPmSJRM.mjs");
 	return addHandler(input, { silent: true });
 }
 async function history(options) {
@@ -10400,6 +10664,15 @@ async function check(projectDir, options) {
 		json: options?.json ?? false
 	}]);
 }
+async function update(projectDir, options) {
+	return caller.update([projectDir, {
+		dryRun: options?.dryRun ?? false,
+		apply: options?.apply ?? false,
+		check: options?.check ?? false,
+		json: options?.json ?? false,
+		recordBaseline: options?.recordBaseline ?? false
+	}]);
+}
 
 //#endregion
-export { createBtsCli as a, history as c, telemetry as d, create as i, router as l, builder as n, docs as o, check as r, doctor as s, add as t, sponsors as u };
+export { createBtsCli as a, history as c, telemetry as d, update as f, create as i, router as l, builder as n, docs as o, check as r, doctor as s, add as t, sponsors as u };