@mnci/cli 1.19.8 → 3.0.0

package/dist/cli.js

@@ -80,12 +80,11 @@ function runNpx(arguments_, cwd) {
     throw new Error(`npx ${arguments_.join(" ")} failed with exit code ${status}`);
   }
 }
-function runFormatter(cwd, linter, target = ".") {
-  const [command, arguments_] = linter === "oxlint" ? ["oxfmt", ["--write", target]] : ["prettier", ["--write", "--log-level", "warn", target]];
-  const status = runShell("npx", [command, ...arguments_], cwd);
+function runFormatter(cwd, target = ".") {
+  const status = runShell("npx", ["eslint", target, "--fix"], cwd);
   if (status !== 0) {
     logger.warn(
-      `${command} could not format '${target}' (exit code ${status}). The project was generated; run 'npm run format' to normalise it.`
+      `eslint could not format '${target}' (exit code ${status}). The project was generated; run 'npm run format' to normalise it.`
     );
   }
 }
@@ -142,20 +141,7 @@ async function promptStack() {
       { name: "Vitest", value: "vitest" }
     ]
   });
-  const linter = await (0, import_prompts.select)({
-    message: "Linter and formatter",
-    choices: [
-      {
-        name: "ESLint + Prettier \u2014 every file type, the widest rule coverage",
-        value: "eslint"
-      },
-      {
-        name: "oxlint + oxfmt for JS/TS, ESLint for the rest \u2014 much faster, same style",
-        value: "oxlint"
-      }
-    ]
-  });
-  return { testRunner, linter };
+  return { testRunner };
 }
 
 // src/util/fsx.ts
@@ -1220,7 +1206,7 @@ async function runAdd(kind, name, options) {
     case "python-vendor": {
       await addPythonVendor(workspaceRoot, resolvedName, options, kindProvided);
       syncProjectReferences(workspaceRoot);
-      runFormatter(workspaceRoot, stack.linter);
+      runFormatter(workspaceRoot);
       return;
     }
     default: {
@@ -1231,7 +1217,7 @@ async function runAdd(kind, name, options) {
     }
   }
   syncProjectReferences(workspaceRoot);
-  runFormatter(workspaceRoot, stack.linter);
+  runFormatter(workspaceRoot);
   logger.success(`Added ${resolvedKind} '${resolvedName}'.`);
 }
 function syncProjectReferences(workspaceRoot) {
@@ -1248,14 +1234,7 @@ function readWorkspaceStack(workspaceRoot) {
   );
   const stack = nxJson.mnci?.stack;
   return {
-    testRunner: stack?.testRunner === "vitest" ? "vitest" : "jest",
-    // Defaults to `eslint` when absent, the same call `mnci upgrade` makes and
-    // for the same reason: every workspace generated before the choice existed
-    // has no persisted value and is an ESLint workspace. Reading it at all is
-    // the fix — this function returned `testRunner` alone, so `add` finished by
-    // formatting an oxlint workspace with Prettier, against Prettier's defaults,
-    // since the overlay had deleted the config that would have corrected it.
-    linter: stack?.linter === "oxlint" ? "oxlint" : "eslint"
+    testRunner: stack?.testRunner === "vitest" ? "vitest" : "jest"
   };
 }
 
@@ -1266,8 +1245,7 @@ var import_node_path12 = require("path");
 // src/overlay.ts
 var import_node_fs6 = require("fs");
 var import_node_path11 = require("path");
