From 0b14d525e55c79bdf37e79617af0eddcd5e72674 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=EC=9D=B4=EC=A2=85=EA=B2=BD?= <gyoung3063413@naver.com>
Date: Sun, 22 Mar 2026 12:57:20 +0900
Subject: [PATCH 1/7] feat(create): support creating project in current
 directory

---
 .../new-create-vite-directory-dot/steps.json  |  9 ++++
 .../__snapshots__/utils.spec.ts.snap          | 12 +----
 .../cli/src/create/__tests__/utils.spec.ts    | 46 ++++++++++++++++++-
 packages/cli/src/create/bin.ts                | 20 ++++++--
 packages/cli/src/create/prompts.ts            |  1 -
 packages/cli/src/create/utils.ts              | 21 ++++++++-
 6 files changed, 91 insertions(+), 18 deletions(-)
 create mode 100644 packages/cli/snap-tests-global/new-create-vite-directory-dot/steps.json

diff --git a/packages/cli/snap-tests-global/new-create-vite-directory-dot/steps.json b/packages/cli/snap-tests-global/new-create-vite-directory-dot/steps.json
new file mode 100644
index 0000000000..d6ba92d2b2
--- /dev/null
+++ b/packages/cli/snap-tests-global/new-create-vite-directory-dot/steps.json
@@ -0,0 +1,9 @@
+{
+  "commands": [
+    {
+      "command": "vp create vite:application --no-interactive --directory . # create vite app in current directory",
+      "ignoreOutput": true
+    },
+    "ls package.json # check package.json exists in current directory"
+  ]
+}
diff --git a/packages/cli/src/create/__tests__/__snapshots__/utils.spec.ts.snap b/packages/cli/src/create/__tests__/__snapshots__/utils.spec.ts.snap
index 4846bbac07..a8bbed12ce 100644
--- a/packages/cli/src/create/__tests__/__snapshots__/utils.spec.ts.snap
+++ b/packages/cli/src/create/__tests__/__snapshots__/utils.spec.ts.snap
@@ -1,14 +1,6 @@
 // Vitest Snapshot v1, https://vitest.dev/guide/snapshot.html
 
 exports[`formatTargetDir > should format target dir with invalid input 1`] = `
-{
-  "directory": "",
-  "error": "Parsed package name "." is invalid: name cannot start with a period",
-  "packageName": "",
-}
-`;
-
-exports[`formatTargetDir > should format target dir with invalid input 2`] = `
 {
   "directory": "",
   "error": "Absolute path is not allowed",
@@ -16,7 +8,7 @@ exports[`formatTargetDir > should format target dir with invalid input 2`] = `
 }
 `;
 
-exports[`formatTargetDir > should format target dir with invalid input 3`] = `
+exports[`formatTargetDir > should format target dir with invalid input 2`] = `
 {
   "directory": "",
   "error": "Parsed package name "@scope" is invalid: name can only contain URL-friendly characters",
@@ -24,7 +16,7 @@ exports[`formatTargetDir > should format target dir with invalid input 3`] = `
 }
 `;
 
-exports[`formatTargetDir > should format target dir with invalid input 4`] = `
+exports[`formatTargetDir > should format target dir with invalid input 3`] = `
 {
   "directory": "",
   "error": "Relative path contains ".." which is not allowed",
diff --git a/packages/cli/src/create/__tests__/utils.spec.ts b/packages/cli/src/create/__tests__/utils.spec.ts
index 12d75e0e5b..fd01ce4ed8 100644
--- a/packages/cli/src/create/__tests__/utils.spec.ts
+++ b/packages/cli/src/create/__tests__/utils.spec.ts
@@ -1,6 +1,10 @@
 import { describe, expect, it } from 'vitest';
 
-import { formatTargetDir, getProjectDirFromPackageName } from '../utils.js';
+import {
+  deriveDefaultPackageName,
+  formatTargetDir,
+  getProjectDirFromPackageName,
+} from '../utils.js';
 
 describe('getProjectDirFromPackageName', () => {
   it('should get project dir from package name', () => {
@@ -10,8 +14,21 @@ describe('getProjectDirFromPackageName', () => {
 });
 
 describe('formatTargetDir', () => {
+  it('should format "." as current directory with empty package name', () => {
+    expect(formatTargetDir('.')).toEqual({
+      directory: '.',
+      packageName: '',
+    });
+  });
+
+  it('should format "./" as current directory with empty package name', () => {
+    expect(formatTargetDir('./')).toEqual({
+      directory: '.',
+      packageName: '',
+    });
+  });
+
   it('should format target dir with invalid input', () => {
-    expect(formatTargetDir('.')).matchSnapshot();
     expect(formatTargetDir('/foo/bar')).matchSnapshot();
     expect(formatTargetDir('@scope/')).matchSnapshot();
     expect(formatTargetDir('../../foo/bar')).matchSnapshot();
@@ -45,3 +62,28 @@ describe('formatTargetDir', () => {
     expect(formatTargetDir('my-package@1.0.0').error).matchSnapshot();
   });
 });
+
+describe('deriveDefaultPackageName', () => {
+  it('should derive package name from directory basename', () => {
+    expect(deriveDefaultPackageName('/home/user/my-app', undefined, 'fallback')).toBe('my-app');
+  });
+
+  it('should derive scoped package name when scope is provided', () => {
+    expect(deriveDefaultPackageName('/home/user/my-app', '@my-scope', 'fallback')).toBe(
+      '@my-scope/my-app',
+    );
+  });
+
+  it('should fallback to random name when directory name is invalid', () => {
+    const result = deriveDefaultPackageName('/home/user/.hidden', undefined, 'vite-plus-app');
+    // directory name starts with '.', so a random name is generated instead
+    expect(result).not.toBe('.hidden');
+    expect(result.length).toBeGreaterThan(0);
+  });
+
+  it('should fallback when directory is filesystem root', () => {
+    const result = deriveDefaultPackageName('/', undefined, 'vite-plus-app');
+    // basename of '/' is empty, so a random name is generated
+    expect(result.length).toBeGreaterThan(0);
+  });
+});
diff --git a/packages/cli/src/create/bin.ts b/packages/cli/src/create/bin.ts
index c16b0ffeaf..00f732b649 100644
--- a/packages/cli/src/create/bin.ts
+++ b/packages/cli/src/create/bin.ts
@@ -53,7 +53,7 @@ import {
 } from './templates/index.js';
 import { InitialMonorepoAppDir } from './templates/monorepo.js';
 import { BuiltinTemplate, TemplateType } from './templates/types.js';
-import { formatTargetDir } from './utils.js';
+import { deriveDefaultPackageName, formatTargetDir } from './utils.js';
 
 const helpMessage = renderCliDoc({
   usage: 'vp create [TEMPLATE] [OPTIONS] [-- TEMPLATE_OPTIONS]',
@@ -570,8 +570,20 @@ Use \`vp create --list\` to list all available templates, or run \`vp create --h
     }
   }
 
-  if (isBuiltinTemplate && !targetDir) {
-    if (selectedTemplateName === BuiltinTemplate.monorepo) {
+  if (isBuiltinTemplate && (!targetDir || targetDir === '.')) {
+    if (targetDir === '.') {
+      // Current directory: auto-derive package name from cwd, no prompt
+      const fallbackName =
+        selectedTemplateName === BuiltinTemplate.monorepo
+          ? 'vite-plus-monorepo'
+          : `vite-plus-${selectedTemplateName.split(':')[1]}`;
+      packageName = deriveDefaultPackageName(
+        cwd,
+        workspaceInfoOptional.monorepoScope,
+        fallbackName,
+      );
+      prompts.log.info(`Using package name: ${accent(packageName)}`);
+    } else if (selectedTemplateName === BuiltinTemplate.monorepo) {
       const selected = await promptPackageNameAndTargetDir(
         getRandomProjectName({ fallbackName: 'vite-plus-monorepo' }),
         options.interactive,
@@ -788,7 +800,7 @@ Use \`vp create --list\` to list all available templates, or run \`vp create --h
         : selected.targetDir;
     }
     pauseCreateProgress();
-    await checkProjectDirExists(targetDir, options.interactive);
+    await checkProjectDirExists(path.join(workspaceInfo.rootDir, targetDir), options.interactive);
     resumeCreateProgress();
     updateCreateProgress('Generating project');
     result = await executeBuiltinTemplate(
diff --git a/packages/cli/src/create/prompts.ts b/packages/cli/src/create/prompts.ts
index 4b003a51f9..aecb609e1d 100644
--- a/packages/cli/src/create/prompts.ts
+++ b/packages/cli/src/create/prompts.ts
@@ -24,7 +24,6 @@ export async function promptPackageNameAndTargetDir(
         if (value == null || value.length === 0) {
           return;
         }
-
         const result = value ? validateNpmPackageName(value) : null;
         if (result?.validForNewPackages) {
           return;
diff --git a/packages/cli/src/create/utils.ts b/packages/cli/src/create/utils.ts
index cf19781f83..38f5098faa 100644
--- a/packages/cli/src/create/utils.ts
+++ b/packages/cli/src/create/utils.ts
@@ -4,6 +4,7 @@ import path from 'node:path';
 import validateNpmPackageName from 'validate-npm-package-name';
 
 import { editJsonFile } from '../utils/json.js';
+import { getRandomProjectName } from './random-name.js';
 
 // Helper functions for file operations
 export function copy(src: string, dest: string) {
@@ -30,12 +31,12 @@ export function copyDir(srcDir: string, destDir: string) {
  * Examples:
  * ```
  * # invalid target directories
