nx 22.6.0-beta.1 → 22.6.0-beta.11

package/.eslintrc.json

@@ -144,8 +144,8 @@
               "@nx/conformance",
               // Nx Docker plugin conditionally available dynamically at runtime
               "@nx/docker",
-              // Only used in test-utils at the time of writing
-              "@ltd/j-toml"
+              // Used in WASI browser implementation (nx.wasi-browser.js)
+              "@napi-rs/wasm-runtime"
             ]
           }
         ]

package/bin/init-local.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"init-local.d.ts","sourceRoot":"","sources":["../../../../packages/nx/bin/init-local.ts"],"names":[],"mappings":"AAGA,OAAO,EAAE,oBAAoB,EAAE,MAAM,kCAAkC,CAAC;AAMxE;;;;GAIG;AACH,wBAAsB,SAAS,CAAC,SAAS,EAAE,oBAAoB,iBA6C9D;AAED,wBAAgB,yBAAyB,CAAC,IAAI,EAAE,MAAM,EAAE,YA6BvD"}
+{"version":3,"file":"init-local.d.ts","sourceRoot":"","sources":["../../../../packages/nx/bin/init-local.ts"],"names":[],"mappings":"AAGA,OAAO,EAAE,oBAAoB,EAAE,MAAM,kCAAkC,CAAC;AAOxE;;;;GAIG;AACH,wBAAsB,SAAS,CAAC,SAAS,EAAE,oBAAoB,iBA+C9D;AAED,wBAAgB,yBAAyB,CAAC,IAAI,EAAE,MAAM,EAAE,YA6BvD"}

package/bin/init-local.js

@@ -8,6 +8,7 @@ const strip_indents_1 = require("../src/utils/strip-indents");
 const client_1 = require("../src/daemon/client/client");
 const enquirer_1 = require("enquirer");
 const output_1 = require("../src/utils/output");
