apps/cli/src/types.ts (1)

164-179: Persist serverName in BetterTStackConfig for reproducibility

BetterTStackConfig is missing serverName. Without persisting it, repo-local config and reproducible commands will drift from the generated app structure.

 export interface BetterTStackConfig {
   version: string;
   createdAt: string;
   database: Database;
   orm: ORM;
   backend: Backend;
   runtime: Runtime;
   frontend: Frontend[];
   addons: Addons[];
   examples: Examples[];
   auth: boolean;
   packageManager: PackageManager;
   dbSetup: DatabaseSetup;
   api: API;
   webDeploy: WebDeploy;
+  serverName: string;
 }

apps/cli/templates/backend/server/server-base/package.json.hbs (1)

2-9: Align compile output with serverName

The compile script still emits --outfile server. For consistency with the dynamic name and downstream scripts, output should match {{serverName}}.

-    "compile": "bun build --compile --minify --sourcemap --bytecode ./src/index.ts --outfile server"
+    "compile": "bun build --compile --minify --sourcemap --bytecode ./src/index.ts --outfile {{serverName}}"

Optional: If you have any scripts referring to the produced binary, update them accordingly.

apps/cli/src/helpers/setup/backend-setup.ts (1)

57-63: Guard addPackageDependency with serverDir existence to avoid failures with dynamic names.

With a configurable serverName, it’s safer to ensure the computed directory exists before mutating dependencies. If addPackageDependency doesn’t create the directory, this can fail in edge cases.

Apply this change at the call site:

-    await addPackageDependency({
-      dependencies,
-      devDependencies,
-      projectDir: serverDir,
-    });
+    if (await fs.pathExists(serverDir)) {
+      await addPackageDependency({
+        dependencies,
+        devDependencies,
+        projectDir: serverDir,
+      });
+    }

And add the import at the top of this file:

import fs from "fs-extra";

apps/cli/src/helpers/database-providers/mongodb-atlas-setup.ts (1)

132-171: Variable shadowing of config — rename to avoid confusion and typing hazards

Inside setupMongoDBAtlas, const config = await initMongoDBAtlas(serverDir); shadows the function parameter config: ProjectConfig. This is brittle and confusing.

