create-projx 1.6.2 → 1.6.3

package/dist/{chunk-D33FXCNT.js → chunk-OBYYB6PR.js}

@@ -13,11 +13,18 @@ import {
   toSnake,
   upsertComponentMarker,
   writeProjxConfig
-} from "./chunk-LTIJPVRZ.js";
+} from "./chunk-LYPPFXGK.js";
 
 // src/baseline.ts
 import { existsSync, writeFileSync, unlinkSync } from "fs";
-import { chmod, mkdir, writeFile, rm, readFile as readFile2, copyFile } from "fs/promises";
+import {
+  chmod,
+  mkdir,
+  writeFile,
+  rm,
+  readFile as readFile2,
+  copyFile
+} from "fs/promises";
 import { execSync } from "child_process";
 import { join as join2, dirname } from "path";
 import { tmpdir } from "os";
@@ -25,30 +32,57 @@ import { tmpdir } from "os";
 // src/generators/index.ts
 import { readFile } from "fs/promises";
 import { join } from "path";
+function shellSafeUpper(s) {
+  return s.replace(/[^A-Za-z0-9]+/g, "_").toUpperCase();
+}
+var CANONICAL_DISPLAY = {
+  fastapi: "FastAPI",
+  fastify: "Fastify",
+  frontend: "Frontend",
+  mobile: "Flutter",
+  e2e: "E2E",
+  infra: "Terraform"
+};
+function withInstances(vars) {
+  const base = vars.instances && vars.instances.length > 0 ? vars.instances : vars.components.map((type) => ({ type, path: vars.paths[type] ?? type }));
+  const enriched = base.map((inst) => ({
+    ...inst,
+    upper: shellSafeUpper(inst.path),
+    display: inst.path === inst.type ? CANONICAL_DISPLAY[inst.type] : inst.path
+  }));
+  const byType = (type) => enriched.filter((i) => i.type === type).sort((a, b) => a.path.localeCompare(b.path));
+  return {
+    ...vars,
+    instances: enriched,
+    fastapiInstances: byType("fastapi"),
+    fastifyInstances: byType("fastify"),
+    frontendInstances: byType("frontend"),
+    mobileInstances: byType("mobile"),
+    e2eInstances: byType("e2e"),
+    infraInstances: byType("infra")
+  };
+}
 async function renderShared(filename, vars) {
-  const tpl = await readFile(
-    join(sharedTemplateDir(), filename),
-    "utf-8"
-  );
+  const tpl = await readFile(join(sharedTemplateDir(), filename), "utf-8");
   return render(tpl, vars);
 }
 async function generateDockerCompose(vars) {
-  return renderShared("docker-compose.yml.ejs", vars);
+  return renderShared("docker-compose.yml.ejs", withInstances(vars));
 }
 async function generateDockerComposeDev(vars) {
-  return renderShared("docker-compose.dev.yml.ejs", vars);
+  return renderShared("docker-compose.dev.yml.ejs", withInstances(vars));
 }
 async function generatePreCommit(vars) {
-  return renderShared("pre-commit.ejs", vars);
+  return renderShared("pre-commit.ejs", withInstances(vars));
 }
 async function generateSetupSh(vars) {
-  return renderShared("setup.sh.ejs", vars);
+  return renderShared("setup.sh.ejs", withInstances(vars));
 }
 async function generateCiYml(vars) {
-  return renderShared("ci.yml.ejs", vars);
+  return renderShared("ci.yml.ejs", withInstances(vars));
 }
 async function generateReadme(vars) {
-  return renderShared("README.md.ejs", vars);
+  return renderShared("README.md.ejs", withInstances(vars));
 }
 function generateVscodeSettings(vars) {
   const settings = {};
@@ -58,9 +92,15 @@ function generateVscodeSettings(vars) {
       "editor.codeActionsOnSave": { "source.fixAll.ruff": "explicit" }
     };
   }
