@percepta/create 3.0.0 → 3.1.0

package/dist/index.js

@@ -7,7 +7,7 @@ import {
   toSnakeCase,
   toTitleCase,
   validateProjectName
-} from "./chunk-GEVZERMP.js";
+} from "./chunk-7NPWSTCY.js";
 import {
   derivePlaceholders,
   writeManifest
@@ -17,10 +17,9 @@ import {
 import { program } from "commander";
 
 // src/commands/create.ts
-import path4 from "path";
+import path7 from "path";
 import { fileURLToPath as fileURLToPath2 } from "url";
-import { randomBytes } from "crypto";
-import fs4 from "fs-extra";
+import fs7 from "fs-extra";
 import chalk from "chalk";
 import ora from "ora";
 import { execSync, spawn } from "child_process";
@@ -255,14 +254,130 @@ async function detectMonorepo(startDir) {
   return NOT_FOUND;
 }
 
+// src/utils/env-local.ts
+import path4 from "path";
+import { randomBytes } from "crypto";
+import fs4 from "fs-extra";
+async function generateEnvLocal(packageDir) {
+  const examplePath = path4.join(packageDir, ".env.example");
+  const localPath = path4.join(packageDir, ".env.local");
+  if (!await fs4.pathExists(examplePath)) return;
+  if (await fs4.pathExists(localPath)) return;
+  const authSecret = randomBytes(32).toString("base64");
+  const encKey = randomBytes(16).toString("hex");
+  const content = (await fs4.readFile(examplePath, "utf-8")).replace(/^BETTER_AUTH_SECRET=.*$/m, `BETTER_AUTH_SECRET=${authSecret}`).replace(/^ENCRYPTION_SECRET_KEY=.*$/m, `ENCRYPTION_SECRET_KEY=${encKey}`);
+  await fs4.writeFile(localPath, content);
+}
+
+// src/utils/relocate-workflows.ts
+import path5 from "path";
+import fs5 from "fs-extra";
+async function relocateWorkflowsToRoot(packageDir, monorepoRoot, appName) {
+  const sourceDir = path5.join(packageDir, ".github", "workflows");
+  if (!await fs5.pathExists(sourceDir)) return;
+  const targetDir = path5.join(monorepoRoot, ".github", "workflows");
+  await fs5.ensureDir(targetDir);
+  const entries = await fs5.readdir(sourceDir);
+  for (const name of entries) {
+    if (!name.startsWith(`${appName}-`)) continue;
+    if (!/\.(ya?ml)$/.test(name)) continue;
+    await fs5.move(path5.join(sourceDir, name), path5.join(targetDir, name), {
+      overwrite: true
+    });
+  }
+  if ((await fs5.readdir(sourceDir)).length === 0) {
+    await fs5.rmdir(sourceDir);
+    const packageGithub = path5.join(packageDir, ".github");
+    if ((await fs5.readdir(packageGithub)).length === 0) {
+      await fs5.rmdir(packageGithub);
+    }
+  }
+}
+
+// src/utils/resolve-percepta-versions.ts
+import path6 from "path";
+import { execFile } from "child_process";
+import { promisify } from "util";
+import fs6 from "fs-extra";
+var execFileAsync = promisify(execFile);
+var DEPENDENCY_SECTIONS = [
+  "dependencies",
+  "devDependencies",
+  "optionalDependencies",
+  "peerDependencies"
+];
+function getPerceptaPackages(pkg) {
+  const names = /* @__PURE__ */ new Set();
+  for (const section of DEPENDENCY_SECTIONS) {
+    const deps = pkg[section];
+    if (!deps) continue;
+    for (const name of Object.keys(deps)) {
+      if (name.startsWith("@percepta/")) {
+        names.add(name);
+      }
+    }
+  }
+  return [...names].sort();
+}
+async function npmViewDistTagLatest(packageName, cwd) {
+  const { stdout } = await execFileAsync(
+    "npm",
+    ["view", packageName, "dist-tags.latest", "--silent"],
+    {
+      cwd,
+      encoding: "utf8",
+      timeout: 5e3
+    }
+  );
+  const version = stdout.trim();
+  return version.length > 0 ? version : null;
+}
+async function resolvePerceptaVersionsInPackageJson(packageJsonPath, lookupLatest = npmViewDistTagLatest) {
+  const cwd = path6.dirname(packageJsonPath);
+  const pkg = await fs6.readJson(packageJsonPath);
+  const packageNames = getPerceptaPackages(pkg);
+  const resolved = {};
+  const failed = [];
+  const results = await Promise.all(
+    packageNames.map(async (packageName) => {
+      try {
+        return {
+          packageName,
+          latest: await lookupLatest(packageName, cwd)
+        };
+      } catch {
+        return { packageName, latest: null };
+      }
+    })
+  );
+  for (const { packageName, latest } of results) {
+    if (!latest) {
+      failed.push(packageName);
+      continue;
+    }
+    resolved[packageName] = latest;
+    for (const section of DEPENDENCY_SECTIONS) {
+      const deps = pkg[section];
+      if (deps?.[packageName]) {
+        deps[packageName] = latest;
+      }
+    }
+  }
+  if (Object.keys(resolved).length > 0) {
+    await fs6.writeJson(packageJsonPath, pkg, { spaces: 2 });
+    await fs6.appendFile(packageJsonPath, "\n");
+  }
+  return { resolved, failed };
+}
+
 // src/commands/create.ts
 var PACKAGE_MANAGER = "pnpm";
 function shPath(p) {
-  return p.split(path4.sep).join("/");
+  return p.split(path7.sep).join("/");
 }
-function runPackageManagerInstall(packageManager, cwd) {
+function runPackageManagerInstall(packageManager, cwd, args = ["install"]) {
   return new Promise((resolve, reject) => {
-    const child = spawn(packageManager, ["install"], {
+    const child = spawn(packageManager, args, {
       cwd,
       stdio: "ignore"
     });
@@ -272,7 +387,7 @@ function runPackageManagerInstall(packageManager, cwd) {
       else
         reject(
           new Error(
-            `${packageManager} install exited with code ${code ?? "unknown"}`
+            `${packageManager} ${args.join(" ")} exited with code ${code ?? "unknown"}`
           )
         );
     });
@@ -376,48 +491,17 @@ async function autoRunWebapp(packageDir) {
   return true;
 }
 function readTemplateVersions() {
-  const versionsPath = path4.resolve(
-    path4.dirname(fileURLToPath2(import.meta.url)),
+  const versionsPath = path7.resolve(
+    path7.dirname(fileURLToPath2(import.meta.url)),
     "../template-versions.json"
   );
   try {
-    const content = fs4.readFileSync(versionsPath, "utf-8");
+    const content = fs7.readFileSync(versionsPath, "utf-8");
     return JSON.parse(content);
   } catch {
     return {};
   }
 }
-async function generateEnvLocal(packageDir) {
-  const examplePath = path4.join(packageDir, ".env.example");
-  const localPath = path4.join(packageDir, ".env.local");
-  if (!await fs4.pathExists(examplePath)) return;
-  if (await fs4.pathExists(localPath)) return;
-  const authSecret = randomBytes(32).toString("base64");
-  const encKey = randomBytes(16).toString("hex");
-  const content = (await fs4.readFile(examplePath, "utf-8")).replace(/^BETTER_AUTH_SECRET=.*$/m, `BETTER_AUTH_SECRET=${authSecret}`).replace(/^ENCRYPTION_SECRET_KEY=.*$/m, `ENCRYPTION_SECRET_KEY=${encKey}`);
-  await fs4.writeFile(localPath, content);
-}
-async function relocateWorkflowsToRoot(packageDir, monorepoRoot, appName) {
-  const sourceDir = path4.join(packageDir, ".github", "workflows");
-  if (!await fs4.pathExists(sourceDir)) return;
-  const targetDir = path4.join(monorepoRoot, ".github", "workflows");
-  await fs4.ensureDir(targetDir);
-  const entries = await fs4.readdir(sourceDir);
-  for (const name of entries) {
-    if (!name.startsWith(`${appName}-`)) continue;
-    if (!/\.(ya?ml)$/.test(name)) continue;
-    await fs4.move(path4.join(sourceDir, name), path4.join(targetDir, name), {
-      overwrite: true
-    });
-  }
-  if ((await fs4.readdir(sourceDir)).length === 0) {
-    await fs4.rmdir(sourceDir);
-    const packageGithub = path4.join(packageDir, ".github");
-    if ((await fs4.readdir(packageGithub)).length === 0) {
-      await fs4.rmdir(packageGithub);
-    }
-  }
-}
 async function writeMosaicFiles(packageDir, config, projectType) {
   const templateVersions = readTemplateVersions();
   const manifest = {
@@ -431,8 +515,8 @@ async function writeMosaicFiles(packageDir, config, projectType) {
     }
   };
   await writeManifest(packageDir, manifest);
-  const notesPath = path4.join(packageDir, "mosaic-template-notes.md");
-  await fs4.writeFile(
+  const notesPath = path7.join(packageDir, "mosaic-template-notes.md");
+  await fs7.writeFile(
     notesPath,
     `# Mosaic Divergence Notes
 
@@ -445,6 +529,133 @@ _None yet \u2014 freshly created from template._
 `
   );
 }
+async function scaffoldMonorepo(targetDir, config) {
+  const monoSpinner = ora("Copying monorepo template...").start();
+  try {
+    await copyTemplate(targetDir, "monorepo");
+    monoSpinner.succeed("Copied monorepo template");
+  } catch (error) {
+    monoSpinner.fail("Failed to copy monorepo template");
+    console.error(error);
+    process.exit(1);
+  }
+  const replaceSpinner = ora("Replacing monorepo placeholders...").start();
+  try {
+    const stats = await replacePlaceholders(targetDir, config);
+    replaceSpinner.succeed(
+      `Replaced placeholders in ${stats.modified} monorepo files`
+    );
+  } catch (error) {
+    replaceSpinner.fail("Failed to replace monorepo placeholders");
+    console.error(error);
+    process.exit(1);
+  }
+}
+async function addPackageToMonorepo(args) {
+  const { packageDir, monorepoRoot, projectType, config } = args;
+  const copySpinner = ora("Copying package template...").start();
+  try {
+    await copyTemplate(packageDir, projectType);
+    copySpinner.succeed("Copied package template");
+  } catch (error) {
+    copySpinner.fail("Failed to copy package template");
+    console.error(error);
+    process.exit(1);
+  }
+  const replaceSpinner = ora("Replacing package placeholders...").start();
+  try {
+    const stats = await replacePlaceholders(packageDir, config);
+    replaceSpinner.succeed(
+      `Replaced placeholders in ${stats.modified} package files`
+    );
+  } catch (error) {
+    replaceSpinner.fail("Failed to replace package placeholders");
+    console.error(error);
+    process.exit(1);
+  }
+  await writeMosaicFiles(packageDir, config, projectType);
+  if (projectType === "webapp") {
+    await resolvePerceptaPackageVersions(packageDir);
+    await generateEnvLocal(packageDir);
+    await relocateWorkflowsToRoot(packageDir, monorepoRoot, config.name);
+  }
+}
+async function resolvePerceptaPackageVersions(packageDir) {
+  const packageJsonPath = path7.join(packageDir, "package.json");
+  if (!await fs7.pathExists(packageJsonPath)) return;
+  const spinner = ora("Resolving latest @percepta/* versions...").start();
+  try {
+    const result = await resolvePerceptaVersionsInPackageJson(packageJsonPath);
+    const count = Object.keys(result.resolved).length;
+    if (result.failed.length > 0) {
+      spinner.warn(
+        `Resolved ${count} @percepta/* versions; kept existing ranges for ${result.failed.join(", ")}`
+      );
+    } else {
+      spinner.succeed(`Resolved ${count} @percepta/* versions`);
+    }
+  } catch (error) {
+    spinner.warn(
+      "Could not resolve latest @percepta/* versions; kept template ranges"
+    );
+    console.log(chalk.dim(error.message));
+  }
+}
+function initGitRepo(targetDir) {
+  const gitSpinner = ora("Initializing git repository...").start();
+  try {
+    execSync("git init", { cwd: targetDir, stdio: "ignore" });
+    execSync("git add -A", { cwd: targetDir, stdio: "ignore" });
+    execSync('git commit -m "Initial commit from @percepta/create"', {
+      cwd: targetDir,
+      stdio: "ignore"
+    });
+    gitSpinner.succeed("Initialized git repository");
+  } catch {
+    gitSpinner.warn("Failed to initialize git repository");
+  }
+}
+async function installAtMonorepoRoot(monorepoRoot, installDeps) {
+  if (!installDeps) return false;
+  const spinner = ora(
+    `Installing dependencies with ${PACKAGE_MANAGER}...`
+  ).start();
+  try {
+    await runPackageManagerInstall(PACKAGE_MANAGER, monorepoRoot);
+    spinner.succeed("Installed dependencies");
+    return true;
+  } catch {
+    spinner.warn(
+      `Failed to install dependencies. Run '${PACKAGE_MANAGER} install' from monorepo root.`
+    );
+    return false;
+  }
+}
+async function installAtWebappPackage(packageDir, projectType, installDeps) {
+  if (!installDeps || !packageDir || projectType !== "webapp") {
+    return projectType !== "webapp";
+  }
+  const spinner = ora(
+    `Generating package lockfile with ${PACKAGE_MANAGER}...`
+  ).start();
+  try {
+    await runPackageManagerInstall(PACKAGE_MANAGER, packageDir, [
+      "install",
+      "--ignore-workspace"
+    ]);
+    spinner.succeed("Generated package lockfile");
+    return true;
+  } catch {
+    spinner.warn(
+      `Failed to generate package lockfile. Run '${PACKAGE_MANAGER} install --ignore-workspace' from ${packageDir}.`
+    );
+    return false;
+  }
+}
+async function maybeAutoRunWebapp(packageDir, projectType, installSucceeded) {
+  if (!packageDir || projectType !== "webapp" || !installSucceeded) return false;
+  return autoRunWebapp(packageDir);
+}
 function getProjectTypeLabel(projectType) {
   switch (projectType) {
     case "monorepo":
@@ -459,6 +670,35 @@ function getProjectTypeLabel(projectType) {
     }
   }
 }
+function requireNpmTokenForWebappInstall(projectType, installDeps) {
+  if (projectType !== "webapp" || !installDeps || process.env.NPM_TOKEN) {
+    return;
+  }
+  console.log();
+  console.error(chalk.red("Error: NPM_TOKEN environment variable is not set."));
+  console.error(
+    chalk.dim("  Required to install private @percepta/* packages.")
+  );
+  console.error();
+  console.error("  1. Grab the npm token from 1Password:");
+  console.error(
+    chalk.cyan(
+      "     https://start.1password.com/open/i?a=5TX2B4O3QNE4FNQ2A7ZJZDRRBI&v=j7trpyuqh7gt635dtuj6y4pwjm&i=cmmdi5trji7ctkn3fseakf4mgi&h=aitco.1password.com"
+    )
+  );
+  console.error("  2. Add to ~/.zshrc:");
+  console.error(chalk.cyan('     export NPM_TOKEN="<paste-token>"'));
+  console.error(
+    "  3. Open a new terminal (or " + chalk.cyan("source ~/.zshrc") + ") and re-run."
+  );
+  console.error();
+  console.error(
+    chalk.dim(
+      "  Or pass --skip-install to scaffold without running install."
+    )
+  );
+  process.exit(1);
+}
 async function createProject(options) {
   if (options.type !== void 0 && !isValidProjectType(options.type)) {
     console.error(
@@ -511,8 +751,9 @@ async function createProject(options) {
   let answers;
   if (options.yes) {
     const projectType = options.type || "webapp";
+    requireNpmTokenForWebappInstall(projectType, !options.skipInstall);
     const kebabName = toKebabCase(projectName);
-    const directory = monorepoContext.found && monorepoContext.packageDir ? path4.join(monorepoContext.packageDir, kebabName) : path4.resolve(cwd, kebabName);
+    const directory = monorepoContext.found && monorepoContext.packageDir ? path7.join(monorepoContext.packageDir, kebabName) : path7.resolve(cwd, kebabName);
     answers = {
       projectType,
       directory,
@@ -525,10 +766,11 @@ async function createProject(options) {
       projectType: options.type,
       name: projectName ? toKebabCase(projectName) : void 0,
       skipInstall: options.skipInstall,
-      monorepoContext
+      monorepoContext,
+      beforeNamePrompt: (projectType) => requireNpmTokenForWebappInstall(projectType, !options.skipInstall)
     });
     if (monorepoContext.found && monorepoContext.packageDir && !answers.directory) {
-      answers.directory = path4.join(monorepoContext.packageDir, answers.name);
+      answers.directory = path7.join(monorepoContext.packageDir, answers.name);
     }
   }
   const config = {
@@ -540,7 +782,8 @@ async function createProject(options) {
   };
   const typeLabel = getProjectTypeLabel(answers.projectType);
   if (monorepoContext.found) {
-    const packageDir = monorepoContext.packageDir ? path4.join(monorepoContext.packageDir, answers.name) : answers.directory;
+    const monorepoRoot = monorepoContext.rootDir;
+    const packageDir = monorepoContext.packageDir ? path7.join(monorepoContext.packageDir, answers.name) : answers.directory;
     console.log(chalk.dim("  Package type:"), typeLabel);
     console.log(chalk.dim("  Target:"), packageDir);
     console.log(chalk.dim("  Name:"), config.name);
@@ -549,8 +792,8 @@ async function createProject(options) {
       console.log(chalk.dim("  Database:"), config.dbName);
     }
     console.log();
-    if (await fs4.pathExists(packageDir)) {
-      const files = await fs4.readdir(packageDir);
+    if (await fs7.pathExists(packageDir)) {
+      const files = await fs7.readdir(packageDir);
       if (files.length > 0) {
         console.error(
           chalk.red(`Error: Directory ${packageDir} is not empty.`)
@@ -558,81 +801,51 @@ async function createProject(options) {
         process.exit(1);
       }
     }
-    const copySpinner = ora("Copying template files...").start();
-    try {
-      await copyTemplate(packageDir, answers.projectType);
-      copySpinner.succeed("Copied template files");
-    } catch (error) {
-      copySpinner.fail("Failed to copy template files");
-      console.error(error);
-      process.exit(1);
-    }
-    const replaceSpinner = ora("Replacing placeholders...").start();
-    try {
-      const stats = await replacePlaceholders(packageDir, config);
-      replaceSpinner.succeed(
-        `Replaced placeholders in ${stats.modified} files`
-      );
-    } catch (error) {
-      replaceSpinner.fail("Failed to replace placeholders");
-      console.error(error);
-      process.exit(1);
-    }
-    await writeMosaicFiles(packageDir, config, answers.projectType);
-    if (answers.projectType === "webapp") {
-      await generateEnvLocal(packageDir);
-    }
-    if (answers.projectType === "webapp") {
-      await relocateWorkflowsToRoot(
+    if (answers.projectType !== "monorepo") {
+      await addPackageToMonorepo({
         packageDir,
-        monorepoContext.rootDir,
-        config.name
-      );
-    }
-    await warnIfMissingRootNpmrc(monorepoContext.rootDir);
-    let installSucceeded = false;
-    if (answers.installDeps) {
-      const packageManager = PACKAGE_MANAGER;
-      const installSpinner = ora(
-        `Installing dependencies with ${packageManager}...`
-      ).start();
-      try {
-        await runPackageManagerInstall(
-          packageManager,
-          monorepoContext.rootDir
-        );
-        installSpinner.succeed("Installed dependencies");
-        installSucceeded = true;
-      } catch {
-        installSpinner.warn(
-          `Failed to install dependencies. Run '${packageManager} install' from monorepo root.`
-        );
-      }
+        monorepoRoot,
+        projectType: answers.projectType,
+        config
+      });
     }
+    await warnIfMissingRootNpmrc(monorepoRoot);
+    const rootInstallSucceeded = await installAtMonorepoRoot(
+      monorepoRoot,
+      answers.installDeps
+    );
+    const packageInstallSucceeded = await installAtWebappPackage(
+      packageDir,
+      answers.projectType,
+      answers.installDeps
+    );
+    const installSucceeded = answers.projectType === "webapp" ? rootInstallSucceeded && packageInstallSucceeded : rootInstallSucceeded;
     console.log();
     console.log(
       chalk.green("\u2714"),
       chalk.bold(`Created ${typeLabel} at`),
-      chalk.cyan(path4.relative(monorepoContext.rootDir, packageDir))
+      chalk.cyan(path7.relative(monorepoRoot, packageDir))
     );
     console.log();
-    if (answers.projectType === "webapp" && installSucceeded) {
-      const devStarted = await autoRunWebapp(packageDir);
-      if (devStarted) return;
-    }
+    const devStarted = await maybeAutoRunWebapp(
+      packageDir,
+      answers.projectType,
+      installSucceeded
+    );
+    if (devStarted) return;
     printNextStepsExisting(answers, options, packageDir);
   } else {
     const isBareMonorepo = answers.projectType === "monorepo";
-    const targetDir = answers.directory;
-    const packageDir = isBareMonorepo ? null : path4.join(targetDir, "packages", answers.name);
+    const monorepoRoot = answers.directory;
+    const packageDir = isBareMonorepo ? null : path7.join(monorepoRoot, "packages", answers.name);
     if (isBareMonorepo) {
       console.log(chalk.dim("  Type:"), typeLabel);
-      console.log(chalk.dim("  Directory:"), targetDir);
+      console.log(chalk.dim("  Directory:"), monorepoRoot);
       console.log(chalk.dim("  Name:"), config.name);
       console.log(chalk.dim("  Title:"), config.title);
     } else {
       console.log(chalk.dim("  Package type:"), typeLabel);
-      console.log(chalk.dim("  Monorepo directory:"), targetDir);
+      console.log(chalk.dim("  Monorepo directory:"), monorepoRoot);
       console.log(chalk.dim("  Package:"), `packages/${answers.name}/`);
       console.log(chalk.dim("  Name:"), config.name);
       console.log(chalk.dim("  Title:"), config.title);
@@ -641,101 +854,40 @@ async function createProject(options) {
       }
     }
     console.log();
-    if (await fs4.pathExists(targetDir)) {
-      const files = await fs4.readdir(targetDir);
+    if (await fs7.pathExists(monorepoRoot)) {
+      const files = await fs7.readdir(monorepoRoot);
       if (files.length > 0) {
         console.error(
-          chalk.red(`Error: Directory ${targetDir} is not empty.`)
+          chalk.red(`Error: Directory ${monorepoRoot} is not empty.`)
         );
         process.exit(1);
       }
     }
-    const monoSpinner = ora("Copying monorepo template...").start();
-    try {
-      await copyTemplate(targetDir, "monorepo");
-      monoSpinner.succeed("Copied monorepo template");
-    } catch (error) {
-      monoSpinner.fail("Failed to copy monorepo template");
-      console.error(error);
-      process.exit(1);
-    }
-    const monoReplaceSpinner = ora(
-      "Replacing monorepo placeholders..."
-    ).start();
-    try {
-      const stats = await replacePlaceholders(targetDir, config);
-      monoReplaceSpinner.succeed(
-        `Replaced placeholders in ${stats.modified} monorepo files`
-      );
-    } catch (error) {
-      monoReplaceSpinner.fail("Failed to replace monorepo placeholders");
-      console.error(error);
-      process.exit(1);
-    }
-    if (packageDir) {
-      const pkgSpinner = ora("Copying package template...").start();
-      try {
-        await copyTemplate(packageDir, answers.projectType);
-        pkgSpinner.succeed("Copied package template");
-      } catch (error) {
-        pkgSpinner.fail("Failed to copy package template");
-        console.error(error);
-        process.exit(1);
-      }
-      const pkgReplaceSpinner = ora(
-        "Replacing package placeholders..."
-      ).start();
-      try {
-        const stats = await replacePlaceholders(packageDir, config);
-        pkgReplaceSpinner.succeed(
-          `Replaced placeholders in ${stats.modified} package files`
-        );
-      } catch (error) {
-        pkgReplaceSpinner.fail("Failed to replace package placeholders");
-        console.error(error);
-        process.exit(1);
-      }
-      await writeMosaicFiles(packageDir, config, answers.projectType);
-      if (answers.projectType === "webapp") {
-        await generateEnvLocal(packageDir);
-      }
-      if (answers.projectType === "webapp") {
-        await relocateWorkflowsToRoot(packageDir, targetDir, config.name);
-      }
-    }
-    const gitSpinner = ora("Initializing git repository...").start();
-    try {
-      execSync("git init", { cwd: targetDir, stdio: "ignore" });
-      execSync("git add -A", { cwd: targetDir, stdio: "ignore" });
-      execSync('git commit -m "Initial commit from @percepta/create"', {
-        cwd: targetDir,
-        stdio: "ignore"
+    await scaffoldMonorepo(monorepoRoot, config);
+    if (packageDir && answers.projectType !== "monorepo") {
+      await addPackageToMonorepo({
+        packageDir,
+        monorepoRoot,
+        projectType: answers.projectType,
+        config
       });
-      gitSpinner.succeed("Initialized git repository");
-    } catch {
-      gitSpinner.warn("Failed to initialize git repository");
-    }
-    let installSucceeded = false;
-    if (answers.installDeps) {
-      const packageManager = PACKAGE_MANAGER;
-      const installSpinner = ora(
-        `Installing dependencies with ${packageManager}...`
-      ).start();
-      try {
-        await runPackageManagerInstall(packageManager, targetDir);
-        installSpinner.succeed("Installed dependencies");
-        installSucceeded = true;
-      } catch {
-        installSpinner.warn(
-          `Failed to install dependencies. Run '${packageManager} install' manually.`
-        );
-      }
     }
+    initGitRepo(monorepoRoot);
+    const rootInstallSucceeded = await installAtMonorepoRoot(
+      monorepoRoot,
+      answers.installDeps
+    );
+    const packageInstallSucceeded = await installAtWebappPackage(
+      packageDir,
+      answers.projectType,
+      answers.installDeps
+    );
+    const installSucceeded = answers.projectType === "webapp" ? rootInstallSucceeded && packageInstallSucceeded : rootInstallSucceeded;
     console.log();
     console.log(
       chalk.green("\u2714"),
       chalk.bold(isBareMonorepo ? `Created ${typeLabel} at` : "Created monorepo at"),
-      chalk.cyan(targetDir)
+      chalk.cyan(monorepoRoot)
     );
     if (!isBareMonorepo) {
       console.log(
@@ -745,11 +897,13 @@ async function createProject(options) {
       );
     }
     console.log();
-    if (packageDir && answers.projectType === "webapp" && installSucceeded) {
-      const devStarted = await autoRunWebapp(packageDir);
-      if (devStarted) return;
-    }
-    printNextStepsNew(answers, options, targetDir);
+    const devStarted = await maybeAutoRunWebapp(
+      packageDir,
+      answers.projectType,
+      installSucceeded
+    );
+    if (devStarted) return;
+    printNextStepsNew(answers, options, monorepoRoot);
   }
 }
 function printWebappNextSteps(params) {
@@ -762,12 +916,15 @@ function printWebappNextSteps(params) {
   } = params;
   const repoRel = shPath(monorepoRelativePath) || ".";
   const pkgFromRoot = `packages/${answers.name}`;
+  const packageInstallStep = `${pm} install --ignore-workspace`;
   const pnpmSteps = ["pnpm run setup", "pnpm dev"];
   if (variant === "new") {
     const oneLinerParts2 = [];
     if (repoRel !== ".") oneLinerParts2.push(`cd ${repoRel}`);
     if (!answers.installDeps) oneLinerParts2.push(`${pm} install`);
-    oneLinerParts2.push(`cd ${pkgFromRoot}`, ...pnpmSteps);
+    oneLinerParts2.push(`cd ${pkgFromRoot}`);
+    if (!answers.installDeps) oneLinerParts2.push(packageInstallStep);
+    oneLinerParts2.push(...pnpmSteps);
     console.log(chalk.bold("Copy-paste (from your current directory):"));
     console.log();
     console.log(chalk.cyan(`  ${oneLinerParts2.join(" && ")}`));
@@ -782,6 +939,9 @@ function printWebappNextSteps(params) {
       console.log(chalk.dim(`  ${step2++}.`), `${pm} install`);
     }
     console.log(chalk.dim(`  ${step2++}.`), `cd ${pkgFromRoot}`);
+    if (!answers.installDeps) {
+      console.log(chalk.dim(`  ${step2++}.`), packageInstallStep);
+    }
     for (const cmd of pnpmSteps) {
       console.log(chalk.dim(`  ${step2++}.`), cmd);
     }
@@ -791,7 +951,7 @@ function printWebappNextSteps(params) {
   const oneLinerParts = [];
   if (!answers.installDeps) {
     if (repoRel !== ".") oneLinerParts.push(`cd ${repoRel}`);
-    oneLinerParts.push(`${pm} install`, `cd ${pkgFromRoot}`);
+    oneLinerParts.push(`${pm} install`, `cd ${pkgFromRoot}`, packageInstallStep);
   } else if (pkgRel !== ".") {
     oneLinerParts.push(`cd ${pkgRel}`);
   }
@@ -809,6 +969,7 @@ function printWebappNextSteps(params) {
     }
     console.log(chalk.dim(`  ${step++}.`), `${pm} install`);
     console.log(chalk.dim(`  ${step++}.`), `cd ${pkgFromRoot}`);
+    console.log(chalk.dim(`  ${step++}.`), packageInstallStep);
   } else if (pkgRel !== ".") {
     console.log(chalk.dim(`  ${step++}.`), `cd ${pkgRel}`);
   }
@@ -817,10 +978,10 @@ function printWebappNextSteps(params) {
   }
 }
 async function warnIfMissingRootNpmrc(rootDir) {
-  const rootNpmrc = path4.join(rootDir, ".npmrc");
+  const rootNpmrc = path7.join(rootDir, ".npmrc");
   let contents = "";
-  if (await fs4.pathExists(rootNpmrc)) {
-    contents = await fs4.readFile(rootNpmrc, "utf8");
+  if (await fs7.pathExists(rootNpmrc)) {
+    contents = await fs7.readFile(rootNpmrc, "utf8");
   }
   if (contents.includes("@percepta:registry")) {
     return;
@@ -835,7 +996,7 @@ async function warnIfMissingRootNpmrc(rootDir) {
       "  pnpm reads .npmrc from the workspace root, so add these lines to"
     )
   );
-  console.log(chalk.dim(`  ${path4.join(rootDir, ".npmrc")}:`));
+  console.log(chalk.dim(`  ${path7.join(rootDir, ".npmrc")}:`));
   console.log();
   console.log(
     chalk.cyan("    @percepta:registry=https://registry.npmjs.org/")
@@ -847,7 +1008,7 @@ async function warnIfMissingRootNpmrc(rootDir) {
 }
 function printNextStepsNew(answers, options, targetDir) {
   const pm = PACKAGE_MANAGER;
-  const relativePath = path4.relative(process.cwd(), targetDir) || ".";
+  const relativePath = path7.relative(process.cwd(), targetDir) || ".";
   console.log("Next steps:");
   console.log();
   switch (answers.projectType) {
@@ -903,9 +1064,9 @@ function printNextStepsNew(answers, options, targetDir) {
 }
 function printNextStepsExisting(answers, options, packageDir) {
   const pm = PACKAGE_MANAGER;
-  const packageRelativePath = path4.relative(process.cwd(), packageDir) || ".";
-  const monorepoRoot = path4.dirname(path4.dirname(packageDir));
-  const monorepoRelativePath = path4.relative(process.cwd(), monorepoRoot) || ".";
+  const packageRelativePath = path7.relative(process.cwd(), packageDir) || ".";
+  const monorepoRoot = path7.dirname(path7.dirname(packageDir));
+  const monorepoRelativePath = path7.relative(process.cwd(), monorepoRoot) || ".";
   console.log("Next steps:");
   console.log();
   switch (answers.projectType) {
@@ -950,25 +1111,25 @@ program.command("status").description("Show template sync status for current app
   "--mosaic-template-path <path>",
   "Path to local mosaic repo checkout"
 ).action(async (options) => {
-  const { statusCommand } = await import("./status-MITGDLTT.js");
+  const { statusCommand } = await import("./status-BTHGN6QH.js");
   await statusCommand(options);
 });
 program.command("sync").description("Generate downstream sync context (template \u2192 app)").option(
   "--mosaic-template-path <path>",
   "Path to local mosaic repo checkout"
 ).option("--to <version>", "Target template version (default: latest)").action(async (options) => {
-  const { syncCommand } = await import("./sync-J4SFZHDX.js");
+  const { syncCommand } = await import("./sync-3Q27L7XZ.js");
   await syncCommand(options);
 });
 program.command("upstream").description("Generate upstream context (app \u2192 template)").option(
   "--mosaic-template-path <path>",
   "Path to local mosaic repo checkout"
 ).option("--files <patterns...>", "Specific files to propose upstream").action(async (options) => {
-  const { upstreamCommand } = await import("./upstream-AQI7P4EU.js");
+  const { upstreamCommand } = await import("./upstream-C5KFAHVR.js");
   await upstreamCommand(options);
 });
 program.command("init").description("Add .mosaic-template.json to an existing app").option("-t, --type <type>", "Template type (e.g., webapp, library)").option("--template-version <version>", "Template version to set").action(async (options) => {
-  const { initCommand } = await import("./init-Z4VGBHAK.js");
+  const { initCommand } = await import("./init-NP6GRXLL.js");
   await initCommand(options);
 });
 program.parse();