create-better-t-stack 3.40.4 → 3.40.5

package/dist/cli.mjs

@@ -1,5 +1,5 @@
 #!/usr/bin/env node
-import { i as SchemaNameSchema, l as create, m as getSchemaResult, s as add, u as createBtsCli, v as types_exports, y as getLatestCLIVersion } from "./src-CpGAduw0.mjs";
+import { i as SchemaNameSchema, l as create, m as getSchemaResult, s as add, u as createBtsCli, v as types_exports, y as getLatestCLIVersion } from "./src-E3yd8mxg.mjs";
 import z from "zod";
 import { McpServer } from "@modelcontextprotocol/sdk/server/mcp.js";
 import { StdioServerTransport } from "@modelcontextprotocol/sdk/server/stdio.js";
@@ -79,7 +79,7 @@ function getStackGuidance() {
 			"For project creation, build a full explicit config before calling bts_plan_project.",
 			"Always call bts_plan_project before bts_create_project.",
 			"Only call bts_create_project after the plan succeeds and matches the user's intent.",
-			"Use bts_plan_addons before bts_add_addons for existing projects."
+			"Use bts_plan_addons before bts_add_addons when adding addons or scaffolding a workspace package in an existing project."
 		],
 		createContract: {
 			requiresExplicitFields: [
@@ -224,12 +224,12 @@ function createBtsMcpServer() {
 		}
 	});
 	server.registerTool("bts_plan_addons", {
-		title: "Plan Better T Stack Addons",
-		description: "Validate and preview addon installation for an existing Better T Stack project without writing files. Always use this before bts_add_addons when the addon set or nested options are uncertain.",
+		title: "Plan Better T Stack Project Additions",
+		description: "Validate and preview addon installation or workspace package scaffolding for an existing Better T Stack project without writing files. Always use this before bts_add_addons.",
 		inputSchema: types_exports.AddInputSchema,
 		outputSchema: ToolResponseSchema,
 		annotations: {
-			title: "Plan Better T Stack Addons",
+			title: "Plan Better T Stack Project Additions",
 			readOnlyHint: true,
 			destructiveHint: false,
 			idempotentHint: true,
@@ -241,19 +241,19 @@ function createBtsMcpServer() {
 				...input,
 				dryRun: true
 			});
-			if (!result?.success) return formatToolError(result?.error ?? "Failed to plan addon installation");
+			if (!result?.success) return formatToolError(result?.error ?? "Failed to plan project additions");
 			return formatToolSuccess(result);
 		} catch (error) {
 			return formatToolError(error);
 		}
 	});
 	server.registerTool("bts_add_addons", {
-		title: "Add Better T Stack Addons",
-		description: "Install addons into an existing Better T Stack project using the same silent flow as add-json. Call this only after bts_plan_addons succeeds and the planned changes match the user's intent.",
+		title: "Apply Better T Stack Project Additions",
+		description: "Install addons or scaffold a workspace package in an existing Better T Stack project using the same silent flow as add-json. Call this only after bts_plan_addons succeeds and the planned changes match the user's intent.",
 		inputSchema: types_exports.AddInputSchema,
 		outputSchema: ToolResponseSchema,
 		annotations: {
-			title: "Add Better T Stack Addons",
+			title: "Apply Better T Stack Project Additions",
 			destructiveHint: true,
 			idempotentHint: false,
 			openWorldHint: true
@@ -261,7 +261,7 @@ function createBtsMcpServer() {
 	}, async (input) => {
 		try {
 			const result = await add(input);
-			if (!result?.success) return formatToolError(result?.error ?? "Failed to add addons");
+			if (!result?.success) return formatToolError(result?.error ?? "Failed to update project");
 			return formatToolSuccess(result);
 		} catch (error) {
 			return formatToolError(error);

package/dist/index.d.mts

@@ -153,6 +153,7 @@ interface AddResult {
   projectDir: string;
   dryRun?: boolean;
   plannedFileCount?: number;
+  addedPackage?: string;
   error?: string;
 }
 //#endregion
@@ -349,6 +350,7 @@ declare const router: import("@trpc/server").TRPCBuiltRouter<{
   add: import("@trpc/server").TRPCMutationProcedure<{
     input: {
       addons?: ("none" | "pwa" | "tauri" | "electrobun" | "starlight" | "biome" | "lefthook" | "husky" | "mcp" | "turborepo" | "nx" | "vite-plus" | "fumadocs" | "ultracite" | "oxlint" | "opentui" | "wxt" | "skills" | "evlog")[] | undefined;
+      package?: string | undefined;
       install?: boolean | undefined;
       packageManager?: "bun" | "npm" | "pnpm" | undefined;
       projectDir?: string | undefined;
@@ -360,6 +362,7 @@ declare const router: import("@trpc/server").TRPCBuiltRouter<{
   addJson: import("@trpc/server").TRPCMutationProcedure<{
     input: {
       addons?: ("none" | "pwa" | "tauri" | "electrobun" | "starlight" | "biome" | "lefthook" | "husky" | "mcp" | "turborepo" | "nx" | "vite-plus" | "fumadocs" | "ultracite" | "oxlint" | "opentui" | "wxt" | "skills" | "evlog")[] | undefined;
+      package?: string | undefined;
       addonOptions?: {
         wxt?: {
           template: "svelte" | "solid" | "vanilla" | "vue" | "react";
@@ -473,9 +476,9 @@ declare function builder(): Promise<void>;
  * ```
  */
 declare function createVirtual(options: Partial<Omit<types_d_exports.ProjectConfig, "projectDir" | "relativePath">>): Promise<Result$1<VirtualFileTree$1, GeneratorError$1>>;
-type AddOptions = Pick<types_d_exports.AddInput, "addons" | "addonOptions" | "install" | "packageManager" | "projectDir" | "dryRun">;
+type AddOptions = Pick<types_d_exports.AddInput, "addons" | "addonOptions" | "package" | "install" | "packageManager" | "projectDir" | "dryRun">;
 /**
- * Programmatic API to add addons to an existing Better-T-Stack project.
+ * Programmatic API to add addons or a workspace package to an existing Better-T-Stack project.
  *
  * @example
  * ```typescript

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-CpGAduw0.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-E3yd8mxg.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-CpGAduw0.mjs → src-E3yd8mxg.mjs}

@@ -4653,6 +4653,68 @@ const TASK_RUNNER_ADDONS = [
 	"nx",
 	"vite-plus"
 ];
+const fileExistsErrorSchema = z.object({ code: z.literal("EEXIST") });
+const configPackageScopeSchema = z.object({ name: z.string().regex(/^@[a-z0-9](?:[a-z0-9._-]*[a-z0-9])?\/config$/) }).transform(({ name }) => name.slice(0, -7));
+const rootTypescriptVersionSchema = z.object({ devDependencies: z.object({ typescript: z.string().min(1) }) }).transform(({ devDependencies }) => devDependencies.typescript);
+function isFileExistsError(cause) {
+	return fileExistsErrorSchema.safeParse(cause).success;
+}
+async function reserveWorkspacePackage(projectDir, packageName) {
+	const packageDir = path.join(projectDir, "packages", packageName);
+	return Result.tryPromise({
+		try: async () => {
+			await fs.mkdir(packageDir);
+			return packageDir;
+		},
+		catch: (cause) => new CLIError({
+			message: isFileExistsError(cause) ? `Workspace package already exists: packages/${packageName}` : `Failed to reserve workspace package: packages/${packageName}`,
+			cause
+		})
+	});
+}
+async function addWorkspacePackage(vfs, projectDir, packageName, packageManager) {
+	const packageDir = path.join(projectDir, "packages", packageName);
+	if (await fs.pathExists(packageDir)) return Result.err(new CLIError({ message: `Workspace package already exists: packages/${packageName}` }));
+	const configPackagePath = path.join(projectDir, "packages", "config", "package.json");
+	const packageScopeResult = await Result.tryPromise({
+		try: async () => configPackageScopeSchema.parse(await fs.readJson(configPackagePath)),
+		catch: (cause) => new CLIError({
+			message: "Cannot determine the workspace package scope. Expected packages/config/package.json to have a name like @my-app/config.",
+			cause
+		})
+	});
+	if (packageScopeResult.isErr()) return Result.err(packageScopeResult.error);
+	const typescriptVersionResult = await Result.tryPromise({
+		try: async () => rootTypescriptVersionSchema.parse(await fs.readJson(path.join(projectDir, "package.json"))),
+		catch: (cause) => new CLIError({
+			message: "Cannot determine the TypeScript version. Expected package.json to declare devDependencies.typescript.",
+			cause
+		})
+	});
+	if (typescriptVersionResult.isErr()) return Result.err(typescriptVersionResult.error);
+	const packageScope = packageScopeResult.value;
+	const fullPackageName = `${packageScope}/${packageName}`;
+	if (fullPackageName.length > 214) return Result.err(new CLIError({ message: "Workspace package name must not exceed 214 characters including its scope." }));
+	const packagePath = `packages/${packageName}`;
+	vfs.writeFile(`${packagePath}/package.json`, `${JSON.stringify({
+		name: fullPackageName,
+		version: "0.0.0",
+		private: true,
+		type: "module",
+		exports: { ".": "./src/index.ts" },
+		scripts: { "check-types": "tsc --noEmit" },
+		devDependencies: {
+			[`${packageScope}/config`]: packageManager === "npm" ? "*" : "workspace:*",
+			typescript: typescriptVersionResult.value
+		}
+	}, null, 2)}\n`);
+	vfs.writeFile(`${packagePath}/tsconfig.json`, `${JSON.stringify({
+		extends: `${packageScope}/config/tsconfig.base.json`,
+		include: ["src/**/*.ts"]
+	}, null, 2)}\n`);
+	vfs.writeFile(`${packagePath}/src/index.ts`, "export {};\n");
+	return Result.ok(void 0);
+}
 function mergeAddonOptions(existingAddonOptions, nextAddonOptions) {
 	if (!existingAddonOptions && !nextAddonOptions) return;
 	const mergeOption = (existing, next) => {
@@ -4738,7 +4800,7 @@ async function addHandlerInternal(input) {
 	let addonsToAdd;
 	if (input.addons && input.addons.length > 0) {
 		addonsToAdd = input.addons.filter((addon) => addon !== "none" && !existingConfig.addons.includes(addon));
-		if (addonsToAdd.length === 0) {
+		if (addonsToAdd.length === 0 && !input.package) {
 			if (!isSilent()) {
 				log.warn(pc.yellow("Nothing to add — those addons are already installed"));
 				outro(pc.dim("Project unchanged"));
@@ -4749,7 +4811,8 @@ async function addHandlerInternal(input) {
 				projectDir
 			});
 		}
-	} else if (isSilent()) return Result.err(new CLIError({ message: "Addons are required in silent mode. Provide them via add() or add-json." }));
+	} else if (input.package) addonsToAdd = [];
+	else if (isSilent()) return Result.err(new CLIError({ message: "Addons or a package are required in silent mode." }));
 	else {
 		const promptResult = await Result.tryPromise({
 			try: () => getAddonsToAdd(existingConfig),
@@ -4776,7 +4839,10 @@ async function addHandlerInternal(input) {
 	const updatedAddons = [...existingConfig.addons, ...addonsToAdd];
 	const addonsValidationResult = validateAddonsAgainstConfig(updatedAddons, existingConfig);
 	if (addonsValidationResult.isErr()) return Result.err(new CLIError({ message: addonsValidationResult.error.message }));
-	if (!isSilent()) log.info(`${pc.dim("Adding")} ${pc.cyan(formatConfigValue(addonsToAdd))}`);
+	if (!isSilent()) {
+		const additions = [addonsToAdd.length > 0 ? formatConfigValue(addonsToAdd) : void 0, input.package ? `package ${input.package}` : void 0].filter(Boolean);
+		log.info(`${pc.dim("Adding")} ${pc.cyan(additions.join(" and "))}`);
+	}
 	const mergedAddonOptions = mergeAddonOptions(existingConfig.addonOptions, input.addonOptions);
 	const config = {
 		projectName: existingConfig.projectName,
@@ -4804,33 +4870,41 @@ async function addHandlerInternal(input) {
 		...config,
 		addons: updatedAddons
 	};
-	const requirementsResult = await checkLocalRequirements(updatedConfig);
-	if (requirementsResult.isErr()) return Result.err(requirementsResult.error);
-	if (!isSilent()) for (const warning of requirementsResult.value.warnings) log.warn(pc.yellow(warning));
-	if (!isSilent()) log.info(pc.dim("Preparing addon files…"));
+	if (addonsToAdd.length > 0) {
+		const requirementsResult = await checkLocalRequirements(updatedConfig);
+		if (requirementsResult.isErr()) return Result.err(requirementsResult.error);
+		if (!isSilent()) for (const warning of requirementsResult.value.warnings) log.warn(pc.yellow(warning));
+	}
+	if (!isSilent()) log.info(pc.dim("Preparing files…"));
 	const vfs = new VirtualFileSystem();
-	for (const pkgPath of ADD_PACKAGE_JSON_PATHS) {
-		const fullPath = path.join(projectDir, pkgPath);
-		if (await fs.pathExists(fullPath)) {
-			const content = await fs.readFile(fullPath, "utf-8");
-			vfs.writeFile(pkgPath, content);
+	if (input.package) {
+		const packageResult = await addWorkspacePackage(vfs, projectDir, input.package, existingConfig.packageManager);
+		if (packageResult.isErr()) return Result.err(packageResult.error);
+	}
+	if (addonsToAdd.length > 0) {
+		for (const pkgPath of ADD_PACKAGE_JSON_PATHS) {
+			const fullPath = path.join(projectDir, pkgPath);
+			if (await fs.pathExists(fullPath)) {
+				const content = await fs.readFile(fullPath, "utf-8");
+				vfs.writeFile(pkgPath, content);
+			}
 		}
-	}
-	for (const filePath of ADD_TEXT_FILE_PATHS) {
-		const fullPath = path.join(projectDir, filePath);
-		if (await fs.pathExists(fullPath)) {
-			const content = await fs.readFile(fullPath, "utf-8");
-			vfs.writeFile(filePath, content);
+		for (const filePath of ADD_TEXT_FILE_PATHS) {
+			const fullPath = path.join(projectDir, filePath);
+			if (await fs.pathExists(fullPath)) {
+				const content = await fs.readFile(fullPath, "utf-8");
+				vfs.writeFile(filePath, content);
+			}
 		}
+		await processAddonTemplates(vfs, EMBEDDED_TEMPLATES, config);
+		processAddonsDeps(vfs, config);
+		if (addonsToAdd.includes("turborepo")) processTurboConfig(vfs, updatedConfig);
+		if (addonsToAdd.includes("nx")) processNxConfig(vfs, updatedConfig);
+		if (addonsToAdd.includes("vite-plus")) processVitePlusConfig(vfs, updatedConfig);
+		if (updatedAddons.some((addon) => TASK_RUNNER_ADDONS.includes(addon))) processPackageConfigs(vfs, updatedConfig);
+		if (updatedAddons.includes("vite-plus")) updateViteConfigImportsForVitePlus(vfs);
+		if (shouldRefreshLefthook(addonsToAdd, updatedAddons)) refreshLefthookTemplate(vfs, updatedConfig);
 	}
-	await processAddonTemplates(vfs, EMBEDDED_TEMPLATES, config);
-	processAddonsDeps(vfs, config);
-	if (addonsToAdd.includes("turborepo")) processTurboConfig(vfs, updatedConfig);
-	if (addonsToAdd.includes("nx")) processNxConfig(vfs, updatedConfig);
-	if (addonsToAdd.includes("vite-plus")) processVitePlusConfig(vfs, updatedConfig);
-	if (updatedAddons.some((addon) => TASK_RUNNER_ADDONS.includes(addon))) processPackageConfigs(vfs, updatedConfig);
-	if (updatedAddons.includes("vite-plus")) updateViteConfigImportsForVitePlus(vfs);
-	if (shouldRefreshLefthook(addonsToAdd, updatedAddons)) refreshLefthookTemplate(vfs, updatedConfig);
 	const tree = {
 		root: vfs.toTree(""),
 		fileCount: vfs.getFileCount(),
@@ -4840,7 +4914,7 @@ async function addHandlerInternal(input) {
 	if (input.dryRun) {
 		if (!isSilent()) {
 			log.success(pc.green("Dry run passed · no files written"));
-			log.message(pc.dim(`${vfs.getFileCount()} addon files planned`));
+			log.message(pc.dim(`${vfs.getFileCount()} files planned`));
 			outro(pc.dim("Project unchanged"));
 		}
 		return Result.ok({
@@ -4848,17 +4922,41 @@ async function addHandlerInternal(input) {
 			addedAddons: addonsToAdd,
 			projectDir,
 			dryRun: true,
-			plannedFileCount: vfs.getFileCount()
+			plannedFileCount: vfs.getFileCount(),
+			addedPackage: input.package
 		});
 	}
+	let reservedPackageDir;
+	if (input.package) {
+		const reservationResult = await reserveWorkspacePackage(projectDir, input.package);
+		if (reservationResult.isErr()) return Result.err(reservationResult.error);
+		reservedPackageDir = reservationResult.value;
+	}
 	const writeResult = await writeTree(tree, projectDir);
-	if (writeResult.isErr()) return Result.err(new CLIError({ message: `Failed to write addon files: ${writeResult.error.message}` }));
-	if (vfs.getFileCount() > 0 && !isSilent()) log.info(pc.dim(`Wrote ${vfs.getFileCount()} addon files`));
+	if (writeResult.isErr()) {
+		if (reservedPackageDir && input.package) {
+			const cleanupResult = await Result.tryPromise({
+				try: () => fs.remove(reservedPackageDir),
+				catch: (cause) => new CLIError({
+					message: `Failed to clean up incomplete workspace package: packages/${input.package}`,
+					cause
+				})
+			});
+			if (cleanupResult.isErr()) return Result.err(new CLIError({
+				message: `Failed to write files: ${writeResult.error.message}. ${cleanupResult.error.message}`,
+				cause: cleanupResult.error
+			}));
+		}
+		return Result.err(new CLIError({ message: `Failed to write files: ${writeResult.error.message}` }));
+	}
+	if (vfs.getFileCount() > 0 && !isSilent()) log.info(pc.dim(`Wrote ${vfs.getFileCount()} files`));
 	const setupResult = await Result.tryPromise({
-		try: () => setupAddons({
-			...config,
-			addons: getSetupAddons(addonsToAdd, updatedAddons)
-		}),
+		try: async () => {
+			if (addonsToAdd.length > 0) await setupAddons({
+				...config,
+				addons: getSetupAddons(addonsToAdd, updatedAddons)
+			});
+		},
 		catch: (cause) => {
 			if (UserCancelledError.is(cause)) return cause;
 			return new CLIError({
@@ -4868,7 +4966,7 @@ async function addHandlerInternal(input) {
 		}
 	});
 	if (setupResult.isErr()) return Result.err(setupResult.error);
-	await updateBtsConfig(projectDir, {
+	if (addonsToAdd.length > 0) await updateBtsConfig(projectDir, {
 		addons: updatedAddons,
 		addonOptions: updatedConfig.addonOptions
 	});
@@ -4877,7 +4975,8 @@ async function addHandlerInternal(input) {
 		packageManager: config.packageManager
 	});
 	if (!isSilent()) {
-		log.success(pc.green(`Added ${formatConfigValue(addonsToAdd)}`));
+		const additions = [addonsToAdd.length > 0 ? formatConfigValue(addonsToAdd) : void 0, input.package ? `package ${input.package}` : void 0].filter(Boolean);
+		log.success(pc.green(`Added ${additions.join(" and ")}`));
 		if (!input.install) {
 			const installCommand = config.packageManager === "npm" ? "npm install" : `${config.packageManager} install`;
 			log.message(`${pc.dim("Next step")}\n${pc.cyan(installCommand)}`);
@@ -4888,7 +4987,8 @@ async function addHandlerInternal(input) {
 		success: true,
 		addedAddons: addonsToAdd,
 		projectDir,
-		plannedFileCount: vfs.getFileCount()
+		plannedFileCount: vfs.getFileCount(),
+		addedPackage: input.package
 	});
 }
 //#endregion
@@ -9168,8 +9268,9 @@ const router = t.router({
 	sponsors: t.procedure.meta({ description: "Show Better-T-Stack sponsors" }).mutation(() => showSponsorsCommand()),
 	docs: t.procedure.meta({ description: "Open Better-T-Stack documentation" }).mutation(() => openDocsCommand()),
 	builder: t.procedure.meta({ description: "Open the web-based stack builder" }).mutation(() => openBuilderCommand()),
-	add: t.procedure.meta({ description: "Add addons to an existing Better-T-Stack project" }).input(z.object({
+	add: t.procedure.meta({ description: "Add addons or a workspace package to an existing Better-T-Stack project" }).input(z.object({
 		addons: z.array(types_exports.AddonsSchema).optional().describe("Addons to add"),
+		package: types_exports.WorkspacePackageNameSchema.optional(),
 		install: z.boolean().optional().default(false).describe("Install dependencies after adding"),
 		packageManager: types_exports.PackageManagerSchema.optional().describe("Package manager to use"),
 		projectDir: z.string().optional().describe("Project directory (defaults to current)"),
@@ -9178,7 +9279,7 @@ const router = t.router({
 		await addHandler(input);
 	}),
 	addJson: t.procedure.meta({
-		description: "Add addons from a raw JSON payload (agent-friendly)",
+		description: "Add addons or a workspace package from a raw JSON payload (agent-friendly)",
 		jsonInput: "always"
 	}).input(types_exports.AddInputSchema).mutation(async ({ input }) => {
 		const result = await addHandler(input, { silent: true });
@@ -9342,7 +9443,7 @@ async function createVirtual(options) {
 	});
 }
 /**
-* Programmatic API to add addons to an existing Better-T-Stack project.
+* Programmatic API to add addons or a workspace package to an existing Better-T-Stack project.
 *
 * @example
 * ```typescript

package/package.json

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