nx 23.2.0-beta.7 → 23.2.0-beta.9

package/dist/bin/init-local.js

@@ -6,7 +6,7 @@ const perf_hooks_1 = require("perf_hooks");
 const nx_commands_1 = require("../src/command-line/nx-commands");
 const strip_indents_1 = require("../src/utils/strip-indents");
 const client_1 = require("../src/daemon/client/client");
-const enquirer_1 = require("enquirer");
+const prompt_helpers_1 = require("../src/utils/prompt-helpers");
 const output_1 = require("../src/utils/output");
 const analytics_1 = require("../src/analytics");
 /**
@@ -136,11 +136,9 @@ async function ensureNxConsoleInstalledViaDaemon() {
             ],
         });
         try {
-            const { shouldInstallNxConsole } = await (0, enquirer_1.prompt)({
-                type: 'confirm',
-                name: 'shouldInstallNxConsole',
+            const shouldInstallNxConsole = await (0, prompt_helpers_1.confirmationPrompt)({
                 message: 'Install Nx Console? (you can uninstall anytime)',
-                initial: true,
+                onCancel: () => false,
             });
             // Set preference and install if user said yes
             const result = await client_1.daemonClient.setNxConsolePreferenceAndInstall(shouldInstallNxConsole);

package/dist/release/changelog-renderer/index.js

@@ -215,12 +215,11 @@ class DefaultChangelogRenderer {
                 if (!name || name.includes('[bot]')) {
                     continue;
                 }
-                if (_authors.has(name)) {
-                    const entry = _authors.get(name);
-                    entry.email.add(author.email);
+                if (!_authors.has(name)) {
+                    _authors.set(name, { email: new Set() });
                 }
-                else {
-                    _authors.set(name, { email: new Set([author.email]) });
+                if (author.email) {
+                    _authors.get(name).email.add(author.email);
                 }
             }
         }

package/dist/src/adapter/ngcli-adapter.js

@@ -31,6 +31,7 @@ const executor_utils_1 = require("../command-line/run/executor-utils");
 const plugins_1 = require("../project-graph/plugins");
 const schema_utils_1 = require("../config/schema-utils");
 const handle_import_1 = require("../utils/handle-import");
+const prompt_helpers_1 = require("../utils/prompt-helpers");
 const target_merging_1 = require("../project-graph/utils/project-configuration/target-merging");
 function getProjectGraph() {
     try {
@@ -653,8 +654,66 @@ function createPromptProvider() {
                     return { ...question, type: definition.type };
             }
         });
-        return require('enquirer').prompt(questions);
+        // Angular hands over a whole form at once; clack asks one question at a
+        // time, so they are run in order and the answers reassembled.
+        return (async () => {
+            const answers = {};
+            for (const question of questions) {
+                answers[question.name] = await askSchematicQuestion(question);
+            }
+            return answers;
+        })();
     };
+    async function askSchematicQuestion(question) {
+        const validate = question.validate
+            ? (value) => {
+                const result = question.validate(value);
+                if (result === true)
+                    return undefined;
+                return typeof result === 'string' ? result : 'Invalid value';
+            }
+            : undefined;
+        const choices = (question.choices ?? []).map((c) => typeof c === 'string' ? { value: c } : { value: c.name, label: c.message });
+        switch (question.type) {
+            case 'confirm':
+                return (0, prompt_helpers_1.confirmationPrompt)({
+                    message: question.message,
+                    initial: question.initial !== false,
+                });
+            case 'select':
+                return (0, prompt_helpers_1.selectPrompt)({
+                    message: question.message,
+                    choices,
+                    initial: question.initial,
+                });
+            case 'multiselect':
+                return (0, prompt_helpers_1.multiselectPrompt)({
+                    message: question.message,
+                    choices,
+                    initialValues: question.initial,
+                });
+            case 'numeral': {
+                // No numeric prompt; the answer is parsed back so callers still get a
+                // number rather than the typed string.
+                const answer = await (0, prompt_helpers_1.textPrompt)({
+                    message: question.message,
+                    initialValue: question.initial === undefined
+                        ? undefined
+                        : String(question.initial),
+                    validate: (value) => value !== '' && !Number.isNaN(Number(value))
+                        ? validate?.(value)
+                        : 'Please enter a number',
+                });
+                return Number(answer);
+            }
+            default:
+                return (0, prompt_helpers_1.textPrompt)({
+                    message: question.message,
+                    initialValue: question.initial,
+                    validate,
+                });
+        }
+    }
 }
 async function runMigration(root, packageName, migrationName, projects, isVerbose, projectGraph) {
     const logger = (0, exports.getLogger)(isVerbose);

package/dist/src/ai/set-up-ai-agents/set-up-ai-agents.js

@@ -7,7 +7,7 @@ const fs_1 = require("fs");
 const path_1 = require("path");
 const semver_1 = require("semver");
 const smol_toml_1 = tslib_1.__importDefault(require("smol-toml"));
-const format_changed_files_with_prettier_if_available_1 = require("../../generators/internal-utils/format-changed-files-with-prettier-if-available");
+const format_changed_files_1 = require("../../generators/internal-utils/format-changed-files");
 const generate_files_1 = require("../../generators/utils/generate-files");
 const json_1 = require("../../generators/utils/json");
 const native_1 = require("../../native");
@@ -234,7 +234,7 @@ async function setupAiAgentsGeneratorImpl(tree, options) {
     (0, ignore_1.addEntryToGitIgnore)(tree, (0, path_1.join)(options.directory, '.gitignore'), '.nx/polygraph');
     (0, ignore_1.addEntryToGitIgnore)(tree, (0, path_1.join)(options.directory, '.gitignore'), '.claude/worktrees');
     (0, ignore_1.addEntryToGitIgnore)(tree, (0, path_1.join)(options.directory, '.gitignore'), '.claude/settings.local.json');
-    await (0, format_changed_files_with_prettier_if_available_1.formatChangedFilesWithPrettierIfAvailable)(tree);
+    await (0, format_changed_files_1.formatChangedFiles)(tree);
     // we use the check variable to determine if we should actually make changes or just report what would be changed
     return async (check = false) => {
         const messages = [];

package/dist/src/command-line/completion/command-object.js

@@ -1,7 +1,7 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.yargsCompletionCommand = void 0;
-const enquirer_1 = require("enquirer");
+const prompt_helpers_1 = require("../../utils/prompt-helpers");
 const fs_1 = require("fs");
 const os_1 = require("os");
 const path_1 = require("path");
@@ -69,18 +69,13 @@ async function pickShellsInteractively() {
         process.exit(1);
     }
     const detected = detectAvailableShells();
-    const answer = (await (0, enquirer_1.prompt)({
-        type: 'multiselect',
-        name: 'shells',
+    return await (0, prompt_helpers_1.multiselectPrompt)({
         message: 'Install nx completion for which shell(s)?',
-        choices: SHELL_CHOICES.map((name) => ({
-            name,
-            value: name,
-            // Pre-check shells we can detect on this machine.
-            enabled: detected.has(name),
-        })),
-    }));
-    return answer.shells ?? [];
+        choices: SHELL_CHOICES,
+        // Pre-select shells we can detect on this machine.
+        initialValues: SHELL_CHOICES.filter((name) => detected.has(name)),
+        onCancel: () => [],
+    });
 }
 /** Best-effort detect-which-shells-the-user-has. Pre-checks the multiselect.
  *  Signals: $SHELL basename, presence of conventional rc files, $PSModulePath

package/dist/src/command-line/configure-ai-agents/configure-ai-agents.js

@@ -3,7 +3,7 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.configureAiAgentsHandler = configureAiAgentsHandler;
 exports.configureAiAgentsHandlerImpl = configureAiAgentsHandlerImpl;
 const tslib_1 = require("tslib");
-const enquirer_1 = require("enquirer");
+const prompt_helpers_1 = require("../../utils/prompt-helpers");
 const node_fs_1 = require("node:fs");
 const node_path_1 = require("node:path");
 const pc = tslib_1.__importStar(require("picocolors"));
@@ -63,8 +63,10 @@ async function configureAiAgentsHandler(args, inner = false) {
     await resetDaemonAgentStatus();
 }
 async function configureAiAgentsHandlerImpl(options) {
-    // Node 24 has stricter readline behavior, and enquirer is not checking for closed state
-    // when invoking operations, thus you get an ERR_USE_AFTER_CLOSE error.
+    // Node 24's stricter readline throws ERR_USE_AFTER_CLOSE when a prompt
+    // library operates on a closed interface. Added for enquirer, which nx no
+    // longer uses; verify against Node 24 before removing.
+    // TODO(v24): drop if @clack/prompts proves not to need it.
     process.on('uncaughtException', (error) => {
         if (error &&
             typeof error === 'object' &&
@@ -158,7 +160,7 @@ async function configureAiAgentsHandlerImpl(options) {
                     ...partiallyConfiguredAgents,
                     ...outOfDateAgents,
                     ...nonConfiguredAgents,
-                ].map((a) => getAgentChoiceForPrompt(a).message),
+                ].map((a) => getAgentChoiceForPrompt(a).label),
             });
             process.exit(1);
         }
@@ -239,26 +241,22 @@ async function configureAiAgentsHandlerImpl(options) {
     }
     // Interactive mode (or non-interactive with explicit --agents)
     const allAgentChoices = [];
-    const preselectedIndices = [];
-    let currentIndex = 0;
+    const preselectedAgents = [];
     // Partially configured agents first (highest priority)
     partiallyConfiguredAgents.forEach((a) => {
         allAgentChoices.push(getAgentChoiceForPrompt(a));
-        preselectedIndices.push(currentIndex);
-        currentIndex++;
+        preselectedAgents.push(a.name);
     });
     // Outdated agents second
     for (const a of fullyConfiguredAgents) {
         if (a.outdated) {
             allAgentChoices.push(getAgentChoiceForPrompt(a));
-            preselectedIndices.push(currentIndex);
-            currentIndex++;
+            preselectedAgents.push(a.name);
         }
     }
     // Non-configured agents last
     nonConfiguredAgents.forEach((a) => {
         allAgentChoices.push(getAgentChoiceForPrompt(a));
-        currentIndex++;
     });
     if (allAgentChoices.length === 0) {
         output_1.output.success({
@@ -270,18 +268,13 @@ async function configureAiAgentsHandlerImpl(options) {
     let selectedAgents;
     if (options.interactive !== false) {
         try {
-            selectedAgents = (await (0, enquirer_1.prompt)({
-                type: 'multiselect',
-                name: 'agents',
+            selectedAgents = await (0, prompt_helpers_1.multiselectPrompt)({
                 message: 'Which AI agents would you like to configure? (space to select, enter to confirm)',
                 choices: allAgentChoices,
-                initial: preselectedIndices,
+                initialValues: preselectedAgents,
                 required: true,
-                footer: function () {
-                    const focused = this.focused;
-                    return pc.dim(`  ${getAgentFooterDescription(focused.agentConfiguration)}`);
-                },
-            })).agents;
+                onCancel: () => process.exit(1),
+            });
         }
         catch {
             process.exit(1);
@@ -289,7 +282,7 @@ async function configureAiAgentsHandlerImpl(options) {
     }
     else {
         // non-interactive with explicit --agents: configure all requested
-        selectedAgents = allAgentChoices.map((a) => a.name);
+        selectedAgents = allAgentChoices.map((a) => a.value);
     }
     if (selectedAgents?.length === 0) {
         output_1.output.log({
@@ -388,10 +381,11 @@ function getAgentChoiceForPrompt(agent) {
     const partiallyConfigured = agent.mcp !== agent.rules;
     const needsUpdate = partiallyConfigured || agent.outdated;
     return {
-        name: agent.name,
-        message: needsUpdate
+        value: agent.name,
+        label: needsUpdate
             ? `${agent.displayName} (update available)`
             : agent.displayName,
+        hint: getAgentFooterDescription(agent),
         agentConfiguration: agent,
     };
 }

package/dist/src/command-line/format/format.js

@@ -2,9 +2,7 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.format = format;
 const tslib_1 = require("tslib");
-const node_child_process_1 = require("node:child_process");
 const path = tslib_1.__importStar(require("node:path"));
-const semver_1 = require("semver");
 const configuration_1 = require("../../config/configuration");
 const typescript_1 = require("../../plugins/js/utils/typescript");
 const affected_project_graph_1 = require("../../project-graph/affected/affected-project-graph");
@@ -13,59 +11,81 @@ const project_graph_1 = require("../../project-graph/project-graph");
 const chunkify_1 = require("../../utils/chunkify");
 const command_line_utils_1 = require("../../utils/command-line-utils");
 const fileutils_1 = require("../../utils/fileutils");
-const handle_import_1 = require("../../utils/handle-import");
+const formatters_1 = require("../../utils/formatters");
+const oxfmt_1 = require("../../utils/formatters/oxfmt");
+const prettier_1 = require("../../utils/formatters/prettier");
 const ignore_1 = require("../../utils/ignore");
 const object_sort_1 = require("../../utils/object-sort");
 const output_1 = require("../../utils/output");
-const package_json_1 = require("../../utils/package-json");
 const workspace_root_1 = require("../../utils/workspace-root");
+/**
+ * A table, not a `switch`: this lookup sits inside a `try` whose `catch`
+ * reports "configured but not installed", and a `never` arm would throw into
+ * that catch and be misreported. A missing member is a compile error here.
+ */
+const resolveFormatterBin = {
+    oxfmt: oxfmt_1.getOxfmtBinPath,
+    prettier: prettier_1.getPrettierPath,
+};
 async function format(command, args) {
-    let prettier;
+    const formatterType = (0, formatters_1.detectFormatter)(workspace_root_1.workspaceRoot);
+    if (!formatterType) {
+        output_1.output.warn({
+            title: 'No formatter configured.',
+            bodyLines: ['Install oxfmt or prettier to enable formatting.'],
+        });
+        return;
+    }
+    // Detection reads configuration only, so a workspace can be configured for a
+    // formatter that is not installed - a fresh clone, `--omit=dev` CI, a pruned
+    // node_modules. Resolving now turns a raw MODULE_NOT_FOUND into something
+    // actionable.
     try {
-        prettier = await (0, handle_import_1.handleImport)('prettier');
+        resolveFormatterBin[formatterType]();
     }
     catch {
         output_1.output.error({
-            title: 'Prettier is not installed.',
+            title: `${formatterType} is configured for this workspace but is not installed.`,
             bodyLines: [
-                `Please install "prettier" and try again, or don't run the "nx format:${command}" command.`,
+                `Install "${formatterType}" and try again, or remove its configuration to disable "nx format:${command}".`,
             ],
         });
         process.exit(1);
     }
     const { nxArgs } = (0, command_line_utils_1.splitArgsIntoNxArgsAndOverrides)(args, 'affected', { printWarnings: false }, (0, configuration_1.readNxJson)());
-    const patterns = (await getPatterns(prettier, { ...args, ...nxArgs })).map((p) => {
-        // On non-Windows, escape $ to prevent shell variable interpolation
-        // (the shell consumes one \, so \\$ becomes \$ which the shell treats as literal $)
-        // On Windows (cmd.exe), $ is not a special character, so escaping it would
-        // cause prettier to look for a file with a literal \$ in the name
-        // prettier-ignore
-        const escaped = process.platform !== 'win32' ? p.replace(/\$/g, '\\\$') : p;
-        return `"${escaped}"`;
+    // Patterns are kept raw here. Prettier is invoked through a shell so it
+    // quotes them at the call site; oxfmt is invoked with execFile and needs
+    // the unquoted paths.
+    const patterns = await getPatterns(formatterType, {
+        ...args,
+        ...nxArgs,
     });
-    // Chunkify the patterns array to prevent crashing the windows terminal
-    const chunkList = (0, chunkify_1.chunkify)(patterns);
+    // Chunkify the patterns array to prevent crashing the windows terminal.
+    // The prettier path quotes each pattern on its way to the shell, so size the
+    // chunks against that; oxfmt goes through execFile and gets them raw.
+    const chunkList = (0, chunkify_1.chunkify)(patterns, undefined, formatterType === 'prettier'
+        ? (pattern) => (0, prettier_1.quoteForShell)(pattern).length
+        : undefined);
     switch (command) {
         case 'write':
             if (nxArgs.sortRootTsconfigPaths) {
                 sortTsConfig();
             }
             addRootConfigFiles(chunkList, nxArgs);
-            chunkList.forEach((chunk) => write(prettier, chunk));
+            chunkList.forEach((chunk) => write(formatterType, chunk));
             break;
         case 'check': {
             const filesWithDifferentFormatting = [];
             for (const chunk of chunkList) {
-                const files = await check(chunk);
+                const files = await check(formatterType, chunk);
                 filesWithDifferentFormatting.push(...files);
             }
             if (filesWithDifferentFormatting.length > 0) {
                 if (nxArgs.verbose) {
                     output_1.output.error({
-                        title: 'The following files are not formatted correctly based on your Prettier configuration',
+                        title: 'The following files are not formatted correctly',
                         bodyLines: [
                             '- Run "nx format:write" and commit the resulting diff to fix these files.',
-                            '- Please note, Prettier does not support a native way to diff the output of its check logic (https://github.com/prettier/prettier/issues/6885).',
                             '',
                             ...filesWithDifferentFormatting,
                         ],
@@ -80,7 +100,7 @@ async function format(command, args) {
         }
     }
 }
-async function getPatterns(prettier, args) {
+async function getPatterns(formatterType, args) {
     const allFilesPattern = ['.'];
     if (args.all) {
         return allFilesPattern;
@@ -91,16 +111,16 @@ async function getPatterns(prettier, args) {
             return getPatternsFromProjects(args.projects, graph);
         }
         const p = (0, command_line_utils_1.parseFiles)(args);
-        const supportedExtensions = new Set((await prettier.getSupportInfo()).languages
-            .flatMap((language) => language.extensions)
-            .filter((extension) => !!extension)
-            // Prettier supports ".swcrc" as a file instead of an extension
-            // So we add ".swcrc" as a supported extension manually
-            // which allows it to be considered for calculating "patterns"
-            .concat('.swcrc'));
-        const patterns = p.files
+        // Deleted files still show up in the changed-file set, and neither
+        // formatter should be handed a path that is no longer there.
+        let patterns = p.files
             .map((f) => path.relative(workspace_root_1.workspaceRoot, f))
-            .filter((f) => (0, fileutils_1.fileExists)(f) && supportedExtensions.has(path.extname(f)));
+            .filter((f) => (0, fileutils_1.fileExists)(f));
+        if (formatterType === 'prettier') {
+            // oxfmt needs no equivalent filter - it silently skips file types it
+            // does not handle, and its base args keep an all-skipped run green.
+            patterns = await (0, prettier_1.filterToPrettierSupportedFiles)(patterns);
+        }
         // exclude patterns in .nxignore or .gitignore
         const nonIgnoredPatterns = (0, ignore_1.getIgnoreObject)().filter(patterns);
         if (args.libsAndApps) {
@@ -130,13 +150,10 @@ function addRootConfigFiles(chunkList, nxArgs) {
     }
     const chunk = [];
     const addToChunkIfNeeded = (file) => {
-        if (chunkList.every((c) => !c.includes(`"${file}"`))) {
+        if (chunkList.every((c) => !c.includes(file))) {
             chunk.push(file);
         }
     };
-    // if (workspaceJsonPath) {
-    //   addToChunkIfNeeded(workspaceJsonPath);
-    // }
     ['nx.json', (0, typescript_1.getRootTsConfigFileName)()]
         .filter(Boolean)
         .forEach(addToChunkIfNeeded);
@@ -147,49 +164,43 @@ function addRootConfigFiles(chunkList, nxArgs) {
 function getPatternsFromProjects(projects, projectGraph) {
     return (0, command_line_utils_1.getProjectRoots)(projects, projectGraph);
 }
-function write(prettier, patterns) {
-    if (patterns.length > 0) {
-        const [swcrcPatterns, regularPatterns] = patterns.reduce((result, pattern) => {
-            result[pattern.includes('.swcrc') ? 0 : 1].push(pattern);
-            return result;
-        }, [[], []]);
-        const prettierPath = getPrettierPath();
-        const listDifferentArg = shouldUseListDifferent(prettier.version)
-            ? '--list-different '
-            : '';
-        (0, node_child_process_1.execSync)(`node "${prettierPath}" --write ${listDifferentArg}${regularPatterns.join(' ')}`, {
-            stdio: [0, 1, 2],
-            windowsHide: true,
-        });
-        if (swcrcPatterns.length > 0) {
-            (0, node_child_process_1.execSync)(`node "${prettierPath}" --write ${listDifferentArg}${swcrcPatterns.join(' ')} --parser json`, {
-                stdio: [0, 1, 2],
-                windowsHide: true,
-            });
+function write(formatterType, patterns) {
+    if (patterns.length === 0) {
+        return;
+    }
+    switch (formatterType) {
+        case 'oxfmt':
+            (0, oxfmt_1.writeWithOxfmt)(patterns);
+            break;
+        case 'prettier':
+            (0, prettier_1.writeWithPrettier)(patterns);
+            break;
+        default: {
+            // Without this, an unhandled formatter makes `nx format:write` exit 0
+            // having formatted nothing, while `check()` throws - the two halves of
+            // the same command disagreeing.
+            const unhandled = formatterType;
+            throw new Error(`Unhandled formatter: ${unhandled}`);
         }
     }
 }
-async function check(patterns) {
+async function check(formatterType, patterns) {
     if (patterns.length === 0) {
         return [];
     }
-    const prettierPath = getPrettierPath();
-    return new Promise((resolve, reject) => {
-        (0, node_child_process_1.exec)(`node "${prettierPath}" --list-different ${patterns.join(' ')}`, { encoding: 'utf-8', windowsHide: true }, (error, stdout) => {
-            if (error) {
-                // The command failed because Prettier threw an error.
-                if (stdout.length === 0) {
-                    reject(error);
-                }
-                // The command failed so there are files with different formatting. Prettier writes them to stdout, newline separated.
-                resolve(stdout.trim().split('\n'));
-            }
-            else {
-                // The command succeeded so there are no files with different formatting
-                resolve([]);
-            }
-        });
-    });
+    switch (formatterType) {
+        case 'oxfmt':
+            return (0, oxfmt_1.checkWithOxfmt)(patterns);
+        case 'prettier':
+            return (0, prettier_1.checkWithPrettier)(patterns);
+        default: {
+            // `strict: false` does not make a missing case an error on its own, but
+            // it does reject this assignment - so adding a formatter fails to compile
+            // here instead of returning undefined into a caller that spreads it.
+            const unhandled = formatterType;
+            throw new Error(`Unhandled formatter: ${unhandled}`);
+        }
+    }
 }
 function sortTsConfig() {
     try {
@@ -203,31 +214,3 @@ function sortTsConfig() {
         // catch noop
     }
 }
-let prettierPath;
-function getPrettierPath() {
-    if (prettierPath) {
-        return prettierPath;
-    }
-    const { packageJson, path: packageJsonPath } = (0, package_json_1.readModulePackageJson)('prettier');
-    const bin = packageJson.bin;
-    const binPath = typeof bin === 'string' ? bin : bin?.['prettier'];
-    if (!binPath) {
-        throw new Error(`Could not find prettier binary in ${packageJsonPath}`);
-    }
-    prettierPath = path.resolve(path.dirname(packageJsonPath), binPath);
-    return prettierPath;
-}
-let useListDifferent;
-/**
- * Determines if --list-different should be used with --write.
- * Prettier 4+ and 3.6.x with experimental CLI don't support combining these flags.
- */
-function shouldUseListDifferent(prettierVersion) {
-    if (useListDifferent !== undefined) {
-        return useListDifferent;
-    }
-    const prettierMajor = (0, semver_1.major)(prettierVersion);
-    const isExperimentalCli = process.env.PRETTIER_EXPERIMENTAL_CLI === '1';
-    useListDifferent = prettierMajor < 4 && !isExperimentalCli;
-    return useListDifferent;
-}

package/dist/src/command-line/generate/generate.js

@@ -6,7 +6,7 @@ exports.printGenHelp = printGenHelp;
 exports.generate = generate;
 const tslib_1 = require("tslib");
 const pc = tslib_1.__importStar(require("picocolors"));
-const enquirer_1 = require("enquirer");
+const prompt_helpers_1 = require("../../utils/prompt-helpers");
 const path_1 = require("path");
 const configuration_1 = require("../../config/configuration");
 const tree_1 = require("../../generators/tree");
@@ -91,42 +91,42 @@ async function promptForCollection(generatorName, interactive, projectsConfigura
         throwInvalidInvocation(Array.from(choicesMap));
     }
     else if (interactive && choices.length > 1) {
-        const noneOfTheAbove = `\nNone of the above`;
+        const noneOfTheAbove = `None of the above`;
+        // Blank line before the last entry. The newline has to trail the choice
+        // *before* the gap: a leading one would land between the following
+        // choice's radio marker and its text, splitting that row in two.
+        const beforeGap = choices.length - 1;
         choices.push(noneOfTheAbove);
-        let { generator, customCollection } = await (0, enquirer_1.prompt)([
-            {
-                name: 'generator',
-                message: `Which generator would you like to use?`,
-                type: 'autocomplete',
-                // enquirer's typings are incorrect here... It supports (string | Choice)[], but is typed as (string[] | Choice[])
-                choices: choices,
-            },
-            {
-                name: 'customCollection',
-                type: 'input',
-                message: `Which collection would you like to use?`,
-                skip: function () {
-                    // Skip this question if the user did not answer None of the above
-                    return this.state.answers.generator !== noneOfTheAbove;
-                },
-                validate: function (value) {
-                    if (this.skipped) {
-                        return true;
-                    }
-                    try {
-                        (0, generator_utils_1.getGeneratorInformation)(value, generatorName, workspace_root_1.workspaceRoot, projectsConfiguration.projects);
-                        return true;
-                    }
-                    catch {
-                        logger_1.logger.error(`\nCould not find ${value}:${generatorName}`);
-                        return false;
-                    }
-                },
+        const generator = await (0, prompt_helpers_1.selectPrompt)({
+            message: `Which generator would you like to use?`,
+            // Local-plugin entries carry a separate display label; the rest are
+            // plain collection names. Only the label takes the newline, so the
+            // value still resolves as a collection name.
+            choices: choices.map((c, i) => {
+                const choice = typeof c === 'string'
+                    ? { value: c, label: c }
+                    : { value: c.value, label: c.message };
+                return i === beforeGap && !choice.label.endsWith('\n')
+                    ? { ...choice, label: `${choice.label}\n` }
+                    : choice;
+            }),
+        });
+        if (generator !== noneOfTheAbove) {
+            return generator;
+        }
+        const customCollection = await (0, prompt_helpers_1.textPrompt)({
+            message: `Which collection would you like to use?`,
+            validate: (value) => {
+                try {
+                    (0, generator_utils_1.getGeneratorInformation)(value, generatorName, workspace_root_1.workspaceRoot, projectsConfiguration.projects);
+                    return undefined;
+                }
+                catch {
+                    return `Could not find ${value}:${generatorName}`;
+                }
             },
-        ]);
-        return customCollection
-            ? `${customCollection}:${generatorName}`
-            : generator;
+        });
+        return `${customCollection}:${generatorName}`;
     }
     else if (deprecatedChoices.size > 0) {
         throw new Error([