+const analytics_1 = require("../src/analytics");
 /**
  * Nx is being run inside a workspace.
  *
@@ -44,6 +45,7 @@ async function initLocal(workspace) {
             const split = newArgs.indexOf('--');
             if (help > -1 && (split === -1 || split > help)) {
                 nx_commands_1.commandsObject.showHelp();
+                process.exit(0);
             }
             else {
                 nx_commands_1.commandsObject.parse(newArgs);
@@ -55,6 +57,7 @@ async function initLocal(workspace) {
     }
     catch (e) {
         console.error(e.message);
+        (0, analytics_1.flushAnalytics)();
         process.exit(1);
     }
 }

package/bin/nx.js

@@ -1,6 +1,12 @@
 #!/usr/bin/env node
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
+// TODO: Remove this workaround once picocolors handles FORCE_COLOR=0 correctly
+// See: https://github.com/alexeyraspopov/picocolors/issues/100
+if (process.env.FORCE_COLOR === '0') {
+    process.env.NO_COLOR = '1';
+    delete process.env.FORCE_COLOR;
+}
 const find_workspace_root_1 = require("../src/utils/find-workspace-root");
 const pc = require("picocolors");
 const dotenv_1 = require("../src/utils/dotenv");
@@ -17,6 +23,8 @@ const perf_hooks_1 = require("perf_hooks");
 const workspace_context_1 = require("../src/utils/workspace-context");
 const client_1 = require("../src/daemon/client/client");
 const db_connection_1 = require("../src/utils/db-connection");
+const analytics_prompt_1 = require("../src/utils/analytics-prompt");
+const analytics_1 = require("../src/analytics");
 async function main() {
     if (process.argv[2] !== 'report' &&
         process.argv[2] !== '--version' &&
@@ -62,12 +70,18 @@ async function main() {
         if (process.argv[2] === '--version') {
             handleNxVersionCommand(LOCAL_NX_VERSION, GLOBAL_NX_VERSION);
         }
-        if (!workspace) {
+        if (!workspace && !isNxCloudCommand(process.argv[2])) {
             handleNoWorkspace(GLOBAL_NX_VERSION);
         }
         if (!localNx && !isNxCloudCommand(process.argv[2])) {
             handleMissingLocalInstallation(workspace ? workspace.dir : null);
         }
+        // Prompt for analytics preference if not set
+        try {
+            await (0, analytics_prompt_1.ensureAnalyticsPreferenceSet)();
+        }
+        catch { }
+        await (0, analytics_1.startAnalytics)();
         // this file is already in the local workspace
         if (isNxCloudCommand(process.argv[2])) {
             // nx-cloud commands can run without local Nx installation
@@ -150,6 +164,7 @@ function isNxCloudCommand(command) {
         'view-logs',
         'fix-ci',
         'record',
+        'polygraph',
     ];
     return nxCloudCommands.includes(command);
 }
@@ -242,5 +257,6 @@ process.on('exit', () => {
 });
 main().catch((error) => {
     console.error(error);
+    (0, analytics_1.flushAnalytics)();
     process.exit(1);
 });

package/migrations.json

@@ -136,6 +136,24 @@
       "version": "22.1.0-beta.5",
       "description": "Updates the nx wrapper.",
       "implementation": "./src/migrations/update-22-1-0/update-nx-wrapper"
+    },
+    "22-6-1-add-claude-worktrees-to-git-ignore": {
+      "cli": "nx",
+      "version": "22.6.0-beta.10",
+      "description": "Adds .claude/worktrees to .gitignore",
+      "implementation": "./src/migrations/update-22-6-0/add-claude-worktrees-to-git-ignore"
+    },
+    "22-7-0-add-polygraph-to-git-ignore": {
+      "cli": "nx",
+      "version": "22.7.0-beta.0",
+      "description": "Adds .nx/polygraph to .gitignore",
+      "implementation": "./src/migrations/update-22-7-0/add-polygraph-to-git-ignore"
+    },
+    "22-6-0-enable-analytics-prompt": {
+      "cli": "nx",
+      "version": "22.6.0-beta.11",
+      "description": "Prompts to enable usage analytics",
+      "implementation": "./src/migrations/update-22-6-0/enable-analytics-prompt"
     }
   }
 }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "nx",
-  "version": "22.6.0-beta.1",
+  "version": "22.6.0-beta.11",
   "private": false,
   "description": "The core Nx plugin contains the core functionality of Nx like the project graph, nx commands and task orchestration.",
   "repository": {
@@ -34,6 +34,7 @@
   },
   "homepage": "https://nx.dev",
   "dependencies": {
+    "@ltd/j-toml": "^1.38.0",
     "@napi-rs/wasm-runtime": "0.2.4",
     "@yarnpkg/lockfile": "^1.1.0",
     "@yarnpkg/parsers": "3.0.2",
@@ -54,7 +55,7 @@
     "jest-diff": "^30.0.2",
     "jsonc-parser": "3.2.0",
     "lines-and-columns": "2.0.3",
-    "minimatch": "10.1.1",
+    "minimatch": "10.2.4",
     "node-machine-id": "1.1.12",
     "npm-run-path": "^4.0.1",
     "open": "^8.4.0",
@@ -84,16 +85,16 @@
     }
   },
   "optionalDependencies": {
-    "@nx/nx-darwin-arm64": "22.6.0-beta.1",
-    "@nx/nx-darwin-x64": "22.6.0-beta.1",
-    "@nx/nx-freebsd-x64": "22.6.0-beta.1",
-    "@nx/nx-linux-arm-gnueabihf": "22.6.0-beta.1",
-    "@nx/nx-linux-arm64-gnu": "22.6.0-beta.1",
-    "@nx/nx-linux-arm64-musl": "22.6.0-beta.1",
-    "@nx/nx-linux-x64-gnu": "22.6.0-beta.1",
-    "@nx/nx-linux-x64-musl": "22.6.0-beta.1",
-    "@nx/nx-win32-arm64-msvc": "22.6.0-beta.1",
-    "@nx/nx-win32-x64-msvc": "22.6.0-beta.1"
+    "@nx/nx-darwin-arm64": "22.6.0-beta.11",
+    "@nx/nx-darwin-x64": "22.6.0-beta.11",
+    "@nx/nx-freebsd-x64": "22.6.0-beta.11",
+    "@nx/nx-linux-arm-gnueabihf": "22.6.0-beta.11",
+    "@nx/nx-linux-arm64-gnu": "22.6.0-beta.11",
+    "@nx/nx-linux-arm64-musl": "22.6.0-beta.11",
+    "@nx/nx-linux-x64-gnu": "22.6.0-beta.11",
+    "@nx/nx-linux-x64-musl": "22.6.0-beta.11",
+    "@nx/nx-win32-arm64-msvc": "22.6.0-beta.11",
+    "@nx/nx-win32-x64-msvc": "22.6.0-beta.11"
   },
   "nx-migrations": {
     "migrations": "./migrations.json",
@@ -103,6 +104,8 @@
       "@nx/eslint",
       "@nx/workspace",
       "@nx/angular",
+      "@nx/angular-rspack",
+      "@nx/angular-rspack-compiler",
       "@nx/jest",
       "@nx/cypress",
       "@nx/detox",

package/plugins/package-json.d.ts

@@ -1,6 +1,5 @@
 import { ProjectConfiguration } from '../src/config/workspace-json-project-json';
-export type PackageJsonConfigurationCache = {
-    [hash: string]: ProjectConfiguration;
-};
+import { PluginCache } from '../src/utils/plugin-cache-utils';
+export type PackageJsonConfigurationCache = PluginCache<ProjectConfiguration>;
 export declare function readPackageJsonConfigurationCache(): PackageJsonConfigurationCache;
 //# sourceMappingURL=package-json.d.ts.map

package/plugins/package-json.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"package-json.d.ts","sourceRoot":"","sources":["../../../../packages/nx/plugins/package-json.ts"],"names":[],"mappings":"AASA,OAAO,EAAE,oBAAoB,EAAE,MAAM,2CAA2C,CAAC;AAGjF,MAAM,MAAM,6BAA6B,GAAG;IAC1C,CAAC,IAAI,EAAE,MAAM,GAAG,oBAAoB,CAAC;CACtC,CAAC;AAIF,wBAAgB,iCAAiC,kCAMhD"}
+{"version":3,"file":"package-json.d.ts","sourceRoot":"","sources":["../../../../packages/nx/plugins/package-json.ts"],"names":[],"mappings":"AASA,OAAO,EAAE,oBAAoB,EAAE,MAAM,2CAA2C,CAAC;AAEjF,OAAO,EAAE,WAAW,EAAE,MAAM,iCAAiC,CAAC;AAE9D,MAAM,MAAM,6BAA6B,GAAG,WAAW,CAAC,oBAAoB,CAAC,CAAC;AAM9E,wBAAgB,iCAAiC,IAAI,6BAA6B,CAGjF"}

package/plugins/package-json.js

@@ -7,17 +7,17 @@ const package_json_1 = require("../src/plugins/package-json");
 const cache_directory_1 = require("../src/utils/cache-directory");
 const path_1 = require("path");
 const fileutils_1 = require("../src/utils/fileutils");
+const plugin_cache_utils_1 = require("../src/utils/plugin-cache-utils");
 const cachePath = (0, path_1.join)(cache_directory_1.workspaceDataDirectory, 'package-json.hash');
+let packageJsonPluginCache = null;
 function readPackageJsonConfigurationCache() {
-    try {
-        return (0, fileutils_1.readJsonFile)(cachePath);
-    }
-    catch (e) {
-        return {};
-    }
+    packageJsonPluginCache = new plugin_cache_utils_1.PluginCache(cachePath);
+    return packageJsonPluginCache;
 }
-function writeCache(cache) {
-    (0, fileutils_1.writeJsonFile)(cachePath, cache);
+function writeCache() {
+    if (packageJsonPluginCache) {
+        packageJsonPluginCache.writeToDisk(cachePath);
+    }
 }
 const plugin = {
     name: 'nx-all-package-jsons-plugin',
@@ -28,7 +28,7 @@ const plugin = {
             const patterns = (0, package_json_1.buildPackageJsonPatterns)(context.workspaceRoot, (f) => (0, fileutils_1.readJsonFile)((0, path_1.join)(context.workspaceRoot, f)));
             const isInPackageJsonWorkspaces = (0, package_json_1.buildPackageJsonWorkspacesMatcher)(patterns);
             const result = (0, plugins_1.createNodesFromFiles)((packageJsonPath) => (0, package_json_1.createNodeFromPackageJson)(packageJsonPath, workspace_root_1.workspaceRoot, cache, isInPackageJsonWorkspaces(packageJsonPath)), configFiles, options, context);
-            writeCache(cache);
+            writeCache();
             return result;
         },
     ],

package/schemas/nx-schema.json

@@ -142,6 +142,10 @@
       "type": "boolean",
       "description": "Specifies whether to add inference plugins when generating new projects."
     },
+    "analytics": {
+      "type": "boolean",
+      "description": "Set this to true to allow Nx to collect usage analytics."
+    },
     "release": {
       "type": "object",
       "description": "Configuration for the nx release commands.",

package/src/adapter/compat.d.ts

@@ -1,3 +1,3 @@
 export declare const allowedProjectExtensions: readonly ["tags", "implicitDependencies", "configFilePath", "$schema", "generators", "namedInputs", "name", "files", "root", "sourceRoot", "projectType", "release", "includedScripts", "metadata", "owners", "nxCloudImplicitDependencies"];
-export declare const allowedWorkspaceExtensions: readonly ["$schema", "implicitDependencies", "affected", "defaultBase", "tasksRunnerOptions", "workspaceLayout", "plugins", "targetDefaults", "files", "generators", "namedInputs", "extends", "cli", "pluginsConfig", "defaultProject", "installation", "release", "nxCloudAccessToken", "nxCloudId", "nxCloudUrl", "nxCloudEncryptionKey", "parallel", "cacheDirectory", "useDaemonProcess", "useInferencePlugins", "neverConnectToCloud", "sync", "useLegacyCache", "maxCacheSize", "tui", "owners"];
+export declare const allowedWorkspaceExtensions: readonly ["$schema", "implicitDependencies", "affected", "defaultBase", "tasksRunnerOptions", "workspaceLayout", "plugins", "targetDefaults", "files", "generators", "namedInputs", "extends", "cli", "pluginsConfig", "defaultProject", "installation", "release", "nxCloudAccessToken", "nxCloudId", "nxCloudUrl", "nxCloudEncryptionKey", "parallel", "cacheDirectory", "useDaemonProcess", "useInferencePlugins", "neverConnectToCloud", "analytics", "sync", "useLegacyCache", "maxCacheSize", "tui", "owners"];
 //# sourceMappingURL=compat.d.ts.map

package/src/adapter/compat.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"compat.d.ts","sourceRoot":"","sources":["../../../../../packages/nx/src/adapter/compat.ts"],"names":[],"mappings":"AAgCA,eAAO,MAAM,wBAAwB,8OAiB3B,CAAC;AAQX,eAAO,MAAM,0BAA0B,yeAgC7B,CAAC"}
+{"version":3,"file":"compat.d.ts","sourceRoot":"","sources":["../../../../../packages/nx/src/adapter/compat.ts"],"names":[],"mappings":"AAgCA,eAAO,MAAM,wBAAwB,8OAiB3B,CAAC;AAQX,eAAO,MAAM,0BAA0B,sfAiC7B,CAAC"}

package/src/adapter/compat.js

@@ -65,6 +65,7 @@ exports.allowedWorkspaceExtensions = [
     'useDaemonProcess',
     'useInferencePlugins',
     'neverConnectToCloud',
+    'analytics',
     'sync',
     'useLegacyCache',
     'maxCacheSize',

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":"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"}
+{"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":"AAKA,OAAO,EAAE,IAAI,EAAE,MAAM,uBAAuB,CAAC;AAS7C,OAAO,EACL,qBAAqB,EACrB,oBAAoB,EACrB,MAAM,oBAAoB,CAAC;AAuB5B,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,CAoP7C;AAuRD,eAAe,sBAAsB,CAAC"}

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

@@ -5,17 +5,18 @@ exports.setupAiAgentsGeneratorImpl = setupAiAgentsGeneratorImpl;
 const fs_1 = require("fs");
 const path_1 = require("path");
 const semver_1 = require("semver");
+const j_toml_1 = require("@ltd/j-toml");
 const format_changed_files_with_prettier_if_available_1 = require("../../generators/internal-utils/format-changed-files-with-prettier-if-available");
 const generate_files_1 = require("../../generators/utils/generate-files");
 const json_1 = require("../../generators/utils/json");
 const native_1 = require("../../native");
 const package_json_1 = require("../../utils/package-json");
+const ignore_1 = require("../../utils/ignore");
 const provenance_1 = require("../../utils/provenance");
 const workspace_root_1 = require("../../utils/workspace-root");
 const constants_1 = require("../constants");
 const clone_ai_config_repo_1 = require("../clone-ai-config-repo");
 const utils_1 = require("../utils");
-const constants_2 = require("../constants");
 /**
  * Get the installed Nx version, with fallback to workspace package.json or default version.
  */