-  settings["[typescript]"] = { "editor.defaultFormatter": "esbenp.prettier-vscode" };
-  settings["[typescriptreact]"] = { "editor.defaultFormatter": "esbenp.prettier-vscode" };
-  settings["[javascript]"] = { "editor.defaultFormatter": "esbenp.prettier-vscode" };
+  settings["[typescript]"] = {
+    "editor.defaultFormatter": "esbenp.prettier-vscode"
+  };
+  settings["[typescriptreact]"] = {
+    "editor.defaultFormatter": "esbenp.prettier-vscode"
+  };
+  settings["[javascript]"] = {
+    "editor.defaultFormatter": "esbenp.prettier-vscode"
+  };
   settings["[json]"] = { "editor.defaultFormatter": "esbenp.prettier-vscode" };
   settings["[css]"] = { "editor.defaultFormatter": "esbenp.prettier-vscode" };
   settings["[yaml]"] = { "editor.defaultFormatter": "esbenp.prettier-vscode" };
@@ -82,32 +122,9 @@ function generateVscodeSettings(vars) {
 }
 
 // src/baseline.ts
-function buildPathsUpper(paths) {
-  const result = {};
-  for (const [component, dir] of Object.entries(paths)) {
-    result[component] = dir.replace(/[^A-Za-z0-9]+/g, "_").toUpperCase();
-  }
-  return result;
-}
-var CANONICAL_DISPLAY_NAMES = {
-  fastapi: "FastAPI",
-  fastify: "Fastify",
-  frontend: "Frontend",
-  mobile: "Flutter",
-  e2e: "E2E",
-  infra: "Terraform"
-};
-function buildDisplayNames(paths) {
-  const result = {};
-  for (const [component, dir] of Object.entries(paths)) {
-    const canonical = component;
-    result[canonical] = dir === canonical ? CANONICAL_DISPLAY_NAMES[canonical] : dir;
-  }
-  return result;
-}
 var BASELINE_REF = "refs/projx/baseline";
 async function migrateComponentMarkers(cwd, components, componentPaths, applyDefaults) {
-  const { readComponentMarker: readComponentMarker2, writeComponentMarker } = await import("./utils-VY5BBJBQ.js");
+  const { readComponentMarker: readComponentMarker2, writeComponentMarker } = await import("./utils-BXHJP6HF.js");
   for (const component of components) {
     const dir = componentPaths[component];
     const markerDir = join2(cwd, dir);
@@ -175,11 +192,17 @@ function saveBaselineRef(cwd) {
 }
 function getBaselineRef(cwd) {
   try {
-    return execSync(`git rev-parse --verify ${BASELINE_REF}`, { cwd, stdio: "pipe" }).toString().trim();
+    return execSync(`git rev-parse --verify ${BASELINE_REF}`, {
+      cwd,
+      stdio: "pipe"
+    }).toString().trim();
   } catch {
   }
   try {
-    const sha = execSync("git log -1 --format=%H -- .projx", { cwd, stdio: "pipe" }).toString().trim();
+    const sha = execSync("git log -1 --format=%H -- .projx", {
+      cwd,
+      stdio: "pipe"
+    }).toString().trim();
     if (sha) return sha;
   } catch {
   }
@@ -187,7 +210,10 @@ function getBaselineRef(cwd) {
 }
 function getFileAtRef(cwd, ref, filePath) {
   try {
-    return execSync(`git show ${ref}:"${filePath}"`, { cwd, stdio: "pipe" }).toString();
+    return execSync(`git show ${ref}:"${filePath}"`, {
+      cwd,
+      stdio: "pipe"
+    }).toString();
   } catch {
     return null;
   }
@@ -258,15 +284,22 @@ async function tryThreeWayMerge(cwd, templateDir, baselineRef, componentPaths) {
   const pathFallbacks = buildPathFallbacks(componentPaths);
   for (const file of templateFiles) {
     if (file === ".projx") continue;
-    if (file.endsWith("/.projx-component") || file === ".projx-component") continue;
+    const isMarker = file.endsWith("/.projx-component") || file === ".projx-component";
     const oursPath = join2(cwd, file);
+    if (isMarker && existsSync(oursPath)) continue;
     if (!existsSync(oursPath)) {
       await mkdir(dirname(oursPath), { recursive: true });
       await copyFile(join2(templateDir, file), oursPath);
       merged.push(file);
       continue;
     }
-    const baseContent = lookupBaseContent(cwd, baselineRef, file, pathFallbacks);
+    if (isMarker) continue;
+    const baseContent = lookupBaseContent(
+      cwd,
+      baselineRef,
+      file,
+      pathFallbacks
+    );
     if (baseContent === null) continue;
     let theirsContent;
     try {
@@ -307,7 +340,10 @@ function createOrphanWorktree(cwd) {
 }
 function cleanupWorktree(cwd, worktree, branch) {
   try {
-    execSync(`git worktree remove "${worktree}" --force`, { cwd, stdio: "pipe" });
+    execSync(`git worktree remove "${worktree}" --force`, {
+      cwd,
+      stdio: "pipe"
+    });
   } catch {
     try {
       rm(worktree, { recursive: true, force: true });
@@ -332,7 +368,8 @@ async function removeSkippedFiles(dir, skipPatterns, realDir) {
         await walk(full, base);
       } else if (entry.name !== ".projx-component") {
         const targetRel = rel.endsWith(".ejs") ? rel.slice(0, -".ejs".length) : rel;
-        if (!matchesSkip(targetRel, skipPatterns) && !matchesSkip(rel, skipPatterns)) continue;
+        if (!matchesSkip(targetRel, skipPatterns) && !matchesSkip(rel, skipPatterns))
+          continue;
         if (realDir && !existsSync(join2(realDir, targetRel))) continue;
         await unlink(full);
       }
@@ -341,41 +378,35 @@ async function removeSkippedFiles(dir, skipPatterns, realDir) {
   await walk(dir, dir);
 }
 async function writeTemplateToDir(dest, repoDir, components, componentPaths, vars, version, options = {}) {
-  const { componentSkips, rootSkip, applyDefaults = false, realCwd = dest } = options;
+  const {
+    componentSkips,
+    rootSkip,
+    applyDefaults = false,
+    realCwd = dest,
+    extraInstances = [],
+    instancesToScaffold
+  } = options;
   const name = vars.projectName;
   const nameSnake = toSnake(name);
-  for (const component of components) {
-    const targetDir = componentPaths[component];
-    const baseSkip = componentSkips?.[component] ?? [];
-    const realMarker = await readComponentMarker(join2(realCwd, targetDir));
-    const isNewMarker = !realMarker;
-    const shouldApplyComponentDefault = isNewMarker || applyDefaults;
-    const defaultSkip = shouldApplyComponentDefault ? DEFAULT_COMPONENT_SKIP_PATTERNS[component] ?? [] : [];
-    const skipPatterns = [.../* @__PURE__ */ new Set([...baseSkip, ...defaultSkip])];
-    const tmpDir = join2(dest, "__cptmp__");
-    await copyComponent(repoDir, component, tmpDir);
-    const srcDir = join2(tmpDir, component);
-    if (skipPatterns.length > 0) {
-      const realComponentDir = join2(realCwd, targetDir);
-      await removeSkippedFiles(srcDir, skipPatterns, realComponentDir);
-    }
-    const outDir = join2(dest, targetDir);
-    await mkdir(outDir, { recursive: true });
-    const { cp } = await import("fs/promises");
-    if (existsSync(srcDir)) {
-      await cp(srcDir, outDir, { recursive: true, force: true });
-    }
-    await rm(tmpDir, { recursive: true, force: true });
-    await renderEjsInDir(outDir, vars);
-    await upsertComponentMarker(join2(dest, targetDir), component, skipPatterns.length > 0 ? skipPatterns : void 0);
-  }
-  if (!vars.pathsUpper) {
-    vars.pathsUpper = buildPathsUpper(componentPaths);
-  }
-  if (!vars.displayNames) {
-    vars.displayNames = buildDisplayNames(componentPaths);
+  const primaryInstances = components.map((type) => ({
+    type,
+    path: componentPaths[type]
+  }));
+  const allInstances = [...primaryInstances, ...extraInstances];
+  const toScaffold = instancesToScaffold ?? allInstances;
+  for (const inst of toScaffold) {
+    await writeOneInstance(inst, {
+      dest,
+      repoDir,
+      vars,
+      componentPaths,
+      realCwd,
+      applyDefaults,
+      baseSkip: componentSkips?.[inst.type] ?? [],
+      projectName: name,
+      nameSnake
+    });
   }
-  await substituteNames(dest, components, componentPaths, name, nameSnake, vars.nameOverrides);
   const hasBackend = components.includes("fastapi") || components.includes("fastify");
   const userSkip = rootSkip ?? [];
   const defaultRootSkip = applyDefaults ? DEFAULT_ROOT_SKIP_PATTERNS : [];
@@ -386,20 +417,32 @@ async function writeTemplateToDir(dest, repoDir, components, componentPaths, var
   };
   if (hasBackend || components.includes("frontend")) {
     if (shouldWrite("docker-compose.yml"))
-      await writeFile(join2(dest, "docker-compose.yml"), await generateDockerCompose(vars));
+      await writeFile(
+        join2(dest, "docker-compose.yml"),
+        await generateDockerCompose(vars)
+      );
     if (shouldWrite("docker-compose.dev.yml"))
-      await writeFile(join2(dest, "docker-compose.dev.yml"), await generateDockerComposeDev(vars));
+      await writeFile(
+        join2(dest, "docker-compose.dev.yml"),
+        await generateDockerComposeDev(vars)
+      );
   }
   if (shouldWrite("README.md"))
     await writeFile(join2(dest, "README.md"), await generateReadme(vars));
   if (shouldWrite(".githooks/pre-commit")) {
     await mkdir(join2(dest, ".githooks"), { recursive: true });
-    await writeFile(join2(dest, ".githooks/pre-commit"), await generatePreCommit(vars));
+    await writeFile(
+      join2(dest, ".githooks/pre-commit"),
+      await generatePreCommit(vars)
+    );
     await chmod(join2(dest, ".githooks/pre-commit"), 493);
   }
   if (shouldWrite(".github/workflows/ci.yml")) {
     await mkdir(join2(dest, ".github/workflows"), { recursive: true });
-    await writeFile(join2(dest, ".github/workflows/ci.yml"), await generateCiYml(vars));
+    await writeFile(
+      join2(dest, ".github/workflows/ci.yml"),
+      await generateCiYml(vars)
+    );
   }
   if (shouldWrite("setup.sh")) {
     await writeFile(join2(dest, "setup.sh"), await generateSetupSh(vars));
@@ -408,31 +451,68 @@ async function writeTemplateToDir(dest, repoDir, components, componentPaths, var
   await copyStaticFiles(repoDir, dest);
   if (shouldWrite(".vscode/settings.json")) {
     await mkdir(join2(dest, ".vscode"), { recursive: true });
-    await writeFile(join2(dest, ".vscode/settings.json"), generateVscodeSettings(vars));
+    await writeFile(
+      join2(dest, ".vscode/settings.json"),
+      generateVscodeSettings(vars)
+    );
   }
   await writeManagedProjx(dest, version, vars, applyDefaults);
 }
-async function substituteNames(dest, components, paths, name, nameSnake, overrides) {
-  if (components.includes("fastapi")) {
-    const target = overrides?.fastapi ?? `${name}-fastapi`;
-    await replaceInFile(join2(dest, `${paths.fastapi}/pyproject.toml`), "projx-fastapi", target);
-  }
-  if (components.includes("fastify")) {
-    const target = overrides?.fastify ?? `${name}-fastify`;
-    await replaceInFile(join2(dest, `${paths.fastify}/package.json`), "projx-fastify", target);
-  }
-  if (components.includes("frontend")) {
-    const target = overrides?.frontend ?? `${name}-frontend`;
-    await replaceInFile(join2(dest, `${paths.frontend}/package.json`), "projx-frontend", target);
-  }
-  if (components.includes("e2e")) {
-    const target = overrides?.e2e ?? `${name}-e2e`;
-    await replaceInFile(join2(dest, `${paths.e2e}/package.json`), "projx-e2e", target);
-  }
-  if (components.includes("mobile")) {
-    const target = overrides?.mobile ?? `${nameSnake}_mobile`;
-    await replaceInFile(join2(dest, `${paths.mobile}/pubspec.yaml`), "projx_mobile", target);
-    await replaceInDir(join2(dest, `${paths.mobile}`), "package:projx_mobile/", `package:${target}/`, ".dart");
+async function writeOneInstance(inst, opts) {
+  const { dest, repoDir, vars, componentPaths, realCwd, applyDefaults, baseSkip, projectName, nameSnake } = opts;
+  const { type, path: targetDir } = inst;
+  const realMarker = await readComponentMarker(join2(realCwd, targetDir));
+  const isNewMarker = !realMarker;
+  const shouldApplyComponentDefault = isNewMarker || applyDefaults;
+  const markerSkip = realMarker?.skip ?? [];
+  const defaultSkip = shouldApplyComponentDefault ? DEFAULT_COMPONENT_SKIP_PATTERNS[type] ?? [] : [];
+  const skipPatterns = [.../* @__PURE__ */ new Set([...baseSkip, ...markerSkip, ...defaultSkip])];
+  const tmpDir = join2(dest, "__cptmp__");
+  await copyComponent(repoDir, type, tmpDir);
+  const srcDir = join2(tmpDir, type);
+  if (skipPatterns.length > 0) {
+    await removeSkippedFiles(srcDir, skipPatterns, join2(realCwd, targetDir));
+  }
+  const outDir = join2(dest, targetDir);
+  await mkdir(outDir, { recursive: true });
+  const { cp } = await import("fs/promises");
+  if (existsSync(srcDir)) {
+    await cp(srcDir, outDir, { recursive: true, force: true });
+  }
+  await rm(tmpDir, { recursive: true, force: true });
+  const instancePaths = { ...componentPaths, [type]: targetDir };
+  await renderEjsInDir(outDir, { ...vars, paths: instancePaths });
+  await upsertComponentMarker(
+    join2(dest, targetDir),
+    type,
+    skipPatterns.length > 0 ? skipPatterns : void 0
+  );
+  await substituteNamesForInstance(inst, dest, projectName, nameSnake, vars.nameOverrides);
+}
+async function substituteNamesForInstance(inst, dest, name, nameSnake, overrides) {
+  const { type, path } = inst;
+  const isCanonical = path === type;
+  if (type === "fastapi") {
+    const target = isCanonical ? overrides?.fastapi ?? `${name}-fastapi` : `${name}-${path}`;
+    await replaceInFile(join2(dest, `${path}/pyproject.toml`), "projx-fastapi", target);
+  } else if (type === "fastify") {
+    const target = isCanonical ? overrides?.fastify ?? `${name}-fastify` : `${name}-${path}`;
+    await replaceInFile(join2(dest, `${path}/package.json`), "projx-fastify", target);
+  } else if (type === "frontend") {
+    const target = isCanonical ? overrides?.frontend ?? `${name}-frontend` : `${name}-${path}`;
+    await replaceInFile(join2(dest, `${path}/package.json`), "projx-frontend", target);
+  } else if (type === "e2e") {
+    const target = isCanonical ? overrides?.e2e ?? `${name}-e2e` : `${name}-${path}`;
+    await replaceInFile(join2(dest, `${path}/package.json`), "projx-e2e", target);
+  } else if (type === "mobile") {
+    const target = isCanonical ? overrides?.mobile ?? `${nameSnake}_mobile` : toSnake(`${nameSnake}_${path}`);
+    await replaceInFile(join2(dest, `${path}/pubspec.yaml`), "projx_mobile", target);
+    await replaceInDir(
+      join2(dest, path),
+      "package:projx_mobile/",
+      `package:${target}/`,
+      ".dart"
+    );
   }
 }
 async function detectPackageNameOverrides(cwd, components, componentPaths) {
@@ -484,7 +564,7 @@ async function readPubspecName(file) {
     return null;
   }
 }
-async function applyTemplate(cwd, repoDir, components, componentPaths, vars, version, componentSkips, rootSkip, applyDefaults = false) {
+async function applyTemplate(cwd, repoDir, components, componentPaths, vars, version, componentSkips, rootSkip, applyDefaults = false, extraInstances = [], instancesToScaffold) {
   const hasHead = (() => {
     try {
       execSync("git rev-parse HEAD", { cwd, stdio: "pipe" });
@@ -494,24 +574,47 @@ async function applyTemplate(cwd, repoDir, components, componentPaths, vars, ver
     }
   })();
   if (!hasHead) {
-    await writeTemplateToDir(cwd, repoDir, components, componentPaths, vars, version, {
-      componentSkips,
-      rootSkip,
-      applyDefaults,
-      realCwd: cwd
-    });
+    await writeTemplateToDir(
+      cwd,
+      repoDir,
+      components,
+      componentPaths,
+      vars,
+      version,
+      {
+        componentSkips,
+        rootSkip,
+        applyDefaults,
+        realCwd: cwd,
+        extraInstances,
+        instancesToScaffold
+      }
+    );
     return { status: "clean" };
   }
   const { worktree, branch } = createOrphanWorktree(cwd);
   try {
-    await writeTemplateToDir(worktree, repoDir, components, componentPaths, vars, version, {
-      componentSkips,
-      rootSkip,
-      applyDefaults,
-      realCwd: cwd
-    });
+    await writeTemplateToDir(
+      worktree,
+      repoDir,
+      components,
+      componentPaths,
+      vars,
+      version,
+      {
+        componentSkips,
+        rootSkip,
+        applyDefaults,
+        realCwd: cwd,
+        extraInstances,
+        instancesToScaffold
+      }
+    );
     execSync("git add -A", { cwd: worktree, stdio: "pipe" });
-    const diff = execSync("git diff --cached --stat", { cwd: worktree, stdio: "pipe" }).toString().trim();
+    const diff = execSync("git diff --cached --stat", {
+      cwd: worktree,
+      stdio: "pipe"
+    }).toString().trim();
     if (!diff) {
       cleanupWorktree(cwd, worktree, branch);
       return { status: "clean" };
@@ -521,7 +624,10 @@ async function applyTemplate(cwd, repoDir, components, componentPaths, vars, ver
       { cwd: worktree, stdio: "pipe" }
     );
     try {
-      execSync(`git worktree remove "${worktree}" --force`, { cwd, stdio: "pipe" });
+      execSync(`git worktree remove "${worktree}" --force`, {
+        cwd,
+        stdio: "pipe"
+      });
     } catch {
       try {
         await rm(worktree, { recursive: true, force: true });
@@ -547,7 +653,12 @@ async function applyTemplate(cwd, repoDir, components, componentPaths, vars, ver
     } catch {
     }
     if (mergeClean) {
-      await migrateComponentMarkers(cwd, components, componentPaths, applyDefaults);
+      await migrateComponentMarkers(
+        cwd,
+        components,
+        componentPaths,
+        applyDefaults
+      );
       saveBaselineRef(cwd);
       return { status: "clean" };
     }
@@ -555,32 +666,47 @@ async function applyTemplate(cwd, repoDir, components, componentPaths, vars, ver
     if (baselineRef) {
       const tmpTemplate = join2(tmpdir(), `projx-tpl-${Date.now()}`);
       await mkdir(tmpTemplate, { recursive: true });
-      await writeTemplateToDir(tmpTemplate, repoDir, components, componentPaths, vars, version, {
-        componentSkips,
-        rootSkip,
-        applyDefaults,
-        realCwd: cwd
-      });
-      const result = await tryThreeWayMerge(cwd, tmpTemplate, baselineRef, componentPaths);
+      await writeTemplateToDir(
+        tmpTemplate,
+        repoDir,
+        components,
+        componentPaths,
+        vars,
+        version,
+        {
+          componentSkips,
+          rootSkip,
+          applyDefaults,
+          realCwd: cwd,
+          extraInstances,
+          instancesToScaffold
+        }
+      );
+      const result = await tryThreeWayMerge(
+        cwd,
+        tmpTemplate,
+        baselineRef,
+        componentPaths
+      );
       await rm(tmpTemplate, { recursive: true, force: true });
-      await migrateComponentMarkers(cwd, components, componentPaths, applyDefaults);
+      await migrateComponentMarkers(
+        cwd,
+        components,
+        componentPaths,
+        applyDefaults
+      );
       if (result.conflicted.length === 0) {
         await writeManagedProjx(cwd, version, vars, applyDefaults);
         execSync("git add -A", { cwd, stdio: "pipe" });
-        const staged = execSync("git diff --cached --stat", { cwd, stdio: "pipe" }).toString().trim();
+        const staged = execSync("git diff --cached --stat", {
+          cwd,
+          stdio: "pipe"
+        }).toString().trim();
         if (staged) {
-          try {
-            execSync(
-              `git commit -m "projx: update to template v${version} (3-way merge)"`,
-              { cwd, stdio: "pipe" }
-            );
-          } catch (err) {
-            throw new Error(
-              `Pre-commit hook rejected the merged template content. Resolve the issues and commit manually:
-  git commit -m "projx: update to template v${version} (3-way merge)"`,
-              { cause: err }
-            );
-          }
+          execSync(
+            `git -c core.hooksPath=/dev/null commit -m "projx: update to template v${version} (3-way merge)"`,
+            { cwd, stdio: "pipe" }
+          );
         }
         saveBaselineRef(cwd);
         return result.merged.length > 0 ? { status: "merged", mergedFiles: result.merged } : { status: "clean" };
@@ -609,13 +735,28 @@ async function applyTemplate(cwd, repoDir, components, componentPaths, vars, ver
         conflictedFiles: result.conflicted
       };
     }
-    await writeTemplateToDir(cwd, repoDir, components, componentPaths, vars, version, {
-      componentSkips,
-      rootSkip,
-      applyDefaults,
-      realCwd: cwd
-    });
-    await migrateComponentMarkers(cwd, components, componentPaths, applyDefaults);
+    await writeTemplateToDir(
+      cwd,
+      repoDir,
+      components,
+      componentPaths,
+      vars,
+      version,
+      {
+        componentSkips,
+        rootSkip,
+        applyDefaults,
+        realCwd: cwd,
+        extraInstances,
+        instancesToScaffold
+      }
+    );
+    await migrateComponentMarkers(
+      cwd,
+      components,
+      componentPaths,
+      applyDefaults
+    );
     return { status: "conflicts" };
   } catch (err) {
     cleanupWorktree(cwd, worktree, branch);
@@ -624,8 +765,6 @@ async function applyTemplate(cwd, repoDir, components, componentPaths, vars, ver
 }
 
 export {
-  buildPathsUpper,
-  buildDisplayNames,
   BASELINE_REF,
   matchesSkip,
   saveBaselineRef,