nx 22.5.0 → 22.6.0-beta.0

package/LICENSE

@@ -1,6 +1,6 @@
 (The MIT License)
 
-Copyright (c) 2017-2025 Narwhal Technologies Inc.
+Copyright (c) 2017-2026 Narwhal Technologies Inc.
 
 Permission is hereby granted, free of charge, to any person obtaining
 a copy of this software and associated documentation files (the

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "nx",
-  "version": "22.5.0",
+  "version": "22.6.0-beta.0",
   "private": false,
   "description": "The core Nx plugin contains the core functionality of Nx like the project graph, nx commands and task orchestration.",
   "repository": {
@@ -72,8 +72,8 @@
     "yargs-parser": "21.1.1"
   },
   "peerDependencies": {
-    "@swc-node/register": "1.11.1",
-    "@swc/core": "1.15.8"
+    "@swc-node/register": "^1.11.1",
+    "@swc/core": "^1.15.8"
   },
   "peerDependenciesMeta": {
     "@swc-node/register": {
@@ -84,16 +84,16 @@
     }
   },
   "optionalDependencies": {
-    "@nx/nx-darwin-arm64": "22.5.0",
-    "@nx/nx-darwin-x64": "22.5.0",
-    "@nx/nx-freebsd-x64": "22.5.0",
-    "@nx/nx-linux-arm-gnueabihf": "22.5.0",
-    "@nx/nx-linux-arm64-gnu": "22.5.0",
-    "@nx/nx-linux-arm64-musl": "22.5.0",
-    "@nx/nx-linux-x64-gnu": "22.5.0",
-    "@nx/nx-linux-x64-musl": "22.5.0",
-    "@nx/nx-win32-arm64-msvc": "22.5.0",
-    "@nx/nx-win32-x64-msvc": "22.5.0"
+    "@nx/nx-darwin-arm64": "22.6.0-beta.0",
+    "@nx/nx-darwin-x64": "22.6.0-beta.0",
+    "@nx/nx-freebsd-x64": "22.6.0-beta.0",
+    "@nx/nx-linux-arm-gnueabihf": "22.6.0-beta.0",
+    "@nx/nx-linux-arm64-gnu": "22.6.0-beta.0",
+    "@nx/nx-linux-arm64-musl": "22.6.0-beta.0",
+    "@nx/nx-linux-x64-gnu": "22.6.0-beta.0",
+    "@nx/nx-linux-x64-musl": "22.6.0-beta.0",
+    "@nx/nx-win32-arm64-msvc": "22.6.0-beta.0",
+    "@nx/nx-win32-x64-msvc": "22.6.0-beta.0"
   },
   "nx-migrations": {
     "migrations": "./migrations.json",

package/schemas/nx-schema.json

@@ -560,8 +560,13 @@
               "fileset": {
                 "type": "string",
                 "description": "A glob"
+              },
+              "dependencies": {
+                "type": "boolean",
+                "description": "Include files matching the fileset for all the project dependencies of this target."
               }
             },
+            "required": ["fileset"],
             "additionalProperties": false
           },
           {

package/schemas/project-schema.json

@@ -216,8 +216,13 @@
               "fileset": {
                 "type": "string",
                 "description": "A glob used to determine a fileset."
+              },
+              "dependencies": {
+                "type": "boolean",
+                "description": "Include files matching the fileset for all the project dependencies of this target."
               }
             },