-export async function setupMongoDBAtlas(config: ProjectConfig) {
-  const { projectDir, serverName } = config;
+export async function setupMongoDBAtlas(config: ProjectConfig) {
+  const { projectDir, serverName } = config;
   const mainSpinner = spinner();
   mainSpinner.start("Setting up MongoDB Atlas...");
 
   const serverDir = path.join(projectDir, "apps", serverName);
   try {
     await fs.ensureDir(serverDir);
 
     mainSpinner.stop("MongoDB Atlas setup ready");
 
-    const config = await initMongoDBAtlas(serverDir);
+    const atlasConfig = await initMongoDBAtlas(serverDir);
 
-    if (config) {
-      await writeEnvFile(projectDir, serverName, config);
+    if (atlasConfig) {
+      await writeEnvFile(projectDir, serverName, atlasConfig);
       log.success(
         pc.green(
           "MongoDB Atlas setup complete! Connection saved to .env file.",
         ),
       );
     } else {
       log.warn(pc.yellow("Falling back to local MongoDB configuration"));
       await writeEnvFile(projectDir, serverName);
       displayManualSetupInstructions();
     }
   } catch (error) {
     mainSpinner.stop(pc.red("MongoDB Atlas setup failed"));
     consola.error(
       pc.red(
         `Error during MongoDB Atlas setup: ${
           error instanceof Error ? error.message : String(error)
         }`,
       ),
     );
 
     try {
       await writeEnvFile(projectDir, serverName);
       displayManualSetupInstructions();
     } catch {}
   }
 }

apps/cli/src/helpers/database-providers/docker-compose-setup.ts (1)

24-31: Ensure target directory exists and guard serverName

Prevent failures when apps/{serverName} isn’t created yet and avoid invalid names creeping into paths.

Apply within this function:

 async function writeEnvFile(
   projectDir: string,
   database: Database,
   projectName: string,
   serverName: string,
 ) {
-  const envPath = path.join(projectDir, "apps", serverName, ".env");
+  const envPath = path.join(projectDir, "apps", serverName, ".env");
+  // Basic sanity check; full validation should live in input/schema
+  if (!serverName || /[\\/]/.test(serverName)) {
+    throw new Error(`Invalid serverName: "${serverName}"`);
+  }
+  // Ensure directory exists to avoid write failures
+  await fs.ensureDir(path.dirname(envPath));
   const variables: EnvVariable[] = [

Add missing import at top of the file:

import fs from "fs-extra";

apps/cli/src/helpers/database-providers/turso-setup.ts (2)

170-189: Ensure env directory exists and validate serverName

Avoid write failures and reject invalid serverName inputs.

 async function writeEnvFile(
   projectDir: string,
   serverName: string,
   config?: TursoConfig,
 ) {
-  const envPath = path.join(projectDir, "apps", serverName, ".env");
+  const envPath = path.join(projectDir, "apps", serverName, ".env");
+  if (!serverName || /[\\/]/.test(serverName)) {
+    throw new Error(`Invalid serverName: "${serverName}"`);
+  }
+  await fs.ensureDir(path.dirname(envPath));
   const variables: EnvVariable[] = [

Add missing import if not present at top:

import fs from "fs-extra";

---

265-271: Bug: success can be set even when Turso config retrieval fails

createTursoDatabase returns undefined on details retrieval failure; the loop then writes empty env values and marks success=true. Only proceed when config is truthy.

-        const config = await createTursoDatabase(dbName, selectedGroup);
-        await writeEnvFile(projectDir, serverName, config);
-        success = true;
+        const config = await createTursoDatabase(dbName, selectedGroup);
+        if (!config?.dbUrl || !config?.authToken) {
+          throw new Error("TURSO_CONFIG_MISSING");
+        }
+        await writeEnvFile(projectDir, serverName, config);
+        success = true;

Optionally, also throw inside createTursoDatabase when details retrieval fails:

   } catch (_error) {
     s.stop(pc.red("Failed to retrieve database connection details"));
+    throw new Error("TURSO_CONFIG_MISSING");
   }

apps/cli/src/helpers/database-providers/prisma-postgres-setup.ts (2)

151-168: Avoid duplicate dotenv import and handle missing prisma.config.ts gracefully

Currently the code always prepends import "dotenv/config" and assumes prisma.config.ts exists. Two improvements:

• Prevent duplicate imports if the file already includes dotenv/config.
• Only attempt this when the file exists (and ideally only when orm === "prisma").

Suggested inline fix:

 async function addDotenvImportToPrismaConfig(
   projectDir: string,
   serverName: string,
 ) {
   try {
     const prismaConfigPath = path.join(
       projectDir,
-      "apps",
-      serverName,
-      "prisma.config.ts",
+      "apps",
+      serverName,
+      "prisma.config.ts",
     );
-    let content = await fs.readFile(prismaConfigPath, "utf8");
-    content = `import "dotenv/config";\n${content}`;
-    await fs.writeFile(prismaConfigPath, content);
+    if (!(await fs.pathExists(prismaConfigPath))) {
+      return;
+    }
+    let content = await fs.readFile(prismaConfigPath, "utf8");
+    if (!content.includes('import "dotenv/config"')) {
+      content = `import "dotenv/config";\n${content}`;
+      await fs.writeFile(prismaConfigPath, content);
+    }
   } catch (_error) {
     consola.error("Failed to update prisma.config.ts");
   }
 }

If preferred, you can also pass orm into this function and early-return when orm !== "prisma".

---

223-293: Gate Prisma-specific mutations behind orm === "prisma"

addDotenvImportToPrismaConfig is executed regardless of the selected ORM. For Drizzle/Mongoose, this produces unnecessary errors/noise if prisma.config.ts doesn’t exist.

Apply:

-    if (prismaConfig) {
-      await writeEnvFile(projectDir, serverName, prismaConfig);
-
-      await addDotenvImportToPrismaConfig(projectDir, serverName);
-
-      if (orm === "prisma") {
-        await addPrismaAccelerateExtension(serverDir);
-      }
+    if (prismaConfig) {
+      await writeEnvFile(projectDir, serverName, prismaConfig);
+      if (orm === "prisma") {
+        await addDotenvImportToPrismaConfig(projectDir, serverName);
+        await addPrismaAccelerateExtension(serverDir);
+      }
     } else {
       await writeEnvFile(projectDir, serverName);
       displayManualSetupInstructions(serverName);
     }

apps/cli/src/helpers/database-providers/supabase-setup.ts (1)

165-223: Bug: serverDir still hardcoded to "server"

serverDir should use the provided serverName. Otherwise, the Supabase CLI runs in the wrong directory when serverName !== "server".

Fix:

-  const { projectDir, packageManager, serverName } = config;
+  const { projectDir, packageManager, serverName } = config;

-  const serverDir = path.join(projectDir, "apps", "server");
+  const serverDir = path.join(projectDir, "apps", serverName);

.changeset/petite-corners-say.md (1)

1-6: Confirm non-breaking semantics for minor release

If serverName is required on CLI input or templates break when omitted, this should be a major bump. If defaults preserve behavior when unspecified, minor is correct. Please confirm.

apps/cli/templates/api/trpc/web/react/base/src/utils/trpc.ts.hbs (1)

5-5: LGTM: dynamic serverName type import is correct; minor consistency note

• Using import type { AppRouter } from '../../../{{serverName}}/src/routers' is the right pattern for clients.
• Keeping the import at the directory (without /index) aligns with TS module resolution and avoids path churn.

Optional: ensure ORPC templates use the same pattern (importing a type alias instead of typeof over a type-only import) for consistency.

Also applies to: 50-50, 56-56

apps/cli/src/validation.ts (1)

99-101: Add a small test around serverName flag

Add unit tests for processAndValidateFlags to assert:

• Valid serverName is accepted and set.
• Invalid names (e.g., containing slashes or spaces) are rejected with an error.

I can draft the tests if you share the existing test harness for validation.ts.

apps/cli/src/helpers/database-providers/d1-setup.ts (1)

11-11: Optional: derive envPath from a serverDir variable to reduce duplication.

This keeps path construction consistent with other helpers and eases future maintenance.

- const envPath = path.join(projectDir, "apps", serverName, ".env");
+ const serverDir = path.join(projectDir, "apps", serverName);
+ const envPath = path.join(serverDir, ".env");

apps/cli/src/helpers/setup/examples-setup.ts (1)

8-8: Guard against empty/undefined serverName when constructing serverDir

Use a defensive fallback to avoid resolving to apps/ or apps/undefined if serverName is missing.

-    const serverDir = path.join(projectDir, "apps", serverName);
+    const serverDir = path.join(projectDir, "apps", serverName?.trim() || "server");

Also applies to: 22-22

apps/cli/src/helpers/project-generation/create-project.ts (1)

45-53: Passing both serverName and options is redundant

These helpers can read serverName from options. Passing it twice increases the chance of drift.

• Prefer a consistent convention: either pass a single options bag everywhere or consistently pass decomposed arguments. If you opt for the former, remove the serverName positional arg and read from options.serverName inside those helpers (less surface area to update later).

apps/cli/src/helpers/project-generation/command-handlers.ts (1)

62-66: Ensure projectDirectory is correct and serverName is propagated

• Good: serverName is forwarded into cliInput.
• Potential issue: projectDirectory is set to input.projectName. That looks wrong; most flows expect a resolved path (e.g., finalResolvedPath). If this value is used downstream (e.g., flag processing), it might cause confusion.

-const cliInput = {
-  ...input,
-  projectDirectory: input.projectName,
-  serverName: input.serverName,
-};
+const cliInput = {
+  ...input,
+  projectDirectory: finalResolvedPath,
+  serverName: input.serverName,
+};

apps/cli/src/helpers/setup/db-setup.ts (1)

30-33: Minor: avoid recomputing serverDir

You compute serverDir twice. Compute once near the top for clarity.

-const s = spinner();
-const serverDir = path.join(projectDir, "apps", serverName);
+const s = spinner();
+const serverDir = path.join(projectDir, "apps", serverName);

Then reuse serverDir above where needed (remove the earlier duplicate).

apps/cli/src/helpers/setup/runtime-setup.ts (1)

57-60: Nit: quote path in manual command for safety

Quoting protects paths when serverName contains spaces or special chars.

-      `Note: You can manually run 'cd apps/${serverName} && ${managerCmd} cf-typegen' in the project directory later`,
+      `Note: You can manually run 'cd "apps/${serverName}" && ${managerCmd} cf-typegen' in the project directory later`,

apps/cli/src/helpers/database-providers/turso-setup.ts (1)

191-201: Nit: quote the .env path in manual instructions

Improves readability and safety for atypical names.

-4. Add these credentials to the .env file in apps/${serverName}/.env
+4. Add these credentials to the .env file in "apps/${serverName}/.env"

apps/cli/src/helpers/project-generation/project-config.ts (1)

70-71: Add backward-compatible alias script dev:server

Keeps existing docs/automation working while enabling dev:${serverName}.

   scripts[`dev:${options.serverName}`] = serverDevScript;
+  if (options.serverName !== "server") {
+    scripts["dev:server"] = serverDevScript;
+  }

Apply at each package-manager/turborepo block where dev:${options.serverName} is set.

Also applies to: 97-98, 129-130, 163-164

apps/cli/src/helpers/project-generation/post-installation.ts (2)

127-130: Nit: quote path in cf-typegen step

Handles spaces or unusual names safely.

-)} cd apps/${serverName} && ${runCmd} run cf-typegen\n\n`;
+)} cd "apps/${serverName}" && ${runCmd} run cf-typegen\n\n`;

---

299-301: Nit: quote path in local DB command

Minor readability and safety improvement.

-      )} Start local DB (if needed): ${`cd apps/${serverName} && ${runCmd} db:local`}`,
+      )} Start local DB (if needed): ${`cd "apps/${serverName}" && ${runCmd} db:local`}`,

apps/cli/src/helpers/database-providers/supabase-setup.ts (1)

142-162: Minor: remove stray double quotes in the heading

The heading string includes quotes, which render oddly in console logs.

-  `"Manual Supabase Setup Instructions:"
+  `Manual Supabase Setup Instructions:

apps/cli/src/helpers/project-generation/template-manager.ts (1)

243-251: Avoid duplicating serverName in both params and context

These functions now take serverName while context already includes serverName. Two sources of truth increase the risk of mismatch and propagate signature churn.

Prefer deriving serverName from context within each function:

-export async function setupBackendFramework(
-  projectDir: string,
-  serverName: string,
-  context: ProjectConfig,
-) {
+export async function setupBackendFramework(
+  projectDir: string,
+  context: ProjectConfig,
+) {
+  const { serverName } = context;

Do similarly for setupDbOrmTemplates, setupAuthTemplate, setupExamplesTemplate, and setupDockerComposeTemplates. This reduces boilerplate and ensures consistency.

Also applies to: 333-337, 359-367, 572-586, 829-839

Configuration used: CodeRabbit UI
Review profile: CHILL
Plan: Pro