create-projx 1.6.1 → 1.6.3

package/dist/index.js

@@ -9,7 +9,7 @@ import {
   matchesSkip,
   saveBaselineRef,
   writeTemplateToDir
-} from "./chunk-TNI4XBVS.js";
+} from "./chunk-OBYYB6PR.js";
 import {
   COMPONENTS,
   COMPONENT_MARKER,
@@ -33,7 +33,7 @@ import {
   toTitle,
   writeComponentMarker,
   writeProjxConfig
-} from "./chunk-FTHX7ILT.js";
+} from "./chunk-LYPPFXGK.js";
 
 // src/index.ts
 import { existsSync as existsSync11 } from "fs";
@@ -76,7 +76,9 @@ async function runPrompts(nameArg) {
   if (components.length === 0) {
     p.log.warn("No components selected. Creating an empty project.");
   }
-  const hasJs = components.some((c) => ["fastify", "frontend", "e2e"].includes(c));
+  const hasJs = components.some(
+    (c) => ["fastify", "frontend", "e2e"].includes(c)
+  );
   let packageManager = "npm";
   if (hasJs) {
     const pm = await p.select({
@@ -101,11 +103,18 @@ async function scaffold(opts, dest, localRepo) {
   const paths = Object.fromEntries(
     opts.components.map((c) => [c, c])
   );
-  const vars = { projectName: name, components: opts.components, paths, pm: pmCommands(pm) };
+  const vars = {
+    projectName: name,
+    components: opts.components,
+    paths,
+    pm: pmCommands(pm)
+  };
   const isLocal = !!localRepo;
   await mkdir(dest, { recursive: true });
   const dlSpinner = p2.spinner();
-  dlSpinner.start(isLocal ? "Using local templates" : "Downloading latest templates");
+  dlSpinner.start(
+    isLocal ? "Using local templates" : "Downloading latest templates"
+  );
   const repoDir = await downloadRepo(localRepo).catch((err) => {
     dlSpinner.stop("Failed.");
     p2.log.error(String(err));
@@ -113,7 +122,9 @@ async function scaffold(opts, dest, localRepo) {
   });
   dlSpinner.stop(isLocal ? "Local templates loaded." : "Templates downloaded.");
   try {
-    const pkg = JSON.parse(await readFile(join(repoDir, "cli/package.json"), "utf-8"));
+    const pkg = JSON.parse(
+      await readFile(join(repoDir, "cli/package.json"), "utf-8")
+    );
     const version = pkg.version;
     p2.log.info(`Scaffolding project in ${dest}`);
     if (opts.git) {
@@ -121,7 +132,17 @@ async function scaffold(opts, dest, localRepo) {
     }
     const spinner7 = p2.spinner();
     spinner7.start("Scaffolding project");
-    await applyTemplate(dest, repoDir, opts.components, paths, vars, version, void 0, void 0, true);
+    await applyTemplate(
+      dest,
+      repoDir,
+      opts.components,
+      paths,
+      vars,
+      version,
+      void 0,
+      void 0,
+      true
+    );
     spinner7.stop("Scaffold complete.");
     if (opts.install) {
       await installDeps(dest, opts.components, pm);
@@ -139,12 +160,14 @@ async function scaffold(opts, dest, localRepo) {
   } finally {
     await cleanupRepo(repoDir, isLocal);
   }
-  p2.outro(`Done! Next steps:
+  p2.outro(
+    `Done! Next steps:
 
   cd ${name}
   ./setup.sh
 
-  Like projx? Star it: https://github.com/ukanhaupa/projx`);
+  Like projx? Star it: https://github.com/ukanhaupa/projx`
+  );
 }
 async function installDeps(dest, components, pm) {
   const cmds = pmCommands(pm);
@@ -168,7 +191,9 @@ async function installDeps(dest, components, pm) {
             exec(cmds.install, join(dest, "fastify"));
             spinner7.stop("Fastify dependencies installed.");
           } else {
-            p2.log.warn(`${pm} not found \u2014 run 'cd fastify && ${cmds.install}' manually.`);
+            p2.log.warn(
+              `${pm} not found \u2014 run 'cd fastify && ${cmds.install}' manually.`
+            );
           }
           break;
         case "frontend":
@@ -177,7 +202,9 @@ async function installDeps(dest, components, pm) {
             exec(cmds.install, join(dest, "frontend"));
             spinner7.stop("Frontend dependencies installed.");
           } else {
-            p2.log.warn(`${pm} not found \u2014 run 'cd frontend && ${cmds.install}' manually.`);
+            p2.log.warn(
+              `${pm} not found \u2014 run 'cd frontend && ${cmds.install}' manually.`
+            );
           }
           break;
         case "e2e":
@@ -186,7 +213,9 @@ async function installDeps(dest, components, pm) {
             exec(cmds.install, join(dest, "e2e"));
             spinner7.stop("E2E dependencies installed.");
           } else {
-            p2.log.warn(`${pm} not found \u2014 run 'cd e2e && ${cmds.install}' manually.`);
+            p2.log.warn(
+              `${pm} not found \u2014 run 'cd e2e && ${cmds.install}' manually.`
+            );
           }
           break;
         case "mobile":
@@ -195,7 +224,9 @@ async function installDeps(dest, components, pm) {
             exec("flutter pub get", join(dest, "mobile"));
             spinner7.stop("Flutter dependencies installed.");
           } else {
-            p2.log.warn("Flutter not found \u2014 run 'cd mobile && flutter pub get' manually.");
+            p2.log.warn(
+              "Flutter not found \u2014 run 'cd mobile && flutter pub get' manually."
+            );
           }
           break;
         case "infra":
@@ -237,17 +268,33 @@ async function update(cwd, localRepo) {
   } catch {
   }
   const raw = await readProjxConfig(cwd);
-  const { components, paths: componentPaths } = await discoverComponentsFromMarkers(cwd);
+  const {
+    components,
+    paths: componentPaths,
+    instances
+  } = await discoverComponentsFromMarkers(cwd);
+  const extraInstances = instances.filter(
+    (i) => componentPaths[i.type] !== i.path
+  );
   const pendingConflicts = findFilesWithConflictMarkers(cwd);
   if (pendingConflicts.length > 0) {
-    p3.log.warn(`Found ${pendingConflicts.length} file(s) with unresolved conflict markers from a prior update:`);
+    p3.log.warn(
+      `Found ${pendingConflicts.length} file(s) with unresolved conflict markers from a prior update:`
+    );
     for (const f of pendingConflicts) p3.log.info(`  ${f}`);
     p3.log.info("");
     const resumeVersion = String(raw.version ?? "unknown");
-    const handled = await promptSkipLearning(cwd, componentPaths, resumeVersion, pendingConflicts);
+    const handled = await promptSkipLearning(
+      cwd,
+      componentPaths,
+      resumeVersion,
+      pendingConflicts
+    );
     if (!handled) {
       p3.log.info("");
-      p3.log.info("Resolve manually with `git diff` then `git add` / `git checkout --`,");
+      p3.log.info(
+        "Resolve manually with `git diff` then `git add` / `git checkout --`,"
+      );
       p3.log.info("or re-run `npx create-projx update` to resume the prompt.");
     }
     return;
@@ -261,7 +308,9 @@ async function update(cwd, localRepo) {
     process.exit(1);
   }
   if (Object.keys(raw).length > 0) {
-    p3.log.info(`Found .projx (v${raw.version ?? "unknown"}, components: ${components.join(", ")})`);
+    p3.log.info(
+      `Found .projx (v${raw.version ?? "unknown"}, components: ${components.join(", ")})`
+    );
   } else {
     p3.log.warn("No .projx file found. Detected components from markers.");
     p3.log.info(`Detected: ${components.join(", ")}`);
@@ -279,7 +328,9 @@ async function update(cwd, localRepo) {
     }
   }
   const dlSpinner = p3.spinner();
-  dlSpinner.start(isLocal ? "Using local templates" : "Downloading latest templates");
+  dlSpinner.start(
+    isLocal ? "Using local templates" : "Downloading latest templates"
+  );
   const repoDir = await downloadRepo(localRepo).catch((err) => {
     dlSpinner.stop("Failed.");
     p3.log.error(String(err));
@@ -287,43 +338,88 @@ async function update(cwd, localRepo) {
   });
   dlSpinner.stop(isLocal ? "Local templates loaded." : "Templates downloaded.");
   try {
-    const pkg = JSON.parse(await readFile2(join2(repoDir, "cli/package.json"), "utf-8"));
+    const pkg = JSON.parse(
+      await readFile2(join2(repoDir, "cli/package.json"), "utf-8")
+    );
     const version = pkg.version;
     const name = detectProjectName(cwd, components, componentPaths);
     const recordedPm = raw.packageManager;
     const detectedPm = detectPackageManagerFromComponents(cwd, componentPaths);
     const pm = detectedPm ?? recordedPm ?? "npm";
     if (detectedPm && recordedPm && detectedPm !== recordedPm) {
-      p3.log.warn(`packageManager mismatch: .projx says "${recordedPm}" but lockfile is "${detectedPm}". Using "${detectedPm}".`);
+      p3.log.warn(
+        `packageManager mismatch: .projx says "${recordedPm}" but lockfile is "${detectedPm}". Using "${detectedPm}".`
+      );
       await writeProjxConfig(cwd, { ...raw, packageManager: detectedPm });
     } else if (detectedPm && !recordedPm) {
       await writeProjxConfig(cwd, { ...raw, packageManager: detectedPm });
     }
-    const nameOverrides = await detectPackageNameOverrides(cwd, components, componentPaths);
-    const vars = { projectName: name, components, paths: componentPaths, pm: pmCommands(pm), nameOverrides };
+    const nameOverrides = await detectPackageNameOverrides(
+      cwd,
+      components,
+      componentPaths
+    );
+    const vars = {
+      projectName: name,
+      components,
+      paths: componentPaths,
+      instances,
+      pm: pmCommands(pm),
+      nameOverrides
+    };
     const spinner7 = p3.spinner();
     spinner7.start("Applying template update");
     const rootSkip = Array.isArray(raw.skip) ? raw.skip : [];
     const isLegacyMigration = !raw.defaultsApplied;
     if (isLegacyMigration) {
-      p3.log.info("Legacy project detected \u2014 applying default skip patterns for user-owned files.");
+      p3.log.info(
+        "Legacy project detected \u2014 applying default skip patterns for user-owned files."
+      );
     }
-    const result = await applyTemplate(cwd, repoDir, components, componentPaths, vars, version, componentSkips, rootSkip, isLegacyMigration);
+    const result = await applyTemplate(
+      cwd,
+      repoDir,
+      components,
+      componentPaths,
+      vars,
+      version,
+      componentSkips,
+      rootSkip,
+      isLegacyMigration,
+      extraInstances
+    );
     spinner7.stop("Template applied.");
-    const pinnedUpdates = await findPinnedFilesWithUpdates(cwd, repoDir, components, componentPaths, vars, version, componentSkips, rootSkip);
+    const pinnedUpdates = await findPinnedFilesWithUpdates(
+      cwd,
+      repoDir,
+      components,
+      componentPaths,
+      vars,
+      version,
+      componentSkips,
+      rootSkip
+    );
     if (pinnedUpdates.length > 0) {
       p3.log.info("");
-      p3.log.info(`${pinnedUpdates.length} pinned file(s) have template updates available:`);
+      p3.log.info(
+        `${pinnedUpdates.length} pinned file(s) have template updates available:`
+      );
       for (const f of pinnedUpdates) p3.log.info(`  ${f}`);
-      p3.log.info("Run `npx create-projx unpin <file> && npx create-projx update` to opt in.");
+      p3.log.info(
+        "Run `npx create-projx unpin <file> && npx create-projx update` to opt in."
+      );
     }
     if (result.status === "merged") {
       saveBaselineRef(cwd);
-      p3.log.success(`${result.mergedFiles?.length ?? 0} file(s) merged cleanly.`);
+      p3.log.success(
+        `${result.mergedFiles?.length ?? 0} file(s) merged cleanly.`
+      );
       p3.outro(`Updated to template v${version}.`);
     } else if (result.status === "conflicts") {
       if (result.mergedFiles && result.mergedFiles.length > 0) {
-        p3.log.success(`${result.mergedFiles.length} file(s) merged cleanly and staged.`);
+        p3.log.success(
+          `${result.mergedFiles.length} file(s) merged cleanly and staged.`
+        );
       }
       const conflictCount = result.conflictedFiles?.length ?? 0;
       if (conflictCount > 0) {
@@ -332,13 +428,20 @@ async function update(cwd, localRepo) {
           p3.log.info(`  ${f}`);
         }
       }
-      const handled = await promptSkipLearning(cwd, componentPaths, version, result.conflictedFiles ?? []);
+      const handled = await promptSkipLearning(
+        cwd,
+        componentPaths,
+        version,
+        result.conflictedFiles ?? []
+      );
       if (!handled) {
         p3.log.info("");
         p3.log.info("Review:  git diff");
         p3.log.info("Keep:    git add <file>");
         p3.log.info("Discard: git checkout -- <file>");
-        p3.log.info(`Commit:  git add . && git commit -m "projx: update to v${version}"`);
+        p3.log.info(
+          `Commit:  git add . && git commit -m "projx: update to v${version}"`
+        );
         p3.outro(`Template v${version} applied. Review with git diff.`);
       }
     } else {
@@ -371,7 +474,7 @@ function hasUncommittedChanges(cwd) {
 async function findPinnedFilesWithUpdates(cwd, repoDir, components, componentPaths, vars, version, componentSkips, rootSkip) {
   const { mkdir: mkdir5, rm: rm2, readFile: readFile7 } = await import("fs/promises");
   const { tmpdir: tmpdir2 } = await import("os");
-  const { writeTemplateToDir: writeTemplateToDir2 } = await import("./baseline-5XAJJ457.js");
+  const { writeTemplateToDir: writeTemplateToDir2 } = await import("./baseline-RXPDDEDD.js");
   const config = await readProjxConfig(cwd);
   const rootPinned = Array.isArray(config.skip) ? config.skip : [];
   const componentPinned = [];
@@ -388,11 +491,19 @@ async function findPinnedFilesWithUpdates(cwd, repoDir, components, componentPat
   void componentSkips;
   void rootSkip;
   try {
-    await writeTemplateToDir2(tmpTemplate, repoDir, components, componentPaths, vars, version, {
-      componentSkips: {},
-      rootSkip: [],
-      realCwd: tmpTemplate
-    });
+    await writeTemplateToDir2(
+      tmpTemplate,
+      repoDir,
+      components,
+      componentPaths,
+      vars,
+      version,
+      {
+        componentSkips: {},
+        rootSkip: [],
+        realCwd: tmpTemplate
+      }
+    );
     const updates = [];
     for (const file of rootPinned) {
       const tmplPath = join2(tmpTemplate, file);
@@ -439,20 +550,33 @@ async function promptSkipLearning(cwd, componentPaths, version, conflictedFiles)
   });
   if (changedFiles.length === 0) return false;
   if (!process.stdin.isTTY) {
-    p3.log.info("Non-interactive: skipping prompt. Resolve conflicts manually with `git diff` then `git add`.");
-    p3.log.info("Re-run `npx create-projx update` later to interactively decide which files to keep.");
+    p3.log.info(
+      "Non-interactive: skipping prompt. Resolve conflicts manually with `git diff` then `git add`."
+    );
+    p3.log.info(
+      "Re-run `npx create-projx update` later to interactively decide which files to keep."
+    );
     return false;
   }
-  const statusOutput = execSync("git status --porcelain", { cwd, stdio: "pipe" }).toString().trim();
+  const statusOutput = execSync("git status --porcelain", {
+    cwd,
+    stdio: "pipe"
+  }).toString().trim();
   const entries = statusOutput.split("\n").filter(Boolean).map((line) => ({
     status: line.slice(0, 2).trim(),
     file: line.slice(3).trim()
   }));
   p3.log.warn(`${changedFiles.length} file(s) have conflicts to resolve.`);
-  p3.log.info("Each file is currently in your working tree with conflict markers.");
+  p3.log.info(
+    "Each file is currently in your working tree with conflict markers."
+  );
   p3.log.info("");
-  p3.log.info("CHECKED  = keep your version, resolve markers manually, commit when ready");
-  p3.log.info("UNCHECKED = discard template's changes AND skip this file on future updates");
+  p3.log.info(
+    "CHECKED  = keep your version, resolve markers manually, commit when ready"
+  );
+  p3.log.info(
+    "UNCHECKED = discard template's changes AND skip this file on future updates"
+  );
   p3.log.info("");
   const selected = await p3.multiselect({
     message: "Which files do you want to KEEP?",
@@ -484,10 +608,10 @@ async function promptSkipLearning(cwd, componentPaths, version, conflictedFiles)
     );
   }
   if (kept.size > 0) {
-    p3.log.info(`${kept.size} file(s) kept with conflict markers \u2014 resolve and commit:`);
     p3.log.info(
-      `  git add . && git commit -m "projx: update to v${version}"`
+      `${kept.size} file(s) kept with conflict markers \u2014 resolve and commit:`
     );
+    p3.log.info(`  git add . && git commit -m "projx: update to v${version}"`);
     p3.outro(`Template v${version} applied.`);
   } else {
     p3.outro("All template changes discarded. Skip list updated.");
@@ -536,15 +660,38 @@ import { copyFileSync as copyFileSync2, existsSync as existsSync3 } from "fs";
 import { readFile as readFile3 } from "fs/promises";
 import { join as join3 } from "path";
 import * as p4 from "@clack/prompts";
-async function add(cwd, newComponents, localRepo, skipInstall = false) {
+async function add(cwd, newComponents, localRepo, skipInstall = false, customName) {
   p4.intro("projx add");
   const isLocal = !!localRepo;
   if (!existsSync3(join3(cwd, ".projx"))) {
-    p4.log.error("No .projx file found. Run 'npx create-projx <name>' to create a project first.");
+    p4.log.error(
+      "No .projx file found. Run 'npx create-projx <name>' to create a project first."
+    );
     process.exit(1);
   }
   const config = await readProjxConfig(cwd);
   const { components: existing } = await discoverComponentsFromMarkers(cwd);
+  if (customName) {
+    if (newComponents.length !== 1) {
+      throw new Error(
+        "--name can only be used when adding a single component type."
+      );
+    }
+    const targetDir = join3(cwd, customName);
+    if (existsSync3(targetDir)) {
+      throw new Error(`Directory '${customName}' already exists.`);
+    }
+    return await addInstance(
+      cwd,
+      newComponents[0],
+      customName,
+      config,
+      existing,
+      localRepo,
+      skipInstall,
+      isLocal
+    );
+  }
   const alreadyExists = newComponents.filter((c) => existing.includes(c));
   if (alreadyExists.length > 0) {
     p4.log.warn(`Already present: ${alreadyExists.join(", ")}. Skipping those.`);
@@ -556,7 +703,9 @@ async function add(cwd, newComponents, localRepo, skipInstall = false) {
   }
   p4.log.info(`Adding: ${toAdd.join(", ")}`);
   const dlSpinner = p4.spinner();
-  dlSpinner.start(isLocal ? "Using local templates" : "Downloading latest templates");
+  dlSpinner.start(
+    isLocal ? "Using local templates" : "Downloading latest templates"
+  );
   const repoDir = await downloadRepo(localRepo).catch((err) => {
     dlSpinner.stop("Failed.");
     p4.log.error(String(err));
@@ -568,17 +717,42 @@ async function add(cwd, newComponents, localRepo, skipInstall = false) {
     const existingPaths = await discoverComponentPaths(cwd, existing);
     const paths = { ...existingPaths };
     for (const c of toAdd) paths[c] = c;
+    const { instances: existingInstances } = await discoverComponentsFromMarkers(cwd);
+    const instances = [
+      ...existingInstances,
+      ...toAdd.map((c) => ({ type: c, path: c }))
+    ];
     const pm = config.packageManager ?? "npm";
     const name = detectProjectName(cwd, existing, paths);
-    const vars = { projectName: name, components: allComponents, paths, pm: pmCommands(pm) };
-    const pkg = JSON.parse(await readFile3(join3(repoDir, "cli/package.json"), "utf-8"));
+    const vars = {
+      projectName: name,
+      components: allComponents,
+      paths,
+      instances,
+      pm: pmCommands(pm)
+    };
+    const pkg = JSON.parse(
+      await readFile3(join3(repoDir, "cli/package.json"), "utf-8")
+    );
     const version = pkg.version;
     const spinner7 = p4.spinner();
     spinner7.start("Adding components");
-    await writeTemplateToDir(cwd, repoDir, allComponents, paths, vars, version, { realCwd: cwd });
+    await writeTemplateToDir(
+      cwd,
+      repoDir,
+      allComponents,
+      paths,
+      vars,
+      version,
+      { realCwd: cwd }
+    );
     spinner7.stop("Components added.");
     if (!skipInstall) {
-      await installDeps2(cwd, toAdd, pm);
+      await installDeps2(
+        cwd,
+        toAdd.map((c) => ({ type: c, path: c })),
+        pm
+      );
     }
     for (const component of toAdd) {
       const example = join3(cwd, component, ".env.example");
@@ -590,70 +764,175 @@ async function add(cwd, newComponents, localRepo, skipInstall = false) {
         }
       }
     }
-    p4.outro(`Added ${toAdd.join(", ")}.
+    p4.outro(
+      `Added ${toAdd.join(", ")}.
 
-  Like projx? Star it: https://github.com/ukanhaupa/projx`);
+  Like projx? Star it: https://github.com/ukanhaupa/projx`
+    );
   } finally {
     await cleanupRepo(repoDir, isLocal);
   }
 }
-async function installDeps2(dest, components, pm) {
+async function addInstance(cwd, type, customName, config, existing, localRepo, skipInstall, isLocal) {
+  p4.log.info(`Adding ${type} instance at ${customName}/`);
+  const dlSpinner = p4.spinner();
+  dlSpinner.start(
+    isLocal ? "Using local templates" : "Downloading latest templates"
+  );
+  const repoDir = await downloadRepo(localRepo).catch((err) => {
+    dlSpinner.stop("Failed.");
+    throw err;
+  });
+  dlSpinner.stop(isLocal ? "Local templates loaded." : "Templates downloaded.");
+  try {
+    const existingPaths = await discoverComponentPaths(cwd, existing);
+    const paths = { ...existingPaths };
+    const { instances: existingInstances } = await discoverComponentsFromMarkers(cwd);
+    const newInstance = { type, path: customName };
+    const instances = [...existingInstances, newInstance];
+    const pm = config.packageManager ?? "npm";
+    const name = detectProjectName(cwd, existing, existingPaths);
+    const vars = {
+      projectName: name,
+      components: existing,
+      paths,
+      instances,
+      pm: pmCommands(pm)
+    };
+    const pkg = JSON.parse(
+      await readFile3(join3(repoDir, "cli/package.json"), "utf-8")
+    );
+    const version = pkg.version;
+    const INSTANCE_AWARE_ROOT = /* @__PURE__ */ new Set([
+      ".github/workflows/ci.yml",
+      ".githooks/pre-commit",
+      "setup.sh"
+    ]);
+    const rawSkip = Array.isArray(config.skip) ? config.skip : [];
+    const rootSkip = rawSkip.filter((p11) => !INSTANCE_AWARE_ROOT.has(p11));
+    const componentSkips = {};
+    for (const inst of existingInstances) {
+      const m = await readComponentMarker(join3(cwd, inst.path));
+      if (m?.skip && m.skip.length > 0) componentSkips[inst.type] = m.skip;
+    }
+    const spinner7 = p4.spinner();
+    spinner7.start(`Scaffolding ${customName}/`);
+    const result = await applyTemplate(
+      cwd,
+      repoDir,
+      existing,
+      paths,
+      vars,
+      version,
+      componentSkips,
+      rootSkip,
+      false,
+      [newInstance],
+      [newInstance]
+    );
+    spinner7.stop(`Scaffolded ${customName}/.`);
+    if (result.status === "merged") {
+      p4.log.success(
+        `${result.mergedFiles?.length ?? 0} root file(s) merged cleanly.`
+      );
+    } else if (result.status === "conflicts") {
+      const conflictCount = result.conflictedFiles?.length ?? 0;
+      if (conflictCount > 0) {
+        p4.log.warn(`${conflictCount} root file(s) need manual review:`);
+        for (const f of result.conflictedFiles) p4.log.info(`  ${f}`);
+        p4.log.info("Review:  git diff");
+        p4.log.info("Keep:    git add <file>");
+        p4.log.info("Discard: git checkout -- <file>");
+      }
+    }
+    if (!skipInstall) {
+      await installDeps2(cwd, [{ type, path: customName }], pm);
+    }
+    const example = join3(cwd, customName, ".env.example");
+    const env = join3(cwd, customName, ".env");
+    if (existsSync3(example) && !existsSync3(env)) {
+      try {
+        copyFileSync2(example, env);
+      } catch {
+      }
+    }
+    p4.outro(`Added ${type} instance at ${customName}/.`);
+  } finally {
+    await cleanupRepo(repoDir, isLocal);
+  }
+}
+async function installDeps2(dest, instances, pm) {
   const cmds = pmCommands(pm);
   const pmBin = pm === "bun" ? "bun" : pm;
-  for (const component of components) {
+  for (const { type, path } of instances) {
+    const dir = join3(dest, path);
     const spinner7 = p4.spinner();
     try {
-      switch (component) {
+      switch (type) {
         case "fastapi":
           if (hasCommand("uv")) {
-            spinner7.start("Installing FastAPI dependencies");
-            exec("uv sync --all-extras", join3(dest, "fastapi"));
-            spinner7.stop("FastAPI dependencies installed.");
+            spinner7.start(`Installing FastAPI dependencies (${path}/)`);
+            exec("uv sync --all-extras", dir);
+            spinner7.stop(`FastAPI dependencies installed (${path}/).`);
           } else {
-            p4.log.warn("uv not found \u2014 run 'cd fastapi && uv sync' manually.");
+            p4.log.warn(`uv not found \u2014 run 'cd ${path} && uv sync' manually.`);
           }
           break;
         case "fastify":
           if (hasCommand(pmBin)) {
-            spinner7.start(`Installing Fastify dependencies (${cmds.install})`);
-            exec(cmds.install, join3(dest, "fastify"));
-            spinner7.stop("Fastify dependencies installed.");
+            spinner7.start(
+              `Installing Fastify dependencies (${path}/, ${cmds.install})`
+            );
+            exec(cmds.install, dir);
+            spinner7.stop(`Fastify dependencies installed (${path}/).`);
           } else {
-            p4.log.warn(`${pm} not found \u2014 run 'cd fastify && ${cmds.install}' manually.`);
+            p4.log.warn(
+              `${pm} not found \u2014 run 'cd ${path} && ${cmds.install}' manually.`
+            );
           }
           break;
         case "frontend":
           if (hasCommand(pmBin)) {
-            spinner7.start(`Installing Frontend dependencies (${cmds.install})`);
-            exec(cmds.install, join3(dest, "frontend"));
-            spinner7.stop("Frontend dependencies installed.");
+            spinner7.start(
+              `Installing Frontend dependencies (${path}/, ${cmds.install})`
+            );
+            exec(cmds.install, dir);
+            spinner7.stop(`Frontend dependencies installed (${path}/).`);
           } else {
-            p4.log.warn(`${pm} not found \u2014 run 'cd frontend && ${cmds.install}' manually.`);
+            p4.log.warn(
+              `${pm} not found \u2014 run 'cd ${path} && ${cmds.install}' manually.`
+            );
           }
           break;
         case "e2e":
           if (hasCommand(pmBin)) {
-            spinner7.start(`Installing E2E dependencies (${cmds.install})`);
-            exec(cmds.install, join3(dest, "e2e"));
-            spinner7.stop("E2E dependencies installed.");
+            spinner7.start(
+              `Installing E2E dependencies (${path}/, ${cmds.install})`
+            );
+            exec(cmds.install, dir);
+            spinner7.stop(`E2E dependencies installed (${path}/).`);
           } else {
-            p4.log.warn(`${pm} not found \u2014 run 'cd e2e && ${cmds.install}' manually.`);
+            p4.log.warn(
+              `${pm} not found \u2014 run 'cd ${path} && ${cmds.install}' manually.`
+            );
           }
           break;
         case "mobile":
           if (hasCommand("flutter")) {
-            spinner7.start("Installing Flutter dependencies");
-            exec("flutter pub get", join3(dest, "mobile"));
-            spinner7.stop("Flutter dependencies installed.");
+            spinner7.start(`Installing Flutter dependencies (${path}/)`);
+            exec("flutter pub get", dir);
+            spinner7.stop(`Flutter dependencies installed (${path}/).`);
           } else {
-            p4.log.warn("Flutter not found \u2014 run 'cd mobile && flutter pub get' manually.");
+            p4.log.warn(
+              `Flutter not found \u2014 run 'cd ${path} && flutter pub get' manually.`
+            );
           }
           break;
         case "infra":
           break;
       }
     } catch {
-      spinner7.stop(`Failed to install ${component} dependencies.`);
+      spinner7.stop(`Failed to install ${type} dependencies (${path}/).`);
     }
   }
 }
@@ -672,7 +951,9 @@ import { join as join4 } from "path";
 async function detectComponents(cwd) {
   const results = [];
   const entries = await readdir(cwd, { withFileTypes: true });
-  const dirs = entries.filter((e) => e.isDirectory() && !e.name.startsWith(".") && !EXCLUDE.has(e.name)).map((e) => e.name);
+  const dirs = entries.filter(
+    (e) => e.isDirectory() && !e.name.startsWith(".") && !EXCLUDE.has(e.name)
+  ).map((e) => e.name);
   for (const dir of dirs) {
     const full = join4(cwd, dir);
     const detections = await scanDirectory(full, dir);
@@ -754,11 +1035,15 @@ async function init(cwd, localRepo) {
   p5.intro("projx init");
   const isLocal = !!localRepo;
   if (existsSync5(join5(cwd, ".projx"))) {
-    p5.log.error("This project is already initialized. Use 'npx create-projx update' or 'npx create-projx add' instead.");
+    p5.log.error(
+      "This project is already initialized. Use 'npx create-projx update' or 'npx create-projx add' instead."
+    );
     process.exit(1);
   }
   if (!isGitRepo2(cwd)) {
-    p5.log.error(`projx init requires a git repo. Run 'git init && git add -A && git commit -m "initial"' first.`);
+    p5.log.error(
+      `projx init requires a git repo. Run 'git init && git add -A && git commit -m "initial"' first.`
+    );
     process.exit(1);
   }
   if (hasUncommittedChanges2(cwd)) {
@@ -785,7 +1070,9 @@ async function init(cwd, localRepo) {
   const paths = Object.fromEntries(
     confirmed.map((c) => [c.component, c.directory])
   );
-  const hasJs = components.some((c) => ["fastify", "frontend", "e2e"].includes(c));
+  const hasJs = components.some(
+    (c) => ["fastify", "frontend", "e2e"].includes(c)
+  );
   let pm = "npm";
   if (hasJs) {
     const detected2 = detectPackageManager(cwd);
@@ -803,9 +1090,16 @@ async function init(cwd, localRepo) {
     }
   }
   const projectName = toKebab(cwd.split("/").pop());
-  const vars = { projectName, components, paths, pm: pmCommands(pm) };
+  const vars = {
+    projectName,
+    components,
+    paths,
+    pm: pmCommands(pm)
+  };
   const dlSpinner = p5.spinner();
-  dlSpinner.start(isLocal ? "Using local templates" : "Downloading latest templates");
+  dlSpinner.start(
+    isLocal ? "Using local templates" : "Downloading latest templates"
+  );
   const repoDir = await downloadRepo(localRepo).catch((err) => {
     dlSpinner.stop("Failed.");
     p5.log.error(String(err));
@@ -813,11 +1107,23 @@ async function init(cwd, localRepo) {
   });
   dlSpinner.stop(isLocal ? "Local templates loaded." : "Templates downloaded.");
   try {
-    const pkg = JSON.parse(await readFile4(join5(repoDir, "cli/package.json"), "utf-8"));
+    const pkg = JSON.parse(
+      await readFile4(join5(repoDir, "cli/package.json"), "utf-8")
+    );
     const version = pkg.version;
     const applySpinner = p5.spinner();
     applySpinner.start("Applying template");
-    const result = await applyTemplate(cwd, repoDir, components, paths, vars, version, void 0, void 0, true);
+    const result = await applyTemplate(
+      cwd,
+      repoDir,
+      components,
+      paths,
+      vars,
+      version,
+      void 0,
+      void 0,
+      true
+    );
     applySpinner.stop("Template applied.");
     if (existsSync5(join5(cwd, ".githooks"))) {
       try {
@@ -829,19 +1135,27 @@ async function init(cwd, localRepo) {
       saveBaselineRef(cwd);
     }
     if (result.status === "conflicts") {
-      p5.log.warn("Some template files differ from your code. Changes written directly.");
+      p5.log.warn(
+        "Some template files differ from your code. Changes written directly."
+      );
       p5.log.info("Review changes:");
       p5.log.info("  git diff");
       p5.log.info("");
       p5.log.info("Keep a change:  git add <file>");
       p5.log.info("Discard a change:  git checkout -- <file>");
-      p5.log.info('Commit when ready:  git add . && git commit -m "projx: init"');
+      p5.log.info(
+        'Commit when ready:  git add . && git commit -m "projx: init"'
+      );
       p5.log.info("");
       p5.log.info("To skip files on future updates, add to .projx-component:");
       p5.log.info('  { "skip": ["src/**", "tests/**"] }');
-      p5.outro("Template applied. Review with git diff.\n\n  Like projx? Star it: https://github.com/ukanhaupa/projx");
+      p5.outro(
+        "Template applied. Review with git diff.\n\n  Like projx? Star it: https://github.com/ukanhaupa/projx"
+      );
     } else {
-      p5.outro("Project initialized.\n\n  Like projx? Star it: https://github.com/ukanhaupa/projx");
+      p5.outro(
+        "Project initialized.\n\n  Like projx? Star it: https://github.com/ukanhaupa/projx"
+      );
     }
   } finally {
     await cleanupRepo(repoDir, isLocal);
@@ -940,7 +1254,10 @@ async function pin(cwd, patterns) {
       p6.log.warn(`Cannot pin ${pattern} \u2014 config files are managed by projx.`);
       continue;
     }
-    const { scope, component, relative } = classifyPattern(pattern, componentPaths);
+    const { scope, component, relative } = classifyPattern(
+      pattern,
+      componentPaths
+    );
     if (scope === "component" && component) {
       if (!componentAdds[component]) componentAdds[component] = [];
       componentAdds[component].push(relative);
@@ -989,7 +1306,10 @@ async function unpin(cwd, patterns) {
   const rootRemoves = [];
   const componentRemoves = {};
   for (const pattern of patterns) {
-    const { scope, component, relative } = classifyPattern(pattern, componentPaths);
+    const { scope, component, relative } = classifyPattern(
+      pattern,
+      componentPaths
+    );
     if (scope === "component" && component) {
       if (!componentRemoves[component]) componentRemoves[component] = [];
       componentRemoves[component].push(relative);
@@ -1089,7 +1409,11 @@ async function checkConfig(cwd) {
     });
     return { results };
   }
-  results.push({ name: ".projx exists", status: "pass", message: `v${rootConfig.version ?? "unknown"}` });
+  results.push({
+    name: ".projx exists",
+    status: "pass",
+    message: `v${rootConfig.version ?? "unknown"}`
+  });
   if (!rootConfig.version) {
     results.push({
       name: ".projx fields",
@@ -1110,7 +1434,11 @@ async function checkComponents(cwd, components, componentPaths) {
     });
     return results;
   }
-  results.push({ name: "components", status: "pass", message: `${components.length} discovered from markers` });
+  results.push({
+    name: "components",
+    status: "pass",
+    message: `${components.length} discovered from markers`
+  });
   for (const component of components) {
     const dir = componentPaths[component];
     const fullDir = join7(cwd, dir);
@@ -1133,7 +1461,11 @@ async function checkComponents(cwd, components, componentPaths) {
       continue;
     }
     const label = dir !== component ? `${dir}/ (${component})` : `${component}/`;
-    results.push({ name: `${component} marker`, status: "pass", message: label });
+    results.push({
+      name: `${component} marker`,
+      status: "pass",
+      message: label
+    });
   }
   return results;
 }
@@ -1143,18 +1475,36 @@ function checkGit(cwd, fix) {
     execSync3("git rev-parse --is-inside-work-tree", { cwd, stdio: "pipe" });
     results.push({ name: "git repo", status: "pass", message: "OK" });
   } catch {
-    results.push({ name: "git repo", status: "fail", message: "Not a git repository." });
+    results.push({
+      name: "git repo",
+      status: "fail",
+      message: "Not a git repository."
+    });
     return results;
   }
   try {
-    const ref = execSync3(`git rev-parse --verify ${BASELINE_REF}`, { cwd, stdio: "pipe" }).toString().trim();
-    results.push({ name: "baseline ref", status: "pass", message: ref.slice(0, 8) });
+    const ref = execSync3(`git rev-parse --verify ${BASELINE_REF}`, {
+      cwd,
+      stdio: "pipe"
+    }).toString().trim();
+    results.push({
+      name: "baseline ref",
+      status: "pass",
+      message: ref.slice(0, 8)
+    });
   } catch {
     if (fix) {
       saveBaselineRef(cwd);
       try {
-        execSync3(`git rev-parse --verify ${BASELINE_REF}`, { cwd, stdio: "pipe" });
-        results.push({ name: "baseline ref", status: "pass", message: "Created from git history." });
+        execSync3(`git rev-parse --verify ${BASELINE_REF}`, {
+          cwd,
+          stdio: "pipe"
+        });
+        results.push({
+          name: "baseline ref",
+          status: "pass",
+          message: "Created from git history."
+        });
       } catch {
         results.push({
           name: "baseline ref",
@@ -1173,12 +1523,19 @@ function checkGit(cwd, fix) {
     }
   }
   try {
-    const worktrees = execSync3("git worktree list --porcelain", { cwd, stdio: "pipe" }).toString();
+    const worktrees = execSync3("git worktree list --porcelain", {
+      cwd,
+      stdio: "pipe"
+    }).toString();
     const stale = worktrees.split("\n").filter((l) => l.includes("projx-wt-") || l.includes("projx/tmp-"));
     if (stale.length > 0) {
       if (fix) {
         execSync3("git worktree prune", { cwd, stdio: "pipe" });
-        results.push({ name: "worktrees", status: "pass", message: "Pruned stale worktrees." });
+        results.push({
+          name: "worktrees",
+          status: "pass",
+          message: "Pruned stale worktrees."
+        });
       } else {
         results.push({
           name: "worktrees",
@@ -1198,7 +1555,11 @@ function checkGit(cwd, fix) {
     const status = execSync3("git status --porcelain", { cwd, stdio: "pipe" }).toString().trim();
     if (status) {
       const count = status.split("\n").length;
-      results.push({ name: "working tree", status: "warn", message: `${count} uncommitted change(s).` });
+      results.push({
+        name: "working tree",
+        status: "warn",
+        message: `${count} uncommitted change(s).`
+      });
     } else {
       results.push({ name: "working tree", status: "pass", message: "Clean" });
     }
@@ -1236,7 +1597,11 @@ async function checkSkipPatterns(cwd, rootConfig, components, componentPaths) {
     }
   }
   if (results.length === 0 && (rootSkip.length > 0 || components.length > 0)) {
-    results.push({ name: "skip patterns", status: "pass", message: "All patterns match files." });
+    results.push({
+      name: "skip patterns",
+      status: "pass",
+      message: "All patterns match files."
+    });
   }
   return results;
 }
@@ -1275,7 +1640,9 @@ async function doctor(cwd, fix = false) {
   const { components, paths: componentPaths } = await discoverComponentsFromMarkers(cwd);
   allResults.push(...await checkComponents(cwd, components, componentPaths));
   allResults.push(...checkGit(cwd, fix));
-  allResults.push(...await checkSkipPatterns(cwd, rootConfig, components, componentPaths));
+  allResults.push(
+    ...await checkSkipPatterns(cwd, rootConfig, components, componentPaths)
+  );
   printReport(allResults);
   const passed = allResults.filter((r) => r.status === "pass").length;
   const warns = allResults.filter((r) => r.status === "warn").length;
@@ -1341,7 +1708,9 @@ async function diff(cwd, localRepo) {
   }
   const rootSkip = Array.isArray(raw.skip) ? raw.skip : [];
   const dlSpinner = p8.spinner();
-  dlSpinner.start(isLocal ? "Using local templates" : "Downloading latest templates");
+  dlSpinner.start(
+    isLocal ? "Using local templates" : "Downloading latest templates"
+  );
   const repoDir = await downloadRepo(localRepo).catch((err) => {
     dlSpinner.stop("Failed.");
     p8.log.error(String(err));
@@ -1349,20 +1718,35 @@ async function diff(cwd, localRepo) {
   });
   dlSpinner.stop(isLocal ? "Local templates loaded." : "Templates downloaded.");
   try {
-    const pkg = JSON.parse(await readFile5(join8(repoDir, "cli/package.json"), "utf-8"));
+    const pkg = JSON.parse(
+      await readFile5(join8(repoDir, "cli/package.json"), "utf-8")
+    );
     const version = pkg.version;
     p8.log.info(`Current: v${raw.version ?? "unknown"} \u2192 Template: v${version}`);
     const name = detectProjectName(cwd, components, componentPaths);
-    const vars = { projectName: name, components, paths: componentPaths, pm: pmCommands(raw.packageManager ?? "npm") };
+    const vars = {
+      projectName: name,
+      components,
+      paths: componentPaths,
+      pm: pmCommands(raw.packageManager ?? "npm")
+    };
     const spinner7 = p8.spinner();
     spinner7.start("Analyzing changes");
     const tmpTemplate = join8(tmpdir(), `projx-diff-${Date.now()}`);
     await mkdir2(tmpTemplate, { recursive: true });
-    await writeTemplateToDir(tmpTemplate, repoDir, components, componentPaths, vars, version, {
-      componentSkips,
-      rootSkip,
-      realCwd: cwd
-    });
+    await writeTemplateToDir(
+      tmpTemplate,
+      repoDir,
+      components,
+      componentPaths,
+      vars,
+      version,
+      {
+        componentSkips,
+        rootSkip,
+        realCwd: cwd
+      }
+    );
     const baselineRef = getBaselineRef(cwd);
     const templateFiles = await collectAllFiles(tmpTemplate, tmpTemplate);
     const analyses = [];
@@ -1409,12 +1793,12 @@ async function diff(cwd, localRepo) {
     await rm(tmpTemplate, { recursive: true, force: true });
     spinner7.stop("Analysis complete.");
     const groups = {
-      "new": [],
+      new: [],
       "clean-update": [],
       "needs-merge": [],
       "user-only": [],
-      "unchanged": [],
-      "skipped": []
+      unchanged: [],
+      skipped: []
     };
     for (const a of analyses) {
       groups[a.status].push(a);
@@ -1424,15 +1808,21 @@ async function diff(cwd, localRepo) {
       for (const a of groups["new"]) p8.log.info(`  + ${a.file}`);
     }
     if (groups["clean-update"].length > 0) {
-      p8.log.success(`Clean updates \u2014 auto-merged (${groups["clean-update"].length}):`);
+      p8.log.success(
+        `Clean updates \u2014 auto-merged (${groups["clean-update"].length}):`
+      );
       for (const a of groups["clean-update"]) p8.log.info(`  ~ ${a.file}`);
     }
     if (groups["needs-merge"].length > 0) {
-      p8.log.warn(`Needs merge \u2014 both sides changed (${groups["needs-merge"].length}):`);
+      p8.log.warn(
+        `Needs merge \u2014 both sides changed (${groups["needs-merge"].length}):`
+      );
       for (const a of groups["needs-merge"]) p8.log.info(`  ! ${a.file}`);
     }
     if (groups["user-only"].length > 0) {
-      p8.log.info(`User-modified only \u2014 no template change (${groups["user-only"].length}):`);
+      p8.log.info(
+        `User-modified only \u2014 no template change (${groups["user-only"].length}):`
+      );
       for (const a of groups["user-only"]) p8.log.info(`  = ${a.file}`);
     }
     if (groups["skipped"].length > 0) {
@@ -1459,12 +1849,21 @@ import { existsSync as existsSync9 } from "fs";
 import { readFile as readFile6, writeFile, mkdir as mkdir3 } from "fs/promises";
 import { join as join9 } from "path";
 import * as p9 from "@clack/prompts";
-var FIELD_TYPES = ["string", "number", "boolean", "date", "datetime", "text", "json"];
+var FIELD_TYPES = [
+  "string",
+  "number",
+  "boolean",
+  "date",
+  "datetime",
+  "text",
+  "json"
+];
 function toPascal(s) {
   return s.split(/[-_\s]+/).map((w) => w.charAt(0).toUpperCase() + w.slice(1)).join("");
 }
 function pluralize(s) {
-  if (s.endsWith("s") || s.endsWith("x") || s.endsWith("z") || s.endsWith("sh") || s.endsWith("ch")) return s + "es";
+  if (s.endsWith("s") || s.endsWith("x") || s.endsWith("z") || s.endsWith("sh") || s.endsWith("ch"))
+    return s + "es";
   if (s.endsWith("y") && !/[aeiou]y$/i.test(s)) return s.slice(0, -1) + "ies";
   return s + "s";
 }
@@ -1527,7 +1926,9 @@ async function promptEntityConfig(name) {
     p9.log.warn("No fields defined. Adding a default 'name' field.");
     fields.push({ name: "name", type: "string", required: true });
   }
-  const stringFields = fields.filter((f) => f.type === "string" || f.type === "text");
+  const stringFields = fields.filter(
+    (f) => f.type === "string" || f.type === "text"
+  );
   let searchableFields = [];
   if (stringFields.length > 0) {
     const selected = await p9.multiselect({
@@ -1632,7 +2033,9 @@ function generateFastAPIModel(config) {
   lines.push("");
   for (const field of config.fields) {
     const nullable = field.required ? "nullable=False" : "nullable=True";
-    lines.push(`    ${field.name} = Column(${sqlalchemyType(field.type)}, ${nullable})`);
+    lines.push(
+      `    ${field.name} = Column(${sqlalchemyType(field.type)}, ${nullable})`
+    );
   }
   lines.push("");
   return lines.join("\n");
@@ -1726,7 +2129,10 @@ function generateFastifySchemas(config) {
   }
   lines.push(`  created_at: Type.String({ format: 'date-time' }),`);
   lines.push(`  updated_at: Type.String({ format: 'date-time' }),`);
-  if (config.softDelete) lines.push(`  deleted_at: Type.Union([Type.String({ format: 'date-time' }), Type.Null()]),`);
+  if (config.softDelete)
+    lines.push(
+      `  deleted_at: Type.Union([Type.String({ format: 'date-time' }), Type.Null()]),`
+    );
   lines.push(`});`);
   lines.push("");
   lines.push(`export type ${className} = Static<typeof ${className}Schema>;`);
@@ -1741,7 +2147,9 @@ function generateFastifySchemas(config) {
   }
   lines.push(`});`);
   lines.push("");
-  lines.push(`export type Create${className} = Static<typeof Create${className}Schema>;`);
+  lines.push(
+    `export type Create${className} = Static<typeof Create${className}Schema>;`
+  );
   lines.push("");
   lines.push(`export const Update${className}Schema = Type.Object({`);
   for (const f of config.fields) {
@@ -1749,29 +2157,50 @@ function generateFastifySchemas(config) {
   }
   lines.push(`});`);
   lines.push("");
-  lines.push(`export type Update${className} = Static<typeof Update${className}Schema>;`);
+  lines.push(
+    `export type Update${className} = Static<typeof Update${className}Schema>;`
+  );
   lines.push("");
   return lines.join("\n");
 }
 function generateFastifyIndex(config) {
   const className = toPascal(config.name);
   const camelConfig = className.charAt(0).toLowerCase() + className.slice(1) + "Config";
-  const allColumns = ["id", ...config.fields.map((f) => f.name), "created_at", "updated_at"];
+  const allColumns = [
+    "id",
+    ...config.fields.map((f) => f.name),
+    "created_at",
+    "updated_at"
+  ];
   if (config.softDelete) allColumns.push("deleted_at");
   const lines = [];
-  lines.push(`import { EntityRegistry, type EntityConfig, type FieldMeta } from '../_base/index.js';`);
-  lines.push(`import { ${className}Schema, Create${className}Schema, Update${className}Schema } from './schemas.js';`);
+  lines.push(
+    `import { EntityRegistry, type EntityConfig, type FieldMeta } from '../_base/index.js';`
+  );
+  lines.push(
+    `import { ${className}Schema, Create${className}Schema, Update${className}Schema } from './schemas.js';`
+  );
   lines.push("");
   lines.push(`const fields: FieldMeta[] = [`);
-  lines.push(`  { key: 'id', label: 'Id', type: 'str', nullable: false, is_auto: true, is_primary_key: true, filterable: true, has_foreign_key: false, field_type: 'text' },`);
+  lines.push(
+    `  { key: 'id', label: 'Id', type: 'str', nullable: false, is_auto: true, is_primary_key: true, filterable: true, has_foreign_key: false, field_type: 'text' },`
+  );
   for (const f of config.fields) {
     const meta = fieldMetaType(f.type);
-    lines.push(`  { key: '${f.name}', label: '${toTitle(f.name)}', type: '${meta.type}', nullable: ${!f.required}, is_auto: false, is_primary_key: false, filterable: true, has_foreign_key: false, field_type: '${meta.fieldType}' },`);
+    lines.push(
+      `  { key: '${f.name}', label: '${toTitle(f.name)}', type: '${meta.type}', nullable: ${!f.required}, is_auto: false, is_primary_key: false, filterable: true, has_foreign_key: false, field_type: '${meta.fieldType}' },`
+    );
   }
-  lines.push(`  { key: 'created_at', label: 'Created At', type: 'datetime', nullable: false, is_auto: true, is_primary_key: false, filterable: true, has_foreign_key: false, field_type: 'datetime' },`);
-  lines.push(`  { key: 'updated_at', label: 'Updated At', type: 'datetime', nullable: false, is_auto: true, is_primary_key: false, filterable: true, has_foreign_key: false, field_type: 'datetime' },`);
+  lines.push(
+    `  { key: 'created_at', label: 'Created At', type: 'datetime', nullable: false, is_auto: true, is_primary_key: false, filterable: true, has_foreign_key: false, field_type: 'datetime' },`
+  );
+  lines.push(
+    `  { key: 'updated_at', label: 'Updated At', type: 'datetime', nullable: false, is_auto: true, is_primary_key: false, filterable: true, has_foreign_key: false, field_type: 'datetime' },`
+  );
   if (config.softDelete) {
-    lines.push(`  { key: 'deleted_at', label: 'Deleted At', type: 'datetime', nullable: true, is_auto: true, is_primary_key: false, filterable: true, has_foreign_key: false, field_type: 'datetime' },`);
+    lines.push(
+      `  { key: 'deleted_at', label: 'Deleted At', type: 'datetime', nullable: true, is_auto: true, is_primary_key: false, filterable: true, has_foreign_key: false, field_type: 'datetime' },`
+    );
   }
   lines.push(`];`);
   lines.push("");
@@ -1787,7 +2216,9 @@ function generateFastifyIndex(config) {
   lines.push(`  bulkOperations: ${config.bulkOperations},`);
   lines.push(`  columnNames: [${allColumns.map((c) => `'${c}'`).join(", ")}],`);
   if (config.searchableFields.length > 0) {
-    lines.push(`  searchableFields: [${config.searchableFields.map((f) => `'${f}'`).join(", ")}],`);
+    lines.push(
+      `  searchableFields: [${config.searchableFields.map((f) => `'${f}'`).join(", ")}],`
+    );
   } else {
     lines.push(`  searchableFields: [],`);
   }
@@ -1898,7 +2329,8 @@ function dartFromJson(fieldName, type, required) {
   const key = `json['${fieldName}']`;
   const isDate = type === "date" || type === "datetime";
   if (isDate && required) return `DateTime.parse(${key} as String)`;
-  if (isDate && !required) return `${key} != null ? DateTime.parse(${key} as String) : null`;
+  if (isDate && !required)
+    return `${key} != null ? DateTime.parse(${key} as String) : null`;
   if (type === "json" && !required) return `${key} as Map<String, dynamic>?`;
   if (type === "json") return `${key} as Map<String, dynamic>`;
   const dartT = (() => {
@@ -1918,14 +2350,22 @@ function dartFromJson(fieldName, type, required) {
 }
 function dartToJson(fieldName, camelName, type, required) {
   const isDate = type === "date" || type === "datetime";
-  if (isDate && required) return `'${fieldName}': ${camelName}.toIso8601String()`;
-  if (isDate && !required) return `'${fieldName}': ${camelName}?.toIso8601String()`;
+  if (isDate && required)
+    return `'${fieldName}': ${camelName}.toIso8601String()`;
+  if (isDate && !required)
+    return `'${fieldName}': ${camelName}?.toIso8601String()`;
   return `'${fieldName}': ${camelName}`;
 }
 function generateDartModel(config) {
   const className = toPascal(config.name);
   const allFields = [
-    { snake: "id", camel: "id", type: "String", required: true, fieldType: "string" },
+    {
+      snake: "id",
+      camel: "id",
+      type: "String",
+      required: true,
+      fieldType: "string"
+    },
     ...config.fields.map((f) => ({
       snake: f.name,
       camel: toCamel(f.name),
@@ -1935,11 +2375,29 @@ function generateDartModel(config) {
     }))
   ];
   if (config.softDelete) {
-    allFields.push({ snake: "deleted_at", camel: "deletedAt", type: "DateTime?", required: false, fieldType: "datetime" });
+    allFields.push({
+      snake: "deleted_at",
+      camel: "deletedAt",
+      type: "DateTime?",
+      required: false,
+      fieldType: "datetime"
+    });
   }
   allFields.push(
-    { snake: "created_at", camel: "createdAt", type: "DateTime", required: true, fieldType: "datetime" },
-    { snake: "updated_at", camel: "updatedAt", type: "DateTime", required: true, fieldType: "datetime" }
+    {
+      snake: "created_at",
+      camel: "createdAt",
+      type: "DateTime",
+      required: true,
+      fieldType: "datetime"
+    },
+    {
+      snake: "updated_at",
+      camel: "updatedAt",
+      type: "DateTime",
+      required: true,
+      fieldType: "datetime"
+    }
   );
   const lines = [];
   lines.push(`class ${className} {`);
@@ -1960,7 +2418,9 @@ function generateDartModel(config) {
   lines.push(`  factory ${className}.fromJson(Map<String, dynamic> json) {`);
   lines.push(`    return ${className}(`);
   for (const f of allFields) {
-    lines.push(`      ${f.camel}: ${dartFromJson(f.snake, f.fieldType, f.required)},`);
+    lines.push(
+      `      ${f.camel}: ${dartFromJson(f.snake, f.fieldType, f.required)},`
+    );
   }
   lines.push(`    );`);
   lines.push(`  }`);
@@ -1968,7 +2428,9 @@ function generateDartModel(config) {
   lines.push(`  Map<String, dynamic> toJson() {`);
   lines.push(`    return {`);
   for (const f of allFields) {
-    lines.push(`      ${dartToJson(f.snake, f.camel, f.fieldType, f.required)},`);
+    lines.push(
+      `      ${dartToJson(f.snake, f.camel, f.fieldType, f.required)},`
+    );
   }
   lines.push(`    };`);
   lines.push(`  }`);
@@ -2070,11 +2532,15 @@ function generateFastapiTest(config) {
   }
   lines.push(`    }`);
   const updateField = config.fields[0];
-  lines.push(`    update_payload = {"${updateField.name}": ${pyHttpLiteral(updateField.type, "update")}}`);
+  lines.push(
+    `    update_payload = {"${updateField.name}": ${pyHttpLiteral(updateField.type, "update")}}`
+  );
   lines.push(`    invalid_payload: dict = {}`);
   lines.push(`    filter_field = "${filterField.name}"`);
   lines.push(`    filter_value = ${pyHttpLiteral(filterField.type, "create")}`);
-  lines.push(`    other_filter_value = ${pyHttpLiteral(filterField.type, "alt")}`);
+  lines.push(
+    `    other_filter_value = ${pyHttpLiteral(filterField.type, "alt")}`
+  );
   lines.push("");
   lines.push(`    def make_model(self, index: int, **overrides):`);
   lines.push(`        data = {`);
@@ -2092,7 +2558,9 @@ function generateFastifyTest(config) {
   const basePath = `/api/v1${config.apiPrefix}`;
   const updateField = config.fields[0];
   const lines = [];
-  lines.push(`import { describeCrudEntity } from '../helpers/crud-test-base.js';`);
+  lines.push(
+    `import { describeCrudEntity } from '../helpers/crud-test-base.js';`
+  );
   lines.push("");
   lines.push(`describeCrudEntity({`);
   lines.push(`  entityName: '${className}',`);
@@ -2104,7 +2572,9 @@ function generateFastifyTest(config) {
   }
   lines.push(`  },`);
   lines.push(`  updatePayload: {`);
-  lines.push(`    ${updateField.name}: ${tsLiteral(updateField.type, "update")},`);
+  lines.push(
+    `    ${updateField.name}: ${tsLiteral(updateField.type, "update")},`
+  );
   lines.push(`  },`);
   lines.push(`});`);
   lines.push("");
@@ -2150,7 +2620,12 @@ async function gen(cwd, entityName, fieldsFlag, backendFlag) {
     p9.log.error("No backend component found. Need fastapi or fastify.");
     process.exit(1);
   }
-  const targetBackend = await resolvePrimaryBackend(cwd, hasFastapi, hasFastify, backendFlag);
+  const targetBackend = await resolvePrimaryBackend(
+    cwd,
+    hasFastapi,
+    hasFastify,
+    backendFlag
+  );
   const genFastapi = targetBackend === "fastapi" && hasFastapi;
   const genFastify = targetBackend === "fastify" && hasFastify;
   let config;
@@ -2177,11 +2652,19 @@ async function gen(cwd, entityName, fieldsFlag, backendFlag) {
     const dir = componentPaths.fastapi;
     const entityDir = join9(cwd, dir, "src/entities", toSnake(config.name));
     if (existsSync9(entityDir)) {
-      p9.log.warn(`${dir}/src/entities/${toSnake(config.name)}/ already exists. Skipping FastAPI.`);
+      p9.log.warn(
+        `${dir}/src/entities/${toSnake(config.name)}/ already exists. Skipping FastAPI.`
+      );
     } else {
       await mkdir3(entityDir, { recursive: true });
-      await writeFile(join9(entityDir, "_model.py"), generateFastAPIModel(config));
-      await writeFile(join9(entityDir, "__init__.py"), "from ._model import *\n");
+      await writeFile(
+        join9(entityDir, "_model.py"),
+        generateFastAPIModel(config)
+      );
+      await writeFile(
+        join9(entityDir, "__init__.py"),
+        "from ._model import *\n"
+      );
       generated.push(`${dir}/src/entities/${toSnake(config.name)}/_model.py`);
       generated.push(`${dir}/src/entities/${toSnake(config.name)}/__init__.py`);
       const testsDir = join9(cwd, dir, "tests");
@@ -2196,11 +2679,19 @@ async function gen(cwd, entityName, fieldsFlag, backendFlag) {
     const dir = componentPaths.fastify;
     const moduleDir = join9(cwd, dir, "src/modules", toKebab(config.name));
     if (existsSync9(moduleDir)) {
-      p9.log.warn(`${dir}/src/modules/${toKebab(config.name)}/ already exists. Skipping Fastify.`);
+      p9.log.warn(
+        `${dir}/src/modules/${toKebab(config.name)}/ already exists. Skipping Fastify.`
+      );
     } else {
       await mkdir3(moduleDir, { recursive: true });
-      await writeFile(join9(moduleDir, "schemas.ts"), generateFastifySchemas(config));
-      await writeFile(join9(moduleDir, "index.ts"), generateFastifyIndex(config));
+      await writeFile(
+        join9(moduleDir, "schemas.ts"),
+        generateFastifySchemas(config)
+      );
+      await writeFile(
+        join9(moduleDir, "index.ts"),
+        generateFastifyIndex(config)
+      );
       generated.push(`${dir}/src/modules/${toKebab(config.name)}/schemas.ts`);
       generated.push(`${dir}/src/modules/${toKebab(config.name)}/index.ts`);
       const appPath = join9(cwd, dir, "src/app.ts");
@@ -2225,12 +2716,18 @@ async function gen(cwd, entityName, fieldsFlag, backendFlag) {
         const modelName = `model ${toPascal(config.name)}`;
         if (!prismaContent.includes(modelName)) {
           const prismaModel = generatePrismaModel(config);
-          await writeFile(prismaPath, prismaContent.trimEnd() + "\n\n" + prismaModel + "\n");
+          await writeFile(
+            prismaPath,
+            prismaContent.trimEnd() + "\n\n" + prismaModel + "\n"
+          );
           generated.push(`${dir}/prisma/schema.prisma (model added)`);
         }
       }
       const testsModulesDir = join9(cwd, dir, "tests/modules");
-      const fastifyTestFile = join9(testsModulesDir, `${toKebab(config.name)}.test.ts`);
+      const fastifyTestFile = join9(
+        testsModulesDir,
+        `${toKebab(config.name)}.test.ts`
+      );
       if (existsSync9(testsModulesDir) && !existsSync9(fastifyTestFile)) {
         await writeFile(fastifyTestFile, generateFastifyTest(config));
         generated.push(`${dir}/tests/modules/${toKebab(config.name)}.test.ts`);
@@ -2243,7 +2740,9 @@ async function gen(cwd, entityName, fieldsFlag, backendFlag) {
     const fileName = toKebab(config.name) + ".ts";
     const filePath = join9(typesDir, fileName);
     if (existsSync9(filePath)) {
-      p9.log.warn(`${dir}/src/types/${fileName} already exists. Skipping frontend types.`);
+      p9.log.warn(
+        `${dir}/src/types/${fileName} already exists. Skipping frontend types.`
+      );
     } else {
       await mkdir3(typesDir, { recursive: true });
       await writeFile(filePath, generateFrontendInterface(config));
@@ -2253,7 +2752,10 @@ async function gen(cwd, entityName, fieldsFlag, backendFlag) {
       if (existsSync9(barrelPath)) {
         const content = await readFile6(barrelPath, "utf-8");
         if (!content.includes(exportLine)) {
-          await writeFile(barrelPath, content.trimEnd() + "\n" + exportLine + "\n");
+          await writeFile(
+            barrelPath,
+            content.trimEnd() + "\n" + exportLine + "\n"
+          );
         }
       } else {
         await writeFile(barrelPath, exportLine + "\n");
@@ -2266,7 +2768,9 @@ async function gen(cwd, entityName, fieldsFlag, backendFlag) {
     const entityDir = join9(cwd, dir, "lib/entities", toSnake(config.name));
     const modelPath = join9(entityDir, "model.dart");
     if (existsSync9(modelPath)) {
-      p9.log.warn(`${dir}/lib/entities/${toSnake(config.name)}/model.dart already exists. Skipping mobile model.`);
+      p9.log.warn(
+        `${dir}/lib/entities/${toSnake(config.name)}/model.dart already exists. Skipping mobile model.`
+      );
     } else {
       await mkdir3(entityDir, { recursive: true });
       await writeFile(modelPath, generateDartModel(config));
@@ -2286,19 +2790,27 @@ async function gen(cwd, entityName, fieldsFlag, backendFlag) {
   if (genFastapi) {
     p9.log.info("");
     p9.log.info("FastAPI next steps:");
-    p9.log.info(`  alembic revision --autogenerate -m "add ${config.tableName}"`);
+    p9.log.info(
+      `  alembic revision --autogenerate -m "add ${config.tableName}"`
+    );
     p9.log.info("  alembic upgrade head");
   }
   if (genFastify) {
     p9.log.info("");
     p9.log.info("Fastify next steps:");
-    p9.log.info(`  ${pm.prismaExec} migrate dev --name add_${toSnake(config.name)}`);
+    p9.log.info(
+      `  ${pm.prismaExec} migrate dev --name add_${toSnake(config.name)}`
+    );
   }
   if (hasFrontend) {
     p9.log.info("");
     p9.log.info("Frontend usage:");
-    p9.log.info(`  import type { ${className} } from '../types/${toKebab(config.name)}';`);
-    p9.log.info(`  const { data } = await api.list<${className}>('${config.apiPrefix}');`);
+    p9.log.info(
+      `  import type { ${className} } from '../types/${toKebab(config.name)}';`
+    );
+    p9.log.info(
+      `  const { data } = await api.list<${className}>('${config.apiPrefix}');`
+    );
   }
   if (hasMobile) {
     p9.log.info("");
@@ -2645,9 +3157,7 @@ function parseArgs() {
     if (arg === "--components") {
       const val = args[++i];
       if (val) {
-        options.components = val.split(",").filter(
-          (c) => COMPONENTS.includes(c)
-        );
+        options.components = val.split(",").filter((c) => COMPONENTS.includes(c));
       }
       continue;
     }
@@ -2697,6 +3207,11 @@ function parseArgs() {
       if (val) extraArgs.push(`--fields=${val}`);
       continue;
     }
+    if (arg === "--name") {
+      const val = args[++i];
+      if (val) extraArgs.push(`--name=${val}`);
+      continue;
+    }
     if (!arg.startsWith("-")) {
       if (command === "add" || command === "pin" || command === "unpin" || command === "gen") {
         extraArgs.push(arg);
@@ -2713,6 +3228,7 @@ function printHelp() {
     projx <name> [options]        Create a new project
     projx init                    Adopt existing project into projx
     projx add <components...>     Add components to existing project
+    projx add <type> --name <dir> Add another instance of <type> at <dir>
     projx update                  Update scaffolding to latest
     projx diff                    Preview what update would change
     projx pin <patterns...>       Skip files on future updates
@@ -2735,6 +3251,7 @@ function printHelp() {
     npx create-projx my-app --components fastapi,frontend,e2e
     npx create-projx my-app -y
     npx create-projx add frontend mobile
+    npx create-projx add fastify --name email-ingestor
     npx create-projx@latest update
     npx create-projx diff
     npx create-projx pin backend/pyproject.toml
@@ -2758,10 +3275,25 @@ async function main() {
       (c) => COMPONENTS.includes(c)
     );
     if (components.length === 0) {
-      console.error(`Error: specify components to add. Available: ${COMPONENTS.join(", ")}`);
+      console.error(
+        `Error: specify components to add. Available: ${COMPONENTS.join(", ")}`
+      );
       process.exit(1);
     }
-    await add(process.cwd(), components, localRepo, options.install === false);
+    const customName = extraArgs.find((a) => a.startsWith("--name="))?.slice("--name=".length);
+    if (customName && components.length > 1) {
+      console.error(
+        "Error: --name can only be used when adding a single component type."
+      );
+      process.exit(2);
+    }
+    await add(
+      process.cwd(),
+      components,
+      localRepo,
+      options.install === false,
+      customName
+    );
     return;
   }
   if (command === "pin") {
@@ -2774,7 +3306,9 @@ async function main() {
   }
   if (command === "unpin") {
     if (extraArgs.length === 0) {
-      console.error("Error: specify patterns to unpin. Usage: projx unpin <patterns...>");
+      console.error(
+        "Error: specify patterns to unpin. Usage: projx unpin <patterns...>"
+      );
       process.exit(1);
     }
     await unpin(process.cwd(), extraArgs);
@@ -2797,7 +3331,9 @@ async function main() {
   if (command === "gen") {
     const subcommand = extraArgs[0];
     if (subcommand !== "entity" || !extraArgs[1]) {
-      console.error('Usage: projx gen entity <name> [--fields "name:string,amount:number"]');
+      console.error(
+        'Usage: projx gen entity <name> [--fields "name:string,amount:number"]'
+      );
       process.exit(1);
     }
     const entityName = extraArgs[1];