create-krispya 0.12.0 → 0.14.0

package/dist/cli.mjs

@@ -2,17 +2,18 @@
 import * as p from '@clack/prompts';
 import color from 'chalk';
 import { Command } from 'commander';
-import { access as access$1, readFile, writeFile, readdir, mkdir, unlink } from 'node:fs/promises';
+import { access, readFile, writeFile, readdir, mkdir, unlink } from 'node:fs/promises';
 import { createRequire } from 'node:module';
-import { resolve, join as join$1, dirname } from 'node:path';
+import { resolve, join, dirname } from 'node:path';
 import { cwd } from 'node:process';
 import { fetch } from 'undici';
-import { t as getEngineName, a as getBaseTemplate, s as shouldEnableReactCompiler, b as getLanguageFromTemplate, x as getPackageManagerName, g as generateRandomName, A as ALL_AI_PLATFORMS, y as AI_PLATFORM_LABELS, z as AI_PLATFORM_HINTS, d as detectTooling, B as parsePackageManager, C as parseEngine, p as parseWorkspaceYamlContent, D as renderTypescriptConfigPackage, E as renderOxlintConfigPackage, F as renderEslintConfigPackage, G as renderOxfmtConfigPackage, H as renderPrettierConfigPackage, I as resolveMonorepoRootPackageVersions, J as getResolvedPackageVersion, K as renderVscodeFiles, L as renderAiFiles, M as renderVscodeFiles$1, N as renderEditorConfig, O as renderGitignore, P as toPrettierIgnoreContent, Q as mergePackageJsonScripts, R as renderViteConfig, S as packageJsonScripts, T as resolveDefaultPackageJsonScripts, U as formatResolvedPackageVersion, V as renderOxlintConfig, l as planProject, r as resolveProjectPlanInput, v as validatePackageName, q as resolveWorkspacePlanInput, n as planWorkspace } from './shared/create-krispya.DZWMfM2v.mjs';
-import Conf from 'conf';
-import { access, constants, readFile as readFile$1, mkdir as mkdir$1, writeFile as writeFile$1 } from 'fs/promises';
-import { constants as constants$2 } from 'fs';
-import { join, dirname as dirname$1 } from 'path';
-import { constants as constants$1 } from 'node:fs';
+import { g as getEngineName, a as getPackageManagerName, b as getBaseTemplate, s as shouldEnableReactCompiler, c as getLanguageFromTemplate, d as generateRandomName, e as getConfigStrategy, f as getAiPlatforms, A as ALL_AI_PLATFORMS, h as AI_PLATFORM_LABELS, i as AI_PLATFORM_HINTS, j as detectTooling, p as parsePackageManagerSpec, k as parseEngine, l as parseWorkspaceYamlContent, v as validateWorkspace, r as renderTypescriptConfigPackage, m as renderOxlintConfigPackage, n as renderEslintConfigPackage, o as renderOxfmtConfigPackage, q as renderPrettierConfigPackage, t as resolveMonorepoRootPackageVersions, u as getResolvedPackageVersion, w as renderVscodeFiles, x as renderAiFiles, y as renderVscodeFiles$1, z as renderEditorConfig, B as renderGitignore, C as toPrettierIgnoreContent, D as mergePackageJsonScripts, E as getPackageManagerProfile, F as renderPnpmWorkspaceConfig, G as renderViteConfig, H as packageJsonScripts, I as resolveDefaultPackageJsonScripts, J as formatResolvedPackageVersion, K as getSemverMajorString, L as formatPackageManager, M as renderOxlintConfig, N as resolvePackageManager, O as getSemverMajor, P as compareNumericSemver, Q as getPackageDirectoryName, R as planProject, S as resolveProjectPlanInput, T as validatePackageName, U as clearConfig, V as getConfigPath, W as resolveWorkspacePlanInput, X as planWorkspace } from './shared/create-krispya.BYCdQkPo.mjs';
+import { readFile as readFile$1, mkdir as mkdir$1, writeFile as writeFile$1, access as access$1 } from 'fs/promises';
+import { constants as constants$1 } from 'fs';
+import { join as join$1, dirname as dirname$1 } from 'path';
+import { constants } from 'node:fs';
+import { spawn } from 'node:child_process';
+import 'conf';
 
 function formatConfigSummary(options, inherited) {
   const lines = [];
@@ -30,8 +31,9 @@ function formatConfigSummary(options, inherited) {
   const projectType = options.projectType ?? "app";
   const baseTemplate = options.template ? getBaseTemplate(options.template) : "vanilla";
   if (baseTemplate === "react") {
-    lines.push(formatRow("Framework", "React"));
-    lines.push(formatRow("\u21B3 React compiler", shouldEnableReactCompiler(options) ? "yes" : "no"));
+    lines.push(
+      formatRow("Framework", shouldEnableReactCompiler(options) ? "React + compiler" : "React")
+    );
   } else if (baseTemplate === "r3f") {
     lines.push(formatRow("Framework", "React Three Fiber"));
   }
@@ -112,8 +114,9 @@ function formatMonorepoConfigSummary(options) {
   lines.push(
     formatRow("Engine", `${getEngineName(options.engine)}@${options.engine.version ?? "latest"}`)
   );
-  lines.push(formatRow("Package manager", options.packageManager));
-  if (options.packageManager === "pnpm") {
+  const packageManagerName = getPackageManagerName(options.packageManager);
+  lines.push(formatRow("Package manager", packageManagerName));
+  if (packageManagerName === "pnpm") {
     const versionManaged = options.pnpmManageVersions ? "yes" : "no";
     lines.push(formatRow("\u21B3 Version managed", versionManaged, ""));
   }
@@ -123,22 +126,6 @@ function formatMonorepoConfigSummary(options) {
   return lines.join("\n");
 }
 
-const config = new Conf({
-  projectName: "create-krispya"
-});
-function getAiPlatforms() {
-  return config.get("aiPlatforms");
-}
-function getConfigStrategy() {
-  return config.get("configStrategy") ?? "stealth";
-}
-function clearConfig() {
-  config.clear();
-}
-function getConfigPath() {
-  return config.path;
-}
-
 const R3F_INTEGRATION_OPTIONS = [
   { value: "drei", label: "Drei" },
   { value: "handle", label: "Handle" },
@@ -252,7 +239,7 @@ async function promptForCustomization(template, name, projectType, features, inh
     libraryBundler = bundler;
   }
   let engine = inheritedSettings?.engine ?? presets?.engine ?? { name: "node", version: "latest" };
-  let finalPackageManager = inheritedSettings?.packageManager?.name ?? presets?.packageManager ?? "pnpm";
+  let finalPackageManager = inheritedSettings?.packageManager?.name ?? presets?.packageManager?.name ?? "pnpm";
   let pnpmManageVersions = inheritedSettings?.pnpmManageVersions ?? presets?.pnpmManageVersions ?? true;
   if (!inheritedSettings?.engine?.version) {
     const nodeVersionInput = await p.text({
@@ -260,7 +247,7 @@ async function promptForCustomization(template, name, projectType, features, inh
       placeholder: presets?.engine?.version ?? "latest",
       defaultValue: presets?.engine?.version ?? "latest",
       validate: (value) => {
-        if (!value.length) return "Required";
+        if (!value?.length) return "Required";
         if (value !== "latest" && !/^\d+(\.\d+(\.\d+)?)?$/.test(value)) {
           return 'Must be "latest" or a valid semver (e.g., "22" or "22.13.0")';
         }
@@ -280,7 +267,7 @@ async function promptForCustomization(template, name, projectType, features, inh
         { value: "npm", label: "npm" },
         { value: "yarn", label: "yarn" }
       ],
-      initialValue: presets?.packageManager ?? "pnpm"
+      initialValue: presets?.packageManager?.name ?? "pnpm"
     });
     if (p.isCancel(packageManager)) {
       p.cancel("Operation cancelled.");
@@ -389,7 +376,7 @@ async function promptForCustomization(template, name, projectType, features, inh
     projectType,
     libraryBundler: projectType === "library" ? libraryBundler : void 0,
     engine,
-    packageManager: { name: finalPackageManager },
+    packageManager: presets?.packageManager?.name === finalPackageManager ? presets.packageManager : { name: finalPackageManager },
     pnpmManageVersions,
     linter,
     formatter,
@@ -436,7 +423,7 @@ async function promptForMonorepoCustomization(name, presets) {
     placeholder: presets?.engine?.version ?? "latest",
     defaultValue: presets?.engine?.version ?? "latest",
     validate: (value) => {
-      if (!value.length) return "Required";
+      if (!value?.length) return "Required";
       if (value !== "latest" && !/^\d+(\.\d+(\.\d+)?)?$/.test(value)) {
         return 'Must be "latest" or a valid semver (e.g., "22" or "22.13.0")';
       }
@@ -517,7 +504,7 @@ async function promptForMonorepo(workspaceName, presets) {
     formatMonorepoConfigSummary({
       name: defaultOptions.name,
       engine: defaultOptions.engine ?? { name: "node", version: "latest" },
-      packageManager: getPackageManagerName(defaultOptions.packageManager),
+      packageManager: defaultOptions.packageManager ?? { name: "pnpm" },
       pnpmManageVersions: defaultOptions.pnpmManageVersions,
       linter: defaultOptions.linter ?? "oxlint",
       formatter: defaultOptions.formatter ?? "prettier",
@@ -538,7 +525,7 @@ async function promptForOptions(name, presets) {
       placeholder: generateRandomName(),
       defaultValue: generateRandomName(),
       validate: (value) => {
-        if (!value.length) return "Project name is required";
+        if (!value?.length) return "Project name is required";
       }
     });
     if (p.isCancel(nameResult)) {
@@ -570,7 +557,7 @@ function presetsToInheritedSettings(presets) {
   return {
     linter: presets.linter,
     formatter: presets.formatter,
-    packageManager: presets.packageManager ? { name: presets.packageManager } : void 0,
+    packageManager: presets.packageManager,
     engine: presets.engine,
     pnpmManageVersions: presets.pnpmManageVersions
   };
@@ -655,54 +642,9 @@ async function promptForAiAgentPlatforms(isNonInteractive) {
   return selected;
 }
 
-async function checkAnyExists(paths) {
-  for (const path of paths) {
-    try {
-      await access(path, constants.F_OK);
-      return true;
-    } catch {
-    }
-  }
-  return false;
-}
-async function validateWorkspace(monorepoRoot) {
-  const errors = [];
-  const tsConfigPath = join(monorepoRoot, ".config/typescript/package.json");
-  try {
-    await access(tsConfigPath, constants.F_OK);
-  } catch {
-    errors.push("Missing .config/typescript package");
-  }
-  const linterPaths = [
-    join(monorepoRoot, ".config/oxlint/package.json"),
-    join(monorepoRoot, ".config/eslint/package.json"),
-    join(monorepoRoot, "eslint.config.js"),
-    join(monorepoRoot, "biome.json")
-  ];
-  const hasLinter = await checkAnyExists(linterPaths);
-  if (!hasLinter) {
-    errors.push(
-      "Missing linter config (.config/oxlint, .config/eslint, eslint.config.js, or biome.json)"
-    );
-  }
-  const formatterPaths = [
-    join(monorepoRoot, ".config/oxfmt/package.json"),
-    join(monorepoRoot, ".config/prettier/package.json"),
-    join(monorepoRoot, ".prettierrc.json"),
-    join(monorepoRoot, "biome.json")
-  ];
-  const hasFormatter = await checkAnyExists(formatterPaths);
-  if (!hasFormatter) {
-    errors.push(
-      "Missing formatter config (.config/oxfmt, .config/prettier, .prettierrc.json, or biome.json)"
-    );
-  }
-  return { valid: errors.length === 0, errors };
-}
-
 async function fileExists$1(path) {
   try {
-    await access$1(path, constants$1.F_OK);
+    await access(path, constants.F_OK);
     return true;
   } catch {
     return false;
@@ -716,9 +658,9 @@ async function detectMonorepoRoot() {
   let currentDir = cwd();
   const root = resolve("/");
   while (currentDir !== root) {
-    const workspaceFile = join$1(currentDir, "pnpm-workspace.yaml");
+    const workspaceFile = join(currentDir, "pnpm-workspace.yaml");
     try {
-      await access$1(workspaceFile, constants$1.F_OK);
+      await access(workspaceFile, constants.F_OK);
       const content = await readFile(workspaceFile, "utf-8");
       if (content.includes("packages:")) {
         return currentDir;
@@ -733,16 +675,16 @@ async function detectPackageRoot() {
   let currentDir = cwd();
   const root = resolve("/");
   while (currentDir !== root) {
-    if (await fileExists$1(join$1(currentDir, "package.json"))) {
+    if (await fileExists$1(join(currentDir, "package.json"))) {
       return currentDir;
     }
     currentDir = dirname(currentDir);
   }
-  return await fileExists$1(join$1(root, "package.json")) ? root : null;
+  return await fileExists$1(join(root, "package.json")) ? root : null;
 }
 async function parseWorkspaceDirectories(monorepoRoot) {
   try {
-    const workspaceFile = join$1(monorepoRoot, "pnpm-workspace.yaml");
+    const workspaceFile = join(monorepoRoot, "pnpm-workspace.yaml");
     const content = await readFile(workspaceFile, "utf-8");
     return parseWorkspaceYamlContent(content);
   } catch {
@@ -752,14 +694,14 @@ async function parseWorkspaceDirectories(monorepoRoot) {
 async function detectWorkspaceSettings(monorepoRoot) {
   try {
     const tooling = await detectTooling(monorepoRoot);
-    const pkgPath = join$1(monorepoRoot, "package.json");
+    const pkgPath = join(monorepoRoot, "package.json");
     const content = await readFile(pkgPath, "utf-8");
     const pkgJson = JSON.parse(content);
-    const packageManager = parsePackageManager(pkgJson.packageManager);
+    const packageManager = parsePackageManagerSpec(pkgJson.packageManager);
     const engine = parseEngine(pkgJson.engines);
     let pnpmManageVersions;
     try {
-      const workspaceFile = join$1(monorepoRoot, "pnpm-workspace.yaml");
+      const workspaceFile = join(monorepoRoot, "pnpm-workspace.yaml");
       const workspaceContent = await readFile(workspaceFile, "utf-8");
       pnpmManageVersions = workspaceContent.includes("manage-package-manager-versions: true");
     } catch {
@@ -777,17 +719,17 @@ async function detectWorkspaceSettings(monorepoRoot) {
 }
 async function detectExistingConfigs(monorepoRoot) {
   const configs = {};
-  const eslintPath = join$1(monorepoRoot, "eslint.config.js");
+  const eslintPath = join(monorepoRoot, "eslint.config.js");
   if (await fileExists$1(eslintPath)) {
     configs.linter = "eslint";
     configs.eslintConfigPath = eslintPath;
   }
-  const prettierPath = join$1(monorepoRoot, ".prettierrc.json");
+  const prettierPath = join(monorepoRoot, ".prettierrc.json");
   if (await fileExists$1(prettierPath)) {
     configs.formatter = "prettier";
     configs.prettierConfigPath = prettierPath;
   }
-  const biomePath = join$1(monorepoRoot, "biome.json");
+  const biomePath = join(monorepoRoot, "biome.json");
   if (await fileExists$1(biomePath)) {
     configs.biomeConfigPath = biomePath;
     if (!configs.linter) configs.linter = "biome";
@@ -797,7 +739,7 @@ async function detectExistingConfigs(monorepoRoot) {
 }
 async function getMonorepoScope(monorepoRoot) {
   try {
-    const pkgPath = join$1(monorepoRoot, "package.json");
+    const pkgPath = join(monorepoRoot, "package.json");
     const content = await readFile(pkgPath, "utf-8");
     const pkgJson = JSON.parse(content);
     if (pkgJson.name) {
@@ -808,14 +750,14 @@ async function getMonorepoScope(monorepoRoot) {
   return monorepoRoot.split(/[/\\]/).pop() ?? "workspace";
 }
 async function getWorkspacePackages(monorepoRoot) {
-  const packagesDir = join$1(monorepoRoot, "packages");
+  const packagesDir = join(monorepoRoot, "packages");
   try {
     const entries = await readdir(packagesDir, { withFileTypes: true });
     const names = [];
     for (const entry of entries) {
       if (!entry.isDirectory()) continue;
       try {
-        const content = await readFile(join$1(packagesDir, entry.name, "package.json"), "utf-8");
+        const content = await readFile(join(packagesDir, entry.name, "package.json"), "utf-8");
         const pkg = JSON.parse(content);
         if (pkg.name) names.push(pkg.name);
       } catch {
@@ -827,7 +769,7 @@ async function getWorkspacePackages(monorepoRoot) {
   }
 }
 async function ensureConfigInWorkspace(monorepoRoot) {
-  const workspacePath = join$1(monorepoRoot, "pnpm-workspace.yaml");
+  const workspacePath = join(monorepoRoot, "pnpm-workspace.yaml");
   let content;
   try {
     content = await readFile(workspacePath, "utf-8");
@@ -877,7 +819,7 @@ async function handleCheckCommand() {
 
 async function migrateEslintConfig(monorepoRoot, files) {
   const configBasePath = ".config/eslint";
-  const existingConfigPath = join$1(monorepoRoot, "eslint.config.js");
+  const existingConfigPath = join(monorepoRoot, "eslint.config.js");
   let existingContent;
   try {
     existingContent = await readFile(existingConfigPath, "utf-8");
@@ -956,7 +898,7 @@ export default [
 }
 async function migratePrettierConfig(monorepoRoot, files) {
   const configBasePath = ".config/prettier";
-  const existingConfigPath = join$1(monorepoRoot, ".prettierrc.json");
+  const existingConfigPath = join(monorepoRoot, ".prettierrc.json");
   let existingContent;
   try {
     existingContent = await readFile(existingConfigPath, "utf-8");
@@ -1092,15 +1034,15 @@ async function handleFixCommand(options) {
   spinner.start("Fixing workspace...");
   try {
     const files = {};
-    const tsConfigExists = await fileExists$1(join$1(monorepoRoot, ".config/typescript/package.json"));
+    const tsConfigExists = await fileExists$1(join(monorepoRoot, ".config/typescript/package.json"));
     if (!tsConfigExists) {
       renderTypescriptConfigPackage(files);
     }
     if (linter === "oxlint") {
-      const oxlintExists = await fileExists$1(join$1(monorepoRoot, ".config/oxlint/package.json"));
+      const oxlintExists = await fileExists$1(join(monorepoRoot, ".config/oxlint/package.json"));
       if (!oxlintExists) renderOxlintConfigPackage(files);
     } else if (linter === "eslint") {
-      const eslintPkgExists = await fileExists$1(join$1(monorepoRoot, ".config/eslint/package.json"));
+      const eslintPkgExists = await fileExists$1(join(monorepoRoot, ".config/eslint/package.json"));
       if (!eslintPkgExists) {
         if (existingConfigs.eslintConfigPath) {
           await migrateEslintConfig(monorepoRoot, files);
@@ -1110,10 +1052,10 @@ async function handleFixCommand(options) {
       }
     }
     if (formatter === "oxfmt") {
-      const oxfmtExists = await fileExists$1(join$1(monorepoRoot, ".config/oxfmt/package.json"));
+      const oxfmtExists = await fileExists$1(join(monorepoRoot, ".config/oxfmt/package.json"));
       if (!oxfmtExists) renderOxfmtConfigPackage(files);
     } else if (formatter === "prettier") {
-      const prettierPkgExists = await fileExists$1(join$1(monorepoRoot, ".config/prettier/package.json"));
+      const prettierPkgExists = await fileExists$1(join(monorepoRoot, ".config/prettier/package.json"));
       if (!prettierPkgExists) {
         if (existingConfigs.prettierConfigPath) {
           await migratePrettierConfig(monorepoRoot, files);
@@ -1151,7 +1093,7 @@ async function handleFixCommand(options) {
       };
     }
     for (const [filePath, file] of Object.entries(files)) {
-      const fullPath = join$1(monorepoRoot, filePath);
+      const fullPath = join(monorepoRoot, filePath);
       await mkdir(dirname(fullPath), { recursive: true });
       await writeFile(fullPath, file.content);
     }
@@ -1174,8 +1116,8 @@ async function handleFixCommand(options) {
       const pkgName = pkgFile.replace("/package.json", "");
       console.log(color.dim(`  Generated ${pkgName}`));
     }
-    const vscodeSettingsExists = await fileExists$1(join$1(monorepoRoot, ".vscode/settings.json"));
-    const vscodeExtensionsExists = await fileExists$1(join$1(monorepoRoot, ".vscode/extensions.json"));
+    const vscodeSettingsExists = await fileExists$1(join(monorepoRoot, ".vscode/settings.json"));
+    const vscodeExtensionsExists = await fileExists$1(join(monorepoRoot, ".vscode/extensions.json"));
     const vscodeExists = vscodeSettingsExists && vscodeExtensionsExists;
     if (!vscodeExists) {
       let addVscode = false;
@@ -1192,7 +1134,7 @@ async function handleFixCommand(options) {
         const vscodeFiles = {};
         renderVscodeFiles(vscodeFiles, linter, formatter);
         for (const [filePath, file] of Object.entries(vscodeFiles)) {
-          const fullPath = join$1(monorepoRoot, filePath);
+          const fullPath = join(monorepoRoot, filePath);
           await mkdir(dirname(fullPath), { recursive: true });
           await writeFile(fullPath, file.content);
         }
@@ -1200,7 +1142,7 @@ async function handleFixCommand(options) {
         console.log(color.dim("  Generated .vscode/extensions.json"));
       }
     }
-    const aiRulesExist = await fileExists$1(join$1(monorepoRoot, ".ai/workspace.md"));
+    const aiRulesExist = await fileExists$1(join(monorepoRoot, ".ai/workspace.md"));
     if (!aiRulesExist) {
       const platforms = await promptForAiAgentPlatforms(isNonInteractive);
       if (platforms.length > 0) {
@@ -1216,7 +1158,7 @@ async function handleFixCommand(options) {
           platforms
         });
         for (const [filePath, file] of Object.entries(aiFilesOutput)) {
-          const fullPath = join$1(monorepoRoot, filePath);
+          const fullPath = join(monorepoRoot, filePath);
           await mkdir(dirname(fullPath), { recursive: true });
           await writeFile(fullPath, file.content);
           console.log(color.dim(`  Generated ${filePath}`));
@@ -1260,18 +1202,22 @@ function renderExpectedViteConfig(template) {
 async function detectCurrentConfig(root, isMonorepo = true) {
   let name = root.split(/[/\\]/).pop() ?? "workspace";
   let packageManager = "pnpm";
+  let packageManagerSpec = { name: "pnpm" };
+  let engine;
   let hasTypecheck = false;
   let viteTemplate;
   try {
-    const pkgPath = join(root, "package.json");
+    const pkgPath = join$1(root, "package.json");
     const content = await readFile$1(pkgPath, "utf-8");
     const pkgJson = JSON.parse(content);
     if (pkgJson.name) {
       name = pkgJson.name.replace(/^@/, "").replace(/\/.*$/, "");
     }
     if (pkgJson.packageManager) {
-      packageManager = pkgJson.packageManager.split("@")[0] ?? packageManager;
+      packageManagerSpec = parsePackageManagerSpec(pkgJson.packageManager) ?? packageManagerSpec;
+      packageManager = packageManagerSpec.name;
     }
+    engine = parseEngine(pkgJson.engines);
     hasTypecheck = pkgJson.scripts?.typecheck != null;
     viteTemplate = detectViteTemplate(pkgJson);
   } catch {
@@ -1283,6 +1229,8 @@ async function detectCurrentConfig(root, isMonorepo = true) {
     linter: tooling.linter ?? "oxlint",
     formatter: tooling.formatter ?? "prettier",
     packageManager,
+    packageManagerSpec,
+    engine,
     isMonorepo,
     configStrategy,
     hasTypecheck,
@@ -1291,10 +1239,10 @@ async function detectCurrentConfig(root, isMonorepo = true) {
 }
 async function detectSinglePackageConfigStrategy(root) {
   const hasStealthConfig = await Promise.all([
-    fileExists(join(root, ".config/tsconfig.app.json")),
-    fileExists(join(root, ".config/tsconfig.node.json")),
-    fileExists(join(root, ".config/prettier.json")),
-    fileExists(join(root, ".config/oxlint.json"))
+    fileExists(join$1(root, ".config/tsconfig.app.json")),
+    fileExists(join$1(root, ".config/tsconfig.node.json")),
+    fileExists(join$1(root, ".config/prettier.json")),
+    fileExists(join$1(root, ".config/oxlint.json"))
   ]).then((matches) => matches.some(Boolean));
   return hasStealthConfig ? "stealth" : "root";
 }
@@ -1389,7 +1337,7 @@ async function planExpectedFiles(config) {
 }
 async function fileExists(path) {
   try {
-    await access(path, constants$2.F_OK);
+    await access$1(path, constants$1.F_OK);
     return true;
   } catch {
     return false;
@@ -1528,7 +1476,7 @@ async function compareWithDisk(expected, root) {
     const changes = [];
     for (const [filePath, file] of Object.entries(files)) {
       if (file.type !== "text") continue;
-      const fullPath = join(root, filePath);
+      const fullPath = join$1(root, filePath);
       const newContent = file.content;
       if (await fileExists(fullPath)) {
         const currentContent = await readFile$1(fullPath, "utf-8");
@@ -1603,13 +1551,13 @@ function addMissingDevDependency(pkg, devDependencies, name) {
 }
 async function detectTypeScriptPackage(root, pkg) {
   if (hasPackage(pkg, "typescript")) return true;
-  return await fileExists(join(root, "tsconfig.json")) || await fileExists(join(root, "tsconfig.app.json")) || await fileExists(join(root, ".config/tsconfig.app.json"));
+  return await fileExists(join$1(root, "tsconfig.json")) || await fileExists(join$1(root, "tsconfig.app.json")) || await fileExists(join$1(root, ".config/tsconfig.app.json"));
 }
 function detectLibraryPackage(pkg) {
   return pkg.exports != null || pkg.main?.includes("dist") === true || pkg.module?.includes("dist") === true || Array.isArray(pkg.files) && pkg.files.includes("dist");
 }
 function getPackageManagerForScripts(config, pkg) {
-  const packageManager = pkg.packageManager?.split("@")[0] ?? config.packageManager;
+  const packageManager = parsePackageManagerSpec(pkg.packageManager)?.name ?? config.packageManager;
   return isPackageManagerName(packageManager) ? packageManager : "pnpm";
 }
 function getSinglePackageToolScripts(config) {
@@ -1639,6 +1587,35 @@ function scriptsEqual(left, right) {
   if (leftEntries.length !== Object.keys(right).length) return false;
   return leftEntries.every(([key, value]) => right[key] === value);
 }
+function packageManagerFieldsEqual(pkg, packageManagerSpec, targetNodeVersion) {
+  if (packageManagerSpec == null || packageManagerSpec.version == null) {
+    return targetNodeVersion == null || pkg.engines?.node === `>=${targetNodeVersion}`;
+  }
+  const majorVersion = getSemverMajorString(packageManagerSpec.version);
+  return pkg.packageManager === formatPackageManager(packageManagerSpec) && pkg.engines?.[packageManagerSpec.name] === `>=${majorVersion}.0.0` && (targetNodeVersion == null || pkg.engines?.node === `>=${targetNodeVersion}`);
+}
+function applyPackageManagerFields(pkg, packageManagerSpec, targetNodeVersion) {
+  if (packageManagerSpec == null || packageManagerSpec.version == null) {
+    if (targetNodeVersion == null) return pkg;
+    return {
+      ...pkg,
+      engines: {
+        ...pkg.engines,
+        node: `>=${targetNodeVersion}`
+      }
+    };
+  }
+  const majorVersion = getSemverMajorString(packageManagerSpec.version);
+  return {
+    ...pkg,
+    packageManager: formatPackageManager(packageManagerSpec),
+    engines: {
+      ...pkg.engines,
+      [packageManagerSpec.name]: `>=${majorVersion}.0.0`,
+      ...targetNodeVersion == null ? {} : { node: `>=${targetNodeVersion}` }
+    }
+  };
+}
 async function getExpectedPackageScripts(root, config, pkg) {
   if (config.isMonorepo) {
     return packageJsonScripts.monorepoRoot(config.linter, config.formatter);
@@ -1667,6 +1644,9 @@ async function getExpectedPackageDevDependencies(root, config, pkg) {
     addMissingDevDependency(pkg, nextDevDependencies, "@babel/core");
     addMissingDevDependency(pkg, nextDevDependencies, "@rolldown/plugin-babel");
     addMissingDevDependency(pkg, nextDevDependencies, "babel-plugin-react-compiler");
+    if (config.linter === "oxlint") {
+      addMissingDevDependency(pkg, nextDevDependencies, "eslint-plugin-react-hooks");
+    }
     if (await detectTypeScriptPackage(root, pkg)) {
       addMissingDevDependency(pkg, nextDevDependencies, "@types/babel__core");
     }
@@ -1674,7 +1654,7 @@ async function getExpectedPackageDevDependencies(root, config, pkg) {
   return sortPackageMap(nextDevDependencies);
 }
 async function getPackageJsonScriptUpdates(root, config) {
-  const packageJsonPath = join(root, "package.json");
+  const packageJsonPath = join$1(root, "package.json");
   let currentContent;
   try {
     currentContent = await readFile$1(packageJsonPath, "utf-8");
@@ -1687,7 +1667,9 @@ async function getPackageJsonScriptUpdates(root, config) {
   const nextScripts = mergePackageJsonScripts(currentScripts, expectedScripts);
   const currentDevDependencies = pkg.devDependencies ?? {};
   const nextDevDependencies = await getExpectedPackageDevDependencies(root, config, pkg);
-  if (scriptsEqual(currentScripts, nextScripts) && scriptsEqual(currentDevDependencies, nextDevDependencies)) {
+  const targetPackageManagerSpec = config.targetPackageManagerSpec;
+  const targetNodeVersion = config.targetNodeVersion;
+  if (scriptsEqual(currentScripts, nextScripts) && scriptsEqual(currentDevDependencies, nextDevDependencies) && packageManagerFieldsEqual(pkg, targetPackageManagerSpec, targetNodeVersion)) {
     return [
       {
         path: "package.json",
@@ -1697,10 +1679,14 @@ async function getPackageJsonScriptUpdates(root, config) {
       }
     ];
   }
-  const nextPackageJson = {
-    ...pkg,
-    scripts: nextScripts
-  };
+  const nextPackageJson = applyPackageManagerFields(
+    {
+      ...pkg,
+      scripts: nextScripts
+    },
+    targetPackageManagerSpec,
+    targetNodeVersion
+  );
   if (Object.keys(nextDevDependencies).length > 0 || pkg.devDependencies != null) {
     nextPackageJson.devDependencies = nextDevDependencies;
   }
@@ -1715,12 +1701,49 @@ async function getPackageJsonScriptUpdates(root, config) {
     }
   ];
 }
+async function getPackageManagerConfigUpdates(root, config) {
+  if (config.targetPackageManagerSpec == null && config.targetNodeVersion == null) return [];
+  const packageJsonPath = join$1(root, "package.json");
+  let currentContent;
+  try {
+    currentContent = await readFile$1(packageJsonPath, "utf-8");
+  } catch {
+    return [];
+  }
+  const pkg = JSON.parse(currentContent);
+  if (packageManagerFieldsEqual(pkg, config.targetPackageManagerSpec, config.targetNodeVersion)) {
+    return [
+      {
+        path: "package.json",
+        status: "unchanged",
+        currentContent,
+        newContent: currentContent
+      }
+    ];
+  }
+  const nextPackageJson = applyPackageManagerFields(
+    pkg,
+    config.targetPackageManagerSpec,
+    config.targetNodeVersion
+  );
+  return [
+    {
+      path: "package.json",
+      status: "modified",
+      currentContent,
+      newContent: `${JSON.stringify(nextPackageJson, null, 2)}
+`
+    }
+  ];
+}
 function planSinglePackageOxlintConfig(config) {
   if (config.linter !== "oxlint" || config.isMonorepo) return void 0;
   const isStealth = (config.configStrategy ?? "stealth") === "stealth";
   const path = isStealth ? ".config/oxlint.json" : "oxlint.json";
   const oxlintConfig = renderOxlintConfig({
     schemaPath: isStealth ? "../node_modules/oxlint/configuration_schema.json" : "./node_modules/oxlint/configuration_schema.json",
+    react: config.viteTemplate === "react" || config.viteTemplate === "r3f",
+    reactCompiler: config.viteTemplate === "react",
     typescript: true
   });
   return {
@@ -1733,7 +1756,7 @@ function planSinglePackageOxlintConfig(config) {
 async function getOxlintConfigReplacementUpdates(root, config) {
   const expected = planSinglePackageOxlintConfig(config);
   if (expected == null) return [];
-  const fullPath = join(root, expected.path);
+  const fullPath = join$1(root, expected.path);
   let currentContent;
   try {
     currentContent = await readFile$1(fullPath, "utf-8");
@@ -1758,9 +1781,105 @@ async function getOxlintConfigReplacementUpdates(root, config) {
     }
   ];
 }
-async function getWorkspaceConfigUpdates(root) {
-  const workspacePath = join(root, "pnpm-workspace.yaml");
+function extractBuildDependencies(content) {
+  const buildDependencies = {};
+  let section;
+  for (const line of content.split("\n")) {
+    const trimmed = line.trim();
+    if (trimmed === "onlyBuiltDependencies:") {
+      section = "onlyBuiltDependencies";
+      continue;
+    }
+    if (trimmed === "allowBuilds:") {
+      section = "allowBuilds";
+      continue;
+    }
+    if (section != null && trimmed && !line.startsWith(" ") && !line.startsWith("	")) {
+      section = void 0;
+    }
+    if (section === "onlyBuiltDependencies" && trimmed.startsWith("-")) {
+      const dependency = trimmed.slice(1).trim().replace(/^["']|["']$/g, "");
+      if (dependency.length > 0) {
+        buildDependencies[dependency] = true;
+      }
+    }
+    if (section === "allowBuilds") {
+      const match = trimmed.match(/^([^:]+):\s*(true|false)$/);
+      if (match == null) continue;
+      const dependency = match[1].trim().replace(/^["']|["']$/g, "");
+      if (dependency.length > 0) {
+        buildDependencies[dependency] = match[2] === "true";
+      }
+    }
+  }
+  return buildDependencies;
+}
+function withDefaultBuildDependencies(buildDependencies) {
+  return Object.keys(buildDependencies).length > 0 ? buildDependencies : { esbuild: true };
+}
+function isPnpmWorkspaceManagedScalarKey(trimmed) {
+  return trimmed.startsWith("manage-package-manager-versions:") || trimmed.startsWith("pmOnFail:");
+}
+function isPnpmWorkspaceManagedBlockKey(trimmed) {
+  return trimmed === "onlyBuiltDependencies:" || trimmed === "allowBuilds:";
+}
+function isIndentedWorkspaceLine(line) {
+  return line.startsWith(" ") || line.startsWith("	");
+}
+function removePnpmWorkspaceManagedKeys(content) {
+  const sourceLines = content.split("\n");
+  const lines = [];
+  let insertionIndex = 0;
+  let foundManagedKey = false;
+  for (let index = 0; index < sourceLines.length; index++) {
+    const line = sourceLines[index];
+    const trimmed = line.trim();
+    if (isPnpmWorkspaceManagedScalarKey(trimmed)) {
+      if (!foundManagedKey) {
+        insertionIndex = lines.length;
+        foundManagedKey = true;
+      }
+      continue;
+    }
+    if (isPnpmWorkspaceManagedBlockKey(trimmed)) {
+      if (!foundManagedKey) {
+        insertionIndex = lines.length;
+        foundManagedKey = true;
+      }
+      while (index + 1 < sourceLines.length) {
+        const nextLine = sourceLines[index + 1];
+        const nextTrimmed = nextLine.trim();
+        if (nextTrimmed !== "" && !isIndentedWorkspaceLine(nextLine)) break;
+        index++;
+      }
+      continue;
+    }
+    lines.push(line);
+  }
+  return {
+    content: lines.join("\n").trim(),
+    insertionIndex
+  };
+}
+function patchPnpmWorkspaceManagedKeys(content, profile, buildDependencies) {
+  const managedContent = renderPnpmWorkspaceConfig({
+    profile,
+    manageVersions: true,
+    buildDependencies
+  });
+  const existing = removePnpmWorkspaceManagedKeys(content);
+  const preservedLines = existing.content.length > 0 ? existing.content.split("\n") : [];
+  const insertionIndex = Math.min(existing.insertionIndex, preservedLines.length);
+  const managedLines = managedContent.split("\n");
+  preservedLines.splice(insertionIndex, 0, ...managedLines);
+  return preservedLines.join("\n").replace(/\n{3,}/g, "\n\n").trim();
+}
+async function getWorkspaceConfigUpdates(root, config) {
+  const workspacePath = join$1(root, "pnpm-workspace.yaml");
   const changes = [];
+  const packageManagerSpec = config?.targetPackageManagerSpec ?? config?.packageManagerSpec ?? { name: "pnpm" };
+  const profile = getPackageManagerProfile(packageManagerSpec);
+  const defaultPackages = [".config/*", "apps/*", "packages/*"];
   let currentContent = "";
   let exists = false;
   try {
@@ -1769,15 +1888,11 @@ async function getWorkspaceConfigUpdates(root) {
   } catch {
   }
   if (!exists) {
-    const newContent = `manage-package-manager-versions: true
-
-packages:
-  - '.config/*'
-  - 'apps/*'
-  - 'packages/*'
-
-onlyBuiltDependencies:
-  - esbuild
+    const newContent = `${renderPnpmWorkspaceConfig({
+      profile,
+      manageVersions: true,
+      packages: defaultPackages
+    })}
 `;
     changes.push({
       path: "pnpm-workspace.yaml",
@@ -1786,32 +1901,14 @@ onlyBuiltDependencies:
     });
     return changes;
   }
-  let updatedContent = currentContent;
-  let needsUpdate = false;
-  if (!currentContent.includes("manage-package-manager-versions")) {
-    updatedContent = `manage-package-manager-versions: true
-
-${updatedContent}`;
-    needsUpdate = true;
-  }
-  if (!currentContent.includes("onlyBuiltDependencies")) {
-    updatedContent = `${updatedContent.trimEnd()}
-
-onlyBuiltDependencies:
-  - esbuild
+  const buildDependencies = withDefaultBuildDependencies(extractBuildDependencies(currentContent));
+  const updatedContent = `${patchPnpmWorkspaceManagedKeys(
+    currentContent,
+    profile,
+    buildDependencies
+  )}
 `;
-    needsUpdate = true;
-  }
-  if (!currentContent.includes(".config/*")) {
-    const lines = updatedContent.split("\n");
-    const packagesIndex = lines.findIndex((line) => line.trim().startsWith("packages:"));
-    if (packagesIndex !== -1) {
-      lines.splice(packagesIndex + 1, 0, "  - '.config/*'");
-      updatedContent = lines.join("\n");
-      needsUpdate = true;
-    }
-  }
-  if (needsUpdate) {
+  if (updatedContent !== currentContent) {
     changes.push({
       path: "pnpm-workspace.yaml",
       status: "modified",
@@ -1831,7 +1928,7 @@ onlyBuiltDependencies:
 async function applyUpdates(changes, root) {
   for (const change of changes) {
     if (change.status === "unchanged") continue;
-    const fullPath = join(root, change.path);
+    const fullPath = join$1(root, change.path);
     await mkdir$1(dirname$1(fullPath), { recursive: true });
     await writeFile$1(fullPath, change.newContent);
   }
@@ -1909,6 +2006,96 @@ function orderUpdateCategories(categories) {
     (left, right) => getCategoryOrder(left.category) - getCategoryOrder(right.category)
   );
 }
+function isPnpmMajorMigration(config) {
+  const currentPackageManager = config.packageManagerSpec;
+  const targetPackageManager = config.targetPackageManagerSpec;
+  if (currentPackageManager?.name !== "pnpm" || targetPackageManager?.name !== "pnpm") {
+    return false;
+  }
+  const currentMajor = getSemverMajor(currentPackageManager.version);
+  const targetMajor = getSemverMajor(targetPackageManager.version);
+  return currentMajor != null && targetMajor != null && currentMajor !== targetMajor;
+}
+function getPackageUpdateCommand(config) {
+  const packageManagerName = config.packageManager.split("@")[0] ?? config.packageManager;
+  if (packageManagerName === "pnpm") {
+    if (isPnpmMajorMigration(config)) {
+      return {
+        command: "pnpm",
+        args: ["install"],
+        displayCommand: "pnpm install",
+        promptMessage: "Install dependencies?",
+        successMessage: "Dependencies installed",
+        failureLabel: "Dependency install"
+      };
+    }
+    return {
+      command: "pnpm",
+      args: ["update"],
+      displayCommand: "pnpm update",
+      promptMessage: "Update packages?",
+      successMessage: "Packages updated",
+      failureLabel: "Package update"
+    };
+  }
+  if (packageManagerName === "npm") {
+    return {
+      command: "npm",
+      args: ["update"],
+      displayCommand: "npm update",
+      promptMessage: "Update packages?",
+      successMessage: "Packages updated",
+      failureLabel: "Package update"
+    };
+  }
+  return void 0;
+}
+async function runPackageUpdate(projectRoot, updateCommand) {
+  await new Promise((resolve, reject) => {
+    const child = spawn(updateCommand.command, updateCommand.args, {
+      cwd: projectRoot,
+      shell: process.platform === "win32",
+      stdio: "inherit"
+    });
+    child.on("error", reject);
+    child.on("exit", (code) => {
+      if (code === 0) {
+        resolve();
+        return;
+      }
+      reject(new Error(`${updateCommand.displayCommand} exited with code ${code ?? "unknown"}`));
+    });
+  });
+}
+async function promptForPackageUpdate(projectRoot, config, options) {
+  const updateCommand = getPackageUpdateCommand(config);
+  if (!updateCommand) {
+    console.log(color.dim(`  Package updates are not supported for ${config.packageManager}`));
+    return;
+  }
+  const shouldUpdatePackages = options.yes || await p.confirm({
+    message: updateCommand.promptMessage,
+    initialValue: true
+  });
+  if (p.isCancel(shouldUpdatePackages)) {
+    p.cancel("Operation cancelled.");
+    process.exit(0);
+  }
+  if (!shouldUpdatePackages) {
+    console.log(color.dim("  Skipped package updates"));
+    return;
+  }
+  console.log();
+  console.log(color.cyan(`Running ${updateCommand.displayCommand}...`));
+  try {
+    await runPackageUpdate(projectRoot, updateCommand);
+    console.log(color.green("\u2713") + ` ${updateCommand.successMessage}`);
+  } catch (error) {
+    const message = error instanceof Error ? error.message : String(error);
+    console.log(color.red("\u2717") + ` ${updateCommand.failureLabel} failed: ${message}`);
+    process.exit(1);
+  }
+}
 async function collectUpdateCategories(projectRoot, config, isMonorepo) {
   const expected = await planExpectedFiles(config);
   const categories = await compareWithDisk(expected, projectRoot);
@@ -1932,7 +2119,7 @@ async function collectUpdateCategories(projectRoot, config, isMonorepo) {
     });
   }
   if (isMonorepo) {
-    const workspaceConfigChanges = await getWorkspaceConfigUpdates(projectRoot);
+    const workspaceConfigChanges = await getWorkspaceConfigUpdates(projectRoot, config);
     if (workspaceConfigChanges.length > 0) {
       allCategories.push({
         category: "workspace-config",
@@ -1944,6 +2131,110 @@ async function collectUpdateCategories(projectRoot, config, isMonorepo) {
   }
   return orderUpdateCategories(allCategories);
 }
+async function resolveTargetPackageManagerSpec(options, config) {
+  if (options.packageManager == null) return void 0;
+  const packageManager = parsePackageManagerSpec(options.packageManager);
+  if (packageManager == null) {
+    console.log(color.red("\u2717") + ` Unsupported package manager: ${options.packageManager}`);
+    process.exit(1);
+  }
+  return resolvePackageManager({
+    name: config.name,
+    packageManager
+  });
+}
+function getPackageManagerMajorUpdateTarget(currentPackageManager, latestPackageManager) {
+  if (currentPackageManager?.version == null) return void 0;
+  const currentMajor = getSemverMajor(currentPackageManager.version);
+  const latestMajor = getSemverMajor(latestPackageManager.version);
+  if (currentMajor == null || latestMajor == null || latestMajor <= currentMajor) {
+    return void 0;
+  }
+  return latestPackageManager;
+}
+function getRequiredNodeUpdateTarget(currentNodeVersion, requiredNodeVersion) {
+  if (requiredNodeVersion == null) return void 0;
+  if (currentNodeVersion == null) return requiredNodeVersion;
+  return compareNumericSemver(currentNodeVersion, requiredNodeVersion) < 0 ? requiredNodeVersion : void 0;
+}
+function formatPackageManagerMajor(packageManager) {
+  const major = getSemverMajor(packageManager.version);
+  return major == null ? packageManager.name : `${packageManager.name}@${major}`;
+}
+async function promptForNodeRequirementUpdate(options, config, targetPackageManagerSpec) {
+  if (targetPackageManagerSpec == null) return void 0;
+  const profile = getPackageManagerProfile(targetPackageManagerSpec);
+  const requiredNodeVersion = profile.requirements.node;
+  const currentNodeVersion = config.engine?.version;
+  const targetNodeVersion = getRequiredNodeUpdateTarget(currentNodeVersion, requiredNodeVersion);
+  if (targetNodeVersion == null) return void 0;
+  const currentNodeLabel = currentNodeVersion == null ? "not set" : `>=${currentNodeVersion}`;
+  p.log.warn(
+    `${formatPackageManager(targetPackageManagerSpec)} requires Node >=${targetNodeVersion}; current engines.node is ${currentNodeLabel}.`
+  );
+  const shouldUpdate = options.yes || await p.confirm({
+    message: `Update engines.node to >=${targetNodeVersion} too?`,
+    initialValue: true
+  });
+  if (p.isCancel(shouldUpdate)) {
+    p.cancel("Operation cancelled.");
+    process.exit(0);
+  }
+  return shouldUpdate ? targetNodeVersion : void 0;
+}
+async function promptForPackageManagerMajorUpdate(options, config) {
+  if (options.packageManager != null || config.packageManagerSpec == null) return void 0;
+  const currentPackageManager = config.packageManagerSpec;
+  if (currentPackageManager.version == null) return void 0;
+  const latestPackageManager = await resolvePackageManager({
+    name: config.name,
+    packageManager: { name: currentPackageManager.name }
+  });
+  const updateTarget = getPackageManagerMajorUpdateTarget(
+    currentPackageManager,
+    latestPackageManager
+  );
+  if (updateTarget == null) return void 0;
+  const shouldUpdate = options.yes || await p.confirm({
+    message: `Update ${currentPackageManager.name} from ${formatPackageManagerMajor(
+      currentPackageManager
+    )} to ${formatPackageManagerMajor(latestPackageManager)}?`,
+    initialValue: true
+  });
+  if (p.isCancel(shouldUpdate)) {
+    p.cancel("Operation cancelled.");
+    process.exit(0);
+  }
+  return shouldUpdate ? updateTarget : void 0;
+}
+async function applyPackageManagerMigration(projectRoot, isMonorepo, options, detectedConfig) {
+  const targetPackageManagerSpec = await resolveTargetPackageManagerSpec(options, detectedConfig) ?? await promptForPackageManagerMajorUpdate(options, detectedConfig);
+  if (targetPackageManagerSpec == null) return detectedConfig;
+  const targetNodeVersion = await promptForNodeRequirementUpdate(
+    options,
+    detectedConfig,
+    targetPackageManagerSpec
+  );
+  const migrationConfig = {
+    ...detectedConfig,
+    packageManager: targetPackageManagerSpec.name,
+    targetPackageManagerSpec,
+    targetNodeVersion
+  };
+  const changes = [
+    ...await getPackageManagerConfigUpdates(projectRoot, migrationConfig),
+    ...isMonorepo || targetPackageManagerSpec.name === "pnpm" ? await getWorkspaceConfigUpdates(projectRoot, migrationConfig) : []
+  ].filter((change) => change.status === "added" || change.status === "modified");
+  if (changes.length === 0) return migrationConfig;
+  console.log();
+  console.log(color.cyan("Package Manager:"));
+  for (const change of changes) {
+    console.log(formatFileChange(change));
+  }
+  await applyUpdates(changes, projectRoot);
+  console.log(color.green("\u2713") + ` Package Manager: updated ${changes.length}`);
+  return migrationConfig;
+}
 async function processUpdateCategory(category, projectRoot, options) {
   const newChanges = category.changes.filter((change) => change.status === "added");
   const modifiedChanges = category.changes.filter((change) => change.status === "modified");
@@ -1983,11 +2274,8 @@ async function processUpdateCategory(category, projectRoot, options) {
     if (addedCount > 0) parts.push(`added ${addedCount}`);
     if (updatedFilesCount > 0) parts.push(`updated ${updatedFilesCount}`);
     console.log(color.green("\u2713") + ` ${category.label}: ${parts.join(", ")}`);
-    console.log();
     return "updated";
   }
-  console.log(color.dim(`  Skipped ${category.label}`));
-  console.log();
   return "skipped";
 }
 async function handleUpdateCommand(options, handleFixCommand) {
@@ -2053,6 +2341,8 @@ async function handleUpdateCommand(options, handleFixCommand) {
       console.log(color.dim(`  Skipped ${skippedCount}`));
     }
   }
+  const finalConfig = await applyPackageManagerMigration(projectRoot, isMonorepo, options, config);
+  await promptForPackageUpdate(projectRoot, finalConfig, options);
   process.exit(0);
 }
 
@@ -2070,12 +2360,13 @@ async function createPackageInWorkspace(monorepoRoot, packageManager, inheritedS
     message: "Package name?",
     initialValue: `@${scope}/`,
     validate: (value) => {
-      const validationError = validatePackageName(value);
+      const packageName = value ?? "";
+      const validationError = validatePackageName(packageName);
       if (validationError) return validationError;
-      const dirName = value.includes("/") ? value.split("/").pop() : value;
+      const dirName = getPackageDirectoryName(packageName);
       if (!dirName) return "Package name is required";
       if (!hasCustomDirectories) {
-        const targetPath = join$1(monorepoRoot, defaultDir, dirName);
+        const targetPath = join(monorepoRoot, defaultDir, dirName);
         try {
           const { statSync } = require$2("fs");
           statSync(targetPath);
@@ -2089,7 +2380,7 @@ async function createPackageInWorkspace(monorepoRoot, packageManager, inheritedS
     return false;
   }
   const scopedName = packageNameInput;
-  const shortName = scopedName.includes("/") ? scopedName.split("/").pop() : scopedName;
+  const shortName = getPackageDirectoryName(scopedName);
   const packageOptions = await promptForPackageOptions(scopedName, packageType, inheritedSettings);
   let targetDir = defaultDir;
   if (hasCustomDirectories && workspaceDirectories.length > 0) {
@@ -2105,7 +2396,7 @@ async function createPackageInWorkspace(monorepoRoot, packageManager, inheritedS
       return false;
     }
     targetDir = dirChoice;
-    const targetPath = join$1(monorepoRoot, targetDir, shortName);
+    const targetPath = join(monorepoRoot, targetDir, shortName);
     try {
       const { statSync } = require$2("fs");
       statSync(targetPath);
@@ -2114,7 +2405,7 @@ async function createPackageInWorkspace(monorepoRoot, packageManager, inheritedS
     } catch {
     }
   }
-  const relativePkgPath = join$1(targetDir, shortName);
+  const relativePkgPath = join(targetDir, shortName);
   const workspaceRoot = calculateWorkspaceRoot(relativePkgPath);
   packageOptions.workspaceRoot = workspaceRoot;
   packageOptions.name = scopedName;
@@ -2129,7 +2420,7 @@ async function createPackageInWorkspace(monorepoRoot, packageManager, inheritedS
       packageOptions.workspaceDependencies = selectedDeps;
     }
   }
-  const outputPath = join$1(monorepoRoot, relativePkgPath);
+  const outputPath = join(monorepoRoot, relativePkgPath);
   const spinner = p.spinner();
   spinner.start("Creating package...");
   try {
@@ -2170,10 +2461,11 @@ async function handleWorkspaceCommand(name, options, writeGeneratedFiles) {
   const template = options.template ?? "vanilla";
   const baseTemplate = getBaseTemplate(template);
   const scopedName = name.startsWith("@") ? name : `@${scope}/${name}`;
-  const fullPackagePath = join$1(monorepoRoot, targetDir, name);
+  const packageDirName = getPackageDirectoryName(name);
+  const fullPackagePath = join(monorepoRoot, targetDir, packageDirName);
   try {
-    await access$1(fullPackagePath, constants$1.F_OK);
-    console.error(color.red("Error:") + ` Directory ${targetDir}/${name} already exists`);
+    await access(fullPackagePath, constants.F_OK);
+    console.error(color.red("Error:") + ` Directory ${targetDir}/${packageDirName} already exists`);
     process.exit(1);
   } catch {
   }
@@ -2186,7 +2478,7 @@ async function handleWorkspaceCommand(name, options, writeGeneratedFiles) {
   };
   const pnpmManageVersions = inheritedSettings.pnpmManageVersions ?? true;
   const isLibrary = projectType === "library";
-  const relativePkgPath = join$1(targetDir, name);
+  const relativePkgPath = join(targetDir, packageDirName);
   const workspaceRoot = calculateWorkspaceRoot(relativePkgPath);
   const projectOptions = {
     name: scopedName,
@@ -2214,11 +2506,11 @@ async function handleWorkspaceCommand(name, options, writeGeneratedFiles) {
       triplex: options.triplex ? {} : void 0
     }
   };
-  console.log(color.cyan("Creating") + ` ${scopedName} in ${targetDir}/${name}...`);
+  console.log(color.cyan("Creating") + ` ${scopedName} in ${targetDir}/${packageDirName}...`);
   try {
     const { files } = await planProject(resolveProjectPlanInput(projectOptions));
     await writeGeneratedFiles(fullPackagePath, files);
-    console.log(color.green("\u2713") + ` Created ${scopedName} at ${targetDir}/${name}`);
+    console.log(color.green("\u2713") + ` Created ${scopedName} at ${targetDir}/${packageDirName}`);
     process.exit(0);
   } catch (error) {
     console.error(color.red("Error:") + " Failed to create package");
@@ -2288,7 +2580,7 @@ function hasConfigOptions(options) {
 async function writeGeneratedFiles(basePath, files) {
   const filePaths = Object.keys(files).sort();
   for (const filePath of filePaths) {
-    const fullFilePath = join$1(basePath, filePath);
+    const fullFilePath = join(basePath, filePath);
     await mkdir(dirname(fullFilePath), { recursive: true });
     const file = files[filePath];
     if (file.type === "text") {
@@ -2301,7 +2593,7 @@ async function writeGeneratedFiles(basePath, files) {
 }
 async function handleMonorepoCreation(projectOptions, isNonInteractive) {
   const packageManager = getPackageManagerName(projectOptions.packageManager);
-  const projectPath = join$1(cwd(), projectOptions.name);
+  const projectPath = join(cwd(), projectOptions.name);
   const spinner = p.spinner();
   spinner.start("Creating monorepo workspace...");
   try {
@@ -2363,7 +2655,8 @@ async function handleSingleWorkspaceCreation(projectOptions, isNonInteractive) {
   const defaultFallbackName = base === "vanilla" ? "vanilla-app" : base === "react" ? "react-app" : "react-three-app";
   projectOptions.name ??= defaultFallbackName;
   const packageManager = getPackageManagerName(projectOptions.packageManager);
-  const projectPath = join$1(cwd(), projectOptions.name);
+  const projectDirName = getPackageDirectoryName(projectOptions.name);
+  const projectPath = join(cwd(), projectDirName);
   const spinner = p.spinner();
   spinner.start("Creating project...");
   try {
@@ -2372,15 +2665,11 @@ async function handleSingleWorkspaceCreation(projectOptions, isNonInteractive) {
     await writeGeneratedFiles(projectPath, files);
     spinner.stop(color.green.inverse(" \u2713 Project created! "));
     if (isNonInteractive) process.exit(0);
-    const nextSteps = projectOptions.projectType === "library" ? [
-      `cd ${projectOptions.name}`,
-      `${packageManager} install`,
-      `${packageManager} run build`
-    ].join("\n") : [
-      `cd ${projectOptions.name}`,
-      `${packageManager} install`,
-      `${packageManager} run dev`
-    ].join("\n");
+    const nextSteps = projectOptions.projectType === "library" ? [`cd ${projectDirName}`, `${packageManager} install`, `${packageManager} run build`].join(
+      "\n"
+    ) : [`cd ${projectDirName}`, `${packageManager} install`, `${packageManager} run dev`].join(
+      "\n"
+    );
     p.note(nextSteps, "Next steps");
     p.outro(color.green("Happy coding! \u2728"));
   } catch (error) {
@@ -2396,7 +2685,7 @@ async function main() {
   ).option(
     "--template <type>",
     "project template: vanilla, vanilla-js, react, react-js, r3f, r3f-js (default: vanilla)"
-  ).option("--linter <type>", "linter: eslint, oxlint, or biome (default: oxlint)").option("--formatter <type>", "formatter: prettier, oxfmt, or biome (default: prettier)").option("--drei", "add @react-three/drei (r3f only)").option("--handle", "add @react-three/handle (r3f only)").option("--leva", "add leva (r3f only)").option("--postprocessing", "add @react-three/postprocessing (r3f only)").option("--rapier", "add @react-three/rapier (r3f only)").option("--xr", "add @react-three/xr (r3f only)").option("--uikit", "add @react-three/uikit (r3f only)").option("--offscreen", "add @react-three/offscreen (r3f only)").option("--zustand", "add zustand (r3f only)").option("--koota", "add koota (r3f only)").option("--triplex", "set up triplex development environment (r3f only)").option("--viverse", "set up viverse deployment (r3f only)").option("--package-manager <manager>", "specify package manager (e.g. npm, yarn, pnpm)").option("--ide <ide>", "IDE files: vscode or none (default: vscode)").option(
+  ).option("--linter <type>", "linter: eslint, oxlint, or biome (default: oxlint)").option("--formatter <type>", "formatter: prettier, oxfmt, or biome (default: prettier)").option("--drei", "add @react-three/drei (r3f only)").option("--handle", "add @react-three/handle (r3f only)").option("--leva", "add leva (r3f only)").option("--postprocessing", "add @react-three/postprocessing (r3f only)").option("--rapier", "add @react-three/rapier (r3f only)").option("--xr", "add @react-three/xr (r3f only)").option("--uikit", "add @react-three/uikit (r3f only)").option("--offscreen", "add @react-three/offscreen (r3f only)").option("--zustand", "add zustand (r3f only)").option("--koota", "add koota (r3f only)").option("--triplex", "set up triplex development environment (r3f only)").option("--viverse", "set up viverse deployment (r3f only)").option("--package-manager <manager>", "specify package manager (e.g. npm, yarn, pnpm@11)").option("--ide <ide>", "IDE files: vscode or none (default: vscode)").option(
     "--pnpm-manage-versions",
     "enable manage-package-manager-versions in pnpm-workspace.yaml (default: true)"
   ).option(
@@ -2422,6 +2711,12 @@ async function main() {
       console.error(color.red("Error:") + ' --ide must be "vscode" or "none"');
       process.exit(1);
     }
+    const packageManagerSpec = parsePackageManagerSpec(options.packageManager);
+    if (options.packageManager && packageManagerSpec == null) {
+      console.error(color.red("Error:") + " --package-manager must be npm, yarn, or pnpm");
+      console.log(color.dim("  Version specs are allowed, e.g. pnpm@10 or pnpm@11"));
+      process.exit(1);
+    }
     if (name?.startsWith("-")) {
       switch (name) {
         case "--version":
@@ -2507,7 +2802,7 @@ async function main() {
           viverse: options.viverse ? {} : void 0,
           triplex: options.triplex ? {} : void 0
         },
-        packageManager: options.packageManager ? { name: options.packageManager } : void 0,
+        packageManager: packageManagerSpec,
         pnpmManageVersions: options.pnpmManageVersions,
         engine: { name: "node", version: options.nodeVersion ?? "latest" }
       };
@@ -2518,7 +2813,7 @@ async function main() {
         bundler: options.bundler,
         linter: options.linter,
         formatter: options.formatter,
-        packageManager: options.packageManager,
+        packageManager: packageManagerSpec,
         ide: options.ide,
         engine: options.nodeVersion ? { name: "node", version: options.nodeVersion } : void 0,
         pnpmManageVersions: options.pnpmManageVersions,