create-better-t-stack 3.46.1 → 3.48.0

package/README.md

@@ -94,9 +94,9 @@ Options:
 
 ```bash
 # Raw JSON payload input (agent-friendly)
-create-better-t-stack create-json --input '{"projectName":"my-app","yes":true,"dryRun":true}'
-create-better-t-stack add-json --input '{"projectDir":"./my-app","addons":["wxt"],"addonOptions":{"wxt":{"template":"react"}}}'
-create-better-t-stack create-json --input '{"projectName":"db-app","database":"postgres","orm":"drizzle","dbSetup":"neon","dbSetupOptions":{"mode":"manual"}}'
+create-better-t-stack create-json --json '{"projectName":"my-app","yes":true,"dryRun":true}'
+create-better-t-stack add-json --json '{"projectDir":"./my-app","addons":["wxt"],"addonOptions":{"wxt":{"template":"react"}}}'
+create-better-t-stack create-json --json '{"projectName":"db-app","database":"postgres","orm":"drizzle","dbSetup":"neon","dbSetupOptions":{"mode":"manual"}}'
 
 # Runtime schema/introspection output
 create-better-t-stack schema --name all

package/dist/cli.mjs

@@ -1,5 +1,5 @@
 #!/usr/bin/env node
-import { D as setProcessMode, i as SchemaNameSchema, l as create, m as getSchemaResult, s as add, u as createBtsCli, v as types_exports, y as getLatestCLIVersion } from "./src-_HMF_A8q.mjs";
+import { D as setProcessMode, i as SchemaNameSchema, l as create, m as getSchemaResult, s as add, u as createBtsCli, v as types_exports, y as getLatestCLIVersion } from "./src-DswDqMzo.mjs";
 import { lineByLineConsoleLogger } from "trpc-cli";
 import z from "zod";
 import { McpServer } from "@modelcontextprotocol/server";

package/dist/index.d.mts

@@ -592,7 +592,7 @@ export declare const router: {
             "expo/skills": "expo/skills";
             "prisma/skills": "prisma/skills";
             "elysiajs/skills": "elysiajs/skills";
-            "waynesutton/convexskills": "waynesutton/convexskills";
+            "get-convex/agent-skills": "get-convex/agent-skills";
             "msmps/opentui-skill": "msmps/opentui-skill";
             "haydenbleasel/ultracite": "haydenbleasel/ultracite";
             "https://www.evlog.dev": "https://www.evlog.dev";
@@ -1119,7 +1119,7 @@ export declare const router: {
             "expo/skills": "expo/skills";
             "prisma/skills": "prisma/skills";
             "elysiajs/skills": "elysiajs/skills";
-            "waynesutton/convexskills": "waynesutton/convexskills";
+            "get-convex/agent-skills": "get-convex/agent-skills";
             "msmps/opentui-skill": "msmps/opentui-skill";
             "haydenbleasel/ultracite": "haydenbleasel/ultracite";
             "https://www.evlog.dev": "https://www.evlog.dev";

package/dist/index.mjs

@@ -1,3 +1,3 @@
 #!/usr/bin/env node
-import { C as DirectoryConflictError, E as ValidationError, S as DatabaseSetupError, T as UserCancelledError, _ as ProjectLauncherSchema, a as TEMPLATE_COUNT, b as CLIError, 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 ProjectCreationError, x as CompatibilityError } from "./src-_HMF_A8q.mjs";
+import { C as DirectoryConflictError, E as ValidationError, S as DatabaseSetupError, T as UserCancelledError, _ as ProjectLauncherSchema, a as TEMPLATE_COUNT, b as CLIError, 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 ProjectCreationError, x as CompatibilityError } from "./src-DswDqMzo.mjs";
 export { CLIError, CompatibilityError, DatabaseSetupError, DirectoryConflictError, EMBEDDED_TEMPLATES, GeneratorError, ProjectCreationError, ProjectLauncherSchema, Result, SchemaNameSchema, TEMPLATE_COUNT, UserCancelledError, ValidationError, VirtualFileSystem, add, builder, create, createBtsCli, createVirtual, docs, generate, getSchemaResult, router, sponsors };

package/dist/{src-_HMF_A8q.mjs → src-DswDqMzo.mjs}

@@ -228,7 +228,8 @@ function defaultContext() {
 		silent: false,
 		verbose: false,
 		promptShown: false,
-		analyticsDisabled: false
+		analyticsDisabled: false,
+		stepFailures: []
 	};
 }
 function getContext() {
@@ -290,7 +291,8 @@ function createContext(options) {
 		analyticsDisabled: options.analyticsDisabled ?? false,
 		projectDir: options.projectDir,
 		projectName: options.projectName,
-		packageManager: options.packageManager
+		packageManager: options.packageManager,
+		stepFailures: []
 	};
 }
 async function runWithContextAsync(options, fn) {
@@ -337,6 +339,8 @@ function beginInterruptibleScope() {
 	endInterruptibleScope();
 	stepInterrupted = false;
 	anyStepInterrupted = false;
+	const ctx = tryGetContext();
+	if (ctx) ctx.stepFailures = [];
 	listener = () => {
 		stepInterrupted = true;
 		anyStepInterrupted = true;
@@ -360,6 +364,13 @@ function wasInterrupted() {
 function wasAnyStepInterrupted() {
 	return anyStepInterrupted;
 }
+/** Records an optional step that failed, so silent/JSON callers can report it. */
+function recordStepFailure(message) {
+	tryGetContext()?.stepFailures.push(message);
+}
+function getStepFailures() {
+	return [...tryGetContext()?.stepFailures ?? []];
+}
 function getInterruptSignal() {
 	return controller?.signal;
 }
@@ -1697,10 +1708,6 @@ function parseBtsConfig(content) {
 	const errors = [];
 	const value = parse(content, errors, { allowTrailingComma: true });
 	if (errors.length > 0) throw new Error("Invalid JSONC in bts.jsonc");
-	const selections = value?.addonOptions?.skills?.selections;
-	if (Array.isArray(selections)) {
-		for (const selection of selections) if (selection?.source === "yusukebe/hono-skill") selection.source = "honojs/skills";
-	}
 	return BetterTStackConfigSchema.parse(value);
 }
 async function readBtsConfig(projectDir) {
@@ -1888,7 +1895,7 @@ function getNodeToolingRequirements(config) {
 			addNodeRequirement(requirements, ">=22.12.0", "Astro 7");
 			break;
 		case "nuxt":
-			addNodeRequirement(requirements, "^22.19.0 || ^24.11.0 || >=26.0.0", "Nuxt 4");
+			addNodeRequirement(requirements, "^22.22.3 || ^24.15.0 || >=26.0.0", "Nuxt 4.6");
 			break;
 		case "solid":
 			addNodeRequirement(requirements, ">=24.0.0", "Solid");
@@ -1897,6 +1904,8 @@ function getNodeToolingRequirements(config) {
 			addNodeRequirement(requirements, ">=22.22.0", "React Router 8");
 			break;
 		case "svelte":
+			addNodeRequirement(requirements, ">=22.17.0", "SvelteKit 3");
+			break;
 		case "tanstack-router":
 			addNodeRequirement(requirements, "^20.19.0 || >=22.12.0", "Vite 8");
 			break;
@@ -1951,11 +1960,8 @@ function getBaselineRequirements(packageManager, hostRuntime) {
 }
 function getLocalVersionRequirements(config, hostRuntime) {
 	const requirements = getBaselineRequirements(config.packageManager, hostRuntime);
-	if (config.packageManager !== "bun") requirements.push(...getNodeToolingRequirements(config));
-	else {
-		requirements.push(...getAddonNodeRequirements(config));
-		if (config.runtime === "node") addNodeRequirement(requirements, ">=22.0.0", "the selected Node.js server runtime");
-	}
+	requirements.push(...getNodeToolingRequirements(config));
+	if (config.runtime === "node") addNodeRequirement(requirements, ">=22.0.0", "the selected Node.js server runtime");
 	return requirements;
 }
 function formatRequirementError(requirement, rawVersion) {
@@ -2082,6 +2088,7 @@ async function runOptionalStep(step, cancelledMessage) {
 		cliLog.warn(pc.yellow(cancelledMessage));
 		return;
 	}
+	recordStepFailure(result.error.message);
 	cliConsola.error(pc.red(result.error.message));
 }
 //#endregion
@@ -2278,9 +2285,24 @@ function addNuxtEvlogSetup(content, serviceName) {
 	return nextContent;
 }
 function addSvelteViteEvlogSetup(content, serviceName) {
-	let nextContent = prependMissingImports(content, ["import evlog from \"evlog/vite\";"]);
+	const nextContent = prependMissingImports(content, ["import evlog from \"evlog/vite\";"]);
 	if (nextContent.includes("evlog({")) return nextContent;
-	return nextContent.replace("sveltekit(),", `sveltekit(),\n    evlog({ service: "${serviceName}" }),`);
+	const source = ts.createSourceFile("vite.config.ts", nextContent, ts.ScriptTarget.Latest);
+	let insertion;
+	function visit(node) {
+		if (insertion !== void 0) return;
+		if (ts.isPropertyAssignment(node) && node.name.getText(source) === "plugins" && ts.isArrayLiteralExpression(node.initializer)) {
+			const kitPlugin = node.initializer.elements.find((element) => ts.isCallExpression(element) && element.expression.getText(source) === "sveltekit");
+			if (kitPlugin) {
+				insertion = kitPlugin.getEnd();
+				return;
+			}
+		}
+		ts.forEachChild(node, visit);
+	}
+	visit(source);
+	if (insertion === void 0) return nextContent;
+	return `${nextContent.slice(0, insertion)},\n    evlog({ service: ${JSON.stringify(serviceName)} })${nextContent.slice(insertion)}`;
 }
 function getSvelteEvlogHooksCall(fsDrain, axiom = false) {
 	if (axiom) return "createEvlogHooks({ drain: createAxiomDrain() })";
@@ -2292,7 +2314,7 @@ function addSvelteHooksEvlogSetup(content, fsDrain, axiom) {
 		...fsDrain ? ["import { createFsDrain } from \"evlog/fs\";"] : [],
 		...axiom ? ["import { createAxiomDrain } from \"evlog/axiom\";"] : []
 	]);
-	if (fsDrain) nextContent = addNamedImport(nextContent, "$app/environment", ["dev"]);
+	if (fsDrain) nextContent = addNamedImport(nextContent, "$app/env", ["dev"]);
 	const hooksCall = getSvelteEvlogHooksCall(fsDrain, axiom);
 	if (fsDrain || axiom) nextContent = nextContent.replaceAll("createEvlogHooks()", hooksCall);
 	if (!nextContent.includes("export const handle") && !nextContent.includes("const authHandle")) {
@@ -2302,7 +2324,7 @@ function addSvelteHooksEvlogSetup(content, fsDrain, axiom) {
 	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 } = ${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`;