- * ./ -> { directory: '', packageName: '', error: 'Invalid target directory' }
  * /foo/bar -> { directory: '', packageName: '', error: 'Absolute path is not allowed' }
  * @scope/ -> { directory: '', packageName: '', error: 'Invalid target directory' }
  * ../../foo/bar -> { directory: '', packageName: '', error: 'Invalid target directory' }
  *
  * # valid target directories
+ * . -> { directory: '.', packageName: '' }
  * ./my-package -> { directory: './my-package', packageName: 'my-package' }
  * ./foo/bar-package -> { directory: './foo/bar-package', packageName: 'bar-package' }
  * ./foo/bar-package/ -> { directory: './foo/bar-package', packageName: 'bar-package' }
@@ -52,6 +53,12 @@ export function formatTargetDir(input: string): {
   error?: string;
 } {
   let targetDir = path.normalize(input.trim());
+
+  // "." or "./" means current directory — valid directory, but no package name derivable
+  if (targetDir === '.' || targetDir === `.${path.sep}`) {
+    return { directory: '.', packageName: '' };
+  }
+
   const parsed = path.parse(targetDir);
   if (parsed.root || path.isAbsolute(targetDir)) {
     return {
@@ -120,3 +127,15 @@ export function formatDisplayTargetDir(targetDir: string) {
   }
   return `./${normalized}`;
 }
+
+export function deriveDefaultPackageName(
+  cwd: string,
+  scope: string | undefined,
+  fallbackName: string,
+): string {
+  const dirName = path.basename(cwd);
+  const candidate = scope ? `${scope}/${dirName}` : dirName;
+  return validateNpmPackageName(candidate).validForNewPackages
+    ? candidate
+    : getRandomProjectName({ scope, fallbackName });
+}

From 287fdda6dc30adced4f86e1aec8d2a75603fe9a5 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=EC=9D=B4=EC=A2=85=EA=B2=BD?= <gyoung3063413@naver.com>
Date: Mon, 23 Mar 2026 20:34:12 +0900
Subject: [PATCH 2/7] fix(create): resolve --directory . against cwd in
 monorepo subdirectories

---
 .../create-from-monorepo-subdir/snap.txt               |  4 ++++
 .../create-from-monorepo-subdir/steps.json             |  8 +++++++-
 .../new-create-vite-directory-dot/snap.txt             | 10 ++++++++++
 packages/cli/src/create/bin.ts                         |  5 +++++
 4 files changed, 26 insertions(+), 1 deletion(-)
 create mode 100644 packages/cli/snap-tests-global/new-create-vite-directory-dot/snap.txt

diff --git a/packages/cli/snap-tests-global/create-from-monorepo-subdir/snap.txt b/packages/cli/snap-tests-global/create-from-monorepo-subdir/snap.txt
index 79e092d56e..27cc642cf3 100644
--- a/packages/cli/snap-tests-global/create-from-monorepo-subdir/snap.txt
+++ b/packages/cli/snap-tests-global/create-from-monorepo-subdir/snap.txt
@@ -19,3 +19,7 @@ Not in scripts/helper/
 > cd scripts/helper && vp create --no-interactive vite:application --directory apps/custom-app # --directory from non-workspace dir
 > test -f apps/custom-app/package.json && echo 'Created at apps/custom-app with --directory' || echo 'NOT at apps/custom-app'
 Created at apps/custom-app with --directory
+
+> mkdir -p apps/dot-test && cd apps/dot-test && vp create --no-interactive vite:application --directory . # --directory . from monorepo subdir
+> test -f apps/dot-test/package.json && echo 'Created at apps/dot-test with --directory .' || echo 'NOT at apps/dot-test'
+Created at apps/dot-test with --directory .
diff --git a/packages/cli/snap-tests-global/create-from-monorepo-subdir/steps.json b/packages/cli/snap-tests-global/create-from-monorepo-subdir/steps.json
index 692f8d5e48..31d5084f90 100644
--- a/packages/cli/snap-tests-global/create-from-monorepo-subdir/steps.json
+++ b/packages/cli/snap-tests-global/create-from-monorepo-subdir/steps.json
@@ -25,6 +25,12 @@
       "command": "cd scripts/helper && vp create --no-interactive vite:application --directory apps/custom-app # --directory from non-workspace dir",
       "ignoreOutput": true
     },
-    "test -f apps/custom-app/package.json && echo 'Created at apps/custom-app with --directory' || echo 'NOT at apps/custom-app'"
+    "test -f apps/custom-app/package.json && echo 'Created at apps/custom-app with --directory' || echo 'NOT at apps/custom-app'",
+
+    {
+      "command": "mkdir -p apps/dot-test && cd apps/dot-test && vp create --no-interactive vite:application --directory . # --directory . from monorepo subdir",
+      "ignoreOutput": true
+    },
+    "test -f apps/dot-test/package.json && echo 'Created at apps/dot-test with --directory .' || echo 'NOT at apps/dot-test'"
   ]
 }
