feat(cli): warn before creating in non-empty target dirs

Author: tannerlinsley

packages/cli/src/cli.ts

@@ -1,7 +1,7 @@
 import fs from 'node:fs'
 import { resolve } from 'node:path'
 import { Command, InvalidArgumentError } from 'commander'
-import { intro, log } from '@clack/prompts'
+import { cancel, confirm, intro, isCancel, log } from '@clack/prompts'
 import chalk from 'chalk'
 import semver from 'semver'
 
@@ -70,6 +70,37 @@ export function cli({
 
   const program = new Command()
 
+  async function confirmTargetDirectorySafety(
+    targetDir: string,
+    forced?: boolean,
+  ) {
+    if (forced) {
+      return
+    }
+
+    if (!fs.existsSync(targetDir)) {
+      return
+    }
+
+    if (!fs.statSync(targetDir).isDirectory()) {
+      throw new Error(`Target path exists and is not a directory: ${targetDir}`)
+    }
+
+    if (fs.readdirSync(targetDir).length === 0) {
+      return
+    }
+
+    const shouldContinue = await confirm({
+      message: `Target directory "${targetDir}" already exists and is not empty. Continue anyway?`,
+      initialValue: false,
+    })
+
+    if (isCancel(shouldContinue) || !shouldContinue) {
+      cancel('Operation cancelled.')
+      process.exit(0)
+    }
+  }
+
   const availableFrameworks = getFrameworks().map((f) => f.name)
 
   const toolchains = new Set<string>()
@@ -251,6 +282,7 @@ export function cli({
         console.log(chalk.gray('├─') + ' ' + chalk.yellow('⟳') + ' installing packages...')
       }
       const silentEnvironment = createUIEnvironment(appName, true)
+      await confirmTargetDirectorySafety(normalizedOpts.targetDir, options.force)
       await createApp(silentEnvironment, normalizedOpts)
       console.log(chalk.gray('└─') + ' ' + chalk.green('✓') + ` app created`)
 
@@ -342,6 +374,7 @@ export function cli({
         finalOptions.targetDir = resolve(process.cwd(), finalOptions.projectName)
       }
 
+      await confirmTargetDirectorySafety(finalOptions.targetDir, options.force)
       await createApp(environment, finalOptions)
     } catch (error) {
       log.error(

packages/cli/src/options.ts

@@ -1,5 +1,4 @@
-import fs from 'node:fs'
-import { cancel, confirm, intro, isCancel } from '@clack/prompts'
+import { intro } from '@clack/prompts'
 
 import {
   finalizeAddOns,
@@ -59,23 +58,6 @@ export async function promptForCreateOptions(
     options.projectName = await getProjectName()
   }
 
-  // Check if target directory is empty
-  if (
-    !cliOptions.force &&
-    fs.existsSync(options.projectName) &&
-    fs.readdirSync(options.projectName).length > 0
-  ) {
-    const shouldContinue = await confirm({
-      message: `Target directory ${options.projectName} is not empty. Do you want to continue?`,
-      initialValue: true,
-    })
-
-    if (isCancel(shouldContinue) || !shouldContinue) {
-      cancel('Operation cancelled.')
-      process.exit(0)
-    }
-  }
-
   // Mode is always file-router (TanStack Start)
   options.mode = 'file-router'