@mnci/cli 4.46.0 → 4.47.0

package/dist/cli.js

@@ -8485,7 +8485,7 @@ function runDoctor(workspaceRoot, options = {}) {
   process.exitCode = 1;
 }
 
-// src/repository-adoption/adopt-kinds.use-case.ts
+// src/repository-adoption/adopt-dependencies.use-case.ts
 var import_node_fs31 = require("fs");
 var import_node_path36 = require("path");
 
@@ -8499,6 +8499,157 @@ function requireCleanWorkingTree(repositoryRoot, capture = runCapture) {
   }
 }
 
+// src/repository-adoption/extract-imports.algorithm.ts
+var import_node_module = require("module");
+var SPECIFIER2 = /(?:\bfrom\s*|\bimport\s*(?:\(\s*)?|\brequire\s*\(\s*)(['"`])([^'"`\n]+)\1/g;
+var BUILTINS = new Set(import_node_module.builtinModules);
+function packageOfSpecifier(specifier) {
+  if (/^(?:[./#~]|[a-z]+:)/i.test(specifier)) {
+    return void 0;
+  }
+  const parts = specifier.split("/");
+  const name = specifier.startsWith("@") ? parts.slice(0, 2).join("/") : parts[0];
+  if (name === "" || BUILTINS.has(name) || specifier.startsWith("@") && parts.length < 2) {
+    return void 0;
+  }
+  return name;
+}
+function extractImportedPackages(source) {
+  const found = /* @__PURE__ */ new Set();
+  for (const match of source.matchAll(SPECIFIER2)) {
+    const name = packageOfSpecifier(match[2]);
+    if (name !== void 0) {
+      found.add(name);
+    }
+  }
+  return found;
+}
+
+// src/repository-adoption/plan-dependency-moves.algorithm.ts
+function planDependencyMoves(rootDependencies, usage, declared) {
+  const plan = { moves: [], removed: [], keptAtRoot: [], conflicts: [] };
+  for (const [name, range] of Object.entries(rootDependencies)) {
+    const where = usage[name];
+    const runtime = where?.runtime ?? [];
+    const testsOnly = where?.testsOnly ?? [];
+    if (runtime.length === 0 && testsOnly.length === 0) {
+      plan.keptAtRoot.push({ name, reason: "no project imports it: it may be tooling the root uses, or unused" });
+      continue;
+    }
+    const targets = [
+      ...runtime.map((dir) => [dir, "dependencies"]),
+      ...testsOnly.map((dir) => [dir, "devDependencies"])
+    ];
+    for (const [dir, field] of targets) {
+      const existing = declared[dir]?.[name];
+      if (existing === void 0) {
+        plan.moves.push({ name, range, dir, field });
+      } else if (existing !== range) {
+        plan.conflicts.push({ name, dir, projectRange: existing, rootRange: range });
+      }
+    }
+    plan.removed.push(name);
+  }
+  return plan;
+}
+
+// src/repository-adoption/adopt-dependencies.use-case.ts
+var SOURCE_FILE = /\.(?:[cm]?[jt]s|[jt]sx)$/;
+var TEST_FILE = /\.(?:spec|test)\.[^.]+$|[\\/](?:__tests__|tests?|e2e)[\\/]/;
+var SKIPPED_DIRECTORIES = /* @__PURE__ */ new Set(["node_modules", "dist", "build", "coverage", "out", ".git", ".nx", "tmp"]);
+function sourceFiles(directory, relative = "") {
+  const entries = (0, import_node_fs31.readdirSync)((0, import_node_path36.join)(directory, relative), { withFileTypes: true });
+  const found = [];
+  for (const entry of entries) {
+    const path = relative === "" ? entry.name : `${relative}/${entry.name}`;
+    if (entry.isDirectory()) {
+      if (!SKIPPED_DIRECTORIES.has(entry.name)) {
+        found.push(...sourceFiles(directory, path));
+      }
+    } else if (SOURCE_FILE.test(entry.name)) {
+      found.push(path);
+    }
+  }
+  return found;
+}
+function wantedImportsOf(path, wanted) {
+  try {
+    const imported = [...extractImportedPackages((0, import_node_fs31.readFileSync)(path, "utf8"))];
+    return imported.filter((name) => wanted.has(name));
+  } catch {
+    return [];
+  }
+}
+function importsOfProject(projectDirectory, wanted) {
+  const shipped = /* @__PURE__ */ new Set();
+  const tested = /* @__PURE__ */ new Set();
+  const files = sourceFiles(projectDirectory);
+  for (const file of files) {
+    const names = wantedImportsOf((0, import_node_path36.join)(projectDirectory, file), wanted);
+    const target = TEST_FILE.test(file) ? tested : shipped;
+    for (const name of names) {
+      target.add(name);
+    }
+  }
+  const shippedNames = [...shipped];
+  return { shipped: shippedNames, testsOnly: [...tested].filter((name) => !shippedNames.includes(name)) };
+}
+function findUsage(repositoryRoot, projectDirectories, wanted) {
+  const usage = {};
+  for (const dir of projectDirectories) {
+    const { shipped, testsOnly } = importsOfProject((0, import_node_path36.join)(repositoryRoot, dir), wanted);
+    for (const name of shipped) {
+      usage[name] ??= { runtime: [], testsOnly: [] };
+      usage[name].runtime.push(dir);
+    }
+    for (const name of testsOnly) {
+      usage[name] ??= { runtime: [], testsOnly: [] };
+      usage[name].testsOnly.push(dir);
+    }
+  }
+  return usage;
+}
+function adoptDependencies(repositoryRoot, dependencies = {}) {
+  const run = dependencies.run ?? runShell;
+  requireCleanWorkingTree(repositoryRoot, dependencies.capture ?? runCapture);
+  const rootPath = (0, import_node_path36.join)(repositoryRoot, "package.json");
+  if (!fileExists(rootPath)) {
+    throw new Error("No package.json at the repository root.");
+  }
+  const root = readJson(rootPath);
+  const rootDependencies = root.dependencies ?? {};
+  const projects = locateProjects(repositoryRoot).filter((location) => location.ecosystem === "npm");
+  const manifests = new Map(projects.map((location) => [location.dir, readJson(location.manifestPath)]));
+  const usage = findUsage(repositoryRoot, projects.map((location) => location.dir), new Set(Object.keys(rootDependencies)));
+  const declared = Object.fromEntries([...manifests].map(([dir, manifest]) => [dir, { ...manifest.devDependencies, ...manifest.dependencies }]));
+  const plan = planDependencyMoves(rootDependencies, usage, declared);
+  if (plan.moves.length === 0 && plan.removed.length === 0) {
+    return { plan, installed: true };
+  }
+  for (const move of plan.moves) {
+    const manifest = manifests.get(move.dir);
+    manifest[move.field] = Object.fromEntries(Object.entries({ ...manifest[move.field], [move.name]: move.range }).toSorted(([a], [b]) => a.localeCompare(b)));
+  }
+  for (const location of projects) {
+    if (plan.moves.some((move) => move.dir === location.dir)) {
+      writeFileEnsured(location.manifestPath, toJson(manifests.get(location.dir)));
+    }
+  }
+  const remaining = Object.fromEntries(Object.entries(rootDependencies).filter(([name]) => !plan.removed.includes(name)));
+  if (Object.keys(remaining).length === 0) {
+    Reflect.deleteProperty(root, "dependencies");
+  } else {
+    root.dependencies = remaining;
+  }
+  writeFileEnsured(rootPath, toJson(root));
+  const installed = run("npm", ["install", "--ignore-scripts", "--no-audit", "--no-fund"], repositoryRoot) === 0;
+  return { plan, installed };
+}
+
+// src/repository-adoption/adopt-kinds.use-case.ts
+var import_node_fs32 = require("fs");
+var import_node_path37 = require("path");
+
 // src/repository-adoption/infer-project-kind.algorithm.ts
 var SERVER_FRAMEWORKS = ["express", "koa", "fastify", "@nestjs/core"];
 function declares(manifest, name) {
@@ -8598,32 +8749,32 @@ function inferProjectKind(evidence) {
 // src/repository-adoption/adopt-kinds.use-case.ts
 var TYPE_TAG = "type:";
 function readEvidence(repositoryRoot, location) {
-  const directory = (0, import_node_path36.join)(repositoryRoot, location.dir);
-  const files = (0, import_node_fs31.readdirSync)(directory);
+  const directory = (0, import_node_path37.join)(repositoryRoot, location.dir);
+  const files = (0, import_node_fs32.readdirSync)(directory);
   const manifest = location.ecosystem === "npm" ? readJson(location.manifestPath) : {};
-  const text = location.ecosystem === "npm" ? "" : (0, import_node_fs31.readFileSync)(location.manifestPath, "utf8");
+  const text = location.ecosystem === "npm" ? "" : (0, import_node_fs32.readFileSync)(location.manifestPath, "utf8");
   let hasProgram = false;
   if (location.ecosystem === "go") {
-    hasProgram = files.filter((file) => file.endsWith(".go")).some((file) => /^package main\b/m.test((0, import_node_fs31.readFileSync)((0, import_node_path36.join)(directory, file), "utf8")));
+    hasProgram = files.filter((file) => file.endsWith(".go")).some((file) => /^package main\b/m.test((0, import_node_fs32.readFileSync)((0, import_node_path37.join)(directory, file), "utf8")));
   } else if (location.ecosystem === "pub") {
-    hasProgram = (0, import_node_fs31.existsSync)((0, import_node_path36.join)(directory, "lib", "main.dart"));
+    hasProgram = (0, import_node_fs32.existsSync)((0, import_node_path37.join)(directory, "lib", "main.dart"));
   }
   return { ecosystem: location.ecosystem, manifest, text, files, hasProgram };
 }
 function existingKind(directory) {
   const sources = [];
-  if (fileExists((0, import_node_path36.join)(directory, "project.json"))) {
-    sources.push(readJson((0, import_node_path36.join)(directory, "project.json")).tags ?? []);
+  if (fileExists((0, import_node_path37.join)(directory, "project.json"))) {
+    sources.push(readJson((0, import_node_path37.join)(directory, "project.json")).tags ?? []);
   }
-  if (fileExists((0, import_node_path36.join)(directory, "package.json"))) {
-    sources.push(readJson((0, import_node_path36.join)(directory, "package.json")).nx?.tags ?? []);
+  if (fileExists((0, import_node_path37.join)(directory, "package.json"))) {
+    sources.push(readJson((0, import_node_path37.join)(directory, "package.json")).nx?.tags ?? []);
   }
   return sources.flat().find((tag) => tag.startsWith(TYPE_TAG))?.slice(TYPE_TAG.length);
 }
 function writeKindTag(directory, name, kind) {
   const tag = `${TYPE_TAG}${kind}`;
-  const projectJson = (0, import_node_path36.join)(directory, "project.json");
-  const packageJson = (0, import_node_path36.join)(directory, "package.json");
+  const projectJson = (0, import_node_path37.join)(directory, "project.json");
+  const packageJson = (0, import_node_path37.join)(directory, "package.json");
   if (fileExists(projectJson)) {
     const project = readJson(projectJson);
     writeFileEnsured(projectJson, toJson({ ...project, tags: [...project.tags ?? [], tag] }));
@@ -8647,7 +8798,7 @@ function adoptKinds(repositoryRoot, overrides = {}, dependencies = {}) {
     }
   }
   return locations.map((location) => {
-    const directory = (0, import_node_path36.join)(repositoryRoot, location.dir);
+    const directory = (0, import_node_path37.join)(repositoryRoot, location.dir);
     const present = existingKind(directory);
     if (present !== void 0) {
       return { dir: location.dir, outcome: "already", kind: present, reason: PROJECT_KINDS.includes(present) ? "it already has a type tag" : "it already has a type tag of its own, which is not an mnci kind name; left as it is" };
@@ -8663,12 +8814,12 @@ function adoptKinds(repositoryRoot, overrides = {}, dependencies = {}) {
 }
 
 // src/repository-adoption/adopt-overlay.use-case.ts
-var import_node_fs33 = require("fs");
-var import_node_path38 = require("path");
+var import_node_fs34 = require("fs");
+var import_node_path39 = require("path");
 
 // src/workspace-upgrade/upgrade-workspace.use-case.ts
-var import_node_fs32 = require("fs");
-var import_node_path37 = require("path");
+var import_node_fs33 = require("fs");
+var import_node_path38 = require("path");
 function resolveRegistry(options, persisted) {
   if (options.registry === "azure-artifacts" || options.organization && options.artifactsFeed) {
     const persistedAzure = persisted?.kind === "azure-artifacts" ? persisted : void 0;
@@ -8697,7 +8848,7 @@ function resolveWorkspaceName(workspaceRoot, persisted) {
     return persisted.workspaceName;
   }
   try {
-    const existing = (0, import_node_fs32.readdirSync)(workspaceRoot).find(
+    const existing = (0, import_node_fs33.readdirSync)(workspaceRoot).find(
       (file) => file.endsWith(".code-workspace") && file !== "undefined.code-workspace"
     );
     if (existing) {
@@ -8705,11 +8856,11 @@ function resolveWorkspaceName(workspaceRoot, persisted) {
     }
   } catch {
   }
-  return (0, import_node_path37.basename)(workspaceRoot);
+  return (0, import_node_path38.basename)(workspaceRoot);
 }
 function detectNpmAuth(workspaceRoot) {
   try {
-    return (0, import_node_fs32.readFileSync)((0, import_node_path37.join)(workspaceRoot, "azure-pipelines.yml"), "utf8").includes("npmAuthenticate@0") ? "build-identity" : void 0;
+    return (0, import_node_fs33.readFileSync)((0, import_node_path38.join)(workspaceRoot, "azure-pipelines.yml"), "utf8").includes("npmAuthenticate@0") ? "build-identity" : void 0;
   } catch {
     return void 0;
   }
@@ -8756,7 +8907,7 @@ function resolveOverlayOptions(workspaceRoot, options, persisted) {
   };
 }
 function runUpgrade(workspaceRoot, options) {
-  if (!fileExists((0, import_node_path37.join)(workspaceRoot, "nx.json"))) {
+  if (!fileExists((0, import_node_path38.join)(workspaceRoot, "nx.json"))) {
     throw new Error(
       `No nx.json found in ${workspaceRoot} \u2014 this does not look like an Nx workspace. Run 'mnci upgrade' from the workspace root.`
     );
@@ -8830,7 +8981,7 @@ function runUpgrade(workspaceRoot, options) {
     "Formatting the workspace (eslint --fix) \u2014 the slowest step, minutes on a large workspace"
   );
   runFormatter(workspaceRoot);
-  const nxJson = readJson((0, import_node_path37.join)(workspaceRoot, "nx.json"));
+  const nxJson = readJson((0, import_node_path38.join)(workspaceRoot, "nx.json"));
   const stranded = locateStrandedReleaseTags(workspaceRoot, nxJson.release?.releaseTag?.pattern);
   for (const entry of stranded) {
     logger.warn(`${entry.project} has release tags only under ${entry.oldTag}: nx release would restart it from its disk version. Run \`mnci adopt --tags\` before the next release to create ${entry.newTag} locally (\`mnci doctor\` lists them all).`);
@@ -8841,9 +8992,9 @@ function runUpgrade(workspaceRoot, options) {
 
 // src/repository-adoption/adopt-overlay.use-case.ts
 function detectCiProvider(repositoryRoot) {
-  const azure = (0, import_node_fs33.existsSync)((0, import_node_path38.join)(repositoryRoot, "azure-pipelines.yml"));
-  const workflows = (0, import_node_path38.join)(repositoryRoot, ".github", "workflows");
-  const github = (0, import_node_fs33.existsSync)(workflows) && (0, import_node_fs33.readdirSync)(workflows).some((file) => /\.ya?ml$/.test(file));
+  const azure = (0, import_node_fs34.existsSync)((0, import_node_path39.join)(repositoryRoot, "azure-pipelines.yml"));
+  const workflows = (0, import_node_path39.join)(repositoryRoot, ".github", "workflows");
+  const github = (0, import_node_fs34.existsSync)(workflows) && (0, import_node_fs34.readdirSync)(workflows).some((file) => /\.ya?ml$/.test(file));
   if (azure && github) {
     return "both";
   }
@@ -8853,7 +9004,7 @@ function detectCiProvider(repositoryRoot) {
   return github ? "github" : void 0;
 }
 function detectTestRunner(repositoryRoot) {
-  const manifestPath = (0, import_node_path38.join)(repositoryRoot, "package.json");
+  const manifestPath = (0, import_node_path39.join)(repositoryRoot, "package.json");
   if (!fileExists(manifestPath)) {
     return void 0;
   }
@@ -8866,7 +9017,7 @@ function detectTestRunner(repositoryRoot) {
 }
 function adoptOverlay(repositoryRoot, options, dependencies = {}) {
   requireCleanWorkingTree(repositoryRoot, dependencies.capture ?? runCapture);
-  if (!fileExists((0, import_node_path38.join)(repositoryRoot, "nx.json"))) {
+  if (!fileExists((0, import_node_path39.join)(repositoryRoot, "nx.json"))) {
     throw new Error("There is no nx.json, so Nx is not set up here. Set it up first (`npx nx@latest init`); adopt does not install Nx yet.");
   }
   const persisted = readMnciConfig(repositoryRoot);
@@ -8879,7 +9030,7 @@ function adoptOverlay(repositoryRoot, options, dependencies = {}) {
 }
 
 // src/repository-adoption/adopt-toolchain.use-case.ts
-var import_node_path40 = require("path");
+var import_node_path41 = require("path");
 
 // src/repository-adoption/align-nx-family.algorithm.ts
 var VERSION = /^[\^~]?(\d+)\.(\d+)\.(\d+)$/;
@@ -8917,24 +9068,24 @@ function alignNxFamily(dependencies, version) {
 }
 
 // src/repository-adoption/retire-tooling.use-case.ts
-var import_node_fs34 = require("fs");
-var import_node_path39 = require("path");
+var import_node_fs35 = require("fs");
+var import_node_path40 = require("path");
 var RETIRED_COMMAND = /\b(?:prettier|oxfmt|oxlint)\b/;
 function retireTooling(repositoryRoot) {
   const removed = [];
   for (const file of RETIRED_FORMATTER_FILES) {
-    if (!fileExists((0, import_node_path39.join)(repositoryRoot, file))) {
+    if (!fileExists((0, import_node_path40.join)(repositoryRoot, file))) {
       continue;
     }
-    (0, import_node_fs34.rmSync)((0, import_node_path39.join)(repositoryRoot, file), { force: true });
+    (0, import_node_fs35.rmSync)((0, import_node_path40.join)(repositoryRoot, file), { force: true });
     removed.push(file);
   }
-  const hadRegistry = fileExists((0, import_node_path39.join)(repositoryRoot, ".verdaccio"));
+  const hadRegistry = fileExists((0, import_node_path40.join)(repositoryRoot, ".verdaccio"));
   removeLocalRegistryScaffolding(repositoryRoot);
   if (hadRegistry) {
     removed.push(".verdaccio, its dependency and the local-registry target");
   }
-  const manifestPath = (0, import_node_path39.join)(repositoryRoot, "package.json");
+  const manifestPath = (0, import_node_path40.join)(repositoryRoot, "package.json");
   if (!fileExists(manifestPath)) {
     return removed;
   }
@@ -8981,7 +9132,7 @@ function adoptToolchain(repositoryRoot, options = {}, dependencies = {}) {
     console.log(message);
   });
   requireCleanWorkingTree(repositoryRoot, capture);
-  const manifestPath = (0, import_node_path40.join)(repositoryRoot, "package.json");
+  const manifestPath = (0, import_node_path41.join)(repositoryRoot, "package.json");
   if (!fileExists(manifestPath)) {
     throw new Error("No package.json at the repository root.");
   }
@@ -9031,8 +9182,8 @@ function createBaselineTags(repositoryRoot, stranded) {
 }
 
 // src/repository-adoption/inspect-repository.use-case.ts
-var import_node_fs35 = require("fs");
-var import_node_path41 = require("path");
+var import_node_fs36 = require("fs");
+var import_node_path42 = require("path");
 var LOCKFILES = [
   ["package-lock.json", "npm"],
   ["pnpm-lock.yaml", "pnpm"],
@@ -9053,25 +9204,25 @@ function inspectRepository(repositoryRoot) {
   const isGitRepo = inside.status === 0 && inside.stdout.trim() === "true";
   const dirty = isGitRepo && runCapture("git", ["status", "--porcelain"], repositoryRoot).stdout.trim() !== "";
   const tags = isGitRepo ? runCapture("git", ["tag", "--list"], repositoryRoot).stdout.split(/\r?\n/).filter(Boolean) : [];
-  const manifestPath = (0, import_node_path41.join)(repositoryRoot, "package.json");
+  const manifestPath = (0, import_node_path42.join)(repositoryRoot, "package.json");
   const manifest = fileExists(manifestPath) ? readJson(manifestPath) : {};
-  const nxJsonPath = (0, import_node_path41.join)(repositoryRoot, "nx.json");
+  const nxJsonPath = (0, import_node_path42.join)(repositoryRoot, "nx.json");
   const nxJson = fileExists(nxJsonPath) ? readJson(nxJsonPath) : {};
   const ci = [];
   const pipelines = [];
-  if ((0, import_node_fs35.existsSync)((0, import_node_path41.join)(repositoryRoot, "azure-pipelines.yml"))) {
+  if ((0, import_node_fs36.existsSync)((0, import_node_path42.join)(repositoryRoot, "azure-pipelines.yml"))) {
     ci.push("azure");
-    pipelines.push((0, import_node_path41.join)(repositoryRoot, "azure-pipelines.yml"));
+    pipelines.push((0, import_node_path42.join)(repositoryRoot, "azure-pipelines.yml"));
   }
-  const workflows = (0, import_node_path41.join)(repositoryRoot, ".github", "workflows");
-  if ((0, import_node_fs35.existsSync)(workflows)) {
-    const files = (0, import_node_fs35.readdirSync)(workflows).filter((file) => /\.ya?ml$/.test(file));
+  const workflows = (0, import_node_path42.join)(repositoryRoot, ".github", "workflows");
+  if ((0, import_node_fs36.existsSync)(workflows)) {
+    const files = (0, import_node_fs36.readdirSync)(workflows).filter((file) => /\.ya?ml$/.test(file));
     if (files.length > 0) {
       ci.push("github");
-      pipelines.push(...files.map((file) => (0, import_node_path41.join)(workflows, file)));
+      pipelines.push(...files.map((file) => (0, import_node_path42.join)(workflows, file)));
     }
   }
-  const rootFiles = (0, import_node_fs35.readdirSync)(repositoryRoot);
+  const rootFiles = (0, import_node_fs36.readdirSync)(repositoryRoot);
   return {
     isGitRepo,
     dirty,
@@ -9082,7 +9233,7 @@ function inspectRepository(repositoryRoot) {
     tagCount: tags.length,
     strandedTags: isGitRepo ? locateStrandedReleaseTags(repositoryRoot, nxJson.release?.releaseTag?.pattern) : [],
     ci,
-    pipelineUsesMnci: pipelines.some((file) => /\bmnci ci\b/.test((0, import_node_fs35.readFileSync)(file, "utf8"))),
+    pipelineUsesMnci: pipelines.some((file) => /\bmnci ci\b/.test((0, import_node_fs36.readFileSync)(file, "utf8"))),
     retiredTooling: [.../* @__PURE__ */ new Set([...rootFiles.filter((file) => RETIRED_FILE_PATTERN.test(file) || file === ".verdaccio"), ...retiredNamesIn(manifest)])],
     personalFiles: PERSONAL_FILES.filter((file) => rootFiles.includes(file))
   };
@@ -9139,6 +9290,10 @@ function reportAdoption(repositoryRoot) {
 }
 function runAdopt(repositoryRoot, options = {}) {
   const report = reportAdoption(repositoryRoot);
+  if (options.dependencies === true) {
+    runDependencies(repositoryRoot);
+    return;
+  }
   if (options.kinds === true) {
     runKinds2(repositoryRoot, options);
     return;
@@ -9278,6 +9433,31 @@ function runKinds2(repositoryRoot, options) {
     process.exitCode = 1;
   }
 }
+function runDependencies(repositoryRoot) {
+  try {
+    const { plan, installed } = adoptDependencies(repositoryRoot);
+    for (const move of plan.moves) {
+      logger.success(`${move.name} ${move.range} -> ${move.dir} (${move.field})`);
+    }
+    for (const conflict of plan.conflicts) {
+      logger.warn(`${conflict.name}: ${conflict.dir} already declares ${conflict.projectRange}; the root had ${conflict.rootRange}. The project's own range is kept.`);
+    }
+    for (const kept of plan.keptAtRoot) {
+      logger.warn(`${kept.name} stays at the root: ${kept.reason}`);
+    }
+    if (plan.removed.length === 0) {
+      logger.success("The root declares no runtime dependency that a project imports. Nothing to move.");
+    } else if (installed) {
+      logger.success(`Moved ${plan.removed.length} package(s) out of the root and reinstalled. Review with \`git diff\` and commit package.json files and package-lock.json.`);
+    } else {
+      logger.error("The moves were written, but npm install failed. Run `npm install` and read its error before committing.");
+      process.exitCode = 1;
+    }
+  } catch (error) {
+    logger.error(error instanceof Error ? error.message : String(error));
+    process.exitCode = 1;
+  }
+}
 
 // src/command-catalog/command-groups.config.ts
 var COMMAND_GROUPS = {
@@ -9350,13 +9530,13 @@ function runCommands(program, options) {
 }
 
 // src/workspace-info/list-projects.use-case.ts
-var import_node_path42 = require("path");
+var import_node_path43 = require("path");
 var TYPE_TAG_PREFIX = "type:";
 function listProjects(workspaceRoot) {
   return locateProjects(workspaceRoot).map((location) => {
-    const projectJsonPath = (0, import_node_path42.join)(workspaceRoot, location.dir, "project.json");
+    const projectJsonPath = (0, import_node_path43.join)(workspaceRoot, location.dir, "project.json");
     const project = fileExists(projectJsonPath) ? readJson(projectJsonPath) : {};
-    const manifestPath = (0, import_node_path42.join)(workspaceRoot, location.dir, "package.json");
+    const manifestPath = (0, import_node_path43.join)(workspaceRoot, location.dir, "package.json");
     const manifestTags = fileExists(manifestPath) ? readJson(manifestPath).nx?.tags ?? [] : [];
     const typeTag = [...project.tags ?? [], ...manifestTags].find((tag) => tag.startsWith(TYPE_TAG_PREFIX));
     return {
@@ -9369,7 +9549,7 @@ function listProjects(workspaceRoot) {
   }).toSorted((a, b) => a.dir.localeCompare(b.dir));
 }
 function runProjects(workspaceRoot, options) {
-  if (!fileExists((0, import_node_path42.join)(workspaceRoot, "nx.json"))) {
+  if (!fileExists((0, import_node_path43.join)(workspaceRoot, "nx.json"))) {
     throw new Error("No nx.json found here. Run `projects` from the workspace root.");
   }
   const projects = listProjects(workspaceRoot);
@@ -9383,11 +9563,11 @@ function runProjects(workspaceRoot, options) {
 }
 
 // src/workspace-info/read-workspace-info.use-case.ts
-var import_node_path44 = require("path");
+var import_node_path45 = require("path");
 
 // src/cli-version/check-for-update.use-case.ts
-var import_node_fs36 = require("fs");
-var import_node_path43 = require("path");
+var import_node_fs37 = require("fs");
+var import_node_path44 = require("path");
 var import_cross_spawn3 = __toESM(require("cross-spawn"));
 var PACKAGE_NAME2 = "@mnci/cli";
 var REGISTRY_TIMEOUT_MS = 2e3;
@@ -9446,8 +9626,8 @@ function releaseTriple(version) {
 }
 function readCliVersion(packageDirectory) {
   try {
-    const manifestPath = (0, import_node_path43.join)(packageDirectory, "..", "package.json");
-    const manifest = JSON.parse((0, import_node_fs36.readFileSync)(manifestPath, "utf8"));
+    const manifestPath = (0, import_node_path44.join)(packageDirectory, "..", "package.json");
+    const manifest = JSON.parse((0, import_node_fs37.readFileSync)(manifestPath, "utf8"));
     return manifest.version ?? "0.0.0";
   } catch {
     return "0.0.0";
@@ -9457,7 +9637,7 @@ function readCliVersion(packageDirectory) {
 // src/workspace-info/read-workspace-info.use-case.ts
 function readWorkspaceInfo(workspaceRoot, cliVersion) {
   const latest = fetchLatestVersion() ?? null;
-  const isWorkspace = fileExists((0, import_node_path44.join)(workspaceRoot, "nx.json"));
+  const isWorkspace = fileExists((0, import_node_path45.join)(workspaceRoot, "nx.json"));
   return {
     cli: {
       version: cliVersion,
@@ -9478,8 +9658,8 @@ function runInfo(workspaceRoot, cliVersion, options) {
 }
 
 // src/workspace-creation/adopt-directory.use-case.ts
-var import_node_fs37 = require("fs");
-var import_node_path45 = require("path");
+var import_node_fs38 = require("fs");
+var import_node_path46 = require("path");
 var NEVER_COPIED = /* @__PURE__ */ new Set([".git", "node_modules"]);
 var AGENT_AND_CI_ENTRIES = [
   "AGENTS.md",
@@ -9510,13 +9690,13 @@ var PREFLIGHT_BLOCKERS = [
   "packages"
 ];
 function assertAdoptableDirectory(target) {
-  if (!(0, import_node_fs37.existsSync)(target)) {
+  if (!(0, import_node_fs38.existsSync)(target)) {
     throw new Error(`--into '${target}' does not exist. Create or clone it first.`);
   }
-  if (!(0, import_node_fs37.statSync)(target).isDirectory()) {
+  if (!(0, import_node_fs38.statSync)(target).isDirectory()) {
     throw new Error(`--into '${target}' is not a directory.`);
   }
-  const blockers = PREFLIGHT_BLOCKERS.filter((entry) => (0, import_node_fs37.existsSync)((0, import_node_path45.join)(target, entry)));
+  const blockers = PREFLIGHT_BLOCKERS.filter((entry) => (0, import_node_fs38.existsSync)((0, import_node_path46.join)(target, entry)));
   if (blockers.length > 0) {
     throw new Error(
       `--into '${target}' already holds ${blockers.join(", ")}, so it is a project already. Use \`mnci upgrade\` to re-apply the overlay to an existing workspace, or point --into at an empty checkout.`
@@ -9524,15 +9704,15 @@ function assertAdoptableDirectory(target) {
   }
 }
 function mergeGitignore(generatedFile, targetFile) {
-  const existing = (0, import_node_fs37.readFileSync)(targetFile, "utf8");
+  const existing = (0, import_node_fs38.readFileSync)(targetFile, "utf8");
   const present = new Set(existing.split("\n").map((line) => line.trim()));
-  const additions = (0, import_node_fs37.readFileSync)(generatedFile, "utf8").split("\n").map((line) => line.trimEnd()).filter((line) => {
+  const additions = (0, import_node_fs38.readFileSync)(generatedFile, "utf8").split("\n").map((line) => line.trimEnd()).filter((line) => {
     const trimmed = line.trim();
     return trimmed !== "" && !trimmed.startsWith("#") && !present.has(trimmed);
   });
   if (additions.length === 0) return false;
   const separator = existing.endsWith("\n") ? "" : "\n";
-  (0, import_node_fs37.writeFileSync)(
+  (0, import_node_fs38.writeFileSync)(
     targetFile,
     `${existing}${separator}
 # Added by mnci (Nx workspace)
@@ -9542,9 +9722,9 @@ ${additions.join("\n")}
   return true;
 }
 function adoptGeneratedWorkspace(generatedRoot, target) {
-  const entries = (0, import_node_fs37.readdirSync)(generatedRoot).filter((entry) => !NEVER_COPIED.has(entry));
+  const entries = (0, import_node_fs38.readdirSync)(generatedRoot).filter((entry) => !NEVER_COPIED.has(entry));
   const collisions = entries.filter(
-    (entry) => (0, import_node_fs37.existsSync)((0, import_node_path45.join)(target, entry)) && !EXISTING_WINS.has(entry) && entry !== ".gitignore"
+    (entry) => (0, import_node_fs38.existsSync)((0, import_node_path46.join)(target, entry)) && !EXISTING_WINS.has(entry) && entry !== ".gitignore"
   );
   if (collisions.length > 0) {
     throw new Error(
@@ -9553,28 +9733,28 @@ function adoptGeneratedWorkspace(generatedRoot, target) {
   }
   const result = { copied: [], kept: [], mergedGitignore: false };
   for (const entry of entries) {
-    const from = (0, import_node_path45.join)(generatedRoot, entry);
-    const to = (0, import_node_path45.join)(target, entry);
-    if (entry === ".gitignore" && (0, import_node_fs37.existsSync)(to)) {
+    const from = (0, import_node_path46.join)(generatedRoot, entry);
+    const to = (0, import_node_path46.join)(target, entry);
+    if (entry === ".gitignore" && (0, import_node_fs38.existsSync)(to)) {
       result.mergedGitignore = mergeGitignore(from, to);
       result.kept.push(entry);
       continue;
     }
-    if ((0, import_node_fs37.existsSync)(to)) {
+    if ((0, import_node_fs38.existsSync)(to)) {
       result.kept.push(entry);
       continue;
     }
-    (0, import_node_fs37.cpSync)(from, to, { recursive: true });
+    (0, import_node_fs38.cpSync)(from, to, { recursive: true });
     result.copied.push(entry);
   }
-  (0, import_node_fs37.rmSync)(generatedRoot, { recursive: true, force: true });
+  (0, import_node_fs38.rmSync)(generatedRoot, { recursive: true, force: true });
   return result;
 }
 
 // src/workspace-creation/create-workspace.use-case.ts
-var import_node_fs38 = require("fs");
+var import_node_fs39 = require("fs");
 var import_node_os2 = require("os");
-var import_node_path46 = require("path");
+var import_node_path47 = require("path");
 function nxCloudProviderValue(ci) {
   return ci === "azure" ? "azure" : "github";
 }
@@ -9617,9 +9797,9 @@ async function resolveRegistry2(options) {
   return await promptRegistry();
 }
 async function runNew(name, options) {
-  const adoptTarget = options.into === void 0 ? void 0 : (0, import_node_path46.resolve)(process.cwd(), options.into);
+  const adoptTarget = options.into === void 0 ? void 0 : (0, import_node_path47.resolve)(process.cwd(), options.into);
   if (adoptTarget !== void 0) assertAdoptableDirectory(adoptTarget);
-  const workspaceName = name ?? (adoptTarget === void 0 ? await promptText("Workspace name") : (0, import_node_path46.basename)(adoptTarget));
+  const workspaceName = name ?? (adoptTarget === void 0 ? await promptText("Workspace name") : (0, import_node_path47.basename)(adoptTarget));
   assertValidProjectName(workspaceName, "Workspace name");
   const scope = options.scope ?? (options.yes ? `@${workspaceName}` : await promptText("npm scope for publishable packages", `@${workspaceName}`));
   const registry = await resolveRegistry2(options);
@@ -9632,8 +9812,8 @@ async function runNew(name, options) {
   const npmAuth = resolveNpmAuth(options.npmAuth, registry, ci);
   const stack = await resolveStack(options);
   const nxCloud = options.nxCloud ?? (options.yes ? false : await promptNxCloud());
-  const stagingParent = adoptTarget === void 0 ? process.cwd() : (0, import_node_fs38.mkdtempSync)((0, import_node_path46.join)((0, import_node_os2.tmpdir)(), "mnci-new-"));
-  let workspaceRoot = (0, import_node_path46.join)(stagingParent, workspaceName);
+  const stagingParent = adoptTarget === void 0 ? process.cwd() : (0, import_node_fs39.mkdtempSync)((0, import_node_path47.join)((0, import_node_os2.tmpdir)(), "mnci-new-"));
+  let workspaceRoot = (0, import_node_path47.join)(stagingParent, workspaceName);
   try {
     logger.step(`Creating Nx workspace '${workspaceName}' (preset: ts)`);
     runNpx(
@@ -9656,7 +9836,7 @@ async function runNew(name, options) {
       workspaceRoot = adoptTarget;
     }
   } finally {
-    if (adoptTarget !== void 0) (0, import_node_fs38.rmSync)(stagingParent, { recursive: true, force: true });
+    if (adoptTarget !== void 0) (0, import_node_fs39.rmSync)(stagingParent, { recursive: true, force: true });
   }
   logger.step(
     "Applying MoNecromanCI overlay (VS Code workspace, release config, .npmrc, commitlint, pipeline, stack)"
@@ -9666,8 +9846,8 @@ async function runNew(name, options) {
     { workspaceName, scope, registry, agent, variableGroup, ci, stack, ...npmAuth && { npmAuth } },
     logger.detail
   );
-  (0, import_node_fs38.rmSync)((0, import_node_path46.join)(workspaceRoot, "node_modules"), { recursive: true, force: true });
-  (0, import_node_fs38.rmSync)((0, import_node_path46.join)(workspaceRoot, "package-lock.json"), { force: true });
+  (0, import_node_fs39.rmSync)((0, import_node_path47.join)(workspaceRoot, "node_modules"), { recursive: true, force: true });
+  (0, import_node_fs39.rmSync)((0, import_node_path47.join)(workspaceRoot, "package-lock.json"), { force: true });
   logger.step("Installing the toolchain (commitlint + husky + linting/formatting)");
   const installStatus = runShell(
     "npm",
@@ -9705,10 +9885,10 @@ function projectKindHintLines(kinds = PROJECT_KINDS) {
 }
 
 // src/workspace-creation/interactive-wizard.use-case.ts
-var import_node_path47 = require("path");
+var import_node_path48 = require("path");
 var import_prompts4 = require("@inquirer/prompts");
 async function runInteractive() {
-  const inWorkspace = fileExists((0, import_node_path47.join)(process.cwd(), "nx.json"));
+  const inWorkspace = fileExists((0, import_node_path48.join)(process.cwd(), "nx.json"));
   const choiceNew = { name: "Create a new monorepo", value: "new" };
   const choiceAdd = { name: "Add a project to this workspace", value: "add" };
   const choiceUpgrade = {
@@ -9760,7 +9940,7 @@ function buildProgram(cliVersion) {
   ).option("--json", "print the findings as one JSON document, each with its remedy").action((options) => {
     runDoctor(process.cwd(), options);
   });
-  program.command("adopt").description("Read an existing repository and report what bringing it under mnci would involve: blockers, warnings and the step that clears each. Read-only unless a step flag is given; exits non-zero when something blocks").option("--json", "print the report as one JSON document").option("--tags", "create, locally, the baseline tag each project whose release tags are stranded under an old name needs; nothing is pushed").option("--toolchain", "retire old formatter and registry tooling, align the Nx family to one version and run npm audit fix until the audit gate passes; needs a clean git tree and leaves the changes uncommitted").option("--nx <version>", "the Nx version --toolchain aligns to (default: the newest published in the major already in use)").option("--kinds", "record each project's mnci kind as a type:<kind> tag (npm, Python, Go, Flutter and C# projects); a project where two kinds fit is listed with a guess and not tagged; needs a clean git tree").option("--kind <dir=kind>", "the kind you choose for one project, for --kinds (repeatable)", (value, previous = []) => [...previous, value]).option("--overlay", "apply the mnci overlay (release config, pipeline, npmrc, commitlint, scripts) with the flags mnci upgrade takes; the pipeline keeps the steps mnci does not recognise in its slots; needs a clean git tree and an nx.json").option("--scope <scope>", "npm scope for publishable packages (--overlay)").option("--registry <kind>", "azure-artifacts | npm (--overlay)").option("--organization <name>", "Azure DevOps organization (--overlay)").option("--project <name>", "Azure DevOps project (--overlay)").option("--artifacts-feed <name>", "Azure Artifacts feed (--overlay)").option("--agent <pool>", "CI build agent (--overlay)").option("--variable-group <name>", "Azure DevOps variable group holding the npm PAT (--overlay)").option("--npm-auth <mode>", "pat (default) | build-identity (--overlay, --ci azure only)").option("--ci <provider>", "azure | github | both (--overlay; default: what the repository already has)").option("--test-runner <runner>", "jest | vitest (--overlay; default: what the repository already declares)").action((options) => {
+  program.command("adopt").description("Read an existing repository and report what bringing it under mnci would involve: blockers, warnings and the step that clears each. Read-only unless a step flag is given; exits non-zero when something blocks").option("--json", "print the report as one JSON document").option("--tags", "create, locally, the baseline tag each project whose release tags are stranded under an old name needs; nothing is pushed").option("--toolchain", "retire old formatter and registry tooling, align the Nx family to one version and run npm audit fix until the audit gate passes; needs a clean git tree and leaves the changes uncommitted").option("--nx <version>", "the Nx version --toolchain aligns to (default: the newest published in the major already in use)").option("--dependencies", "move the root package.json runtime dependencies into the projects that import them (same range), then reinstall; a package no project imports stays and is listed; needs a clean git tree").option("--kinds", "record each project's mnci kind as a type:<kind> tag (npm, Python, Go, Flutter and C# projects); a project where two kinds fit is listed with a guess and not tagged; needs a clean git tree").option("--kind <dir=kind>", "the kind you choose for one project, for --kinds (repeatable)", (value, previous = []) => [...previous, value]).option("--overlay", "apply the mnci overlay (release config, pipeline, npmrc, commitlint, scripts) with the flags mnci upgrade takes; the pipeline keeps the steps mnci does not recognise in its slots; needs a clean git tree and an nx.json").option("--scope <scope>", "npm scope for publishable packages (--overlay)").option("--registry <kind>", "azure-artifacts | npm (--overlay)").option("--organization <name>", "Azure DevOps organization (--overlay)").option("--project <name>", "Azure DevOps project (--overlay)").option("--artifacts-feed <name>", "Azure Artifacts feed (--overlay)").option("--agent <pool>", "CI build agent (--overlay)").option("--variable-group <name>", "Azure DevOps variable group holding the npm PAT (--overlay)").option("--npm-auth <mode>", "pat (default) | build-identity (--overlay, --ci azure only)").option("--ci <provider>", "azure | github | both (--overlay; default: what the repository already has)").option("--test-runner <runner>", "jest | vitest (--overlay; default: what the repository already declares)").action((options) => {
     runAdopt(process.cwd(), options);
   });
   program.command("ci").addArgument(new import_commander.Argument("<phase>", "which phase of the pipeline to run").choices(CI_PHASES)).description(