+            "required": ["fileset"],
             "additionalProperties": false
           },
           {

package/src/ai/constants.d.ts

@@ -1,3 +1,5 @@
+import { AgentRulesOptions } from './set-up-ai-agents/get-agent-rules';
+export type { AgentRulesOptions };
 export declare function agentsMdPath(root: string): string;
 export declare function geminiMdPath(root: string): string;
 export declare function parseGeminiSettings(root: string): any | undefined;
@@ -5,12 +7,16 @@ export declare function geminiSettingsPath(root: string): string;
 export declare function claudeMdPath(root: string): string;
 export declare function claudeMcpJsonPath(root: string): string;
 export declare function opencodeMcpPath(root: string): string;
-export declare const codexConfigTomlPath: string;
+export declare function codexConfigTomlPath(root: string): string;
 export declare const nxRulesMarkerCommentStart = "<!-- nx configuration start-->";
 export declare const nxRulesMarkerCommentDescription = "<!-- Leave the start & end comments to automatically receive updates. -->";
 export declare const nxRulesMarkerCommentEnd = "<!-- nx configuration end-->";
 export declare const rulesRegex: RegExp;
-export declare const getAgentRulesWrapped: (writeNxCloudRules: boolean) => string;
+export interface AgentRulesWrappedOptions {
+    writeNxCloudRules: boolean;
+    useH1?: boolean;
+}
+export declare const getAgentRulesWrapped: (options: AgentRulesWrappedOptions) => string;
 export declare const nxMcpTomlHeader = "[mcp_servers.\"nx-mcp\"]";
 /**
  * Get the MCP TOML configuration based on the Nx version.

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

@@ -1 +1 @@
-{"version":3,"file":"constants.d.ts","sourceRoot":"","sources":["../../../../../packages/nx/src/ai/constants.ts"],"names":[],"mappings":"AAMA,wBAAgB,YAAY,CAAC,IAAI,EAAE,MAAM,GAAG,MAAM,CAEjD;AAED,wBAAgB,YAAY,CAAC,IAAI,EAAE,MAAM,GAAG,MAAM,CAEjD;AAED,wBAAgB,mBAAmB,CAAC,IAAI,EAAE,MAAM,GAAG,GAAG,GAAG,SAAS,CAOjE;AAED,wBAAgB,kBAAkB,CAAC,IAAI,EAAE,MAAM,GAAG,MAAM,CAEvD;AAED,wBAAgB,YAAY,CAAC,IAAI,EAAE,MAAM,GAAG,MAAM,CAEjD;AAED,wBAAgB,iBAAiB,CAAC,IAAI,EAAE,MAAM,GAAG,MAAM,CAEtD;AAED,wBAAgB,eAAe,CAAC,IAAI,EAAE,MAAM,GAAG,MAAM,CAEpD;AAED,eAAO,MAAM,mBAAmB,QAA2C,CAAC;AAE5E,eAAO,MAAM,yBAAyB,mCAAmC,CAAC;AAC1E,eAAO,MAAM,+BAA+B,8EAA8E,CAAC;AAC3H,eAAO,MAAM,uBAAuB,iCAAiC,CAAC;AACtE,eAAO,MAAM,UAAU,QAGtB,CAAC;AAEF,eAAO,MAAM,oBAAoB,GAAI,mBAAmB,OAAO,WAG9D,CAAC;AAEF,eAAO,MAAM,eAAe,6BAA2B,CAAC;AAExD;;;;GAIG;AACH,wBAAgB,kBAAkB,CAAC,SAAS,EAAE,MAAM,GAAG,MAAM,CAQ5D"}
+{"version":3,"file":"constants.d.ts","sourceRoot":"","sources":["../../../../../packages/nx/src/ai/constants.ts"],"names":[],"mappings":"AAGA,OAAO,EAEL,iBAAiB,EAClB,MAAM,oCAAoC,CAAC;AAE5C,YAAY,EAAE,iBAAiB,EAAE,CAAC;AAElC,wBAAgB,YAAY,CAAC,IAAI,EAAE,MAAM,GAAG,MAAM,CAEjD;AAED,wBAAgB,YAAY,CAAC,IAAI,EAAE,MAAM,GAAG,MAAM,CAEjD;AAED,wBAAgB,mBAAmB,CAAC,IAAI,EAAE,MAAM,GAAG,GAAG,GAAG,SAAS,CAOjE;AAED,wBAAgB,kBAAkB,CAAC,IAAI,EAAE,MAAM,GAAG,MAAM,CAEvD;AAED,wBAAgB,YAAY,CAAC,IAAI,EAAE,MAAM,GAAG,MAAM,CAEjD;AAED,wBAAgB,iBAAiB,CAAC,IAAI,EAAE,MAAM,GAAG,MAAM,CAEtD;AAED,wBAAgB,eAAe,CAAC,IAAI,EAAE,MAAM,GAAG,MAAM,CAEpD;AAED,wBAAgB,mBAAmB,CAAC,IAAI,EAAE,MAAM,GAAG,MAAM,CAExD;AAED,eAAO,MAAM,yBAAyB,mCAAmC,CAAC;AAC1E,eAAO,MAAM,+BAA+B,8EAA8E,CAAC;AAC3H,eAAO,MAAM,uBAAuB,iCAAiC,CAAC;AACtE,eAAO,MAAM,UAAU,QAGtB,CAAC;AAEF,MAAM,WAAW,wBAAwB;IACvC,iBAAiB,EAAE,OAAO,CAAC;IAC3B,KAAK,CAAC,EAAE,OAAO,CAAC;CACjB;AAED,eAAO,MAAM,oBAAoB,GAAI,SAAS,wBAAwB,WAIrE,CAAC;AAEF,eAAO,MAAM,eAAe,6BAA2B,CAAC;AAExD;;;;GAIG;AACH,wBAAgB,kBAAkB,CAAC,SAAS,EAAE,MAAM,GAAG,MAAM,CAQ5D"}

package/src/ai/constants.js

@@ -1,6 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.nxMcpTomlHeader = exports.getAgentRulesWrapped = exports.rulesRegex = exports.nxRulesMarkerCommentEnd = exports.nxRulesMarkerCommentDescription = exports.nxRulesMarkerCommentStart = exports.codexConfigTomlPath = void 0;
+exports.nxMcpTomlHeader = exports.getAgentRulesWrapped = exports.rulesRegex = exports.nxRulesMarkerCommentEnd = exports.nxRulesMarkerCommentDescription = exports.nxRulesMarkerCommentStart = void 0;
 exports.agentsMdPath = agentsMdPath;
 exports.geminiMdPath = geminiMdPath;
 exports.parseGeminiSettings = parseGeminiSettings;
@@ -8,8 +8,8 @@ exports.geminiSettingsPath = geminiSettingsPath;
 exports.claudeMdPath = claudeMdPath;
 exports.claudeMcpJsonPath = claudeMcpJsonPath;
 exports.opencodeMcpPath = opencodeMcpPath;
+exports.codexConfigTomlPath = codexConfigTomlPath;
 exports.getNxMcpTomlConfig = getNxMcpTomlConfig;
-const os_1 = require("os");
 const path_1 = require("path");
 const semver_1 = require("semver");
 const fileutils_1 = require("../utils/fileutils");
@@ -41,14 +41,17 @@ function claudeMcpJsonPath(root) {
 function opencodeMcpPath(root) {
     return (0, path_1.join)(root, 'opencode.json');
 }
-exports.codexConfigTomlPath = (0, path_1.join)((0, os_1.homedir)(), '.codex', 'config.toml');
+function codexConfigTomlPath(root) {
+    return (0, path_1.join)(root, '.codex', 'config.toml');
+}
 exports.nxRulesMarkerCommentStart = `<!-- nx configuration start-->`;
 exports.nxRulesMarkerCommentDescription = `<!-- Leave the start & end comments to automatically receive updates. -->`;
 exports.nxRulesMarkerCommentEnd = `<!-- nx configuration end-->`;
 exports.rulesRegex = new RegExp(`${exports.nxRulesMarkerCommentStart}[\\s\\S]*?${exports.nxRulesMarkerCommentEnd}`, 'm');
-const getAgentRulesWrapped = (writeNxCloudRules) => {
-    const agentRulesString = (0, get_agent_rules_1.getAgentRules)(writeNxCloudRules);
-    return `${exports.nxRulesMarkerCommentStart}\n${exports.nxRulesMarkerCommentDescription}\n${agentRulesString}\n${exports.nxRulesMarkerCommentEnd}`;
+const getAgentRulesWrapped = (options) => {
+    const { writeNxCloudRules, useH1 = true } = options;
+    const agentRulesString = (0, get_agent_rules_1.getAgentRules)({ nxCloud: writeNxCloudRules, useH1 });
+    return `${exports.nxRulesMarkerCommentStart}\n${exports.nxRulesMarkerCommentDescription}\n\n${agentRulesString}\n\n${exports.nxRulesMarkerCommentEnd}`;
 };
 exports.getAgentRulesWrapped = getAgentRulesWrapped;
 exports.nxMcpTomlHeader = `[mcp_servers."nx-mcp"]`;

package/src/ai/detect-ai-agent.d.ts

@@ -0,0 +1,3 @@
+import { Agent } from './utils';
+export declare function detectAiAgent(): Agent | null;
+//# sourceMappingURL=detect-ai-agent.d.ts.map

package/src/ai/detect-ai-agent.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"detect-ai-agent.d.ts","sourceRoot":"","sources":["../../../../../packages/nx/src/ai/detect-ai-agent.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,KAAK,EAAmB,MAAM,SAAS,CAAC;AAEjD,wBAAgB,aAAa,IAAI,KAAK,GAAG,IAAI,CAM5C"}

package/src/ai/detect-ai-agent.js

@@ -0,0 +1,12 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.detectAiAgent = detectAiAgent;
+const native_1 = require("../native");
+const utils_1 = require("./utils");
+function detectAiAgent() {
+    const detected = (0, native_1.detectAiAgent)();
+    if (detected && utils_1.supportedAgents.includes(detected)) {
+        return detected;
+    }
+    return null;
+}

package/src/ai/set-up-ai-agents/get-agent-rules.d.ts

@@ -1,2 +1,6 @@
-export declare function getAgentRules(nxCloud: boolean): string;
+export interface AgentRulesOptions {
+    nxCloud: boolean;
+    useH1?: boolean;
+}
+export declare function getAgentRules(options: AgentRulesOptions): string;
 //# sourceMappingURL=get-agent-rules.d.ts.map

package/src/ai/set-up-ai-agents/get-agent-rules.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"get-agent-rules.d.ts","sourceRoot":"","sources":["../../../../../../packages/nx/src/ai/set-up-ai-agents/get-agent-rules.ts"],"names":[],"mappings":"AAAA,wBAAgB,aAAa,CAAC,OAAO,EAAE,OAAO,UAqB7C"}
+{"version":3,"file":"get-agent-rules.d.ts","sourceRoot":"","sources":["../../../../../../packages/nx/src/ai/set-up-ai-agents/get-agent-rules.ts"],"names":[],"mappings":"AAAA,MAAM,WAAW,iBAAiB;IAChC,OAAO,EAAE,OAAO,CAAC;IACjB,KAAK,CAAC,EAAE,OAAO,CAAC;CACjB;AAED,wBAAgB,aAAa,CAAC,OAAO,EAAE,iBAAiB,UAsBvD"}

package/src/ai/set-up-ai-agents/get-agent-rules.js

@@ -1,9 +1,10 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.getAgentRules = getAgentRules;
-function getAgentRules(nxCloud) {
-    return `
-# General Guidelines for working with Nx
+function getAgentRules(options) {
+    const { nxCloud, useH1 = true } = options;
+    const header = useH1 ? '#' : '##';
+    return `${header} General Guidelines for working with Nx
 
 - For navigating/exploring the workspace, invoke the \`nx-workspace\` skill first - it has patterns for querying projects, targets, and dependencies
 - When running tasks (for example build, lint, test, e2e, etc.), always prefer running the task through \`nx\` (i.e. \`nx run\`, \`nx run-many\`, \`nx affected\`) instead of using the underlying tooling directly

package/src/ai/set-up-ai-agents/set-up-ai-agents.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"set-up-ai-agents.d.ts","sourceRoot":"","sources":["../../../../../../packages/nx/src/ai/set-up-ai-agents/set-up-ai-agents.ts"],"names":[],"mappings":"AAWA,OAAO,EAAE,IAAI,EAAE,MAAM,uBAAuB,CAAC;AAS7C,OAAO,EACL,qBAAqB,EACrB,oBAAoB,EACrB,MAAM,oBAAoB,CAAC;AAyB5B,OAAO,EACL,sCAAsC,EACtC,4BAA4B,EAC7B,MAAM,UAAU,CAAC;AAElB,MAAM,MAAM,mBAAmB,GAAG;IAChC,QAAQ,EAAE,oBAAoB,EAAE,CAAC;IACjC,MAAM,EAAE,qBAAqB,EAAE,CAAC;CACjC,CAAC;AAmCF,wBAAsB,sBAAsB,CAC1C,IAAI,EAAE,IAAI,EACV,OAAO,EAAE,4BAA4B,EACrC,KAAK,UAAQ,GACZ,OAAO,CAAC,CAAC,KAAK,CAAC,EAAE,OAAO,KAAK,OAAO,CAAC,mBAAmB,CAAC,CAAC,CAmC5D;AAaD,wBAAsB,0BAA0B,CAC9C,IAAI,EAAE,IAAI,EACV,OAAO,EAAE,sCAAsC,GAC9C,OAAO,CAAC,MAAM,OAAO,CAAC,mBAAmB,CAAC,CAAC,CA4O7C;AAkFD,eAAe,sBAAsB,CAAC"}
+{"version":3,"file":"set-up-ai-agents.d.ts","sourceRoot":"","sources":["../../../../../../packages/nx/src/ai/set-up-ai-agents/set-up-ai-agents.ts"],"names":[],"mappings":"AAIA,OAAO,EAAE,IAAI,EAAE,MAAM,uBAAuB,CAAC;AAS7C,OAAO,EACL,qBAAqB,EACrB,oBAAoB,EACrB,MAAM,oBAAoB,CAAC;AAwB5B,OAAO,EACL,sCAAsC,EACtC,4BAA4B,EAC7B,MAAM,UAAU,CAAC;AAElB,MAAM,MAAM,mBAAmB,GAAG;IAChC,QAAQ,EAAE,oBAAoB,EAAE,CAAC;IACjC,MAAM,EAAE,qBAAqB,EAAE,CAAC;CACjC,CAAC;AAmCF,wBAAsB,sBAAsB,CAC1C,IAAI,EAAE,IAAI,EACV,OAAO,EAAE,4BAA4B,EACrC,KAAK,UAAQ,GACZ,OAAO,CAAC,CAAC,KAAK,CAAC,EAAE,OAAO,KAAK,OAAO,CAAC,mBAAmB,CAAC,CAAC,CAmC5D;AAaD,wBAAsB,0BAA0B,CAC9C,IAAI,EAAE,IAAI,EACV,OAAO,EAAE,sCAAsC,GAC9C,OAAO,CAAC,MAAM,OAAO,CAAC,mBAAmB,CAAC,CAAC,CAgO7C;AAqJD,eAAe,sBAAsB,CAAC"}

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

@@ -3,7 +3,6 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.setupAiAgentsGenerator = setupAiAgentsGenerator;
 exports.setupAiAgentsGeneratorImpl = setupAiAgentsGeneratorImpl;
 const fs_1 = require("fs");
-const os_1 = require("os");
 const path_1 = require("path");
 const semver_1 = require("semver");
 const format_changed_files_with_prettier_if_available_1 = require("../../generators/internal-utils/format-changed-files-with-prettier-if-available");
@@ -138,6 +137,19 @@ async function setupAiAgentsGeneratorImpl(tree, options) {
         }
         (0, json_1.updateJson)(tree, opencodeMcpJsonPath, (json) => opencodeMcpConfigUpdater(json, nxVersion));
     }
+    if (hasAgent('codex')) {
+        const codexTomlPath = (0, path_1.join)(options.directory, '.codex', 'config.toml');
+        const tomlConfig = (0, constants_2.getNxMcpTomlConfig)(nxVersion);
+        if (!tree.exists(codexTomlPath)) {
+            tree.write(codexTomlPath, tomlConfig);
+        }
+        else {
+            const existing = tree.read(codexTomlPath, 'utf-8');
+            if (!existing.includes(constants_2.nxMcpTomlHeader)) {
+                tree.write(codexTomlPath, existing + '\n' + tomlConfig);
+            }
+        }
+    }
     if (hasAgent('gemini')) {
         const geminiSettingsPath = (0, path_1.join)(options.directory, '.gemini', 'settings.json');
         if (!tree.exists(geminiSettingsPath)) {
@@ -169,7 +181,7 @@ async function setupAiAgentsGeneratorImpl(tree, options) {
             { agent: 'opencode', src: 'generated/.opencode', dest: '.opencode' },
             { agent: 'copilot', src: 'generated/.github', dest: '.github' },
             { agent: 'cursor', src: 'generated/.cursor', dest: '.cursor' },
-            { agent: 'codex', src: 'generated/.codex', dest: '.codex' },
+            { agent: 'codex', src: 'generated/.agents', dest: '.agents' },
             { agent: 'gemini', src: 'generated/.gemini', dest: '.gemini' },
         ];
         for (const { agent, src, dest } of agentDirs) {
@@ -186,34 +198,12 @@ async function setupAiAgentsGeneratorImpl(tree, options) {
     return async (check = false) => {
         const messages = [];
         const errors = [];
-        if (hasAgent('codex')) {
-            if ((0, fs_1.existsSync)(constants_1.codexConfigTomlPath)) {
-                const tomlContents = (0, fs_1.readFileSync)(constants_1.codexConfigTomlPath, 'utf-8');
-                if (!tomlContents.includes(constants_2.nxMcpTomlHeader)) {
-                    if (!check) {
-                        (0, fs_1.appendFileSync)(constants_1.codexConfigTomlPath, `\n${(0, constants_2.getNxMcpTomlConfig)(nxVersion)}`);
-                    }
-                    messages.push({
-                        title: `Updated ${constants_1.codexConfigTomlPath} with nx-mcp server`,
-                    });
-                }
-            }
-            else {
-                if (!check) {
-                    (0, fs_1.mkdirSync)((0, path_1.join)((0, os_1.homedir)(), '.codex'), { recursive: true });
-                    (0, fs_1.writeFileSync)(constants_1.codexConfigTomlPath, (0, constants_2.getNxMcpTomlConfig)(nxVersion));
-                }
-                messages.push({
-                    title: `Created ${constants_1.codexConfigTomlPath} with nx-mcp server`,
-                });
-            }
-        }
         if (hasAgent('copilot')) {
             try {
-                if ((0, native_1.isEditorInstalled)(0 /* SupportedEditor.VSCode */) &&
-                    (0, native_1.canInstallNxConsoleForEditor)(0 /* SupportedEditor.VSCode */)) {
+                if ((await (0, native_1.isEditorInstalled)(0 /* SupportedEditor.VSCode */)) &&
+                    (await (0, native_1.canInstallNxConsoleForEditor)(0 /* SupportedEditor.VSCode */))) {
                     if (!check) {
-                        (0, native_1.installNxConsoleForEditor)(0 /* SupportedEditor.VSCode */);
+                        await (0, native_1.installNxConsoleForEditor)(0 /* SupportedEditor.VSCode */);
                     }
                     messages.push({
                         title: `Installed Nx Console for VSCode`,
@@ -227,10 +217,10 @@ async function setupAiAgentsGeneratorImpl(tree, options) {
                 });
             }
             try {
-                if ((0, native_1.isEditorInstalled)(1 /* SupportedEditor.VSCodeInsiders */) &&
-                    (0, native_1.canInstallNxConsoleForEditor)(1 /* SupportedEditor.VSCodeInsiders */)) {
+                if ((await (0, native_1.isEditorInstalled)(1 /* SupportedEditor.VSCodeInsiders */)) &&
+                    (await (0, native_1.canInstallNxConsoleForEditor)(1 /* SupportedEditor.VSCodeInsiders */))) {
                     if (!check) {
-                        (0, native_1.installNxConsoleForEditor)(1 /* SupportedEditor.VSCodeInsiders */);
+                        await (0, native_1.installNxConsoleForEditor)(1 /* SupportedEditor.VSCodeInsiders */);
                     }
                     messages.push({
                         title: `Installed Nx Console for VSCode Insiders`,
@@ -246,10 +236,10 @@ async function setupAiAgentsGeneratorImpl(tree, options) {
         }
         if (hasAgent('cursor')) {
             try {
-                if ((0, native_1.isEditorInstalled)(2 /* SupportedEditor.Cursor */) &&
-                    (0, native_1.canInstallNxConsoleForEditor)(2 /* SupportedEditor.Cursor */)) {
+                if ((await (0, native_1.isEditorInstalled)(2 /* SupportedEditor.Cursor */)) &&
+                    (await (0, native_1.canInstallNxConsoleForEditor)(2 /* SupportedEditor.Cursor */))) {
                     if (!check) {
-                        (0, native_1.installNxConsoleForEditor)(2 /* SupportedEditor.Cursor */);
+                        await (0, native_1.installNxConsoleForEditor)(2 /* SupportedEditor.Cursor */);
                     }
                     messages.push({
                         title: `Installed Nx Console for Cursor`,
@@ -270,8 +260,12 @@ async function setupAiAgentsGeneratorImpl(tree, options) {
     };
 }
 function writeAgentRules(tree, path, writeNxCloudRules) {
-    const expectedRules = (0, constants_2.getAgentRulesWrapped)(writeNxCloudRules);
     if (!tree.exists(path)) {
+        // File doesn't exist - create with h1 header (standalone content)
+        const expectedRules = (0, constants_2.getAgentRulesWrapped)({
+            writeNxCloudRules,
+            useH1: true,
+        });
         tree.write(path, expectedRules);
         return;
     }
@@ -279,6 +273,14 @@ function writeAgentRules(tree, path, writeNxCloudRules) {
     const regex = constants_2.rulesRegex;
     const existingNxConfiguration = existing.match(regex);
     if (existingNxConfiguration) {
+        // Check the rest of the file (outside nx block) for an h1 header
+        // to ensure only one h1 exists in the document
+        const contentWithoutNxBlock = existing.replace(regex, '');
+        const hasExternalH1 = /^# /m.test(contentWithoutNxBlock);
+        const expectedRules = (0, constants_2.getAgentRulesWrapped)({
+            writeNxCloudRules,
+            useH1: !hasExternalH1,
+        });
         const contentOnly = (str) => str
             .replace(constants_2.nxRulesMarkerCommentStart, '')
             .replace(constants_2.nxRulesMarkerCommentEnd, '')
@@ -293,12 +295,52 @@ function writeAgentRules(tree, path, writeNxCloudRules) {
         tree.write(path, updatedContent);
     }
     else {
+        // Appending to existing content - use h2 only if the file already has an h1 header
+        // This prevents unnecessary changes when users add content without their own h1
+        const hasExistingH1 = /^# /m.test(existing);
+        const expectedRules = (0, constants_2.getAgentRulesWrapped)({
+            writeNxCloudRules,
+            useH1: !hasExistingH1,
+        });
         tree.write(path, existing + '\n\n' + expectedRules);
     }
 }
+/**
+ * Extract user-added extra args/flags from an existing MCP config args array
+ * by stripping the known base command prefix.
+ *
+ * Known base patterns (matched in order, first wins):
+ *   ['nx', 'mcp']  or  ['nx-mcp'] (possibly with @version suffix like nx-mcp@latest)
+ *   For opencode the caller prepends 'npx' to these patterns.
+ */
+function getExtraMcpArgs(existingArgs, knownBasePatterns) {
+    if (!Array.isArray(existingArgs) || existingArgs.length === 0)
+        return [];
+    for (const pattern of knownBasePatterns) {
+        if (existingArgs.length < pattern.length)
+            continue;
+        const matches = pattern.every((baseArg, i) => {
+            if (baseArg === 'nx-mcp') {
+                // Also match versioned variants like nx-mcp@latest
+                return (existingArgs[i] === 'nx-mcp' || existingArgs[i].startsWith('nx-mcp@'));
+            }
+            return existingArgs[i] === baseArg;
+        });
+        if (matches) {
+            return existingArgs.slice(pattern.length);
+        }
+    }
+    return [];
+}
 function mcpConfigUpdater(existing, nxVersion) {
     const majorVersion = (0, semver_1.major)(nxVersion);
     const mcpArgs = majorVersion >= 22 ? ['nx', 'mcp'] : ['nx-mcp'];
+    // Preserve any extra args (e.g. --experimental-polygraph, --transport http) from existing config
+    const extraArgs = getExtraMcpArgs(existing.mcpServers?.['nx-mcp']?.args, [
+        ['nx', 'mcp'],
+        ['nx-mcp'],
+    ]);
+    mcpArgs.push(...extraArgs);
     if (existing.mcpServers) {
         existing.mcpServers['nx-mcp'] = {
             type: 'stdio',
@@ -320,6 +362,12 @@ function mcpConfigUpdater(existing, nxVersion) {
 function opencodeMcpConfigUpdater(existing, nxVersion) {
     const majorVersion = (0, semver_1.major)(nxVersion);
     const mcpCommand = majorVersion >= 22 ? ['npx', 'nx', 'mcp'] : ['npx', 'nx-mcp'];
+    // Preserve any extra args (e.g. --experimental-polygraph, --transport http) from existing config
+    const extraArgs = getExtraMcpArgs(existing.mcp?.['nx-mcp']?.command, [
+        ['npx', 'nx', 'mcp'],
+        ['npx', 'nx-mcp'],
+    ]);
+    mcpCommand.push(...extraArgs);
     if (existing.mcp) {
         existing.mcp['nx-mcp'] = {
             type: 'local',

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,yEAOlB,CAAC;AACX,MAAM,MAAM,KAAK,GAAG,CAAC,OAAO,eAAe,CAAC,CAAC,MAAM,CAAC,CAAC;AACrD,eAAO,MAAM,eAAe,EAAE,MAAM,CAAC,KAAK,EAAE,MAAM,CAOjD,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;AAoLD,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,yEAOlB,CAAC;AACX,MAAM,MAAM,KAAK,GAAG,CAAC,OAAO,eAAe,CAAC,CAAC,MAAM,CAAC,CAAC;AACrD,eAAO,MAAM,eAAe,EAAE,MAAM,CAAC,KAAK,EAAE,MAAM,CAOjD,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;AAyLD,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

@@ -108,12 +108,12 @@ async function getAgentConfiguration(agent, workspaceRoot) {
         }
         case 'copilot': {
             const rulesPath = (0, constants_1.agentsMdPath)(workspaceRoot);
-            const hasInstalledVSCode = (0, native_1.isEditorInstalled)(0 /* SupportedEditor.VSCode */);
-            const hasInstalledVSCodeInsiders = (0, native_1.isEditorInstalled)(1 /* SupportedEditor.VSCodeInsiders */);
+            const hasInstalledVSCode = await (0, native_1.isEditorInstalled)(0 /* SupportedEditor.VSCode */);
+            const hasInstalledVSCodeInsiders = await (0, native_1.isEditorInstalled)(1 /* SupportedEditor.VSCodeInsiders */);
             const hasInstalledNxConsoleForVSCode = hasInstalledVSCode &&
-                !(0, native_1.canInstallNxConsoleForEditor)(0 /* SupportedEditor.VSCode */);
+                !(await (0, native_1.canInstallNxConsoleForEditor)(0 /* SupportedEditor.VSCode */));
             const hasInstalledNxConsoleForVSCodeInsiders = hasInstalledVSCodeInsiders &&
-                !(0, native_1.canInstallNxConsoleForEditor)(1 /* SupportedEditor.VSCodeInsiders */);
+                !(await (0, native_1.canInstallNxConsoleForEditor)(1 /* SupportedEditor.VSCodeInsiders */));
             const agentsMdExists = (0, fs_1.existsSync)(rulesPath);
             agentConfiguration = {
                 mcp: hasInstalledNxConsoleForVSCode ||
@@ -127,8 +127,8 @@ async function getAgentConfiguration(agent, workspaceRoot) {
         }
         case 'cursor': {
             const rulesPath = (0, constants_1.agentsMdPath)(workspaceRoot);
-            const hasInstalledCursor = (0, native_1.isEditorInstalled)(2 /* SupportedEditor.Cursor */);
-            const hasInstalledNxConsole = !(0, native_1.canInstallNxConsoleForEditor)(2 /* SupportedEditor.Cursor */);
+            const hasInstalledCursor = await (0, native_1.isEditorInstalled)(2 /* SupportedEditor.Cursor */);
+            const hasInstalledNxConsole = !(await (0, native_1.canInstallNxConsoleForEditor)(2 /* SupportedEditor.Cursor */));
             const agentsMdExists = (0, fs_1.existsSync)(rulesPath);
             agentConfiguration = {
                 mcp: hasInstalledCursor ? hasInstalledNxConsole : false,
@@ -142,9 +142,10 @@ async function getAgentConfiguration(agent, workspaceRoot) {
         case 'codex': {
             const rulesPath = (0, constants_1.agentsMdPath)(workspaceRoot);
             const agentsMdExists = (0, fs_1.existsSync)(rulesPath);
+            const mcpPath = (0, constants_1.codexConfigTomlPath)(workspaceRoot);
             let mcpConfigured;
-            if ((0, fs_1.existsSync)(constants_1.codexConfigTomlPath)) {
-                const tomlContents = (0, fs_1.readFileSync)(constants_1.codexConfigTomlPath, 'utf-8');
+            if ((0, fs_1.existsSync)(mcpPath)) {
+                const tomlContents = (0, fs_1.readFileSync)(mcpPath, 'utf-8');
                 mcpConfigured = tomlContents.includes(constants_1.nxMcpTomlHeader);
             }
             else {
@@ -154,7 +155,7 @@ async function getAgentConfiguration(agent, workspaceRoot) {
                 mcp: mcpConfigured,
                 rules: agentsMdExists,
                 rulesPath,
-                mcpPath: constants_1.codexConfigTomlPath,
+                mcpPath,
             };
             break;
         }

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":"AAgBA,OAAO,EAAE,wBAAwB,EAAE,MAAM,kBAAkB,CAAC;AAG5D,wBAAsB,wBAAwB,CAC5C,IAAI,EAAE,wBAAwB,EAC9B,KAAK,UAAQ,GACZ,OAAO,CAAC,IAAI,CAAC,CAmCf;AAED,wBAAsB,4BAA4B,CAChD,OAAO,EAAE,wBAAwB,GAChC,OAAO,CAAC,IAAI,CAAC,CA4Nf"}
+{"version":3,"file":"configure-ai-agents.d.ts","sourceRoot":"","sources":["../../../../../../packages/nx/src/command-line/configure-ai-agents/configure-ai-agents.ts"],"names":[],"mappings":"AAmBA,OAAO,EAAE,wBAAwB,EAAE,MAAM,kBAAkB,CAAC;AAG5D,wBAAsB,wBAAwB,CAC5C,IAAI,EAAE,wBAAwB,EAC9B,KAAK,UAAQ,GACZ,OAAO,CAAC,IAAI,CAAC,CAsDf;AAED,wBAAsB,4BAA4B,CAChD,OAAO,EAAE,wBAAwB,GAChC,OAAO,CAAC,IAAI,CAAC,CAyOf"}

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

@@ -8,17 +8,35 @@ const node_path_1 = require("node:path");
 const pc = require("picocolors");
 const constants_1 = require("../../ai/constants");
 const utils_1 = require("../../ai/utils");
+const client_1 = require("../../daemon/client/client");
 const devkit_internals_1 = require("../../devkit-internals");
 const output_1 = require("../../utils/output");
+const package_manager_1 = require("../../utils/package-manager");
 const provenance_1 = require("../../utils/provenance");
+const versions_1 = require("../../utils/versions");
 const workspace_root_1 = require("../../utils/workspace-root");
 const ora = require("ora");
 async function configureAiAgentsHandler(args, inner = false) {
+    // When called as inner from the tmp install, just run the impl directly
+    if (inner) {
+        return await configureAiAgentsHandlerImpl(args);
+    }
     // Use environment variable to force local execution
     if (process.env.NX_USE_LOCAL === 'true' ||
-        process.env.NX_AI_FILES_USE_LOCAL === 'true' ||
-        inner) {
-        return await configureAiAgentsHandlerImpl(args);
+        process.env.NX_AI_FILES_USE_LOCAL === 'true') {
+        await configureAiAgentsHandlerImpl(args);
+        await resetDaemonAgentStatus();
+        return;
+    }
+    // Skip downloading latest if the current version is already the latest
+    try {
+        const latestVersion = await (0, package_manager_1.resolvePackageVersionUsingRegistry)('nx', 'latest');
+        if (latestVersion === versions_1.nxVersion) {
+            return await configureAiAgentsHandlerImpl(args);
+        }
+    }
+    catch {
+        // If we can't check, proceed with download
     }
     let cleanup;
     try {
@@ -27,19 +45,31 @@ async function configureAiAgentsHandler(args, inner = false) {
         cleanup = packageInstallResults.cleanup;
         let modulePath = require.resolve('nx/src/command-line/configure-ai-agents/configure-ai-agents.js', { paths: [packageInstallResults.tempDir] });
         const module = await Promise.resolve(`${modulePath}`).then(s => require(s));
-        const configureAiAgentsResult = await module.configureAiAgentsHandler(args, true);
+        await module.configureAiAgentsHandler(args, true);
         cleanup();
-        return configureAiAgentsResult;
     }
     catch (error) {
         if (cleanup) {
             cleanup();
         }
         // Fall back to local implementation
-        return configureAiAgentsHandlerImpl(args);
+        await configureAiAgentsHandlerImpl(args);
     }
+    // Reset daemon cache using the local daemon client (the inner handler's
+    // client belongs to the tmp install and isn't connected to our daemon)
+    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.
+    process.on('uncaughtException', (error) => {
+        if (error &&
+            typeof error === 'object' &&
+            'code' in error &&
+            error['code'] === 'ERR_USE_AFTER_CLOSE')
+            return;
+        throw error;
+    });
     const normalizedOptions = normalizeOptions(options);
     const { nonConfiguredAgents, partiallyConfiguredAgents, fullyConfiguredAgents, disabledAgents, } = await (0, utils_1.getAgentConfigurations)(normalizedOptions.agents, workspace_root_1.workspaceRoot);
     if (disabledAgents.length > 0) {
@@ -249,7 +279,7 @@ function getAgentFooterDescription(agent) {
         case 'opencode':
             return `Configures MCP server. Adds skills and agents. Updates ${rulesFile}.`;
         case 'codex':
-            return `Configures MCP server. Updates ${rulesFile}.`;
+            return `Configures MCP server. Adds skills. Updates ${rulesFile}.`;
         default:
             return '';
     }
@@ -271,7 +301,7 @@ function getAgentConfiguredDescription(agent) {
         case 'opencode':
             return `MCP + skills + ${rulesFile}`;
         case 'codex':
-            return `MCP + ${rulesFile}`;
+            return `MCP + skills + ${rulesFile}`;
         default:
             return '';
     }
@@ -297,3 +327,21 @@ function normalizeOptions(options) {
         check,
     };
 }
+async function resetDaemonAgentStatus() {
+    try {
+        // Don't check daemonClient.enabled() — the CLI sets NX_DAEMON=false for
+        // configure-ai-agents (it doesn't need the daemon to do its work), but a
+        // daemon started by a previous command may still be running and serving
+        // cached status. We just need to reach it to reset its cache.
+        if (await client_1.daemonClient.isServerAvailable()) {
+            await client_1.daemonClient.resetConfigureAiAgentsStatus();
+        }
+    }
+    catch {
+        // Daemon may not be running, that's fine
+    }
+    finally {
+        // Close the daemon socket so the process can exit cleanly.
+        client_1.daemonClient.reset();
+    }
+}

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

@@ -1 +1 @@
-{"version":3,"file":"ai-agent-prompts.d.ts","sourceRoot":"","sources":["../../../../../../packages/nx/src/command-line/init/ai-agent-prompts.ts"],"names":[],"mappings":"AAEA,OAAO,EAAE,KAAK,EAAoC,MAAM,gBAAgB,CAAC;AAGzE,wBAAsB,iBAAiB,CACrC,QAAQ,CAAC,EAAE,KAAK,EAAE,EAClB,WAAW,CAAC,EAAE,OAAO,GACpB,OAAO,CAAC,KAAK,EAAE,CAAC,CASlB"}
+{"version":3,"file":"ai-agent-prompts.d.ts","sourceRoot":"","sources":["../../../../../../packages/nx/src/command-line/init/ai-agent-prompts.ts"],"names":[],"mappings":"AAEA,OAAO,EAAE,KAAK,EAAoC,MAAM,gBAAgB,CAAC;AAIzE,wBAAsB,iBAAiB,CACrC,QAAQ,CAAC,EAAE,KAAK,EAAE,EAClB,WAAW,CAAC,EAAE,OAAO,GACpB,OAAO,CAAC,KAAK,EAAE,CAAC,CAalB"}

package/src/command-line/init/ai-agent-prompts.js

@@ -4,10 +4,15 @@ exports.determineAiAgents = determineAiAgents;
 const enquirer_1 = require("enquirer");
 const is_ci_1 = require("../../utils/is-ci");
 const utils_1 = require("../../ai/utils");
+const detect_ai_agent_1 = require("../../ai/detect-ai-agent");
 const pc = require("picocolors");
 async function determineAiAgents(aiAgents, interactive) {
     if (interactive === false || (0, is_ci_1.isCI)()) {
-        return aiAgents ?? [];
+        if (aiAgents) {
+            return aiAgents;
+        }
+        const detected = (0, detect_ai_agent_1.detectAiAgent)();
+        return detected ? [detected] : [];
     }
     if (aiAgents) {
         return aiAgents;

package/src/command-line/init/command-object.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"command-object.d.ts","sourceRoot":"","sources":["../../../../../../packages/nx/src/command-line/init/command-object.ts"],"names":[],"mappings":"AAAA,OAAO,EAAQ,aAAa,EAAE,MAAM,OAAO,CAAC;AAG5C,eAAO,MAAM,gBAAgB,EAAE,aAiC9B,CAAC"}
+{"version":3,"file":"command-object.d.ts","sourceRoot":"","sources":["../../../../../../packages/nx/src/command-line/init/command-object.ts"],"names":[],"mappings":"AAAA,OAAO,EAAQ,aAAa,EAAE,MAAM,OAAO,CAAC;AAU5C,eAAO,MAAM,gBAAgB,EAAE,aAqD9B,CAAC"}