create-better-t-stack 3.37.0 → 3.38.1

package/dist/{src-IZv104V2.mjs → src-ihjK9T9S.mjs}

@@ -1,5 +1,5 @@
 #!/usr/bin/env node
-import { n as __reExport, t as __exportAll } from "./chunk-BtN16TXe.mjs";
+import { n as __reExport, t as __exportAll } from "./rolldown-runtime-yhw22V8Z.mjs";
 import { getAllJsonSchemas } from "@better-t-stack/types/json-schema";
 import { initTRPC } from "@trpc/server";
 import { Result, Result as Result$1, TaggedError } from "better-result";
@@ -336,7 +336,7 @@ const cliConsola = {
 /**
 * User cancelled the operation (e.g., Ctrl+C in prompts)
 */
-var UserCancelledError = class extends TaggedError("UserCancelledError")() {
+var UserCancelledError = class extends TaggedError("UserCancelledError") {
 	constructor(args) {
 		super({ message: args?.message ?? "Operation cancelled" });
 	}
@@ -344,11 +344,11 @@ var UserCancelledError = class extends TaggedError("UserCancelledError")() {
 /**
 * General CLI error for validation failures, invalid flags, etc.
 */
-var CLIError = class extends TaggedError("CLIError")() {};
+var CLIError = class extends TaggedError("CLIError") {};
 /**
 * Validation error for config/flag validation failures
 */
-var ValidationError = class extends TaggedError("ValidationError")() {
+var ValidationError = class extends TaggedError("ValidationError") {
 	constructor(args) {
 		super(args);
 	}
@@ -356,7 +356,7 @@ var ValidationError = class extends TaggedError("ValidationError")() {
 /**
 * Compatibility error for incompatible option combinations
 */
-var CompatibilityError = class extends TaggedError("CompatibilityError")() {
+var CompatibilityError = class extends TaggedError("CompatibilityError") {
 	constructor(args) {
 		super(args);
 	}
@@ -364,7 +364,7 @@ var CompatibilityError = class extends TaggedError("CompatibilityError")() {
 /**
 * Directory conflict error when target directory exists and is not empty
 */
-var DirectoryConflictError = class extends TaggedError("DirectoryConflictError")() {
+var DirectoryConflictError = class extends TaggedError("DirectoryConflictError") {
 	constructor(args) {
 		super({
 			directory: args.directory,
@@ -375,7 +375,7 @@ var DirectoryConflictError = class extends TaggedError("DirectoryConflictError")
 /**
 * Project creation error for failures during scaffolding
 */
-var ProjectCreationError = class extends TaggedError("ProjectCreationError")() {
+var ProjectCreationError = class extends TaggedError("ProjectCreationError") {
 	constructor(args) {
 		super(args);
 	}
@@ -383,7 +383,7 @@ var ProjectCreationError = class extends TaggedError("ProjectCreationError")() {
 /**
 * Database setup error for failures during database configuration
 */
-var DatabaseSetupError = class extends TaggedError("DatabaseSetupError")() {
+var DatabaseSetupError = class extends TaggedError("DatabaseSetupError") {
 	constructor(args) {
 		super(args);
 	}
@@ -391,7 +391,7 @@ var DatabaseSetupError = class extends TaggedError("DatabaseSetupError")() {
 /**
 * Addon setup error for failures during addon configuration
 */
-var AddonSetupError = class extends TaggedError("AddonSetupError")() {
+var AddonSetupError = class extends TaggedError("AddonSetupError") {
 	constructor(args) {
 		super(args);
 	}
@@ -441,7 +441,7 @@ function getLatestCLIVersion() {
 //#region src/utils/project-history.ts
 const paths = envPaths("better-t-stack", { suffix: "" });
 const HISTORY_FILE = "history.json";
-var HistoryError = class extends TaggedError("HistoryError")() {};
+var HistoryError = class extends TaggedError("HistoryError") {};
 function getHistoryDir() {
 	return paths.data;
 }
@@ -1701,15 +1701,37 @@ const evlogWebFrontends = [
 	"tanstack-start",
 	"astro"
 ];
+const NODE_DEV_FS_DRAIN_EXPRESSION = "process.env.NODE_ENV === \"production\" ? undefined : createFsDrain()";
+const SVELTE_DEV_FS_DRAIN_EXPRESSION = "dev ? createFsDrain() : undefined";
+const ASTRO_DEV_FS_DRAIN_EXPRESSION = "import.meta.env.DEV ? createFsDrain() : undefined";
 function isEvlogBackend(backend) {
 	return evlogBackends.includes(backend);
 }
 function getEvlogWebFrontend(frontends) {
 	return frontends.find((frontend) => evlogWebFrontends.includes(frontend));
 }
+function shouldWireEvlogServerFsDrain(config) {
+	return isEvlogBackend(config.backend) && config.runtime !== "workers" && config.serverDeploy !== "cloudflare";
+}
+function shouldWireEvlogWebFsDrain(config) {
+	return getEvlogWebFrontend(config.frontend) !== void 0 && config.webDeploy !== "cloudflare";
+}
+function supportsEvlogLocalLogs(config) {
+	return shouldWireEvlogServerFsDrain(config) || shouldWireEvlogWebFsDrain(config);
+}
 function shouldIdentifyWebAuth(config) {
 	return config.auth === "better-auth" && config.backend === "self";
 }
+function getEvlogServerMiddlewareMarker(backend, fsDrain) {
+	const options = fsDrain ? `{ drain: ${NODE_DEV_FS_DRAIN_EXPRESSION} }` : "";
+	if (backend === "hono" || backend === "express") return `app.use(evlog(${options}));`;
+	if (backend === "fastify") return `fastify.register(evlog${options ? `, ${options}` : ""});`;
+	return `.use(evlog(${options}))`;
+}
+function findEvlogServerMiddlewareMarker(content, backend) {
+	const fsDrainMarker = getEvlogServerMiddlewareMarker(backend, true);
+	return content.includes(fsDrainMarker) ? fsDrainMarker : getEvlogServerMiddlewareMarker(backend, false);
+}
 function prependMissingImports(content, imports) {
 	const missingImports = imports.filter((line) => !content.includes(line));
 	if (missingImports.length === 0) return content;
@@ -1771,46 +1793,72 @@ function addEvlogBetterAuthServerSetup(content, backend, authExpression) {
 	const identifySnippet = usesAuthFactory ? "" : `const identifyUser = createAuthMiddleware(${evlogAuthExpression}, ${authOptions});\n\n`;
 	const identifyUserSetup = usesAuthFactory ? `\n\tconst identifyUser = createAuthMiddleware(${evlogAuthExpression}, ${authOptions});` : "";
 	if (backend === "hono") {
+		const evlogMarker = findEvlogServerMiddlewareMarker(nextContent, backend);
 		nextContent = insertBeforeOnce(nextContent, "const app = new Hono", identifySnippet, "createAuthMiddleware(");
-		return insertAfterOnce(nextContent, "app.use(evlog());", `\napp.use("*", async (c, next) => {${identifyUserSetup}\n\tawait identifyUser(c.get("log"), c.req.raw.headers, c.req.path);\n\tawait next();\n});`, "identifyUser(c.get(\"log\")");
+		return insertAfterOnce(nextContent, evlogMarker, `\napp.use("*", async (c, next) => {${identifyUserSetup}\n\tawait identifyUser(c.get("log"), c.req.raw.headers, c.req.path);\n\tawait next();\n});`, "identifyUser(c.get(\"log\")");
 	}
 	if (backend === "express") {
+		const evlogMarker = findEvlogServerMiddlewareMarker(nextContent, backend);
 		nextContent = addNamedImport(nextContent, "evlog/express", ["useLogger"]);
 		nextContent = insertBeforeOnce(nextContent, "const app = express();", identifySnippet, "createAuthMiddleware(");
-		return insertAfterOnce(nextContent, "app.use(evlog());", `\napp.use(async (req, _res, next) => {${identifyUserSetup}\n\tawait identifyUser(useLogger(), req.headers, req.path);\n\tnext();\n});`, "identifyUser(useLogger()");
+		return insertAfterOnce(nextContent, evlogMarker, `\napp.use(async (req, _res, next) => {${identifyUserSetup}\n\tawait identifyUser(useLogger(), req.headers, req.path);\n\tnext();\n});`, "identifyUser(useLogger()");
 	}
 	if (backend === "fastify") {
+		const evlogMarker = findEvlogServerMiddlewareMarker(nextContent, backend);
 		nextContent = addNamedImport(nextContent, "evlog/fastify", ["useLogger"]);
 		nextContent = insertBeforeOnce(nextContent, "const fastify = Fastify", identifySnippet, "createAuthMiddleware(");
-		return insertAfterOnce(nextContent, "fastify.register(evlog);", `\nfastify.addHook("preHandler", async (request) => {${identifyUserSetup}\n\tawait identifyUser(useLogger(), request.headers, request.url);\n});`, "identifyUser(useLogger()");
+		return insertAfterOnce(nextContent, evlogMarker, `\nfastify.addHook("preHandler", async (request) => {${identifyUserSetup}\n\tawait identifyUser(useLogger(), request.headers, request.url);\n});`, "identifyUser(useLogger()");
 	}
 	const elysiaMarker = nextContent.includes("const app = new Elysia") ? "const app = new Elysia" : "new Elysia";
 	nextContent = insertBeforeOnce(nextContent, elysiaMarker, identifySnippet, "createAuthMiddleware(");
-	return insertAfterOnce(nextContent, ".use(evlog())", `\n\t.derive(async ({ request, log }) => {${identifyUserSetup.replace(/\n\t/g, "\n		")}\n\t\tawait identifyUser(log, request.headers, new URL(request.url).pathname);\n\t\treturn {};\n\t})`, "identifyUser(log");
+	const evlogMarker = findEvlogServerMiddlewareMarker(nextContent, backend);
+	return insertAfterOnce(nextContent, evlogMarker, `\n\t.derive(async ({ request, log }) => {${identifyUserSetup.replace(/\n\t/g, "\n		")}\n\t\tawait identifyUser(log, request.headers, new URL(request.url).pathname);\n\t\treturn {};\n\t})`, "identifyUser(log");
 }
-function addEvlogServerSetup(content, backend, serviceName) {
+function addEvlogServerSetup(content, backend, serviceName, fsDrain) {
 	const initSnippet = `initLogger({\n\tenv: { service: "${serviceName}" },\n});\n\n`;
+	const evlogMarker = getEvlogServerMiddlewareMarker(backend, fsDrain);
+	const legacyEvlogMarker = getEvlogServerMiddlewareMarker(backend, false);
 	if (backend === "hono") {
-		let nextContent = prependMissingImports(content, ["import { initLogger } from \"evlog\";", "import { evlog, type EvlogVariables } from \"evlog/hono\";"]);
+		let nextContent = prependMissingImports(content, [
+			"import { initLogger } from \"evlog\";",
+			"import { evlog, type EvlogVariables } from \"evlog/hono\";",
+			...fsDrain ? ["import { createFsDrain } from \"evlog/fs\";"] : []
+		]);
 		nextContent = insertBeforeOnce(nextContent, "const app = new Hono", initSnippet, "initLogger({");
 		nextContent = nextContent.replace("const app = new Hono();", "const app = new Hono<EvlogVariables>();");
 		nextContent = nextContent.replace("import { logger } from \"hono/logger\";\n", "").replace(/\napp\.use\(logger\(\)\);/, "");
-		return insertAfterOnce(nextContent, "const app = new Hono<EvlogVariables>();", "\n\napp.use(evlog());", "app.use(evlog());");
+		if (fsDrain) nextContent = nextContent.replace(legacyEvlogMarker, evlogMarker);
+		return insertAfterOnce(nextContent, "const app = new Hono<EvlogVariables>();", `\n\n${evlogMarker}`, evlogMarker);
 	}
 	if (backend === "express") {
-		let nextContent = prependMissingImports(content, ["import { initLogger } from \"evlog\";", "import { evlog } from \"evlog/express\";"]);
+		let nextContent = prependMissingImports(content, [
+			"import { initLogger } from \"evlog\";",
+			"import { evlog } from \"evlog/express\";",
+			...fsDrain ? ["import { createFsDrain } from \"evlog/fs\";"] : []
+		]);
 		nextContent = insertBeforeOnce(nextContent, "const app = express();", initSnippet, "initLogger({");
-		return insertAfterOnce(nextContent, "const app = express();", "\n\napp.use(evlog());", "app.use(evlog());");
+		if (fsDrain) nextContent = nextContent.replace(legacyEvlogMarker, evlogMarker);
+		return insertAfterOnce(nextContent, "const app = express();", `\n\n${evlogMarker}`, evlogMarker);
 	}
 	if (backend === "fastify") {
-		let nextContent = prependMissingImports(content, ["import { initLogger } from \"evlog\";", "import { evlog } from \"evlog/fastify\";"]);
+		let nextContent = prependMissingImports(content, [
+			"import { initLogger } from \"evlog\";",
+			"import { evlog } from \"evlog/fastify\";",
+			...fsDrain ? ["import { createFsDrain } from \"evlog/fs\";"] : []
+		]);
 		nextContent = insertBeforeOnce(nextContent, "const fastify = Fastify", initSnippet, "initLogger({");
-		return insertBeforeOnce(nextContent, "fastify.register(fastifyCors", "fastify.register(evlog);\n", "fastify.register(evlog);");
+		if (fsDrain) nextContent = nextContent.replace(legacyEvlogMarker, evlogMarker);
+		return insertBeforeOnce(nextContent, "fastify.register(fastifyCors", `${evlogMarker}\n`, evlogMarker);
 	}
-	let nextContent = prependMissingImports(content, ["import { initLogger } from \"evlog\";", "import { evlog } from \"evlog/elysia\";"]);
+	let nextContent = prependMissingImports(content, [
+		"import { initLogger } from \"evlog\";",
+		"import { evlog } from \"evlog/elysia\";",
+		...fsDrain ? ["import { createFsDrain } from \"evlog/fs\";"] : []
+	]);
 	const elysiaMarker = nextContent.includes("const app = new Elysia") ? "const app = new Elysia" : "new Elysia";
 	nextContent = insertBeforeOnce(nextContent, elysiaMarker, initSnippet, "initLogger({");
-	for (const marker of ["new Elysia({ adapter: node() })", "new Elysia()"]) nextContent = insertAfterOnce(nextContent, marker, "\n	.use(evlog())", ".use(evlog())");
+	if (fsDrain) nextContent = nextContent.replace(legacyEvlogMarker, evlogMarker);
+	for (const marker of ["new Elysia({ adapter: node() })", "new Elysia()"]) nextContent = insertAfterOnce(nextContent, marker, `\n\t${evlogMarker}`, evlogMarker);
 	return nextContent;
 }
 function addNuxtEvlogSetup(content, serviceName) {
@@ -1827,14 +1875,20 @@ function addSvelteViteEvlogSetup(content, serviceName) {
 	if (nextContent.includes("evlog({")) return nextContent;
 	return nextContent.replace("plugins: [tailwindcss(), sveltekit()],", `plugins: [\n    tailwindcss(),\n    sveltekit(),\n    evlog({ service: "${serviceName}" }),\n  ],`);
 }
-function addSvelteHooksEvlogSetup(content) {
-	let nextContent = prependMissingImports(content, ["import { createEvlogHooks } from \"evlog/sveltekit\";"]);
+function getSvelteEvlogHooksCall(fsDrain) {
+	return fsDrain ? `createEvlogHooks({ drain: ${SVELTE_DEV_FS_DRAIN_EXPRESSION} })` : "createEvlogHooks()";
+}
+function addSvelteHooksEvlogSetup(content, fsDrain) {
+	let nextContent = prependMissingImports(content, ["import { createEvlogHooks } from \"evlog/sveltekit\";", ...fsDrain ? ["import { createFsDrain } from \"evlog/fs\";"] : []]);
+	if (fsDrain) nextContent = addNamedImport(nextContent, "$app/environment", ["dev"]);
+	const hooksCall = getSvelteEvlogHooksCall(fsDrain);
+	if (fsDrain) nextContent = nextContent.replaceAll("createEvlogHooks()", hooksCall);
 	if (!nextContent.includes("export const handle") && !nextContent.includes("const authHandle")) {
-		if (!nextContent.includes("createEvlogHooks()")) nextContent = `${nextContent.trimEnd()}\n\nexport const { handle, handleError } = createEvlogHooks();\n`;
+		if (!nextContent.includes("createEvlogHooks(")) nextContent = `${nextContent.trimEnd()}\n\nexport const { handle, handleError } = ${hooksCall};\n`;
 		return nextContent;
 	}
 	nextContent = prependMissingImports(nextContent, ["import { sequence } from \"@sveltejs/kit/hooks\";"]);
-	if (!nextContent.includes("const { handle: evlogHandle, handleError }")) nextContent = nextContent.replace(/((?:import .+\n)+)/, `$1\nconst { handle: evlogHandle, handleError } = createEvlogHooks();\n\n`);
+	if (!nextContent.includes("const { handle: evlogHandle, handleError }")) nextContent = nextContent.replace(/((?:import .+\n)+)/, `$1\nconst { handle: evlogHandle, handleError } = ${hooksCall};\n\n`);
 	nextContent = nextContent.replace(/export const handle(:\s*Handle)?\s*=\s*async/, (_match, typeAnnotation) => `const authHandle${typeAnnotation ?? ""} = async`);
 	if (!nextContent.includes("sequence(evlogHandle, authHandle)")) nextContent = `${nextContent.trimEnd()}\n\nexport const handle = sequence(evlogHandle as Handle, authHandle);\nexport { handleError };\n`;
 	return nextContent;
@@ -1853,10 +1907,14 @@ function addTanstackStartRootEvlogSetup(content) {
 	if (/server:\s*{/.test(nextContent)) return nextContent.replace(/server:\s*{\n/, `server: {\n    middleware: [${middlewareEntry}],\n`);
 	return nextContent.replace("head: () => ({", `server: {\n    middleware: [${middlewareEntry}],\n  },\n\n  head: () => ({`);
 }
-function addAstroMiddlewareEvlogSetup(content, serviceName) {
-	let nextContent = prependMissingImports(content, ["import { createRequestLogger, initLogger } from \"evlog\";"]);
-	const initSnippet = `initLogger({\n  env: { service: "${serviceName}" },\n});\n\n`;
+function getInitLoggerSnippet(serviceName, fsDrain, indent) {
+	return `initLogger({\n${indent}env: { service: "${serviceName}" },${fsDrain ? `\n${indent}drain: ${ASTRO_DEV_FS_DRAIN_EXPRESSION},` : ""}\n});\n\n`;
+}
+function addAstroMiddlewareEvlogSetup(content, serviceName, fsDrain) {
+	let nextContent = prependMissingImports(content, ["import { createRequestLogger, initLogger } from \"evlog\";", ...fsDrain ? ["import { createFsDrain } from \"evlog/fs\";"] : []]);
+	const initSnippet = getInitLoggerSnippet(serviceName, fsDrain, "  ");
 	nextContent = insertBeforeOnce(nextContent, "export const onRequest", initSnippet, "initLogger({");
+	if (fsDrain && !nextContent.includes("drain:")) nextContent = nextContent.replace(/initLogger\(\{\n(\s+env: \{ service: "[^"]+" \},)/, `initLogger({\n$1\n  drain: ${ASTRO_DEV_FS_DRAIN_EXPRESSION},`);
 	if (nextContent.includes("createRequestLogger({")) return nextContent;
 	const contextMarker = "export const onRequest = defineMiddleware(async (context, next) => {";
 	if (nextContent.includes(contextMarker)) {
@@ -1931,7 +1989,8 @@ function addSvelteBetterAuthEvlogSetup(content, config) {
 	const authExpression = getAuthExpression(config);
 	const authOptions = "{ exclude: [\"/api/auth/**\"], maskEmail: true }";
 	const authHandleSnippet = usesCreateAuthFactory(config) && config.webDeploy === "cloudflare" ? `const evlogAuthHandle: Handle = async ({ event, resolve }) => {\n\tif (building) {\n\t\treturn resolve(event);\n\t}\n\n\tconst authEnv = event.platform?.env ?? localEnv;\n\tconst identifyUser = createAuthMiddleware(createAuth(authEnv) as BetterAuthInstance, ${authOptions});\n\tawait identifyUser(event.locals.log, event.request.headers, event.url.pathname);\n\treturn resolve(event);\n};\n\n` : `const identifyUser = createAuthMiddleware(${authExpression} as BetterAuthInstance, ${authOptions});\n\nconst evlogAuthHandle: Handle = async ({ event, resolve }) => {\n\tawait identifyUser(event.locals.log, event.request.headers, event.url.pathname);\n\treturn resolve(event);\n};\n\n`;
-	nextContent = insertAfterOnce(nextContent, "const { handle: evlogHandle, handleError } = createEvlogHooks();\n\n", authHandleSnippet, "evlogAuthHandle");
+	const evlogHandleDeclaration = nextContent.match(/const \{ handle: evlogHandle, handleError \} = createEvlogHooks\([\s\S]*?\);\n\n/)?.[0];
+	if (evlogHandleDeclaration) nextContent = insertAfterOnce(nextContent, evlogHandleDeclaration, authHandleSnippet, "evlogAuthHandle");
 	return nextContent.replace("sequence(evlogHandle as Handle, authHandle)", "sequence(evlogHandle as Handle, evlogAuthHandle, authHandle)").replace("sequence(evlogHandle, authHandle)", "sequence(evlogHandle as Handle, evlogAuthHandle, authHandle)");
 }
 function addAstroBetterAuthEvlogSetup(content, config) {
@@ -1950,19 +2009,29 @@ function addAstroBetterAuthEvlogSetup(content, config) {
 	}
 	return nextContent;
 }
-function getNextEvlogFile(serviceName) {
+function getNextEvlogFile(serviceName, fsDrain) {
 	return `import { createEvlog } from "evlog/next";
 import { createInstrumentation } from "evlog/next/instrumentation/create";
+${fsDrain ? "import { createFsDrain } from \"evlog/fs\";\n" : ""}
 
 export const { withEvlog, useLogger, log, createError } = createEvlog({
   service: "${serviceName}",
-});
+${fsDrain ? `  drain: ${NODE_DEV_FS_DRAIN_EXPRESSION},\n` : ""}});
 
 export const { register, onRequestError } = createInstrumentation({
   service: "${serviceName}",
 });
 `;
 }
+function getNitroEvlogDrainFile() {
+	return `import { createFsDrain } from "evlog/fs";
+
+export default defineNitroPlugin((nitroApp) => {
+  if (!import.meta.dev) return;
+  nitroApp.hooks.hook("evlog:drain", createFsDrain());
+});
+`;
+}
 function getNextInstrumentationFile() {
 	return `import { defineNodeInstrumentation } from "evlog/next/instrumentation";
 
@@ -2077,13 +2146,12 @@ export default defineConfig({
 });
 `;
 }
-function getAstroMiddlewareFile(serviceName) {
+function getAstroMiddlewareFile(serviceName, fsDrain) {
 	return `import { defineMiddleware } from "astro:middleware";
 import { createRequestLogger, initLogger } from "evlog";
+${fsDrain ? "import { createFsDrain } from \"evlog/fs\";\n" : ""}
 
-initLogger({
-  env: { service: "${serviceName}" },
-});
+${getInitLoggerSnippet(serviceName, fsDrain, "  ").trimEnd()}
 
 export const onRequest = defineMiddleware(async ({ request, locals }, next) => {
   const url = new URL(request.url);
@@ -2120,8 +2188,9 @@ declare namespace App {
 }
 async function setupNextEvlog(config, serviceName) {
 	const webDir = path.join(config.projectDir, "apps/web");
+	const fsDrain = shouldWireEvlogWebFsDrain(config);
 	const evlogPath = path.join(webDir, "src/lib/evlog.ts");
-	if (!await fs.pathExists(evlogPath)) await writeFileIfChanged(evlogPath, getNextEvlogFile(serviceName));
+	if (!await fs.pathExists(evlogPath)) await writeFileIfChanged(evlogPath, getNextEvlogFile(serviceName, fsDrain));
 	const identifyWebAuth = shouldIdentifyWebAuth(config);
 	if (identifyWebAuth) {
 		const evlogAuthPath = path.join(webDir, "src/lib/evlog-auth.ts");
@@ -2147,7 +2216,12 @@ async function setupNextEvlog(config, serviceName) {
 }
 async function setupNuxtEvlog(config, serviceName) {
 	const webDir = path.join(config.projectDir, "apps/web");
+	const fsDrain = shouldWireEvlogWebFsDrain(config);
 	await updateFileIfExists(path.join(webDir, "nuxt.config.ts"), (content) => addNuxtEvlogSetup(content, serviceName));
+	if (fsDrain) {
+		const drainPath = path.join(webDir, "server/plugins/evlog-drain.ts");
+		if (!await fs.pathExists(drainPath)) await writeFileIfChanged(drainPath, getNitroEvlogDrainFile());
+	}
 	if (shouldIdentifyWebAuth(config)) {
 		const oldAuthPluginPath = path.join(webDir, "server/plugins/evlog-auth.ts");
 		if (await fs.pathExists(oldAuthPluginPath)) {
@@ -2160,12 +2234,15 @@ async function setupNuxtEvlog(config, serviceName) {
 }
 async function setupSvelteEvlog(config, serviceName) {
 	const webDir = path.join(config.projectDir, "apps/web");
+	const fsDrain = shouldWireEvlogWebFsDrain(config);
 	await updateFileIfExists(path.join(webDir, "vite.config.ts"), (content) => addSvelteViteEvlogSetup(content, serviceName));
 	const hooksPath = path.join(webDir, "src/hooks.server.ts");
-	if (await fs.pathExists(hooksPath)) await updateFileIfExists(hooksPath, addSvelteHooksEvlogSetup);
+	if (await fs.pathExists(hooksPath)) await updateFileIfExists(hooksPath, (content) => addSvelteHooksEvlogSetup(content, fsDrain));
 	else await writeFileIfChanged(hooksPath, `import { createEvlogHooks } from "evlog/sveltekit";
+${fsDrain ? "import { createFsDrain } from \"evlog/fs\";\n" : ""}
+${fsDrain ? "import { dev } from \"$app/environment\";\n" : ""}
 
-export const { handle, handleError } = createEvlogHooks();
+export const { handle, handleError } = ${getSvelteEvlogHooksCall(fsDrain)};
 `);
 	await updateFileIfExists(path.join(webDir, "src/app.d.ts"), addSvelteLocalsType);
 	if (shouldIdentifyWebAuth(config)) await updateFileIfExists(path.join(webDir, "src/hooks.server.ts"), (content) => addSvelteBetterAuthEvlogSetup(content, config));
@@ -2173,9 +2250,14 @@ export const { handle, handleError } = createEvlogHooks();
 }
 async function setupTanstackStartEvlog(config, serviceName) {
 	const webDir = path.join(config.projectDir, "apps/web");
+	const fsDrain = shouldWireEvlogWebFsDrain(config);
 	const nitroConfigPath = path.join(webDir, "nitro.config.ts");
 	if (!await fs.pathExists(nitroConfigPath)) await writeFileIfChanged(nitroConfigPath, getTanstackNitroConfigFile(serviceName));
 	await updateFileIfExists(path.join(webDir, "src/routes/__root.tsx"), addTanstackStartRootEvlogSetup);
+	if (fsDrain) {
+		const drainPath = path.join(webDir, "server/plugins/evlog-drain.ts");
+		if (!await fs.pathExists(drainPath)) await writeFileIfChanged(drainPath, getNitroEvlogDrainFile());
+	}
 	if (shouldIdentifyWebAuth(config)) {
 		const authPluginPath = path.join(webDir, "server/plugins/evlog-auth.ts");
 		if (!await fs.pathExists(authPluginPath)) await writeFileIfChanged(authPluginPath, getNitroEvlogAuthPluginFile(config));
@@ -2184,9 +2266,10 @@ async function setupTanstackStartEvlog(config, serviceName) {
 }
 async function setupAstroEvlog(config, serviceName) {
 	const webDir = path.join(config.projectDir, "apps/web");
+	const fsDrain = shouldWireEvlogWebFsDrain(config);
 	const middlewarePath = path.join(webDir, "src/middleware.ts");
-	if (!await fs.pathExists(middlewarePath)) await writeFileIfChanged(middlewarePath, getAstroMiddlewareFile(serviceName));
-	else await updateFileIfExists(middlewarePath, (content) => addAstroMiddlewareEvlogSetup(content, serviceName));
+	if (!await fs.pathExists(middlewarePath)) await writeFileIfChanged(middlewarePath, getAstroMiddlewareFile(serviceName, fsDrain));
+	else await updateFileIfExists(middlewarePath, (content) => addAstroMiddlewareEvlogSetup(content, serviceName, fsDrain));
 	const envPath = path.join(webDir, "src/env.d.ts");
 	if (!await fs.pathExists(envPath)) await writeFileIfChanged(envPath, getAstroEnvFile());
 	else await updateFileIfExists(envPath, addAstroLocalsType);
@@ -2209,7 +2292,7 @@ async function setupEvlog(config) {
 				const serverIndexPath = path.join(config.projectDir, "apps/server/src/index.ts");
 				if (await fs.pathExists(serverIndexPath)) {
 					const content = await fs.readFile(serverIndexPath, "utf-8");
-					let nextContent = addEvlogServerSetup(content, config.backend, `${config.projectName}-server`);
+					let nextContent = addEvlogServerSetup(content, config.backend, `${config.projectName}-server`, shouldWireEvlogServerFsDrain(config));
 					if (config.auth === "better-auth") nextContent = addEvlogBetterAuthServerSetup(nextContent, config.backend, getAuthExpression(config));
 					if (config.examples.includes("ai")) nextContent = addBackendAiEvlogSetup(nextContent, config.backend);
 					if (nextContent !== content) await fs.writeFile(serverIndexPath, nextContent);
@@ -2431,6 +2514,10 @@ const TEMPLATES$2 = {
 		label: "Tanstack Start SPA: Fumadocs MDX (not RSC)",
 		hint: "SPA mode allows you to host the site statically, compatible with a CDN.",
 		value: "tanstack-start-spa"
+	},
+	astro: {
+		label: "Astro: Fumadocs MDX",
+		value: "astro"
 	}
 };
 const DEFAULT_TEMPLATE$2 = "next-mdx";
@@ -2444,7 +2531,7 @@ function getFumadocsLinter(addons) {
 	if (addons.includes("vite-plus")) return "oxlint";
 }
 function getFumadocsAddonContext(currentAddons, persistedAddons) {
-	return Array.from(new Set([...persistedAddons ?? [], ...currentAddons]));
+	return Array.from(/* @__PURE__ */ new Set([...persistedAddons ?? [], ...currentAddons]));
 }
 async function setupFumadocs(config) {
 	if (shouldSkipExternalCommands()) return Result.ok(void 0);
@@ -2646,6 +2733,11 @@ const MCP_AGENTS = [
 		label: "GitHub Copilot CLI",
 		scope: "both"
 	},
+	{
+		value: "grok-build",
+		label: "Grok Build",
+		scope: "both"
+	},
 	{
 		value: "mcporter",
 		label: "MCPorter",
@@ -2656,6 +2748,11 @@ const MCP_AGENTS = [
 		label: "VS Code (GitHub Copilot)",
 		scope: "both"
 	},
+	{
+		value: "windsurf",
+		label: "Windsurf",
+		scope: "global"
+	},
 	{
 		value: "zed",
 		label: "Zed",
@@ -3029,10 +3126,42 @@ const SKILL_SOURCES = {
 	"haydenbleasel/ultracite": { label: "Ultracite" },
 	"https://www.evlog.dev": { label: "evlog" }
 };
-const AVAILABLE_AGENTS = [
+const SKILLS_CLI_AGENT_OPTIONS = [
 	{
-		value: "cursor",
-		label: "Cursor"
+		value: "adal",
+		label: "AdaL"
+	},
+	{
+		value: "aider-desk",
+		label: "AiderDesk"
+	},
+	{
+		value: "amp",
+		label: "Amp"
+	},
+	{
+		value: "antigravity",
+		label: "Antigravity"
+	},
+	{
+		value: "antigravity-cli",
+		label: "Antigravity CLI"
+	},
+	{
+		value: "astrbot",
+		label: "AstrBot"
+	},
+	{
+		value: "augment",
+		label: "Augment"
+	},
+	{
+		value: "autohand-code",
+		label: "Autohand Code CLI"
+	},
+	{
+		value: "bob",
+		label: "IBM Bob"
 	},
 	{
 		value: "claude-code",
@@ -3043,100 +3172,306 @@ const AVAILABLE_AGENTS = [
 		label: "Cline"
 	},
 	{
-		value: "github-copilot",
-		label: "GitHub Copilot"
+		value: "codearts-agent",
+		label: "CodeArts Agent"
+	},
+	{
+		value: "codebuddy",
+		label: "CodeBuddy"
+	},
+	{
+		value: "codemaker",
+		label: "Codemaker"
+	},
+	{
+		value: "codestudio",
+		label: "Code Studio"
 	},
 	{
 		value: "codex",
 		label: "Codex"
 	},
 	{
-		value: "opencode",
-		label: "OpenCode"
+		value: "command-code",
+		label: "Command Code"
 	},
 	{
-		value: "windsurf",
-		label: "Windsurf"
+		value: "continue",
+		label: "Continue"
+	},
+	{
+		value: "cortex",
+		label: "Cortex Code"
+	},
+	{
+		value: "crush",
+		label: "Crush"
+	},
+	{
+		value: "cursor",
+		label: "Cursor"
+	},
+	{
+		value: "deepagents",
+		label: "Deep Agents"
+	},
+	{
+		value: "devin",
+		label: "Devin for Terminal"
+	},
+	{
+		value: "dexto",
+		label: "Dexto"
+	},
+	{
+		value: "droid",
+		label: "Droid"
+	},
+	{
+		value: "eve",
+		label: "Eve"
+	},
+	{
+		value: "firebender",
+		label: "Firebender"
+	},
+	{
+		value: "forgecode",
+		label: "ForgeCode"
+	},
+	{
+		value: "gemini-cli",
+		label: "Gemini CLI"
+	},
+	{
+		value: "github-copilot",
+		label: "GitHub Copilot"
 	},
 	{
 		value: "goose",
 		label: "Goose"
 	},
 	{
-		value: "roo",
-		label: "Roo Code"
+		value: "grok",
+		label: "Grok Build"
+	},
+	{
+		value: "hermes-agent",
+		label: "Hermes Agent"
+	},
+	{
+		value: "iflow-cli",
+		label: "iFlow CLI"
+	},
+	{
+		value: "inference-sh",
+		label: "inference.sh"
+	},
+	{
+		value: "jazz",
+		label: "Jazz"
+	},
+	{
+		value: "junie",
+		label: "Junie"
 	},
 	{
 		value: "kilo",
 		label: "Kilo Code"
 	},
 	{
-		value: "gemini-cli",
-		label: "Gemini CLI"
+		value: "kimchi",
+		label: "Kimchi"
 	},
 	{
-		value: "antigravity",
-		label: "Antigravity"
+		value: "kimi-code-cli",
+		label: "Kimi Code CLI"
 	},
 	{
-		value: "openhands",
-		label: "OpenHands"
+		value: "kiro-cli",
+		label: "Kiro CLI"
 	},
 	{
-		value: "trae",
-		label: "Trae"
+		value: "kode",
+		label: "Kode"
 	},
 	{
-		value: "amp",
-		label: "Amp"
+		value: "lingma",
+		label: "Lingma"
+	},
+	{
+		value: "loaf",
+		label: "Loaf"
+	},
+	{
+		value: "mcpjam",
+		label: "MCPJam"
+	},
+	{
+		value: "mistral-vibe",
+		label: "Mistral Vibe"
+	},
+	{
+		value: "moxby",
+		label: "Moxby"
+	},
+	{
+		value: "mux",
+		label: "Mux"
+	},
+	{
+		value: "neovate",
+		label: "Neovate"
+	},
+	{
+		value: "ona",
+		label: "Ona"
+	},
+	{
+		value: "openclaw",
+		label: "OpenClaw"
+	},
+	{
+		value: "opencode",
+		label: "OpenCode"
+	},
+	{
+		value: "openhands",
+		label: "OpenHands"
 	},
 	{
 		value: "pi",
 		label: "Pi"
 	},
+	{
+		value: "pochi",
+		label: "Pochi"
+	},
+	{
+		value: "promptscript",
+		label: "PromptScript"
+	},
 	{
 		value: "qoder",
 		label: "Qoder"
 	},
+	{
+		value: "qoder-cn",
+		label: "Qoder CN"
+	},
 	{
 		value: "qwen-code",
 		label: "Qwen Code"
 	},
 	{
-		value: "kiro-cli",
-		label: "Kiro CLI"
+		value: "reasonix",
+		label: "Reasonix"
 	},
 	{
-		value: "droid",
-		label: "Droid"
+		value: "replit",
+		label: "Replit"
 	},
 	{
-		value: "command-code",
-		label: "Command Code"
+		value: "roo",
+		label: "Roo Code"
 	},
 	{
-		value: "clawdbot",
-		label: "Clawdbot"
+		value: "rovodev",
+		label: "Rovo Dev"
 	},
 	{
-		value: "zencoder",
-		label: "Zencoder"
+		value: "tabnine-cli",
+		label: "Tabnine CLI"
 	},
 	{
-		value: "neovate",
-		label: "Neovate"
+		value: "terramind",
+		label: "Terramind"
 	},
 	{
-		value: "mcpjam",
-		label: "MCPJam"
+		value: "tinycloud",
+		label: "Tinycloud"
+	},
+	{
+		value: "trae",
+		label: "Trae"
+	},
+	{
+		value: "trae-cn",
+		label: "Trae CN"
+	},
+	{
+		value: "universal",
+		label: "Universal"
+	},
+	{
+		value: "warp",
+		label: "Warp"
+	},
+	{
+		value: "windsurf",
+		label: "Windsurf"
+	},
+	{
+		value: "zcode",
+		label: "ZCode"
+	},
+	{
+		value: "zed",
+		label: "Zed"
+	},
+	{
+		value: "zencoder",
+		label: "Zencoder"
+	},
+	{
+		value: "zenflow",
+		label: "Zenflow"
 	}
 ];
-const DEFAULT_SCOPE = "project";
-const DEFAULT_AGENTS$1 = [
+const UNIVERSAL_SKILLS_AGENTS = [
+	"amp",
+	"antigravity",
+	"antigravity-cli",
+	"cline",
+	"codex",
 	"cursor",
-	"claude-code",
-	"github-copilot"
+	"deepagents",
+	"dexto",
+	"firebender",
+	"gemini-cli",
+	"github-copilot",
+	"kimi-code-cli",
+	"loaf",
+	"opencode",
+	"promptscript",
+	"warp",
+	"zed"
+];
+const PROMPT_HIDDEN_AGENTS = /* @__PURE__ */ new Set([
+	...UNIVERSAL_SKILLS_AGENTS,
+	"universal",
+	"eve",
+	"replit"
+]);
+const SKILLS_AGENT_PROMPT_OPTIONS = [
+	{
+		value: "universal",
+		label: "Universal (.agents/skills)",
+		hint: "17 agents including Amp, Antigravity, Cline, Codex, Cursor, Gemini CLI, Copilot, OpenCode, Warp, and Zed"
+	},
+	...SKILLS_CLI_AGENT_OPTIONS.filter(({ value }) => value === "claude-code"),
+	...SKILLS_CLI_AGENT_OPTIONS.filter(({ value }) => value !== "claude-code" && !PROMPT_HIDDEN_AGENTS.has(value))
 ];
+function expandSkillsAgentTargets(agents) {
+	const expanded = agents.flatMap((agent) => {
+		if (agent === "universal") return [...UNIVERSAL_SKILLS_AGENTS];
+		if (agent === "clawdbot") return ["openclaw"];
+		return [agent];
+	});
+	return Array.from(new Set(expanded));
+}
+const DEFAULT_SCOPE = "project";
+const DEFAULT_AGENTS$1 = ["universal", "claude-code"];
 function hasReactBasedFrontend(frontend) {
 	return frontend.includes("react-router") || frontend.includes("tanstack-router") || frontend.includes("tanstack-start") || frontend.includes("next");
 }
@@ -3238,7 +3573,11 @@ const CURATED_SKILLS_BY_SOURCE = {
 	],
 	"msmps/opentui-skill": () => ["opentui"],
 	"haydenbleasel/ultracite": () => ["ultracite"],
-	"https://www.evlog.dev": () => ["review-logging-patterns", "analyze-logs"]
+	"https://www.evlog.dev": (config) => [
+		"review-logging-patterns",
+		"build-audit-logs",
+		...supportsEvlogLocalLogs(config) ? ["analyze-logs"] : []
+	]
 };
 function getCuratedSkillNamesForSourceKey(sourceKey, config) {
 	return CURATED_SKILLS_BY_SOURCE[sourceKey](config);
@@ -3315,9 +3654,10 @@ async function setupSkills(config) {
 				if (configuredAgents !== void 0) return [...configuredAgents];
 				return navigableMultiselect({
 					message: "Select agents to install skills to",
-					options: AVAILABLE_AGENTS,
+					options: SKILLS_AGENT_PROMPT_OPTIONS,
 					required: false,
-					initialValues: [...DEFAULT_AGENTS$1]
+					initialValues: [...DEFAULT_AGENTS$1],
+					maxItems: 10
 				});
 			}
 		});
@@ -3337,6 +3677,7 @@ async function setupSkills(config) {
 	installSpinner.start("Installing skills...");
 	const runner = getPackageRunnerPrefix(packageManager);
 	const globalFlags = scope === "global" ? ["-g"] : [];
+	const agentTargets = expandSkillsAgentTargets(selectedAgents);
 	for (const [source, skills] of Object.entries(skillsBySource)) if ((await Result.tryPromise({
 		try: async () => {
 			const args = [
@@ -3348,7 +3689,7 @@ async function setupSkills(config) {
 				"--skill",
 				...skills,
 				"--agent",
-				...selectedAgents,
+				...agentTargets,
 				"-y"
 			];
 			await $({
@@ -3660,7 +4001,7 @@ const HOOKS = {
 	claude: { label: "Claude Code" },
 	copilot: { label: "GitHub Copilot" }
 };
-const ULTRACITE_VERSION = "7.9.3";
+const ULTRACITE_VERSION = "7.9.4";
 const DEFAULT_LINTER = "biome";
 const DEFAULT_EDITORS = ["vscode"];
 const DEFAULT_AGENTS = ["universal"];
@@ -5387,9 +5728,7 @@ async function getProjectName(initialName) {
 */
 function isTelemetryEnabled() {
 	const BTS_TELEMETRY_DISABLED = process.env.BTS_TELEMETRY_DISABLED;
-	const BTS_TELEMETRY = "1";
 	if (BTS_TELEMETRY_DISABLED !== void 0) return BTS_TELEMETRY_DISABLED !== "1";
-	if (BTS_TELEMETRY !== void 0) return BTS_TELEMETRY === "1";
 	return true;
 }
 //#endregion
@@ -5509,16 +5848,15 @@ async function handleDirectoryConflict(currentPathInput) {
 		}
 	}
 }
+function resolveProjectDirectoryPath(finalPathInput) {
+	const finalResolvedPath = finalPathInput === "." ? process.cwd() : path.resolve(process.cwd(), finalPathInput);
+	return {
+		finalResolvedPath,
+		finalBaseName: path.basename(finalResolvedPath)
+	};
+}
 async function setupProjectDirectory(finalPathInput, shouldClearDirectory) {
-	let finalResolvedPath;
-	let finalBaseName;
-	if (finalPathInput === ".") {
-		finalResolvedPath = process.cwd();
-		finalBaseName = path.basename(finalResolvedPath);
-	} else {
-		finalResolvedPath = path.resolve(process.cwd(), finalPathInput);
-		finalBaseName = path.basename(finalResolvedPath);
-	}
+	const { finalResolvedPath, finalBaseName } = resolveProjectDirectoryPath(finalPathInput);
 	const pathSafetyResult = await validateSafeProjectDirectoryPath(finalPathInput);
 	if (pathSafetyResult.isErr()) throw pathSafetyResult.error;
 	if (shouldClearDirectory) {
@@ -5767,7 +6105,7 @@ function validateArrayOptions(options) {
 }
 //#endregion
 //#region src/validation.ts
-const CORE_STACK_FLAGS = new Set([
+const coreStackFlags = /* @__PURE__ */ new Set([
 	"database",
 	"orm",
 	"backend",
@@ -5785,7 +6123,7 @@ const CORE_STACK_FLAGS = new Set([
 function validateYesFlagCombination(options, providedFlags) {
 	if (!options.yes) return Result.ok(void 0);
 	if (options.template && options.template !== "none") return Result.ok(void 0);
-	const coreStackFlagsProvided = Array.from(providedFlags).filter((flag) => CORE_STACK_FLAGS.has(flag));
+	const coreStackFlagsProvided = Array.from(providedFlags).filter((flag) => coreStackFlags.has(flag));
 	if (coreStackFlagsProvided.length > 0) return Result.err(new ValidationError({ message: `Cannot combine --yes with core stack configuration flags: ${coreStackFlagsProvided.map((f) => `--${f}`).join(", ")}. The --yes flag uses default configuration. Remove these flags or use --yes without them.` }));
 	return Result.ok(void 0);
 }
@@ -5824,6 +6162,9 @@ function validateConfigCompatibility(config, providedFlags, options) {
 	if (options && providedFlags) return validateFullConfig(config, providedFlags, options);
 	else return validateConfigForProgrammaticUse(config);
 }
+function validateResolvedConfigCompatibility(config) {
+	return validateFullConfig(config, coreStackFlags, config);
+}
 //#endregion
 //#region src/utils/file-formatter.ts
 const formatOptions = {
@@ -6017,7 +6358,7 @@ async function initMongoDBAtlas(serverDir) {
 			await $({
 				cwd: serverDir,
 				stdio: "inherit"
-			})`atlas deployments setup`;
+			})`atlas setup`;
 			cliLog.success("MongoDB Atlas deployment ready");
 		},
 		catch: (e) => new DatabaseSetupError({
@@ -6066,7 +6407,7 @@ ${pc.green("MongoDB Atlas Manual Setup Instructions:")}
    ${pc.blue("https://www.mongodb.com/docs/atlas/cli/stable/install-atlas-cli/")}
 
 2. Run the following command and follow the prompts:
-   ${pc.blue("atlas deployments setup")}
+   ${pc.blue("atlas setup")}
 
 3. Get your connection string from the Atlas dashboard:
    Format: ${pc.dim("mongodb+srv://USERNAME:PASSWORD@CLUSTER.mongodb.net/DATABASE_NAME")}
@@ -6167,10 +6508,6 @@ const NEON_REGIONS = [
 		label: "AWS Asia Pacific (Singapore)",
 		value: "aws-ap-southeast-1"
 	},
-	{
-		label: "AWS South America East 1 (São Paulo)",
-		value: "aws-sa-east-1"
-	},
 	{
 		label: "AWS Asia Pacific (Sydney)",
 		value: "aws-ap-southeast-2"
@@ -6180,13 +6517,12 @@ const NEON_REGIONS = [
 		value: "azure-eastus2"
 	}
 ];
-async function executeNeonCommand(packageManager, commandArgsString, spinnerText) {
+async function executeNeonCommand(commandArgs, spinnerText) {
 	const s = createSpinner();
-	const args = getPackageExecutionArgs(packageManager, commandArgsString);
 	if (spinnerText) s.start(spinnerText);
 	return Result.tryPromise({
 		try: async () => {
-			const result = await $`${args}`;
+			const result = await $`${commandArgs}`;
 			if (spinnerText) s.stop(pc.green(spinnerText.replace("...", "").replace("ing ", "ed ").trim()));
 			return result;
 		},
@@ -6200,8 +6536,22 @@ async function executeNeonCommand(packageManager, commandArgsString, spinnerText
 		}
 	});
 }
+function getNeonProjectCreateArgs(packageManager, projectName, regionId) {
+	return [
+		...getPackageRunnerPrefix(packageManager),
+		"neon@latest",
+		"projects",
+		"create",
+		"--name",
+		projectName,
+		"--region-id",
+		regionId,
+		"--output",
+		"json"
+	];
+}
 async function createNeonProject(projectName, regionId, packageManager) {
-	const execResult = await executeNeonCommand(packageManager, `neonctl@latest projects create --name ${projectName} --region-id ${regionId} --output json`, `Creating Neon project "${projectName}"...`);
+	const execResult = await executeNeonCommand(getNeonProjectCreateArgs(packageManager, projectName, regionId), `Creating Neon project "${projectName}"...`);
 	if (execResult.isErr()) return Result.err(execResult.error);
 	const parseResult = Result.try({
 		try: () => JSON.parse(execResult.value.stdout),
@@ -6245,7 +6595,7 @@ async function writeEnvFile$2(projectDir, backend, config) {
 }
 async function setupWithNeonDb(projectDir, packageManager, backend) {
 	const s = createSpinner();
-	s.start("Creating Neon database using get-db...");
+	s.start("Creating Neon database using neon-new...");
 	const targetApp = backend === "self" ? "apps/web" : "apps/server";
 	const targetDir = path.join(projectDir, targetApp);
 	const ensureDirResult = await Result.tryPromise({
@@ -6260,17 +6610,17 @@ async function setupWithNeonDb(projectDir, packageManager, backend) {
 		s.stop(pc.red("Failed to create directory"));
 		return ensureDirResult;
 	}
-	const packageArgs = getPackageExecutionArgs(packageManager, `get-db@latest --yes --ref "sbA3tIe"`);
+	const packageArgs = getPackageExecutionArgs(packageManager, `neon-new@latest --yes --ref "sbA3tIe"`);
 	return Result.tryPromise({
 		try: async () => {
 			await $({ cwd: targetDir })`${packageArgs}`;
 			s.stop(pc.green("Neon database created successfully!"));
 		},
 		catch: (e) => {
-			s.stop(pc.red("Failed to create database with get-db"));
+			s.stop(pc.red("Failed to create database with neon-new"));
 			return new DatabaseSetupError({
 				provider: "neon",
-				message: `Failed to create database with get-db: ${e instanceof Error ? e.message : String(e)}`,
+				message: `Failed to create database with neon-new: ${e instanceof Error ? e.message : String(e)}`,
 				cause: e
 			});
 		}
@@ -6331,25 +6681,25 @@ async function setupNeonPostgres(config, cliInput) {
 		return Result.ok(void 0);
 	}
 	let setupMethod = cliInput?.dbSetupOptions?.neon?.method ?? config.dbSetupOptions?.neon?.method;
-	if (!setupMethod) if (isSilent()) setupMethod = "neondb";
+	if (!setupMethod) if (isSilent()) setupMethod = "neon-new";
 	else {
 		const promptedSetupMethod = await select({
 			message: "Choose your Neon setup method:",
 			options: [{
-				label: "Quick setup with get-db",
-				value: "neondb",
+				label: "Quick setup with neon-new",
+				value: "neon-new",
 				hint: "fastest, no auth required"
 			}, {
-				label: "Custom setup with neonctl",
-				value: "neonctl",
+				label: "Custom setup with Neon CLI",
+				value: "neon",
 				hint: "More control - choose project name and region"
 			}],
-			initialValue: "neondb"
+			initialValue: "neon-new"
 		});
 		if (isCancel(promptedSetupMethod)) return userCancelled("Operation cancelled");
 		setupMethod = promptedSetupMethod;
 	}
-	if (setupMethod === "neondb") {
+	if (setupMethod === "neon-new" || setupMethod === "neondb") {
 		const neonDbResult = await setupWithNeonDb(projectDir, packageManager, backend);
 		if (neonDbResult.isErr()) {
 			cliLog.error(pc.red(neonDbResult.error.message));
@@ -7269,7 +7619,7 @@ async function getDockerStatus(database) {
 //#endregion
 //#region src/helpers/core/post-installation.ts
 function getDesktopStaticBuildNote(frontend) {
-	const staticBuildFrontends = new Map([
+	const staticBuildFrontends = /* @__PURE__ */ new Map([
 		["tanstack-start", "TanStack Start"],
 		["next", "Next.js"],
 		["nuxt", "Nuxt"],
@@ -7739,24 +8089,35 @@ function createEmptyResult(timeScaffolded, elapsedTimeMs, error) {
 		error
 	};
 }
-async function createProjectHandler(input, options = {}) {
+async function executeCreateProjectHandler(input, options) {
 	const { silent = false } = options;
 	return runWithContextAsync({ silent }, async () => {
 		const startTime = Date.now();
 		const timeScaffolded = (/* @__PURE__ */ new Date()).toISOString();
-		const result = await createProjectHandlerInternal(input, startTime, timeScaffolded);
-		if (result.isOk()) return result.value;
-		const error = result.error;
-		const elapsedTimeMs = Date.now() - startTime;
-		if (UserCancelledError.is(error)) {
-			if (isSilent()) return createEmptyResult(timeScaffolded, elapsedTimeMs, error.message);
-			return;
-		}
-		if (isSilent()) return createEmptyResult(timeScaffolded, elapsedTimeMs, error.message);
-		displayError(error);
-		process.exit(1);
+		return {
+			result: await createProjectHandlerInternal(input, startTime, timeScaffolded),
+			startTime,
+			timeScaffolded
+		};
 	});
 }
+async function createProjectHandlerResult(input, options = {}) {
+	return (await executeCreateProjectHandler(input, options)).result;
+}
+async function createProjectHandler(input, options = {}) {
+	const { silent = false } = options;
+	const { result, startTime, timeScaffolded } = await executeCreateProjectHandler(input, options);
+	if (result.isOk()) return result.value;
+	const error = result.error;
+	const elapsedTimeMs = Date.now() - startTime;
+	if (UserCancelledError.is(error)) {
+		if (silent) return createEmptyResult(timeScaffolded, elapsedTimeMs, error.message);
+		return;
+	}
+	if (silent) return createEmptyResult(timeScaffolded, elapsedTimeMs, error.message);
+	displayError(error);
+	process.exit(1);
+}
 async function createProjectHandlerInternal(input, startTime, timeScaffolded) {
 	return Result.gen(async function* () {
 		if (!isSilent() && input.renderTitle !== false) renderTitle();
@@ -7789,25 +8150,7 @@ async function createProjectHandlerInternal(input, startTime, timeScaffolded) {
 		shouldClearDirectory = conflictResult.shouldClearDirectory;
 		yield* validateResolvedProjectPathInput(finalPathInput);
 		yield* Result.await(validateSafeProjectDirectoryPath(finalPathInput));
-		let finalResolvedPath;
-		let finalBaseName;
-		if (input.dryRun) {
-			finalResolvedPath = finalPathInput === "." ? process.cwd() : path.resolve(process.cwd(), finalPathInput);
-			finalBaseName = path.basename(finalResolvedPath);
-		} else {
-			const setupResult = yield* Result.await(Result.tryPromise({
-				try: async () => setupProjectDirectory(finalPathInput, shouldClearDirectory),
-				catch: (e) => {
-					if (e instanceof UserCancelledError) return e;
-					return new CLIError({
-						message: e instanceof Error ? e.message : String(e),
-						cause: e
-					});
-				}
-			}));
-			finalResolvedPath = setupResult.finalResolvedPath;
-			finalBaseName = setupResult.finalBaseName;
-		}
+		const { finalResolvedPath, finalBaseName } = resolveProjectDirectoryPath(finalPathInput);
 		const originalInput = {
 			...input,
 			projectDirectory: input.projectName
@@ -7846,10 +8189,10 @@ async function createProjectHandlerInternal(input, startTime, timeScaffolded) {
 				relativePath: finalPathInput
 			};
 			const validationResult = validateConfigCompatibility(config, providedFlags, cliInput);
-			if (validationResult.isErr()) return Result.err(new CLIError({
+			if (validationResult.isErr()) yield* new CLIError({
 				message: validationResult.error.message,
 				cause: validationResult.error
-			}));
+			});
 			if (!isSilent()) log.info(pc.dim("Quick setup selected — using defaults and provided flags."));
 		} else {
 			const flagConfigResult = processAndValidateFlags(cliInput, providedFlags, finalBaseName);
@@ -7881,9 +8224,22 @@ async function createProjectHandlerInternal(input, startTime, timeScaffolded) {
 			dbSetupOptions: effectiveDbSetupOptions
 		};
 		if (!input.yolo) {
-			const addonsValidationResult = validateAddonsAgainstFrontends(config.addons, config.frontend, config.auth, config.backend, config.runtime);
-			if (addonsValidationResult.isErr()) return Result.err(new CLIError({ message: addonsValidationResult.error.message }));
+			const resolvedConfigValidationResult = validateResolvedConfigCompatibility(config);
+			if (resolvedConfigValidationResult.isErr()) yield* new CLIError({
+				message: resolvedConfigValidationResult.error.message,
+				cause: resolvedConfigValidationResult.error
+			});
 		}
+		if (!input.dryRun) yield* Result.await(Result.tryPromise({
+			try: async () => setupProjectDirectory(finalPathInput, shouldClearDirectory),
+			catch: (e) => {
+				if (e instanceof UserCancelledError) return e;
+				return new CLIError({
+					message: e instanceof Error ? e.message : String(e),
+					cause: e
+				});
+			}
+		}));
 		if (!isSilent()) {
 			log.info(pc.magenta(pc.bold("Stack ready")));
 			log.message(displayConfig(config));
@@ -8100,7 +8456,7 @@ const router = t.router({
 	}),
 	createJson: t.procedure.meta({
 		description: "Create a project from a raw JSON payload (agent-friendly)",
-		jsonInput: true
+		jsonInput: "always"
 	}).input(types_exports.CreateInputSchema).mutation(async ({ input }) => {
 		const result = await createProjectHandler(input, { silent: true });
 		if (!result) throw new UserCancelledError({ message: "Operation cancelled" });
@@ -8122,7 +8478,7 @@ const router = t.router({
 	}),
 	addJson: t.procedure.meta({
 		description: "Add addons from a raw JSON payload (agent-friendly)",
-		jsonInput: true
+		jsonInput: "always"
 	}).input(types_exports.AddInputSchema).mutation(async ({ input }) => {
 		const result = await addHandler(input, { silent: true });
 		if (!result) throw new UserCancelledError({ message: "Operation cancelled" });
@@ -8194,15 +8550,15 @@ async function create(projectName, options) {
 	};
 	return Result.tryPromise({
 		try: async () => {
-			const result = await createProjectHandler(input, { silent: true });
-			if (!result) throw new UserCancelledError({ message: "Operation cancelled" });
-			if (!result.success) throw new CLIError({ message: result.error || "Unknown error occurred" });
-			return result;
+			const result = await createProjectHandlerResult(input, { silent: true });
+			if (result.isErr()) throw result.error;
+			return result.value;
 		},
 		catch: (e) => {
-			if (e instanceof UserCancelledError) return e;
-			if (e instanceof CLIError) return e;
-			if (e instanceof ProjectCreationError) return e;
+			if (UserCancelledError.is(e)) return e;
+			if (CLIError.is(e)) return e;
+			if (DirectoryConflictError.is(e)) return e;
+			if (ProjectCreationError.is(e)) return e;
 			return new CLIError({
 				message: e instanceof Error ? e.message : String(e),
 				cause: e
@@ -8273,7 +8629,7 @@ async function createVirtual(options) {
 		webDeploy: virtualOptions.webDeploy || "none",
 		serverDeploy: virtualOptions.serverDeploy || "none"
 	};
-	const validationResult = validateConfigCompatibility(config, new Set([
+	const validationResult = validateConfigCompatibility(config, /* @__PURE__ */ new Set([
 		"database",
 		"orm",
 		"backend",