create-better-t-stack 3.27.4 → 3.27.5

package/dist/cli.mjs

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

package/dist/index.d.mts

@@ -225,6 +225,9 @@ declare const router: _$_trpc_server0.TRPCBuiltRouter<{
         fumadocs?: {
           template: "react-router" | "tanstack-start" | "next-mdx" | "next-mdx-static" | "waku" | "react-router-spa" | "tanstack-start-spa";
           devPort?: number | undefined;
+          search?: "orama" | "orama-cloud" | undefined;
+          ogImage?: "next-og" | "takumi" | undefined;
+          aiChat?: "openrouter" | "inkeep" | undefined;
         } | undefined;
         opentui?: {
           template: "solid" | "react" | "core";
@@ -244,9 +247,9 @@ declare const router: _$_trpc_server0.TRPCBuiltRouter<{
         } | undefined;
         ultracite?: {
           linter?: "biome" | "oxlint" | "eslint" | undefined;
-          editors?: ("void" | "antigravity" | "cursor" | "vscode" | "zed" | "windsurf" | "trae" | "kiro")[] | undefined;
-          agents?: ("cline" | "codex" | "opencode" | "goose" | "amp" | "droid" | "claude" | "jules" | "copilot" | "aider" | "firebase-studio" | "open-hands" | "gemini" | "junie" | "augmentcode" | "kilo-code" | "roo-code" | "warp" | "crush" | "qwen" | "amazon-q-cli" | "firebender" | "cursor-cli" | "mistral-vibe" | "vercel")[] | undefined;
-          hooks?: ("cursor" | "windsurf" | "claude")[] | undefined;
+          editors?: ("void" | "antigravity" | "cursor" | "vscode" | "zed" | "windsurf" | "trae" | "codebuddy" | "bob" | "kiro")[] | undefined;
+          agents?: ("cline" | "codex" | "opencode" | "goose" | "amp" | "pi" | "qoder" | "droid" | "zencoder" | "mcpjam" | "bob" | "universal" | "claude" | "jules" | "replit" | "devin" | "lovable" | "ona" | "openclaw" | "continue" | "snowflake-cortex" | "deepagents" | "kimi-cli" | "mux" | "adal" | "copilot" | "aider" | "firebase-studio" | "open-hands" | "gemini" | "junie" | "augmentcode" | "kilo-code" | "roo-code" | "warp" | "crush" | "qwen" | "amazon-q-cli" | "firebender" | "cursor-cli" | "mistral-vibe" | "vercel")[] | undefined;
+          hooks?: ("cursor" | "windsurf" | "codebuddy" | "claude" | "copilot")[] | undefined;
         } | undefined;
       } | undefined;
       dbSetupOptions?: {
@@ -332,6 +335,9 @@ declare const router: _$_trpc_server0.TRPCBuiltRouter<{
         fumadocs?: {
           template: "react-router" | "tanstack-start" | "next-mdx" | "next-mdx-static" | "waku" | "react-router-spa" | "tanstack-start-spa";
           devPort?: number | undefined;
+          search?: "orama" | "orama-cloud" | undefined;
+          ogImage?: "next-og" | "takumi" | undefined;
+          aiChat?: "openrouter" | "inkeep" | undefined;
         } | undefined;
         opentui?: {
           template: "solid" | "react" | "core";
@@ -351,9 +357,9 @@ declare const router: _$_trpc_server0.TRPCBuiltRouter<{
         } | undefined;
         ultracite?: {
           linter?: "biome" | "oxlint" | "eslint" | undefined;
-          editors?: ("void" | "antigravity" | "cursor" | "vscode" | "zed" | "windsurf" | "trae" | "kiro")[] | undefined;
-          agents?: ("cline" | "codex" | "opencode" | "goose" | "amp" | "droid" | "claude" | "jules" | "copilot" | "aider" | "firebase-studio" | "open-hands" | "gemini" | "junie" | "augmentcode" | "kilo-code" | "roo-code" | "warp" | "crush" | "qwen" | "amazon-q-cli" | "firebender" | "cursor-cli" | "mistral-vibe" | "vercel")[] | undefined;
-          hooks?: ("cursor" | "windsurf" | "claude")[] | undefined;
+          editors?: ("void" | "antigravity" | "cursor" | "vscode" | "zed" | "windsurf" | "trae" | "codebuddy" | "bob" | "kiro")[] | undefined;
+          agents?: ("cline" | "codex" | "opencode" | "goose" | "amp" | "pi" | "qoder" | "droid" | "zencoder" | "mcpjam" | "bob" | "universal" | "claude" | "jules" | "replit" | "devin" | "lovable" | "ona" | "openclaw" | "continue" | "snowflake-cortex" | "deepagents" | "kimi-cli" | "mux" | "adal" | "copilot" | "aider" | "firebase-studio" | "open-hands" | "gemini" | "junie" | "augmentcode" | "kilo-code" | "roo-code" | "warp" | "crush" | "qwen" | "amazon-q-cli" | "firebender" | "cursor-cli" | "mistral-vibe" | "vercel")[] | undefined;
+          hooks?: ("cursor" | "windsurf" | "codebuddy" | "claude" | "copilot")[] | undefined;
         } | undefined;
       } | undefined;
       webDeploy?: "none" | "cloudflare" | undefined;

package/dist/index.mjs

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

package/dist/{src-nmBsmday.mjs → src-VGvTc2ik.mjs}

@@ -5,7 +5,7 @@ import { initTRPC } from "@trpc/server";
 import { Result, Result as Result$1, TaggedError } from "better-result";
 import { createCli } from "trpc-cli";
 import z from "zod";
-import { cancel, confirm, group, intro, isCancel, log, multiselect, outro, select, spinner, text } from "@clack/prompts";
+import { cancel, confirm, intro, isCancel, log, outro, select, spinner, text } from "@clack/prompts";
 import pc from "picocolors";
 import path from "node:path";
 import envPaths from "env-paths";
@@ -1381,6 +1381,62 @@ const addPackageDependency = async (opts) => {
 	await fs.writeJson(pkgJsonPath, pkgJson, { spaces: 2 });
 };
 //#endregion
+//#region src/prompts/navigable-group.ts
+/**
+* Navigable group - a group of prompts that allows going back
+*/
+/**
+* Define a group of prompts that supports going back to previous prompts.
+* Returns a result object with all the values, or handles cancel/go-back navigation.
+*/
+async function navigableGroup(prompts, opts) {
+	const results = {};
+	const promptNames = Object.keys(prompts);
+	let currentIndex = 0;
+	let goingBack = false;
+	while (currentIndex < promptNames.length) {
+		const name = promptNames[currentIndex];
+		const prompt = prompts[name];
+		setIsFirstPrompt$1(currentIndex === 0);
+		setLastPromptShownUI(false);
+		const result = await prompt({ results })?.catch((e) => {
+			throw e;
+		});
+		if (isGoBack(result)) {
+			goingBack = true;
+			if (currentIndex > 0) {
+				const prevName = promptNames[currentIndex - 1];
+				delete results[prevName];
+				currentIndex--;
+				continue;
+			}
+			goingBack = false;
+			continue;
+		}
+		if (isCancel$1(result)) {
+			if (typeof opts?.onCancel === "function") {
+				results[name] = "canceled";
+				opts.onCancel({ results });
+			}
+			setIsFirstPrompt$1(false);
+			return results;
+		}
+		if (goingBack && !didLastPromptShowUI()) {
+			if (currentIndex > 0) {
+				const prevName = promptNames[currentIndex - 1];
+				delete results[prevName];
+				currentIndex--;
+				continue;
+			}
+		}
+		goingBack = false;
+		results[name] = result;
+		currentIndex++;
+	}
+	setIsFirstPrompt$1(false);
+	return results;
+}
+//#endregion
 //#region src/utils/external-commands.ts
 function shouldSkipExternalCommands() {
 	return process.env.BTS_SKIP_EXTERNAL_COMMANDS === "1" || process.env.BTS_TEST_MODE === "1";
@@ -1484,64 +1540,143 @@ function getPackageRunnerPrefix(packageManager) {
 const TEMPLATES$2 = {
 	"next-mdx": {
 		label: "Next.js: Fumadocs MDX",
-		hint: "Recommended template with MDX support",
+		hint: "recommended",
 		value: "+next+fuma-docs-mdx"
 	},
 	"next-mdx-static": {
-		label: "Next.js: Fumadocs MDX (Static)",
-		hint: "Static export template with MDX support",
+		label: "Next.js Static: Fumadocs MDX",
 		value: "+next+fuma-docs-mdx+static"
 	},
 	waku: {
-		label: "Waku: Content Collections",
-		hint: "Template using Waku with content collections",
+		label: "Waku: Fumadocs MDX",
 		value: "waku"
 	},
 	"react-router": {
-		label: "React Router: MDX Remote",
-		hint: "Template for React Router with MDX remote",
+		label: "React Router: Fumadocs MDX (not RSC)",
 		value: "react-router"
 	},
 	"react-router-spa": {
-		label: "React Router: SPA",
-		hint: "Template for React Router SPA",
+		label: "React Router SPA: Fumadocs MDX (not RSC)",
+		hint: "SPA mode allows you to host the site statically, compatible with a CDN.",
 		value: "react-router-spa"
 	},
 	"tanstack-start": {
-		label: "Tanstack Start: MDX Remote",
-		hint: "Template for Tanstack Start with MDX remote",
+		label: "Tanstack Start: Fumadocs MDX (not RSC)",
 		value: "tanstack-start"
 	},
 	"tanstack-start-spa": {
-		label: "Tanstack Start: SPA",
-		hint: "Template for Tanstack Start SPA",
+		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"
 	}
 };
 const DEFAULT_TEMPLATE$2 = "next-mdx";
 const DEFAULT_DEV_PORT$1 = 4e3;
+function aiChatDisabledForTemplate(template) {
+	return template === "next-mdx-static" || template.endsWith("-spa");
+}
 async function setupFumadocs(config) {
 	if (shouldSkipExternalCommands()) return Result.ok(void 0);
 	const { packageManager, projectDir } = config;
 	cliLog.info("Setting up Fumadocs...");
 	const configuredOptions = config.addonOptions?.fumadocs;
 	let template = configuredOptions?.template;
-	if (!template) if (isSilent()) template = DEFAULT_TEMPLATE$2;
+	let search = configuredOptions?.search;
+	let ogImage = configuredOptions?.ogImage;
+	let aiChat = configuredOptions?.aiChat;
+	if (isSilent()) template = template ?? DEFAULT_TEMPLATE$2;
 	else {
-		const selectedTemplate = await select({
-			message: "Choose a template",
-			options: Object.entries(TEMPLATES$2).map(([key, templateOption]) => ({
-				value: key,
-				label: templateOption.label,
-				hint: templateOption.hint
-			})),
-			initialValue: DEFAULT_TEMPLATE$2
+		const promptResult = await Result.tryPromise({
+			try: () => navigableGroup({
+				template: async () => {
+					if (template !== void 0) return template;
+					return navigableSelect({
+						message: "Choose a template",
+						options: Object.entries(TEMPLATES$2).map(([key, t]) => ({
+							value: key,
+							label: t.label,
+							hint: "hint" in t ? t.hint : void 0
+						})),
+						initialValue: DEFAULT_TEMPLATE$2
+					});
+				},
+				search: async () => {
+					if (search !== void 0) return search;
+					return navigableSelect({
+						message: "Choose a search solution?",
+						options: [{
+							value: "orama",
+							label: "Default",
+							hint: "local search powered by Orama, recommended"
+						}, {
+							value: "orama-cloud",
+							label: "Orama Cloud",
+							hint: "3rd party search solution, signup needed"
+						}],
+						initialValue: "orama"
+					});
+				},
+				ogImage: async ({ results }) => {
+					if (ogImage !== void 0) return ogImage;
+					if (!(results.template ?? template ?? DEFAULT_TEMPLATE$2).startsWith("next-")) return "skip";
+					return navigableSelect({
+						message: "Configure Open Graph Image generation?",
+						options: [{
+							value: "next-og",
+							label: "next/og",
+							hint: "Next.js built-in solution"
+						}, {
+							value: "takumi",
+							label: "Takumi",
+							hint: "Output WebP format, framework-agnostic"
+						}],
+						initialValue: "next-og"
+					});
+				},
+				aiChat: async ({ results }) => {
+					if (aiChat !== void 0) return aiChat;
+					if (aiChatDisabledForTemplate(results.template ?? template ?? DEFAULT_TEMPLATE$2)) return "none";
+					return navigableSelect({
+						message: "Configure AI Chat?",
+						options: [
+							{
+								value: "none",
+								label: "No"
+							},
+							{
+								value: "openrouter",
+								label: "AI SDK",
+								hint: "default to OpenRouter"
+							},
+							{
+								value: "inkeep",
+								label: "Inkeep AI",
+								hint: "API key required"
+							}
+						],
+						initialValue: "none"
+					});
+				}
+			}),
+			catch: (e) => new AddonSetupError({
+				addon: "fumadocs",
+				message: `Failed to run Fumadocs prompts: ${e instanceof Error ? e.message : String(e)}`,
+				cause: e
+			})
 		});
-		if (isCancel(selectedTemplate)) return userCancelled("Operation cancelled");
-		template = selectedTemplate;
-	}
-	const templateArg = TEMPLATES$2[template].value;
+		if (promptResult.isErr()) return Result.err(promptResult.error);
+		const results = promptResult.value;
+		if (results.template === void 0 || results.search === void 0 || results.ogImage === void 0 || results.aiChat === void 0) return userCancelled("Operation cancelled");
+		template = results.template;
+		search = results.search;
+		ogImage = results.ogImage === "skip" ? void 0 : results.ogImage;
+		aiChat = results.aiChat === "none" ? void 0 : results.aiChat;
+	}
+	if (!template) return userCancelled("Operation cancelled");
 	const isNextTemplate = template.startsWith("next-");
+	if (!isNextTemplate) ogImage = void 0;
+	if (aiChatDisabledForTemplate(template)) aiChat = void 0;
+	const templateArg = TEMPLATES$2[template].value;
 	const devPort = configuredOptions?.devPort ?? DEFAULT_DEV_PORT$1;
 	const options = [
 		`--template ${templateArg}`,
@@ -1549,7 +1684,10 @@ async function setupFumadocs(config) {
 		"--no-git"
 	];
 	if (isNextTemplate) options.push("--src");
-	if (config.addons.includes("biome")) options.push("--linter biome");
+	if (config.addons.includes("biome") || config.addons.includes("ultracite")) options.push("--linter biome");
+	if (search) options.push(`--search ${search}`);
+	if (ogImage) options.push(`--og-image ${ogImage}`);
+	if (aiChat) options.push(`--ai-chat ${aiChat}`);
 	const args = getPackageExecutionArgs(packageManager, `create-fumadocs-app@latest fumadocs ${options.join(" ")}`);
 	const appsDir = path.join(projectDir, "apps");
 	await fs.ensureDir(appsDir);
@@ -1812,67 +1950,84 @@ async function setupMcp(config) {
 	if (shouldSkipExternalCommands()) return Result.ok(void 0);
 	const { packageManager, projectDir } = config;
 	cliLog.info("Setting up MCP servers...");
-	let scope = config.addonOptions?.mcp?.scope;
-	if (!scope) if (isSilent()) scope = DEFAULT_SCOPE$1;
-	else {
-		const selectedScope = await select({
-			message: "Where should MCP servers be installed?",
-			options: [{
-				value: "project",
-				label: "Project",
-				hint: "Writes to project config files (recommended for teams)"
-			}, {
-				value: "global",
-				label: "Global",
-				hint: "Writes to user-level config files (personal machine)"
-			}],
-			initialValue: DEFAULT_SCOPE$1
-		});
-		if (isCancel(selectedScope)) return Result.err(new UserCancelledError({ message: "Operation cancelled" }));
-		scope = selectedScope;
-	}
-	const recommendedServers = getRecommendedMcpServers(config, scope);
-	if (recommendedServers.length === 0) return Result.ok(void 0);
-	const allServersByKey = new Map(getAllMcpServers(config).map((server) => [server.key, server]));
-	const serverOptions = recommendedServers.map((s) => ({
-		value: s.key,
-		label: s.label,
-		hint: s.target
-	}));
+	const configuredScope = config.addonOptions?.mcp?.scope;
 	const configuredServerKeys = config.addonOptions?.mcp?.servers;
-	const availableServerKeys = new Set(allServersByKey.keys());
-	let selectedServerKeys = configuredServerKeys?.filter((serverKey) => availableServerKeys.has(serverKey)) ?? [];
-	if (selectedServerKeys.length === 0 && configuredServerKeys === void 0) if (isSilent()) selectedServerKeys = serverOptions.map((o) => o.value);
-	else {
-		const promptedServerKeys = await multiselect({
-			message: "Select MCP servers to install",
-			options: serverOptions,
-			required: false,
-			initialValues: serverOptions.map((o) => o.value)
-		});
-		if (isCancel(promptedServerKeys)) return Result.err(new UserCancelledError({ message: "Operation cancelled" }));
-		selectedServerKeys = [...promptedServerKeys];
-	}
-	if (selectedServerKeys.length === 0) return Result.ok(void 0);
-	const agentOptions = filterAgentsForScope(scope).map((a) => ({
-		value: a.value,
-		label: a.label
-	}));
-	const defaultAgents = uniqueValues$1(DEFAULT_AGENTS$2.filter((agent) => agentOptions.some((option) => option.value === agent)));
 	const configuredAgents = config.addonOptions?.mcp?.agents;
-	let selectedAgents = configuredAgents?.filter((agent) => agentOptions.some((option) => option.value === agent)) ?? [];
-	if (selectedAgents.length === 0 && configuredAgents === void 0) if (isSilent()) selectedAgents = defaultAgents;
-	else {
-		const promptedAgents = await multiselect({
-			message: "Select agents to install MCP servers to",
-			options: agentOptions,
-			required: false,
-			initialValues: defaultAgents
+	const allServersByKey = new Map(getAllMcpServers(config).map((server) => [server.key, server]));
+	const availableServerKeys = new Set(allServersByKey.keys());
+	let scope;
+	let selectedServerKeys;
+	let selectedAgents;
+	if (isSilent()) {
+		scope = configuredScope ?? DEFAULT_SCOPE$1;
+		const recommendedServers = getRecommendedMcpServers(config, scope);
+		if (recommendedServers.length === 0) return Result.ok(void 0);
+		const serverOptions = recommendedServers.map((s) => s.key);
+		selectedServerKeys = configuredServerKeys?.filter((k) => availableServerKeys.has(k)) ?? serverOptions;
+		if (selectedServerKeys.length === 0) return Result.ok(void 0);
+		const agentOptions = filterAgentsForScope(scope);
+		const defaultAgents = uniqueValues$1(DEFAULT_AGENTS$2.filter((a) => agentOptions.some((o) => o.value === a)));
+		selectedAgents = configuredAgents?.filter((a) => agentOptions.some((o) => o.value === a)) ?? defaultAgents;
+		if (selectedAgents.length === 0) return Result.ok(void 0);
+	} else {
+		const results = await navigableGroup({
+			scope: async () => {
+				if (configuredScope !== void 0) return configuredScope;
+				return navigableSelect({
+					message: "Where should MCP servers be installed?",
+					options: [{
+						value: "project",
+						label: "Project",
+						hint: "Writes to project config files (recommended for teams)"
+					}, {
+						value: "global",
+						label: "Global",
+						hint: "Writes to user-level config files (personal machine)"
+					}],
+					initialValue: DEFAULT_SCOPE$1
+				});
+			},
+			servers: async ({ results: r }) => {
+				const recommended = getRecommendedMcpServers(config, r.scope ?? configuredScope ?? DEFAULT_SCOPE$1);
+				if (recommended.length === 0) return [];
+				const options = recommended.map((s) => ({
+					value: s.key,
+					label: s.label,
+					hint: s.target
+				}));
+				if (configuredServerKeys !== void 0) return configuredServerKeys.filter((k) => availableServerKeys.has(k));
+				return navigableMultiselect({
+					message: "Select MCP servers to install",
+					options,
+					required: false,
+					initialValues: options.map((o) => o.value)
+				});
+			},
+			agents: async ({ results: r }) => {
+				const currentScope = r.scope ?? configuredScope ?? DEFAULT_SCOPE$1;
+				const currentServers = r.servers;
+				if (currentServers !== void 0 && currentServers.length === 0) return [];
+				const agentOpts = filterAgentsForScope(currentScope);
+				if (agentOpts.length === 0) return [];
+				const defaults = uniqueValues$1(DEFAULT_AGENTS$2.filter((a) => agentOpts.some((o) => o.value === a)));
+				if (configuredAgents !== void 0) return configuredAgents.filter((a) => agentOpts.some((o) => o.value === a));
+				return navigableMultiselect({
+					message: "Select agents to install MCP servers to",
+					options: agentOpts.map((a) => ({
+						value: a.value,
+						label: a.label
+					})),
+					required: false,
+					initialValues: defaults
+				});
+			}
 		});
-		if (isCancel(promptedAgents)) return Result.err(new UserCancelledError({ message: "Operation cancelled" }));
-		selectedAgents = [...promptedAgents];
+		if (results.scope === void 0 || results.servers === void 0 || results.agents === void 0) return Result.err(new UserCancelledError({ message: "Operation cancelled" }));
+		scope = results.scope;
+		selectedServerKeys = results.servers;
+		selectedAgents = results.agents;
+		if (selectedServerKeys.length === 0 || selectedAgents.length === 0) return Result.ok(void 0);
 	}
-	if (selectedAgents.length === 0) return Result.ok(void 0);
 	const selectedServers = [];
 	for (const key of selectedServerKeys) {
 		const server = allServersByKey.get(key);
@@ -2236,55 +2391,64 @@ async function setupSkills(config) {
 		}));
 	});
 	if (skillOptions.length === 0) return Result.ok(void 0);
-	let scope = skillsOptions?.scope;
-	if (!scope) if (isSilent()) scope = DEFAULT_SCOPE;
-	else {
-		const selectedScope = await select({
-			message: "Where should skills be installed?",
-			options: [{
-				value: "project",
-				label: "Project",
-				hint: "Writes to project config files (recommended for teams)"
-			}, {
-				value: "global",
-				label: "Global",
-				hint: "Writes to user-level config files (personal machine)"
-			}],
-			initialValue: DEFAULT_SCOPE
-		});
-		if (isCancel(selectedScope)) return Result.err(new UserCancelledError({ message: "Operation cancelled" }));
-		scope = selectedScope;
-	}
-	const allSkillValues = skillOptions.map((opt) => opt.value);
+	const configuredScope = skillsOptions?.scope;
 	const configuredSelections = skillsOptions?.selections;
-	let selectedSkills;
-	if (configuredSelections !== void 0) selectedSkills = configuredSelections.flatMap((selection) => selection.skills.map((skill) => `${selection.source}::${skill}`));
-	else if (isSilent()) selectedSkills = allSkillValues;
-	else {
-		const promptedSkills = await multiselect({
-			message: "Select skills to install",
-			options: skillOptions,
-			required: false,
-			initialValues: allSkillValues
-		});
-		if (isCancel(promptedSkills)) return Result.err(new UserCancelledError({ message: "Operation cancelled" }));
-		selectedSkills = promptedSkills;
-	}
-	if (selectedSkills.length === 0) return Result.ok(void 0);
 	const configuredAgents = skillsOptions?.agents;
-	let selectedAgents = configuredAgents ? [...configuredAgents] : [];
-	if (selectedAgents.length === 0 && configuredAgents === void 0) if (isSilent()) selectedAgents = [...DEFAULT_AGENTS$1];
-	else {
-		const promptedAgents = await multiselect({
-			message: "Select agents to install skills to",
-			options: AVAILABLE_AGENTS,
-			required: false,
-			initialValues: [...DEFAULT_AGENTS$1]
+	const allSkillValues = skillOptions.map((opt) => opt.value);
+	let scope;
+	let selectedSkills;
+	let selectedAgents;
+	if (isSilent()) {
+		scope = configuredScope ?? DEFAULT_SCOPE;
+		selectedSkills = configuredSelections !== void 0 ? configuredSelections.flatMap((selection) => selection.skills.map((skill) => `${selection.source}::${skill}`)) : allSkillValues;
+		if (selectedSkills.length === 0) return Result.ok(void 0);
+		selectedAgents = configuredAgents ? [...configuredAgents] : [...DEFAULT_AGENTS$1];
+		if (selectedAgents.length === 0) return Result.ok(void 0);
+	} else {
+		const results = await navigableGroup({
+			scope: async () => {
+				if (configuredScope !== void 0) return configuredScope;
+				return navigableSelect({
+					message: "Where should skills be installed?",
+					options: [{
+						value: "project",
+						label: "Project",
+						hint: "Writes to project config files (recommended for teams)"
+					}, {
+						value: "global",
+						label: "Global",
+						hint: "Writes to user-level config files (personal machine)"
+					}],
+					initialValue: DEFAULT_SCOPE
+				});
+			},
+			skills: async () => {
+				if (configuredSelections !== void 0) return configuredSelections.flatMap((selection) => selection.skills.map((skill) => `${selection.source}::${skill}`));
+				return navigableMultiselect({
+					message: "Select skills to install",
+					options: skillOptions,
+					required: false,
+					initialValues: allSkillValues
+				});
+			},
+			agents: async ({ results: r }) => {
+				const pickedSkills = r.skills;
+				if (pickedSkills !== void 0 && pickedSkills.length === 0) return [];
+				if (configuredAgents !== void 0) return [...configuredAgents];
+				return navigableMultiselect({
+					message: "Select agents to install skills to",
+					options: AVAILABLE_AGENTS,
+					required: false,
+					initialValues: [...DEFAULT_AGENTS$1]
+				});
+			}
 		});
-		if (isCancel(promptedAgents)) return Result.err(new UserCancelledError({ message: "Operation cancelled" }));
-		selectedAgents = [...promptedAgents];
+		if (results.scope === void 0 || results.skills === void 0 || results.agents === void 0) return Result.err(new UserCancelledError({ message: "Operation cancelled" }));
+		scope = results.scope;
+		selectedSkills = results.skills;
+		selectedAgents = results.agents;
+		if (selectedSkills.length === 0 || selectedAgents.length === 0) return Result.ok(void 0);
 	}
-	if (selectedAgents.length === 0) return Result.ok(void 0);
 	const skillsBySource = {};
 	for (const skillKey of selectedSkills) {
 		const [source, skillName] = skillKey.split("::");
@@ -2474,7 +2638,8 @@ async function setupTui(config) {
 	cliLog.info("Setting up OpenTUI...");
 	let template = resolveTuiTemplate(config);
 	if (!template) {
-		const selectedTemplate = await select({
+		setIsFirstPrompt(true);
+		const selectedTemplate = await navigableSelect({
 			message: "Choose a template",
 			options: Object.entries(TEMPLATES$1).map(([key, templateOption]) => ({
 				value: key,
@@ -2483,7 +2648,7 @@ async function setupTui(config) {
 			})),
 			initialValue: DEFAULT_TEMPLATE$1
 		});
-		if (isCancel(selectedTemplate)) return userCancelled("Operation cancelled");
+		if (isCancel$1(selectedTemplate)) return userCancelled("Operation cancelled");
 		template = selectedTemplate;
 	}
 	const args = getPackageExecutionArgs(packageManager, `create-tui@latest --template ${template} --no-git --no-install tui`);
@@ -2563,42 +2728,40 @@ async function postProcessTuiWorkspace(tuiDir) {
 //#endregion
 //#region src/helpers/addons/ultracite-setup.ts
 const LINTERS = {
-	biome: {
-		label: "Biome",
-		hint: "Fast formatter and linter"
-	},
-	eslint: {
-		label: "ESLint",
-		hint: "Traditional JavaScript linter"
-	},
-	oxlint: {
-		label: "Oxlint",
-		hint: "Oxidation compiler linter"
-	}
-};
-const EDITORS = {
-	vscode: { label: "VS Code" },
-	cursor: { label: "Cursor" },
-	windsurf: { label: "Windsurf" },
-	antigravity: { label: "Antigravity" },
-	kiro: { label: "Kiro" },
-	trae: { label: "Trae" },
-	void: { label: "Void" },
-	zed: { label: "Zed" }
+	biome: { label: "Biome (Recommended)" },
+	eslint: { label: "ESLint + Prettier + Stylelint" },
+	oxlint: { label: "Oxlint + Oxfmt" }
 };
 const AGENTS = {
-	claude: { label: "Claude" },
+	universal: { label: "Universal (AGENTS.md — covers all agents)" },
+	claude: { label: "Claude Code" },
 	codex: { label: "Codex" },
 	jules: { label: "Jules" },
+	replit: { label: "Replit Agent" },
+	devin: { label: "Devin" },
+	lovable: { label: "Lovable" },
+	zencoder: { label: "Zencoder" },
+	ona: { label: "Ona" },
+	openclaw: { label: "OpenClaw" },
+	continue: { label: "Continue" },
+	"snowflake-cortex": { label: "Snowflake Cortex" },
+	deepagents: { label: "Deepagents" },
+	qoder: { label: "Qoder" },
+	"kimi-cli": { label: "Kimi CLI" },
+	mcpjam: { label: "MCPJam" },
+	mux: { label: "Mux" },
+	pi: { label: "Pi" },
+	adal: { label: "AdaL" },
 	copilot: { label: "GitHub Copilot" },
 	cline: { label: "Cline" },
-	amp: { label: "Amp" },
+	amp: { label: "AMP" },
 	aider: { label: "Aider" },
 	"firebase-studio": { label: "Firebase Studio" },
-	"open-hands": { label: "Open Hands" },
+	"open-hands": { label: "OpenHands" },
 	gemini: { label: "Gemini" },
 	junie: { label: "Junie" },
-	augmentcode: { label: "AugmentCode" },
+	augmentcode: { label: "Augment Code" },
+	bob: { label: "IBM Bob" },
 	"kilo-code": { label: "Kilo Code" },
 	goose: { label: "Goose" },
 	"roo-code": { label: "Roo Code" },
@@ -2606,21 +2769,23 @@ const AGENTS = {
 	droid: { label: "Droid" },
 	opencode: { label: "OpenCode" },
 	crush: { label: "Crush" },
-	qwen: { label: "Qwen" },
+	qwen: { label: "Qwen Code" },
 	"amazon-q-cli": { label: "Amazon Q CLI" },
 	firebender: { label: "Firebender" },
 	"cursor-cli": { label: "Cursor CLI" },
 	"mistral-vibe": { label: "Mistral Vibe" },
-	vercel: { label: "Vercel" }
+	vercel: { label: "Vercel Agent" }
 };
 const HOOKS = {
 	cursor: { label: "Cursor" },
 	windsurf: { label: "Windsurf" },
-	claude: { label: "Claude" }
+	codebuddy: { label: "CodeBuddy" },
+	claude: { label: "Claude Code" },
+	copilot: { label: "GitHub Copilot" }
 };
 const DEFAULT_LINTER = "biome";
-const DEFAULT_EDITORS = ["vscode", "cursor"];
-const DEFAULT_AGENTS = ["claude", "codex"];
+const DEFAULT_EDITORS = ["vscode"];
+const DEFAULT_AGENTS = ["universal"];
 const DEFAULT_HOOKS = [];
 function getFrameworksFromFrontend(frontend) {
 	const frameworkMap = {
@@ -2633,7 +2798,8 @@ function getFrameworksFromFrontend(frontend) {
 		"native-uniwind": "react",
 		"native-unistyles": "react",
 		svelte: "svelte",
-		solid: "solid"
+		solid: "solid",
+		astro: "astro"
 	};
 	const frameworks = /* @__PURE__ */ new Set();
 	for (const f of frontend) if (f !== "none" && frameworkMap[f]) frameworks.add(frameworkMap[f]);
@@ -2651,10 +2817,7 @@ function buildUltraciteInitArgs({ packageManager, linter, frameworks, editors, a
 	if (editors.length > 0) ultraciteArgs.push("--editors", ...editors);
 	if (agents.length > 0) ultraciteArgs.push("--agents", ...agents);
 	if (hooks.length > 0) ultraciteArgs.push("--hooks", ...hooks);
-	if (gitHooks.length > 0) {
-		const integrations = gitHooks.includes("husky") ? [...new Set([...gitHooks, "lint-staged"])] : gitHooks;
-		ultraciteArgs.push("--integrations", ...integrations);
-	}
+	if (gitHooks.length > 0) ultraciteArgs.push("--integrations", ...gitHooks);
 	return [
 		...getPackageRunnerPrefix(packageManager),
 		"ultracite@latest",
@@ -2678,67 +2841,60 @@ async function setupUltracite(config, gitHooks) {
 		agents = agents ?? [...DEFAULT_AGENTS];
 		hooks = hooks ?? [...DEFAULT_HOOKS];
 	} else {
-		const groupResult = await Result.tryPromise({
-			try: async () => {
-				return await group({
-					linter: () => select({
-						message: "Choose linter/formatter",
-						options: Object.entries(LINTERS).map(([key, linterOption]) => ({
-							value: key,
-							label: linterOption.label,
-							hint: linterOption.hint
-						})),
-						initialValue: linter ?? DEFAULT_LINTER
-					}),
-					editors: () => multiselect({
-						message: "Choose editors",
-						required: false,
-						options: Object.entries(EDITORS).map(([key, editor]) => ({
-							value: key,
-							label: editor.label
-						})),
-						initialValues: editors ?? [...DEFAULT_EDITORS]
-					}),
-					agents: () => multiselect({
-						message: "Choose agents",
-						required: false,
-						options: Object.entries(AGENTS).map(([key, agent]) => ({
-							value: key,
-							label: agent.label
-						})),
-						initialValues: agents ?? [...DEFAULT_AGENTS]
-					}),
-					hooks: () => multiselect({
-						message: "Choose hooks",
-						required: false,
-						options: Object.entries(HOOKS).map(([key, hook]) => ({
-							value: key,
-							label: hook.label
-						})),
-						initialValues: hooks ?? [...DEFAULT_HOOKS]
-					})
-				}, { onCancel: () => {
-					throw new UserCancelledError({ message: "Operation cancelled" });
-				} });
+		const results = await navigableGroup({
+			linter: async () => {
+				if (linter !== void 0) return linter;
+				return navigableSelect({
+					message: "Which linter do you want to use?",
+					options: Object.entries(LINTERS).map(([key, linterOption]) => ({
+						value: key,
+						label: linterOption.label
+					})),
+					initialValue: linter ?? DEFAULT_LINTER
+				});
 			},
-			catch: (e) => {
-				if (e instanceof UserCancelledError) return e;
-				return new AddonSetupError({
-					addon: "ultracite",
-					message: `Failed to get user preferences: ${e instanceof Error ? e.message : String(e)}`,
-					cause: e
+			editors: async () => {
+				if (editors !== void 0) return editors;
+				return navigableMultiselect({
+					message: "Which editors do you want to configure (recommended)?",
+					required: false,
+					options: [{
+						value: "vscode",
+						label: "VSCode / Cursor / Windsurf"
+					}, {
+						value: "zed",
+						label: "Zed"
+					}]
+				});
+			},
+			agents: async () => {
+				if (agents !== void 0) return agents;
+				return navigableMultiselect({
+					message: "Which agent files do you want to add (optional)?",
+					required: false,
+					options: Object.entries(AGENTS).map(([key, agent]) => ({
+						value: key,
+						label: agent.label
+					}))
+				});
+			},
+			hooks: async () => {
+				if (hooks !== void 0) return hooks;
+				return navigableMultiselect({
+					message: "Which agent hooks do you want to enable (optional)?",
+					required: false,
+					options: Object.entries(HOOKS).map(([key, hook]) => ({
+						value: key,
+						label: hook.label
+					}))
 				});
 			}
 		});
-		if (groupResult.isErr()) {
-			if (UserCancelledError.is(groupResult.error)) return userCancelled(groupResult.error.message);
-			cliLog.error(pc.red("Failed to set up Ultracite"));
-			return groupResult;
-		}
-		linter = groupResult.value.linter;
-		editors = groupResult.value.editors;
-		agents = groupResult.value.agents;
-		hooks = groupResult.value.hooks;
+		if (results.linter === void 0 || results.editors === void 0 || results.agents === void 0 || results.hooks === void 0) return userCancelled("Operation cancelled");
+		linter = results.linter;
+		editors = results.editors;
+		agents = results.agents;
+		hooks = results.hooks;
 	}
 	const frameworks = getFrameworksFromFrontend(frontend);
 	const args = buildUltraciteInitArgs({
@@ -2809,7 +2965,8 @@ async function setupWxt(config) {
 	let template = configuredOptions?.template;
 	if (!template) if (isSilent()) template = DEFAULT_TEMPLATE;
 	else {
-		const selectedTemplate = await select({
+		setIsFirstPrompt(true);
+		const selectedTemplate = await navigableSelect({
 			message: "Choose a template",
 			options: Object.entries(TEMPLATES).map(([key, templateOption]) => ({
 				value: key,
@@ -2818,7 +2975,7 @@ async function setupWxt(config) {
 			})),
 			initialValue: DEFAULT_TEMPLATE
 		});
-		if (isCancel(selectedTemplate)) return userCancelled("Operation cancelled");
+		if (isCancel$1(selectedTemplate)) return userCancelled("Operation cancelled");
 		template = selectedTemplate;
 	}
 	const devPort = configuredOptions?.devPort ?? DEFAULT_DEV_PORT;
@@ -3648,62 +3805,6 @@ async function getinstallChoice(install) {
 	return response;
 }
 //#endregion
-//#region src/prompts/navigable-group.ts
-/**
-* Navigable group - a group of prompts that allows going back
-*/
-/**
-* Define a group of prompts that supports going back to previous prompts.
-* Returns a result object with all the values, or handles cancel/go-back navigation.
-*/
-async function navigableGroup(prompts, opts) {
-	const results = {};
-	const promptNames = Object.keys(prompts);
-	let currentIndex = 0;
-	let goingBack = false;
-	while (currentIndex < promptNames.length) {
-		const name = promptNames[currentIndex];
-		const prompt = prompts[name];
-		setIsFirstPrompt$1(currentIndex === 0);
-		setLastPromptShownUI(false);
-		const result = await prompt({ results })?.catch((e) => {
-			throw e;
-		});
-		if (isGoBack(result)) {
-			goingBack = true;
-			if (currentIndex > 0) {
-				const prevName = promptNames[currentIndex - 1];
-				delete results[prevName];
-				currentIndex--;
-				continue;
-			}
-			goingBack = false;
-			continue;
-		}
-		if (isCancel$1(result)) {
-			if (typeof opts?.onCancel === "function") {
-				results[name] = "canceled";
-				opts.onCancel({ results });
-			}
-			setIsFirstPrompt$1(false);
-			return results;
-		}
-		if (goingBack && !didLastPromptShowUI()) {
-			if (currentIndex > 0) {
-				const prevName = promptNames[currentIndex - 1];
-				delete results[prevName];
-				currentIndex--;
-				continue;
-			}
-		}
-		goingBack = false;
-		results[name] = result;
-		currentIndex++;
-	}
-	setIsFirstPrompt$1(false);
-	return results;
-}
-//#endregion
 //#region src/utils/config-validation.ts
 function validationErr(message) {
 	return Result.err(new ValidationError({ message }));

package/package.json

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