@@ -97,6 +98,7 @@ async function setupAiAgentsGeneratorImpl(tree, options) {
                 ...json.extraKnownMarketplaces,
                 'nx-claude-plugins': {
                     source: {
+                        ...json.extraKnownMarketplaces?.['nx-claude-plugins']?.source,
                         source: 'github',
                         repo: 'nrwl/nx-ai-agents-config',
                     },
@@ -137,19 +139,25 @@ 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);
+    // Get the ai-config repo path once for all non-Claude agents that need it
+    const needsAiConfigRepo = hasAgent('codex') ||
+        hasAgent('opencode') ||
+        hasAgent('copilot') ||
+        hasAgent('cursor') ||
+        hasAgent('gemini');
+    let aiConfigRepoPath;
+    if (needsAiConfigRepo) {
+        try {
+            aiConfigRepoPath = (0, clone_ai_config_repo_1.getAiConfigRepoPath)();
         }
-        else {
-            const existing = tree.read(codexTomlPath, 'utf-8');
-            if (!existing.includes(constants_2.nxMcpTomlHeader)) {
-                tree.write(codexTomlPath, existing + '\n' + tomlConfig);
-            }
+        catch {
+            // Network/clone failure — individual consumers handle fallback
         }
     }
+    if (hasAgent('codex')) {
+        const codexTomlPath = (0, path_1.join)(options.directory, '.codex', 'config.toml');
+        writeCodexConfig(tree, codexTomlPath, nxVersion, aiConfigRepoPath);
+    }
     if (hasAgent('gemini')) {
         const geminiSettingsPath = (0, path_1.join)(options.directory, '.gemini', 'settings.json');
         if (!tree.exists(geminiSettingsPath)) {
@@ -171,17 +179,18 @@ async function setupAiAgentsGeneratorImpl(tree, options) {
         }
     }
     // Copy extensibility artifacts (commands, skills, subagents) for non-Claude agents
-    if (hasAgent('opencode') ||
-        hasAgent('copilot') ||
-        hasAgent('cursor') ||
-        hasAgent('codex') ||
-        hasAgent('gemini')) {
-        const repoPath = (0, clone_ai_config_repo_1.getAiConfigRepoPath)();
+    if (aiConfigRepoPath) {
+        const repoPath = aiConfigRepoPath;
         const agentDirs = [
             { 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/.agents', dest: '.agents' },
+            {
+                agent: 'codex',
+                src: 'generated/.codex/agents',
+                dest: '.codex/agents',
+            },
             { agent: 'gemini', src: 'generated/.gemini', dest: '.gemini' },
         ];
         for (const { agent, src, dest } of agentDirs) {
@@ -193,6 +202,8 @@ async function setupAiAgentsGeneratorImpl(tree, options) {
             }
         }
     }
+    (0, ignore_1.addEntryToGitIgnore)(tree, (0, path_1.join)(options.directory, '.gitignore'), '.nx/polygraph');
+    (0, ignore_1.addEntryToGitIgnore)(tree, (0, path_1.join)(options.directory, '.gitignore'), '.claude/worktrees');
     await (0, format_changed_files_with_prettier_if_available_1.formatChangedFilesWithPrettierIfAvailable)(tree);
     // we use the check variable to determine if we should actually make changes or just report what would be changed
     return async (check = false) => {
@@ -262,7 +273,7 @@ async function setupAiAgentsGeneratorImpl(tree, options) {
 function writeAgentRules(tree, path, writeNxCloudRules) {
     if (!tree.exists(path)) {
         // File doesn't exist - create with h1 header (standalone content)
-        const expectedRules = (0, constants_2.getAgentRulesWrapped)({
+        const expectedRules = (0, constants_1.getAgentRulesWrapped)({
             writeNxCloudRules,
             useH1: true,
         });
@@ -270,21 +281,21 @@ function writeAgentRules(tree, path, writeNxCloudRules) {
         return;
     }
     const existing = tree.read(path, 'utf-8');
-    const regex = constants_2.rulesRegex;
+    const regex = constants_1.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)({
+        const expectedRules = (0, constants_1.getAgentRulesWrapped)({
             writeNxCloudRules,
             useH1: !hasExternalH1,
         });
         const contentOnly = (str) => str
-            .replace(constants_2.nxRulesMarkerCommentStart, '')
-            .replace(constants_2.nxRulesMarkerCommentEnd, '')
-            .replace(constants_2.nxRulesMarkerCommentDescription, '')
+            .replace(constants_1.nxRulesMarkerCommentStart, '')
+            .replace(constants_1.nxRulesMarkerCommentEnd, '')
+            .replace(constants_1.nxRulesMarkerCommentDescription, '')
             .replace(/\s/g, '');
         // we don't want to make updates on whitespace-only changes
         if (contentOnly(existingNxConfiguration[0]) === contentOnly(expectedRules)) {
@@ -298,13 +309,115 @@ function writeAgentRules(tree, path, writeNxCloudRules) {
         // 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)({
+        const expectedRules = (0, constants_1.getAgentRulesWrapped)({
             writeNxCloudRules,
             useH1: !hasExistingH1,
         });
         tree.write(path, existing + '\n\n' + expectedRules);
     }
 }
+/**
+ * Write or merge the Codex config.toml.
+ *
+ * Reads the generated config.toml from the nx-ai-agents-config repo (which
+ * contains MCP servers, agent definitions, and feature flags) and deep-merges
+ * it into the user's existing config.toml using proper TOML parsing.
+ *
+ * Merge rules:
+ * - [mcp_servers."nx-mcp"] — upsert with version-adjusted args, preserving extra user args
+ * - [features] multi_agent — set to true unless user has explicitly set it to false
+ * - [agents.*] — upsert each agent definition
+ * - All other user config is preserved untouched
+ *
+ * Falls back to a minimal hardcoded MCP config if the generated file is unavailable.
+ */
+function writeCodexConfig(tree, codexTomlPath, nxVersion, aiConfigRepoPath) {
+    let generated = null;
+    if (aiConfigRepoPath) {
+        const generatedConfigPath = (0, path_1.join)(aiConfigRepoPath, 'generated', '.codex', 'config.toml');
+        if ((0, fs_1.existsSync)(generatedConfigPath)) {
+            const generatedConfig = (0, fs_1.readFileSync)(generatedConfigPath, 'utf-8');
+            generated = j_toml_1.default.parse(generatedConfig);
+        }
+    }
+    if (!generated) {
+        // Fallback: use hardcoded MCP-only config (no agents/features)
+        const tomlConfig = (0, constants_1.getNxMcpTomlConfig)(nxVersion);
+        if (!tree.exists(codexTomlPath)) {
+            tree.write(codexTomlPath, tomlConfig);
+        }
+        else {
+            const existing = tree.read(codexTomlPath, 'utf-8');
+            if (!existing.includes(constants_1.nxMcpTomlHeader)) {
+                tree.write(codexTomlPath, existing + '\n' + tomlConfig);
+            }
+        }
+        return;
+    }
+    // Parse existing config (or start empty)
+    let config = {};
+    if (tree.exists(codexTomlPath)) {
+        try {
+            config = j_toml_1.default.parse(tree.read(codexTomlPath, 'utf-8'));
+        }
+        catch {
+            // If existing file can't be parsed, start fresh
+            config = {};
+        }
+    }
+    // ── Merge MCP servers ──
+    const majorVersion = (0, semver_1.major)(nxVersion);
+    const mcpArgs = majorVersion >= 22 ? ['nx', 'mcp'] : ['nx-mcp'];
+    // Preserve extra user args from existing config
+    const existingArgs = config.mcp_servers?.['nx-mcp']?.args ?? [];
+    const extraArgs = stripKnownMcpBaseArgs(existingArgs);
+    mcpArgs.push(...extraArgs);
+    config.mcp_servers ??= {};
+    config.mcp_servers['nx-mcp'] = {
+        command: 'npx',
+        args: mcpArgs,
+    };
+    // ── Merge features ──
+    // Only set multi_agent = true if user hasn't explicitly set it to false
+    const userSetMultiAgentFalse = config.features?.multi_agent === false;
+    if (!userSetMultiAgentFalse && generated.features) {
+        config.features ??= {};
+        Object.assign(config.features, generated.features);
+    }
+    // ── Merge agents ──
+    if (generated.agents) {
+        config.agents ??= {};
+        for (const [name, def] of Object.entries(generated.agents)) {
+            config.agents[name] = def;
+        }
+    }
+    // ── Serialize and write ──
+    const tomlString = j_toml_1.default.stringify(config, {
+        newlineAround: 'section',
+    });
+    tree.write(codexTomlPath, Array.isArray(tomlString) ? tomlString.join('\n') : tomlString);
+}
+/**
+ * Strip known MCP base command args (["nx", "mcp"] or ["nx-mcp"]) from an
+ * args array, returning only the extra user-added args.
+ */
+function stripKnownMcpBaseArgs(args) {
+    const knownBasePatterns = [['nx', 'mcp'], ['nx-mcp']];
+    for (const pattern of knownBasePatterns) {
+        if (args.length < pattern.length)
+            continue;
+        const matches = pattern.every((baseArg, i) => {
+            if (baseArg === 'nx-mcp') {
+                return args[i] === 'nx-mcp' || args[i].startsWith('nx-mcp@');
+            }
+            return args[i] === baseArg;
+        });
+        if (matches) {
+            return args.slice(pattern.length);
+        }
+    }
+    return [];
+}
 /**
  * Extract user-added extra args/flags from an existing MCP config args array
  * by stripping the known base command prefix.

package/src/analytics/analytics.d.ts

@@ -0,0 +1,8 @@
+export declare function startAnalytics(): Promise<void>;
+export declare function reportNxAddCommand(packageName: string, version: string): void;
+export declare function reportNxGenerateCommand(generator: string): void;
+export declare function reportCommandRunEvent(command: string, parameters?: Record<string, any>, args?: Record<string, any>): void;
+export declare function reportProjectGraphCreationEvent(duration: number): void;
+export declare function argsToQueryString(args: Record<string, any>): string;
+export declare function flushAnalytics(): void;
+//# sourceMappingURL=analytics.d.ts.map

package/src/analytics/analytics.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"analytics.d.ts","sourceRoot":"","sources":["../../../../../packages/nx/src/analytics/analytics.ts"],"names":[],"mappings":"AA0CA,wBAAsB,cAAc,kBAoDnC;AAED,wBAAgB,kBAAkB,CAAC,WAAW,EAAE,MAAM,EAAE,OAAO,EAAE,MAAM,QAKtE;AAED,wBAAgB,uBAAuB,CAAC,SAAS,EAAE,MAAM,QAIxD;AAED,wBAAgB,qBAAqB,CACnC,OAAO,EAAE,MAAM,EACf,UAAU,CAAC,EAAE,MAAM,CAAC,MAAM,EAAE,GAAG,CAAC,EAChC,IAAI,CAAC,EAAE,MAAM,CAAC,MAAM,EAAE,GAAG,CAAC,QAW3B;AAED,wBAAgB,+BAA+B,CAAC,QAAQ,EAAE,MAAM,QAI/D;AAuID,wBAAgB,iBAAiB,CAAC,IAAI,EAAE,MAAM,CAAC,MAAM,EAAE,GAAG,CAAC,GAAG,MAAM,CAkBnE;AAmDD,wBAAgB,cAAc,SAW7B"}