nx 23.2.0-beta.0 → 23.2.0-beta.10

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([

package/dist/src/command-line/graph/graph.d.ts

@@ -50,6 +50,7 @@ export declare function generateGraph(args: {
     exclude?: string[];
     affected?: boolean;
 }, affectedProjects: string[]): Promise<void>;
+export declare function getExpandedTaskInputs(depGraphClientResponse: ProjectGraphClientResponse, expandedTaskInputsCache: Map<string, Record<string, string[]>>, taskId: string): Promise<Record<string, string[]>>;
 /**
  * The data type that `nx graph --file graph.json` or `nx build --graph graph.json` contains
  */

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

@@ -1,6 +1,7 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.generateGraph = generateGraph;
+exports.getExpandedTaskInputs = getExpandedTaskInputs;
 const tslib_1 = require("tslib");
 const crypto_1 = require("crypto");
 const node_child_process_1 = require("node:child_process");
@@ -9,7 +10,6 @@ const daemon_socket_messenger_1 = require("../../daemon/client/daemon-socket-mes
 const http = tslib_1.__importStar(require("node:http"));
 const minimatch_1 = require("minimatch");
 const node_url_1 = require("node:url");
-const open_1 = tslib_1.__importDefault(require("open"));
 const node_path_1 = require("node:path");
 const net = tslib_1.__importStar(require("node:net"));
 const node_perf_hooks_1 = require("node:perf_hooks");
@@ -34,6 +34,7 @@ const create_task_hasher_1 = require("../../hasher/create-task-hasher");
 const task_env_1 = require("../../tasks-runner/task-env");
 const error_types_1 = require("../../project-graph/error-types");
 const nx_cloud_utils_1 = require("../../utils/nx-cloud-utils");
+const split_target_1 = require("../../utils/split-target");
 // maps file extention to MIME types
 const mimeType = {
     '.ico': 'image/x-icon',
@@ -349,7 +350,11 @@ async function generateGraph(args, affectedProjects) {
             title: `Project graph started at ${url.toString()}`,
         });
         if (args.open) {
-            (0, open_1.default)(url.toString());
+            new Function('return import("open")')()
+                .then((m) => m.default(url.toString()))
+                .catch(() => {
+                // Ignore errors when opening browser (e.g. no browser available)
+            });
         }
         return new Promise((res) => {
             app.once('close', res);
@@ -438,7 +443,7 @@ async function startServer(html, environmentJs, host, port = 4211, watchForChang
             node_perf_hooks_1.performance.mark('task input generation:start');
             const taskId = parsedUrl.searchParams.get('taskId');
             res.writeHead(200, { 'Content-Type': 'application/json' });
-            const inputs = await getExpandedTaskInputs(taskId);
+            const inputs = await getExpandedTaskInputs(currentProjectGraphClientResponse, expandedTaskInputsCache, taskId);
             node_perf_hooks_1.performance.mark('task input generation:end');
             res.end(JSON.stringify({ [taskId]: inputs }));
             node_perf_hooks_1.performance.measure('task input generation', 'task input generation:start', 'task input generation:end');
@@ -823,19 +828,23 @@ async function createTaskGraphForTargetsAndProjects(targetNames, projectNames, c
         };
     }
 }
-async function getExpandedTaskInputs(taskId) {
+async function getExpandedTaskInputs(depGraphClientResponse, expandedTaskInputsCache, taskId) {
     // Check cache first
     if (expandedTaskInputsCache.has(taskId)) {
         return expandedTaskInputsCache.get(taskId);
     }
     // Use the optimized version that only creates the specific task graph needed
-    const [projectName, targetName, configuration] = taskId.split(':');
+    // Use colon-aware splitting so that target names containing colons
+    // (e.g. "test:integration") are parsed correctly instead of being
+    // mistaken for a target + configuration pair.
+    const projectNodes = Object.fromEntries(depGraphClientResponse.projects.map((p) => [p.name, p]));
+    const [projectName, targetName, configuration] = (0, split_target_1.splitTargetFromNodes)(taskId, projectNodes, { silent: true });
     const taskGraphResponse = await createTaskGraphForTargetsAndProjects([targetName], [projectName], configuration);
     const allWorkspaceFiles = await (0, all_file_data_1.allFileData)();
     const inputs = taskGraphResponse.plans?.[taskId];
     let result = {};
     if (inputs) {
-        result = expandInputs(inputs, currentProjectGraphClientResponse.projects.find((p) => p.name === projectName), allWorkspaceFiles, currentProjectGraphClientResponse);
+        result = expandInputs(inputs, depGraphClientResponse.projects.find((p) => p.name === projectName), allWorkspaceFiles, depGraphClientResponse);
     }
     // Cache the result
     expandedTaskInputsCache.set(taskId, result);

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

@@ -8,7 +8,7 @@ const pc = tslib_1.__importStar(require("picocolors"));
 const git_utils_1 = require("../../utils/git-utils");
 const promises_1 = require("node:fs/promises");
 const tmp_1 = require("tmp");
-const enquirer_1 = require("enquirer");
+const prompt_helpers_1 = require("../../utils/prompt-helpers");
 const output_1 = require("../../utils/output");
 const createSpinner = require('ora');
 const init_v2_1 = require("../init/init-v2");
@@ -23,10 +23,10 @@ const prepare_source_repo_1 = require("./utils/prepare-source-repo");
 const merge_remote_source_1 = require("./utils/merge-remote-source");
 const minimatch_1 = require("minimatch");
 const configure_plugins_1 = require("../init/configure-plugins");
+const format_1 = require("../init/implementation/format");
 const check_compatible_with_plugins_1 = require("../init/implementation/check-compatible-with-plugins");
 const native_1 = require("../../native");
 const ai_output_1 = require("./utils/ai-output");
-const init_v2_2 = require("../init/init-v2");
 const importRemoteName = '__tmp_nx_import__';
 async function importHandler(options) {
     process.env.NX_RUNNING_NX_IMPORT = 'true';
@@ -77,14 +77,10 @@ async function importHandler(options) {
     }
     const tempImportDirectory = (0, path_1.join)(tmp_1.tmpdir, 'nx-import');
     if (!sourceRepository) {
-        sourceRepository = (await (0, enquirer_1.prompt)([
-            {
-                type: 'input',
-                name: 'sourceRepository',
-                message: 'What is the URL of the repository you want to import? (This can be a local git repository or a git remote URL)',
-                required: true,
-            },
-        ])).sourceRepository;
+        sourceRepository = await (0, prompt_helpers_1.textPrompt)({
+            message: 'What is the URL of the repository you want to import? (This can be a local git repository or a git remote URL)',
+            validate: (value) => (value ? undefined : 'A repository is required'),
+        });
     }
     try {
         const maybeLocalDirectory = await (0, promises_1.stat)(sourceRepository);
@@ -132,19 +128,10 @@ async function importHandler(options) {
             throw new Error('The --ref option is required when running in agent mode.');
         }
         const branchChoices = await sourceGitClient.listBranches();
-        ref = (await (0, enquirer_1.prompt)([
-            {
-                type: 'autocomplete',
-                name: 'ref',
-                message: `Which branch do you want to import?`,
-                choices: branchChoices,
-                /**
-                 * Limit the number of choices so that it fits on screen
-                 */
-                limit: process.stdout.rows - 3,
-                required: true,
-            },
-        ])).ref;
+        ref = await (0, prompt_helpers_1.selectPrompt)({
+            message: `Which branch do you want to import?`,
+            choices: branchChoices,
+        });
     }
     if (!source) {
         if (aiMode) {
@@ -152,28 +139,20 @@ async function importHandler(options) {
             source = '.';
         }
         else {
-            source = (await (0, enquirer_1.prompt)([
-                {
-                    type: 'input',
-                    name: 'source',
-                    message: `Which directory do you want to import into this workspace? (leave blank to import the entire repository)`,
-                },
-            ])).source;
+            source = await (0, prompt_helpers_1.textPrompt)({
+                message: `Which directory do you want to import into this workspace? (leave blank to import the entire repository)`,
+            });
         }
     }
     if (!destination) {
         if (aiMode) {
             throw new Error('The --destination option is required when running in agent mode.');
         }
-        destination = (await (0, enquirer_1.prompt)([
-            {
-                type: 'input',
-                name: 'destination',
-                message: 'Where in this workspace should the code be imported into?',
-                required: true,
-                initial: source ? source : undefined,
-            },
-        ])).destination;
+        destination = await (0, prompt_helpers_1.textPrompt)({
+            message: 'Where in this workspace should the code be imported into?',
+            initialValue: source ? source : undefined,
+            validate: (value) => (value ? undefined : 'A destination is required'),
+        });
     }
     const absSource = (0, path_1.join)(sourceTempRepoPath, source);
     if ((0, path_1.isAbsolute)(destination)) {
@@ -282,6 +261,7 @@ async function importHandler(options) {
             const incompatiblePlugins = await (0, check_compatible_with_plugins_1.checkCompatibleWithPlugins)();
             if (Object.keys(incompatiblePlugins).length > 0) {
                 (0, check_compatible_with_plugins_1.updatePluginsInNxJson)(workspace_root_1.workspaceRoot, incompatiblePlugins);
+                await (0, format_1.formatInitWrites)(workspace_root_1.workspaceRoot, 'nx import');
                 await destinationGitClient.amendCommit();
             }
         }
@@ -290,6 +270,7 @@ async function importHandler(options) {
             if (installed) {
                 const { succeededPlugins } = await (0, configure_plugins_1.configurePlugins)(plugins, updatePackageScripts, pmc, workspace_root_1.workspaceRoot, verbose);
                 if (succeededPlugins.length > 0) {
+                    await (0, format_1.formatInitWrites)(workspace_root_1.workspaceRoot, 'nx import');
                     await destinationGitClient.amendCommit();
                 }
             }
@@ -361,7 +342,7 @@ async function importHandler(options) {
             (0, ai_output_1.writeAiOutput)((0, ai_output_1.buildImportNeedsPluginSelectionResult)({
                 detectedPlugins: detectedButNotInstalled.map((name) => ({
                     name,
-                    reason: (0, init_v2_2.getPluginReason)(name),
+                    reason: (0, init_v2_1.getPluginReason)(name),
                 })),
                 sourceRepository,
                 ref,
@@ -456,6 +437,7 @@ async function handlePluginOnlyMode(options, destinationGitClient, verbose) {
         if (installed) {
             const { succeededPlugins } = await (0, configure_plugins_1.configurePlugins)(plugins, updatePackageScripts, pmc, workspace_root_1.workspaceRoot, verbose);
             if (succeededPlugins.length > 0) {
+                await (0, format_1.formatInitWrites)(workspace_root_1.workspaceRoot, 'nx import');
                 await destinationGitClient.amendCommit();
             }
         }
@@ -490,6 +472,7 @@ async function runInstallDestinationRepo(packageManager, destinationGitClient) {
             title: 'Installing dependencies for imported code',
         });
         (0, utils_1.runInstall)(workspace_root_1.workspaceRoot, packageManager, (0, package_manager_1.getPackageManagerCommand)(packageManager));
+        await (0, format_1.formatInitWrites)(workspace_root_1.workspaceRoot, 'nx import');
         await destinationGitClient.amendCommit();
     }
     catch (e) {
@@ -506,6 +489,7 @@ async function runPluginsInstall(plugins, pmc, destinationGitClient) {
     output_1.output.log({ title: 'Installing Plugins' });
     try {
         (0, configure_plugins_1.installPluginPackages)(workspace_root_1.workspaceRoot, pmc, plugins);
+        await (0, format_1.formatInitWrites)(workspace_root_1.workspaceRoot, 'nx import');
         await destinationGitClient.amendCommit();
     }
     catch (e) {
@@ -583,6 +567,12 @@ async function handleMissingWorkspacesEntry(pm, pmc, pkgPath, destinationGitClie
             return;
         }
         (0, package_manager_1.addPackagePathToWorkspaces)(pkgPath, pm, workspaces, workspace_root_1.workspaceRoot);
+        // That helper is shared, so it does not record for us - without this the
+        // drain below has nothing to do and the rewritten file ships unformatted.
+        // It writes pnpm-workspace.yaml for pnpm and package.json for the rest, so
+        // recording package.json unconditionally records a file it never touched.
+        (0, format_1.recordInitWrite)((0, path_1.join)(workspace_root_1.workspaceRoot, pm === 'pnpm' ? 'pnpm-workspace.yaml' : 'package.json'));
+        await (0, format_1.formatInitWrites)(workspace_root_1.workspaceRoot, 'nx import');
         await destinationGitClient.amendCommit();
         output_1.output.success({
             title: `Project added in workspaces`,

package/dist/src/command-line/init/ai-agent-prompts.d.ts

@@ -1,2 +1,2 @@
 import { Agent } from '../../ai/utils';
-export declare function determineAiAgents(aiAgents?: Agent[], interactive?: boolean): Promise<Agent[]>;
+export declare function determineAiAgents(aiAgents?: (Agent | 'none')[], interactive?: boolean): Promise<Agent[]>;