+	if (!nextContent.includes("sequence(evlogHandle, authHandle)")) nextContent = `${nextContent.trimEnd()}\n\nexport const handle = sequence(evlogHandle, authHandle);\nexport { handleError };\n`;
 	return nextContent;
 }
 function addSvelteLocalsType(content) {
@@ -2398,7 +2420,7 @@ function addNextBetterAuthToRoute(content) {
 }
 function addSvelteBetterAuthEvlogSetup(content, config) {
 	if (!content.includes("authHandle") || content.includes("evlogAuthHandle")) return content;
-	let nextContent = addNamedImport(content, "evlog/better-auth", ["createAuthMiddleware", "type BetterAuthInstance"]);
+	let nextContent = addNamedImport(content, "evlog/better-auth", ["createAuthMiddleware"]);
 	if (!nextContent.includes("from \"./services\"")) nextContent = prependMissingImports(nextContent, [getAuthImportLine(config, "./services")]);
 	let environmentBinding = "ENV";
 	if (usesCreateAuthFactory(config) && config.webDeploy === "cloudflare") {
@@ -2411,10 +2433,10 @@ 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 ?? ${environmentBinding};\n\tconst identifyUser = createAuthMiddleware((await 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`;
+	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 = ${environmentBinding};\n\tconst identifyUser = createAuthMiddleware(await createAuth(authEnv), ${authOptions});\n\tawait identifyUser(event.locals.log, event.request.headers, event.url.pathname);\n\treturn resolve(event);\n};\n\n` : `const identifyUser = createAuthMiddleware(${authExpression}, ${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`;
 	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)");
+	return nextContent.replace("sequence(evlogHandle as Handle, authHandle)", "sequence(evlogHandle, evlogAuthHandle, authHandle)").replace("sequence(evlogHandle, authHandle)", "sequence(evlogHandle, evlogAuthHandle, authHandle)");
 }
 function addAstroBetterAuthEvlogSetup(content, config) {
 	if (content.includes("createAuthMiddleware(")) return content;
@@ -2447,14 +2469,16 @@ export const { register, onRequestError } = createInstrumentation({
 });
 `;
 }
+const NITRO_V3_PLUGIN_IMPORT = "import { definePlugin as defineNitroPlugin } from \"nitro\";\n";
 function getNitroEvlogDrainFile(axiom = false, nitroV3 = false) {
-	if (axiom) return `${nitroV3 ? "import { definePlugin as defineNitroPlugin } from \"nitro\";\n" : ""}import { createAxiomDrain } from "evlog/axiom";
+	const pluginImport = nitroV3 ? NITRO_V3_PLUGIN_IMPORT : "";
+	if (axiom) return `${pluginImport}import { createAxiomDrain } from "evlog/axiom";
 
 export default defineNitroPlugin((nitroApp) => {
   nitroApp.hooks.hook("evlog:drain", createAxiomDrain());
 });
 `;
-	return `import { createFsDrain } from "evlog/fs";
+	return `${pluginImport}import { createFsDrain } from "evlog/fs";
 
 export default defineNitroPlugin((nitroApp) => {
   if (!import.meta.dev) return;
@@ -2505,31 +2529,32 @@ export async function identifyEvlogUser(request: Request) {
 }
 `;
 }
-function getNitroEvlogAuthPluginFile(config) {
+function getTanstackStartEvlogAuthMiddlewareFile(config) {
 	if (usesCreateAuthFactory(config)) return `${getAuthImportLine(config, "../../src/services")}
-import { createAuthIdentifier, type BetterAuthInstance } from "evlog/better-auth";
+import { createAuthMiddleware, type BetterAuthInstance } from "evlog/better-auth";
+import { useLogger } from "evlog/nitro/v3";
+import { defineHandler } from "nitro";
 
-export default defineNitroPlugin((nitroApp) => {
-  nitroApp.hooks.hook("request", async (event) => {
-    const identify = createAuthIdentifier(${getAuthExpression(config)} as BetterAuthInstance, {
-      exclude: ["/api/auth/**"],
-      maskEmail: true,
-    });
-    await identify(event);
+export default defineHandler(async (event) => {
+  const identifyUser = createAuthMiddleware(${getAuthExpression(config)} as BetterAuthInstance, {
+    exclude: ["/api/auth/**"],
+    maskEmail: true,
   });
+  await identifyUser(useLogger(event), event.req.headers, event.url.pathname);
 });
 `;
 	return `${getAuthImportLine(config, "../../src/services")}
-import { createAuthIdentifier, type BetterAuthInstance } from "evlog/better-auth";
+import { createAuthMiddleware, type BetterAuthInstance } from "evlog/better-auth";
+import { useLogger } from "evlog/nitro/v3";
+import { defineHandler } from "nitro";
 
-export default defineNitroPlugin((nitroApp) => {
-  nitroApp.hooks.hook(
-    "request",
-    createAuthIdentifier(${getAuthExpression(config)} as BetterAuthInstance, {
-      exclude: ["/api/auth/**"],
-      maskEmail: true,
-    }),
-  );
+const identifyUser = createAuthMiddleware(${getAuthExpression(config)} as BetterAuthInstance, {
+  exclude: ["/api/auth/**"],
+  maskEmail: true,
+});
+
+export default defineHandler(async (event) => {
+  await identifyUser(useLogger(event), event.req.headers, event.url.pathname);
 });
 `;
 }
@@ -2664,10 +2689,6 @@ async function setupNuxtEvlog(config, serviceName) {
 		if (!await fs.pathExists(drainPath)) await writeFileIfChanged(drainPath, getNitroEvlogDrainFile(usesAxiom(config), config.frontend.includes("tanstack-start")));
 	}
 	if (shouldIdentifyWebAuth(config)) {
-		const oldAuthPluginPath = path.join(webDir, "server/plugins/evlog-auth.ts");
-		if (await fs.pathExists(oldAuthPluginPath)) {
-			if ((await fs.readFile(oldAuthPluginPath, "utf-8")).includes("evlog/better-auth")) await fs.remove(oldAuthPluginPath);
-		}
 		const authMiddlewarePath = path.join(webDir, "server/middleware/evlog-auth.ts");
 		if (!await fs.pathExists(authMiddlewarePath)) await writeFileIfChanged(authMiddlewarePath, getNuxtEvlogAuthMiddlewareFile(config));
 	}
@@ -2683,7 +2704,7 @@ async function setupSvelteEvlog(config, serviceName) {
 	else await writeFileIfChanged(hooksPath, `import { createEvlogHooks } from "evlog/sveltekit";
 ${fsDrain ? "import { createFsDrain } from \"evlog/fs\";\n" : ""}
 ${axiom ? "import { createAxiomDrain } from \"evlog/axiom\";\n" : ""}
-${fsDrain ? "import { dev } from \"$app/environment\";\n" : ""}
+${fsDrain ? "import { dev } from \"$app/env\";\n" : ""}
 
 export const { handle, handleError } = ${getSvelteEvlogHooksCall(fsDrain, axiom)};
 `);
@@ -2725,8 +2746,8 @@ async function setupTanstackStartEvlog(config, serviceName) {
 		if (!await fs.pathExists(drainPath)) await writeFileIfChanged(drainPath, getNitroEvlogDrainFile(usesAxiom(config), config.frontend.includes("tanstack-start")));
 	}
 	if (shouldIdentifyWebAuth(config)) {
-		const authPluginPath = path.join(webDir, "server/plugins/evlog-auth.ts");
-		if (!await fs.pathExists(authPluginPath)) await writeFileIfChanged(authPluginPath, getNitroEvlogAuthPluginFile(config));
+		const authMiddlewarePath = path.join(webDir, "server/middleware/evlog-auth.ts");
+		if (!await fs.pathExists(authMiddlewarePath)) await writeFileIfChanged(authMiddlewarePath, getTanstackStartEvlogAuthMiddlewareFile(config));
 	}
 	if (config.examples.includes("ai")) await updateFileIfExists(path.join(webDir, "src/routes/api/ai/$.ts"), addTanstackStartAiEvlogSetup);
 }
@@ -3607,7 +3628,7 @@ const SKILL_SOURCES = {
 	"expo/skills": { label: "Expo" },
 	"prisma/skills": { label: "Prisma" },
 	"elysiajs/skills": { label: "ElysiaJS" },
-	"waynesutton/convexskills": { label: "Convex" },
+	"get-convex/agent-skills": { label: "Convex" },
 	"msmps/opentui-skill": { label: "OpenTUI Platform" },
 	"haydenbleasel/ultracite": { label: "Ultracite" },
 	"https://www.evlog.dev": { label: "evlog" }
@@ -3994,7 +4015,7 @@ function getRecommendedSourceKeys(config) {
 	if (addons.includes("turborepo")) sources.push("vercel/turborepo");
 	if (backend === "hono") sources.push("honojs/skills");
 	if (backend === "elysia") sources.push("elysiajs/skills");
-	if (backend === "convex") sources.push("waynesutton/convexskills");
+	if (backend === "convex") sources.push("get-convex/agent-skills");
 	if (addons.includes("opentui")) sources.push("msmps/opentui-skill");
 	if (addons.includes("ultracite")) sources.push("haydenbleasel/ultracite");
 	if (addons.includes("evlog") || addons.includes("axiom")) sources.push("https://www.evlog.dev");
@@ -4051,36 +4072,32 @@ const CURATED_SKILLS_BY_SOURCE = {
 		if (config.database === "mysql") return ["mysql", "vitess"];
 		return [];
 	},
-	"expo/skills": (config) => {
-		const skills = [
-			"expo-overview",
-			"expo-router",
-			"expo-dev-client",
-			"expo-native-ui",
-			"expo-data-fetching",
-			"eas-app-stores",
-			"eas-workflows"
-		];
-		if (config.frontend.includes("native-uniwind")) skills.push("expo-tailwind-setup");
-		return skills;
-	},
+	"expo/skills": () => [
+		"expo-overview",
+		"expo-router",
+		"expo-dev-client",
+		"expo-native-ui",
+		"expo-data-fetching",
+		"eas-app-stores",
+		"eas-workflows"
+	],
 	"prisma/skills": (config) => {
 		const skills = [];
-		if (config.orm === "prisma") skills.push("prisma-cli", "prisma-client-api", "prisma-database-setup");
-		if (config.dbSetup === "prisma-postgres") skills.push("prisma-postgres");
+		if (config.orm === "prisma") skills.push("prisma-cli", "prisma-client-api", "prisma-orm-setup");
+		if (config.dbSetup === "prisma-postgres") skills.push("prisma-postgres-setup");
 		return skills;
 	},
 	"elysiajs/skills": () => ["elysiajs"],
-	"waynesutton/convexskills": () => [
-		"convex-best-practices",
-		"convex-functions",
-		"convex-schema-validator",
-		"convex-realtime",
-		"convex-http-actions",
-		"convex-cron-jobs",
-		"convex-file-storage",
-		"convex-migrations",
-		"convex-security-check"
+	"get-convex/agent-skills": () => [
+		"convex",
+		"convex-design",
+		"convex-docs",
+		"convex-reviewer",
+		"convex-authz",
+		"convex-crons",
+		"convex-migrate",
+		"convex-env",
+		"convex-test"
 	],
 	"msmps/opentui-skill": () => ["opentui"],
 	"haydenbleasel/ultracite": () => ["ultracite"],
@@ -4189,31 +4206,43 @@ async function setupSkills(config) {
 	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 = [
-				...runner,
-				"skills@latest",
-				"add",
-				source,
-				...globalFlags,
-				"--skill",
-				...skills,
-				"--agent",
-				...agentTargets,
-				"-y"
-			];
-			await $({
-				cwd: projectDir,
-				env: { CI: "true" }
-			})`${args}`;
-		},
-		catch: (e) => new AddonSetupError({
+	const failures = [];
+	for (const [source, skills] of Object.entries(skillsBySource)) {
+		const installResult = await Result.tryPromise({
+			try: async () => {
+				const args = [
+					...runner,
+					"skills@latest",
+					"add",
+					source,
+					...globalFlags,
+					"--skill",
+					...skills,
+					"--agent",
+					...agentTargets,
+					"-y"
+				];
+				await $({
+					cwd: projectDir,
+					env: { CI: "true" }
+				})`${args}`;
+			},
+			catch: (e) => new AddonSetupError({
+				addon: "skills",
+				message: `Failed to install skills from ${source}: ${e instanceof Error ? e.message : String(e)}`,
+				cause: e
+			})
+		});
+		if (installResult.isErr()) failures.push(installResult.error);
+	}
+	if (failures.length > 0) {
+		installSpinner.stop(pc.red("Failed to install skills"));
+		return Result.err(new AddonSetupError({
 			addon: "skills",
-			message: `Failed to install skills from ${source}: ${e instanceof Error ? e.message : String(e)}`,
-			cause: e
-		})
-	})).isErr()) cliLog.warn(pc.yellow(`Warning: Could not install skills from ${source}`));
+			message: failures.map((failure) => failure.message).join("\n"),
+			cause: failures.map((failure) => failure.cause)
+		}));
+	}
 	installSpinner.stop("Skills installed");
 	return Result.ok(void 0);
 }
@@ -5301,7 +5330,31 @@ async function addHandlerInternal(input) {
 			});
 		}
 	});
-	if (setupResult.isErr()) return Result.err(setupResult.error);
+	const cleanupReservedPackage = async () => {
+		if (!reservedPackageDir) return void 0;
+		const dir = reservedPackageDir;
+		return (await Result.tryPromise({
+			try: () => fs.remove(dir),
+			catch: (cause) => new CLIError({
+				message: `Failed to remove ${dir}`,
+				cause
+			})
+		})).isErr() ? `Also failed to remove ${dir}; delete it before retrying.` : void 0;
+	};
+	if (setupResult.isErr()) {
+		const cleanupNote = await cleanupReservedPackage();
+		if (!cleanupNote) return Result.err(setupResult.error);
+		return Result.err(new CLIError({
+			message: `${setupResult.error.message}\n${cleanupNote}`,
+			cause: setupResult.error
+		}));
+	}
+	const stepFailures = getStepFailures();
+	if (stepFailures.length > 0) {
+		const cleanupNote = await cleanupReservedPackage();
+		const message = isSilent() ? stepFailures.join("\n") : "Addon setup failed";
+		return Result.err(new CLIError({ message: cleanupNote ? `${message}\n${cleanupNote}` : message }));
+	}
 	if (addonsToAdd.length > 0) {
 		const configResult = await updateBtsConfig(projectDir, {
 			addons: updatedAddons,
@@ -8078,19 +8131,21 @@ async function setupPrismaPostgres(config, cliInput) {
 }
 //#endregion
 //#region src/helpers/database-providers/supabase-setup.ts
+const SUPABASE_CLI_PACKAGE = "supabase@2.121.0";
+const supabaseEnv = { SUPABASE_EXPERIMENTAL_STACK: "0" };
+const statusSchema = z$1.object({ DB_URL: z$1.url().refine((value) => ["postgres:", "postgresql:"].includes(new URL(value).protocol)) });
+/** Save a verified database URL in the app that consumes the database. */
 async function writeSupabaseEnvFile(projectDir, backend, databaseUrl) {
 	return Result.tryPromise({
 		try: async () => {
 			const targetApp = backend === "self" ? "apps/web" : "apps/server";
-			const envPath = path.join(projectDir, targetApp, ".env");
-			const dbUrlToUse = databaseUrl || "postgresql://postgres:postgres@127.0.0.1:54322/postgres";
-			await addEnvVariablesToFile(envPath, [{
+			await addEnvVariablesToFile(path.join(projectDir, targetApp, ".env"), [{
 				key: "DATABASE_URL",
-				value: dbUrlToUse,
+				value: databaseUrl,
 				condition: true
 			}, {
 				key: "DIRECT_URL",
-				value: dbUrlToUse,
+				value: databaseUrl,
 				condition: true
 			}]);
 		},
@@ -8101,28 +8156,38 @@ async function writeSupabaseEnvFile(projectDir, backend, databaseUrl) {
 		})
 	});
 }
-function extractDbUrl(statusEnv) {
-	return statusEnv.match(/^DB_URL="(postgresql:\/\/[^"]+)"$/m)?.[1] ?? null;
-}
+/** Read Docker status with cancellation and a bounded wait. */
 async function readSupabaseStatus(serverDir, packageManager) {
-	const statusArgs = getPackageExecutionArgs(packageManager, "supabase status --agent no -o env");
-	const result = await Result.tryPromise({
+	const statusArgs = getPackageExecutionArgs(packageManager, `${SUPABASE_CLI_PACKAGE} status --agent no --output json`);
+	return Result.tryPromise({
 		try: async () => {
-			const { stdout } = await execa(statusArgs[0], statusArgs.slice(1), { cwd: serverDir });
-			return stdout;
+			const { stdout } = await execa(statusArgs[0], statusArgs.slice(1), {
+				cwd: serverDir,
+				env: supabaseEnv,
+				cancelSignal: getInterruptSignal(),
+				timeout: 12e4
+			});
+			return statusSchema.parse(JSON.parse(stdout)).DB_URL;
 		},
-		catch: () => ""
+		catch: (e) => new DatabaseSetupError({
+			provider: "supabase",
+			message: "Could not read the Supabase database URL. Run Supabase status and configure DATABASE_URL and DIRECT_URL manually.",
+			cause: e
+		})
 	});
-	return result.isOk() ? result.value : "";
 }
+/** Initialize missing configuration without overwriting an existing project. */
 async function initializeSupabase(serverDir, packageManager) {
 	cliLog.info("Initializing Supabase project...");
 	return Result.tryPromise({
 		try: async () => {
-			const supabaseInitArgs = getPackageExecutionArgs(packageManager, "supabase init");
+			if (await fs.pathExists(path.join(serverDir, "supabase/config.toml"))) return;
+			const supabaseInitArgs = getPackageExecutionArgs(packageManager, `${SUPABASE_CLI_PACKAGE} init --agent no`);
 			await execa(supabaseInitArgs[0], supabaseInitArgs.slice(1), {
 				cwd: serverDir,
-				stdio: "inherit"
+				stdio: "inherit",
+				env: supabaseEnv,
+				cancelSignal: getInterruptSignal()
 			});
 			cliLog.success("Supabase project initialized");
 		},
@@ -8130,18 +8195,23 @@ async function initializeSupabase(serverDir, packageManager) {
 			const error = e;
 			return new DatabaseSetupError({
 				provider: "supabase",
-				message: error.message?.includes("ENOENT") ? "Supabase CLI not found. Please install it globally (npm install -g supabase) or ensure it's in your PATH." : `Failed to initialize Supabase project: ${error.message ?? String(e)}`,
+				message: error.message?.includes("ENOENT") ? "Could not run the Supabase CLI. Ensure your selected package manager is installed and available in PATH." : `Failed to initialize Supabase project: ${error.message ?? String(e)}`,
 				cause: e
 			});
 		}
 	});
 }
+/** Start the standard Docker runtime and stream its progress to the CLI. */
 async function startSupabase(serverDir, packageManager) {
 	cliLog.info("Starting Supabase services (this may take a moment)...");
-	const supabaseStartArgs = getPackageExecutionArgs(packageManager, "supabase start --agent no");
+	const supabaseStartArgs = getPackageExecutionArgs(packageManager, `${SUPABASE_CLI_PACKAGE} start --agent no`);
 	return Result.tryPromise({
 		try: async () => {
-			const subprocess = execa(supabaseStartArgs[0], supabaseStartArgs.slice(1), { cwd: serverDir });
+			const subprocess = execa(supabaseStartArgs[0], supabaseStartArgs.slice(1), {
+				cwd: serverDir,
+				env: supabaseEnv,
+				cancelSignal: getInterruptSignal()
+			});
 			let stdoutData = "";
 			if (subprocess.stdout) subprocess.stdout.on("data", (data) => {
 				const text = data.toString();
@@ -8150,7 +8220,6 @@ async function startSupabase(serverDir, packageManager) {
 			});
 			if (subprocess.stderr) subprocess.stderr.pipe(process.stderr);
 			await subprocess;
-			await new Promise((resolve) => setTimeout(resolve, 100));
 			return stdoutData;
 		},
 		catch: (e) => {
@@ -8163,18 +8232,21 @@ async function startSupabase(serverDir, packageManager) {
 		}
 	});
 }
-function displayManualSupabaseInstructions(targetApp, output) {
+/** Print pinned setup commands without changing configuration or credentials. */
+function displayManualSupabaseInstructions(targetApp, packageManager, output) {
+	const command = getPackageExecutionCommand(packageManager, SUPABASE_CLI_PACKAGE);
 	cliLog.info(`"Manual Supabase Setup Instructions:"
-1. Ensure Docker is installed and running.
-2. Install the Supabase CLI (e.g., \`npm install -g supabase\`).
-3. Run \`supabase init\` in your project's \`packages/db\` directory.
-4. Run \`supabase start\` in your project's \`packages/db\` directory.
-5. Copy the database URL from the output.${output ? `
+1. Open your project's \`packages/db\` directory.
+2. Run \`${command} init\` if \`supabase/config.toml\` does not exist.
+3. Ensure Docker or a Docker-compatible container runtime is installed and running.
+4. Run \`${command} start\`.
+5. Run \`${command} status --output json\` and copy \`DB_URL\`.${output ? `
 ${pc.bold("Relevant output from `supabase start`:")}
 ${pc.dim(output)}` : ""}
-6. Add the database URL to the .env file in \`${targetApp}/.env\` as \`DATABASE_URL\`:
-			${pc.gray("DATABASE_URL=\"your_supabase_db_url\"")}`);
+6. Add the database URL to the .env file in \`${targetApp}/.env\` as \`DATABASE_URL\` and \`DIRECT_URL\`:
+			${pc.gray("DATABASE_URL=\"your_supabase_db_url\"\nDIRECT_URL=\"your_supabase_db_url\"")}`);
 }
+/** Configure local Supabase, preserving credentials until automatic setup succeeds. */
 async function setupSupabase(config, cliInput) {
 	const { projectDir, packageManager, backend } = config;
 	const targetApp = backend === "self" ? "apps/web" : "apps/server";
@@ -8193,8 +8265,8 @@ async function setupSupabase(config, cliInput) {
 	});
 	if (ensureDirResult.isErr()) return ensureDirResult;
 	if (setupMode === "manual") {
-		displayManualSupabaseInstructions(targetApp);
-		return writeSupabaseEnvFile(projectDir, backend, "");
+		displayManualSupabaseInstructions(targetApp, packageManager);
+		return Result.ok();
 	}
 	let mode = setupMode;
 	if (!mode) {
@@ -8218,35 +8290,35 @@ async function setupSupabase(config, cliInput) {
 		}
 	}
 	if (mode === "manual") {
-		displayManualSupabaseInstructions(targetApp);
-		return writeSupabaseEnvFile(projectDir, backend, "");
+		displayManualSupabaseInstructions(targetApp, packageManager);
+		return Result.ok();
 	}
 	const initResult = await initializeSupabase(serverDir, packageManager);
 	if (initResult.isErr()) {
 		cliLog.error(pc.red(initResult.error.message));
-		displayManualSupabaseInstructions(targetApp);
-		return writeSupabaseEnvFile(projectDir, backend, "");
+		displayManualSupabaseInstructions(targetApp, packageManager);
+		return initResult;
 	}
 	const startResult = await startSupabase(serverDir, packageManager);
 	if (startResult.isErr()) {
 		cliLog.error(pc.red(startResult.error.message));
-		displayManualSupabaseInstructions(targetApp);
-		return writeSupabaseEnvFile(projectDir, backend, "");
+		displayManualSupabaseInstructions(targetApp, packageManager);
+		return startResult;
 	}
 	const supabaseOutput = startResult.value;
-	const dbUrl = extractDbUrl(await readSupabaseStatus(serverDir, packageManager));
-	if (dbUrl) {
-		const envResult = await writeSupabaseEnvFile(projectDir, backend, dbUrl);
+	const statusResult = await readSupabaseStatus(serverDir, packageManager);
+	if (statusResult.isOk()) {
+		const envResult = await writeSupabaseEnvFile(projectDir, backend, statusResult.value);
 		if (envResult.isOk()) cliLog.success(pc.green("Supabase local development setup ready!"));
 		else {
 			cliLog.error(pc.red("Supabase setup completed, but failed to update .env automatically."));
-			displayManualSupabaseInstructions(targetApp, supabaseOutput);
+			displayManualSupabaseInstructions(targetApp, packageManager, supabaseOutput);
 		}
 		return envResult;
 	}
 	cliLog.error(pc.yellow("Supabase started, but could not extract DB URL automatically."));
-	displayManualSupabaseInstructions(targetApp, supabaseOutput);
-	return databaseSetupError("supabase", "Could not extract database URL from Supabase output. Please configure manually.");
+	displayManualSupabaseInstructions(targetApp, packageManager, supabaseOutput);
+	return statusResult;
 }
 //#endregion
 //#region src/helpers/database-providers/turso-setup.ts
@@ -8766,7 +8838,7 @@ async function displayPostInstallInstructions(config) {
 	let output = `${pc.cyan("1.")} ${cdCmd}\n`;
 	let stepCounter = 2;
 	if (!depsInstalled) output += `${pc.cyan(`${stepCounter++}.`)} ${packageManager} install\n`;
-	if (database === "sqlite" && dbSetup !== "d1") output += `${pc.cyan(`${stepCounter++}.`)} ${runCmd} db:local\n${pc.dim("   (optional - starts local SQLite database)")}\n`;
+	if ((0, types_exports.usesTursoDevServer)(config)) output += `${pc.cyan(`${stepCounter++}.`)} ${runCmd} db:local\n${pc.dim(dbSetup === "turso" ? "   (optional - starts a local Turso database)" : "   (starts the local SQLite server)")}\n`;
 	const hasAlchemyD1 = dbSetup === "d1" && (serverDeploy === "cloudflare" || isBackendSelf && webDeploy === "cloudflare");
 	const hasWranglerLocalD1 = (0, types_exports.getLocalD1Owner)(config) === "wrangler";
 	if (orm === "prisma" && !hasAlchemyD1) output += `${pc.cyan(`${stepCounter++}.`)} ${runCmd} db:generate\n`;
@@ -9169,7 +9241,8 @@ async function* runPostScaffoldSteps(options, cliInput, projectDir, isConvex) {
 		projectDir,
 		install,
 		installError,
-		interrupted: wasAnyStepInterrupted()
+		interrupted: wasAnyStepInterrupted(),
+		stepFailures: getStepFailures()
 	});
 }
 async function setPackageManagerVersion(projectDir, packageManager, version) {
@@ -9438,6 +9511,7 @@ async function createProjectHandlerInternal(input, startTime, timeScaffolded) {
 		await trackProjectCreation(config, input.disableAnalytics, mode);
 		const warnings = [];
 		if (created.interrupted) warnings.push("One or more setup steps were cancelled.");
+		warnings.push(...created.stepFailures);
 		if (created.installError) {
 			warnings.push(created.installError.message);
 			await reportDiagnostic("cli_failed", {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "create-better-t-stack",
-  "version": "3.46.1",
+  "version": "3.48.0",
   "description": "A modern CLI tool for scaffolding end-to-end type-safe TypeScript projects with best practices and customizable configurations",
   "keywords": [
     "better-auth",
@@ -64,17 +64,17 @@
     "dev": "tsdown --watch",
     "check-types": "tsc --noEmit",
     "check-test-types": "tsc --noEmit -p tsconfig.tests.json",
-    "test": "bun test",
-    "test:ci": "bun run build && BTS_SKIP_EXTERNAL_COMMANDS=1 BTS_TEST_MODE=1 bun test --bail=5",
-    "test:complete": "cd ../.. && bun run build && cd apps/cli && BTS_MATRIX_MODE=smoke BTS_BUILD_SAMPLES=1 bun test --bail=5",
+    "test": "bun test ./test",
+    "test:ci": "bun run build && BTS_SKIP_EXTERNAL_COMMANDS=1 BTS_TEST_MODE=1 bun run test --bail=5",
+    "test:complete": "cd ../.. && bun run build && cd apps/cli && BTS_BUILD_SAMPLES=1 bun run test --bail=5",
     "prepublishOnly": "npm run build"
   },
   "dependencies": {
-    "@better-t-stack/template-generator": "^3.46.1",
-    "@better-t-stack/types": "^3.46.1",
+    "@better-t-stack/template-generator": "^3.48.0",
+    "@better-t-stack/types": "^3.48.0",
     "@clack/core": "^1.5.0",
     "@clack/prompts": "^1.8.0",
-    "@modelcontextprotocol/server": "2.0.0",
+    "@modelcontextprotocol/server": "2.3.1",
     "@orpc/server": "^1.15.6",
     "better-result": "^3.0.1",
     "consola": "^3.4.2",
@@ -94,9 +94,9 @@
     "zod": "^4.5.4"
   },
   "devDependencies": {
-    "@modelcontextprotocol/client": "2.0.0",
+    "@modelcontextprotocol/client": "2.3.1",
     "@playwright/test": "1.63.0",
-    "@types/bun": "^1.4.2",
+    "@types/bun": "^1.4.3",
     "@types/fs-extra": "^11.0.4",
     "@types/node": "^26.5.0",
     "@types/semver": "^7.8.0",