nx 22.0.0-beta.0 → 22.0.0-beta.2

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "nx",
-  "version": "22.0.0-beta.0",
+  "version": "22.0.0-beta.2",
   "private": false,
   "description": "The core Nx plugin contains the core functionality of Nx like the project graph, nx commands and task orchestration.",
   "repository": {
@@ -49,7 +49,7 @@
     "figures": "3.2.0",
     "flat": "^5.0.2",
     "front-matter": "^4.0.2",
-    "ignore": "^5.0.4",
+    "ignore": "^7.0.5",
     "jest-diff": "^30.0.2",
     "jsonc-parser": "3.2.0",
     "lines-and-columns": "2.0.3",
@@ -83,16 +83,16 @@
     }
   },
   "optionalDependencies": {
-    "@nx/nx-darwin-arm64": "*",
-    "@nx/nx-darwin-x64": "*",
-    "@nx/nx-freebsd-x64": "*",
-    "@nx/nx-linux-arm-gnueabihf": "*",
-    "@nx/nx-linux-arm64-gnu": "*",
-    "@nx/nx-linux-arm64-musl": "*",
-    "@nx/nx-linux-x64-gnu": "*",
-    "@nx/nx-linux-x64-musl": "*",
-    "@nx/nx-win32-arm64-msvc": "*",
-    "@nx/nx-win32-x64-msvc": "*"
+    "@nx/nx-darwin-arm64": "22.0.0-beta.2",
+    "@nx/nx-darwin-x64": "22.0.0-beta.2",
+    "@nx/nx-freebsd-x64": "22.0.0-beta.2",
+    "@nx/nx-linux-arm-gnueabihf": "22.0.0-beta.2",
+    "@nx/nx-linux-arm64-gnu": "22.0.0-beta.2",
+    "@nx/nx-linux-arm64-musl": "22.0.0-beta.2",
+    "@nx/nx-linux-x64-gnu": "22.0.0-beta.2",
+    "@nx/nx-linux-x64-musl": "22.0.0-beta.2",
+    "@nx/nx-win32-arm64-msvc": "22.0.0-beta.2",
+    "@nx/nx-win32-x64-msvc": "22.0.0-beta.2"
   },
   "nx-migrations": {
     "migrations": "./migrations.json",

package/src/ai/utils.d.ts

@@ -2,6 +2,8 @@ export declare const supportedAgents: readonly ["claude", "codex", "copilot", "c
 export type Agent = (typeof supportedAgents)[number];
 export declare const agentDisplayMap: Record<Agent, string>;
 export type AgentConfiguration = {
+    name: Agent;
+    displayName: string;
     rules: boolean;
     mcp: boolean;
     rulesPath: string;
@@ -10,11 +12,10 @@ export type AgentConfiguration = {
     disabled?: boolean;
 };
 export declare function getAgentConfigurations(agentsToConsider: Agent[], workspaceRoot: string): Promise<{
-    nonConfiguredAgents: Agent[];
-    partiallyConfiguredAgents: Agent[];
-    fullyConfiguredAgents: Agent[];
-    disabledAgents: Agent[];
-    agentConfigurations: Map<Agent, AgentConfiguration>;
+    nonConfiguredAgents: AgentConfiguration[];
+    partiallyConfiguredAgents: AgentConfiguration[];
+    fullyConfiguredAgents: AgentConfiguration[];
+    disabledAgents: AgentConfiguration[];
 }>;
 export declare function configureAgents(agents: Agent[], workspaceRoot: string, useLatest?: boolean): Promise<void>;
 //# sourceMappingURL=utils.d.ts.map

package/src/ai/utils.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"utils.d.ts","sourceRoot":"","sources":["../../../../../packages/nx/src/ai/utils.ts"],"names":[],"mappings":"AA0BA,eAAO,MAAM,eAAe,6DAMlB,CAAC;AACX,MAAM,MAAM,KAAK,GAAG,CAAC,OAAO,eAAe,CAAC,CAAC,MAAM,CAAC,CAAC;AACrD,eAAO,MAAM,eAAe,EAAE,MAAM,CAAC,KAAK,EAAE,MAAM,CAMjD,CAAC;AAEF,MAAM,MAAM,kBAAkB,GAAG;IAC/B,KAAK,EAAE,OAAO,CAAC;IACf,GAAG,EAAE,OAAO,CAAC;IACb,SAAS,EAAE,MAAM,CAAC;IAClB,OAAO,EAAE,MAAM,GAAG,IAAI,CAAC;IACvB,QAAQ,EAAE,OAAO,CAAC;IAClB,QAAQ,CAAC,EAAE,OAAO,CAAC;CACpB,CAAC;AAEF,wBAAsB,sBAAsB,CAC1C,gBAAgB,EAAE,KAAK,EAAE,EACzB,aAAa,EAAE,MAAM,GACpB,OAAO,CAAC;IACT,mBAAmB,EAAE,KAAK,EAAE,CAAC;IAC7B,yBAAyB,EAAE,KAAK,EAAE,CAAC;IACnC,qBAAqB,EAAE,KAAK,EAAE,CAAC;IAC/B,cAAc,EAAE,KAAK,EAAE,CAAC;IACxB,mBAAmB,EAAE,GAAG,CAAC,KAAK,EAAE,kBAAkB,CAAC,CAAC;CACrD,CAAC,CA8BD;AA8ID,wBAAsB,eAAe,CACnC,MAAM,EAAE,KAAK,EAAE,EACf,aAAa,EAAE,MAAM,EACrB,SAAS,CAAC,EAAE,OAAO,GAClB,OAAO,CAAC,IAAI,CAAC,CAoBf"}
+{"version":3,"file":"utils.d.ts","sourceRoot":"","sources":["../../../../../packages/nx/src/ai/utils.ts"],"names":[],"mappings":"AA0BA,eAAO,MAAM,eAAe,6DAMlB,CAAC;AACX,MAAM,MAAM,KAAK,GAAG,CAAC,OAAO,eAAe,CAAC,CAAC,MAAM,CAAC,CAAC;AACrD,eAAO,MAAM,eAAe,EAAE,MAAM,CAAC,KAAK,EAAE,MAAM,CAMjD,CAAC;AAEF,MAAM,MAAM,kBAAkB,GAAG;IAC/B,IAAI,EAAE,KAAK,CAAC;IACZ,WAAW,EAAE,MAAM,CAAC;IACpB,KAAK,EAAE,OAAO,CAAC;IACf,GAAG,EAAE,OAAO,CAAC;IACb,SAAS,EAAE,MAAM,CAAC;IAClB,OAAO,EAAE,MAAM,GAAG,IAAI,CAAC;IACvB,QAAQ,EAAE,OAAO,CAAC;IAClB,QAAQ,CAAC,EAAE,OAAO,CAAC;CACpB,CAAC;AAEF,wBAAsB,sBAAsB,CAC1C,gBAAgB,EAAE,KAAK,EAAE,EACzB,aAAa,EAAE,MAAM,GACpB,OAAO,CAAC;IACT,mBAAmB,EAAE,kBAAkB,EAAE,CAAC;IAC1C,yBAAyB,EAAE,kBAAkB,EAAE,CAAC;IAChD,qBAAqB,EAAE,kBAAkB,EAAE,CAAC;IAC5C,cAAc,EAAE,kBAAkB,EAAE,CAAC;CACtC,CAAC,CA2BD;AAsJD,wBAAsB,eAAe,CACnC,MAAM,EAAE,KAAK,EAAE,EACf,aAAa,EAAE,MAAM,EACrB,SAAS,CAAC,EAAE,OAAO,GAClB,OAAO,CAAC,IAAI,CAAC,CAoBf"}

package/src/ai/utils.js

@@ -34,22 +34,20 @@ async function getAgentConfigurations(agentsToConsider, workspaceRoot) {
     const partiallyConfiguredAgents = [];
     const fullyConfiguredAgents = [];
     const disabledAgents = [];
-    const agentConfigurations = new Map();
     for (const agent of agentsToConsider) {
-        const configured = await getAgentConfiguration(agent, workspaceRoot);
-        if (configured.disabled) {
-            disabledAgents.push(agent);
+        const configuration = await getAgentConfiguration(agent, workspaceRoot);
+        if (configuration.disabled) {
+            disabledAgents.push(configuration);
             continue;
         }
-        agentConfigurations.set(agent, configured);
-        if (configured.mcp && configured.rules) {
-            fullyConfiguredAgents.push(agent);
+        if (configuration.mcp && configuration.rules) {
+            fullyConfiguredAgents.push(configuration);
         }
-        else if (!configured.mcp && !configured.rules) {
-            nonConfiguredAgents.push(agent);
+        else if (!configuration.mcp && !configuration.rules) {
+            nonConfiguredAgents.push(configuration);
         }
         else {
-            partiallyConfiguredAgents.push(agent);
+            partiallyConfiguredAgents.push(configuration);
         }
     }
     return {
@@ -57,7 +55,6 @@ async function getAgentConfigurations(agentsToConsider, workspaceRoot) {
         partiallyConfiguredAgents,
         fullyConfiguredAgents,
         disabledAgents,
-        agentConfigurations,
     };
 }
 async function getAgentConfiguration(agent, workspaceRoot) {
@@ -158,10 +155,14 @@ async function getAgentConfiguration(agent, workspaceRoot) {
     }
     return {
         ...agentConfiguration,
-        outdated: await isAgentOutdated(agent, workspaceRoot),
+        outdated: agentConfiguration.mcp &&
+            agentConfiguration.rules &&
+            (await agentWouldChangeWithGenerator(agent, workspaceRoot)),
+        name: agent,
+        displayName: exports.agentDisplayMap[agent],
     };
 }
-async function isAgentOutdated(agent, workspaceRoot) {
+async function agentWouldChangeWithGenerator(agent, workspaceRoot) {
     const tree = new tree_1.FsTree(workspaceRoot, false);
     const callback = await (0, set_up_ai_agents_1.default)(tree, {
         directory: '.',

package/src/command-line/affected/affected.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"affected.d.ts","sourceRoot":"","sources":["../../../../../../packages/nx/src/command-line/affected/affected.ts"],"names":[],"mappings":"AAIA,OAAO,KAAK,EAAE,MAAM,EAAE,MAAM,gCAAgC,CAAC;AAQ7D,OAAO,EACL,YAAY,EACZ,uBAAuB,EACxB,MAAM,4BAA4B,CAAC;AAGpC,OAAO,EAAE,sBAAsB,EAAE,MAAM,0CAA0C,CAAC;AAMlF,wBAAsB,QAAQ,CAC5B,OAAO,EAAE,OAAO,GAAG,gBAAgB,GAAG,UAAU,EAChD,IAAI,EAAE;IAAE,CAAC,CAAC,EAAE,MAAM,GAAG,GAAG,CAAA;CAAE,EAC1B,uBAAuB,GAAE,MAAM,CAC7B,MAAM,EACN,CAAC,sBAAsB,GAAG,MAAM,CAAC,EAAE,CAC/B,EACN,YAAY,GAGP;IACH,uBAAuB,EAAE,OAAO,CAAC;IACjC,eAAe,EAAE,OAAO,CAAC;CAC1B,GACA,OAAO,CAAC,IAAI,CAAC,CAiEf;AAED,wBAAsB,qBAAqB,CACzC,MAAM,EAAE,MAAM,EACd,YAAY,EAAE,YAAY,GACzB,OAAO,CAAC,uBAAuB,EAAE,CAAC,CAuBpC"}
+{"version":3,"file":"affected.d.ts","sourceRoot":"","sources":["../../../../../../packages/nx/src/command-line/affected/affected.ts"],"names":[],"mappings":"AAIA,OAAO,KAAK,EAAE,MAAM,EAAE,MAAM,gCAAgC,CAAC;AAQ7D,OAAO,EACL,YAAY,EACZ,uBAAuB,EACxB,MAAM,4BAA4B,CAAC;AAGpC,OAAO,EAAE,sBAAsB,EAAE,MAAM,0CAA0C,CAAC;AAMlF,wBAAsB,QAAQ,CAC5B,OAAO,EAAE,OAAO,GAAG,gBAAgB,GAAG,UAAU,EAChD,IAAI,EAAE;IAAE,CAAC,CAAC,EAAE,MAAM,GAAG,GAAG,CAAA;CAAE,EAC1B,uBAAuB,GAAE,MAAM,CAC7B,MAAM,EACN,CAAC,sBAAsB,GAAG,MAAM,CAAC,EAAE,CAC/B,EACN,YAAY,GAGP;IACH,uBAAuB,EAAE,OAAO,CAAC;IACjC,eAAe,EAAE,OAAO,CAAC;CAC1B,GACA,OAAO,CAAC,IAAI,CAAC,CAiEf;AAED,wBAAsB,qBAAqB,CACzC,MAAM,EAAE,MAAM,EACd,YAAY,EAAE,YAAY,GACzB,OAAO,CAAC,uBAAuB,EAAE,CAAC,CAmBpC"}

package/src/command-line/affected/affected.js

@@ -14,7 +14,6 @@ const affected_project_graph_1 = require("../../project-graph/affected/affected-
 const configuration_1 = require("../../config/configuration");
 const find_matching_projects_1 = require("../../utils/find-matching-projects");
 const graph_1 = require("../graph/graph");
-const all_file_data_1 = require("../../utils/all-file-data");
 async function affected(command, args, extraTargetDependencies = {}, extraOptions = {
     excludeTaskDependencies: args.excludeTaskDependencies,
     loadDotEnvFiles: process.env.NX_LOAD_DOT_ENV_FILES !== 'false',
@@ -65,7 +64,7 @@ async function affected(command, args, extraTargetDependencies = {}, extraOption
 async function getAffectedGraphNodes(nxArgs, projectGraph) {
     let affectedGraph = nxArgs.all
         ? projectGraph
-        : await (0, affected_project_graph_1.filterAffected)(projectGraph, (0, file_utils_1.calculateFileChanges)((0, command_line_utils_1.parseFiles)(nxArgs).files, await (0, all_file_data_1.allFileData)(), nxArgs));
+        : await (0, affected_project_graph_1.filterAffected)(projectGraph, (0, file_utils_1.calculateFileChanges)((0, command_line_utils_1.parseFiles)(nxArgs).files, nxArgs));
     if (nxArgs.exclude) {
         const excludedProjects = new Set((0, find_matching_projects_1.findMatchingProjects)(nxArgs.exclude, affectedGraph.nodes));
         return Object.entries(affectedGraph.nodes)

package/src/command-line/configure-ai-agents/configure-ai-agents.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"configure-ai-agents.d.ts","sourceRoot":"","sources":["../../../../../../packages/nx/src/command-line/configure-ai-agents/configure-ai-agents.ts"],"names":[],"mappings":"AAcA,OAAO,EAAE,wBAAwB,EAAE,MAAM,kBAAkB,CAAC;AAI5D,wBAAsB,wBAAwB,CAC5C,IAAI,EAAE,wBAAwB,EAC9B,KAAK,UAAQ,GACZ,OAAO,CAAC,IAAI,CAAC,CA+Bf;AAED,wBAAsB,4BAA4B,CAChD,OAAO,EAAE,wBAAwB,GAChC,OAAO,CAAC,IAAI,CAAC,CAgNf"}
+{"version":3,"file":"configure-ai-agents.d.ts","sourceRoot":"","sources":["../../../../../../packages/nx/src/command-line/configure-ai-agents/configure-ai-agents.ts"],"names":[],"mappings":"AAeA,OAAO,EAAE,wBAAwB,EAAE,MAAM,kBAAkB,CAAC;AAI5D,wBAAsB,wBAAwB,CAC5C,IAAI,EAAE,wBAAwB,EAC9B,KAAK,UAAQ,GACZ,OAAO,CAAC,IAAI,CAAC,CA+Bf;AAED,wBAAsB,4BAA4B,CAChD,OAAO,EAAE,wBAAwB,GAChC,OAAO,CAAC,IAAI,CAAC,CA2Mf"}

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

@@ -37,12 +37,12 @@ async function configureAiAgentsHandler(args, inner = false) {
 }
 async function configureAiAgentsHandlerImpl(options) {
     const normalizedOptions = normalizeOptions(options);
-    const { nonConfiguredAgents, partiallyConfiguredAgents, fullyConfiguredAgents, disabledAgents, agentConfigurations, } = await (0, utils_1.getAgentConfigurations)(normalizedOptions.agents, workspace_root_1.workspaceRoot);
+    const { nonConfiguredAgents, partiallyConfiguredAgents, fullyConfiguredAgents, disabledAgents, } = await (0, utils_1.getAgentConfigurations)(normalizedOptions.agents, workspace_root_1.workspaceRoot);
     if (disabledAgents.length > 0) {
         const commandNames = disabledAgents.map((a) => {
-            if (a === 'cursor')
+            if (a.name === 'cursor')
                 return '"cursor"';
-            if (a === 'copilot')
+            if (a.name === 'copilot')
                 return '"code"/"code-insiders"';
             return a;
         });
@@ -58,8 +58,7 @@ async function configureAiAgentsHandlerImpl(options) {
             ],
         });
     }
-    if (normalizedOptions.agents.filter((a) => !disabledAgents.includes(a))
-        .length === 0) {
+    if (normalizedOptions.agents.filter((agentName) => !disabledAgents.find((a) => a.name === agentName)).length === 0) {
         output_1.output.error({
             title: 'Please select at least one AI agent to configure.',
         });
@@ -75,11 +74,11 @@ async function configureAiAgentsHandlerImpl(options) {
             });
             process.exit(0);
         }
-        const outOfDateAgents = fullyConfiguredAgents.filter((a) => agentConfigurations.get(a)?.outdated);
+        const outOfDateAgents = fullyConfiguredAgents.filter((a) => a?.outdated);
         if (outOfDateAgents.length === 0) {
             output_1.output.success({
                 title: 'All configured AI agents are up to date',
-                bodyLines: fullyConfiguredAgents.map((a) => `- ${utils_1.agentDisplayMap[a]}`),
+                bodyLines: fullyConfiguredAgents.map((a) => `- ${a.displayName}`),
             });
             process.exit(0);
         }
@@ -88,11 +87,11 @@ async function configureAiAgentsHandlerImpl(options) {
                 title: 'The following AI agents are out of date:',
                 bodyLines: [
                     ...outOfDateAgents.map((a) => {
-                        const rulesPath = agentConfigurations.get(a).rulesPath;
+                        const rulesPath = a.rulesPath;
                         const displayPath = rulesPath.startsWith(workspace_root_1.workspaceRoot)
                             ? (0, path_1.relative)(workspace_root_1.workspaceRoot, rulesPath)
                             : rulesPath;
-                        return `- ${utils_1.agentDisplayMap[a]} (${displayPath})`;
+                        return `- ${a.displayName} (${displayPath})`;
                     }),
                     '',
                     'You can update them by running `nx configure-ai-agents`.',
@@ -101,74 +100,61 @@ async function configureAiAgentsHandlerImpl(options) {
             process.exit(1);
         }
     }
-    // first, prompt for partially configured agents and out of date agents
-    const agentsToUpdate = [];
+    const allAgentChoices = [];
+    const preselectedIndices = [];
+    let currentIndex = 0;
+    // Partially configured agents first (highest priority)
     partiallyConfiguredAgents.forEach((a) => {
-        agentsToUpdate.push(getAgentChoiceForPrompt(a, true, false));
+        allAgentChoices.push(getAgentChoiceForPrompt(a));
+        preselectedIndices.push(currentIndex);
+        currentIndex++;
     });
+    // Outdated agents second
     for (const a of fullyConfiguredAgents) {
-        if (agentConfigurations.get(a).outdated) {
-            agentsToUpdate.push(getAgentChoiceForPrompt(a, false, true));
+        if (a.outdated) {
+            allAgentChoices.push(getAgentChoiceForPrompt(a));
+            preselectedIndices.push(currentIndex);
+            currentIndex++;
         }
     }
-    let updateResult = [];
-    let updateSucceeded = true;
-    if (agentsToUpdate.length > 0) {
-        if (options.interactive !== false) {
-            try {
-                updateResult = (await (0, enquirer_1.prompt)({
-                    type: 'multiselect',
-                    name: 'agents',
-                    message: 'The following agents are not configured completely or are out of date. Which would you like to update?',
-                    choices: agentsToUpdate,
-                    initial: agentsToUpdate.map((_, i) => i),
-                    required: true,
-                })).agents;
-            }
-            catch {
-                process.exit(1);
-            }
-        }
-        else {
-            // in non-interactive mode, update all
-            updateResult = agentsToUpdate.map((a) => a.name);
-        }
-        if (updateResult?.length > 0) {
-            const updateSpinner = ora(`Updating agent configurations...`).start();
-            try {
-                await (0, utils_1.configureAgents)(updateResult, workspace_root_1.workspaceRoot, false);
-                updateSpinner.succeed('Agent configurations updated.');
-            }
-            catch {
-                updateSpinner.fail('Failed to update agent configurations.');
-                updateSucceeded = false;
-            }
-        }
-    }
-    // then prompt for non-configured agents
-    if (nonConfiguredAgents.length === 0) {
+    // Non-configured agents last
+    nonConfiguredAgents.forEach((a) => {
+        allAgentChoices.push(getAgentChoiceForPrompt(a));
+        currentIndex++;
+    });
+    if (allAgentChoices.length === 0) {
         const usingAllAgents = normalizedOptions.agents.length === utils_1.supportedAgents.length;
-        const configuredOrUpdatedAgents = [
-            ...new Set([
-                ...fullyConfiguredAgents,
-                ...(updateSucceeded ? updateResult : []),
-            ]),
-        ];
         output_1.output.success({
             title: `No new agents to configure. All ${!usingAllAgents ? 'selected' : 'supported'} AI agents are already configured:`,
-            bodyLines: configuredOrUpdatedAgents.map((agent) => `- ${utils_1.agentDisplayMap[agent]}`),
+            bodyLines: fullyConfiguredAgents.map((agent) => `- ${agent.displayName}`),
         });
         process.exit(0);
     }
-    let configurationResult;
+    let selectedAgents;
     if (options.interactive !== false) {
         try {
-            configurationResult = (await (0, enquirer_1.prompt)({
+            selectedAgents = (await (0, enquirer_1.prompt)({
                 type: 'multiselect',
                 name: 'agents',
                 message: 'Which AI agents would you like to configure? (space to select, enter to confirm)',
-                choices: nonConfiguredAgents.map((a) => getAgentChoiceForPrompt(a, false, false)),
+                choices: allAgentChoices,
+                initial: preselectedIndices,
                 required: true,
+                footer: function () {
+                    const focused = this.focused;
+                    if (focused.partial) {
+                        return chalk.dim(focused.partialReason);
+                    }
+                    if (focused.agentConfiguration.outdated) {
+                        return chalk.dim(`  The rules file at ${focused.rulesDisplayPath} can be updated with the latest Nx recommendations`);
+                    }
+                    if (!focused.agentConfiguration.mcp &&
+                        !focused.agentConfiguration.rules) {
+                        return chalk.dim(`  Configures agent rules at ${focused.rulesDisplayPath} and the Nx MCP server ${focused.mcpDisplayPath
+                            ? `at ${focused.mcpDisplayPath}`
+                            : 'via Nx Console'}`);
+                    }
+                },
             })).agents;
         }
         catch {
@@ -177,48 +163,67 @@ async function configureAiAgentsHandlerImpl(options) {
     }
     else {
         // in non-interactive mode, configure all
-        configurationResult = nonConfiguredAgents;
+        selectedAgents = allAgentChoices.map((a) => a.name);
     }
-    if (configurationResult?.length === 0) {
+    if (selectedAgents?.length === 0) {
         output_1.output.log({
             title: 'No agents selected',
         });
         process.exit(0);
     }
+    const configSpinner = ora(`Configuring agent(s)...`).start();
     try {
-        await (0, utils_1.configureAgents)(configurationResult, workspace_root_1.workspaceRoot, false);
+        await (0, utils_1.configureAgents)(selectedAgents, workspace_root_1.workspaceRoot, false);
         const configuredOrUpdatedAgents = [
             ...new Set([
-                ...fullyConfiguredAgents,
-                ...(updateSucceeded ? updateResult : []),
-                ...configurationResult,
+                ...fullyConfiguredAgents.map((a) => a.name),
+                ...selectedAgents,
             ]),
         ];
-        output_1.output.success({
-            title: 'AI agents set up successfully. Configured agents:',
+        configSpinner.stop();
+        output_1.output.log({
+            title: 'AI agents set up successfully. Configured Agents:',
             bodyLines: configuredOrUpdatedAgents.map((agent) => `- ${utils_1.agentDisplayMap[agent]}`),
         });
         return;
     }
     catch (e) {
+        configSpinner.fail('Failed to set up AI agents');
         output_1.output.error({
-            title: 'Failed to set up AI agents',
+            title: 'Error details:',
             bodyLines: [e.message],
         });
         process.exit(1);
     }
 }
-function getAgentChoiceForPrompt(agent, partiallyConfigured, outdated) {
-    let message = utils_1.agentDisplayMap[agent];
+function getAgentChoiceForPrompt(agent) {
+    const partiallyConfigured = agent.mcp !== agent.rules;
+    let message = agent.displayName;
     if (partiallyConfigured) {
-        message += ' (partially configured)';
+        message += ` (${agent.rules ? 'MCP missing' : 'rules missing'})`;
     }
-    else if (outdated) {
+    else if (agent.outdated) {
         message += ' (out of date)';
     }
+    const rulesDisplayPath = agent.rulesPath.startsWith(workspace_root_1.workspaceRoot)
+        ? (0, path_1.relative)(workspace_root_1.workspaceRoot, agent.rulesPath)
+        : agent.rulesPath;
+    const mcpDisplayPath = agent.mcpPath?.startsWith(workspace_root_1.workspaceRoot)
+        ? (0, path_1.relative)(workspace_root_1.workspaceRoot, agent.mcpPath)
+        : agent.mcpPath;
+    const partialReason = partiallyConfigured
+        ? agent.rules
+            ? `  Partially configured: MCP missing ${agent.mcpPath ? `at ${mcpDisplayPath}` : 'via Nx Console'}`
+            : `  Partially configured: rules file missing at ${rulesDisplayPath}`
+        : undefined;
     return {
-        name: agent,
+        name: agent.name,
         message,
+        partial: partiallyConfigured,
+        partialReason,
+        agentConfiguration: agent,
+        rulesDisplayPath,
+        mcpDisplayPath,
     };
 }
 function normalizeOptions(options) {

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

@@ -37,7 +37,7 @@ function withFormatOptions(yargs) {
         coerce: shared_options_1.parseCSV,
     })
         .option('sort-root-tsconfig-paths', {
-        describe: `Ensure the workspace's tsconfig compilerOptions.paths are sorted. Warning: This will cause comments in the tsconfig to be lost. The default value is "true" unless NX_FORMAT_SORT_TSCONFIG_PATHS is set to "false".`,
+        describe: `Ensure the workspace's tsconfig compilerOptions.paths are sorted. Warning: This will cause comments in the tsconfig to be lost. The default value is "false" unless NX_FORMAT_SORT_TSCONFIG_PATHS is set to "true".`,
         type: 'boolean',
     })
         .option('all', {
@@ -48,12 +48,8 @@ function withFormatOptions(yargs) {
         all: 'projects',
     })
         .middleware((args) => {
-        /**
-         * TODO(v22): Stop sorting tsconfig paths by default, paths are now less common/important
-         * in Nx workspace setups, and the sorting causes comments to be lost.
-         */
         args.sortRootTsconfigPaths ??=
-            process.env.NX_FORMAT_SORT_TSCONFIG_PATHS !== 'false';
+            process.env.NX_FORMAT_SORT_TSCONFIG_PATHS === 'true';
         // If NX_FORMAT_SORT_TSCONFIG_PATHS=false and --sort-root-tsconfig-paths is passed, we want to set it to true favoring the arg
         process.env.NX_FORMAT_SORT_TSCONFIG_PATHS =
             args.sortRootTsconfigPaths.toString();

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

@@ -113,7 +113,7 @@ async function getPatternsFromApps(affectedFiles, allWorkspaceFiles, projectGrap
     const graph = await (0, project_graph_1.createProjectGraphAsync)({
         exitOnError: true,
     });
-    const affectedGraph = await (0, affected_project_graph_1.filterAffected)(graph, (0, file_utils_1.calculateFileChanges)(affectedFiles, allWorkspaceFiles));
+    const affectedGraph = await (0, affected_project_graph_1.filterAffected)(graph, (0, file_utils_1.calculateFileChanges)(affectedFiles));
     return getPatternsFromProjects(Object.keys(affectedGraph.nodes), projectGraph);
 }
 function addRootConfigFiles(chunkList, nxArgs) {

package/src/command-line/init/implementation/add-nx-to-monorepo.js

@@ -3,7 +3,7 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.addNxToMonorepo = addNxToMonorepo;
 const enquirer_1 = require("enquirer");
 const fs_1 = require("fs");
-const ignore_1 = require("ignore");
+const ignore = require("ignore");
 const path_1 = require("path");
 const fileutils_1 = require("../../../utils/fileutils");
 const output_1 = require("../../../utils/output");
@@ -113,7 +113,7 @@ function allPackageJsonFiles(repoRoot, dirName) {
     return res;
 }
 function getIgnoredGlobs(repoRoot) {
-    const ig = (0, ignore_1.default)();
+    const ig = ignore();
     try {
         ig.add((0, fs_1.readFileSync)(`${repoRoot}/.gitignore`, 'utf-8'));
     }

package/src/command-line/release/changelog.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"changelog.d.ts","sourceRoot":"","sources":["../../../../../../packages/nx/src/command-line/release/changelog.ts"],"names":[],"mappings":"AAMA,OAAO,EAAE,sBAAsB,EAAc,MAAM,sBAAsB,CAAC;AAkB1E,OAAO,EAAE,gBAAgB,EAAE,MAAM,kBAAkB,CAAC;AAmBpD,OAAO,EAEL,SAAS,EAUV,MAAM,aAAa,CAAC;AAYrB,OAAO,EACL,cAAc,EASf,MAAM,gBAAgB,CAAC;AAExB,MAAM,WAAW,wBAAwB;IACvC,kBAAkB,CAAC,EAAE;QACnB,cAAc,EAAE,cAAc,CAAC;QAC/B,QAAQ,EAAE,MAAM,CAAC;QACjB,WAAW,EAAE,WAAW,GAAG,IAAI,CAAC;KACjC,CAAC;IACF,iBAAiB,CAAC,EAAE;QAClB,CAAC,WAAW,EAAE,MAAM,GAAG;YACrB,cAAc,EAAE,cAAc,CAAC;YAC/B,QAAQ,EAAE,MAAM,CAAC;YACjB,WAAW,EAAE,WAAW,GAAG,IAAI,CAAC;SACjC,CAAC;KACH,CAAC;CACH;AAED,MAAM,WAAW,eAAe;IAC9B,IAAI,EAAE,MAAM,CAAC;IACb,KAAK,EAAE,MAAM,CAAC;IACd,WAAW,EAAE,MAAM,CAAC;IACpB,gBAAgB,EAAE,MAAM,EAAE,GAAG,GAAG,CAAC;IACjC,IAAI,CAAC,EAAE,MAAM,CAAC;IACd,UAAU,CAAC,EAAE,OAAO,CAAC;IACrB,gBAAgB,CAAC,EAAE,SAAS,EAAE,CAAC;IAC/B,OAAO,CAAC,EAAE;QAAE,IAAI,EAAE,MAAM,CAAC;QAAC,KAAK,EAAE,MAAM,CAAA;KAAE,EAAE,CAAC;IAC5C,SAAS,CAAC,EAAE,MAAM,CAAC;IACnB,cAAc,CAAC,EAAE,MAAM,EAAE,CAAC;CAC3B;AAED,MAAM,MAAM,WAAW,GAAG,CAAC,YAAY,EAAE,MAAM,KAAK,OAAO,CAAC,IAAI,CAAC,CAAC;AAElE,eAAO,MAAM,0BAA0B,GAAI,MAAM,gBAAgB,oBACV,CAAC;AAExD,wBAAgB,SAAS,CAAC,qBAAqB,EAAE,sBAAsB,IAOnE,MAAM,gBAAgB,KACrB,OAAO,CAAC,wBAAwB,CAAC,CAisBrC"}
+{"version":3,"file":"changelog.d.ts","sourceRoot":"","sources":["../../../../../../packages/nx/src/command-line/release/changelog.ts"],"names":[],"mappings":"AAMA,OAAO,EAAE,sBAAsB,EAAc,MAAM,sBAAsB,CAAC;AAkB1E,OAAO,EAAE,gBAAgB,EAAE,MAAM,kBAAkB,CAAC;AAmBpD,OAAO,EAEL,SAAS,EAWV,MAAM,aAAa,CAAC;AAYrB,OAAO,EACL,cAAc,EASf,MAAM,gBAAgB,CAAC;AAExB,MAAM,WAAW,wBAAwB;IACvC,kBAAkB,CAAC,EAAE;QACnB,cAAc,EAAE,cAAc,CAAC;QAC/B,QAAQ,EAAE,MAAM,CAAC;QACjB,WAAW,EAAE,WAAW,GAAG,IAAI,CAAC;KACjC,CAAC;IACF,iBAAiB,CAAC,EAAE;QAClB,CAAC,WAAW,EAAE,MAAM,GAAG;YACrB,cAAc,EAAE,cAAc,CAAC;YAC/B,QAAQ,EAAE,MAAM,CAAC;YACjB,WAAW,EAAE,WAAW,GAAG,IAAI,CAAC;SACjC,CAAC;KACH,CAAC;CACH;AAED,MAAM,WAAW,eAAe;IAC9B,IAAI,EAAE,MAAM,CAAC;IACb,KAAK,EAAE,MAAM,CAAC;IACd,WAAW,EAAE,MAAM,CAAC;IACpB,gBAAgB,EAAE,MAAM,EAAE,GAAG,GAAG,CAAC;IACjC,IAAI,CAAC,EAAE,MAAM,CAAC;IACd,UAAU,CAAC,EAAE,OAAO,CAAC;IACrB,gBAAgB,CAAC,EAAE,SAAS,EAAE,CAAC;IAC/B,OAAO,CAAC,EAAE;QAAE,IAAI,EAAE,MAAM,CAAC;QAAC,KAAK,EAAE,MAAM,CAAA;KAAE,EAAE,CAAC;IAC5C,SAAS,CAAC,EAAE,MAAM,CAAC;IACnB,cAAc,CAAC,EAAE,MAAM,EAAE,CAAC;CAC3B;AAED,MAAM,MAAM,WAAW,GAAG,CAAC,YAAY,EAAE,MAAM,KAAK,OAAO,CAAC,IAAI,CAAC,CAAC;AAElE,eAAO,MAAM,0BAA0B,GAAI,MAAM,gBAAgB,oBACV,CAAC;AAExD,wBAAgB,SAAS,CAAC,qBAAqB,EAAE,sBAAsB,IAOnE,MAAM,gBAAgB,KACrB,OAAO,CAAC,wBAAwB,CAAC,CA+qBrC"}

package/src/command-line/release/changelog.js

@@ -155,8 +155,6 @@ function createAPI(overrideReleaseConfig) {
         (0, shared_1.handleDuplicateGitTags)(gitTagValues);
         const postGitTasks = [];
         let workspaceChangelogChanges = [];
-        // TODO(v22): remove this after the changelog renderer is refactored to remove coupling with git commits
-        let workspaceChangelogCommits = [];
         // If there are multiple release groups, we'll just skip the workspace changelog anyway.
         const versionPlansEnabledForWorkspaceChangelog = releaseGroups[0].resolvedVersionPlans;
         if (versionPlansEnabledForWorkspaceChangelog) {
@@ -168,13 +166,13 @@ function createAPI(overrideReleaseConfig) {
                         .flatMap((vp) => {
                         const releaseType = versionPlanSemverReleaseTypeToChangelogType(vp.groupVersionBump);
                         let githubReferences = [];
-                        let author = undefined;
+                        let authors = undefined;
                         const parsedCommit = vp.commit
-                            ? (0, git_1.parseGitCommit)(vp.commit, true)
+                            ? (0, git_1.parseVersionPlanCommit)(vp.commit)
                             : null;
                         if (parsedCommit) {
                             githubReferences = parsedCommit.references;
-                            author = parsedCommit.author;
+                            authors = parsedCommit.authors;
                         }
                         const changes = !vp.triggeredByProjects
                             ? {
@@ -184,8 +182,7 @@ function createAPI(overrideReleaseConfig) {
                                 body: '',
                                 isBreaking: releaseType.isBreaking,
                                 githubReferences,
-                                // TODO(JamesHenry): Implement support for Co-authored-by and adding multiple authors
-                                authors: [author],
+                                authors,
                                 affectedProjects: '*',
                             }
                             : vp.triggeredByProjects.map((project) => {
@@ -196,8 +193,7 @@ function createAPI(overrideReleaseConfig) {
                                     body: '',
                                     isBreaking: releaseType.isBreaking,
                                     githubReferences,
-                                    // TODO(JamesHenry): Implement support for Co-authored-by and adding multiple authors
-                                    authors: [author],
+                                    authors,
                                     affectedProjects: [project],
                                 };
                             });
@@ -229,8 +225,7 @@ function createAPI(overrideReleaseConfig) {
             }
             // Make sure that the fromRef is actually resolvable
             const workspaceChangelogFromSHA = await (0, git_1.getCommitHash)(workspaceChangelogFromRef);
-            workspaceChangelogCommits = await getCommits(workspaceChangelogFromSHA, toSHA);
-            workspaceChangelogChanges = filterHiddenChanges(workspaceChangelogCommits.map((c) => {
+            workspaceChangelogChanges = filterHiddenChanges((await getCommits(workspaceChangelogFromSHA, toSHA)).map((c) => {
                 return {
                     type: c.type,
                     scope: c.scope,
@@ -238,7 +233,7 @@ function createAPI(overrideReleaseConfig) {
                     body: c.body,
                     isBreaking: c.isBreaking,
                     githubReferences: c.references,
-                    authors: [c.author],
+                    authors: c.authors,
                     shortHash: c.shortHash,
                     revertedHashes: c.revertedHashes,
                     affectedProjects: '*',
@@ -312,8 +307,6 @@ function createAPI(overrideReleaseConfig) {
             if (releaseGroup.projectsRelationship === 'independent') {
                 for (const project of projectNodes) {
                     let changes = null;
-                    // TODO(v22): remove this after the changelog renderer is refactored to remove coupling with git commits
-                    let commits;
                     if (releaseGroup.resolvedVersionPlans) {
                         changes = releaseGroup.resolvedVersionPlans
                             .map((vp) => {
@@ -325,12 +318,11 @@ function createAPI(overrideReleaseConfig) {
                             let githubReferences = [];
                             let authors = [];
                             const parsedCommit = vp.commit
-                                ? (0, git_1.parseGitCommit)(vp.commit, true)
+                                ? (0, git_1.parseVersionPlanCommit)(vp.commit)
                                 : null;
                             if (parsedCommit) {
                                 githubReferences = parsedCommit.references;
-                                // TODO(JamesHenry): Implement support for Co-authored-by and adding multiple authors
-                                authors = [parsedCommit.author];
+                                authors = parsedCommit.authors;
                             }
                             return {
                                 type: releaseType.type,
@@ -356,6 +348,7 @@ function createAPI(overrideReleaseConfig) {
                                 releaseTagPatternRequireSemver: releaseGroup.releaseTagPatternRequireSemver,
                                 releaseTagPatternStrictPreid: releaseGroup.releaseTagPatternStrictPreid,
                             }))?.tag;
+                        let commits;
                         if (!fromRef && useAutomaticFromRef) {
                             const firstCommit = await (0, git_1.getFirstGitCommit)();
                             commits = await filterProjectCommits({
@@ -387,8 +380,7 @@ function createAPI(overrideReleaseConfig) {
                             body: c.body,
                             isBreaking: c.isBreaking,
                             githubReferences: c.references,
-                            // TODO(JamesHenry): Implement support for Co-authored-by and adding multiple authors
-                            authors: [c.author],
+                            authors: c.authors,
                             shortHash: c.shortHash,
                             revertedHashes: c.revertedHashes,
                             affectedProjects: commitChangesNonProjectFiles(c, fileMap.nonProjectFiles)
@@ -419,20 +411,18 @@ function createAPI(overrideReleaseConfig) {
             }
             else {
                 let changes = [];
-                // TODO(v22): remove this after the changelog renderer is refactored to remove coupling with git commits
-                let commits = [];
                 if (releaseGroup.resolvedVersionPlans) {
                     changes = releaseGroup.resolvedVersionPlans
                         .flatMap((vp) => {
                         const releaseType = versionPlanSemverReleaseTypeToChangelogType(vp.groupVersionBump);
                         let githubReferences = [];
-                        let author = undefined;
+                        let authors = undefined;
                         const parsedCommit = vp.commit
-                            ? (0, git_1.parseGitCommit)(vp.commit, true)
+                            ? (0, git_1.parseVersionPlanCommit)(vp.commit)
                             : null;
                         if (parsedCommit) {
                             githubReferences = parsedCommit.references;
-                            author = parsedCommit.author;
+                            authors = parsedCommit.authors;
                         }
                         const changes = !vp.triggeredByProjects
                             ? {
@@ -442,8 +432,7 @@ function createAPI(overrideReleaseConfig) {
                                 body: '',
                                 isBreaking: releaseType.isBreaking,
                                 githubReferences,
-                                // TODO(JamesHenry): Implement support for Co-authored-by and adding multiple authors
-                                authors: [author],
+                                authors,
                                 affectedProjects: '*',
                             }
                             : vp.triggeredByProjects.map((project) => {
@@ -454,8 +443,7 @@ function createAPI(overrideReleaseConfig) {
                                     body: '',
                                     isBreaking: releaseType.isBreaking,
                                     githubReferences,
-                                    // TODO(JamesHenry): Implement support for Co-authored-by and adding multiple authors
-                                    authors: [author],
+                                    authors,
                                     affectedProjects: [project],
                                 };
                             });
@@ -487,16 +475,14 @@ function createAPI(overrideReleaseConfig) {
                     const fromSHA = await (0, git_1.getCommitHash)(fromRef);
                     const { fileMap } = await (0, file_map_utils_1.createFileMapUsingProjectGraph)(projectGraph);
                     const fileToProjectMap = createFileToProjectMap(fileMap.projectFileMap);
-                    commits = await getCommits(fromSHA, toSHA);
-                    changes = filterHiddenChanges(commits.map((c) => ({
+                    changes = filterHiddenChanges((await getCommits(fromSHA, toSHA)).map((c) => ({
                         type: c.type,
                         scope: c.scope,
                         description: c.description,
                         body: c.body,
                         isBreaking: c.isBreaking,
                         githubReferences: c.references,
-                        // TODO(JamesHenry): Implement support for Co-authored-by and adding multiple authors
-                        authors: [c.author],
+                        authors: c.authors,
                         shortHash: c.shortHash,
                         revertedHashes: c.revertedHashes,
                         affectedProjects: commitChangesNonProjectFiles(c, fileMap.nonProjectFiles)