-var DEFAULT_STACK = { testRunner: "jest", linter: "eslint" };
-var PRETTIER_VERSION = "^3.8.1";
+var DEFAULT_STACK = { testRunner: "jest" };
 var TS_COMPILER_DEPENDENCIES = {
   "@typescript/native": "npm:typescript@^7.0.2",
   typescript: "npm:@typescript/typescript6@^6.0.2"
@@ -1375,32 +1353,12 @@ var COMMITLINT_CONFIG = `export default { extends: ['@commitlint/config-conventi
 `;
 var COMMIT_MSG_HOOK = `npx --no -- commitlint --edit "$1"
 `;
-var PRETTIER_CONFIG = `// The formatting half of @mnci/eslint-config.
-//
-// Prettier's options live in the same package as the ESLint rules on purpose:
-// linting and formatting are one decision. \`eslint-config-prettier\` is composed
-// last inside that package so every formatting rule defers to these settings, and
-// splitting the two across packages means a version pair that can drift until
-// \`npm run lint\` and \`npm run format:check\` disagree with each other.
-//
-// Consuming it as a shareable config also means a formatting fix reaches this
-// workspace through \`npm update\`, the same way a rule change does, instead of
-// waiting for \`mnci upgrade\` to rewrite a file.
-//
-// TO OVERRIDE an option, spread it rather than re-exporting:
-//
-//   import mnci from '@mnci/eslint-config/prettier'
-//   export default { ...mnci, printWidth: 120 }
-//
-// TO SEE the resolved options for a file:  npx prettier --find-config-path <file>
-export { default } from '@mnci/eslint-config/prettier'
-`;
 var ESLINT_CONFIG_VERSION = "^0.1.0";
 function eslintConfigSpec() {
   return process.env.MNCI_ESLINT_CONFIG_SPEC ?? ESLINT_CONFIG_VERSION;
 }
 var ESLINT_VERSION = "^10.8.0";
-function devcontainerJson(workspaceName, linter) {
+function devcontainerJson(workspaceName) {
   return `${toJson({
     name: workspaceName,
     image: `mcr.microsoft.com/devcontainers/typescript-node:${NODE_VERSION}-bookworm`,
@@ -1423,7 +1381,7 @@ function devcontainerJson(workspaceName, linter) {
     // The same recommendations the `.code-workspace` file carries, so opening
     // the folder in a container suggests the identical toolset.
     customizations: {
-      vscode: { extensions: vscodeExtensions(linter) }
+      vscode: { extensions: VSCODE_RECOMMENDED_EXTENSIONS }
     }
   })}
 `;
@@ -1433,7 +1391,13 @@ var ROOT_LINT_TARGET = {
   cache: true,
   options: {
     command: [
-      "eslint .",
+      // `--cache` is the one ESLint speed option that actually pays here:
+      // measured best-of-3 on this repo, an unchanged re-run drops from 9,546ms
+      // to 2,835ms (3.4x). `--concurrency=auto` was measured too and REJECTED —
+      // it came out 8% SLOWER, because per-worker TypeScript type-service
+      // startup costs more than the parallelism saves. The cache file is
+      // per-machine and gitignored.
+      "eslint . --cache",
       '--ignore-pattern "apps/**"',
       '--ignore-pattern "libs/**"',
       '--ignore-pattern "packages/**"',
@@ -1477,38 +1441,23 @@ function eslintToolchainDependencies(nxVersion) {
     "@mnci/eslint-config": eslintConfigSpec()
   };
 }
-var LINTER_ONLY_DEPENDENCIES = {
-  eslint: ["prettier"],
-  oxlint: ["@mnci/oxlint-config", "oxlint", "oxfmt"]
-};
-function withoutStaleLinterDependencies(devDeps, linter) {
-  const stale = new Set(LINTER_ONLY_DEPENDENCIES[linter === "oxlint" ? "eslint" : "oxlint"]);
-  return Object.fromEntries(Object.entries(devDeps).filter(([name]) => !stale.has(name)));
-}
-function rootLintTarget(linter) {
-  if (linter !== "oxlint") return ROOT_LINT_TARGET;
-  return {
-    executor: "nx:run-commands",
-    cache: true,
-    options: {
-      commands: ["oxlint .", ROOT_LINT_TARGET.options.command],
-      parallel: false,
-      cwd: "."
-    }
-  };
-}
-var OXLINT_VERSION = "^1.76.0";
-var OXFMT_VERSION = "^0.61.0";
-function oxlintToolchainDependencies() {
-  return {
-    "@mnci/oxlint-config": oxlintConfigSpec(),
-    oxlint: OXLINT_VERSION,
-    oxfmt: OXFMT_VERSION
-  };
-}
-var OXLINT_CONFIG_VERSION = "^0.1.0";
-function oxlintConfigSpec() {
-  return process.env.MNCI_OXLINT_CONFIG_SPEC ?? OXLINT_CONFIG_VERSION;
+var RETIRED_FORMATTER_FILES = [
+  ".prettierrc",
+  ".prettierrc.json",
+  ".prettierrc.mjs",
+  ".prettierignore",
+  "oxlint.config.ts",
+  ".oxfmtrc.json"
+];
+function withoutRetiredFormatterDependencies(devDeps) {
+  const retired = /* @__PURE__ */ new Set([
+    "prettier",
+    "eslint-config-prettier",
+    "oxlint",
+    "oxfmt",
+    "@mnci/oxlint-config"
+  ]);
+  return Object.fromEntries(Object.entries(devDeps).filter(([name]) => !retired.has(name)));
 }
 var ESLINT_BLOCK_INVENTORY = `// WHAT IS IN HERE. Each line is one config block, by the \`name\` it carries.
 //
@@ -1535,9 +1484,9 @@ var ESLINT_BLOCK_INVENTORY = `// WHAT IS IN HERE. Each line is one config block,
 //   mnci/tests                    *.spec/*.test relaxations \u2014 eslint-plugin-jest
 //                                 (Vitest's globals too; the two stacks share them)
 //   mnci/nx-dependency-checks     @nx/eslint-plugin, on publishable packages' manifests
-//   mnci/prettier-compat          eslint-config-prettier \u2014 switches off every rule
-//                                 Prettier owns. Composed LAST, on purpose.
-//   mnci/stylistic                the 3 Standard rules Prettier does not touch
+//   mnci/standard                 JavaScript Standard Style as ESLint rules \u2014 the
+//                                 whole formatting opinion. Composed LAST, on
+//                                 purpose: nothing may follow that disables it.
 //
 // To list them as ESLint actually resolves them:  npx eslint --inspect-config
 `;
@@ -1561,83 +1510,21 @@ ${ESLINT_BLOCK_INVENTORY}//
 // a dependency, so \`npm update\` brings rule fixes in the way it brings any
 // other. An override here survives that; an edit to the package does not.
 //
-// One override cannot work, and it is the one people reach for first:
-// \`space-before-function-paren\`. Prettier rewrites \`f (a)\` to \`f(a)\` on every
-// run, so switching that rule on makes \`npm run lint\` and \`npm run format:check\`
-// impossible to satisfy at the same time. Formatting lives in .prettierrc.mjs.
-export default mnci({ workspaceRoot: import.meta.dirname })
-`;
-var ESLINT_CONFIG_NON_JS = `import { nonJs } from '@mnci/eslint-config'
-
-// This workspace lints JS/TS with oxlint (see oxlint.config.ts). ESLint keeps
-// the file types oxlint cannot parse at all \u2014 YAML, TOML, Markdown, CSS, HTML,
-// JSON \u2014 plus @nx/dependency-checks on publishable manifests.
-//
-// The JS/TS rule blocks are deliberately NOT composed here. Running both linters
-// over the same file would report one defect twice under two different names.
-//
-// TO OVERRIDE, append a named block after the spread, exactly as the full config
-// documents. To change a JS/TS rule, edit oxlint.config.ts instead \u2014 this file
-// does not lint JS/TS.
-export default [...nonJs({ workspaceRoot: import.meta.dirname })]
-`;
-var OXLINT_CONFIG = `import { defineConfig } from 'oxlint'
-import mnci from '@mnci/oxlint-config'
-
-// oxlint owns JS/TS/JSX here; eslint.config.mjs keeps everything oxlint cannot
-// parse. The contract @mnci/oxlint-config holds itself to: anything
-// @mnci/eslint-config accepts must pass oxlint, so switching linters never turns
-// a green codebase red.
-//
-// oxlint.config.ts, not .oxlintrc.json, and that is not a preference: .oxlintrc's
-// \`extends\` takes PATHS relative to the config file, so
-// \`extends: ["@mnci/oxlint-config"]\` fails with "No such file or directory".
-// defineConfig is the only shareable-config route oxlint offers.
+// FORMATTING IS LINTING HERE. There is no Prettier, no oxfmt and no
+// \`format:check\` \u2014 \`npm run lint\` reports indentation, quotes and spacing as
+// ordinary errors, and \`npm run format\` is \`eslint . --fix\`. So do not add a
+// formatter: whichever one you pick will disagree with the \`mnci/standard\`
+// block above, and because a formatter runs on save it wins silently, leaving
+// \`lint\` to fail on files you never edited by hand.
 //
-// Type-aware rules (no-floating-promises and friends) are opt-in \u2014 pass
-// { typeAware: true } AND run oxlint with --type-aware. They report findings the
-// ESLint stack accepts, so they are off by default to keep the contract above.
-export default defineConfig({ extends: [mnci()] })
-`;
-var OXFMT_CONFIG = `${JSON.stringify(
-  {
-    $schema: "./node_modules/oxfmt/configuration_schema.json",
-    semi: false,
-    singleQuote: true,
-    trailingComma: "none",
-    arrowParens: "avoid",
-    printWidth: 100,
-    tabWidth: 2,
-    useTabs: false
-  },
-  null,
-  2
-)}
-`;
-var PRETTIER_IGNORE = `node_modules
-dist
-dist-dev
-dist-uat
-dist-prod
-coverage
-.next
-out
-.nx
-tmp
-package-lock.json
-*.lock
-.venv
-venv
-__pycache__
-.pytest_cache
-.ruff_cache
-.dart_tool
+// That also applies to the editor. Installing a Prettier or oxfmt extension is
+// enough on its own \u2014 neither needs a config file, and with none present they
+// format against their own defaults (semicolons, double quotes), which is the
+// inverse of Standard.
+export default mnci({ workspaceRoot: import.meta.dirname })
 `;
-var LINTER_EXTENSIONS = {
-  eslint: ["dbaeumer.vscode-eslint", "esbenp.prettier-vscode"],
-  oxlint: ["oxc.oxc-vscode", "dbaeumer.vscode-eslint"]
-};
-var SHARED_VSCODE_EXTENSIONS = [
+var VSCODE_RECOMMENDED_EXTENSIONS = [
+  "dbaeumer.vscode-eslint",
   "nrwl.angular-console",
   "firsttris.vscode-jest-runner"
 ];
@@ -1653,25 +1540,9 @@ var FORMATTED_LANGUAGES = [
   "css",
   "html"
 ];
-var OXFMT_ONLY_LANGUAGES = ["toml"];
-function formattedLanguages(linter) {
-  return [...FORMATTED_LANGUAGES, ...linter === "oxlint" ? OXFMT_ONLY_LANGUAGES : []];
-}
-function vscodeExtensions(linter) {
-  return [...LINTER_EXTENSIONS[linter], ...SHARED_VSCODE_EXTENSIONS];
-}
-function vscodeSettings(linter) {
-  const formatter = linter === "oxlint" ? "oxc.oxc-vscode" : "esbenp.prettier-vscode";
-  const eslintLanguages = linter === "oxlint" ? ["json", "jsonc", "markdown", "yaml", "html", "css"] : [
-    "javascript",
-    "javascriptreact",
-    "typescript",
-    "typescriptreact",
-    "json",
-    "jsonc",
-    "markdown",
-    "yaml"
-  ];
+function vscodeSettings() {
+  const formatter = "dbaeumer.vscode-eslint";
+  const eslintLanguages = [...FORMATTED_LANGUAGES];
   return {
     "eslint.validate": eslintLanguages,
     "editor.codeActionsOnSave": {
@@ -1686,27 +1557,27 @@ function vscodeSettings(linter) {
     // does that comparison BEFORE scope. So a `[typescript]` block in someone's
     // USER settings — left over from any other project — outranks this file's
     // workspace-level `editor.defaultFormatter`, and format-on-save quietly uses
-    // that other formatter instead. Nothing reports it: Prettier is installed,
-    // the config resolves, `npm run format:check` still finds the 68 unformatted
-    // files, and the editor simply never applies it.
+    // that other formatter instead — and nothing reports it, because the gate
+    // and the editor are looking at different tools. That is how it was found:
+    // reported from a real workspace, not deduced from the docs.
     //
     // Reported from a real workspace where `.ts` files were not being formatted
     // while `.json`/`.jsonc`/`.yaml` were — exactly the three that had explicit
     // entries here and nothing else did.
     ...Object.fromEntries(
-      formattedLanguages(linter).map((language) => [
+      FORMATTED_LANGUAGES.map((language) => [
         `[${language}]`,
         { "editor.defaultFormatter": formatter }
       ])
     )
   };
 }
-function vscodeWorkspace(workspaceName, linter, existingTasks) {
+function vscodeWorkspace(workspaceName, existingTasks) {
   return JSON.stringify(
     {
       folders: [{ path: ".", name: workspaceName }],
-      settings: vscodeSettings(linter),
-      extensions: { recommendations: vscodeExtensions(linter) },
+      settings: vscodeSettings(),
+      extensions: { recommendations: VSCODE_RECOMMENDED_EXTENSIONS },
       tasks: {
         version: existingTasks?.version ?? "2.0.0",
         tasks: existingTasks?.tasks ?? []
@@ -1726,12 +1597,14 @@ var ROOT_SCRIPTS = {
   "release:preview": "nx release --dry-run",
   prepare: "husky"
 };
-function rootScripts(linter = "eslint") {
-  const formatter = linter === "oxlint" ? "oxfmt" : "prettier";
+function rootScripts() {
   return {
     ...ROOT_SCRIPTS,
-    format: linter === "oxlint" ? "oxfmt ." : "prettier --write .",
-    "format:check": `${formatter} --check .`,
+    // ESLint is the formatter, so `format` is `--fix` and there is no separate
+    // `format:check`: `lint` already reports formatting as ordinary errors.
+    // Carrying a second script that ran the same tool twice would just make a
+    // CI run slower for no extra coverage.
+    format: "eslint . --fix --cache",
     "python:install": `${PYTHON_INSTALL_GUARD} && ${PYTHON_WORKSPACE_INSTALL_GUARD}`
   };
 }
@@ -1765,7 +1638,7 @@ function mnciConfig(options) {
     agent: options.agent,
     variableGroup: options.variableGroup,
     ci: options.ci,
-    stack: { testRunner: options.stack.testRunner, linter: options.stack.linter }
+    stack: { testRunner: options.stack.testRunner }
   };
 }
 function readMnciConfig(workspaceRoot) {
@@ -1783,7 +1656,7 @@ var PYTHON_WORKSPACE_INSTALL_GUARD = `node -e "const fs=require('node:fs'),path=
 var PIP_AUDIT_GUARD = `node -e "if(!require('node:fs').existsSync('requirements-dev.txt')){console.log('No Python projects - skipping.');process.exit(0)}const py=process.platform==='win32'?'python':'python3';require('node:child_process').spawnSync(py,['-m','pip_audit'],{stdio:'inherit'});process.exit(0)"`;
 var GO_MODULE_DOWNLOAD_GUARD = `node -e "if(!require('node:fs').existsSync('go.mod')){console.log('No Go projects - skipping.');process.exit(0)}process.exit(require('node:child_process').spawnSync('go',['mod','download'],{stdio:'inherit'}).status ?? 1)"`;
 var GOLANGCI_LINT_INSTALL_GUARD = `node -e "const fs=require('node:fs'),cp=require('node:child_process');if(!fs.existsSync('go.mod')){console.log('No Go projects - skipping.');process.exit(0)}if(cp.spawnSync('golangci-lint',['--version'],{stdio:'ignore'}).status===0){console.log('golangci-lint already installed - skipping.');process.exit(0)}process.exit(cp.spawnSync('go',['install','github.com/golangci/golangci-lint/v2/cmd/golangci-lint@latest'],{stdio:'inherit'}).status ?? 1)"`;
-var GO_TOOL_PATH_PRELUDE = `const fs=require('node:fs'),cp=require('node:child_process');if(!fs.existsSync('go.mod')){console.log('No Go projects - skipping.');process.exit(0)}const r=cp.spawnSync('go',['env','GOPATH'],{encoding:'utf8'});if(r.status!==0){console.log('Could not resolve GOPATH - skipping.');process.exit(0)}const bin=require('node:path').join(r.stdout.trim(),'bin');`;
+var GO_TOOL_PATH_PRELUDE = "const fs=require('node:fs'),cp=require('node:child_process');if(!fs.existsSync('go.mod')){console.log('No Go projects - skipping.');process.exit(0)}const r=cp.spawnSync('go',['env','GOPATH'],{encoding:'utf8'});if(r.status!==0){console.log('Could not resolve GOPATH - skipping.');process.exit(0)}const bin=require('node:path').join(r.stdout.trim(),'bin');";
 var GO_TOOL_PATH_AZURE = `node -e "${GO_TOOL_PATH_PRELUDE}console.log('##vso[task.prependpath]'+bin)"`;
 var GO_TOOL_PATH_GITHUB = `node -e "${GO_TOOL_PATH_PRELUDE}if(!process.env.GITHUB_PATH){console.log('Not running in GitHub Actions - skipping.');process.exit(0)}fs.appendFileSync(process.env.GITHUB_PATH,bin+${String.raw`'\n'`})"`;
 var FLUTTER_SDK_VERSION = "3.44.8";
@@ -1812,7 +1685,7 @@ function poolBlock(agent) {
   return /^(?:ubuntu|windows|macos)-/i.test(agent) ? `  vmImage: ${agent}` : `  name: ${agent}`;
 }
 function azurePipelinesYaml(agent, variableGroup, pythonPublishUrl2, registryKind = "azure-artifacts") {
-  const onMain = `and(succeeded(), ne(variables['Build.Reason'], 'PullRequest'), eq(variables['Build.SourceBranchName'], 'main'))`;
+  const onMain = "and(succeeded(), ne(variables['Build.Reason'], 'PullRequest'), eq(variables['Build.SourceBranchName'], 'main'))";
   const [npmAuthName, npmAuthValue] = npmAuthEnvVariable(registryKind, (name) => `$(${name})`);
   return `name: monorepo-ci-$(Date:yyyyMMdd)$(Rev:.r)
 
@@ -1966,17 +1839,6 @@ steps:
   - script: npx nx sync:check
     displayName: Verify the workspace is synced (run 'npx nx sync' locally and commit if this fails)
 
-  # Prettier owns ALL formatting in this workspace, so it needs a gate of its
-  # own: ESLint is configured for correctness only and deliberately reports
-  # nothing about formatting. Without this step the entire formatting opinion is
-  # advisory, and a workspace drifts out of compliance with no signal anywhere.
-  #
-  # Stays workspace-wide even on a PR, unlike the verify step below: it is one
-  # Prettier invocation over the whole tree, not a per-project Nx target, so
-  # there is nothing to scope down and formatting is never partially checked.
-  - script: npm run format:check
-    displayName: Check formatting (run 'npm run format' locally to fix)
-
   # The one verify step, and deliberately the only one: affected projects on a
   # pull request, EVERY project on anything else (a push to main included, so a
   # release is always verified in full). Every fallback \u2014 no target branch, an
@@ -2031,7 +1893,7 @@ steps:
 `;
 }
 function githubActionsYaml(agent, pythonPublishUrl2, registryKind = "azure-artifacts", ci = "github") {
-  const onMain = `github.event_name == 'push' && github.ref_name == 'main'`;
+  const onMain = "github.event_name == 'push' && github.ref_name == 'main'";
   const [npmAuthName, npmAuthValue] = npmAuthEnvVariable(
     registryKind,
     (name) => `\${{ secrets.${name} }}`
@@ -2173,19 +2035,6 @@ jobs:
       - run: npx nx sync:check
         name: Verify the workspace is synced (run 'npx nx sync' locally and commit if this fails)
 
-      # Prettier owns ALL formatting in this workspace, so it needs a gate of
-      # its own: ESLint is configured for correctness only and deliberately
-      # reports nothing about formatting. Without this step the entire
-      # formatting opinion is advisory, and a workspace drifts out of
-      # compliance with no signal anywhere.
-      #
-      # Stays workspace-wide even on a PR, unlike the verify step below: it is
-      # one Prettier invocation over the whole tree, not a per-project Nx
-      # target, so there is nothing to scope down and formatting is never
-      # partially checked.
-      - run: npm run format:check
-        name: Check formatting (run 'npm run format' locally to fix)
-
       # The one verify step, and deliberately the only one: affected projects on
       # a pull request, EVERY project on anything else (a push to main included,
       # so a release is always verified in full). Every fallback \u2014 no target
@@ -2310,23 +2159,15 @@ function applyOverlay(workspaceRoot, options) {
   const manifest = readJson(manifestPath);
   const scripts = {
     ...manifest.scripts,
-    ...rootScripts(options.stack.linter)
+    ...rootScripts()
   };
   const existingDevDeps = manifest.devDependencies;
-  const devDeps = withoutStaleLinterDependencies(
-    {
-      ...existingDevDeps,
-      ...TS_COMPILER_DEPENDENCIES,
-      // The preset pins `nx` itself; the ESLint plugins must match it exactly.
-      ...eslintToolchainDependencies(existingDevDeps?.nx ?? "latest"),
-      // Additive for the linter, exclusive for the formatter: the hybrid keeps
-      // the whole ESLint toolchain for the file types oxlint cannot parse, but
-      // exactly one of prettier/oxfmt formats the workspace. Declaring both is
-      // how an editor ends up applying the one CI does not check.
-      ...options.stack.linter === "oxlint" ? oxlintToolchainDependencies() : { prettier: PRETTIER_VERSION }
-    },
-    options.stack.linter
-  );
+  const devDeps = withoutRetiredFormatterDependencies({
+    ...existingDevDeps,
+    ...TS_COMPILER_DEPENDENCIES,
+    // The preset pins `nx` itself; the ESLint plugins must match it exactly.
+    ...eslintToolchainDependencies(existingDevDeps?.nx ?? "latest")
+  });
   const overrides = {
     ...manifest.overrides,
     ...ESLINT_PEER_OVERRIDES
@@ -2337,7 +2178,7 @@ function applyOverlay(workspaceRoot, options) {
     includedScripts: existingNx?.includedScripts ?? [],
     targets: {
       ...existingNx?.targets,
-      lint: rootLintTarget(options.stack.linter)
+      lint: ROOT_LINT_TARGET
     }
   };
   writeFileEnsured(
@@ -2356,28 +2197,20 @@ function applyOverlay(workspaceRoot, options) {
   const hookPath = (0, import_node_path11.join)(workspaceRoot, ".husky/commit-msg");
   writeFileEnsured(hookPath, COMMIT_MSG_HOOK);
   markExecutable(hookPath);
-  if (options.stack.linter === "oxlint") {
-    writeFileEnsured((0, import_node_path11.join)(workspaceRoot, "oxlint.config.ts"), OXLINT_CONFIG);
-    writeFileEnsured((0, import_node_path11.join)(workspaceRoot, ".oxfmtrc.json"), OXFMT_CONFIG);
-    writeFileEnsured((0, import_node_path11.join)(workspaceRoot, "eslint.config.mjs"), ESLINT_CONFIG_NON_JS);
-    removeIfPresent((0, import_node_path11.join)(workspaceRoot, ".prettierrc.mjs"));
-  } else {
-    writeFileEnsured((0, import_node_path11.join)(workspaceRoot, "eslint.config.mjs"), ESLINT_CONFIG);
-    writeFileEnsured((0, import_node_path11.join)(workspaceRoot, ".prettierrc.mjs"), PRETTIER_CONFIG);
-    removeIfPresent((0, import_node_path11.join)(workspaceRoot, "oxlint.config.ts"));
-    removeIfPresent((0, import_node_path11.join)(workspaceRoot, ".oxfmtrc.json"));
+  writeFileEnsured((0, import_node_path11.join)(workspaceRoot, "eslint.config.mjs"), ESLINT_CONFIG);
+  for (const retired of RETIRED_FORMATTER_FILES) {
+    removeIfPresent((0, import_node_path11.join)(workspaceRoot, retired));
   }
   writeFileEnsured(
     (0, import_node_path11.join)(workspaceRoot, ".devcontainer/devcontainer.json"),
-    devcontainerJson(options.workspaceName, options.stack.linter)
+    devcontainerJson(options.workspaceName)
   );
-  writeFileEnsured((0, import_node_path11.join)(workspaceRoot, ".prettierignore"), PRETTIER_IGNORE);
   removeNxScaffolding(workspaceRoot);
   const codeWorkspacePath = (0, import_node_path11.join)(workspaceRoot, `${options.workspaceName}.code-workspace`);
   const existing = readCodeWorkspace(codeWorkspacePath);
   writeFileEnsured(
     codeWorkspacePath,
-    vscodeWorkspace(options.workspaceName, options.stack.linter, existing?.tasks)
+    vscodeWorkspace(options.workspaceName, existing?.tasks)
   );
   if (options.workspaceName !== "undefined") {
     (0, import_node_fs6.rmSync)((0, import_node_path11.join)(workspaceRoot, "undefined.code-workspace"), { force: true });
@@ -2420,65 +2253,28 @@ function checkEslintConfigs(workspaceRoot) {
     }
   ];
 }
-function checkPrettierConfig(workspaceRoot) {
-  const strayExists = fileExists((0, import_node_path12.join)(workspaceRoot, ".prettierrc"));
-  return {
-    check: "Prettier config is mnci\u2019s",
-    ok: !strayExists,
-    detail: ".prettierrc exists and outranks .prettierrc.json, so mnci\u2019s config is ignored",
-    remedy: "delete .prettierrc (or run `mnci upgrade`, which deletes it)"
-  };
-}
-function checkLinterModeIsConsistent(workspaceRoot) {
-  const linter = readMnciConfig(workspaceRoot).stack?.linter ?? "eslint";
-  const oxlintFiles = ["oxlint.config.ts", ".oxfmtrc.json"].filter(
-    (file) => fileExists((0, import_node_path12.join)(workspaceRoot, file))
-  );
-  const hasPrettier = fileExists((0, import_node_path12.join)(workspaceRoot, ".prettierrc.mjs"));
-  const stray = linter === "oxlint" ? hasPrettier ? [".prettierrc.mjs"] : [] : oxlintFiles;
-  return {
-    check: `linter is ${linter} and only ${linter}'s config files are present`,
-    ok: stray.length === 0,
-    detail: `${stray.join(", ")} belongs to the other linter mode, so two configs are in play at once`,
-    remedy: "run `mnci upgrade`, which removes the mode the workspace did not choose"
-  };
-}
 function declaredDevDependencies(workspaceRoot) {
-  const manifestPath = (0, import_node_path12.join)(workspaceRoot, "package.json");
-  if (!fileExists(manifestPath)) return {};
-  const manifest = readJson(manifestPath);
-  return manifest.devDependencies ?? {};
-}
-function checkOneFormatterDeclared(workspaceRoot) {
-  const linter = readMnciConfig(workspaceRoot).stack?.linter ?? "eslint";
-  const stale = linter === "oxlint" ? "prettier" : "oxfmt";
-  const declared = declaredDevDependencies(workspaceRoot)[stale] !== void 0;
-  return {
-    check: `only ${linter === "oxlint" ? "oxfmt" : "prettier"} is declared as the formatter`,
-    ok: !declared,
-    detail: `${stale} is declared but nothing runs it \u2014 the editor may still resolve and apply it, disagreeing with \`npm run format:check\``,
-    remedy: "run `mnci upgrade`, which drops the formatter of the mode you left"
-  };
+  try {
+    const manifest = readJson(
+      (0, import_node_path12.join)(workspaceRoot, "package.json")
+    );
+    return manifest.devDependencies ?? {};
+  } catch {
+    return {};
+  }
 }
-function checkOxlintToolchainDeclared(workspaceRoot) {
-  const linter = readMnciConfig(workspaceRoot).stack?.linter ?? "eslint";
-  if (linter !== "oxlint") {
-    return {
-      check: "oxlint toolchain declared",
-      ok: true,
-      detail: "not an oxlint workspace",
-      remedy: ""
-    };
+function checkNoRetiredFormatter(workspaceRoot) {
+  const files = RETIRED_FORMATTER_FILES.filter((file) => fileExists((0, import_node_path12.join)(workspaceRoot, file)));
+  const declared = ["prettier", "eslint-config-prettier", "oxlint", "oxfmt", "@mnci/oxlint-config"].filter((name) => declaredDevDependencies(workspaceRoot)[name] !== void 0);
+  const stale = [...files, ...declared];
+  if (stale.length === 0) {
+    return { check: "ESLint is the only linter and formatter", ok: true };
   }
-  const devDeps = declaredDevDependencies(workspaceRoot);
-  const missing = ["oxlint", "oxfmt", "@mnci/oxlint-config"].filter(
-    (dependency) => devDeps[dependency] === void 0
-  );
   return {
-    check: "oxlint toolchain declared in devDependencies",
-    ok: missing.length === 0,
-    detail: `missing: ${missing.join(", ")} \u2014 lint or format will fail with "command not found"`,
-    remedy: "run `mnci upgrade`, which writes the toolchain the chosen linter needs"
+    check: "no retired formatter is still configured",
+    ok: false,
+    detail: `Found: ${stale.join(", ")}. These no longer run, but an editor extension still resolves them and will reformat on save against an opinion no gate checks.`,
+    remedy: "Run 'mnci upgrade' to remove them."
   };
 }
 function checkEslintPlugin(nxJson) {
@@ -2574,10 +2370,7 @@ function collectFindings(workspaceRoot) {
   const nxJson = readJson(nxJsonPath);
   return [
     ...checkEslintConfigs(workspaceRoot),
-    checkPrettierConfig(workspaceRoot),
-    checkLinterModeIsConsistent(workspaceRoot),
-    checkOneFormatterDeclared(workspaceRoot),
-    checkOxlintToolchainDeclared(workspaceRoot),
+    checkNoRetiredFormatter(workspaceRoot),
     checkEslintPlugin(nxJson),
     checkResolvedEslint(workspaceRoot),
     checkNpmrc(workspaceRoot, nxJson.mnci?.registry, nxJson.mnci?.scope),
@@ -2617,17 +2410,11 @@ function nxCloudProviderValue(ci) {
   return ci === "azure" ? "azure" : "github";
 }
 async function resolveStack(options) {
-  if (options.testRunner || options.linter || options.yes) {
-    return {
-      testRunner: options.testRunner ?? DEFAULT_STACK.testRunner,
-      linter: options.linter ?? DEFAULT_STACK.linter
-    };
+  if (options.testRunner || options.yes) {
+    return { testRunner: options.testRunner ?? DEFAULT_STACK.testRunner };
   }
   const prompted = await promptStack();
-  return {
-    testRunner: prompted.testRunner,
-    linter: prompted.linter
-  };
+  return { testRunner: prompted.testRunner };
 }
 var CI_PROVIDERS = /* @__PURE__ */ new Set(["azure", "github", "both"]);
 async function resolveCi(options) {
@@ -2696,10 +2483,8 @@ async function runNew(name, options) {
     throw new Error(`npm install of the toolchain failed with exit code ${installStatus}`);
   }
   runShell("npx", ["husky"], workspaceRoot);
-  logger.step(
-    `Formatting the workspace (${stack.linter === "oxlint" ? "oxfmt" : "Prettier"}, JavaScript Standard Style)`
-  );
-  runFormatter(workspaceRoot, stack.linter);
+  logger.step("Formatting the workspace (eslint --fix, JavaScript Standard Style)");
+  runFormatter(workspaceRoot);
   logger.success("Done. Next steps:");
   logger.info(`  cd ${workspaceName}`);
   logger.info("  mnci add react-app web        # or: react-lib, react-internal-lib, node-app,");
@@ -2776,7 +2561,6 @@ function resolveOverlayOptions(workspaceRoot, options, persisted) {
     );
   }
   const variableGroup = options.variableGroup ?? persisted.variableGroup ?? "Build";
-  const linter = options.linter ?? persisted.stack?.linter ?? "eslint";
   const testRunner = options.testRunner ?? persisted.stack?.testRunner;
   if (!testRunner) {
     throw new Error(
@@ -2790,7 +2574,7 @@ function resolveOverlayOptions(workspaceRoot, options, persisted) {
     agent,
     variableGroup,
     ci,
-    stack: { testRunner, linter }
+    stack: { testRunner }
   };
 }
 function runUpgrade(workspaceRoot, options) {
@@ -2805,7 +2589,7 @@ function runUpgrade(workspaceRoot, options) {
     "Re-applying the MoNecromanCI overlay (release config, .npmrc, commitlint, pipeline, stack)"
   );
   applyOverlay(workspaceRoot, resolved);
-  runFormatter(workspaceRoot, resolved.stack.linter);
+  runFormatter(workspaceRoot);
   logger.success("Done. Review the changes with `git diff` before committing.");
 }
 
@@ -2904,10 +2688,7 @@ function buildProgram(cliVersion) {
   program.command("new").argument("[name]", "workspace name").description("Create a new monorepo (Nx TS preset + release/pipeline overlay)").option("-y, --yes", "accept defaults for anything not passed as a flag").option("--scope <scope>", "npm scope for publishable packages (e.g. @demo)").option("--registry <kind>", "azure-artifacts | npm").option("--organization <name>", "Azure DevOps organization").option("--project <name>", "Azure DevOps project").option("--artifacts-feed <name>", "Azure Artifacts feed").option(
     "--agent <pool>",
     "CI build agent: a vmImage (e.g. ubuntu-latest) or self-hosted pool name"
-  ).option("--variable-group <name>", "Azure DevOps variable group holding the npm PAT").option("--ci <provider>", "CI provider: azure | github | both").option("--test-runner <runner>", "unit-test runner: jest | vitest").option(
-    "--linter <linter>",
-    "linter + formatter: eslint (ESLint + Prettier) | oxlint (oxlint + oxfmt for JS/TS, ESLint for the rest)"
-  ).option("--nx-cloud", "connect the workspace to Nx Cloud (remote caching + CI insights)").action(async (name, options) => {
+  ).option("--variable-group <name>", "Azure DevOps variable group holding the npm PAT").option("--ci <provider>", "CI provider: azure | github | both").option("--test-runner <runner>", "unit-test runner: jest | vitest").option("--nx-cloud", "connect the workspace to Nx Cloud (remote caching + CI insights)").action(async (name, options) => {
     await runNew(name, options);
   });
   program.command("upgrade").description(
@@ -2915,9 +2696,6 @@ function buildProgram(cliVersion) {
   ).option("--scope <scope>", "npm scope for publishable packages (overrides the persisted value)").option("--registry <kind>", "azure-artifacts | npm (overrides the persisted value)").option("--organization <name>", "Azure DevOps organization").option("--project <name>", "Azure DevOps project").option("--artifacts-feed <name>", "Azure Artifacts feed").option("--agent <pool>", "CI build agent (overrides the persisted value)").option("--variable-group <name>", "Azure DevOps variable group holding the npm PAT").option("--ci <provider>", "CI provider: azure | github | both (overrides the persisted value)").option(
     "--test-runner <runner>",
     "unit-test runner: jest | vitest (overrides the persisted value)"
-  ).option(
-    "--linter <linter>",
-    "linter + formatter: eslint | oxlint (overrides the persisted value)"
   ).action((options) => {
     runUpgrade(process.cwd(), options);
   });