diff --git a/packages/cli/snap-tests-global/new-create-vite-directory-dot/snap.txt b/packages/cli/snap-tests-global/new-create-vite-directory-dot/snap.txt
new file mode 100644
index 0000000000..45f7b47da2
--- /dev/null
+++ b/packages/cli/snap-tests-global/new-create-vite-directory-dot/snap.txt
@@ -0,0 +1,10 @@
+[1]> vp create vite:application --no-interactive --directory . # create vite app in current directory
+
+Using package name: new-create-vite-directory-dot
+
+Use --directory to specify a different location or remove the directory first
+Target directory "<cwd>" is not empty
+
+
+[1]> ls package.json # check package.json exists in current directory
+ls: package.json: No such file or directory
diff --git a/packages/cli/src/create/bin.ts b/packages/cli/src/create/bin.ts
index 00f732b649..3592359393 100644
--- a/packages/cli/src/create/bin.ts
+++ b/packages/cli/src/create/bin.ts
@@ -583,6 +583,11 @@ Use \`vp create --list\` to list all available templates, or run \`vp create --h
         fallbackName,
       );
       prompts.log.info(`Using package name: ${accent(packageName)}`);
+      // In a monorepo subdirectory, resolve '.' to the path relative to rootDir
+      // so that scaffolding happens in cwd, not at the workspace root
+      if (isMonorepo && cwdRelativeToRoot) {
+        targetDir = cwdRelativeToRoot;
+      }
     } else if (selectedTemplateName === BuiltinTemplate.monorepo) {
       const selected = await promptPackageNameAndTargetDir(
         getRandomProjectName({ fallbackName: 'vite-plus-monorepo' }),

From 8d89bd606a235965b1b6a362f331ff819aaf1874 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=EC=9D=B4=EC=A2=85=EA=B2=BD?= <gyoung3063413@naver.com>
Date: Mon, 23 Mar 2026 20:47:16 +0900
Subject: [PATCH 3/7] fix(test): verify --directory . success path in
 standalone snap test

---
 .../new-create-vite-directory-dot/snap.txt          | 13 +++----------
 .../new-create-vite-directory-dot/steps.json        |  4 ++--
 2 files changed, 5 insertions(+), 12 deletions(-)

diff --git a/packages/cli/snap-tests-global/new-create-vite-directory-dot/snap.txt b/packages/cli/snap-tests-global/new-create-vite-directory-dot/snap.txt
index 45f7b47da2..b07de24e2c 100644
--- a/packages/cli/snap-tests-global/new-create-vite-directory-dot/snap.txt
+++ b/packages/cli/snap-tests-global/new-create-vite-directory-dot/snap.txt
@@ -1,10 +1,3 @@
-[1]> vp create vite:application --no-interactive --directory . # create vite app in current directory
-
-Using package name: new-create-vite-directory-dot
-
-Use --directory to specify a different location or remove the directory first
-Target directory "<cwd>" is not empty
-
-
-[1]> ls package.json # check package.json exists in current directory
-ls: package.json: No such file or directory
+> mkdir -p my-app && cd my-app && vp create vite:application --no-interactive --directory . # create vite app in current directory
+> test -f my-app/package.json && echo 'Created at my-app with --directory .' || echo 'NOT at my-app'
+Created at my-app with --directory .
diff --git a/packages/cli/snap-tests-global/new-create-vite-directory-dot/steps.json b/packages/cli/snap-tests-global/new-create-vite-directory-dot/steps.json
index d6ba92d2b2..10ad8fc718 100644
--- a/packages/cli/snap-tests-global/new-create-vite-directory-dot/steps.json
+++ b/packages/cli/snap-tests-global/new-create-vite-directory-dot/steps.json
@@ -1,9 +1,9 @@
 {
   "commands": [
     {
-      "command": "vp create vite:application --no-interactive --directory . # create vite app in current directory",
+      "command": "mkdir -p my-app && cd my-app && vp create vite:application --no-interactive --directory . # create vite app in current directory",
       "ignoreOutput": true
     },
-    "ls package.json # check package.json exists in current directory"
+    "test -f my-app/package.json && echo 'Created at my-app with --directory .' || echo 'NOT at my-app'"
   ]
 }

From 3d2f1c58571231fb0681c67c71160463491297c6 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=EC=9D=B4=EC=A2=85=EA=B2=BD?= <gyoung3063413@naver.com>
Date: Mon, 23 Mar 2026 21:06:08 +0900
Subject: [PATCH 4/7] fix(create): reject --directory . at monorepo root and
 inside existing packages

---
 .../create-from-monorepo-subdir/snap.txt      | 12 ++++++++++
 .../create-from-monorepo-subdir/steps.json    |  6 ++++-
 packages/cli/src/create/bin.ts                | 23 ++++++++++++++++---
 3 files changed, 37 insertions(+), 4 deletions(-)

diff --git a/packages/cli/snap-tests-global/create-from-monorepo-subdir/snap.txt b/packages/cli/snap-tests-global/create-from-monorepo-subdir/snap.txt
index 27cc642cf3..dbd7458b3e 100644
--- a/packages/cli/snap-tests-global/create-from-monorepo-subdir/snap.txt
+++ b/packages/cli/snap-tests-global/create-from-monorepo-subdir/snap.txt
@@ -23,3 +23,15 @@ Created at apps/custom-app with --directory
 > mkdir -p apps/dot-test && cd apps/dot-test && vp create --no-interactive vite:application --directory . # --directory . from monorepo subdir
 > test -f apps/dot-test/package.json && echo 'Created at apps/dot-test with --directory .' || echo 'NOT at apps/dot-test'
 Created at apps/dot-test with --directory .
+
+> vp create --no-interactive vite:application --directory . 2>&1 || true # --directory . from monorepo root should fail
+
+Using package name: create-from-monorepo-subdir
+Cannot scaffold into the monorepo root directory. Use --directory to specify a target directory
+
+
+> mkdir -p apps/website/src && cd apps/website/src && vp create --no-interactive vite:application --directory . 2>&1 || true # --directory . inside existing package should fail
+
+Using package name: src
+Cannot scaffold inside existing package "website" (apps/website). Use --directory to specify a different location
+
diff --git a/packages/cli/snap-tests-global/create-from-monorepo-subdir/steps.json b/packages/cli/snap-tests-global/create-from-monorepo-subdir/steps.json
index 31d5084f90..6e84978ab3 100644
--- a/packages/cli/snap-tests-global/create-from-monorepo-subdir/steps.json
+++ b/packages/cli/snap-tests-global/create-from-monorepo-subdir/steps.json
@@ -31,6 +31,10 @@
       "command": "mkdir -p apps/dot-test && cd apps/dot-test && vp create --no-interactive vite:application --directory . # --directory . from monorepo subdir",
       "ignoreOutput": true
     },
-    "test -f apps/dot-test/package.json && echo 'Created at apps/dot-test with --directory .' || echo 'NOT at apps/dot-test'"
+    "test -f apps/dot-test/package.json && echo 'Created at apps/dot-test with --directory .' || echo 'NOT at apps/dot-test'",
+
+    "vp create --no-interactive vite:application --directory . 2>&1 || true # --directory . from monorepo root should fail",
+
+    "mkdir -p apps/website/src && cd apps/website/src && vp create --no-interactive vite:application --directory . 2>&1 || true # --directory . inside existing package should fail"
   ]
 }
diff --git a/packages/cli/src/create/bin.ts b/packages/cli/src/create/bin.ts
index 3592359393..c6f532dc82 100644
--- a/packages/cli/src/create/bin.ts
+++ b/packages/cli/src/create/bin.ts
@@ -583,9 +583,26 @@ Use \`vp create --list\` to list all available templates, or run \`vp create --h
         fallbackName,
       );
       prompts.log.info(`Using package name: ${accent(packageName)}`);
-      // In a monorepo subdirectory, resolve '.' to the path relative to rootDir
-      // so that scaffolding happens in cwd, not at the workspace root
-      if (isMonorepo && cwdRelativeToRoot) {
+      if (isMonorepo) {
+        if (!cwdRelativeToRoot) {
+          // At monorepo root: scaffolding here would overwrite the entire workspace
+          cancelAndExit(
+            'Cannot scaffold into the monorepo root directory. Use --directory to specify a target directory',
+            1,
+          );
+        }
+        // Check if cwd is inside an existing workspace package
+        const enclosingPackage = workspaceInfoOptional.packages.find((pkg) =>
+          cwdRelativeToRoot.startsWith(`${pkg.path}/`),
+        );
+        if (enclosingPackage) {
+          cancelAndExit(
+            `Cannot scaffold inside existing package "${enclosingPackage.name}" (${enclosingPackage.path}). Use --directory to specify a different location`,
+            1,
+          );
+        }
+        // Resolve '.' to the path relative to rootDir
+        // so that scaffolding happens in cwd, not at the workspace root
         targetDir = cwdRelativeToRoot;
       }
     } else if (selectedTemplateName === BuiltinTemplate.monorepo) {

From 44ffcef1309c490c0cdb4b78a6528b16202bbaca Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=EC=9D=B4=EC=A2=85=EA=B2=BD?= <gyoung3063413@naver.com>
Date: Mon, 23 Mar 2026 21:25:41 +0900
Subject: [PATCH 5/7] fix(create): detect --directory . at existing package
 root

---
 .../snap-tests-global/create-from-monorepo-subdir/snap.txt  | 6 ++++++
 .../create-from-monorepo-subdir/steps.json                  | 4 +++-
 packages/cli/src/create/bin.ts                              | 6 ++++--
 3 files changed, 13 insertions(+), 3 deletions(-)

diff --git a/packages/cli/snap-tests-global/create-from-monorepo-subdir/snap.txt b/packages/cli/snap-tests-global/create-from-monorepo-subdir/snap.txt
index dbd7458b3e..367832dd11 100644
--- a/packages/cli/snap-tests-global/create-from-monorepo-subdir/snap.txt
+++ b/packages/cli/snap-tests-global/create-from-monorepo-subdir/snap.txt
@@ -35,3 +35,9 @@ Cannot scaffold into the monorepo root directory. Use --directory to specify a t
 Using package name: src
 Cannot scaffold inside existing package "website" (apps/website). Use --directory to specify a different location
 
+
+> cd apps/website && vp create --no-interactive vite:application --directory . 2>&1 || true # --directory . at existing package root should fail
+
+Using package name: website
+Cannot scaffold inside existing package "website" (apps/website). Use --directory to specify a different location
+
diff --git a/packages/cli/snap-tests-global/create-from-monorepo-subdir/steps.json b/packages/cli/snap-tests-global/create-from-monorepo-subdir/steps.json
index 6e84978ab3..72df0f7725 100644
--- a/packages/cli/snap-tests-global/create-from-monorepo-subdir/steps.json
+++ b/packages/cli/snap-tests-global/create-from-monorepo-subdir/steps.json
@@ -35,6 +35,8 @@
 
     "vp create --no-interactive vite:application --directory . 2>&1 || true # --directory . from monorepo root should fail",
 
-    "mkdir -p apps/website/src && cd apps/website/src && vp create --no-interactive vite:application --directory . 2>&1 || true # --directory . inside existing package should fail"
+    "mkdir -p apps/website/src && cd apps/website/src && vp create --no-interactive vite:application --directory . 2>&1 || true # --directory . inside existing package should fail",
+
+    "cd apps/website && vp create --no-interactive vite:application --directory . 2>&1 || true # --directory . at existing package root should fail"
   ]
 }
diff --git a/packages/cli/src/create/bin.ts b/packages/cli/src/create/bin.ts
index c6f532dc82..1dde471f49 100644
--- a/packages/cli/src/create/bin.ts
+++ b/packages/cli/src/create/bin.ts
@@ -592,8 +592,10 @@ Use \`vp create --list\` to list all available templates, or run \`vp create --h
           );
         }
         // Check if cwd is inside an existing workspace package
-        const enclosingPackage = workspaceInfoOptional.packages.find((pkg) =>
-          cwdRelativeToRoot.startsWith(`${pkg.path}/`),
+        const enclosingPackage = workspaceInfoOptional.packages.find(
+          (pkg) =>
+            cwdRelativeToRoot === pkg.path ||
+            cwdRelativeToRoot.startsWith(`${pkg.path}/`),
         );
         if (enclosingPackage) {
           cancelAndExit(

From f37413ca02e75e419abe7ce116b5c1e6c860b387 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=EC=9D=B4=EC=A2=85=EA=B2=BD?= <gyoung3063413@naver.com>
Date: Mon, 23 Mar 2026 21:31:29 +0900
Subject: [PATCH 6/7] fix(create): log package name after monorepo validation
 checks

---
 .../snap-tests-global/create-from-monorepo-subdir/snap.txt  | 6 ------
 packages/cli/src/create/bin.ts                              | 2 +-
 2 files changed, 1 insertion(+), 7 deletions(-)

diff --git a/packages/cli/snap-tests-global/create-from-monorepo-subdir/snap.txt b/packages/cli/snap-tests-global/create-from-monorepo-subdir/snap.txt
index 367832dd11..187bec6010 100644
--- a/packages/cli/snap-tests-global/create-from-monorepo-subdir/snap.txt
+++ b/packages/cli/snap-tests-global/create-from-monorepo-subdir/snap.txt
@@ -25,19 +25,13 @@ Created at apps/custom-app with --directory
 Created at apps/dot-test with --directory .
 
 > vp create --no-interactive vite:application --directory . 2>&1 || true # --directory . from monorepo root should fail
-
-Using package name: create-from-monorepo-subdir
 Cannot scaffold into the monorepo root directory. Use --directory to specify a target directory
 
 
 > mkdir -p apps/website/src && cd apps/website/src && vp create --no-interactive vite:application --directory . 2>&1 || true # --directory . inside existing package should fail
-
-Using package name: src
 Cannot scaffold inside existing package "website" (apps/website). Use --directory to specify a different location
 
 
 > cd apps/website && vp create --no-interactive vite:application --directory . 2>&1 || true # --directory . at existing package root should fail
-
-Using package name: website
 Cannot scaffold inside existing package "website" (apps/website). Use --directory to specify a different location
 
diff --git a/packages/cli/src/create/bin.ts b/packages/cli/src/create/bin.ts
index 1dde471f49..badfdd3695 100644
--- a/packages/cli/src/create/bin.ts
+++ b/packages/cli/src/create/bin.ts
@@ -582,7 +582,6 @@ Use \`vp create --list\` to list all available templates, or run \`vp create --h
         workspaceInfoOptional.monorepoScope,
         fallbackName,
       );
-      prompts.log.info(`Using package name: ${accent(packageName)}`);
       if (isMonorepo) {
         if (!cwdRelativeToRoot) {
           // At monorepo root: scaffolding here would overwrite the entire workspace
@@ -607,6 +606,7 @@ Use \`vp create --list\` to list all available templates, or run \`vp create --h
         // so that scaffolding happens in cwd, not at the workspace root
         targetDir = cwdRelativeToRoot;
       }
+      prompts.log.info(`Using package name: ${accent(packageName)}`);
     } else if (selectedTemplateName === BuiltinTemplate.monorepo) {
       const selected = await promptPackageNameAndTargetDir(
         getRandomProjectName({ fallbackName: 'vite-plus-monorepo' }),

From a23d9d0f7ec2795752bd09fc38e7a47feb3370ec Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=EC=9D=B4=EC=A2=85=EA=B2=BD?= <gyoung3063413@naver.com>
Date: Mon, 23 Mar 2026 22:48:54 +0900
Subject: [PATCH 7/7] chore(create): apply formatter

---
 packages/cli/src/create/bin.ts | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

diff --git a/packages/cli/src/create/bin.ts b/packages/cli/src/create/bin.ts
index badfdd3695..63b0f2ce4d 100644
--- a/packages/cli/src/create/bin.ts
+++ b/packages/cli/src/create/bin.ts
@@ -592,9 +592,7 @@ Use \`vp create --list\` to list all available templates, or run \`vp create --h
         }
         // Check if cwd is inside an existing workspace package
         const enclosingPackage = workspaceInfoOptional.packages.find(
-          (pkg) =>
-            cwdRelativeToRoot === pkg.path ||
-            cwdRelativeToRoot.startsWith(`${pkg.path}/`),
+          (pkg) => cwdRelativeToRoot === pkg.path || cwdRelativeToRoot.startsWith(`${pkg.path}/`),
         );
         if (enclosingPackage) {
           cancelAndExit(